[tor-commits] [tor-launcher/master] Bug 12895: add @riseup.net to Bridge Relay Help

[brade at torproject.org]

commit c1a09372770adb8a3f7085f69eca2fecae7c1107
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Fri Aug 22 10:33:02 2014 -0400

    Bug 12895: add @riseup.net to Bridge Relay Help
---
 src/chrome/content/network-settings-overlay.xul |    3 ++-
 src/chrome/locale/en/network-settings.dtd       |    3 ++-
 src/chrome/skin/network-settings.css            |    8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul
index c9a6a82..03171ec 100644
--- a/src/chrome/content/network-settings-overlay.xul
+++ b/src/chrome/content/network-settings-overlay.xul
@@ -116,7 +116,8 @@
       </html:li>
       <html:li>
         <html:div class="heading">&torsettings.bridgeHelp3Heading;</html:div>
-        <html:div>&torsettings.bridgeHelp3;</html:div>
+        <html:div>&torsettings.bridgeHelp3.emailDesc;</html:div>
+        <html:div>&torsettings.bridgeHelp3.emailList;</html:div>
       </html:li>
       <html:li>
         <html:div class="heading">&torsettings.bridgeHelp4Heading;</html:div>
diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd
index f46473e..aa54f3e 100644
--- a/src/chrome/locale/en/network-settings.dtd
+++ b/src/chrome/locale/en/network-settings.dtd
@@ -59,6 +59,7 @@
 <!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 bridges at 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 a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges at 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 help at rt.torproject.org.  Please note that a person will need to respond to each request.">
diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css
index 60f1ef2..e4142d4 100644
--- a/src/chrome/skin/network-settings.css
+++ b/src/chrome/skin/network-settings.css
@@ -17,15 +17,15 @@ dialog.os-windows {
 }
 
 wizard {
-  width: 43em;
-  height: 34em;
+  width: 45em;
+  height: 35em;
   font: -moz-dialog;
   padding-top: 0px;
 }
 
 wizard.os-windows {
-  width: 45em;
-  height: 39em;
+  width: 46em;
+  height: 41em;
 }
 
 .wizard-page-box {