[tor-commits] [tor-launcher/master] Show Connect before Configure; improve configure prompt.

[brade@xxxxxxxxxxxxxx]

commit 913a5459204bc88f0f0496d4d4a12e331a17e67a
Author: Kathy Brade <brade@xxxxxxxxxxxxxx>
Date:   Mon May 13 11:33:24 2013 -0400

    Show Connect before Configure; improve configure prompt.
---
 src/chrome/content/network-settings-wizard.xul |    8 ++++----
 src/chrome/locale/en/network-settings.dtd      |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul
index 72941bc..ed822f7 100644
--- a/src/chrome/content/network-settings-wizard.xul
+++ b/src/chrome/content/network-settings-wizard.xul
@@ -41,13 +41,13 @@
     <vbox class="firstResponses" align="start">
       <label class="question">&torSettings.firstQuestion;</label>
       <separator/>
-      <label>&torSettings.configurePrompt1;</label>
-      <label>&torSettings.configurePrompt2;</label>
-      <button label="&torSettings.configure;" oncommand="onWizardConfigure();"/>
-      <separator class="tall"/>
       <label>&torSettings.connectPrompt1;</label>
       <label>&torSettings.connectPrompt2;</label>
       <button label="&torSettings.connect;" oncommand="useSettings();"/>
+      <separator class="tall"/>
+      <label>&torSettings.configurePrompt1;</label>
+      <label>&torSettings.configurePrompt2;</label>
+      <button label="&torSettings.configure;" oncommand="onWizardConfigure();"/>
     </vbox>
   </wizardpage>
 
diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd
index 2207dd2..7923622 100644
--- a/src/chrome/locale/en/network-settings.dtd
+++ b/src/chrome/locale/en/network-settings.dtd
@@ -8,7 +8,7 @@
 <!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, proxied, or filtered.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
 <!ENTITY torSettings.configurePrompt2 "I need to configure network settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt1 "This computer's Internet connection is clear of obstacles.">

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits