[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [tor-launcher/master] Bug #10894: Help desk is not a bridge autoresponder.

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor-launcher/master] Bug #10894: Help desk is not a bridge autoresponder.
From: brade@xxxxxxxxxxxxxx
Date: Fri, 14 Feb 2014 16:09:04 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 14 Feb 2014 11:09:16 -0500
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Kathy Brade <brade@xxxxxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit a187a2062840c9466b87154ba698e90decaf1302
Author: Kathy Brade <brade@xxxxxxxxxxxxxxxxx>
Date:   Fri Feb 14 11:06:04 2014 -0500

    Bug #10894: Help desk is not a bridge autoresponder.
    
    Revise the text and layout of the Bridge Relay Help wizard page to
    avoid confusion and to encourage people to try the other methods of
    obtaining bridge addresses before they contact the help desk.
---
 src/chrome/content/network-settings-wizard.xul |   19 +++++++++++++++---
 src/chrome/content/network-settings.js         |    6 ++++++
 src/chrome/locale/ar/network-settings.dtd      |    8 ++++++--
 src/chrome/locale/de/network-settings.dtd      |    4 ++++
 src/chrome/locale/en/network-settings.dtd      |   12 ++++++++----
 src/chrome/locale/es/network-settings.dtd      |    4 ++++
 src/chrome/locale/fa/network-settings.dtd      |    6 +++++-
 src/chrome/locale/fr/network-settings.dtd      |    4 ++++
 src/chrome/locale/it/network-settings.dtd      |    4 ++++
 src/chrome/locale/ja/network-settings.dtd      |    4 ++++
 src/chrome/locale/ko/network-settings.dtd      |    4 ++++
 src/chrome/locale/nl/network-settings.dtd      |    4 ++++
 src/chrome/locale/pl/network-settings.dtd      |    4 ++++
 src/chrome/locale/pt/network-settings.dtd      |    4 ++++
 src/chrome/locale/ru/network-settings.dtd      |    4 ++++
 src/chrome/locale/vi/network-settings.dtd      |    4 ++++
 src/chrome/locale/zh-CN/network-settings.dtd   |    4 ++++
 src/chrome/skin/network-settings.css           |   25 ++++++++++++++++++++----
 18 files changed, 110 insertions(+), 14 deletions(-)

diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul
index 20483ec..dcc169e 100644
--- a/src/chrome/content/network-settings-wizard.xul
+++ b/src/chrome/content/network-settings-wizard.xul
@@ -15,6 +15,7 @@
 
 <wizard id="TorNetworkSettings"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+        xmlns:html="http://www.w3.org/1999/xhtml";
         title="&torsettings.dialog.title;"
         windowtype="TorLauncher:NetworkSettings"
         persist="screenX screenY"
@@ -149,9 +150,21 @@
               onpageadvanced="closeHelp(); return false;">
     <hbox align="middle"><label>&torsettings.bridgeHelpTitle;</label></hbox>
     <description>&torsettings.bridgeHelp1;</description>
-    <description>&torsettings.bridgeHelp2;</description>
-    <description>&torsettings.bridgeHelp3;</description>
-    <description class="endOfHelp">&torsettings.bridgeHelp4;</description>
+    <description class="prelist">&torsettings.bridgeHelp1B;</description>
+    <html:ol>
+      <html:li>
+        <html:div class="heading">&torsettings.bridgeHelp2Heading;</html:div>
+        <html:div>&torsettings.bridgeHelp2;</html:div>
+      </html:li>
+      <html:li>
+        <html:div class="heading">&torsettings.bridgeHelp3Heading;</html:div>
+        <html:div>&torsettings.bridgeHelp3;</html:div>
+      </html:li>
+      <html:li>
+        <html:div class="heading">&torsettings.bridgeHelp4Heading;</html:div>
+        <html:div class="endOfHelp">&torsettings.bridgeHelp4;</html:div>
+      </html:li>
+    </html:ol>
   </wizardpage>
 
   <hbox pack="start">
diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js
index 27b6f58..6446af2 100644
--- a/src/chrome/content/network-settings.js
+++ b/src/chrome/content/network-settings.js
@@ -520,6 +520,9 @@ function onOpenHelp()
     showOrHideButton("back", false, false);
     showOrHideButton("extra2", false, false);
     overrideButtonLabel("next", "done");
+    var forAssistance = document.getElementById("forAssistance");
+    if (forAssistance)
+      forAssistance.setAttribute("hidden", true);
   }
   else
     overrideButtonLabel("cancel", "done");
@@ -539,6 +542,9 @@ function closeHelp()
     if (copyLogBtn && copyLogBtn.hasAttribute("wizardCanCopyLog"))
       copyLogBtn.removeAttribute("hidden");
     restoreButtonLabel("next");
+    var forAssistance = document.getElementById("forAssistance");
+    if (forAssistance)
+      forAssistance.removeAttribute("hidden");
   }
   else
     restoreButtonLabel("cancel");
diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd
index 21bc7e3..fda8d64 100644
--- a/src/chrome/locale/ar/network-settings.dtd
+++ b/src/chrome/locale/ar/network-settings.dtd
@@ -49,7 +49,11 @@
 
 <!ENTITY torsettings.copyLog "Ù?Ø³Ø® Ø³Ø¬Ù? ØªÙ?Ø± Ø¥Ù?Ù? Ø§Ù?ØØ§Ù?Ø¸Ø©">
 <!ENTITY torsettings.bridgeHelpTitle "Ø§Ù?Ù?Ø³Ø§Ø¹Ø¯Ø© Ø§Ù?Ø®Ø§ØµØ© Ø¨Ø§Ù?Ø¬Ø³Ù?Ø± Ø§Ù?Ù?Ù?Ø±ØÙ?Ø©">
-<!ENTITY torsettings.bridgeHelp1 "Ù?Ø¯ Ù?Ù?Ù?Ù? Ø§Ù?Ø³Ø¨Ø¨ Ù?Ù? Ø¹Ø¯Ù? Ù?Ø¯Ø±ØªÙ? Ø¹Ù?Ù? Ø§Ù?Ø§ØªØµØ§Ù? Ø¨Ø´Ø¨Ù?Ø© ØªÙ?Ø±Ù?Ù? Ø§Ù? Ù?Ø²Ù?Ø¯ Ø®Ø¯Ù?Ø© Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª Ø§Ù?Ø®Ø§Øµ Ø¨Ù? (ISP) Ø£Ù? Ù?Ù?Ø¸Ù?Ø© Ø§Ø®Ø±Ù? Ù?Ù?Ù?Ø¹ Ù?ØØ§Ù?Ù?Ø§Øª Ø§Ù?Ø§ØªØµØ§Ù? Ø¨Ø´Ø¨Ù?Ø© ØªÙ?Ø±. &amp;#160; Ù?ØºØ§Ù?Ø¨Ø§Ù?Ø? ØªØ³ØªØ·Ù?Ø¹ ØªØ®Ø·Ù? Ù?Ø°Ø§ Ø§Ù?Ù?Ù?Ø¹ Ø¹Ù? Ø·Ø±Ù?Ù? Ø§Ø³ØªØ®Ø¯Ø§Ù? Ø¬Ø³Ù?Ø± ØªÙ?Ø± Ù? Ø§Ù?Ø¬Ø³Ù?Ø± Ø¹Ø¨Ø§Ø±Ø© Ø¹Ù? Ù?Ù?Ø±ØÙ?Ø§Øª Ù?Ø®Ù?Ù?Ø© ØµØ¹Ø¨ Ù?Ù?Ø¹Ù?Ø§.">
+<!ENTITY torsettings.bridgeHelp1 "Ù?Ø¯ Ù?Ù?Ù?Ù? Ø§Ù?Ø³Ø¨Ø¨ Ù?Ù? Ø¹Ø¯Ù? Ù?Ø¯Ø±ØªÙ? Ø¹Ù?Ù? Ø§Ù?Ø§ØªØµØ§Ù? Ø¨Ø´Ø¨Ù?Ø© ØªÙ?Ø±Ù?Ù? Ø§Ù? Ù?Ø²Ù?Ø¯ Ø®Ø¯Ù?Ø© Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª Ø§Ù?Ø®Ø§Øµ Ø¨Ù? (ISP) Ø£Ù? Ù?Ù?Ø¸Ù?Ø© Ø§Ø®Ø±Ù? Ù?Ù?Ù?Ø¹ Ù?ØØ§Ù?Ù?Ø§Øª Ø§Ù?Ø§ØªØµØ§Ù? Ø¨Ø´Ø¨Ù?Ø© ØªÙ?Ø±. &#160; Ù?ØºØ§Ù?Ø¨Ø§Ù?Ø? ØªØ³ØªØ·Ù?Ø¹ ØªØ®Ø·Ù? Ù?Ø°Ø§ Ø§Ù?Ù?Ù?Ø¹ Ø¹Ù? Ø·Ø±Ù?Ù? Ø§Ø³ØªØ®Ø¯Ø§Ù? Ø¬Ø³Ù?Ø± ØªÙ?Ø± Ù? Ø§Ù?Ø¬Ø³Ù?Ø± Ø¹Ø¨Ø§Ø±Ø© Ø¹Ù? Ù?Ù?Ø±ØÙ?Ø§Øª Ù?Ø®Ù?Ù?Ø© ØµØ¹Ø¨ Ù?Ù?Ø¹Ù?Ø§.">
+<!ENTITY torsettings.bridgeHelp1B "">
+<!ENTITY torsettings.bridgeHelp2Heading "">
 <!ENTITY torsettings.bridgeHelp2 "Ù?Ù?ØØµÙ?Ù? Ø¹Ù?Ù? Ø¨Ø¹Ø¶ Ø§Ù?Ø¬Ø³Ù?Ø±Ø? Ø²Ø± Ù?Ø°Ù? Ø§Ù?ØµÙ?ØØ© Ù?Ù? Ø®Ù?Ø§Ù? Ø§Ù?Ù?ØªØµÙ?Ø: https://bridges.torproject.org";>
-<!ENTITY torsettings.bridgeHelp3 "Ù?Ù?Ù?Ø§Ù? Ø·Ø±Ù?Ù?Ø© Ø£Ø®Ø±Ù? Ù?Ù?Ø¹Ø«Ù?Ø± Ø¹Ù?Ù? Ø¹Ù?Ø§Ù?Ù?Ù? Ø§Ù?Ø¬Ø³Ù?Ø± Ø§Ù?Ø¹Ø§Ù?Ø© Ù?Ù?Ù? Ø¥Ø±Ø³Ø§Ù? Ø¨Ø±Ù?Ø¯ Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø¥Ù?Ù? bridges@xxxxxxxxxxxxxx Ù?ØØªÙ?Ù? Ø¹Ù?Ù? 'get bridges' Ù?Ù? Ù?Ù?Ø¨ Ø§Ù?Ø¨Ø±Ù?Ø¯.&amp;#160; Ù? ØØªÙ? ØªØ¶Ù?Ù? Ù?ØµÙ?Ù? Ø°Ù?Ù? Ø§Ù?Ø¨Ø±Ù?Ø¯ Ù?Ù?Ø§ Ø¨Ù?Ø¬Ø§Ø Ø§Ø³ØªØ®Ø¯Ù? Ø¥Ù?Ø§ gmail.com Ø£Ù? Ø¥Ù?Ø§ yahoo.com">
+<!ENTITY torsettings.bridgeHelp3Heading "">
+<!ENTITY torsettings.bridgeHelp3 "Ù?Ù?Ù?Ø§Ù? Ø·Ø±Ù?Ù?Ø© Ø£Ø®Ø±Ù? Ù?Ù?Ø¹Ø«Ù?Ø± Ø¹Ù?Ù? Ø¹Ù?Ø§Ù?Ù?Ù? Ø§Ù?Ø¬Ø³Ù?Ø± Ø§Ù?Ø¹Ø§Ù?Ø© Ù?Ù?Ù? Ø¥Ø±Ø³Ø§Ù? Ø¨Ø±Ù?Ø¯ Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø¥Ù?Ù? bridges@xxxxxxxxxxxxxx Ù?ØØªÙ?Ù? Ø¹Ù?Ù? 'get bridges' Ù?Ù? Ù?Ù?Ø¨ Ø§Ù?Ø¨Ø±Ù?Ø¯.&#160; Ù? ØØªÙ? ØªØ¶Ù?Ù? Ù?ØµÙ?Ù? Ø°Ù?Ù? Ø§Ù?Ø¨Ø±Ù?Ø¯ Ù?Ù?Ø§ Ø¨Ù?Ø¬Ø§Ø Ø§Ø³ØªØ®Ø¯Ù? Ø¥Ù?Ø§ gmail.com Ø£Ù? Ø¥Ù?Ø§ yahoo.com">
+<!ENTITY torsettings.bridgeHelp4Heading "">
 <!ENTITY torsettings.bridgeHelp4 "Ù?Ù?Ù?Ù?Ù? Ø¥Ù?Ø¶Ø§Ù? Ø·Ù?Ø¨ Ø§Ù?Ø¬Ø³Ù?Ø± Ù?Ø¥Ø±Ø³Ø§Ù? Ø¨Ø±Ù?Ø¯ Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø¥Ù?Ù? help@xxxxxxxxxxxxxxxxxx">
diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd
index 19af78a..5621a3a 100644
--- a/src/chrome/locale/de/network-settings.dtd
+++ b/src/chrome/locale/de/network-settings.dtd
@@ -50,6 +50,10 @@
 <!ENTITY torsettings.copyLog "Tor-Protokoll in die Zwischenablage kopieren">
 <!ENTITY torsettings.bridgeHelpTitle "Hilfe zum BrÃ¼ckenrelais">
 <!ENTITY torsettings.bridgeHelp1 "Sollten Sie sich nicht mit dem Tor-Netzwerk verbinden kÃ¶nnen, ist es mÃ¶glich, dass Ihr Internetdienstanbieter (ISP) oder eine andere Organisation, Tor blockiert.&amp;#160; Dieses Problem kann meist mit der Benutzung von TorbrÃ¼cke umgangen werden, dieses sind versteckte Relais und damit schwerer zu blocken.">
+<!ENTITY torsettings.bridgeHelp1B "">
+<!ENTITY torsettings.bridgeHelp2Heading "">
 <!ENTITY torsettings.bridgeHelp2 "Um einige BrÃ¼ckenrelais zu erhalten, besuchen Sie mit einem Web-Browser folgende Seite: https://bridges.torproject.org";>
+<!ENTITY torsettings.bridgeHelp3Heading "">
 <!ENTITY torsettings.bridgeHelp3 "Eine andere MÃ¶glichkeit Ã¶ffentliche BrÃ¼cken zu finden ist, eine E-Mail mit dem Inhalt Â»get bridgesÂ« an bridges@xxxxxxxxxxxxxx zu schicken.&amp;#160; Allerdings muss diese E-Mail, um es potentiellen Angreifern schwerer zu machen, von einer der folgenden Domains aus geschickt werden: gmail.com oder yahoo.com.">
+<!ENTITY torsettings.bridgeHelp4Heading "">
 <!ENTITY torsettings.bridgeHelp4 "BrÃ¼ckenrelais kÃ¶nnen auch mit Hilfe einer E-Mail an help@xxxxxxxxxxxxxxxxx angefordert werden.">
diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd
index ee9e149..899a543 100644
--- a/src/chrome/locale/en/network-settings.dtd
+++ b/src/chrome/locale/en/network-settings.dtd
@@ -49,7 +49,11 @@
 
 <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
 <!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.&#160; 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@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from an email address at one of the following domains: gmail.com or yahoo.com.">
-<!ENTITY torsettings.bridgeHelp4 "You can also request bridge relays by sending mail to help@xxxxxxxxxxxxxxxxxx">
+<!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.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
+<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!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@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; 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.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@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd
index 1fd58b2..28b0c9e 100644
--- a/src/chrome/locale/es/network-settings.dtd
+++ b/src/chrome/locale/es/network-settings.dtd
@@ -50,6 +50,10 @@
 <!ENTITY torsettings.copyLog "Copiar el registro de mensajes ('log') de Tor al portapapeles">
 <!ENTITY torsettings.bridgeHelpTitle "Ayuda de Repetidores Puente ('Bridge Relays')">
 <!ENTITY torsettings.bridgeHelp1 "Si no es capaz de conectar con la red Tor, podrÃa ser que su Proveedor de Servicios de Internet (ISP), u otra agencia, estÃ© bloqueando Tor.&amp;#160; A menudo puede evitar este problema usando puentes Tor ('bridges'), que son repetidores 'ocultos' mÃ¡s difÃciles de bloquear">
+<!ENTITY torsettings.bridgeHelp1B "">
+<!ENTITY torsettings.bridgeHelp2Heading "">
 <!ENTITY torsettings.bridgeHelp2 "Para obtener algunas direcciones de puentes, utilice un navegador web para visitar la siguiente pÃ¡gina: ">
+<!ENTITY torsettings.bridgeHelp3Heading "">
 <!ENTITY torsettings.bridgeHelp3 "Otra manera de encontrar direcciones de puentes ('bridges') pÃºblicas es mandar un correo a bridges@xxxxxxxxxxxxxx con la lÃnea 'get bridges' por si misma en el cuerpo del mensaje.&amp;#160; Sin embargo, para ponerle mÃ¡s difÃcil a un atacante conocer muchas direcciones de puentes, debe envÃar esta solicitud desde una direcciÃ³n de correo electrÃ³nico de uno de los siguientes dominios (con soporte DKIM): gmail.com o yahoo.com ">
+<!ENTITY torsettings.bridgeHelp4Heading "">
 <!ENTITY torsettings.bridgeHelp4 "TambiÃ©n puede solicitar repetidores puente ('bridge relays') mandando un correo a help@xxxxxxxxxxxxxxxxx">
diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd
index ab43953..d837426 100644
--- a/src/chrome/locale/fa/network-settings.dtd
+++ b/src/chrome/locale/fa/network-settings.dtd
@@ -49,7 +49,11 @@
 
 <!ENTITY torsettings.copyLog "Ú©Ù¾Û? Ú¯Ø²Ø§Ø±Ø´ Ù?Ù?Ø§Û?Ø¹ ØªÙ?Ø±">
 <!ENTITY torsettings.bridgeHelpTitle "Ú©Ù?Ú© Ø¨Ø±Ø§Û? Ù¾Ù? Ø§Ø±ØªØ¨Ø§Ø·Û?">
-<!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.&amp;#160; Often, you can work around this problem by using Tor Bridges which are hidden relays that are more difficult to block.">
+<!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.&amp;#160; Often, you can work around this problem by using Tor Bridges which are unlisted relays that are more difficult to block.">
+<!ENTITY torsettings.bridgeHelp1B "">
+<!ENTITY torsettings.bridgeHelp2Heading "">
 <!ENTITY torsettings.bridgeHelp2 "Ø¨Ø±Ø§Û? Ø¨Ø¯Ø³Øª Ø¢Ù?Ø±Ø¯Ù? Ù¾Ù? Ø§Ø±ØªØ¨Ø§Ø·Û?Ù«Ø¨Ø§ Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø§Ø² Ù?Ø±Ù?Ø±Ú¯Ø± Ù?Ø¨ Ø¨Ù? Ø¢Ø¯Ø±Ø³ https://bridges.torproject.org Ù?Ø±Ø§Ø¬Ø¹Ù? Ù?Ø±Ù?Ø§Û?Û?Ø¯.">
+<!ENTITY torsettings.bridgeHelp3Heading "">
 <!ENTITY torsettings.bridgeHelp3 "Another way to find public bridge addresses is to send mail to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&amp;#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from an email address at one of the following domains: gmail.com or yahoo.com.">
+<!ENTITY torsettings.bridgeHelp4Heading "">
 <!ENTITY torsettings.bridgeHelp4 "Ø´Ù?Ø§ Ù?Û?ØªÙ?Ø§Ù?Û?Ø¯ Ø¨Ø§ Ø§Ø±Ø³Ø§Ù? Ø§Û?Ù?Û?Ù? Ø¨Ù? help@xxxxxxxxxxxxxxxxx Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù¾Ù? Ø§Ø±ØªØ¨Ø§Ø·Û? Ù?Ù?Ø§Û?Û?Ø¯.">
diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd
index 7d4a4fe..edbe29e 100644
--- a/src/chrome/locale/fr/network-settings.dtd
+++ b/src/chrome/locale/fr/network-settings.dtd
@@ -50,6 +50,10 @@
 <!ENTITY torsettings.copyLog "Copier le journal des messages de Tor dans le presse-papier">
 <!ENTITY torsettings.bridgeHelpTitle "Aide pour les bridges">
 <!ENTITY torsettings.bridgeHelp1 "S'il est impossible de se connecter au rÃ©seau Tor, cela peut Ãªtre le signe que votre Fournisseur d'AccÃ¨s Ã  Internet (FAI) ou une autre entitÃ© bloque Tor. La plupart du temps, vous pouvez contourner ce problÃ¨me en utilisant les Â«Â bridgesÂ Â» Tor. Ce sont des relais cachÃ©s qui sont plus difficiles Ã  bloquer.">
+<!ENTITY torsettings.bridgeHelp1B "">
+<!ENTITY torsettings.bridgeHelp2Heading "">
 <!ENTITY torsettings.bridgeHelp2 "Pour obtenir des adresses de bridges, utilisez un navigateur web pour aller sur la pageÂ : https://bridges.torproject.org/";>
+<!ENTITY torsettings.bridgeHelp3Heading "">
 <!ENTITY torsettings.bridgeHelp3 "Une autre maniÃ¨re de trouver des adresses de bridges publics est d'envoyer un mail Ã  bridges@xxxxxxxxxxxxxx avec la ligne &quot;get bridges&quot; dans le corps de l'email. Toutefois, pour que cela soit plus difficile pour un attaquant de dÃ©couvrir beaucoup d'adresses, les demandes doivent provenir d'une adresse email appartenant Ã  l'un des domaines suivantsÂ : gmail.com ou yahoo.com.">
+<!ENTITY torsettings.bridgeHelp4Heading "">
 <!ENTITY torsettings.bridgeHelp4 "Vous pouvez Ã©galement demander des adresses de bridges en Ã©crivant Ã  help-fr@xxxxxxxxxxxxxxxxxx">
diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd
index cc5228f..bed89b3 100644
--- a/src/chrome/locale/it/network-settings.dtd
+++ b/src/chrome/locale/it/network-settings.dtd
@@ -50,6 +50,10 @@
 <!ENTITY torsettings.copyLog "Copia il log di Tor negli &quot;appunti&quot; di sistema">
 <!ENTITY torsettings.bridgeHelpTitle "Aiuto per i ponti relÃ©">
 <!ENTITY torsettings.bridgeHelp1 "Se non riesci a connetterti alla rete Tor, potrebbe essere il tuo fornitore di servizi Internet (ISP), o un altro ente, che sta bloccando Tor.&amp;#160; Spesso Ã¨ possibile aggirare questo problema utilizzando i ponti Tor: si tratta di relÃ© nascosti, piÃ¹ difficili da bloccare.">
+<!ENTITY torsettings.bridgeHelp1B "">
+<!ENTITY torsettings.bridgeHelp2Heading "">
 <!ENTITY torsettings.bridgeHelp2 "Per ottenere una lista di ponti relÃ©, visita con un browser web la seguente pagina: https://bridges.torproject.org";>
+<!ENTITY torsettings.bridgeHelp3Heading "">
 <!ENTITY torsettings.bridgeHelp3 "Un altro modo per conoscere gli indirizzi dei ponti pubblici consiste nell'inviare una e-mail all'indirizzo bridges@xxxxxxxxxxxxxx con il testo 'get bridges' nel corpo del messaggio.&amp;#160; Tuttavia, per rendere piÃ¹ difficile ad un utente malintenzionato il rilevamento di molti indirizzi dei ponti, devi inviare la richiesta da un indirizzo e-mail appartenente ad uno dei seguenti domini: gmail.com oppure yahoo.com.">
+<!ENTITY torsettings.bridgeHelp4Heading "">
 <!ENTITY torsettings.bridgeHelp4 "Una lista di ponti relÃ© puÃ² essere ottenuta anche inviando una e-mail all'indirizzo help@xxxxxxxxxxxxxxxxxx">
diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd
index 976df97..d12b19f 100644
--- a/src/chrome/locale/ja/network-settings.dtd
+++ b/src/chrome/locale/ja/network-settings.dtd
@@ -50,6 +50,10 @@
 <!ENTITY torsettings.copyLog "Torã?®ã?ã?°ã??ã?¯ã?ªã??ã??ã??ã?¼ã??ã?«ã?³ã??ã?¼">
 <!ENTITY torsettings.bridgeHelpTitle "ã??ã?ªã??ã?¸ã?ªã?¬ã?¼ã?®ã??ã?«ã??">
 <!ENTITY torsettings.bridgeHelp1 "Torã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã?§ã??ã?ªã??å ´å??ã??ã??ã?ªã??ã?®ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã?µã?¼ã??ã?¹ã??ã?ã??ã?¤ã??(ISP)ã??å?¥ã?®ä»£ç??åº?ã??Torã??ã??ã?ã??ã?¯ã??ã?¦ã??ã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??ã??&amp;#160; ã??ã?ã??ã?¯ã??ã??ã??ã?¨ã??ã??ã??å?°é?£ã?«ã??ã??é? ã??ã?ªã?¬ã?¼ã?§ã??ã??Torã??ã?ªã??ã?¸ã??ä½¿ç?¨ã??ã??ã??ã?¨ã?§ã??ã??ã?°ã??ã?°ã??ã?®å??é¡?ã??å??é?¿å?ºæ?¥ã?¾ã??ã??">
+<!ENTITY torsettings.bridgeHelp1B "">
+<!ENTITY torsettings.bridgeHelp2Heading "">
 <!ENTITY torsettings.bridgeHelp2 "ã??ã??ã?¤ã??ã??ã?ªã??ã?¸ã?ªã?¬ã?¼ã??å?¥æ??ã??ã??ã?«ã?¯ã??ã?¦ã?§ã??ã??ã?©ã?¦ã?¶ã?¼ã??ä½¿ç?¨ã??ã??ä»¥ä¸?ã?®ã??ã?¼ã?¸ã?«è¡?ã?£ã?¦ã??ã? ã??ã??: https://bridges.torproject.org";>
+<!ENTITY torsettings.bridgeHelp3Heading "">
 <!ENTITY torsettings.bridgeHelp3 "ã??ã??ã?ªã??ã?¯ã?ªã??ã?ªã??ã?¸ã?¢ã??ã?¬ã?¹ã??è¦?ã?¤ã??ã??ã??ã??ä¸?ã?¤ã?®æ?¹æ³?ã?¯ã??æ?¬æ??ã?«&lt;b&gt;get bridges&lt;/b&gt;ã?¨è¨?å?¥ã??ã??E-mailã?? bridges@xxxxxxxxxxxxxx å®?ã?«é??ä¿¡ã??ã?? ã??ã?¨ã?§ã??ã??&amp;#160; ã??ã??ã??ã??ã?¢ã?¿ã??ã?«ã?¼ã??ã??ã??ã??ã??ã?®ã??ã?ªã??ã?¸ã?¢ã??ã?¬ã?¹ã??å??é??ã??ã??ã?®ã??å?°é?£ã?«ã??ã??ã??ã??ã?? ã??ã?ªã??ã?¯ã??gmail.comã??yahoo.comã?®ã??ã?¡ã?¤ã?³ã?®ã??ã??ã??ã??ã??ã??ã??ã?®ã?ªã?¯ã?¨ã?¹ã??ã??é??ã??ã?ªã??ã??ã?°ã?ªã??ã?¾ã??ã??ã??">
+<!ENTITY torsettings.bridgeHelp4Heading "">
 <!ENTITY torsettings.bridgeHelp4 "help@xxxxxxxxxxxxxxxxxå®?ã?«ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã??ã??ã?¨ã?§ã??ã??ã?ªã??ã?¸ã?ªã?¬ã?¼ã??è¦?æ±?ã?§ã??ã?¾ã??ã??">
diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd
index 91886b4..8091319 100644
--- a/src/chrome/locale/ko/network-settings.dtd
+++ b/src/chrome/locale/ko/network-settings.dtd
@@ -50,6 +50,10 @@
 <!ENTITY torsettings.copyLog "">
 <!ENTITY torsettings.bridgeHelpTitle "">
 <!ENTITY torsettings.bridgeHelp1 "">
+<!ENTITY torsettings.bridgeHelp1B "">
+<!ENTITY torsettings.bridgeHelp2Heading "">
 <!ENTITY torsettings.bridgeHelp2 "">
+<!ENTITY torsettings.bridgeHelp3Heading "">
 <!ENTITY torsettings.bridgeHelp3 "">
+<!ENTITY torsettings.bridgeHelp4Heading "">
 <!ENTITY torsettings.bridgeHelp4 "">
diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd
index 96cb0a2..23caff2 100644
--- a/src/chrome/locale/nl/network-settings.dtd
+++ b/src/chrome/locale/nl/network-settings.dtd
@@ -50,6 +50,10 @@
 <!ENTITY torsettings.copyLog "Kopieer Tor log naar het klembord">
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Hulp">
 <!ENTITY torsettings.bridgeHelp1 "Als je niet kan verbinden met het Tor netwerk, dan is het mogelijk dat je Internet Service Provider (ISP) of en ander agentschap Tor &amp;#160; blokkeert. Vaak kan je dit probleem omzeilen door gebruik te maken van Tor Bridges. Dit zijn verborgen relays die moeilijker te blokkeren zijn.">
+<!ENTITY torsettings.bridgeHelp1B "">
+<!ENTITY torsettings.bridgeHelp2Heading "">
 <!ENTITY torsettings.bridgeHelp2 "Om enkele bridge relays te verkrijgen gebruik je een web browser om de volgende pagina te bezoeken: https://bridges.torproject.org";>
+<!ENTITY torsettings.bridgeHelp3Heading "">
 <!ENTITY torsettings.bridgeHelp3 "Een andere manier om openbare bridge addressen te verkrijgen is door e-mail te sturen naar bridges@xxxxxxxxxxxxxx met de woorden 'get bridges' als losstaande tekst in het berichtgedeelte van de e-mail. &amp;#160; Echter: om het moelijker te maken voor een aanvaller om veel bridge adressen te verkrijgen, moet je deze e-mail versturen vanaf een e-mailadres uit Ã©Ã©n van de volgende domeinen: gmail.com of yahoo.com.">
+<!ENTITY torsettings.bridgeHelp4Heading "">
 <!ENTITY torsettings.bridgeHelp4 "Je kan ook bridge relays opvragen door een e-mail te sturen naar help@xxxxxxxxxxxxxxxxxx">
diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd
index ffbd499..f18352a 100644
--- a/src/chrome/locale/pl/network-settings.dtd
+++ b/src/chrome/locale/pl/network-settings.dtd
@@ -50,6 +50,10 @@
 <!ENTITY torsettings.copyLog "Skopiuj log do schowka">
 <!ENTITY torsettings.bridgeHelpTitle "Pomoc PrzekaÅºnikÃ³w Mostkowych">
 <!ENTITY torsettings.bridgeHelp1 "JeÅ?li nie moÅ¼esz poÅ?Ä?czyÄ? siÄ? z sieciÄ? Tor moÅ¼liwe jest, Å¼e TwÃ³j dostawca internetu (ISP) blokuje Ci ten dostÄ?p&amp;#160. CzÄ?stym rozwiÄ?zaniem jest uÅ¼ycie mostkÃ³w Tora, w ktÃ³rych ukryte sÄ? przekaÅºniki trudne do wykrycia.">
+<!ENTITY torsettings.bridgeHelp1B "">
+<!ENTITY torsettings.bridgeHelp2Heading "">
 <!ENTITY torsettings.bridgeHelp2 "W celu uzyskania przekaÅºnikÃ³w mostkowych skorzystaÄ? ze strony  https://bridges.torproject.org";>
+<!ENTITY torsettings.bridgeHelp3Heading "">
 <!ENTITY torsettings.bridgeHelp3 "InnÄ? drogÄ? do znalezienia publicznych mostkÃ³w jest wysÅ?anie e-maila do bridges@xxxxxxxxxxxxxx z poleceniem 'get bridges' w tytule wiadomoÅ?ci.&amp;#160; JednakÅ¼e, by utrudniÄ? atakujÄ?cym dostÄ?p do wiedzy o mostkach musisz wysÅ?aÄ? zapytanie z adresu o domenach: gmail.com lub yahoo.com.">
+<!ENTITY torsettings.bridgeHelp4Heading "">
 <!ENTITY torsettings.bridgeHelp4 "MoÅ¼esz zgÅ?osiÄ? mostki wysyÅ?ajÄ?c e-maila do help@xxxxxxxxxxxxxxxxxx">
diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd
index b743ce3..e998fb1 100644
--- a/src/chrome/locale/pt/network-settings.dtd
+++ b/src/chrome/locale/pt/network-settings.dtd
@@ -50,6 +50,10 @@
 <!ENTITY torsettings.copyLog "Copiar o Tor Log para o Clipboard">
 <!ENTITY torsettings.bridgeHelpTitle "Ajuda Bridge Relay">
 <!ENTITY torsettings.bridgeHelp1 "Se nÃ£o consegue ligar-se Ã  rede Tor, o seu Internet Service Provider (ISP) ou outra agÃªncia estÃ¡ a bloquear o Tor.&amp;#160; Muito frequentemente poderÃ¡ contornar este problema usando Bridges Tor que sÃ£o relays escondidos mais difÃceis de bloquear.">
+<!ENTITY torsettings.bridgeHelp1B "">
+<!ENTITY torsettings.bridgeHelp2Heading "">
 <!ENTITY torsettings.bridgeHelp2 "Para obter alguns bridge relays, utilize um navegador web para visitar a seguinte pÃ¡gina: https://bridges.torproject.org";>
+<!ENTITY torsettings.bridgeHelp3Heading "">
 <!ENTITY torsettings.bridgeHelp3 "Outra forma de encontrar enderenÃ§oes de bridges pÃºblicos Ã© enviar um e-mail para bridges@xxxxxxxxxxxxxx com &quot;get bridges&quot; no corpo da mensagem.&amp;#160; Contudo, para tornar mais difÃcil para um atacante descobrir muito sobre endereÃ§Ãµes bridge, deve enviar este pedido a partir de um endereÃ§o de e-mail de um dos seguintes domÃnios: gmail.com ou yahoo.com.">
+<!ENTITY torsettings.bridgeHelp4Heading "">
 <!ENTITY torsettings.bridgeHelp4 "TambÃ©m pode pedir bridge relays enviando um e-mail para help@xxxxxxxxxxxxxxxxxx">
diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd
index 7c96ee2..c84d7de 100644
--- a/src/chrome/locale/ru/network-settings.dtd
+++ b/src/chrome/locale/ru/network-settings.dtd
@@ -50,6 +50,10 @@
 <!ENTITY torsettings.copyLog "Ð¡ÐºÐ¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¶Ñ?Ñ?Ð½Ð°Ð» Tor Ð² Ð±Ñ?Ñ?ÐµÑ? Ð¾Ð±Ð¼ÐµÐ½Ð°">
 <!ENTITY torsettings.bridgeHelpTitle "Ð?Ð¾Ð¼Ð¾Ñ?Ñ? Ð¿Ð¾ Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð°Ð¼ Ñ?Ð¸Ð¿Ð° Ð¼Ð¾Ñ?Ñ?">
 <!ENTITY torsettings.bridgeHelp1 "Ð?Ñ?Ð»Ð¸ Tor Ð¿Ð¾-Ð¿Ñ?ÐµÐ¶Ð½ÐµÐ¼Ñ? Ð½Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ð°ÐµÑ?, Ð²Ð¿Ð¾Ð»Ð½Ðµ Ð²ÐµÑ?Ð¾Ñ?Ñ?Ð½Ð¾, Ñ?Ñ?Ð¾ Ð?Ð°Ñ? Ð¿Ñ?Ð¾Ð²Ð°Ð¹Ð´ÐµÑ? Ð±Ð»Ð¾ÐºÐ¸Ñ?Ñ?ÐµÑ? Tor. &amp;#160; Ð?Ñ?ÐµÐ½Ñ? Ñ?Ð°Ñ?Ñ?Ð¾ Ñ?Ñ?Ð¾ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð±Ð¾Ð¹Ñ?Ð¸ Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?Ñ?Ñ? Tor Ð¼Ð¾Ñ?Ñ?Ð¾Ð² - Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð¾Ð², ÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ð½Ðµ Ñ?Ð°Ðº Ð»ÐµÐ³ÐºÐ¾ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ?.">
+<!ENTITY torsettings.bridgeHelp1B "">
+<!ENTITY torsettings.bridgeHelp2Heading "">
 <!ENTITY torsettings.bridgeHelp2 "Ð§Ñ?Ð¾Ð±Ñ? Ð½Ð°Ð¹Ñ?Ð¸ Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ñ? Ñ?Ð¸Ð¿Ð° Ð¼Ð¾Ñ?Ñ? Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð»Ñ?Ð¹Ñ?ÐµÑ?Ñ? Ð¿Ð¾ Ð°Ð´Ñ?ÐµÑ?Ñ? https://bridges.torproject.org";>
+<!ENTITY torsettings.bridgeHelp3Heading "">
 <!ENTITY torsettings.bridgeHelp3 "Ð?Ñ?Ñ?Ð³Ð¾Ð¹ Ñ?Ð¿Ð¾Ñ?Ð¾Ð± Ð½Ð°Ð¹Ñ?Ð¸ Ð¿Ñ?Ð±Ð»Ð¸Ñ?Ð½Ñ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ð° - Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ñ? Ð¿Ð¸Ñ?Ñ?Ð¼Ð¾ Ð½Ð° Ð°Ð´Ñ?ÐµÑ? bridges@xxxxxxxxxxxxxx Ñ?Ð¾ Ñ?Ñ?Ñ?Ð¾ÐºÐ¾Ð¹ get bridges Ð² Ñ?ÐµÐ»Ðµ Ð¿Ð¸Ñ?Ñ?Ð¼Ð°. Ð? Ñ?ÐµÐ»Ñ?Ñ? Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð° Ð¿Ñ?Ð¸Ð½Ð¸Ð¼Ð°ÐµÑ? Ð¿Ð¸Ñ?Ñ?Ð¼Ð° Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¾Ð² gmail.com Ð¸ yahoo.com">
+<!ENTITY torsettings.bridgeHelp4Heading "">
 <!ENTITY torsettings.bridgeHelp4 "Ð?Ñ? Ñ?Ð°ÐºÐ¶Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ñ?Ð¿Ð¸Ñ?Ð¾Ðº Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð¸Ð² Ð¿Ð¸Ñ?Ñ?Ð¼Ð¾ Ð½Ð° help@xxxxxxxxxxxxxxxxx">
diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd
index 7dfa6cc..3ac3994 100644
--- a/src/chrome/locale/vi/network-settings.dtd
+++ b/src/chrome/locale/vi/network-settings.dtd
@@ -50,6 +50,10 @@
 <!ENTITY torsettings.copyLog "">
 <!ENTITY torsettings.bridgeHelpTitle "">
 <!ENTITY torsettings.bridgeHelp1 "">
+<!ENTITY torsettings.bridgeHelp1B "">
+<!ENTITY torsettings.bridgeHelp2Heading "">
 <!ENTITY torsettings.bridgeHelp2 "">
+<!ENTITY torsettings.bridgeHelp3Heading "">
 <!ENTITY torsettings.bridgeHelp3 "">
+<!ENTITY torsettings.bridgeHelp4Heading "">
 <!ENTITY torsettings.bridgeHelp4 "">
diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd
index 14b753d..267e4bb 100644
--- a/src/chrome/locale/zh-CN/network-settings.dtd
+++ b/src/chrome/locale/zh-CN/network-settings.dtd
@@ -50,6 +50,10 @@
 <!ENTITY torsettings.copyLog "è¯·å°? Tor æ?¥å¿?å¤?å?¶å?°å?ªè´´æ?¿">
 <!ENTITY torsettings.bridgeHelpTitle "ç½?æ¡¥ä¸ç»§å¸®å?©">
 <!ENTITY torsettings.bridgeHelp1 "å¦?æ??æ? æ³?è¿?æ?¥ Tor ç½?ç»?ï¼?å?¯è?½æ?¯å? ä¸ºäº?è??ç½?æ??å?¡æ??ä¾?å?? (ISP) å°?é??äº? Torã??é??å¸¸ï¼?å?©ç?¨æ?´é?¾ä»¥å°?é??ç??é??è??ä¸ç»§ Tor ç½?æ¡¥å?¯ä»¥åº?å¯¹è¿?ä¸?é?®é¢?ã??">
+<!ENTITY torsettings.bridgeHelp1B "">
+<!ENTITY torsettings.bridgeHelp2Heading "">
 <!ENTITY torsettings.bridgeHelp2 "å¦?é??è?·å??ç½?æ¡¥ï¼?è¯·ä½¿ç?¨æµ?è§?å?¨è®¿é?®ä»¥ä¸?é¡µé?¢ï¼?https://bridges.torproject.org";>
+<!ENTITY torsettings.bridgeHelp3Heading "">
 <!ENTITY torsettings.bridgeHelp3 "è?·å??å?¬å?±ç½?æ¡¥å?°å??è¿?æ??ä¸?ä¸ªæ?¹å¼?ï¼?å??é??é?®ä»¶è?³ bridges@xxxxxxxxxxxxxxï¼?å¹¶å?¨æ£æ??ä¸å¡«ä¸?â??get bridgesâ??ã??ä¸?è¿?ï¼?ä¸ºäº?é?²æ¢æ?»å?»è??è?·å¾?å¤§é??ç½?æ¡¥å?°å??ï¼?å??é??é?®ä»¶ç??ç?µå?é?®ä»¶å?°å??å¿?é¡»æ?¥è?ªä»¥ä¸?å??å??ï¼?gmail.com æ?? yahoo.comã??">
+<!ENTITY torsettings.bridgeHelp4Heading "">
 <!ENTITY torsettings.bridgeHelp4 "å?¦å¤?ï¼?è¿?å?¯ä»¥å??é??ç?µå?é?®ä»¶è?³ help@xxxxxxxxxxxxxxxxx æ?¥è?·å??ç½?æ¡¥ä¸ç»§ã??">
diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css
index 7ab28c1..4f39e5a 100644
--- a/src/chrome/skin/network-settings.css
+++ b/src/chrome/skin/network-settings.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, The Tor Project, Inc.
+ * Copyright (c) 2014, The Tor Project, Inc.
  * See LICENSE for licensing information.
  *
  * vim: set sw=2 sts=2 ts=8 et syntax=css:
@@ -65,6 +65,7 @@ separator.tall {
   height: 2.1em;
 }
 
+.help .heading,
 .question {
   font-weight: bold;
 }
@@ -113,21 +114,37 @@ dialog .help {
 .help label {
   font-size: 120%;
   font-weight: bold;
-  margin: 0px 0px 20px 0px;
+  margin: 0px 0px 12px 0px;
+}
+
+.help div {
+  -moz-user-select: text;
+  -moz-user-focus: normal;
 }
 
 .help description {
-  margin-bottom: 15px;
+  margin-bottom: 10px;
   -moz-user-select: text;
   -moz-user-focus: normal;
   cursor: text;
 }
 
-.help description.endOfHelp {
+.help description.prelist {
   margin-bottom: 0px;
 }
 
+.help ol {
+  padding-top: 0px;
+  margin-top: 5px;
+  margin-bottom: 0px;
+}
+
+.help li {
+  margin-bottom: 8px;
+}
+
 /* Increase font size on Windows for readability */
+.os-windows div,
 .os-windows label,
 .os-windows description,
 .os-windows textbox

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

Prev by Author: [tor-commits] [tor-launcher/master] Bug #10610: Users don't know if free of obstacles
Next by Author: [tor-commits] [tor-launcher/master] Require Firefox 24.0 or newer. Use *.*.* for maxVersion of all applications.
Previous by thread: [tor-commits] [torspec/master] Add 227-vote-on-package-fingerprints.txt
Next by thread: [tor-commits] [tor-launcher/master] Bug #10894: Help desk is not a bridge autoresponder.
Index(es):
- Author
- Thread