commit 4d0b5c4d3c2e42af215d4782f781a534d5bc420d Merge: 80468d0 3084f4c Author: hiro hiro@torproject.org Date: Thu Jan 23 17:44:19 2020 +0100
Fix merge conflict for gsoc branch
.htaccess | 18 +++++ .../gsoc/cloudflare-captcha-monitoring/contents.lr | 49 ++++++++++++ content/gsoc/contents.lr | 21 +++++ content/gsoc/onion-toolbox/contents.lr | 60 +++++++++++++++ content/gsoc/privacy-friendly-web/contents.lr | 45 +++++++++++ content/gsoc/tor-relay-ipv6-support/contents.lr | 58 ++++++++++++++ content/gsoc/tor-weather/contents.lr | 90 ++++++++++++++++++++++ content/localization/pick-a-project/contents.lr | 4 +- content/onion-services/setup/contents.lr | 2 +- .../community-resources/bad-relays/contents.lr | 26 ++++--- .../community-resources/contents.lr | 2 +- .../eff-tor-legal-faq/contents.lr | 66 ++++++++++++---- .../tor-dmca-response/contents.lr | 2 + .../community-resources/good-bad-isps/contents.lr | 2 + .../community-resources/swag/contents.lr | 6 +- .../tor-abuse-templates/contents.lr | 2 + .../tor-exit-guidelines/contents.lr | 8 +- .../tor-relay-universities/contents.lr | 4 +- content/relay-operations/contents.lr | 2 +- .../relays-requirements/contents.lr | 2 +- .../bridge/debian-ubuntu/contents.lr | 15 ++-- .../technical-setup/bridge/docker/contents.lr | 87 ++++++++++++++------- content/training/best-practices/contents.lr | 3 +- lego | 2 +- models/project.ini | 51 ++++++++++++ models/projects.ini | 33 ++++++++ templates/gsoc.html | 23 ++++++ templates/hero.html | 2 +- templates/macros/projects.html | 16 ++++ templates/project.html | 49 ++++++++++++ 30 files changed, 671 insertions(+), 79 deletions(-)
diff --cc content/localization/pick-a-project/contents.lr index 765cd4e,c5b5860..9234b53 --- a/content/localization/pick-a-project/contents.lr +++ b/content/localization/pick-a-project/contents.lr @@@ -19,10 -19,9 +19,10 @@@ We want our tools to be available and l
<img class="col-lg-6" src="../../static/images/localization/stats.png">
- Although we would value your contribution to any of the projects above, the most critical are Tor Browser, the Tor Browser User Manual, and our Support Portal: + Although we would value your contribution to any of the projects above, our most critical needs are Tor Browser, the Tor Browser User Manual, and our Support Portal:
* Tor Browser is translated in many different Transifex resources, but you can see the [Tor Browser total strings translated per language](https://torpat.ch/locales) to see where help is needed. -* The Tor Browser User Manual is a very useful resource for new users that do not speak English, see [Tor Browser User Manual translation statistics](https://torpat.ch/manual-locales) or [translate](https://www.transifex.com/otf/tor-project-support-community-portal/tbmanual-...) to help. -* The [Support Portal](https://support.torproject.org/) is also a valuable resource for all Tor users, see [Tor Support Portal translation statistics](https://torpat.ch/support-locales) or [translate](https://www.transifex.com/otf/tor-project-support-community-portal/support-p...) to help. -* The [Community Portal](https://community.torproject.org/) is this website, where you can find ways to contribute to Tor. Help us [translate](https://www.transifex.com/otf/tor-project-support-community-portal/support-p...) it. +* The Tor Browser User Manual is a very useful resource for new users that do not speak English, see [Tor Browser User Manual translation statistics](https://torpat.ch/manual-locales) or [translate](https://www.transifex.com/otf/tor-project-support-community-portal/tbmanual-...). +* The [Support Portal](https://support.torproject.org/) is also a valuable resource for all Tor users, see [Tor Support Portal translation statistics](https://torpat.ch/support-locales) or [translate](https://www.transifex.com/otf/tor-project-support-community-portal/support-p...) +* The [Community Portal](https://community.torproject.org/) is this website, where you can find ways to contribute to Tor. + [Translate](https://www.transifex.com/otf/tor-project-support-community-portal/support-p...) diff --cc lego index bbf8108,f0ea955..e9dd081 --- a/lego +++ b/lego @@@ -1,1 -1,1 +1,1 @@@ - Subproject commit bbf8108b622ef4c8b1d96b9790fc3e77aa1c030f -Subproject commit f0ea955c50f147813fd7735d226e7f4689e94523 ++Subproject commit e9dd081027132aa21f6abd74be708323ff3b9180