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

[tor/master] scripts/git: Fix a variable name typo in git-push-all.sh
by teor＠torproject.org 23 Oct '19

23 Oct '19

commit 71191fa3dcc29d24aee9a22d1d9f2584316e818f Author: teor <teor(a)torproject.org> Date: Wed Oct 23 13:00:35 2019 +1000 scripts/git: Fix a variable name typo in git-push-all.sh Obviously correct changes to already reviewed code. --- scripts/git/git-push-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index f848da784..7e67f4c96 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -151,7 +151,7 @@ if [ "$TEST_BRANCH_PREFIX" ]; then fi if [ "$TOR_GIT_PUSH_PATH" ]; then - echo "Changing to $GIT_PUSH_PATH before pushing" + echo "Changing to $TOR_GIT_PUSH_PATH before pushing" cd "$TOR_GIT_PUSH_PATH" else echo "Pushing from the current directory"

1 0

[tor/master] changes: file for 29603
by teor＠torproject.org 23 Oct '19

23 Oct '19

commit d804a81cf1b43fe9382821e79c3ac588c6a9967d Author: teor <teor(a)torproject.org> Date: Wed Oct 23 12:26:32 2019 +1000 changes: file for 29603 We merged this change without a changes file. --- changes/ticket29603 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket29603 b/changes/ticket29603 new file mode 100644 index 000000000..f820352cb --- /dev/null +++ b/changes/ticket29603 @@ -0,0 +1,3 @@ + o Minor features (git scripts): + - Add git-setup-dirs.sh, which sets up an upstream git repository and + worktrees for tor maintainers. Closes ticket 29603.

1 0

[translation/exoneratorproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties_completed
by translation＠torproject.org 23 Oct '19

23 Oct '19

commit 0b4a4818e81b0e0bff798ad904b945b4999f3299 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 23 00:46:00 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=exoneratorpropertie… --- zh_CN/exonerator.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/zh_CN/exonerator.properties b/zh_CN/exonerator.properties index d5f6676a4..c7db45f8d 100644 --- a/zh_CN/exonerator.properties +++ b/zh_CN/exonerator.properties @@ -30,6 +30,7 @@ summary.positive.title=结果是肯定的 summary.positive.body=我们发现一个或多个 Tor 中继在 IP 地址 %s（于指定日期 %s）可被 Tor 客户端获知。 summary.negative.title=结果是否定的 summary.negative.body=我们没有找到 IP 地址 %s（于指定日期 %s）。 +summary.missingdata=然而，对于此特定请求数据库丢失了几个小时的数据，因此结果需要小心地展现出来。 technicaldetails.heading=技术细节 technicaldetails.pre=查询 IP 地址 %s 于指定日期 %s 的记录。Tor 客户端可以选择这个或这些 Tor 中继来构建线路。 technicaldetails.colheader.timestamp=时间戳（UTC）

1 0

[translation/exoneratorproperties] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties
by translation＠torproject.org 23 Oct '19

23 Oct '19

commit 82283a1de7481582e7a8469cbabf475606d154a3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 23 00:45:54 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties --- zh_CN/exonerator.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/exonerator.properties b/zh_CN/exonerator.properties index 3fe4662bf..c7db45f8d 100644 --- a/zh_CN/exonerator.properties +++ b/zh_CN/exonerator.properties @@ -30,7 +30,7 @@ summary.positive.title=结果是肯定的 summary.positive.body=我们发现一个或多个 Tor 中继在 IP 地址 %s（于指定日期 %s）可被 Tor 客户端获知。 summary.negative.title=结果是否定的 summary.negative.body=我们没有找到 IP 地址 %s（于指定日期 %s）。 -summary.missingdata=However, the database is missing several hours of data for this specific request, so that this result must be interpreted carefully. +summary.missingdata=然而，对于此特定请求数据库丢失了几个小时的数据，因此结果需要小心地展现出来。 technicaldetails.heading=技术细节 technicaldetails.pre=查询 IP 地址 %s 于指定日期 %s 的记录。Tor 客户端可以选择这个或这些 Tor 中继来构建线路。 technicaldetails.colheader.timestamp=时间戳（UTC）

1 0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 23 Oct '19

23 Oct '19

commit 45e17aeec0ddfd72fe44fc224075730d6045de31 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 23 00:45:23 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- zh_CN/LC_MESSAGES/bridgedb.po | 90 ++++++++++++++++++++++++------------------- 1 file changed, 50 insertions(+), 40 deletions(-) diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po index ba4155b62..884b4b64f 100644 --- a/zh_CN/LC_MESSAGES/bridgedb.po +++ b/zh_CN/LC_MESSAGES/bridgedb.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2019-10-03 15:04-0700\n" -"PO-Revision-Date: 2019-10-09 01:44+0000\n" +"POT-Creation-Date: 2019-10-19 14:51-0700\n" +"PO-Revision-Date: 2019-10-23 00:16+0000\n" "Last-Translator: ff98sha\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -47,8 +47,8 @@ msgstr "" #. recompiled). `collection_size` sets the number of compiled templates which #. are cached before the least recently used ones are removed. See: #. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup -#. : Localisations which BridgeDB supports which should be rendered right-to- -#. left. +#. : A list of supported language tuples. Use getSortedLangList() to read this +#. variable. #. We use our metrics singleton to keep track of BridgeDB metrics such as #. "number of failed HTTPS bridge requests." #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in @@ -62,19 +62,23 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: bridgedb/distributors/https/server.py:135 +#: bridgedb/distributors/https/server.py:138 msgid "Sorry! Something went wrong with your request." msgstr "抱歉，你的邮件请求出现问题。" -#: bridgedb/distributors/https/templates/base.html:79 +#: bridgedb/distributors/https/templates/base.html:42 +msgid "Language" +msgstr "语言" + +#: bridgedb/distributors/https/templates/base.html:92 msgid "Report a Bug" msgstr "报告漏洞" -#: bridgedb/distributors/https/templates/base.html:82 +#: bridgedb/distributors/https/templates/base.html:95 msgid "Source Code" msgstr "源代码" -#: bridgedb/distributors/https/templates/base.html:85 +#: bridgedb/distributors/https/templates/base.html:98 msgid "Changelog" msgstr "更改日志" @@ -113,7 +117,8 @@ msgstr "二维码包含网桥信息。利用二维码扫描程序，可将相应 msgid "There currently aren't any bridges available..." msgstr "现在没有可用的网桥。" -#: bridgedb/distributors/https/templates/bridges.html:132 +#: bridgedb/distributors/https/templates/bridges.html:133 +#: bridgedb/distributors/https/templates/bridges.html:137 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -135,17 +140,19 @@ msgstr "下载 %s Tor 浏览器 %s" msgid "Step %s2%s" msgstr "第 %s 2 %s 步" -#: bridgedb/distributors/https/templates/index.html:27 +#: bridgedb/distributors/https/templates/index.html:28 +#: bridgedb/distributors/https/templates/index.html:30 #, python-format msgid "Get %s bridges %s" msgstr "获取 %s 网桥 %s" -#: bridgedb/distributors/https/templates/index.html:36 +#: bridgedb/distributors/https/templates/index.html:40 #, python-format msgid "Step %s3%s" msgstr "第 %s 3 %s 步" -#: bridgedb/distributors/https/templates/index.html:38 +#: bridgedb/distributors/https/templates/index.html:43 +#: bridgedb/distributors/https/templates/index.html:47 #, python-format msgid "Now %s add the bridges to Tor Browser %s" msgstr "如何 %s 在 Tor 浏览器添加网桥%s" @@ -154,27 +161,27 @@ msgstr "如何 %s 在 Tor 浏览器添加网桥%s" #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#: bridgedb/distributors/https/templates/options.html:38 +#: bridgedb/distributors/https/templates/options.html:42 #, python-format msgid "%sJ%sust give me bridges!" msgstr " 直接给我网桥(%sJ%s)！ " -#: bridgedb/distributors/https/templates/options.html:51 +#: bridgedb/distributors/https/templates/options.html:55 msgid "Advanced Options" msgstr "高级选项" -#: bridgedb/distributors/https/templates/options.html:86 +#: bridgedb/distributors/https/templates/options.html:93 msgid "No" msgstr "否" -#: bridgedb/distributors/https/templates/options.html:87 +#: bridgedb/distributors/https/templates/options.html:94 msgid "none" msgstr "无" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: bridgedb/distributors/https/templates/options.html:124 +#: bridgedb/distributors/https/templates/options.html:131 #, python-format msgid "%sY%ses!" msgstr "是(%sY%s)！" @@ -182,7 +189,7 @@ msgstr "是(%sY%s)！" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: bridgedb/distributors/https/templates/options.html:147 +#: bridgedb/distributors/https/templates/options.html:154 #, python-format msgid "%sG%set Bridges" msgstr "获取网桥(%sG%s)" @@ -226,7 +233,7 @@ msgstr "你好，%s！" msgid "Hello, friend!" msgstr "你好，朋友！" -#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58 +#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58 msgid "Public Keys" msgstr "公共密匙" @@ -301,47 +308,50 @@ msgstr "获得网桥的另一种方法是向 %s 发送一封邮件。注意： msgid "My bridges don't work! I need help!" msgstr "用网桥也无法连接，需要帮助！" -#. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:117 +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and +#. "Support Portal", respectively. +#: bridgedb/strings.py:119 #, python-format -msgid "If your Tor cannot connect, please take a look at the %s and our %s." -msgstr "如果您的 Tor 无法连接，请查看%s和%s。" +msgid "" +"If your Tor Browser cannot connect, please take a look at the %s and our %s." +msgstr "如果您的 Tor 浏览器无法连接，请查看%s和%s。" -#: bridgedb/strings.py:121 +#: bridgedb/strings.py:123 msgid "Here are your bridge lines:" msgstr "以下是为你提供的网桥：" -#: bridgedb/strings.py:122 +#: bridgedb/strings.py:124 msgid "Get Bridges!" msgstr "获得网桥！" -#: bridgedb/strings.py:126 +#: bridgedb/strings.py:128 msgid "Please select options for bridge type:" msgstr "请选择类型类型。" -#: bridgedb/strings.py:127 +#: bridgedb/strings.py:129 msgid "Do you need IPv6 addresses?" msgstr "是否需要IPv6地址？" -#: bridgedb/strings.py:128 +#: bridgedb/strings.py:130 #, python-format msgid "Do you need a %s?" msgstr "是否需要 %s？" -#: bridgedb/strings.py:132 +#: bridgedb/strings.py:134 msgid "Your browser is not displaying images properly." msgstr "浏览器无法正确显示图片。" -#: bridgedb/strings.py:133 +#: bridgedb/strings.py:135 msgid "Enter the characters from the image above..." msgstr "请输入上图中的字符（不区分大小写）..." -#: bridgedb/strings.py:137 +#: bridgedb/strings.py:139 msgid "How to start using your bridges" msgstr "如何使用网桥" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: bridgedb/strings.py:139 +#: bridgedb/strings.py:141 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -350,21 +360,21 @@ msgid "" msgstr "如需在 Tor 浏览器中添加网桥，请先根据 %s Tor 浏览器下载页面 %s 的说明下载和启动 Tor 浏览器。" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:144 +#: bridgedb/strings.py:146 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "当“Tor 网络设置” 对话框出现时，点击“配置” ，然后根据向导操作，直到看到下面的问题：" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:148 +#: bridgedb/strings.py:150 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "网络提供商（ISP）或其他人是否对 Tor 网络连接进行审查或封锁？" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:152 +#: bridgedb/strings.py:154 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -372,28 +382,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "选择“是”，然后点击“下一步”。如下添加新的网桥，请将网桥地址行通过复制粘贴的方式输入到文本输入框。最后，点击“连接”就可以连接至 Tor 网络。如有问题需要帮助，请点击“Tor 网络设置”向导窗口中的“帮助”按钮。" -#: bridgedb/strings.py:160 +#: bridgedb/strings.py:162 msgid "Displays this message." msgstr "显示这条信息。" #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: bridgedb/strings.py:164 +#: bridgedb/strings.py:166 msgid "Request vanilla bridges." msgstr "请求普通网桥。" -#: bridgedb/strings.py:165 +#: bridgedb/strings.py:167 msgid "Request IPv6 bridges." msgstr "请求IPv6网络。" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:167 +#: bridgedb/strings.py:169 msgid "Request a Pluggable Transport by TYPE." msgstr "按照类型请求不同的可插拔传输网桥。" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:170 +#: bridgedb/strings.py:172 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "获取 BridgeDB 的 GnuPG 公共密匙。"

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 23 Oct '19

23 Oct '19

commit 547db12c7ca1fe71672ad1283feb4908f14e7a75 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 23 00:45:15 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- zh_CN/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po index 71179f94c..884b4b64f 100644 --- a/zh_CN/LC_MESSAGES/bridgedb.po +++ b/zh_CN/LC_MESSAGES/bridgedb.po @@ -22,8 +22,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2019-10-19 14:51-0700\n" -"PO-Revision-Date: 2019-10-22 01:44+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-10-23 00:16+0000\n" +"Last-Translator: ff98sha\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -315,7 +315,7 @@ msgstr "用网桥也无法连接，需要帮助！" #, python-format msgid "" "If your Tor Browser cannot connect, please take a look at the %s and our %s." -msgstr "" +msgstr "如果您的 Tor 浏览器无法连接，请查看%s和%s。" #: bridgedb/strings.py:123 msgid "Here are your bridge lines:"

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 23 Oct '19

23 Oct '19

commit e1c6a3dc550ea4aa5f4007f989762076aeb563e7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 23 00:23:16 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- zh_CN/network-settings.dtd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index a34cd4685..8c9bc742f 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -26,18 +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 "选择网桥"> @@ -69,7 +69,7 @@ <!ENTITY torPreferences.bridges "网桥"> <!ENTITY torPreferences.bridgesDescription "网桥帮助你在 Tor 被阻塞的地方连接 Tor 网络。取决于你在哪里，有的网桥的效果可能比另一个要好。"> <!ENTITY torPreferences.useBridge "使用网桥"> -<!ENTITY torPreferences.requestNewBridge ""> +<!ENTITY torPreferences.requestNewBridge "正在请求新网桥……"> <!ENTITY torPreferences.provideBridge "添加网桥"> <!ENTITY torPreferences.advanced "高级"> <!ENTITY torPreferences.advancedDescription "配置 Tor 浏览器如何接入网络。"> @@ -79,5 +79,5 @@ <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "请输入验证码以获取网桥。"> <!ENTITY torPreferences.requestBridgeErrorBadSolution "结果并不正确，请重试。"> <!ENTITY torPreferences.viewTorLogs "查看 Tor 日志。"> -<!ENTITY torPreferences.viewLogs ""> +<!ENTITY torPreferences.viewLogs "查看日志"> <!ENTITY torPreferences.torLogsDialogTitle "Tor 日志">

1 0

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

23 Oct '19

commit ce78c0715a596a7dd7328ea62ce9b5bb6d7399ac Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 23 00:17:15 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- zh_CN/messages.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/zh_CN/messages.json b/zh_CN/messages.json index ff9449adf..ac6bd9ee2 100644 --- a/zh_CN/messages.json +++ b/zh_CN/messages.json @@ -30,51 +30,51 @@ "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>." + "message": "Snowflake 是一个用来对抗互联网审查的系统。被审查的人们可以使用 Snowflake 来访问互联网。他们的连接将通过由志愿者们所运行的 Snowflake 代理来访问网络。了解更多关于 Snowflake 如何运行的资讯，请参阅<a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\" data-msgid=\"__MSG_docWiki__\">文档 wiki</a>。" }, "docWiki": { - "message": "documentation wiki" + "message": "文档 wiki" }, "browser": { - "message": "Browser" + "message": "浏览器" }, "censoredUsers": { - "message": "If your internet access is censored, you should download <a href=\"https://www.torproject.org/download/\">Tor Browser</a>." + "message": "如果您的互联网访问是受到审查的，您应该下载 <a href=\"https://www.torproject.org/download/\">Tor 浏览器</a>。" }, "extension": { - "message": "Extension" + "message": "拓展" }, "installExtension": { - "message": "If your internet access is not 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." + "message": "如果您的互联网访问并未受到审查，你可以考虑安装 Snowflake 拓展来帮助那些身陷审查网络中的用户。无需担心人们通过您的代理访问哪些网站。他们可见的 IP 地址是他们的 Tor 出口节点的 IP 地址，而不是您的。" }, "installFirefox": { - "message": "Install in Firefox" + "message": "安装到 Firefox 浏览器" }, "installChrome": { - "message": "Install in Chrome" + "message": "安装到 Google Chrome 浏览器" }, "reportingBugs": { - "message": "Reporting Bugs" + "message": "报告缺陷" }, "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," + "message": "如果您在使用 Snowflake 客户端或者代理时遇到了问题，请考虑提交漏洞。要这样做，您将需要" }, "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 cypherpunks account with password writecode." + "message": "<a href=\"https://trac.torproject.org/projects/tor/register\">创建一个账户</a>或者使用共享的 cypherpunks 账号 writecode 密码<a href=\"https://trac.torproject.org/projects/tor/login\">登录</a>，" }, "bugTracker": { - "message": "<a href=\"https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">File a ticket</a> using our bug tracker." + "message": "使用我们的漏洞追踪器<a href=\"https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">填写工单</a> 。" }, "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 snowflake-webextension or snowflake-client to let us know how which part of the Snowflake system is experiencing problems." + "message": "请尽量客观地描述您的情况，如果可能，请同时报告您的日志文件，这将帮助我们重现漏洞。考虑添加关键词 snowflake-webextension 或者 snowflake-client 来让我们知道您在 Snowflake 系统的哪个部分中遇到了问题。" }, "embed": { - "message": "Embed" + "message": "嵌入式插件" }, "possible": { - "message": "It is now possible to embed the Snowflake badge on any website:" + "message": "现在可以在任何网站上嵌入 Snowflake 徽章：" }, "looksLike": { - "message": "Which looks like this:" + "message": "看起来是这样的：" } }

1 0

[tor/release-0.4.1] Merge branch 'pr1450_squashed' into maint-0.4.1
by teor＠torproject.org 23 Oct '19

23 Oct '19

commit 8bc65cda4423d27896dcf3060cbe4d6abcdd3438 Merge: 4a5c909ce f3c0a0b9f Author: teor <teor(a)torproject.org> Date: Wed Oct 23 09:58:22 2019 +1000 Merge branch 'pr1450_squashed' into maint-0.4.1 changes/ticket31549 | 4 +++ src/feature/dirauth/process_descs.c | 59 +++++++++++++++++++++++++++---------- 2 files changed, 47 insertions(+), 16 deletions(-)

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by teor＠torproject.org 23 Oct '19

23 Oct '19

commit e188e02f28b3732c6788e4136685dcec4caa027d Merge: fd4fca378 8bc65cda4 Author: teor <teor(a)torproject.org> Date: Wed Oct 23 10:00:41 2019 +1000 Merge branch 'maint-0.4.1' into release-0.4.1 changes/ticket31549 | 4 +++ src/feature/dirauth/process_descs.c | 59 +++++++++++++++++++++++++++---------- 2 files changed, 47 insertions(+), 16 deletions(-)

1 0