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

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
From: translation@xxxxxxxxxxxxxx
Date: Thu, 21 Jan 2016 09:17:14 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 21 Jan 2016 04:17:54 -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: Translation commit bot <translation@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 070ba4117ca2c3cef7b73b090a2d3765696e6ee8
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Thu Jan 21 09:17:12 2016 +0000

    Update translations for tor-launcher-network-settings
---
 ach/network-settings.dtd         |   15 +++++++++++----
 ady/network-settings.dtd         |   15 +++++++++++----
 af/network-settings.dtd          |   15 +++++++++++----
 ak/network-settings.dtd          |   15 +++++++++++----
 am/network-settings.dtd          |   15 +++++++++++----
 am_ET/network-settings.dtd       |   15 +++++++++++----
 ar/network-settings.dtd          |   15 +++++++++++----
 ar_AA/network-settings.dtd       |   15 +++++++++++----
 arn/network-settings.dtd         |   15 +++++++++++----
 ast/network-settings.dtd         |   15 +++++++++++----
 az/network-settings.dtd          |   16 +++++++++++-----
 ba/network-settings.dtd          |   15 +++++++++++----
 bal/network-settings.dtd         |   15 +++++++++++----
 be/network-settings.dtd          |   15 +++++++++++----
 bg/network-settings.dtd          |   15 +++++++++++----
 bn/network-settings.dtd          |   15 +++++++++++----
 bn_BD/network-settings.dtd       |   15 +++++++++++----
 bn_IN/network-settings.dtd       |   15 +++++++++++----
 bo/network-settings.dtd          |   15 +++++++++++----
 br/network-settings.dtd          |   15 +++++++++++----
 brx/network-settings.dtd         |   15 +++++++++++----
 bs/network-settings.dtd          |   15 +++++++++++----
 ca/network-settings.dtd          |   15 +++++++++++----
 ceb/network-settings.dtd         |   15 +++++++++++----
 co/network-settings.dtd          |   15 +++++++++++----
 cs/network-settings.dtd          |   15 +++++++++++----
 cs_CZ/network-settings.dtd       |   15 +++++++++++----
 csb/network-settings.dtd         |   15 +++++++++++----
 cv/network-settings.dtd          |   15 +++++++++++----
 cy/network-settings.dtd          |   15 +++++++++++----
 cy_GB/network-settings.dtd       |   15 +++++++++++----
 da/network-settings.dtd          |   15 +++++++++++----
 da_DK/network-settings.dtd       |   15 +++++++++++----
 de/network-settings.dtd          |   15 +++++++++++----
 dz/network-settings.dtd          |   15 +++++++++++----
 el/network-settings.dtd          |   15 +++++++++++----
 en/network-settings.dtd          |   15 +++++++++++----
 en_GB/network-settings.dtd       |   15 +++++++++++----
 eo/network-settings.dtd          |   15 +++++++++++----
 es/network-settings.dtd          |   15 +++++++++++----
 es_AR/network-settings.dtd       |   15 +++++++++++----
 es_CL/network-settings.dtd       |   15 +++++++++++----
 es_CO/network-settings.dtd       |   15 +++++++++++----
 es_MX/network-settings.dtd       |   15 +++++++++++----
 et/network-settings.dtd          |   15 +++++++++++----
 eu/network-settings.dtd          |   15 +++++++++++----
 fa/network-settings.dtd          |   15 +++++++++++----
 fi/network-settings.dtd          |   15 +++++++++++----
 fil/network-settings.dtd         |   15 +++++++++++----
 fo/network-settings.dtd          |   15 +++++++++++----
 fr/network-settings.dtd          |   15 +++++++++++----
 fr_CA/network-settings.dtd       |   15 +++++++++++----
 fur/network-settings.dtd         |   15 +++++++++++----
 fy/network-settings.dtd          |   15 +++++++++++----
 ga/network-settings.dtd          |   15 +++++++++++----
 gd/network-settings.dtd          |   15 +++++++++++----
 gl/network-settings.dtd          |   15 +++++++++++----
 gu/network-settings.dtd          |   15 +++++++++++----
 gu_IN/network-settings.dtd       |   15 +++++++++++----
 gun/network-settings.dtd         |   15 +++++++++++----
 ha/network-settings.dtd          |   15 +++++++++++----
 he/network-settings.dtd          |   15 +++++++++++----
 hi/network-settings.dtd          |   15 +++++++++++----
 hr/network-settings.dtd          |   15 +++++++++++----
 hr_HR/network-settings.dtd       |   15 +++++++++++----
 ht/network-settings.dtd          |   15 +++++++++++----
 hu/network-settings.dtd          |   15 +++++++++++----
 hy/network-settings.dtd          |   15 +++++++++++----
 hy_AM/network-settings.dtd       |   15 +++++++++++----
 ia/network-settings.dtd          |   15 +++++++++++----
 id/network-settings.dtd          |   15 +++++++++++----
 is/network-settings.dtd          |   15 +++++++++++----
 it/network-settings.dtd          |   15 +++++++++++----
 ja/network-settings.dtd          |   15 +++++++++++----
 jbo/network-settings.dtd         |   15 +++++++++++----
 jv/network-settings.dtd          |   15 +++++++++++----
 ka/network-settings.dtd          |   15 +++++++++++----
 kk/network-settings.dtd          |   15 +++++++++++----
 km/network-settings.dtd          |   15 +++++++++++----
 kn/network-settings.dtd          |   15 +++++++++++----
 ko/network-settings.dtd          |   15 +++++++++++----
 ko_KR/network-settings.dtd       |   15 +++++++++++----
 ku/network-settings.dtd          |   15 +++++++++++----
 ku_IQ/network-settings.dtd       |   15 +++++++++++----
 kw/network-settings.dtd          |   15 +++++++++++----
 ky/network-settings.dtd          |   15 +++++++++++----
 la/network-settings.dtd          |   15 +++++++++++----
 lb/network-settings.dtd          |   15 +++++++++++----
 lg/network-settings.dtd          |   15 +++++++++++----
 ln/network-settings.dtd          |   15 +++++++++++----
 lo/network-settings.dtd          |   15 +++++++++++----
 lt/network-settings.dtd          |   15 +++++++++++----
 lv/network-settings.dtd          |   15 +++++++++++----
 mg/network-settings.dtd          |   15 +++++++++++----
 mi/network-settings.dtd          |   15 +++++++++++----
 mk/network-settings.dtd          |   15 +++++++++++----
 ml/network-settings.dtd          |   15 +++++++++++----
 mn/network-settings.dtd          |   15 +++++++++++----
 mr/network-settings.dtd          |   15 +++++++++++----
 ms_MY/network-settings.dtd       |   15 +++++++++++----
 mt/network-settings.dtd          |   15 +++++++++++----
 my/network-settings.dtd          |   15 +++++++++++----
 nah/network-settings.dtd         |   15 +++++++++++----
 nap/network-settings.dtd         |   15 +++++++++++----
 nb/network-settings.dtd          |   15 +++++++++++----
 nds/network-settings.dtd         |   15 +++++++++++----
 ne/network-settings.dtd          |   15 +++++++++++----
 nl/network-settings.dtd          |   15 +++++++++++----
 nl_BE/network-settings.dtd       |   15 +++++++++++----
 nn/network-settings.dtd          |   15 +++++++++++----
 nso/network-settings.dtd         |   15 +++++++++++----
 oc/network-settings.dtd          |   15 +++++++++++----
 or/network-settings.dtd          |   15 +++++++++++----
 pa/network-settings.dtd          |   15 +++++++++++----
 pap/network-settings.dtd         |   15 +++++++++++----
 pl/network-settings.dtd          |   15 +++++++++++----
 pms/network-settings.dtd         |   15 +++++++++++----
 ps/network-settings.dtd          |   15 +++++++++++----
 pt/network-settings.dtd          |   15 +++++++++++----
 pt_BR/network-settings.dtd       |   15 +++++++++++----
 ro/network-settings.dtd          |   15 +++++++++++----
 ru/network-settings.dtd          |   15 +++++++++++----
 ru@petr1708/network-settings.dtd |   15 +++++++++++----
 sa/network-settings.dtd          |   15 +++++++++++----
 scn/network-settings.dtd         |   15 +++++++++++----
 sco/network-settings.dtd         |   15 +++++++++++----
 si/network-settings.dtd          |   15 +++++++++++----
 si_LK/network-settings.dtd       |   15 +++++++++++----
 sk/network-settings.dtd          |   17 ++++++++++++-----
 sk_SK/network-settings.dtd       |   15 +++++++++++----
 sl/network-settings.dtd          |   15 +++++++++++----
 sl_SI/network-settings.dtd       |   15 +++++++++++----
 sn/network-settings.dtd          |   15 +++++++++++----
 so/network-settings.dtd          |   15 +++++++++++----
 son/network-settings.dtd         |   15 +++++++++++----
 sq/network-settings.dtd          |   15 +++++++++++----
 sq_AL/network-settings.dtd       |   15 +++++++++++----
 sr/network-settings.dtd          |   15 +++++++++++----
 sr@latin/network-settings.dtd    |   15 +++++++++++----
 st/network-settings.dtd          |   15 +++++++++++----
 su/network-settings.dtd          |   15 +++++++++++----
 sv/network-settings.dtd          |   15 +++++++++++----
 sw/network-settings.dtd          |   15 +++++++++++----
 szl/network-settings.dtd         |   15 +++++++++++----
 ta/network-settings.dtd          |   15 +++++++++++----
 te/network-settings.dtd          |   15 +++++++++++----
 te_IN/network-settings.dtd       |   15 +++++++++++----
 tg/network-settings.dtd          |   15 +++++++++++----
 th/network-settings.dtd          |   15 +++++++++++----
 ti/network-settings.dtd          |   15 +++++++++++----
 tk/network-settings.dtd          |   15 +++++++++++----
 tl_PH/network-settings.dtd       |   15 +++++++++++----
 tr/network-settings.dtd          |   19 +++++++++++++------
 ug@Arab/network-settings.dtd     |   15 +++++++++++----
 uk/network-settings.dtd          |   15 +++++++++++----
 ur/network-settings.dtd          |   15 +++++++++++----
 ur_PK/network-settings.dtd       |   15 +++++++++++----
 uz/network-settings.dtd          |   15 +++++++++++----
 ve/network-settings.dtd          |   15 +++++++++++----
 vi/network-settings.dtd          |   15 +++++++++++----
 wa/network-settings.dtd          |   15 +++++++++++----
 wo/network-settings.dtd          |   15 +++++++++++----
 yo/network-settings.dtd          |   15 +++++++++++----
 zh_CN/network-settings.dtd       |   15 +++++++++++----
 zh_HK/network-settings.dtd       |   15 +++++++++++----
 zh_TW/network-settings.dtd       |   15 +++++++++++----
 zu/network-settings.dtd          |   15 +++++++++++----
 167 files changed, 1840 insertions(+), 672 deletions(-)

diff --git a/ach/network-settings.dtd b/ach/network-settings.dtd
index b193750..75ece3b 100644
--- a/ach/network-settings.dtd
+++ b/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/ady/network-settings.dtd b/ady/network-settings.dtd
index b193750..75ece3b 100644
--- a/ady/network-settings.dtd
+++ b/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/af/network-settings.dtd b/af/network-settings.dtd
index 4248631..93e2527 100644
--- a/af/network-settings.dtd
+++ b/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/ak/network-settings.dtd b/ak/network-settings.dtd
index b193750..75ece3b 100644
--- a/ak/network-settings.dtd
+++ b/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/am/network-settings.dtd b/am/network-settings.dtd
index b193750..75ece3b 100644
--- a/am/network-settings.dtd
+++ b/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/am_ET/network-settings.dtd b/am_ET/network-settings.dtd
index fb9eb3c..23aae0a 100644
--- a/am_ET/network-settings.dtd
+++ b/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/ar/network-settings.dtd b/ar/network-settings.dtd
index a581606..9d42278 100644
--- a/ar/network-settings.dtd
+++ b/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/ar_AA/network-settings.dtd b/ar_AA/network-settings.dtd
index b193750..75ece3b 100644
--- a/ar_AA/network-settings.dtd
+++ b/ar_AA/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/arn/network-settings.dtd b/arn/network-settings.dtd
index b193750..75ece3b 100644
--- a/arn/network-settings.dtd
+++ b/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/ast/network-settings.dtd b/ast/network-settings.dtd
index fdbc39c..caa9d55 100644
--- a/ast/network-settings.dtd
+++ b/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/az/network-settings.dtd b/az/network-settings.dtd
index cd8cbcb..eb34988 100644
--- a/az/network-settings.dtd
+++ b/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/ba/network-settings.dtd b/ba/network-settings.dtd
index b193750..75ece3b 100644
--- a/ba/network-settings.dtd
+++ b/ba/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/bal/network-settings.dtd b/bal/network-settings.dtd
index b193750..75ece3b 100644
--- a/bal/network-settings.dtd
+++ b/bal/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/be/network-settings.dtd b/be/network-settings.dtd
index fe05a5c..ad37df4 100644
--- a/be/network-settings.dtd
+++ b/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/bg/network-settings.dtd b/bg/network-settings.dtd
index 46165b8..94bd5f1 100644
--- a/bg/network-settings.dtd
+++ b/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/bn/network-settings.dtd b/bn/network-settings.dtd
index 8f2f987..2c55dd3 100644
--- a/bn/network-settings.dtd
+++ b/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/bn_BD/network-settings.dtd b/bn_BD/network-settings.dtd
index b193750..75ece3b 100644
--- a/bn_BD/network-settings.dtd
+++ b/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/bn_IN/network-settings.dtd b/bn_IN/network-settings.dtd
index b193750..75ece3b 100644
--- a/bn_IN/network-settings.dtd
+++ b/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/bo/network-settings.dtd b/bo/network-settings.dtd
index b193750..75ece3b 100644
--- a/bo/network-settings.dtd
+++ b/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/br/network-settings.dtd b/br/network-settings.dtd
index b193750..75ece3b 100644
--- a/br/network-settings.dtd
+++ b/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/brx/network-settings.dtd b/brx/network-settings.dtd
index b193750..75ece3b 100644
--- a/brx/network-settings.dtd
+++ b/brx/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/bs/network-settings.dtd b/bs/network-settings.dtd
index 3750fd2..cd1efa7 100644
--- a/bs/network-settings.dtd
+++ b/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/ca/network-settings.dtd b/ca/network-settings.dtd
index 8ef50cf..e344598 100644
--- a/ca/network-settings.dtd
+++ b/ca/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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 "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 "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/ceb/network-settings.dtd b/ceb/network-settings.dtd
index b193750..75ece3b 100644
--- a/ceb/network-settings.dtd
+++ b/ceb/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/co/network-settings.dtd b/co/network-settings.dtd
index b193750..75ece3b 100644
--- a/co/network-settings.dtd
+++ b/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/cs/network-settings.dtd b/cs/network-settings.dtd
index bdf2fd2..b08348b 100644
--- a/cs/network-settings.dtd
+++ b/cs/network-settings.dtd
@@ -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/cs_CZ/network-settings.dtd b/cs_CZ/network-settings.dtd
index b193750..75ece3b 100644
--- a/cs_CZ/network-settings.dtd
+++ b/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/csb/network-settings.dtd b/csb/network-settings.dtd
index b193750..75ece3b 100644
--- a/csb/network-settings.dtd
+++ b/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/cv/network-settings.dtd b/cv/network-settings.dtd
index 866ddd6..f3d44b5 100644
--- a/cv/network-settings.dtd
+++ b/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/cy/network-settings.dtd b/cy/network-settings.dtd
index 7dfcd46..e743cc1 100644
--- a/cy/network-settings.dtd
+++ b/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/cy_GB/network-settings.dtd b/cy_GB/network-settings.dtd
index b193750..75ece3b 100644
--- a/cy_GB/network-settings.dtd
+++ b/cy_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/da/network-settings.dtd b/da/network-settings.dtd
index a59c8d6..f8f4c0f 100644
--- a/da/network-settings.dtd
+++ b/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/da_DK/network-settings.dtd b/da_DK/network-settings.dtd
index b193750..75ece3b 100644
--- a/da_DK/network-settings.dtd
+++ b/da_DK/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/de/network-settings.dtd b/de/network-settings.dtd
index cf394a3..ef926d5 100644
--- a/de/network-settings.dtd
+++ b/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/dz/network-settings.dtd b/dz/network-settings.dtd
index b193750..75ece3b 100644
--- a/dz/network-settings.dtd
+++ b/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/el/network-settings.dtd b/el/network-settings.dtd
index 371b8c5..d776892 100644
--- a/el/network-settings.dtd
+++ b/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/en/network-settings.dtd b/en/network-settings.dtd
index b193750..75ece3b 100644
--- a/en/network-settings.dtd
+++ b/en/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/en_GB/network-settings.dtd b/en_GB/network-settings.dtd
index b193750..75ece3b 100644
--- a/en_GB/network-settings.dtd
+++ b/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/eo/network-settings.dtd b/eo/network-settings.dtd
index 263ade0..89f752b 100644
--- a/eo/network-settings.dtd
+++ b/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/es/network-settings.dtd b/es/network-settings.dtd
index 64547c1..c194584 100644
--- a/es/network-settings.dtd
+++ b/es/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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 "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 conectarme directamente a la red Tor.">
+<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network.">
 <!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 "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 "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 "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 "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.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 "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 "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 "Introducir puentes personalizados">
 <!ENTITY torsettings.useBridges.label "Introduzca uno o mÃ¡s repetidores puente(uno por lÃnea).">
diff --git a/es_AR/network-settings.dtd b/es_AR/network-settings.dtd
index 2c3f300..9dd4ef3 100644
--- a/es_AR/network-settings.dtd
+++ b/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/es_CL/network-settings.dtd b/es_CL/network-settings.dtd
index c3b8e6e..b6cd80c 100644
--- a/es_CL/network-settings.dtd
+++ b/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/es_CO/network-settings.dtd b/es_CO/network-settings.dtd
index b630a4a..8ec90ba 100644
--- a/es_CO/network-settings.dtd
+++ b/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/es_MX/network-settings.dtd b/es_MX/network-settings.dtd
index 0c7dbb6..0d8f71d 100644
--- a/es_MX/network-settings.dtd
+++ b/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/et/network-settings.dtd b/et/network-settings.dtd
index b5db33d..d4e4c14 100644
--- a/et/network-settings.dtd
+++ b/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/eu/network-settings.dtd b/eu/network-settings.dtd
index 6190d66..e034658 100644
--- a/eu/network-settings.dtd
+++ b/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/fa/network-settings.dtd b/fa/network-settings.dtd
index b7d2076..3a95731 100644
--- a/fa/network-settings.dtd
+++ b/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/fi/network-settings.dtd b/fi/network-settings.dtd
index 55a218f..6338e04 100644
--- a/fi/network-settings.dtd
+++ b/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/fil/network-settings.dtd b/fil/network-settings.dtd
index 001b446..78c45b7 100644
--- a/fil/network-settings.dtd
+++ b/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/fo/network-settings.dtd b/fo/network-settings.dtd
index e113692..14dac48 100644
--- a/fo/network-settings.dtd
+++ b/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/fr/network-settings.dtd b/fr/network-settings.dtd
index cfc1c0f..e3b06af 100644
--- a/fr/network-settings.dtd
+++ b/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/fr_CA/network-settings.dtd b/fr_CA/network-settings.dtd
index 9e3094d..904ed36 100644
--- a/fr_CA/network-settings.dtd
+++ b/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 "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 voudrais 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 "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 "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 "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 "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 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 "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 avec les ponts fournis">
+<!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 "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).">
diff --git a/fur/network-settings.dtd b/fur/network-settings.dtd
index b193750..75ece3b 100644
--- a/fur/network-settings.dtd
+++ b/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/fy/network-settings.dtd b/fy/network-settings.dtd
index 6c6c869..8165a1a 100644
--- a/fy/network-settings.dtd
+++ b/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/ga/network-settings.dtd b/ga/network-settings.dtd
index b193750..75ece3b 100644
--- a/ga/network-settings.dtd
+++ b/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/gd/network-settings.dtd b/gd/network-settings.dtd
index b193750..75ece3b 100644
--- a/gd/network-settings.dtd
+++ b/gd/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/gl/network-settings.dtd b/gl/network-settings.dtd
index bcf88eb..c4703b1 100644
--- a/gl/network-settings.dtd
+++ b/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/gu/network-settings.dtd b/gu/network-settings.dtd
index 2e06d74..93ec7cb 100644
--- a/gu/network-settings.dtd
+++ b/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/gu_IN/network-settings.dtd b/gu_IN/network-settings.dtd
index b193750..75ece3b 100644
--- a/gu_IN/network-settings.dtd
+++ b/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/gun/network-settings.dtd b/gun/network-settings.dtd
index b193750..75ece3b 100644
--- a/gun/network-settings.dtd
+++ b/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/ha/network-settings.dtd b/ha/network-settings.dtd
index b193750..75ece3b 100644
--- a/ha/network-settings.dtd
+++ b/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/he/network-settings.dtd b/he/network-settings.dtd
index d4b3d16..6fd02c7 100644
--- a/he/network-settings.dtd
+++ b/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/hi/network-settings.dtd b/hi/network-settings.dtd
index f852698..d63adb7 100644
--- a/hi/network-settings.dtd
+++ b/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/hr/network-settings.dtd b/hr/network-settings.dtd
index 0ccf030..b229c09 100644
--- a/hr/network-settings.dtd
+++ b/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/hr_HR/network-settings.dtd b/hr_HR/network-settings.dtd
index 74d4ce2..657b7f9 100644
--- a/hr_HR/network-settings.dtd
+++ b/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/ht/network-settings.dtd b/ht/network-settings.dtd
index b193750..75ece3b 100644
--- a/ht/network-settings.dtd
+++ b/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/hu/network-settings.dtd b/hu/network-settings.dtd
index afdfafc..0f7de0c 100644
--- a/hu/network-settings.dtd
+++ b/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/hy/network-settings.dtd b/hy/network-settings.dtd
index b193750..75ece3b 100644
--- a/hy/network-settings.dtd
+++ b/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/hy_AM/network-settings.dtd b/hy_AM/network-settings.dtd
index 0daa0a7..f6b89c5 100644
--- a/hy_AM/network-settings.dtd
+++ b/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/ia/network-settings.dtd b/ia/network-settings.dtd
index 13fc151..0abeba8 100644
--- a/ia/network-settings.dtd
+++ b/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/id/network-settings.dtd b/id/network-settings.dtd
index 2062d8c..990cbac 100644
--- a/id/network-settings.dtd
+++ b/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/is/network-settings.dtd b/is/network-settings.dtd
index cf296ef..d151c0d 100644
--- a/is/network-settings.dtd
+++ b/is/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.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 "Ã?g vil tengjast beint viÃ° Tor-netiÃ°.">
+<!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 "BÃÃ° eftir aÃ° Tor rÃ¦sist...">
 <!ENTITY torsettings.restartTor "EndurrÃ¦sa 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 "ValkvÃ¦tt">
 
@@ -50,6 +56,7 @@
 <!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).">
diff --git a/it/network-settings.dtd b/it/network-settings.dtd
index 6888c98..4d67204 100644
--- a/it/network-settings.dtd
+++ b/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/ja/network-settings.dtd b/ja/network-settings.dtd
index f289507..6fe3ede 100644
--- a/ja/network-settings.dtd
+++ b/ja/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 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/jbo/network-settings.dtd b/jbo/network-settings.dtd
index b193750..75ece3b 100644
--- a/jbo/network-settings.dtd
+++ b/jbo/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/jv/network-settings.dtd b/jv/network-settings.dtd
index b193750..75ece3b 100644
--- a/jv/network-settings.dtd
+++ b/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/ka/network-settings.dtd b/ka/network-settings.dtd
index 7551c74..135c799 100644
--- a/ka/network-settings.dtd
+++ b/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/kk/network-settings.dtd b/kk/network-settings.dtd
index f1d2205..ce471c2 100644
--- a/kk/network-settings.dtd
+++ b/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/km/network-settings.dtd b/km/network-settings.dtd
index eff2770..b2af430 100644
--- a/km/network-settings.dtd
+++ b/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/kn/network-settings.dtd b/kn/network-settings.dtd
index 2c14637..6cd943a 100644
--- a/kn/network-settings.dtd
+++ b/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/ko/network-settings.dtd b/ko/network-settings.dtd
index 4b34c7e..8ac0ad0 100644
--- a/ko/network-settings.dtd
+++ b/ko/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 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/ko_KR/network-settings.dtd b/ko_KR/network-settings.dtd
index 63fb382..74b8c4a 100644
--- a/ko_KR/network-settings.dtd
+++ b/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/ku/network-settings.dtd b/ku/network-settings.dtd
index b193750..75ece3b 100644
--- a/ku/network-settings.dtd
+++ b/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/ku_IQ/network-settings.dtd b/ku_IQ/network-settings.dtd
index e7428cb..c111d30 100644
--- a/ku_IQ/network-settings.dtd
+++ b/ku_IQ/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/kw/network-settings.dtd b/kw/network-settings.dtd
index b193750..75ece3b 100644
--- a/kw/network-settings.dtd
+++ b/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/ky/network-settings.dtd b/ky/network-settings.dtd
index fee491d..2f61a16 100644
--- a/ky/network-settings.dtd
+++ b/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/la/network-settings.dtd b/la/network-settings.dtd
index 3a796f3..2577bef 100644
--- a/la/network-settings.dtd
+++ b/la/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/lb/network-settings.dtd b/lb/network-settings.dtd
index 0aabd24..5d56d79 100644
--- a/lb/network-settings.dtd
+++ b/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/lg/network-settings.dtd b/lg/network-settings.dtd
index b193750..75ece3b 100644
--- a/lg/network-settings.dtd
+++ b/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/ln/network-settings.dtd b/ln/network-settings.dtd
index b193750..75ece3b 100644
--- a/ln/network-settings.dtd
+++ b/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/lo/network-settings.dtd b/lo/network-settings.dtd
index bc62da0..7c0e752 100644
--- a/lo/network-settings.dtd
+++ b/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/lt/network-settings.dtd b/lt/network-settings.dtd
index c66d60d..4958908 100644
--- a/lt/network-settings.dtd
+++ b/lt/network-settings.dtd
@@ -13,26 +13,32 @@
 
 <!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.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 "Tai suveiks daugeliu situacijÅ³.">
 <!ENTITY torSettings.connect "Prisijungti">
 
 <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
 <!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 "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 "Pakartotinai paleisti 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 "NebÅ«tina">
 
@@ -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/lv/network-settings.dtd b/lv/network-settings.dtd
index 074d77f..3bd53a8 100644
--- a/lv/network-settings.dtd
+++ b/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/mg/network-settings.dtd b/mg/network-settings.dtd
index b193750..75ece3b 100644
--- a/mg/network-settings.dtd
+++ b/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/mi/network-settings.dtd b/mi/network-settings.dtd
index b193750..75ece3b 100644
--- a/mi/network-settings.dtd
+++ b/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/mk/network-settings.dtd b/mk/network-settings.dtd
index d62a729..05cad9a 100644
--- a/mk/network-settings.dtd
+++ b/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/ml/network-settings.dtd b/ml/network-settings.dtd
index b193750..75ece3b 100644
--- a/ml/network-settings.dtd
+++ b/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/mn/network-settings.dtd b/mn/network-settings.dtd
index b193750..75ece3b 100644
--- a/mn/network-settings.dtd
+++ b/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/mr/network-settings.dtd b/mr/network-settings.dtd
index 594d86a..c31e040 100644
--- a/mr/network-settings.dtd
+++ b/mr/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/ms_MY/network-settings.dtd b/ms_MY/network-settings.dtd
index 20a6de7..c7eb7d1 100644
--- a/ms_MY/network-settings.dtd
+++ b/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/mt/network-settings.dtd b/mt/network-settings.dtd
index b193750..75ece3b 100644
--- a/mt/network-settings.dtd
+++ b/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/my/network-settings.dtd b/my/network-settings.dtd
index b1adfef..a3d9240 100644
--- a/my/network-settings.dtd
+++ b/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/nah/network-settings.dtd b/nah/network-settings.dtd
index b193750..75ece3b 100644
--- a/nah/network-settings.dtd
+++ b/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/nap/network-settings.dtd b/nap/network-settings.dtd
index b193750..75ece3b 100644
--- a/nap/network-settings.dtd
+++ b/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/nb/network-settings.dtd b/nb/network-settings.dtd
index 567ca39..802253c 100644
--- a/nb/network-settings.dtd
+++ b/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).">
diff --git a/nds/network-settings.dtd b/nds/network-settings.dtd
index b193750..75ece3b 100644
--- a/nds/network-settings.dtd
+++ b/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/ne/network-settings.dtd b/ne/network-settings.dtd
index a853c53..aea700a 100644
--- a/ne/network-settings.dtd
+++ b/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/nl/network-settings.dtd b/nl/network-settings.dtd
index 5415366..ab35d6b 100644
--- a/nl/network-settings.dtd
+++ b/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/nl_BE/network-settings.dtd b/nl_BE/network-settings.dtd
index 0cb285b..95f0a12 100644
--- a/nl_BE/network-settings.dtd
+++ b/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/nn/network-settings.dtd b/nn/network-settings.dtd
index 8a75a1f..4bd82f0 100644
--- a/nn/network-settings.dtd
+++ b/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/nso/network-settings.dtd b/nso/network-settings.dtd
index b193750..75ece3b 100644
--- a/nso/network-settings.dtd
+++ b/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/oc/network-settings.dtd b/oc/network-settings.dtd
index b193750..75ece3b 100644
--- a/oc/network-settings.dtd
+++ b/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/or/network-settings.dtd b/or/network-settings.dtd
index b193750..75ece3b 100644
--- a/or/network-settings.dtd
+++ b/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/pa/network-settings.dtd b/pa/network-settings.dtd
index 4270144..127f5c6 100644
--- a/pa/network-settings.dtd
+++ b/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/pap/network-settings.dtd b/pap/network-settings.dtd
index b193750..75ece3b 100644
--- a/pap/network-settings.dtd
+++ b/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/pl/network-settings.dtd b/pl/network-settings.dtd
index a7af06b..42180fa 100644
--- a/pl/network-settings.dtd
+++ b/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/pms/network-settings.dtd b/pms/network-settings.dtd
index b193750..75ece3b 100644
--- a/pms/network-settings.dtd
+++ b/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/ps/network-settings.dtd b/ps/network-settings.dtd
index b193750..75ece3b 100644
--- a/ps/network-settings.dtd
+++ b/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/pt/network-settings.dtd b/pt/network-settings.dtd
index 7790807..03dfb80 100644
--- a/pt/network-settings.dtd
+++ b/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/pt_BR/network-settings.dtd b/pt_BR/network-settings.dtd
index cefaf9a..1379f93 100644
--- a/pt_BR/network-settings.dtd
+++ b/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 tiver certeza sobre como responder a essa questÃ£o, escolha NÃ£o&#160;. Se vocÃª escolher Sim, serÃ¡ preciso configurar pontes Tor, que sÃ£o relÃ©s 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,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Portas habilitadas:">
 <!ENTITY torsettings.useBridges.checkbox "Meu Provedor de ServiÃ§os Internet (ISP) bloqueia as conexÃµes Ã  rede Tor">
 <!ENTITY torsettings.useBridges.default "Conectar com as pontes fornecidas">
+<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.&#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 relÃ©s de pontes (um por linha).">
diff --git a/ro/network-settings.dtd b/ro/network-settings.dtd
index 5e77179..1ab990d 100644
--- a/ro/network-settings.dtd
+++ b/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/ru/network-settings.dtd b/ru/network-settings.dtd
index 41072da..fbf9702 100644
--- a/ru/network-settings.dtd
+++ b/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/ru@petr1708/network-settings.dtd b/ru@petr1708/network-settings.dtd
index 3c1d225..9987337 100644
--- a/ru@petr1708/network-settings.dtd
+++ b/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/sa/network-settings.dtd b/sa/network-settings.dtd
index b193750..75ece3b 100644
--- a/sa/network-settings.dtd
+++ b/sa/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/scn/network-settings.dtd b/scn/network-settings.dtd
index b193750..75ece3b 100644
--- a/scn/network-settings.dtd
+++ b/scn/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/sco/network-settings.dtd b/sco/network-settings.dtd
index b193750..75ece3b 100644
--- a/sco/network-settings.dtd
+++ b/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/si/network-settings.dtd b/si/network-settings.dtd
index b193750..75ece3b 100644
--- a/si/network-settings.dtd
+++ b/si/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/si_LK/network-settings.dtd b/si_LK/network-settings.dtd
index 0ef880c..d5c5fb1 100644
--- a/si_LK/network-settings.dtd
+++ b/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/sk/network-settings.dtd b/sk/network-settings.dtd
index 4360063..5826392 100644
--- a/sk/network-settings.dtd
+++ b/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/sk_SK/network-settings.dtd b/sk_SK/network-settings.dtd
index 8520626..81deede 100644
--- a/sk_SK/network-settings.dtd
+++ b/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/sl/network-settings.dtd b/sl/network-settings.dtd
index 31e1cfc..73ef092 100644
--- a/sl/network-settings.dtd
+++ b/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/sl_SI/network-settings.dtd b/sl_SI/network-settings.dtd
index e80491f..a5b4388 100644
--- a/sl_SI/network-settings.dtd
+++ b/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/sn/network-settings.dtd b/sn/network-settings.dtd
index b193750..75ece3b 100644
--- a/sn/network-settings.dtd
+++ b/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/so/network-settings.dtd b/so/network-settings.dtd
index b193750..75ece3b 100644
--- a/so/network-settings.dtd
+++ b/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/son/network-settings.dtd b/son/network-settings.dtd
index b193750..75ece3b 100644
--- a/son/network-settings.dtd
+++ b/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/sq/network-settings.dtd b/sq/network-settings.dtd
index 9a627e9..228d865 100644
--- a/sq/network-settings.dtd
+++ b/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/sq_AL/network-settings.dtd b/sq_AL/network-settings.dtd
index b193750..75ece3b 100644
--- a/sq_AL/network-settings.dtd
+++ b/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/sr/network-settings.dtd b/sr/network-settings.dtd
index 0883ccf..f4f9098 100644
--- a/sr/network-settings.dtd
+++ b/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/sr@latin/network-settings.dtd b/sr@latin/network-settings.dtd
index 331278d..dcb6891 100644
--- a/sr@latin/network-settings.dtd
+++ b/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/st/network-settings.dtd b/st/network-settings.dtd
index b193750..75ece3b 100644
--- a/st/network-settings.dtd
+++ b/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/su/network-settings.dtd b/su/network-settings.dtd
index b193750..75ece3b 100644
--- a/su/network-settings.dtd
+++ b/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/sv/network-settings.dtd b/sv/network-settings.dtd
index c53103f..19fcb74 100644
--- a/sv/network-settings.dtd
+++ b/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/sw/network-settings.dtd b/sw/network-settings.dtd
index b193750..75ece3b 100644
--- a/sw/network-settings.dtd
+++ b/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/szl/network-settings.dtd b/szl/network-settings.dtd
index b193750..75ece3b 100644
--- a/szl/network-settings.dtd
+++ b/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/ta/network-settings.dtd b/ta/network-settings.dtd
index 5e1479c..7ffc083 100644
--- a/ta/network-settings.dtd
+++ b/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/te/network-settings.dtd b/te/network-settings.dtd
index b193750..75ece3b 100644
--- a/te/network-settings.dtd
+++ b/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/te_IN/network-settings.dtd b/te_IN/network-settings.dtd
index 8943c47..c19ed8a 100644
--- a/te_IN/network-settings.dtd
+++ b/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/tg/network-settings.dtd b/tg/network-settings.dtd
index b193750..75ece3b 100644
--- a/tg/network-settings.dtd
+++ b/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/th/network-settings.dtd b/th/network-settings.dtd
index 23ad049..c97495e 100644
--- a/th/network-settings.dtd
+++ b/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/ti/network-settings.dtd b/ti/network-settings.dtd
index b193750..75ece3b 100644
--- a/ti/network-settings.dtd
+++ b/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/tk/network-settings.dtd b/tk/network-settings.dtd
index b193750..75ece3b 100644
--- a/tk/network-settings.dtd
+++ b/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/tl_PH/network-settings.dtd b/tl_PH/network-settings.dtd
index b193750..75ece3b 100644
--- a/tl_PH/network-settings.dtd
+++ b/tl_PH/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/tr/network-settings.dtd b/tr/network-settings.dtd
index 0b05f9c..eb86388 100644
--- a/tr/network-settings.dtd
+++ b/tr/network-settings.dtd
@@ -6,33 +6,39 @@
 
 <!-- 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 Ä°nternet 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.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 Ä°nternet 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 "Ä°nternet 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'Ä± seÃ§in.&#160; 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.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Ä±">
 
@@ -50,6 +56,7 @@
 <!ENTITY torsettings.firewall.allowedPorts "Ä°zin Verilen BaÄ?lantÄ± NoktalarÄ±:">
 <!ENTITY torsettings.useBridges.checkbox "Ä°nternet Servis SaÄ?layÄ±cÄ±m (ISS) Tor aÄ?Ä±na olan baÄ?lantÄ±larÄ± engelliyor">
 <!ENTITY torsettings.useBridges.default "SaÄ?lanan kÃ¶prÃ¼ler ile baÄ?lan">
+<!ENTITY torsettings.useBridges.note "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).">
diff --git a/ug@Arab/network-settings.dtd b/ug@Arab/network-settings.dtd
index b193750..75ece3b 100644
--- a/ug@Arab/network-settings.dtd
+++ b/ug@Arab/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/uk/network-settings.dtd b/uk/network-settings.dtd
index 8703783..ed17b65 100644
--- a/uk/network-settings.dtd
+++ b/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/ur/network-settings.dtd b/ur/network-settings.dtd
index cad9bd9..a856870 100644
--- a/ur/network-settings.dtd
+++ b/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/ur_PK/network-settings.dtd b/ur_PK/network-settings.dtd
index c055623..f461264 100644
--- a/ur_PK/network-settings.dtd
+++ b/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/uz/network-settings.dtd b/uz/network-settings.dtd
index e6db699..f8795c1 100644
--- a/uz/network-settings.dtd
+++ b/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/ve/network-settings.dtd b/ve/network-settings.dtd
index b193750..75ece3b 100644
--- a/ve/network-settings.dtd
+++ b/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/vi/network-settings.dtd b/vi/network-settings.dtd
index 64e6fcb..7556d04 100644
--- a/vi/network-settings.dtd
+++ b/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/wa/network-settings.dtd b/wa/network-settings.dtd
index b193750..75ece3b 100644
--- a/wa/network-settings.dtd
+++ b/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/wo/network-settings.dtd b/wo/network-settings.dtd
index b193750..75ece3b 100644
--- a/wo/network-settings.dtd
+++ b/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/yo/network-settings.dtd b/yo/network-settings.dtd
index b193750..75ece3b 100644
--- a/yo/network-settings.dtd
+++ b/yo/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/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd
index 8afb952..813cd80 100644
--- a/zh_CN/network-settings.dtd
+++ b/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/zh_HK/network-settings.dtd b/zh_HK/network-settings.dtd
index bcd5692..03178e9 100644
--- a/zh_HK/network-settings.dtd
+++ b/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/zh_TW/network-settings.dtd b/zh_TW/network-settings.dtd
index 40d1a29..5e54ea1 100644
--- a/zh_TW/network-settings.dtd
+++ b/zh_TW/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/zu/network-settings.dtd b/zu/network-settings.dtd
index b193750..75ece3b 100644
--- a/zu/network-settings.dtd
+++ b/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).">

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

Prev by Author: [tor-commits] [translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed
Next by Author: [tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
Previous by thread: [tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
Next by thread: [tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
Index(es):
- Author
- Thread