[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [tor-launcher/master] Translation updates

To: tor-commits@xxxxxxxxxxxxxxxxxxxx, tbb-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor-launcher/master] Translation updates
From: gk@xxxxxxxxxxxxxx
Date: Sat, 23 Jan 2016 20:30:43 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sat, 23 Jan 2016 15:31:29 -0500
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit e6ea0ecfc7e1aee2b7368767e188a9b02f26b84e
Author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Date:   Thu Jan 21 14:46:23 2016 +0000

    Translation updates
---
 src/chrome/locale/ach/network-settings.dtd         |   15 +++-
 src/chrome/locale/ach/progress.dtd                 |    2 +-
 src/chrome/locale/ady/network-settings.dtd         |   15 +++-
 src/chrome/locale/ady/progress.dtd                 |    2 +-
 src/chrome/locale/af/network-settings.dtd          |   15 +++-
 src/chrome/locale/af/progress.dtd                  |    2 +-
 src/chrome/locale/ak/network-settings.dtd          |   15 +++-
 src/chrome/locale/ak/progress.dtd                  |    2 +-
 src/chrome/locale/am-ET/network-settings.dtd       |   15 +++-
 src/chrome/locale/am-ET/progress.dtd               |    2 +-
 src/chrome/locale/am/network-settings.dtd          |   15 +++-
 src/chrome/locale/am/progress.dtd                  |    2 +-
 src/chrome/locale/ar/network-settings.dtd          |   15 +++-
 src/chrome/locale/ar/progress.dtd                  |    2 +-
 src/chrome/locale/arn/network-settings.dtd         |   15 +++-
 src/chrome/locale/arn/progress.dtd                 |    2 +-
 src/chrome/locale/ast/network-settings.dtd         |   15 +++-
 src/chrome/locale/ast/progress.dtd                 |    2 +-
 src/chrome/locale/az/network-settings.dtd          |   16 ++--
 src/chrome/locale/az/progress.dtd                  |    2 +-
 src/chrome/locale/be/network-settings.dtd          |   15 +++-
 src/chrome/locale/be/progress.dtd                  |    2 +-
 src/chrome/locale/bg/network-settings.dtd          |   15 +++-
 src/chrome/locale/bg/progress.dtd                  |    2 +-
 src/chrome/locale/bn-BD/network-settings.dtd       |   15 +++-
 src/chrome/locale/bn-BD/progress.dtd               |    2 +-
 src/chrome/locale/bn-IN/network-settings.dtd       |   15 +++-
 src/chrome/locale/bn-IN/progress.dtd               |    2 +-
 src/chrome/locale/bn/network-settings.dtd          |   15 +++-
 src/chrome/locale/bn/progress.dtd                  |    2 +-
 src/chrome/locale/bo/network-settings.dtd          |   15 +++-
 src/chrome/locale/bo/progress.dtd                  |    2 +-
 src/chrome/locale/br/network-settings.dtd          |   15 +++-
 src/chrome/locale/br/progress.dtd                  |    2 +-
 src/chrome/locale/bs/network-settings.dtd          |   15 +++-
 src/chrome/locale/bs/progress.dtd                  |    2 +-
 src/chrome/locale/ca/network-settings.dtd          |   27 ++++---
 src/chrome/locale/ca/progress.dtd                  |    2 +-
 src/chrome/locale/cs-CZ/network-settings.dtd       |   15 +++-
 src/chrome/locale/cs-CZ/progress.dtd               |    2 +-
 src/chrome/locale/cs/network-settings.dtd          |   19 +++--
 src/chrome/locale/cs/progress.dtd                  |    2 +-
 src/chrome/locale/csb/network-settings.dtd         |   15 +++-
 src/chrome/locale/csb/progress.dtd                 |    2 +-
 src/chrome/locale/cv/network-settings.dtd          |   15 +++-
 src/chrome/locale/cv/progress.dtd                  |    2 +-
 src/chrome/locale/cy/network-settings.dtd          |   15 +++-
 src/chrome/locale/cy/progress.dtd                  |    2 +-
 src/chrome/locale/da/network-settings.dtd          |   15 +++-
 src/chrome/locale/da/progress.dtd                  |    2 +-
 src/chrome/locale/de/network-settings.dtd          |   15 +++-
 src/chrome/locale/de/progress.dtd                  |    2 +-
 src/chrome/locale/dz/network-settings.dtd          |   15 +++-
 src/chrome/locale/dz/progress.dtd                  |    2 +-
 src/chrome/locale/el/network-settings.dtd          |   15 +++-
 src/chrome/locale/el/progress.dtd                  |    2 +-
 src/chrome/locale/en-GB/network-settings.dtd       |   15 +++-
 src/chrome/locale/en-GB/progress.dtd               |    2 +-
 src/chrome/locale/eo/network-settings.dtd          |   15 +++-
 src/chrome/locale/eo/progress.dtd                  |    2 +-
 src/chrome/locale/es-AR/network-settings.dtd       |   15 +++-
 src/chrome/locale/es-AR/progress.dtd               |    2 +-
 src/chrome/locale/es-CL/network-settings.dtd       |   15 +++-
 src/chrome/locale/es-CL/progress.dtd               |    2 +-
 src/chrome/locale/es-CO/network-settings.dtd       |   15 +++-
 src/chrome/locale/es-CO/progress.dtd               |    2 +-
 src/chrome/locale/es-MX/network-settings.dtd       |   15 +++-
 src/chrome/locale/es-MX/progress.dtd               |    2 +-
 src/chrome/locale/es/network-settings.dtd          |   19 +++--
 src/chrome/locale/es/progress.dtd                  |    2 +-
 src/chrome/locale/et/network-settings.dtd          |   15 +++-
 src/chrome/locale/et/progress.dtd                  |    2 +-
 src/chrome/locale/eu/network-settings.dtd          |   15 +++-
 src/chrome/locale/eu/progress.dtd                  |    2 +-
 src/chrome/locale/fa/network-settings.dtd          |   15 +++-
 src/chrome/locale/fa/progress.dtd                  |    2 +-
 src/chrome/locale/fi/network-settings.dtd          |   15 +++-
 src/chrome/locale/fi/progress.dtd                  |    2 +-
 src/chrome/locale/fil/network-settings.dtd         |   15 +++-
 src/chrome/locale/fil/progress.dtd                 |    2 +-
 src/chrome/locale/fo/network-settings.dtd          |   15 +++-
 src/chrome/locale/fo/progress.dtd                  |    2 +-
 src/chrome/locale/fr-CA/network-settings.dtd       |   17 ++--
 src/chrome/locale/fr-CA/progress.dtd               |    2 +-
 src/chrome/locale/fr/network-settings.dtd          |   15 +++-
 src/chrome/locale/fr/progress.dtd                  |    2 +-
 src/chrome/locale/fur/network-settings.dtd         |   15 +++-
 src/chrome/locale/fur/progress.dtd                 |    2 +-
 src/chrome/locale/fy/network-settings.dtd          |   15 +++-
 src/chrome/locale/fy/progress.dtd                  |    2 +-
 src/chrome/locale/ga/network-settings.dtd          |   15 +++-
 src/chrome/locale/ga/progress.dtd                  |    2 +-
 src/chrome/locale/gl/network-settings.dtd          |   15 +++-
 src/chrome/locale/gl/progress.dtd                  |    2 +-
 src/chrome/locale/gu-IN/network-settings.dtd       |   15 +++-
 src/chrome/locale/gu-IN/progress.dtd               |    2 +-
 src/chrome/locale/gu/network-settings.dtd          |   15 +++-
 src/chrome/locale/gu/progress.dtd                  |    2 +-
 src/chrome/locale/gun/network-settings.dtd         |   15 +++-
 src/chrome/locale/gun/progress.dtd                 |    2 +-
 src/chrome/locale/ha/network-settings.dtd          |   15 +++-
 src/chrome/locale/ha/progress.dtd                  |    2 +-
 src/chrome/locale/he/network-settings.dtd          |   15 +++-
 src/chrome/locale/he/progress.dtd                  |    2 +-
 src/chrome/locale/hi/network-settings.dtd          |   15 +++-
 src/chrome/locale/hi/progress.dtd                  |    2 +-
 src/chrome/locale/hr-HR/network-settings.dtd       |   15 +++-
 src/chrome/locale/hr-HR/progress.dtd               |    2 +-
 src/chrome/locale/hr/network-settings.dtd          |   15 +++-
 src/chrome/locale/hr/progress.dtd                  |    2 +-
 src/chrome/locale/ht/network-settings.dtd          |   15 +++-
 src/chrome/locale/ht/progress.dtd                  |    2 +-
 src/chrome/locale/hu/network-settings.dtd          |   15 +++-
 src/chrome/locale/hu/progress.dtd                  |    2 +-
 src/chrome/locale/hy-AM/network-settings.dtd       |   15 +++-
 src/chrome/locale/hy-AM/progress.dtd               |    2 +-
 src/chrome/locale/hy/network-settings.dtd          |   15 +++-
 src/chrome/locale/hy/progress.dtd                  |    2 +-
 src/chrome/locale/ia/network-settings.dtd          |   15 +++-
 src/chrome/locale/ia/progress.dtd                  |    2 +-
 src/chrome/locale/id/network-settings.dtd          |   15 +++-
 src/chrome/locale/id/progress.dtd                  |    4 +-
 src/chrome/locale/is/network-settings.dtd          |   51 ++++++------
 src/chrome/locale/is/progress.dtd                  |    2 +-
 src/chrome/locale/it/network-settings.dtd          |   15 +++-
 src/chrome/locale/it/progress.dtd                  |    2 +-
 src/chrome/locale/ja/network-settings.dtd          |   19 +++--
 src/chrome/locale/ja/progress.dtd                  |    2 +-
 src/chrome/locale/jv/network-settings.dtd          |   15 +++-
 src/chrome/locale/jv/progress.dtd                  |    2 +-
 src/chrome/locale/ka/network-settings.dtd          |   15 +++-
 src/chrome/locale/ka/progress.dtd                  |    2 +-
 src/chrome/locale/kk/network-settings.dtd          |   15 +++-
 src/chrome/locale/kk/progress.dtd                  |    2 +-
 src/chrome/locale/km/network-settings.dtd          |   15 +++-
 src/chrome/locale/km/progress.dtd                  |    2 +-
 src/chrome/locale/kn/network-settings.dtd          |   15 +++-
 src/chrome/locale/kn/progress.dtd                  |    2 +-
 src/chrome/locale/ko-KR/network-settings.dtd       |   15 +++-
 src/chrome/locale/ko-KR/progress.dtd               |    2 +-
 src/chrome/locale/ko/network-settings.dtd          |   23 ++++--
 src/chrome/locale/ko/progress.dtd                  |    2 +-
 src/chrome/locale/ku/network-settings.dtd          |   15 +++-
 src/chrome/locale/ku/progress.dtd                  |    2 +-
 src/chrome/locale/kw/network-settings.dtd          |   15 +++-
 src/chrome/locale/kw/progress.dtd                  |    2 +-
 src/chrome/locale/ky/network-settings.dtd          |   15 +++-
 src/chrome/locale/ky/progress.dtd                  |    2 +-
 src/chrome/locale/lb/network-settings.dtd          |   15 +++-
 src/chrome/locale/lb/progress.dtd                  |    2 +-
 src/chrome/locale/lg/network-settings.dtd          |   15 +++-
 src/chrome/locale/lg/progress.dtd                  |    2 +-
 src/chrome/locale/ln/network-settings.dtd          |   15 +++-
 src/chrome/locale/ln/progress.dtd                  |    2 +-
 src/chrome/locale/lo/network-settings.dtd          |   15 +++-
 src/chrome/locale/lo/progress.dtd                  |    2 +-
 src/chrome/locale/lt/network-settings.dtd          |   39 ++++++----
 src/chrome/locale/lt/progress.dtd                  |    2 +-
 src/chrome/locale/lv/network-settings.dtd          |   15 +++-
 src/chrome/locale/lv/progress.dtd                  |    2 +-
 src/chrome/locale/mg/network-settings.dtd          |   15 +++-
 src/chrome/locale/mg/progress.dtd                  |    2 +-
 src/chrome/locale/mi/network-settings.dtd          |   15 +++-
 src/chrome/locale/mi/progress.dtd                  |    2 +-
 src/chrome/locale/mk/network-settings.dtd          |   15 +++-
 src/chrome/locale/mk/progress.dtd                  |    2 +-
 src/chrome/locale/ml/network-settings.dtd          |   15 +++-
 src/chrome/locale/ml/progress.dtd                  |    2 +-
 src/chrome/locale/mn/network-settings.dtd          |   15 +++-
 src/chrome/locale/mn/progress.dtd                  |    2 +-
 src/chrome/locale/mr/network-settings.dtd          |   17 ++--
 src/chrome/locale/mr/progress.dtd                  |    2 +-
 src/chrome/locale/ms-MY/network-settings.dtd       |   15 +++-
 src/chrome/locale/ms-MY/progress.dtd               |    2 +-
 src/chrome/locale/mt/network-settings.dtd          |   15 +++-
 src/chrome/locale/mt/progress.dtd                  |    2 +-
 src/chrome/locale/my/network-settings.dtd          |   15 +++-
 src/chrome/locale/my/progress.dtd                  |    2 +-
 src/chrome/locale/nah/network-settings.dtd         |   15 +++-
 src/chrome/locale/nah/progress.dtd                 |    2 +-
 src/chrome/locale/nap/network-settings.dtd         |   15 +++-
 src/chrome/locale/nap/progress.dtd                 |    2 +-
 src/chrome/locale/nb/network-settings.dtd          |   17 ++--
 src/chrome/locale/nb/progress.dtd                  |    2 +-
 src/chrome/locale/nds/network-settings.dtd         |   15 +++-
 src/chrome/locale/nds/progress.dtd                 |    2 +-
 src/chrome/locale/ne/network-settings.dtd          |   15 +++-
 src/chrome/locale/ne/progress.dtd                  |    2 +-
 src/chrome/locale/nl-BE/network-settings.dtd       |   15 +++-
 src/chrome/locale/nl-BE/progress.dtd               |    2 +-
 src/chrome/locale/nl/network-settings.dtd          |   15 +++-
 src/chrome/locale/nl/progress.dtd                  |    2 +-
 src/chrome/locale/nn/network-settings.dtd          |   15 +++-
 src/chrome/locale/nn/progress.dtd                  |    2 +-
 src/chrome/locale/nso/network-settings.dtd         |   15 +++-
 src/chrome/locale/nso/progress.dtd                 |    2 +-
 src/chrome/locale/oc/network-settings.dtd          |   15 +++-
 src/chrome/locale/oc/progress.dtd                  |    2 +-
 src/chrome/locale/or/network-settings.dtd          |   15 +++-
 src/chrome/locale/or/progress.dtd                  |    2 +-
 src/chrome/locale/pa/network-settings.dtd          |   15 +++-
 src/chrome/locale/pa/progress.dtd                  |    2 +-
 src/chrome/locale/pap/network-settings.dtd         |   15 +++-
 src/chrome/locale/pap/progress.dtd                 |    2 +-
 src/chrome/locale/pl/network-settings.dtd          |   15 +++-
 src/chrome/locale/pl/progress.dtd                  |    2 +-
 src/chrome/locale/pms/network-settings.dtd         |   15 +++-
 src/chrome/locale/pms/progress.dtd                 |    2 +-
 src/chrome/locale/ps/network-settings.dtd          |   15 +++-
 src/chrome/locale/ps/progress.dtd                  |    2 +-
 src/chrome/locale/pt-BR/network-settings.dtd       |   21 +++--
 src/chrome/locale/pt-BR/progress.dtd               |    2 +-
 src/chrome/locale/pt-BR/torlauncher.properties     |    6 +-
 src/chrome/locale/pt/network-settings.dtd          |   15 +++-
 src/chrome/locale/pt/progress.dtd                  |    2 +-
 src/chrome/locale/ro/network-settings.dtd          |   15 +++-
 src/chrome/locale/ro/progress.dtd                  |    2 +-
 src/chrome/locale/ru/network-settings.dtd          |   15 +++-
 src/chrome/locale/ru/progress.dtd                  |    2 +-
 src/chrome/locale/ru@petr1708/network-settings.dtd |   15 +++-
 src/chrome/locale/ru@petr1708/progress.dtd         |    2 +-
 src/chrome/locale/sco/network-settings.dtd         |   15 +++-
 src/chrome/locale/sco/progress.dtd                 |    2 +-
 src/chrome/locale/si-LK/network-settings.dtd       |   15 +++-
 src/chrome/locale/si-LK/progress.dtd               |    2 +-
 src/chrome/locale/sk-SK/network-settings.dtd       |   15 +++-
 src/chrome/locale/sk-SK/progress.dtd               |    2 +-
 src/chrome/locale/sk/network-settings.dtd          |   17 ++--
 src/chrome/locale/sk/progress.dtd                  |    2 +-
 src/chrome/locale/sl-SI/network-settings.dtd       |   15 +++-
 src/chrome/locale/sl-SI/progress.dtd               |    2 +-
 src/chrome/locale/sl/network-settings.dtd          |   15 +++-
 src/chrome/locale/sl/progress.dtd                  |    2 +-
 src/chrome/locale/sn/network-settings.dtd          |   15 +++-
 src/chrome/locale/sn/progress.dtd                  |    2 +-
 src/chrome/locale/so/network-settings.dtd          |   15 +++-
 src/chrome/locale/so/progress.dtd                  |    2 +-
 src/chrome/locale/son/network-settings.dtd         |   15 +++-
 src/chrome/locale/son/progress.dtd                 |    2 +-
 src/chrome/locale/sq-AL/network-settings.dtd       |   15 +++-
 src/chrome/locale/sq-AL/progress.dtd               |    2 +-
 src/chrome/locale/sq/network-settings.dtd          |   15 +++-
 src/chrome/locale/sq/progress.dtd                  |    2 +-
 src/chrome/locale/sr/network-settings.dtd          |   15 +++-
 src/chrome/locale/sr/progress.dtd                  |    2 +-
 src/chrome/locale/sr@latin/network-settings.dtd    |   15 +++-
 src/chrome/locale/sr@latin/progress.dtd            |    2 +-
 src/chrome/locale/st/network-settings.dtd          |   15 +++-
 src/chrome/locale/st/progress.dtd                  |    2 +-
 src/chrome/locale/su/network-settings.dtd          |   15 +++-
 src/chrome/locale/su/progress.dtd                  |    2 +-
 src/chrome/locale/sv/network-settings.dtd          |   15 +++-
 src/chrome/locale/sv/progress.dtd                  |    2 +-
 src/chrome/locale/sw/network-settings.dtd          |   15 +++-
 src/chrome/locale/sw/progress.dtd                  |    2 +-
 src/chrome/locale/szl/network-settings.dtd         |   15 +++-
 src/chrome/locale/szl/progress.dtd                 |    2 +-
 src/chrome/locale/ta/network-settings.dtd          |   15 +++-
 src/chrome/locale/ta/progress.dtd                  |    2 +-
 src/chrome/locale/te-IN/network-settings.dtd       |   15 +++-
 src/chrome/locale/te-IN/progress.dtd               |    2 +-
 src/chrome/locale/te/network-settings.dtd          |   15 +++-
 src/chrome/locale/te/progress.dtd                  |    2 +-
 src/chrome/locale/tg/network-settings.dtd          |   15 +++-
 src/chrome/locale/tg/progress.dtd                  |    2 +-
 src/chrome/locale/th/network-settings.dtd          |   15 +++-
 src/chrome/locale/th/progress.dtd                  |    2 +-
 src/chrome/locale/ti/network-settings.dtd          |   15 +++-
 src/chrome/locale/ti/progress.dtd                  |    2 +-
 src/chrome/locale/tk/network-settings.dtd          |   15 +++-
 src/chrome/locale/tk/progress.dtd                  |    2 +-
 src/chrome/locale/tr/network-settings.dtd          |   29 ++++---
 src/chrome/locale/tr/progress.dtd                  |    2 +-
 src/chrome/locale/tr/torlauncher.properties        |    4 +-
 src/chrome/locale/uk/network-settings.dtd          |   15 +++-
 src/chrome/locale/uk/progress.dtd                  |    2 +-
 src/chrome/locale/ur-PK/network-settings.dtd       |   15 +++-
 src/chrome/locale/ur-PK/progress.dtd               |    3 +-
 src/chrome/locale/ur/network-settings.dtd          |   15 +++-
 src/chrome/locale/ur/progress.dtd                  |    2 +-
 src/chrome/locale/uz/network-settings.dtd          |   15 +++-
 src/chrome/locale/uz/progress.dtd                  |    2 +-
 src/chrome/locale/ve/network-settings.dtd          |   15 +++-
 src/chrome/locale/ve/progress.dtd                  |    2 +-
 src/chrome/locale/vi/network-settings.dtd          |   15 +++-
 src/chrome/locale/vi/progress.dtd                  |    2 +-
 src/chrome/locale/wa/network-settings.dtd          |   15 +++-
 src/chrome/locale/wa/progress.dtd                  |    2 +-
 src/chrome/locale/wo/network-settings.dtd          |   15 +++-
 src/chrome/locale/wo/progress.dtd                  |    2 +-
 src/chrome/locale/zh-CN/network-settings.dtd       |   15 +++-
 src/chrome/locale/zh-CN/progress.dtd               |    2 +-
 src/chrome/locale/zh-HK/network-settings.dtd       |   15 +++-
 src/chrome/locale/zh-HK/progress.dtd               |    2 +-
 src/chrome/locale/zh-TW/network-settings.dtd       |   81 +++++++++++---------
 src/chrome/locale/zh-TW/progress.dtd               |    2 +-
 src/chrome/locale/zh-TW/torlauncher.properties     |    4 +-
 src/chrome/locale/zu/network-settings.dtd          |   15 +++-
 src/chrome/locale/zu/progress.dtd                  |    2 +-
 299 files changed, 1877 insertions(+), 843 deletions(-)

diff --git a/src/chrome/locale/ach/network-settings.dtd b/src/chrome/locale/ach/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/ach/network-settings.dtd
+++ b/src/chrome/locale/ach/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ach/progress.dtd b/src/chrome/locale/ach/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/ach/progress.dtd
+++ b/src/chrome/locale/ach/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ady/network-settings.dtd b/src/chrome/locale/ady/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/ady/network-settings.dtd
+++ b/src/chrome/locale/ady/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ady/progress.dtd b/src/chrome/locale/ady/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/ady/progress.dtd
+++ b/src/chrome/locale/ady/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/af/network-settings.dtd b/src/chrome/locale/af/network-settings.dtd
index 4248631..93e2527 100644
--- a/src/chrome/locale/af/network-settings.dtd
+++ b/src/chrome/locale/af/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "As jy nie seker is hoe om hierdie vraag te beantwoord nie, kies Nee.&#160; As jy Ja kies, sal jy gevra word om Tor Bridges, wat ongenoteerde relays is wat die moeiliker maak om verbindings na die Tor Netwerk blok, in te stel.">
+<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Toegelate Poorte:">
 <!ENTITY torsettings.useBridges.checkbox "My Internet Diensverskaffer (IDV) blok konneksies na die Tor netwerk">
 <!ENTITY torsettings.useBridges.default "Connect with provided bridges">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#160; 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).">
diff --git a/src/chrome/locale/af/progress.dtd b/src/chrome/locale/af/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/af/progress.dtd
+++ b/src/chrome/locale/af/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ak/network-settings.dtd b/src/chrome/locale/ak/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/ak/network-settings.dtd
+++ b/src/chrome/locale/ak/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ak/progress.dtd b/src/chrome/locale/ak/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/ak/progress.dtd
+++ b/src/chrome/locale/ak/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/am-ET/network-settings.dtd b/src/chrome/locale/am-ET/network-settings.dtd
index fb9eb3c..23aae0a 100644
--- a/src/chrome/locale/am-ET/network-settings.dtd
+++ b/src/chrome/locale/am-ET/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/am-ET/progress.dtd b/src/chrome/locale/am-ET/progress.dtd
index a38a578..8ce4f0e 100644
--- a/src/chrome/locale/am-ET/progress.dtd
+++ b/src/chrome/locale/am-ET/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "á?¨á?¶á? á?á??á?³">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/am/network-settings.dtd b/src/chrome/locale/am/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/am/network-settings.dtd
+++ b/src/chrome/locale/am/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/am/progress.dtd b/src/chrome/locale/am/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/am/progress.dtd
+++ b/src/chrome/locale/am/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd
index a581606..9d42278 100644
--- a/src/chrome/locale/ar/network-settings.dtd
+++ b/src/chrome/locale/ar/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Ø£Ù? Ù?Ù?Ø§ Ù?Ù?Ù? Ù?Ø¹ØªØ¨Ø± Ù?ØµÙ? Ø§Ù?Ø¶Ù? Ù?Ù?Ù?Ù?Ù?Ù?Ø?">
 <!ENTITY torSettings.configurePrompt1 "Ø§ØªØµØ§Ù? Ù?Ø°Ø§ Ø§Ù?ØØ§Ø³Ø¨ Ø¨Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª Ù?ØØ¬Ù?Ø¨ Ø£Ù? Ù?Ù? Ø¨Ø±Ù?Ù?Ø³Ù?.">
-<!ENTITY torSettings.configurePrompt2 "Ø£ØØªØ§Ø¬ Ù?Ø¥Ø¹Ø¯Ø§Ø¯ Ø¬Ø³Ø± Ø£Ù? Ø¨Ø±Ù?Ù?Ø³Ù? Ù?ØÙ?Ù?.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "ØªÙ?Ù?Ù?Ù?">
-<!ENTITY torSettings.connectPrompt2 "Ø£Ù?Ø¯ Ø§Ù?Ø§ØªØµØ§Ù? Ù?Ø¨Ø§Ø´Ø±Ø© Ø¥Ù?Ù? Ø´Ø¨Ù?Ø© ØªÙ?Ø±.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Ø³Ù?ØµÙ?Ø Ù?Ø°Ø§ Ù?Ù? Ù?Ø¹Ø¸Ù? Ø§Ù?ØØ§Ù?Ø§Øª.">
 <!ENTITY torSettings.connect "Ø§ØªØµÙ?">
 
 <!ENTITY torSettings.proxyPageTitle "Ø¥Ø¹Ø¯Ø§Ø¯ Ø§Ù?Ø¨Ø±Ù?Ù?Ø³Ù? Ø§Ù?Ù?ØÙ?Ù?Ù?">
 <!ENTITY torSettings.proxyQuestion "Ù?Ù? Ù?ØØªØ§Ø¬ Ù?Ø°Ø§ Ø§Ù?Ù?Ù?Ø¨Ù?Ù?ØªØ± Ù?Ø§Ø³ØªØ®Ø¯Ø§Ù? Ù?Ù?Ù?Ù? Ù?ØÙ?Ù? Ù?Ù?Ø§ØªØµØ§Ù? Ø¨Ø§Ù?Ø¥Ù?ØªØ±Ù?ØªØ?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Ø¥Ø°Ø§ Ù?Ù?Øª ØºÙ?Ø± Ù?ØªØ£Ù?Ø¯ Ù?Ù? Ù?Ù?Ù?Ù?Ø© Ø§Ù?Ø¥Ø¬Ø§Ø¨Ø© Ø¹Ù?Ù? Ù?Ø°Ø§ Ø§Ù?Ø³Ø¤Ø§Ù?Ø? Ø£Ù?Ø¸Ø± Ø§Ù?Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª Ù?Ù? Ù?ØªØµÙ?Ø Ø¢Ø®Ø± Ù?Ù?Ø¹Ø±Ù?Ø© Ù?Ø§ Ø¥Ø°Ø§ ØªÙ?Øª ØªÙ?Ù?Ø¦ØªØ© Ù?Ø§Ø³ØªØ®Ø¯Ø§Ù? Ù?Ù?Ù?Ù? Ù?ØÙ?Ù?.">
+<!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 "Ø£Ø¯Ø®Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø¨Ø±Ù?Ù?Ø³Ù?.">
 <!ENTITY torSettings.bridgePageTitle "Ø¥Ø¹Ø¯Ø§Ø¯ Ø¬Ø³Ù?Ø± ØªÙ?Ø±.">
 <!ENTITY torSettings.bridgeQuestion "Ù?Ù? Ù?Ù?Ù?Ù? Ù?Ù?Ø¯Ù? Ø®Ø¯Ù?Ø© Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª (ISP) Ø§Ù?Ø°Ù? ØªØªØ¹Ø§Ù?Ù? Ù?Ø¹Ù? Ø¨ØØ¬Ø¨ Ø§Ù?Ø§ØªØµØ§Ù?Ø§Øª Ø¨Ø´Ø¨Ù?Ø© Tor Ø£Ù? Ù?Ø±Ø§Ù?Ø¨ØªÙ?Ø§ Ø¨Ø·Ø±Ù?Ù?Ø© Ø£Ø®Ø±Ù?Ø?">
-<!ENTITY torSettings.bridgeHelp "Ø¥Ø°Ø§ Ù?Ù? ØªÙ?Ù? Ù?ØªØ£Ù?Ø¯Ø§ Ù?Ù? Ø¥Ø¬Ø§Ø¨Ø© Ù?Ø°Ø§ Ø§Ù?Ø³Ø¤Ø§Ù?Ø? Ù?Ù? Ø¨Ø§Ø®ØªÙ?Ø§Ø± Ù?Ø§. &#160; Ø¥Ø°Ø§ Ù?Ù?Øª Ø¨Ø§Ø®ØªÙ?Ø§Ø± Ù?Ø¹Ù?Ø? Ù?Ø³Ù?Ø·Ù?Ø¨ Ù?Ù?Ù? ØªÙ?Ù?Ù?Ù? Ø¬Ø³Ù?Ø± Tor Ù?Ø§Ù?ØªÙ? Ù?Ù? Ù?Ù?Ø§Ù?Ø° ØªØ±ØÙ?Ù? ØºÙ?Ø± Ù?Ø¯Ø±Ø¬Ø© ØªØµØ¹Ø¨ Ø¹Ù?Ù?Ù?Ø© ØØ¸Ø± Ø§Ù?Ø§ØªØµØ§Ù?Ø§Øª Ø¨Ø´Ø¨Ù?Ø© 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 "Ù?Ù?Ù?Ù?Ù? Ø§Ø³ØªØ®Ø¯Ø§Ù? Ù?Ø¬Ù?Ù?Ø¹Ø© Ø§Ù?Ø¬Ø³Ù?Ø± Ø§Ù?Ù?ØªÙ?Ù?Ø±Ø© Ø£Ù? Ø§Ù?ØØµÙ?Ù? Ø¹Ù?Ù? Ù?Ø¬Ù?Ù?Ø¹Ø© Ù?Ø®ØµØµØ© Ù?Ù? Ø§Ù?Ø¬Ø³Ù?Ø±.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Ù?Ù? Ø§Ù?ØªØ¸Ø§Ø± ØªÙ?Ø± ØØªÙ? Ù?Ø¨Ø¯Ø¡ Ø¨Ø§Ù?Ø¹Ù?Ù?...">
 <!ENTITY torsettings.restartTor "Ø¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙ?Ù? ØªÙ?Ø±">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Ø§Ø®ØªÙ?Ø§Ø±Ù?">
 
@@ -50,6 +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.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "Ù?Ù?Ø¹ Ø§Ù?Ù?Ù?Ù?:">
 <!ENTITY torsettings.useBridges.custom "Ø¥Ø¯Ø®Ø§Ù? Ø¬Ø³Ù?Ø± Ù?Ø®ØµØµØ©">
 <!ENTITY torsettings.useBridges.label "Ø§Ø¯Ø®Ù? Ø¬Ø³Ø± Ø§Ù? Ø§Ù?Ø«Ø± (Ø¬Ø³Ø± Ù?Ø§ØØ¯ Ù?Ù? Ù?Ù? Ø³Ø·Ø±).">
diff --git a/src/chrome/locale/ar/progress.dtd b/src/chrome/locale/ar/progress.dtd
index 6f4907d..ef4cfb9 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 "Ø§Ù?Ø±Ø¬Ø§Ø¡ Ø§Ù?Ø§Ù?ØªØ¸Ø§Ø±Ø? Ù?ØªÙ? Ø§Ù?Ø§Ù? Ø¥Ù?Ø´Ø§Ø¡ Ø§ØªØµØ§Ù? Ø¨Ø´Ø¨Ù?Ø© ØªÙ?Ø±.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/arn/network-settings.dtd b/src/chrome/locale/arn/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/arn/network-settings.dtd
+++ b/src/chrome/locale/arn/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/arn/progress.dtd b/src/chrome/locale/arn/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/arn/progress.dtd
+++ b/src/chrome/locale/arn/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ast/network-settings.dtd b/src/chrome/locale/ast/network-settings.dtd
index fdbc39c..caa9d55 100644
--- a/src/chrome/locale/ast/network-settings.dtd
+++ b/src/chrome/locale/ast/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ast/progress.dtd b/src/chrome/locale/ast/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/ast/progress.dtd
+++ b/src/chrome/locale/ast/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/az/network-settings.dtd b/src/chrome/locale/az/network-settings.dtd
index cd8cbcb..eb34988 100644
--- a/src/chrome/locale/az/network-settings.dtd
+++ b/src/chrome/locale/az/network-settings.dtd
@@ -13,27 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "AÅ?aÄ?Ä±dakÄ±lardan hansÄ± sizin vÉ?ziyyÉ?tinizi tam tÉ?svir edir?">
 <!ENTITY torSettings.configurePrompt1 "Bu kompÃ¼terin internet Å?É?bÉ?kÉ?si senzorlu vÉ?ya proksilidir.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "QuraÅ?dÄ±r">
-<!ENTITY torSettings.connectPrompt2 "MÉ?n birbaÅ?a Tor Å?É?bÉ?kÉ?sinÉ? qoÅ?ulmaq istÉ?yirÉ?m.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Bu É?ksÉ?r hallarda iÅ?lÉ?yir.">
 <!ENTITY torSettings.connect "QoÅ?ul">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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 "Proksy parametrlÉ?rini daxil edin">
 <!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
 <!ENTITY torSettings.bridgeQuestion "Sizin internet provayderiniz(Ä°SP) Tor Å?É?bÉ?kÉ?sinÉ? hÉ?r-hansÄ± qadaÄ?a qoyub?">
-<!ENTITY torSettings.bridgeHelp "Æ?gÉ?r bu saula nÉ? cavab verÉ?cÉ?yinizi bilirsinizsÉ? Xeyr seÃ§in.No.&#160;
-Æ?gÉ?r bÉ?li seÃ§sÉ?niz, sizdÉ?n Tor kÃ¶rpÃ¼sÃ¼ quraÅ?dÄ±rmaÄ?Ä±nÄ±z tÉ?lÉ?b olunacaq,hansÄ± ki bunlar qeydÉ? alÄ±nmamÄ±Å?, qarÅ?Ä±sÄ±nÄ±n alÄ±nmasÄ± daha Ã§É?tin olan vasitÉ?lÉ?rdir.">
+<!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 "Siz tÉ?min olunmuÅ? kÃ¶rpÃ¼ dÉ?stindÉ?n istifadÉ? edÉ?, vÉ? ya Ã¶zÃ¼nÃ¼z Å?É?xsi kÃ¶rpÃ¼ dÉ?sti daxil edÉ? bilÉ?rsiz.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Torun aÃ§Ä±lmasÄ± Ã¼Ã§Ã¼n gÃ¶zlÉ?yin...">
 <!ENTITY torsettings.restartTor "Tor`u yenidÉ?n baÅ?lat">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Æ?lavÉ?">
 
@@ -51,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Ä°czaÉ? verilÉ?n portlar:">
 <!ENTITY torsettings.useBridges.checkbox "MÉ?nim Ä°nternet provayderim(Ä°SP) Tor Å?É?bÉ?kÉ?sinÉ? qoÅ?ulmaÄ?Ä± qadaÄ?an edir">
 <!ENTITY torsettings.useBridges.default "TÉ?min olunmuÅ? kÃ¶pÃ¼dÉ?n istifadÉ? et">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "NÉ?qliyyat tipi:">
 <!ENTITY torsettings.useBridges.custom "KÃ¶rpÃ¼ daxil edin">
 <!ENTITY torsettings.useBridges.label "Bir vÉ? ya daha Ã§ox KÃ¶rpÃ¼ qoÅ?qusu daxil edin (hÉ?r sÉ?tirÉ? ancaq bir dÉ?nÉ?)">
diff --git a/src/chrome/locale/az/progress.dtd b/src/chrome/locale/az/progress.dtd
index 473b050..31e6b48 100644
--- a/src/chrome/locale/az/progress.dtd
+++ b/src/chrome/locale/az/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Statusu">
 <!ENTITY torprogress.openSettings "ParametrlÉ?ri aÃ§">
 <!ENTITY torprogress.heading "Tor Å?É?bÉ?kÉ?sinÉ? qoÅ?ulur">
-<!ENTITY torprogress.pleaseWait "ZÉ?hmÉ?t olmasa biz Tor Å?É?bÉ?kÉ?sini quraÅ?diranadÉ?k gÃ¶zlÉ?yin.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/be/network-settings.dtd b/src/chrome/locale/be/network-settings.dtd
index fe05a5c..ad37df4 100644
--- a/src/chrome/locale/be/network-settings.dtd
+++ b/src/chrome/locale/be/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Ð¨Ñ?Ð¾ Ð· Ð¿Ñ?Ñ?Ð²ÐµÐ´Ð·ÐµÐ½Ð½Ð°Ð³Ð° Ð½Ñ?Ð¶Ñ?Ð¹ Ð»ÐµÐ¿Ñ? Ð°Ð¿Ñ?Ñ?Ð²Ð°Ðµ Ð²Ð°Ñ?Ñ? Ñ?Ñ?Ñ?Ñ?Ð°Ñ?Ñ?Ñ??">
 <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
-<!ENTITY torSettings.configurePrompt2 "Ð?Ð½Ðµ Ð¿Ð°Ñ?Ñ?Ñ?Ð±Ð½Ð° Ð½Ð°Ð»Ð°Ð´Ð·Ñ?Ñ?Ñ? Ð¼Ð¾Ñ?Ñ? Ñ?Ñ? Ð»Ð°ÐºÐ°Ð»Ñ?Ð½Ñ?Ñ? Ð½Ð°Ð»Ð°Ð´Ñ? Ð¿Ñ?Ð¾ÐºÑ?Ñ?-Ñ?ÐµÑ?Ð²ÐµÑ?Ð°">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Ð?Ð°Ð»Ð°Ð´Ð·Ñ?Ñ?Ñ?">
-<!ENTITY torSettings.connectPrompt2 "Ð¯ Ð±Ñ? Ñ?Ð°Ñ?ÐµÑ? Ð·Ð»Ñ?Ñ?Ñ?Ñ?Ñ?Ð° Ð· Ñ?ÐµÑ?ÐºÐ°Ð¹ Ð¢Ð¾Ñ? Ð½Ð°Ñ?Ð¿Ñ?Ð¾Ñ?Ñ?.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Ð?Ñ?Ñ?Ð° Ð±Ñ?Ð´Ð·Ðµ Ð¿Ñ?Ð°Ñ?Ð°Ð²Ð°Ñ?Ñ? Ñ? Ð±Ð¾Ð»Ñ?Ñ?Ð°Ñ?Ñ?Ñ? Ð²Ñ?Ð¿Ð°Ð´ÐºÐ°Ñ?.">
 <!ENTITY torSettings.connect "Ð?Ð»Ñ?Ñ?Ñ?Ð½Ð½Ðµ">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Ð¦Ñ? Ð¿Ð°Ñ?Ñ?Ð°Ð±Ñ?Ðµ Ð³Ñ?Ñ?Ñ? ÐºÐ°Ð¿Ñ?Ñ?Ð°Ñ? Ð²Ñ?ÐºÐ°Ñ?Ñ?Ñ?Ñ?Ð¾Ñ?Ð²Ð°Ð½Ð½Ñ? Ð»Ð°ÐºÐ°Ð»Ñ?Ð½Ð°Ð³Ð° Ð¿Ñ?Ð¾ÐºÑ?Ñ?-Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ð´Ð»Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð° Ñ? Ñ?Ð½Ñ?Ñ?Ñ?Ð½Ñ?Ñ??">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/be/progress.dtd b/src/chrome/locale/be/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/be/progress.dtd
+++ b/src/chrome/locale/be/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd
index 46165b8..94bd5f1 100644
--- a/src/chrome/locale/bg/network-settings.dtd
+++ b/src/chrome/locale/bg/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Ð?Ð¾Ðµ Ð¾Ñ? Ñ?Ð»ÐµÐ´Ð½Ð¸Ñ?Ðµ Ð¾Ð¿Ð¸Ñ?Ð²Ð° Ð½Ð°Ð¹-Ð´Ð¾Ð±Ñ?Ðµ Ð²Ð°Ñ?Ð°Ñ?Ð° Ñ?Ð¸Ñ?Ñ?Ð°Ñ?Ð¸Ñ??">
 <!ENTITY torSettings.configurePrompt1 "Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ð²Ñ?Ñ?Ð·ÐºÐ°Ñ?Ð° Ð½Ð° Ñ?Ð¾Ð·Ð¸ ÐºÐ¾Ð¼Ð¿Ñ?Ñ?Ñ?Ñ? Ðµ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð° Ð¸Ð»Ð¸ Ð¼Ð¸Ð½Ð°Ð²Ð° Ð¿Ñ?ÐµÐ· proxy Ñ?Ñ?Ñ?Ð²Ñ?Ñ?.">
-<!ENTITY torSettings.configurePrompt2 "Ð¢Ñ?Ñ?Ð±Ð²Ð° Ð´Ð° ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ð¼ bridge Ð¸Ð»Ð¸ proxy Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Ð?Ð¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ð¹">
-<!ENTITY torSettings.connectPrompt2 "Ð?Ð¸Ñ? Ð¸Ñ?ÐºÐ°Ð» Ð´Ð° Ñ?Ðµ Ñ?Ð²Ñ?Ñ?Ð¶Ð° Ð´Ð¸Ñ?ÐµÐºÑ?Ð½Ð¾ ÐºÑ?Ð¼ Tor Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Ð¢Ð¾Ð²Ð° Ñ?Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ð¸ Ð¿Ñ?Ð¸ Ð¿Ð¾Ð²ÐµÑ?ÐµÑ?Ð¾ Ñ?Ð¸Ñ?Ñ?Ð°Ñ?Ð¸Ð¸.">
 <!ENTITY torSettings.connect "Ð¡Ð²Ñ?Ñ?Ð¶Ð¸ Ñ?Ðµ">
 
 <!ENTITY torSettings.proxyPageTitle "Ð?Ð¾ÐºÐ°Ð»Ð½Ð¸ Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸">
 <!ENTITY torSettings.proxyQuestion "Ð¢Ð¾Ð·Ð¸ ÐºÐ¾Ð¼Ð¿Ñ?Ñ?Ñ?Ñ? Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð° Ð»Ð¸ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð·Ð° Ð´Ð¾Ñ?Ñ?Ñ?Ð¿ Ð´Ð¾ Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ??">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Ð?ÐºÐ¾ Ð½Ðµ Ñ?Ñ?Ðµ Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¸ ÐºÐ°Ðº Ð´Ð° Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ?Ð¸Ñ?Ðµ Ð½Ð° Ñ?Ð¾Ð·Ð¸ Ð²Ñ?Ð¿Ñ?Ð¾Ñ? Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐµÑ?Ðµ Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸Ñ?Ðµ Ð½Ð° Ð´Ñ?Ñ?Ð³ Ð±Ñ?Ð°Ñ?Ð·Ñ?Ñ?,Ð·Ð° Ð´Ð° Ð²Ð¸Ð´Ð¸Ñ?Ðµ Ð´Ð°Ð»Ð¸ Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾ÐµÐ½ Ð´Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð° Ð¿Ñ?Ð¾ÐºÑ?Ð¸.">
+<!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 "Ð?Ñ?Ð²ÐµÐ´ÐµÑ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸Ñ?Ðµ Ð·Ð° Ð¿Ñ?Ð¾ÐºÑ?Ð¸.">
 <!ENTITY torSettings.bridgePageTitle "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð½Ð° Ð¢Ð¾Ñ? Ð±Ñ?Ð¸Ð´Ð¶Ð¾Ð²Ðµ">
 <!ENTITY torSettings.bridgeQuestion "Ð?Ð»Ð¾ÐºÐ¸Ñ?Ð°Ð½Ð¸ Ð¸Ð»Ð¸ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð¸ Ð»Ð¸ Ñ?Ð° Ð²Ñ?Ñ?Ð·ÐºÐ¸Ñ?Ðµ ÐºÑ?Ð¼ Tor Ð?Ñ?ÐµÐ¶Ð°Ñ?Ð° Ð¾Ñ? Ð²Ð°Ñ?Ð¸Ñ?Ñ? Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ð?Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð¸Ðº(ISP)?">
-<!ENTITY torSettings.bridgeHelp "Ð?ÐºÐ¾ Ð½Ðµ Ñ?Ñ?Ðµ Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¸ ÐºÐ°Ðº Ð´Ð° Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ?Ð¸Ñ?Ðµ Ð½Ð° Ñ?Ð¾Ð·Ð¸ Ð²Ñ?Ð¿Ñ?Ð¾Ñ?, Ð¸Ð·Ð±ÐµÑ?ÐµÑ?Ðµ No.&#160; Ð?ÐºÐ¾ Ð¸Ð·Ð±ÐµÑ?ÐµÑ?Ðµ Yes, Ð²Ð¸Ðµ Ñ?Ðµ Ð±Ñ?Ð´ÐµÑ?Ðµ Ð¿Ð¾Ð¼Ð¾Ð»ÐµÐ½ Ð´Ð° ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Tor Bridges, Ð½ÐµÐ¿Ñ?Ð±Ð»Ð¸ÐºÑ?Ð²Ð°Ð½Ð¸ relays ÐºÐ¾Ð¸Ñ?Ð¾ Ð¿Ñ?Ð°Ð²Ñ?Ñ? Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð²Ñ?Ñ?Ð·ÐºÐ°Ñ?Ð° ÐºÑ?Ð¼ 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 "Ð?Ð¸Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ?Ðµ Ð¿Ñ?ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ?Ðµ ÐºÐ¾Ð¼Ð¿Ð»ÐµÐºÑ?Ð¸ Ð¾Ñ? bridges Ð¸Ð»Ð¸ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¸Ð·Ð¸Ñ?ÐºÐ²Ð°Ñ?Ðµ Ð¿ÐµÑ?Ñ?Ð¾Ð½Ð°Ð»Ð¸Ð·Ð¸Ñ?Ð°Ð½ ÐºÐ¾Ð¼Ð¿Ð»ÐµÐºÑ? Ð¾Ñ? Ñ?Ñ?Ñ?.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Ð?Ð·Ñ?Ð°ÐºÐ²Ð°Ð½Ðµ Ð½Ð° Tor Ð´Ð° Ñ?Ñ?Ð°Ñ?Ñ?Ð¸Ñ?Ð°...">
 <!ENTITY torsettings.restartTor "Ð ÐµÑ?Ñ?Ð°Ñ?Ñ?Ð¸Ñ?Ð°Ð¹Ñ?Ðµ Ð¢Ð¾Ñ?">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Ð?Ð¾Ð¿Ñ?Ð»Ð½Ð¸Ñ?ÐµÐ»ÐµÐ½">
 
@@ -50,6 +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.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "Ð¢Ð¸Ð¿ Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ:">
 <!ENTITY torsettings.useBridges.custom "Ð?Ñ?Ð²ÐµÐ´Ð¸ Ð¿ÐµÑ?Ñ?Ð¾Ð½Ð°Ð»Ð½Ð¸ bridges">
 <!ENTITY torsettings.useBridges.label "Ð?Ñ?Ð²ÐµÐ´Ð¸ ÐµÐ´Ð¸Ð½ Ð¸Ð»Ð¸ Ð¿Ð¾Ð²ÐµÑ?Ðµ bridge relays (Ð¿Ð¾ ÐµÐ´Ð¸Ð½ Ð½Ð° Ð»Ð¸Ð½Ð¸Ñ?).">
diff --git a/src/chrome/locale/bg/progress.dtd b/src/chrome/locale/bg/progress.dtd
index 45a5ee3..1c89f2e 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 "Ð?Ð¾Ð»Ñ? Ð¸Ð·Ñ?Ð°ÐºÐ°Ð¹Ñ?Ðµ,Ð´Ð¾ÐºÐ°Ñ?Ð¾ Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ð¼ Ð²Ñ?Ñ?Ð·ÐºÐ° Ñ? Ð¢Ð¾Ñ? Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/bn-BD/network-settings.dtd b/src/chrome/locale/bn-BD/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/bn-BD/network-settings.dtd
+++ b/src/chrome/locale/bn-BD/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/bn-BD/progress.dtd b/src/chrome/locale/bn-BD/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/bn-BD/progress.dtd
+++ b/src/chrome/locale/bn-BD/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/bn-IN/network-settings.dtd b/src/chrome/locale/bn-IN/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/bn-IN/network-settings.dtd
+++ b/src/chrome/locale/bn-IN/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/bn-IN/progress.dtd b/src/chrome/locale/bn-IN/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/bn-IN/progress.dtd
+++ b/src/chrome/locale/bn-IN/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/bn/network-settings.dtd b/src/chrome/locale/bn/network-settings.dtd
index 8f2f987..2c55dd3 100644
--- a/src/chrome/locale/bn/network-settings.dtd
+++ b/src/chrome/locale/bn/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "à¦¸à¦?à¦¯à§?à¦? à¦?à¦°à§?à¦¨">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/bn/progress.dtd b/src/chrome/locale/bn/progress.dtd
index e324946..9819d83 100644
--- a/src/chrome/locale/bn/progress.dtd
+++ b/src/chrome/locale/bn/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "à¦?à¦° à¦?à¦¬à¦¸à§?à¦¥à¦¾">
 <!ENTITY torprogress.openSettings "à¦¸à§?à¦?à¦¿à¦?à¦¸ à¦?à§?à¦²à§?à¦¨">
 <!ENTITY torprogress.heading "à¦?à¦° à¦¨à§?à¦?à¦?à¦¯à¦¼à¦¾à¦°à§?à¦?à§?à¦° à¦¸à¦¾à¦¥à§? à¦¸à¦?à¦¯à§?à¦?à§?à¦¤ à¦¹à¦?à§?à¦?à§?">
-<!ENTITY torprogress.pleaseWait "à¦?à¦®à¦°à¦¾ à¦?à¦° à¦¨à§?à¦?à¦?à¦¯à¦¼à¦¾à¦°à§?à¦?à§?à¦° à¦¸à¦¾à¦¥à§? à¦¸à¦?à¦¯à§?à¦? à¦¸à§?à¦¥à¦¾à¦ªà¦¨ à¦?à¦°à¦¾à¦° à¦¸à¦®à¦¯à¦¼ à¦?à¦¨à§?à¦?à§?à¦°à¦¹ à¦?à¦°à§? à¦?à¦ªà§?à¦?à§?à¦·à¦¾ à¦?à¦°à§?à¦¨à¥¤">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/bo/network-settings.dtd b/src/chrome/locale/bo/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/bo/network-settings.dtd
+++ b/src/chrome/locale/bo/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/bo/progress.dtd b/src/chrome/locale/bo/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/bo/progress.dtd
+++ b/src/chrome/locale/bo/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/br/network-settings.dtd b/src/chrome/locale/br/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/br/network-settings.dtd
+++ b/src/chrome/locale/br/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/br/progress.dtd b/src/chrome/locale/br/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/br/progress.dtd
+++ b/src/chrome/locale/br/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/bs/network-settings.dtd b/src/chrome/locale/bs/network-settings.dtd
index 3750fd2..cd1efa7 100644
--- a/src/chrome/locale/bs/network-settings.dtd
+++ b/src/chrome/locale/bs/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/bs/progress.dtd b/src/chrome/locale/bs/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/bs/progress.dtd
+++ b/src/chrome/locale/bs/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd
index 78253a0..e344598 100644
--- a/src/chrome/locale/ca/network-settings.dtd
+++ b/src/chrome/locale/ca/network-settings.dtd
@@ -1,38 +1,44 @@
-<!ENTITY torsettings.dialog.title "ConfiguraciÃ³ de la Tor Network">
+<!ENTITY torsettings.dialog.title "ConfiguraciÃ³ de la xarxa Tor">
 
 <!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+<!ENTITY torlauncher.localePicker.title "Llengua del navegador Tor">
+<!ENTITY torlauncher.localePicker.prompt "SelÂ·leccioneu una llengua">
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "Abans de connectar-te a la xarxa Thor, necessites introduir informaciÃ³ sobre el ordinador que fas servir per la connexiÃ³ a internet.">
+<!ENTITY torsettings.prompt "Abans de connectar-vos a la xarxa Tor, heu d'introduir informaciÃ³ sobre la connexiÃ³ a internet de l'ordinador que feu servir. ">
 
 <!ENTITY torSettings.yes "SÃ">
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Quina de les segÃ¼uens descriula teva situaciÃ³?">
 <!ENTITY torSettings.configurePrompt1 "La connexiÃ³ a internet d'aquest ordinador estÃ  censurada o configurada amb un proxy. ">
-<!ENTITY torSettings.configurePrompt2 "He de configurar preferÃ¨ncies de ponts o de proxy local.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configura">
-<!ENTITY torSettings.connectPrompt2 "M'agradaria conectar-me directament a la xarxa Tor.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "AixÃ² funciona en la majoria dels casos.">
 <!ENTITY torSettings.connect "Conectar">
 
-<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
+<!ENTITY torSettings.proxyPageTitle "ConfiguraciÃ³ del servidor intermediari local">
 <!ENTITY torSettings.proxyQuestion "Aquest ordinador ha de fer servir un proxy local per accedir a internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Si no esteu segurs de com  respondre aquesta pregunta, mireu les preferÃ¨ncies d'internet d'un altre navegador per veure si estÃ  configurat per usar un proxy local. ">
+<!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 "Introdueix les opcions del proxy.">
-<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
+<!ENTITY torSettings.bridgePageTitle "ConfiguraciÃ³ dels ponts Tor">
 <!ENTITY torSettings.bridgeQuestion "El vostre proveÃ¯dor d'Internet (ISP) bloqueja o censura les connexions a la Xarxa Tor?">
-<!ENTITY torSettings.bridgeHelp "Si no esteu segurs de com respondre a aquesta pregunta, escolliu  No.&#160; Si escolliu SÃ, se us demanarÃ  que configureu Ponts Tor, que sÃ³n relÃ©s no llistats que fan mÃ©s dificil de bloquejar les connexions a la Xarxa 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 "Hauries d'utilitzar el set de repetidors provist o customitzar el teu propi.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Esperant a Tor per comenÃ§ar...">
 <!ENTITY torsettings.restartTor "Reinicia Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Opcional
 ">
@@ -51,6 +57,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Ports permesos:">
 <!ENTITY torsettings.useBridges.checkbox "El meu proveidor d'internet (ISP) bloqueja les conexions a la xarxa Tor">
 <!ENTITY torsettings.useBridges.default "Connectar amb els repetidors porvistos.">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "Tipus de transport:">
 <!ENTITY torsettings.useBridges.custom "Entra als repetidors customitzats.">
 <!ENTITY torsettings.useBridges.label "Entra en un o mÃ©s repetidors (un per linia).">
diff --git a/src/chrome/locale/ca/progress.dtd b/src/chrome/locale/ca/progress.dtd
index cb62f1b..331193c 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 "Si us plau, espereu mentre establim una connexiÃ³ a la xarxa Tor.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/cs-CZ/network-settings.dtd b/src/chrome/locale/cs-CZ/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/cs-CZ/network-settings.dtd
+++ b/src/chrome/locale/cs-CZ/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/cs-CZ/progress.dtd b/src/chrome/locale/cs-CZ/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/cs-CZ/progress.dtd
+++ b/src/chrome/locale/cs-CZ/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd
index 4829311..b08348b 100644
--- a/src/chrome/locale/cs/network-settings.dtd
+++ b/src/chrome/locale/cs/network-settings.dtd
@@ -1,8 +1,8 @@
 <!ENTITY torsettings.dialog.title "SÃÅ¥ovÃ© nastavenÃ TORu">
 
 <!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+<!ENTITY torlauncher.localePicker.title "Jazyk Tor ProhlÃÅ¾eÄ?e">
+<!ENTITY torlauncher.localePicker.prompt "ProsÃm zvolte jazyk.">
 
 <!-- For "first run" wizard: -->
 
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "KterÃ¡ moÅ¾nost nejlÃ©pe popisuje VaÅ¡i situaci?">
 <!ENTITY torSettings.configurePrompt1 "PÅ?ipojenÃ k internetu u tohoto poÅ?ÃtaÄ?e je cenzorovÃ¡no nebo proxovÃ¡no.">
-<!ENTITY torSettings.configurePrompt2 "PotÅ?ebuji nastavit most, nebo lokÃ¡lnÃ nastavenÃ proxy.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Konfigurovat">
-<!ENTITY torSettings.connectPrompt2 "ChtÄ?l bych se pÅ?Ãmo pÅ?ipojit k Tor sÃti.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Toto bude fungovat ve vÄ?tÅ¡inÄ? pÅ?ÃpadÅ¯.">
 <!ENTITY torSettings.connect "PÅ?ipojit">
 
 <!ENTITY torSettings.proxyPageTitle "Konfigurace mÃstnÃ proxy">
 <!ENTITY torSettings.proxyQuestion "PotÅ?ebuje tento poÄ?ÃtaÄ? zapnutÃ lokÃ¡lnÃ proxy, aby se pÅ?ipojil k internetu?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Pokud nevÃte, jak odpovÄ?dÄ?t, podÃvejte se na nastavenÃ sÃtÄ? Internet v jinÃ©m prohlÃÅ¾eÄ?i, abyste zjistili, zda je nakonfigurovÃ¡n k pouÅ¾ÃvÃ¡nÃ proxy.">
+<!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 "Zadejte nastavenÃ serveru proxy.">
 <!ENTITY torSettings.bridgePageTitle "Konfigurace Tor pÅ?emostÄ?nÃ">
 <!ENTITY torSettings.bridgeQuestion "Blokuje nebo jinak cenzuruje vÃ¡Å¡ poskytovatel internetovÃ©ho pÅ?ipojenÃ (ISP) spojenÃ se sÃtÃ TORu?">
-<!ENTITY torSettings.bridgeHelp "Pokud si nejste jistÃ jak odpovÄ?dÄ?t na tuto otÃ¡zku, zvolte No.&#160; Pokud vyberete Ano, budete vyzvÃ¡ni k nastavenÃ MostÅ¯ TORu, coÅ¾ jsou pÅ?enaÅ¡eÄ?e neuvedenÃ© v seznamu, kterÃ© dÄ?lajÃ blokovÃ¡nÃ spojenÃ se sÃtÃ TORu sloÅ¾itÄ?jÅ¡Ã.">
+<!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 "MÅ¯Å¾ete pouÅ¾Ãt poskytnutou sadu sÃÅ¥ovÃ½ch mostÅ¯ nebo mÅ¯Å¾ete zÃskat a zadat vlastnÃ sadu.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Ä?ekÃ¡nÃ na start TORu">
 <!ENTITY torsettings.restartTor "Restartovat Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "VolitelnÃ½">
 
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "PovolenÃ© porty:">
 <!ENTITY torsettings.useBridges.checkbox "MÅ¯j internetovÃ½ poskytovatel (ISP) blokuje pÅ?ipojenÃ k Tor sÃti">
 <!ENTITY torsettings.useBridges.default "PÅ?ipojit pomocÃ poskytnutÃ© sady mostÅ¯">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "Typ pÅ?enosu:">
 <!ENTITY torsettings.useBridges.custom "Zadejete vlastnÃ mosty">
 <!ENTITY torsettings.useBridges.label "Zadejte jedno nebo vÃce mostnÃch relÃ© (jedno na Å?Ã¡dek).">
diff --git a/src/chrome/locale/cs/progress.dtd b/src/chrome/locale/cs/progress.dtd
index c953214..e91a01f 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 "ProsÃm vyÄ?kejte neÅ¾ bude sestaveno pÅ?ipojenÃ k sÃti Tor.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/csb/network-settings.dtd b/src/chrome/locale/csb/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/csb/network-settings.dtd
+++ b/src/chrome/locale/csb/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/csb/progress.dtd b/src/chrome/locale/csb/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/csb/progress.dtd
+++ b/src/chrome/locale/csb/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/cv/network-settings.dtd b/src/chrome/locale/cv/network-settings.dtd
index 866ddd6..f3d44b5 100644
--- a/src/chrome/locale/cv/network-settings.dtd
+++ b/src/chrome/locale/cv/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Ã?Ñ?Ñ?Ä?Ð½Ñ?Ð°Ñ?">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/cv/progress.dtd b/src/chrome/locale/cv/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/cv/progress.dtd
+++ b/src/chrome/locale/cv/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/cy/network-settings.dtd b/src/chrome/locale/cy/network-settings.dtd
index 7dfcd46..e743cc1 100644
--- a/src/chrome/locale/cy/network-settings.dtd
+++ b/src/chrome/locale/cy/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Pa un o'r canlynol sy'n disgrifio'ch sefyllfa orau?">
 <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Ffurfweddu">
-<!ENTITY torSettings.connectPrompt2 "Hoffwn gysylltu'n uniongyrchol Ã¢ rhwydwaith Tor.">
+<!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 "Cysylltu">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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 "Rhowch osodiadau'r dirprwy.">
 <!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Yn aros am Tor i gychwynâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Dewisiol">
 
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Pyrth a ganiateir:">
 <!ENTITY torsettings.useBridges.checkbox "Mae fy Narparydd Gwasanaeth Rhyngrwyd (ISP) yn atal cysylltiadau Ã¢ rhwydwaith Tor">
 <!ENTITY torsettings.useBridges.default "Connect with provided bridges">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#160; 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).">
diff --git a/src/chrome/locale/cy/progress.dtd b/src/chrome/locale/cy/progress.dtd
index 507d1c6..c4f29d7 100644
--- a/src/chrome/locale/cy/progress.dtd
+++ b/src/chrome/locale/cy/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Statws Tor">
 <!ENTITY torprogress.openSettings "Agor Gosodiadau">
 <!ENTITY torprogress.heading "Yn cysylltu Ã¢ rhwydwaith Tor">
-<!ENTITY torprogress.pleaseWait "Arhoswch tra ein bod yn cysylltu Ã¢ rhwydwaith Tor.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd
index a59c8d6..f8f4c0f 100644
--- a/src/chrome/locale/da/network-settings.dtd
+++ b/src/chrome/locale/da/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Hvilke af de fÃ¸lgende beskriver bedst din situation?">
 <!ENTITY torSettings.configurePrompt1 "Denne computers internetforbindelse er censureret eller er etableret gennem en proxy.">
-<!ENTITY torSettings.configurePrompt2 "Jeg har brug for at konfigurere bro eller lokale proxy indstillinger.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Indstil">
-<!ENTITY torSettings.connectPrompt2 "Jeg vil forbinde direkte til Tor netvÃ¦rket.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Dette vil virker i de fleste situationer">
 <!ENTITY torSettings.connect "Tilslut">
 
 <!ENTITY torSettings.proxyPageTitle "Lokale proxy indstillinger">
 <!ENTITY torSettings.proxyQuestion "BehÃ¸ver denne computer bruge en lokal proxy for at tilgÃ¥ Internettet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Hvis du ikke er sikker pÃ¥ svaret pÃ¥ dette spÃ¸rgsmÃ¥l, sÃ¥ kig pÃ¥ Internetindstillingerne i en anden browser for at se om den er konfigureret til at bruge en lokal proxy. ">
+<!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 "Indtast proxy-indstillinger.">
 <!ENTITY torSettings.bridgePageTitle "Tor bridge konfiguration">
 <!ENTITY torSettings.bridgeQuestion "Blokerer eller censurerer din internetudbyder (ISP) forbindelser til Tor netvÃ¦rket?">
-<!ENTITY torSettings.bridgeHelp "Hvis du er usikker pÃ¥ svaret til dette spÃ¸rgsmÃ¥l, vÃ¦lg No.&#160; Hvis du vÃ¦lger Ja, vil du blive bedt om at konfigurere Tor Broer, der er ulistede relays, som gÃ¸r det svÃ¦rere at blokere forbindelser til Tor NetvÃ¦rket.">
+<!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 "Du kan bruge det tildelte sÃ¦t broer eller du kan hente og indtaste et skrÃ¦ddersyet sÃ¦t broer.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Venter pÃ¥ at Tor starter...">
 <!ENTITY torsettings.restartTor "Genstart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Valgfri">
 
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Tilladte Porte:">
 <!ENTITY torsettings.useBridges.checkbox "Min udbyder (ISP) blokerer forbindelse til Tor netvÃ¦rket">
 <!ENTITY torsettings.useBridges.default "Forbind med tildelte broer">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "Transport type:">
 <!ENTITY torsettings.useBridges.custom "Indtast skrÃ¦ddersyede broer">
 <!ENTITY torsettings.useBridges.label "Indtast et eller flere bro-relÃ¦er (et per linie)">
diff --git a/src/chrome/locale/da/progress.dtd b/src/chrome/locale/da/progress.dtd
index 7e3f342..2a8a41a 100644
--- a/src/chrome/locale/da/progress.dtd
+++ b/src/chrome/locale/da/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Ã?ben Indstillinger">
 <!ENTITY torprogress.heading "Forbinder til Tor netvÃ¦rket">
-<!ENTITY torprogress.pleaseWait "Vent venligst imens vi etablerer en forbindelse til Tor netvÃ¦rket.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd
index cf394a3..ef926d5 100644
--- a/src/chrome/locale/de/network-settings.dtd
+++ b/src/chrome/locale/de/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Was beschreibt Ihre Situation am besten?">
 <!ENTITY torSettings.configurePrompt1 "Die Internetverbindung dieses Rechner ist zensiert oder vermittelt.">
-<!ENTITY torSettings.configurePrompt2 "Ich muss Bridge- oder lokale Proxy-Einstellungen konfigurieren">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Konfigurieren">
-<!ENTITY torSettings.connectPrompt2 "Ich wÃ¼rde gerne direkt eine Verbindung zum Tor-Netzwerk herstellen.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Das wird in den meisten Situationen funktionieren.">
 <!ENTITY torSettings.connect "Verbinden">
 
 <!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.proxyHelp "Wenn Sie unsicher sind, schauen Sie in den Interneteinstellungen in einem andern Browser nach, um zu sehen ob ein lokaler Proxy konfiguriert ist.">
+<!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 "Proxy-Einstellungen eingeben.">
 <!ENTITY torSettings.bridgePageTitle "TorbrÃ¼cken-Konfiguration">
 <!ENTITY torSettings.bridgeQuestion "Blockiert oder zensiert Ihr Internetdienstanbieter (ISP) Verbindungen zum Tor-Netzwerk?">
-<!ENTITY torSettings.bridgeHelp "Wenn Sie sich nicht sicher sind, wie Sie diese Frage beantworten sollen, wÃ¤hlen Sie Nr.&#160; Wenn Sie Ja wÃ¤hlen, werden Sie aufgefordert, die TorbrÃ¼cken zu konfigurieren. Die nicht aufgefÃ¼hrte Relais sind, was es schwieriger macht, Verbindungen zum Tor-Netzwerk zu blockieren.">
+<!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 "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: -->
 
 <!ENTITY torsettings.startingTor "Auf den Start von Tor wird gewartet â?¦">
 <!ENTITY torsettings.restartTor "Tor neu starten">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +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.&#160; If one bridge does not work, try again using a different one.">
 <!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).">
diff --git a/src/chrome/locale/de/progress.dtd b/src/chrome/locale/de/progress.dtd
index 9433d6f..d087f69 100644
--- a/src/chrome/locale/de/progress.dtd
+++ b/src/chrome/locale/de/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor-Status">
 <!ENTITY torprogress.openSettings "Einstellungen Ã¶ffnen">
 <!ENTITY torprogress.heading "Verbindung mit dem Tor-Netzwerk wird hergestellt">
-<!ENTITY torprogress.pleaseWait "Bitte warten Sie, wÃ¤hrend eine Verbindung zum Tor-Netzwerk hergestellt wird">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/dz/network-settings.dtd b/src/chrome/locale/dz/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/dz/network-settings.dtd
+++ b/src/chrome/locale/dz/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/dz/progress.dtd b/src/chrome/locale/dz/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/dz/progress.dtd
+++ b/src/chrome/locale/dz/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd
index 371b8c5..d776892 100644
--- a/src/chrome/locale/el/network-settings.dtd
+++ b/src/chrome/locale/el/network-settings.dtd
@@ -13,27 +13,33 @@
 
 <!ENTITY torSettings.firstQuestion "Î Î¿Î¹Î¿ Î±Ï?Ï? Ï?Î± Ï?Î±Ï?Î±ÎºÎ¬Ï?Ï? Ï?ÎµÏ?Î¹Î³Ï?Î¬Ï?ÎµÎ¹ ÎºÎ±Î»Ï?Ï?ÎµÏ?Î± Ï?Î·Î½ ÎºÎ±Ï?Î¬Ï?Ï?Î±Ï?Î® Ï?Î±Ï?;">
 <!ENTITY torSettings.configurePrompt1 "Î£Ï?Î½Î´ÎµÏ?Î· Ï?Ï?Î¿ Internet Î±Ï?Ï?Î¿Ï? Ï?Î¿Ï? Ï?Ï?Î¿Î»Î¿Î³Î¹Ï?Ï?Î® Î»Î¿Î³Î¿ÎºÏ?Î¯Î½ÎµÏ?Î±Î¹ Î® Ï?Ï?Î¿Ï?ÎµÎ³Î³Î¯Î¶ÎµÏ?Î±Î¹">
-<!ENTITY torSettings.configurePrompt2 "Î§Ï?ÎµÎ¹Î¬Î¶Î¿Î¼Î±Î¹ Î½Î± Ï?Ï?Î¸Î¼Î¯Ï?Ï? Ï?Î·Î½ Î³ÎÏ?Ï?Ï?Î± Î® Ï?Î¹Ï? Ï?Î¿Ï?Î¹ÎºÎÏ? Ï?Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? proxy">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Î¡Ï?Î¸Î¼Î¹Ï?Î· ">
-<!ENTITY torSettings.connectPrompt2 "Î?Î± Î®Î¸ÎµÎ»Î± Î½Î± Ï?Ï?Î½Î´ÎµÎ¸ÎµÎ¯ Î¬Î¼ÎµÏ?Î± Î¼Îµ Ï?Î¿ Î´Î¯ÎºÏ?Ï?Î¿ Tor.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!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.proxyHelp "Î?Î½ Î´ÎµÎ½ ÎµÎ¯Ï?Ï?Îµ Ï?Î¯Î³Î¿Ï?Ï?Î¿Î¹ Ï?Ï?Ï? Î½Î± Î±Ï?Î±Î½Ï?Î®Ï?ÎµÏ?Îµ Ï?Îµ Î±Ï?Ï?Î®Î½ Ï?Î·Î½ ÎµÏ?Ï?Ï?Î·Ï?Î·, ÎºÎ¿Î¹Ï?Î¬Î¾Ï?Îµ Ï?Î¹Ï? Ï?Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Ï?Î¿Ï? Internet Ï?Îµ ÎºÎ¬Ï?Î¿Î¹Î¿ Î¬Î»Î»Î¿ Ï?Ï?Ï?Î³Ï?Î±Î¼Î¼Î± Ï?ÎµÏ?Î¹Î®Î³Î·Ï?Î·Ï? Î³Î¹Î± Î½Î± Î´ÎµÎ¯Ï?Îµ Î±Î½ ÎÏ?ÎµÎ¹ Ï?Ï?Î¸Î¼Î¹Ï?Ï?ÎµÎ¯ Î½Î± Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹ÎµÎ¯ ÎÎ½Î± Ï?Î¿Ï?Î¹ÎºÏ? proxy.">
+<!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 "Î?Î¹Ï?Î¬Î³Ï?Î³Î· Ï?Ï?Î½ Ï?Ï?Î¸Î¼Î¯Ï?ÎµÏ?Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹Ï?Ï?Î® Î¼ÎµÏ?Î¿Î»Î¬Î²Î·Ï?Î·Ï?.">
 <!ENTITY torSettings.bridgePageTitle "Î?Î¹Î±Î¼Ï?Ï?Ï?Ï?Ï?Î· Î?ÎµÏ?Ï?Ï?Ï?Î½ Tor">
 <!ENTITY torSettings.bridgeQuestion "Î?Î½Ï?Ï?Î¯Î¶ÎµÏ?Îµ Î±Î½ Î¿ Ï?Î¬Ï?Î¿Ï?Î¿Ï? (ISP) Ï?Î±Ï? Î¼Ï?Î»Î¿ÎºÎ¬Ï?ÎµÎ¹ Î® Î¼Îµ Î¿Ï?Î¿Î¹Î¿Î´Î®Ï?Î¿Ï?Îµ Ï?Ï?Ï?Ï?Î¿ ÎµÎ»ÎÎ³Ï?ÎµÎ¹ Ï?Ï?Î½Î´ÎÏ?ÎµÎ¹Ï?
 Ï?Ï?Î¿ Î´Î¯ÎºÏ?Ï?Î¿ Tor?">
-<!ENTITY torSettings.bridgeHelp "Î?Î½ Î´Îµ Î¾ÎÏ?ÎµÏ?Îµ Ï?Ï?Ï? Î½Î± Î±Ï?Î±Î½Ï?Î®Ï?ÎµÏ?Îµ ÎµÎ´Ï?, ÎµÏ?Î¹Î»ÎÎ¾Ï?Îµ &quot;Î?Ï?Î¹&quot;.&#160; Î?Î½ ÎµÏ?Î¹Î»ÎÎ¾ÎµÏ?Îµ &quot;Î?Î±Î¹&quot;, Î¸Î± Ï?Î±Ï? Î¶Î·Ï?Î®Ï?Ï? Î½Î± Ï?Ï?Î¸Î¼Î¯Ï?ÎµÏ?Îµ Î³ÎÏ?Ï?Ï?ÎµÏ? Tor, Ï?Î¿Ï? ÎµÎ¯Î½Î±Î¹ Î¼Î· ÎµÏ?Ï?ÎÏ?Ï? Î³Î½Ï?Ï?Ï?Î¬ ÎºÎ±Î½Î¬Î»Î¹Î± ÎµÎ¹Ï?Ï?Î´Î¿Ï? Ï?Ï?Î¿ Î´Î¯ÎºÏ?Ï?Î¿ Tor, Ï?Î¿Ï? Î´Ï?Ï?ÎºÎ¿Î»ÎµÏ?Î¿Ï?Î½ Ï?Ï?Î¿Ï?Ï? Ï?Ï?Î¿Ï?Ï?Î±Î¸Î¿Ï?Î½ Î½Î± Î¼Ï?Î»Î¿ÎºÎ¬Ï?Î¿Ï?Î½ Ï?Î¹Ï? Ï?Ï?Î½Î´ÎÏ?ÎµÎ¹Ï? Ï?Ï?Î¿ Î´Î¯ÎºÏ?Ï?Î¿ 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 "Î?Ï?Î¿Ï?ÎµÎ¯Ï?Îµ Î½Î± Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹Î®Ï?ÎµÏ?Îµ Ï?Î¹Ï? Ï?Ï?Î¿ÎºÎ±Î¸Î¿Ï?Î¹Ï?Î¼ÎÎ½ÎµÏ? Î³ÎÏ?Ï?Ï?ÎµÏ?, Î® Î½Î± Î±Ï?Î¿ÎºÏ?Î®Ï?ÎµÏ?Îµ ÎºÎ±Î¹ ÎµÎ¹Ï?Î¬Î³ÎµÏ?Îµ Î½ÎÎµÏ? Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?ÎµÎ¹Ï? Î³ÎµÏ?Ï?Ï?Ï?Î½.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Î?Î½Î±Î¼Î¿Î½Î® Î³Î¹Î± Î½Î± Î¾ÎµÎºÎ¹Î½Î®Ï?ÎµÎ¹ Ï?Î¿ Tor... ">
 <!ENTITY torsettings.restartTor "EÏ?Î±Î½ÎµÎºÎºÎ¯Î½Î·Ï?Î· Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Î Ï?Î¿ÎµÏ?Î±Î¹Ï?Î¹ÎºÎ±">
 
@@ -51,6 +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.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "Î¤Ï?Ï?Î¿Ï? Î¼ÎµÏ?Î±Ï?Î¿Ï?Î¬Ï?:">
 <!ENTITY torsettings.useBridges.custom "Î?Î¹Ï?Î±Î³Ï?Î³Î® Î¬Î»Î»Ï?Î½ Î³ÎµÏ?Ï?Ï?Ï?Î½">
 <!ENTITY torsettings.useBridges.label "Î?Î¹Ï?Î¬Î³ÎµÏ?Îµ Î¼Î¹Î± Î® Ï?ÎµÏ?Î¹Ï?Ï?Ï?Ï?ÎµÏ?ÎµÏ? Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?ÎµÎ¹Ï? Î³ÎµÏ?Ï?Ï?Ï?Î½ (Î¼Î¯Î± Î±Î½Î¬ Î³Ï?Î±Î¼Î¼Î®).">
diff --git a/src/chrome/locale/el/progress.dtd b/src/chrome/locale/el/progress.dtd
index 70b8fc5..9f96b8d 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 "Î Î±Ï?Î±ÎºÎ±Î»Ï? Ï?ÎµÏ?Î¹Î¼ÎÎ½ÎµÏ?Îµ ÎµÎ½Ï? Î´Î·Î¼Î¹Î¿Ï?Ï?Î³Î¿Ï?Î¼Îµ Î¼Î¹Î± Ï?Ï?Î½Î´ÎµÏ?Î· Î¼Îµ Ï?Î¿ Î´Î¯ÎºÏ?Ï?Î¿ Tor.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/en-GB/network-settings.dtd b/src/chrome/locale/en-GB/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/en-GB/network-settings.dtd
+++ b/src/chrome/locale/en-GB/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/en-GB/progress.dtd b/src/chrome/locale/en-GB/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/en-GB/progress.dtd
+++ b/src/chrome/locale/en-GB/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/eo/network-settings.dtd b/src/chrome/locale/eo/network-settings.dtd
index 263ade0..89f752b 100644
--- a/src/chrome/locale/eo/network-settings.dtd
+++ b/src/chrome/locale/eo/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!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 "Konekti">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restartigi Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/eo/progress.dtd b/src/chrome/locale/eo/progress.dtd
index 9fc2f3b..c03f16a 100644
--- a/src/chrome/locale/eo/progress.dtd
+++ b/src/chrome/locale/eo/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Stato de Tor">
 <!ENTITY torprogress.openSettings "Malfermi agordojn">
 <!ENTITY torprogress.heading "Konektante al Tor-reto">
-<!ENTITY torprogress.pleaseWait "Bonvolu atendi Ä?is kiam ni ne starigos konekton al la Tor-reto.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd
index 2c3f300..9dd4ef3 100644
--- a/src/chrome/locale/es-AR/network-settings.dtd
+++ b/src/chrome/locale/es-AR/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configurar">
-<!ENTITY torSettings.connectPrompt2 "Me gustarÃa conectar directamente a la red Tor.">
+<!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.">
 <!ENTITY torSettings.connect "Conectar">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Reiniciar Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Opcional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/es-AR/progress.dtd b/src/chrome/locale/es-AR/progress.dtd
index 10a52dd..f8029aa 100644
--- a/src/chrome/locale/es-AR/progress.dtd
+++ b/src/chrome/locale/es-AR/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Estado de Tor">
 <!ENTITY torprogress.openSettings "Abrir Configuraciones">
 <!ENTITY torprogress.heading "Conectando a la red Tor">
-<!ENTITY torprogress.pleaseWait "Por favor, espere mientras establecemos una conexiÃ³n a la red Tor.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/es-CL/network-settings.dtd b/src/chrome/locale/es-CL/network-settings.dtd
index c3b8e6e..b6cd80c 100644
--- a/src/chrome/locale/es-CL/network-settings.dtd
+++ b/src/chrome/locale/es-CL/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/es-CL/progress.dtd b/src/chrome/locale/es-CL/progress.dtd
index 73f1bbf..87e2523 100644
--- a/src/chrome/locale/es-CL/progress.dtd
+++ b/src/chrome/locale/es-CL/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Estado Del Modulo Tor">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Conectando a la red Tor">
-<!ENTITY torprogress.pleaseWait "Por favor espere mientras establecemos una conexiÃ³n a la red Tor.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/es-CO/network-settings.dtd b/src/chrome/locale/es-CO/network-settings.dtd
index b630a4a..8ec90ba 100644
--- a/src/chrome/locale/es-CO/network-settings.dtd
+++ b/src/chrome/locale/es-CO/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/es-CO/progress.dtd b/src/chrome/locale/es-CO/progress.dtd
index a5ee7b4..f59998a 100644
--- a/src/chrome/locale/es-CO/progress.dtd
+++ b/src/chrome/locale/es-CO/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Estado de Tor">
 <!ENTITY torprogress.openSettings "Configuraciones abiertas">
 <!ENTITY torprogress.heading "Conectando a la red de Tor">
-<!ENTITY torprogress.pleaseWait "Por favor espere mientras establecemos una coneccion a la red de Tor">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/es-MX/network-settings.dtd b/src/chrome/locale/es-MX/network-settings.dtd
index 0c7dbb6..0d8f71d 100644
--- a/src/chrome/locale/es-MX/network-settings.dtd
+++ b/src/chrome/locale/es-MX/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!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 "Conectar">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Reiniciar Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/es-MX/progress.dtd b/src/chrome/locale/es-MX/progress.dtd
index 614ad59..d1d6bb5 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 "Porfavor espere mientras establecemos una conexiÃ³n con la red Tor">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd
index 64547c1..13b8c28 100644
--- a/src/chrome/locale/es/network-settings.dtd
+++ b/src/chrome/locale/es/network-settings.dtd
@@ -13,33 +13,39 @@
 
 <!ENTITY torSettings.firstQuestion "Â¿CuÃ¡l de las siguientes opciones describe mejor su situaciÃ³n?">
 <!ENTITY torSettings.configurePrompt1 "La conexiÃ³n a Internet de este equipo estÃ¡ censurada o proxificada.">
-<!ENTITY torSettings.configurePrompt2 "Necesito ajustar la configuraciÃ³n del repetidor puente(bridge) o del proxy local.">
+<!ENTITY torSettings.configurePrompt2 "Necesito configurar bridge o los ajustes del proxy local antes de conectar a la red Tor. ">
 <!ENTITY torSettings.configure "Configurar">
-<!ENTITY torSettings.connectPrompt2 "Me gustarÃa conectarme directamente a la red Tor.">
+<!ENTITY torSettings.connectPrompt2 "Quisiera hacer una conexiÃ³n directa a la red Tor.">
 <!ENTITY torSettings.connectPrompt3 "Esto funcionarÃ¡ en la mayorÃa de las situaciones.">
 <!ENTITY torSettings.connect "Conectar">
 
 <!ENTITY torSettings.proxyPageTitle "ConfiguraciÃ³n del proxy local">
 <!ENTITY torSettings.proxyQuestion "Â¿Necesita mi computadora utilizar un proxy local para acceder a Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Si no estÃ¡ seguro de cÃ³mo responder a esta pregunta, mire la configuraciÃ³n de Internet en otro navegador para ver si estÃ¡ configurado para utilizar un proxy (interpuesto) local.">
+<!ENTITY torSettings.proxyExplanation1 "En la mayorÃa de los casos no se requiere un proxy (interpuesto) local, pero puede ser necesario al realizar una conexiÃ³n a travÃ©s de una red de empresa, de escuela, o universitaria. ">
+<!ENTITY torSettings.proxyExplanation2 "Si no estÃ¡ seguro de cÃ³mo responder a esta pregunta, mire la configuraciÃ³n de Internet en otro navegador o compruebe la configuraciÃ³n de red de su sistema para ver si un proxy local es necesario.">
 <!ENTITY torSettings.enterProxy "Introduzca los ajustes del proxy.">
 <!ENTITY torSettings.bridgePageTitle "ConfiguraciÃ³n de puentes Tor">
 <!ENTITY torSettings.bridgeQuestion "Su proveedor de servicios de Internet (ISP) bloquea o censura de alguna forma las conexiones hacia la red Tor?">
-<!ENTITY torSettings.bridgeHelp "Si no estÃ¡ seguro de como responder a esta pregunta, elija No.&#160; Si usted elige SÃ, se le pedirÃ¡ configurar puentes Tor, los cuales son repetidores no listados que hacen mÃ¡s difÃcil el bloqueo de las conexiones hacia la red Tor.">
+<!ENTITY torSettings.bridgeExplanation1 "Si no estÃ¡ seguro de cÃ³mo responder a esta pregunta, elija No (si no puede conectarse a la red Tor sin un puente (bridge), puede aÃ±adir uno mÃ¡s adelante).">
+<!ENTITY torSettings.bridgeExplanation2 "Si elige SÃ, se le pedirÃ¡ que configure los puentes (bridges) de Tor, que son repetidores no listados que dificultan el bloqueo de conexiones hacia la red Tor.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Puede utilizar el conjunto de repetidores puente (bridge) proporcionado, o puede obtener e introducir un juego de puentes personalizado.">
 
 <!-- Other: -->
 
-<!ENTITY torsettings.startingTor "Esperando a que Tor arranque...">
+<!ENTITY torsettings.startingTor "Esperando a que Tor se inicie...">
 <!ENTITY torsettings.restartTor "Reiniciar Tor">
+<!ENTITY torsettings.reconfigTor "Configurar de nuevo">
+
+<!ENTITY torsettings.discardSettings.prompt "Ha configurado los puentes (bridges) de Tor o ha introducido los ajustes para proxy (interpuesto) local.&#160; Para realizar una conexiÃ³n directa a la red Tor, estos ajustes deben ser borrados.">
+<!ENTITY torsettings.discardSettings.proceed "Eliminar ajustes y conectar">
 
 <!ENTITY torsettings.optional "Opcional">
 
 <!ENTITY torsettings.useProxy.checkbox "Esta computadora necesita utilizar un proxy local para acceder a Internet">
 <!ENTITY torsettings.useProxy.type "Tipo de proxy:">
 <!ENTITY torsettings.useProxy.address "DirecciÃ³n:">
-<!ENTITY torsettings.useProxy.address.placeholder "DirecciÃ³n IP o nombre de mÃ¡quina ('hostname')">
+<!ENTITY torsettings.useProxy.address.placeholder "DirecciÃ³n IP o nombre de mÃ¡quina (host)">
 <!ENTITY torsettings.useProxy.port "Puerto:">
 <!ENTITY torsettings.useProxy.username "Nombre de usuario:">
 <!ENTITY torsettings.useProxy.password "ContraseÃ±a:">
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Puertos permitidos:">
 <!ENTITY torsettings.useBridges.checkbox "Mi Proveedor de Servicios de Internet (ISP) bloquea las conexiones a la red Tor">
 <!ENTITY torsettings.useBridges.default "Conectar con los puentes proporcionados">
+<!ENTITY torsettings.useBridges.note "Cada tipo de puente (bridge) usa un mÃ©todo diferente para evitar la censura.&#160; Si un repetidor puente no funciona, intÃ©ntelo de nuevo utilizando otro distinto.">
 <!ENTITY torsettings.useBridges.type "Tipo de transporte:">
 <!ENTITY torsettings.useBridges.custom "Introducir puentes personalizados">
 <!ENTITY torsettings.useBridges.label "Introduzca uno o mÃ¡s repetidores puente(uno por lÃnea).">
diff --git a/src/chrome/locale/es/progress.dtd b/src/chrome/locale/es/progress.dtd
index 1d3683d..a8703de 100644
--- a/src/chrome/locale/es/progress.dtd
+++ b/src/chrome/locale/es/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Estado de Tor">
 <!ENTITY torprogress.openSettings "Abrir Preferencias">
 <!ENTITY torprogress.heading "Conectando con la red de Tor">
-<!ENTITY torprogress.pleaseWait "Espere mientras se establece una conexiÃ³n con la red de Tor.">
+<!ENTITY torprogress.pleaseWait "Por favor, espere a que establezcamos una conexiÃ³n a la red Tor.&#160; Esto puede llevar varios minutos.">
diff --git a/src/chrome/locale/et/network-settings.dtd b/src/chrome/locale/et/network-settings.dtd
index b5db33d..d4e4c14 100644
--- a/src/chrome/locale/et/network-settings.dtd
+++ b/src/chrome/locale/et/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/et/progress.dtd b/src/chrome/locale/et/progress.dtd
index 2d50f46..6b93dff 100644
--- a/src/chrome/locale/et/progress.dtd
+++ b/src/chrome/locale/et/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tori staatus">
 <!ENTITY torprogress.openSettings "Ava seaded">
 <!ENTITY torprogress.heading "Tor vÃµrgustikuga Ã¼hendumine">
-<!ENTITY torprogress.pleaseWait "Palun oota, kuna Ã¼hendus Tor vÃµrgustikuga on saavutatud.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd
index 6190d66..e034658 100644
--- a/src/chrome/locale/eu/network-settings.dtd
+++ b/src/chrome/locale/eu/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Hurrengoetako zeinek deskribatzen du zure egoera hobekien?">
 <!ENTITY torSettings.configurePrompt1 "Ordenagailu honen Interneteko konexioa zentsuratuta dago edo proxy batetik igarotzen da.">
-<!ENTITY torSettings.configurePrompt2 "Zubi edo proxy lokalaren ezarpenak konfiguratu behar ditut.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Konfiguratu">
-<!ENTITY torSettings.connectPrompt2 "Tor sarera zuzenean konektatu nahiko nuke.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Hau egoera gehienetan funtzionatuko du.">
 <!ENTITY torSettings.connect "Konektatu">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Ordenagailu honek Internetera sartzeko proxy lokalen bat erabili behar al du?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Galdera hau nola erantzuteaz zalantzan bazaude, begiratu beste nabigatzaile batean Interneteko ezarpenak proxy lokal bat erabiltzeko konfiguratuta dagoen ikusteko.">
+<!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 "Sartu proxy ezarpenak.">
 <!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
 <!ENTITY torSettings.bridgeQuestion "Zure Interneteko Zerbitzu Hornitzaileak (ISP ingeleraz) Tor sarera doazen konexioak blokeatu edo zentsuratu egiten ditu?">
-<!ENTITY torSettings.bridgeHelp "Galdera hau nola erantzuteaz ziur ez bazaude, aukeratu Ez.&#160; Bai aukeratzen baduzu, Tor zubiak konfigura ditzazun eskatuko zaizu, hau da zerrendatuta ez dauden eta Tor sarera doazen konexioak blokeatzea zailago egiten duten erreleak.">
+<!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 "Emandako zubi taldea erabili dezakezu edo zubi talde pertsonalizatua eskuratu eta sar dezakezu.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Tor abiarazi dadin itxaroten...">
 <!ENTITY torsettings.restartTor "Tor berrabiarazi">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Hautazkoa">
 
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Baimendutako atakak:">
 <!ENTITY torsettings.useBridges.checkbox "Nire Internet Zerbitzu Hornitzaileak (ISP ingeleraz) Tor sarera konektatzea blokeatzen dit.">
 <!ENTITY torsettings.useBridges.default "Emandako zubiekin konektatu">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "Garraio mota:">
 <!ENTITY torsettings.useBridges.custom "Sartu zubi pertsonalizatuak">
 <!ENTITY torsettings.useBridges.label "Sartu zubi errele bat edo gehiago (bat lerro bakoitzeko).">
diff --git a/src/chrome/locale/eu/progress.dtd b/src/chrome/locale/eu/progress.dtd
index 3e9f084..caa9a98 100644
--- a/src/chrome/locale/eu/progress.dtd
+++ b/src/chrome/locale/eu/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor egoera">
 <!ENTITY torprogress.openSettings "Ezarpenak ireki">
 <!ENTITY torprogress.heading "Tor sarera konektatzen">
-<!ENTITY torprogress.pleaseWait "Mesedez itxaron Tor-sarera konexioa ezartzen dugun bitartean.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd
index b7d2076..3a95731 100644
--- a/src/chrome/locale/fa/network-settings.dtd
+++ b/src/chrome/locale/fa/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Ú©Ø¯Ø§Ù? Û?Ú© Ø§Ø² Ù?Ù?Ø§Ø±Ø¯ Ø²Û?Ø± Ù?Ø¶Ø¹Û?Øª Ø´Ù?Ø§ Ø±Ø§ Ø¨Ù?ØªØ± Ø¨Û?Ø§Ù? Ù?Û?â??Ú©Ù?Ø¯Ø?">
 <!ENTITY torSettings.configurePrompt1 "Ø§ØªØµØ§Ù? Ø¨Ù? Ø§Û?Ù?ØªØ±Ù?Øª Ø§Û?Ù? Ú©Ø§Ù?Ù¾Û?Ù?ØªØ± Û?Ø§ Ù?Û?Ù?ØªØ±Û?Ù?Ú¯ Ø´Ø¯Û?Ø¯ Ø¯Ø§Ø±Ø¯ Ù? Û?Ø§ Ù¾Ø±Ø§Ú©Ø³Û? Ø¯Ø§Ø±Ø¯.">
-<!ENTITY torSettings.configurePrompt2 "Ù?Ù? Ù?Û?Ø§Ø² Ø¨Ù? Ù¾Û?Ú©Ø±Ø¨Ù?Ø¯Û? Ù¾Ù? Ù? Û?Ø§ ØªÙ?Ø¸Û?Ù?Ø§Øª Ù¾Ø±Ù?Ú©Ø³Û? Ù?ØÙ?Û? Ø¯Ø§Ø±Ù?.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Ù¾Û?Ú©Ø±Ø¨Ù?Ø¯Û?">
-<!ENTITY torSettings.connectPrompt2 "ØªÙ?Ø§Û?Ù? Ø¯Ø§Ø±Ù? Ù?Ø³ØªÙ?Û?Ù?Ø§ Ø¨Ù? Ø´Ø¨Ú©Ù?â??Û? ØªÙ?Ø± Ù?ØªØµÙ? Ø´Ù?Ù?.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Ø§Û?Ù? Ø¯Ø± Ø¨Û?Ø´ØªØ± Ù?Ù?Ø§Ù?Ø¹ Ú©Ø§Ø± Ø®Ù?Ø§Ù?Ø¯ Ú©Ø±Ø¯.">
 <!ENTITY torSettings.connect "Ø§ØªØµØ§Ù?">
 
 <!ENTITY torSettings.proxyPageTitle "Ù¾Û?Ú©Ø±Ø¨Ù?Ø¯Û? Ù¾Ø±Ø§Ú©Ø³Û? Ù?ØÙ?Û?">
 <!ENTITY torSettings.proxyQuestion "Ø¢Û?Ø§ Ø§Û?Ù? Ú©Ø§Ù?Ù¾Û?Ù?ØªØ± Ù?Û?Ø§Ø² Ø¨Ù? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø§Ø² Û?Ú© Ù¾Ø±Ù?Ú©Ø³Û? Ù?ØÙ?Û? Ø¨Ø±Ø§Û? Ø¯Ø³ØªØ±Ø³Û? Ø¨Ù? Ø§Û?Ù?ØªØ±Ù?Øª Ø¯Ø§Ø±Ø¯Ø?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Ø§Ú¯Ø± Ø´Ù?Ø§ Ù?Ø·Ù?Ø¦Ù? Ù?Û?Ø³ØªÛ?Ø¯ Ú©Ù? Ú?Ú¯Ù?Ù?Ù? Ø¨Ù? Ø§Û?Ù? Ø³Ù?Ø§Ù? Ù¾Ø§Ø³Ø® Ø¯Ù?Û?Ø¯Ø? Ø¨Ù? ØªÙ?Ø¸Û?Ù?Ø§Øª Ø³Ø§Û?Ø± Ù?Ø±Ù?Ø±Ú¯Ø±Ù?Ø§Û? Ø®Ù?Ø¯ Ù?Ú¯Ø§Ù?Û? Ø¨Û?Ø§Ù?Ø¯Ø§Ø²Û?Ø¯ ØªØ§ Ù?ØªÙ?Ø¬Ù? Ø´Ù?Û?Ø¯ Ú©Ù? Ø¢Û?Ø§ Ø¨Ø§Û?Ø¯ Û?Ú© Ù¾Ø±Ù?Ú©Ø³Û? Ù?ØÙ?Û? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø´Ù?Ø¯Ø?">
+<!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 "ØªÙ?Ø¸Û?Ù?Ø§Øª Ù¾Ø±Ø§Ú©Ø³Û? Ø±Ø§ Ù?Ø§Ø±Ø¯ Ú©Ù?Û?Ø¯.">
 <!ENTITY torSettings.bridgePageTitle "Ù¾Û?Ú©Ø±Ø¨Ù?Ø¯Û? Ù¾Ù? ØªÙ?Ø±">
 <!ENTITY torSettings.bridgeQuestion "Ø¢Û?Ø§ Ø´Ø±Ú©ØªÛ? Ú©Ù? Ø§Ø² Ø¢Ù? Ø§Û?Ù?ØªØ±Ù?Øª Ú¯Ø±Ù?ØªÙ? Ø§Û?Ø¯ (ISP)Ø? Ø¯Ø³ØªØ±Ø³Û? Ø¨Ù? Ø´Ø¨Ú©Ù? ØªÙ?Ø± Ø±Ø§ Ù?Û?Ù?ØªØ±Ø? Ø³Ø§Ù?Ø³Ù?Ø± Ù? Û?Ø§ Ù?Ø³Ø¯Ù?Ø¯ Ù?Û? Ú©Ù?Ø¯Ø?">
-<!ENTITY torSettings.bridgeHelp "Ø§Ú¯Ø± Ù?Ø·Ù?Ø¦Ù? Ù?Û?Ø³ØªÛ?Ø¯ Ú?Ø·Ù?Ø± Ø¨Ù? Ø§Û?Ù? Ø³Ù?Ø§Ù? Ù¾Ø§Ø³Ø® Ø¯Ù?Û?Ø¯Ø? Â«Ù?Ù?Â» Û?Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯.&#160; Ø§Ú¯Ø± Â«Ø¨Ù?Ù?Â» Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯Ø? Ù?Û? Ø¨Ø§Û?Ø³Øª ØªÙ?Ø¸Û?Ù?Ø§Øª Ù?Ø±Ø¨Ù?Ø· Ø¨Ù? Â«Ù¾Ù? Ù?Ø§Û?Â» ØªÙ?Ø± Ø±Ø§ Ø§Ù?Ø¬Ø§Ù? Ø¯Ù?Û?Ø¯. Ù¾Ù? Ù?Ø§ Ù?Ø³Û?Ø±Ù?Ø§Û? Ø¯Ù?Ø± Ø²Ø¯Ù? Ù?Û?Ù?ØªØ± Ù?Ø³ØªÙ?Ø¯ Ú©Ù? Ù?Û?Ø³Øª Ù?Ø´Ø®ØµÛ? Ø§Ø² Ø¢Ù? Ù?Ø§ Ù?Ø¬Ù?Ø¯ Ù?Ø¯Ø§Ø±Ø¯ Ù? Ù?Û?Ù?ØªØ± Ú©Ø±Ø¯Ù? Ø¢Ù? Ù?Ø§ Ø¨Ø³Û?Ø§Ø± Ù?Ø´Ú©Ù? Ø§Ø³Øª.">
+<!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 "Ø´Ù?Ø§ Ù?Û?â??ØªÙ?Ø§Ù?Û?Ø¯ Ø§Ø² Ù?Ø¬Ù?Ù?Ø¹Ù?â??Ø§Û? Ø§Ø² Ù¾Ù?â??Ù?Ø§Û? Ø¢Ù?Ø§Ø¯Ù? Ù? Û?Ø§ Ù¾Ù?â??Ù?Ø§Û? Ø´Ø®ØµÛ? Ø®Ù?Ø¯ØªØ§Ù? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ù?Û?Ø¯.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Ø¯Ø± Ø§Ù?ØªØ¸Ø§Ø± Ø¢ØºØ§Ø² Ø¨Ù? Ú©Ø§Ø± ØªÙ?Ø±...">
 <!ENTITY torsettings.restartTor "ØªÙ?Ø± Ø±Ø§ Ø¯Ù?Ø¨Ø§Ø±Ù? Ø´Ù?Ø±Ù?Ø¹ Ú©Ù?Û?Ø¯.">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Ø§Ø®ØªÛ?Ø§Ø±Û?">
 
@@ -50,6 +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.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "Ù?Ù?Ø¹ Ø§Ù?ØªÙ?Ø§Ù?:">
 <!ENTITY torsettings.useBridges.custom "Ù¾Ù?â??Ù?Ø§Û? Ø´Ø®ØµÛ? Ø±Ø§ Ù?Ø§Ø±Ø¯ Ú©Ù?Û?Ø¯">
 <!ENTITY torsettings.useBridges.label "Û?Ú© Û?Ø§ Ú?Ù?Ø¯ Ù¾Ù? Ø§Ø±ØªØ¨Ø§Ø·Û? Ø±Ø§ Ù?Ø§Ø±Ø¯ Ù?Ù?Ø§Û?Û?Ø¯. (Ø¯Ø± Ù?Ø± Ø®Ø· Û?Ú©Û?)">
diff --git a/src/chrome/locale/fa/progress.dtd b/src/chrome/locale/fa/progress.dtd
index 5f8eee1..5efcd93 100644
--- a/src/chrome/locale/fa/progress.dtd
+++ b/src/chrome/locale/fa/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Ù?Ø¶Ø¹Û?Øª ØªÙ?Ø±">
 <!ENTITY torprogress.openSettings "ØªÙ?Ø¸Û?Ù?Ø§Øªâ??Ø±Ø§ Ø¨Ø§Ø² Ú©Ù?Û?Ø¯">
 <!ENTITY torprogress.heading "Ø¯Ø±ØØ§Ù? Ø§ØªØµØ§Ù? Ø¨Ù? Ø´Ø¨Ú©Ù? ØªÙ?Ø±">
-<!ENTITY torprogress.pleaseWait "Ù?Ø·Ù?Ø§ Ø¨Ø±Ø§Û? Ø§ØªØµØ§Ù? Ø¨Ù? Ø´Ø¨Ú©Ù? ØªÙ?Ø± Ù?Ù?ØªØ¸Ø± Ø¨Ù?Ø§Ù?Û?Ø¯.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd
index 55a218f..6338e04 100644
--- a/src/chrome/locale/fi/network-settings.dtd
+++ b/src/chrome/locale/fi/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "MikÃ¤ seuraavista kuvailee parhaiten tilannettasi?">
 <!ENTITY torSettings.configurePrompt1 "TÃ¤mÃ¤n tietokoneen internet-yhteys on sensuroitu tai kulkee vÃ¤lityspalvelimen kautta.">
-<!ENTITY torSettings.configurePrompt2 "Minun on asetettava sillan tai paikallisen vÃ¤lityspalvelimen asetukset">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "MÃ¤Ã¤ritÃ¤">
-<!ENTITY torSettings.connectPrompt2 "Haluan yhdistÃ¤Ã¤ suoraan Tor-verkkoon.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "TÃ¤mÃ¤ toimii useimmissa tilanteissa.">
 <!ENTITY torSettings.connect "YhdistÃ¤">
 
 <!ENTITY torSettings.proxyPageTitle "Paikallisen vÃ¤lityspalvelimen mÃ¤Ã¤ritys">
 <!ENTITY torSettings.proxyQuestion "Tarvitseeko tÃ¤mÃ¤n tietokoneen kÃ¤yttÃ¤Ã¤ paikallista vÃ¤lityspalvelinta Internet-pÃ¤Ã¤syyn?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Jos et ole varma, kuinka vastata tÃ¤hÃ¤n kysymykseen, katso toisen selaimen Internet-asetuksista, onko se asetettu kÃ¤yttÃ¤mÃ¤Ã¤n paikallista vÃ¤lityspalvelinta.">
+<!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 "Kirjoita vÃ¤lityspalvelinasetukset.">
 <!ENTITY torSettings.bridgePageTitle "Tor-siltojen mÃ¤Ã¤ritys">
 <!ENTITY torSettings.bridgeQuestion "Sensuroiko tai estÃ¤Ã¤kÃ¶ sinun operaattorisi (ISP) yhteydet Tor-verkkoon?">
-<!ENTITY torSettings.bridgeHelp "Ellet ole varma kuinka vastata tÃ¤hÃ¤n kysymykseen, valitse Ei.&#160; Jos valitset KyllÃ¤, sinua pyydetÃ¤Ã¤n mÃ¤Ã¤rittÃ¤mÃ¤Ã¤n Tor-sillat, jotka ovat listaamattomia vÃ¤lityspalvelimia, jotta yhteyksiÃ¤ olisi vaikeampi estÃ¤Ã¤ Tor-verkkoon yhdistettÃ¤essÃ¤.">
+<!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 "Voit kÃ¤yttÃ¤Ã¤ tarjottua siltajoukkoa tai voit hankkia ja kirjoittaa oman siltojen joukon.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Odotetaan Tor-sovelluksen kÃ¤ynnistymistÃ¤...">
 <!ENTITY torsettings.restartTor "KÃ¤ynnistÃ¤ Tor uudelleen">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Vaihtoehtoinen">
 
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Sallitut portit:">
 <!ENTITY torsettings.useBridges.checkbox "Minun internet-yhteyden tarjoajani (ISP) estÃ¤Ã¤ yhteydet Tor-verkkoon">
 <!ENTITY torsettings.useBridges.default "YhdistÃ¤ tarjotuilla silloilla">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "Siirtotyyppi:">
 <!ENTITY torsettings.useBridges.custom "Kirjoita omat sillat">
 <!ENTITY torsettings.useBridges.label "Kirjoita yksi tai useampi siltavÃ¤lityspalvelin (yksi per rivi).">
diff --git a/src/chrome/locale/fi/progress.dtd b/src/chrome/locale/fi/progress.dtd
index 1ddad9b..5850aa9 100644
--- a/src/chrome/locale/fi/progress.dtd
+++ b/src/chrome/locale/fi/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor-tila">
 <!ENTITY torprogress.openSettings "Avaa asetukset">
 <!ENTITY torprogress.heading "YhdistetÃ¤Ã¤n Tor-verkkoon">
-<!ENTITY torprogress.pleaseWait "Odota hetki yhteyden muodostamista Tor-verkkoon.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/fil/network-settings.dtd b/src/chrome/locale/fil/network-settings.dtd
index 001b446..78c45b7 100644
--- a/src/chrome/locale/fil/network-settings.dtd
+++ b/src/chrome/locale/fil/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Alin dito ang pinaka angkop na nagsasaad ng iyong sitwasyon?">
 <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!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 "Makipag-ugnay">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "I-restart ang Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/fil/progress.dtd b/src/chrome/locale/fil/progress.dtd
index 33bbaca..b8256ea 100644
--- a/src/chrome/locale/fil/progress.dtd
+++ b/src/chrome/locale/fil/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Buksan ang Settings">
 <!ENTITY torprogress.heading "Nakikipag-ugnayan sa network ng Tor.">
-<!ENTITY torprogress.pleaseWait "Pakihintay sandali habang tayo ay nakikipag-ugnayan sa kabalagan ng Tor.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/fo/network-settings.dtd b/src/chrome/locale/fo/network-settings.dtd
index e113692..14dac48 100644
--- a/src/chrome/locale/fo/network-settings.dtd
+++ b/src/chrome/locale/fo/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/fo/progress.dtd b/src/chrome/locale/fo/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/fo/progress.dtd
+++ b/src/chrome/locale/fo/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/fr-CA/network-settings.dtd b/src/chrome/locale/fr-CA/network-settings.dtd
index 9e3094d..111e80e 100644
--- a/src/chrome/locale/fr-CA/network-settings.dtd
+++ b/src/chrome/locale/fr-CA/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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 configurer des paramÃ¨tres de pont ou de serveur mandataire local.">
+<!ENTITY torSettings.configurePrompt2 "Je dois paramÃ©trer un pont ou un mandataire local avant de me connecter au rÃ©seau&#160; Tor.">
 <!ENTITY torSettings.configure "Configurer">
-<!ENTITY torSettings.connectPrompt2 "Je voudrais me connecter directement au rÃ©seau Tor.">
+<!ENTITY torSettings.connectPrompt2 "J'aimerais Ã©tablir une connexion directe vers le rÃ©seau Tor.">
 <!ENTITY torSettings.connectPrompt3 "Ceci fonctionnera dans la plupart des situations.">
 <!ENTITY torSettings.connect "Se connecter">
 
 <!ENTITY torSettings.proxyPageTitle "Configuration du mandataire local">
 <!ENTITY torSettings.proxyQuestion "Cet ordinateur doit-il utiliser un serveur mandataire local pour accÃ©der Ã  Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Si vous n'Ãªtes pas certain de connaÃ®tre la rÃ©ponse Ã  cette question, vÃ©rifiez les paramÃ¨tres Internet d'un autre navigateur pour voir s'il est configurÃ© pour utiliser un mandataire local.">
+<!ENTITY torSettings.proxyExplanation1 "Dans la plupart des cas, un serveur mandataire local n'est pas requis, mais il pourrait Ãªtre exigÃ© pour une connexion par un rÃ©seau d'entreprise, d'Ã©cole ou d'universitÃ©.">
+<!ENTITY torSettings.proxyExplanation2 "Si vous n'Ãªtes pas certain de savoir comment rÃ©pondre Ã  cette question, vÃ©rifier les paramÃ¨tres Internet d'un autre navigateur ou vÃ©rifier les paramÃ¨tres rÃ©seau de votre systÃ¨me pour voir si un serveur mandataire local est requis.">
 <!ENTITY torSettings.enterProxy "Saisir les paramÃ¨tres du serveur mandataire.">
 <!ENTITY torSettings.bridgePageTitle "Configuration des ponts Tor">
 <!ENTITY torSettings.bridgeQuestion "Votre fournisseur de service Internet (FSI) bloque-t-il ou censure-t-il vos connexions au rÃ©seau Tor?">
-<!ENTITY torSettings.bridgeHelp "Si vous ne savez pas comment rÃ©pondre Ã  cette question, choisissez Non.&#160; Si vous choisissez Oui, on vous demandera de configurer les ponts Tor qui sont des relais non listÃ©s rendant le bloquage des connexions au rÃ©seau Tor plus difficile.">
+<!ENTITY torSettings.bridgeExplanation1 "Si vous n'Ãªtes pas certain de savoir comment rÃ©pondre Ã  cette question, choisir Non (si vous n'arrivez pas Ã  vous connecter au rÃ©seau Tor sans pont, pour pourrez en ajouter un ultÃ©rieurement).">
+<!ENTITY torSettings.bridgeExplanation2 "Si vous choisissez Oui, l'on vous demandera de configurer des ponts Tor, qui sont des relais non rÃ©pertoriÃ©s rendant le blocage des connexions au rÃ©seau Tor plus difficile.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser le jeu de ponts fourni ou vous pouvez obtenir et saisir un jeu de ponts personnalisÃ©.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "En attente du dÃ©marrage de Tor...">
 <!ENTITY torsettings.restartTor "RedÃ©marrer Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigurer">
+
+<!ENTITY torsettings.discardSettings.prompt "Vous avez configurÃ© des ponts Tor ou vous avez saisi des paramÃ¨tres de mandataire local.&#160; Pour Ã©tablir une connexion directe vers le rÃ©seau Tor, ces paramÃ¨tres doivent Ãªtre supprimÃ©s.">
+<!ENTITY torsettings.discardSettings.proceed "Supprimer les paramÃ¨tres et se connecter">
 
 <!ENTITY torsettings.optional "Optionnel">
 
@@ -50,6 +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 avec les ponts fournis">
+<!ENTITY torsettings.useBridges.note "Chaque type de pont utilise une mÃ©thode diffÃ©rente pour contourner la censure.&#160; Si un pont ne fonctionne pas, ressayer en utilisant un autre type.">
 <!ENTITY torsettings.useBridges.type "Type de transport :">
 <!ENTITY torsettings.useBridges.custom "Saisir les ponts personnalisÃ©s">
 <!ENTITY torsettings.useBridges.label "Saisir un ou plusieurs relais-ponts (un par ligne).">
@@ -57,7 +64,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 agence bloque Tor.&#160; Vous pouvez souvent le contourner en utilisant des ponts Tor qui sont des relais non rÃ©pertoriÃ©s, plus difficiles Ã  bloquer.">
+<!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.&#160; 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.bridgeHelp2Heading "par le Web">
 <!ENTITY torsettings.bridgeHelp2 "en utilisant un navigateur Web pour visiter https://bridges.torproject.org";>
diff --git a/src/chrome/locale/fr-CA/progress.dtd b/src/chrome/locale/fr-CA/progress.dtd
index 99c632e..39a0643 100644
--- a/src/chrome/locale/fr-CA/progress.dtd
+++ b/src/chrome/locale/fr-CA/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 "Veuillez patienter pendant que nous Ã©tablissons une connexion avec le rÃ©seau Tor.">
+<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que nous Ã©tablissons une connexion vers le rÃ©seau Tor.&#160; Cela pourrait prendre plusieurs minutes.">
diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd
index cfc1c0f..e3b06af 100644
--- a/src/chrome/locale/fr/network-settings.dtd
+++ b/src/chrome/locale/fr/network-settings.dtd
@@ -13,26 +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 "Je dois configurer le pont rÃ©seau ou les paramÃ¨tres du proxy.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configurer">
-<!ENTITY torSettings.connectPrompt2 "Je souhaite me connecter directement au rÃ©seau Tor.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!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.proxyHelp "Si vous n'Ãªtes pas sur de la rÃ©ponse Ã  cette question, regardez les paramÃ¨tres internet dans un autre navigateur pour voir si il est configurÃ© pour l'utilisation d'un proxy.">
+<!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 "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.bridgeHelp "Si vous ne savez pas comment rÃ©pondre Ã  cette question, choisissez Non.&#160; Si vous choisissez Oui, il vous sera demandÃ© de configurer les ponts Tor qui sont des relais non listÃ©s et qui rendent plus difficile le blocage du 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.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "En attente du dÃ©marrage de Tor...">
 <!ENTITY torsettings.restartTor "Relancer Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optionnel">
 
@@ -50,6 +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.&#160; If one bridge does not work, try again using a different one.">
 <!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).">
diff --git a/src/chrome/locale/fr/progress.dtd b/src/chrome/locale/fr/progress.dtd
index d028d4c..157276d 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 "Veuillez patienter pendant que la connexion au rÃ©seau Tor s'Ã©tablit.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/fur/network-settings.dtd b/src/chrome/locale/fur/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/fur/network-settings.dtd
+++ b/src/chrome/locale/fur/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/fur/progress.dtd b/src/chrome/locale/fur/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/fur/progress.dtd
+++ b/src/chrome/locale/fur/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/fy/network-settings.dtd b/src/chrome/locale/fy/network-settings.dtd
index 6c6c869..8165a1a 100644
--- a/src/chrome/locale/fy/network-settings.dtd
+++ b/src/chrome/locale/fy/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/fy/progress.dtd b/src/chrome/locale/fy/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/fy/progress.dtd
+++ b/src/chrome/locale/fy/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ga/network-settings.dtd b/src/chrome/locale/ga/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/ga/network-settings.dtd
+++ b/src/chrome/locale/ga/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ga/progress.dtd b/src/chrome/locale/ga/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/ga/progress.dtd
+++ b/src/chrome/locale/ga/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/gl/network-settings.dtd b/src/chrome/locale/gl/network-settings.dtd
index bcf88eb..c4703b1 100644
--- a/src/chrome/locale/gl/network-settings.dtd
+++ b/src/chrome/locale/gl/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Cal das seguintes alternativas describe mellor a sÃºa 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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configurar">
-<!ENTITY torSettings.connectPrompt2 "GustarÃame conectar directamente Ã¡ rede Tor">
+<!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 "Conectar">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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 "Introduza a configuraciÃ³n do proxy.">
 <!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Ã? espera de que Tor comece ...">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Opcional">
 
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Portos permitidos:">
 <!ENTITY torsettings.useBridges.checkbox "O meu Provedor Servizos de Internet (ISP) bloquea as conexiÃ³ns Ã¡ rede Tor">
 <!ENTITY torsettings.useBridges.default "Connect with provided bridges">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#160; 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).">
diff --git a/src/chrome/locale/gl/progress.dtd b/src/chrome/locale/gl/progress.dtd
index 8aee80a..84c3935 100644
--- a/src/chrome/locale/gl/progress.dtd
+++ b/src/chrome/locale/gl/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Estado do Tor">
 <!ENTITY torprogress.openSettings "Abrir axustes">
 <!ENTITY torprogress.heading "ConexiÃ³n Ã¡ rede Tor">
-<!ENTITY torprogress.pleaseWait "Por faver, espera mentres estabelecemos a conexiÃ³n coa rede Tor.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/gu-IN/network-settings.dtd b/src/chrome/locale/gu-IN/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/gu-IN/network-settings.dtd
+++ b/src/chrome/locale/gu-IN/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/gu-IN/progress.dtd b/src/chrome/locale/gu-IN/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/gu-IN/progress.dtd
+++ b/src/chrome/locale/gu-IN/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/gu/network-settings.dtd b/src/chrome/locale/gu/network-settings.dtd
index 2e06d74..93ec7cb 100644
--- a/src/chrome/locale/gu/network-settings.dtd
+++ b/src/chrome/locale/gu/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/gu/progress.dtd b/src/chrome/locale/gu/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/gu/progress.dtd
+++ b/src/chrome/locale/gu/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/gun/network-settings.dtd b/src/chrome/locale/gun/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/gun/network-settings.dtd
+++ b/src/chrome/locale/gun/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/gun/progress.dtd b/src/chrome/locale/gun/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/gun/progress.dtd
+++ b/src/chrome/locale/gun/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ha/network-settings.dtd b/src/chrome/locale/ha/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/ha/network-settings.dtd
+++ b/src/chrome/locale/ha/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ha/progress.dtd b/src/chrome/locale/ha/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/ha/progress.dtd
+++ b/src/chrome/locale/ha/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd
index d4b3d16..6fd02c7 100644
--- a/src/chrome/locale/he/network-settings.dtd
+++ b/src/chrome/locale/he/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "×?×?×?×? ×?×? ×?×?×?×?×? ×?×ª×?×¨ ×?×ª ×?×¦×?×? ×?×¦×?×¨×? ×?×?×?×?×?×§×ª ×?×?×?×ª×¨?">
 <!ENTITY torSettings.configurePrompt1 "×?×?×?×?×¨ ×?×?×?× ×?×¨× ×? ×©×? ×?×?×©×? ×?×? ×?×¡×?× ×? ×?×? ×¢×?×?×¨ ×?×¨×? ×©×¨×ª ×¤×¨×?×§×¡×?.">
-<!ENTITY torSettings.configurePrompt2 "×?×¨×¦×?× ×? ×?×?×?×?×?×¨ ×?×©×¨ ×?×? ×©×¨×ª ×¤×¨×?×§×¡×? ×?×§×?×?×?.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "×?×?×?×¨">
-<!ENTITY torSettings.connectPrompt2 "×?×¨×¦×?× ×? ×?×?×ª×?×?×¨ ×?×©×?×¨×?×ª ×?×¨×©×ª Tor.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "×?×?×¨ ×?×? ×?×¢×?×?×? ×?×?×¨×?×?×ª ×?×?×§×¨×?×?.">
 <!ENTITY torSettings.connect "×?×ª×?×?×¨">
 
 <!ENTITY torSettings.proxyPageTitle "×?×?×?×¨×?×ª ×©×¨×ª ×¤×¨×?×§×¡×? ×?×§×?×?×?">
 <!ENTITY torSettings.proxyQuestion "×?×?×? ×?×?×©×? ×?×? ×?×?×?×¨×? ×?×?×©×ª×?×© ×?×©×¨×ª ×¤×¨×?×§×¡×? ×?×§×?×?×? ×?×?×? ×?×§×?×? ×?×?×©×? ×?×?×?× ×?×¨× ×??">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "×?×? ×?×?× ×? ×?×?×?×? ×?×?×¦×? ×?×?×©×?×? ×?×©×?×?×? ×?×?, ×?×?×? ×?×ª ×?×?×?×¨×?×ª ×?×?×?× ×?×¨× ×? ×?×?×¤×?×¤×? ×?×?×¨ ×?×?×? ×?×¨×?×?×ª ×?×?×? ×?×?×?×¨×?×ª ×?×?×ª×?×?×¨×?×ª ×©×?×? ×?×?×?×?×?×ª ×©×?×?×?×© ×?×©×¨×ª ×¤×¨×?×§×¡×? ×?×§×?×?×?.">
+<!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 "×?×?×? ×?×ª ×?×?×?×¨×?×ª ×?×¤×¨×?×§×¡×?.">
 <!ENTITY torSettings.bridgePageTitle "×?×?×?×¨×ª ×?×©×¨×?×? ×?-Tor">
 <!ENTITY torSettings.bridgeQuestion "×?×?×? ×¡×¤×§ ×©×?×¨×?×ª×? ×?×?×?× ×?×¨× ×? (ISP) ×©×?×? ×?×?×¡×? ×?×? ×?×¡× ×? ×?×?×?×?×¨×?×? ×?×¨×©×ª Tor ?">
-<!ENTITY torSettings.bridgeHelp "×?×? ×?×?× ×? ×?×?×?×? ×?×?×¦×? ×?×¢× ×?×ª ×?×©×?×?×? ×?×?, ×?×?×¨ ×?-'×?×?'. ×?×? ×ª×?×?×¨ ×?-'×?×?', ×ª×ª×?×§×© ×?×?×?×?×?×¨ ×?×©×¨×?×? ×?-Tor, ×©×?×? ×©×¨×ª×?×? ×?×? ×¤×?×?×?×?×?×? ×?×?×¡×?×?×¢×?×? ×?×¢×§×?×£ ×?×¡×?×?×?×ª ×?×?×©×? ×?×¨×©×ª 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 "×?×?×¤×©×¨×?×ª×? ×?×?×©×ª×?×© ×?×¨×©×?×?×ª ×?×?×©×¨×?×? ×?×?×?×?× ×? ×?×? ×?×?×©×?×? ×?×¢×¦×?×? ×?×?×?×?×?×? ×¨×©×?×?×ª ×?×©×¨×?×? ×?×?×©×?.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "×?×?×ª×?×? ×?×¢×ª ×¢×?×?×¨ Tor ×?×?×? ×?×?×ª×?×?×?â?¦">
 <!ENTITY torsettings.restartTor "×?×ª×?×? ×?×?×?×© ×?×ª Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "×?×?×¤×¦×?×?× ×?×?">
 
@@ -50,6 +56,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.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "×¡×?×? ×?×¡×?×?×? ×ª×¢×?×?×¨×?:">
 <!ENTITY torsettings.useBridges.custom "×?×?×? ×¨×©×?×?×ª ×?×©×¨×?×? ×?×?×©×?">
 <!ENTITY torsettings.useBridges.label "×?×?×? ×¤×¨×?×? ×?×©×¨ ×?×?×? ×?×¤×?×?×ª (×?×?×? ×?×?×? ×©×?×¨×?)">
diff --git a/src/chrome/locale/he/progress.dtd b/src/chrome/locale/he/progress.dtd
index 891697d..ee4943a 100644
--- a/src/chrome/locale/he/progress.dtd
+++ b/src/chrome/locale/he/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 "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/hi/network-settings.dtd b/src/chrome/locale/hi/network-settings.dtd
index f852698..d63adb7 100644
--- a/src/chrome/locale/hi/network-settings.dtd
+++ b/src/chrome/locale/hi/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "à¤?à¥?à¥?à¥?à¤?">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/hi/progress.dtd b/src/chrome/locale/hi/progress.dtd
index 87f2f41..14111f6 100644
--- a/src/chrome/locale/hi/progress.dtd
+++ b/src/chrome/locale/hi/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "à¤?à¥?à¤° à¤¸à¥?à¤¥à¤¿à¤¤à¤¿">
 <!ENTITY torprogress.openSettings "à¤µà¥?à¤¯à¤µà¤¸à¥?à¤¥à¤¾ à¤?à¥?à¤²à¥?à¤?">
 <!ENTITY torprogress.heading "à¤?à¥?à¤° à¤¸à¤?à¤?à¤¾à¤² à¤¸à¥? à¤?à¥?à¥? à¤°à¤¹à¤¾ à¤¹à¥?">
-<!ENTITY torprogress.pleaseWait "à¤?à¥?à¤° à¤¸à¤?à¤?à¤¾à¤² à¤¸à¥? à¤¸à¤?à¤?à¤¾à¤° à¤¸à¥?à¤¥à¤¾à¤ªà¤¿à¤¤ à¤¹à¥?à¤¨à¥? à¤¤à¤? à¤ªà¥?à¤°à¤¤à¥?à¤?à¥?à¤·à¤¾ à¤?à¤°à¥?à¤?à¥¤">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd
index 74d4ce2..657b7f9 100644
--- a/src/chrome/locale/hr-HR/network-settings.dtd
+++ b/src/chrome/locale/hr-HR/network-settings.dtd
@@ -14,27 +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 "Trebam konfigurirati postavke mosta ili lokalnog proxy-a.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Podesi">
-<!ENTITY torSettings.connectPrompt2 "Å½elim se izravno spojiti na Tor mreÅ¾u.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Ovo Ä?e raditi u veÄ?ini situacija.">
 <!ENTITY torSettings.connect "Spajanje">
 
 <!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.proxyHelp "Ako niste sigurni kako odgovoriti na ovo pitanje, pogledajte Internet postavke u drugom pregledniku da vidite jeli postavljen da koristi lokalni proxy.">
+<!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 "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.bridgeHelp "Ako niste sigurni kako da odgovorite na ovo pitanje, odaberite Ne.&#160; Ako odaberete Da, od Vas Ä?e se traÅ¾iti da konfigurirate Tor Mostove, koji su neizlistani releji koji oteÅ¾avaju blokiranje povezivanja 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.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.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Opcionalno">
 
@@ -52,6 +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.&#160; If one bridge does not work, try again using a different one.">
 <!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).">
diff --git a/src/chrome/locale/hr-HR/progress.dtd b/src/chrome/locale/hr-HR/progress.dtd
index ea7118a..405b87e 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 "Molimo priÄ?ekajte dok ne uspostavimo vezu s Tor mreÅ¾om.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/hr/network-settings.dtd b/src/chrome/locale/hr/network-settings.dtd
index 0ccf030..b229c09 100644
--- a/src/chrome/locale/hr/network-settings.dtd
+++ b/src/chrome/locale/hr/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Å to od sljedeÄ?eg najbolje opisuje tvoju situaciju?">
 <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Konfiguriraj">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Ovo Ä?e raditi u veÄ?ini situacija.">
 <!ENTITY torSettings.connect "PoveÅ¾i se">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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 "Unesi proxy postavke.">
 <!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/hr/progress.dtd b/src/chrome/locale/hr/progress.dtd
index 9c3caaf..4bacee4 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 "Molimo priÄ?ekajte dok uspostavimo konekciju sa Tor mreÅ¾om.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ht/network-settings.dtd b/src/chrome/locale/ht/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/ht/network-settings.dtd
+++ b/src/chrome/locale/ht/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ht/progress.dtd b/src/chrome/locale/ht/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/ht/progress.dtd
+++ b/src/chrome/locale/ht/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd
index afdfafc..0f7de0c 100644
--- a/src/chrome/locale/hu/network-settings.dtd
+++ b/src/chrome/locale/hu/network-settings.dtd
@@ -13,26 +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 "SzÃ¼ksÃ©gem van hÃd vagy helyi proxy beÃ¡llÃtÃ¡sÃ¡ra.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "BeÃ¡llÃt">
-<!ENTITY torSettings.connectPrompt2 "SzeretnÃ©k kÃ¶zvetlenÃ¼l kapcsolÃ³dni a Tor hÃ¡lÃ³zathoz.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!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.proxyHelp "Ha nem biztos ennek a kÃ©rdÃ©snek a megvÃ¡laszolÃ¡sÃ¡ban, kattintson az Internet beÃ¡llÃtÃ¡sokra a mÃ¡sik bÃ¶ngÃ©szÅ?jÃ©ben, Ã©s tekintse meg, hog van-e benne beÃ¡llÃtva helyiproxy.">
+<!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 "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.bridgeHelp "Ha nem vagy biztos a vÃ¡laszban, vÃ¡laszd a Nem-et.&#160; Ha az Igen-t vÃ¡lasztod neked kell konfigurÃ¡lni a Tor bridges amik nem listÃ¡zott Ã¡tjÃ¡tszÃ³k Ã©s nehezebbÃ© teszik a Tor hÃ¡lÃ³zat kapcsolÃ³dÃ¡sÃ¡nak a blokkolÃ¡sÃ¡t.">
+<!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 "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.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "OpcionÃ¡lis">
 
@@ -50,6 +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.&#160; If one bridge does not work, try again using a different one.">
 <!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)">
diff --git a/src/chrome/locale/hu/progress.dtd b/src/chrome/locale/hu/progress.dtd
index b19344f..bdcab7a 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 "KÃ©rlek vÃ¡rj amÃg a kapcsolat lÃ©trejÃ¶n a Tor hÃ¡lÃ³zattal.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/hy-AM/network-settings.dtd b/src/chrome/locale/hy-AM/network-settings.dtd
index 0daa0a7..f6b89c5 100644
--- a/src/chrome/locale/hy-AM/network-settings.dtd
+++ b/src/chrome/locale/hy-AM/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Õ?Õ«Õ¡Õ¶Õ¡Õ¬">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/hy-AM/progress.dtd b/src/chrome/locale/hy-AM/progress.dtd
index 3be7837..545668d 100644
--- a/src/chrome/locale/hy-AM/progress.dtd
+++ b/src/chrome/locale/hy-AM/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.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/hy/network-settings.dtd b/src/chrome/locale/hy/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/hy/network-settings.dtd
+++ b/src/chrome/locale/hy/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/hy/progress.dtd b/src/chrome/locale/hy/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/hy/progress.dtd
+++ b/src/chrome/locale/hy/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ia/network-settings.dtd b/src/chrome/locale/ia/network-settings.dtd
index 13fc151..0abeba8 100644
--- a/src/chrome/locale/ia/network-settings.dtd
+++ b/src/chrome/locale/ia/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ia/progress.dtd b/src/chrome/locale/ia/progress.dtd
index 8d94c15..3f9c00f 100644
--- a/src/chrome/locale/ia/progress.dtd
+++ b/src/chrome/locale/ia/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Stato de Tor">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd
index 2062d8c..990cbac 100644
--- a/src/chrome/locale/id/network-settings.dtd
+++ b/src/chrome/locale/id/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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 "Saya perlu mengonfigurasi pengaturan jembatan atau proksi lokal.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Konfigur">
-<!ENTITY torSettings.connectPrompt2 "Saya ingin terhubung secara langsung ke jaringan Tor.">
+<!ENTITY torSettings.connectPrompt2 "Saya ingin membuat koneksi langsung ke jaringan Tor.">
 <!ENTITY torSettings.connectPrompt3 "Ini akan bekerja dalam kebanyakan situasi.">
 <!ENTITY torSettings.connect "Sambung">
 
 <!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.proxyHelp "Jika Anda tidak yakin bagaimana menjawab pertanyaan ini, llihatlah pengaturan Internet di peramban lain untuk memastikan apakah dikonfigurasi untuk menggunakan proksi lokal.">
+<!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 "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.bridgeHelp "Jika Anda tidak yakin bagaimana untuk menjawab pertanyaan ini, pilih No.&#160; Jika Anda memilih Ya, Anda akan diminta untuk mengkonfigurasi Jembatan Tor, yang merupakan relai tidak terdaftar yang akan membuat semakin sulit untuk memblokir 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.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.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Buang Pengaturan dan Sambung">
 
 <!ENTITY torsettings.optional "Opsional">
 
@@ -50,6 +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.&#160; If one bridge does not work, try again using a different one.">
 <!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).">
diff --git a/src/chrome/locale/id/progress.dtd b/src/chrome/locale/id/progress.dtd
index 526e6e1..da6956f 100644
--- a/src/chrome/locale/id/progress.dtd
+++ b/src/chrome/locale/id/progress.dtd
@@ -1,4 +1,4 @@
-<!ENTITY torprogress.dialog.title "Status Tor ">
+<!ENTITY torprogress.dialog.title "Status Tor">
 <!ENTITY torprogress.openSettings "Buka Pengaturan">
 <!ENTITY torprogress.heading "Menyambung ke jaringan Tor">
-<!ENTITY torprogress.pleaseWait "Mohon tunggu saat kami membangun koneksi ke jaringan Tor.">
+<!ENTITY torprogress.pleaseWait "Mohon tunggu sementara kami menyambung ke jaringan Tor.&#160; Ini mungkin memakan waktu beberapa menit.">
diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd
index 9af70e1..d151c0d 100644
--- a/src/chrome/locale/is/network-settings.dtd
+++ b/src/chrome/locale/is/network-settings.dtd
@@ -1,8 +1,8 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
+<!ENTITY torsettings.dialog.title "Netkerfisstillingar Tor">
 
 <!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+<!ENTITY torlauncher.localePicker.title "TungumÃ¡l Tor-vafra">
+<!ENTITY torlauncher.localePicker.prompt "Veldu tungumÃ¡l">
 
 <!-- For "first run" wizard: -->
 
@@ -11,56 +11,63 @@
 <!ENTITY torSettings.yes "JÃ¡">
 <!ENTITY torSettings.no "Nei">
 
-<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
+<!ENTITY torSettings.firstQuestion "HvaÃ° af eftirfarandi lÃ½sir best aÃ°stÃ¦Ã°um Ã¾Ãnum?">
 <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings.">
-<!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
-<!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
+<!ENTITY torSettings.configure "Stilla">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
+<!ENTITY torSettings.connectPrompt3 "Ã?etta mun virka Ã flestum tilfellum.">
 <!ENTITY torSettings.connect "Tengjast">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
-<!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
+<!ENTITY torsettings.startingTor "BÃÃ° eftir aÃ° Tor rÃ¦sist...">
 <!ENTITY torsettings.restartTor "EndurrÃ¦sa Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
 
-<!ENTITY torsettings.optional "Optional">
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+
+<!ENTITY torsettings.optional "ValkvÃ¦tt">
 
 <!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet">
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
-<!ENTITY torsettings.useProxy.address "Address:">
-<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!ENTITY torsettings.useProxy.port "Port:">
-<!ENTITY torsettings.useProxy.username "Username:">
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.type "GerÃ° milliÃ¾jÃ³ns:">
+<!ENTITY torsettings.useProxy.address "Vistfang:">
+<!ENTITY torsettings.useProxy.address.placeholder "IP-vistfang eÃ°a vÃ©larheiti">
+<!ENTITY torsettings.useProxy.port "GÃ¡tt:">
+<!ENTITY torsettings.useProxy.username "Notandanafn:">
+<!ENTITY torsettings.useProxy.password "LykilorÃ°:">
 <!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.firewall.allowedPorts "LeyfÃ°ar gÃ¡ttir:">
 <!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.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "Transport type:">
 <!ENTITY torsettings.useBridges.custom "Enter custom bridges">
 <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "type address:port">
+<!ENTITY torsettings.useBridges.placeholder "settu inn vistfang:gÃ¡tt">
 
 <!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.&#160; 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.bridgeHelp2Heading "Ã? gegnum vefinn">
+<!ENTITY torsettings.bridgeHelp2 "NotaÃ°u vafra til aÃ° skoÃ°a 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.&#160; 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/is/progress.dtd b/src/chrome/locale/is/progress.dtd
index 1541026..c6f500e 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 "BÃddu aÃ°eins Ã¡ meÃ°an komiÃ° er Ã¡ tengingu viÃ° Tor-netiÃ°">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd
index 6888c98..4d67204 100644
--- a/src/chrome/locale/it/network-settings.dtd
+++ b/src/chrome/locale/it/network-settings.dtd
@@ -13,26 +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 "Devo configurare un bridge o le impostazioni del proxy locale.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configura">
-<!ENTITY torSettings.connectPrompt2 "Vorrei connettermi direttamente alla rete Tor.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!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.proxyHelp "Se non sei sicuro su come rispondere a questa domanda, guarda alle impostazioni Internet in un altro browser per vedere come Ã¨ configurato per l'uso di un proxy locale.">
+<!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 "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.bridgeHelp "Se non sei sicuro di come rispondere alla domanda, scegli No.&#160; Se scegli SÃ¬, ti verrÃ  chiesto di configurare Tor Bridges, che consiste in relay non elencati che rendono piÃ¹ difficile bloccare le connessioni 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.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.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Facoltativo">
 
@@ -50,6 +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.&#160; If one bridge does not work, try again using a different one.">
 <!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)">
diff --git a/src/chrome/locale/it/progress.dtd b/src/chrome/locale/it/progress.dtd
index fcc4b08..ef30289 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 "Si prega di attendere: stiamo stabilendo una connessione alla rete Tor.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd
index dc7f76f..6fe3ede 100644
--- a/src/chrome/locale/ja/network-settings.dtd
+++ b/src/chrome/locale/ja/network-settings.dtd
@@ -1,8 +1,8 @@
 <!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: -->
 
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "ä»¥ä¸?ã?®ã??ã?¡ã??ã?ªã??ã?®ç?¶æ??ã?«æ??ã??é?©ã??ã?¦ã??ã??ã?®ã?¯ã?©ã??ã?§ã??ã??ï¼?">
 <!ENTITY torSettings.configurePrompt1 "ã??ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?®ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ?¥ç¶?ã?¯ã??æ¤?é?²ã??ã??ã?¦ã??ã??ã??ã??ã?ã?ã?·ã??é??ã??ã?¾ã??ã??">
-<!ENTITY torSettings.configurePrompt2 "ã??ã?ªã??ã?¸ã??ã?ã?¼ã?«ã?«ã??ã?ã?ã?·ã?®è¨å®?ã??æ§?æ??ã??ã??å¿?è¦?ã??ã??ã??ã?¾ã??ã??">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "æ§?æ??">
-<!ENTITY torSettings.connectPrompt2 "Torã??ã??ã??ã?¯ã?¼ã?¯ã?¸ç?´æ?¥æ?¥ç¶?ã??ã?¾ã??ã??">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "ã??ã??ã?¯ã?»ã?¨ã??ã?©ã?®ç?¶æ³?ã?§å??ä½?ã??ã?¾ã??ã??">
 <!ENTITY torSettings.connect "æ?¥ç¶?">
 
 <!ENTITY torSettings.proxyPageTitle "ã?ã?¼ã?«ã?«ã??ã?ã?ã?·ã?®è¨å®?">
 <!ENTITY torSettings.proxyQuestion "ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã?«æ?¥ç¶?ã??ã??ã??ã??ã?«ã?ã?¼ã?«ã?«ã??ã?ã?ã?·ã??é??ã??å¿?è¦?ã??ã??ã??ã?¾ã??ã??ï¼?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "ã??ã??å??ã??ã??ã?ªã??ã??ã?°ã??ä»?ã?®ã??ã?©ã?¦ã?¶ã?¼ã?®ã?¤ã?³ã?¿ã?¼ã??ã??ã??è¨å®?ã?§ã?ã?¼ã?«ã?«ã??ã?ã?ã?·ã??ä½¿ç?¨ã??ã?¦ã??ã??ã??ã??ç¢ºèª?ã??ã?¦ã??ã? ã??ã??ã??">
+<!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 "ã??ã?ã?ã?·è¨å®?ã??å?¥å??">
 <!ENTITY torSettings.bridgePageTitle "Torã??ã?ªã??ã?¸ã?®è¨å®?">
 <!ENTITY torSettings.bridgeQuestion "ã??ã?ªã??ã?®ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã?µã?¼ã??ã?¹ã??ã?ã??ã?¤ã??ã?¼ (ISP) ã?¯ Tor ã??ã??ã??ã?¯ã?¼ã?¯ã?¸ã?®æ?¥ç¶?ã??ã??ã?ã??ã?¯ã??ã?¦ã??ã??ã??ã??ã??ã??ã??ã?¯å?¥ã?®ã??ã??æ?¹ã?§æ¤?é?²ã??ã?¦ã??ã?¾ã??ã??ï¼?">
-<!ENTITY torSettings.bridgeHelp "ã??ã?®è³ªå??ã?«ã?©ã??ç?ã??ã??ã?¹ã??ã??ã??ã??ã??ã??ã??ã?ªã??å ´å??ã?¯ã??ã??ã??ã??ã??é?¸æ??ã??ã?¦ã??ã? ã??ã??ã??&#160; ã?¯ã??ã??é?¸æ??ã??ã??ã?¨ã??Tor ã??ã??ã??ã?¯ã?¼ã?¯ã?¸ã?®æ?¥ç¶?ã??ã??ã?ã??ã?¯ã??ã??ã??ã?¨ã??ã??ã??ã?«å?°é?£ã?«ã??ã??ã?ªã?¹ã??å??ã??ã??ã?¦ã??ã?ªã??ã?ªã?¬ã?¼ã?§ã??ã?? Tor Bridges ã??æ§?æ??ã??ã??ã??ã?¨ã??æ±?ã??ã??ã??ã?¾ã??ã??">
+<!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 "æ??ä¾?ã??ã??ã??ã??ã?ªã??ã?¸ã?®ã?»ã??ã??ã??ä½¿ç?¨ã??ã??ã??ã??ã??ã??ã??ã?¯ã?«ã?¹ã?¿ã? ã?®ã??ã?ªã??ã?¸ã?®ã?»ã??ã??ã??å??å¾?ã??ã?¦å?¥å??ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Torã?®é??å§?ã??å¾?ã?£ã?¦ã??ã?¾ã??...">
 <!ENTITY torsettings.restartTor "Torã??å??èµ·å??ã??ã??">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "ã?ªã??ã?·ã?§ã?³">
 
@@ -50,6 +56,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.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "ã??ã?©ã?³ã?¹ã??ã?¼ã??ã?¿ã?¤ã??:">
 <!ENTITY torsettings.useBridges.custom "ã?«ã?¹ã?¿ã? ã??ã?ªã??ã?¸ã??å?¥å??">
 <!ENTITY torsettings.useBridges.label "1ã?¤ä»¥ä¸?ã?®ã??ã?ªã??ã?¸ã?ªã?¬ã?¼ã??å?¥å??ã??ã?¦ã??ã? ã??ã??(è¡?ã??ã??ã??1ã?¤)ã??">
diff --git a/src/chrome/locale/ja/progress.dtd b/src/chrome/locale/ja/progress.dtd
index 9d03c6b..31c0943 100644
--- a/src/chrome/locale/ja/progress.dtd
+++ b/src/chrome/locale/ja/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 "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/jv/network-settings.dtd b/src/chrome/locale/jv/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/jv/network-settings.dtd
+++ b/src/chrome/locale/jv/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/jv/progress.dtd b/src/chrome/locale/jv/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/jv/progress.dtd
+++ b/src/chrome/locale/jv/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd
index 7551c74..135c799 100644
--- a/src/chrome/locale/ka/network-settings.dtd
+++ b/src/chrome/locale/ka/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ka/progress.dtd b/src/chrome/locale/ka/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/ka/progress.dtd
+++ b/src/chrome/locale/ka/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/kk/network-settings.dtd b/src/chrome/locale/kk/network-settings.dtd
index f1d2205..ce471c2 100644
--- a/src/chrome/locale/kk/network-settings.dtd
+++ b/src/chrome/locale/kk/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/kk/progress.dtd b/src/chrome/locale/kk/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/kk/progress.dtd
+++ b/src/chrome/locale/kk/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/km/network-settings.dtd b/src/chrome/locale/km/network-settings.dtd
index eff2770..b2af430 100644
--- a/src/chrome/locale/km/network-settings.dtd
+++ b/src/chrome/locale/km/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "á??á?¾â??á??á?¶á??â??á??á??á??á??á?¶â??á??á?¶â??á??á?½á??â??â??â??á??á?¼á??â??á??á?¶â??á??á??á??á??á??á??â??á??á??á??â??á??á??á?¢â??á??á??á??á?»á??â??á??á??á??á??á?¶á??á??á??á??á??á?¶á??á??á?¶á??â??á??á??á??á??â??á?¢á??á??á???">
 <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "á??á??á??á??á??á??á??á??á?¶á??á??á??á??á??á??á??á??">
-<!ENTITY torSettings.connectPrompt2 "á??á??á??á?»á??â??á??á??á??á??á??á??á?¶á??á??â??á??á??á??â??á??á??á??á?¶á??á??á??á??â??á??á??á??á??á?¶á?? Tor á??">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!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?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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 "á??á??á??á??á?¼á??â??á??á?¶á??â??á??á??á??á??á??â??á??á??á??á?¼á??á??á??á?¸á??">
 <!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
 <!ENTITY torSettings.bridgeQuestion "á??á?¾â??á??á??á??á?»á??á? á??á?»á??â??á??á??á??á??á??â??á?¢á??á?¸á??á??á?ºá??á?·á??â??á??á??á??á??â??á?¢á??á??á?? (ISP) á??á??á??á??á??á??á?¶á??á?? á?¬â??á??á?¾â??á??á?·á??â??á??á?¼á??á??á??á??á??â??á??á??â??á??á?¶á??â??á??á??á??á?¶á??á??â??á?§á??á??á??á??á??â??á??á?¶á??á??â??á??á??á??á??á?¶á??á??â??á??á??á??á??á?¶á?? Tor ?">
-<!ENTITY torSettings.bridgeHelp "á??á?¾â??á?¢á??á??á??â??á??á??á??á?¶á??á??â??á??á?¸â??á??á?·á??á?¸â??á??á??á??á?¾á??â??á??á??á??á?½á??â??á??á??á?? á??á??á??á?¾á??â??á??á??á?? &#160; á??á?¾â??á?¢á??á??á??â??á??á??á??á?¾á??â??á??á?¶á??/á??á?¶á?? á?¢á??á??á??â??á??á?¹á??â??á??á??á??á?¼á??â??á??á?¶á??â??á??á??á??á?¾â??á?²á??á??â??á??á??á??á??á??â??á??á??á??á?¶á??á??á??á??á??á??á??á??â??á??á??á??á??á?¸á?? Tor á??á??á??â??â??á??á?¶â??á??á?¶á??â??á??á??á??á??á?¼á??â??á??á??á??á??â??á??á?·á??â??á??á?¶á??â??á??á?¶á??â??á??á??á??â??á??á??á??á?¾â??á?²á??á??â??á??á?¶â??á??á?¶á??á??á??á??â??á??á??á??á?¶á??â??â??á??á??á??á?»á??â??á??á?¶á??â??á??á??á??á??á??á??á?¶á??á??â??á??á?¶á??â??á??á??á??á?¶á??á??â??á??á??â??á??á??á??á??á?¶á?? 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 "á?¢á??á??á??á?¢á?¶á??â??á??á??á??á?¾â??á??á?¶á??á??á??á??á??á??á??á??á??á??á?¸á??â??á??á??á??â??á??á?¶á??á??á??á??á??á?? á?¬â??á?¢á??á??á??â??á?¢á?¶á??â??á??á??â?? á??á?·á??â??á??á??á??á??á?¼á??â??á??á?¶á??â??á??á??á??á??á??á??á??á??á??á?¸á??â??á??á??á??á?¶á??á??â??á??á??á??á?½á??á??">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "á??á??á??á?»á??â??á??á??á??á??á?¶á?? Tor á??á?¶á??á??á??á??á??á?¾á??...">
 <!ENTITY torsettings.restartTor "á??á?¶á??á??á??á??á??á?¾á?? Tor á?¡á?¾á??â??á??á?·á??">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "á??á?¶â??á??á??á??á??á?¾á??">
 
@@ -50,6 +56,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.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "á??á??á??á??á??á??â??á??á??á??á??á?¼á??á??">
 <!ENTITY torsettings.useBridges.custom "á??á??á??á??á?¼á??â??á??á??á??á??á?¸á??â??á??á??á??á?¶á??á??â??á??á??á??á?½á??">
 <!ENTITY torsettings.useBridges.label "á??á??á??á??á?¼á??â??á??á?¶á??â??á??á??á??á??á?¼á??â??á??á??á??á??á?¸á??â??á??á??á??á??â??á??á?½á?? á?¬â??á??á??á??á?¾á?? (á??á?½á??â??á??á??á??á?»á??â??á??á?½á??â??á??á?½á??)á??">
diff --git a/src/chrome/locale/km/progress.dtd b/src/chrome/locale/km/progress.dtd
index b09663c..76d75ce 100644
--- a/src/chrome/locale/km/progress.dtd
+++ b/src/chrome/locale/km/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 "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/kn/network-settings.dtd b/src/chrome/locale/kn/network-settings.dtd
index 2c14637..6cd943a 100644
--- a/src/chrome/locale/kn/network-settings.dtd
+++ b/src/chrome/locale/kn/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/kn/progress.dtd b/src/chrome/locale/kn/progress.dtd
index 7b197ab..b6e3b70 100644
--- a/src/chrome/locale/kn/progress.dtd
+++ b/src/chrome/locale/kn/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "à²?à²¾à²°à³?â??à²¨ à²¸à³?à²¥à²¿à²¤à²¿">
 <!ENTITY torprogress.openSettings "à²?à²ªà³?à²°à³?à²£ à²¸à³?à²?à³?à²?à²¿à²?à²?à³?â??à²?à²³à³?">
 <!ENTITY torprogress.heading "à²?à²¾à²°à³? à²?à²¾à²²à²?à³?à²?à³? à²¸à³?à²°à²¿à²?à³?à²¤à²¾ à²?à²¦à³?à²µà²¿.">
-<!ENTITY torprogress.pleaseWait "à²¨à²¾à²µà³? à²?à²¾à²°à³? à²?à²¾à²²à²¬à²?à²§à²?à³?à²?à³? à²¸à²?à²ªà²°à³?à²?à²µà²¨à³?à²¨à³? à²?à²²à³?à²ªà²¿à²¸à³?à²¤à³?à²¤à²¿à²¦à³?à²¦à³?à²µà³?. à²¦à²¯à²µà²¿à²?à³?à²?à³? à²¨à²¿à²°à³?à²?à³?à²·à²¿à²¸à²¿">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ko-KR/network-settings.dtd b/src/chrome/locale/ko-KR/network-settings.dtd
index 63fb382..74b8c4a 100644
--- a/src/chrome/locale/ko-KR/network-settings.dtd
+++ b/src/chrome/locale/ko-KR/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "í??ì?©ë?? í?¬í?¸:">
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ko-KR/progress.dtd b/src/chrome/locale/ko-KR/progress.dtd
index 896bd56..7c2da43 100644
--- a/src/chrome/locale/ko-KR/progress.dtd
+++ b/src/chrome/locale/ko-KR/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Tor ë?¤í?¸ì??í?¬ë¡? ì?°ê²°í??ê³  ì??ì?´ì??">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd
index 88ba8b1..8ac0ad0 100644
--- a/src/chrome/locale/ko/network-settings.dtd
+++ b/src/chrome/locale/ko/network-settings.dtd
@@ -1,8 +1,8 @@
 <!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: -->
 
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "ì?´ë?¤ ê²?ì?´ ê·?í??ì?? ì??í?©ì?? ê°?ê¹?ì?µë??ê¹??">
 <!ENTITY torSettings.configurePrompt1 "ì?´ ì»´í?¨í?°ì?? ì?¸í?°ë?· ì?°ê²°ì?? ê²?ì?´ë??ì?´ ì??ê±°ë?? í??ë¡?ì??ë¥¼ í?µí?©ë??ë?¤.">
-<!ENTITY torSettings.configurePrompt2 "ë¸?ë¦¿ì§? ë??ë?? í??ë¡?ì?? ì?¤ì ? êµ¬ì?±ì?? í?´ì?¼ í?©ë??ë?¤.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "êµ¬ì?±">
-<!ENTITY torSettings.connectPrompt2 "Tor ë?¤í?¸ì??í?¬ì?? ì§?ì ? ì?°ê²°í??ê³  ì?¶ì?µë??ë?¤.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "ì?´ê²?ì?? ë??ë¶?ë¶?ì?? ì??í?©ì??ì?? ë??ì??í?©ë??ë?¤">
 <!ENTITY torSettings.connect "ì?°ê²°">
 
-<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
+<!ENTITY torSettings.proxyPageTitle "ë¡?ì»¬ í??ë¡?ì?? ì?¤ì ?">
 <!ENTITY torSettings.proxyQuestion "ì?´ ì»´í?¨í?°ë?? ì?¸í?°ë?·ì?? ì ?ì??í??ë?? ë?° í??ë¡?ì??ê°? í??ì??í??ê°?ì???">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "ë? ì§?ë¬¸ì?¸ì§? ì?? ëª¨ë¥´ì??ê² ë?¤ë©´, ë?¤ë¥¸ ë¸?ë?¼ì?°ì ?ì?? ì?¸í?°ë?· ì?¤ì ?ì?? ë³´ê³  í??ë¡?ì??ê°? ì?´ë?»ê²? ì?¤ì ?ë??ì?´ ì??ë??ì§? ì°¸ê³ í??ì?¸ì??.">
+<!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 "í??ë¡?ì?? ì?¤ì ?ì?? ë?¤ì?´ê°?ë??ë?¤.">
-<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
+<!ENTITY torSettings.bridgePageTitle "Tor ë¸?ë¦¿ì§? ì?¤ì ?">
 <!ENTITY torSettings.bridgeQuestion "ì?¸í?°ë?· ì??ë¹?ì?¤ ê³µê¸?ì??(ISP)ê°? Tor ë?¤í?¸ì??í?¬ ì ?ì??ì?? ì°¨ë?¨í??ê±°ë?? ê²?ì?´í??ê³  ì??ë??ì???">
-<!ENTITY torSettings.bridgeHelp "ì?´ ì§?ë¬¸ì?? ì?´ë?»ê²? ë??ë?µí?´ì?¼í? ì§? ì?? ëª¨ë¥´ë?? ê²½ì?° ì??ë??ì?¤ë¥¼ ì? í??í??ì?ì??ì?¤.&#160; ì??ë¥¼ ì? í??í??ë©´ Tor ë?¤í?¸ì??í?¬ì?? ë??í?? ì?°ê²°ì?? ì°¨ë?¨í??ë?? ê²?ì?? ë??ì?± ì?´ë µê²?í??ë?? ëª©ë¡? í??ë??ì§? ì??ì?? ë¦´ë ?ì?´ì?´ê³  Tor Bridgesì?? êµ¬ì?±í??ë?? ê²?ì?´ ì??êµ¬ë?©ë??ë?¤.">
+<!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 "ì ?ê³µë?? ë¸?ë¦¿ì§? ì?¸í?¸ë¥¼ ì?¬ì?©í??ê±°ë?? ì?¬ì?©ì?? ì§?ì ? ë¸?ë¦¿ì§? ì?¸í?¸ë¥¼ ì·¨ë??í??ì?¬ ì??ë ¥ í?  ì?? ì??ì?µë??ë?¤.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Tor ì??ì?? ë??ê¸° ì¤?...">
 <!ENTITY torsettings.restartTor "Tor ì?¬ì??ì??">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "ì? í??">
 
@@ -50,6 +56,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.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "ì ?ì?¡ ì? í??:">
 <!ENTITY torsettings.useBridges.custom "ì?´ì?©ì?? ë¸?ë¦¿ì§? ì ?ì??">
 <!ENTITY torsettings.useBridges.label "1ê°? ì?´ì??ì?? ë¸?ë¦¿ì§? ì¤?ê³? ì??ë²?ë¥¼ ì??ë ¥í?´ ì£¼ì?¸ì??. (ê°? ì¤?ì?? í?? ê°?ì?©)">
diff --git a/src/chrome/locale/ko/progress.dtd b/src/chrome/locale/ko/progress.dtd
index bb931d0..7669c26 100644
--- a/src/chrome/locale/ko/progress.dtd
+++ b/src/chrome/locale/ko/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 "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ku/network-settings.dtd b/src/chrome/locale/ku/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/ku/network-settings.dtd
+++ b/src/chrome/locale/ku/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ku/progress.dtd b/src/chrome/locale/ku/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/ku/progress.dtd
+++ b/src/chrome/locale/ku/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/kw/network-settings.dtd b/src/chrome/locale/kw/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/kw/network-settings.dtd
+++ b/src/chrome/locale/kw/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/kw/progress.dtd b/src/chrome/locale/kw/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/kw/progress.dtd
+++ b/src/chrome/locale/kw/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ky/network-settings.dtd b/src/chrome/locale/ky/network-settings.dtd
index fee491d..2f61a16 100644
--- a/src/chrome/locale/ky/network-settings.dtd
+++ b/src/chrome/locale/ky/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ky/progress.dtd b/src/chrome/locale/ky/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/ky/progress.dtd
+++ b/src/chrome/locale/ky/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/lb/network-settings.dtd b/src/chrome/locale/lb/network-settings.dtd
index 0aabd24..5d56d79 100644
--- a/src/chrome/locale/lb/network-settings.dtd
+++ b/src/chrome/locale/lb/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/lb/progress.dtd b/src/chrome/locale/lb/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/lb/progress.dtd
+++ b/src/chrome/locale/lb/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/lg/network-settings.dtd b/src/chrome/locale/lg/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/lg/network-settings.dtd
+++ b/src/chrome/locale/lg/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/lg/progress.dtd b/src/chrome/locale/lg/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/lg/progress.dtd
+++ b/src/chrome/locale/lg/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ln/network-settings.dtd b/src/chrome/locale/ln/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/ln/network-settings.dtd
+++ b/src/chrome/locale/ln/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ln/progress.dtd b/src/chrome/locale/ln/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/ln/progress.dtd
+++ b/src/chrome/locale/ln/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/lo/network-settings.dtd b/src/chrome/locale/lo/network-settings.dtd
index bc62da0..7c0e752 100644
--- a/src/chrome/locale/lo/network-settings.dtd
+++ b/src/chrome/locale/lo/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "àºàº±àº?à»?àº? àº?à»?à»?à»?àº?àº?àºµà»? àº?àºµà»? àº?àº±àº?àº?àº²àº? àº¢à»?àº²àº? àº¥àº°àºàº½àº? àº?àºµà»?àºªàº¸àº? àº?à»?àº½àº§àº?àº±àº? àºªàº°àº?àº²àº? àº?àºàº? àº?à»?àº²àº??">
 <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "àº?àº³àº?àº»àº?àº?à»?àº²">
-<!ENTITY torSettings.connectPrompt2 "àº?à»?àºàº?àº?à»?àºàº?àº?àº²àº?à»?àº?àº·à»?àºàº¡à»?àº?àº?àº?àº»àº?àº?àº±àº?à»?àº?àº·àºàº?à»?àº²àº? Tor.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!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?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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 "àº?à»?àºàº? àº?àº²àº?àº?àº±à»?àº?àº?à»?àº² àº?àº£àº±àºàº?àº?àºµ à»?àº?àº»à»?àº²à»?àº?.">
 <!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
 <!ENTITY torSettings.bridgeQuestion "àº?àº¹à»?à»?àº«à»?àº?à»?àº¥àº´àº?àº²àº? àºàº´àº?à»?àº?àºµà»?àº?àº±àº? (ISP) àº?àº±àº?à»?àº§à»?àº?à»?à»? àº«àº¼àº·àº?à»?à»? àº?à»?à»?àº¡à»?àº? àº¡àºµàº?àº²àº?àº?àº§àº?àºªàºàº? àº?à»?àºàº?àº?àºµà»?àº?àº°à»?àº?àº·à»?àºàº¡àº?à»?à»?à»?àº?àº»à»?àº²àº?àº±àº?à»?àº?àº·àºàº?à»?àº²àº? Tor?">
-<!ENTITY torSettings.bridgeHelp "àº?à»?àº²àº?à»?àº²àº?àº?àº±àº?àº?à»?à»?à»?àº?à»?à»?àº?àº§à»?àº²àº?àº°àº?àºàº?àº?à»?àº²àº?àº²àº¡àº?àºµà»?à»?àº?àº§à»?àº?, à»?àº«à»?à»?àº¥àº·àºàº? No.&#160; àº?à»?àº²àº?à»?àº²àº?à»?àº¥àº·àº? Yes, àº?à»?àº²àº? àº?àº° àº?àº·àº?àº?àºàº? à»?àº«à»?àº?àº³àº?àº»àº?àº?à»?àº² Tor Bridge àº?àºµà»?àº?à»?à»?à»?àº?à»?àº¢àº¹à»?à»?àº?àº¥àº²àº?àº?àº²àº? àº?àº¶à»?àº?àº?àº°à»?àº®àº±àº?à»?àº«à»?àº«àº?àº¸à»?àº?àº?àº²àº?àº?àº·à»?àº¡ à»?àº?àº?àº²àº?àº?àº±à»?àº? àº?àº²àº?à»?àº?àº·à»?àºàº¡àº?à»?à»?à»?àº?àº»à»?àº²à»?àº?àº·àºàº?à»?àº²àº? 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 "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/lo/progress.dtd b/src/chrome/locale/lo/progress.dtd
index f364bd9..fb3aeb4 100644
--- a/src/chrome/locale/lo/progress.dtd
+++ b/src/chrome/locale/lo/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "àºªàº°àº?àº²àº?àº° Tor">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd
index c66d60d..78e4d6d 100644
--- a/src/chrome/locale/lt/network-settings.dtd
+++ b/src/chrome/locale/lt/network-settings.dtd
@@ -1,42 +1,48 @@
 <!ENTITY torsettings.dialog.title "Tor tinklo nustatymai">
 
 <!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+<!ENTITY torlauncher.localePicker.title "Tor Browser kalba">
+<!ENTITY torlauncher.localePicker.prompt "PraÅ¡ome pasirinkti kalbÄ?.">
 
 <!-- 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 "PrieÅ¡ tai, kaip prisijungsite prie Tor tinklo, jÅ«s turite pateikti informacijÄ? apie Å¡io kompiuterio interneto ryÅ¡Ä¯.">
 
 <!ENTITY torSettings.yes "Taip">
 <!ENTITY torSettings.no "Ne">
 
 <!ENTITY torSettings.firstQuestion "Kuris iÅ¡ Å¾emiau pateiktÅ³ apibrÄ?Å¾imÅ³ labiausiai atspindi JÅ«sÅ³ padÄ?tÄ¯?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings.">
-<!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.configurePrompt1 "Å io kompiuterio interneto ryÅ¡ys yra cenzÅ«ruojamas arba jungiamas per Ä¯galiotÄ?jÄ¯ serverÄ¯.">
+<!ENTITY torSettings.configurePrompt2 "PrieÅ¡ jungiantis prie Tor&#160;tinklo, man reikia sukonfigÅ«ruoti tinklÅ³ tiltÄ? ar vietinius Ä¯galiotojo serverio nustatymus.">
+<!ENTITY torSettings.configure "KonfigÅ«ruoti">
+<!ENTITY torSettings.connectPrompt2 "AÅ¡ norÄ?Ä?iau tiesiogiai prisijungti prie Tor tinklo.">
 <!ENTITY torSettings.connectPrompt3 "Tai suveiks daugeliu situacijÅ³.">
 <!ENTITY torSettings.connect "Prisijungti">
 
-<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
+<!ENTITY torSettings.proxyPageTitle "Vietinio Ä¯galiotojo serverio konfigÅ«racija">
 <!ENTITY torSettings.proxyQuestion "Ar Å¡is kompiuteris naudoja vietinÄ¯ proxy prisijungimui prie interneto?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!ENTITY torSettings.proxyExplanation1 "Daugelyje atveju, vietinis Ä¯galiotasis serveris yra nereikalingas, taÄ?iau jo gali prireikti, jungiantis per kompanijos, mokyklos ar universiteto tinklÄ?.">
+<!ENTITY torSettings.proxyExplanation2 "Jeigu nesate tikri kaip atsakyti Ä¯ Å¡Ä¯ klausimÄ?, paÅ¾iÅ«rÄ?kite interneto nustatymus kitoje narÅ¡yklÄ?je arba patikrinkite savo sistemos tinklo nustatymus, kad pamatytumÄ?te ar vietinis Ä¯galiotasis serveris yra reikalingas.">
 <!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "Ar jÅ«sÅ³ interneto paslaugÅ³ tiekÄ?jas (ISP) blokuoja ar kitaip cenzÅ«ruoja prisijungimus prie Tor tinklo?">
+<!ENTITY torSettings.bridgeExplanation1 "Jeigu nesate tikri kaip atsakyti Ä¯ Å¡Ä¯ klausimÄ?, pasirinkite Ne (jeigu negalite prisijungti prie Tor tinklo be tinklÅ³ tilto, jÅ«s galÄ?site jÄ¯ pridÄ?ti vÄ?liau).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Pakartotinai paleisti Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "JÅ«s esate sukofigÅ«ravÄ? Tor tinklÅ³ tiltus arba esate Ä¯vedÄ? vietinio Ä¯galiotojo serverio nustatymus.&#160; Tam, kad galÄ?tumÄ?te tiesiogiai prisijungti prie Tor tinklo, Å¡ie nustatymai privalo bÅ«ti paÅ¡alinti.">
+<!ENTITY torsettings.discardSettings.proceed "Å alinti nustatymus ir prisijungti">
 
 <!ENTITY torsettings.optional "NebÅ«tina">
 
-<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet">
+<!ENTITY torsettings.useProxy.checkbox "Å is kompiuteris turi naudoti vietinÄ¯ Ä¯galiotÄ?jÄ¯ serverÄ¯, kad gautÅ³ prieigÄ? prie internetÄ?.">
 <!ENTITY torsettings.useProxy.type "Proxy tipas:">
 <!ENTITY torsettings.useProxy.address "Adresas:">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
@@ -47,15 +53,16 @@
 <!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.firewall.allowedPorts "LeidÅ¾iami prievadai:">
+<!ENTITY torsettings.useBridges.checkbox "Mano interneto paslaugÅ³ tiekÄ?jas (ISP) blokuoja prisijungimus prie Tor tinklo">
 <!ENTITY torsettings.useBridges.default "Connect with provided bridges">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "Transport type:">
 <!ENTITY torsettings.useBridges.custom "Enter custom bridges">
 <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
 <!ENTITY torsettings.useBridges.placeholder "type address:port">
 
-<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
+<!ENTITY torsettings.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.&#160; 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:">
@@ -63,6 +70,6 @@
 <!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.&#160; 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.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ar 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&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/lt/progress.dtd b/src/chrome/locale/lt/progress.dtd
index 326cfcf..0989f9f 100644
--- a/src/chrome/locale/lt/progress.dtd
+++ b/src/chrome/locale/lt/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor bÅ«sena">
 <!ENTITY torprogress.openSettings "Atverti nustatymus">
 <!ENTITY torprogress.heading "Jungiamasi prie Tor tinklo">
-<!ENTITY torprogress.pleaseWait "PraÅ¡ome palaukti kol sujungsime su Tor tinklu.">
+<!ENTITY torprogress.pleaseWait "PraÅ¡ome palaukti, kol mes uÅ¾megsime ryÅ¡Ä¯ su Tor tinklu.&#160; Tai gali uÅ¾trukti kelias minutes.">
diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd
index 074d77f..3bd53a8 100644
--- a/src/chrome/locale/lv/network-settings.dtd
+++ b/src/chrome/locale/lv/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Kura situÄ?cija vislabÄ?k atbilst jÅ«sÄ?jai?">
 <!ENTITY torSettings.configurePrompt1 "Datora savienojums ar internetu ir cenzÄ?ts vai starpniekots.">
-<!ENTITY torSettings.configurePrompt2 "Man jÄ?nokonfigurÄ? tiltu vai lokÄ?lo starpniekserveru iestatÄ«jumi.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "KonfigurÄ?t">
-<!ENTITY torSettings.connectPrompt2 "Es vÄ?los tieÅ¡i pieslÄ?gties tÄ«klam Tor.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Å is strÄ?dÄ?s vairumÄ? gadÄ«jumu.">
 <!ENTITY torSettings.connect "Veidot savienojumu">
 
 <!ENTITY torSettings.proxyPageTitle "LokÄ?lÄ? starpniekservera konfigurÄ?Å¡ana">
 <!ENTITY torSettings.proxyQuestion "Vai Å¡im datoram jÄ?izmanto lokÄ?lais starpniekserveris, lai piekÄ¼Å«tu internetam?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Ja neesat pÄ?rliecinÄ?ts par atbildi uz Å¡o jautÄ?jumu, apskatiet cita pÄ?rlÅ«ka interneta iestatÄ«jumus, lai redzÄ?tu vai pÄ?rlÅ«ks ir nokonfigurÄ?ts lokÄ?la starpniekservera izmantoÅ¡anai. ">
+<!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 "Ievadiet starpnieka iestatÄ«jumus.">
 <!ENTITY torSettings.bridgePageTitle "Tor tiltu konfigurÄ?Å¡ana">
 <!ENTITY torSettings.bridgeQuestion "Vai JÅ«su interneta pakalpojumu sniedzÄ?js (ISP) bloÄ·Ä? vai savÄ?dÄ?k cenzÄ? savienojumus ar tÄ«klu Tor?">
-<!ENTITY torSettings.bridgeHelp "Ja nezinÄ?t atbildi, izvÄ?lieties No.&#160; ja izvÄ?lÄ?sities JÄ?, Jums lÅ«gs konfigurÄ?t Tor tiltus jeb Tor Bridges, proti, neuzskaitÄ«tus retranslatorus, kuri apgrÅ«tina savienojumu bloÄ·Ä?Å¡anu ar tÄ«klu 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 "JÅ«s varat izmantot piedÄ?vÄ?to tiltu kopumu vai varat ievadÄ«t tiltu pielÄ?gotu sarakstu. ">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Gaida, kamÄ?r Tor startÄ?s...">
 <!ENTITY torsettings.restartTor "RestartÄ?t Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "NeobligÄ?ts">
 
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "AtÄ¼autie porti:">
 <!ENTITY torsettings.useBridges.checkbox "Mans interneta pakalpojumu sniedzÄ?js (IPS) bloÄ·Ä? savienojumu izveidoÅ¡anu ar tÄ«klu Tor">
 <!ENTITY torsettings.useBridges.default "Veidot savienojumu ar piedÄ?vÄ?tajiem tiltiem">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "Transporta veids:">
 <!ENTITY torsettings.useBridges.custom "Ievadiet pielÄ?gotus tiltus">
 <!ENTITY torsettings.useBridges.label "Ievadiet vienu vai vairÄ?kus tilta retranslatorus (vienu rindÄ?).">
diff --git a/src/chrome/locale/lv/progress.dtd b/src/chrome/locale/lv/progress.dtd
index 3924775..2e1be38 100644
--- a/src/chrome/locale/lv/progress.dtd
+++ b/src/chrome/locale/lv/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor'a statuss">
 <!ENTITY torprogress.openSettings "AtvÄ?rt iestatÄ«jumus">
 <!ENTITY torprogress.heading "Veido savienojumu ar Tor'a tÄ«klu">
-<!ENTITY torprogress.pleaseWait "LÅ«dzu, gaidiet, kamÄ?r izveidojam savienojumu ar tÄ«klu Tor.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/mg/network-settings.dtd b/src/chrome/locale/mg/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/mg/network-settings.dtd
+++ b/src/chrome/locale/mg/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/mg/progress.dtd b/src/chrome/locale/mg/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/mg/progress.dtd
+++ b/src/chrome/locale/mg/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/mi/network-settings.dtd b/src/chrome/locale/mi/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/mi/network-settings.dtd
+++ b/src/chrome/locale/mi/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/mi/progress.dtd b/src/chrome/locale/mi/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/mi/progress.dtd
+++ b/src/chrome/locale/mi/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd
index d62a729..05cad9a 100644
--- a/src/chrome/locale/mk/network-settings.dtd
+++ b/src/chrome/locale/mk/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/mk/progress.dtd b/src/chrome/locale/mk/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/mk/progress.dtd
+++ b/src/chrome/locale/mk/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ml/network-settings.dtd b/src/chrome/locale/ml/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/ml/network-settings.dtd
+++ b/src/chrome/locale/ml/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ml/progress.dtd b/src/chrome/locale/ml/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/ml/progress.dtd
+++ b/src/chrome/locale/ml/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/mn/network-settings.dtd b/src/chrome/locale/mn/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/mn/network-settings.dtd
+++ b/src/chrome/locale/mn/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/mn/progress.dtd b/src/chrome/locale/mn/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/mn/progress.dtd
+++ b/src/chrome/locale/mn/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/mr/network-settings.dtd b/src/chrome/locale/mr/network-settings.dtd
index aa410db..c31e040 100644
--- a/src/chrome/locale/mr/network-settings.dtd
+++ b/src/chrome/locale/mr/network-settings.dtd
@@ -9,30 +9,36 @@
 <!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.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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "à¤?à¥?à¤¡à¤¾">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/mr/progress.dtd b/src/chrome/locale/mr/progress.dtd
index 9c675c1..e37501b 100644
--- a/src/chrome/locale/mr/progress.dtd
+++ b/src/chrome/locale/mr/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.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ms-MY/network-settings.dtd b/src/chrome/locale/ms-MY/network-settings.dtd
index 20a6de7..c7eb7d1 100644
--- a/src/chrome/locale/ms-MY/network-settings.dtd
+++ b/src/chrome/locale/ms-MY/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Antara berikut yang manakah terbaik menerangkan keadaan anda?">
 <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Konfigurasi">
-<!ENTITY torSettings.connectPrompt2 "Saya ingin berhubung terus kepada rangkaian Tor.">
+<!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 "Menyambung">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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 "Masukkan tetapan proksi.">
 <!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Menunggu Tor untuk dimulakan...">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Port yang dibenarkan:">
 <!ENTITY torsettings.useBridges.checkbox "Pembekal Perkhidmatan Internet saya (ISP) menghalang sambungan kepada rangkaian Tor">
 <!ENTITY torsettings.useBridges.default "Connect with provided bridges">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#160; 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 "Masukkan satu atau lebih bridge relay (satu per baris).">
diff --git a/src/chrome/locale/ms-MY/progress.dtd b/src/chrome/locale/ms-MY/progress.dtd
index f24ab09..1735116 100644
--- a/src/chrome/locale/ms-MY/progress.dtd
+++ b/src/chrome/locale/ms-MY/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Buka tetapan.">
 <!ENTITY torprogress.heading "Menyambung ke rangkaian Tor.">
-<!ENTITY torprogress.pleaseWait "Sila tunggu sementara kami wujudkan sambung ke rangkaian Tor. ">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/mt/network-settings.dtd b/src/chrome/locale/mt/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/mt/network-settings.dtd
+++ b/src/chrome/locale/mt/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/mt/progress.dtd b/src/chrome/locale/mt/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/mt/progress.dtd
+++ b/src/chrome/locale/mt/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/my/network-settings.dtd b/src/chrome/locale/my/network-settings.dtd
index b1adfef..a3d9240 100644
--- a/src/chrome/locale/my/network-settings.dtd
+++ b/src/chrome/locale/my/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "á??á?½á??á?ºá?·á??á?¼á?¯á??á?¬á?¸â??á??á?±á?¬ 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.&#160; 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).">
diff --git a/src/chrome/locale/my/progress.dtd b/src/chrome/locale/my/progress.dtd
index 7b35c53..97fdfb1 100644
--- a/src/chrome/locale/my/progress.dtd
+++ b/src/chrome/locale/my/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor á?¡á??á?±á?¡á??á?¬á?¸">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Tor á??á?½á??á?ºá??á??á?ºá??á?á?¯ á??á??á?ºá??á?½á??á?ºá??á?±á??á??á?º">
-<!ENTITY torprogress.pleaseWait "Tor á??á?½á??á?ºá??á??á?ºá??á?¾á??á?ºá?· á??á?»á?á??á?ºá??á??á?ºá??á?¾á?¯á??á?¼á?¯â??á??á?¯á??á?ºá??á?±á??á?¥á?ºá??á?±á?¬á??á?ºá?·á??á?á?¯á??á?ºá?¸á??á?±á?¸á??á?«á??">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/nah/network-settings.dtd b/src/chrome/locale/nah/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/nah/network-settings.dtd
+++ b/src/chrome/locale/nah/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/nah/progress.dtd b/src/chrome/locale/nah/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/nah/progress.dtd
+++ b/src/chrome/locale/nah/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/nap/network-settings.dtd b/src/chrome/locale/nap/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/nap/network-settings.dtd
+++ b/src/chrome/locale/nap/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/nap/progress.dtd b/src/chrome/locale/nap/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/nap/progress.dtd
+++ b/src/chrome/locale/nap/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb/network-settings.dtd
index 1bc8963..802253c 100644
--- a/src/chrome/locale/nb/network-settings.dtd
+++ b/src/chrome/locale/nb/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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 "Jeg trenger Ã¥ konfigurere en bro eller lokale mellomtjener innstillinger.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Konfigurer">
-<!ENTITY torSettings.connectPrompt2 "Jeg vil koble direkte til Tor-nettverket.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Dette vil fungere i de fleste situasjoner.">
 <!ENTITY torSettings.connect "Koble til">
 
 <!ENTITY torSettings.proxyPageTitle "Lokal proxy-konfigurasjon">
 <!ENTITY torSettings.proxyQuestion "Trenger denne maskinen Ã¥ bruke en lokal mellomtjener for Ã¥ nÃ¥ Internett?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Dersom du er usikker pÃ¥ hvordan du skal svare pÃ¥ dette spÃ¸rsmÃ¥let, sjekk Internett innstillingene i en annen nettleser for Ã¥ se om den er konfigurert til Ã¥ bruke en lokal mellomtjener.">
+<!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.bridgePageTitle "Oppsett av Tor-broer.">
 <!ENTITY torSettings.bridgeQuestion "Blokkerer eller sensurerer internettleverandÃ¸ren (ISP) din tilkoblinger til Tor-nettverket?">
-<!ENTITY torSettings.bridgeHelp "Hvis du er usikker pÃ¥ hva du skal svare pÃ¥ dette spÃ¸rsmÃ¥let, velg Nei.&#160; Hvis du velger Ja, vil du bli bedt om Ã¥ konfigurere Tor-broer, som er ulistede relÃ©er som gjÃ¸r det vanskeligere Ã¥ blokkere 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.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.restartTor "Omstart av Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Valgfritt">
 
@@ -50,6 +56,7 @@
 <!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.&#160; If one bridge does not work, try again using a different one.">
 <!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).">
@@ -60,7 +67,7 @@
 <!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.&#160; 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.bridgeHelp2Heading "Via nettet">
-<!ENTITY torsettings.bridgeHelp2 "Bruk en nettleser for Ã¥ besÃ¸ke https://bridges.torproject.org";>
+<!ENTITY torsettings.bridgeHelp2 "Bruk en nettleser for Ã¥ besÃ¸ke https://bridges.torproject.org/?lang=nb";>
 <!ENTITY torsettings.bridgeHelp3Heading "Via e-post autosvar">
 <!ENTITY torsettings.bridgeHelp3.emailDesc "Send en e-post til bridges@xxxxxxxxxxxxxx med 'get bridges' enten i emnefeltet eller i meldingen.&#160; For Ã¥ gjÃ¸re det vanskeligere for en angriper Ã¥ ta rede pÃ¥ en mengde bro-adresser, mÃ¥ du sende denne forespÃ¸rselen fra en av fÃ¸lgende i listen over e-posttilbydere (opplistet etter preferanse):">
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, eller https://mail.yahoo.com";>
diff --git a/src/chrome/locale/nb/progress.dtd b/src/chrome/locale/nb/progress.dtd
index 3052326..2d7049a 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.openSettings "Ã?pne Innstillinger">
 <!ENTITY torprogress.heading "Kobler til Tor-nettverket">
-<!ENTITY torprogress.pleaseWait "Vennligst vent mens vi etablerer en forbindelse til Tor-nettverket.">
+<!ENTITY torprogress.pleaseWait "Vennligst vent mens vi oppretter en tilkobling til Tor-nettverket.&#160; Dette kan ta flere minutter.">
diff --git a/src/chrome/locale/nds/network-settings.dtd b/src/chrome/locale/nds/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/nds/network-settings.dtd
+++ b/src/chrome/locale/nds/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/nds/progress.dtd b/src/chrome/locale/nds/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/nds/progress.dtd
+++ b/src/chrome/locale/nds/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ne/network-settings.dtd b/src/chrome/locale/ne/network-settings.dtd
index a853c53..aea700a 100644
--- a/src/chrome/locale/ne/network-settings.dtd
+++ b/src/chrome/locale/ne/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "à¤?à¤¡à¤¾à¤¨ à¤?à¤°à¥?à¤¨à¥?à¤¹à¥?à¤¸à¥? ">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ne/progress.dtd b/src/chrome/locale/ne/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/ne/progress.dtd
+++ b/src/chrome/locale/ne/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/nl-BE/network-settings.dtd b/src/chrome/locale/nl-BE/network-settings.dtd
index 0cb285b..95f0a12 100644
--- a/src/chrome/locale/nl-BE/network-settings.dtd
+++ b/src/chrome/locale/nl-BE/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Welke van devolgende situaties beschrijft uw situatie het best?">
 <!ENTITY torSettings.configurePrompt1 "De Internet connectie van deze computer is gecensureerd of connecteert via een proxy.">
-<!ENTITY torSettings.configurePrompt2 "Ik dien bridge of lokale proxy instellingen te configureren.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configureer">
-<!ENTITY torSettings.connectPrompt2 "Ik zou direct naar het Tor netwerk willen connecteren.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Dit zal werken in de meeste situaties.">
 <!ENTITY torSettings.connect "Verbinden">
 
 <!ENTITY torSettings.proxyPageTitle "Lokale Proxy Configuratie.">
 <!ENTITY torSettings.proxyQuestion "Gebruikt deze computer een lokale proxy om verbinding te maken met het Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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 "Geef de proxy instellingen in">
 <!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuratie">
 <!ENTITY torSettings.bridgeQuestion "Blokkeert of censureert uw internetleverancier (ISP) connecties naar het Tor netwerk?">
-<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Wachten tot Tor opstart...">
 <!ENTITY torsettings.restartTor "Tor herstarten">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optioneel">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/nl-BE/progress.dtd b/src/chrome/locale/nl-BE/progress.dtd
index 40774a0..9d01a14 100644
--- a/src/chrome/locale/nl-BE/progress.dtd
+++ b/src/chrome/locale/nl-BE/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Instellingen">
 <!ENTITY torprogress.heading "Connecteren naar het Tor netwerk">
-<!ENTITY torprogress.pleaseWait "Gelieve te wachten tot we een connectie opzetten naar het Tor netwerk.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd
index 5415366..ab35d6b 100644
--- a/src/chrome/locale/nl/network-settings.dtd
+++ b/src/chrome/locale/nl/network-settings.dtd
@@ -13,26 +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 "Ik moet de instellingen van bridge of lokale proxy aanpassen.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configureren">
-<!ENTITY torSettings.connectPrompt2 "Ik zou graag rechtstreeks met het Tor-netwerk verbinden.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!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.proxyHelp "Als je niet zeker weet hoe deze vraag te beantwoorden, kijk naar de internetinstellingen in een andere browser om te zien of deze is geconfigureerd om een lokale proxy te gebruiken.">
+<!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 "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.bridgeHelp "Als je niet zeker weet hoe je deze vraag moet beantwoorden, kies dan Nee.&#160; Als je Ja kiest, moet je Tor bridges instellen, die doordat ze geen bekende relays zijn het moeilijker maken om verbindingen met het Tor-netwerk te blokkeren.">
+<!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 "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.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Facultatief">
 
@@ -50,6 +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.&#160; If one bridge does not work, try again using a different one.">
 <!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).">
diff --git a/src/chrome/locale/nl/progress.dtd b/src/chrome/locale/nl/progress.dtd
index 89b7b7c..fb513ad 100644
--- a/src/chrome/locale/nl/progress.dtd
+++ b/src/chrome/locale/nl/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor status">
 <!ENTITY torprogress.openSettings "Open Instellingen">
 <!ENTITY torprogress.heading "Bezig met verbinden met het Tor-netwerk">
-<!ENTITY torprogress.pleaseWait "Wacht alstublieft terwijl we een verbinding met het Tor-netwerk tot stand brengen.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/nn/network-settings.dtd b/src/chrome/locale/nn/network-settings.dtd
index 8a75a1f..4bd82f0 100644
--- a/src/chrome/locale/nn/network-settings.dtd
+++ b/src/chrome/locale/nn/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "Eg vil kopla til direkte til Tor-nettverket.">
+<!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.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?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Start Tor pÃ¥ nytt">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Valfritt">
 
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Tillatne portar:">
 <!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.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "Transporttype:">
 <!ENTITY torsettings.useBridges.custom "Enter custom bridges">
 <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
diff --git a/src/chrome/locale/nn/progress.dtd b/src/chrome/locale/nn/progress.dtd
index 90fe3e6..0664105 100644
--- a/src/chrome/locale/nn/progress.dtd
+++ b/src/chrome/locale/nn/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor-status">
 <!ENTITY torprogress.openSettings "Opne innstillingar">
 <!ENTITY torprogress.heading "Koplar til Tor-nettverket">
-<!ENTITY torprogress.pleaseWait "Gjer vel og vent medan me opprettar samband med Tor-nettverket.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/nso/network-settings.dtd b/src/chrome/locale/nso/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/nso/network-settings.dtd
+++ b/src/chrome/locale/nso/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/nso/progress.dtd b/src/chrome/locale/nso/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/nso/progress.dtd
+++ b/src/chrome/locale/nso/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/oc/network-settings.dtd b/src/chrome/locale/oc/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/oc/network-settings.dtd
+++ b/src/chrome/locale/oc/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/oc/progress.dtd b/src/chrome/locale/oc/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/oc/progress.dtd
+++ b/src/chrome/locale/oc/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/or/network-settings.dtd b/src/chrome/locale/or/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/or/network-settings.dtd
+++ b/src/chrome/locale/or/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/or/progress.dtd b/src/chrome/locale/or/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/or/progress.dtd
+++ b/src/chrome/locale/or/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/pa/network-settings.dtd b/src/chrome/locale/pa/network-settings.dtd
index 4270144..127f5c6 100644
--- a/src/chrome/locale/pa/network-settings.dtd
+++ b/src/chrome/locale/pa/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "à¨¸à©°à¨°à¨?à¨¨à¨¾">
-<!ENTITY torSettings.connectPrompt2 "à¨®à©?à¨? à¨?à©?à¨° à¨¨à©?à©±à¨?à¨µà¨°à¨? à¨¨à¨¾à¨² à¨¸à¨¿à©±à¨§à¨¾ à¨?à©?à¨¨à©?à¨?à¨? à¨¹à©?à¨£à¨¾ à¨?à¨¾à¨¹à©?à©°à¨¦à¨¾/à¨?à¨¾à¨¹à©?à©°à¨¦à©? à¨¹à¨¾à¨?à¥¤">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!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?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "...à¨?à©?à¨° à¨¶à©?à¨°à©? à¨¹à©?à¨£ à¨¤à©±à¨? à¨?à¨¡à©?à¨?à©?">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "à¨?à©?à¨£à¨µà¨¾à¨?">
 
@@ -50,6 +56,7 @@
 <!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 "à¨¦à¨¿à©±à¨¤à©? à¨¬à¨°à¨¿à©? à¨°à¨¾à¨¹à©?à¨? à¨?à©?à¨¨à©?à¨?à¨?">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "à¨?à¨°à¨¾à¨?à¨¸à¨ªà©?à¨°à¨? à¨?à¨¿à¨¸à¨®:">
 <!ENTITY torsettings.useBridges.custom "à¨ªà¨¸à©°à¨¦à©?à¨¦à¨¾ à¨¬à¨°à¨¿à©±à©? à¨¦à¨¿à¨?">
 <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
diff --git a/src/chrome/locale/pa/progress.dtd b/src/chrome/locale/pa/progress.dtd
index 0a1de0c..ec821bc 100644
--- a/src/chrome/locale/pa/progress.dtd
+++ b/src/chrome/locale/pa/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "à¨?à©?à¨° à¨¸à¨¥à¨¿à¨¤à©?">
 <!ENTITY torprogress.openSettings "à¨¸à©?à¨?à¨¿à©°à¨? à¨?à©?à¨²à©?à¨¹à©?">
 <!ENTITY torprogress.heading "à¨?à©?à¨° à¨¨à©?à©±à¨?à¨µà¨°à¨? à¨¨à¨¾à¨² à¨?à©?à¨¨à©?à¨?à¨? à¨?à©?à¨¤à¨¾ à¨?à¨¾ à¨°à¨¿à¨¹à¨¾ à¨¹à©?">
-<!ENTITY torprogress.pleaseWait "à¨¸à¨¾à¨¡à©? à¨µà¨²à©?à¨? à¨?à©?à¨° à¨¨à©?à©±à¨?à¨µà¨°à¨? à¨¨à¨¾à¨² à¨?à©?à¨¨à©?à¨?à¨¶à¨¨ à¨¤à¨¿à¨?à¨° à¨?à¨°à¨¨ à¨¤à©±à¨? à¨?à¨¡à©?à¨? à¨?à©?à¨° à¨?à©?à¥¤">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/pap/network-settings.dtd b/src/chrome/locale/pap/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/pap/network-settings.dtd
+++ b/src/chrome/locale/pap/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/pap/progress.dtd b/src/chrome/locale/pap/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/pap/progress.dtd
+++ b/src/chrome/locale/pap/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd
index a7af06b..42180fa 100644
--- a/src/chrome/locale/pl/network-settings.dtd
+++ b/src/chrome/locale/pl/network-settings.dtd
@@ -13,26 +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 "MuszÄ? skonfigurowaÄ? bridge lub lokalne ustawienia proxy.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Konfiguruj">
-<!ENTITY torSettings.connectPrompt2 "ChcÄ? poÅ?Ä?czyÄ? siÄ? bezpoÅ?rednio z sieciÄ? Tor.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!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.proxyHelp "JeÅ?li nie jesteÅ? pewny jak odpowiedzieÄ? na to pytanie, to sprawdÅº swoje ustawienia internetu w innej przeglÄ?darce, aby zobaczyÄ? czy ma ona skonfigurowane lokalne proxy.">
+<!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 "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.bridgeHelp "JeÅ?li nie jesteÅ? pewny odpowiedzi na to pytanie proszÄ? wybraÄ? odpowiedÅº Nie.&#160; JeÅ?li wybierzesz Tak, to bÄ?dziesz poproszony o skonfigurowanie mostkÃ³w Tora, ktÃ³re nie sÄ? publicznie wymienione, dziÄ?ki czemu bÄ?dzie trudniej zablokowaÄ? poÅ?Ä?czenia do 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.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.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "(opcjonalnie)">
 
@@ -50,6 +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.&#160; If one bridge does not work, try again using a different one.">
 <!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)">
diff --git a/src/chrome/locale/pl/progress.dtd b/src/chrome/locale/pl/progress.dtd
index f8d75cc..f30af87 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 "Poczekaj chwilÄ?, aÅ¼ ustanowimy poÅ?Ä?czenie z sieciÄ? Tor.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/pms/network-settings.dtd b/src/chrome/locale/pms/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/pms/network-settings.dtd
+++ b/src/chrome/locale/pms/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/pms/progress.dtd b/src/chrome/locale/pms/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/pms/progress.dtd
+++ b/src/chrome/locale/pms/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ps/network-settings.dtd b/src/chrome/locale/ps/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/ps/network-settings.dtd
+++ b/src/chrome/locale/ps/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ps/progress.dtd b/src/chrome/locale/ps/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/ps/progress.dtd
+++ b/src/chrome/locale/ps/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd
index 4bb00f0..1379f93 100644
--- a/src/chrome/locale/pt-BR/network-settings.dtd
+++ b/src/chrome/locale/pt-BR/network-settings.dtd
@@ -13,26 +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 "Eu preciso configurar as configuraÃ§Ãµes de ponte ou de proxy local.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configurar">
-<!ENTITY torSettings.connectPrompt2 "Eu gostaria de me conectar diretamente Ã  rede Tor.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!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.proxyHelp "Se vocÃª nÃ£o tiver certeza de como responder a esta pergunta, dÃª uma olhada nas configuraÃ§Ãµes de Internet de um outro navegador para ver se ele estÃ¡ configurado para usar um proxy local.">
+<!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 "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.bridgeHelp "Se vocÃª nÃ£o estiver seguro sobre como responder a essa questÃ£o, escolha NÃ£o&#160;. Se vocÃª escolher Sim, serÃ¡ preciso configurar pontes Tor, que sÃ£o retransmissores nÃ£o-listados que dificultam possÃveis bloqueios Ã  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.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.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Opcional">
 
@@ -50,14 +56,15 @@
 <!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.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "Tipo de transporte:">
 <!ENTITY torsettings.useBridges.custom "Adicionar pontes personalizadas">
-<!ENTITY torsettings.useBridges.label "Insira um ou mais retransmissores de pontes (um por linha).">
+<!ENTITY torsettings.useBridges.label "Insira um ou mais relÃ©s de pontes (um por linha).">
 <!ENTITY torsettings.useBridges.placeholder "tipo de endereÃ§o:porta">
 
 <!ENTITY torsettings.copyLog "Copiar o registro do Tor na Ã¡rea de transferÃªncia">
-<!ENTITY torsettings.bridgeHelpTitle "Ajuda Retransmissor 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.&#160;. Normalmente, Ã© possÃvel contornar esse problema utilizando Pontes Tor, que sÃ£o retransmissores ocultos (nÃ£o listados), mais difÃceis de bloquear.">
+<!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.&#160;. 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.bridgeHelp2Heading "AtravÃ©s da Web">
 <!ENTITY torsettings.bridgeHelp2 "Use um navegador internet para visitar https://bridges.torproject.org";>
diff --git a/src/chrome/locale/pt-BR/progress.dtd b/src/chrome/locale/pt-BR/progress.dtd
index f41b13c..b2f8eb3 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 "Por favor, aguarde enquanto nÃ³s estabelecemos uma conexÃ£o Ã  rede Tor.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/pt-BR/torlauncher.properties b/src/chrome/locale/pt-BR/torlauncher.properties
index 0c56aff..295770d 100644
--- a/src/chrome/locale/pt-BR/torlauncher.properties
+++ b/src/chrome/locale/pt-BR/torlauncher.properties
@@ -39,13 +39,13 @@ torlauncher.forAssistance=Para assistÃªncia, contacte
 
 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.
 
-torlauncher.bootstrapStatus.conn_dir=Conectando a um diretÃ³rio de retransmissores
+torlauncher.bootstrapStatus.conn_dir=Conectando a um diretÃ³rio de relÃ©s
 torlauncher.bootstrapStatus.handshake_dir=Estabelecendo uma conexÃ£o de diretÃ³rio criptografado
 torlauncher.bootstrapStatus.requesting_status=Recebendo estado da rede
 torlauncher.bootstrapStatus.loading_status=Carregando estado da rede
 torlauncher.bootstrapStatus.loading_keys=Carregando certificados de autoridade
-torlauncher.bootstrapStatus.requesting_descriptors=Requisitando informaÃ§Ãµes do retransmissor
-torlauncher.bootstrapStatus.loading_descriptors=Carregando informaÃ§Ãµes do retransmissor
+torlauncher.bootstrapStatus.requesting_descriptors=Requisitando informaÃ§Ãµes do relÃ©
+torlauncher.bootstrapStatus.loading_descriptors=Carregando informaÃ§Ãµes do relÃ©
 torlauncher.bootstrapStatus.conn_or=Conectando Ã  rede Tor
 torlauncher.bootstrapStatus.handshake_or=Estabelecendo um circuito Tor
 torlauncher.bootstrapStatus.done=Conectado Ã  rede Tor!
diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd
index 7790807..03dfb80 100644
--- a/src/chrome/locale/pt/network-settings.dtd
+++ b/src/chrome/locale/pt/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Qual das seguintes frases melhor descreve a sua situaÃ§Ã£o?">
 <!ENTITY torSettings.configurePrompt1 "Esta ligaÃ§Ã£o Ã  Internet deste computador estÃ¡ censurada ou Ã© efetuada via proxy.">
-<!ENTITY torSettings.configurePrompt2 "Eu preciso de configurar a ponte ou as definiÃ§Ãµes de proxy local.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configurar">
-<!ENTITY torSettings.connectPrompt2 "Eu gostaria de me ligar diretamente Ã  rede Tor.">
+<!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.connect "Ligar">
 
 <!ENTITY torSettings.proxyPageTitle "ConfiguraÃ§Ã£o do Proxy Local">
 <!ENTITY torSettings.proxyQuestion "Este computador precisa de utilizar um proxy para aceder Ã  Internet.">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Se nÃ£o tem a certeza de como responder a esta questÃ£o, procure nas definiÃ§Ãµes da Internet de outro navegador para ver se este estÃ¡ configurado para utilizar um proxy local.">
+<!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 "Insira as definiÃ§Ãµes do proxy.">
 <!ENTITY torSettings.bridgePageTitle "ConfiguraÃ§Ã£o das Pontes Tor">
 <!ENTITY torSettings.bridgeQuestion "O seu Provedor de ServiÃ§os da Internet (ISP) bloqueia ou entÃ£o censura as ligaÃ§Ãµes Ã  Rede Tor?">
-<!ENTITY torSettings.bridgeHelp "Se nÃ£o tem a certeza de como responder a esta questÃ£o, escolha No.&#160; Se escolher 'Sim', ser-lhe-Ã¡ pedido para configurar as Pontes do Tor, que sÃ£o retransmissÃµes nÃ£o listadas e que torna mais difÃcil o bloqueio das ligaÃ§Ãµ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.bridgeSettingsPrompt "PoderÃ¡ utilizar o conjunto de pontes fornecido ou poderÃ¡ obter um conjunto de pontes personalizadas.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "A aguardar que o Tor inicie...">
 <!ENTITY torsettings.restartTor "Reiniciar o Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Opcional">
 
@@ -50,6 +56,7 @@
 <!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">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "Tipo de transporte:">
 <!ENTITY torsettings.useBridges.custom "Insira as pontes personalizadas">
 <!ENTITY torsettings.useBridges.label "Insira uma ou mais retransmissÃµes de ponte (uma por linha).">
diff --git a/src/chrome/locale/pt/progress.dtd b/src/chrome/locale/pt/progress.dtd
index 473438c..85cf672 100644
--- a/src/chrome/locale/pt/progress.dtd
+++ b/src/chrome/locale/pt/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Estado do Tor">
 <!ENTITY torprogress.openSettings "Abrir ConfiguraÃ§Ãµes">
 <!ENTITY torprogress.heading "A conetar Ã  rede Tor">
-<!ENTITY torprogress.pleaseWait "Por favor, aguarde, enquanto nÃ³s estabelecemos uma ligaÃ§Ã£o Ã  rede Tor">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd
index 5e77179..1ab990d 100644
--- a/src/chrome/locale/ro/network-settings.dtd
+++ b/src/chrome/locale/ro/network-settings.dtd
@@ -13,26 +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 "Am nevoie sÄ? configurez puntea sau configurÄ?rile locale proxy.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "ConfiguraÅ£i ">
-<!ENTITY torSettings.connectPrompt2 "Vreau sa ma conectez direct la reÅ£eaua Tor .">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!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.proxyHelp "DacÄ? nu È?tii sigur cum sÄ? rÄ?spunzi la aceastÄ? Ã®ntrebare, uitÄ?-te la setÄ?rile de Internet Ã®ntr-un alt browser pentru a vedea dacÄ? este configurat sÄ? foloseascÄ? un proxy local.">
+<!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 "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.bridgeHelp "DacÄ? nu sÃ®nteÈ?i sigur cum sÄ? rÄ?spundeÈ?i la aceastÄ? Ã®ntrebare, alegeÈ?i Nu.&#160; DacÄ? alegeÈ?i Da, vi se va cere sÄ? configuraÈ?i punÈ?ile Tor, care sÃ®nt relayuri nelistate care fac mai dificilÄ? blocarea conexiunilor la 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.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.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "OpÈ?ional">
 
@@ -50,6 +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.&#160; If one bridge does not work, try again using a different one.">
 <!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).">
diff --git a/src/chrome/locale/ro/progress.dtd b/src/chrome/locale/ro/progress.dtd
index f81f1b2..bda4ccc 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 "AÈ?teptaÈ?i pÃ®nÄ? stabilim o conexiune la reÈ?eaua Tor.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd
index 41072da..fbf9702 100644
--- a/src/chrome/locale/ru/network-settings.dtd
+++ b/src/chrome/locale/ru/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Ð§Ñ?Ð¾ Ð»Ñ?Ñ?Ñ?Ðµ Ð¾Ð¿Ð¸Ñ?Ñ?Ð²Ð°ÐµÑ? Ð²Ð°Ñ?Ñ? Ñ?Ð¸Ñ?Ñ?Ð°Ñ?Ð¸Ñ??">
 <!ENTITY torSettings.configurePrompt1 "Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ?Ñ?Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿Ñ?Ñ?Ñ?ÐµÑ?Ð° Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ñ?Ñ? Ð¸Ð»Ð¸ Ð½Ð°Ñ?Ð¾Ð´Ð¸Ñ?Ñ?Ñ? Ð·Ð° Ð¿Ñ?Ð¾ÐºÑ?Ð¸.">
-<!ENTITY torSettings.configurePrompt2 "Ð?Ð½Ðµ Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ñ?ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð¼Ð¾Ñ?Ñ?Ð° Ð¸Ð»Ð¸ Ð»Ð¾ÐºÐ°Ð»Ñ?Ð½Ð¾Ð³Ð¾ Ð¿Ñ?Ð¾ÐºÑ?Ð¸">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ñ?">
-<!ENTITY torSettings.connectPrompt2 "Ð¯ Ð±Ñ? Ñ?Ð¾Ñ?ÐµÐ» Ñ?Ð¾ÐµÐ´Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ñ? Ñ? Ñ?ÐµÑ?Ñ?Ñ? Tor Ð½Ð°Ð¿Ñ?Ñ?Ð¼Ñ?Ñ?.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "ÐÑ?Ð¾ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñ?Ð°Ð±Ð¾Ñ?Ð°Ñ?Ñ? Ð² Ð±Ð¾Ð»Ñ?Ñ?Ð¸Ð½Ñ?Ñ?Ð²Ðµ Ñ?Ð¸Ñ?Ñ?Ð°Ñ?Ð¸Ð¹.">
 <!ENTITY torSettings.connect "Ð¡Ð¾ÐµÐ´Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ñ?">
 
 <!ENTITY torSettings.proxyPageTitle "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð»Ð¾ÐºÐ°Ð»Ñ?Ð½Ð¾Ð³Ð¾ Ð¿Ñ?Ð¾ÐºÑ?Ð¸">
 <!ENTITY torSettings.proxyQuestion "Ð¢Ñ?ÐµÐ±Ñ?ÐµÑ?Ñ?Ñ? Ð»Ð¸ Ñ?Ñ?Ð¾Ð¼Ñ? ÐºÐ¾Ð¼Ð¿Ñ?Ñ?Ñ?ÐµÑ?Ñ? Ð»Ð¾ÐºÐ°Ð»Ñ?Ð½Ñ?Ð¹ Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð´Ð»Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð° Ðº Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ñ??">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Ð?Ñ?Ð»Ð¸ Ð?Ñ? Ð½Ðµ Ñ?Ð²ÐµÑ?ÐµÐ½Ñ? Ð² Ð¾Ñ?Ð²ÐµÑ?Ðµ Ð½Ð° Ñ?Ñ?Ð¾Ñ? Ð²Ð¾Ð¿Ñ?Ð¾Ñ?, Ð¿Ð¾Ñ?Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ð° Ð² Ð´Ñ?Ñ?Ð³Ð¾Ð¼ Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ðµ, Ñ?Ñ?Ð¾Ð±Ñ? Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ñ?, Ð½Ð°Ñ?Ñ?Ñ?Ð¾ÐµÐ½ Ð»Ð¸ Ð¾Ð½ Ð´Ð»Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ? Ð»Ð¾ÐºÐ°Ð»Ñ?Ð½Ð¾Ð³Ð¾ Ð¿Ñ?Ð¾ÐºÑ?Ð¸.">
+<!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 "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð¿Ñ?Ð¾ÐºÑ?Ð¸.">
 <!ENTITY torSettings.bridgePageTitle "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ñ?Ð»Ñ?Ð·Ð¾Ð² Tor">
 <!ENTITY torSettings.bridgeQuestion "Ð?Ð°Ñ? Ð¿Ñ?Ð¾Ð²Ð°Ð¹Ð´ÐµÑ? (ISP) Ð±Ð»Ð¾ÐºÐ¸Ñ?Ñ?ÐµÑ? Ð¸Ð»Ð¸ ÐºÐ°Ðº-Ð»Ð¸Ð±Ð¾ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ñ?ÐµÑ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ðº Ñ?ÐµÑ?Ð¸ Tor?">
-<!ENTITY torSettings.bridgeHelp "Ð?Ñ?Ð»Ð¸ Ð²Ñ? Ð½Ðµ Ð·Ð½Ð°ÐµÑ?Ðµ, ÐºÐ°Ðº Ð¾Ñ?Ð²ÐµÑ?Ð¸Ñ?Ñ? Ð½Ð° Ñ?Ñ?Ð¾Ñ? Ð²Ð¾Ð¿Ñ?Ð¾Ñ?, Ð²Ñ?Ð±Ð¸Ñ?Ð°Ð¹Ñ?Ðµ Ð?ÐµÑ?.&#160; Ð?Ñ?Ð»Ð¸ Ð²Ñ? Ð²Ñ?Ð±ÐµÑ?ÐµÑ?Ðµ Ð?Ð°, Ð²Ð°Ñ? Ð¿Ð¾Ð¿Ñ?Ð¾Ñ?Ñ?Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ñ? 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 "Ð?Ñ? Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ñ?ÐµÐ´Ð¾Ð¿Ñ?ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ñ?Ð¹ Ð½Ð°Ð±Ð¾Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ð¸Ð»Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¸ Ð²Ð²ÐµÑ?Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ?Ð¾Ðº Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ð²Ñ?Ñ?Ñ?Ð½Ñ?Ñ?.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Ð?Ð¶Ð¸Ð´Ð°Ð½Ð¸Ðµ Ð·Ð°Ð¿Ñ?Ñ?ÐºÐ° Tor...">
 <!ENTITY torsettings.restartTor "Ð?ÐµÑ?ÐµÐ·Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ñ? Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Ð?ÐµÐ¾Ð±Ñ?Ð·Ð°Ñ?ÐµÐ»Ñ?Ð½Ð¾">
 
@@ -50,6 +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.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "Ð¢Ð¸Ð¿ Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?Ð°:">
 <!ENTITY torsettings.useBridges.custom "Ð?Ð²ÐµÑ?Ñ?Ð¸ Ð¼Ð¾Ñ?Ñ?Ñ? Ð²Ñ?Ñ?Ñ?Ð½Ñ?Ñ?">
 <!ENTITY torsettings.useBridges.label "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ð¾Ð´Ð¸Ð½ Ð¸Ð»Ð¸ Ð½ÐµÑ?ÐºÐ¾Ð»Ñ?ÐºÐ¾ Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð¾Ð² Ñ?Ð¸Ð¿Ð° Ð¼Ð¾Ñ?Ñ? (Ð¾Ð´Ð¸Ð½ Ð½Ð° Ñ?Ñ?Ñ?Ð¾ÐºÑ?)">
diff --git a/src/chrome/locale/ru/progress.dtd b/src/chrome/locale/ru/progress.dtd
index 47827da..aa09819 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 "Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸Ñ?Ðµ, Ð¿Ð¾ÐºÐ° Ð±Ñ?Ð´ÐµÑ? Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ? Ñ?ÐµÑ?Ñ?Ñ? Tor.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ru@petr1708/network-settings.dtd b/src/chrome/locale/ru@petr1708/network-settings.dtd
index 3c1d225..9987337 100644
--- a/src/chrome/locale/ru@petr1708/network-settings.dtd
+++ b/src/chrome/locale/ru@petr1708/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ru@petr1708/progress.dtd b/src/chrome/locale/ru@petr1708/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/ru@petr1708/progress.dtd
+++ b/src/chrome/locale/ru@petr1708/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sco/network-settings.dtd b/src/chrome/locale/sco/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/sco/network-settings.dtd
+++ b/src/chrome/locale/sco/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/sco/progress.dtd b/src/chrome/locale/sco/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/sco/progress.dtd
+++ b/src/chrome/locale/sco/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/si-LK/network-settings.dtd b/src/chrome/locale/si-LK/network-settings.dtd
index 0ef880c..d5c5fb1 100644
--- a/src/chrome/locale/si-LK/network-settings.dtd
+++ b/src/chrome/locale/si-LK/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "à¶´à·?à¶ à·?à¶¯à·?à¶±à·? à¶?à·?à¶¸à¶?à·? à¶?à¶¶à¶?à·? à¶à¶à·?à¶à·?à·?à¶º à·?à·?à¶¯à·?à¶±à·?à¶¸ à·?à·?à·?à·?à¶à¶» à¶?à¶»à¶ºà·?à¶¯?">
 <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "à·?à·?à¶±à·?â??à¶ºà·?à·? à¶?à¶»à¶±à·?à¶±">
-<!ENTITY torSettings.connectPrompt2 "à¶¸à¶¸ à¶?à¶¢à·?à·?à¶¸ Tor à¶¢à·?à¶½à¶º à·?à·? à·?à¶¸à·?à¶¶à¶±à·?à¶°  à·?à·?à¶¸à¶§ à¶?à·?à¶¸à¶à·?à¶º.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "à·?à¶¸à·?à¶¶à¶±à·?à¶° à·?à·?à¶±à·?à¶±">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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 "à¶±à·?à¶ºà·?à¶à·? à·?à·?à·?à·?à¶¯à·?à¶ºà¶? à·?à·?à¶?à·?à·?à¶¸à·? à¶?à¶à·?à·?à¶à·? à¶?à¶»à¶±à·?à¶±">
 <!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "TOR à¶?à¶»à¶¸à·?à¶· à·?à¶±à¶à·?à¶»à·? â?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "à¶?à¶¸à¶à¶»">
 
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "à¶?à¶±à·?à¶¸à¶ Ports">
 <!ENTITY torsettings.useBridges.checkbox "à¶¸à·?à¶?à·? à¶?à¶±à·?à¶à¶»à·?à¶¢à·?à¶½ à·?à·?à·?à·? à·?à¶´à¶ºà¶±à·?à¶±à·?(ISP) à·?à·?à·?à·?à¶±à·? TOR  à¶¢à·?à¶½à¶º à·?à¶¯à·?à·? à·?à¶¶à¶¯à¶à·?à·?à¶º à¶?à·?à·?à·?à¶» à¶?à¶» à¶?à¶.">
 <!ENTITY torsettings.useBridges.default "Connect with provided bridges">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#160; 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).">
diff --git a/src/chrome/locale/si-LK/progress.dtd b/src/chrome/locale/si-LK/progress.dtd
index f1d7045..6377cf4 100644
--- a/src/chrome/locale/si-LK/progress.dtd
+++ b/src/chrome/locale/si-LK/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.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sk-SK/network-settings.dtd b/src/chrome/locale/sk-SK/network-settings.dtd
index 8520626..81deede 100644
--- a/src/chrome/locale/sk-SK/network-settings.dtd
+++ b/src/chrome/locale/sk-SK/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "KtorÃ¡ z nasledujÃºcich situÃ¡ciÃ najlepÅ¡ie popisuje vaÅ¡u?">
 <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "KonfigurovaÅ¥">
-<!ENTITY torSettings.connectPrompt2 "RÃ¡d by som sa pripojil priamo do siete Tor.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Toto by vo vÃ¤Ä?Å¡ine prÃpadov malo fungovaÅ¥.">
 <!ENTITY torSettings.connect "PripojiÅ¥">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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 "Zadajte nastavenia proxy.">
 <!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
 <!ENTITY torSettings.bridgeQuestion "Blokuje vÃ¡Å¡ poskytovateÄ¾ internetovÃ©ho pripojenia (ISP) alebo inak cenzuruje pripojenia do siete Tor Network?">
-<!ENTITY torSettings.bridgeHelp "Ak si nie ste istÃ, ako odpovedaÅ¥, zvoÄ¾te Nie.&#160; Ak zvolÃte Ã?no, bude potrebnÃ© nakonfigurovaÅ¥ Tor Bridges, Ä?o sÃº nikde nezapÃsanÃ© relÃ©, pouÅ¾itie ktorÃ½ch robÃ blokovanie pripojenia do Tor Network eÅ¡te obtiaÅ¾nejÅ¡Ãm.">
+<!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 "MÃ´Å¾ete pouÅ¾iÅ¥ dodanÃº sadu premostenÃ alebo si mÃ´Å¾ete zaobstaraÅ¥ a zadaÅ¥ vlastnÃº sadu premostenÃ.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Ä?akanie na Å¡tart Toru...">
 <!ENTITY torsettings.restartTor "ReÅ¡tartovaÅ¥ Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "VoliteÄ¾nÃ©">
 
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "PovolenÃ© porty:">
 <!ENTITY torsettings.useBridges.checkbox "MÃ´j poskytovateÄ¾ internetovÃ©ho pripojenia blokuje spojenie do siete Tor">
 <!ENTITY torsettings.useBridges.default "PripojiÅ¥ sa cez dodanÃ© premostenia">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "Typ transportu:">
 <!ENTITY torsettings.useBridges.custom "Zadajte vlastnÃ© premostenia">
 <!ENTITY torsettings.useBridges.label "Zadaj jedno alebo viac premostenÃ relÃ© (jedno na riadok).">
diff --git a/src/chrome/locale/sk-SK/progress.dtd b/src/chrome/locale/sk-SK/progress.dtd
index cdf3509..58926c8 100644
--- a/src/chrome/locale/sk-SK/progress.dtd
+++ b/src/chrome/locale/sk-SK/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "OtvoriÅ¥ nastavenia">
 <!ENTITY torprogress.heading "PripÃ¡janie do siete Tor ">
-<!ENTITY torprogress.pleaseWait "Ä?akajte, prosÃm, kÃ½m sa vytvorÃ spojenie do siete Tor.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sk/network-settings.dtd b/src/chrome/locale/sk/network-settings.dtd
index 4360063..5826392 100644
--- a/src/chrome/locale/sk/network-settings.dtd
+++ b/src/chrome/locale/sk/network-settings.dtd
@@ -1,7 +1,7 @@
 <!ENTITY torsettings.dialog.title "SieÅ¥ovÃ© Nastavenia Tor">
 
 <!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
+<!ENTITY torlauncher.localePicker.title "Jazyk PrehliadaÄ?a Tor">
 <!ENTITY torlauncher.localePicker.prompt "ProsÃm vyberte si jazyk">
 
 <!-- For "first run" wizard: -->
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "KtorÃ© z nasledujÃºcich moÅ¾nostÃ najlepÅ¡ie opisuje VaÅ¡u situÃ¡ciu?">
 <!ENTITY torSettings.configurePrompt1 "Pripojenie tohto poÄ?ÃtaÄ?a k Internetu je cenzurovanÃ©, filtrovanÃ© alebo sprostredkovÃ¡vanÃ©.">
-<!ENTITY torSettings.configurePrompt2 "Potrebujem nastaviÅ¥ premostenie alebo lokÃ¡lne proxy nastavenia.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "KonfigurÃ¡cia">
-<!ENTITY torSettings.connectPrompt2 "Chcem sa pripojiÅ¥ priamo do siete Tor.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Toto bude vo vÃ¤Ä?Å¡ine prÃpadov fungovaÅ¥.">
 <!ENTITY torSettings.connect "PripojiÅ¥">
 
 <!ENTITY torSettings.proxyPageTitle "LokÃ¡lne proxy nastavenie">
 <!ENTITY torSettings.proxyQuestion "Potrebuje tento poÄ?ÃtaÄ? pouÅ¾ÃvaÅ¥ lokÃ¡lne proxy k prÃstupu na internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Ak si nie ste istÃ½ ako odpovedaÅ¥ na tÃºto otÃ¡zku, pozrite sa do internetovÃ½ch nastavenÃ inÃ©ho prehliadaÄ?a aby ste pochopili Ä?i je nastavenÃ½ tak aby pouÅ¾Ãval lokÃ¡lne proxy.">
+<!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 "VstÃºpiÅ¥ do nastavenÃ proxy.">
 <!ENTITY torSettings.bridgePageTitle "Nastavenie Tor premostenÃ">
 <!ENTITY torSettings.bridgeQuestion "Blokuje alebo nejak cenzuruje vÃ¡Å¡ PoskytovateÄ¾ Internetu (ISP) pripojenia k Sieti Tor?">
-<!ENTITY torSettings.bridgeHelp "Ak ste si nie istÃ½ ako zodpovedaÅ¥ tÃºto otÃ¡zku, zvoÄ¾te Nie.&#160; Ak zvolÃte Ã?no, budete vyzvanÃ½ na konfigurÃ¡ciu Mostov Toru, Ä?o sÃº nezaradenÃ© relÃ© znaÄ?ne sÅ¥aÅ¾ujÃºce blokovanie pripojenÃ k Sieti 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 "MÃ´Å¾ete pouÅ¾iÅ¥ poskytnutÃº sadu mostov alebo zÃskaÅ¥ a vloÅ¾iÅ¥ vlastnÃº sadu.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Ä?akÃ¡m kÃ½m sa Tor spustÃ...">
 <!ENTITY torsettings.restartTor "ReÅ¡tartujte Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "VoliteÄ¾nÃ©">
 
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "PovolenÃ© porty:">
 <!ENTITY torsettings.useBridges.checkbox "MÃ´j InternetovÃ½ provider (ISP) blokuje pripojenia do siete Toru">
 <!ENTITY torsettings.useBridges.default "PripojiÅ¥ sa s poskytnutÃ½mi mostami">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "PrepravnÃ½ typ:">
 <!ENTITY torsettings.useBridges.custom "VloÅ¾iÅ¥ vlastnÃ© mosty">
 <!ENTITY torsettings.useBridges.label "VloÅ¾te jedno alebo viacero relÃ© premostenÃ (kaÅ¾dÃ© do novÃ©ho riadka).">
diff --git a/src/chrome/locale/sk/progress.dtd b/src/chrome/locale/sk/progress.dtd
index 81c3a1a..fcb403f 100644
--- a/src/chrome/locale/sk/progress.dtd
+++ b/src/chrome/locale/sk/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor status">
 <!ENTITY torprogress.openSettings "Otvor nastavenia">
 <!ENTITY torprogress.heading "PripÃ¡janie do siete Tor">
-<!ENTITY torprogress.pleaseWait "ProsÃme poÄ?kajte kÃ½m nadviaÅ¾eme spojenie so sieÅ¥ou Toru.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sl-SI/network-settings.dtd b/src/chrome/locale/sl-SI/network-settings.dtd
index e80491f..a5b4388 100644
--- a/src/chrome/locale/sl-SI/network-settings.dtd
+++ b/src/chrome/locale/sl-SI/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Kaj od sledeÄ?ega najbolj ustzrezno opisuje vaÅ¡o situacijo?">
 <!ENTITY torSettings.configurePrompt1 "Ta raÄ?unalniÅ¡ka internet povezava je cenzurirana ali neposredna.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Oblikovanje">
-<!ENTITY torSettings.connectPrompt2 "HoÄ?em se neposredno povezati na Tor omreÅ¾je.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "To deluje v veÄ?ini primerov.">
 <!ENTITY torSettings.connect "Povezava">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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 "Vnesite nastavitve streÅ¾nika proxy.">
 <!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
 <!ENTITY torSettings.bridgeQuestion "Ali vaÅ¡ internetni ponudnik (ISP) blokira ali kako drugaÄ?e cenzurira povezavo na Tor omreÅ¾je?">
-<!ENTITY torSettings.bridgeHelp "Ä?e niste prepriÄ?ani kako odgovoriti na to vpraÅ¡anje, izberite Ne.&#160; Ä?e ste izbrali Da, boste morali nastaviti Tor premostitve na nenaÅ¡teta vozliÅ¡Ä?a, za teÅ¾je blokiranje povezave na Tor omreÅ¾je.">
+<!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 "Lahko uporabite pripravljene nastavitve povezav ali pridobite in vnesete obiÄ?ajne nastavitve povezav.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Ä?akanje na zagon Tor-a...">
 <!ENTITY torsettings.restartTor "Ponovno zaÅ¾enite Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Po izbiri">
 
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Dovoljena vrata:">
 <!ENTITY torsettings.useBridges.checkbox "Moj internetni ponudnik (ISP) blokira povezave na Tor omreÅ¾je">
 <!ENTITY torsettings.useBridges.default "Povezava z ponujeno premostitvijo">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "Tip prometa:">
 <!ENTITY torsettings.useBridges.custom "Vnesite obiÄ?ajne premostitve">
 <!ENTITY torsettings.useBridges.label "Vnesite enega ali veÄ? premostitvenih vozliÅ¡Ä? (vsakega v svojo vrsto)">
diff --git a/src/chrome/locale/sl-SI/progress.dtd b/src/chrome/locale/sl-SI/progress.dtd
index 3153326..95372f9 100644
--- a/src/chrome/locale/sl-SI/progress.dtd
+++ b/src/chrome/locale/sl-SI/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor stanje">
 <!ENTITY torprogress.openSettings "Odpri Nastavitve">
 <!ENTITY torprogress.heading "Povezovanje v Tor omreÅ¾je">
-<!ENTITY torprogress.pleaseWait "Prosim poÄ?akajte, da se stabilizira povezava v Tor omreÅ¾je.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sl/network-settings.dtd b/src/chrome/locale/sl/network-settings.dtd
index 31e1cfc..73ef092 100644
--- a/src/chrome/locale/sl/network-settings.dtd
+++ b/src/chrome/locale/sl/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!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 "PoveÅ¾i">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/sl/progress.dtd b/src/chrome/locale/sl/progress.dtd
index d62303a..5d12bf5 100644
--- a/src/chrome/locale/sl/progress.dtd
+++ b/src/chrome/locale/sl/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor stanje">
 <!ENTITY torprogress.openSettings "Odpri nastavitve">
 <!ENTITY torprogress.heading "Povezovanje v Tor omreÅ¾je">
-<!ENTITY torprogress.pleaseWait "PoÄ?akajte, da vzpostavimo povezavo s Tor omreÅ¾jem">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sn/network-settings.dtd b/src/chrome/locale/sn/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/sn/network-settings.dtd
+++ b/src/chrome/locale/sn/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/sn/progress.dtd b/src/chrome/locale/sn/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/sn/progress.dtd
+++ b/src/chrome/locale/sn/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/so/network-settings.dtd b/src/chrome/locale/so/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/so/network-settings.dtd
+++ b/src/chrome/locale/so/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/so/progress.dtd b/src/chrome/locale/so/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/so/progress.dtd
+++ b/src/chrome/locale/so/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/son/network-settings.dtd b/src/chrome/locale/son/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/son/network-settings.dtd
+++ b/src/chrome/locale/son/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/son/progress.dtd b/src/chrome/locale/son/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/son/progress.dtd
+++ b/src/chrome/locale/son/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sq-AL/network-settings.dtd b/src/chrome/locale/sq-AL/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/sq-AL/network-settings.dtd
+++ b/src/chrome/locale/sq-AL/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/sq-AL/progress.dtd b/src/chrome/locale/sq-AL/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/sq-AL/progress.dtd
+++ b/src/chrome/locale/sq-AL/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sq/network-settings.dtd b/src/chrome/locale/sq/network-settings.dtd
index 9a627e9..228d865 100644
--- a/src/chrome/locale/sq/network-settings.dtd
+++ b/src/chrome/locale/sq/network-settings.dtd
@@ -13,26 +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 "MÃ« duhet tÃ« konfiguroj urÃ«n ose parametrat e proxy-t.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Konfiguroni">
-<!ENTITY torSettings.connectPrompt2 "Do tÃ« dÃ«shiroja tÃ« lidhesha drejtpÃ«rdrejt me rrjetin e Tor.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!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.proxyHelp "NÃ«se s'jeni i sigurt sesi t'i pÃ«rgjigjeni kÃ«saj pyetje, shikoni tek konfigurimi i Internetit nÃ« njÃ« tjetÃ«r shfletues, pÃ«r tÃ« parÃ« nÃ«se ai Ã«shtÃ« i konfiguruar pÃ«r tÃ« pÃ«rdorur njÃ« proxy lokal.">
+<!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 "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.bridgeHelp "NÃ«se s'jeni i sigurt sesi t'i pÃ«rgjigjeni kÃ«saj pyetje, pÃ«rzgjidhni &quot;Jo&quot;.&#160; NÃ«se pÃ«rzgjidhni &quot;Po&quot;, 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.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 "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.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Me zgjedhje">
 
@@ -50,6 +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.&#160; If one bridge does not work, try again using a different one.">
 <!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)">
diff --git a/src/chrome/locale/sq/progress.dtd b/src/chrome/locale/sq/progress.dtd
index 8138a00..167ecd2 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 "Ju lutemi prisni derisa tÃ« vendoset njÃ« lidhje me rrjetin Tor">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd
index 0883ccf..f4f9098 100644
--- a/src/chrome/locale/sr/network-settings.dtd
+++ b/src/chrome/locale/sr/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Ð¨Ñ?Ð° Ð¾Ð´ Ð¿Ð¾Ð½Ñ?Ñ?ÐµÐ½Ð¾Ð³ Ð½Ð°Ñ?Ð±Ð¾Ñ?Ðµ Ð¾Ð¿Ð¸Ñ?Ñ?Ñ?Ðµ Ð?Ð°Ñ?Ñ? Ñ?Ð¸Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ñ??">
 <!ENTITY torSettings.configurePrompt1 "Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? ÐºÐ¾Ð½ÐµÐºÑ?Ð¸Ñ?Ð° Ð¾Ð²Ð¾Ð³ Ñ?Ð°Ñ?Ñ?Ð½Ð°Ñ?Ð° Ñ?Ðµ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð° Ð¸Ð»Ð¸ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð¾Ð²Ð°Ð½Ð°.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Ð?Ð¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð¸">
-<!ENTITY torSettings.connectPrompt2 "Ð?ÐµÐ»ÐµÐ¾ Ð±Ð¸Ñ? Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ¶ÐµÐ¼ Ð´Ð¸Ñ?ÐµÐºÑ?Ð½Ð¾ Ð½Ð° Ð¢Ð¾Ñ? Ð¼Ñ?ÐµÐ¶Ñ?.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Ð?Ð²Ð¾ Ñ?Ðµ Ñ?Ð°Ð´Ð¸Ñ?Ð¸ Ñ? Ð²ÐµÑ?Ð¸Ð½Ð¸ Ñ?Ð¸Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ð°.">
 <!ENTITY torSettings.connect "Ð?Ð¾Ð²ÐµÐ¶Ð¸ Ñ?Ðµ">
 
 <!ENTITY torSettings.proxyPageTitle "Konfiguracija lokalnog proksija">
 <!ENTITY torSettings.proxyQuestion "Da li ovaj kompjuter koristi lokalni proksi kao pristup internetu?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Ako niste sigurni kako da odgovorite na ovo pitanje, pogledajte internet podeÅ¡avanja u drugom brauzeruda biste utvrdili da li je konfigurisan da koristi lokalni proksi.">
+<!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 "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ proxy Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð°.">
 <!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
 <!ENTITY torSettings.bridgeQuestion "Ð?Ð° Ð»Ð¸ Ð?Ð°Ñ? Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÑ?Ð²Ð¸Ñ? Ð¿Ñ?Ð¾Ð²Ð°Ñ?Ð´ÐµÑ? (Ð?Ð¡Ð?) Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð° Ð¸Ð»Ð¸ Ð½Ð° Ð½ÐµÐºÐ¸ Ð´Ñ?Ñ?Ð³Ð¸ Ð½Ð°Ñ?Ð¸Ð½ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° Ð¢Ð¾Ñ? Ð¼Ñ?ÐµÐ¶Ñ??">
-<!ENTITY torSettings.bridgeHelp "Ð?ÐºÐ¾ Ð½Ð¸Ñ?Ñ?Ðµ Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¸ ÐºÐ°ÐºÐ¾ Ð´Ð° Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð¸Ñ?Ðµ Ð½Ð° Ð¾Ð²Ð¾ Ð¿Ð¸Ñ?Ð°Ñ?Ðµ, Ð¸Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð?Ðµ.&#160; Ð?ÐºÐ¾ Ð¸Ð·Ð°Ð±ÐµÑ?ÐµÑ?Ðµ Ð?Ð°, Ð±Ð¸Ñ?ÐµÑ?Ðµ Ð·Ð°Ð¼Ð¾Ñ?ÐµÐ½Ð¸ Ð´Ð° Ð¿Ð¾Ð´ÐµÑ?Ð¸Ñ?Ðµ Ð¢Ð¾Ñ? Ð?Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ, ÐºÐ¾Ñ?Ð¸ Ñ?Ñ? Ð½ÐµÐ¸Ð·Ð»Ð¸Ñ?Ñ?Ð°Ð½Ð¸ Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ð½Ð¸Ñ?Ð¸ Ñ?Ð¸Ñ?Ð° Ñ?Ðµ Ñ?Ð»Ð¾Ð³Ð° Ð´Ð° Ð¾Ñ?ÐµÐ¶Ð°Ð²Ð°Ñ?Ñ? Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ð° Ð½Ð° Ð¢Ð¾Ñ? Ð¼Ñ?ÐµÐ¶Ñ?.">
+<!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 "Ð?Ð¾Ð¶ÐµÑ?Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð¸ Ð¿Ð¾Ð½Ñ?Ñ?ÐµÐ½Ð¸ Ñ?ÐµÑ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð° Ð¸Ð»Ð¸ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ð¸ Ð¸Ð»Ð¸ Ñ?Ð½ÐµÑ?Ð¸ Ð¶ÐµÑ?ÐµÐ½Ð¸ Ñ?ÐµÑ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Ð§ÐµÐºÐ°Ð¼Ð¾ Ð´Ð° Ñ?Ðµ Ð¢Ð¾Ñ? Ð¿Ð¾ÐºÑ?ÐµÐ½Ðµ...">
 <!ENTITY torsettings.restartTor "Ð?Ð¾Ð½Ð¾Ð²Ð¾ Ð¿Ð¾ÐºÑ?ÐµÐ½Ð¸ Ð¢Ð¾Ñ?">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Ð?Ð¿Ñ?Ð¸Ð¾Ð½Ð¾">
 
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Ð?Ð¾Ð·Ð²Ð¾Ñ?ÐµÐ½Ð¸ Ð?Ð¾Ñ?Ñ?Ð¾Ð²Ð¸:">
 <!ENTITY torsettings.useBridges.checkbox "Ð?Ð¾Ñ? Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÑ?Ð²Ð¸Ñ? Ð¿Ñ?Ð¾Ð²Ð°Ñ?Ð´ÐµÑ? (Ð?Ð¡Ð?) Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð° Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° Ð¢Ð¾Ñ? Ð¼Ñ?ÐµÐ¶Ñ?.">
 <!ENTITY torsettings.useBridges.default "Ð?Ð¾Ð²ÐµÐ¶Ð¸Ñ?Ðµ Ñ?Ðµ Ñ?Ð° Ð¿Ð¾Ð½Ñ?Ñ?ÐµÐ½Ð¸Ð¼ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð¸Ð¼Ð°">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "Ð?Ñ?Ñ?Ñ?Ð° Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?Ð°:">
 <!ENTITY torsettings.useBridges.custom "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð¶ÐµÑ?ÐµÐ½Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ">
 <!ENTITY torsettings.useBridges.label "Unesite jedan ili viÅ¡e releja mostova (u svakom redu po jedan).">
diff --git a/src/chrome/locale/sr/progress.dtd b/src/chrome/locale/sr/progress.dtd
index 5e5f506..ef5e90c 100644
--- a/src/chrome/locale/sr/progress.dtd
+++ b/src/chrome/locale/sr/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Ð¢Ð¾Ñ? Ñ?Ñ?Ð°Ñ?Ñ?Ñ?">
 <!ENTITY torprogress.openSettings "Ð?Ñ?Ð²Ð¾Ñ?Ð¸ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð°">
 <!ENTITY torprogress.heading "Ð?Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° Ð¢Ð¾Ñ? Ð¼Ñ?ÐµÐ¶Ñ?">
-<!ENTITY torprogress.pleaseWait "Ð?Ð¾Ð»Ð¸Ð¼Ð¾ Ð²Ð°Ñ? Ñ?Ð°Ñ?ÐµÐºÐ°Ñ?Ñ?Ðµ Ð´Ð¾Ðº Ñ?Ñ?Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ð¸Ð¼Ð¾ Ð²ÐµÐ·Ñ? Ñ?Ð° Ð¢Ð¾Ñ? Ð¼Ñ?ÐµÐ¶Ð¾Ð¼">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sr@latin/network-settings.dtd b/src/chrome/locale/sr@latin/network-settings.dtd
index 331278d..dcb6891 100644
--- a/src/chrome/locale/sr@latin/network-settings.dtd
+++ b/src/chrome/locale/sr@latin/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Koji od ponuÄ?enih najbolje opisuje vaÅ¡u situaciju?">
 <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "KonfiguriÅ¡i">
-<!ENTITY torSettings.connectPrompt2 "Å½elim da se direktno poveÅ¾em na Tor mreÅ¾u.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Ovo Ä?e raditi u veÄ?ini situacija.">
 <!ENTITY torSettings.connect "Povezivanje">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Da li ovaj kompjuter koristi lokalni proksi za pristup internetu?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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 "Unesite vaÅ¡a proksi podeÅ¡avanja.">
 <!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restartovanje Tor-a">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Opciono">
 
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Dozvoljeni portovi: ">
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/sr@latin/progress.dtd b/src/chrome/locale/sr@latin/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/sr@latin/progress.dtd
+++ b/src/chrome/locale/sr@latin/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/st/network-settings.dtd b/src/chrome/locale/st/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/st/network-settings.dtd
+++ b/src/chrome/locale/st/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/st/progress.dtd b/src/chrome/locale/st/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/st/progress.dtd
+++ b/src/chrome/locale/st/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/su/network-settings.dtd b/src/chrome/locale/su/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/su/network-settings.dtd
+++ b/src/chrome/locale/su/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/su/progress.dtd b/src/chrome/locale/su/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/su/progress.dtd
+++ b/src/chrome/locale/su/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd
index c53103f..19fcb74 100644
--- a/src/chrome/locale/sv/network-settings.dtd
+++ b/src/chrome/locale/sv/network-settings.dtd
@@ -13,26 +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 "Jag behÃ¶ver konfigurera brygg- eller proxyinstÃ¤llningar.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Konfigurera">
-<!ENTITY torSettings.connectPrompt2 "Jag vill ansluta direkt till Tor-nÃ¤tverket.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!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.proxyHelp "Om du Ã¤r osÃ¤ker pÃ¥ svaret pÃ¥ frÃ¥gan, titta pÃ¥ InternetinstÃ¤llningarna i en annan webblÃ¤sare fÃ¶r att se om den Ã¤r konfigurerad att anvÃ¤nda en lokal proxy.">
+<!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 "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.bridgeHelp "Om du Ã¤r osÃ¤ker pÃ¥ hur du ska svara pÃ¥ den hÃ¤r frÃ¥gan, vÃ¤lj Nej.&#160; Om du vÃ¤ljer Ja kommer du ombes att konfigurera Tor-bryggor, vilka Ã¤r olistade relÃ¤er som gÃ¶r det svÃ¥rare att blockera 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.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.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Valfri">
 
@@ -50,6 +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.&#160; If one bridge does not work, try again using a different one.">
 <!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).">
diff --git a/src/chrome/locale/sv/progress.dtd b/src/chrome/locale/sv/progress.dtd
index c42db4e..7ac45ca 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 "VÃ¤nta medan vi upprÃ¤ttar en anslutning till Tor-nÃ¤tverket.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sw/network-settings.dtd b/src/chrome/locale/sw/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/sw/network-settings.dtd
+++ b/src/chrome/locale/sw/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/sw/progress.dtd b/src/chrome/locale/sw/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/sw/progress.dtd
+++ b/src/chrome/locale/sw/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/szl/network-settings.dtd b/src/chrome/locale/szl/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/szl/network-settings.dtd
+++ b/src/chrome/locale/szl/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/szl/progress.dtd b/src/chrome/locale/szl/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/szl/progress.dtd
+++ b/src/chrome/locale/szl/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ta/network-settings.dtd b/src/chrome/locale/ta/network-settings.dtd
index 5e1479c..7ffc083 100644
--- a/src/chrome/locale/ta/network-settings.dtd
+++ b/src/chrome/locale/ta/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "à®?à®?à¯?à®?à®®à¯?à®?à¯?à®?">
-<!ENTITY torSettings.connectPrompt2 "à®¨à®¾à®©à¯? Tor à®µà®²à¯?à®¯à®®à¯?à®ªà¯?à®ªà®¿à®²à¯? à®¨à¯?à®°à®?à®¿à®¯à®¾à®? à®?à®£à¯?à®?à¯?à®? à®µà®¿à®°à¯?à®®à¯?à®ªà¯?à®?à®¿à®±à¯?à®©à¯?.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "à®?à®£à¯?à®?à¯?à®?">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Tor à®¤à¯?à®¾à®?à®?à¯?à®?à¯?à®µà®¤à®±à¯?à®?à¯? à®?à®¾à®¤à¯?à®¤à®¿à®°à¯?à®?à¯?à®?à®¿à®±à®¤à¯?...">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "à®µà®¿à®°à¯?à®ªà¯?à®ªà®¤à¯?à®¤à¯?à®°à¯?à®µà¯?">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ta/progress.dtd b/src/chrome/locale/ta/progress.dtd
index b8570e4..3bbd799 100644
--- a/src/chrome/locale/ta/progress.dtd
+++ b/src/chrome/locale/ta/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 "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/te-IN/network-settings.dtd b/src/chrome/locale/te-IN/network-settings.dtd
index 8943c47..c19ed8a 100644
--- a/src/chrome/locale/te-IN/network-settings.dtd
+++ b/src/chrome/locale/te-IN/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/te-IN/progress.dtd b/src/chrome/locale/te-IN/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/te-IN/progress.dtd
+++ b/src/chrome/locale/te-IN/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/te/network-settings.dtd b/src/chrome/locale/te/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/te/network-settings.dtd
+++ b/src/chrome/locale/te/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/te/progress.dtd b/src/chrome/locale/te/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/te/progress.dtd
+++ b/src/chrome/locale/te/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/tg/network-settings.dtd b/src/chrome/locale/tg/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/tg/network-settings.dtd
+++ b/src/chrome/locale/tg/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/tg/progress.dtd b/src/chrome/locale/tg/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/tg/progress.dtd
+++ b/src/chrome/locale/tg/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/th/network-settings.dtd b/src/chrome/locale/th/network-settings.dtd
index 23ad049..c97495e 100644
--- a/src/chrome/locale/th/network-settings.dtd
+++ b/src/chrome/locale/th/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "à¸ªà¸´à¹?à¸?à¸?à¹?à¸à¹?à¸?à¸?à¸µà¹?à¸à¸±à¸?à¹?à¸«à¸?à¸?à¹?à¸²à¸?à¸?à¸µà¹?à¸?à¸£à¸£à¸¢à¸²à¸¢à¸¥à¸±à¸?à¸©à¸?à¸°à¸ªà¸?à¸²à¸?à¸?à¸²à¸£à¸?à¹?à¸?à¸à¸?à¸?à¸¸à¸?">
 <!ENTITY torSettings.configurePrompt1 "à¸?à¸²à¸£à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸à¸à¸´à¸?à¹?à¸?à¸à¸£à¹?à¹?à¸?à¹?à¸?à¸?à¸à¸?à¸?à¸à¸¡à¸?à¸´à¸§à¹?à¸?à¸à¸£à¹?à¹?à¸?à¸£à¸·à¹?à¸à¸?à¸?à¸µà¹?à¸?à¸¹à¸?à¸?à¸£à¸§à¸?à¸ªà¸à¸?à¸«à¸£à¸·à¸à¸¡à¸µà¸?à¸²à¸£à¹?à¸?à¹?à¸?à¸£à¹?à¸à¸?à¸?à¸µà¹?">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "à¸?à¸£à¸±à¸?à¹?à¸?à¹?à¸?">
-<!ENTITY torSettings.connectPrompt2 "à¸?à¸±à¸?à¸à¸¢à¸²à¸?à¸?à¸°à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸à¹?à¸?à¸¢à¸?à¸£à¸?à¸?à¸±à¸?à¹?à¸?à¸£à¸·à¸à¸?à¹?à¸²à¸¢ Tor">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!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?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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 "à¹?à¸ªà¹?à¸?à¹?à¸²à¸?à¸´à¸?à¸?à¸±à¹?à¸?à¸?à¸£à¹?à¸à¸?à¸?à¸µ">
 <!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
 <!ENTITY torSettings.bridgeQuestion "à¸?à¸¹à¹?à¹?à¸«à¹?à¸?à¸£à¸´à¸?à¸²à¸£à¸à¸´à¸?à¹?à¸?à¸à¸£à¹?à¹?à¸?à¹?à¸? (ISP) à¸?à¸à¸?à¸?à¸¸à¸?à¸?à¸´à¸?à¸?à¸±à¹?à¸?à¸«à¸£à¸·à¸à¸?à¸±à¸?à¸?à¸£à¸à¸?à¸?à¸²à¸£à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸à¹?à¸?à¸¢à¸±à¸?à¹?à¸?à¸£à¸·à¸à¸?à¹?à¸²à¸¢ Tor à¸«à¸£à¸·à¸à¹?à¸¡à¹??">
-<!ENTITY torSettings.bridgeHelp "à¸?à¹?à¸²à¸?à¸¸à¸?à¹?à¸¡à¹?à¹?à¸?à¹?à¹?à¸? à¸?à¸à¸?à¹?à¸¡à¹?&#160; à¸?à¹?à¸²à¸?à¸¸à¸?à¸?à¸à¸?à¹?à¸?à¹? à¸?à¸¸à¸?à¸?à¸°à¸?à¹?à¸à¸?à¸?à¸±à¹?à¸?à¸?à¹?à¸² Tor Bridge à¸?à¸¶à¹?à¸?à¹?à¸?à¹?à¸?à¸£à¸µà¹?à¸¥à¸¢à¹?à¸?à¸µà¹?à¹?à¸¡à¹?à¸?à¸¹à¸?à¸¥à¸´à¸ªà¸?à¹?à¹?à¸§à¹?à¹?à¸¥à¸°à¸?à¹?à¸§à¸¢à¹?à¸«à¹?à¹?à¸?à¹?à¸?à¹?à¸?à¹?à¸?à¹?à¸¢à¸²à¸?à¸?à¸¶à¹?à¸?à¸?à¸µà¹?à¸?à¸°à¸?à¸´à¸?à¸?à¸±à¹?à¸?à¸?à¸²à¸£à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸à¹?à¸?à¸¢à¸±à¸?à¹?à¸?à¸£à¸·à¸à¸?à¹?à¸²à¸¢ 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 "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "à¸£à¸à¹?à¸«à¹? Tor à¹?à¸£à¸´à¹?à¸¡à¸?à¸³à¸?à¸²à¸?...">
 <!ENTITY torsettings.restartTor "à¹?à¸£à¸´à¹?à¸¡à¸?à¸²à¸£à¸?à¸³à¸?à¸²à¸?à¸?à¸à¸? Tor à¹?à¸«à¸¡à¹?">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "à¸?à¸±à¸§à¹?à¸¥à¸·à¸à¸?">
 
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "à¸?à¸à¸£à¹?à¸?à¸?à¸µà¹?à¸à¸?à¸¸à¸?à¸²à¸?:">
 <!ENTITY torsettings.useBridges.checkbox "à¸?à¸¹à¹?à¹?à¸«à¹?à¸?à¸£à¸´à¸?à¸²à¸£à¸à¸´à¸?à¹?à¸?à¸à¸£à¹?à¹?à¸?à¹?à¸? (à¹?à¸à¹?à¸à¸ªà¸?à¸µ) à¸?à¸à¸?à¸?à¸±à¸? à¸?à¸´à¸?à¸?à¸±à¹?à¸?à¸?à¸²à¸£à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸à¸?à¸±à¸?à¹?à¸?à¸£à¸·à¸à¸?à¹?à¸²à¸¢ Tor">
 <!ENTITY torsettings.useBridges.default "Connect with provided bridges">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#160; 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 "à¹?à¸ªà¹?à¸ªà¸°à¸?à¸²à¸?à¸£à¸µà¹?à¸¥à¸¢à¹?à¸à¸¢à¹?à¸²à¸?à¸?à¹?à¸à¸¢à¸«à¸?à¸¶à¹?à¸?à¸à¸±à¸? (à¸?à¸£à¸£à¸?à¸±à¸?à¸¥à¸°à¸à¸±à¸?)">
diff --git a/src/chrome/locale/th/progress.dtd b/src/chrome/locale/th/progress.dtd
index 839aade..002e38f 100644
--- a/src/chrome/locale/th/progress.dtd
+++ b/src/chrome/locale/th/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 "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ti/network-settings.dtd b/src/chrome/locale/ti/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/ti/network-settings.dtd
+++ b/src/chrome/locale/ti/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ti/progress.dtd b/src/chrome/locale/ti/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/ti/progress.dtd
+++ b/src/chrome/locale/ti/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/tk/network-settings.dtd b/src/chrome/locale/tk/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/tk/network-settings.dtd
+++ b/src/chrome/locale/tk/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/tk/progress.dtd b/src/chrome/locale/tk/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/tk/progress.dtd
+++ b/src/chrome/locale/tk/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd
index c37d65d..eb86388 100644
--- a/src/chrome/locale/tr/network-settings.dtd
+++ b/src/chrome/locale/tr/network-settings.dtd
@@ -6,37 +6,43 @@
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "Tor aÄ?Ä±na baÄ?lanmadan Ã¶nce, bu bilgisayarÄ±n Internet baÄ?lantÄ±sÄ± hakkÄ±nda bilgi vermeniz gerekiyor.">
+<!ENTITY torsettings.prompt "Tor aÄ?Ä±na baÄ?lanmadan Ã¶nce, bu bilgisayarÄ±n Ä°nternet baÄ?lantÄ±sÄ± hakkÄ±nda bilgi vermeniz gerekiyor.">
 
 <!ENTITY torSettings.yes "Evet">
 <!ENTITY torSettings.no "HayÄ±r">
 
 <!ENTITY torSettings.firstQuestion "AÅ?aÄ?Ä±dakilerden hangisi durumunuzu en iyi aÃ§Ä±klÄ±yor?">
-<!ENTITY torSettings.configurePrompt1 "Bu bilgisayarÄ±n Internet baÄ?lantÄ±sÄ± sansÃ¼rlÃ¼ ya da vekil sunucu arkasÄ±nda.">
-<!ENTITY torSettings.configurePrompt2 "KÃ¶prÃ¼ ve yerel vekil sunucu ayarlarÄ±nÄ± yapmam gerekiyor.">
+<!ENTITY torSettings.configurePrompt1 "Bu bilgisayarÄ±n Ä°nternet baÄ?lantÄ±sÄ± sansÃ¼rlÃ¼ ya da vekil sunucu arkasÄ±nda.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "YapÄ±landÄ±r">
-<!ENTITY torSettings.connectPrompt2 "DoÄ?rudan Tor aÄ?Ä±na baÄ?lanmak istiyorum.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Bu Ã§oÄ?u durumda Ã§alÄ±Å?Ä±r.">
 <!ENTITY torSettings.connect "BaÄ?lan">
 
 <!ENTITY torSettings.proxyPageTitle "Yerel Vekil Sunucu AyarlarÄ±">
-<!ENTITY torSettings.proxyQuestion "Bu bilgisayarÄ±n Internet'e eriÅ?mesi iÃ§in bir yerel vekil sunucu kullanmasÄ± gerekiyor mu?">
+<!ENTITY torSettings.proxyQuestion "Bu bilgisayarÄ±n Ä°nternet'e eriÅ?mesi iÃ§in bir yerel vekil sunucu kullanmasÄ± gerekiyor mu?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Bu soruyu nasÄ±l yanÄ±tlayacaÄ?Ä±nÄ±zÄ± bilmiyorsanÄ±z, baÅ?ka bir tarayÄ±cÄ±da Internet ayarlarÄ±na bakarak bir yerel vekil sunucu kullanÄ±lÄ±p kullanÄ±lmadÄ±Ä?Ä±nÄ± gÃ¶rÃ¼n.">
+<!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 "Vekil sunucu ayarlarÄ±nÄ± girin.">
 <!ENTITY torSettings.bridgePageTitle "Tor KÃ¶prÃ¼leri AyarlarÄ±">
-<!ENTITY torSettings.bridgeQuestion "Internet Servis SaÄ?layÄ±cÄ±nÄ±z (ISS) Tor AÄ?Ä±na olan baÄ?lantÄ±larÄ± engelliyor ya da sansÃ¼rlÃ¼yor mu?">
-<!ENTITY torSettings.bridgeHelp "Bu soruyu nasÄ±l yanÄ±tlayacaÄ?Ä±nÄ±zÄ± bilmiyorsanÄ±z, HayÄ±r&#160;'Ä± seÃ§in. Evet'i seÃ§erseniz, Tor AÄ?Ä± baÄ?lantÄ±larÄ±nÄ±n engellenmesini daha zor hale getiren, listelenmeyen aktarÄ±cÄ±lar olan Tor KÃ¶prÃ¼lerini ayarlamanÄ±z istenir.">
+<!ENTITY torSettings.bridgeQuestion "Ä°nternet Servis SaÄ?layÄ±cÄ±nÄ±z (ISS) Tor AÄ?Ä±na olan baÄ?lantÄ±larÄ± engelliyor ya da sansÃ¼rlÃ¼yor mu?">
+<!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 "SaÄ?lanan kÃ¶prÃ¼leri kullanabilir ya da Ã¶zel kÃ¶prÃ¼ler edinip yazabilirsiniz.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Tor'un baÅ?lamasÄ± bekleniyorâ?¦">
 <!ENTITY torsettings.restartTor "Tor'u Yeniden BaÅ?lat">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Ä°steÄ?e baÄ?lÄ±">
 
-<!ENTITY torsettings.useProxy.checkbox "Bu bilgisayarÄ±n Internet'e eriÅ?mesi iÃ§in bir yerel vekil sunucu kullanmasÄ± gerekiyor">
+<!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.address "Adres:">
 <!ENTITY torsettings.useProxy.address.placeholder "IP adresi ya da sunucu adÄ±">
@@ -48,8 +54,9 @@
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "Bu bilgisayar yalnÄ±z belirli baÄ?lantÄ± noktalarÄ±na baÄ?lanmaya izin veren bir gÃ¼venlik duvarÄ± kullanÄ±yor">
 <!ENTITY torsettings.firewall.allowedPorts "Ä°zin Verilen BaÄ?lantÄ± NoktalarÄ±:">
-<!ENTITY torsettings.useBridges.checkbox "Internet Servis SaÄ?layÄ±cÄ±m (ISS) Tor aÄ?Ä±na olan baÄ?lantÄ±larÄ± engelliyor">
+<!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 "Each type of bridge uses a different method to avoid censorship.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "AktarÄ±m tipi:">
 <!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).">
@@ -57,7 +64,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 Internet Servis SaÄ?layÄ±cÄ±sÄ± (ISS) ya da baÅ?ka bir kurum Tor&#160;'u engelliyor olabilir. Bu sorunu Ã§oÄ?unlukla, engellenmesi daha zor olan listelenmeyen aktarÄ±cÄ±lar, Tor KÃ¶prÃ¼lerini kullanarak Ã§Ã¶zebilirsiniz.">
+<!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&#160;'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.bridgeHelp2Heading "Web yoluyla">
 <!ENTITY torsettings.bridgeHelp2 "Bir web tarayÄ±cÄ±sÄ± kullanarak https://bridges.torproject.org adresini ziyaret edin">
diff --git a/src/chrome/locale/tr/progress.dtd b/src/chrome/locale/tr/progress.dtd
index 353bbbe..e9d4e5c 100644
--- a/src/chrome/locale/tr/progress.dtd
+++ b/src/chrome/locale/tr/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Durumu">
 <!ENTITY torprogress.openSettings "AyarlarÄ± AÃ§">
 <!ENTITY torprogress.heading "Tor aÄ?Ä±na baÄ?lanÄ±lÄ±yor">
-<!ENTITY torprogress.pleaseWait "LÃ¼tfen Tor aÄ?Ä± ile baÄ?lantÄ± kurulana kadar bekleyin.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties
index 38b0740..cbf467d 100644
--- a/src/chrome/locale/tr/torlauncher.properties
+++ b/src/chrome/locale/tr/torlauncher.properties
@@ -5,7 +5,7 @@ torlauncher.error_title=Tor BaÅ?latÄ±cÄ±
 
 torlauncher.tor_exited=Tor, beklenmedik Å?ekilde sonlandÄ±. Bu durum Tor iÃ§inde ya da sisteminizdeki baÅ?ka bir yazÄ±lÄ±mda bulunan bir hatadan ya da sorunlu bir donanÄ±mdan kaynaklanmÄ±Å? olabilir. Yeniden baÅ?latÄ±lana kadar Tor Browser hiÃ§bir web sitesine eriÅ?emeyecek. Sorun devam ederse lÃ¼tfen Tor GÃ¼nlÃ¼Ä?Ã¼nÃ¼n bir kopyasÄ±nÄ± destek takÄ±mÄ±na gÃ¶nderin.
 torlauncher.tor_exited2=Tor yeniden baÅ?latÄ±ldÄ±Ä?Ä±nda tarayÄ±cÄ± sekmeleriniz kapatÄ±lmayacak.
-torlauncher.tor_controlconn_failed=Tor denetim kapÄ±sÄ±na baÄ?lanÄ±lamadÄ±.
+torlauncher.tor_controlconn_failed=Tor denetim baÄ?lantÄ± noktasÄ±na baÄ?lanÄ±lamadÄ±.
 torlauncher.tor_failed_to_start=Tor baÅ?latÄ±lamadÄ±.
 torlauncher.tor_control_failed=Tor denetimi alÄ±namadÄ±.
 torlauncher.tor_bootstrap_failed=Tor aÄ?Ä±yla baÄ?lantÄ± kurulamadÄ±.
@@ -21,7 +21,7 @@ torlauncher.failed_to_get_settings=Tor ayarlarÄ± alÄ±namadÄ±.\n\n%S
 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=Internet'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_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_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.
diff --git a/src/chrome/locale/uk/network-settings.dtd b/src/chrome/locale/uk/network-settings.dtd
index 8703783..ed17b65 100644
--- a/src/chrome/locale/uk/network-settings.dtd
+++ b/src/chrome/locale/uk/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Ð¯ÐºÐµ Ð· Ð½Ð°Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? Ñ?Ð²ÐµÑ?Ð´Ð¶ÐµÐ½Ñ? Ð½Ð°Ð¹ÐºÑ?Ð°Ñ?Ðµ Ð¾Ð¿Ð¸Ñ?Ñ?Ñ? Ð?Ð°Ñ?Ñ? Ñ?Ð¸Ñ?Ñ?Ð°Ñ?Ñ?Ñ??">
 <!ENTITY torSettings.configurePrompt1 "Ð?ÐµÑ?ÐµÐ¶ÐµÐ²Ðµ Ð·'Ñ?Ð´Ð½Ð°Ð½Ð½Ñ? Ñ?Ñ?Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿'Ñ?Ñ?ÐµÑ?Ð° Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? Ð°Ð±Ð¾ Ð¹Ð´Ðµ Ñ?ÐµÑ?ÐµÐ· Ð¿Ñ?Ð¾ÐºÑ?Ñ?-Ñ?ÐµÑ?Ð²ÐµÑ?.">
-<!ENTITY torSettings.configurePrompt2 "Ð?ÐµÐ½Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?Ð±Ð½Ð¾ Ð½Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ð¼Ñ?Ñ?Ñ? Ð°Ð±Ð¾ Ð»Ð¾ÐºÐ°Ð»Ñ?Ð½Ð¸Ð¹ Ð¿Ñ?Ð¾ÐºÑ?Ñ?.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Ð?Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ?">
-<!ENTITY torSettings.connectPrompt2 "Ð¯ Ð±Ð°Ð¶Ð°Ñ? Ð¿Ñ?Ð´ÐºÐ»Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ñ? Ð´Ð¾ Tor Ð½Ð°Ð¿Ñ?Ñ?Ð¼Ñ? ">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Ð¦Ðµ Ð¼Ð°Ñ? Ð¿Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ñ? Ð±Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ñ?Ñ? Ñ?Ð¸Ñ?Ñ?Ð°Ñ?Ñ?Ð¹.">
 <!ENTITY torSettings.connect "Ð?'Ñ?Ð´Ð½Ð°Ñ?Ð¸Ñ?Ñ?">
 
 <!ENTITY torSettings.proxyPageTitle "Ð?Ð¾ÐºÐ°Ð»Ñ?Ð½Ð° ÐºÐ¾Ð½Ñ?Ñ?Ð³Ñ?Ñ?Ð°Ñ?Ñ?Ñ? Ð¿Ñ?Ð¾ÐºÑ?Ñ?-Ñ?ÐµÑ?Ð²ÐµÑ?Ð°">
 <!ENTITY torSettings.proxyQuestion "Ð§Ð¸ Ð¿Ð¾Ñ?Ñ?Ñ?Ð±Ð½Ð¾ Ñ?Ñ?Ð¾Ð¼Ñ? ÐºÐ¾Ð¼Ð¿'Ñ?Ñ?ÐµÑ?Ñ? Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ð²Ð°Ñ?Ð¸ Ð»Ð¾ÐºÐ°Ð»Ñ?Ð½Ð¸Ð¹ Ð¿Ñ?Ð¾ÐºÑ?Ñ? Ð´Ð»Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ñ? Ð² Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ??">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Ð¯ÐºÑ?Ð¾ Ð²Ð¸ Ð½Ðµ Ð·Ð½Ð°Ñ?Ñ?Ðµ, Ñ?Ðº Ð²Ñ?Ð´Ð¿Ð¾Ð²Ñ?Ñ?Ñ?Ð¸ Ð½Ð° Ñ?Ðµ Ð¿Ð¸Ñ?Ð°Ð½Ð½Ñ?, Ð¿ÐµÑ?ÐµÐ²Ñ?Ñ?Ñ?Ðµ Ð½Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ñ? Ð² Ñ?Ð½Ñ?Ð¾Ð¼Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ñ?, Ñ?Ð¾Ð± Ð¿Ð¾Ð±Ð°Ñ?Ð¸Ñ?Ð¸ Ñ?Ð¸ Ð²Ñ?Ð½ Ð½Ð°Ð»Ð°Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ð½Ð° Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð°Ð½Ð½Ñ? Ð»Ð¾ÐºÐ°Ð»Ñ?Ð½Ð¾Ð³Ð¾ Ð¿Ñ?Ð¾ÐºÑ?Ñ?.">
+<!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 "Ð?Ð°Ð´Ð°Ñ?Ð¸ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸ Ð¿Ñ?Ð¾ÐºÑ?Ñ?">
 <!ENTITY torSettings.bridgePageTitle "Ð?Ð¾Ð½Ñ?Ñ?Ð³Ñ?Ñ?Ð°Ñ?Ñ?Ñ? Tor-Ð¼Ð¾Ñ?Ñ?Ñ?Ð²">
 <!ENTITY torSettings.bridgeQuestion "Ð?Ð°Ñ? Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ð¿Ñ?Ð¾Ð²Ð°Ð¹Ð´ÐµÑ? (ISP) Ð±Ð»Ð¾ÐºÑ?Ñ? Ñ?Ð¸ Ñ?ÐºÐ¸Ð¼-Ð½ÐµÐ±Ñ?Ð´Ñ? Ñ?Ð¸Ð½Ð¾Ð¼ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?Ñ? Ð¿Ñ?Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð½Ñ? Ð´Ð¾ Tor Ð¼ÐµÑ?ÐµÐ¶Ñ??">
-<!ENTITY torSettings.bridgeHelp "Ð¯ÐºÑ?Ð¾ Ð?Ð¸ Ð½Ðµ Ð·Ð½Ð°Ñ?Ñ?Ðµ, Ñ?Ðº Ð²Ñ?Ð´Ð¿Ð¾Ð²Ñ?Ñ?Ñ?Ð¸ Ð½Ð° Ñ?Ðµ Ð¿Ð¸Ñ?Ð°Ð½Ð½Ñ?, Ð²Ð¸Ð±ÐµÑ?Ñ?Ñ?Ñ? Ð?Ñ?.&#160; Ð¯ÐºÑ?Ð¾ Ð?Ð¸ Ð²Ð¸Ð±ÐµÑ?ÐµÑ?Ðµ Ð¢Ð°Ðº, Ð?Ð°Ð¼ Ð±Ñ?Ð´Ðµ Ð·Ð°Ð¿Ñ?Ð¾Ð¿Ð¾Ð½Ð¾Ð²Ð°Ð½Ð¾ Ð½Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¸ Tor, Ñ?Ð¾ Ñ? Ð¿Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¸Ð¼Ð¸ Ñ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð°Ð¼Ð¸, Ñ?ÐºÑ? Ñ?Ð¾Ð±Ð»Ñ?Ñ?Ñ? Ð±Ñ?Ð»Ñ?Ñ? Ð²Ð°Ð¶ÐºÐ¸Ð¼ Ð±Ð»Ð¾ÐºÑ?Ð²Ð°Ð½Ð½Ñ? Ð·'Ñ?Ð´Ð½Ð°Ð½Ñ? Ð· 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 "Ð?Ð¸ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð°Ñ?Ð¸ Ð²Ð¸Ð·Ð½Ð°Ñ?ÐµÐ½Ð¸Ð¹ Ð¿ÐµÑ?ÐµÐ»Ñ?Ðº Ð¼Ð¾Ñ?Ñ?Ñ?Ð² Ð°Ð±Ð¾ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ Ñ? Ð²Ð²ÐµÑ?Ñ?Ð¸ Ð½Ð°Ð±Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ñ?Ð² Ð²Ñ?Ñ?Ñ?Ð½Ñ?.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Ð?Ñ?Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð½Ñ? Ð´Ð¾ Tor...">
 <!ENTITY torsettings.restartTor "Ð?ÐµÑ?ÐµÐ·Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ð¸ Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Ð?Ð¾Ð´Ð°Ñ?ÐºÐ¾Ð²Ð¾">
 
@@ -50,6 +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.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "Ð¢Ð¸Ð¿ Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?Ñ?:">
 <!ENTITY torsettings.useBridges.custom "Ð?Ð²ÐµÑ?Ñ?Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¸ Ð²Ñ?Ñ?Ñ?Ð½Ñ?">
 <!ENTITY torsettings.useBridges.label "Ð?Ð²ÐµÐ´Ñ?Ñ?Ñ? Ð¾Ð´Ð¸Ð½ Ð°Ð±Ð¾ ÐºÑ?Ð»Ñ?ÐºÐ° Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ñ?Ð² Ñ?Ð¸Ð¿Ñ? Ð¼Ñ?Ñ?Ñ? (Ð¿Ð¾ Ð¾Ð´Ð½Ð¾Ð¼Ñ? Ð² Ñ?Ñ?Ð´Ð¾Ðº).">
diff --git a/src/chrome/locale/uk/progress.dtd b/src/chrome/locale/uk/progress.dtd
index 1bf065b..192f5d3 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 "Ð?Ñ?Ð´Ñ? Ð»Ð°Ñ?ÐºÐ°, Ð·Ð°Ñ?ÐµÐºÐ°Ð¹Ñ?Ðµ, Ð¿Ð¾ÐºÐ¸ Ð¼Ð¸ Ð¿Ñ?Ð´ÐºÐ»Ñ?Ñ?Ð°Ñ?Ð¼Ð¾Ñ?Ñ? Ð´Ð¾ Ð¼ÐµÑ?ÐµÐ¶Ñ? Tor.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ur-PK/network-settings.dtd b/src/chrome/locale/ur-PK/network-settings.dtd
index c055623..f461264 100644
--- a/src/chrome/locale/ur-PK/network-settings.dtd
+++ b/src/chrome/locale/ur-PK/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Ø§Ø®ØªÛ?Ø§Ø±Û?">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ur-PK/progress.dtd b/src/chrome/locale/ur-PK/progress.dtd
index 09d3567..4cd92e2 100644
--- a/src/chrome/locale/ur-PK/progress.dtd
+++ b/src/chrome/locale/ur-PK/progress.dtd
@@ -1,5 +1,4 @@
 <!ENTITY torprogress.dialog.title "Ù¹Ø§Ø± Ø§Ø³Ù¹Û?Ù¹Ø³">
 <!ENTITY torprogress.openSettings "ØªØ±ØªÛ?Ø¨Ø§Øª Ú©Ú¾Ù?Ù?Û?Úº">
 <!ENTITY torprogress.heading "Ù¹Ø§Ø± Ù?Û?Ù¹ Ù?Ø±Ú©Ø³ Ø³Û? Ø±Ø§Ø¨Ø·Û? Ø¨Ù?Ø§Ø¦Û?Úº">
-<!ENTITY torprogress.pleaseWait "Ø¨Ø±Ø§Ø¦Û? Ù?Û?Ø±Ø¨Ø§Ù?Û? Ø§Ù?ØªØ¸Ø§Ø± Ù?Ø±Ù?Ø§Ø¦Û?Úº
-Û?Ù? Ø§Ù?Ù¾ Ú©Ø§ Ø±Ø§Ø¨Ø·Û? Ù¹Ø§Ø± Ù?Û?Ù¹ Ù?Ø±Ú© Ú©Û? Ø³Ø§ØªÚ¾ Ú©Ø± Ø±Û?Û?Úº">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd
index cad9bd9..a856870 100644
--- a/src/chrome/locale/ur/network-settings.dtd
+++ b/src/chrome/locale/ur/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ur/progress.dtd b/src/chrome/locale/ur/progress.dtd
index c8710bb..991c7ef 100644
--- a/src/chrome/locale/ur/progress.dtd
+++ b/src/chrome/locale/ur/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Ø·Ù?Ø± Ú©Û? ØÛ?Ø«Û?Øª">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/uz/network-settings.dtd b/src/chrome/locale/uz/network-settings.dtd
index e6db699..f8795c1 100644
--- a/src/chrome/locale/uz/network-settings.dtd
+++ b/src/chrome/locale/uz/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Qo'shimcha">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/uz/progress.dtd b/src/chrome/locale/uz/progress.dtd
index 865a7ed..7d6c8ec 100644
--- a/src/chrome/locale/uz/progress.dtd
+++ b/src/chrome/locale/uz/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor holati">
 <!ENTITY torprogress.openSettings "Moslamalarni ochish">
 <!ENTITY torprogress.heading "Tor tarmog'iga ulanish">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ve/network-settings.dtd b/src/chrome/locale/ve/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/ve/network-settings.dtd
+++ b/src/chrome/locale/ve/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/ve/progress.dtd b/src/chrome/locale/ve/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/ve/progress.dtd
+++ b/src/chrome/locale/ve/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd
index 64e6fcb..7556d04 100644
--- a/src/chrome/locale/vi/network-settings.dtd
+++ b/src/chrome/locale/vi/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "Nhá»¯ng má»¥c nÃ y cÃ³ miÃªu táº£ Ä?Ãºng vá»? trÃ cá»§a báº¡n khÃ´ng?">
 <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Cáº¥u hÃ¬nh">
-<!ENTITY torSettings.connectPrompt2 "TÃ´i muá»?n káº¿t ná»?i trá»±c tiáº¿p Ä?áº¿n máº¡ng Tor,">
+<!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 "Káº¿t ná»?i">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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 "NhÃ  cung cáº¥p dá»?ch vá»¥ (ISP) cá»§a báº¡n cÃ³ ngÄ?n cháº·n hoáº·c kiá»?m duyá»?t káº¿t ná»?i Ä?áº¿n máº¡ng Tor khÃ´ng?">
-<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Chá»? Ä?á»£i Ä?á»? Tor khá»?i Ä?á»?ng..">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Tuá»³ chá»?n">
 
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Nhá»¯ng Cá»?ng Ä?Æ°á»£c phÃ©p:">
 <!ENTITY torsettings.useBridges.checkbox "NhÃ  cung cáº¥p dá»?ch vá»¥ cá»§a tÃ´i (ISP) Ä?Ã£ cháº·n káº¿t ná»?i Ä?áº¿n máº¡ng Tor">
 <!ENTITY torsettings.useBridges.default "Káº¿t ná»?i vá»?i nhá»¯ng cáº§u Ä?Æ°á»£c cung cáº¥p">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "Loáº¡i hÃ¬nh váºn chuyá»?n:">
 <!ENTITY torsettings.useBridges.custom "Nháºp nhá»¯ng cáº§u quen thuá»?c">
 <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
diff --git a/src/chrome/locale/vi/progress.dtd b/src/chrome/locale/vi/progress.dtd
index 507803b..305cba3 100644
--- a/src/chrome/locale/vi/progress.dtd
+++ b/src/chrome/locale/vi/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tráº¡ng thÃ¡i Tor">
 <!ENTITY torprogress.openSettings "CÃ i Ä?áº·t Má»?">
 <!ENTITY torprogress.heading "Káº¿t ná»?i vá»?i máº¡ng Tor">
-<!ENTITY torprogress.pleaseWait "Vui lÃ²ng chá»? Ä?á»£i Ä?á»? chÃºng tÃ´i káº¿t ná»?i Ä?áº¿n máº¡ng lÆ°á»?i Tor.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/wa/network-settings.dtd b/src/chrome/locale/wa/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/wa/network-settings.dtd
+++ b/src/chrome/locale/wa/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/wa/progress.dtd b/src/chrome/locale/wa/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/wa/progress.dtd
+++ b/src/chrome/locale/wa/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/wo/network-settings.dtd b/src/chrome/locale/wo/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/wo/network-settings.dtd
+++ b/src/chrome/locale/wo/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/wo/progress.dtd b/src/chrome/locale/wo/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/wo/progress.dtd
+++ b/src/chrome/locale/wo/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd
index 8afb952..813cd80 100644
--- a/src/chrome/locale/zh-CN/network-settings.dtd
+++ b/src/chrome/locale/zh-CN/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!ENTITY torSettings.firstQuestion "ä»¥ä¸?å?ªä¸ªæ??è¿°ä¸?ä½ ç??æ??å?µæ??ä¸ºå?¹é??ï¼?">
 <!ENTITY torSettings.configurePrompt1 "ç½?ç»?è¿?æ?¥å??å?°å®¡æ?¥æ??é??è¦?ä»£ç??ã??">
-<!ENTITY torSettings.configurePrompt2 "é??è¦?æ·»å? ç½?æ¡¥æ??å¯¹æ?¬å?°ä»£ç??è¿?è¡?é??ç½®ã??">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "é??ç½®">
-<!ENTITY torSettings.connectPrompt2 "æ??æ?³è¦?ç?´æ?¥è¿?æ?¥ Tor ç½?ç»?ã??">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "é??å¸¸è¿?ç§?æ?¹å¼?æ?¯æ??æ??ç??ã??">
 <!ENTITY torSettings.connect "è¿?æ?¥">
 
 <!ENTITY torSettings.proxyPageTitle "æ?¬å?°ä»£ç??é??ç½®">
 <!ENTITY torSettings.proxyQuestion "æ?¯å?¦é??è¦?æ?¬å?°ä»£ç??è®¿é?®äº?è??ç½?ï¼?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "å¦?æ??ä¸?ç?¥é??å¦?ä½?å??ç?è¯¥é?®é¢?ï¼?è¯·æ£?æ?¥å?¶ä»?æµ?è§?å?¨ä¸ç??äº?è??ç½?è®¾ç½®ï¼?æ?¥ç??æ?¯å?¦ä½¿ç?¨æ?¬å?°ä»£ç??ã??">
+<!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 "è¾?å?¥ä»£ç??è®¾ç½®ã??">
 <!ENTITY torSettings.bridgePageTitle "Tor ç½?æ¡¥é??ç½®">
 <!ENTITY torSettings.bridgeQuestion "äº?è??ç½?æ??å?¡æ??ä¾?å??  (ISP)  æ?¯å?¦å¯¹ Tor ç½?ç»?è¿?æ?¥è¿?è¡?äº?å°?é??æ??å®¡æ?¥ï¼?">
-<!ENTITY torSettings.bridgeHelp "å¦?æ??ä¸?ç??è§£è¯¥é?®é¢?ï¼?è¯·é??æ?©â??å?¦â??ã??å¦?æ??é??æ?©â??æ?¯â??ï¼?é?£ä¹?é??è¦?å¯¹ Tor ç½?æ¡¥è¿?è¡?é??ç½®ã??ç½?æ¡¥æ??ç?¨äº?è¿?æ?¥ 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 "å?¯ä»¥ä½¿ç?¨é??æ??ç??ç½?æ¡¥ï¼?ä¹?å?¯ä»¥è?·å??ç½?æ¡¥ï¼?ä»¥è?ªå®?ä¹?æ?¹å¼?æ??å?¨è¾?å?¥ã??">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "ç?å¾? Tor å?¯å?¨...">
 <!ENTITY torsettings.restartTor "é??æ?°å?¯å?¨ Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "å?¯é??">
 
@@ -50,6 +56,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.&#160; If one bridge does not work, try again using a different one.">
 <!ENTITY torsettings.useBridges.type "ä¼ è¾?ç±»å??ï¼?">
 <!ENTITY torsettings.useBridges.custom "è¾?å?¥è?ªå®?ä¹?ç½?æ¡¥">
 <!ENTITY torsettings.useBridges.label "è¾?å?¥ä¸?ä¸ªæ??å¤?ä¸ªç½?æ¡¥ä¸ç»§(ä¸?è¡?ä¸?ä¸ª)ã??">
diff --git a/src/chrome/locale/zh-CN/progress.dtd b/src/chrome/locale/zh-CN/progress.dtd
index 90ef643..838d88e 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-HK/network-settings.dtd b/src/chrome/locale/zh-HK/network-settings.dtd
index bcd5692..03178e9 100644
--- a/src/chrome/locale/zh-HK/network-settings.dtd
+++ b/src/chrome/locale/zh-HK/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "é?£æ?¥">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/zh-HK/progress.dtd b/src/chrome/locale/zh-HK/progress.dtd
index 8a38686..e93a82a 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 "è·?Torç¶²çµ¡é?£æ?¥, è«?ç¨?å??ã??">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd
index d02b3f1..5e54ea1 100644
--- a/src/chrome/locale/zh-TW/network-settings.dtd
+++ b/src/chrome/locale/zh-TW/network-settings.dtd
@@ -1,68 +1,75 @@
-<!ENTITY torsettings.dialog.title "Tor ç¶²è·¯è¨å®?">
+<!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: -->
 
-<!ENTITY torsettings.prompt "å?¨æ?¨é?£æ?¥å?° Tor ç¶²è·¯å??ï¼?æ?¨é??è¦?æ??ä¾?é??å?°é?»è?¦ç¶²è·¯é?£ç·?ç??ç?¸é??è³?è¨?">
+<!ENTITY torsettings.prompt "å?¨æ?¨é?£æ?¥å?°æ´?è?¥è·¯ç?±ç¶²è·¯å??ï¼?æ?¨é??è¦?æ??ä¾?é??å?°é?»è?¦ç¶²è·¯é?£ç·?ç??ç?¸é??è³?è¨?ã??">
 
 <!ENTITY torSettings.yes "æ?¯">
 <!ENTITY torSettings.no "å?¦">
 
-<!ENTITY torSettings.firstQuestion "ä¸?å??å?ªä¸?é ?æ??ç¬¦å??æ?¨ç??æ??æ³??">
-<!ENTITY torSettings.configurePrompt1 "é??é?¨é?»è?¦ç??ç¶²è·¯é?£ç·?æ?¯è¢«å¯©æ?¥æ??æ?¯æ??ä»£ç??ç??ã??">
-<!ENTITY torSettings.configurePrompt2 "æ??é??è¦?è¨å®?æ©?æ?¥æ??æ?¬å?°ä»£ç??è¨å®?">
+<!ENTITY torSettings.firstQuestion "ä¸?å??å?ªä¸?é ?æ??è¿°æ??ç¬¦å??æ?¨ç??å¯¦é??æ??æ³?ï¼?">
+<!ENTITY torSettings.configurePrompt1 "é??é?¨é?»è?¦ç??ç¶²è·¯é?£ç·?æ??è¢«ç?£æ?§é??æ¿¾æ??æ?¯æ??é??é??ä»£ç??ä¼ºæ??å?¨ã??">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "è¨å®?">
-<!ENTITY torSettings.connectPrompt2 "æ??æ?³ç?´æ?¥é?£æ?¥å?° Tor ç¶²è·¯ã??">
-<!ENTITY torSettings.connectPrompt3 "é??å°?å?¨å¤§å¤?æ?¸æ??æ³?ä¸?ç??æ??ã??">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
+<!ENTITY torSettings.connectPrompt3 "é??å°?å?¨å¤§å¤?æ?¸æ??æ³?ä¸?æ£å¸¸é??ä½?ã??">
 <!ENTITY torSettings.connect "é?£æ?¥">
 
-<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
+<!ENTITY torSettings.proxyPageTitle "æ?¬å?°ç«¯ä»£ç??ä¼ºæ??å?¨ç??è¨å®?">
 <!ENTITY torSettings.proxyQuestion "é??å?°é?»è?¦é??è¦?ä½¿ç?¨æ?¬å?°ä»£ç??ä¼ºæ??å?¨ä¾?å?å??ç¶²è·¯å??ï¼?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "è?¥æ?¨ç?¡æ³?ç¢ºå®?å¦?ä½?å??ç?é??å??å??é¡?ï¼?è«?æ?¥ç??å?¶ä»?ç??è¦½å?¨ç??ç¶²è·¯è¨å®?ï¼?ç??å®?æ?¯å?¦è¨å®?ç?ºé??é??ä»£ç??ä¼ºæ??å?¨é?£ç·?ã??">
+<!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 "è¼¸å?¥ä»£ç??ä¼ºæ??å?¨è¨å®?ã??">
-<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
-<!ENTITY torSettings.bridgeQuestion "æ?¨ç??ç¶²é??ç¶²è·¯æ??å??æ??ä¾?è??(ISP)é?»æ??æ??å¯©æ?¥å?¡é?£æ?¥å?° Tor ç¶²è·¯?">
-<!ENTITY torSettings.bridgeHelp "å¦?æ??æ?¨ä¸?ç¢ºå®?å¦?ä½?å??ç?æ¤å??é¡?ï¼?è«?é?¸æ??ã??å?¦ã??ã??&#160; å¦?æ??æ?¨é?¸æ??ã??æ?¯ã??ï¼?æ?¨å°?è¢«è¦?æ±?è¨å®?Tor æ©?æ?¥ï¼?é??è®?é?»æ¢é?£æ?¥å?° Tor ç¶²è·¯æ?´å? å?°é?£ã??">
-<!ENTITY torSettings.bridgeSettingsPrompt "æ?¨å?¯ä»¥ä½¿ç?¨æ??ä¾?ç??æ©?æ?¥æ??æ?¨å?¯ä»¥è¼¸å?¥ä¸?çµ?è?ªè¨?ç??æ©?æ?¥ã??">
+<!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.bridgeSettingsPrompt "æ?¨å?¯ä»¥ä½¿ç?¨æ??ä¾?ç??æ©?æ?¥å?¨ï¼?æ?¨ä¹?å?¯ä»¥è¼¸å?¥ä¸?çµ?è?ªè¨?ç??æ©?æ?¥å?¨ã??">
 
 <!-- Other: -->
 
-<!ENTITY torsettings.startingTor "æ£å?¨ç?å¾? Tor å??å??â?¦">
-<!ENTITY torsettings.restartTor "é??æ?°å??å?? Tor">
+<!ENTITY torsettings.startingTor "æ£å?¨ç?å¾?æ´?è?¥è·¯ç?±å??å??â?¦">
+<!ENTITY torsettings.restartTor "é??æ?°å??å??æ´?è?¥è·¯ç?±">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "é?¸ç?¨">
 
-<!ENTITY torsettings.useProxy.checkbox "é??å?°é?»è?¦é??è¦?ä½¿ç?¨ä»£ç??ä¼ºæ??å?¨å?å??ç¶²é??ç¶²è·¯">
-<!ENTITY torsettings.useProxy.type "ä»£ç??ä¼ºæ??å?¨é¡?å??:">
-<!ENTITY torsettings.useProxy.address "ä½?å??:">
+<!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.port "é?£æ?¥å? ï¼?">
+<!ENTITY torsettings.useProxy.username "ä½¿ç?¨è??å??ç¨±ï¼?">
+<!ENTITY torsettings.useProxy.password "å¯?ç¢¼ï¼?">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "é??å?°é?»è?¦é??é??å?ªå??è¨±é?£æ?¥è?³ç?¹å®?é?£ç·?å? ç??é?²ç?«ç??">
-<!ENTITY torsettings.firewall.allowedPorts "å??è¨±ç??é?£æ?¥å? :">
-<!ENTITY torsettings.useBridges.checkbox "æ??ç??ç¶²é??ç¶²è·¯æ??å??æ??ä¾?è??(ISP)é?»æ¢é?£æ?¥è?³ Tor ç¶²è·¯">
-<!ENTITY torsettings.useBridges.default "ä½¿ç?¨æ??ä¾?ç??æ©?æ?¥é?£ç·?">
-<!ENTITY torsettings.useBridges.type "å?³è¼¸é¡?å??:">
-<!ENTITY torsettings.useBridges.custom "è¼¸å?¥è?ªè¨?æ©?æ?¥">
-<!ENTITY torsettings.useBridges.label "è¼¸å?¥ä¸?å??æ??å¤?å??æ©?æ?¥ä¸ç¹¼ (æ¯?è¡?ä¸?å??)ã??">
-<!ENTITY torsettings.useBridges.placeholder "è¼¸å?¥ä½?å??:é?£æ?¥å? ">
+<!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.&#160; If one bridge does not work, try again using a different one.">
+<!ENTITY torsettings.useBridges.type "å?³è¼¸é¡?å??ï¼?">
+<!ENTITY torsettings.useBridges.custom "è¼¸å?¥è?ªè¨?ç??æ©?æ?¥å?¨">
+<!ENTITY torsettings.useBridges.label "è¼¸å?¥ä¸?å??æ??å¤?å??æ©?æ?¥ä¸ç¹¼å?¨ (æ¯?è¡?ä¸?å??)ã??">
+<!ENTITY torsettings.useBridges.placeholder "è«?è¼¸å?¥  ä½?å??:é?£æ?¥å? ">
 
-<!ENTITY torsettings.copyLog "å°? Tor è¨?é??è¤?è£½å?°å?ªè²¼ç°¿">
-<!ENTITY torsettings.bridgeHelpTitle "æ©?æ?¥ä¸ç¹¼èªªæ??">
-<!ENTITY torsettings.bridgeHelp1 "è?¥æ?¨ç?¡æ³?é?£æ?¥å?° Tor ç¶²è·¯ï¼?å?¯è?½æ?¯æ?¨ç??ç¶²é??ç¶²è·¯æ??å??æ??ä¾?è?? (ISP) æ??å?¶å®?æ©?æ§?å·²å°?é?? Torã??&#160; é??å¸¸æ?¨å?¯ä»¥ä½¿ç?¨æ?´é?£ä»¥å°?é??ä¹?é?±è??ä¸ç¹¼ç?? Tor æ©?æ?¥ä¾?è§£æ±ºæ¤å??é¡?ã??">
-<!ENTITY torsettings.bridgeHelp1B "æ?¨å?¯ä»¥ä½¿ç?¨é ?å??è¨å®?ï¼?æ??ä¾?æ©?æ?¥ä½?å??æ??æ?¨å?¯ä»¥ä½¿ç?¨ä¸?å??ä¸?ç¨®æ?¹æ³?å?¶ä¸ä¹?ä¸?ç?²å??ä¸?çµ?è?ªè¨?ç??ä½?å??:">
+<!ENTITY torsettings.copyLog "å°?æ´?è?¥è·¯ç?±ç??è¨?æ?¯è¨?é??è¤?è£½å?°å?ªè²¼ç°¿">
+<!ENTITY torsettings.bridgeHelpTitle "æ©?æ?¥ä¸ç¹¼å?¨ä¹?èªªæ??">
+<!ENTITY torsettings.bridgeHelp1 "è?¥æ?¨ç?¡æ³?é?£æ?¥å?°æ´?è?¥è·¯ç?±ç¶²è·¯ï¼?å?¯è?½æ?¯å? ç?ºæ?¨ç??ç¶²é??ç¶²è·¯æ??å??æ??ä¾?è?? (ISP) æ??å?¶å®?æ©?æ§?æ£å?¨å°?é??æ´?è?¥è·¯ç?±ç¶²è·¯ã??&#160; é??å¸¸æ?¨å?¯ä»¥ä½¿ç?¨æ?´é?£ä»¥è¢«å°?é??ä¹?æ©?æ?¥ä¸ç¹¼å?¨ä¾?é?£ä¸?æ´?è?¥è·¯ç?±ï¼?ä»¥ä¾¿è§£æ±ºæ¤å??é¡?ã??">
+<!ENTITY torsettings.bridgeHelp1B "æ?¨å?¯ä»¥ä½¿ç?¨é ?å??è¨å®?å¥½ç??æ©?æ?¥å?¨ä½?å??ï¼?æ??æ?¨ä¹?å?¯ä»¥ä½¿ç?¨ä¸?å??ä¸?ç¨®æ?¹æ³?ç??ä»»ä¸?ç¨®ä»¥ç?²å??ä¸?çµ?è?ªè¨?ç??ä½?å??ï¼?">
 <!ENTITY torsettings.bridgeHelp2Heading "é??é??ç¶²è·¯">
 <!ENTITY torsettings.bridgeHelp2 "ä½¿ç?¨ç¶²è·¯ç??è¦½å?¨é? è¨ª https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "é??é??é?»å?é?µä»¶è?ªå??å??è¦?">
-<!ENTITY torsettings.bridgeHelp3.emailDesc "å?³é??é?µä»¶å?° bridges@xxxxxxxxxxxxxx ä¸¦å?¨å?§æ??ä¸è¼¸å?¥ 'get bridges'ã??&#160; ç?¶è??ï¼?è¦?ä½¿å¾?é§å®¢æ?´é?£å¸ç¿?æ??é??æ©?æ?¥ä½?å??ï¼?æ?¨å¿?é ?æ?¯ä½¿ç?¨ä»¥ä¸?é?»å?é?µä»¶æ??ä¾?è??ä¹?ä¸?ä¾?å¯?é??æ?¬è¦?æ±? (å??è¡¨é ?åº?æ?¯ä¾?ç?§å?ªå??å??å¥½)ï¼?">
-<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, æ??è?? https://mail.yahoo.com";>
+<!ENTITY torsettings.bridgeHelp3.emailDesc "å?³é??é?µä»¶å?° bridges@xxxxxxxxxxxxxx ä¸¦å?¨å?§æ??ä¸è¼¸å?¥ã??get bridgesã??å?ä¸²ã??&#160; ç?¶è??ï¼?è¦?ä½¿å¾?ç¶²è·¯æ?»æ??è??æ?´é?£å??å¾?æ©?æ?¥å?¨ä½?å??ï¼?æ?¨å¿?é ?æ?¯ä½¿ç?¨ä»¥ä¸?é?»å?é?µä»¶æ??ä¾?è??ä¹?ä¸?ä¾?å¯?é??æ?¬è¦?æ±? (å??è¡¨é ?åº?æ?¯ä¾?ç?§å?ªå??å??å¥½)ï¼?">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com æ??è?? https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "é??é??æ??å??å?°">
-<!ENTITY torsettings.bridgeHelp4 "æ??å¾?ç??æ?¹æ³?æ?¯:æ?¨å?¯ä»¥ç?¼é??ä¸?å°?æ£å¸¸ç??é?µä»¶å?° help@xxxxxxxxxxxxxxxxxã??&#160; è«?æ³¨æ??æ??å??é??è¦?ä¸?å°?å°?å?°æ??å??å??è¦?é?µä»¶ã??">
+<!ENTITY torsettings.bridgeHelp4 "æ??å¾?ç??æ?¹æ³?æ?¯ï¼?æ?¨å?¯ä»¥ç?¼é??ä¸?å°?ç¦®è²?æ?§ç??é?µä»¶å?° help@xxxxxxxxxxxxxxxxxã??&#160; è«?æ³¨æ??ï¼?å°?æ?¼æ¤é¡?é?µä»¶æ??å??å¿?é??è¦?ä¸?å°?å°?å?°æ??å??å??è¦?ã??">
diff --git a/src/chrome/locale/zh-TW/progress.dtd b/src/chrome/locale/zh-TW/progress.dtd
index be27a6b..65b0d3e 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.openSettings "é??å??è¨å®?">
 <!ENTITY torprogress.heading "æ£å?¨é?£ç·?è?³ Tor ç¶²è·¯">
-<!ENTITY torprogress.pleaseWait "æ??å??æ£å?¨å»ºç«? Tor ç¶²è·¯é?£ç·?ï¼?è«?ç¨?å??...">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties
index 7cb086b..6fadc66 100644
--- a/src/chrome/locale/zh-TW/torlauncher.properties
+++ b/src/chrome/locale/zh-TW/torlauncher.properties
@@ -4,9 +4,9 @@
 torlauncher.error_title=Tor å??å??å·¥å?·
 
 torlauncher.tor_exited=Tor æ??å¤?å?°çµ?æ??ã??é??æ??å?¯è?½æ?¯ Tor æ?¬èº«ç??ç¨?å¼?é?¯èª¤ã??æ?¨ç³»çµ±ä¸?ç??å?¶å®?ç¨?å¼?æ??æ?¯ç¡¬é«?æ??é??ã??ç?´å?°æ?¨é??æ?°å??å?? Torï¼?Tor Browserå°?ä¸?æ??é? è¨ªä»»ä½?ç¶²ç«?ã??å¦?æ??å??é¡?ä»?ç?¶å?å?¨ï¼?è«?ç?¼é??æ?¨ç?? Tor ç´?é??å?¯æ?¬å?°æ?¯æ?´å??é??ã??
-torlauncher.tor_exited2=é??æ?°å??å?? Tor å°?ä¸?æ??é??é??æ?¨ç??è¦½å?¨ç??å??é ?ã??
+torlauncher.tor_exited2=é??æ?°å??å??æ´?è?¥è·¯ç?±å°?ä¸?æ??é??é??æ?¨ç??è¦½å?¨ç??å??é ?ã??
 torlauncher.tor_controlconn_failed=ç?¡æ³?é?£æ?¥è?³ Tor æ?§å?¶é?£æ?¥å? ã??
-torlauncher.tor_failed_to_start=Tor ç?¡æ³?å??å??ã??
+torlauncher.tor_failed_to_start=æ´?è?¥è·¯ç?±ç?¡æ³?å??å??ã??
 torlauncher.tor_control_failed=ç?¡æ³?æ?§å?¶ Torã??
 torlauncher.tor_bootstrap_failed=Tor ç?¡æ³?å»ºç«? Tor ç¶²è·¯é?£ç·?ã??
 torlauncher.tor_bootstrap_failed_details=%1$S å¤±æ?? (%2$S)ã??
diff --git a/src/chrome/locale/zu/network-settings.dtd b/src/chrome/locale/zu/network-settings.dtd
index b193750..75ece3b 100644
--- a/src/chrome/locale/zu/network-settings.dtd
+++ b/src/chrome/locale/zu/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor&#160;network.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
 <!ENTITY torSettings.connect "Connect">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
+<!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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later).">
+<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
 <!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.reconfigTor "Reconfigure">
+
+<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.&#160; To make a direct connection to the Tor network, these settings must be removed.">
+<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
 
 <!ENTITY torsettings.optional "Optional">
 
@@ -50,6 +56,7 @@
 <!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.&#160; 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).">
diff --git a/src/chrome/locale/zu/progress.dtd b/src/chrome/locale/zu/progress.dtd
index ebd9cef..9ac9ad7 100644
--- a/src/chrome/locale/zu/progress.dtd
+++ b/src/chrome/locale/zu/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Status">
 <!ENTITY torprogress.openSettings "Open Settings">
 <!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [tor-launcher/master] Merge remote-tracking branch 'isis/bug18113'
Next by Author: [tor-commits] [tor-browser-bundle/hardened-builds] Release preparations
Previous by thread: [tor-commits] [tor-launcher/master] Merge remote-tracking branch 'isis/bug18113'
Next by thread: [tor-commits] [tor-browser-bundle/hardened-builds] Release preparations
Index(es):
- Author
- Thread