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

brade Fri, 14 Feb 2014 08:09:46 -0800

commit a187a2062840c9466b87154ba698e90decaf1302
Author: Kathy Brade <[email protected]>
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 "ÙÙÙØ§Ù Ø·Ø±ÙÙØ© Ø£Ø®Ø±Ù ÙÙØ¹Ø«ÙØ± 
Ø¹ÙÙ Ø¹ÙØ§ÙÙÙ Ø§ÙØ¬Ø³ÙØ± Ø§ÙØ¹Ø§ÙØ© ÙÙÙ Ø¥Ø±Ø³Ø§Ù Ø¨Ø±ÙØ¯ 
Ø¥ÙÙØªØ±ÙÙÙ Ø¥ÙÙ [email protected] ÙØØªÙÙ Ø¹ÙÙ 'get bridges' 
ÙÙ ÙÙØ¨ Ø§ÙØ¨Ø±ÙØ¯.&amp;#160; Ù ØØªÙ ØªØ¶ÙÙ ÙØµÙÙ Ø°ÙÙ 
Ø§ÙØ¨Ø±ÙØ¯ ÙÙØ§ Ø¨ÙØ¬Ø§Ø Ø§Ø³ØªØ®Ø¯Ù Ø¥ÙØ§ gmail.com Ø£Ù Ø¥ÙØ§ 
yahoo.com">
+<!ENTITY torsettings.bridgeHelp3Heading "">
+<!ENTITY torsettings.bridgeHelp3 "ÙÙÙØ§Ù Ø·Ø±ÙÙØ© Ø£Ø®Ø±Ù ÙÙØ¹Ø«ÙØ± 
Ø¹ÙÙ Ø¹ÙØ§ÙÙÙ Ø§ÙØ¬Ø³ÙØ± Ø§ÙØ¹Ø§ÙØ© ÙÙÙ Ø¥Ø±Ø³Ø§Ù Ø¨Ø±ÙØ¯ 
Ø¥ÙÙØªØ±ÙÙÙ Ø¥ÙÙ [email protected] ÙØØªÙÙ Ø¹ÙÙ 'get bridges' 
ÙÙ ÙÙØ¨ Ø§ÙØ¨Ø±ÙØ¯.&#160; Ù ØØªÙ ØªØ¶ÙÙ ÙØµÙÙ Ø°ÙÙ Ø§ÙØ¨Ø±ÙØ¯ 
ÙÙØ§ Ø¨ÙØ¬Ø§Ø Ø§Ø³ØªØ®Ø¯Ù Ø¥ÙØ§ gmail.com Ø£Ù Ø¥ÙØ§ yahoo.com">
+<!ENTITY torsettings.bridgeHelp4Heading "">
 <!ENTITY torsettings.bridgeHelp4 "ÙÙÙÙÙ Ø¥ÙØ¶Ø§Ù Ø·ÙØ¨ Ø§ÙØ¬Ø³ÙØ± 
ÙØ¥Ø±Ø³Ø§Ù Ø¨Ø±ÙØ¯ Ø¥ÙÙØªØ±ÙÙÙ Ø¥ÙÙ [email protected].">
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 
[email protected] 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 [email protected] 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 [email protected] 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 [email protected].">
+<!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 [email protected] 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 [email protected].&#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 [email protected] 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 [email protected]">
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 [email protected] 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 "Ø´ÙØ§ ÙÛØªÙØ§ÙÛØ¯ Ø¨Ø§ Ø§Ø±Ø³Ø§Ù 
Ø§ÛÙÛÙ Ø¨Ù [email protected] Ø¯Ø±Ø®ÙØ§Ø³Øª Ù¾Ù Ø§Ø±ØªØ¨Ø§Ø·Û ÙÙ
Ø§ÛÛØ¯.">
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 Ã  [email protected] 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 Ã  [email protected].">
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 
[email protected] 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 [email protected].">
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ã [email protected] 
å®ã«éä¿¡ãã ãã¨ã§ãã&amp;#160; 
ããããã¢ã¿ãã«ã¼ãããããã®ããªãã¸ã¢ãã¬ã¹ãåéããã®ãå°é£ã«ããããã
 
ããªãã¯ãgmail.comãyahoo.comã®ãã¡ã¤ã³ã®ãããããããã®ãªã¯ã¨ã¹ããéããªããã°ãªãã¾ããã">
+<!ENTITY torsettings.bridgeHelp4Heading "">
 <!ENTITY torsettings.bridgeHelp4 
"[email protected]å®ã«ã¡ã¼ã«ãéä¿¡ãããã¨ã§ãããªãã¸ãªã¬ã¼ãè¦æ±ã§ãã¾ãã">
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 [email protected] 
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 [email protected].">
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 [email protected] 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 [email protected].">
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 [email protected] 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 [email protected].">
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 "ÐÑÑÐ³Ð¾Ð¹ ÑÐ¿Ð¾ÑÐ¾Ð± Ð½Ð°Ð¹ÑÐ¸ 
Ð¿ÑÐ±Ð»Ð¸ÑÐ½ÑÐµ Ð°Ð´ÑÐµÑÐ° - Ð¿Ð¾ÑÐ»Ð°ÑÑ Ð¿Ð¸ÑÑÐ¼Ð¾ Ð½Ð° Ð°Ð´ÑÐµÑ 
[email protected] ÑÐ¾ ÑÑÑÐ¾ÐºÐ¾Ð¹ get bridges Ð² ÑÐµÐ»Ðµ 
Ð¿Ð¸ÑÑÐ¼Ð°. Ð ÑÐµÐ»ÑÑ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸ ÑÐ¸ÑÑÐµÐ¼Ð° 
Ð¿ÑÐ¸Ð½Ð¸Ð¼Ð°ÐµÑ Ð¿Ð¸ÑÑÐ¼Ð° ÑÐ¾Ð»ÑÐºÐ¾ Ñ Ð°Ð´ÑÐµÑÐ¾Ð² gmail.com Ð¸ 
yahoo.com">
+<!ENTITY torsettings.bridgeHelp4Heading "">
 <!ENTITY torsettings.bridgeHelp4 "ÐÑ ÑÐ°ÐºÐ¶Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ 
Ð·Ð°Ð¿ÑÐ¾ÑÐ¸ÑÑ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¼Ð¾ÑÑÐ¾Ð² Ð¾ÑÐ¿ÑÐ°Ð²Ð¸Ð² Ð¿Ð¸ÑÑÐ¼Ð¾ Ð½Ð° 
[email protected]">
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 "è·åå¬å
±ç½æ¡¥å°åè¿æä¸ä¸ªæ¹å¼ï¼åéé®ä»¶è³ 
[email protected]ï¼å¹¶å¨æ£æä¸å¡«ä¸âget 
bridgesâãä¸è¿ï¼ä¸ºäºé²æ¢æ»å»è
è·å¾å¤§éç½æ¡¥å°åï¼åéé®ä»¶ççµåé®ä»¶å°åå¿
é¡»æ¥èªä»¥ä¸ååï¼gmail.com æ yahoo.comã">
+<!ENTITY torsettings.bridgeHelp4Heading "">
 <!ENTITY torsettings.bridgeHelp4 "å¦å¤ï¼è¿å¯ä»¥åéçµåé®ä»¶è³ 
[email protected] æ¥è·åç½æ¡¥ä¸ç»§ã">
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
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

Reply via email to