commit 944da94e2d6e232dfd964a063f8e2cbf76ab2511
Author: Translation commit bot <[email protected]>
Date: Thu Jan 21 09:17:17 2016 +0000
Update translations for tor-launcher-network-settings_completed
---
en/network-settings.dtd | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
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 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.  If you choose Yes, you will be 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.  To 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.  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
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
