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

[tpo/master] Add new Tor Browser version: 9.0a7
by boklm＠torproject.org 01 Oct '19

01 Oct '19

commit 946d3ddcd77ee5d54e14d3655452adf4058b37b3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Oct 1 21:30:42 2019 +0200 Add new Tor Browser version: 9.0a7 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +++++- databags/versions.ini | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 7b28d2b..dd9b84a 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -12,5 +12,9 @@ body: "9.0a6", "9.0a6-MacOS", "9.0a6-Linux", -"9.0a6-Windows" +"9.0a6-Windows", +"9.0a7", +"9.0a7-MacOS", +"9.0a7-Linux", +"9.0a7-Windows" ] diff --git a/databags/versions.ini b/databags/versions.ini index e59162f..86a9f6b 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -6,7 +6,7 @@ win32 = 0.4.1.5 version = 8.5.6 [torbrowser-alpha] -version = 9.0a6 +version = 9.0a7 [tor-stable] version = 0.4.1.6

1 0

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

01 Oct '19

commit a49395a0715e7df6eb9ff50cf32cd36bd691ff2c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 1 19:22:39 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+zh-CN.po | 54 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 4aa3ad775..11ea1731c 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -3,11 +3,11 @@ # ヨイツの賢狼ホロ, 2019 # Dianyu Liu <liudianyu5(a)gmail.com>, 2019 # Emma Peel, 2019 -# PCloud <heige.pcloud(a)outlook.com>, 2019 # ciaran <ciaranchen(a)qq.com>, 2019 # erinm, 2019 # MD Rights <psychi2009(a)gmail.com>, 2019 # ff98sha, 2019 +# Cloud P <heige.pcloud(a)outlook.com>, 2019 # msgid "" msgstr "" @@ -15,7 +15,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: ff98sha, 2019\n" +"Last-Translator: Cloud P <heige.pcloud(a)outlook.com>, 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" @@ -88,11 +88,11 @@ msgstr "其它" #: https//support.torproject.org/get-in-touch/ #: (content/get-in-touch/contents+en.lrtopic.title) msgid "Get in Touch" -msgstr "" +msgstr "保持联系" #: https//support.torproject.org/apt/ (content/apt/contents+en.lrtopic.title) msgid "Debian Repository" -msgstr "" +msgstr "Debian资料库" #: https//support.torproject.org/faq/faq-1/ #: (content/faq/faq-1/contents+en.lrquestion.title) @@ -501,12 +501,12 @@ msgstr "" msgid "" "Using Tor with other browsers is [dangerous and not " "recommended](/tbb/tbb-9/)." -msgstr "" +msgstr "将Tor和其他浏览器一起使用是[危险且不推荐的](/tbb/tbb-9/)。" #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.title) msgid "Can I distribute Tor?" -msgstr "" +msgstr "我可以分发Tor吗？" #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) @@ -516,19 +516,19 @@ msgstr "可以。" #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) msgid "The Tor software is [free software](https://www.fsf.org/)." -msgstr "" +msgstr "Tor 软件是[免费软件](https://www.fsf.org/)。" #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) msgid "" "This means we give you the rights to redistribute the Tor software, either " "modified or unmodified, either for a fee or gratis." -msgstr "" +msgstr "这意味着我们给予您权力来再次分发Tor软件，无论是修改或未修改的版本，无论是收费或免费。" #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) msgid "You don't have to ask us for specific permission." -msgstr "" +msgstr "您不需要向我们要特殊许可。" #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) @@ -630,12 +630,12 @@ msgstr "" #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "In the simplest configuration, you don't have to install anything." -msgstr "" +msgstr "通过最简单的配置，您不需要安装任何东西。" #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "You just have to point your browser at their proxy server." -msgstr "" +msgstr "您只需要将您的浏览器指向他们的代理服务器。" #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) @@ -709,12 +709,12 @@ msgstr "" #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "### Doesn't the first server see who I am?" -msgstr "" +msgstr "###第一台服务器不知道我是谁吗？" #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "Possibly." -msgstr "" +msgstr "有可能。" #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) @@ -737,7 +737,7 @@ msgstr "" #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "" "Tor is not illegal anywhere in the world, so using Tor by itself is fine." -msgstr "" +msgstr "Tor并非在世界上任何一个地方都是不合法的，所以在Tor被允许使用的地方使用它。" #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) @@ -749,23 +749,23 @@ msgstr "" #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "### Can't the third server see my traffic?" -msgstr "" +msgstr "###第三台服务器看不见我的流量吗？" #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "A bad third of three servers can see the traffic you sent into Tor." -msgstr "" +msgstr "一个差劲的末端服务器可以看到三分之一的你发送给Tor的流量。" #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "It won't know who sent this traffic." -msgstr "" +msgstr "它不会知道是谁发送的数据。" #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "" "If you're using encryption (like HTTPS), it will only know the destination." -msgstr "" +msgstr "如果您正在使用加密（例如HTTPS协议），它仅能知道目标地点。" #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) @@ -783,7 +783,7 @@ msgstr "" #: https//support.torproject.org/about/no-data-scrubbing/ #: (content/about/no-data-scrubbing/contents+en.lrquestion.description) msgid "No, it doesn't." -msgstr "" +msgstr "不，它不会。" #: https//support.torproject.org/about/no-data-scrubbing/ #: (content/about/no-data-scrubbing/contents+en.lrquestion.description) @@ -839,17 +839,17 @@ msgstr "" msgid "" "The Tor Project is a non-profit (charity) organization that maintains and " "develops the Tor software." -msgstr "" +msgstr "Tor 项目是一个非盈利性（慈善）组织，它维护和开发Tor 软件。" #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.title) msgid "Why is it called Tor?" -msgstr "" +msgstr "它为什么被叫做Tor？" #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) msgid "Because Tor is the onion routing network." -msgstr "" +msgstr "因为Tor是洋葱路由网络。" #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) @@ -2310,6 +2310,8 @@ msgid "" "Internet is not flat, and it in fact does look different depending on where " "you are. This feature reminds people of this fact." msgstr "" +"如果您真的想看英文版的Google，你可以点击提供此内容的链接。不过我们认为这是Tor的一项特性，而不是漏洞——互联网并非处处相同，实际上，根据您所在的位置，它看上去确实有所不同。" +" 此功能使人们想起了这一事实。" #: https//support.torproject.org/tbb/tbb-43/ #: (content/tbb/tbb-43/contents+en.lrquestion.description) @@ -2323,7 +2325,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-43/ #: (content/tbb/tbb-43/contents+en.lrquestion.description) msgid "https://encrypted.google.com/search?q=online%20anonymity&hl=en" -msgstr "" +msgstr "https://encrypted.google.com/search?q=online%20anonymity&hl=en" #: https//support.torproject.org/tbb/tbb-43/ #: (content/tbb/tbb-43/contents+en.lrquestion.description) @@ -2335,7 +2337,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-44/ #: (content/tbb/tbb-44/contents+en.lrquestion.title) msgid "Google makes me solve a CAPTCHA or tells me I have spyware installed" -msgstr "" +msgstr "谷歌让我进行CAPTCHA验证，或告知我安装了间谍软件。" #: https//support.torproject.org/tbb/tbb-44/ #: (content/tbb/tbb-44/contents+en.lrquestion.description) @@ -3947,7 +3949,7 @@ msgstr "" #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description) msgid "A green onion with a lock means:" -msgstr "" +msgstr "一个绿色的带锁洋葱意味着：" #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description) @@ -3964,7 +3966,7 @@ msgstr "" #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description) msgid "A grey onion with a red slash means:" -msgstr "" +msgstr "带有红色斜线的灰洋葱表示：" #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description)

1 0

[snowflake/master] Use a static label for the button
by arlo＠torproject.org 01 Oct '19

01 Oct '19

commit 36eb07a6fc1026b8b96471b72a17f578a2caff35 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Sep 27 18:50:24 2019 -0400 Use a static label for the button Trac: 31685 --- proxy/init-badge.js | 2 -- proxy/static/_locales/en_US/messages.json | 7 ++----- proxy/static/embed.html | 2 +- proxy/static/popup.js | 3 --- proxy/webext/embed.js | 2 -- 5 files changed, 3 insertions(+), 13 deletions(-) diff --git a/proxy/init-badge.js b/proxy/init-badge.js index d8d9113..7684e68 100644 --- a/proxy/init-badge.js +++ b/proxy/init-badge.js @@ -38,7 +38,6 @@ class BadgeUI extends UI { turnOn() { const clients = this.active ? 1 : 0; this.popup.setChecked(true); - this.popup.setToggleText(messages.getMessage('popupTurnOff')); if (clients > 0) { this.popup.setStatusText(messages.getMessage('popupStatusOn', String(clients))); } else { @@ -52,7 +51,6 @@ class BadgeUI extends UI { turnOff() { this.popup.setChecked(false); - this.popup.setToggleText(messages.getMessage('popupTurnOn')); this.popup.setStatusText(messages.getMessage('popupStatusOff')); this.popup.setStatusDesc(''); this.popup.setEnabled(false); diff --git a/proxy/static/_locales/en_US/messages.json b/proxy/static/_locales/en_US/messages.json index 1ac15d9..e83a0fd 100644 --- a/proxy/static/_locales/en_US/messages.json +++ b/proxy/static/_locales/en_US/messages.json @@ -2,11 +2,8 @@ "appDesc": { "message": "Snowflake is a WebRTC pluggable transport for Tor." }, - "popupTurnOn": { - "message": "Turn On" - }, - "popupTurnOff": { - "message": "Turn Off" + "popupEnabled": { + "message": "Enabled" }, "popupLearnMore": { "message": "Learn more" diff --git a/proxy/static/embed.html b/proxy/static/embed.html index eb75c30..96bf90c 100644 --- a/proxy/static/embed.html +++ b/proxy/static/embed.html @@ -15,7 +15,7 @@ <p id="statusdesc"></p> </div> <div class="b button"> - <label id="toggle" for="enabled">__MSG_popupTurnOn__</label> + <label id="toggle" for="enabled">__MSG_popupEnabled__</label> <label class="switch"> <input id="enabled" type="checkbox" /> <span class="slider round"></span> diff --git a/proxy/static/popup.js b/proxy/static/popup.js index c59f842..80cbcc6 100644 --- a/proxy/static/popup.js +++ b/proxy/static/popup.js @@ -35,9 +35,6 @@ class Popup { setChecked(checked) { document.getElementById('enabled').checked = checked; } - setToggleText(txt) { - document.getElementById('toggle').innerText = txt; - } static fill(n, func) { switch(n.nodeType) { case 3: { // Node.TEXT_NODE diff --git a/proxy/webext/embed.js b/proxy/webext/embed.js index 85a3465..eae482f 100644 --- a/proxy/webext/embed.js +++ b/proxy/webext/embed.js @@ -28,7 +28,6 @@ port.onMessage.addListener((m) => { if (enabled) { popup.setChecked(true); - popup.setToggleText(chrome.i18n.getMessage('popupTurnOff')); if (clients > 0) { popup.setStatusText(chrome.i18n.getMessage('popupStatusOn', String(clients))); } else { @@ -37,7 +36,6 @@ port.onMessage.addListener((m) => { popup.setStatusDesc((total > 0) ? chrome.i18n.getMessage('popupDescOn', String(total)) : ''); } else { popup.setChecked(false); - popup.setToggleText(chrome.i18n.getMessage('popupTurnOn')); popup.setStatusText(chrome.i18n.getMessage('popupStatusOff')); popup.setStatusDesc(""); }

1 0

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

01 Oct '19

commit b0eb1ef59679008cb07a5253326f4ef72bd6e859 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 1 18:17:02 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- pt_BR/messages.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pt_BR/messages.json b/pt_BR/messages.json index f6ed740cf..1ac15d95a 100644 --- a/pt_BR/messages.json +++ b/pt_BR/messages.json @@ -23,6 +23,9 @@ "popupWebRTCOff": { "message": "WebRTC feature is not detected." }, + "popupBridgeUnreachable": { + "message": "Could not connect to the bridge." + }, "popupDescOn": { "message": "Number of users your Snowflake has helped circumvent censorship in the last 24 hours: $1" },

1 0

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

01 Oct '19

commit 90152181bc6dd5a8df2f1fab7b80bf1ff5d3dc9d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 1 18:16:57 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- pt_BR/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/messages.json b/pt_BR/messages.json index ade87e6a1..5ce679143 100644 --- a/pt_BR/messages.json +++ b/pt_BR/messages.json @@ -24,7 +24,7 @@ "message": "O recurso WebRTC não é detectado." }, "popupBridgeUnreachable": { - "message": "Could not connect to the bridge." + "message": "Não foi possível se conectar à ponte." }, "popupDescOn": { "message": "Número de usuários que seu Snowflake ajudou a contornar a censura nas últimas 24 horas: $1"

1 0

[translation/policies-code_of_conducttxtpot_completed] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot_completed
by translation＠torproject.org 01 Oct '19

01 Oct '19

commit a220a453486443186a66098a5ac3669c0131785d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 1 17:46:50 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+pt_BR.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/code_of_conduct+pt_BR.po b/code_of_conduct+pt_BR.po index 9b8f9f069..aed27e8af 100644 --- a/code_of_conduct+pt_BR.po +++ b/code_of_conduct+pt_BR.po @@ -8,8 +8,8 @@ # Hildeberto Abreu Magalhães <hildeberto(a)gmail.com>, 2019 # Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2019 # Irio Musskopf, 2019 -# Cy Belle <cyb3ll3(a)protonmail.com>, 2019 # Communia <ameaneantie(a)riseup.net>, 2019 +# Cy Belle <cyb3ll3(a)protonmail.com>, 2019 # #, fuzzy msgid "" @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: Code of conduct of the Tor Project\n" "POT-Creation-Date: 2019-08-02 12:00+0000\n" "PO-Revision-Date: 2019-08-27 18:54+0000\n" -"Last-Translator: Communia <ameaneantie(a)riseup.net>, 2019\n" +"Last-Translator: Cy Belle <cyb3ll3(a)protonmail.com>, 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -641,16 +641,16 @@ msgstr "" "tiver quaisquer considerações, por favor, comunique o Conselho Comunitário o" " mais rápido possível. Você pode entrar em contato com um membro do Conselho" " pessoalmente ou via tor-community-council(a)lists.torproject.org. Os atuais " -"membros do Conselho estão listados na wiki [1]. A reação do Conselho " +"membros do Conselho estão listados na wiki [1]. A resposta do Conselho " "Comunitário ao incidente irá variar para cada caso. O Conselho fará o " "possível para reagir ao incidente imediatamente. O Conselho priorizará a " "segurança da pessoa que tiver sofrido ou estiver sob risco de sofre um dano." -" Pessoas que se tornaram vítimas ou que estão sob risco podem retirar a " -"denúncia do incidente a qualquer momento. Nós nunca iremos fazer nada sem o " -"consentimento pessoa que tiver sofrido ou estiver sob risco de sofre um " -"dano, exceto quando a situação apresentar perigo imediato para alguém. Mais " -"informações sobre denúncias ao Conselho Comunitário e suas políticas podem " -"ser encontrados em sua wiki [1]." +" Pessoas que forem lesadas ou que estão sob risco, podem retirar a denúncia " +"do incidente a qualquer momento. Nós nunca iremos fazer nada sem o " +"consentimento da pessoa que tiver sofrido ou estiver sob risco de sofrer " +"algum dano, exceto quando a situação apresentar perigo imediato para alguém." +" Mais informações sobre denúncias ao Conselho Comunitário e suas políticas " +"podem ser encontrados em sua wiki [1]." #. type: Plain text #: ../code_of_conduct.txt:233

1 0

[translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
by translation＠torproject.org 01 Oct '19

01 Oct '19

commit 791a539c56297c985058f565e3758493cf276c2c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 1 17:46:44 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+pt_BR.po | 18 +- code_of_conduct+zh_CN.po | 699 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 708 insertions(+), 9 deletions(-) diff --git a/code_of_conduct+pt_BR.po b/code_of_conduct+pt_BR.po index 37937837b..799323fdb 100644 --- a/code_of_conduct+pt_BR.po +++ b/code_of_conduct+pt_BR.po @@ -8,8 +8,8 @@ # Hildeberto Abreu Magalhães <hildeberto(a)gmail.com>, 2019 # Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2019 # Irio Musskopf, 2019 -# Cy Belle <cyb3ll3(a)protonmail.com>, 2019 # Communia <ameaneantie(a)riseup.net>, 2019 +# Cy Belle <cyb3ll3(a)protonmail.com>, 2019 # #, fuzzy msgid "" @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: Code of conduct of the Tor Project\n" "POT-Creation-Date: 2019-08-02 12:00+0000\n" "PO-Revision-Date: 2019-08-27 18:54+0000\n" -"Last-Translator: Communia <ameaneantie(a)riseup.net>, 2019\n" +"Last-Translator: Cy Belle <cyb3ll3(a)protonmail.com>, 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -646,16 +646,16 @@ msgstr "" "tiver quaisquer considerações, por favor, comunique o Conselho Comunitário o" " mais rápido possível. Você pode entrar em contato com um membro do Conselho" " pessoalmente ou via tor-community-council(a)lists.torproject.org. Os atuais " -"membros do Conselho estão listados na wiki [1]. A reação do Conselho " +"membros do Conselho estão listados na wiki [1]. A resposta do Conselho " "Comunitário ao incidente irá variar para cada caso. O Conselho fará o " "possível para reagir ao incidente imediatamente. O Conselho priorizará a " "segurança da pessoa que tiver sofrido ou estiver sob risco de sofre um dano." -" Pessoas que se tornaram vítimas ou que estão sob risco podem retirar a " -"denúncia do incidente a qualquer momento. Nós nunca iremos fazer nada sem o " -"consentimento pessoa que tiver sofrido ou estiver sob risco de sofre um " -"dano, exceto quando a situação apresentar perigo imediato para alguém. Mais " -"informações sobre denúncias ao Conselho Comunitário e suas políticas podem " -"ser encontrados em sua wiki [1]." +" Pessoas que forem lesadas ou que estão sob risco, podem retirar a denúncia " +"do incidente a qualquer momento. Nós nunca iremos fazer nada sem o " +"consentimento da pessoa que tiver sofrido ou estiver sob risco de sofrer " +"algum dano, exceto quando a situação apresentar perigo imediato para alguém." +" Mais informações sobre denúncias ao Conselho Comunitário e suas políticas " +"podem ser encontrados em sua wiki [1]." #. type: Plain text #: ../code_of_conduct.txt:233 diff --git a/code_of_conduct+zh_CN.po b/code_of_conduct+zh_CN.po new file mode 100644 index 000000000..cfb57f3e6 --- /dev/null +++ b/code_of_conduct+zh_CN.po @@ -0,0 +1,699 @@ +# Code of conduct of the tor project +# Copyright (C) 2019 tor project. +# This Code of Conduct is licensed under a Creative Commons CC-BY-SA 4.0 +# International license.e. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +# Translators: +# ciaran <ciaranchen(a)qq.com>, 2019 +# ff98sha, 2019 +# Cloud P <heige.pcloud(a)outlook.com>, 2019 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: Code of conduct of the Tor Project\n" +"POT-Creation-Date: 2019-08-02 12:00+0000\n" +"PO-Revision-Date: 2019-08-27 18:54+0000\n" +"Last-Translator: Cloud P <heige.pcloud(a)outlook.com>, 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" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. type: Plain text +#: ../code_of_conduct.txt:1 ../code_of_conduct.txt:24 +#: ../code_of_conduct.txt:51 ../code_of_conduct.txt:75 +#: ../code_of_conduct.txt:104 ../code_of_conduct.txt:180 +#: ../code_of_conduct.txt:193 ../code_of_conduct.txt:213 +#: ../code_of_conduct.txt:231 ../code_of_conduct.txt:243 +#: ../code_of_conduct.txt:253 ../code_of_conduct.txt:278 +#, no-wrap +msgid "============================================================\n" +msgstr "============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:3 +#, no-wrap +msgid "" +"Tor Project Code of Conduct\n" +"============================================================\n" +msgstr "" +"Tor 项目行为准则\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:6 +msgid "Statement of Intent:" +msgstr "宗旨陈述：" + +#. type: Plain text +#: ../code_of_conduct.txt:10 +msgid "" +"The Tor Project is committed to fostering an inclusive environment and " +"community. Tor is a place where people should feel safe to engage, share " +"their point of view, and participate." +msgstr "Tor 项目致力于营造一个包容性的社区环境。 Tor 应该是人们可以放心参与，分享观点的地方。" + +#. type: Plain text +#: ../code_of_conduct.txt:15 +msgid "" +"This code of conduct applies to The Tor Project as a whole. It is intended " +"to provide guidelines for contributors. Employees and contractors of The Tor" +" Project, Inc. (TPI) are also subject to company policies and procedures. " +"Those people should feel free to contact HR with questions or concerns." +msgstr "" +"该行为准则适用于整个Tor 项目。它旨在为贡献者提供指导。 The Tor Project，Inc.（TPI）的员工和承包商也受公司政策和程序的约束。" +" 人们可以随时联系人力资源部以提出问题或疑虑。" + +#. type: Plain text +#: ../code_of_conduct.txt:23 +msgid "" +"This code of conduct is not exhaustive or complete. It is an ongoing effort " +"to summarize our shared understanding. We want to provide a welcoming, safe " +"environment, so we can work together to pursue powerful solutions. We " +"reserve the right to deviate from strictly enforcing this code. Any " +"deviations must produce an outcome which is fairer, and aligned with our " +"values. We understand that keeping a living document relevant and “patched” " +"involves sustained effort." +msgstr "" +"本行为准则并不详尽或完整。总结我们的共识是一项持续的工作。我们希望提供一个温馨，安全的环境，因此我们共同努力，寻求有力的解决方案。 " +"我们保留弹性执行此代码的权利。任何特例都必须产生更公平的结果，并与我们的价值观保持一致。 " +"我们理解保持活动文档的相关性并对其进行“修补”需要持续的努力。" + +#. type: Plain text +#: ../code_of_conduct.txt:26 +#, no-wrap +msgid "" +"0. Summary: Don't be a jerk. Be awesome instead.\n" +"============================================================\n" +msgstr "" +"0. 概述：不要成为混蛋。成为一个优秀的人。\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:29 +msgid "The Tor community should be a good place where people are glad to be." +msgstr "Tor社区应该是人们乐于驻足停留的好地方。" + +#. type: Plain text +#: ../code_of_conduct.txt:31 +#, no-wrap +msgid " DO: Be kind, thoughtful, and considerate.\n" +msgstr "请务必：友善，三思，为他人着想。\n" + +#. type: Plain text +#: ../code_of_conduct.txt:33 +#, no-wrap +msgid " DO: Make Tor a place where people are happy and comfortable.\n" +msgstr "请务必：创造一个让人们能快乐舒适的地方。\n" + +#. type: Plain text +#: ../code_of_conduct.txt:36 +#, no-wrap +msgid "" +" DO: Remember: We are all contributing; we are all learning. Nobody was born\n" +" an expert.\n" +msgstr "请务必记住：我们都在做出共享；我们都在倾听。没有人生来就是专家。\n" + +#. type: Plain text +#: ../code_of_conduct.txt:38 +#, no-wrap +msgid " DO: Yield the floor. Listen. Make sure everyone gets heard.\n" +msgstr "请务必：伏地倾听，确保每个人的声音都能被听见。\n" + +#. type: Plain text +#: ../code_of_conduct.txt:40 +#, no-wrap +msgid " DON'T: Insult, harass, intimidate, or be a jerk.\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:43 +#, no-wrap +msgid "" +" DON'T: Treat honest mistakes as an excuse to hassle people. Mistakes are for\n" +" learning.\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:46 +#, no-wrap +msgid "" +" DON'T: Hunt for ways to uphold the letter of this code while violating its\n" +" spirit.\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:50 +#, no-wrap +msgid "" +" AND DO: Eagerly email: tor-community-council(a)lists.torproject.org with\n" +" questions or concerns. Public key:\n" +" https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil#Contact\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:53 +#, no-wrap +msgid "" +"1. Purpose\n" +"============================================================\n" +msgstr "" +"1. 宗旨\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:63 +msgid "" +"A primary goal of the Tor community is to be inclusive of many different " +"contributors. We want to include contributors from the most varied and " +"diverse backgrounds possible. As such, we are committed to providing a " +"friendly, safe and welcoming environment for all, regardless of their " +"experience, gender identity or expression, sexual orientation, family, " +"relationships, ability (whether bodily or mental), personal appearance, " +"socioeconomic status, body size, race, ethnicity, age, religion, " +"nationality, or membership in a disadvantaged and/or underrepresented group." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:68 +msgid "" +"A safe environment means one free from abuse, whether isolated or systemic. " +"We explicitly acknowledge that tolerating abuse is a security problem. " +"Allowing abusers and malicious people to disrupt our community puts our " +"software, developers, and users at risk." +msgstr "" +"一个安全的环境意味着一个不受虐待的环境，无论是孤立的还是系统的。我们明确承认容忍滥用是一个安全问题。 " +"允许滥用者和恶意人员破坏我们的社区会使我们的软件，开发人员和用户面临风险。" + +#. type: Plain text +#: ../code_of_conduct.txt:71 +msgid "" +"This code of conduct outlines our expectations for all those who participate" +" in our community, as well as the consequences for unacceptable behavior." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:74 +msgid "" +"We invite all those who participate in The Tor Project to help us create " +"safe and positive experiences for everyone." +msgstr "我们邀请所有参与Tor项目的人员帮助我们为每个人创造安全，积极的体验。" + +#. type: Plain text +#: ../code_of_conduct.txt:77 +#, no-wrap +msgid "" +"2. Be your best self\n" +"============================================================\n" +msgstr "" +"2.成为最好的自己\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:80 +msgid "" +"The following behaviors are expected and requested of all community members:" +msgstr "所有社区成员都被期望与请求实行下行为：" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:83 +msgid "" +"Participate in an honest and active way. In doing so, you contribute to the " +"health and longevity of this community." +msgstr "以诚实和积极的方式参与社区活动。这样，您可以为这个社区的健康和持续发展做出贡献。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:85 +msgid "Exercise consideration and respect in your speech and actions." +msgstr "在发言与行为中需要考虑对他人的尊重。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:87 +msgid "Attempt collaboration and dialog before engaging in conflict." +msgstr "在冲突之前尝试协作和对话。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:89 +msgid "" +"Refrain from demeaning, discriminatory, or harassing behavior and speech." +msgstr "避免贬低，歧视或骚扰的行为和言论。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:92 +msgid "" +"Be mindful of your surroundings and of your fellow participants. Alert " +"community leaders if you notice:" +msgstr "注意周围的环境和参与者。如果您发现以下情况，请通知社区领导人：" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:94 +msgid "a dangerous situation" +msgstr "一个危险的情况" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:96 +msgid "someone in distress" +msgstr "遭遇危险的人" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:98 +msgid "violations of this code of conduct, even if they seem minor" +msgstr "违反本行为准则，即使它们看上去似乎时小事" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:101 +msgid "" +"Remember that community event venues may be shared with members of the " +"public. Please be respectful to everyone using these locations." +msgstr "请记住，社区活动场所可能会与公众共享。请尊重使用这些场所的每个人。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:103 +msgid "Respect the privacy of your fellow community members." +msgstr "尊重社区其他成员的隐私。" + +#. type: Plain text +#: ../code_of_conduct.txt:106 +#, no-wrap +msgid "" +"3. Unacceptable behaviors\n" +"============================================================\n" +msgstr "" +"3. 不可接受的行为\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:109 +msgid "The following behaviors are unacceptable within our community:" +msgstr "以下行为在我们的社区是不可接受的：" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:114 +msgid "" +"Violence, sexual assault, threats of violence, or violent language directed " +"against another person, especially violence against a person or group based " +"on a protected characteristic. (Display of weapons may constitute " +"intimidation or a threat of violence.)" +msgstr "暴力，性侵犯，暴力威胁或针对他人的暴力语言，尤其是基于受保护特征的针对个人或群体的暴力。（展示武器可能构成恐吓或暴力威胁。）" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:117 +msgid "" +"Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory" +" jokes and language." +msgstr "性别歧视，种族歧视，仇视同性恋，仇视恐怖，能力歧视或其他歧视性笑话和语言。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:122 +msgid "" +"Spontaneously posting or displaying sexually explicit or violent material. " +"(If it is necessary to share such material when working on Tor's mission, do" +" so with sensitivity. Be aware that many people don't want to see it.)" +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:125 +msgid "" +"Posting or threatening to post other people’s personally identifying " +"information (\"doxing\") without their consent." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:127 +msgid "Personal insults or attacks, particularly those related to:" +msgstr "人身侮辱或攻击，尤其是与以下方面有关的：" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:129 +msgid "experience" +msgstr "经验" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:131 +msgid "gender identity or expression" +msgstr "性别认同与表达" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:133 +msgid "sexual orientation" +msgstr "性取向" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:135 +msgid "family" +msgstr "家庭" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:137 +msgid "relationships" +msgstr "关系" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:139 +msgid "ability (whether bodily or mental)" +msgstr "能力（心里与生理）" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:141 +msgid "personal appearance" +msgstr "个人外表" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:143 +msgid "socioeconomic status" +msgstr "社会经济情况" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:145 +msgid "body size" +msgstr "身材" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:147 +msgid "race" +msgstr "比赛" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:149 +msgid "ethnicity" +msgstr "种族" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:151 +msgid "age" +msgstr "年龄" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:153 +msgid "religion" +msgstr "地区" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:155 +msgid "nationality" +msgstr "国籍" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:157 +msgid "membership in a disadvantaged and/or underrepresented group" +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:161 +msgid "" +"Inappropriate photography, audio recording, or recording of personal " +"information. You should have someone's consent before recording these " +"things, and before posting them publicly." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:164 +msgid "" +"Inappropriate physical contact. You should have someone’s consent before " +"touching them." +msgstr "不当的物理接触。您必须先征得他人的同意，然后再与他们接触。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:167 +msgid "" +"Unwelcome sexual attention: this includes sexualized comments or jokes, " +"inappropriate touching, groping, and unwelcome sexual advances." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:169 +msgid "Deliberate intimidation, stalking or following (online or in person)." +msgstr "故意恐吓或跟踪（在线或线下）。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:172 +msgid "" +"Deliberately undermining the spirit of this code while following the letter." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:175 +msgid "" +"Sustained disruption of any community events, including talks, " +"presentations, and online conversations." +msgstr "持续中断任何的社区活动，包括谈话，演示和在线对话。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:177 +msgid "Deliberately pushing against someone's stated boundaries." +msgstr "故意触犯某人的底线。" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:179 +msgid "Advocating for, or encouraging, any of the above behavior." +msgstr "提倡或鼓励上述任何行为。" + +#. type: Plain text +#: ../code_of_conduct.txt:182 +#, no-wrap +msgid "" +"4. Unacceptable behavior has consequences\n" +"============================================================\n" +msgstr "" +"4.不可接受的行为及其后果\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:188 +msgid "" +"We will not tolerate unacceptable behavior from any community member. We " +"will not make exceptions for sponsors and those with decision-making " +"authority. People in formal or informal leadership roles must model the " +"highest standards of behavior." +msgstr "" +"我们不会容忍任何社区成员的不可接受的行为。我们对那些有/无决策权的赞助商也不会例外。担任正式或非正式领导职务的人必须树立最高的行为标准。" + +#. type: Plain text +#: ../code_of_conduct.txt:192 +msgid "" +"Anyone asked by another community member to stop unacceptable behavior is " +"expected to comply immediately. Please don't step in on someone else's " +"behalf without their consent." +msgstr "任何来自其他社区成员的要求停止不可接受行为的请求都应立即被遵守。未经他人同意，请勿代表他人介入。" + +#. type: Plain text +#: ../code_of_conduct.txt:195 +#, no-wrap +msgid "" +"5. Where to go for help\n" +"============================================================\n" +msgstr "" +"5.去哪里寻求帮助\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:201 +msgid "" +"The Community Council is an elected body of Tor Core Contributors who can " +"assist with intra-community conflict resolution. Community Council policies " +"and information can be found on the Community Council wiki [1]. You can " +"contact the whole Community council:" +msgstr "" +"社区理事会是Tor核心贡献者的民选机构，可以协助解决社区内部冲突。社区委员会的政策和信息可以在社区委员会Wiki [1]上找到。 " +"您可以联系整个社区理事会：" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:203 +msgid "if you have questions or concerns about the code of conduct, or" +msgstr "如果您有任何有关此行为准则的问题或关切，或者" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:205 +msgid "if you feel that you have witnessed a code of conduct violation" +msgstr "如果您认为自己目睹了违反行为准则的行为" + +#. type: Plain text +#: ../code_of_conduct.txt:212 +msgid "" +"However, if you feel that there is a conflict of interest with any council " +"member, you may contact members individually. Council members' GPG keys are " +"listed on the Community Council wiki. If there is a conflict of interest, " +"the affected council member will recuse themselves. They will not be " +"involved in any discussion or documentation of the incident. More about the " +"Community Council can be found in the guidelines [2]." +msgstr "" +"但是，如果您认为与任何理事会成员存在利益冲突，则可以单独与成员联系。社区成员Wiki上列出了理事会成员的GPG密钥。 " +"如果存在利益冲突，受影响的理事会成员将回避。他们将不会参与该事件的任何讨论或记录。有关社区委员会的更多信息，请参见指南[2]。" + +#. type: Plain text +#: ../code_of_conduct.txt:215 +#, no-wrap +msgid "" +"6. What to do if you witness unacceptable behavior\n" +"============================================================\n" +msgstr "" +"6. 如果您看到不可接受的行为时该怎么办\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:230 +msgid "" +"If you are subject to or witness unacceptable behavior, or have any other " +"concerns, please notify the Community Council as soon as possible. You can " +"contact the community council in person, or at tor-community-" +"council(a)lists.torproject.org. Current councilmembers are listed on the wiki " +"[1]. The Community Council's incident response will vary on a case-by-case " +"basis. The council will make every effort to respond to the incident " +"immediately. The council will prioritize the safety of the person who has " +"been harmed, or is at risk of harm. Person(s) who have been harmed or are at" +" risk of harm can withdraw the incident report at any time. We will never do" +" anything without the consent of the person who has been harmed or is at " +"risk of harm, except in situations where there is a threat of imminent " +"danger or harm to anyone. More information about the Community Council's " +"incident reporting and response policies can be found on their wiki [1]." +msgstr "" +"如果您遭受不可接受的行为或目睹不可接受的行为，或有任何其他担忧，请尽快通知社区理事会。您可以亲自联系社区理事会，或发送电子邮件至tor-" +"community-council(a)lists.torproject.org. Wiki上列出了当前的理事会成员[1]。 " +"社区委员会的事件响应将视情况而定。理事会将尽一切努力立即对事件作出回应。理事会将优先考虑受到伤害或有遭受伤害风险的人的安全。 " +"受到伤害或有受到伤害危险的人可以随时撤回事件报告。 " +"未经受到伤害或有遭受伤害危险的人的同意，我们绝不会做任何事情，除非存在对任何人迫在眉睫的危险或伤害的威胁。 " +"有关社区委员会的事件报告和响应政策的更多信息，请参见其Wiki [1]。" + +#. type: Plain text +#: ../code_of_conduct.txt:233 +#, no-wrap +msgid "" +"7. What the person reporting a violation can expect\n" +"============================================================\n" +msgstr "" +"7. 违规事件的检举者会得到什么样的反馈\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:242 +msgid "" +"The Community Council prioritizes the safety and well-being of any person " +"who feels that they have been harmed or may be in danger of being harmed. " +"Anyone reporting an issue to the Community Council can expect that their " +"report will be taken seriously. Initial reports can be taken in written or " +"verbal form. If the incident does not require an immediate resolution, then " +"a written report can be shared with the Community Council in an encrypted " +"format. The next steps in an incident response will vary on a case-by-case " +"basis." +msgstr "" +"社区理事会优先考虑任何认为自己受到伤害或可能受到伤害的人的安全和利益。向社区委员会报告问题的任何人都可以确定他们的报告将得到认真对待。 " +"初次报告可以书面或口头形式进行。如果事件不需要立即解决，则可以书面形式与社区委员会共享加密格式的报告。事件响应的后续步骤将视情况而定。" + +#. type: Plain text +#: ../code_of_conduct.txt:245 +#, no-wrap +msgid "" +"8. How the Community Council responds to incidents\n" +"============================================================\n" +msgstr "" +"8. 社区理事会如何回应事件\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:252 +msgid "" +"If a community member engages in unacceptable behavior, the Community " +"Council may take any action they deem appropriate, including but not limited" +" to a warning, informal mediation, temporary ban or permanent expulsion from" +" the community. Any actions and decisions by the Community Council may be " +"appealed by following the appeals process in the Community Council " +"Guidelines [1]." +msgstr "" +"如果社区成员进行了任何不可接受的行为，社区理事会可采取他们认为适当的任何行动，包括但不限于警告，非正式调解，临时禁止或永久驱逐社区。 " +"遵循社区委员会准则[1]中的上诉程序，可以对社区委员会的任何行动和决定提出上诉。" + +#. type: Plain text +#: ../code_of_conduct.txt:255 +#, no-wrap +msgid "" +"9. Scope of this document\n" +"============================================================\n" +msgstr "" +"9.本文件的范围\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:258 +msgid "This code of conduct covers all community participants:" +msgstr "该行为准则覆盖所有社区参与者：" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:260 +msgid "paid and unpaid contributors" +msgstr "有偿和无偿贡献者" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:262 +msgid "sponsors" +msgstr "赞助者" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:264 +msgid "other guests" +msgstr "其他贵宾" + +#. type: Plain text +#: ../code_of_conduct.txt:266 +msgid "when interacting:" +msgstr "何时互动：" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:268 +msgid "in all online and in-person community venues" +msgstr "在所有在线和面对面的社区场所" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:270 +msgid "in one-on-one communications that relate to community work" +msgstr "与社区工作有关的一对一交流" + +#. type: Plain text +#: ../code_of_conduct.txt:277 +msgid "" +"This code of conduct and its related procedures also applies to unacceptable" +" behavior occurring outside the scope of community activities when such " +"behavior has the potential to adversely affect the safety and well-being of " +"community members. As members of the Tor community, we support and follow " +"this Code while we are working on Tor, and take care not to undermine it in " +"the rest of our time." +msgstr "" +"当行为有可能对社区成员的安全和福祉产生不利影响时，本行为准则及其相关程序也适用于在社区活动范围之外发生的不可接受的行为。 " +"作为Tor社区的成员，我们在致力于Tor的过程中会支持并遵守本《准则》，并请注意不要在任何时间破坏它。" + +#. type: Plain text +#: ../code_of_conduct.txt:280 +#, no-wrap +msgid "" +"10. License and attribution\n" +"============================================================\n" +msgstr "" +"10. 许可证与归属权\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:284 +msgid "" +"This code of conduct is shared under a Creative Commons CC-BY-SA 4.0 " +"International license." +msgstr "这份行为准则在Creative Commons CC-BY-SA 4.0 国际准则下共享。" + +#. type: Plain text +#: ../code_of_conduct.txt:287 +msgid "" +"This code of conduct uses some language and framing from the Citizen Code of" +" Conduct, which is shared under a CC-BY-SA license: citizencodeofconduct.org" +msgstr "" +"该行为准则使用了《公民行为准则》中的某些语言和框架，该行为准则是根据CC-BY-SA许可共享的：citizencodeofconduct.org" + +#. type: Plain text +#: ../code_of_conduct.txt:289 +msgid "" +"[1] https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil [2] " +"https://gitweb.torproject.org/community/policies.git/tree/community_council…" +msgstr "" +"[1] https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil [2] " +"https://gitweb.torproject.org/community/policies.git/tree/community_council…"

1 0

[tpo/master] Remove unnecessary htaccess rule
by hiro＠torproject.org 01 Oct '19

01 Oct '19

commit 16d268ae0fcff3e34132e3091b64a16d5b9281d9 Author: hiro <hiro(a)torproject.org> Date: Tue Oct 1 19:42:12 2019 +0200 Remove unnecessary htaccess rule --- .htaccess | 3 --- 1 file changed, 3 deletions(-) diff --git a/.htaccess b/.htaccess index f9fe507..ba4d211 100644 --- a/.htaccess +++ b/.htaccess @@ -16,9 +16,6 @@ RewriteRule ^images/how_tor_works_thumb.png$ https://2019.www.torproject.org/ima RewriteRule ^about/findoc(.*) /static/findoc$1 [R=302,L] RewriteRule ^about/corepeople$ /about/people/ [R=302,L] -# dist (for mirrors) -RewriteRule ^dist/(.*) https://dist.torproject.org/$1 [R=302,L] - # moved to /docs/ RewriteRule ^docs/(.*) https://2019.www.torproject.org/docs/$1 [R=302,L] RewriteRule ^documentation.html$ https://2019.www.torproject.org/docs/documentation.html [R=302,L]

1 0

[tor-browser-spec/master] Bug 31911: Add information about monitoring disk space for cdn.tpo
by gk＠torproject.org 01 Oct '19

01 Oct '19

commit aff3780c19d235bc98ff6b765f0eeb5e52a98535 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Oct 1 17:49:19 2019 +0200 Bug 31911: Add information about monitoring disk space for cdn.tpo --- processes/ReleaseProcess | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index c183c9a..2b772e5 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -127,6 +127,14 @@ for i in *.asc; do echo $i ; gpg -q $i || break; done static-update-component dist.torproject.org +#. Check diskspace available on cdn.tpo +# We currently have enough disk space to host two alpha and stable +# releases. However with the size of each Tor Browser release increasing, +# it may become necessary to increase disk space. The server hosting +# the files for cdn.tpo is savii.tpo and its disk usage can be monitored +# by going to https://grafana.torproject.org/d/Z7T7Cfemz/node-exporter-full +# and selecting the host savii.torproject.org. + #. Upload the *.mar files to cdn.tpo #. Local to staticiforme: mkdir /srv/cdn-master.torproject.org/htdocs/aus1/torbrowser/$TORBROWSER_VERSION

1 0

[tpo/master] Redirect dist for mirrors
by hiro＠torproject.org 01 Oct '19

01 Oct '19

commit b60739ffc7094da9b55a500d32d4978ae0d8e777 Author: hiro <hiro(a)torproject.org> Date: Tue Oct 1 19:25:25 2019 +0200 Redirect dist for mirrors --- .htaccess | 4 +++- content/press/new-release-tor-browser/contents.lr | 2 +- templates/hero-download.html | 2 +- templates/macros/downloads.html | 8 ++++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.htaccess b/.htaccess index c476b56..f9fe507 100644 --- a/.htaccess +++ b/.htaccess @@ -16,6 +16,8 @@ RewriteRule ^images/how_tor_works_thumb.png$ https://2019.www.torproject.org/ima RewriteRule ^about/findoc(.*) /static/findoc$1 [R=302,L] RewriteRule ^about/corepeople$ /about/people/ [R=302,L] +# dist (for mirrors) +RewriteRule ^dist/(.*) https://dist.torproject.org/$1 [R=302,L] # moved to /docs/ RewriteRule ^docs/(.*) https://2019.www.torproject.org/docs/$1 [R=302,L] @@ -26,7 +28,7 @@ RewriteRule ^torbutton/design(.*) https://2019.www.torproject.org/docs/torbutton RewriteRule ^torbutton/(.*) https://2019.www.torproject.org/docs/torbutton/$1 [R=302,L] # Tor Browser -RewriteRule ^torbrowser/dist/(.*) https://2019.www.torproject.org//dist/torbrowser/$1 [R=302,L] +RewriteRule ^torbrowser/dist/(.*) https://2019.www.torproject.org/dist/torbrowser/$1 [R=302,L] RewriteRule ^torbrowser(.*) https://2019.www.torproject.org/projects/torbrowser.html.en [R=302,L] RewriteRule ^torbrowser$ https://2019.www.torproject.org/projects/torbrowser.html.en [R=302,L] diff --git a/content/press/new-release-tor-browser/contents.lr b/content/press/new-release-tor-browser/contents.lr index 1aebc49..feb1c03 100644 --- a/content/press/new-release-tor-browser/contents.lr +++ b/content/press/new-release-tor-browser/contents.lr @@ -12,6 +12,6 @@ link: https://blog.torproject.org/new-release-tor-browser-85a10 --- summary: -Tor Browser 8.5a10 is now available from the <a href="https://www.torproject.org/projects/torbrowser.html.en#downloads-alpha">Tor Browser Project page</a> and also from our <a href="https://www.torproject.org/dist/torbrowser/8.5a10/">distribution directory</a>. +Tor Browser 8.5a10 is now available from the <a href="https://www.torproject.org/projects/torbrowser.html.en#downloads-alpha">Tor Browser Project page</a> and also from our <a href="/dist/torbrowser/8.5a10/">distribution directory</a>. --- body: diff --git a/templates/hero-download.html b/templates/hero-download.html index 9cfb65a..a13fb08 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -10,7 +10,7 @@ <div class="oval-2 bg-darker mx-auto"> {% set alt_l = alt %} {% set t = bag('versions', 'torbrowser-stable') %} - {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + t.version + '/' %} + {% set download_prefix = '/dist/torbrowser/' + t.version + '/' %} {% if alt_l == 'en' %} {% set alt_l = 'en-US' %} {% elif alt_l == 'es' %} diff --git a/templates/macros/downloads.html b/templates/macros/downloads.html index 7581aca..1ca65ad 100644 --- a/templates/macros/downloads.html +++ b/templates/macros/downloads.html @@ -1,5 +1,5 @@ {% macro render_windows(version, alt) %} - {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + version + '/' %} + {% set download_prefix = '/dist/torbrowser/' + version + '/' %} {% if alt == 'en' %} {% set alt = 'en-US' %} {% elif alt == 'es' %} @@ -14,7 +14,7 @@ {% endmacro %} {% macro render_windows_expert(version, win32) %} - {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + version + '/' %} + {% set download_prefix = '/dist/torbrowser/' + version + '/' %} {% set download_link_32 = download_prefix + 'tor-win32-' + win32 + '.zip' %} {% set sig_link_32 = download_link_32 + '.asc' %} @@ -22,7 +22,7 @@ {% endmacro %} {% macro render_mac(version, alt) %} - {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + version + '/' %} + {% set download_prefix = '/dist/torbrowser/' + version + '/' %} {% if alt == 'en' %} {% set alt = 'en-US' %} {% elif alt == 'es' %} @@ -35,7 +35,7 @@ {% endmacro %} {% macro render_linux(version, alt) %} - {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + version + '/' %} + {% set download_prefix = '/dist/torbrowser/' + version + '/' %} {% if alt == 'en' %} {% set alt = 'en-US' %} {% elif alt == 'es' %}

1 0