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

[bridgedb/develop] Add unittests for the bridgedb.parse.options module.
by isis＠torproject.org 26 Aug '14

26 Aug '14

commit a235f2c5a81829720803cb8545f9f611e9bf547d Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Aug 21 04:25:06 2014 +0000 Add unittests for the bridgedb.parse.options module. --- lib/bridgedb/parse/options.py | 9 +-- lib/bridgedb/test/test_parse_options.py | 102 +++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/parse/options.py b/lib/bridgedb/parse/options.py index 5664460..2ed93d0 100644 --- a/lib/bridgedb/parse/options.py +++ b/lib/bridgedb/parse/options.py @@ -121,7 +121,7 @@ def parseOptions(): print(uerr.message) print(options.getUsage()) sys.exit(1) - except Exception as error: + except Exception as error: # pragma: no cover exc, value, tb = sys.exc_info() print("Unhandled Error: %s" % error.message) print(traceback.format_exc(tb)) @@ -204,7 +204,7 @@ class BaseOptions(usage.Options): gRundir = os.getcwdu() setRundir(gRundir) - if not os.path.isdir(gRundir): + if not os.path.isdir(gRundir): # pragma: no cover raise usage.UsageError( "Could not change to runtime directory: `%s'" % gRundir) @@ -214,14 +214,15 @@ class BaseOptions(usage.Options): gConfig = config if not os.path.isabs(gConfig): - if gConfig.startswith('.'): # also covers '..' + # startswith('.') will handle other relative paths, i.e. '..' + if gConfig.startswith('.'): # pragma: no cover gConfig = os.path.abspath(os.path.expanduser(gConfig)) else: gConfig = os.path.join(gRundir, gConfig) setConfig(gConfig) gConfig = getConfig() - if not os.path.isfile(gConfig): + if not os.path.isfile(gConfig): # pragma: no cover raise usage.UsageError( "Specified config file `%s' doesn't exist!" % gConfig) diff --git a/lib/bridgedb/test/test_parse_options.py b/lib/bridgedb/test/test_parse_options.py new file mode 100644 index 0000000..fc76904 --- /dev/null +++ b/lib/bridgedb/test/test_parse_options.py @@ -0,0 +1,102 @@ +# -*- coding: utf-8 -*- +#_____________________________________________________________________________ +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2014, The Tor Project, Inc. +# (c) 2014, Isis Lovecruft +# :license: see LICENSE for licensing information +#_____________________________________________________________________________ + +"""Unittests for :mod:`bridgedb.parse.options`.""" + + +from __future__ import print_function + +import os +import sys + +from twisted.python.usage import UsageError +from twisted.trial import unittest + +from bridgedb.parse import options + + +class ParseOptionsTests(unittest.TestCase): + """Unittests for :mod:`bridgedb.parse.options`.""" + + def setUp(self): + """Replace the current sys.argv's for the run of this test, and + redirect sys.stdout to os.devnull to prevent the options parser from + printing the --help a bunch of times. + """ + # Make sure a config file is in the current directory, or else the + # argument parser will get angry and throw another SystemExit + # exception. + with open(os.path.join(os.getcwd(), 'bridgedb.conf'), 'a+') as fh: + fh.write('\n') + + self.oldSysArgv = sys.argv + self.oldStdout = sys.stdout + sys.stdout = open(os.devnull, 'w') + + def tearDown(self): + """Put the original sys.argv's back.""" + sys.stdout.close() # Actually closes the FD we opened for /dev/null + sys.argv = self.oldSysArgv + sys.stdout = self.oldStdout + self.oldSysArgv = None + self.oldStdout = None + + def test_parse_options_parseOptions_with_invalid_options(self): + """:func:`options.parseOptions` should raise SystemExit because + the args 'somearg anotherarg' are invalid commands. + """ + fakeSysArgv = ['somearg', 'anotherarg'] + sys.argv = fakeSysArgv + self.assertRaises(SystemExit, options.parseOptions) + + def test_parse_options_parseOptions_with_valid_options(self): + """:func:`options.parseOptions` should return a + :class:`options.MainOptions` when given valid commandline arguments. + """ + fakeSysArgv = ['bridgedb', 'mock', '-n', '-1'] + sys.argv = fakeSysArgv + opts = options.parseOptions() + self.assertIsInstance(opts, options.MainOptions) + + def test_parse_options_parseOptions_verbosity_quiet_quiet(self): + """If we use `-q` twice on the commandline, ``opts['verbosity']`` + should equal ``10``. + """ + fakeSysArgv = ['bridgedb', '-q', '-q', 'mock', '-n', '-1'] + sys.argv = fakeSysArgv + opts = options.parseOptions() + self.assertEqual(opts['verbosity'], 10) + + def test_parse_options_parseOptions_verbosity_verbose(self): + """If we use `-v` once on the commandline, ``opts['verbosity']`` + should equal ``50``. + """ + fakeSysArgv = ['bridgedb', '-v', '-v', 'mock', '-n', '-1'] + sys.argv = fakeSysArgv + opts = options.parseOptions() + self.assertEqual(opts['verbosity'], 50) + + def test_parse_options_parseOptions_rundir(self): + """The automatic rundir should be our current directory.""" + fakeSysArgv = ['bridgedb', 'mock', '-n', '-1'] + sys.argv = fakeSysArgv + opts = options.parseOptions() + self.assertEqual(opts['rundir'], os.getcwd()) + + def test_parse_options_parseOptions_version(self): + """:func:`options.parseOptions` when given a `--version` argument on + the commandline, should raise SystemExit (after printing some stuff, + but we don't care what it prints). + """ + fakeSysArgv = ['bridgedb', '--version'] + sys.argv = fakeSysArgv + self.assertRaises(SystemExit, options.parseOptions)

1 0

[bridgedb/develop] Add unittests for bridgedb.parse.versions module.
by isis＠torproject.org 26 Aug '14

26 Aug '14

commit ab99f855f708dec213c9eea1489643c01526e0b0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Aug 21 04:47:54 2014 +0000 Add unittests for bridgedb.parse.versions module. --- lib/bridgedb/test/test_parse_versions.py | 42 ++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/lib/bridgedb/test/test_parse_versions.py b/lib/bridgedb/test/test_parse_versions.py new file mode 100644 index 0000000..3b2e392 --- /dev/null +++ b/lib/bridgedb/test/test_parse_versions.py @@ -0,0 +1,42 @@ +# -*- coding: utf-8 -*- +#_____________________________________________________________________________ +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2014, The Tor Project, Inc. +# (c) 2014, Isis Lovecruft +# :license: see LICENSE for licensing information +#_____________________________________________________________________________ + +"""Unittests for :mod:`bridgedb.parse.versions`.""" + + +from __future__ import print_function + +from twisted.trial import unittest + +from bridgedb.parse import versions + + +class ParseVersionTests(unittest.TestCase): + """Unitests for :class:`bridgedb.parse.versions.Version`.""" + + def test_Version_with_bad_delimiter(self): + """Test parsing a version number which uses '-' as a delimiter.""" + self.assertRaises(versions.InvalidVersionStringFormat, + versions.Version, '2-6-0', package='tor') + + def test_Version_really_long_version_string(self): + """Parsing a version number which is way too long should raise + an IndexError which is ignored. + """ + v = versions.Version('2.6.0.0.beta', package='tor') + self.assertEqual(v.prerelease, 'beta') + self.assertEqual(v.major, 6) + + def test_Version_string(self): + """Test converting a valid Version object into string form.""" + v = versions.Version('0.2.5.4', package='tor') + self.assertEqual(v.base(), '0.2.5.4')

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 26 Aug '14

26 Aug '14

commit 5488958d3c56590149a9ca6eb513506be6f14b5d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 26 10:15:22 2014 +0000 Update translations for https_everywhere_completed --- zh-CN/ssl-observatory.dtd | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/zh-CN/ssl-observatory.dtd b/zh-CN/ssl-observatory.dtd index cb64d82..bee6259 100644 --- a/zh-CN/ssl-observatory.dtd +++ b/zh-CN/ssl-observatory.dtd @@ -44,18 +44,15 @@ to turn it on?">--> "这将抓取网络的“自治系统号码”(Autonomous System number)。这将有助于找出对 HTTPS 发动攻击的源头，并判断在攻击相对常见的地区网络上，如伊朗和叙利亚，我们是否具有观测数据。"> <!ENTITY ssl-observatory.prefs.show_cert_warning -"监测窗检测到未被浏览器捕获的已吊销证书时显示警告。"> +"当观测站检测到已吊销证书而该证书未被浏览器捕获时，显示警告。"> <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip -"这会用已知的证书吊销列表检查已提交的证书，可惜我们无法保证标记每一个已吊销的证书，不过如果你确实看到一个警告，则很有可能有问题。"> +"对照证书吊销列表，对提交的证书进行检查。可惜我们无法保证标记每个已吊销证书。如果确实出现警告信息，那么很有可能存在问题。"> <!ENTITY ssl-observatory.prefs.done "完成"> <!ENTITY ssl-observatory.prefs.explanation -"HTTPS Everywhere 可以使用 EFF 的 SSL 观测站。这有两个功能： -(1) 将 HTTPS 数字证书寄送到观测站，以协助我们侦测中间人式的攻击 -并改善网络的安全性； -(2) 针对不安全的连接以及对你的浏览器进行的攻击，向你发出警告。"> +"HTTPS Everywhere 可以使用 EFF 的 SSL 观测站。这有两个功能：(1) 将 HTTPS 数字证书寄送到观测站，以协助我们侦测中间人式的攻击并改善网络的安全性；(2)针对不安全的连接以及对你的浏览器进行的攻击，向你发出警告。">  <!ENTITY ssl-observatory.prefs.explanation2 -"例如，在访问 https://www.something.com 时，观测站收到的数字证书显示 -某人访问了 www.something.com，但不会显示是谁访问了该站点或者浏览了 -哪些页面。将鼠标移至该选项可了解更多详细信息："> +"例如，在访问 https://www.something.com 时，观测站收到的数字证书显示某人访问了 www.something.com，但不会显示是谁访问了该站点或者浏览了哪些页面。将鼠标移至该选项可了解更多详细信息："> <!ENTITY ssl-observatory.prefs.hide "隐藏高级选项"> @@ -91,7 +86,7 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.warning.showcert "显示数字证书链"> <!ENTITY ssl-observatory.warning.okay "我已了解"> <!ENTITY ssl-observatory.warning.text "EFF 的 SSL 观测站已对该 HTTPS 数字证书发出警告："> -<!ENTITY ssl-observatory.warning.defense "如果你已登录了此网站，建议在有安全连接时更改密码。（这些警告可以在 HTTPS Everywhere 用户偏好对话框的“SSL Observatory”页面禁用。）"> +<!ENTITY ssl-observatory.warning.defense "如果已登录网站，建议使用安全连接更改密码。（这些警告可以在 HTTPS Everywhere 首选项的“SSL Observatory”选项卡中禁用。）"> <!ENTITY ssl-observatory.prefs.self_signed "提交并检查自签名证书">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 26 Aug '14

26 Aug '14

commit 077c23996aafda8904c9c47c01b6bbe865ee24e1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 26 10:15:15 2014 +0000 Update translations for https_everywhere --- zh-CN/ssl-observatory.dtd | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/zh-CN/ssl-observatory.dtd b/zh-CN/ssl-observatory.dtd index cb64d82..bee6259 100644 --- a/zh-CN/ssl-observatory.dtd +++ b/zh-CN/ssl-observatory.dtd @@ -44,18 +44,15 @@ to turn it on?">--> "这将抓取网络的“自治系统号码”(Autonomous System number)。这将有助于找出对 HTTPS 发动攻击的源头，并判断在攻击相对常见的地区网络上，如伊朗和叙利亚，我们是否具有观测数据。"> <!ENTITY ssl-observatory.prefs.show_cert_warning -"监测窗检测到未被浏览器捕获的已吊销证书时显示警告。"> +"当观测站检测到已吊销证书而该证书未被浏览器捕获时，显示警告。"> <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip -"这会用已知的证书吊销列表检查已提交的证书，可惜我们无法保证标记每一个已吊销的证书，不过如果你确实看到一个警告，则很有可能有问题。"> +"对照证书吊销列表，对提交的证书进行检查。可惜我们无法保证标记每个已吊销证书。如果确实出现警告信息，那么很有可能存在问题。"> <!ENTITY ssl-observatory.prefs.done "完成"> <!ENTITY ssl-observatory.prefs.explanation -"HTTPS Everywhere 可以使用 EFF 的 SSL 观测站。这有两个功能： -(1) 将 HTTPS 数字证书寄送到观测站，以协助我们侦测中间人式的攻击 -并改善网络的安全性； -(2) 针对不安全的连接以及对你的浏览器进行的攻击，向你发出警告。"> +"HTTPS Everywhere 可以使用 EFF 的 SSL 观测站。这有两个功能：(1) 将 HTTPS 数字证书寄送到观测站，以协助我们侦测中间人式的攻击并改善网络的安全性；(2)针对不安全的连接以及对你的浏览器进行的攻击，向你发出警告。">  <!ENTITY ssl-observatory.prefs.explanation2 -"例如，在访问 https://www.something.com 时，观测站收到的数字证书显示 -某人访问了 www.something.com，但不会显示是谁访问了该站点或者浏览了 -哪些页面。将鼠标移至该选项可了解更多详细信息："> +"例如，在访问 https://www.something.com 时，观测站收到的数字证书显示某人访问了 www.something.com，但不会显示是谁访问了该站点或者浏览了哪些页面。将鼠标移至该选项可了解更多详细信息："> <!ENTITY ssl-observatory.prefs.hide "隐藏高级选项"> @@ -91,7 +86,7 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.warning.showcert "显示数字证书链"> <!ENTITY ssl-observatory.warning.okay "我已了解"> <!ENTITY ssl-observatory.warning.text "EFF 的 SSL 观测站已对该 HTTPS 数字证书发出警告："> -<!ENTITY ssl-observatory.warning.defense "如果你已登录了此网站，建议在有安全连接时更改密码。（这些警告可以在 HTTPS Everywhere 用户偏好对话框的“SSL Observatory”页面禁用。）"> +<!ENTITY ssl-observatory.warning.defense "如果已登录网站，建议使用安全连接更改密码。（这些警告可以在 HTTPS Everywhere 首选项的“SSL Observatory”选项卡中禁用。）"> <!ENTITY ssl-observatory.prefs.self_signed "提交并检查自签名证书">

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 26 Aug '14

26 Aug '14

commit 4b74674329e11cf6ca3eb48ec4aa2a7d288ccd04 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 26 09:45:55 2014 +0000 Update translations for torbutton-torbuttondtd --- zh_CN/torbutton.dtd | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd index 5f20ad8..06ab662 100644 --- a/zh_CN/torbutton.dtd +++ b/zh_CN/torbutton.dtd @@ -53,7 +53,7 @@ <!ENTITY torbutton.prefs.clear_cache "切换 Tor 时禁用磁盘缓存并清除所有缓存"> <!ENTITY torbutton.prefs.block_cache "使用 Tor 时禁止访问磁盘和内存缓存"> <!ENTITY torbutton.prefs.cookie_jars "在受保护的 jar 中保存 Tor 之外的 cookie"> -<!ENTITY torbutton.prefs.cookie_protection "请在 Cookie 隐私保护对话框内选择"> +<!ENTITY torbutton.prefs.cookie_protection "请在 cookie 隐私保护对话框内选择"> <!ENTITY torbutton.prefs.mmm_cookies "手动管理 cookie （危险）"> <!ENTITY torbutton.prefs.clear_cookies "切换 Tor 时清除 cookie"> <!ENTITY torbutton.prefs.disable_plugins "使用 Tor 时禁用插件（重要）"> @@ -74,9 +74,9 @@ <!ENTITY torbutton.prefs.headers "Header"> <!ENTITY torbutton.prefs.spoof_english "伪装浏览器语言为美国英语"> <!ENTITY torbutton.prefs.refererspoofing "伪造 Referer"> -<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> +<!ENTITY torbutton.prefs.spoofblank "使用 Tor 时伪造空白 Referer（可能造成某些网站显示异常）"> <!ENTITY torbutton.prefs.smartspoof "使用 Tor 时伪造智能 Referer（伪造跨域 Referer）"> -<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)"> +<!ENTITY torbutton.prefs.nospoof "使用Tor 时不使用伪造 Rererer（发送正常 Referer）"> <!ENTITY torbutton.prefs.disable_domstorage "使用 Tor 时禁止存储浏览器的 DOM（重要）"> <!ENTITY torbutton.prefs.forms "表单"> <!ENTITY torbutton.prefs.block_tforms "使用 Tor 时禁止保存密码和表单（推荐）"> @@ -86,7 +86,7 @@ <!ENTITY torbutton.prefs.restore_tor "恢复浏览器会话时，设置 Tor 的状态为："> <!ENTITY torbutton.prefs.startup_tor "浏览器启动时,设置 Tor 的状态为:"> <!ENTITY torbutton.prefs.reload_crashed_jar "Firefox 崩溃后重载 cookie jar/清除 cookie（推荐）"> -<!ENTITY torbutton.prefs.dual_cookie_jars "在受保护的 jar 文件中同时保存使用 Tor 和停用 Tor 时的 cookies（危险）"> +<!ENTITY torbutton.prefs.dual_cookie_jars "在受保护的 jar 文件中同时保存使用 Tor 和停用 Tor 时的 cookie（危险）"> <!ENTITY torbutton.prefs.clear_http_auth "清除 HTTP 认证会话（推荐）"> <!ENTITY torbutton.prefs.block_js_history "Tor 状态变化后限制在先前状态下已浏览的网页间进行跳转（重要）"> <!ENTITY torbutton.prefs.resize_on_toggle "使用 Tor 时调整窗口大小为 50 像素的倍数（推荐）"> @@ -104,7 +104,7 @@ <!ENTITY torbutton.prefs.restore_defaults "恢复默认设置"> <!ENTITY torbutton.prefs.test_settings "测试代理设置"> <!ENTITY torbutton.prefs.test_auto "每次启动 Firefox 后进行首次切换时自动验证 Tor 设置"> -<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> +<!ENTITY torbutton.prefs.disable_livemarks "使用 Tor 时禁用 Livemark（RSS书签）更新"> <!ENTITY torbutton.prefs.tor_memory_jar "使用 Tor 时不将 Cookie 写入磁盘"> <!ENTITY torbutton.prefs.nontor_memory_jar "停用 Tor 时不将 Cookie 写入磁盘"> <!ENTITY torbutton.prefs.session_restore "让 Firefox 的会话保存功能保存并恢复如下标签页："> @@ -116,10 +116,10 @@ <!ENTITY torbutton.prefs.no_proxy_warning "警告：请不要使用上述任何主机名。"> <!ENTITY torbutton.prefs.spoofreresh "伪造刷新"> <!ENTITY torbutton.prefs.refereroptions "Referer 欺骗选项"> -<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)"> +<!ENTITY torbutton.prefs.nospoof "使用Tor 时不使用伪造 Rererer（发送正常 Referer）"> <!ENTITY torbutton.prefs.spoofroot "伪造包含文件夹的页面"> <!ENTITY torbutton.prefs.spoofdomain "伪造域名作为 Referer"> -<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> +<!ENTITY torbutton.prefs.spoofblank "使用 Tor 时伪造空白 Referer（可能造成某些网站显示异常）"> <!ENTITY torbutton.cookiedialog.title "管理受保护的 Cookie"> <!ENTITY torbutton.cookiedialog.lockCol "受保护"> <!ENTITY torbutton.cookiedialog.domainCol "服务器"> @@ -129,9 +129,9 @@ <!ENTITY torbutton.cookiedialog.removeCookie "移除 Cookie"> <!ENTITY torbutton.cookiedialog.unprotectCookie "停止保护 Cookie"> <!ENTITY torbutton.cookiedialog.removeAllBut "全部移除仅保留受保护的 Cookie"> -<!ENTITY torbutton.cookiedialog.saveAllCookies "保护新的 Cookies"> -<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "不保护新的 Cookies"> -<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> +<!ENTITY torbutton.cookiedialog.saveAllCookies "保护新的 Cookie"> +<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "不保护新的 Cookie"> +<!ENTITY torbutton.prefs.disable_livemarks "使用 Tor 时禁用 Livemark（RSS书签）更新"> <!ENTITY torbutton.prefs.dtd_recommended "（推荐）"> <!ENTITY torbutton.prefs.dtd_optional "（可选）"> <!ENTITY torbutton.prefs.dtd_crucial "（重要）">

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 26 Aug '14

26 Aug '14

commit 1ac68054adbda44ef5418ea625f1e49e580094d3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 26 09:45:24 2014 +0000 Update translations for https_everywhere_completed --- zh-CN/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index de49fca..e32cc8e 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -7,7 +7,7 @@ <!ENTITY https-everywhere.about.thanks "致谢"> <!ENTITY https-everywhere.about.contribute "如果喜欢 HTTPS Everywhere，您可以考虑"> <!ENTITY https-everywhere.about.donate_tor "捐助 Tor"> -<!ENTITY https-everywhere.about.tor_lang_code "en"> +<!ENTITY https-everywhere.about.tor_lang_code "zh_CN"> <!ENTITY https-everywhere.about.donate_eff "捐助电子前线基金会 (EFF)"> <!ENTITY https-everywhere.menu.about "关于 HTTPS Everywhere">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 26 Aug '14

26 Aug '14

commit 1854c4baca3eac45bb3baf66af77d15494625ed4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 26 09:45:16 2014 +0000 Update translations for https_everywhere --- zh-CN/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index de49fca..e32cc8e 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -7,7 +7,7 @@ <!ENTITY https-everywhere.about.thanks "致谢"> <!ENTITY https-everywhere.about.contribute "如果喜欢 HTTPS Everywhere，您可以考虑"> <!ENTITY https-everywhere.about.donate_tor "捐助 Tor"> -<!ENTITY https-everywhere.about.tor_lang_code "en"> +<!ENTITY https-everywhere.about.tor_lang_code "zh_CN"> <!ENTITY https-everywhere.about.donate_eff "捐助电子前线基金会 (EFF)"> <!ENTITY https-everywhere.menu.about "关于 HTTPS Everywhere">

1 0

[translation/tor-and-https_completed] Update translations for tor-and-https_completed
by translation＠torproject.org 26 Aug '14

26 Aug '14

commit 636ac01d2a540e580b6836cdccba99ec3163c850 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 26 09:16:31 2014 +0000 Update translations for tor-and-https_completed --- zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN.po b/zh_CN.po index ee5beef..79d4feb 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+0000\n" -"PO-Revision-Date: 2014-08-26 08:43+0000\n" +"PO-Revision-Date: 2014-08-26 08:50+0000\n" "Last-Translator: Wu Ming Shi\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 26 Aug '14

26 Aug '14

commit a0065ac4d9d85f1340bde8e11db5ab38685cca48 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 26 09:16:29 2014 +0000 Update translations for tor-and-https --- zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN.po b/zh_CN.po index ee5beef..79d4feb 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+0000\n" -"PO-Revision-Date: 2014-08-26 08:43+0000\n" +"PO-Revision-Date: 2014-08-26 08:50+0000\n" "Last-Translator: Wu Ming Shi\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 26 Aug '14

26 Aug '14

commit 15ea048dcc1d4debd2cc90ec213a1bad3c0d9df9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 26 09:16:21 2014 +0000 Update translations for torbutton-torbuttondtd --- zh_CN/torbutton.dtd | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd index 2b1894e..5f20ad8 100644 --- a/zh_CN/torbutton.dtd +++ b/zh_CN/torbutton.dtd @@ -3,7 +3,7 @@ <!ENTITY torbutton.prefs.recommended_settings "该版本的 Firefox 使用推荐代理设置"> <!ENTITY torbutton.prefs.use_privoxy "使用 Privoxy"> <!ENTITY torbutton.prefs.use_polipo "使用 Polipo"> -<!ENTITY torbutton.prefs.custom_settings "使用自定义代理设置"> +<!ENTITY torbutton.prefs.custom_settings "自定义代理设置"> <!ENTITY torbutton.prefs.proxy.host.http "HTTP 代理："> <!ENTITY torbutton.prefs.proxy.host.https "SSL 代理："> <!ENTITY torbutton.prefs.proxy.host.ftp "FTP 代理："> @@ -16,12 +16,12 @@ <!ENTITY torbutton.about.code "代码贡献者："> <!ENTITY torbutton.about.maintainer "维护人员："> <!ENTITY torbutton.about.security_review "安全评审："> -<!ENTITY torbutton.about.donate "如果喜欢使用 Tor，你可以"> +<!ENTITY torbutton.about.donate "如果喜欢使用 Tor，你可以考虑"> <!ENTITY torbutton.about.make_donation "给予捐赠。"> <!ENTITY torbutton.pref_connection.notice "禁止 Torbutton 更改这些设置。"> <!ENTITY torbutton.pref_connection.more_info "更多信息"> <!ENTITY torbutton.pref_connection_more_info.title "帮助"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton 当前已启用。如需对 Tor 之外的代理设置进行更改，请禁用 Torbutton 后再返回这里。如需更改Tor 的设置，请在 Torbutton 首选项窗口中进行设置。"> +<!ENTITY torbutton.pref_connection_more_info.text "Torbutton 当前已启用。如需对 Tor 之外的代理设置进行更改，请禁用 Torbutton 后再返回这里。如需更改 Tor 的设置，请在 Torbutton 首选项窗口中进行设置。"> <!ENTITY torbutton.context_menu.new_identity "新标识"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.toggle "切换 Tor 状态"> @@ -36,11 +36,11 @@ <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie 保护"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.context_menu.copyTor "复制 Tor URL"> +<!ENTITY torbutton.context_menu.copyTor "复制 Tor 网址"> <!ENTITY torbutton.context_menu.copyTor.key "p"> -<!ENTITY torbutton.context_menu.openTorTab "在新标签页中打开 Tor URL"> +<!ENTITY torbutton.context_menu.openTorTab "在新标签页中打开 Tor 网址"> <!ENTITY torbutton.context_menu.openTorTab.key "r"> -<!ENTITY torbutton.context_menu.openTorWindow "在新窗口中打开 Tor URL"> +<!ENTITY torbutton.context_menu.openTorWindow "在新窗口中打开 Tor 网址"> <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "点此初始化 Torbutton"> @@ -52,9 +52,9 @@ <!ENTITY torbutton.prefs.clear_history "切换 Tor 状态时清除历史记录（可选）"> <!ENTITY torbutton.prefs.clear_cache "切换 Tor 时禁用磁盘缓存并清除所有缓存"> <!ENTITY torbutton.prefs.block_cache "使用 Tor 时禁止访问磁盘和内存缓存"> -<!ENTITY torbutton.prefs.cookie_jars "在受保护的 jar 中保存 Tor 之外的 Cookie"> +<!ENTITY torbutton.prefs.cookie_jars "在受保护的 jar 中保存 Tor 之外的 cookie"> <!ENTITY torbutton.prefs.cookie_protection "请在 Cookie 隐私保护对话框内选择"> -<!ENTITY torbutton.prefs.mmm_cookies "手动管理我的 cookies （危险）"> +<!ENTITY torbutton.prefs.mmm_cookies "手动管理 cookie （危险）"> <!ENTITY torbutton.prefs.clear_cookies "切换 Tor 时清除 cookie"> <!ENTITY torbutton.prefs.disable_plugins "使用 Tor 时禁用插件（重要）"> <!ENTITY torbutton.prefs.kill_bad_js "挂勾危险的 Java 脚本（重要）"> @@ -62,13 +62,13 @@ <!ENTITY torbutton.prefs.no_updates "使用 Tor 时禁用浏览器更新"> <!ENTITY torbutton.prefs.set_uagent "使用 Tor 作为用户代理设置（重要）"> <!ENTITY torbutton.prefs.dynamic "动态网页内容"> -<!ENTITY torbutton.prefs.cookies "Cookies"> +<!ENTITY torbutton.prefs.cookies "Cookie"> <!ENTITY torbutton.prefs.cache "缓存"> <!ENTITY torbutton.prefs.history "历史"> <!ENTITY torbutton.prefs.no_search "使用 Tor 时禁用搜索建议（推荐）"> <!ENTITY torbutton.prefs.shutdown "关闭"> -<!ENTITY torbutton.prefs.tor_shutdown "通过 Tor 启动的浏览器关闭时清除 Cookies"> -<!ENTITY torbutton.prefs.all_shutdown "任何浏览器关闭时都清除 cookies"> +<!ENTITY torbutton.prefs.tor_shutdown "通过 Tor 启动的浏览器关闭时清除 cookie"> +<!ENTITY torbutton.prefs.all_shutdown "任何浏览器关闭时都清除 cookie"> <!ENTITY torbutton.prefs.no_shutdown "关闭时不清除 cookies"> <!ENTITY torbutton.prefs.disable_sessionstore "禁用 Firefox 的会话保存（推荐）"> <!ENTITY torbutton.prefs.headers "Header">

1 0