[tbb-commits] [tor-launcher/master] Bug 10418: Improve layout and strings

[mikeperry at torproject.org]

commit 8748fdb1006a811eb5864be36108be4f2b5d0a8a
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Mar 10 16:27:11 2014 -0700

    Bug 10418: Improve layout and strings
    
    The layout may still need some work, but at least these strings are in better
    shape in terms of usability and future changes like #11071.
---
 src/chrome/content/network-settings-overlay.xul |   23 +++++++++++++----------
 src/chrome/locale/en/network-settings.dtd       |    9 +++++----
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul
index 29c3bb3..dc88655 100644
--- a/src/chrome/content/network-settings-overlay.xul
+++ b/src/chrome/content/network-settings-overlay.xul
@@ -76,25 +76,28 @@
   <groupbox id="bridgeSpecificSettings">
     <hbox pack="end">
       <radiogroup id="bridgeTypeRadioGroup" flex="1" style="margin: 0px">
-        <hbox align="center">
           <radio id="bridgeRadioDefault"
                  label="&torsettings.useBridges.default;" selected="true" />
-          <menulist id="defaultBridgeType" oncommand="onBridgeTypeChange()">
+          <hbox align="baseline">
+           <spacer style="width: 1.9em" />
+           <label value="&torsettings.useBridges.type;"
+              control="firewallAllowedPorts"/>
+           <menulist id="defaultBridgeType" oncommand="onBridgeTypeChange()">
             <menupopup id="defaultBridgeType_menuPopup" />
-          </menulist>
-          <spring/>
-        </hbox>
+           </menulist>
+           <spring/>
+          </hbox>
         <spacer style="height: 0.5em" />
 
-        <radio id="bridgeRadioCustom" label="&torsettings.useBridges.custom;"
+        <hbox align="baseline" flex="1">
+          <radio align="start" id="bridgeRadioCustom" label="&torsettings.useBridges.custom;"
                oncommand="onCustomBridges()" />
+          <button align="end" dlgtype="help" oncommand="onOpenHelp()" />
+       </hbox>
       </radiogroup>
-      <vbox pack="start">
-        <button dlgtype="help" oncommand="onOpenHelp()" />
-      </vbox>
     </hbox>
     <vbox id="bridgeCustomEntry">
-      <label style="margin-top:0px;"
+       <label style="margin-top:0px;"
              value="&torsettings.useBridges.label;" control="bridgeList"/>
       <textbox id="bridgeList" multiline="true" rows="3"
                oninput="onCustomBridgesTextInput();"
diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd
index 4e21541..62afab4 100644
--- a/src/chrome/locale/en/network-settings.dtd
+++ b/src/chrome/locale/en/network-settings.dtd
@@ -1,8 +1,8 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
+<!ENTITY torsettings.dialog.title "Tor Browser Network Settings">
 
 <!-- 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 the Tor Browser tries to connect to the Tor network, you need to provide information about this computer's Internet connection.">
 
 <!ENTITY torSettings.yes "Yes">
 <!ENTITY torSettings.no "No">
@@ -46,8 +46,9 @@
 <!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 "Use default bridges of type">
-<!ENTITY torsettings.useBridges.custom "Use custom bridges">
+<!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 "type address:port">