May 2020 - tor-commits - lists.torproject.org

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 29 May '20

29 May '20

commit 57b67c5cfe114184e436b8c7607b53da5b4d6680 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 29 23:20:17 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+es.po | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/contents+es.po b/contents+es.po index 6ee621e434..ceade37c09 100644 --- a/contents+es.po +++ b/contents+es.po @@ -9,6 +9,7 @@ # David Figuera <dfb(a)fastmail.com>, 2020 # Emma Peel, 2020 # Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2020 +# deimidis <guillermo.movia(a)gmail.com>, 2020 # msgid "" msgstr "" @@ -16,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-04-12 08:00+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2020\n" +"Last-Translator: deimidis <guillermo.movia(a)gmail.com>, 2020\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -657,11 +658,13 @@ msgid "" "The first checkbox asks if access to the Tor network is blocked or censored " "on your connection." msgstr "" +"La primera casilla de verificación pregunta si el acceso a la red Tor está " +"bloqueado o censurado en tu conexión." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "If you do not believe this is the case, leave this unchecked." -msgstr "" +msgstr "Si crees que ese no es el caso, dejala sin seleccionar." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -679,6 +682,8 @@ msgid "" "This will display the [Circumvention](../circumvention) section to configure" " a pluggable transport." msgstr "" +"Esto mostrará la sección de [Evasión](../evasion) para configurar un " +"transporte conectable." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -693,6 +698,10 @@ msgid "" "checkbox because the same settings will be used for other browsers on your " "system." msgstr "" +"La segunda casilla de verificación pregunta si tu conexión usa un proxy. En " +"la mayoría de los casos, esto no es necesario. Usualmente sabrás si debes " +"elegir esta opción, porque la misma funcionalidad será usada para otros " +"navegadores en tu sistema." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -702,7 +711,7 @@ msgstr "Si es posible, preguntale a tu administrador de red para que te guíe." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "If your connection does not use a proxy, click “Connect”." -msgstr "" +msgstr "Si tu conexión no usa un proxy, haz clic en \"Conectar\"." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.title) @@ -857,6 +866,8 @@ msgid "" "After checking the checkbox \"Tor is censored in my country,\" choose the " "\"Select a built-in bridge\" option." msgstr "" +"Después de seleccionar esta casilla \"Tor está censurado en mi país\", elige" +" la opción \"Elegir un puente incorporado\"." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body)

1 0

[tor-browser-build/master] Release preparations for 10.0a1
by sysrqb＠torproject.org 29 May '20

29 May '20

commit db927811143f4f124f24b435adf477f19fa306c2 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 21:25:47 2020 +0000 Release preparations for 10.0a1 Versions bump and Changelog update. --- projects/firefox-langpacks/config | 2 +- projects/firefox-locale-bundle/config | 2 +- projects/firefox/config | 6 +++--- projects/https-everywhere/config | 2 +- projects/tba-translation/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 22 ++++++++++++++++++++++ projects/tor-launcher/config | 2 +- rbm.conf | 6 +++--- 8 files changed, 33 insertions(+), 11 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 17a707a..34d6fad 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index 2ea6db6..2f4997f 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 diff --git a/projects/firefox/config b/projects/firefox/config index 272634d..a64763e 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,16 +1,16 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.8.0 + firefox_platform_version: 68.9.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' - torbrowser_branch: 9.5 + torbrowser_branch: 10.0 branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 7e5aa51..a5be759 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2020.3.16 +version: 2020.5.20 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tba-translation/config b/projects/tba-translation/config index 29388a4..ab5c04e 100644 --- a/projects/tba-translation/config +++ b/projects/tba-translation/config @@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/translation.git # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. -git_hash: d3df6cc6e1797733ebca5b370f0f6915f490666f +git_hash: d5bd416ac0cda30893e18f2eb511514bd2e698bd version: '[% c("abbrev") %]' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index ab1c7b8..a4e261c 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,25 @@ +Tor Browser 10.0a1 -- June 2 2020 + * All Platforms + * Update Firefox to 68.9.0esr + * Update HTTPS-Everywhere to 2020.5.20 + * Translations update + * Windows + OS X + Linux + * Update Tor Launcher to 0.2.21.8 + * Translations update + * Bug 34321: Add Learn More onboarding item + * Linux + * Bug 34315: Avoid reading policies from /etc/firefox on Linux + * Android + * Bug 30318: Integrate snowflake into mobile Tor Browser + * Bug 34219: Enable ZSTD support properly for Android + * Build System + * Windows + * Bug 31128: Move Windows containers to Debian 10 + * Mac OS X + * Bug 31129: Move macOS containers to Debian 10 + * Android + * Bug 28672: Android reproducible build of Snowflake + Tor Browser 9.5a13 -- May 20 2020 * All Platforms * Bump NoScript to 11.0.26 diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index eb4dc24..9aaca27 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.21.7 +version: 0.2.21.8 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index f2d0f4f..d0afe9a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.5a13' - torbrowser_build: 'build2' + torbrowser_version: '10.0a1' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.5a12 + - 9.5a13 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 29 May '20

29 May '20

commit 06cb2c9974991c92780df09ce6429c14f13be3d6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 29 21:23:31 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+mr.po | 1370 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1370 insertions(+) diff --git a/contents+mr.po b/contents+mr.po new file mode 100644 index 0000000000..b56d4e443c --- /dev/null +++ b/contents+mr.po @@ -0,0 +1,1370 @@ +# +# Translators: +# Prachi Joshi <josprachi(a)yahoo.com>, 2019 +# erinm, 2020 +# vinay bichave <vinaybichave4(a)gmail.com>, 2020 +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-02-24 13:39+CET\n" +"PO-Revision-Date: 2019-03-09 10:41+0000\n" +"Last-Translator: vinay bichave <vinaybichave4(a)gmail.com>, 2020\n" +"Language-Team: Marathi (https://www.transifex.com/otf/teams/1519/mr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: mr\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: https//www.torproject.org/ (content/contents+en.lrpage.title) +msgid "Anonymity Online" +msgstr "" + +#: https//www.torproject.org/ (content/contents+en.lrpage.section) +msgid "home" +msgstr "" + +#: https//www.torproject.org/ (content/contents+en.lrpage.body) +msgid "###### ABOUT US ######" +msgstr "" + +#: https//www.torproject.org/ (content/contents+en.lrpage.body) +msgid "" +"We believe everyone should be able to explore the internet with privacy." +msgstr "" + +#: https//www.torproject.org/ (content/contents+en.lrpage.body) +msgid "We are the Tor Project, a 501(c)3 US nonprofit." +msgstr "" + +#: https//www.torproject.org/ (content/contents+en.lrpage.body) +msgid "" +"We advance human rights and defend your privacy online through free software" +" and open networks. [Meet our team](about/people)." +msgstr "" + +#: https//www.torproject.org/contact/ +#: (content/contact/contents+en.lrpage.title) +msgid "Contact" +msgstr "संपर्क" + +#: https//www.torproject.org/contact/ +#: (content/contact/contents+en.lrpage.section) +#: https//www.torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.section) +msgid "The Tor Project" +msgstr "" + +#: https//www.torproject.org/contact/ +#: (content/contact/contents+en.lrpage.body) +msgid "### Get Support" +msgstr "" + +#: https//www.torproject.org/contact/ +#: (content/contact/contents+en.lrpage.body) +msgid "" +"Need help? Visit our [Support Portal](https://support.torproject.org) for " +"answers to frequently asked questions about connecting to Tor, circumventing" +" censorship, using onion services, and more." +msgstr "" + +#: https//www.torproject.org/download/ +#: (content/download/contents+en.lrpage.title) +#: (content/download/contents+en.lrpage.section) +#: https//www.torproject.org/download/alpha/ +#: (content/download/alpha/contents+en.lrpage.section) +#: https//www.torproject.org/download/languages/ +#: (content/download/languages/contents+en.lrpage.section) +#: https//www.torproject.org/download/tor/ +#: (content/download/tor/contents+en.lrpage.section) +msgid "Download" +msgstr "" + +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.title) +msgid "Sponsors" +msgstr "" + +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.section) +#: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section) +#: https//www.torproject.org/about/cy-pres/ +#: (content/about/cy-pres/contents+en.lrpage.section) +#: https//www.torproject.org/about/trademark/ +#: (content/about/trademark/contents+en.lrtrademark.section) +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.section) +#: https//www.torproject.org/about/people/ +#: (content/about/people/contents+en.lrpeople.section) +#: https//www.torproject.org/about/sponsors/ +#: (content/about/sponsors/contents+en.lrsponsors.section) +#: https//www.torproject.org/about/reports/ +#: (content/about/reports/contents+en.lrreports.section) +#: https//www.torproject.org/about/jobs/ +#: (content/about/jobs/contents+en.lrjobs.section) +msgid "About" +msgstr "" + +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Documentation" +msgstr "" + +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Press" +msgstr "" + +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Support" +msgstr "समर्थन" + +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Jobs" +msgstr "" + +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Blog" +msgstr "" + +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Donate" +msgstr "दान " + +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Donate Now" +msgstr "दान करा " + +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Trademark" +msgstr "" + +#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) +msgid "Community" +msgstr "" + +#: https//www.torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.title) +msgid "Success" +msgstr "" + +#: https//www.torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "You're equipped to browse freely." +msgstr "" + +#: https//www.torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "Tor is the strongest tool for privacy and freedom online." +msgstr "" + +#: https//www.torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "" +"It is free and open source software maintained by the Tor Project and a " +"community of volunteers worldwide." +msgstr "" + +#: https//www.torproject.org/thank-you/ +#: (content/thank-you/contents+en.lrpage.body) +msgid "" +"We need your help to keep Tor secure and safe for millions across the globe." +" [Donate Now](https://donate.torproject.org/)" +msgstr "" + +#: https//www.torproject.org/about/ (content/about/contents+en.lrpage.title) +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.title) +msgid "History" +msgstr "History" + +#: https//www.torproject.org/download/alpha/ +#: (content/download/alpha/contents+en.lrpage.title) +msgid "Download Tor Browser Alpha" +msgstr "" + +#: https//www.torproject.org/download/alpha/ +#: (content/download/alpha/contents+en.lrpage.body) +msgid "" +"Before we release a stable version of our software, we release an alpha " +"version to test features and find bugs." +msgstr "" + +#: https//www.torproject.org/download/alpha/ +#: (content/download/alpha/contents+en.lrpage.body) +msgid "" +"Please only download an alpha if you are okay with some things not working " +"properly, want to help us find and [report " +"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not " +"putting yourself at risk." +msgstr "" + +#: https//www.torproject.org/download/languages/ +#: (content/download/languages/contents+en.lrpage.title) +msgid "Download Tor Browser in your language" +msgstr "" + +#: https//www.torproject.org/download/languages/ +#: (content/download/languages/contents+en.lrpage.body) +msgid "" +"We want everyone to be able to enjoy Tor Browser in their own language. Tor " +"Browser is now available in 32 different languages, and we are working to " +"add more. Want to help us translate? [See " +"here](https://community.torproject.org/localization/)" +msgstr "" + +#: https//www.torproject.org/download/tor/ +#: (content/download/tor/contents+en.lrpage.title) +msgid "Download Tor Source Code" +msgstr "" + +#: https//www.torproject.org/about/cy-pres/ +#: (content/about/cy-pres/contents+en.lrpage.title) +msgid "Cy Pres Awards" +msgstr "" + +#: https//www.torproject.org/about/cy-pres/ +#: (content/about/cy-pres/contents+en.lrpage.body) +msgid "### Cy Pres Awards – Consumer Privacy and Privacy Online" +msgstr "" + +#: https//www.torproject.org/about/cy-pres/ +#: (content/about/cy-pres/contents+en.lrpage.body) +msgid "" +"_Cy pres_ awards are funds distributed as a part of class action lawsuit " +"settlements in the United States. When the totality of the funds cannot be " +"distributed to class members, they can be distributed to nonprofit, " +"advocacy, and research groups that generally represent the class members. " +"Consumer privacy _cy pres_ awards can help the Tor Project to educate " +"individuals and organizations about how to retain their privacy online, " +"advocate for privacy protections, and build important free, open source " +"technologies that prioritize privacy." +msgstr "" + +#: https//www.torproject.org/about/cy-pres/ +#: (content/about/cy-pres/contents+en.lrpage.body) +msgid "#### About the Tor Project" +msgstr "" + +#: https//www.torproject.org/about/cy-pres/ +#: (content/about/cy-pres/contents+en.lrpage.body) +msgid "" +"The Tor Project is a U.S.-based 501(c)3 nonprofit founded in 2006 with the " +"mission of advancing human rights and freedoms by:" +msgstr "" + +#: https//www.torproject.org/about/cy-pres/ +#: (content/about/cy-pres/contents+en.lrpage.body) +msgid "" +"- Creating and deploying free and open anonymity and privacy technologies," +msgstr "" + +#: https//www.torproject.org/about/cy-pres/ +#: (content/about/cy-pres/contents+en.lrpage.body) +msgid "- Supporting their unrestricted availability and use, and" +msgstr "" + +#: https//www.torproject.org/about/cy-pres/ +#: (content/about/cy-pres/contents+en.lrpage.body) +msgid "- Furthering their scientific and popular understanding." +msgstr "" + +#: https//www.torproject.org/about/cy-pres/ +#: (content/about/cy-pres/contents+en.lrpage.body) +msgid "" +"The Tor Project and its surrounding community develop and distribute some of" +" the most popular and widely used free, open source privacy technologies: " +"Tor Browser and the Tor network." +msgstr "" + +#: https//www.torproject.org/about/cy-pres/ +#: (content/about/cy-pres/contents+en.lrpage.body) +msgid "" +"Beyond developing technology, the organization helps people retain their " +"privacy online. The Tor Project has educated thousands of activists, " +"journalists, human rights defenders, librarians, consumers, and average " +"internet users about how to protect and retain their privacy online." +msgstr "" + +#: https//www.torproject.org/about/cy-pres/ +#: (content/about/cy-pres/contents+en.lrpage.body) +msgid "" +"The Tor Project is recognized as a leading expert on privacy online, and is " +"[often turned to by the media for information about how individuals and " +"consumers can protect their privacy](https://www.torproject.org/press/)." +msgstr "" + +#: https//www.torproject.org/about/cy-pres/ +#: (content/about/cy-pres/contents+en.lrpage.body) +msgid "" +"In the past, the Tor Project has been the recipient of consumer privacy _cy " +"pres_ awards through the Rose Foundation's Consumer Privacy grants. The " +"organization has more than a decade of experience successfully delivering on" +" projects with funders and partners as varied as the U.S. State Department –" +" Bureau of Democracy, Human Rights, and Labor; National Science Foundation; " +"Defense Advanced Research Projects Agency (DARPA); and the Media Democracy " +"Fund." +msgstr "" + +#: https//www.torproject.org/about/cy-pres/ +#: (content/about/cy-pres/contents+en.lrpage.body) +msgid "#### Contact the Tor Project about a Cy Pres Award" +msgstr "" + +#: https//www.torproject.org/about/cy-pres/ +#: (content/about/cy-pres/contents+en.lrpage.body) +msgid "" +"If you would like to speak to somebody at the Tor Project about whether or " +"not the organization might be appropriate for a _cy pres_ award, please " +"contact Sarah Stevenson, Fundraising Director, at " +"[sstevenson@torproject.org](mailto:sstevenson@torproject.org)." +msgstr "" + +#: https//www.torproject.org/about/cy-pres/ +#: (content/about/cy-pres/contents+en.lrpage.body) +msgid "#### Further Reading" +msgstr "" + +#: https//www.torproject.org/about/cy-pres/ +#: (content/about/cy-pres/contents+en.lrpage.body) +msgid "- [The Tor Project in the Media](https://www.torproject.org/press/)" +msgstr "" + +#: https//www.torproject.org/about/cy-pres/ +#: (content/about/cy-pres/contents+en.lrpage.body) +msgid "" +"- [The Tor Project Financial " +"Reports](https://www.torproject.org/about/reports/)" +msgstr "" + +#: https//www.torproject.org/about/cy-pres/ +#: (content/about/cy-pres/contents+en.lrpage.body) +msgid "" +"- [The Tor Project Board Members and " +"Staff](https://www.torproject.org/about/people/)" +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"The Tor Project, Inc, became a 501(c)3 nonprofit in 2006, but the idea of " +"\"onion routing\" began in the mid 1990s." +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"**Just like Tor users, the developers, researchers, and founders who've made" +" Tor possible are a diverse group of people. But all of the people who have " +"been involved in Tor are united by a common belief: internet users should " +"have private access to an uncensored web.**" +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"In the 1990s, the lack of security on the internet and its ability to be " +"used for tracking and surveillance was becoming clear, and in 1995, David " +"Goldschlag, Mike Reed, and Paul Syverson at the U.S. Naval Research Lab " +"(NRL) asked themselves if there was a way to create internet connections " +"that don't reveal who is talking to whom, even to someone monitoring the " +"network." +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Their answer was to create and deploy the first research designs and " +"prototypes of onion routing." +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"The goal of onion routing was to have a way to use the internet with as much" +" privacy as possible, and the idea was to route traffic through multiple " +"servers and encrypt it each step of the way." +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "This is still a simple explanation for how Tor works today." +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"In the early 2000s, Roger Dingledine, a recent [Massachusetts Institute of " +"Technology (MIT)](https://web.mit.edu/) graduate, began working on an NRL " +"onion routing project with Paul Syverson." +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"To distinguish this original work at NRL from other onion routing efforts " +"that were starting to pop up elsewhere, Roger called the project Tor, which " +"stood for The Onion Routing. Nick Mathewson, a classmate of Roger's at MIT, " +"joined the project soon after." +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"From its inception in the 1990s, onion routing was conceived to rely on a " +"decentralized network. The network needed to be operated by entities with " +"diverse interests and trust assumptions, and the software needed to be free " +"and open to maximize transparency and separation." +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"That's why in October 2002 when the Tor network was initially deployed, its " +"code was released under a free and open software license." +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"By the end of 2003, the network had about a dozen volunteer nodes, mostly in" +" the U.S., plus one in Germany." +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Recognizing the benefit of Tor to digital rights, the [Electronic Frontier " +"Foundation (EFF)](https://www.eff.org/) began funding Roger's and Nick's " +"work on Tor in 2004. In 2006, the Tor Project, Inc., a 501(c)3 nonprofit " +"organization, was founded to maintain Tor's development." +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"In 2007, the organization began developing bridges to the Tor network to " +"address censorship, such as the need to get around government firewalls, in " +"order for its users to access the open web." +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Tor began gaining popularity among activists and tech-savvy users interested" +" in privacy, but it was still difficult for less-technically savvy people to" +" use, so starting in 2005, development of tools beyond just the Tor proxy " +"began." +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Development of Tor Browser began in " +"[2008](https://lists.torproject.org/pipermail/tor-" +"talk/2008-January/007837.html)." +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"With Tor Browser having made Tor more accessible to everyday internet users " +"and activists, Tor was an instrumental tool during the [Arab " +"Spring](https://en.wikipedia.org/wiki/Arab_Spring) beginning in late 2010. " +"It not only protected people's identity online but also allowed them to " +"access critical resources, social media, and websites which were blocked." +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"The need for tools safeguarding against mass surveillance became a " +"mainstream concern thanks to the [Snowden revelations in " +"2013](https://www.theguardian.com/world/interactive/2013/nov/01/snowden-nsa-" +"files-surveillance-revelations-decoded#section/1)." +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Not only was Tor instrumental to Snowden's whistleblowing, but content of " +"the documents also upheld assurances that, at that time, [Tor could not be " +"cracked](https://www.wired.com/story/the-grand-tor/)." +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"People's awareness of tracking, surveillance, and censorship may have " +"increased, but so has the prevalence of these hindrances to internet " +"freedom." +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"Today, the network has [thousands of relays](https://metrics.torproject.org)" +" run by volunteers and millions of users worldwide. And it is this diversity" +" that keeps Tor users safe." +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"We, at the Tor Project, fight every day for everyone to have private access " +"to an uncensored internet, and Tor has become the world's strongest tool for" +" privacy and freedom online." +msgstr "" + +#: https//www.torproject.org/about/history/ +#: (content/about/history/contents+en.lrpage.body) +msgid "" +"But Tor is more than just software. It is a labor of love produced by an " +"international community of people devoted to human rights. The Tor Project " +"is [deeply committed](https://blog.torproject.org/tor-social-contract) to " +"transparency and the safety of its users." +msgstr "" + +#: https//www.torproject.org/about/people/ +#: (content/about/people/contents+en.lrpeople.title) +msgid "People" +msgstr "" + +#: https//www.torproject.org/about/people/ +#: (content/about/people/contents+en.lrpeople.body) +msgid "" +"We are an international team who believes everyone should have private " +"access to the uncensored web." +msgstr "" + +#: https//www.torproject.org/about/sponsors/ +#: (content/about/sponsors/contents+en.lrsponsors.body) +msgid "" +"Having a diverse user base means we have diverse funding sources, too. Our " +"goal is to continue diversifying our funding. To inquire about sponsorship, " +"please email giving(at)torproject.org." +msgstr "" + +#: https//www.torproject.org/about/reports/ +#: (content/about/reports/contents+en.lrreports.body) +msgid "" +"The Tor Project, Inc. is a US 501(c)(3) nonprofit organization committed to " +"transparency in its work and reporting." +msgstr "" + +#: https//www.torproject.org/press/-new-release-tails/ +#: (content/press/new-release-tails/contents+en.lrpost.title) +msgid "New Release: Tails 3.12" +msgstr "" + +#: https//www.torproject.org/press/-new-release-tails/ +#: (content/press/new-release-tails/contents+en.lrpost.summary) +msgid "" +"This release fixes many security vulnerabilities. You should upgrade as soon" +" as possible." +msgstr "" + +#: https//www.torproject.org/press/-new-release-tails/ +#: (content/press/new-release-tails/contents+en.lrpost.summary) +msgid "" +"The biggest news for 3.12 is that we completely changed the installation " +"methods for Tails." +msgstr "" + +#: https//www.torproject.org/press/-new-release-tor/ +#: (content/press/new-release-tor/contents+en.lrpost.title) +msgid "New Release: Tor 0.4.0.1-alpha" +msgstr "" + +#: https//www.torproject.org/press/-new-release-tor/ +#: (content/press/new-release-tor/contents+en.lrpost.summary) +msgid "" +"There's a new alpha release available for download. If you build Tor from " +"source, you can download the source code for 0.4.0.1-alpha from the usual " +"place on the website." +msgstr "" + +#: https//www.torproject.org/press/-new-release-tor-browser/ +#: (content/press/new-release-tor-browser/contents+en.lrpost.title) +msgid "New Release: Tor Browser 8.5a10" +msgstr "" + +#: https//www.torproject.org/press/-new-release-tor-browser/ +#: (content/press/new-release-tor-browser/contents+en.lrpost.summary) +msgid "" +"Tor Browser 8.5a10 is now available from the <a " +"href=\"https://www.torproject.org/projects/torbrowser.html.en#downloads-" +"alpha\">Tor Browser Project page</a> and also from our <a " +"href=\"/dist/torbrowser/8.5a10/\">distribution directory</a>." +msgstr "" + +#: https//www.torproject.org/about/trademark/trademark-faq/ +#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title) +msgid "Tor Trademark Frequently Asked Questions" +msgstr "" + +#: lego/templates/banner.html:3 lego/templates/banner.html:5 +#: templates/banner.html:3 templates/banner.html:5 +msgid "Close banner" +msgstr "" + +#: lego/templates/banner.html:11 templates/banner.html:11 +msgid "Tracking, surveillance, and censorship are widespread online." +msgstr "" + +#: lego/templates/banner.html:20 templates/banner.html:20 +msgid "TAKE BACK THE INTERNET WITH TOR" +msgstr "" + +#: lego/templates/banner.html:33 lego/templates/banner.html:35 +#: templates/banner.html:33 templates/banner.html:35 +msgid "DONATE NOW" +msgstr "" + +#: lego/templates/banner.html:37 templates/banner.html:37 +msgid "Give today, and Mozilla will match your donation." +msgstr "" + +#: lego/templates/footer.html:13 lego/templates/footer.html:22 +#: lego/templates/navbar.html:83 templates/footer.html:13 +#: templates/footer.html:22 templates/hero-home.html:13 +#: templates/navbar.html:83 +msgid "Download Tor Browser" +msgstr "टॉर ब्राउझर डाउनलोड करा" + +#: lego/templates/footer.html:14 templates/footer.html:14 +msgid "" +"Download Tor Browser to experience real private browsing without tracking, " +"surveillance, or censorship." +msgstr "" + +#: lego/templates/footer.html:35 templates/footer-min.html:9 +#: templates/footer.html:35 +msgid "Our mission:" +msgstr "" + +#: lego/templates/footer.html:36 templates/footer-min.html:10 +#: templates/footer.html:36 +msgid "" +"To advance human rights and freedoms by creating and deploying free and open" +" source anonymity and privacy technologies, supporting their unrestricted " +"availability and use, and furthering their scientific and popular " +"understanding." +msgstr "" + +#: lego/templates/footer.html:73 templates/footer-min.html:46 +#: templates/footer.html:73 +msgid "Subscribe to our Newsletter" +msgstr "" + +#: lego/templates/footer.html:74 templates/footer-min.html:47 +#: templates/footer.html:74 +msgid "Get monthly updates and opportunities from the Tor Project:" +msgstr "" + +#: lego/templates/footer.html:75 templates/footer-min.html:48 +#: templates/footer.html:75 +msgid "Sign up" +msgstr "" + +#: lego/templates/footer.html:94 templates/footer-min.html:67 +#: templates/footer.html:94 +#, python-format +msgid "" +"Trademark, copyright notices, and rules for use by third parties can be " +"found in our %(link_to_faq)s" +msgstr "" + +#: lego/templates/navbar.html:25 templates/navbar.html:25 +msgid "Menu" +msgstr "" + +#: lego/templates/search.html:5 templates/search.html:5 +msgid "Search" +msgstr "शोध" + +#: lego/templates/secure-connections.html:1 +msgid "" +"The following visualization shows what information is visible to " +"eavesdroppers with and without Tor Browser and HTTPS encryption:" +msgstr "" + +#: lego/templates/secure-connections.html:4 +msgid "" +"Click the “Tor” button to see what data is visible to observers when you're " +"using Tor. The button will turn green to indicate that Tor is on." +msgstr "" + +#: lego/templates/secure-connections.html:5 +msgid "" +"Click the “HTTPS” button to see what data is visible to observers when " +"you're using HTTPS. The button will turn green to indicate that HTTPS is on." +msgstr "" + +#: lego/templates/secure-connections.html:6 +msgid "" +"When both buttons are green, you see the data that is visible to observers " +"when you are using both tools." +msgstr "" + +#: lego/templates/secure-connections.html:7 +msgid "" +"When both buttons are grey, you see the data that is visible to observers " +"when you don't use either tool." +msgstr "" + +#: lego/templates/secure-connections.html:11 +msgid "HTTPS" +msgstr "HTTPS" + +#: lego/templates/secure-connections.html:15 +#: lego/templates/secure-connections.html:65 +msgid "Tor" +msgstr "Tor" + +#: lego/templates/secure-connections.html:32 +msgid "POTENTIALLY VISIBLE DATA" +msgstr "" + +#: lego/templates/secure-connections.html:37 +msgid "Site.com" +msgstr "" + +#: lego/templates/secure-connections.html:40 +msgid "The site being visited." +msgstr "" + +#: lego/templates/secure-connections.html:44 +msgid "user / pw" +msgstr "" + +#: lego/templates/secure-connections.html:47 +msgid "Username and password used for authentication." +msgstr "" + +#: lego/templates/secure-connections.html:51 +msgid "data" +msgstr "" + +#: lego/templates/secure-connections.html:54 +msgid "Data being transmitted." +msgstr "" + +#: lego/templates/secure-connections.html:58 +msgid "location" +msgstr "" + +#: lego/templates/secure-connections.html:61 +msgid "" +"Network location of the computer used to visit the website (the public IP " +"address)." +msgstr "" + +#: lego/templates/secure-connections.html:68 +msgid "Whether or not Tor is being used." +msgstr "" + +#: templates/contact.html:8 +msgid "Chat with us on" +msgstr "" + +#: templates/contact.html:9 +msgid "Ask questions about using Tor." +msgstr "" + +#: templates/contact.html:10 +msgid "Discuss Tor-related coding and protocols. Ideas are welcome." +msgstr "" + +#: templates/contact.html:11 +msgid "Get in touch with other translators" +msgstr "" + +#: templates/contact.html:12 +msgid "Watch or join publicly logged team meetings." +msgstr "" + +#: templates/contact.html:13 +msgid "" +"Discuss organization and community related topics: meetups and outreach." +msgstr "" + +#: templates/contact.html:14 +msgid "Discuss running a Tor relay." +msgstr "" + +#: templates/contact.html:15 +msgid "Talk with Tor's global south community." +msgstr "" + +#: templates/contact.html:16 +msgid "Talk with us about improvements on our websites." +msgstr "" + +#: templates/contact.html:17 +msgid "Discuss UX related ideas." +msgstr "" + +#: templates/contact.html:23 +msgid "Find us on Social Media" +msgstr "" + +#: templates/contact.html:37 +msgid "Volunteer with Tor" +msgstr "" + +#: templates/contact.html:41 +msgid "Get Involved" +msgstr "" + +#: templates/contact.html:47 +msgid "Join an email list" +msgstr "" + +#: templates/contact.html:50 +msgid "" +"Our teams collaborate in open channels, including email lists, you are " +"welcome to join. If you have a question for a specific team not answered on " +"our support portal, you can ask the appropriate list. You're welcome to " +"subscribe and just watch, too :)" +msgstr "" + +#: templates/contact.html:63 +msgid "Report a bug or give feedback." +msgstr "" + +#: templates/contact.html:64 +msgid "" +"Tor relies on the support of users and volunteers around the world to help " +"us improve our software and resources, so your feedback is extremely " +"valuable to us (and to all Tor users)." +msgstr "" + +#: templates/contact.html:70 +msgid "Tell us about a bad relay." +msgstr "" + +#: templates/contact.html:71 +msgid "" +"If you find a relay that you think is malicious, misconfigured, or otherwise" +" broken, please check out our wiki page and blog post on how to report it." +msgstr "" + +#: templates/contact.html:79 +msgid "Report a security issue." +msgstr "" + +#: templates/contact.html:80 +msgid "" +"If you've found a security issue in one of our projects or in our " +"infrastructure, please email tor-security(a)lists.torproject.org. If you've " +"found a security bug in Tor or Tor Browser, feel free to submit it for our" +msgstr "" + +#: templates/contact.html:80 +msgid "bug bounty program." +msgstr "" + +#: templates/contact.html:80 +msgid "" +"If you want to encrypt your mail, you can get the GPG public key for the " +"list by contacting tor-security-sendkey(a)lists.torproject.org or from pool" +".sks-keyservers.net. Here is the fingerprint:" +msgstr "" + +#: templates/contact.html:100 +msgid "Email us" +msgstr "" + +#: templates/contact.html:101 +msgid "" +"For questions and comments about Tor the non-profit organization: trademark " +"questions, affiliation and coordination, contract inquiries, etc, please " +"email frontdesk(a)torproject.org. For donor-related questions, contact " +"giving(a)torproject.org" +msgstr "" + +#: templates/contact.html:107 +msgid "Send us Mail" +msgstr "" + +#: templates/download-android.html:12 +msgid "Get Tor Browser for Android." +msgstr "" + +#: templates/download-android.html:15 templates/hero-download.html:5 +msgid "Protect yourself against tracking, surveillance, and censorship." +msgstr "" + +#: templates/download-android.html:27 templates/download-android.html:30 +#: templates/download-android.html:33 templates/download-android.html:36 +msgid "Download .apk" +msgstr "" + +#: templates/download-android.html:39 +msgid "Go to Google Play" +msgstr "" + +#: templates/download-android.html:41 +msgid "Go to F-Droid" +msgstr "" + +#: templates/download-android.html:48 +msgid "Are you an iOS user? We encourage you to try Onion Browser." +msgstr "" + +#: templates/download-languages.html:11 templates/download-options.html:11 +msgid "Language" +msgstr "भाषा" + +#: templates/download-languages.html:12 templates/download-options.html:12 +msgid "Windows" +msgstr "" + +#: templates/download-languages.html:13 +msgid "macOS" +msgstr "" + +#: templates/download-languages.html:14 templates/download-options.html:14 +msgid "GNU/Linux" +msgstr "" + +#: templates/download-options.html:13 +msgid "MacOS" +msgstr "" + +#: templates/download-options.html:43 +msgid "Tor Browser for Android Alpha" +msgstr "" + +#: templates/download-options.html:49 +msgid "Google Play" +msgstr "" + +#: templates/download-tor.html:8 +msgid "Tor Source" +msgstr "" + +#: templates/download-tor.html:12 +msgid "Version" +msgstr "आवृत्ती" + +#: templates/download-tor.html:27 templates/download-tor.html:33 +msgid "Changelog" +msgstr "बदल लॉग" + +#: templates/download-tor.html:28 templates/download-tor.html:34 +msgid "sig" +msgstr "" + +#: templates/download-tor.html:41 +msgid "Windows Expert Bundle" +msgstr "" + +#: templates/download-tor.html:46 +msgid "Windows 10, 8, 7, Vista, XP, 2000, 2003 Server, ME, and Windows 98SE" +msgstr "" + +#: templates/download-tor.html:47 +msgid "Contains just Tor and nothing else." +msgstr "" + +#: templates/download.html:5 +msgid "Get Connected" +msgstr "" + +#: templates/download.html:7 +msgid "Get connected" +msgstr "" + +#: templates/download.html:9 +msgid "" +"If you are in a country where Tor is blocked, you can configure Tor to " +"connect to a bridge during the setup process." +msgstr "" + +#: 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." +msgstr "" + +#: templates/download.html:14 +msgid "Support Portal" +msgstr "" + +#: templates/download.html:14 +msgid "Read other FAQ's at our Support Portal" +msgstr "" + +#: templates/download.html:19 templates/download.html:21 +msgid "Stay safe" +msgstr "" + +#: templates/download.html:23 +msgid "Please do not torrent over Tor." +msgstr "" + +#: 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:27 +msgid "" +"We do not recommend installing additional add-ons or plugins into Tor " +"Browser" +msgstr "" + +#: 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 "" + +#: templates/download.html:40 +#, python-format +msgid "Check out the %s for more troubleshooting tips." +msgstr "" + +#: templates/download.html:49 +msgid "How can I verify Tor Browser signature?" +msgstr "" + +#: templates/download.html:54 +msgid "Stand up for privacy and freedom online." +msgstr "" + +#: templates/download.html:55 +msgid "" +"We're a nonprofit organization and rely on supporters like you to help us " +"keep Tor robust and secure for millions of people worldwide." +msgstr "" + +#: templates/hero-download-languages.html:2 +#: templates/hero-download-options.html:2 +msgid "DEFEND YOURSELF" +msgstr "" + +#: templates/hero-download-tor.html:2 +msgid "GROW THE NETWORK" +msgstr "" + +#: templates/hero-download.html:2 +msgid "Defend yourself." +msgstr "" + +#: templates/hero-download.html:32 +msgid "Download for" +msgstr "" + +#: templates/hero-download.html:33 +msgid "Signature" +msgstr "" + +#: templates/hero-download.html:43 +msgid "Download for Android" +msgstr "" + +#: templates/hero-download.html:49 +msgid "Download in another language or platform" +msgstr "" + +#: templates/hero-download.html:50 +msgid "Download the latest alpha build" +msgstr "" + +#: templates/hero-download.html:55 +msgid "Read the latest release announcements" +msgstr "" + +#: templates/hero-home.html:2 +msgid "Browse Privately." +msgstr "" + +#: templates/hero-home.html:5 +msgid "Explore Freely." +msgstr "" + +#: templates/hero-home.html:8 templates/meta.html:5 templates/meta.html:12 +msgid "" +"Defend yourself against tracking and surveillance. Circumvent censorship." +msgstr "" + +#: templates/home.html:7 +msgid "Block Trackers" +msgstr "" + +#: templates/home.html:11 +msgid "BLOCK TRACKERS" +msgstr "" + +#: templates/home.html:12 +msgid "" +"Tor Browser isolates each website you visit so third-party trackers and ads " +"can't follow you. Any cookies automatically clear when you're done browsing." +" So will your browsing history." +msgstr "" + +#: templates/home.html:24 +msgid "Defend Against Surveillance" +msgstr "" + +#: templates/home.html:28 +msgid "DEFEND AGAINST SURVEILLANCE" +msgstr "" + +#: templates/home.html:29 +msgid "" +"Tor Browser prevents someone watching your connection from knowing what " +"websites you visit. All anyone monitoring your browsing habits can see is " +"that you're using Tor." +msgstr "" + +#: templates/home.html:41 +msgid "Resist Fingerprinting" +msgstr "" + +#: templates/home.html:45 +msgid "RESIST FINGERPRINTING" +msgstr "" + +#: templates/home.html:46 +msgid "" +"Tor Browser aims to make all users look the same, making it difficult for " +"you to be fingerprinted based on your browser and device information." +msgstr "" + +#: templates/home.html:58 +msgid "Multi-layered Encryption" +msgstr "" + +#: templates/home.html:62 +msgid "MULTI-LAYERED ENCRYPTION" +msgstr "" + +#: templates/home.html:63 +msgid "" +"Your traffic is relayed and encrypted three times as it passes over the Tor " +"network. The network is comprised of thousands of volunteer-run servers " +"known as Tor relays." +msgstr "" + +#: templates/home.html:75 +msgid "Browse Freely" +msgstr "" + +#: templates/home.html:79 +msgid "BROWSE FREELY" +msgstr "" + +#: templates/home.html:80 +msgid "" +"With Tor Browser, you are free to access sites your home network may have " +"blocked." +msgstr "" + +#: templates/jobs.html:2 +msgid "Current Openings" +msgstr "" + +#: templates/jobs.html:13 +msgid "" +"At the moment, we don't have any official open positions. Please check back " +"soon, though!" +msgstr "" + +#: templates/jobs.html:18 templates/projects.html:5 +msgid "Previous Openings" +msgstr "" + +#: templates/jobs.html:32 templates/projects.html:33 +msgid "" +"Think you could help us in a position that's not listed? We also rely on a " +"vast community of volunteer contributors and many have become paid staff." +msgstr "" + +#: templates/jobs.html:32 templates/projects.html:33 +msgid "We invite you to join us on IRC to find how you can get involved." +msgstr "" + +#: templates/meta.html:11 +msgid "The Tor Project | Privacy & Freedom Online" +msgstr "" + +#: templates/meta.html:20 +msgid "Tor Project" +msgstr "टॉर प्रोजेक्ट" + +#: templates/people.html:2 +msgid "Board of Directors" +msgstr "" + +#: templates/people.html:3 templates/people.html:15 +msgid "Core Tor" +msgstr "" + +#: templates/people.html:28 +msgid "Join Our Team" +msgstr "" + +#: templates/people.html:29 +msgid "" +"Even if we aren't hiring, you can contribute to Tor. We are open to ideas " +"and studies to improve Tor software. If you're a developer, we welcome you " +"to sign up for our dev mailing list to see what we're up to." +msgstr "" + +#: templates/people.html:31 +msgid "Sign up for tor-dev" +msgstr "" + +#: templates/press.html:7 +msgid "Get support" +msgstr "" + +#: templates/press.html:9 +msgid "Visit our Support Portal" +msgstr "" + +#: templates/press.html:12 +msgid "Ask us on #tor" +msgstr "" + +#: templates/press.html:15 +msgid "Write to a mailing list" +msgstr "" + +#: templates/press.html:22 +msgid "Brand Assets" +msgstr "" + +#: templates/press.html:27 +msgid "The Tor Browser" +msgstr "" + +#: templates/press.html:30 +msgid "Onion Services" +msgstr "ओनियॉन सेवा" + +#: templates/press.html:40 +msgid "Press Releases" +msgstr "" + +#: templates/press.html:54 +msgid "Coverage" +msgstr "" + +#: templates/press.html:61 +msgid "Date" +msgstr "" + +#: templates/press.html:62 +msgid "Publication" +msgstr "" + +#: templates/press.html:63 +msgid "Topic" +msgstr "" + +#: templates/reports.html:2 +msgid "Founding Documents" +msgstr "" + +#: templates/reports.html:16 +msgid "Reports" +msgstr "" + +#: templates/reports.html:22 +msgid "Year" +msgstr "" + +#: templates/reports.html:23 +msgid "Type" +msgstr "" + +#: templates/reports.html:24 +msgid "Title" +msgstr "" + +#: templates/sidenav.html:4 templates/sidenav.html:35 +msgid "Topics" +msgstr "" + +#: templates/sponsors.html:2 +msgid "" +"Thank you to all the people and groups who have made Tor possible so far, " +"and thank you especially to the individual volunteers who have made non-" +"financial contributions: coding, testing, documenting, translating, " +"educating, researching, and running the relays that make up the Tor network." +msgstr "" + +#: templates/sponsors.html:5 +msgid "Active Sponsors" +msgstr "" + +#: templates/sponsors.html:17 +msgid "Past Sponsors" +msgstr "" + +#: templates/sponsors.html:35 +msgid "" +"This sponsors page is based upon un-audited and un-reviewed financial and " +"in-kind donations, contract, and other data." +msgstr "" + +#: templates/sponsors.html:36 +msgid "" +"Further details about our audited and reviewed funding can be found with our" +" Financial Reports." +msgstr "" + +#: templates/thank-you.html:6 +msgid "Want to join our community? Getting involved with Tor is easy." +msgstr "" + +#: templates/thank-you.html:13 +msgid "" +"Sign up for Tor News and get updates and opportunities from across the " +"organization and community." +msgstr "" + +#: templates/thank-you.html:17 +msgid "Run a relay to make the network faster and more decentralized." +msgstr "" + +#: templates/thank-you.html:21 +msgid "Use your skills to volunteer." +msgstr "" + +#: templates/macros/downloads.html:68 +msgid "Tor Browser manual" +msgstr "" + +#: templates/macros/jobs.html:11 +msgid "Read more." +msgstr "" + +#: templates/macros/question.html:12 +msgid "Contributors to this page:" +msgstr "" + +#: templates/macros/question.html:14 +msgid "Edit this page" +msgstr "" + +#: templates/macros/question.html:15 +msgid "Suggest Feedback" +msgstr "" + +#: templates/macros/question.html:16 +msgid "Permalink" +msgstr "" + +#: templates/macros/reports.html:5 templates/macros/reports.html:19 +msgid "View PDF" +msgstr ""

1 0

[translation/torbutton-aboutdialogdtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdialogdtd
by translation＠torproject.org 29 May '20

29 May '20

commit 7033d766b849d54dfdaa14ee5bb5dcd82b995822 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 29 21:21:51 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdial… --- mr/aboutdialog.dtd | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mr/aboutdialog.dtd b/mr/aboutdialog.dtd index 6a32e0c65d..b0e0889748 100644 --- a/mr/aboutdialog.dtd +++ b/mr/aboutdialog.dtd @@ -1,19 +1,19 @@ -<!ENTITY project.start "&brandShortName; is developed by "> +<!ENTITY project.start "&ब्रँड छोटे नाव ; हे बनवले आहे ">  -<!ENTITY project.tpoLink "the &vendorShortName;"> -<!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> +<!ENTITY project.tpoLink "&विकणाऱ्याचे छोटे नाव "> +<!ENTITY project.end "एक ना-नफा संस्था जी तुमची गोपनीयता आणि ऑनलाइन स्वातंत्र्याचा रक्षण करते "> -<!ENTITY help.start "Want to help? "> +<!ENTITY help.start "मदत करायची आहे?">  -<!ENTITY help.donateLink "Donate"> -<!ENTITY help.or " or "> +<!ENTITY help.donateLink "दान "> +<!ENTITY help.or "किव्हा ">  -<!ENTITY help.getInvolvedLink "get involved"> +<!ENTITY help.getInvolvedLink "शमिळ हव्वा "> <!ENTITY help.end "!">  <!ENTITY bottomLinks.questions "प्रश्न?">  -<!ENTITY bottomLinks.grow "Help the Tor Network Grow!"> +<!ENTITY bottomLinks.grow "टोर नेटवर्कला मोठा बनवायला मदत करा!">  -<!ENTITY bottomLinks.license "Licensing Information"> +<!ENTITY bottomLinks.license "परवाना बद्दल माहिती "> <!ENTITY tor.TrademarkStatement "'टॉर' आणि 'कांद्याचा लोगो' हे टॉर प्रोजेक्ट, Inc. चे नोंदणीकृत ट्रेडमार्क आहेत.">

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] fixup! Pick up latest Torbutton code
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 104e4dd98059f0f42bc78929aea4cce0b999d996 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 21:18:49 2020 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 83bc9c956c3b..0b6562dfffd0 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 83bc9c956c3be091c421521fcf05c3cdc393e870 +Subproject commit 0b6562dfffd0e032ea0051a8c09069fba37d4838

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 29 May '20

29 May '20

commit 08596a5e3e26af46ac51b7d3fcdc9f134fcc4e02 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 29 21:15:40 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/mr/LC_MESSAGES/messages.po | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/locale/mr/LC_MESSAGES/messages.po b/locale/mr/LC_MESSAGES/messages.po index 5006b8d376..d714229a45 100644 --- a/locale/mr/LC_MESSAGES/messages.po +++ b/locale/mr/LC_MESSAGES/messages.po @@ -1,9 +1,11 @@ +# # Translators: # erinm, 2019 +# vinay bichave <vinaybichave4(a)gmail.com>, 2020 # msgid "" msgstr "" -"Last-Translator: erinm, 2019\n" +"Last-Translator: vinay bichave <vinaybichave4(a)gmail.com>, 2020\n" "Language-Team: Marathi (https://www.transifex.com/otf/teams/1519/mr/)\n" "Language: mr\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -277,7 +279,7 @@ msgstr "S" #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:96 #: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:78 msgid "M" -msgstr "" +msgstr "म " #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:100 #: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:82 @@ -766,7 +768,7 @@ msgstr "" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:443 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:446 msgid "Donate" -msgstr "" +msgstr "दान " #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:453 msgid "Gift Selected" @@ -1031,6 +1033,10 @@ msgid "" " and privacy technologies, supporting their unrestricted availability and " "use, and furthering their scientific and popular understanding." msgstr "" +"टोर हा प्रकल्प यू. एस 501 (क)(३) विना - नफा संस्था आहे जी मुक्त आणि मुक्त " +"स्त्रोत निनावीपणा आणि गोपनीयताचा तंत्रज्ञान तयार आणि तैनात करून, त्यांच्या " +"प्रतिबंधित उपलब्धता आणि वापरास समर्थन देऊन आणि त्यांचे वैज्ञानिक आणि " +"लोकप्रिय समजुती पुढे आणून मानवी हक्क आणि स्वातंत्र्यांसाठी प्रगती करणे." #: tmp/cache_locale/92/92eb639bc328f3dd569fa22b60c4360b6fe38f1a4cd80a14fce862d91bd765cb.php:49 #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:31 @@ -1073,7 +1079,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:64 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:44 msgid "Questions?" -msgstr "" +msgstr "प्रश्न?" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:80 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:59 @@ -2373,7 +2379,7 @@ msgstr "" #: tmp/cache_locale/6c/6cd01cfbd4684dcca4eada963c78b5d694a2f40cd309be9366b080c410b3c5a0.php:92 #: tmp/cache_locale/0d/0de73852fd4b6afe8a4f069f907a5e1e93a3159f5ffaddbf485db43dd4ce3a8a.php:71 msgid "Donate Now" -msgstr "" +msgstr "दान करा " #: tmp/cache_locale/66/666e9197f427d70c0743bcdae2c3e34f41f9d7acf2b2dddb2c21c21723e73d10.php:52 #: tmp/cache_locale/66/666e9197f427d70c0743bcdae2c3e34f41f9d7acf2b2dddb2c21c21723e73d10.php:75

1 0

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 29 May '20

29 May '20

commit 5a33286bad97327220b9647ad0ff1717f6f81e54 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 29 21:15:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- mr/aboutTor.dtd | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/mr/aboutTor.dtd b/mr/aboutTor.dtd new file mode 100644 index 0000000000..199b1cb8b7 --- /dev/null +++ b/mr/aboutTor.dtd @@ -0,0 +1,31 @@ + + +<!ENTITY aboutTor.title "टोर बद्दल"> + +<!ENTITY aboutTor.viewChangelog.label "बदललेला लॉग पहा "> + +<!ENTITY aboutTor.ready.label "खसगिरीत्या अन्वेषण"> +<!ENTITY aboutTor.ready2.label "तुम्ही तय्यार आहात जगातील सर्वात खासगी ब्राउझिंग अनुभवा साठी "> +<!ENTITY aboutTor.failure.label "काहीतरी चुकलं!"> +<!ENTITY aboutTor.failure2.label "टोर ह्या ब्राउझर मध्ये नाही चालत आहे "> + +<!ENTITY aboutTor.search.label "'डक डक गो' ने शोधा "> +<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> + +<!ENTITY aboutTor.torbrowser_user_manual_questions.label "प्रश्न?"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "आमच्या टोर ब्राउझर मॅन्युअल पहा "> + +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "म "> +<!ENTITY aboutTor.torbrowser_user_manual.label "टोर ब्राउझर मॅन्युअल"> + +<!ENTITY aboutTor.tor_mission.label "टोर हा प्रकल्प यू. एस 501(क)(3) विना - नफा संस्था आहे जी मुक्त आणि मुक्त स्त्रोत निनावीपणा आणि गोपनीयताचा तंत्रज्ञान तयार आणि तैनात करून, त्यांच्या प्रतिबंधित उपलब्धता आणि वापरास समर्थन देऊन आणि त्यांचे वैज्ञानिक आणि लोकप्रिय समजुती पुढे आणून मानवी हक्क आणि स्वातंत्र्यांसाठी प्रगती करणे."> +<!ENTITY aboutTor.getInvolved.label "सारभागी हव्या "> + +<!ENTITY aboutTor.newsletter.tagline "टोर बद्दल नवीन बातम्या मिरवा थेट तुमच्या इनबॉक्स मध्ये "> +<!ENTITY aboutTor.newsletter.link_text "टोर च्या बातम्यांसाठी साइन उप करा "> +<!ENTITY aboutTor.donationBanner.freeToUse "टोर ही एक मोफत सेवा आहे तुमच्या देणगी मुळे "> +<!ENTITY aboutTor.donationBanner.buttonA "दान करा ">

1 0

[tor-browser-build/master] Bug 30318 - Integrate snowflake on Android
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 4d57755506496d02107e4dc2adf38252032df383 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 20:26:19 2020 +0000 Bug 30318 - Integrate snowflake on Android --- projects/tor-android-service/config | 2 +- .../0001-Bug-30318-Add-snowflake-support.patch | 90 ++++++++++++++++++++++ projects/tor-onion-proxy-library/build | 1 + projects/tor-onion-proxy-library/config | 1 + 4 files changed, 93 insertions(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 800fc47..7ab3ca7 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: ed2e1479eeddede01b1d510ef79dc5ec798b39c0 +git_hash: ecc251d0a73f7e2034a271efd28036a0108b8688 git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1 diff --git a/projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch b/projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch new file mode 100644 index 0000000..03e06aa --- /dev/null +++ b/projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch @@ -0,0 +1,90 @@ +From e006e215b274b1b834e098b199ea2697bc11b0f1 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Sun, 10 May 2020 08:29:10 +0000 +Subject: [PATCH] Bug 30318: Add snowflake support + + +diff --git a/android/build.gradle b/android/build.gradle +index a8d9bdc..2392731 100644 +--- a/android/build.gradle ++++ b/android/build.gradle +@@ -93,6 +93,9 @@ task copyPluggableTransports(type: Copy) { + rename { filename -> + filename.replace 'obfs4proxy', 'libObfs4proxy.so' + } ++ rename { filename -> ++ filename.replace 'snowflake-client', 'libSnowflake.so' ++ } + } + + gradle.projectsEvaluated { +diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +index 2405097..bcb6a37 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +@@ -109,22 +109,33 @@ public final class TorConfigBuilder { + return this; + } + +- public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportClient) throws IOException { +- if (pluggableTransportClient == null) { ++ public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportObfs, File pluggableTransportSnow) throws IOException { ++ if (pluggableTransportObfs == null || pluggableTransportSnow == null) { + return this; + } + +- if (!pluggableTransportClient.exists()) { +- throw new IOException("Bridge binary does not exist: " + pluggableTransportClient ++ if (!pluggableTransportObfs.exists()) { ++ throw new IOException("Obfs4proxy binary does not exist: " + pluggableTransportObfs + .getCanonicalPath()); + } + +- if (!pluggableTransportClient.canExecute()) { +- throw new IOException("Bridge binary is not executable: " + pluggableTransportClient ++ if (!pluggableTransportSnow.exists()) { ++ throw new IOException("Snowflake binary does not exist: " + pluggableTransportSnow + .getCanonicalPath()); + } + +- transportPlugin(pluggableTransportClient.getCanonicalPath()); ++ if (!pluggableTransportObfs.canExecute()) { ++ throw new IOException("Obfs4proxy binary is not executable: " + pluggableTransportObfs ++ .getCanonicalPath()); ++ } ++ ++ if (!pluggableTransportSnow.canExecute()) { ++ throw new IOException("Snowflake binary is not executable: " + pluggableTransportSnow ++ .getCanonicalPath()); ++ } ++ ++ ++ transportPlugin(pluggableTransportObfs.getCanonicalPath(), pluggableTransportSnow.getCanonicalPath()); + return this; + } + +@@ -491,8 +502,9 @@ public final class TorConfigBuilder { + return transPort(settings.transPort()); + } + +- public TorConfigBuilder transportPlugin(String clientPath) { +- buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(clientPath).append('\n'); ++ public TorConfigBuilder transportPlugin(String obfsPath, String snowPath) { ++ buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(obfsPath).append('\n'); ++ buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append(" -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302\n"); + return this; + } + +@@ -557,6 +569,9 @@ public final class TorConfigBuilder { + case 3: + reqBridgeType = "meek_lite"; + break; ++ case 4: ++ reqBridgeType = "snowflake"; ++ break; + default: + throw new IOException("Requested unknown transport type: " + bridgesType); + } +-- +2.26.2 + diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index dfe1837..937c72f 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -22,6 +22,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] patch -p1 < $rootdir/gradle.patch patch -p1 < $rootdir/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch +patch -p1 < $rootdir/0001-Bug-30318-Add-snowflake-support.patch # Extract obfs4proxy from TorBrowser/Tor/PluggableTransports/obfs4proxy tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/obfs4') %] diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index cffcdd0..98bb93c 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -28,3 +28,4 @@ input_files: exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - filename: gradle.patch - filename: 0001-Bug-33931-Filter-bridges-in-stream-by-type.patch + - filename: 0001-Bug-30318-Add-snowflake-support.patch

1 0

[tor-browser-build/master] Bug 28672: Android reproducible build of Snowflake
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 853e75e9276432a39153db2e3fa54375af9b8822 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Apr 30 13:46:56 2020 +0000 Bug 28672: Android reproducible build of Snowflake --- projects/snowflake/build | 7 +++++++ projects/snowflake/config | 3 +++ projects/tor-browser/config | 2 +- projects/tor-onion-proxy-library/build | 7 ++++++- projects/tor-onion-proxy-library/config | 2 ++ rbm.conf | 3 +++ 6 files changed, 22 insertions(+), 2 deletions(-) diff --git a/projects/snowflake/build b/projects/snowflake/build index 2724dd9..a72caba 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -5,6 +5,13 @@ distdir=/var/tmp/dist/[% project %] [% c("var/set_PTDIR_DOCSDIR") -%] mkdir -p $PTDIR $DOCSDIR +[% IF c("var/android") -%] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] + # We need to explicitly set CGO_ENABLED with Go 1.13.x as the Android build + # breaks otherwise. + export CGO_ENABLED=1 +[% END -%] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/pion-webrtc') %] diff --git a/projects/snowflake/config b/projects/snowflake/config index efd0707..898fe70 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -22,3 +22,6 @@ input_files: project: kcp-go - name: smux project: smux + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/android") %]' diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 3f41ed2..809bfa0 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -70,7 +70,7 @@ input_files: enable: '[% ! c("var/android") %]' - project: snowflake name: snowflake - enable: '[% c("var/snowflake") %]' + enable: '[% c("var/snowflake") && ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index c8025ad..dfe1837 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -26,12 +26,17 @@ patch -p1 < $rootdir/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch # Extract obfs4proxy from TorBrowser/Tor/PluggableTransports/obfs4proxy tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/obfs4') %] -# Overwrite the obfs4proxy binary provided by Pluto +# Extract snowflake from TorBrowser/Tor/PluggableTransports/snowflake +tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/snowflake') %] + +# Overwrite the obfs4proxy binary provided by Pluto and add Snowflake for d in external/pluto/bin/*; do cp obfs4proxy $d/ + cp snowflake-client $d/ done rm obfs4proxy +rm snowflake-client # Build Android Libraries and Apps $GRADLE_HOME/gradle-4.10.2/bin/gradle --offline --no-daemon -P androidplugin=3.1.0 -Dmaven.repo.local=$gradle_repo assembleRelease -x lint diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index 5d90481..cffcdd0 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -21,6 +21,8 @@ input_files: project: '[% c("var/compiler") %]' - project: obfs4 name: obfs4 + - project: snowflake + name: snowflake - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' diff --git a/rbm.conf b/rbm.conf index ba1cc23..f2d0f4f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -253,6 +253,9 @@ targets: android_min_api_x86_64: 21 CC: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang' CXX: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang++' + # We only build snowflake on the alpha and nightly + # channels for now. + snowflake: '[% c("var/alpha") || c("var/nightly") %]' container: suite: buster arch: amd64

1 0

[translation/torbutton-aboutdialogdtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdialogdtd
by translation＠torproject.org 29 May '20

29 May '20

commit a9969b8505f5b3025fdd8249f566f164a4c433c8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 29 20:51:54 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdial… --- mr/aboutdialog.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mr/aboutdialog.dtd b/mr/aboutdialog.dtd index 95dbbd809e..6a32e0c65d 100644 --- a/mr/aboutdialog.dtd +++ b/mr/aboutdialog.dtd @@ -11,7 +11,7 @@ <!ENTITY help.getInvolvedLink "get involved"> <!ENTITY help.end "!">  -<!ENTITY bottomLinks.questions "Questions?"> +<!ENTITY bottomLinks.questions "प्रश्न?">  <!ENTITY bottomLinks.grow "Help the Tor Network Grow!">

1 0