commit a38827638daba879f309f7ef77d787715b9135b9
Author: Translation commit bot <translat...@torproject.org>
Date: Sat Dec 23 01:47:05 2017 +0000
Update translations for tor-launcher-network-settings_completed
---
en_GB/network-settings.dtd | 61 +++++++++++++++++-----------------------------
1 file changed, 22 insertions(+), 39 deletions(-)
diff --git a/en_GB/network-settings.dtd b/en_GB/network-settings.dtd
index 0d2e9dc6c..85645d7b9 100644
--- a/en_GB/network-settings.dtd
+++ b/en_GB/network-settings.dtd
@@ -1,4 +1,7 @@
<!ENTITY torsettings.dialog.title "Tor Network Settings">
+<!ENTITY torsettings.wizard.title.default "Connect to Tor">
+<!ENTITY torsettings.wizard.title.configure "Tor Network Settings">
+<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
<!-- For locale picker: -->
<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
@@ -6,31 +9,11 @@
<!-- For "first run" wizard: -->
-<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need
to provide information about this computer's Internet connection.">
-
-<!ENTITY torSettings.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 or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local
proxy settings before I connect to the Tor network.">
+<!ENTITY torSettings.connectPrompt "Click âConnectâ to connect to Tor.">
+<!ENTITY torSettings.configurePrompt "Click âConfigureâ to adjust network
settings if you are in a country that censors Tor (such as Egypt, China,
Turkey) or if you are connecting from a private network that requires a proxy.">
<!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection
to the Tor network.">
-<!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
<!ENTITY torSettings.connect "Connect">
-<!ENTITY torSettings.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.proxyExplanation1 "In most cases a local proxy is not
needed, but it may be required when connecting through a company, school, or
university network.">
-<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this
question, look at the Internet settings in another browser or check your
system's network settings to see whether a local proxy is needed.">
-<!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
-<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP)
block or otherwise censor connections to the Tor Network?">
-<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer
this question, choose No (if you are unable to connect to the Tor network
without a bridge, you can add one later).">
-<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked
to configure Tor Bridges, which are unlisted relays that make it more difficult
to block connections to the Tor Network.">
-<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of
bridges or you may obtain and enter a custom set of bridges.">
-
<!-- Other: -->
<!ENTITY torsettings.startingTor "Waiting for Tor to startâ¦">
@@ -42,8 +25,9 @@
<!ENTITY torsettings.optional "Optional">
-<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local
proxy to access the Internet">
+<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the
Internet">
<!ENTITY torsettings.useProxy.type "Proxy Type:">
+<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
<!ENTITY torsettings.useProxy.address "Address:">
<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
<!ENTITY torsettings.useProxy.port "Port:">
@@ -54,22 +38,21 @@
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall
that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
-<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP)
blocks connections to the Tor network">
-<!ENTITY torsettings.useBridges.default "Connect with provided bridges">
-<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different
method to avoid censorship.  If one bridge does not work, try again using
a different one.">
-<!ENTITY torsettings.useBridges.type "Transport type:">
-<!ENTITY torsettings.useBridges.custom "Enter custom bridges">
-<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one
per line).">
-<!ENTITY torsettings.useBridges.placeholder "type address:port">
+<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
+<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
+<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
+<!ENTITY torsettings.useBridges.custom "Provide a bridge I know">
+<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted
source.">
+<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
+
+<!ENTITY torsettings.proxyHelpTitle "Proxy Help">
+<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting
through a company, school, or university network. If you are not sure how
to answer this question, look at the Internet settings in another browser or
check your system's network settings to see whether a proxy is needed.">
+
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
-<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor
network, it could be that your Internet Service Provider (ISP) or another
agency is blocking Tor.  Often, you can work around this problem by using
Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set
of bridge addresses or you may obtain a custom set of addresses by using one of
these methods:">
-<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
-<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit
https://bridges.torproject.org";>
-<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to
brid...@torproject.org with the line 'get bridges' by itself in the body of the
message.  However, to make it harder for an attacker to learn a lot of
bridge addresses, you must send this request from one of the following email
providers (listed in order of preference):">
-<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net,
https://mail.google.com, or https://mail.yahoo.com";>
-<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
-<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge
addresses by sending a polite email message to h...@rt.torproject.org. 
Please note that a person will need to respond to each request.">
+<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it
more difficult to block connections to the Tor Network.  Each type of
bridge uses a different method to avoid censorship.  The obfs ones make
your traffic look like random noise, and the meek ones make your traffic look
like it's connecting to that service instead of Tor.">
+<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to
block Tor, certain bridges work in certain countries but not others.  If
you are unsure about which bridges work in your country, visit
torproject.org/about/contact.html#support">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection
to the Tor network.  This may take several minutes.">
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
