commit 65c629223b9edf4e19b557807857bec9a409985b Author: Kamran Riaz Khan krkhan@inspirated.com Date: Sun Oct 30 14:30:12 2011 +0500
Updated help docs for #4290. --- src/vidalia/help/content/en/config.html | 12 ++++-------- src/vidalia/help/content/po/en/config.po | 14 ++++++-------- src/vidalia/help/content/po/templates/config.pot | 12 ++++-------- 3 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/src/vidalia/help/content/en/config.html b/src/vidalia/help/content/en/config.html index b1c25c0..c9dc681 100644 --- a/src/vidalia/help/content/en/config.html +++ b/src/vidalia/help/content/en/config.html @@ -86,14 +86,10 @@ network. 128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73 </li> </ul> - Even if you do not know any bridge relay addresses, checking this checkbox - may still be helpful. Tor will encrypt its directory requests, which can - defeat blocking mechanisms that try to filter Tor's requests for - information about other relays. If connections to normal Tor relays are - also blocked, then you will need to learn a bridge relay address somehow - and add it here. See the help topic on <a href="bridges.html#finding">finding - bridge relays</a> for more information on how to learn new bridge relay - addresses and fingerprints. + If connections to normal Tor relays are blocked, then you will need to + learn a bridge relay address somehow and add it here. See the help topic + on <a href="bridges.html#finding">finding bridge relays</a> for more + information on how to learn new bridge relay addresses and fingerprints. </li> </ul>
diff --git a/src/vidalia/help/content/po/en/config.po b/src/vidalia/help/content/po/en/config.po index 38567ae..ff4d8e6 100644 --- a/src/vidalia/help/content/po/en/config.po +++ b/src/vidalia/help/content/po/en/config.po @@ -142,14 +142,12 @@ msgstr "" #. type: Content of: <html><body><ul><li> #: en/config.html:89 msgid "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information " -"about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it " -"here. See the help topic on <a href="bridges.html#finding">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"<b>My ISP blocks connections to the Tor network</b>: If your ISP (Internet " +"Service Provider) blocks connections to the Tor network, Tor can attempt to " +"avoid being filtered by encrypting its directory connections and connecting " +"to the Tor network through relays called <i>bridges</i> (Tor 0.2.0.3-alpha " +"or newer only). You can add bridge relays by specifying either their address " +"and port number, or their address, port number, and fingerprint." msgstr ""
#. type: Content of: <html><body> diff --git a/src/vidalia/help/content/po/templates/config.pot b/src/vidalia/help/content/po/templates/config.pot index d40ebf7..0447e27 100644 --- a/src/vidalia/help/content/po/templates/config.pot +++ b/src/vidalia/help/content/po/templates/config.pot @@ -142,14 +142,10 @@ msgstr "" #. type: Content of: <html><body><ul><li> #: en/config.html:89 msgid "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information " -"about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it " -"here. See the help topic on <a href="bridges.html#finding">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"If connections to normal Tor relays are blocked, then you will need to " +"learn a bridge relay address somehow and add it here. See the help topic on " +"<a href="bridges.html#finding">finding bridge relays</a> for more " +"information on how to learn new bridge relay addresses and fingerprints." msgstr ""
#. type: Content of: <html><body>