[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [community/master] apply lost dip patches overwritten by torpusher
commit a85d586cf220ff7b09442078d8851d6585aa28cc
Author: emma peel <emma.peel@xxxxxxxxxx>
Date: Fri Aug 9 12:47:22 2019 +0200
apply lost dip patches overwritten by torpusher
---
content/outreach/contents.lr | 2 +-
.../community-resources/contents.lr | 41 +++++++++++++++-------
content/training/contents.lr | 4 +--
templates/localization.html | 4 +--
4 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/content/outreach/contents.lr b/content/outreach/contents.lr
index 40a16af..e6d65ef 100644
--- a/content/outreach/contents.lr
+++ b/content/outreach/contents.lr
@@ -20,4 +20,4 @@ body:
##Tell the world about Tor
-We love it when people bring information about Tor to their community events, conferences, and meetups, and so we've curated some beautiful materials for in-person and social media outreach.
+We love it when people bring information about Tor to their community events, conferences, and meetups. We've curated some beautiful materials for sharing in-person and on social media we welcome you to use.
\ No newline at end of file
diff --git a/content/relay-operations/community-resources/contents.lr b/content/relay-operations/community-resources/contents.lr
index eb905fc..bfdcfcb 100644
--- a/content/relay-operations/community-resources/contents.lr
+++ b/content/relay-operations/community-resources/contents.lr
@@ -16,11 +16,15 @@ html: two-columns-page.html
---
body:
-Exit relay operators should understand the potential risks associated with running an exit relay. For the majority of operators in most countries, bridges and guard/middle relays are very low risk. Exits are the ones that present some legal concerns, but operators under most circumstances will be able to handle legal matters by having an abuse response letter, running the exit from a location that isn't their home, and reading through some of the legal resources that Tor-supportive lawyers have put together.
+Exit relay operators should understand the potential risks associated with running an exit relay.
+For the majority of operators in most countries, bridges and guard/middle relays are very low risk.
+Exits are the ones that present some legal concerns, but operators under most circumstances will be able to handle legal matters by having an abuse response letter, running the exit from a location that isn't their home, and reading through some of the legal resources that Tor-supportive lawyers have put together.
# Legal resources
-The [EFF Tor Legal FAQ](https://www.torproject.org/eff/tor-legal-faq.html.en) answers many common questions about relay operation and the law. We also like [Noisebridge's wiki](https://www.noisebridge.net/wiki/Noisebridge_Tor/FBI) for additional legal resources. In general it's a good idea to consult with a lawyer before deciding to operate an exit relay, especially if you live in a place where exit relay operators have been harassed, or if you're the only exit relay operator in your region. Get in touch with your local digital rights organization to see if they have recommendations about legal assistance, and if you're not sure what organizations are working in your region, [write to EFF](https://www.eff.org/about/contact) and see if they can help connect you.
+The [EFF Tor Legal FAQ](https://www.torproject.org/eff/tor-legal-faq.html.en) answers many common questions about relay operation and the law. We also like [Noisebridge's wiki](https://www.noisebridge.net/wiki/Noisebridge_Tor/FBI) for additional legal resources.
+In general it's a good idea to consult with a lawyer before deciding to operate an exit relay, especially if you live in a place where exit relay operators have been harassed, or if you're the only exit relay operator in your region.
+Get in touch with your local digital rights organization to see if they have recommendations about legal assistance, and if you're not sure what organizations are working in your region, [write to EFF](https://www.eff.org/about/contact) and see if they can help connect you.
Also see the [Tor Exit Guidelines](tor-exit-guidelines).
@@ -28,7 +32,8 @@ Also see the [Tor Exit Guidelines](tor-exit-guidelines).
Operators can put together their own abuse complaint template responses from one of many templates that Tor has created: [Tor Abuse Templates](tor-abuse-templates).
-It is important to respond to abuse complaints in a timely manner (usually within 24 hours). If the hoster gets annoyed by the amount of abuse you can reduce the amount of ports allowed in your exit policy. Please document your experience with new hosters on the following wiki page: [GoodBadISPs](good-bad-isps)
+It is important to respond to abuse complaints in a timely manner (usually within 24 hours). If the hoster gets annoyed by the amount of abuse you can reduce the amount of ports allowed in your exit policy.
+Please document your experience with new hosters on the following wiki page: [GoodBadISPs](good-bad-isps)
Other docs we like:
@@ -39,29 +44,41 @@ Other docs we like:
Running relays is more fun with other people! You can work with your university department, your employer or institution, or an organization like [Torservers.net](https://torservers.net) to run a relay.
-## Torservers.net
+## Torservers.net
-Torservers is an independent, global network of organizations that help the Tor network by running high bandwidth Tor relays. Becoming a Torservers partner is a good way to become more involved in the Tor relay community, and can help you connect with dedicated relay operators around the world for solidarity and support. To start a Torservers partner, the most important thing is to have a group of people (3-5 suggested to start) interested in helping with the various activities required for running relays. There should be mutual trust between the people in the group, and members should commit to running relays for the long term. If you do not know anyone in your social network interested in running relays, one place to meet people is [your local hackerspace](https://wiki.hackerspaces.org/Hackerspaces).
+Torservers is an independent, global network of organizations that help the Tor network by running high bandwidth Tor relays.
+Becoming a Torservers partner is a good way to become more involved in the Tor relay community, and can help you connect with dedicated relay operators around the world for solidarity and support.
+To start a Torservers partner, the most important thing is to have a group of people (3-5 suggested to start) interested in helping with the various activities required for running relays.
+There should be mutual trust between the people in the group, and members should commit to running relays for the long term.
+If you do not know anyone in your social network interested in running relays, one place to meet people is [your local hackerspace](https://wiki.hackerspaces.org/Hackerspaces).
-Once you have a trusted group of people, depending on your region, it is often advised to create some type of non-profit corporation. This is useful for having a bank account, shared ownership, grant applications, etc. In many countries operating as a corporation instead of as an individual can also get you certain legal protections.
+Once you have a trusted group of people, depending on your region, it is often advised to create some type of non-profit corporation.
+This is useful for having a bank account, shared ownership, grant applications, etc.
+In many countries operating as a corporation instead of as an individual can also get you certain legal protections.
-The next steps are figuring out hardware, transit, and server hosting. Depending on your location and connections within the technical community of the area, the last one may be the hardest step. Small local ISPs often have extra bandwidth, and may be interested in supporting your group with some bandwidth or rackspace. It is extremely important to maintain good relationships with these ISPs.
+The next steps are figuring out hardware, transit, and server hosting.
+Depending on your location and connections within the technical community of the area, the last one may be the hardest step.
+Small local ISPs often have extra bandwidth, and may be interested in supporting your group with some bandwidth or rackspace.
+It is extremely important to maintain good relationships with these ISPs.
-## At your university
+## At your university
-Many computer science departments, university libraries, and individual students and faculty run relays from university networks. These universities include the Massachusetts Institute of Technology (MIT CSAIL), Boston University, the University of Waterloo, the University of Washington, Northeastern University, Karlstad University, Universitaet Stuttgart, and Friedrich-Alexander University Erlangen-Nuremberg. To learn more about how to get support for a relay on your university's network, check out EFF's resources: [Tor on campus](https://www.eff.org/torchallenge/tor-on-campus.html).
+Many computer science departments, university libraries, and individual students and faculty run relays from university networks.
+These universities include the Massachusetts Institute of Technology (MIT CSAIL), Boston University, the University of Waterloo, the University of Washington, Northeastern University, Karlstad University, Universitaet Stuttgart, and Friedrich-Alexander University Erlangen-Nuremberg.
+To learn more about how to get support for a relay on your university's network, check out EFF's resources: [Tor on campus](https://www.eff.org/torchallenge/tor-on-campus.html).
## At your company or organization
-If you work at a Tor-friendly company or organization, that's another ideal place to run a relay. Some companies running relays include Brass Horn Communications, Quintex Alliance Consulting, and OmuraVPN. Some organizations running Tor relays include Digital Courage, [Access Now](https://www.accessnow.org/), [Derechos Digitales](https://tor.derechosdigitales.org), [Enjambre Digital](https://tor.enjambre.net/) and Lebanon Libraries in New Hampshire.
+If you work at a Tor-friendly company or organization, that's another ideal place to run a relay.
+Some companies running relays include Brass Horn Communications, Quintex Alliance Consulting, and OmuraVPN.
+Some organizations running Tor relays include Digital Courage, [Access Now](https://www.accessnow.org/), [Derechos Digitales](https://tor.derechosdigitales.org), [Enjambre Digital](https://tor.enjambre.net/) and Lebanon Libraries in New Hampshire.
# More resources
-Congratulations, you're officially a Tor relay operator! What now?
+Congratulations, you're officially a Tor relay operator! What now?
* You can check out traffic and other statistics for your relay at our [Relay Search](https://metrics.torproject.org/rs.html) (your relay will appear on "Relay Search" about 3 hours after you started it).
* There is also more info about running a relay at the [Tor FAQ](https://2019.www.torproject.org/docs/faq.html.en#HowDoIDecide).
* And, most importantly, make sure to email tshirt@xxxxxxxxxxxxxx and [claim your swag](swags). It's our way of saying thanks for defending privacy and free speech online.
-
diff --git a/content/training/contents.lr b/content/training/contents.lr
index 06c4259..9024fb8 100644
--- a/content/training/contents.lr
+++ b/content/training/contents.lr
@@ -18,9 +18,9 @@ html: training.html
---
body:
-## We want to teach the world about Tor. Will you help?
+## We want to teach the world about Tor. Can you help?
Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered.
-For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care.
+For some users with serious threat models, teaching Tor and other privacy tools can be risky if not done with care.
If this describes your community, or if you're not sure, please [contact our community team](https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam#Communication) for more help.
diff --git a/templates/localization.html b/templates/localization.html
index bfafcea..7a17aba 100644
--- a/templates/localization.html
+++ b/templates/localization.html
@@ -24,9 +24,9 @@
{% endfor %}
</div>
<div class="row py-5 text-center mx-auto">
- <h2 class="display-4 text-primary text-center mx-auto my-3">{{ _('Help us to improve our translations!') }}</h2>
+ <h2 class="display-4 text-primary text-center mx-auto my-3">{{ _('Can you help us improve our translations?') }}</h2>
<p class="text-center">
- {{ _('Localization is a continuous process across our applications. Notice any improvements we could make to our translations? Open a ticket, reach out to us, or become part of our translators army!') }}
+ {{ _('Localization is a continuous process across our applications. Notice any improvements we could make to our translations? Open a ticket, reach out to us, or become part of our translators squad.') }}
</p>
<a class="btn btn-lg btn-outline-primary mx-auto my-3" href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-l10n";>
{{ _('Translators mailing list') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i>
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits