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

[tpo/staging] Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging
by emmapeel＠torproject.org 07 Mar '19

07 Mar '19

commit e8d695e9b91a459e3bfba4f90cb292e8ede63cff Merge: 0edb2a7 c8ccd63 Author: emma peel <emma.peel(a)riseup.net> Date: Sat Mar 2 02:51:03 2019 +0100 Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging .gitignore | 3 ++ assets/scss/_tor.scss | 2 +- assets/scss/_tpo.scss | 9 +++++- assets/static/bootstrap.css | 8 ++++- assets/static/bootstrap.css.map | 2 +- content/about/history/contents.lr | 35 +++++++++++----------- content/projects/contents.lr | 5 ++++ .../torbrowser/RecommendedTBBVersions/contents.lr | 16 ++++++++++ content/projects/torbrowser/contents.lr | 5 ++++ databags/versions.ini | 8 ++--- models/text.ini | 7 +++++ templates/empty.html | 7 ++--- templates/footer.html | 5 ++-- templates/home.html | 4 +-- templates/navbar.html | 2 +- 15 files changed, 83 insertions(+), 35 deletions(-)

1 0

[tpo/staging] Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging
by emmapeel＠torproject.org 07 Mar '19

07 Mar '19

commit be17fa93f73e9ccf59d2c35aaad06e6a7d803bf5 Merge: e8d695e c653f05 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Mar 6 02:18:47 2019 +0100 Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging assets/scss/_portal.scss | 2 - assets/scss/_tor.scss | 9 + assets/static/bootstrap.css | 10 +- assets/static/bootstrap.css.map | 2 +- assets/static/images/people/agrabeli.png | Bin 0 -> 29509 bytes assets/static/images/people/ailanthus.png | Bin 0 -> 40198 bytes assets/static/images/people/alsmith.png | Bin 0 -> 42933 bytes assets/static/images/people/amoghbl1.png | Bin 0 -> 11879 bytes assets/static/images/people/antonela.png | Bin 0 -> 23267 bytes assets/static/images/people/arlolra.png | Bin 0 -> 38865 bytes assets/static/images/people/arma.png | Bin 0 -> 34872 bytes assets/static/images/people/arthuredelstein.png | Bin 0 -> 37957 bytes assets/static/images/people/asn.png | Bin 0 -> 26187 bytes assets/static/images/people/atagar.png | Bin 0 -> 38415 bytes assets/static/images/people/bdavila.png | Bin 0 -> 34842 bytes assets/static/images/people/biella.png | Bin 0 -> 34947 bytes assets/static/images/people/cindy.png | Bin 0 -> 36456 bytes assets/static/images/people/dawuud.png | Bin 0 -> 22257 bytes assets/static/images/people/dgoulet.png | Bin 0 -> 14379 bytes assets/static/images/people/donnchac.png | Bin 0 -> 25035 bytes assets/static/images/people/egypcio.png | Bin 0 -> 30422 bytes assets/static/images/people/emmapeel.png | Bin 0 -> 26223 bytes assets/static/images/people/ewyatt.png | Bin 0 -> 20553 bytes assets/static/images/people/flexlibris.png | Bin 0 -> 34179 bytes assets/static/images/people/gaba.png | Bin 0 -> 36924 bytes assets/static/images/people/gunner.png | Bin 0 -> 35025 bytes assets/static/images/people/haxxpop.png | Bin 0 -> 37325 bytes assets/static/images/people/hc.png | Bin 0 -> 38444 bytes assets/static/images/people/hellais.png | Bin 0 -> 40390 bytes assets/static/images/people/hiro.png | Bin 0 -> 14842 bytes assets/static/images/people/ian.png | Bin 0 -> 40460 bytes assets/static/images/people/inf0.png | Bin 0 -> 18667 bytes assets/static/images/people/irl.png | Bin 0 -> 42121 bytes assets/static/images/people/isabela.png | Bin 0 -> 46938 bytes assets/static/images/people/jselon.png | Bin 0 -> 29698 bytes assets/static/images/people/juga.png | Bin 0 -> 14026 bytes assets/static/images/people/karsten.png | Bin 0 -> 37330 bytes assets/static/images/people/kat5.png | Bin 0 -> 53700 bytes assets/static/images/people/komlo.png | Bin 0 -> 32188 bytes assets/static/images/people/kushal.png | Bin 0 -> 30343 bytes assets/static/images/people/ln5.png | Bin 0 -> 32291 bytes assets/static/images/people/mcs.png | Bin 0 -> 30521 bytes assets/static/images/people/meejah.png | Bin 0 -> 11186 bytes assets/static/images/people/micahflee.png | Bin 0 -> 33039 bytes assets/static/images/people/moritz.png | Bin 0 -> 43049 bytes assets/static/images/people/mtigas.png | Bin 0 -> 39174 bytes assets/static/images/people/n8fr8.png | Bin 0 -> 32079 bytes assets/static/images/people/nickhopper.png | Bin 0 -> 38099 bytes assets/static/images/people/nickm.png | Bin 0 -> 41516 bytes assets/static/images/people/no_photo.png | Bin 0 -> 10668 bytes assets/static/images/people/nyinz.png | Bin 0 -> 33153 bytes assets/static/images/people/ohmygodel.png | Bin 0 -> 32230 bytes assets/static/images/people/orig/agrabeli.jpg | Bin 0 -> 19745 bytes assets/static/images/people/orig/ailanthus.jpg | Bin 0 -> 795358 bytes assets/static/images/people/orig/alsmith.jpg | Bin 0 -> 267849 bytes assets/static/images/people/orig/antonela.jpeg | Bin 0 -> 12110 bytes assets/static/images/people/orig/arlolra.jpg | Bin 0 -> 72136 bytes assets/static/images/people/orig/arma.jpg | Bin 0 -> 74271 bytes .../static/images/people/orig/arthuredelstein.jpg | Bin 0 -> 18449 bytes assets/static/images/people/orig/atagar.png | Bin 0 -> 116545 bytes assets/static/images/people/orig/bdavila.jpg | Bin 0 -> 1645382 bytes assets/static/images/people/orig/cindy.jpg | Bin 0 -> 210034 bytes assets/static/images/people/orig/dawuud.jpg | Bin 0 -> 9640 bytes assets/static/images/people/orig/dgoulet.png | Bin 0 -> 57781 bytes assets/static/images/people/orig/donnchac.jpg | Bin 0 -> 138279 bytes assets/static/images/people/orig/egypcio.jpg | Bin 0 -> 16276 bytes assets/static/images/people/orig/emmapeel.png | Bin 0 -> 150954 bytes assets/static/images/people/orig/ewyatt.jpg | Bin 0 -> 59903 bytes assets/static/images/people/orig/flexlibris.jpg | Bin 0 -> 615306 bytes assets/static/images/people/orig/gaba.jpg | Bin 0 -> 78748 bytes assets/static/images/people/orig/gunner.jpg | Bin 0 -> 722367 bytes assets/static/images/people/orig/haxxpop.jpg | Bin 0 -> 61834 bytes assets/static/images/people/orig/hc.jpg | Bin 0 -> 149652 bytes assets/static/images/people/orig/hellais.jpg | Bin 0 -> 47753 bytes assets/static/images/people/orig/hiro.jpg | Bin 0 -> 12804 bytes assets/static/images/people/orig/ian.jpg | Bin 0 -> 30787 bytes assets/static/images/people/orig/inf0.jpg | Bin 0 -> 21090 bytes assets/static/images/people/orig/isabela.jpg | Bin 0 -> 896719 bytes assets/static/images/people/orig/jselon.jpg | Bin 0 -> 33180 bytes assets/static/images/people/orig/juga.png | Bin 0 -> 97645 bytes assets/static/images/people/orig/karsten.jpg | Bin 0 -> 90829 bytes assets/static/images/people/orig/komlo.jpg | Bin 0 -> 23451 bytes assets/static/images/people/orig/kushal.jpg | Bin 0 -> 20760 bytes assets/static/images/people/orig/ln5.jpg | Bin 0 -> 54715 bytes assets/static/images/people/orig/meejah.svg | 59 + assets/static/images/people/orig/micahflee.jpeg | Bin 0 -> 16552 bytes assets/static/images/people/orig/moritz.png | Bin 0 -> 731576 bytes assets/static/images/people/orig/n8fr8.jpg | Bin 0 -> 21843 bytes assets/static/images/people/orig/nickhopper.jpg | Bin 0 -> 20252 bytes assets/static/images/people/orig/nyinz.jpg | Bin 0 -> 113648 bytes assets/static/images/people/orig/ohmygodel.jpg | Bin 0 -> 25960 bytes assets/static/images/people/orig/pari.jpg | Bin 0 -> 215061 bytes assets/static/images/people/orig/pastly.jpeg | Bin 0 -> 21097 bytes assets/static/images/people/orig/pepijn.jpg | Bin 0 -> 1025994 bytes assets/static/images/people/orig/phoul.jpg | Bin 0 -> 14218 bytes assets/static/images/people/orig/pili.png | Bin 0 -> 29383 bytes assets/static/images/people/orig/redshiftzero.jpg | Bin 0 -> 51523 bytes assets/static/images/people/orig/robgjansen.jpg | Bin 0 -> 24939 bytes assets/static/images/people/orig/robt.png | Bin 0 -> 689358 bytes assets/static/images/people/orig/saint.jpg | Bin 0 -> 81825 bytes assets/static/images/people/orig/serene.jpg | Bin 0 -> 42790 bytes assets/static/images/people/orig/sjmurdoch.jpg | Bin 0 -> 115664 bytes assets/static/images/people/orig/ssteele.jpg | Bin 0 -> 18889 bytes assets/static/images/people/orig/stephw.jpeg | Bin 0 -> 370743 bytes assets/static/images/people/orig/syverson.jpg | Bin 0 -> 729689 bytes assets/static/images/people/orig/t0mmy.jpg | Bin 0 -> 50507 bytes assets/static/images/people/orig/tjr.jpg | Bin 0 -> 91681 bytes assets/static/images/people/orig/wseltzer.jpg | Bin 0 -> 6888 bytes assets/static/images/people/pari.png | Bin 0 -> 39097 bytes assets/static/images/people/pastly.png | Bin 0 -> 31880 bytes assets/static/images/people/pepijn.png | Bin 0 -> 31866 bytes assets/static/images/people/phoul.png | Bin 0 -> 5932 bytes assets/static/images/people/pili.png | Bin 0 -> 8840 bytes assets/static/images/people/ramy.png | Bin 0 -> 36799 bytes assets/static/images/people/redshiftzero.png | Bin 0 -> 45395 bytes assets/static/images/people/robgjansen.png | Bin 0 -> 33856 bytes assets/static/images/people/robt.png | Bin 0 -> 35268 bytes assets/static/images/people/saint.png | Bin 0 -> 36642 bytes assets/static/images/people/sajolida.png | Bin 0 -> 7493 bytes assets/static/images/people/serene.png | Bin 0 -> 33567 bytes assets/static/images/people/sjmurdoch.png | Bin 0 -> 32427 bytes assets/static/images/people/ssteele.png | Bin 0 -> 42072 bytes assets/static/images/people/sstevenson.png | Bin 0 -> 39263 bytes assets/static/images/people/stephw.png | Bin 0 -> 35533 bytes assets/static/images/people/syverson.png | Bin 0 -> 14050 bytes assets/static/images/people/t0mmy.png | Bin 0 -> 25912 bytes assets/static/images/people/tjr.png | Bin 0 -> 26593 bytes assets/static/images/people/wayward.png | Bin 0 -> 4598 bytes assets/static/images/people/wseltzer.png | Bin 0 -> 38997 bytes assets/static/keys/agrabeli.txt | 66 + assets/static/keys/alsmith.txt | 50 + assets/static/keys/andreas.txt | 931 +++++ assets/static/keys/antonela.txt | 52 + assets/static/keys/biella.txt | 407 +++ assets/static/keys/dawuud.txt | 471 +++ assets/static/keys/donnchac.txt | 543 +++ assets/static/keys/egypcio.txt | 892 +++++ assets/static/keys/ewyatt.txt | 90 + assets/static/keys/gunner.txt | 44 + assets/static/keys/haxxpop.txt | 52 + assets/static/keys/ian.txt | 746 ++++ assets/static/keys/jselon.txt | 99 + assets/static/keys/julius.txt | 681 ++++ assets/static/keys/juris.txt | 321 ++ assets/static/keys/kat.txt | 109 + assets/static/keys/micahflee.txt | 2033 +++++++++++ assets/static/keys/moritz.txt | 3700 ++++++++++++++++++++ assets/static/keys/nyinz.txt | 57 + assets/static/keys/ohmygodel.txt | 37 + assets/static/keys/pari.txt | 52 + assets/static/keys/ramy.txt | 52 + assets/static/keys/redshiftzero.txt | 191 + assets/static/keys/robgjansen.txt | 1216 +++++++ assets/static/keys/robt.txt | 47 + assets/static/keys/sajolida.txt | 373 ++ assets/static/keys/ssteele.txt | 363 ++ assets/static/keys/stephw.txt | 247 ++ assets/static/keys/t0mmy.txt | 51 + content/about/people/agrabeli/contents.lr | 5 + content/about/people/ahf/contents.lr | 3 + content/about/people/ailanthus/contents.lr | 4 + content/about/people/alsmith/contents.lr | 4 + content/about/people/amoghbl1/contents.lr | 2 + content/about/people/andreas/contents.lr | 2 + content/about/people/antonela/contents.lr | 4 + content/about/people/arlolra/contents.lr | 4 + content/about/people/arma/contents.lr | 4 + content/about/people/arthuredelstein/contents.lr | 4 + content/about/people/asn/contents.lr | 4 + content/about/people/atagar/contents.lr | 4 + content/about/people/bdavila/contents.lr | 2 + content/about/people/biella-core/contents.lr | 4 + content/about/people/boklm/contents.lr | 2 + content/about/people/brade/contents.lr | 2 + content/about/people/catalyst/contents.lr | 2 + content/about/people/cindy-core/contents.lr | 4 + content/about/people/dawuud/contents.lr | 4 + content/about/people/dgoulet/contents.lr | 4 + content/about/people/donnchac/contents.lr | 4 + content/about/people/egypcio/contents.lr | 4 + content/about/people/emmapeel/contents.lr | 4 + content/about/people/ewyatt/contents.lr | 4 + content/about/people/flexlibris/contents.lr | 4 + content/about/people/gaba/contents.lr | 4 + content/about/people/geko/contents.lr | 2 + content/about/people/ggus/contents.lr | 2 + content/about/people/gunner/contents.lr | 4 + content/about/people/haxxpop/contents.lr | 4 + content/about/people/hc/contents.lr | 4 + content/about/people/hellais/contents.lr | 4 + content/about/people/hiro/contents.lr | 6 +- content/about/people/iangoldberg/contents.lr | 4 + content/about/people/igt0/contents.lr | 2 + content/about/people/inf0/contents.lr | 4 + content/about/people/intrigeri/contents.lr | 2 + content/about/people/irl/contents.lr | 4 + content/about/people/isabela/contents.lr | 4 + content/about/people/isra/contents.lr | 2 + content/about/people/jselon/contents.lr | 4 + content/about/people/juga/contents.lr | 4 + content/about/people/julius-core/contents.lr | 2 + content/about/people/juris/contents.lr | 2 + content/about/people/karsten/contents.lr | 4 + content/about/people/kat/contents.lr | 4 + content/about/people/komlo/contents.lr | 4 + content/about/people/kushal/contents.lr | 4 + content/about/people/ln5/contents.lr | 4 + content/about/people/mcs/contents.lr | 4 + content/about/people/meejah/contents.lr | 6 +- content/about/people/micahflee/contents.lr | 6 +- content/about/people/moritz/contents.lr | 6 + content/about/people/mrphs/contents.lr | 2 + content/about/people/mtigas/contents.lr | 6 +- content/about/people/n8fr8/contents.lr | 2 + content/about/people/nickm/contents.lr | 4 + content/about/people/ohmygodel/contents.lr | 4 + content/about/people/pari/contents.lr | 4 + content/about/people/pastly/contents.lr | 4 + content/about/people/pepijn/contents.lr | 4 + content/about/people/phoul/contents.lr | 4 + content/about/people/phw/contents.lr | 4 +- content/about/people/pili/contents.lr | 6 +- content/about/people/pospeselr/contents.lr | 2 + content/about/people/qbi/contents.lr | 2 + content/about/people/rabbi-rob-thomas/contents.lr | 4 + content/about/people/ramy-core/contents.lr | 4 + content/about/people/redshiftzero/contents.lr | 4 + content/about/people/robgjansen/contents.lr | 4 + content/about/people/saint/contents.lr | 4 + content/about/people/sajolida/contents.lr | 4 + content/about/people/sebastian/contents.lr | 2 + content/about/people/sjmurdoch/contents.lr | 2 + content/about/people/ssteele-core/contents.lr | 4 + content/about/people/sstevenson/contents.lr | 2 + content/about/people/stephw/contents.lr | 4 + content/about/people/sukhe/contents.lr | 2 + content/about/people/sysrqb/contents.lr | 4 +- content/about/people/syverson/contents.lr | 2 + content/about/people/t0mmy/contents.lr | 13 - content/about/people/teor/contents.lr | 2 + content/about/people/tjr/contents.lr | 4 + content/about/people/wayward/contents.lr | 2 + content/about/people/{peter => weasel}/contents.lr | 0 content/about/people/wseltzer/contents.lr | 4 + models/people.ini | 2 +- models/person.ini | 4 + templates/about.html | 2 +- templates/macros/people.html | 35 +- 248 files changed, 14378 insertions(+), 33 deletions(-)

1 0

[tpo/staging] easier to localize
by emmapeel＠torproject.org 07 Mar '19

07 Mar '19

commit 0edb2a7602f9589bd16cd63c221bd5ce3f127389 Author: emma peel <emma.peel(a)riseup.net> Date: Sat Mar 2 02:05:22 2019 +0100 easier to localize --- templates/footer.html | 2 +- templates/macros/downloads.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/footer.html b/templates/footer.html index 364e704..af22b33 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -53,7 +53,7 @@ <div class="col-12 d-flex justify-content-center"> <div class="col-sm-6 offset-lx-1 offset-sm-0 mt-5"> {% from "macros/footer.html" import render_faq %} - <p class="text-primary text-light">{{ _('Trademark, copyright notices, and rules for use by third parties can be found in our %s')|format(render_faq())|safe }}.</p> + <p class="text-primary text-light">{{ _('Trademark, copyright notices, and rules for use by third parties can be found in our %(link_to_faq)s')|format(link_to_faq=render_faq())|safe }}.</p> </div> <div class="col-sm-2 mt-5 d-none d-sm-block"> <div class="btn-group dropdown float-right"> diff --git a/templates/macros/downloads.html b/templates/macros/downloads.html index 2ceaef2..a080cf2 100644 --- a/templates/macros/downloads.html +++ b/templates/macros/downloads.html @@ -44,5 +44,5 @@ {% endmacro %} {% macro render_tor_browser_manual() %} - <a class="mx-auto" href="https://tb-manual.torproject.org" target="_blank"><u>tor browser manual</u></a> +<a class="mx-auto" href="https://tb-manual.torproject.org" target="_blank"><u>{{ _('tor browser manual') }}</u></a> {% endmacro %}

1 0

[tpo/staging] prepare strings for localization
by emmapeel＠torproject.org 07 Mar '19

07 Mar '19

commit 99ce17e3fb6a358441177b0233a2b2c2b2381710 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 7 13:28:39 2019 +0100 prepare strings for localization --- content/about/history/contents.lr | 13 +++++++++---- templates/thank-you.html | 6 +++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/content/about/history/contents.lr b/content/about/history/contents.lr index 37165dd..cf1ec25 100644 --- a/content/about/history/contents.lr +++ b/content/about/history/contents.lr @@ -22,19 +22,24 @@ The goal of onion routing was to have a way to use the internet with as much pri 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. 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. -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. +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. 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. 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. -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.h…. +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.h…. With Tor Browser having made Tor more accessible to everyday internet users and activists, Tor was an instrumental tool during the [Arab Spring](https://www.theguardian.com/us-news/the-nsa-files) beginning in late 2010. It not only protected people’s identity online but also allowed them to access critical resources, social media, and websites which were blocked. -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/). +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/). -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. +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. 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. diff --git a/templates/thank-you.html b/templates/thank-you.html index 745cc2b..9f14d53 100644 --- a/templates/thank-you.html +++ b/templates/thank-you.html @@ -10,15 +10,15 @@ <div class="row"> <div class="col-md-4"> <i class="fas fa-paper-plane text-primary pr-2"></i> - <h4><a href="https://newsletter.torproject.org">{{ _('Sign up') }}</a>{{ _(' for Tor News and get updates and opportunities from across the organization and community.') }}</h4> + <h4><a href="https://newsletter.torproject.org">{{ _('Sign up for Tor News and get updates and opportunities from across the organization and community.') }}</a></h4> </div> <div class="col-md-4"> <i class="fas fa-cube text-primary pr-2"></i> - <h4><a href="https://trac.torproject.org/projects/tor/wiki/TorRelayGuide">{{ _('Run a relay') }}</a>{{ _(' to make the network faster and more decentralized.') }}</h4> + <h4><a href="https://trac.torproject.org/projects/tor/wiki/TorRelayGuide">{{ _('Run a relay to make the network faster and more decentralized.') }}</a></h4> </div> <div class="col-md-4"> <i class="fas fa-hands-helping text-primary pr-2"></i> - <h4>{{ _('Use your skills to') }}<a href="https://torproject.org/volunteer">{{ _(' volunteer.') }}</a></h4> + <h4><a href="https://torproject.org/volunteer">{{ _('Use your skills to volunteer.') }}</a></h4> </div> </div> </div>

1 0

[tpo/staging] Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging
by emmapeel＠torproject.org 07 Mar '19

07 Mar '19

commit c3597fcb5da9080513f98090ad98aee327864a80 Merge: 99ce17e 9397a07 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 7 13:28:53 2019 +0100 Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging templates/download.html | 11 +++++++---- templates/macros/people.html | 4 ++-- templates/sponsors.html | 3 ++- 3 files changed, 11 insertions(+), 7 deletions(-)

1 0

[tpo/master] Remove |safe in sponsors page
by hiro＠torproject.org 07 Mar '19

07 Mar '19

commit 9397a0797257699232a53340e179ad200cbf713c Author: hiro <hiro(a)torproject.org> Date: Thu Mar 7 13:10:08 2019 +0100 Remove |safe in sponsors page --- templates/sponsors.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/sponsors.html b/templates/sponsors.html index 6a788b8..b1ba3cf 100644 --- a/templates/sponsors.html +++ b/templates/sponsors.html @@ -32,7 +32,8 @@ <div class="container"> <div class="row border-bottom border-light"><p></p></div> <div class="row py-5"> - <p>{{ _('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>')|safe }}</p> + <p>{{ _('This sponsors page is based upon un-audited and un-reviewed financial and in-kind donations, contract, and other data.') }}</p> + <p><a href="/about/reports" title="Reports"><u>{{ _('Further details about our audited and reviewed funding can be found with our Financial Reports.') }}</u></a><p> </div> </div> </div>

1 0

[tpo/staging] Remove |safe in sponsors page
by hiro＠torproject.org 07 Mar '19

07 Mar '19

commit 9397a0797257699232a53340e179ad200cbf713c Author: hiro <hiro(a)torproject.org> Date: Thu Mar 7 13:10:08 2019 +0100 Remove |safe in sponsors page --- templates/sponsors.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/sponsors.html b/templates/sponsors.html index 6a788b8..b1ba3cf 100644 --- a/templates/sponsors.html +++ b/templates/sponsors.html @@ -32,7 +32,8 @@ <div class="container"> <div class="row border-bottom border-light"><p></p></div> <div class="row py-5"> - <p>{{ _('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>')|safe }}</p> + <p>{{ _('This sponsors page is based upon un-audited and un-reviewed financial and in-kind donations, contract, and other data.') }}</p> + <p><a href="/about/reports" title="Reports"><u>{{ _('Further details about our audited and reviewed funding can be found with our Financial Reports.') }}</u></a><p> </div> </div> </div>

1 0

[tpo/staging] Remove |safe in downloads page
by hiro＠torproject.org 07 Mar '19

07 Mar '19

commit a2e12177f97a53f7cea4590e558d0514327144e4 Author: hiro <hiro(a)torproject.org> Date: Thu Mar 7 13:02:23 2019 +0100 Remove |safe in downloads page --- templates/download.html | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/templates/download.html b/templates/download.html index 7c16c35..b853a1d 100644 --- a/templates/download.html +++ b/templates/download.html @@ -6,10 +6,12 @@ </div> <h3 class="text-primary display-6 pt-5">{{ _('Get connected') }}</h3> <div class="row pl-3 pr-5 text-tpo"> - <p class="text-tpo">{{ _('If you are in a country where Tor is blocked, you can <span class="text-primary text-bold">configure</span> Tor to connect to a bridge during the setup process. Select <span class="text-primary">"Tor is censored in my country."</span>')|safe }}</p> + <p class="text-tpo"><span class="text-primary text-bold">{{ _('If you are in a country where Tor is blocked, you can configure Tor to connect to a bridge during the setup process.') }} </span></p> + <p class="text-tpo">{{ _('Select "Tor is censored in my country."') }}</p> </div> <div class="row pl-3 pr-5 text-tpo"> - <p class="text-tpo">{{ _("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\"><u>Support Portal</u></a>.")|safe }}</p> + <p class="text-tpo">{{ _('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.') }}</p> + <p><a href=\"https://support.torproject.org\"><u>{{ _('Read other FAQ’s at our Support Portal') }}</u></a><p> </div> </div> <div class="col-sm-6"> @@ -22,7 +24,8 @@ {{ _('Tor Browser will block browser plugins such as Flash, RealPlayer, Quicktime, and others: they can be manipulated into revealing your IP address.') }}</p> </div> <div class="row pl-3 pr-5 text-tpo"> - <p class="text-tpo">{{ _('<b>We do not recommend installing additional add-ons or plugins</b> into Tor Browser, as these may bypass Tor or compromise your privacy. Tor Browser already comes with HTTPS Everywhere, NoScript, and other patches to protect your privacy and security.')|safe }}</p> + <p class="text-tpo"><b>{{ _('We do not recommend installing additional add-ons or plugins into Tor Browser') }}</b></p> + <p class="text-tpo">{{ _('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.') }}</p> </div> </div> </div> @@ -42,7 +45,7 @@ </div> <div class="container justify-content-center mt-4"> <div class="row justify-content-center"> - <i class="fas fa-signature display-5 text-primary pr-3"></i><p class="text-primary text-tpo">{{ _('Verify Tor Browser signature <a class="mx-auto" href="https://support.torproject.org/how-to-verify-signature" target="_blank"><u>here</u></a>.')|safe }}</p> + <i class="fas fa-signature display-5 text-primary pr-3"></i><p class="text-primary text-tpo"><a class="mx-auto" href="https://support.torproject.org/how-to-verify-signature" target="_blank"><u>{{ _('Verify Tor Browser signature') }}</u></a></p> </div> </div> <div class="container">

1 0

[tpo/master] Remove |safe in downloads page
by hiro＠torproject.org 07 Mar '19

07 Mar '19

commit a2e12177f97a53f7cea4590e558d0514327144e4 Author: hiro <hiro(a)torproject.org> Date: Thu Mar 7 13:02:23 2019 +0100 Remove |safe in downloads page --- templates/download.html | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/templates/download.html b/templates/download.html index 7c16c35..b853a1d 100644 --- a/templates/download.html +++ b/templates/download.html @@ -6,10 +6,12 @@ </div> <h3 class="text-primary display-6 pt-5">{{ _('Get connected') }}</h3> <div class="row pl-3 pr-5 text-tpo"> - <p class="text-tpo">{{ _('If you are in a country where Tor is blocked, you can <span class="text-primary text-bold">configure</span> Tor to connect to a bridge during the setup process. Select <span class="text-primary">"Tor is censored in my country."</span>')|safe }}</p> + <p class="text-tpo"><span class="text-primary text-bold">{{ _('If you are in a country where Tor is blocked, you can configure Tor to connect to a bridge during the setup process.') }} </span></p> + <p class="text-tpo">{{ _('Select "Tor is censored in my country."') }}</p> </div> <div class="row pl-3 pr-5 text-tpo"> - <p class="text-tpo">{{ _("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\"><u>Support Portal</u></a>.")|safe }}</p> + <p class="text-tpo">{{ _('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.') }}</p> + <p><a href=\"https://support.torproject.org\"><u>{{ _('Read other FAQ’s at our Support Portal') }}</u></a><p> </div> </div> <div class="col-sm-6"> @@ -22,7 +24,8 @@ {{ _('Tor Browser will block browser plugins such as Flash, RealPlayer, Quicktime, and others: they can be manipulated into revealing your IP address.') }}</p> </div> <div class="row pl-3 pr-5 text-tpo"> - <p class="text-tpo">{{ _('<b>We do not recommend installing additional add-ons or plugins</b> into Tor Browser, as these may bypass Tor or compromise your privacy. Tor Browser already comes with HTTPS Everywhere, NoScript, and other patches to protect your privacy and security.')|safe }}</p> + <p class="text-tpo"><b>{{ _('We do not recommend installing additional add-ons or plugins into Tor Browser') }}</b></p> + <p class="text-tpo">{{ _('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.') }}</p> </div> </div> </div> @@ -42,7 +45,7 @@ </div> <div class="container justify-content-center mt-4"> <div class="row justify-content-center"> - <i class="fas fa-signature display-5 text-primary pr-3"></i><p class="text-primary text-tpo">{{ _('Verify Tor Browser signature <a class="mx-auto" href="https://support.torproject.org/how-to-verify-signature" target="_blank"><u>here</u></a>.')|safe }}</p> + <i class="fas fa-signature display-5 text-primary pr-3"></i><p class="text-primary text-tpo"><a class="mx-auto" href="https://support.torproject.org/how-to-verify-signature" target="_blank"><u>{{ _('Verify Tor Browser signature') }}</u></a></p> </div> </div> <div class="container">

1 0

[tpo/master] Fix layout
by hiro＠torproject.org 07 Mar '19

07 Mar '19

commit 747d36b5280a99827aa52a1a4089ff84fbfd41f0 Author: hiro <hiro(a)torproject.org> Date: Thu Mar 7 12:18:07 2019 +0100 Fix layout --- templates/macros/people.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/macros/people.html b/templates/macros/people.html index 48c23b6..22b0121 100644 --- a/templates/macros/people.html +++ b/templates/macros/people.html @@ -1,5 +1,5 @@ {% macro render_board(item, alternative) %} - <div class="col-md-4 col-xl-3 my-4"> + <div class="col-md-6 col-sm-12 col-xl-3 my-4"> <div class="card h-100 my-2"> <div class="card-body"> <h5 class="card-title human-name">{{ item.name }}</h5> @@ -12,7 +12,7 @@ {% endmacro %} {% macro render_core(item, alternative) %} - <div class="col-md-3 col-xl-2 my-3"> + <div class="col-md-6 col-sm-12 col-xl-3 my-3"> <div class="card h-100"> <div class="card-header bg-white border-0"> {% if item.image %}

1 0