commit e1bd24c10be5c73646222e1e4a5f9aa565c1f6ea
Author: Translation commit bot <translat...@torproject.org>
Date: Thu May 8 12:45:44 2014 +0000
Update translations for tor-launcher-network-settings_completed
---
en_GB/network-settings.dtd | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/en_GB/network-settings.dtd b/en_GB/network-settings.dtd
index c42c58f..4cedae6 100644
--- a/en_GB/network-settings.dtd
+++ b/en_GB/network-settings.dtd
@@ -2,17 +2,17 @@
<!-- For "first run" wizard: -->
-<!ENTITY torsettings.prompt "Before the Tor Browser Bundle tries to connect to
the Tor network, you need to provide information about this computer's Internet
connection.">
+<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need
to provide information about this computer's Internet connection.">
<!ENTITY torSettings.yes "Yes">
<!ENTITY torSettings.no "No">
<!ENTITY torSettings.firstQuestion "Which of the following best describes your
situation?">
<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is
censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure network settings.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall,
or proxy settings.">
<!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt1 "This computer's Internet connection is
clear of obstacles.">
<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the
Tor network.">
+<!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
<!ENTITY torSettings.connect "Connect">
<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to
access the Internet?">
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet
connection go through a firewall that only allows connections to certain
ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this
question, choose No. If you encounter problems connecting to the Tor network,
change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that
are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is
censored, you will need to obtain and use bridge relays.&#160; If not, just
click Connect.">
+<!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.bridgeSettingsPrompt "You may use the provided set of
bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,12 +46,19 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall
that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP)
blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Connect with provided bridges">
+<!ENTITY torsettings.useBridges.type "Transport type:">
+<!ENTITY torsettings.useBridges.custom "Enter custom bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one
per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport
address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
-<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor
network, it could be that your Internet Service Provider (ISP) or another
agency is blocking Tor.&#160; Often, you can work around this problem by
using Tor Bridges which are hidden relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp2 "To obtain some bridge relays, use a web
browser to visit the following page: https://bridges.torproject.org";>
-<!ENTITY torsettings.bridgeHelp3 "Another way to find public bridge addresses
is to send mail to brid...@torproject.org with the line 'get bridges' by itself
in the body of the message.&#160; However, to make it harder for an
attacker to learn a lot of bridge addresses, you must send this request from an
email address at one of the following domains: gmail.com or yahoo.com.">
-<!ENTITY torsettings.bridgeHelp4 "You can also request bridge relays by
sending mail to h...@rt.torproject.org.">
+<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor
network, it could be that your Internet Service Provider (ISP) or another
agency is blocking Tor.&#160; Often, you can work around this problem by
using Tor Bridges, which are unlisted relays that are more difficult to block.">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set
of bridge addresses or you may obtain a custom set of addresses by using one of
these three methods:">
+<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
+<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit
https://bridges.torproject.org";>
+<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
+<!ENTITY torsettings.bridgeHelp3 "Send email to brid...@torproject.org with
the line 'get bridges' by itself in the body of the message.&#160; However,
to make it harder for an attacker to learn a lot of bridge addresses, you must
send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
+<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge
addresses by sending a polite email message to
h...@rt.torproject.org.&#160; Please note that a person will need to
respond to each request.">
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
