[tor-commits] [tor-launcher/master] Improved prompts and help text.

[brade at torproject.org]

commit 05146e20e4d32baeea3194ead38d0e20d43ad759
Author: Kathy Brade <brade at torproject.org>
Date:   Thu May 2 14:31:29 2013 -0400

    Improved prompts and help text.
---
 src/chrome/content/network-settings-overlay.xul |    3 ++-
 src/chrome/locale/en/network-settings.dtd       |   14 ++++++++------
 src/chrome/skin/network-settings.css            |    2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul
index 05479d0..a062d8f 100644
--- a/src/chrome/content/network-settings-overlay.xul
+++ b/src/chrome/content/network-settings-overlay.xul
@@ -79,7 +79,8 @@
           <button dlgtype="help" oncommand="onOpenHelp()" />
           <label value="&torsettings.useBridges.label;" control="bridgeList"/>
         </hbox>
-        <textbox id="bridgeList" multiline="true" rows="3" />
+        <textbox id="bridgeList" multiline="true" rows="3"
+                 placeholder="&torsettings.useBridges.placeholder;" />
       </vbox>
 <!--
       <vbox>
diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd
index 9c30329..443f6ff 100644
--- a/src/chrome/locale/en/network-settings.dtd
+++ b/src/chrome/locale/en/network-settings.dtd
@@ -9,12 +9,12 @@
 
 <!ENTITY torSettings.proxyQuestion "Do you use a proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "TODO Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce ullamcorper dolor eget purus imperdiet quis ultrices massa tempor. Sed mattis tincidunt justo nec vehicula. Praesent fermentum quam vel neque congue imperdiet. Nam tincidunt sollicitudin neque, eu sodales quam eleifend at. Suspendisse potenti.">
+<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether you are using a proxy.">
 <!ENTITY torSettings.enterProxy "Enter your proxy settings.">
 <!ENTITY torSettings.firewallQuestion "Does your Internet connection go through a firewall that only allows you to connect to certain ports?">
-<!ENTITY torSettings.firewallHelp "TODO Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce ullamcorper dolor eget purus imperdiet quis ultrices massa tempor. Sed mattis tincidunt justo nec vehicula. Praesent fermentum quam vel neque congue imperdiet. Nam tincidunt sollicitudin neque, eu sodales quam eleifend at. Suspendisse potenti.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports allowed by your firewall.">
-<!ENTITY torSettings.bridgeQuestion "If your ISP (Internet Service Provider) blocks connections to the Tor network, you will need to use bridge relays.">
+<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems, change this setting.">
+<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by your firewall.">
+<!ENTITY torSettings.bridgeQuestion "If your Internet Service Provider (ISP) blocks connections to the Tor network, you will need to use bridge relays.">
 
 <!-- Other: -->
 
@@ -34,11 +34,13 @@
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "My firewall only lets me connect to certain ports">
 <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
-<!ENTITY torsettings.useBridges.checkbox "My ISP blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
 <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays in the form address:port.">
+<!ENTITY torsettings.useBridges.placeholder "address:port">
+
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
-<!ENTITY torsettings.bridgeHelp1 "Bridge relays (or 'bridges' for short) are Tor relays that aren't listed in the main directory. Since there is no complete public list of them, even if your ISP is filtering connections to all the known Tor relays they probably won't be able to block all the bridges.">
+<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) is blocking Tor.  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 bridges at torproject.org with the line 'get bridges' by itself in the body of the message. However, so we can make it harder for an attacker to learn lots of bridge addresses, you must send this request from an email address at one of the following domains: gmail.com or yahoo.com.">
diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css
index a7064eb..436396a 100644
--- a/src/chrome/skin/network-settings.css
+++ b/src/chrome/skin/network-settings.css
@@ -13,7 +13,7 @@ dialog {
 
 wizard {
   width: 540px;
-  height: 410px;
+  height: 380px;
   font: -moz-dialog;
   padding-top: 0px;
 }