tor-commits

tor-commits@lists.torproject.org

March 2019

20 participants
3266 discussions

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

07 Mar '19

commit e204d4d556860a698522a74a1bd7d37b82632f03 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 8 02:51:02 2019 +0000 Update translations for tpo-web --- contents+ar.po | 206 +++++++++++++++++++++----------------- contents+de.po | 203 +++++++++++++++++++++----------------- contents+es.po | 208 +++++++++++++++++++++------------------ contents+fa.po | 205 +++++++++++++++++++++----------------- contents+fr.po | 205 +++++++++++++++++++++----------------- contents+ko.po | 204 +++++++++++++++++++++----------------- contents+pt-BR.po | 206 +++++++++++++++++++++----------------- contents+ru.po | 205 +++++++++++++++++++++----------------- contents+tr.po | 207 ++++++++++++++++++++------------------ contents+zh-CN.po | 203 +++++++++++++++++++++----------------- contents+zh-TW.po | 202 ++++++++++++++++++++----------------- contents.pot | 290 +++++++++++++++++++++++++++++------------------------- 12 files changed, 1392 insertions(+), 1152 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 70fd31a66..27206c092 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -1,8 +1,6 @@ # Translators: # ButterflyOfFire ButterflyOfFire, 2019 # ducki2p <ducki2p(a)gmail.com>, 2019 -# Mohamed El-Feky <elfeky.m(a)gmail.com>, 2019 -# Amin Jobran, 2019 # erinm, 2019 # Emma Peel, 2019 # @@ -10,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-06 11:28+CET\n" +"POT-Creation-Date: 2019-03-07 19:57+CET\n" "PO-Revision-Date: 2019-01-10 12:38+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Arabic (https://www.transifex.com/otf/teams/94225/ar/)\n" @@ -48,14 +46,15 @@ msgid "" msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.title) -msgid "contact" -msgstr "تواصل معنا " +#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Contact" +msgstr "للتواصل" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.section) #: https//torproject.org/press/ (content/press/contents+en.lrpress.section) #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.section) -msgid "the tor project" +msgid "The Tor Project" msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.body) @@ -77,16 +76,19 @@ msgstr "" #: (content/download/languages/contents+en.lrpage.section) #: https//torproject.org/download/options/ #: (content/download/options/contents+en.lrpage.section) -msgid "download" -msgstr "تنزيل " +msgid "Download" +msgstr "تحميل" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.title) #: https//torproject.org/about/ (content/about/contents+en.lrpage.title) -msgid "history" -msgstr "" +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.title) +msgid "History" +msgstr "التأريخ" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.section) -#: https//torproject.org/about/ (content/about/contents+en.lrpage.section) +#: (content/menu/contents+en.lrpage.body) https//torproject.org/about/ +#: (content/about/contents+en.lrpage.section) #: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.section) #: https//torproject.org/about/people/ @@ -97,10 +99,6 @@ msgstr "" #: (content/about/reports/contents+en.lrreports.section) #: https//torproject.org/about/jobs/ #: (content/about/jobs/contents+en.lrjobs.section) -msgid "about" -msgstr "لمحه" - -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "About" msgstr "حول" @@ -120,23 +118,33 @@ msgstr "مدونة" msgid "Newsletter" msgstr "" -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) -msgid "Contact" -msgstr "للتواصل" - #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.title) -msgid "success" +msgid "Success" +msgstr "نجاح" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "You’re equipped to browse freely." +msgstr "" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "Tor is the strongest tool for privacy and freedom online." +msgstr "" + +#: https//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 "" #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) msgid "" -"You’re equipped to browse freely. Tor is the strongest tool for privacy and " -"freedom online. It is free and open source software maintained by the Tor " -"Project and a community of volunteers worldwide. We need your help to keep " -"Tor secure and safe for millions across the globe. [Donate " -"Now](https://donate.torproject.org/)" +"We need your help to keep Tor secure and safe for millions across the globe." +" [Donate Now](https://donate.torproject.org/)" msgstr "" #: https//torproject.org/about/ (content/about/contents+en.lrpage.body) @@ -191,11 +199,6 @@ msgid "" msgstr "" #: https//torproject.org/about/history/ -#: (content/about/history/contents+en.lrpage.title) -msgid "History" -msgstr "التأريخ" - -#: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) msgid "" "**Just like Tor users, the developers, researchers, and funders who’ve made " @@ -243,10 +246,21 @@ 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. That’s why in October 2002" -" when the Tor network was initially deployed, its code was released under a " -"free and open software license. By the end of 2003, the network had about a " -"dozen volunteer nodes, mostly in the U.S., plus one in Germany." +"and open to maximize transparency and separation." +msgstr "" + +#: https//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 "" + +#: https//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 "" #: https//torproject.org/about/history/ @@ -272,7 +286,13 @@ 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. Development of Tor Browser began in " +"began." +msgstr "" + +#: https//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 "" @@ -292,9 +312,14 @@ msgstr "" 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). 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 " +"2013](https://www.theguardian.com/us-news/the-nsa-files)." +msgstr "" + +#: https//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 "" @@ -303,9 +328,15 @@ msgstr "" msgid "" "People’s awareness of tracking, surveillance, and censorship may have " "increased, but so has the prevalence of these hindrances to internet " -"freedom. Today, the network has [thousands of " -"relays](http://metrics.torproject.org) run by volunteers and millions of " -"users worldwide. And it is this diversity that keeps Tor users safe." +"freedom." +msgstr "" + +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Today, the network has [thousands of relays](http://metrics.torproject.org) " +"run by volunteers and millions of users worldwide. And it is this diversity " +"that keeps Tor users safe." msgstr "" #: https//torproject.org/about/history/ @@ -1518,10 +1549,10 @@ msgstr "" #: (content/about/people/ssteele/contents+en.lrperson.description) msgid "" "A graduate of Widener University School of Law, Shari later served as a " -"teaching fellow at Georgetown University Law Center " -"<http://www.law.georgetown.edu/>, where she earned an LL.M. degree in " -"Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the Tor " -"Project Board of Directors since January 2019." +"teaching fellow at [Georgetown University Law " +"Center](https://www.law.georgetown.edu/), where she earned an LL.M. degree " +"in Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the " +"Tor Project Board of Directors since January 2019." msgstr "" #: https//torproject.org/about/people/hiro/ @@ -2047,11 +2078,6 @@ msgid "" msgstr "" #: https//torproject.org/about/sponsors/cymru/ -#: (content/about/sponsors/cymru/contents+en.lrsponsor.name) -msgid "Team Cymru" -msgstr "" - -#: https//torproject.org/about/sponsors/cymru/ #: (content/about/sponsors/cymru/contents+en.lrsponsor.description) msgid "" "Team Cymru has over a decade of experience and expertise at providing " @@ -2204,52 +2230,58 @@ 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. Select \"Tor is censored in my " -"country.\"" +"If you are in a country where Tor is blocked, you can configure Tor to " +"connect to a bridge during the setup process." msgstr "" -#: templates/download.html:12 +#: templates/download.html:10 +msgid "Select \"Tor is censored in my country.\"" +msgstr "" + +#: 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. Read other " -"FAQ’s at our <a href=\"https://support.torproject.org\">Support " -"Portal</a>." +"an incorrect system clock. Please make sure it’s set correctly." msgstr "" -#: templates/download.html:19 -msgid "Stay safe" +#: templates/download.html:14 +msgid "Read other FAQ’s at our Support Portal" msgstr "" #: templates/download.html:21 +msgid "Stay safe" +msgstr "" + +#: templates/download.html:23 msgid "Please do not torrent over Tor." msgstr "" -#: templates/download.html:22 +#: 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 "" -#: templates/download.html:25 +#: templates/download.html:27 +msgid "" +"We do not recommend installing additional add-ons or plugins into Tor " +"Browser" +msgstr "" + +#: templates/download.html:28 msgid "" -"We do not recommend installing additional add-ons or plugins into Tor" -" Browser, as these may bypass Tor or compromise your privacy. Tor Browser " +"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 "" -#: templates/download.html:37 +#: templates/download.html:40 #, python-format msgid "Check out the %s for more troubleshooting tips." msgstr "" -#: templates/download.html:45 -msgid "" -"Verify Tor Browser signature <a class=\"mx-auto\" " -"href=\"https://support.torproject.org/how-to-verify-signature\" " -"target=\"_blank\">here</a>." +#: templates/download.html:48 +msgid "Verify Tor Browser signature" msgstr "" #: templates/footer.html:9 templates/footer.html:13 @@ -2437,10 +2469,6 @@ msgstr "" msgid "Brand Assets" msgstr "" -#: templates/press.html:24 -msgid "The Tor Project" -msgstr "" - #: templates/press.html:27 msgid "The Tor Browser" msgstr "" @@ -2516,9 +2544,13 @@ 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. Further details about our " -"audited and reviewed funding can be found with our <a " -"href=\"/about/reports\" title=\"Reports\">Financial Reports.</a>" +"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 @@ -2526,29 +2558,17 @@ msgid "Want to join our community? Getting involved with Tor is easy." msgstr "" #: templates/thank-you.html:13 -msgid "Sign up" -msgstr "تسجيل" - -#: templates/thank-you.html:13 msgid "" -" for Tor News and get updates and opportunities from across the organization" -" and community." -msgstr "" - -#: templates/thank-you.html:17 -msgid "Run a relay" +"Sign up for Tor News and get updates and opportunities from across the " +"organization and community." msgstr "" #: templates/thank-you.html:17 -msgid " to make the network faster and more decentralized." -msgstr "" - -#: templates/thank-you.html:21 -msgid "Use your skills to" +msgid "Run a relay to make the network faster and more decentralized." msgstr "" #: templates/thank-you.html:21 -msgid " volunteer." +msgid "Use your skills to volunteer." msgstr "" #: templates/macros/downloads.html:47 diff --git a/contents+de.po b/contents+de.po index 49713a0d5..68c8a985a 100644 --- a/contents+de.po +++ b/contents+de.po @@ -2,7 +2,6 @@ # ducki2p <ducki2p(a)gmail.com>, 2019 # erinm, 2019 # Ikono Gangansi <ikonogangansi(a)gmail.com>, 2019 -# Oliver Parczyk, 2019 # Ettore Atalan <atalanttore(a)googlemail.com>, 2019 # Emma Peel, 2019 # @@ -10,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-06 11:28+CET\n" +"POT-Creation-Date: 2019-03-07 19:57+CET\n" "PO-Revision-Date: 2019-01-10 12:38+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: German (https://www.transifex.com/otf/teams/94225/de/)\n" @@ -48,14 +47,15 @@ msgid "" msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.title) -msgid "contact" +#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Contact" msgstr "Kontakt" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.section) #: https//torproject.org/press/ (content/press/contents+en.lrpress.section) #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.section) -msgid "the tor project" +msgid "The Tor Project" msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.body) @@ -77,16 +77,19 @@ msgstr "" #: (content/download/languages/contents+en.lrpage.section) #: https//torproject.org/download/options/ #: (content/download/options/contents+en.lrpage.section) -msgid "download" -msgstr "herunterladen" +msgid "Download" +msgstr "Herunterladen" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.title) #: https//torproject.org/about/ (content/about/contents+en.lrpage.title) -msgid "history" -msgstr "" +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.title) +msgid "History" +msgstr "Verlauf" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.section) -#: https//torproject.org/about/ (content/about/contents+en.lrpage.section) +#: (content/menu/contents+en.lrpage.body) https//torproject.org/about/ +#: (content/about/contents+en.lrpage.section) #: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.section) #: https//torproject.org/about/people/ @@ -97,10 +100,6 @@ msgstr "" #: (content/about/reports/contents+en.lrreports.section) #: https//torproject.org/about/jobs/ #: (content/about/jobs/contents+en.lrjobs.section) -msgid "about" -msgstr "über" - -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "About" msgstr "Infos" @@ -120,23 +119,33 @@ msgstr "Blog" msgid "Newsletter" msgstr "Newsletter" -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) -msgid "Contact" -msgstr "Kontakt" - #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.title) -msgid "success" +msgid "Success" +msgstr "Erfolgreich" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "You’re equipped to browse freely." +msgstr "" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "Tor is the strongest tool for privacy and freedom online." msgstr "" #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) msgid "" -"You’re equipped to browse freely. Tor is the strongest tool for privacy and " -"freedom online. It is free and open source software maintained by the Tor " -"Project and a community of volunteers worldwide. We need your help to keep " -"Tor secure and safe for millions across the globe. [Donate " -"Now](https://donate.torproject.org/)" +"It is free and open source software maintained by the Tor Project and a " +"community of volunteers worldwide." +msgstr "" + +#: https//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 "" #: https//torproject.org/about/ (content/about/contents+en.lrpage.body) @@ -191,11 +200,6 @@ msgid "" msgstr "" #: https//torproject.org/about/history/ -#: (content/about/history/contents+en.lrpage.title) -msgid "History" -msgstr "Verlauf" - -#: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) msgid "" "**Just like Tor users, the developers, researchers, and funders who’ve made " @@ -243,10 +247,21 @@ 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. That’s why in October 2002" -" when the Tor network was initially deployed, its code was released under a " -"free and open software license. By the end of 2003, the network had about a " -"dozen volunteer nodes, mostly in the U.S., plus one in Germany." +"and open to maximize transparency and separation." +msgstr "" + +#: https//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 "" + +#: https//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 "" #: https//torproject.org/about/history/ @@ -272,7 +287,13 @@ 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. Development of Tor Browser began in " +"began." +msgstr "" + +#: https//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 "" @@ -292,9 +313,14 @@ msgstr "" 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). 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 " +"2013](https://www.theguardian.com/us-news/the-nsa-files)." +msgstr "" + +#: https//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 "" @@ -303,9 +329,15 @@ msgstr "" msgid "" "People’s awareness of tracking, surveillance, and censorship may have " "increased, but so has the prevalence of these hindrances to internet " -"freedom. Today, the network has [thousands of " -"relays](http://metrics.torproject.org) run by volunteers and millions of " -"users worldwide. And it is this diversity that keeps Tor users safe." +"freedom." +msgstr "" + +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Today, the network has [thousands of relays](http://metrics.torproject.org) " +"run by volunteers and millions of users worldwide. And it is this diversity " +"that keeps Tor users safe." msgstr "" #: https//torproject.org/about/history/ @@ -1518,10 +1550,10 @@ msgstr "" #: (content/about/people/ssteele/contents+en.lrperson.description) msgid "" "A graduate of Widener University School of Law, Shari later served as a " -"teaching fellow at Georgetown University Law Center " -"<http://www.law.georgetown.edu/>, where she earned an LL.M. degree in " -"Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the Tor " -"Project Board of Directors since January 2019." +"teaching fellow at [Georgetown University Law " +"Center](https://www.law.georgetown.edu/), where she earned an LL.M. degree " +"in Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the " +"Tor Project Board of Directors since January 2019." msgstr "" #: https//torproject.org/about/people/hiro/ @@ -2047,11 +2079,6 @@ msgid "" msgstr "" #: https//torproject.org/about/sponsors/cymru/ -#: (content/about/sponsors/cymru/contents+en.lrsponsor.name) -msgid "Team Cymru" -msgstr "" - -#: https//torproject.org/about/sponsors/cymru/ #: (content/about/sponsors/cymru/contents+en.lrsponsor.description) msgid "" "Team Cymru has over a decade of experience and expertise at providing " @@ -2204,52 +2231,58 @@ 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. Select \"Tor is censored in my " -"country.\"" +"If you are in a country where Tor is blocked, you can configure Tor to " +"connect to a bridge during the setup process." +msgstr "" + +#: templates/download.html:10 +msgid "Select \"Tor is censored in my country.\"" msgstr "" -#: templates/download.html:12 +#: 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. Read other " -"FAQ’s at our <a href=\"https://support.torproject.org\">Support " -"Portal</a>." +"an incorrect system clock. Please make sure it’s set correctly." msgstr "" -#: templates/download.html:19 -msgid "Stay safe" +#: templates/download.html:14 +msgid "Read other FAQ’s at our Support Portal" msgstr "" #: templates/download.html:21 +msgid "Stay safe" +msgstr "" + +#: templates/download.html:23 msgid "Please do not torrent over Tor." msgstr "" -#: templates/download.html:22 +#: 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 "" -#: templates/download.html:25 +#: templates/download.html:27 +msgid "" +"We do not recommend installing additional add-ons or plugins into Tor " +"Browser" +msgstr "" + +#: templates/download.html:28 msgid "" -"We do not recommend installing additional add-ons or plugins into Tor" -" Browser, as these may bypass Tor or compromise your privacy. Tor Browser " +"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 "" -#: templates/download.html:37 +#: templates/download.html:40 #, python-format msgid "Check out the %s for more troubleshooting tips." msgstr "" -#: templates/download.html:45 -msgid "" -"Verify Tor Browser signature <a class=\"mx-auto\" " -"href=\"https://support.torproject.org/how-to-verify-signature\" " -"target=\"_blank\">here</a>." +#: templates/download.html:48 +msgid "Verify Tor Browser signature" msgstr "" #: templates/footer.html:9 templates/footer.html:13 @@ -2438,10 +2471,6 @@ msgstr "" msgid "Brand Assets" msgstr "" -#: templates/press.html:24 -msgid "The Tor Project" -msgstr "" - #: templates/press.html:27 msgid "The Tor Browser" msgstr "" @@ -2517,9 +2546,13 @@ 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. Further details about our " -"audited and reviewed funding can be found with our <a " -"href=\"/about/reports\" title=\"Reports\">Financial Reports.</a>" +"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 @@ -2527,29 +2560,17 @@ msgid "Want to join our community? Getting involved with Tor is easy." msgstr "" #: templates/thank-you.html:13 -msgid "Sign up" -msgstr "Registrieren" - -#: templates/thank-you.html:13 msgid "" -" for Tor News and get updates and opportunities from across the organization" -" and community." -msgstr "" - -#: templates/thank-you.html:17 -msgid "Run a relay" +"Sign up for Tor News and get updates and opportunities from across the " +"organization and community." msgstr "" #: templates/thank-you.html:17 -msgid " to make the network faster and more decentralized." -msgstr "" - -#: templates/thank-you.html:21 -msgid "Use your skills to" +msgid "Run a relay to make the network faster and more decentralized." msgstr "" #: templates/thank-you.html:21 -msgid " volunteer." +msgid "Use your skills to volunteer." msgstr "" #: templates/macros/downloads.html:47 diff --git a/contents+es.po b/contents+es.po index e09b3f61c..4dc2fe8e1 100644 --- a/contents+es.po +++ b/contents+es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-06 11:28+CET\n" +"POT-Creation-Date: 2019-03-07 19:57+CET\n" "PO-Revision-Date: 2019-01-10 12:38+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/94225/es/)\n" @@ -46,15 +46,16 @@ msgid "" msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.title) -msgid "contact" -msgstr "contacta" +#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Contact" +msgstr "Contacta" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.section) #: https//torproject.org/press/ (content/press/contents+en.lrpress.section) #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.section) -msgid "the tor project" -msgstr "el tor project" +msgid "The Tor Project" +msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.body) msgid "" @@ -77,16 +78,19 @@ msgstr "" #: (content/download/languages/contents+en.lrpage.section) #: https//torproject.org/download/options/ #: (content/download/options/contents+en.lrpage.section) -msgid "download" +msgid "Download" msgstr "Descargar" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.title) #: https//torproject.org/about/ (content/about/contents+en.lrpage.title) -msgid "history" -msgstr "historia" +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.title) +msgid "History" +msgstr "Historia" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.section) -#: https//torproject.org/about/ (content/about/contents+en.lrpage.section) +#: (content/menu/contents+en.lrpage.body) https//torproject.org/about/ +#: (content/about/contents+en.lrpage.section) #: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.section) #: https//torproject.org/about/people/ @@ -97,10 +101,6 @@ msgstr "historia" #: (content/about/reports/contents+en.lrreports.section) #: https//torproject.org/about/jobs/ #: (content/about/jobs/contents+en.lrjobs.section) -msgid "about" -msgstr "acerca de" - -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "About" msgstr "Acerca de" @@ -120,23 +120,33 @@ msgstr "Blog" msgid "Newsletter" msgstr "Gacetilla" -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) -msgid "Contact" -msgstr "Contacta" - #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.title) -msgid "success" +msgid "Success" +msgstr "Finalizado con éxito" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "You’re equipped to browse freely." +msgstr "" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "Tor is the strongest tool for privacy and freedom online." +msgstr "" + +#: https//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 "" #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) msgid "" -"You’re equipped to browse freely. Tor is the strongest tool for privacy and " -"freedom online. It is free and open source software maintained by the Tor " -"Project and a community of volunteers worldwide. We need your help to keep " -"Tor secure and safe for millions across the globe. [Donate " -"Now](https://donate.torproject.org/)" +"We need your help to keep Tor secure and safe for millions across the globe." +" [Donate Now](https://donate.torproject.org/)" msgstr "" #: https//torproject.org/about/ (content/about/contents+en.lrpage.body) @@ -191,11 +201,6 @@ msgid "" msgstr "" #: https//torproject.org/about/history/ -#: (content/about/history/contents+en.lrpage.title) -msgid "History" -msgstr "Historia" - -#: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) msgid "" "**Just like Tor users, the developers, researchers, and funders who’ve made " @@ -243,10 +248,21 @@ 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. That’s why in October 2002" -" when the Tor network was initially deployed, its code was released under a " -"free and open software license. By the end of 2003, the network had about a " -"dozen volunteer nodes, mostly in the U.S., plus one in Germany." +"and open to maximize transparency and separation." +msgstr "" + +#: https//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 "" + +#: https//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 "" #: https//torproject.org/about/history/ @@ -272,7 +288,13 @@ 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. Development of Tor Browser began in " +"began." +msgstr "" + +#: https//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 "" @@ -292,9 +314,14 @@ msgstr "" 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). 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 " +"2013](https://www.theguardian.com/us-news/the-nsa-files)." +msgstr "" + +#: https//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 "" @@ -303,9 +330,15 @@ msgstr "" msgid "" "People’s awareness of tracking, surveillance, and censorship may have " "increased, but so has the prevalence of these hindrances to internet " -"freedom. Today, the network has [thousands of " -"relays](http://metrics.torproject.org) run by volunteers and millions of " -"users worldwide. And it is this diversity that keeps Tor users safe." +"freedom." +msgstr "" + +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Today, the network has [thousands of relays](http://metrics.torproject.org) " +"run by volunteers and millions of users worldwide. And it is this diversity " +"that keeps Tor users safe." msgstr "" #: https//torproject.org/about/history/ @@ -1520,10 +1553,10 @@ msgstr "" #: (content/about/people/ssteele/contents+en.lrperson.description) msgid "" "A graduate of Widener University School of Law, Shari later served as a " -"teaching fellow at Georgetown University Law Center " -"<http://www.law.georgetown.edu/>, where she earned an LL.M. degree in " -"Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the Tor " -"Project Board of Directors since January 2019." +"teaching fellow at [Georgetown University Law " +"Center](https://www.law.georgetown.edu/), where she earned an LL.M. degree " +"in Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the " +"Tor Project Board of Directors since January 2019." msgstr "" #: https//torproject.org/about/people/hiro/ @@ -2051,11 +2084,6 @@ msgid "" msgstr "" #: https//torproject.org/about/sponsors/cymru/ -#: (content/about/sponsors/cymru/contents+en.lrsponsor.name) -msgid "Team Cymru" -msgstr "Team Cymru" - -#: https//torproject.org/about/sponsors/cymru/ #: (content/about/sponsors/cymru/contents+en.lrsponsor.description) msgid "" "Team Cymru has over a decade of experience and expertise at providing " @@ -2208,56 +2236,58 @@ 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. Select \"Tor is censored in my " -"country.\"" +"If you are in a country where Tor is blocked, you can configure Tor to " +"connect to a bridge during the setup process." +msgstr "" + +#: templates/download.html:10 +msgid "Select \"Tor is censored in my country.\"" msgstr "" -"If you are in a country where Tor is blocked, you can configure Tor to connect to a bridge during the " -"setup process. Select \"Tor is censored in my " -"country.\"" -#: templates/download.html:12 +#: 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. Read other " -"FAQ’s at our <a href=\"https://support.torproject.org\">Support " -"Portal</a>." +"an incorrect system clock. Please make sure it’s set correctly." msgstr "" -#: templates/download.html:19 -msgid "Stay safe" +#: templates/download.html:14 +msgid "Read other FAQ’s at our Support Portal" msgstr "" #: templates/download.html:21 +msgid "Stay safe" +msgstr "" + +#: templates/download.html:23 msgid "Please do not torrent over Tor." msgstr "" -#: templates/download.html:22 +#: 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 "" -#: templates/download.html:25 +#: templates/download.html:27 +msgid "" +"We do not recommend installing additional add-ons or plugins into Tor " +"Browser" +msgstr "" + +#: templates/download.html:28 msgid "" -"We do not recommend installing additional add-ons or plugins into Tor" -" Browser, as these may bypass Tor or compromise your privacy. Tor Browser " +"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 "" -#: templates/download.html:37 +#: templates/download.html:40 #, python-format msgid "Check out the %s for more troubleshooting tips." msgstr "" -#: templates/download.html:45 -msgid "" -"Verify Tor Browser signature <a class=\"mx-auto\" " -"href=\"https://support.torproject.org/how-to-verify-signature\" " -"target=\"_blank\">here</a>." +#: templates/download.html:48 +msgid "Verify Tor Browser signature" msgstr "" #: templates/footer.html:9 templates/footer.html:13 @@ -2445,10 +2475,6 @@ msgstr "" msgid "Brand Assets" msgstr "" -#: templates/press.html:24 -msgid "The Tor Project" -msgstr "" - #: templates/press.html:27 msgid "The Tor Browser" msgstr "" @@ -2524,9 +2550,13 @@ 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. Further details about our " -"audited and reviewed funding can be found with our <a " -"href=\"/about/reports\" title=\"Reports\">Financial Reports.</a>" +"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 @@ -2534,29 +2564,17 @@ msgid "Want to join our community? Getting involved with Tor is easy." msgstr "" #: templates/thank-you.html:13 -msgid "Sign up" -msgstr "Registrarse" - -#: templates/thank-you.html:13 msgid "" -" for Tor News and get updates and opportunities from across the organization" -" and community." -msgstr "" - -#: templates/thank-you.html:17 -msgid "Run a relay" +"Sign up for Tor News and get updates and opportunities from across the " +"organization and community." msgstr "" #: templates/thank-you.html:17 -msgid " to make the network faster and more decentralized." -msgstr "" - -#: templates/thank-you.html:21 -msgid "Use your skills to" +msgid "Run a relay to make the network faster and more decentralized." msgstr "" #: templates/thank-you.html:21 -msgid " volunteer." +msgid "Use your skills to volunteer." msgstr "" #: templates/macros/downloads.html:47 diff --git a/contents+fa.po b/contents+fa.po index 862b29bee..1e3e23c10 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -1,9 +1,6 @@ # Translators: # Armin, 2019 # erinm, 2019 -# BiSansor, 2019 -# Hamed Behravan <behravan.hamed(a)gmail.com>, 2019 -# A.Mehraban <Mehr.Ban(a)chmail.ir>, 2019 # Martus Translations <translations(a)martus.org>, 2019 # Emma Peel, 2019 # @@ -11,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-06 11:28+CET\n" +"POT-Creation-Date: 2019-03-07 19:57+CET\n" "PO-Revision-Date: 2019-01-10 12:38+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Persian (https://www.transifex.com/otf/teams/94225/fa/)\n" @@ -49,14 +46,15 @@ msgid "" msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.title) -msgid "contact" +#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Contact" msgstr "تماس" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.section) #: https//torproject.org/press/ (content/press/contents+en.lrpress.section) #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.section) -msgid "the tor project" +msgid "The Tor Project" msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.body) @@ -78,16 +76,19 @@ msgstr "" #: (content/download/languages/contents+en.lrpage.section) #: https//torproject.org/download/options/ #: (content/download/options/contents+en.lrpage.section) -msgid "download" -msgstr "بارگذاری" +msgid "Download" +msgstr "" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.title) #: https//torproject.org/about/ (content/about/contents+en.lrpage.title) -msgid "history" -msgstr "" +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.title) +msgid "History" +msgstr "سوابق" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.section) -#: https//torproject.org/about/ (content/about/contents+en.lrpage.section) +#: (content/menu/contents+en.lrpage.body) https//torproject.org/about/ +#: (content/about/contents+en.lrpage.section) #: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.section) #: https//torproject.org/about/people/ @@ -98,10 +99,6 @@ msgstr "" #: (content/about/reports/contents+en.lrreports.section) #: https//torproject.org/about/jobs/ #: (content/about/jobs/contents+en.lrjobs.section) -msgid "about" -msgstr "درباره" - -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "About" msgstr "درباره‌ی سایفون" @@ -121,23 +118,33 @@ msgstr "وبلاگ" msgid "Newsletter" msgstr "خبرنامه" -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) -msgid "Contact" -msgstr "تماس" - #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.title) -msgid "success" +msgid "Success" +msgstr "موفق" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "You’re equipped to browse freely." +msgstr "" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "Tor is the strongest tool for privacy and freedom online." +msgstr "" + +#: https//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 "" #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) msgid "" -"You’re equipped to browse freely. Tor is the strongest tool for privacy and " -"freedom online. It is free and open source software maintained by the Tor " -"Project and a community of volunteers worldwide. We need your help to keep " -"Tor secure and safe for millions across the globe. [Donate " -"Now](https://donate.torproject.org/)" +"We need your help to keep Tor secure and safe for millions across the globe." +" [Donate Now](https://donate.torproject.org/)" msgstr "" #: https//torproject.org/about/ (content/about/contents+en.lrpage.body) @@ -192,11 +199,6 @@ msgid "" msgstr "" #: https//torproject.org/about/history/ -#: (content/about/history/contents+en.lrpage.title) -msgid "History" -msgstr "سوابق" - -#: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) msgid "" "**Just like Tor users, the developers, researchers, and funders who’ve made " @@ -244,10 +246,21 @@ 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. That’s why in October 2002" -" when the Tor network was initially deployed, its code was released under a " -"free and open software license. By the end of 2003, the network had about a " -"dozen volunteer nodes, mostly in the U.S., plus one in Germany." +"and open to maximize transparency and separation." +msgstr "" + +#: https//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 "" + +#: https//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 "" #: https//torproject.org/about/history/ @@ -273,7 +286,13 @@ 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. Development of Tor Browser began in " +"began." +msgstr "" + +#: https//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 "" @@ -293,9 +312,14 @@ msgstr "" 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). 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 " +"2013](https://www.theguardian.com/us-news/the-nsa-files)." +msgstr "" + +#: https//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 "" @@ -304,9 +328,15 @@ msgstr "" msgid "" "People’s awareness of tracking, surveillance, and censorship may have " "increased, but so has the prevalence of these hindrances to internet " -"freedom. Today, the network has [thousands of " -"relays](http://metrics.torproject.org) run by volunteers and millions of " -"users worldwide. And it is this diversity that keeps Tor users safe." +"freedom." +msgstr "" + +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Today, the network has [thousands of relays](http://metrics.torproject.org) " +"run by volunteers and millions of users worldwide. And it is this diversity " +"that keeps Tor users safe." msgstr "" #: https//torproject.org/about/history/ @@ -1519,10 +1549,10 @@ msgstr "" #: (content/about/people/ssteele/contents+en.lrperson.description) msgid "" "A graduate of Widener University School of Law, Shari later served as a " -"teaching fellow at Georgetown University Law Center " -"<http://www.law.georgetown.edu/>, where she earned an LL.M. degree in " -"Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the Tor " -"Project Board of Directors since January 2019." +"teaching fellow at [Georgetown University Law " +"Center](https://www.law.georgetown.edu/), where she earned an LL.M. degree " +"in Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the " +"Tor Project Board of Directors since January 2019." msgstr "" #: https//torproject.org/about/people/hiro/ @@ -2048,11 +2078,6 @@ msgid "" msgstr "" #: https//torproject.org/about/sponsors/cymru/ -#: (content/about/sponsors/cymru/contents+en.lrsponsor.name) -msgid "Team Cymru" -msgstr "" - -#: https//torproject.org/about/sponsors/cymru/ #: (content/about/sponsors/cymru/contents+en.lrsponsor.description) msgid "" "Team Cymru has over a decade of experience and expertise at providing " @@ -2205,52 +2230,58 @@ 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. Select \"Tor is censored in my " -"country.\"" +"If you are in a country where Tor is blocked, you can configure Tor to " +"connect to a bridge during the setup process." msgstr "" -#: templates/download.html:12 +#: templates/download.html:10 +msgid "Select \"Tor is censored in my country.\"" +msgstr "" + +#: 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. Read other " -"FAQ’s at our <a href=\"https://support.torproject.org\">Support " -"Portal</a>." +"an incorrect system clock. Please make sure it’s set correctly." msgstr "" -#: templates/download.html:19 -msgid "Stay safe" +#: templates/download.html:14 +msgid "Read other FAQ’s at our Support Portal" msgstr "" #: templates/download.html:21 +msgid "Stay safe" +msgstr "" + +#: templates/download.html:23 msgid "Please do not torrent over Tor." msgstr "" -#: templates/download.html:22 +#: 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 "" -#: templates/download.html:25 +#: templates/download.html:27 +msgid "" +"We do not recommend installing additional add-ons or plugins into Tor " +"Browser" +msgstr "" + +#: templates/download.html:28 msgid "" -"We do not recommend installing additional add-ons or plugins into Tor" -" Browser, as these may bypass Tor or compromise your privacy. Tor Browser " +"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 "" -#: templates/download.html:37 +#: templates/download.html:40 #, python-format msgid "Check out the %s for more troubleshooting tips." msgstr "" -#: templates/download.html:45 -msgid "" -"Verify Tor Browser signature <a class=\"mx-auto\" " -"href=\"https://support.torproject.org/how-to-verify-signature\" " -"target=\"_blank\">here</a>." +#: templates/download.html:48 +msgid "Verify Tor Browser signature" msgstr "" #: templates/footer.html:9 templates/footer.html:13 @@ -2438,10 +2469,6 @@ msgstr "" msgid "Brand Assets" msgstr "" -#: templates/press.html:24 -msgid "The Tor Project" -msgstr "" - #: templates/press.html:27 msgid "The Tor Browser" msgstr "" @@ -2517,9 +2544,13 @@ 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. Further details about our " -"audited and reviewed funding can be found with our <a " -"href=\"/about/reports\" title=\"Reports\">Financial Reports.</a>" +"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 @@ -2527,29 +2558,17 @@ msgid "Want to join our community? Getting involved with Tor is easy." msgstr "" #: templates/thank-you.html:13 -msgid "Sign up" -msgstr "عضویت" - -#: templates/thank-you.html:13 msgid "" -" for Tor News and get updates and opportunities from across the organization" -" and community." -msgstr "" - -#: templates/thank-you.html:17 -msgid "Run a relay" +"Sign up for Tor News and get updates and opportunities from across the " +"organization and community." msgstr "" #: templates/thank-you.html:17 -msgid " to make the network faster and more decentralized." -msgstr "" - -#: templates/thank-you.html:21 -msgid "Use your skills to" +msgid "Run a relay to make the network faster and more decentralized." msgstr "" #: templates/thank-you.html:21 -msgid " volunteer." +msgid "Use your skills to volunteer." msgstr "" #: templates/macros/downloads.html:47 diff --git a/contents+fr.po b/contents+fr.po index 427e46776..9226dd716 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1,7 +1,6 @@ # Translators: # ducki2p <ducki2p(a)gmail.com>, 2019 # erinm, 2019 -# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 # AO <ao(a)localizationlab.org>, 2019 # Emma Peel, 2019 # @@ -9,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-06 11:28+CET\n" +"POT-Creation-Date: 2019-03-07 19:57+CET\n" "PO-Revision-Date: 2019-01-10 12:38+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: French (https://www.transifex.com/otf/teams/94225/fr/)\n" @@ -47,14 +46,15 @@ msgid "" msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.title) -msgid "contact" -msgstr "contact" +#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Contact" +msgstr "Contact" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.section) #: https//torproject.org/press/ (content/press/contents+en.lrpress.section) #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.section) -msgid "the tor project" +msgid "The Tor Project" msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.body) @@ -76,16 +76,19 @@ msgstr "" #: (content/download/languages/contents+en.lrpage.section) #: https//torproject.org/download/options/ #: (content/download/options/contents+en.lrpage.section) -msgid "download" -msgstr "téléchargement télécharger" +msgid "Download" +msgstr "Télécharger" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.title) #: https//torproject.org/about/ (content/about/contents+en.lrpage.title) -msgid "history" -msgstr "" +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.title) +msgid "History" +msgstr "Historique" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.section) -#: https//torproject.org/about/ (content/about/contents+en.lrpage.section) +#: (content/menu/contents+en.lrpage.body) https//torproject.org/about/ +#: (content/about/contents+en.lrpage.section) #: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.section) #: https//torproject.org/about/people/ @@ -96,10 +99,6 @@ msgstr "" #: (content/about/reports/contents+en.lrreports.section) #: https//torproject.org/about/jobs/ #: (content/about/jobs/contents+en.lrjobs.section) -msgid "about" -msgstr "à propos" - -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "About" msgstr "À propos" @@ -119,23 +118,33 @@ msgstr "Blogue" msgid "Newsletter" msgstr "Newsletter" -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) -msgid "Contact" -msgstr "Contact" - #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.title) -msgid "success" +msgid "Success" +msgstr "Succès" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "You’re equipped to browse freely." +msgstr "" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "Tor is the strongest tool for privacy and freedom online." +msgstr "" + +#: https//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 "" #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) msgid "" -"You’re equipped to browse freely. Tor is the strongest tool for privacy and " -"freedom online. It is free and open source software maintained by the Tor " -"Project and a community of volunteers worldwide. We need your help to keep " -"Tor secure and safe for millions across the globe. [Donate " -"Now](https://donate.torproject.org/)" +"We need your help to keep Tor secure and safe for millions across the globe." +" [Donate Now](https://donate.torproject.org/)" msgstr "" #: https//torproject.org/about/ (content/about/contents+en.lrpage.body) @@ -190,11 +199,6 @@ msgid "" msgstr "" #: https//torproject.org/about/history/ -#: (content/about/history/contents+en.lrpage.title) -msgid "History" -msgstr "Historique" - -#: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) msgid "" "**Just like Tor users, the developers, researchers, and funders who’ve made " @@ -242,10 +246,21 @@ 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. That’s why in October 2002" -" when the Tor network was initially deployed, its code was released under a " -"free and open software license. By the end of 2003, the network had about a " -"dozen volunteer nodes, mostly in the U.S., plus one in Germany." +"and open to maximize transparency and separation." +msgstr "" + +#: https//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 "" + +#: https//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 "" #: https//torproject.org/about/history/ @@ -271,7 +286,13 @@ 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. Development of Tor Browser began in " +"began." +msgstr "" + +#: https//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 "" @@ -291,9 +312,14 @@ msgstr "" 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). 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 " +"2013](https://www.theguardian.com/us-news/the-nsa-files)." +msgstr "" + +#: https//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 "" @@ -302,9 +328,15 @@ msgstr "" msgid "" "People’s awareness of tracking, surveillance, and censorship may have " "increased, but so has the prevalence of these hindrances to internet " -"freedom. Today, the network has [thousands of " -"relays](http://metrics.torproject.org) run by volunteers and millions of " -"users worldwide. And it is this diversity that keeps Tor users safe." +"freedom." +msgstr "" + +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Today, the network has [thousands of relays](http://metrics.torproject.org) " +"run by volunteers and millions of users worldwide. And it is this diversity " +"that keeps Tor users safe." msgstr "" #: https//torproject.org/about/history/ @@ -1517,10 +1549,10 @@ msgstr "" #: (content/about/people/ssteele/contents+en.lrperson.description) msgid "" "A graduate of Widener University School of Law, Shari later served as a " -"teaching fellow at Georgetown University Law Center " -"<http://www.law.georgetown.edu/>, where she earned an LL.M. degree in " -"Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the Tor " -"Project Board of Directors since January 2019." +"teaching fellow at [Georgetown University Law " +"Center](https://www.law.georgetown.edu/), where she earned an LL.M. degree " +"in Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the " +"Tor Project Board of Directors since January 2019." msgstr "" #: https//torproject.org/about/people/hiro/ @@ -2046,11 +2078,6 @@ msgid "" msgstr "" #: https//torproject.org/about/sponsors/cymru/ -#: (content/about/sponsors/cymru/contents+en.lrsponsor.name) -msgid "Team Cymru" -msgstr "" - -#: https//torproject.org/about/sponsors/cymru/ #: (content/about/sponsors/cymru/contents+en.lrsponsor.description) msgid "" "Team Cymru has over a decade of experience and expertise at providing " @@ -2203,52 +2230,58 @@ 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. Select \"Tor is censored in my " -"country.\"" +"If you are in a country where Tor is blocked, you can configure Tor to " +"connect to a bridge during the setup process." msgstr "" -#: templates/download.html:12 +#: templates/download.html:10 +msgid "Select \"Tor is censored in my country.\"" +msgstr "" + +#: 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. Read other " -"FAQ’s at our <a href=\"https://support.torproject.org\">Support " -"Portal</a>." +"an incorrect system clock. Please make sure it’s set correctly." msgstr "" -#: templates/download.html:19 -msgid "Stay safe" +#: templates/download.html:14 +msgid "Read other FAQ’s at our Support Portal" msgstr "" #: templates/download.html:21 +msgid "Stay safe" +msgstr "" + +#: templates/download.html:23 msgid "Please do not torrent over Tor." msgstr "" -#: templates/download.html:22 +#: 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 "" -#: templates/download.html:25 +#: templates/download.html:27 +msgid "" +"We do not recommend installing additional add-ons or plugins into Tor " +"Browser" +msgstr "" + +#: templates/download.html:28 msgid "" -"We do not recommend installing additional add-ons or plugins into Tor" -" Browser, as these may bypass Tor or compromise your privacy. Tor Browser " +"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 "" -#: templates/download.html:37 +#: templates/download.html:40 #, python-format msgid "Check out the %s for more troubleshooting tips." msgstr "" -#: templates/download.html:45 -msgid "" -"Verify Tor Browser signature <a class=\"mx-auto\" " -"href=\"https://support.torproject.org/how-to-verify-signature\" " -"target=\"_blank\">here</a>." +#: templates/download.html:48 +msgid "Verify Tor Browser signature" msgstr "" #: templates/footer.html:9 templates/footer.html:13 @@ -2436,10 +2469,6 @@ msgstr "" msgid "Brand Assets" msgstr "" -#: templates/press.html:24 -msgid "The Tor Project" -msgstr "" - #: templates/press.html:27 msgid "The Tor Browser" msgstr "" @@ -2515,9 +2544,13 @@ 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. Further details about our " -"audited and reviewed funding can be found with our <a " -"href=\"/about/reports\" title=\"Reports\">Financial Reports.</a>" +"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 @@ -2525,29 +2558,17 @@ msgid "Want to join our community? Getting involved with Tor is easy." msgstr "" #: templates/thank-you.html:13 -msgid "Sign up" -msgstr "S’abonner" - -#: templates/thank-you.html:13 msgid "" -" for Tor News and get updates and opportunities from across the organization" -" and community." -msgstr "" - -#: templates/thank-you.html:17 -msgid "Run a relay" +"Sign up for Tor News and get updates and opportunities from across the " +"organization and community." msgstr "" #: templates/thank-you.html:17 -msgid " to make the network faster and more decentralized." -msgstr "" - -#: templates/thank-you.html:21 -msgid "Use your skills to" +msgid "Run a relay to make the network faster and more decentralized." msgstr "" #: templates/thank-you.html:21 -msgid " volunteer." +msgid "Use your skills to volunteer." msgstr "" #: templates/macros/downloads.html:47 diff --git a/contents+ko.po b/contents+ko.po index 7e0535a02..3c297cb5c 100644 --- a/contents+ko.po +++ b/contents+ko.po @@ -1,6 +1,4 @@ # Translators: -# Giovanni Pellerano <giovanni.pellerano(a)evilaliv3.org>, 2019 -# Plusb Preco <plusb21(a)gmail.com>, 2019 # SEPT____ <xpressengine3(a)mail.beo.kr>, 2019 # erinm, 2019 # Emma Peel, 2019 @@ -9,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-06 11:28+CET\n" +"POT-Creation-Date: 2019-03-07 19:57+CET\n" "PO-Revision-Date: 2019-01-10 12:38+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Korean (https://www.transifex.com/otf/teams/94225/ko/)\n" @@ -47,14 +45,15 @@ msgid "" msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.title) -msgid "contact" -msgstr "연락" +#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Contact" +msgstr "문의" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.section) #: https//torproject.org/press/ (content/press/contents+en.lrpress.section) #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.section) -msgid "the tor project" +msgid "The Tor Project" msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.body) @@ -76,16 +75,19 @@ msgstr "" #: (content/download/languages/contents+en.lrpage.section) #: https//torproject.org/download/options/ #: (content/download/options/contents+en.lrpage.section) -msgid "download" +msgid "Download" msgstr "다운로드" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.title) #: https//torproject.org/about/ (content/about/contents+en.lrpage.title) -msgid "history" -msgstr "" +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.title) +msgid "History" +msgstr "버젼 역사" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.section) -#: https//torproject.org/about/ (content/about/contents+en.lrpage.section) +#: (content/menu/contents+en.lrpage.body) https//torproject.org/about/ +#: (content/about/contents+en.lrpage.section) #: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.section) #: https//torproject.org/about/people/ @@ -96,10 +98,6 @@ msgstr "" #: (content/about/reports/contents+en.lrreports.section) #: https//torproject.org/about/jobs/ #: (content/about/jobs/contents+en.lrjobs.section) -msgid "about" -msgstr "" - -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "About" msgstr "소개" @@ -119,23 +117,33 @@ msgstr "블로그" msgid "Newsletter" msgstr "" -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) -msgid "Contact" -msgstr "문의" - #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.title) -msgid "success" +msgid "Success" +msgstr "성공" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "You’re equipped to browse freely." +msgstr "" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "Tor is the strongest tool for privacy and freedom online." +msgstr "" + +#: https//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 "" #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) msgid "" -"You’re equipped to browse freely. Tor is the strongest tool for privacy and " -"freedom online. It is free and open source software maintained by the Tor " -"Project and a community of volunteers worldwide. We need your help to keep " -"Tor secure and safe for millions across the globe. [Donate " -"Now](https://donate.torproject.org/)" +"We need your help to keep Tor secure and safe for millions across the globe." +" [Donate Now](https://donate.torproject.org/)" msgstr "" #: https//torproject.org/about/ (content/about/contents+en.lrpage.body) @@ -190,11 +198,6 @@ msgid "" msgstr "" #: https//torproject.org/about/history/ -#: (content/about/history/contents+en.lrpage.title) -msgid "History" -msgstr "버젼 역사" - -#: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) msgid "" "**Just like Tor users, the developers, researchers, and funders who’ve made " @@ -242,10 +245,21 @@ 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. That’s why in October 2002" -" when the Tor network was initially deployed, its code was released under a " -"free and open software license. By the end of 2003, the network had about a " -"dozen volunteer nodes, mostly in the U.S., plus one in Germany." +"and open to maximize transparency and separation." +msgstr "" + +#: https//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 "" + +#: https//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 "" #: https//torproject.org/about/history/ @@ -271,7 +285,13 @@ 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. Development of Tor Browser began in " +"began." +msgstr "" + +#: https//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 "" @@ -291,9 +311,14 @@ msgstr "" 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). 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 " +"2013](https://www.theguardian.com/us-news/the-nsa-files)." +msgstr "" + +#: https//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 "" @@ -302,9 +327,15 @@ msgstr "" msgid "" "People’s awareness of tracking, surveillance, and censorship may have " "increased, but so has the prevalence of these hindrances to internet " -"freedom. Today, the network has [thousands of " -"relays](http://metrics.torproject.org) run by volunteers and millions of " -"users worldwide. And it is this diversity that keeps Tor users safe." +"freedom." +msgstr "" + +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Today, the network has [thousands of relays](http://metrics.torproject.org) " +"run by volunteers and millions of users worldwide. And it is this diversity " +"that keeps Tor users safe." msgstr "" #: https//torproject.org/about/history/ @@ -1517,10 +1548,10 @@ msgstr "" #: (content/about/people/ssteele/contents+en.lrperson.description) msgid "" "A graduate of Widener University School of Law, Shari later served as a " -"teaching fellow at Georgetown University Law Center " -"<http://www.law.georgetown.edu/>, where she earned an LL.M. degree in " -"Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the Tor " -"Project Board of Directors since January 2019." +"teaching fellow at [Georgetown University Law " +"Center](https://www.law.georgetown.edu/), where she earned an LL.M. degree " +"in Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the " +"Tor Project Board of Directors since January 2019." msgstr "" #: https//torproject.org/about/people/hiro/ @@ -2046,11 +2077,6 @@ msgid "" msgstr "" #: https//torproject.org/about/sponsors/cymru/ -#: (content/about/sponsors/cymru/contents+en.lrsponsor.name) -msgid "Team Cymru" -msgstr "" - -#: https//torproject.org/about/sponsors/cymru/ #: (content/about/sponsors/cymru/contents+en.lrsponsor.description) msgid "" "Team Cymru has over a decade of experience and expertise at providing " @@ -2203,52 +2229,58 @@ 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. Select \"Tor is censored in my " -"country.\"" +"If you are in a country where Tor is blocked, you can configure Tor to " +"connect to a bridge during the setup process." msgstr "" -#: templates/download.html:12 +#: templates/download.html:10 +msgid "Select \"Tor is censored in my country.\"" +msgstr "" + +#: 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. Read other " -"FAQ’s at our <a href=\"https://support.torproject.org\">Support " -"Portal</a>." +"an incorrect system clock. Please make sure it’s set correctly." msgstr "" -#: templates/download.html:19 -msgid "Stay safe" +#: templates/download.html:14 +msgid "Read other FAQ’s at our Support Portal" msgstr "" #: templates/download.html:21 +msgid "Stay safe" +msgstr "" + +#: templates/download.html:23 msgid "Please do not torrent over Tor." msgstr "" -#: templates/download.html:22 +#: 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 "" -#: templates/download.html:25 +#: templates/download.html:27 +msgid "" +"We do not recommend installing additional add-ons or plugins into Tor " +"Browser" +msgstr "" + +#: templates/download.html:28 msgid "" -"We do not recommend installing additional add-ons or plugins into Tor" -" Browser, as these may bypass Tor or compromise your privacy. Tor Browser " +"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 "" -#: templates/download.html:37 +#: templates/download.html:40 #, python-format msgid "Check out the %s for more troubleshooting tips." msgstr "" -#: templates/download.html:45 -msgid "" -"Verify Tor Browser signature <a class=\"mx-auto\" " -"href=\"https://support.torproject.org/how-to-verify-signature\" " -"target=\"_blank\">here</a>." +#: templates/download.html:48 +msgid "Verify Tor Browser signature" msgstr "" #: templates/footer.html:9 templates/footer.html:13 @@ -2436,10 +2468,6 @@ msgstr "" msgid "Brand Assets" msgstr "" -#: templates/press.html:24 -msgid "The Tor Project" -msgstr "" - #: templates/press.html:27 msgid "The Tor Browser" msgstr "" @@ -2515,9 +2543,13 @@ 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. Further details about our " -"audited and reviewed funding can be found with our <a " -"href=\"/about/reports\" title=\"Reports\">Financial Reports.</a>" +"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 @@ -2525,29 +2557,17 @@ msgid "Want to join our community? Getting involved with Tor is easy." msgstr "" #: templates/thank-you.html:13 -msgid "Sign up" -msgstr "Sign up" - -#: templates/thank-you.html:13 msgid "" -" for Tor News and get updates and opportunities from across the organization" -" and community." -msgstr "" - -#: templates/thank-you.html:17 -msgid "Run a relay" +"Sign up for Tor News and get updates and opportunities from across the " +"organization and community." msgstr "" #: templates/thank-you.html:17 -msgid " to make the network faster and more decentralized." -msgstr "" - -#: templates/thank-you.html:21 -msgid "Use your skills to" +msgid "Run a relay to make the network faster and more decentralized." msgstr "" #: templates/thank-you.html:21 -msgid " volunteer." +msgid "Use your skills to volunteer." msgstr "" #: templates/macros/downloads.html:47 diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 706b64df4..5e96c03e4 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -2,8 +2,6 @@ # Danton Medrado, 2019 # erinm, 2019 # Gutem <gutemhc(a)gmail.com>, 2019 -# Reurison Silva Rodrigues, 2019 -# nilson t. c., 2019 # Joeffison Silvério de Andrade <joeffison(a)gmail.com>, 2019 # Emma Peel, 2019 # @@ -11,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-06 11:28+CET\n" +"POT-Creation-Date: 2019-03-07 19:57+CET\n" "PO-Revision-Date: 2019-01-10 12:38+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/94225/pt_BR/)\n" @@ -49,14 +47,15 @@ msgid "" msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.title) -msgid "contact" -msgstr "contato" +#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Contact" +msgstr "Contato" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.section) #: https//torproject.org/press/ (content/press/contents+en.lrpress.section) #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.section) -msgid "the tor project" +msgid "The Tor Project" msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.body) @@ -78,16 +77,19 @@ msgstr "" #: (content/download/languages/contents+en.lrpage.section) #: https//torproject.org/download/options/ #: (content/download/options/contents+en.lrpage.section) -msgid "download" -msgstr "Baixar" +msgid "Download" +msgstr "Download" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.title) #: https//torproject.org/about/ (content/about/contents+en.lrpage.title) -msgid "history" -msgstr "" +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.title) +msgid "History" +msgstr "História" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.section) -#: https//torproject.org/about/ (content/about/contents+en.lrpage.section) +#: (content/menu/contents+en.lrpage.body) https//torproject.org/about/ +#: (content/about/contents+en.lrpage.section) #: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.section) #: https//torproject.org/about/people/ @@ -98,10 +100,6 @@ msgstr "" #: (content/about/reports/contents+en.lrreports.section) #: https//torproject.org/about/jobs/ #: (content/about/jobs/contents+en.lrjobs.section) -msgid "about" -msgstr "sobre" - -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "About" msgstr "Sobre" @@ -121,23 +119,33 @@ msgstr "Blog" msgid "Newsletter" msgstr "Boletim informativo" -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) -msgid "Contact" -msgstr "Contato" - #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.title) -msgid "success" +msgid "Success" +msgstr "Sucesso" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "You’re equipped to browse freely." +msgstr "" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "Tor is the strongest tool for privacy and freedom online." +msgstr "" + +#: https//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 "" #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) msgid "" -"You’re equipped to browse freely. Tor is the strongest tool for privacy and " -"freedom online. It is free and open source software maintained by the Tor " -"Project and a community of volunteers worldwide. We need your help to keep " -"Tor secure and safe for millions across the globe. [Donate " -"Now](https://donate.torproject.org/)" +"We need your help to keep Tor secure and safe for millions across the globe." +" [Donate Now](https://donate.torproject.org/)" msgstr "" #: https//torproject.org/about/ (content/about/contents+en.lrpage.body) @@ -192,11 +200,6 @@ msgid "" msgstr "" #: https//torproject.org/about/history/ -#: (content/about/history/contents+en.lrpage.title) -msgid "History" -msgstr "História" - -#: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) msgid "" "**Just like Tor users, the developers, researchers, and funders who’ve made " @@ -244,10 +247,21 @@ 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. That’s why in October 2002" -" when the Tor network was initially deployed, its code was released under a " -"free and open software license. By the end of 2003, the network had about a " -"dozen volunteer nodes, mostly in the U.S., plus one in Germany." +"and open to maximize transparency and separation." +msgstr "" + +#: https//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 "" + +#: https//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 "" #: https//torproject.org/about/history/ @@ -273,7 +287,13 @@ 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. Development of Tor Browser began in " +"began." +msgstr "" + +#: https//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 "" @@ -293,9 +313,14 @@ msgstr "" 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). 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 " +"2013](https://www.theguardian.com/us-news/the-nsa-files)." +msgstr "" + +#: https//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 "" @@ -304,9 +329,15 @@ msgstr "" msgid "" "People’s awareness of tracking, surveillance, and censorship may have " "increased, but so has the prevalence of these hindrances to internet " -"freedom. Today, the network has [thousands of " -"relays](http://metrics.torproject.org) run by volunteers and millions of " -"users worldwide. And it is this diversity that keeps Tor users safe." +"freedom." +msgstr "" + +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Today, the network has [thousands of relays](http://metrics.torproject.org) " +"run by volunteers and millions of users worldwide. And it is this diversity " +"that keeps Tor users safe." msgstr "" #: https//torproject.org/about/history/ @@ -1519,10 +1550,10 @@ msgstr "" #: (content/about/people/ssteele/contents+en.lrperson.description) msgid "" "A graduate of Widener University School of Law, Shari later served as a " -"teaching fellow at Georgetown University Law Center " -"<http://www.law.georgetown.edu/>, where she earned an LL.M. degree in " -"Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the Tor " -"Project Board of Directors since January 2019." +"teaching fellow at [Georgetown University Law " +"Center](https://www.law.georgetown.edu/), where she earned an LL.M. degree " +"in Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the " +"Tor Project Board of Directors since January 2019." msgstr "" #: https//torproject.org/about/people/hiro/ @@ -2048,11 +2079,6 @@ msgid "" msgstr "" #: https//torproject.org/about/sponsors/cymru/ -#: (content/about/sponsors/cymru/contents+en.lrsponsor.name) -msgid "Team Cymru" -msgstr "" - -#: https//torproject.org/about/sponsors/cymru/ #: (content/about/sponsors/cymru/contents+en.lrsponsor.description) msgid "" "Team Cymru has over a decade of experience and expertise at providing " @@ -2205,52 +2231,58 @@ 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. Select \"Tor is censored in my " -"country.\"" +"If you are in a country where Tor is blocked, you can configure Tor to " +"connect to a bridge during the setup process." msgstr "" -#: templates/download.html:12 +#: templates/download.html:10 +msgid "Select \"Tor is censored in my country.\"" +msgstr "" + +#: 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. Read other " -"FAQ’s at our <a href=\"https://support.torproject.org\">Support " -"Portal</a>." +"an incorrect system clock. Please make sure it’s set correctly." msgstr "" -#: templates/download.html:19 -msgid "Stay safe" +#: templates/download.html:14 +msgid "Read other FAQ’s at our Support Portal" msgstr "" #: templates/download.html:21 +msgid "Stay safe" +msgstr "" + +#: templates/download.html:23 msgid "Please do not torrent over Tor." msgstr "" -#: templates/download.html:22 +#: 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 "" -#: templates/download.html:25 +#: templates/download.html:27 +msgid "" +"We do not recommend installing additional add-ons or plugins into Tor " +"Browser" +msgstr "" + +#: templates/download.html:28 msgid "" -"We do not recommend installing additional add-ons or plugins into Tor" -" Browser, as these may bypass Tor or compromise your privacy. Tor Browser " +"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 "" -#: templates/download.html:37 +#: templates/download.html:40 #, python-format msgid "Check out the %s for more troubleshooting tips." msgstr "" -#: templates/download.html:45 -msgid "" -"Verify Tor Browser signature <a class=\"mx-auto\" " -"href=\"https://support.torproject.org/how-to-verify-signature\" " -"target=\"_blank\">here</a>." +#: templates/download.html:48 +msgid "Verify Tor Browser signature" msgstr "" #: templates/footer.html:9 templates/footer.html:13 @@ -2438,10 +2470,6 @@ msgstr "" msgid "Brand Assets" msgstr "" -#: templates/press.html:24 -msgid "The Tor Project" -msgstr "" - #: templates/press.html:27 msgid "The Tor Browser" msgstr "" @@ -2517,9 +2545,13 @@ 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. Further details about our " -"audited and reviewed funding can be found with our <a " -"href=\"/about/reports\" title=\"Reports\">Financial Reports.</a>" +"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 @@ -2527,29 +2559,17 @@ msgid "Want to join our community? Getting involved with Tor is easy." msgstr "" #: templates/thank-you.html:13 -msgid "Sign up" -msgstr "Cadastrar" - -#: templates/thank-you.html:13 msgid "" -" for Tor News and get updates and opportunities from across the organization" -" and community." -msgstr "" - -#: templates/thank-you.html:17 -msgid "Run a relay" +"Sign up for Tor News and get updates and opportunities from across the " +"organization and community." msgstr "" #: templates/thank-you.html:17 -msgid " to make the network faster and more decentralized." -msgstr "" - -#: templates/thank-you.html:21 -msgid "Use your skills to" +msgid "Run a relay to make the network faster and more decentralized." msgstr "" #: templates/thank-you.html:21 -msgid " volunteer." +msgid "Use your skills to volunteer." msgstr "" #: templates/macros/downloads.html:47 diff --git a/contents+ru.po b/contents+ru.po index 346a917fa..10f1aca7c 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -1,6 +1,5 @@ # Translators: # ducki2p <ducki2p(a)gmail.com>, 2019 -# Vitaliy Grishenko, 2019 # erinm, 2019 # Emma Peel, 2019 # @@ -8,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-06 11:28+CET\n" +"POT-Creation-Date: 2019-03-07 19:57+CET\n" "PO-Revision-Date: 2019-01-10 12:38+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Russian (https://www.transifex.com/otf/teams/94225/ru/)\n" @@ -46,14 +45,15 @@ msgid "" msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.title) -msgid "contact" -msgstr "контакт" +#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Contact" +msgstr "Контакты" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.section) #: https//torproject.org/press/ (content/press/contents+en.lrpress.section) #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.section) -msgid "the tor project" +msgid "The Tor Project" msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.body) @@ -75,16 +75,19 @@ msgstr "" #: (content/download/languages/contents+en.lrpage.section) #: https//torproject.org/download/options/ #: (content/download/options/contents+en.lrpage.section) -msgid "download" -msgstr "скачать" +msgid "Download" +msgstr "Загрузить" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.title) #: https//torproject.org/about/ (content/about/contents+en.lrpage.title) -msgid "history" -msgstr "" +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.title) +msgid "History" +msgstr "История" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.section) -#: https//torproject.org/about/ (content/about/contents+en.lrpage.section) +#: (content/menu/contents+en.lrpage.body) https//torproject.org/about/ +#: (content/about/contents+en.lrpage.section) #: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.section) #: https//torproject.org/about/people/ @@ -95,10 +98,6 @@ msgstr "" #: (content/about/reports/contents+en.lrreports.section) #: https//torproject.org/about/jobs/ #: (content/about/jobs/contents+en.lrjobs.section) -msgid "about" -msgstr "О нас" - -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "About" msgstr "О программе" @@ -118,23 +117,33 @@ msgstr "Блог" msgid "Newsletter" msgstr "Бюллетень" -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) -msgid "Contact" -msgstr "Контакты" - #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.title) -msgid "success" +msgid "Success" +msgstr "Успех" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "You’re equipped to browse freely." +msgstr "" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "Tor is the strongest tool for privacy and freedom online." +msgstr "" + +#: https//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 "" #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) msgid "" -"You’re equipped to browse freely. Tor is the strongest tool for privacy and " -"freedom online. It is free and open source software maintained by the Tor " -"Project and a community of volunteers worldwide. We need your help to keep " -"Tor secure and safe for millions across the globe. [Donate " -"Now](https://donate.torproject.org/)" +"We need your help to keep Tor secure and safe for millions across the globe." +" [Donate Now](https://donate.torproject.org/)" msgstr "" #: https//torproject.org/about/ (content/about/contents+en.lrpage.body) @@ -189,11 +198,6 @@ msgid "" msgstr "" #: https//torproject.org/about/history/ -#: (content/about/history/contents+en.lrpage.title) -msgid "History" -msgstr "История" - -#: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) msgid "" "**Just like Tor users, the developers, researchers, and funders who’ve made " @@ -241,10 +245,21 @@ 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. That’s why in October 2002" -" when the Tor network was initially deployed, its code was released under a " -"free and open software license. By the end of 2003, the network had about a " -"dozen volunteer nodes, mostly in the U.S., plus one in Germany." +"and open to maximize transparency and separation." +msgstr "" + +#: https//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 "" + +#: https//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 "" #: https//torproject.org/about/history/ @@ -270,7 +285,13 @@ 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. Development of Tor Browser began in " +"began." +msgstr "" + +#: https//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 "" @@ -290,9 +311,14 @@ msgstr "" 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). 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 " +"2013](https://www.theguardian.com/us-news/the-nsa-files)." +msgstr "" + +#: https//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 "" @@ -301,9 +327,15 @@ msgstr "" msgid "" "People’s awareness of tracking, surveillance, and censorship may have " "increased, but so has the prevalence of these hindrances to internet " -"freedom. Today, the network has [thousands of " -"relays](http://metrics.torproject.org) run by volunteers and millions of " -"users worldwide. And it is this diversity that keeps Tor users safe." +"freedom." +msgstr "" + +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Today, the network has [thousands of relays](http://metrics.torproject.org) " +"run by volunteers and millions of users worldwide. And it is this diversity " +"that keeps Tor users safe." msgstr "" #: https//torproject.org/about/history/ @@ -1516,10 +1548,10 @@ msgstr "" #: (content/about/people/ssteele/contents+en.lrperson.description) msgid "" "A graduate of Widener University School of Law, Shari later served as a " -"teaching fellow at Georgetown University Law Center " -"<http://www.law.georgetown.edu/>, where she earned an LL.M. degree in " -"Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the Tor " -"Project Board of Directors since January 2019." +"teaching fellow at [Georgetown University Law " +"Center](https://www.law.georgetown.edu/), where she earned an LL.M. degree " +"in Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the " +"Tor Project Board of Directors since January 2019." msgstr "" #: https//torproject.org/about/people/hiro/ @@ -2045,11 +2077,6 @@ msgid "" msgstr "" #: https//torproject.org/about/sponsors/cymru/ -#: (content/about/sponsors/cymru/contents+en.lrsponsor.name) -msgid "Team Cymru" -msgstr "" - -#: https//torproject.org/about/sponsors/cymru/ #: (content/about/sponsors/cymru/contents+en.lrsponsor.description) msgid "" "Team Cymru has over a decade of experience and expertise at providing " @@ -2202,52 +2229,58 @@ 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. Select \"Tor is censored in my " -"country.\"" +"If you are in a country where Tor is blocked, you can configure Tor to " +"connect to a bridge during the setup process." msgstr "" -#: templates/download.html:12 +#: templates/download.html:10 +msgid "Select \"Tor is censored in my country.\"" +msgstr "" + +#: 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. Read other " -"FAQ’s at our <a href=\"https://support.torproject.org\">Support " -"Portal</a>." +"an incorrect system clock. Please make sure it’s set correctly." msgstr "" -#: templates/download.html:19 -msgid "Stay safe" +#: templates/download.html:14 +msgid "Read other FAQ’s at our Support Portal" msgstr "" #: templates/download.html:21 +msgid "Stay safe" +msgstr "" + +#: templates/download.html:23 msgid "Please do not torrent over Tor." msgstr "" -#: templates/download.html:22 +#: 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 "" -#: templates/download.html:25 +#: templates/download.html:27 +msgid "" +"We do not recommend installing additional add-ons or plugins into Tor " +"Browser" +msgstr "" + +#: templates/download.html:28 msgid "" -"We do not recommend installing additional add-ons or plugins into Tor" -" Browser, as these may bypass Tor or compromise your privacy. Tor Browser " +"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 "" -#: templates/download.html:37 +#: templates/download.html:40 #, python-format msgid "Check out the %s for more troubleshooting tips." msgstr "" -#: templates/download.html:45 -msgid "" -"Verify Tor Browser signature <a class=\"mx-auto\" " -"href=\"https://support.torproject.org/how-to-verify-signature\" " -"target=\"_blank\">here</a>." +#: templates/download.html:48 +msgid "Verify Tor Browser signature" msgstr "" #: templates/footer.html:9 templates/footer.html:13 @@ -2435,10 +2468,6 @@ msgstr "" msgid "Brand Assets" msgstr "" -#: templates/press.html:24 -msgid "The Tor Project" -msgstr "" - #: templates/press.html:27 msgid "The Tor Browser" msgstr "" @@ -2514,9 +2543,13 @@ 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. Further details about our " -"audited and reviewed funding can be found with our <a " -"href=\"/about/reports\" title=\"Reports\">Financial Reports.</a>" +"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 @@ -2524,29 +2557,17 @@ msgid "Want to join our community? Getting involved with Tor is easy." msgstr "" #: templates/thank-you.html:13 -msgid "Sign up" -msgstr "Зарегистрироваться" - -#: templates/thank-you.html:13 msgid "" -" for Tor News and get updates and opportunities from across the organization" -" and community." -msgstr "" - -#: templates/thank-you.html:17 -msgid "Run a relay" +"Sign up for Tor News and get updates and opportunities from across the " +"organization and community." msgstr "" #: templates/thank-you.html:17 -msgid " to make the network faster and more decentralized." -msgstr "" - -#: templates/thank-you.html:21 -msgid "Use your skills to" +msgid "Run a relay to make the network faster and more decentralized." msgstr "" #: templates/thank-you.html:21 -msgid " volunteer." +msgid "Use your skills to volunteer." msgstr "" #: templates/macros/downloads.html:47 diff --git a/contents+tr.po b/contents+tr.po index 793cb3be4..03148fd34 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -1,16 +1,13 @@ # Translators: # Necdet Yücel <necdetyucel(a)gmail.com>, 2019 -# Volkan Gezer <volkangezer(a)gmail.com>, 2019 -# Translinguini <translinguini(a)gmail.com>, 2019 # erinm, 2019 -# T. E. Kalayci <tekrei(a)gmail.com>, 2019 # Emma Peel, 2019 # msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-06 11:28+CET\n" +"POT-Creation-Date: 2019-03-07 19:57+CET\n" "PO-Revision-Date: 2019-01-10 12:38+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/94225/tr/)\n" @@ -48,14 +45,15 @@ msgid "" msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.title) -msgid "contact" -msgstr "iletişim" +#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Contact" +msgstr "İletişim" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.section) #: https//torproject.org/press/ (content/press/contents+en.lrpress.section) #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.section) -msgid "the tor project" +msgid "The Tor Project" msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.body) @@ -77,16 +75,19 @@ msgstr "" #: (content/download/languages/contents+en.lrpage.section) #: https//torproject.org/download/options/ #: (content/download/options/contents+en.lrpage.section) -msgid "download" -msgstr "karşıdan yükle" +msgid "Download" +msgstr "İndir" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.title) #: https//torproject.org/about/ (content/about/contents+en.lrpage.title) -msgid "history" -msgstr "" +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.title) +msgid "History" +msgstr "Geçmiş" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.section) -#: https//torproject.org/about/ (content/about/contents+en.lrpage.section) +#: (content/menu/contents+en.lrpage.body) https//torproject.org/about/ +#: (content/about/contents+en.lrpage.section) #: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.section) #: https//torproject.org/about/people/ @@ -97,10 +98,6 @@ msgstr "" #: (content/about/reports/contents+en.lrreports.section) #: https//torproject.org/about/jobs/ #: (content/about/jobs/contents+en.lrjobs.section) -msgid "about" -msgstr "hakkında" - -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "About" msgstr "Hakkında" @@ -120,23 +117,33 @@ msgstr "Günlük" msgid "Newsletter" msgstr "Bülten" -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) -msgid "Contact" -msgstr "İletişim" - #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.title) -msgid "success" +msgid "Success" +msgstr "Başarılı" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "You’re equipped to browse freely." +msgstr "" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "Tor is the strongest tool for privacy and freedom online." +msgstr "" + +#: https//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 "" #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) msgid "" -"You’re equipped to browse freely. Tor is the strongest tool for privacy and " -"freedom online. It is free and open source software maintained by the Tor " -"Project and a community of volunteers worldwide. We need your help to keep " -"Tor secure and safe for millions across the globe. [Donate " -"Now](https://donate.torproject.org/)" +"We need your help to keep Tor secure and safe for millions across the globe." +" [Donate Now](https://donate.torproject.org/)" msgstr "" #: https//torproject.org/about/ (content/about/contents+en.lrpage.body) @@ -191,11 +198,6 @@ msgid "" msgstr "" #: https//torproject.org/about/history/ -#: (content/about/history/contents+en.lrpage.title) -msgid "History" -msgstr "Geçmiş" - -#: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) msgid "" "**Just like Tor users, the developers, researchers, and funders who’ve made " @@ -243,10 +245,21 @@ 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. That’s why in October 2002" -" when the Tor network was initially deployed, its code was released under a " -"free and open software license. By the end of 2003, the network had about a " -"dozen volunteer nodes, mostly in the U.S., plus one in Germany." +"and open to maximize transparency and separation." +msgstr "" + +#: https//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 "" + +#: https//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 "" #: https//torproject.org/about/history/ @@ -272,7 +285,13 @@ 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. Development of Tor Browser began in " +"began." +msgstr "" + +#: https//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 "" @@ -292,9 +311,14 @@ msgstr "" 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). 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 " +"2013](https://www.theguardian.com/us-news/the-nsa-files)." +msgstr "" + +#: https//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 "" @@ -303,9 +327,15 @@ msgstr "" msgid "" "People’s awareness of tracking, surveillance, and censorship may have " "increased, but so has the prevalence of these hindrances to internet " -"freedom. Today, the network has [thousands of " -"relays](http://metrics.torproject.org) run by volunteers and millions of " -"users worldwide. And it is this diversity that keeps Tor users safe." +"freedom." +msgstr "" + +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Today, the network has [thousands of relays](http://metrics.torproject.org) " +"run by volunteers and millions of users worldwide. And it is this diversity " +"that keeps Tor users safe." msgstr "" #: https//torproject.org/about/history/ @@ -1518,10 +1548,10 @@ msgstr "" #: (content/about/people/ssteele/contents+en.lrperson.description) msgid "" "A graduate of Widener University School of Law, Shari later served as a " -"teaching fellow at Georgetown University Law Center " -"<http://www.law.georgetown.edu/>, where she earned an LL.M. degree in " -"Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the Tor " -"Project Board of Directors since January 2019." +"teaching fellow at [Georgetown University Law " +"Center](https://www.law.georgetown.edu/), where she earned an LL.M. degree " +"in Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the " +"Tor Project Board of Directors since January 2019." msgstr "" #: https//torproject.org/about/people/hiro/ @@ -2047,11 +2077,6 @@ msgid "" msgstr "" #: https//torproject.org/about/sponsors/cymru/ -#: (content/about/sponsors/cymru/contents+en.lrsponsor.name) -msgid "Team Cymru" -msgstr "" - -#: https//torproject.org/about/sponsors/cymru/ #: (content/about/sponsors/cymru/contents+en.lrsponsor.description) msgid "" "Team Cymru has over a decade of experience and expertise at providing " @@ -2204,52 +2229,58 @@ 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. Select \"Tor is censored in my " -"country.\"" +"If you are in a country where Tor is blocked, you can configure Tor to " +"connect to a bridge during the setup process." msgstr "" -#: templates/download.html:12 +#: templates/download.html:10 +msgid "Select \"Tor is censored in my country.\"" +msgstr "" + +#: 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. Read other " -"FAQ’s at our <a href=\"https://support.torproject.org\">Support " -"Portal</a>." +"an incorrect system clock. Please make sure it’s set correctly." msgstr "" -#: templates/download.html:19 -msgid "Stay safe" +#: templates/download.html:14 +msgid "Read other FAQ’s at our Support Portal" msgstr "" #: templates/download.html:21 +msgid "Stay safe" +msgstr "" + +#: templates/download.html:23 msgid "Please do not torrent over Tor." msgstr "" -#: templates/download.html:22 +#: 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 "" -#: templates/download.html:25 +#: templates/download.html:27 +msgid "" +"We do not recommend installing additional add-ons or plugins into Tor " +"Browser" +msgstr "" + +#: templates/download.html:28 msgid "" -"We do not recommend installing additional add-ons or plugins into Tor" -" Browser, as these may bypass Tor or compromise your privacy. Tor Browser " +"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 "" -#: templates/download.html:37 +#: templates/download.html:40 #, python-format msgid "Check out the %s for more troubleshooting tips." msgstr "" -#: templates/download.html:45 -msgid "" -"Verify Tor Browser signature <a class=\"mx-auto\" " -"href=\"https://support.torproject.org/how-to-verify-signature\" " -"target=\"_blank\">here</a>." +#: templates/download.html:48 +msgid "Verify Tor Browser signature" msgstr "" #: templates/footer.html:9 templates/footer.html:13 @@ -2439,10 +2470,6 @@ msgstr "" msgid "Brand Assets" msgstr "" -#: templates/press.html:24 -msgid "The Tor Project" -msgstr "" - #: templates/press.html:27 msgid "The Tor Browser" msgstr "" @@ -2518,9 +2545,13 @@ 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. Further details about our " -"audited and reviewed funding can be found with our <a " -"href=\"/about/reports\" title=\"Reports\">Financial Reports.</a>" +"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 @@ -2528,29 +2559,17 @@ msgid "Want to join our community? Getting involved with Tor is easy." msgstr "" #: templates/thank-you.html:13 -msgid "Sign up" -msgstr "Kayıt ol" - -#: templates/thank-you.html:13 msgid "" -" for Tor News and get updates and opportunities from across the organization" -" and community." -msgstr "" - -#: templates/thank-you.html:17 -msgid "Run a relay" +"Sign up for Tor News and get updates and opportunities from across the " +"organization and community." msgstr "" #: templates/thank-you.html:17 -msgid " to make the network faster and more decentralized." -msgstr "" - -#: templates/thank-you.html:21 -msgid "Use your skills to" +msgid "Run a relay to make the network faster and more decentralized." msgstr "" #: templates/thank-you.html:21 -msgid " volunteer." +msgid "Use your skills to volunteer." msgstr "" #: templates/macros/downloads.html:47 diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 84e5d37dc..76d508b68 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -1,7 +1,6 @@ # Translators: # ducki2p <ducki2p(a)gmail.com>, 2019 # erinm, 2019 -# kwh(Kim Wan-Ho), 2019 # Xiaoyu Huang <007pig(a)gmail.com>, 2019 # Chi-Hsun Tsai, 2019 # Emma Peel, 2019 @@ -10,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-06 11:28+CET\n" +"POT-Creation-Date: 2019-03-07 19:57+CET\n" "PO-Revision-Date: 2019-01-10 12:38+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/94225/zh_CN/)\n" @@ -48,14 +47,15 @@ msgid "" msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.title) -msgid "contact" -msgstr "" +#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Contact" +msgstr "联系方式" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.section) #: https//torproject.org/press/ (content/press/contents+en.lrpress.section) #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.section) -msgid "the tor project" +msgid "The Tor Project" msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.body) @@ -77,16 +77,19 @@ msgstr "" #: (content/download/languages/contents+en.lrpage.section) #: https//torproject.org/download/options/ #: (content/download/options/contents+en.lrpage.section) -msgid "download" +msgid "Download" msgstr "下载" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.title) #: https//torproject.org/about/ (content/about/contents+en.lrpage.title) -msgid "history" -msgstr "" +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.title) +msgid "History" +msgstr "历史记录" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.section) -#: https//torproject.org/about/ (content/about/contents+en.lrpage.section) +#: (content/menu/contents+en.lrpage.body) https//torproject.org/about/ +#: (content/about/contents+en.lrpage.section) #: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.section) #: https//torproject.org/about/people/ @@ -97,10 +100,6 @@ msgstr "" #: (content/about/reports/contents+en.lrreports.section) #: https//torproject.org/about/jobs/ #: (content/about/jobs/contents+en.lrjobs.section) -msgid "about" -msgstr "关于" - -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "About" msgstr "关于" @@ -120,23 +119,33 @@ msgstr "博客" msgid "Newsletter" msgstr "新闻" -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) -msgid "Contact" -msgstr "联系方式" - #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.title) -msgid "success" +msgid "Success" +msgstr "成功" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "You’re equipped to browse freely." +msgstr "" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "Tor is the strongest tool for privacy and freedom online." msgstr "" #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) msgid "" -"You’re equipped to browse freely. Tor is the strongest tool for privacy and " -"freedom online. It is free and open source software maintained by the Tor " -"Project and a community of volunteers worldwide. We need your help to keep " -"Tor secure and safe for millions across the globe. [Donate " -"Now](https://donate.torproject.org/)" +"It is free and open source software maintained by the Tor Project and a " +"community of volunteers worldwide." +msgstr "" + +#: https//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 "" #: https//torproject.org/about/ (content/about/contents+en.lrpage.body) @@ -191,11 +200,6 @@ msgid "" msgstr "" #: https//torproject.org/about/history/ -#: (content/about/history/contents+en.lrpage.title) -msgid "History" -msgstr "历史记录" - -#: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) msgid "" "**Just like Tor users, the developers, researchers, and funders who’ve made " @@ -243,10 +247,21 @@ 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. That’s why in October 2002" -" when the Tor network was initially deployed, its code was released under a " -"free and open software license. By the end of 2003, the network had about a " -"dozen volunteer nodes, mostly in the U.S., plus one in Germany." +"and open to maximize transparency and separation." +msgstr "" + +#: https//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 "" + +#: https//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 "" #: https//torproject.org/about/history/ @@ -272,7 +287,13 @@ 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. Development of Tor Browser began in " +"began." +msgstr "" + +#: https//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 "" @@ -292,9 +313,14 @@ msgstr "" 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). 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 " +"2013](https://www.theguardian.com/us-news/the-nsa-files)." +msgstr "" + +#: https//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 "" @@ -303,9 +329,15 @@ msgstr "" msgid "" "People’s awareness of tracking, surveillance, and censorship may have " "increased, but so has the prevalence of these hindrances to internet " -"freedom. Today, the network has [thousands of " -"relays](http://metrics.torproject.org) run by volunteers and millions of " -"users worldwide. And it is this diversity that keeps Tor users safe." +"freedom." +msgstr "" + +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Today, the network has [thousands of relays](http://metrics.torproject.org) " +"run by volunteers and millions of users worldwide. And it is this diversity " +"that keeps Tor users safe." msgstr "" #: https//torproject.org/about/history/ @@ -1518,10 +1550,10 @@ msgstr "" #: (content/about/people/ssteele/contents+en.lrperson.description) msgid "" "A graduate of Widener University School of Law, Shari later served as a " -"teaching fellow at Georgetown University Law Center " -"<http://www.law.georgetown.edu/>, where she earned an LL.M. degree in " -"Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the Tor " -"Project Board of Directors since January 2019." +"teaching fellow at [Georgetown University Law " +"Center](https://www.law.georgetown.edu/), where she earned an LL.M. degree " +"in Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the " +"Tor Project Board of Directors since January 2019." msgstr "" #: https//torproject.org/about/people/hiro/ @@ -2047,11 +2079,6 @@ msgid "" msgstr "" #: https//torproject.org/about/sponsors/cymru/ -#: (content/about/sponsors/cymru/contents+en.lrsponsor.name) -msgid "Team Cymru" -msgstr "" - -#: https//torproject.org/about/sponsors/cymru/ #: (content/about/sponsors/cymru/contents+en.lrsponsor.description) msgid "" "Team Cymru has over a decade of experience and expertise at providing " @@ -2204,52 +2231,58 @@ 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. Select \"Tor is censored in my " -"country.\"" +"If you are in a country where Tor is blocked, you can configure Tor to " +"connect to a bridge during the setup process." msgstr "" -#: templates/download.html:12 +#: templates/download.html:10 +msgid "Select \"Tor is censored in my country.\"" +msgstr "" + +#: 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. Read other " -"FAQ’s at our <a href=\"https://support.torproject.org\">Support " -"Portal</a>." +"an incorrect system clock. Please make sure it’s set correctly." msgstr "" -#: templates/download.html:19 -msgid "Stay safe" +#: templates/download.html:14 +msgid "Read other FAQ’s at our Support Portal" msgstr "" #: templates/download.html:21 +msgid "Stay safe" +msgstr "" + +#: templates/download.html:23 msgid "Please do not torrent over Tor." msgstr "" -#: templates/download.html:22 +#: 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 "" -#: templates/download.html:25 +#: templates/download.html:27 +msgid "" +"We do not recommend installing additional add-ons or plugins into Tor " +"Browser" +msgstr "" + +#: templates/download.html:28 msgid "" -"We do not recommend installing additional add-ons or plugins into Tor" -" Browser, as these may bypass Tor or compromise your privacy. Tor Browser " +"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 "" -#: templates/download.html:37 +#: templates/download.html:40 #, python-format msgid "Check out the %s for more troubleshooting tips." msgstr "" -#: templates/download.html:45 -msgid "" -"Verify Tor Browser signature <a class=\"mx-auto\" " -"href=\"https://support.torproject.org/how-to-verify-signature\" " -"target=\"_blank\">here</a>." +#: templates/download.html:48 +msgid "Verify Tor Browser signature" msgstr "" #: templates/footer.html:9 templates/footer.html:13 @@ -2437,10 +2470,6 @@ msgstr "" msgid "Brand Assets" msgstr "" -#: templates/press.html:24 -msgid "The Tor Project" -msgstr "" - #: templates/press.html:27 msgid "The Tor Browser" msgstr "" @@ -2516,9 +2545,13 @@ 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. Further details about our " -"audited and reviewed funding can be found with our <a " -"href=\"/about/reports\" title=\"Reports\">Financial Reports.</a>" +"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 @@ -2526,29 +2559,17 @@ msgid "Want to join our community? Getting involved with Tor is easy." msgstr "" #: templates/thank-you.html:13 -msgid "Sign up" -msgstr "注册" - -#: templates/thank-you.html:13 msgid "" -" for Tor News and get updates and opportunities from across the organization" -" and community." -msgstr "" - -#: templates/thank-you.html:17 -msgid "Run a relay" +"Sign up for Tor News and get updates and opportunities from across the " +"organization and community." msgstr "" #: templates/thank-you.html:17 -msgid " to make the network faster and more decentralized." -msgstr "" - -#: templates/thank-you.html:21 -msgid "Use your skills to" +msgid "Run a relay to make the network faster and more decentralized." msgstr "" #: templates/thank-you.html:21 -msgid " volunteer." +msgid "Use your skills to volunteer." msgstr "" #: templates/macros/downloads.html:47 diff --git a/contents+zh-TW.po b/contents+zh-TW.po index 42c5fc441..f197e163d 100644 --- a/contents+zh-TW.po +++ b/contents+zh-TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-06 11:28+CET\n" +"POT-Creation-Date: 2019-03-07 19:57+CET\n" "PO-Revision-Date: 2019-01-10 12:38+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/otf/teams/94225/zh_TW/)\n" @@ -46,14 +46,15 @@ msgid "" msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.title) -msgid "contact" -msgstr "聯繫" +#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Contact" +msgstr "嬖" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.section) #: https//torproject.org/press/ (content/press/contents+en.lrpress.section) #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.section) -msgid "the tor project" +msgid "The Tor Project" msgstr "" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.body) @@ -75,16 +76,19 @@ msgstr "" #: (content/download/languages/contents+en.lrpage.section) #: https//torproject.org/download/options/ #: (content/download/options/contents+en.lrpage.section) -msgid "download" +msgid "Download" msgstr "下載" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.title) #: https//torproject.org/about/ (content/about/contents+en.lrpage.title) -msgid "history" -msgstr "" +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.title) +msgid "History" +msgstr "歷史" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.section) -#: https//torproject.org/about/ (content/about/contents+en.lrpage.section) +#: (content/menu/contents+en.lrpage.body) https//torproject.org/about/ +#: (content/about/contents+en.lrpage.section) #: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.section) #: https//torproject.org/about/people/ @@ -95,10 +99,6 @@ msgstr "" #: (content/about/reports/contents+en.lrreports.section) #: https//torproject.org/about/jobs/ #: (content/about/jobs/contents+en.lrjobs.section) -msgid "about" -msgstr "" - -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "About" msgstr "關於" @@ -118,23 +118,33 @@ msgstr "部落格" msgid "Newsletter" msgstr "" -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) -msgid "Contact" -msgstr "嬖" - #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.title) -msgid "success" +msgid "Success" +msgstr "成功" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "You’re equipped to browse freely." +msgstr "" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "Tor is the strongest tool for privacy and freedom online." +msgstr "" + +#: https//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 "" #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) msgid "" -"You’re equipped to browse freely. Tor is the strongest tool for privacy and " -"freedom online. It is free and open source software maintained by the Tor " -"Project and a community of volunteers worldwide. We need your help to keep " -"Tor secure and safe for millions across the globe. [Donate " -"Now](https://donate.torproject.org/)" +"We need your help to keep Tor secure and safe for millions across the globe." +" [Donate Now](https://donate.torproject.org/)" msgstr "" #: https//torproject.org/about/ (content/about/contents+en.lrpage.body) @@ -189,11 +199,6 @@ msgid "" msgstr "" #: https//torproject.org/about/history/ -#: (content/about/history/contents+en.lrpage.title) -msgid "History" -msgstr "歷史" - -#: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) msgid "" "**Just like Tor users, the developers, researchers, and funders who’ve made " @@ -241,10 +246,21 @@ 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. That’s why in October 2002" -" when the Tor network was initially deployed, its code was released under a " -"free and open software license. By the end of 2003, the network had about a " -"dozen volunteer nodes, mostly in the U.S., plus one in Germany." +"and open to maximize transparency and separation." +msgstr "" + +#: https//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 "" + +#: https//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 "" #: https//torproject.org/about/history/ @@ -270,7 +286,13 @@ 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. Development of Tor Browser began in " +"began." +msgstr "" + +#: https//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 "" @@ -290,9 +312,14 @@ msgstr "" 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). 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 " +"2013](https://www.theguardian.com/us-news/the-nsa-files)." +msgstr "" + +#: https//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 "" @@ -301,9 +328,15 @@ msgstr "" msgid "" "People’s awareness of tracking, surveillance, and censorship may have " "increased, but so has the prevalence of these hindrances to internet " -"freedom. Today, the network has [thousands of " -"relays](http://metrics.torproject.org) run by volunteers and millions of " -"users worldwide. And it is this diversity that keeps Tor users safe." +"freedom." +msgstr "" + +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Today, the network has [thousands of relays](http://metrics.torproject.org) " +"run by volunteers and millions of users worldwide. And it is this diversity " +"that keeps Tor users safe." msgstr "" #: https//torproject.org/about/history/ @@ -1516,10 +1549,10 @@ msgstr "" #: (content/about/people/ssteele/contents+en.lrperson.description) msgid "" "A graduate of Widener University School of Law, Shari later served as a " -"teaching fellow at Georgetown University Law Center " -"<http://www.law.georgetown.edu/>, where she earned an LL.M. degree in " -"Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the Tor " -"Project Board of Directors since January 2019." +"teaching fellow at [Georgetown University Law " +"Center](https://www.law.georgetown.edu/), where she earned an LL.M. degree " +"in Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the " +"Tor Project Board of Directors since January 2019." msgstr "" #: https//torproject.org/about/people/hiro/ @@ -2045,11 +2078,6 @@ msgid "" msgstr "" #: https//torproject.org/about/sponsors/cymru/ -#: (content/about/sponsors/cymru/contents+en.lrsponsor.name) -msgid "Team Cymru" -msgstr "" - -#: https//torproject.org/about/sponsors/cymru/ #: (content/about/sponsors/cymru/contents+en.lrsponsor.description) msgid "" "Team Cymru has over a decade of experience and expertise at providing " @@ -2202,52 +2230,58 @@ 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. Select \"Tor is censored in my " -"country.\"" +"If you are in a country where Tor is blocked, you can configure Tor to " +"connect to a bridge during the setup process." msgstr "" -#: templates/download.html:12 +#: templates/download.html:10 +msgid "Select \"Tor is censored in my country.\"" +msgstr "" + +#: 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. Read other " -"FAQ’s at our <a href=\"https://support.torproject.org\">Support " -"Portal</a>." +"an incorrect system clock. Please make sure it’s set correctly." msgstr "" -#: templates/download.html:19 -msgid "Stay safe" +#: templates/download.html:14 +msgid "Read other FAQ’s at our Support Portal" msgstr "" #: templates/download.html:21 +msgid "Stay safe" +msgstr "" + +#: templates/download.html:23 msgid "Please do not torrent over Tor." msgstr "" -#: templates/download.html:22 +#: 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 "" -#: templates/download.html:25 +#: templates/download.html:27 +msgid "" +"We do not recommend installing additional add-ons or plugins into Tor " +"Browser" +msgstr "" + +#: templates/download.html:28 msgid "" -"We do not recommend installing additional add-ons or plugins into Tor" -" Browser, as these may bypass Tor or compromise your privacy. Tor Browser " +"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 "" -#: templates/download.html:37 +#: templates/download.html:40 #, python-format msgid "Check out the %s for more troubleshooting tips." msgstr "" -#: templates/download.html:45 -msgid "" -"Verify Tor Browser signature <a class=\"mx-auto\" " -"href=\"https://support.torproject.org/how-to-verify-signature\" " -"target=\"_blank\">here</a>." +#: templates/download.html:48 +msgid "Verify Tor Browser signature" msgstr "" #: templates/footer.html:9 templates/footer.html:13 @@ -2435,10 +2469,6 @@ msgstr "" msgid "Brand Assets" msgstr "" -#: templates/press.html:24 -msgid "The Tor Project" -msgstr "" - #: templates/press.html:27 msgid "The Tor Browser" msgstr "" @@ -2514,9 +2544,13 @@ 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. Further details about our " -"audited and reviewed funding can be found with our <a " -"href=\"/about/reports\" title=\"Reports\">Financial Reports.</a>" +"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 @@ -2524,29 +2558,17 @@ msgid "Want to join our community? Getting involved with Tor is easy." msgstr "" #: templates/thank-you.html:13 -msgid "Sign up" -msgstr "註冊" - -#: templates/thank-you.html:13 msgid "" -" for Tor News and get updates and opportunities from across the organization" -" and community." -msgstr "" - -#: templates/thank-you.html:17 -msgid "Run a relay" +"Sign up for Tor News and get updates and opportunities from across the " +"organization and community." msgstr "" #: templates/thank-you.html:17 -msgid " to make the network faster and more decentralized." -msgstr "" - -#: templates/thank-you.html:21 -msgid "Use your skills to" +msgid "Run a relay to make the network faster and more decentralized." msgstr "" #: templates/thank-you.html:21 -msgid " volunteer." +msgid "Use your skills to volunteer." msgstr "" #: templates/macros/downloads.html:47 diff --git a/contents.pot b/contents.pot index 4bd221d26..69b55089b 100644 --- a/contents.pot +++ b/contents.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-06 11:28+CET\n" +"POT-Creation-Date: 2019-03-07 19:57+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL(a)li.org>\n" @@ -43,15 +43,16 @@ msgstr "" " and open networks. [Meet our team](about/people)." #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.title) -msgid "contact" -msgstr "contact" +#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Contact" +msgstr "Contact" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.section) #: https//torproject.org/press/ (content/press/contents+en.lrpress.section) #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.section) -msgid "the tor project" -msgstr "the tor project" +msgid "The Tor Project" +msgstr "The Tor Project" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.body) msgid "" @@ -77,16 +78,19 @@ msgstr "" #: (content/download/languages/contents+en.lrpage.section) #: https//torproject.org/download/options/ #: (content/download/options/contents+en.lrpage.section) -msgid "download" -msgstr "download" +msgid "Download" +msgstr "Download" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.title) #: https//torproject.org/about/ (content/about/contents+en.lrpage.title) -msgid "history" -msgstr "history" +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.title) +msgid "History" +msgstr "History" #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.section) -#: https//torproject.org/about/ (content/about/contents+en.lrpage.section) +#: (content/menu/contents+en.lrpage.body) https//torproject.org/about/ +#: (content/about/contents+en.lrpage.section) #: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.section) #: https//torproject.org/about/people/ @@ -97,10 +101,6 @@ msgstr "history" #: (content/about/reports/contents+en.lrreports.section) #: https//torproject.org/about/jobs/ #: (content/about/jobs/contents+en.lrjobs.section) -msgid "about" -msgstr "about" - -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "About" msgstr "About" @@ -120,29 +120,38 @@ msgstr "Blog" msgid "Newsletter" msgstr "Newsletter" -#: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body) -msgid "Contact" -msgstr "Contact" - #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.title) -msgid "success" -msgstr "success" +msgid "Success" +msgstr "Success" + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "You’re equipped to browse freely." +msgstr "You’re equipped to browse freely." + +#: https//torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "Tor is the strongest tool for privacy and freedom online." +msgstr "Tor is the strongest tool for privacy and freedom online." #: https//torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) msgid "" -"You’re equipped to browse freely. Tor is the strongest tool for privacy and " -"freedom online. It is free and open source software maintained by the Tor " -"Project and a community of volunteers worldwide. We need your help to keep " -"Tor secure and safe for millions across the globe. [Donate " -"Now](https://donate.torproject.org/)" +"It is free and open source software maintained by the Tor Project and a " +"community of volunteers worldwide." msgstr "" -"You’re equipped to browse freely. Tor is the strongest tool for privacy and " -"freedom online. It is free and open source software maintained by the Tor " -"Project and a community of volunteers worldwide. We need your help to keep " -"Tor secure and safe for millions across the globe. [Donate " -"Now](https://donate.torproject.org/)" +"It is free and open source software maintained by the Tor Project and a " +"community of volunteers worldwide." + +#: https//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 "" +"We need your help to keep Tor secure and safe for millions across the globe." +" [Donate Now](https://donate.torproject.org/)" #: https//torproject.org/about/ (content/about/contents+en.lrpage.body) #: https//torproject.org/about/history/ @@ -212,11 +221,6 @@ msgstr "" " and are not putting yourself at risk." #: https//torproject.org/about/history/ -#: (content/about/history/contents+en.lrpage.title) -msgid "History" -msgstr "History" - -#: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) msgid "" "**Just like Tor users, the developers, researchers, and funders who’ve made " @@ -286,18 +290,30 @@ 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. That’s why in October 2002" -" when the Tor network was initially deployed, its code was released under a " -"free and open software license. By the end of 2003, the network had about a " -"dozen volunteer nodes, mostly in the U.S., plus one in Germany." +"and open to maximize transparency and separation." msgstr "" "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. That’s why in October 2002" -" when the Tor network was initially deployed, its code was released under a " -"free and open software license. By the end of 2003, the network had about a " -"dozen volunteer nodes, mostly in the U.S., plus one in Germany." +"and open to maximize transparency and separation." + +#: https//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 "" +"That’s why in October 2002 when the Tor network was initially deployed, its " +"code was released under a free and open software license." + +#: https//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 "" +"By the end of 2003, the network had about a dozen volunteer nodes, mostly in" +" the U.S., plus one in Germany." #: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -329,14 +345,21 @@ 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. Development of Tor Browser began in " -"[2008](https://lists.torproject.org/pipermail/tor-" -"talk/2008-January/007837.html)." +"began." msgstr "" "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. Development of Tor Browser began in " +"began." + +#: https//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 "" +"Development of Tor Browser began in " "[2008](https://lists.torproject.org/pipermail/tor-" "talk/2008-January/007837.html)." @@ -360,16 +383,21 @@ msgstr "" 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). 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/)." +"2013](https://www.theguardian.com/us-news/the-nsa-files)." msgstr "" "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). 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 " +"2013](https://www.theguardian.com/us-news/the-nsa-files)." + +#: https//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 "" +"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/)." #: https//torproject.org/about/history/ @@ -377,15 +405,22 @@ msgstr "" msgid "" "People’s awareness of tracking, surveillance, and censorship may have " "increased, but so has the prevalence of these hindrances to internet " -"freedom. Today, the network has [thousands of " -"relays](http://metrics.torproject.org) run by volunteers and millions of " -"users worldwide. And it is this diversity that keeps Tor users safe." +"freedom." msgstr "" "People’s awareness of tracking, surveillance, and censorship may have " "increased, but so has the prevalence of these hindrances to internet " -"freedom. Today, the network has [thousands of " -"relays](http://metrics.torproject.org) run by volunteers and millions of " -"users worldwide. And it is this diversity that keeps Tor users safe." +"freedom." + +#: https//torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Today, the network has [thousands of relays](http://metrics.torproject.org) " +"run by volunteers and millions of users worldwide. And it is this diversity " +"that keeps Tor users safe." +msgstr "" +"Today, the network has [thousands of relays](http://metrics.torproject.org) " +"run by volunteers and millions of users worldwide. And it is this diversity " +"that keeps Tor users safe." #: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -1812,16 +1847,16 @@ msgstr "" #: (content/about/people/ssteele/contents+en.lrperson.description) msgid "" "A graduate of Widener University School of Law, Shari later served as a " -"teaching fellow at Georgetown University Law Center " -"<http://www.law.georgetown.edu/>, where she earned an LL.M. degree in " -"Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the Tor " -"Project Board of Directors since January 2019." +"teaching fellow at [Georgetown University Law " +"Center](https://www.law.georgetown.edu/), where she earned an LL.M. degree " +"in Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the " +"Tor Project Board of Directors since January 2019." msgstr "" "A graduate of Widener University School of Law, Shari later served as a " -"teaching fellow at Georgetown University Law Center " -"<http://www.law.georgetown.edu/>, where she earned an LL.M. degree in " -"Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the Tor " -"Project Board of Directors since January 2019." +"teaching fellow at [Georgetown University Law " +"Center](https://www.law.georgetown.edu/), where she earned an LL.M. degree " +"in Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the " +"Tor Project Board of Directors since January 2019." #: https//torproject.org/about/people/hiro/ #: (content/about/people/hiro/contents+en.lrperson.description) @@ -2462,11 +2497,6 @@ msgstr "" "a privacy-focused train-the-trainer program for librarians." #: https//torproject.org/about/sponsors/cymru/ -#: (content/about/sponsors/cymru/contents+en.lrsponsor.name) -msgid "Team Cymru" -msgstr "Team Cymru" - -#: https//torproject.org/about/sponsors/cymru/ #: (content/about/sponsors/cymru/contents+en.lrsponsor.description) msgid "" "Team Cymru has over a decade of experience and expertise at providing " @@ -2643,37 +2673,37 @@ msgstr "Get connected" #: 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. Select \"Tor is censored in my " -"country.\"" +"If you are in a country where Tor is blocked, you can configure Tor to " +"connect to a bridge during the setup process." msgstr "" -"If you are in a country where Tor is blocked, you can configure Tor to connect to a bridge during the " -"setup process. Select \"Tor is censored in my " -"country.\"" +"If you are in a country where Tor is blocked, you can configure Tor to " +"connect to a bridge during the setup process." -#: templates/download.html:12 +#: templates/download.html:10 +msgid "Select \"Tor is censored in my country.\"" +msgstr "Select \"Tor is censored in my country.\"" + +#: 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. Read other " -"FAQ’s at our <a href=\"https://support.torproject.org\">Support " -"Portal</a>." +"an incorrect system clock. Please make sure it’s set correctly." msgstr "" "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. Read other " -"FAQ’s at our <a href=\"https://support.torproject.org\">Support " -"Portal</a>." +"an incorrect system clock. Please make sure it’s set correctly." + +#: templates/download.html:14 +msgid "Read other FAQ’s at our Support Portal" +msgstr "Read other FAQ’s at our Support Portal" -#: templates/download.html:19 +#: templates/download.html:21 msgid "Stay safe" msgstr "Stay safe" -#: templates/download.html:21 +#: templates/download.html:23 msgid "Please do not torrent over Tor." msgstr "Please do not torrent over Tor." -#: templates/download.html:22 +#: 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." @@ -2681,32 +2711,32 @@ msgstr "" "Tor Browser will block browser plugins such as Flash, RealPlayer, Quicktime," " and others: they can be manipulated into revealing your IP address." -#: templates/download.html:25 +#: templates/download.html:27 msgid "" -"We do not recommend installing additional add-ons or plugins into Tor" -" Browser, as these may bypass Tor or compromise your privacy. Tor Browser " +"We do not recommend installing additional add-ons or plugins into Tor " +"Browser" +msgstr "" +"We do not recommend installing additional add-ons or plugins into 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 "" -"We do not recommend installing additional add-ons or plugins into Tor" -" Browser, as these may bypass Tor or compromise your privacy. Tor Browser " +"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." -#: templates/download.html:37 +#: templates/download.html:40 #, python-format msgid "Check out the %s for more troubleshooting tips." msgstr "Check out the %s for more troubleshooting tips." -#: templates/download.html:45 -msgid "" -"Verify Tor Browser signature <a class=\"mx-auto\" " -"href=\"https://support.torproject.org/how-to-verify-signature\" " -"target=\"_blank\">here</a>." -msgstr "" -"Verify Tor Browser signature <a class=\"mx-auto\" " -"href=\"https://support.torproject.org/how-to-verify-signature\" " -"target=\"_blank\">here</a>." +#: templates/download.html:48 +msgid "Verify Tor Browser signature" +msgstr "Verify Tor Browser signature" #: templates/footer.html:9 templates/footer.html:13 #: templates/hero-home.html:13 templates/navbar.html:57 @@ -2920,10 +2950,6 @@ msgstr "Write to a mailing list" msgid "Brand Assets" msgstr "Brand Assets" -#: templates/press.html:24 -msgid "The Tor Project" -msgstr "The Tor Project" - #: templates/press.html:27 msgid "The Tor Browser" msgstr "The Tor Browser" @@ -3003,46 +3029,38 @@ msgstr "Past Sponsors" #: 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. Further details about our " -"audited and reviewed funding can be found with our <a " -"href=\"/about/reports\" title=\"Reports\">Financial Reports.</a>" +"in-kind donations, contract, and other data." msgstr "" "This sponsors page is based upon un-audited and un-reviewed financial and " -"in-kind donations, contract, and other data. Further details about our " -"audited and reviewed funding can be found with our <a " -"href=\"/about/reports\" title=\"Reports\">Financial Reports.</a>" +"in-kind donations, contract, and other data." + +#: templates/sponsors.html:36 +msgid "" +"Further details about our audited and reviewed funding can be found with our" +" Financial Reports." +msgstr "" +"Further details about our audited and reviewed funding can be found with our" +" Financial Reports." #: templates/thank-you.html:6 msgid "Want to join our community? Getting involved with Tor is easy." msgstr "Want to join our community? Getting involved with Tor is easy." #: templates/thank-you.html:13 -msgid "Sign up" -msgstr "Sign up" - -#: templates/thank-you.html:13 msgid "" -" for Tor News and get updates and opportunities from across the organization" -" and community." +"Sign up for Tor News and get updates and opportunities from across the " +"organization and community." msgstr "" -" for Tor News and get updates and opportunities from across the organization" -" and community." - -#: templates/thank-you.html:17 -msgid "Run a relay" -msgstr "Run a relay" +"Sign up for Tor News and get updates and opportunities from across the " +"organization and community." #: templates/thank-you.html:17 -msgid " to make the network faster and more decentralized." -msgstr " to make the network faster and more decentralized." - -#: templates/thank-you.html:21 -msgid "Use your skills to" -msgstr "Use your skills to" +msgid "Run a relay to make the network faster and more decentralized." +msgstr "Run a relay to make the network faster and more decentralized." #: templates/thank-you.html:21 -msgid " volunteer." -msgstr " volunteer." +msgid "Use your skills to volunteer." +msgstr "Use your skills to volunteer." #: templates/macros/downloads.html:47 msgid "tor browser manual"

1 0

[meek/webextension] Look for EOF on stdin while grepping for the helper address.
by dcf＠torproject.org 07 Mar '19

07 Mar '19

commit 01ea27b4c59cd8ae17e608006cd7a9a16ba282c4 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Feb 23 00:23:51 2019 -0700 Look for EOF on stdin while grepping for the helper address. This way, we still exit when the parent process dies, even if for whatever reason Firefox doesn't give us a helper address. https://bugs.torproject.org/29559 --- meek-client-torbrowser/meek-client-torbrowser.go | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index f3ffc68..16f0ebc 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -370,10 +370,25 @@ func main() { defer logKill(firefoxCmd.Process) // Find out the helper's listening address. - helperAddr, err := grepHelperAddr(stdout) - if err != nil { + addrChan := make(chan string) + errChan := make(chan error) + go func() { + addr, err := grepHelperAddr(stdout) + if err == nil { + addrChan <- addr + } else { + errChan <- err + } + }() + var helperAddr string + select { + case sig := <-sigChan: + log.Printf("sig %s", sig) + return + case err = <-errChan: log.Print(err) return + case helperAddr = <-addrChan: } // Start meek-client with the helper address.

1 0

[meek/webextension] Minor refactoring of meek-client-torbrowser.
by dcf＠torproject.org 07 Mar '19

07 Mar '19

commit a0aa256c3bf692b31117acb6d885a0b012661014 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Feb 22 16:42:41 2019 -0700 Minor refactoring of meek-client-torbrowser. --- meek-client-torbrowser/meek-client-torbrowser.go | 65 ++++++++++++------------ 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 2daa108..f3ffc68 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -203,6 +203,30 @@ func isBrowserProfileUpToDate(templatePath string, profilePath string) bool { // the path to the Firefox profile to use. Otherwise, the profile is chosen in a // platform-specific way (see linux.go, mac.go, windows.go). func runFirefox() (cmd *exec.Cmd, stdout io.Reader, err error) { + // Unset environment variables that Firefox sets after a restart (as + // caused by, for example, an update or the installation of an add-on). + // XRE_PROFILE_PATH, in particular, overrides the -profile option that + // runFirefox sets, causing Firefox to run with profile.default instead + // of profile.meek-http-helper, which conflicts with the profile.default + // that is already running. See https://bugs.torproject.org/13247, + // particularly #comment:17 and #comment:18. The environment variable + // names come from + // https://hg.mozilla.org/mozilla-central/file/cfde3603b020/toolkit/xre/nsAppR… + for _, varname := range []string{ + "XRE_PROFILE_PATH", + "XRE_PROFILE_LOCAL_PATH", + "XRE_PROFILE_NAME", + "XRE_START_OFFLINE", + "NO_EM_RESTART", + "XUL_APP_FILE", + "XRE_BINARY_PATH", + } { + err = os.Unsetenv(varname) + if err != nil { + return + } + } + // Mac OS X needs absolute paths for firefox and for the profile. var absFirefoxPath string absFirefoxPath, err = filepath.Abs(firefoxPath) @@ -327,29 +351,14 @@ func main() { sigChan := make(chan os.Signal, 1) signal.Notify(sigChan, syscall.SIGTERM) - // Unset environment variables that Firefox sets after a restart (as - // caused by, for example, an update or the installation of an add-on). - // XRE_PROFILE_PATH, in particular, overrides the -profile option that - // runFirefox sets, causing Firefox to run with profile.default instead - // of profile.meek-http-helper, which conflicts with the profile.default - // that is already running. See https://bugs.torproject.org/13247, - // particularly #comment:17 and #comment:18. The environment variable - // names come from - // https://hg.mozilla.org/mozilla-central/file/cfde3603b020/toolkit/xre/nsAppR… - var firefoxRestartEnvVars = []string{ - "XRE_PROFILE_PATH", - "XRE_PROFILE_LOCAL_PATH", - "XRE_PROFILE_NAME", - "XRE_START_OFFLINE", - "NO_EM_RESTART", - "XUL_APP_FILE", - "XRE_BINARY_PATH", - } - for _, varname := range firefoxRestartEnvVars { - err := os.Unsetenv(varname) - if err != nil { - log.Fatal(err) - } + if os.Getenv("TOR_PT_EXIT_ON_STDIN_CLOSE") == "1" { + // This environment variable means we should treat EOF on stdin + // just like SIGTERM: https://bugs.torproject.org/15435. + go func() { + io.Copy(ioutil.Discard, os.Stdin) + log.Print("synthesizing SIGTERM because of stdin close") + sigChan <- syscall.SIGTERM + }() } // Start firefox. @@ -375,16 +384,6 @@ func main() { } defer logKill(meekClientCmd.Process) - if os.Getenv("TOR_PT_EXIT_ON_STDIN_CLOSE") == "1" { - // This environment variable means we should treat EOF on stdin - // just like SIGTERM: https://bugs.torproject.org/15435. - go func() { - io.Copy(ioutil.Discard, os.Stdin) - log.Printf("synthesizing SIGTERM because of stdin close") - sigChan <- syscall.SIGTERM - }() - } - sig := <-sigChan log.Printf("sig %s", sig) err = logSignal(meekClientCmd.Process, sig)

1 0

[meek/webextension] Tests for grepHelperAddr.
by dcf＠torproject.org 07 Mar '19

07 Mar '19

commit a07bb28ba27c4f3336c7d685f0016a75e985811d Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 5 13:17:35 2019 -0700 Tests for grepHelperAddr. --- meek-client-torbrowser/protocol_test.go | 88 +++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/meek-client-torbrowser/protocol_test.go b/meek-client-torbrowser/protocol_test.go new file mode 100644 index 0000000..e127c4f --- /dev/null +++ b/meek-client-torbrowser/protocol_test.go @@ -0,0 +1,88 @@ +package main + +import ( + "bytes" + "errors" + "io" + "testing" + "time" +) + +const timeout = 50 * time.Millisecond +var errTimedout = errors.New("timed out") + +type infiniteReader struct{} + +func (r *infiniteReader) Read(p []byte) (int, error) { + for i := range p { + p[i] = '\n' + } + return len(p), nil +} + +func grepHelperAddrTimeout(r io.Reader) (string, error) { + type result struct { + s string + err error + } + ch := make(chan result) + go func() { + s, err := grepHelperAddr(r) + ch <- result { + s: s, + err: err, + } + }() + + select { + case result := <-ch: + return result.s, result.err + case <-time.After(timeout): + return "", errTimedout + } +} + +func TestGrepHelperAddr(t *testing.T) { + const expectedAddr = "127.0.0.1:1000" + + // bad tests + for _, test := range []string{ + "", + "xmeek-http-helper: listen " + expectedAddr + "\n", + "meek-http-helper: listen 127.0.0.1:\n", + "meek-http-helper: listen " + expectedAddr + " \n", + "meek-http-helper: listen " + expectedAddr + "abc\n", + } { + b := bytes.NewBufferString(test) + s, err := grepHelperAddrTimeout(b) + if err != io.EOF { + t.Errorf("%q → (%q, %v), should have been %v", test, s, err, io.EOF) + } + // test again with an endless reader + b = bytes.NewBufferString(test) + s, err = grepHelperAddrTimeout(io.MultiReader(b, &infiniteReader{})) + if err != errTimedout { + t.Errorf("%q → (%q, %v), should have been %v", test, s, err, errTimedout) + } + } + + // good tests + for _, test := range []string{ + "meek-http-helper: listen " + expectedAddr, + "meek-http-helper: listen " + expectedAddr+ "\njunk", + "junk\nmeek-http-helper: listen " + expectedAddr + "\njunk", + "meek-http-helper: listen " + expectedAddr + "\nmeek-http-helper: listen 1.2.3.4:9999\n", + } { + b := bytes.NewBufferString(test) + s, err := grepHelperAddrTimeout(b) + if err != nil || s != expectedAddr { + t.Errorf("%q → (%q, %v), should have been %q", test, s, err, expectedAddr) + } + // test again with an endless reader + b = bytes.NewBufferString(test) + s, err = grepHelperAddrTimeout(io.MultiReader(b, &infiniteReader{})) + if err != nil || s != expectedAddr { + t.Errorf("%q → (%q, %v), should have been %q", test, s, err, expectedAddr) + } + } +}

1 0

[meek/webextension] fmt.
by dcf＠torproject.org 07 Mar '19

07 Mar '19

commit 975c534e07f43ffa66833f46857d193f9535be78 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 5 16:20:22 2019 -0700 fmt. --- meek-client-torbrowser/protocol_test.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meek-client-torbrowser/protocol_test.go b/meek-client-torbrowser/protocol_test.go index 63e48d2..48db95f 100644 --- a/meek-client-torbrowser/protocol_test.go +++ b/meek-client-torbrowser/protocol_test.go @@ -9,6 +9,7 @@ import ( ) const timeout = 50 * time.Millisecond + var errTimedout = errors.New("timed out") type infiniteReader struct{} @@ -22,14 +23,14 @@ func (r *infiniteReader) Read(p []byte) (int, error) { func grepHelperAddrTimeout(r io.Reader) (string, error) { type result struct { - s string + s string err error } ch := make(chan result) go func() { s, err := grepHelperAddr(r) - ch <- result { - s: s, + ch <- result{ + s: s, err: err, } }() @@ -69,7 +70,7 @@ func TestGrepHelperAddr(t *testing.T) { // good tests for _, test := range []string{ "meek-http-helper: listen " + expectedAddr, - "meek-http-helper: listen " + expectedAddr+ "\njunk", + "meek-http-helper: listen " + expectedAddr + "\njunk", "junk\nmeek-http-helper: listen " + expectedAddr + "\njunk", "meek-http-helper: listen " + expectedAddr + "\nmeek-http-helper: listen 1.2.3.4:9999\n", } {

1 0

[meek/webextension] Can use bytes.Reader, don't need bytes.Buffer.
by dcf＠torproject.org 07 Mar '19

07 Mar '19

commit 5848703da3fbf48b4d67b5abd48171cd4935dca7 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 5 16:19:50 2019 -0700 Can use bytes.Reader, don't need bytes.Buffer. --- meek-client-torbrowser/protocol_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meek-client-torbrowser/protocol_test.go b/meek-client-torbrowser/protocol_test.go index e127c4f..63e48d2 100644 --- a/meek-client-torbrowser/protocol_test.go +++ b/meek-client-torbrowser/protocol_test.go @@ -53,13 +53,13 @@ func TestGrepHelperAddr(t *testing.T) { "meek-http-helper: listen " + expectedAddr + " \n", "meek-http-helper: listen " + expectedAddr + "abc\n", } { - b := bytes.NewBufferString(test) + b := bytes.NewReader([]byte(test)) s, err := grepHelperAddrTimeout(b) if err != io.EOF { t.Errorf("%q → (%q, %v), should have been %v", test, s, err, io.EOF) } // test again with an endless reader - b = bytes.NewBufferString(test) + b = bytes.NewReader([]byte(test)) s, err = grepHelperAddrTimeout(io.MultiReader(b, &infiniteReader{})) if err != errTimedout { t.Errorf("%q → (%q, %v), should have been %v", test, s, err, errTimedout) @@ -73,13 +73,13 @@ func TestGrepHelperAddr(t *testing.T) { "junk\nmeek-http-helper: listen " + expectedAddr + "\njunk", "meek-http-helper: listen " + expectedAddr + "\nmeek-http-helper: listen 1.2.3.4:9999\n", } { - b := bytes.NewBufferString(test) + b := bytes.NewReader([]byte(test)) s, err := grepHelperAddrTimeout(b) if err != nil || s != expectedAddr { t.Errorf("%q → (%q, %v), should have been %q", test, s, err, expectedAddr) } // test again with an endless reader - b = bytes.NewBufferString(test) + b = bytes.NewReader([]byte(test)) s, err = grepHelperAddrTimeout(io.MultiReader(b, &infiniteReader{})) if err != nil || s != expectedAddr { t.Errorf("%q → (%q, %v), should have been %q", test, s, err, expectedAddr)

1 0

[meek/webextension] Make a separate webextension/browser directory.
by dcf＠torproject.org 07 Mar '19

07 Mar '19

commit cf1e51dfe922c2c7965494e21bcc18bf9771f367 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 7 14:30:41 2019 -0700 Make a separate webextension/browser directory. --- webextension/README | 14 +++++++------- webextension/{ => browser}/Makefile | 0 webextension/{ => browser}/background.js | 0 webextension/{ => browser}/manifest.json | 0 webextension/{ => native}/meek.http.helper.json | 0 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/webextension/README b/webextension/README index a728842..5b958cb 100644 --- a/webextension/README +++ b/webextension/README @@ -12,18 +12,18 @@ These instructions require Firefox 65. 1. Compile the native application. cd native && go build -2. Edit meek.http.helper.json and set the "path" field to the path to - the native application. +2. Edit native/meek.http.helper.json and set the "path" field to the + path to the native application. "path": "/where/you/installed/native", -3. Copy the edited meek.http.helper.json file to the OS-appropriate - location. +3. Copy the edited native/meek.http.helper.json file to the + OS-appropriate location. # macOS mkdir -p ~/"Library/Application Support/Mozilla/NativeMessagingHosts/" - cp meek.http.helper.json ~/"Library/Application Support/Mozilla/NativeMessagingHosts/" + cp native/meek.http.helper.json ~/"Library/Application Support/Mozilla/NativeMessagingHosts/" # other Unix mkdir -p ~/.mozilla/native-messaging-hosts/ - cp meek.http.helper.json ~/.mozilla/native-messaging-hosts/ + cp native/meek.http.helper.json ~/.mozilla/native-messaging-hosts/ The meek.http.helper.json file is called the "host manifest" or "app manifest" and it tells the browser where to find the native part of the WebExtension. More information: @@ -35,7 +35,7 @@ These instructions require Firefox 65. This enables the extension to write to stdout. 5. In Firefox, go to about:debugging and click "Load Temporary - Add-on...". Find manifest.json and click Open. + Add-on...". Find browser/manifest.json and click Open. More information: https://developer.mozilla.org/en-US/docs/Tools/about:debugging#Loading_a_te… In the terminal, you should see a line like this, with a random port diff --git a/webextension/Makefile b/webextension/browser/Makefile similarity index 100% rename from webextension/Makefile rename to webextension/browser/Makefile diff --git a/webextension/background.js b/webextension/browser/background.js similarity index 100% rename from webextension/background.js rename to webextension/browser/background.js diff --git a/webextension/manifest.json b/webextension/browser/manifest.json similarity index 100% rename from webextension/manifest.json rename to webextension/browser/manifest.json diff --git a/webextension/meek.http.helper.json b/webextension/native/meek.http.helper.json similarity index 100% rename from webextension/meek.http.helper.json rename to webextension/native/meek.http.helper.json

1 0

[meek/webextension] Merge branch 'master' into webextension
by dcf＠torproject.org 07 Mar '19

07 Mar '19

commit 7530db5bb8ba90c3c895fbc166e8aba9f984868c Merge: 068306e 975c534 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 7 15:54:11 2019 -0700 Merge branch 'master' into webextension meek-client-torbrowser/meek-client-torbrowser.go | 84 ++++++++++++---------- meek-client-torbrowser/protocol_test.go | 89 ++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 35 deletions(-) diff --cc meek-client-torbrowser/meek-client-torbrowser.go index 48b055c,16f0ebc..37dcf6e --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@@ -203,6 -203,30 +203,30 @@@ func isBrowserProfileUpToDate(templateP // the path to the Firefox profile to use. Otherwise, the profile is chosen in a // platform-specific way (see linux.go, mac.go, windows.go). func runFirefox() (cmd *exec.Cmd, stdout io.Reader, err error) { + // Unset environment variables that Firefox sets after a restart (as + // caused by, for example, an update or the installation of an add-on). - // XRE_PROFILE_PATH, in particular, overrides the -profile option that ++ // XRE_PROFILE_PATH, in particular, overrides the --profile option that + // runFirefox sets, causing Firefox to run with profile.default instead + // of profile.meek-http-helper, which conflicts with the profile.default + // that is already running. See https://bugs.torproject.org/13247, + // particularly #comment:17 and #comment:18. The environment variable + // names come from + // https://hg.mozilla.org/mozilla-central/file/cfde3603b020/toolkit/xre/nsAppR… + for _, varname := range []string{ + "XRE_PROFILE_PATH", + "XRE_PROFILE_LOCAL_PATH", + "XRE_PROFILE_NAME", + "XRE_START_OFFLINE", + "NO_EM_RESTART", + "XUL_APP_FILE", + "XRE_BINARY_PATH", + } { + err = os.Unsetenv(varname) + if err != nil { + return + } + } + // Mac OS X needs absolute paths for firefox and for the profile. var absFirefoxPath string absFirefoxPath, err = filepath.Abs(firefoxPath)

1 0

[meek/webextension] Revise webextension instructions.
by dcf＠torproject.org 07 Mar '19

07 Mar '19

commit d8babfd4a3accb13b4e336724190166c47aa68b1 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 7 14:45:16 2019 -0700 Revise webextension instructions. --- README | 7 ++++++- webextension/README | 13 ++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/README b/README index e2f04bd..35568b6 100644 --- a/README +++ b/README @@ -45,7 +45,9 @@ Reflector web app that runs on Google App Engine. The reflector simply copies requests and responses to an instance of meek-server somewhere. firefox: -Browser extension for TLS camouflage. +Browser extension for TLS camouflage. Only works with versions of +Firefox below 60.0. Use the extension in the webextension for newer +versions of Firefox. meek-client: The client transport plugin, run by a censored client. @@ -70,6 +72,9 @@ terminateprocess-buffer: An auxiliary program used on Windows to assist with cleanup of subprocesses. +webextension: +Browser extension for TLS camouflage. + wsgi: A WSGI Python reflector. diff --git a/webextension/README b/webextension/README index 5b958cb..ceeb74a 100644 --- a/webextension/README +++ b/webextension/README @@ -9,12 +9,16 @@ meek-client, because the extension cannot open a socket by itself. These instructions require Firefox 65. +== Native component == + 1. Compile the native application. cd native && go build 2. Edit native/meek.http.helper.json and set the "path" field to the path to the native application. - "path": "/where/you/installed/native", + "path": "/path/to/meek/webextension/native/native", + More information: + https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Nati… 3. Copy the edited native/meek.http.helper.json file to the OS-appropriate location. @@ -24,11 +28,18 @@ These instructions require Firefox 65. # other Unix mkdir -p ~/.mozilla/native-messaging-hosts/ cp native/meek.http.helper.json ~/.mozilla/native-messaging-hosts/ + # Windows + Open regedit.exe and create a new registry key: + HKEY_LOCAL_MACHINE\SOFTWARE\Mozilla\NativeMessagingHosts\meek.http.helper + Set the default value to the path to meek.http.helper.json: + C:\path\to\meek\webextension\native\meek.http.helper.json The meek.http.helper.json file is called the "host manifest" or "app manifest" and it tells the browser where to find the native part of the WebExtension. More information: https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Nati… +== Browser component == + 4. Run Firefox in a terminal so you can see its stdout. In Firefox, go to about:config and set browser.dom.window.dump.enabled=true

1 0

[meek/webextension] Try deleting the registry key before exiting.
by dcf＠torproject.org 07 Mar '19

07 Mar '19

commit e80c5b3217914a033bfc2303f5e043a4bdb3488c Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 7 15:46:54 2019 -0700 Try deleting the registry key before exiting. --- meek-client-torbrowser/linux.go | 6 ++++++ meek-client-torbrowser/mac.go | 6 ++++++ meek-client-torbrowser/meek-client-torbrowser.go | 13 ++++++++++++- meek-client-torbrowser/windows.go | 15 ++++++++------- 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/meek-client-torbrowser/linux.go b/meek-client-torbrowser/linux.go index f728f1d..69ee7b7 100644 --- a/meek-client-torbrowser/linux.go +++ b/meek-client-torbrowser/linux.go @@ -29,3 +29,9 @@ func osSpecificCommandSetup(cmd *exec.Cmd) { func installHelperNativeManifest() error { return writeNativeManifestToFile(helperNativeManifestDir, helperNativeExecutablePath) } + +func uninstallHelperNativeManifest() error { + // Nothing to do here: the host manifest file is written inside the + // browser directory, so we assume we don't have to clean it up. + return nil +} diff --git a/meek-client-torbrowser/mac.go b/meek-client-torbrowser/mac.go index 995aca5..918a62e 100644 --- a/meek-client-torbrowser/mac.go +++ b/meek-client-torbrowser/mac.go @@ -42,3 +42,9 @@ func installHelperNativeManifest() error { // https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Nati… return writeNativeManifestToFile(filepath.Join(homeDir, "Mozilla", "NativeMessagingHosts"), helperNativeExecutablePath) } + +func uninstallHelperNativeManifest() error { + // Nothing to do here: the host manifest file is written inside the + // browser directory, so we assume we don't have to clean it up. + return nil +} diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 37dcf6e..f482fb3 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -15,6 +15,11 @@ // executed as given, except that a --helper option is added that points to the // port number read from firefox. // +// On Windows, this program assumes that is has exclusive control over the +// HKEY_CURRENT_USER\SOFTWARE\Mozilla\NativeMessagingHosts\meek.http.helper +// registry key. It creates the key when run and tries to delete it when +// exiting. +// // This program proxies stdin and stdout to and from meek-client, so it is // actually meek-client that drives the pluggable transport negotiation with // tor. @@ -375,7 +380,13 @@ func main() { log.Print(err) return } - defer logKill(firefoxCmd.Process) + defer func() { + logKill(firefoxCmd.Process) + err := uninstallHelperNativeManifest() + if err != nil { + log.Printf("uninstalling native host manifest: %v", err) + } + }() // Find out the helper's listening address. addrChan := make(chan string) diff --git a/meek-client-torbrowser/windows.go b/meek-client-torbrowser/windows.go index 907d1dc..c5c52a5 100644 --- a/meek-client-torbrowser/windows.go +++ b/meek-client-torbrowser/windows.go @@ -22,6 +22,7 @@ const ( // https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Nati… helperNativeManifestDir = "TorBrowser/Data/Browser/.mozilla/native-messaging-hosts" helperNativeExecutablePath = "TorBrowser/Tor/PluggableTransports/meek-http-helper.exe" + registryKey = `SOFTWARE\Mozilla\NativeMessagingHosts\`+nativeAppName ) func osSpecificCommandSetup(cmd *exec.Cmd) { @@ -39,16 +40,16 @@ func installHelperNativeManifest() error { return err } - // TODO: Find a way to do this without having to write to the registry. - // https://bugs.torproject.org/29347#comment:9 + // On Windows we must set a registry key pointing to the host manifest. + // We'll attempt to delete the key in uninstallHelperNativeManifest. // https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Nati… - k, _, err := registry.CreateKey( - registry.CURRENT_USER, - `SOFTWARE\Mozilla\NativeMessagingHosts\`+nativeAppName, - registry.WRITE, - ) + k, _, err := registry.CreateKey(registry.CURRENT_USER, registryKey, registry.WRITE) if err != nil { return err } return k.SetStringValue("", absManifestPath) } + +func uninstallHelperNativeManifest() error { + return registry.DeleteKey(registry.CURRENT_USER, registryKey) +}

1 0

Jump to page: