February 2014 - tor-commits - lists.torproject.org

[chutney/master] Print out help error message on binary not found
by nickm＠torproject.org 28 Feb '14

28 Feb '14

commit 32d498be07ae9858d3f618fb52a7d32f9f0391d4 Author: Qingping Hou <dave2008713(a)gmail.com> Date: Mon Feb 17 23:36:17 2014 -0500 Print out help error message on binary not found --- lib/chutney/TorNet.py | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index fed80c4..ec467a3 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -277,7 +277,17 @@ class LocalNodeBuilder(NodeBuilder): '-a', addr] print "Creating identity key %s for %s with %s"%( idfile,self._env['nick']," ".join(cmdline)) - p = subprocess.Popen(cmdline, stdin=subprocess.PIPE) + try: + p = subprocess.Popen(cmdline, stdin=subprocess.PIPE) + except OSError as e: + # only catch file not found error + if errno.errorcode[e.errno] == 'ENOENT': + print ''.join(["Cannot find tor-gencert binary, use ", + "CHUTNEY_TOR_GENCERT environment variable to set the ", + "path or put the binary into $PATH."]) + sys.exit(0) + else: + raise p.communicate(passphrase+"\n") assert p.returncode == 0 #XXXX BAD! @@ -296,7 +306,17 @@ class LocalNodeBuilder(NodeBuilder): "--dirserver", "xyzzy 127.0.0.1:1 ffffffffffffffffffffffffffffffffffffffff", "--datadirectory", datadir ] - p = subprocess.Popen(cmdline, stdout=subprocess.PIPE) + try: + p = subprocess.Popen(cmdline, stdout=subprocess.PIPE) + except OSError as e: + # only catch file not found error + if errno.errorcode[e.errno] == 'ENOENT': + print ''.join(["Cannot find tor-gencert binary, use ", + "CHUTNEY_TOR_GENCERT environment variable to set the ", + "path or put the binary into $PATH."]) + sys.exit(0) + else: + raise stdout, stderr = p.communicate() fingerprint = "".join(stdout.split()[1:]) assert re.match(r'^[A-F0-9]{40}$', fingerprint) @@ -442,13 +462,24 @@ class LocalNodeController(NodeController): if self.isRunning(): print "%s is already running"%self._env['nick'] return True + tor_path = self._env['tor'] torrc = self._getTorrcFname() cmdline = [ - self._env['tor'], + tor_path, "--quiet", "-f", torrc, ] - p = subprocess.Popen(cmdline) + try: + p = subprocess.Popen(cmdline) + except OSError as e: + # only catch file not found error + if errno.errorcode[e.errno] == 'ENOENT': + print ''.join(["Cannot find Tor binary, use CHUTNEY_TOR ", + "environment variable to set the path or put the binary ", + "into $PATH."]) + sys.exit(0) + else: + raise # XXXX this requires that RunAsDaemon is set. p.wait() if p.returncode != 0:

1 0

[chutney/master] Clean up ENOENT messages a bit
by nickm＠torproject.org 28 Feb '14

28 Feb '14

commit 8d1007189f7024d796687e94dc461864288af8df Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 28 08:46:05 2014 -0500 Clean up ENOENT messages a bit --- lib/chutney/TorNet.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index ec467a3..3685ec0 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -281,10 +281,10 @@ class LocalNodeBuilder(NodeBuilder): p = subprocess.Popen(cmdline, stdin=subprocess.PIPE) except OSError as e: # only catch file not found error - if errno.errorcode[e.errno] == 'ENOENT': - print ''.join(["Cannot find tor-gencert binary, use ", - "CHUTNEY_TOR_GENCERT environment variable to set the ", - "path or put the binary into $PATH."]) + if e.errno == errno.ENOENT: + print ("Cannot find tor-gencert binary %r. Use " + "CHUTNEY_TOR_GENCERT environment variable to set the " + "path, or put the binary into $PATH.")%tor_gencert sys.exit(0) else: raise @@ -310,10 +310,10 @@ class LocalNodeBuilder(NodeBuilder): p = subprocess.Popen(cmdline, stdout=subprocess.PIPE) except OSError as e: # only catch file not found error - if errno.errorcode[e.errno] == 'ENOENT': - print ''.join(["Cannot find tor-gencert binary, use ", - "CHUTNEY_TOR_GENCERT environment variable to set the ", - "path or put the binary into $PATH."]) + if e.errno == errno.ENOENT: + print ("Cannot find tor binary %r. Use " + "CHUTNEY_TOR environment variable to set the " + "path, or put the binary into $PATH.")%tor sys.exit(0) else: raise @@ -473,10 +473,10 @@ class LocalNodeController(NodeController): p = subprocess.Popen(cmdline) except OSError as e: # only catch file not found error - if errno.errorcode[e.errno] == 'ENOENT': - print ''.join(["Cannot find Tor binary, use CHUTNEY_TOR ", - "environment variable to set the path or put the binary ", - "into $PATH."]) + if e.errno == errno.ENOENT: + print ("Cannot find tor binary %r. Use CHUTNEY_TOR " + "environment variable to set the path, or put the binary " + "into $PATH.")%tor_path sys.exit(0) else: raise

1 0

[tor/master] Disable (Cell, Entry, ExitPort)Statistics on bridges
by nickm＠torproject.org 28 Feb '14

28 Feb '14

commit 90f0358e3e6d70f20436ebe17065b02476dd133c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 18 18:00:17 2013 +0100 Disable (Cell,Entry,ExitPort)Statistics on bridges In 0.2.3.8-alpha we attempted to "completely disable stats if we aren't running as a relay", but instead disabled them only if we aren't running as a server. This commit leaves DirReqStatistics enabled on both relays and bridges, and disables (Cell,Entry,ExitPort)Statistics on bridges. --- changes/bug5824 | 4 ++++ src/or/config.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug5824 b/changes/bug5824 new file mode 100644 index 0000000..15d366f --- /dev/null +++ b/changes/bug5824 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Bridges now never collect statistics that were designed for relays. + Fix for bug 5824; bugfix on 0.2.3.8-alpha. + diff --git a/src/or/config.c b/src/or/config.c index d348f10..3796858 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1684,10 +1684,14 @@ options_act(const or_options_t *old_options) time_t now = time(NULL); int print_notice = 0; - /* If we aren't acting as a server, we can't collect stats anyway. */ + /* Only collect directory-request statistics on relays and bridges. */ if (!server_mode(options)) { - options->CellStatistics = 0; options->DirReqStatistics = 0; + } + + /* Only collect other relay-only statistics on relays. */ + if (!public_server_mode(options)) { + options->CellStatistics = 0; options->EntryStatistics = 0; options->ExitPortStatistics = 0; }

1 0

[tor/master] Merge remote-tracking branch 'karsten/task-5824'
by nickm＠torproject.org 28 Feb '14

28 Feb '14

commit 043329eeb653b2f9e795cf8b7cfd8fb0b756dca5 Merge: bf16786 b7d8a1e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 28 08:32:13 2014 -0500 Merge remote-tracking branch 'karsten/task-5824' changes/bug5824 | 4 ++++ changes/bug5824-2 | 4 ++++ src/or/config.c | 8 ++++++-- src/or/geoip.c | 5 +++-- 4 files changed, 17 insertions(+), 4 deletions(-)

1 0

[tor/master] Report complete directory request statistics on bridges.
by nickm＠torproject.org 28 Feb '14

28 Feb '14

commit b7d8a1e141479add9f591e4e9fc3da15baecaecd Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 18 18:02:10 2013 +0100 Report complete directory request statistics on bridges. When we wrote the directory request statistics code in August 2009, we thought that these statistics were only relevant for bridges, and that bridges should not report them. That's why we added a switch to discard relevant observations made by bridges. This code was first released in 0.2.2.1-alpha. In May 2012 we learned that we didn't fully disable directory request statistics on bridges. Bridges did report directory request statistics, but these statistics contained empty dirreq-v3-ips and dirreq-v3-reqs lines. But the remaining dirreq-* lines have always been non-empty. (We didn't notice for almost three years, because directory-request statistics were disabled by default until 0.2.3.1-alpha, and all statistics have been removed from bridge descriptors before publishing them on the metrics website.) Proposal 201, created in May 2012, suggests to add a new line called bridge-v3-reqs that is similar to dirreq-v3-reqs, but that is published only by bridges. This proposal is still open as of December 2013. Since October 2012 we're using dirreq-v3-resp (not -reqs) lines in combination with bridge-ips lines to estimate bridge user numbers; see task 8462. This estimation method has superseded the older approach that was only based on bridge-ips lines in November 2013. Using dirreq-v3-resp and bridge-ips lines is a workaround. The cleaner approach would be to use dirreq-v3-reqs instead. This commit makes bridges report the same directory request statistics as relays, including dirreq-v3-ips and dirreq-v3-reqs lines. It makes proposal 201 obsolete. --- changes/bug5824-2 | 4 ++++ src/or/geoip.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/bug5824-2 b/changes/bug5824-2 new file mode 100644 index 0000000..f5963ca --- /dev/null +++ b/changes/bug5824-2 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Bridges now report complete directory request statistics. Related to + bug 5824; bugfix on 0.2.2.1-alpha. + diff --git a/src/or/geoip.c b/src/or/geoip.c index dc4730c..c62fee4 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -554,8 +554,9 @@ geoip_note_client_seen(geoip_client_action_t action, (!(options->BridgeRelay && options->BridgeRecordUsageByCountry))) return; } else { - if (options->BridgeRelay || options->BridgeAuthoritativeDir || - !options->DirReqStatistics) + /* Only gather directory-request statistics if configured, and + * forcibly disable them on bridge authorities. */ + if (!options->DirReqStatistics || options->BridgeAuthoritativeDir) return; }

1 0

[translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
by translation＠torproject.org 28 Feb '14

28 Feb '14

commit d295aa71f490c4556b87fdca4ccabaf92eb12ac8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 28 09:45:59 2014 +0000 Update translations for tails-perl5lib_completed --- zh_TW.po | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/zh_TW.po b/zh_TW.po new file mode 100644 index 0000000..1cb8222 --- /dev/null +++ b/zh_TW.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# 修銘張 <cges30901(a)gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" +"POT-Creation-Date: 2013-11-28 11:56+0100\n" +"PO-Revision-Date: 2014-02-28 09:45+0000\n" +"Last-Translator: 修銘張 <cges30901(a)gmail.com>\n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_TW\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../lib/Tails/RunningSystem.pm:139 +msgid "" +"The device Tails is running from cannot be found. Maybe you used the `toram'" +" option?" +msgstr "Tail 啟動時的運行設備已無法找到。可能您使用了'toram'選項？"

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 28 Feb '14

28 Feb '14

commit e9ecbc4cffca326030a8be7ac5b460c3fe693ba7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 28 09:45:56 2014 +0000 Update translations for tails-perl5lib --- zh_TW.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index dd163f3..1cb8222 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# 修銘張 <cges30901(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2013-11-28 11:56+0100\n" -"PO-Revision-Date: 2013-12-30 04:38+0000\n" -"Last-Translator: Phoul <colin(a)torproject.org>\n" +"PO-Revision-Date: 2014-02-28 09:45+0000\n" +"Last-Translator: 修銘張 <cges30901(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,4 +22,4 @@ msgstr "" msgid "" "The device Tails is running from cannot be found. Maybe you used the `toram'" " option?" -msgstr "" +msgstr "Tail 啟動時的運行設備已無法找到。可能您使用了'toram'選項？"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 28 Feb '14

28 Feb '14

commit c15cb7ca2632642b0c2705ab8630f8c24d981b54 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 28 09:45:05 2014 +0000 Update translations for bridgedb_completed --- zh_TW/LC_MESSAGES/bridgedb.po | 100 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/zh_TW/LC_MESSAGES/bridgedb.po b/zh_TW/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..3fdd1a9 --- /dev/null +++ b/zh_TW/LC_MESSAGES/bridgedb.po @@ -0,0 +1,100 @@ +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2013-03-27 21:41+0000\n" +"PO-Revision-Date: 2014-02-28 09:41+0000\n" +"Last-Translator: 修銘張 <cges30901(a)gmail.com>\n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: zh_TW\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "什麼是網橋？" + +#: lib/bridgedb/templates/base.html:34 +#, python-format +msgid "" +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "%s 網橋中繼 %s 是 Tor 中繼，可以幫助您規避審查。" + +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "我需要使用其他方式獲取網橋！" + +#: lib/bridgedb/templates/base.html:40 +#, python-format +msgid "" +"Another way to find public bridge addresses is to send an email (from a %s " +"or a %s address) to %s with the line 'get bridges' by itself in the body of " +"the mail." +msgstr "獲取公開的網橋地址還有另一種方式：使用 %s 或 %s 電子郵件發送電子郵件至 %s，並在郵件正文中包含文字「get bridges」。" + +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "網橋無法正常運行，我需要幫助！" + +#: lib/bridgedb/templates/base.html:49 +#, python-format +msgid "" +"If your Tor doesn't work, you should email %s. Try including as much info " +"about your case as you can, including the list of bridges you used, the " +"bundle filename/version you used, the messages that Tor gave out, etc." +msgstr "如果Tor 無法正常運行，請發送電子郵件至 %s。請在郵件中提供盡可能詳細的訊息，例如：使用的網橋列表，所用的軟體包檔案名稱/版本，Tor 所顯示的信息等等。" + +#: lib/bridgedb/templates/bridges.html:10 +msgid "" +"To use the above lines, go to Vidalia's Network settings page, and click " +"\"My ISP blocks connections to the Tor network\". Then add each bridge " +"address one at a time." +msgstr "如需使用以上地址，請打開 Vidalia 網路設定，點選「我的 ISP 阻擋了對 Tor 網路的連接\"，然後依次添加網橋地址。" + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "目前無可用的網橋中繼" + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "請將你的瀏覽器升級為 Firefox" + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "請輸入圖中的兩個單字" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "第 1 步" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "獲取 %s Tor Browser Bundle %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "第 2 步" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "獲取 %s bridges %s" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "第 3 步" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "現在 %s 將網橋添加到 Tor %s"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 28 Feb '14

28 Feb '14

commit 4e119f417a6596e939f26b0dc932a5f4b79cb523 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 28 09:45:02 2014 +0000 Update translations for bridgedb --- zh_TW/LC_MESSAGES/bridgedb.po | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/zh_TW/LC_MESSAGES/bridgedb.po b/zh_TW/LC_MESSAGES/bridgedb.po index 50e3d90..3fdd1a9 100644 --- a/zh_TW/LC_MESSAGES/bridgedb.po +++ b/zh_TW/LC_MESSAGES/bridgedb.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Translators: msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2011-02-19 16:53+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2014-02-28 09:41+0000\n" +"Last-Translator: 修銘張 <cges30901(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,17 +21,17 @@ msgstr "" #: lib/bridgedb/templates/base.html:33 msgid "What are bridges?" -msgstr "" +msgstr "什麼是網橋？" #: lib/bridgedb/templates/base.html:34 #, python-format msgid "" "%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "" +msgstr "%s 網橋中繼 %s 是 Tor 中繼，可以幫助您規避審查。" #: lib/bridgedb/templates/base.html:39 msgid "I need an alternative way of getting bridges!" -msgstr "" +msgstr "我需要使用其他方式獲取網橋！" #: lib/bridgedb/templates/base.html:40 #, python-format @@ -38,11 +39,11 @@ msgid "" "Another way to find public bridge addresses is to send an email (from a %s " "or a %s address) to %s with the line 'get bridges' by itself in the body of " "the mail." -msgstr "" +msgstr "獲取公開的網橋地址還有另一種方式：使用 %s 或 %s 電子郵件發送電子郵件至 %s，並在郵件正文中包含文字「get bridges」。" #: lib/bridgedb/templates/base.html:48 msgid "My bridges don't work! I need help!" -msgstr "" +msgstr "網橋無法正常運行，我需要幫助！" #: lib/bridgedb/templates/base.html:49 #, python-format @@ -50,50 +51,50 @@ msgid "" "If your Tor doesn't work, you should email %s. Try including as much info " "about your case as you can, including the list of bridges you used, the " "bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "" +msgstr "如果Tor 無法正常運行，請發送電子郵件至 %s。請在郵件中提供盡可能詳細的訊息，例如：使用的網橋列表，所用的軟體包檔案名稱/版本，Tor 所顯示的信息等等。" #: lib/bridgedb/templates/bridges.html:10 msgid "" "To use the above lines, go to Vidalia's Network settings page, and click " "\"My ISP blocks connections to the Tor network\". Then add each bridge " "address one at a time." -msgstr "" +msgstr "如需使用以上地址，請打開 Vidalia 網路設定，點選「我的 ISP 阻擋了對 Tor 網路的連接\"，然後依次添加網橋地址。" #: lib/bridgedb/templates/bridges.html:13 msgid "No bridges currently available" -msgstr "" +msgstr "目前無可用的網橋中繼" #: lib/bridgedb/templates/captcha.html:6 msgid "Upgrade your browser to Firefox" -msgstr "" +msgstr "請將你的瀏覽器升級為 Firefox" #: lib/bridgedb/templates/captcha.html:8 msgid "Type the two words" -msgstr "" +msgstr "請輸入圖中的兩個單字" #: lib/bridgedb/templates/index.html:6 msgid "Step 1" -msgstr "" +msgstr "第 1 步" #: lib/bridgedb/templates/index.html:8 #, python-format msgid "Get %s Tor Browser Bundle %s" -msgstr "" +msgstr "獲取 %s Tor Browser Bundle %s" #: lib/bridgedb/templates/index.html:13 msgid "Step 2" -msgstr "" +msgstr "第 2 步" #: lib/bridgedb/templates/index.html:15 #, python-format msgid "Get %s bridges %s" -msgstr "" +msgstr "獲取 %s bridges %s" #: lib/bridgedb/templates/index.html:19 msgid "Step 3" -msgstr "" +msgstr "第 3 步" #: lib/bridgedb/templates/index.html:21 #, python-format msgid "Now %s add the bridges to Tor %s" -msgstr "" +msgstr "現在 %s 將網橋添加到 Tor %s"

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 28 Feb '14

28 Feb '14

commit 9db0ebc9e05b023227f69bb6b89d276d2ae79e3e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 28 09:18:28 2014 +0000 Update translations for tor-launcher-network-settings_completed --- en/network-settings.dtd | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/en/network-settings.dtd b/en/network-settings.dtd index 7e3d9ca..eaf4f4a 100644 --- a/en/network-settings.dtd +++ b/en/network-settings.dtd @@ -22,7 +22,9 @@ <!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> <!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> <!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect."> +<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">  @@ -44,13 +46,15 @@ <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> <!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> +<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type"> +<!ENTITY torsettings.useBridges.custom "Use Custom Bridges"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port"> +<!ENTITY torsettings.useBridges.placeholder "type address:port"> <!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 unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> <!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">

1 0