October 2019 - tor-commits - lists.torproject.org

[gettor/master] Log checks temporarily
by hiro＠torproject.org 18 Oct '19

18 Oct '19

commit 356f68a4a7fea6d6cd26c32dbe1091cd6b580463 Author: hiro <hiro(a)torproject.org> Date: Fri Oct 18 12:41:13 2019 +0200 Log checks temporarily --- gettor/parse/email.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index 31afb1e..52d97ec 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -244,6 +244,10 @@ class EmailParser(object): hid, num_requests[0][0], email_requests_limit ) + log.msg("check: {}".format(check), system="email parser") + log.msg("hid: {}".format(hid), system="email parser") + log.msg("request['id']: {}".format(request['id']), system="email parser") + if check: log.msg( "Discarded. Too many requests from {}.".format(

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 18 Oct '19

18 Oct '19

commit 448304f3a53a64733b913904ae03c7772585d84b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 18 10:23:53 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+zh-CN.po | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 90ecd17f2..847513ea3 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -3687,6 +3687,8 @@ msgid "" " plugin which automatically switches thousands of sites from unencrypted " "\"HTTP\" to more private \"HTTPS\"." msgstr "" +"Tor 浏览器内置 <mark><a href=\"https://www.eff.org/https-everywhere\">HTTPS " +"Everywhere</a> 插件，它将自动将数千个不受加密保护的 HTTP 站点切换至更加安全隐私的 HTTPS 站点。" #: https//support.torproject.org/operators/operators-1/ #: (content/operators/operators-1/contents+en.lrquestion.title) @@ -3973,7 +3975,7 @@ msgstr "" #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description) msgid "![Image of a green onion](/static/images/green-onion.png)" -msgstr "" +msgstr "![绿色洋葱标识](/static/images/green-onion.png)" #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description) @@ -3992,7 +3994,7 @@ msgstr "- 洋葱服务通过 HTTP 或带有自签名证书的 HTTPS 提供。" msgid "" "![Image of a green onion with a lock](/static/images/green-onion-with-" "lock.png)" -msgstr "" +msgstr "![绿色带锁洋葱标识](/static/images/green-onion-with-lock.png)" #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description) @@ -4009,7 +4011,7 @@ msgstr "- 洋葱服务通过具有 CA 颁发的证书的 HTTPS 提供。" msgid "" "![Image of a grey onion with a red slash](/static/images/grey-onion-with-" "red-slash.png)" -msgstr "" +msgstr "![灰色洋葱带红色斜杠标识](/static/images/grey-onion-with-red-slash.png)" #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description) @@ -4059,7 +4061,7 @@ msgstr "###反馈模板" msgid "" "When sending us feedback or reporting a bug, please include as many of these" " as possible:" -msgstr "" +msgstr "给我们发送反馈或者报告程序问题时，请尽量包含以下信息，越多越好：" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -4210,7 +4212,7 @@ msgstr "" #: https//support.torproject.org/get-in-touch/how-can-i-get-support/ #: (content/get-in-touch/how-can-i-get-support/contents+en.lrquestion.description) msgid "Learn how to connect to [OFTC servers](/get-in-touch/irc-help)." -msgstr "" +msgstr "了解如何连接到 [OFTC 服务器](/get-in-touch/irc-help)." #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -5431,6 +5433,8 @@ msgid "" "Browser for Android](https://www.torproject.org/download/#android) " "[app](#app) developed by the Tor Project." msgstr "" +"如果需要在安卓设备上使用 Tor 访问网络，请使用受 Tor Project 开发、支持的 [Tor Browser for " +"Android](https://www.torproject.org/download/#android) [应用](#app) 。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6845,7 +6849,7 @@ msgstr "" #: https//support.torproject.org/apt/apt-1/ #: (content/apt/apt-1/contents+en.lrquestion.title) msgid "Why and how I can enable Tor Package Repository in Debian?" -msgstr "" +msgstr "我如何在 Debian 中启用 Tor 软件包仓库？我为什么要这么做？" #: https//support.torproject.org/apt/apt-1/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -6887,6 +6891,8 @@ msgid "" "#### 2. Add the following entries to `/etc/apt/sources.list` or a new file " "in `/etc/apt/sources.list.d/`" msgstr "" +"#### 2. 将以下条目加到 \"/etc/apt/sources.list\" 后，或者 “/etc/apt/sources.list.d/” " +"中的一个新文件中。" #: https//support.torproject.org/apt/apt-1/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -6981,14 +6987,14 @@ msgstr "" #: https//support.torproject.org/apt/apt-1/ #: (content/apt/apt-1/contents+en.lrquestion.description) msgid "#### 4. Install tor and tor debian keyring" -msgstr "" +msgstr "#### 4. 安装 tor 和 tor debian 密钥串" #: https//support.torproject.org/apt/apt-1/ #: (content/apt/apt-1/contents+en.lrquestion.description) msgid "" "We provide a Debian package to help you keep our signing key current. It is " "recommended you use it. Install it with the following commands:" -msgstr "" +msgstr "我们提供一个 Debian 软件包，以帮助您保持我们的密钥为最新状态。推荐您使用这个软件包。用下列命令安装它：" #: https//support.torproject.org/apt/apt-1/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -7010,7 +7016,7 @@ msgstr "我可以使用来自Ubuntu仓库的tor吗？" #: https//support.torproject.org/apt/apt-2/ #: (content/apt/apt-2/contents+en.lrquestion.description) msgid "**No.** Do not use the packages in Ubuntu's universe." -msgstr "" +msgstr "**不.** 不要使用Ubuntu universe提供的软件包！" #: https//support.torproject.org/apt/apt-2/ #: (content/apt/apt-2/contents+en.lrquestion.description) @@ -7027,19 +7033,19 @@ msgstr "" #: https//support.torproject.org/apt/apt-3/ #: (content/apt/apt-3/contents+en.lrquestion.title) msgid "Can I use APT over Tor?" -msgstr "" +msgstr "我可以通过 Tor 使用 apt 吗？" #: https//support.torproject.org/apt/apt-3/ #: (content/apt/apt-3/contents+en.lrquestion.description) msgid "" "Yes, `deb.torproject.org` is also served through via an Onion Service: " "http://sdscoq7snqtznauu.onion/" -msgstr "" +msgstr "是的，“deb.torproject.org” 也通过一个隐藏服务提供服务： http://sdscoq7snqtznauu.onion/" #: https//support.torproject.org/apt/apt-3/ #: (content/apt/apt-3/contents+en.lrquestion.description) msgid "To use Apt over Tor, the apt transport needs to be installed:" -msgstr "" +msgstr "如需通过 Tor 使用apt，需要安装 apt 运载工具。" #: https//support.torproject.org/apt/apt-3/ #: (content/apt/apt-3/contents+en.lrquestion.description)

1 0

[gettor/master] Update check for too_many_requests
by hiro＠torproject.org 18 Oct '19

18 Oct '19

commit 8953e38e9dd5527507c3a3de5d1c9ea4b5541d43 Author: hiro <hiro(a)torproject.org> Date: Fri Oct 18 12:11:24 2019 +0200 Update check for too_many_requests --- gettor/parse/email.py | 18 ++++++++++-------- tests/test_email_service.py | 12 ++++++++++++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index 0768356..31afb1e 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -151,10 +151,10 @@ class EmailParser(object): return request - def too_many_requests(self, request_id, hid, request_service, num_requests, limit): - if hid.hexdigest() == self.settings.get('test_hid'): + def too_many_requests(self, hid, num_requests, limit): + if hid == self.settings.get('test_hid'): return False - elif num_requests[0][0] < limit: + elif num_requests < limit: return False else: return True @@ -224,28 +224,30 @@ class EmailParser(object): email_requests_limit = self.settings.get("email_requests_limit") now_str = datetime.now().strftime("%Y%m%d%H%M%S") dbname = self.settings.get("dbname") - hid = hashlib.sha256(request['id'].encode('utf-8')) - request_service = request['service'] conn = SQLite3(dbname) if request["command"]: + + hid = hashlib.sha256(request['id'].encode('utf-8')).hexdigest() + request_service = request['service'] + log.msg( "Found request for {}.".format(request['command']), system="email parser" ) num_requests = yield conn.get_num_requests( - id=hid.hexdigest(), service=request_service + id=hid, service=request_service ) check = self.too_many_requests( - request['id'], hid, request_service, num_requests, email_requests_limit + hid, num_requests[0][0], email_requests_limit ) if check: log.msg( "Discarded. Too many requests from {}.".format( - hid.hexdigest() + hid ), system="email parser" ) else: diff --git a/tests/test_email_service.py b/tests/test_email_service.py index 9d50f5f..8e7adf0 100644 --- a/tests/test_email_service.py +++ b/tests/test_email_service.py @@ -1,5 +1,7 @@ #!/usr/bin/env python3 import pytest +import hashlib +from datetime import datetime from twisted.trial import unittest from twisted.internet import defer, reactor from twisted.internet import task @@ -58,6 +60,16 @@ class EmailServiceTests(unittest.TestCase): self.assertEqual(request["platform"], "osx") self.assertEqual(request["language"], "es") + def test_too_many_request_exclude(self): + ep = conftests.EmailParser(self.settings, "gettor(a)torproject.org") + hid = "80d7054da0d3826563c7babb5453e18f3e42f932e562c5ab0434aec9df7b0625" + request_service = "osx" + limit = self.settings.get("email_requests_limit") + num_requests = 300 + check = ep.too_many_requests(hid, num_requests, limit) + self.assertEqual(hid, self.settings.get('test_hid')) + self.assertEqual(check, False) + def test_language_email_parser(self): ep = conftests.EmailParser(self.settings, "gettor(a)torproject.org") request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n Subject: \r\n Reply-To: hiro(a)torproject.org \nTo: gettor(a)torproject.org\n osx en")

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 18 Oct '19

18 Oct '19

commit 162df49c9a3d09e032cc70f7c59f43ebbd72e12b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 18 09:53:47 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+zh-CN.po | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 495933563..90ecd17f2 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -6,10 +6,10 @@ # ciaran <ciaranchen(a)qq.com>, 2019 # erinm, 2019 # Cloud P <heige.pcloud(a)outlook.com>, 2019 -# AngelFalse, 2019 # ff98sha, 2019 # Anais Huang <1299820931(a)qq.com>, 2019 # MD Rights <psychi2009(a)gmail.com>, 2019 +# AngelFalse, 2019 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-26 17:56+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: MD Rights <psychi2009(a)gmail.com>, 2019\n" +"Last-Translator: AngelFalse, 2019\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3799,6 +3799,9 @@ msgid "" "guide](https://community.torproject.org/relay/setup/bridge/) to learn how to" " set up an obfs4 bridge." msgstr "" +"请查阅我们的<mark><a " +"href=\"https://community.torproject.org/relay/setup/bridge/\">obfs4 " +"网桥设置指南</a></mark>来了解如何搭建一个obfs4网桥" #: https//support.torproject.org/operators/operators-7/ #: (content/operators/operators-7/contents+en.lrquestion.title)

1 0

[translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
by translation＠torproject.org 18 Oct '19

18 Oct '19

commit 712258aa72d3063057ef69894faa93e9e415160c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 18 09:53:03 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- zh_CN/network-settings.dtd | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index 203a3a286..a34cd4685 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -26,24 +26,18 @@ <!ENTITY torsettings.optional "可选"> <!ENTITY torsettings.useProxy.checkbox "使用代理访问互联网"> - -<!ENTITY torsettings.useProxy.type "代理类型："> +<!ENTITY torsettings.useProxy.type ""> <!ENTITY torsettings.useProxy.type.placeholder "选择代理类型"> - -<!ENTITY torsettings.useProxy.address "地址："> +<!ENTITY torsettings.useProxy.address ""> <!ENTITY torsettings.useProxy.address.placeholder "IP 地址或主机名"> - -<!ENTITY torsettings.useProxy.port "端口："> - -<!ENTITY torsettings.useProxy.username "用户名："> - -<!ENTITY torsettings.useProxy.password "密码："> +<!ENTITY torsettings.useProxy.port ""> +<!ENTITY torsettings.useProxy.username ""> +<!ENTITY torsettings.useProxy.password ""> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "该计算机的防火墙仅允许特定端口的互联网连接"> - -<!ENTITY torsettings.firewall.allowedPorts "允许的端口："> +<!ENTITY torsettings.firewall.allowedPorts ""> <!ENTITY torsettings.useBridges.checkbox "我所在的国家对 Tor 进行了审查"> <!ENTITY torsettings.useBridges.default "选择内置网桥"> <!ENTITY torsettings.useBridges.default.placeholder "选择网桥"> @@ -75,19 +69,15 @@ <!ENTITY torPreferences.bridges "网桥"> <!ENTITY torPreferences.bridgesDescription "网桥帮助你在 Tor 被阻塞的地方连接 Tor 网络。取决于你在哪里，有的网桥的效果可能比另一个要好。"> <!ENTITY torPreferences.useBridge "使用网桥"> - -<!ENTITY torPreferences.requestNewBridge "正在请求新网桥&#x2026;"> +<!ENTITY torPreferences.requestNewBridge ""> <!ENTITY torPreferences.provideBridge "添加网桥"> <!ENTITY torPreferences.advanced "高级"> <!ENTITY torPreferences.advancedDescription "配置 Tor 浏览器如何接入网络。"> <!ENTITY torPreferences.firewallPortsPlaceholder "逗号分隔值"> <!ENTITY torPreferences.requestBridgeDialogTitle "正在请求网桥"> - <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "正在连接到 BridgeDB，请等待。"> - <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "请输入验证码以获取网桥。"> - <!ENTITY torPreferences.requestBridgeErrorBadSolution "结果并不正确，请重试。"> <!ENTITY torPreferences.viewTorLogs "查看 Tor 日志。"> -<!ENTITY torPreferences.viewLogs "查看日志&#x2026;"> +<!ENTITY torPreferences.viewLogs ""> <!ENTITY torPreferences.torLogsDialogTitle "Tor 日志">

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 18 Oct '19

18 Oct '19

commit edeb3f3c737de01cad1344bf41a580fc71153784 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 18 09:52:57 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- zh_CN/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index 3f299714d..8c9bc742f 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "该计算机的防火墙仅允许特定端口的互联网连接"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "允许的端口"> <!ENTITY torsettings.useBridges.checkbox "我所在的国家对 Tor 进行了审查"> <!ENTITY torsettings.useBridges.default "选择内置网桥"> <!ENTITY torsettings.useBridges.default.placeholder "选择网桥"> @@ -79,5 +79,5 @@ <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "请输入验证码以获取网桥。"> <!ENTITY torPreferences.requestBridgeErrorBadSolution "结果并不正确，请重试。"> <!ENTITY torPreferences.viewTorLogs "查看 Tor 日志。"> -<!ENTITY torPreferences.viewLogs "View Logs…"> +<!ENTITY torPreferences.viewLogs "查看日志"> <!ENTITY torPreferences.torLogsDialogTitle "Tor 日志">

1 0

[translation/torbutton-abouttbupdatedtd_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbupdatedtd_completed
by translation＠torproject.org 18 Oct '19

18 Oct '19

commit a915be6c57664b492dab33c7af82be07ddfb6173 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 18 09:52:07 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbup… --- mk/abouttbupdate.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/abouttbupdate.dtd b/mk/abouttbupdate.dtd index 9d8c386a7..1649a1380 100644 --- a/mk/abouttbupdate.dtd +++ b/mk/abouttbupdate.dtd @@ -1,7 +1,7 @@ <!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Листа на промени"> <!ENTITY aboutTBUpdate.updated "Tor Browser е ажуриран."> -<!ENTITY aboutTBUpdate.linkPrefix "За најнови информации за оваа верзија,"> -<!ENTITY aboutTBUpdate.linkLabel " посетете ја нашата веб страна"> +<!ENTITY aboutTBUpdate.linkPrefix "За најнови информации за оваа верзија, "> +<!ENTITY aboutTBUpdate.linkLabel "посетете ја нашата веб страна"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.version "Верзија"> <!ENTITY aboutTBUpdate.releaseDate "Датум на издавање">

1 0

[translation/torbutton-abouttbupdatedtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbupdatedtd
by translation＠torproject.org 18 Oct '19

18 Oct '19

commit 522ee2744ee6c63630d6e095e88960a1dafc4bf3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 18 09:52:01 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbup… --- mk/abouttbupdate.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/abouttbupdate.dtd b/mk/abouttbupdate.dtd index 9d8c386a7..1649a1380 100644 --- a/mk/abouttbupdate.dtd +++ b/mk/abouttbupdate.dtd @@ -1,7 +1,7 @@ <!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Листа на промени"> <!ENTITY aboutTBUpdate.updated "Tor Browser е ажуриран."> -<!ENTITY aboutTBUpdate.linkPrefix "За најнови информации за оваа верзија,"> -<!ENTITY aboutTBUpdate.linkLabel " посетете ја нашата веб страна"> +<!ENTITY aboutTBUpdate.linkPrefix "За најнови информации за оваа верзија, "> +<!ENTITY aboutTBUpdate.linkLabel "посетете ја нашата веб страна"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.version "Верзија"> <!ENTITY aboutTBUpdate.releaseDate "Датум на издавање">

1 0

[translation/snowflake-website-indexhtml] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml
by translation＠torproject.org 18 Oct '19

18 Oct '19

commit e86a9ebb10b39a52f3a11a94955514edb7e170a5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 18 09:47:24 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-i… --- zh_CN/index.html | 92 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 57 insertions(+), 35 deletions(-) diff --git a/zh_CN/index.html b/zh_CN/index.html index 94dccdad8..ac07b62e3 100644 --- a/zh_CN/index.html +++ b/zh_CN/index.html @@ -1,61 +1,83 @@ <!doctype html> -<html lang="zh_CN"> +<html> <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Snowflake</title> -<link rel="icon" href="assets/favicon.ico"> -<link rel="stylesheet" href="index.css"> +<link rel="icon" href="./assets/favicon.ico"> +<link rel="stylesheet" href="./bootstrap.css"> +<link rel="stylesheet" href="./index.css"> </head> -<body> - <header id="header"><a href="https://www.torproject.org/"> - <img src="tor-logo(a)2x.png" alt="Tor" height="50"></a></header><section id="content"><h1>Snowflake</h1> +<body class="no-gutters"> + <header id="header"><nav class="navbar no-background navbar-dark bg-dark p-4"><a class="navbar-brand" href="https://www.torproject.org/"> + <img src="./tor-logo(a)2x.png" alt="Tor" height="50"></a><div class="btn-group dropdown pull-right"> +<button id="language-switcher" type="button" class="btn btn-dark bg-dark dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + </button><div id="supported-languages" class="dropdown-menu"> + </div> + </div> + </nav></header><div> + <section id="content"><h1>Snowflake</h1> - <p class="diagram"><img src="https://trac.torproject.org/projects/tor/raw-attachment/wiki/doc/Snowflake/…" alt="Diagram"></p> + <p class="diagram"><img src="https://trac.torproject.org/projects/tor/raw-attachment/wiki/doc/Snowflake/…" alt="Diagram"></p> - <p>Snowflake 是一个用来对抗互联网审查的系统。被审查的人们可以使用 Snowflake 来访问互联网。他们的连接将通过由志愿者们所运行的 Snowflake 代理来访问网络。了解更多关于 Snowflake 如何运行的资讯，请参阅<a href="https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/">文档 wiki</a>。</p> + <p data-msgid="__MSG_websiteIntro__">Snowflake is a system to defeat internet censorship. People who are + censored can use Snowflake to access the internet. Their connection goes + through Snowflake proxies, which are run by volunteers. For more detailed + information about how Snowflake works see our + <a href="https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/" data-msgid="__MSG_docWiki__">documentation wiki</a>.</p> - <div class="sidebyside"> + <div class="sidebyside"> - <section id="browser" class="browser"><h2>浏览器</h2> + <section id="browser" class="browser"><h2 data-msgid="__MSG_browser__">浏览器</h2> - <p>如果您的互联网访问是受到审查的，您应该下载 <a href="https://www.torproject.org/download/">Tor 浏览器</a>。</p> + <p data-msgid="__MSG_censoredUsers__">If your internet access is censored, you should download + <a href="https://www.torproject.org/download/">Tor Browser</a>.</p> - <p class="screenshot"><img src="screenshot.png" alt="Tor Browser screenshot"></p> - </section><section id="extension" class="extension"><h2>拓展</h2> + <p class="screenshot"><img src="./screenshot.png" alt="Tor Browser screenshot"></p> + </section><section id="extension" class="extension"><h2 data-msgid="__MSG_extension__">拓展</h2> - <p>如果您的互联网访问并<strong>不</strong>受到审查，你可以考虑安装 Snowflake 拓展来帮助那些身陷审查网络中的用户。无需担心人们通过您的代理访问哪些网站。他们可见的 IP 地址是他们的 Tor 出口节点的 IP 地址，而不是您的。</p> + <p data-msgid="__MSG_installExtension__">If your internet access is <strong>not</strong> censored, you should + consider installing the Snowflake extension to help users in censored + networks. There is no need to worry about which websites people are + accessing through your proxy. Their visible browsing IP address will + match their Tor exit node, not yours.</p> - <p class="addon"><a href="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/"> - <img src="firefox150.jpg" alt="Install in Firefox" height="100"><br><span>在 Firefox 中安装</span> + <p class="addon"><a href="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/"> + <img src="./firefox150.jpg" alt="Install in Firefox" height="100"><br><span data-msgid="MSG_installFirefox__">Install in Firefox</span> </a> <a href="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmma…"> - <img src="chrome150.jpg" alt="Install in Chrome" height="100"><br><span>在 Chrome 中安装</span> + <img src="./chrome150.jpg" alt="Install in Chrome" height="100"><br><span data-msgid="__MSG_installChrome__">Install in Chrome</span> </a></p> - </section> + </section> </div> - <section id="bugs"><h2>报告漏洞</h2> + <section id="bugs"><h2 data-msgid="__MSG_reportingBugs__">报告缺陷</h2> - <p>如果您在使用 Snowflake 的客户端或者代理时， - 请考虑提交漏洞。为此，您将需要，</p> + <p data-msgid="__MSG_fileBug__">If you encounter problems with Snowflake as a client or a proxy, + please consider filing a bug. To do so, you will have to,</p> - <ol> -<li> <a href="https://trac.torproject.org/projects/tor/register">创建一个 - 账户</a> 或 <a href="https://trac.torproject.org/projects/tor/login">登录</a> - 使用共享的<b>cypherpunks</b> 账户并使用密码 <b>writecode</b>。</li> - <li> -<a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">填写工单</a> - 使用我们的漏洞追踪器。</li> - </ol> -<p>请尽量描述您的情况，如果可能，请同时报告您的日志文件，这将帮助我们重现漏洞。考虑添加关键词 <em>snowflake-webextension</em> 或者 <em>snowflake-client</em> 来让我们知道您在 Snowflake 系统的哪个部分中遇到了问题。</p> - </section><section id="embed"><h2>嵌入</h2> + <ol> +<li data-msgid="__MSG_sharedAccount__">Either <a href="https://trac.torproject.org/projects/tor/register">create an + account</a> or <a href="https://trac.torproject.org/projects/tor/login">log in</a> + using the shared <b>cypherpunks</b> account with password <b>writecode</b>.</li> + <li data-msgid="__MSG_bugTracker__"> +<a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">File a ticket</a> + using our bug tracker.</li> + </ol> +<p data-msgid="__MSG_descriptive__">Please try to be as descriptive as possible with your ticket and if + possible include log messages that will help us reproduce the bug. + Consider adding keywords <em>snowflake-webextension</em> or <em>snowflake-client</em> + to let us know how which part of the Snowflake system is experiencing + problems.</p> + </section><section id="embed"><h2 data-msgid="__MSG_embed__">嵌入式插件</h2> - <p>现在可以在任何网站上嵌入 Snowflake 徽章：</p> + <p data-msgid="__MSG_possible__">现在可以在任何网站上嵌入 Snowflake 徽章：</p> - <textarea readonly><iframe src="https://snowflake.torproject.org/embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe></textarea><p>看起来是这样的：</p> + <textarea readonly><iframe src="https://snowflake.torproject.org/embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe></textarea><p data-msgid="__MSG_looksLike__">看起来是这样的：</p> - <iframe src="embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe> - </section></section> + <iframe src="https://snowflake.torproject.org/embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe> + </section></section> +</div> + <script src="index.js"></script> </body> </html>

1 0

[translation/snowflakeaddon-messages.json_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed
by translation＠torproject.org 18 Oct '19

18 Oct '19

commit d8e165fac7b20327a93283b727f9a764950830f2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 18 09:47:19 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- zh_CN/messages.json | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/zh_CN/messages.json b/zh_CN/messages.json index 584dfbdc0..ff9449adf 100644 --- a/zh_CN/messages.json +++ b/zh_CN/messages.json @@ -28,5 +28,53 @@ }, "badgeCookiesOff": { "message": "Cookie 未启用。" + }, + "websiteIntro": { + "message": "Snowflake is a system to defeat internet censorship. People who are censored can use Snowflake to access the internet. Their connection goes through Snowflake proxies, which are run by volunteers. For more detailed information about how Snowflake works see our <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\" data-msgid=\"__MSG_docWiki__\">documentation wiki</a>." + }, + "docWiki": { + "message": "documentation wiki" + }, + "browser": { + "message": "Browser" + }, + "censoredUsers": { + "message": "If your internet access is censored, you should download <a href=\"https://www.torproject.org/download/\">Tor Browser</a>." + }, + "extension": { + "message": "Extension" + }, + "installExtension": { + "message": "If your internet access is <strong>not</strong> censored, you should consider installing the Snowflake extension to help users in censored networks. There is no need to worry about which websites people are accessing through your proxy. Their visible browsing IP address will match their Tor exit node, not yours." + }, + "installFirefox": { + "message": "Install in Firefox" + }, + "installChrome": { + "message": "Install in Chrome" + }, + "reportingBugs": { + "message": "Reporting Bugs" + }, + "fileBug": { + "message": "If you encounter problems with Snowflake as a client or a proxy, please consider filing a bug. To do so, you will have to," + }, + "sharedAccount": { + "message": "Either <a href=\"https://trac.torproject.org/projects/tor/register\">create an account</a> or <a href=\"https://trac.torproject.org/projects/tor/login\">log in</a> using the shared <b>cypherpunks</b> account with password <b>writecode</b>." + }, + "bugTracker": { + "message": "<a href=\"https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">File a ticket</a> using our bug tracker." + }, + "descriptive": { + "message": "Please try to be as descriptive as possible with your ticket and if possible include log messages that will help us reproduce the bug. Consider adding keywords <em>snowflake-webextension</em> or <em>snowflake-client</em> to let us know how which part of the Snowflake system is experiencing problems." + }, + "embed": { + "message": "Embed" + }, + "possible": { + "message": "It is now possible to embed the Snowflake badge on any website:" + }, + "looksLike": { + "message": "Which looks like this:" } }

1 0