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

[translation/tpo-web_completed] Update translations for tpo-web_completed
by translation＠torproject.org 25 Apr '19

25 Apr '19

commit 7bf7d1a73384db5411c1735f354fb30a8bd1caea Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 25 13:50:34 2019 +0000 Update translations for tpo-web_completed --- contents+zh-CN.po | 1020 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1020 insertions(+) diff --git a/contents+zh-CN.po b/contents+zh-CN.po new file mode 100644 index 000000000..eacc012c8 --- /dev/null +++ b/contents+zh-CN.po @@ -0,0 +1,1020 @@ +# Translators: +# Chi-Hsun Tsai, 2019 +# Xiaoyu Huang <007pig(a)gmail.com>, 2019 +# ducki2p <ducki2p(a)gmail.com>, 2019 +# erinm, 2019 +# Emma Peel, 2019 +# Zhui Shen <12231252(a)bjtu.edu.cn>, 2019 +# Yikai Yang <ff98sha(a)gmail.com>, 2019 +# ciaran <ciaranchen(a)qq.com>, 2019 +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-04-23 13:54+CET\n" +"PO-Revision-Date: 2019-03-09 10:41+0000\n" +"Last-Translator: ciaran <ciaranchen(a)qq.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" + +#: https//www.torproject.org/ (content/contents+en.lrpage.title) +msgid "Anonymity Online" +msgstr "匿名上网" + +#: https//www.torproject.org/ (content/contents+en.lrpage.section) +msgid "home" +msgstr "主页" + +#: https//www.torproject.org/ (content/contents+en.lrpage.body) +msgid "######ABOUT US######" +msgstr "######关于我们######" + +#: https//www.torproject.org/ (content/contents+en.lrpage.body) +msgid "" +"We believe everyone should be able to explore the internet with privacy." +msgstr "我们坚信每个人都应能私密地探索互联网。" + +#: https//www.torproject.org/ (content/contents+en.lrpage.body) +msgid "We are the Tor Project, a 501(c)3 US nonprofit." +msgstr "我们是 Tor Project，按照美国国内税收法501(c)3登记的非营利慈善机构。" + +#: https//www.torproject.org/ (content/contents+en.lrpage.body) +msgid "" +"We advance human rights and defend your privacy online through free software" +" and open networks. [Meet our team](about/people)." +msgstr "我们推进人权保护，用免费软件和开放的网络来捍卫你的在线隐私。[我们的团队](about/people)" + +#: https//www.torproject.org/contact/ +#: (content/contact/contents+en.lrpage.title) +msgid "Contact" +msgstr "联系方式" + +#: https//www.torproject.org/contact/ +#: (content/contact/contents+en.lrpage.section) +#: https//www.torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.section) +msgid "The Tor Project" +msgstr "The Tor Project" + +#: https//www.torproject.org/contact/ +#: (content/contact/contents+en.lrpage.body) +msgid "### Get Support" +msgstr "### 获得支持" + +#: https//www.torproject.org/contact/ +#: (content/contact/contents+en.lrpage.body) +msgid "" +"Need help? Visit our [Support Portal](https://support.torproject.org) for " +"answers to frequently asked questions about connecting to Tor, circumventing" +" censorship, using onion services, and more." +msgstr "" +"需要帮助？访问我们的[支持页面](https://support.torproject.org)来获得关于连接到Tor，规避审查，使用洋葱路由等常见问题的回答" + +#: https//www.torproject.org/download/ +#: (content/download/contents+en.lrpage.title) +#: (content/download/contents+en.lrpage.section) +#: https//www.torproject.org/download/alpha/ +#: (content/download/alpha/contents+en.lrpage.section) +#: https//www.torproject.org/download/languages/ +#: (content/download/languages/contents+en.lrpage.section) +#: https//www.torproject.org/download/tor/ +#: (content/download/tor/contents+en.lrpage.section) +msgid "Download" +msgstr "下载" + +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.title) +#: (content/menu/contents+en.lrpage.section) https//www.torproject.org/about/ +#: (content/about/contents+en.lrpage.section) +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.section) +#: https//www.torproject.org/about/people/ +#: (content/about/people/contents+en.lrpeople.section) +#: https//www.torproject.org/about/sponsors/ +#: (content/about/sponsors/contents+en.lrsponsors.section) +#: https//www.torproject.org/about/reports/ +#: (content/about/reports/contents+en.lrreports.section) +#: https//www.torproject.org/about/jobs/ +#: (content/about/jobs/contents+en.lrjobs.section) +msgid "About" +msgstr "关于" + +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Documentation" +msgstr "文档" + +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Press" +msgstr "新闻" + +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Support" +msgstr "支持" + +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Jobs" +msgstr "工作" + +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Blog" +msgstr "博客" + +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Donate" +msgstr "捐款" + +#: https//www.torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.title) +msgid "Success" +msgstr "成功" + +#: https//www.torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "You're equipped to browse freely." +msgstr "您可以自由浏览。" + +#: https//www.torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "Tor is the strongest tool for privacy and freedom online." +msgstr "Tor是最强的隐私和线上自由工具" + +#: https//www.torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "" +"It is free and open source software maintained by the Tor Project and a " +"community of volunteers worldwide." +msgstr "这是一个由Tor Project和世界性的志愿者社区维护的自由和开放软件" + +#: https//www.torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "" +"We need your help to keep Tor secure and safe for millions across the globe." +" [Donate Now](https://donate.torproject.org/)" +msgstr "我们需要你的帮助来以确保Tor对全球数百万用户的保密和安全。[现在捐助](https://donate.torproject.org/)" + +#: https//www.torproject.org/about/ (content/about/contents+en.lrpage.title) +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.title) +msgid "History" +msgstr "历史记录" + +#: https//www.torproject.org/download/alpha/ +#: (content/download/alpha/contents+en.lrpage.title) +msgid "Download Tor Browser Alpha" +msgstr "下载Tor Browser Alpha版" + +#: https//www.torproject.org/download/alpha/ +#: (content/download/alpha/contents+en.lrpage.body) +msgid "" +"Before we release a stable version of our software, we release an alpha " +"version to test features and find bugs." +msgstr "在我们发布我们软件的稳定版本前，我们会发布一个alpha版本来测试功能并寻找缺陷。" + +#: https//www.torproject.org/download/alpha/ +#: (content/download/alpha/contents+en.lrpage.body) +msgid "" +"Please only download an alpha if you are okay with some things not working " +"properly, want to help us find and [report " +"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToRepo…," +" and are not putting yourself at risk." +msgstr "" +"如果你能适应一些不能正常工作的东西，请只下载alpha版本，想帮助我们找到并报告[报告错误](https://trac.torproject.org/…" +" 而且不会让自己处于危险之中。" + +#: https//www.torproject.org/download/languages/ +#: (content/download/languages/contents+en.lrpage.title) +msgid "Download Tor Browser in your language" +msgstr "下载你的语言的Tor Browser" + +#: https//www.torproject.org/download/languages/ +#: (content/download/languages/contents+en.lrpage.body) +msgid "" +"We want everyone to be able to enjoy Tor Browser in their own language. Tor " +"Browser is now available in 25 different languages, and we are working to " +"add more. Want to help us translate? [See here](https://tb-" +"manual.torproject.org/becoming-tor-translator/)" +msgstr "" +"我们想让任何人都可以用他们的语言享受Tor Browser。Tor " +"Browser现在可以在25种不同的语言中使用，并且我们在努力添加更多。想要帮助我们翻译吗？[看这里](https://tb-" +"manual.torproject.org/becoming-tor-translator/)" + +#: https//www.torproject.org/download/tor/ +#: (content/download/tor/contents+en.lrpage.title) +msgid "Download Tor Source Code" +msgstr "下载Tor源代码" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"The Tor Project, Inc, became a 501(c)3 nonprofit in 2006, but the idea of " +"\"onion routing\" began in the mid 1990s." +msgstr "Tor Project, Inc在2006年成为501(c)3非营利组织，但“洋葱路由”的概念始于20世纪90年代中期。" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"**Just like Tor users, the developers, researchers, and funders who've made " +"Tor possible are a diverse group of people. But all of the people who have " +"been involved in Tor are united by a common belief: internet users should " +"have private access to an uncensored web.**" +msgstr "" +"**就像Tor用户一样，让Tor成为可能的开发人员，研究人员和资助者是一群多元化的人。 " +"但所有参与Tor的人都有一个共同的信念：互联网用户应该有私有权限访问未经审查的网站。**" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"In the 1990s, the lack of security on the internet and its ability to be " +"used for tracking and surveillance was becoming clear, and in 1995, David " +"Goldschlag, Mike Reed, and Paul Syverson at the U.S. Naval Research Lab " +"(NRL) asked themselves if there was a way to create internet connections " +"that don't reveal who is talking to whom, even to someone monitoring the " +"network." +msgstr "" +"在20世纪90年代，互联网缺乏安全性以及用于跟踪和监视的能力变得越来越明显，1995年，美国海军研究实验室（NRL）的David " +"Goldschlag，Mike Reed和Paul Syverson问自己是否有一种方法可以创建互联网连接，不会泄露谁与谁交谈，甚至是监控网络的人。" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Their answer was to create and deploy the first research designs and " +"prototypes of onion routing." +msgstr "他们的回答是为了创造和部署洋葱路由的首个研究的设计和原型。" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"The goal of onion routing was to have a way to use the internet with as much" +" privacy as possible, and the idea was to route traffic through multiple " +"servers and encrypt it each step of the way." +msgstr "洋葱路由的目标是为了有一种尽可能隐私的方式来使用互联网，其想法是通过多个服务器和在每一步进行加密来路由流量。" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "This is still a simple explanation for how Tor works today." +msgstr "这仍是一种对今天的Tor如何工作的简单解释。" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"In the early 2000s, Roger Dingledine, a recent [Massachusetts Institute of " +"Technology (MIT)](https://web.mit.edu/) graduate, began working on an NRL " +"onion routing project with Paul Syverson." +msgstr "" +"在00年代，Roger Dingledine，一个应届[麻省理工大学(MIT)](https://web.mit.edu/)毕业生，开始与Paul " +"Syverson在NRL的洋葱路由项目工作。" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"To distinguish this original work at NRL from other onion routing efforts " +"that were starting to pop up elsewhere, Roger called the project Tor, which " +"stood for The Onion Routing. Nick Mathewson, a classmate of Roger's at MIT, " +"joined the project soon after." +msgstr "" +"为了区分NRL的这个原始的工作和在其他地方出现的洋葱路由工作，Roger把这个项目叫做Tor，这表示The Onion Routing。Nick " +"Mathewson，Roger的一个MIT同学，在不久后加入了这个项目。" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"From its inception in the 1990s, onion routing was conceived to rely on a " +"decentralized network. The network needed to be operated by entities with " +"diverse interests and trust assumptions, and the software needed to be free " +"and open to maximize transparency and separation." +msgstr "" +"从20世纪90年代开始，洋葱路由被认为依赖于分布式网络。网络需要由具有不同利益和信任假设的实体运营，并且软件需要自由开放来最大化透明度和分离。" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"That's why in October 2002 when the Tor network was initially deployed, its " +"code was released under a free and open software license." +msgstr "这就是为什么2002年10月最初部署Tor网络时，其代码是在免费开放的软件许可下发布的。" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"By the end of 2003, the network had about a dozen volunteer nodes, mostly in" +" the U.S., plus one in Germany." +msgstr "截至2003年底，该网络有大约十二个志愿者节点，大多数在美国，还有一个在德国。" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Recognizing the benefit of Tor to digital rights, the [Electronic Frontier " +"Foundation (EFF)](https://www.eff.org/) began funding Roger's and Nick's " +"work on Tor in 2004. In 2006, the Tor Project, Inc., a 501(c)3 nonprofit " +"organization, was founded to maintain Tor's development." +msgstr "" +"认识到Tor对数字版权的好处，[电子前沿基金会（EFF）](https://www.eff.org/)于2004年开始资助Roger和Nick在Tor…" +" Project,Inc，一个501（c）3非营利组织被建立以维持Tor的发展。" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"In 2007, the organization began developing bridges to the Tor network to " +"address censorship, such as the need to get around government firewalls, in " +"order for its users to access the open web." +msgstr "2007年，该组织开始与Tor网络建立网桥，以解决审查问题，例如需要绕过政府防火墙，以便其用户访问开放网络。" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Tor began gaining popularity among activists and tech-savvy users interested" +" in privacy, but it was still difficult for less-technically savvy people to" +" use, so starting in 2005, development of tools beyond just the Tor proxy " +"began." +msgstr "" +"Tor开始在对隐私感兴趣的活动人员和精通技术的用户中越来越受欢迎，但对技术含量较低的人来说仍然很难使用，所以从2005年开始，除了Tor代理之外的工具开始开发。" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Development of Tor Browser began in " +"[2008](https://lists.torproject.org/pipermail/tor-" +"talk/2008-January/007837.html)." +msgstr "" +"Tor Browser的开发开始于[2008年](https://lists.torproject.org/pipermail/tor-" +"talk/2008-January/007837.html)。" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"With Tor Browser having made Tor more accessible to everyday internet users " +"and activists, Tor was an instrumental tool during the [Arab " +"Spring](https://www.theguardian.com/us-news/the-nsa-files) beginning in late" +" 2010. It not only protected people's identity online but also allowed them " +"to access critical resources, social media, and websites which were blocked." +msgstr "" +"随着Tor浏览器让日常互联网用户和社运认识更容易使用Tor，Tor在[阿拉伯之春](https://www.theguardian.com/us-" +"news/the-nsa-files)开始时成为了一种有效工具。它不仅保护了人们的在线身份，还允许他们访问被阻止的关键资源，社交媒体和网站。" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"The need for tools safeguarding against mass surveillance became a " +"mainstream concern thanks to the [Snowden revelations in " +"2013](https://www.theguardian.com/us-news/the-nsa-files)." +msgstr "" +"由于[2013年的斯诺登启示](https://www.theguardian.com/us-news/the-nsa-" +"files)，防止大规模监视的工具的需求成为主流关注点。" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Not only was Tor instrumental to Snowden's whistleblowing, but content of " +"the documents also upheld assurances that, at that time, [Tor could not be " +"cracked](https://www.wired.com/story/the-grand-tor/)." +msgstr "" +"Tor不仅对斯诺登的举报很有帮助，而且文件的内容也得到了保证，当时，[Tor无法被破解](https://www.wired.com/story" +"/the-grand-tor/)。" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"People's awareness of tracking, surveillance, and censorship may have " +"increased, but so has the prevalence of these hindrances to internet " +"freedom." +msgstr "人们对跟踪，监视和审查的意识可能已经增长，但这些对互联网自由的阻碍也很普遍。" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Today, the network has [thousands of relays](https://metrics.torproject.org)" +" run by volunteers and millions of users worldwide. And it is this diversity" +" that keeps Tor users safe." +msgstr "" +"今天，该网络拥有[数以千计的中继](https://metrics.torproject.org)，由志愿者和全球数百万用户运营。 " +"正是这种多样性保证了Tor用户的安全。" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"We, at the Tor Project, fight every day for everyone to have private access " +"to an uncensored internet, and Tor has become the world's strongest tool for" +" privacy and freedom online." +msgstr "我们，在Tor Project中，每天都在争取让每个人都能有私有权利访问未经审查的互联网，Tor已经成为世界上最强大的隐私和在线自由工具。" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"But Tor is more than just software. It is a labor of love produced by an " +"international community of people devoted to human rights. The Tor Project " +"is [deeply committed](https://blog.torproject.org/tor-social-contract) to " +"transparency and the safety of its users." +msgstr "" +"但Tor已经不仅是软件。这是一个致力于人权的国际化社区所产生的爱的劳动。Tor " +"Project[深度承诺](https://blog.torproject.org/tor-social-contract)用户的透明度和安全性。" + +#: https//www.torproject.org/about/people/ +#: (content/about/people/contents+en.lrpeople.title) +msgid "People" +msgstr "参与人员" + +#: https//www.torproject.org/about/people/ +#: (content/about/people/contents+en.lrpeople.body) +msgid "" +"We are an international team who believes everyone should have private " +"access to the uncensored web." +msgstr "我们是相信每个人都有私有权利访问未审查网络的国际化团队。" + +#: https//www.torproject.org/press/-new-release-tails/ +#: (content/press/new-release-tails/contents+en.lrpost.title) +msgid "New Release: Tails 3.12" +msgstr "最新发布：Tails 3.12" + +#: https//www.torproject.org/press/-new-release-tails/ +#: (content/press/new-release-tails/contents+en.lrpost.summary) +msgid "" +"This release fixes many security vulnerabilities. You should upgrade as soon" +" as possible." +msgstr "这个发布修复了很多安全缺陷。你应该尽快升级。" + +#: https//www.torproject.org/press/-new-release-tails/ +#: (content/press/new-release-tails/contents+en.lrpost.summary) +msgid "" +"The biggest news for 3.12 is that we completely changed the installation " +"methods for Tails." +msgstr "3.12最大的改变是我们完全改变了Tails的安装方式。" + +#: https//www.torproject.org/press/-new-release-tor/ +#: (content/press/new-release-tor/contents+en.lrpost.title) +msgid "New Release: Tor 0.4.0.1-alpha" +msgstr "最新发布：Tor 0.4.0.1-alpha" + +#: https//www.torproject.org/press/-new-release-tor/ +#: (content/press/new-release-tor/contents+en.lrpost.summary) +msgid "" +"There's a new alpha release available for download. If you build Tor from " +"source, you can download the source code for 0.4.0.1-alpha from the usual " +"place on the website." +msgstr "这是最新可下载的alpha发布。如果你从源代码构建Tor，你可以从网站的往常地方下载0.4.0.1-alpha的源代码。" + +#: https//www.torproject.org/press/-new-release-tor-browser/ +#: (content/press/new-release-tor-browser/contents+en.lrpost.title) +msgid "New Release: Tor Browser 8.5a10" +msgstr "最新发布：Tor Browser 8.5a10" + +#: https//www.torproject.org/press/-new-release-tor-browser/ +#: (content/press/new-release-tor-browser/contents+en.lrpost.summary) +msgid "" +"Tor Browser 8.5a10 is now available from the Tor Browser Project page and " +"also from our distribution directory." +msgstr "Tor Browser 8.5a10现在可从Tor Browser项目页面获得，也可从我们的发行版目录中获得。" + +#: templates/contact.html:8 +msgid "Chat with us on" +msgstr "与我们交流在" + +#: templates/contact.html:9 +msgid "Ask questions about using Tor." +msgstr "询问关于使用Tor的问题" + +#: templates/contact.html:10 +msgid "Discuss Tor-related coding and protocols. Ideas are welcome." +msgstr "讨论Tor相关的编码和协议。欢迎提出看法。" + +#: templates/contact.html:11 +msgid "" +"Discuss organization and community related topics: meetups, outreach, " +"translation, or website improvements." +msgstr "讨论组织和社区相关主题：聚会，推广，翻译或网站改进。" + +#: templates/contact.html:12 +msgid "Watch or join publicly logged team meetings." +msgstr "公开地观看或加入记录的团队会议。" + +#: templates/contact.html:13 +msgid "Discuss running a Tor relay." +msgstr "讨论运行一个Tor中继" + +#: templates/contact.html:14 +msgid "Talk with Tor's global south community." +msgstr "与Tor的全球南方社区交谈。" + +#: templates/contact.html:20 +msgid "Find us on Social Media" +msgstr "在社交媒体上找到我们" + +#: templates/contact.html:34 +msgid "Volunteer with Tor" +msgstr "Tor志愿者" + +#: templates/contact.html:38 +msgid "Get Involved" +msgstr "入门指南" + +#: templates/contact.html:44 +msgid "Join an email list" +msgstr "加入邮件列表" + +#: templates/contact.html:47 +msgid "" +"Our teams collaborate in open channels, including email lists, you are " +"welcome to join. If you have a question for a specific team not answered on " +"our support portal, you can ask the appropriate list. You're welcome to " +"subscribe and just watch, too :)" +msgstr "" +"我们的团队在开放渠道，包括电子邮件列表中进行协作，欢迎你的加入。如果你对我们的特定团队有疑问，且在我们的支持门户网站上未回答，您可以询问相应的列表。 " +"欢迎您订阅并观看:)" + +#: templates/contact.html:60 +msgid "Report a bug or give feedback." +msgstr "报告缺陷或提交反馈" + +#: templates/contact.html:61 +msgid "" +"Tor relies on the support of users and volunteers around the world to help " +"us improve our software and resources, so your feedback is extremely " +"valuable to us (and to all Tor users)." +msgstr "Tor依靠全球用户和志愿者的支持来帮助我们改进我们的软件和资源，因此您的反馈对我们（以及所有Tor用户）都非常有价值。" + +#: templates/contact.html:67 +msgid "Tell us about a bad relay." +msgstr "告知我们关于损坏的中继" + +#: templates/contact.html:68 +msgid "" +"If you find a relay that you think is malicious, misconfigured, or otherwise" +" broken, please check out our wiki page and blog post on how to report it." +msgstr "如果你发现了一个你认为是恶意的，配置错误的或者其他损坏的中继，请查看我们的维基页面和博客文章来了解如何报告它。" + +#: templates/contact.html:76 +msgid "Report a security issue." +msgstr "报告安全问题" + +#: templates/contact.html:77 +msgid "" +"If you've found a security issue in one of our projects or in our " +"infrastructure, please email tor-security(a)lists.torproject.org. If you want " +"to encrypt your mail, you can get the GPG public key for the list by " +"contacting tor-security-sendkey(a)lists.torproject.org or from pool.sks-" +"keyservers.net. Here is the fingerprint:" +msgstr "" +"如果您在我们的项目或基础架构中发现了安全问题，请发送电子邮件至tor-security(a)lists.torproject.org. " +"如果你需要加密你的邮件，你可以通过联系tor-security-sendkey(a)lists.torproject.xn--orgpool-b64k564l.sks-" +"keyservers.net获取列表的GPG公钥。这里是指纹：" + +#: templates/contact.html:97 +msgid "Email us" +msgstr "给我们发邮件" + +#: templates/contact.html:98 +msgid "" +"For questions and comments about Tor the non-profit organization: trademark " +"questions, affiliation and coordination, contract inquiries, etc, please " +"email frontdesk(a)rt.torproject.org. For donor-related questions, contact " +"giving(a)torproject.org" +msgstr "" +"对于有关Tor非营利组织的问题和意见：商标问题，从属和合作，合同咨询等，请发送电子邮件至frontdesk(a)rt.torproject.org. " +"对于捐助相关问题，请联系giving(a)torproject.org" + +#: templates/contact.html:104 +msgid "Send us Mail" +msgstr "给我们发邮件" + +#: templates/download-android.html:12 +msgid "Get Tor Browser for Android." +msgstr "获得安卓上的Tor Browser。" + +#: templates/download-android.html:15 templates/hero-download.html:5 +msgid "Protect yourself against tracking, surveillance, and censorship." +msgstr "在追踪，监视和审查中保护你自己。" + +#: templates/download-android.html:20 templates/download-android.html:22 +msgid "Download .apk" +msgstr "下载 .apk 文件" + +#: templates/download-android.html:26 +msgid "Go to Google Play" +msgstr "前往 Google Play" + +#: templates/download-android.html:30 +#, python-format +msgid "Go to F-droid %s" +msgstr "" + +#: templates/download-android.html:35 +msgid "Are you a iOS user? We encourage you to try Onion Browser." +msgstr "你是iOS用户吗？我们鼓励你尝试Onion Browser。" + +#: templates/download-languages.html:11 templates/download-options.html:11 +msgid "Language" +msgstr "语言" + +#: templates/download.html:5 +msgid "Get Connected" +msgstr "" + +#: templates/download.html:7 +msgid "Get connected" +msgstr "" + +#: templates/download.html:9 +msgid "" +"If you are in a country where Tor is blocked, you can configure Tor to " +"connect to a bridge during the setup process." +msgstr "如果你在一个Tor被屏蔽的国家里，你可以在安装过程中配置Tor来连接到网桥" + +#: templates/download.html:10 +msgid "Select \"Tor is censored in my country.\"" +msgstr "选择“我所在国家对 Tor 进行了封锁”" + +#: templates/download.html:13 +msgid "" +"If Tor is not censored, one of the most common reasons Tor won't connect is " +"an incorrect system clock. Please make sure it's set correctly." +msgstr "如果Tor没有被封锁，一个Tor没有连接最常见的原因是不正确的系统时钟。请保证它是正确的设置。" + +#: templates/download.html:14 +msgid "Support Portal" +msgstr "支持门户" + +#: templates/download.html:14 +msgid "Read other FAQ's at our Support Portal" +msgstr "在我们的支持门户读到其他的常见问题" + +#: templates/download.html:19 templates/download.html:21 +msgid "Stay safe" +msgstr "保持安全" + +#: templates/download.html:23 +msgid "Please do not torrent over Tor." +msgstr "请不要在Tor中使用torrent。" + +#: templates/download.html:24 +msgid "" +"Tor Browser will block browser plugins such as Flash, RealPlayer, Quicktime," +" and others: they can be manipulated into revealing your IP address." +msgstr "Tor Browser会屏蔽浏览器插件如Flash，RealPlayer，Quicktime和其他：他们可以被操纵来暴露你的IP地址。" + +#: templates/download.html:27 +msgid "" +"We do not recommend installing additional add-ons or plugins into Tor " +"Browser" +msgstr "我们不推荐在Tor Browser中安装额外的拓展和插件" + +#: templates/download.html:28 +msgid "" +"Plugins or addons may bypass Tor or compromise your privacy. Tor Browser " +"already comes with HTTPS Everywhere, NoScript, and other patches to protect " +"your privacy and security." +msgstr "" +"插件或拓展可能会绕过Tor或损害您的隐私。 Tor Browser已经附带HTTPS " +"Everywhere，NoScript和其他补丁来保护您的隐私和安全。" + +#: templates/download.html:40 +#, python-format +msgid "Check out the %s for more troubleshooting tips." +msgstr "查看%s来获得更多解决问题的提示" + +#: templates/download.html:49 +msgid "Verify Tor Browser signature" +msgstr "验证Tor Browser签名" + +#: templates/footer.html:9 templates/footer.html:13 +#: templates/hero-home.html:13 templates/navbar.html:58 +msgid "Download Tor Browser" +msgstr "下载Tor浏览器" + +#: templates/footer.html:10 +msgid "" +"Download Tor Browser to experience real private browsing without tracking, " +"surveillance, or censorship." +msgstr "下载 Tor Browser 浏览器，体验真正的私密浏览，不被追踪、监视或审查。" + +#: templates/footer.html:22 +msgid "Our mission:" +msgstr "我们的任务：" + +#: templates/footer.html:23 +msgid "" +"To advance human rights and freedoms by creating and deploying free and open" +" source anonymity and privacy technologies, supporting their unrestricted " +"availability and use, and furthering their scientific and popular " +"understanding." +msgstr "" +"通过开发和部署自由和开源的匿名和隐私技术，来支持人们不受限制地使用网络，以及提高他们对科学和普世价值的认知，并增进他们对科学和日常知识的理解。" + +#: templates/footer.html:48 +msgid "Subscribe to our Newsletter" +msgstr "订阅我们的新闻" + +#: templates/footer.html:49 +msgid "Get monthly updates and opportunities from the Tor Project:" +msgstr "获取 Tor Project 每月发布的更新和良机：" + +#: templates/footer.html:50 +msgid "Sign up" +msgstr "订阅" + +#: templates/footer.html:69 +#, python-format +msgid "" +"Trademark, copyright notices, and rules for use by third parties can be " +"found in our %(link_to_faq)s" +msgstr "商标保护、版权保护以及第三方使用规则可以在 %(link_to_faq)s 找到" + +#: templates/hero-download.html:2 +msgid "Defend yourself." +msgstr "保护你自己" + +#: templates/hero-download.html:42 +msgid "Download in another language or platform" +msgstr "下载其他语言或平台" + +#: templates/hero-download.html:43 +msgid "Advanced Install Options" +msgstr "高级安装选项" + +#: templates/hero-download.html:47 +msgid "Read the latest release announcements" +msgstr "阅读最新版本公告。" + +#: templates/hero-home.html:2 +msgid "Browse Privately." +msgstr "私密浏览" + +#: templates/hero-home.html:5 +msgid "Explore Freely." +msgstr "自由探索" + +#: templates/hero-home.html:8 templates/meta.html:5 templates/meta.html:12 +msgid "" +"Defend yourself against tracking and surveillance. Circumvent censorship." +msgstr "防止你被追踪和监视。避开网络审查。" + +#: templates/home.html:7 +msgid "Block Trackers" +msgstr "屏蔽追踪者" + +#: templates/home.html:11 +msgid "BLOCK TRACKERS" +msgstr "屏蔽追踪者" + +#: templates/home.html:12 +msgid "" +"Tor Browser isolates each website you visit so third-party trackers and ads " +"can't follow you. Any cookies automatically clear when you're done browsing." +" So will your browsing history." +msgstr "" +"Tor Browser隔离了你访问的每个网站，因此第三方跟踪器和广告无法关注你。浏览完成后，任何cookie都会自动清除。你的浏览历史也将如此。" + +#: templates/home.html:24 +msgid "Defend Against Surveillance" +msgstr "防御监视" + +#: templates/home.html:28 +msgid "DEFEND AGAINST SURVEILLANCE" +msgstr "防御监视" + +#: templates/home.html:29 +msgid "" +"Tor Browser prevents someone watching your connection from knowing what " +"websites you visit. All anyone monitoring your browsing habits can see is " +"that you're using Tor." +msgstr "Tor Browser可以阻止他人通过观看您的连接来了解您访问的网站。监控您的浏览习惯的所有人都可以看到您正在使用Tor。" + +#: templates/home.html:41 +msgid "Resist Fingerpriting" +msgstr "抵抗指纹" + +#: templates/home.html:45 +msgid "RESIST FINGERPRINTING" +msgstr "抵抗指纹" + +#: templates/home.html:46 +msgid "" +"Tor Browser aims to make all users look the same making it difficult for you" +" to be fingerprinted based on your browser and device information." +msgstr "Tor Browser的目的是让所有用户看起来都一样，使得很难根据您的浏览器和设备信息进行指纹识别。" + +#: templates/home.html:58 +msgid "Multi-layered Encryption" +msgstr "多层加密" + +#: templates/home.html:62 +msgid "MULTI-LAYERED ENCRYPTION" +msgstr "多层加密" + +#: templates/home.html:63 +msgid "" +"Your traffic is relayed and encrypted three times as it passes over the Tor " +"network. The network is comprised of thousands of volunteer-run servers " +"known as Tor relays." +msgstr "当您的流量通过Tor网络时，您的流量会被中继和加密三次。该网络由数千个志愿者运行的服务器组成，称为Tor中继。" + +#: templates/home.html:75 +msgid "Browse Freely" +msgstr "自由浏览" + +#: templates/home.html:79 +msgid "BROWSE FREELY" +msgstr "自由浏览" + +#: templates/home.html:80 +msgid "" +"With Tor Browser, you are free to access sites your home network may have " +"blocked." +msgstr "使用Tor Browser，你可以自由地访问你原有网络可能已经屏蔽的网站。" + +#: templates/jobs.html:2 +msgid "Current Openings" +msgstr "近期开放" + +#: templates/jobs.html:13 +msgid "" +"At the moment, we don't have any official open positions. Please check back " +"soon, though!" +msgstr "目前，我们没有任何正式的空缺职位。不过请不久回来看看！" + +#: templates/jobs.html:18 templates/projects.html:5 +msgid "Previous Openings" +msgstr "过去开放" + +#: templates/jobs.html:32 templates/projects.html:33 +msgid "" +"Think you could help us in a position that's not listed? We also rely on a " +"vast community of volunteer contributors and many have become paid staff." +msgstr "认为你可以在未列出的位置帮助我们？我们还依赖庞大的志愿贡献者社区，许多人已成为有偿工作人员。" + +#: templates/jobs.html:32 templates/projects.html:33 +msgid "We invite you to join us on IRC to find how you can get involved." +msgstr "我们邀请你在IRC中加入我们来看看你能如何获得帮助。" + +#: templates/meta.html:11 +msgid "The Tor Project | Privacy & Freedom Online" +msgstr "Tor Project | 隐私和线上自由" + +#: templates/meta.html:16 +msgid "Tor Project" +msgstr "Tor Project" + +#: templates/navbar.html:14 +msgid "Menu" +msgstr "菜单" + +#: templates/people.html:2 +msgid "Board of Directors" +msgstr "董事会" + +#: templates/people.html:3 templates/people.html:15 +msgid "Core Tor" +msgstr "Tor核心" + +#: templates/people.html:28 +msgid "Join Our Team" +msgstr "加入我们的团队" + +#: templates/people.html:29 +msgid "" +"Even if we aren't hiring, you can contribute to Tor. We are open to ideas " +"and studies to improve Tor software. If you're a developer, we welcome you " +"to sign up for our dev mailing list to see what we're up to." +msgstr "" +"即使我们没有招聘，你也可以为Tor做出贡献。我们对改进Tor软件的想法和研究持开放态度。 " +"如果您是开发人员，我们欢迎您注册我们的开发邮件列表，了解我们的最新动态。" + +#: templates/people.html:31 +msgid "Sign up for tor-dev" +msgstr "注册tor-dev" + +#: templates/press.html:7 +msgid "Get support" +msgstr "获取客户支持" + +#: templates/press.html:9 +msgid "Visit our Support Portal" +msgstr "访问我们的支持门户" + +#: templates/press.html:12 +msgid "Ask us on #tor" +msgstr "在#tor询问我们" + +#: templates/press.html:15 +msgid "Write to a mailing list" +msgstr "写给一个邮件列表" + +#: templates/press.html:22 +msgid "Brand Assets" +msgstr "品牌资产" + +#: templates/press.html:27 +msgid "The Tor Browser" +msgstr "Tor 浏览器" + +#: templates/press.html:30 +msgid "Onion Services" +msgstr "洋葱服务" + +#: templates/press.html:40 +msgid "Press Releases" +msgstr "新闻报道" + +#: templates/press.html:54 +msgid "Coverage" +msgstr "封面" + +#: templates/press.html:61 +msgid "Date" +msgstr "日期" + +#: templates/press.html:62 +msgid "Publication" +msgstr "出版物" + +#: templates/press.html:63 +msgid "Topic" +msgstr "文章" + +#: templates/reports.html:2 +msgid "Founding Documents" +msgstr "资金文档" + +#: templates/reports.html:16 +msgid "Reports" +msgstr "报告" + +#: templates/reports.html:22 +msgid "Year" +msgstr "年报" + +#: templates/reports.html:23 +msgid "Type" +msgstr "类型" + +#: templates/reports.html:24 +msgid "Title" +msgstr "标题" + +#: templates/search.html:5 +msgid "Search" +msgstr "搜索" + +#: templates/sidenav.html:4 templates/sidenav.html:35 +msgid "Topics" +msgstr "主题" + +#: templates/sponsors.html:2 +msgid "" +"Thank you to all the people and groups who have made Tor possible so far, " +"and thank you especially to the individual volunteers who have made non-" +"financial contributions: coding, testing, documenting, translating, " +"educating, researching, and running the relays that make up the Tor network." +msgstr "" +"感谢迄今为止使Tor成为可能的所有人和团体，特别感谢那些做出非财务贡献的志愿者：编码，测试，记录，翻译，教育，研究和运行构建Tor网络的中继。" + +#: templates/sponsors.html:5 +msgid "Active Sponsors" +msgstr "活跃的赞助者" + +#: templates/sponsors.html:17 +msgid "Past Sponsors" +msgstr "以往的赞助者" + +#: templates/sponsors.html:35 +msgid "" +"This sponsors page is based upon un-audited and un-reviewed financial and " +"in-kind donations, contract, and other data." +msgstr "该赞助商页面基于未经审核和未经复核的财务和实物捐赠，合同和其他数据。" + +#: templates/sponsors.html:36 +msgid "" +"Further details about our audited and reviewed funding can be found with our" +" Financial Reports." +msgstr "关于我们经审计和复核资金的更多详细信息，请参阅我们的财务报告。" + +#: templates/thank-you.html:6 +msgid "Want to join our community? Getting involved with Tor is easy." +msgstr "想要加入我们的社区吗？融入Tor非常简单" + +#: templates/thank-you.html:13 +msgid "" +"Sign up for Tor News and get updates and opportunities from across the " +"organization and community." +msgstr "注册Tor新闻，获得来自整个组织和社区的更新和机遇。" + +#: templates/thank-you.html:17 +msgid "Run a relay to make the network faster and more decentralized." +msgstr "运行一个中继来使网络更快和更去中心化" + +#: templates/thank-you.html:21 +msgid "Use your skills to volunteer." +msgstr "成为志愿者使用你的技能" + +#: templates/macros/downloads.html:47 +msgid "tor browser manual" +msgstr "Tor Browser 用户手册" + +#: templates/macros/jobs.html:11 +msgid "Read more." +msgstr "了解更多。" + +#: templates/macros/reports.html:5 templates/macros/reports.html:19 +msgid "View PDF" +msgstr "查看 PDF 版本。"

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 25 Apr '19

25 Apr '19

commit 201f468626121a093bc8d4364933b708a6745335 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 25 13:50:29 2019 +0000 Update translations for tpo-web --- contents+zh-CN.po | 51 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index e275efa67..eacc012c8 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -361,6 +361,8 @@ msgid "" "mainstream concern thanks to the [Snowden revelations in " "2013](https://www.theguardian.com/us-news/the-nsa-files)." msgstr "" +"由于[2013年的斯诺登启示](https://www.theguardian.com/us-news/the-nsa-" +"files)，防止大规模监视的工具的需求成为主流关注点。" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -369,6 +371,8 @@ msgid "" "the documents also upheld assurances that, at that time, [Tor could not be " "cracked](https://www.wired.com/story/the-grand-tor/)." msgstr "" +"Tor不仅对斯诺登的举报很有帮助，而且文件的内容也得到了保证，当时，[Tor无法被破解](https://www.wired.com/story" +"/the-grand-tor/)。" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -376,7 +380,7 @@ msgid "" "People's awareness of tracking, surveillance, and censorship may have " "increased, but so has the prevalence of these hindrances to internet " "freedom." -msgstr "" +msgstr "人们对跟踪，监视和审查的意识可能已经增长，但这些对互联网自由的阻碍也很普遍。" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -385,6 +389,8 @@ msgid "" " run by volunteers and millions of users worldwide. And it is this diversity" " that keeps Tor users safe." msgstr "" +"今天，该网络拥有[数以千计的中继](https://metrics.torproject.org)，由志愿者和全球数百万用户运营。 " +"正是这种多样性保证了Tor用户的安全。" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -392,7 +398,7 @@ msgid "" "We, at the Tor Project, fight every day for everyone to have private access " "to an uncensored internet, and Tor has become the world's strongest tool for" " privacy and freedom online." -msgstr "" +msgstr "我们，在Tor Project中，每天都在争取让每个人都能有私有权利访问未经审查的互联网，Tor已经成为世界上最强大的隐私和在线自由工具。" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -665,7 +671,7 @@ msgstr "" #: templates/download.html:40 #, python-format msgid "Check out the %s for more troubleshooting tips." -msgstr "" +msgstr "查看%s来获得更多解决问题的提示" #: templates/download.html:49 msgid "Verify Tor Browser signature" @@ -863,7 +869,7 @@ msgstr "Tor核心" #: templates/people.html:28 msgid "Join Our Team" -msgstr "" +msgstr "加入我们的团队" #: templates/people.html:29 msgid "" @@ -871,10 +877,12 @@ msgid "" "and studies to improve Tor software. If you're a developer, we welcome you " "to sign up for our dev mailing list to see what we're up to." msgstr "" +"即使我们没有招聘，你也可以为Tor做出贡献。我们对改进Tor软件的想法和研究持开放态度。 " +"如果您是开发人员，我们欢迎您注册我们的开发邮件列表，了解我们的最新动态。" #: templates/people.html:31 msgid "Sign up for tor-dev" -msgstr "" +msgstr "注册tor-dev" #: templates/press.html:7 msgid "Get support" @@ -882,19 +890,19 @@ msgstr "获取客户支持" #: templates/press.html:9 msgid "Visit our Support Portal" -msgstr "" +msgstr "访问我们的支持门户" #: templates/press.html:12 msgid "Ask us on #tor" -msgstr "" +msgstr "在#tor询问我们" #: templates/press.html:15 msgid "Write to a mailing list" -msgstr "" +msgstr "写给一个邮件列表" #: templates/press.html:22 msgid "Brand Assets" -msgstr "" +msgstr "品牌资产" #: templates/press.html:27 msgid "The Tor Browser" @@ -906,11 +914,11 @@ msgstr "洋葱服务" #: templates/press.html:40 msgid "Press Releases" -msgstr "" +msgstr "新闻报道" #: templates/press.html:54 msgid "Coverage" -msgstr "" +msgstr "封面" #: templates/press.html:61 msgid "Date" @@ -918,15 +926,15 @@ msgstr "日期" #: templates/press.html:62 msgid "Publication" -msgstr "" +msgstr "出版物" #: templates/press.html:63 msgid "Topic" -msgstr "" +msgstr "文章" #: templates/reports.html:2 msgid "Founding Documents" -msgstr "" +msgstr "资金文档" #: templates/reports.html:16 msgid "Reports" @@ -934,7 +942,7 @@ msgstr "报告" #: templates/reports.html:22 msgid "Year" -msgstr "" +msgstr "年报" #: templates/reports.html:23 msgid "Type" @@ -959,36 +967,37 @@ msgid "" "financial contributions: coding, testing, documenting, translating, " "educating, researching, and running the relays that make up the Tor network." msgstr "" +"感谢迄今为止使Tor成为可能的所有人和团体，特别感谢那些做出非财务贡献的志愿者：编码，测试，记录，翻译，教育，研究和运行构建Tor网络的中继。" #: templates/sponsors.html:5 msgid "Active Sponsors" -msgstr "" +msgstr "活跃的赞助者" #: templates/sponsors.html:17 msgid "Past Sponsors" -msgstr "" +msgstr "以往的赞助者" #: templates/sponsors.html:35 msgid "" "This sponsors page is based upon un-audited and un-reviewed financial and " "in-kind donations, contract, and other data." -msgstr "" +msgstr "该赞助商页面基于未经审核和未经复核的财务和实物捐赠，合同和其他数据。" #: templates/sponsors.html:36 msgid "" "Further details about our audited and reviewed funding can be found with our" " Financial Reports." -msgstr "" +msgstr "关于我们经审计和复核资金的更多详细信息，请参阅我们的财务报告。" #: templates/thank-you.html:6 msgid "Want to join our community? Getting involved with Tor is easy." -msgstr "" +msgstr "想要加入我们的社区吗？融入Tor非常简单" #: templates/thank-you.html:13 msgid "" "Sign up for Tor News and get updates and opportunities from across the " "organization and community." -msgstr "" +msgstr "注册Tor新闻，获得来自整个组织和社区的更新和机遇。" #: templates/thank-you.html:17 msgid "Run a relay to make the network faster and more decentralized."

1 0

[translation/tor_outreach_md] Update translations for tor_outreach_md
by translation＠torproject.org 25 Apr '19

25 Apr '19

commit 3d6b423b92cf7e0b1a7a70b6b0fb9ea01f6bfa62 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 25 13:50:19 2019 +0000 Update translations for tor_outreach_md --- tor-outreach2019-2020-zh_CN.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tor-outreach2019-2020-zh_CN.md b/tor-outreach2019-2020-zh_CN.md index 507a23dee..aa9d0c4ec 100644 --- a/tor-outreach2019-2020-zh_CN.md +++ b/tor-outreach2019-2020-zh_CN.md @@ -1,8 +1,8 @@ # Tor Outreach Material 2019-2020 -# 1. TOR FOR PRIVACY +# 1. 为了隐私的Tor -### Privacy is a human right +### 隐私是一项人权 Like many of us, Aleisha spends most of her time online--connecting with friends, posting on social media, and browsing the web. @@ -135,28 +135,28 @@ Tor relay operators cannot reveal the true identity of Tor users. Continual peer review of Tor's source code by academic and open source communities ensures that there are no backdoors in Tor, and our social contract promises that we will never backdoor Tor. -## 7. Join the Tor community +## 7. 加入Tor社区 -Tor is made possible by a diverse set of users, developers, relay operators, and advocates from around the world. +Tor由来自世界各地的各种用户，开发人员，中继操作者和倡导者组成。 -We need your help to make Tor more usable and secure for people everywhere. +我们需要你的帮助，使Tor对所有人来说都更加实用和安全。 -You can volunteer with Tor by writing code, running a relay, creating documentation, offering user support, or telling people in your community about Tor. +您可以通过编写代码，运行中继，创建文档，提供用户支持或告诉你的社区关于Tor来志愿帮助Tor。 -The Tor community is governed by a code of conduct, and we outline our set of promises to the community in our social contract. +Tor社区受行为准则的约束，我们在社会性契约中概述了我们对社区的承诺。 -Learn more about Tor by visiting our website, our wiki, finding us on IRC, joining one of our mailing lists, or signing up for Tor News at newsletter.torproject.org. +通过访问我们的网站，我们的维基，在IRC上找到我们，加入一个我们的邮件列表或在newsletter.torproject.org注册Tor新闻了解更多关于Tor。 -## 8. Download Tor +## 8. 下载Tor -Tor for Desktop +Tor 桌面版 torproject.org/download -TOR ON MOBILE -### Android -Tor Browser for Android is available from GooglePlay. +移动设备的Tor +### 安卓 +安卓的Tor Browser可以在GooglePlay中下载。 ### iOS -Onion Browser, developed by M. Tigas, is the only browser we recommend for iOS. +Onion Browser，由M. Tigas开发，是我们在iOS推荐的唯一浏览器。

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 25 Apr '19

25 Apr '19

commit 5bb3410db918ac14357de7d62aeb18f0ad0ac9af Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 25 13:20:45 2019 +0000 Update translations for tpo-web --- contents+fr.po | 49 +++++++++++++++++++------------------- contents+zh-CN.po | 71 +++++++++++++++++++++++++++++++++---------------------- 2 files changed, 67 insertions(+), 53 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 359854458..6dc04e295 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -6,9 +6,8 @@ # erinm, 2019 # Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 # Florentin Rochet <florentin.rochet(a)uclouvain.be>, 2019 -# AO <ao(a)localizationlab.org>, 2019 # Simon-Olivier Morneau <smorn026(a)uottawa.ca>, 2019 -# Thomas Prévost <thomasprevost85(a)gmail.com>, 2019 +# AO <ao(a)localizationlab.org>, 2019 # msgid "" msgstr "" @@ -16,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-23 13:54+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Thomas Prévost <thomasprevost85(a)gmail.com>, 2019\n" +"Last-Translator: AO <ao(a)localizationlab.org>, 2019\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,7 +25,7 @@ msgstr "" #: https//www.torproject.org/ (content/contents+en.lrpage.title) msgid "Anonymity Online" -msgstr "L'anonymat en ligne" +msgstr "L’anonymat en ligne" #: https//www.torproject.org/ (content/contents+en.lrpage.section) msgid "home" @@ -81,9 +80,9 @@ msgid "" "answers to frequently asked questions about connecting to Tor, circumventing" " censorship, using onion services, and more." msgstr "" -"Besoin d'aide ? Visitez notre [Portail " -"d'assistance](https://support.torproject.org) pour des foire aux questions " -"posées sur la connexion à Tor, le contournement de la censure, l'utilisation" +"Besoin d’aide ? Visitez notre [Portail " +"d’assistance](https://support.torproject.org) pour des foire aux questions " +"posées sur la connexion à Tor, le contournement de la censure, l’utilisation" " des services onion, et plus." #: https//www.torproject.org/download/ @@ -152,7 +151,7 @@ msgstr "Vous êtes équipé pour naviguer librement." #: (content/thank-you/contents+en.lrpage.body) msgid "Tor is the strongest tool for privacy and freedom online." msgstr "" -"Tor est l'outil le plus puissant pour la vie privée et la liberté online." +"Tor est l’outil le plus puissant pour la vie privée et la liberté online." #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) @@ -160,7 +159,7 @@ msgid "" "It is free and open source software maintained by the Tor Project and a " "community of volunteers worldwide." msgstr "" -"Il s'agit d'un logiciel gratuit et code source ouvert maintenu par le Projet" +"Il s’agit d’un logiciel gratuit et code source ouvert maintenu par le Projet" " Tor et une communauté de volontaires dans le monde entier." #: https//www.torproject.org/thank-you/ @@ -223,8 +222,8 @@ msgid "" msgstr "" "Nous voulons que chacun puisse profiter du navigateur Tor Browser dans sa " "propre langue. Le navigateur Tor Browser est actuellement disponible dans 25" -" langues différentes, et nous travaillons activement pour qu'il y en ait " -"d'avantage. Vous désirez nous aider à traduire ? Visitez [cette page](https" +" langues différentes, et nous travaillons activement pour qu’il y en ait " +"d’avantage. Vous désirez nous aider à traduire ? Visitez [cette page](https" "://tb-manual.torproject.org/becoming-tor-translator/)." #: https//www.torproject.org/download/tor/ @@ -239,7 +238,7 @@ msgid "" "\"onion routing\" began in the mid 1990s." msgstr "" "Le Projet Tor, Inc, est devenu un organisme sans but lucratif 501(c)3 en " -"2006, mais l'idée de \"routage en oignon\" est apparue au milieu des années " +"2006, mais l’idée de \"routage en oignon\" est apparue au milieu des années " "1990." #: https//www.torproject.org/about/history/ @@ -253,7 +252,7 @@ msgstr "" "**Tout comme les utilisateurs de Tor, les développeurs, chercheurs, et " "bailleurs de fonds qui ont rendu Tor possible forment un groupe de personnes" " riche de diversité. Cependant, toutes les personnes impliquées dans Tor " -"sont unies par une conviction commune : les utilisateurs d'Internet " +"sont unies par une conviction commune : les utilisateurs d’Internet " "devraient avoir un accès privé à un Web non censuré.**" #: https//www.torproject.org/about/history/ @@ -267,11 +266,11 @@ msgid "" "network." msgstr "" "Dans les années 1990, le manque de sécurité sur Internet et son potentiel " -"d'utilisation pour le pistage et la surveillance étaient en train de devenir" +"d’utilisation pour le pistage et la surveillance étaient en train de devenir" " évidents, et en 1995, David Goldschalg, Mike Reed et Paul Syverson au " "United States Naval Research Laboratory (NRL) se sont demandé si il existait" " une manière de créer des connections à Internet qui ne divulgueraient pas " -"qui parle avec qui, même à quelqu'un qui surveille le réseau." +"qui parle avec qui, même à quelqu’un qui surveille le réseau." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -289,16 +288,16 @@ msgid "" " privacy as possible, and the idea was to route traffic through multiple " "servers and encrypt it each step of the way." msgstr "" -"L'objectif du routage en oignon était d'obtenir une façon d'utiliser " +"L’objectif du routage en oignon était d’obtenir une façon d’utiliser " "Internet avec la meilleure protection des renseignements personnels " -"possible, et l'idée était d'acheminer le trafic en passant par plusieurs " +"possible, et l’idée était d’acheminer le trafic en passant par plusieurs " "serveurs et de le chiffrer à chaque étape du parcours." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) msgid "This is still a simple explanation for how Tor works today." msgstr "" -"Il s'agit aujourd'hui encore d'une explication simple du fonctionnement de " +"Il s’agit aujourd’hui encore d’une explication simple du fonctionnement de " "Tor." #: https//www.torproject.org/about/history/ @@ -335,9 +334,9 @@ msgid "" "and open to maximize transparency and separation." msgstr "" "Depuis sa création dans les années 1990, le routage oignon a été conçu pour " -"s'appuyer sur un réseau décentralisé. Ce réseau avait besoin d'être manipulé" +"s’appuyer sur un réseau décentralisé. Ce réseau avait besoin d’être manipulé" " par des entités aux intérêts divers et des affectations de confiance, et le" -" logiciel se devait d'être gratuit et ouvert pour maximiser sa transparence " +" logiciel se devait d’être gratuit et ouvert pour maximiser sa transparence " "et sa séparation." #: https//www.torproject.org/about/history/ @@ -346,7 +345,7 @@ msgid "" "That's why in October 2002 when the Tor network was initially deployed, its " "code was released under a free and open software license." msgstr "" -"C'est pour cela qu'en octobre 2002, lors du déploiement initial du réseau " +"C’est pour cela qu’en octobre 2002, lors du déploiement initial du réseau " "Tor, son code fut publié sous une licence logicielle libre et ouverte." #: https//www.torproject.org/about/history/ @@ -356,7 +355,7 @@ msgid "" " the U.S., plus one in Germany." msgstr "" "Vers la fin 2003, le réseau avait une douzaine de nœuds volontaires, " -"majoritairement aux États-Unis, en plus d'un en Allemagne." +"majoritairement aux États-Unis, en plus d’un en Allemagne." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -374,9 +373,9 @@ msgid "" "address censorship, such as the need to get around government firewalls, in " "order for its users to access the open web." msgstr "" -"En 2007, l'organisation débuta le développement de ponts vers le réseau Tor " +"En 2007, l’organisation débuta le développement de ponts vers le réseau Tor " "pour contourner la censure, comme par exemple les pare-feu gouvernementaux, " -"afin de permettre à tous ses utilisateurs d'accéder au Web libre." +"afin de permettre à tous ses utilisateurs d’accéder au Web libre." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -900,7 +899,7 @@ msgstr "Menu" #: templates/people.html:2 msgid "Board of Directors" -msgstr "Conseil d'administration" +msgstr "Conseil d’administration" #: templates/people.html:3 templates/people.html:15 msgid "Core Tor" diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 178691778..e275efa67 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -140,7 +140,7 @@ msgstr "您可以自由浏览。" #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) msgid "Tor is the strongest tool for privacy and freedom online." -msgstr "Tor是最强的线上隐私和自由工具" +msgstr "Tor是最强的隐私和线上自由工具" #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) @@ -165,14 +165,14 @@ msgstr "历史记录" #: https//www.torproject.org/download/alpha/ #: (content/download/alpha/contents+en.lrpage.title) msgid "Download Tor Browser Alpha" -msgstr "下载Tor浏览器内测版" +msgstr "下载Tor Browser Alpha版" #: https//www.torproject.org/download/alpha/ #: (content/download/alpha/contents+en.lrpage.body) msgid "" "Before we release a stable version of our software, we release an alpha " "version to test features and find bugs." -msgstr "在我们发布我们软件的稳定版本前，我们会发布一个内测版本来测试功能并寻找缺陷。" +msgstr "在我们发布我们软件的稳定版本前，我们会发布一个alpha版本来测试功能并寻找缺陷。" #: https//www.torproject.org/download/alpha/ #: (content/download/alpha/contents+en.lrpage.body) @@ -182,6 +182,8 @@ msgid "" "bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToRepo…," " and are not putting yourself at risk." msgstr "" +"如果你能适应一些不能正常工作的东西，请只下载alpha版本，想帮助我们找到并报告[报告错误](https://trac.torproject.org/…" +" 而且不会让自己处于危险之中。" #: https//www.torproject.org/download/languages/ #: (content/download/languages/contents+en.lrpage.title) @@ -210,7 +212,7 @@ msgstr "下载Tor源代码" msgid "" "The Tor Project, Inc, became a 501(c)3 nonprofit in 2006, but the idea of " "\"onion routing\" began in the mid 1990s." -msgstr "" +msgstr "Tor Project, Inc在2006年成为501(c)3非营利组织，但“洋葱路由”的概念始于20世纪90年代中期。" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -220,6 +222,8 @@ msgid "" "been involved in Tor are united by a common belief: internet users should " "have private access to an uncensored web.**" msgstr "" +"**就像Tor用户一样，让Tor成为可能的开发人员，研究人员和资助者是一群多元化的人。 " +"但所有参与Tor的人都有一个共同的信念：互联网用户应该有私有权限访问未经审查的网站。**" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -231,6 +235,8 @@ msgid "" "that don't reveal who is talking to whom, even to someone monitoring the " "network." msgstr "" +"在20世纪90年代，互联网缺乏安全性以及用于跟踪和监视的能力变得越来越明显，1995年，美国海军研究实验室（NRL）的David " +"Goldschlag，Mike Reed和Paul Syverson问自己是否有一种方法可以创建互联网连接，不会泄露谁与谁交谈，甚至是监控网络的人。" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -260,7 +266,7 @@ msgid "" "onion routing project with Paul Syverson." msgstr "" "在00年代，Roger Dingledine，一个应届[麻省理工大学(MIT)](https://web.mit.edu/)毕业生，开始与Paul " -"Syverson在NRL洋葱路由项目工作。" +"Syverson在NRL的洋葱路由项目工作。" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -305,6 +311,8 @@ msgid "" "work on Tor in 2004. In 2006, the Tor Project, Inc., a 501(c)3 nonprofit " "organization, was founded to maintain Tor's development." msgstr "" +"认识到Tor对数字版权的好处，[电子前沿基金会（EFF）](https://www.eff.org/)于2004年开始资助Roger和Nick在Tor…" +" Project,Inc，一个501（c）3非营利组织被建立以维持Tor的发展。" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -394,6 +402,8 @@ msgid "" "is [deeply committed](https://blog.torproject.org/tor-social-contract) to " "transparency and the safety of its users." msgstr "" +"但Tor已经不仅是软件。这是一个致力于人权的国际化社区所产生的爱的劳动。Tor " +"Project[深度承诺](https://blog.torproject.org/tor-social-contract)用户的透明度和安全性。" #: https//www.torproject.org/about/people/ #: (content/about/people/contents+en.lrpeople.title) @@ -405,31 +415,31 @@ msgstr "参与人员" msgid "" "We are an international team who believes everyone should have private " "access to the uncensored web." -msgstr "" +msgstr "我们是相信每个人都有私有权利访问未审查网络的国际化团队。" #: https//www.torproject.org/press/-new-release-tails/ #: (content/press/new-release-tails/contents+en.lrpost.title) msgid "New Release: Tails 3.12" -msgstr "" +msgstr "最新发布：Tails 3.12" #: https//www.torproject.org/press/-new-release-tails/ #: (content/press/new-release-tails/contents+en.lrpost.summary) msgid "" "This release fixes many security vulnerabilities. You should upgrade as soon" " as possible." -msgstr "" +msgstr "这个发布修复了很多安全缺陷。你应该尽快升级。" #: https//www.torproject.org/press/-new-release-tails/ #: (content/press/new-release-tails/contents+en.lrpost.summary) msgid "" "The biggest news for 3.12 is that we completely changed the installation " "methods for Tails." -msgstr "" +msgstr "3.12最大的改变是我们完全改变了Tails的安装方式。" #: https//www.torproject.org/press/-new-release-tor/ #: (content/press/new-release-tor/contents+en.lrpost.title) msgid "New Release: Tor 0.4.0.1-alpha" -msgstr "" +msgstr "最新发布：Tor 0.4.0.1-alpha" #: https//www.torproject.org/press/-new-release-tor/ #: (content/press/new-release-tor/contents+en.lrpost.summary) @@ -437,19 +447,19 @@ msgid "" "There's a new alpha release available for download. If you build Tor from " "source, you can download the source code for 0.4.0.1-alpha from the usual " "place on the website." -msgstr "" +msgstr "这是最新可下载的alpha发布。如果你从源代码构建Tor，你可以从网站的往常地方下载0.4.0.1-alpha的源代码。" #: https//www.torproject.org/press/-new-release-tor-browser/ #: (content/press/new-release-tor-browser/contents+en.lrpost.title) msgid "New Release: Tor Browser 8.5a10" -msgstr "" +msgstr "最新发布：Tor Browser 8.5a10" #: https//www.torproject.org/press/-new-release-tor-browser/ #: (content/press/new-release-tor-browser/contents+en.lrpost.summary) msgid "" "Tor Browser 8.5a10 is now available from the Tor Browser Project page and " "also from our distribution directory." -msgstr "" +msgstr "Tor Browser 8.5a10现在可从Tor Browser项目页面获得，也可从我们的发行版目录中获得。" #: templates/contact.html:8 msgid "Chat with us on" @@ -555,6 +565,8 @@ msgid "" "email frontdesk(a)rt.torproject.org. For donor-related questions, contact " "giving(a)torproject.org" msgstr "" +"对于有关Tor非营利组织的问题和意见：商标问题，从属和合作，合同咨询等，请发送电子邮件至frontdesk(a)rt.torproject.org. " +"对于捐助相关问题，请联系giving(a)torproject.org" #: templates/contact.html:104 msgid "Send us Mail" @@ -647,6 +659,8 @@ msgid "" "already comes with HTTPS Everywhere, NoScript, and other patches to protect " "your privacy and security." msgstr "" +"插件或拓展可能会绕过Tor或损害您的隐私。 Tor Browser已经附带HTTPS " +"Everywhere，NoScript和其他补丁来保护您的隐私和安全。" #: templates/download.html:40 #, python-format @@ -706,7 +720,7 @@ msgstr "保护你自己" #: templates/hero-download.html:42 msgid "Download in another language or platform" -msgstr "" +msgstr "下载其他语言或平台" #: templates/hero-download.html:43 msgid "Advanced Install Options" @@ -743,6 +757,7 @@ msgid "" "can't follow you. Any cookies automatically clear when you're done browsing." " So will your browsing history." msgstr "" +"Tor Browser隔离了你访问的每个网站，因此第三方跟踪器和广告无法关注你。浏览完成后，任何cookie都会自动清除。你的浏览历史也将如此。" #: templates/home.html:24 msgid "Defend Against Surveillance" @@ -757,36 +772,36 @@ msgid "" "Tor Browser prevents someone watching your connection from knowing what " "websites you visit. All anyone monitoring your browsing habits can see is " "that you're using Tor." -msgstr "" +msgstr "Tor Browser可以阻止他人通过观看您的连接来了解您访问的网站。监控您的浏览习惯的所有人都可以看到您正在使用Tor。" #: templates/home.html:41 msgid "Resist Fingerpriting" -msgstr "" +msgstr "抵抗指纹" #: templates/home.html:45 msgid "RESIST FINGERPRINTING" -msgstr "" +msgstr "抵抗指纹" #: templates/home.html:46 msgid "" "Tor Browser aims to make all users look the same making it difficult for you" " to be fingerprinted based on your browser and device information." -msgstr "" +msgstr "Tor Browser的目的是让所有用户看起来都一样，使得很难根据您的浏览器和设备信息进行指纹识别。" #: templates/home.html:58 msgid "Multi-layered Encryption" -msgstr "" +msgstr "多层加密" #: templates/home.html:62 msgid "MULTI-LAYERED ENCRYPTION" -msgstr "" +msgstr "多层加密" #: templates/home.html:63 msgid "" "Your traffic is relayed and encrypted three times as it passes over the Tor " "network. The network is comprised of thousands of volunteer-run servers " "known as Tor relays." -msgstr "" +msgstr "当您的流量通过Tor网络时，您的流量会被中继和加密三次。该网络由数千个志愿者运行的服务器组成，称为Tor中继。" #: templates/home.html:75 msgid "Browse Freely" @@ -810,25 +825,25 @@ msgstr "近期开放" msgid "" "At the moment, we don't have any official open positions. Please check back " "soon, though!" -msgstr "" +msgstr "目前，我们没有任何正式的空缺职位。不过请不久回来看看！" #: templates/jobs.html:18 templates/projects.html:5 msgid "Previous Openings" -msgstr "" +msgstr "过去开放" #: templates/jobs.html:32 templates/projects.html:33 msgid "" "Think you could help us in a position that's not listed? We also rely on a " "vast community of volunteer contributors and many have become paid staff." -msgstr "" +msgstr "认为你可以在未列出的位置帮助我们？我们还依赖庞大的志愿贡献者社区，许多人已成为有偿工作人员。" #: templates/jobs.html:32 templates/projects.html:33 msgid "We invite you to join us on IRC to find how you can get involved." -msgstr "" +msgstr "我们邀请你在IRC中加入我们来看看你能如何获得帮助。" #: templates/meta.html:11 msgid "The Tor Project | Privacy & Freedom Online" -msgstr "" +msgstr "Tor Project | 隐私和线上自由" #: templates/meta.html:16 msgid "Tor Project" @@ -840,11 +855,11 @@ msgstr "菜单" #: templates/people.html:2 msgid "Board of Directors" -msgstr "" +msgstr "董事会" #: templates/people.html:3 templates/people.html:15 msgid "Core Tor" -msgstr "" +msgstr "Tor核心" #: templates/people.html:28 msgid "Join Our Team"

1 0

[tor/maint-0.4.0] 30001: Fix a race condition in test_dir_handle_get.c
by asn＠torproject.org 25 Apr '19

25 Apr '19

commit 367dd9cf0226c087d49225a20415e9a199d2d71f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 3 10:16:18 2019 -0400 30001: Fix a race condition in test_dir_handle_get.c Previously we used time(NULL) to set the Expires: header in our HTTP responses. This made the actual contents of that header untestable, since the unit tests have no good way to override time(), or to see what time() was at the exact moment of the call to time() in dircache.c. This gave us a race in dir_handle_get/status_vote_next_bandwidth, where the time() call in dircache.c got one value, and the call in the tests got another value. I'm applying our regular solution here: using approx_time() so that the value stays the same between the code and the test. Since approx_time() is updated on every event callback, we shouldn't be losing any accuracy here. Fixes bug 30001. Bug introduced in fb4a40c32c4a7e5; not in any released Tor. --- changes/bug30001 | 4 ++++ src/feature/dircache/dircache.c | 2 +- src/test/test_dir_handle_get.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug30001 b/changes/bug30001 new file mode 100644 index 000000000..e3304701e --- /dev/null +++ b/changes/bug30001 @@ -0,0 +1,4 @@ + o Minor features (testing): + - Use the approx_time() function when setting the "Expires" header + in directory replies, to make them more testable. Needed for + ticket 30001. diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c index caa085dd6..1123d034e 100644 --- a/src/feature/dircache/dircache.c +++ b/src/feature/dircache/dircache.c @@ -124,7 +124,7 @@ write_http_response_header_impl(dir_connection_t *conn, ssize_t length, long cache_lifetime) { char date[RFC1123_TIME_LEN+1]; - time_t now = time(NULL); + time_t now = approx_time(); buf_t *buf = buf_new_with_capacity(1024); tor_assert(conn); diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index c3a17e730..e57bd0258 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -2526,7 +2526,7 @@ test_dir_handle_get_status_vote_next_bandwidth(void* data) /* Check cache lifetime */ char expbuf[RFC1123_TIME_LEN+1]; - time_t now = time(NULL); + time_t now = approx_time(); /* BANDWIDTH_CACHE_LIFETIME is defined in dircache.c. */ format_rfc1123_time(expbuf, (time_t)(now + 30*60)); char *expires = NULL;

1 0

[tor/maint-0.4.0] Merge branch 'tor-github/pr/960' into maint-0.4.0
by asn＠torproject.org 25 Apr '19

25 Apr '19

commit a39789a02c2d89eaa8289a68a6b0fab0cc4d71dc Merge: 24b68b477 37d7daa3c Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Apr 25 15:46:45 2019 +0300 Merge branch 'tor-github/pr/960' into maint-0.4.0 changes/bug30001 | 7 +++++++ src/feature/dircache/dircache.c | 2 +- src/test/test_dir_handle_get.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/master] changes: update the changes file for 30001
by asn＠torproject.org 25 Apr '19

25 Apr '19

commit 37d7daa3cd22a7dce833e09392bcdbadf6e047f1 Author: teor <teor(a)torproject.org> Date: Wed Apr 17 12:34:33 2019 +1000 changes: update the changes file for 30001 --- changes/bug30001 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug30001 b/changes/bug30001 index e3304701e..52e58872e 100644 --- a/changes/bug30001 +++ b/changes/bug30001 @@ -2,3 +2,6 @@ - Use the approx_time() function when setting the "Expires" header in directory replies, to make them more testable. Needed for ticket 30001. + o Minor bug fixes (testing): + - Check the time in the "Expires" header with approx_time(). + Fixes bug 30001; bugfix on 0.4.0.4-rc.

1 0

[tor/master] 30001: Fix a race condition in test_dir_handle_get.c
by asn＠torproject.org 25 Apr '19

25 Apr '19

commit 367dd9cf0226c087d49225a20415e9a199d2d71f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 3 10:16:18 2019 -0400 30001: Fix a race condition in test_dir_handle_get.c Previously we used time(NULL) to set the Expires: header in our HTTP responses. This made the actual contents of that header untestable, since the unit tests have no good way to override time(), or to see what time() was at the exact moment of the call to time() in dircache.c. This gave us a race in dir_handle_get/status_vote_next_bandwidth, where the time() call in dircache.c got one value, and the call in the tests got another value. I'm applying our regular solution here: using approx_time() so that the value stays the same between the code and the test. Since approx_time() is updated on every event callback, we shouldn't be losing any accuracy here. Fixes bug 30001. Bug introduced in fb4a40c32c4a7e5; not in any released Tor. --- changes/bug30001 | 4 ++++ src/feature/dircache/dircache.c | 2 +- src/test/test_dir_handle_get.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug30001 b/changes/bug30001 new file mode 100644 index 000000000..e3304701e --- /dev/null +++ b/changes/bug30001 @@ -0,0 +1,4 @@ + o Minor features (testing): + - Use the approx_time() function when setting the "Expires" header + in directory replies, to make them more testable. Needed for + ticket 30001. diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c index caa085dd6..1123d034e 100644 --- a/src/feature/dircache/dircache.c +++ b/src/feature/dircache/dircache.c @@ -124,7 +124,7 @@ write_http_response_header_impl(dir_connection_t *conn, ssize_t length, long cache_lifetime) { char date[RFC1123_TIME_LEN+1]; - time_t now = time(NULL); + time_t now = approx_time(); buf_t *buf = buf_new_with_capacity(1024); tor_assert(conn); diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index c3a17e730..e57bd0258 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -2526,7 +2526,7 @@ test_dir_handle_get_status_vote_next_bandwidth(void* data) /* Check cache lifetime */ char expbuf[RFC1123_TIME_LEN+1]; - time_t now = time(NULL); + time_t now = approx_time(); /* BANDWIDTH_CACHE_LIFETIME is defined in dircache.c. */ format_rfc1123_time(expbuf, (time_t)(now + 30*60)); char *expires = NULL;

1 0

[tor/maint-0.4.0] changes: update the changes file for 30001
by asn＠torproject.org 25 Apr '19

25 Apr '19

commit 37d7daa3cd22a7dce833e09392bcdbadf6e047f1 Author: teor <teor(a)torproject.org> Date: Wed Apr 17 12:34:33 2019 +1000 changes: update the changes file for 30001 --- changes/bug30001 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug30001 b/changes/bug30001 index e3304701e..52e58872e 100644 --- a/changes/bug30001 +++ b/changes/bug30001 @@ -2,3 +2,6 @@ - Use the approx_time() function when setting the "Expires" header in directory replies, to make them more testable. Needed for ticket 30001. + o Minor bug fixes (testing): + - Check the time in the "Expires" header with approx_time(). + Fixes bug 30001; bugfix on 0.4.0.4-rc.

1 0

[tor/master] Merge branch 'tor-github/pr/960' into maint-0.4.0
by asn＠torproject.org 25 Apr '19

25 Apr '19

commit a39789a02c2d89eaa8289a68a6b0fab0cc4d71dc Merge: 24b68b477 37d7daa3c Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Apr 25 15:46:45 2019 +0300 Merge branch 'tor-github/pr/960' into maint-0.4.0 changes/bug30001 | 7 +++++++ src/feature/dircache/dircache.c | 2 +- src/test/test_dir_handle_get.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0