commit a187a2062840c9466b87154ba698e90decaf1302 Author: Kathy Brade <br...@pearlcrescent.com> 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) Ø£Ù Ù Ùظ٠ة اخر٠ÙÙ Ùع Ù ØاÙÙات اÙاتصا٠بشبÙØ© تÙر. &#160; ÙغاÙباÙØ ØªØ³ØªØ·Ùع تخط٠Ùذا اÙÙ Ùع ع٠طرÙ٠استخدا٠جسÙر تÙر ٠اÙجسÙر عبارة ع٠٠ÙرØÙات Ù Ø®ÙÙØ© صعب Ù ÙعÙا."> +<!ENTITY torsettings.bridgeHelp1 "Ùد ÙÙÙ٠اÙسبب Ù٠عد٠Ùدرت٠عÙ٠اÙاتصا٠بشبÙØ© تÙرÙ٠ا٠٠زÙد خد٠ة اÙØ¥ÙترÙت اÙخاص ب٠(ISP) Ø£Ù Ù Ùظ٠ة اخر٠ÙÙ Ùع Ù ØاÙÙات اÙاتصا٠بشبÙØ© تÙر.   ÙغاÙباÙØ ØªØ³ØªØ·Ùع تخط٠Ùذا اÙÙ Ùع ع٠طرÙ٠استخدا٠جسÙر تÙر ٠اÙجسÙر عبارة ع٠٠ÙرØÙات Ù Ø®ÙÙØ© صعب Ù ÙعÙا."> +<!ENTITY torsettings.bridgeHelp1B ""> +<!ENTITY torsettings.bridgeHelp2Heading ""> <!ENTITY torsettings.bridgeHelp2 "ÙÙØصÙ٠عÙ٠بعض اÙجسÙØ±Ø Ø²Ø± Ùذ٠اÙصÙØØ© Ù Ù Ø®Ùا٠اÙ٠تصÙØ: https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3 "ÙÙÙا٠طرÙÙØ© أخر٠ÙÙعثÙر عÙ٠عÙاÙÙ٠اÙجسÙر اÙعا٠ة ÙÙ٠إرسا٠برÙد Ø¥ÙÙترÙÙ٠إÙÙ brid...@torproject.org ÙØتÙ٠عÙÙ 'get bridges' ÙÙ ÙÙب اÙبرÙد.&#160; Ù Øت٠تض٠٠ÙصÙÙ Ø°Ù٠اÙبرÙد ÙÙا بÙØ¬Ø§Ø Ø§Ø³ØªØ®Ø¯Ù Ø¥Ù Ø§ gmail.com أ٠إ٠ا yahoo.com"> +<!ENTITY torsettings.bridgeHelp3Heading ""> +<!ENTITY torsettings.bridgeHelp3 "ÙÙÙا٠طرÙÙØ© أخر٠ÙÙعثÙر عÙ٠عÙاÙÙ٠اÙجسÙر اÙعا٠ة ÙÙ٠إرسا٠برÙد Ø¥ÙÙترÙÙ٠إÙÙ brid...@torproject.org ÙØتÙ٠عÙÙ 'get bridges' ÙÙ ÙÙب اÙبرÙد.  Ù Øت٠تض٠٠ÙصÙÙ Ø°Ù٠اÙبرÙد ÙÙا بÙØ¬Ø§Ø Ø§Ø³ØªØ®Ø¯Ù Ø¥Ù Ø§ gmail.com أ٠إ٠ا yahoo.com"> +<!ENTITY torsettings.bridgeHelp4Heading ""> <!ENTITY torsettings.bridgeHelp4 "ÙÙ ÙÙ٠إÙضا٠طÙب اÙجسÙر Ùإرسا٠برÙد Ø¥ÙÙترÙÙ٠إÙÙ h...@rt.torproject.org."> 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.&#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 brid...@torproject.org zu schicken.&#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 h...@rt.torproject.org 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.  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 brid...@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 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 h...@rt.torproject.org."> +<!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.  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 brid...@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.bridgeHelp4Heading "Through the Help Desk"> +<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to h...@rt.torproject.org.  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.&#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 brid...@torproject.org con la lÃnea 'get bridges' por si misma en el cuerpo del mensaje.&#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 h...@rt.torproject.org"> 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.&#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.&#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 brid...@torproject.org 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.bridgeHelp4Heading ""> <!ENTITY torsettings.bridgeHelp4 "ش٠ا Ù ÛتÙاÙÛد با ارسا٠اÛÙ Û٠ب٠h...@rt.torproject.org درخÙاست Ù¾Ù Ø§Ø±ØªØ¨Ø§Ø·Û Ù٠اÛÛد."> 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 à brid...@torproject.org avec la ligne "get bridges" 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...@rt.torproject.org."> 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 "appunti" 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.&#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 brid...@torproject.org con il testo 'get bridges' nel corpo del messaggio.&#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 h...@rt.torproject.org."> 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ããããã¯ãã¦ããå¯è½æ§ãããã¾ãã&#160; ãããã¯ãããã¨ãããå°é£ã«ããé ããªã¬ã¼ã§ããTorããªãã¸ã使ç¨ãããã¨ã§ããã°ãã°ãã®åé¡ãåé¿åºæ¥ã¾ãã"> +<!ENTITY torsettings.bridgeHelp1B ""> +<!ENTITY torsettings.bridgeHelp2Heading ""> <!ENTITY torsettings.bridgeHelp2 "ããã¤ãããªãã¸ãªã¬ã¼ãå ¥æããã«ã¯ãã¦ã§ããã©ã¦ã¶ã¼ã使ç¨ãã以ä¸ã®ãã¼ã¸ã«è¡ã£ã¦ãã ãã: https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading ""> <!ENTITY torsettings.bridgeHelp3 "ãããªãã¯ãªããªãã¸ã¢ãã¬ã¹ãè¦ã¤ããããä¸ã¤ã®æ¹æ³ã¯ãæ¬æã«<b>get bridges</b>ã¨è¨å ¥ããE-mailã brid...@torproject.org å®ã«éä¿¡ãã ãã¨ã§ãã&#160; ããããã¢ã¿ãã«ã¼ãããããã®ããªãã¸ã¢ãã¬ã¹ãåéããã®ãå°é£ã«ããããã ããªãã¯ãgmail.comãyahoo.comã®ãã¡ã¤ã³ã®ãããããããã®ãªã¯ã¨ã¹ããéããªããã°ãªãã¾ããã"> +<!ENTITY torsettings.bridgeHelp4Heading ""> <!ENTITY torsettings.bridgeHelp4 "h...@rt.torproject.orgå®ã«ã¡ã¼ã«ãéä¿¡ãããã¨ã§ãããªãã¸ãªã¬ã¼ãè¦æ±ã§ãã¾ãã"> 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 &#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 brid...@torproject.org met de woorden 'get bridges' als losstaande tekst in het berichtgedeelte van de e-mail. &#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 h...@rt.torproject.org."> 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&#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 brid...@torproject.org z poleceniem 'get bridges' w tytule wiadomoÅci.&#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 h...@rt.torproject.org."> 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.&#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 brid...@torproject.org com "get bridges" no corpo da mensagem.&#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 h...@rt.torproject.org."> 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. &#160; ÐÑÐµÐ½Ñ ÑаÑÑо ÑÑо можно обойÑи Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ Tor моÑÑов - ÑкÑÑÑÑÑ ÑеÑÑанÑлÑÑоÑов, коÑоÑÑе не Ñак легко заблокиÑоваÑÑ."> +<!ENTITY torsettings.bridgeHelp1B ""> +<!ENTITY torsettings.bridgeHelp2Heading ""> <!ENTITY torsettings.bridgeHelp2 "ЧÑÐ¾Ð±Ñ Ð½Ð°Ð¹Ñи ÑеÑÑанÑлÑÑоÑÑ Ñипа моÑÑ Ð¾ÑпÑавлÑйÑеÑÑ Ð¿Ð¾ адÑеÑÑ https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading ""> <!ENTITY torsettings.bridgeHelp3 "ÐÑÑгой ÑпоÑоб найÑи пÑблиÑнÑе адÑеÑа - поÑлаÑÑ Ð¿Ð¸ÑÑмо на адÑÐµÑ brid...@torproject.org Ñо ÑÑÑокой get bridges в Ñеле пиÑÑма. Ð ÑелÑÑ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑÑи ÑиÑÑема пÑÐ¸Ð½Ð¸Ð¼Ð°ÐµÑ Ð¿Ð¸ÑÑма ÑолÑко Ñ Ð°Ð´ÑеÑов gmail.com и yahoo.com"> +<!ENTITY torsettings.bridgeHelp4Heading ""> <!ENTITY torsettings.bridgeHelp4 "ÐÑ Ñакже можеÑе запÑоÑиÑÑ ÑпиÑок моÑÑов оÑпÑавив пиÑÑмо на h...@rt.torproject.org"> 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 "è·åå ¬å ±ç½æ¡¥å°åè¿æä¸ä¸ªæ¹å¼ï¼åéé®ä»¶è³ brid...@torproject.orgï¼å¹¶å¨æ£æä¸å¡«ä¸âget bridgesâãä¸è¿ï¼ä¸ºäºé²æ¢æ»å»è è·å¾å¤§éç½æ¡¥å°åï¼åéé®ä»¶ççµåé®ä»¶å°åå¿ é¡»æ¥èªä»¥ä¸ååï¼gmail.com æ yahoo.comã"> +<!ENTITY torsettings.bridgeHelp4Heading ""> <!ENTITY torsettings.bridgeHelp4 "å¦å¤ï¼è¿å¯ä»¥åéçµåé®ä»¶è³ h...@rt.torproject.org æ¥è·åç½æ¡¥ä¸ç»§ã"> 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@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits