[tor-commits] [tpo/staging] i18n updates

2019-02-07 Thread emmapeel 
commit debf31fc69a11c7d6e861d15e0444277e4ae29ec
Author: emma peel 
Date:   Fri Feb 8 00:48:36 2019 +0100

i18n updates
---
 templates/reports.html  | 10 +-
 templates/sponsors.html |  8 
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/templates/reports.html b/templates/reports.html
index 80cef40..97a5ffc 100644
--- a/templates/reports.html
+++ b/templates/reports.html
@@ -1,5 +1,5 @@
 
-  Founding Documents
+{{ _('Founding Documents') }}
 
 
   
@@ -13,15 +13,15 @@
 
 
 
-  Reports
+{{ _('Reports') }}
 
 
   
   
 
-  Year
-  Type
-  Title
+  {{ _('Year') }}
+  {{ _('Type') }}
+  {{ _('Title') }}
   
 
   
diff --git a/templates/sponsors.html b/templates/sponsors.html
index bcc0974..5498217 100644
--- a/templates/sponsors.html
+++ b/templates/sponsors.html
@@ -1,8 +1,8 @@
 
-   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, educating, 
researching, and running the relays that make up the Tor network.
+{{ _('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, educating, 
researching, and running the relays that make up the Tor network.') }}
 
 
-Active Sponsors
+{{ _('Active Sponsors') }}
 
 
   
@@ -14,7 +14,7 @@
   
 
 
-Past Sponsors
+{{ _('Past Sponsors') }}
 
 
 
@@ -32,7 +32,7 @@
   
 
 
-  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 on our Financial Reports page.
+{{ _('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 on our Financial Reports page.') }}
 
   
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/staging] i18n updates

2019-02-07 Thread emmapeel 
commit 7ba398f908d69531d3a4342b27b1f142751a65a6
Author: emma peel 
Date:   Thu Feb 7 20:43:55 2019 +0100

i18n updates
---
 templates/download-options.html |  2 +-
 templates/people.html   |  8 
 templates/press.html| 26 +-
 templates/projects.html |  4 ++--
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/templates/download-options.html b/templates/download-options.html
index 5ed6ffa..28d7ccc 100644
--- a/templates/download-options.html
+++ b/templates/download-options.html
@@ -8,7 +8,7 @@
 
   
 
-  Language
+  {{ _('Language') }}
   Windows
   MacOS
   GNU/Linux
diff --git a/templates/people.html b/templates/people.html
index 83e8805..2ca9bbc 100644
--- a/templates/people.html
+++ b/templates/people.html
@@ -1,5 +1,5 @@
 
-  Board of Directors
+  {{ _('Board of Directors') }}
 
 
   
@@ -11,7 +11,7 @@
   
 
 
-  Core Tor
+  {{ _('Core Tor') }}
 
 
   
@@ -24,8 +24,8 @@
 
 
   
-Join Our Team
-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.
+{{ _('Join Our Team') }}
+{{ _("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.") }}
 
   
 {{ _("Sign up for tor-dev") }}
diff --git a/templates/press.html b/templates/press.html
index e87b31e..61f9707 100644
--- a/templates/press.html
+++ b/templates/press.html
@@ -4,30 +4,30 @@
 
   
 
-   Get support
+ {{ _('Get support') }}
   
-https://support.torproject.org/; 
title="Tor Project Support Portal" target="_blank">Visit our Support Portal
+https://support.torproject.org/; 
title="Tor Project Support Portal" target="_blank">{{ _('Visit our Support 
Portal') }}
   
   
-https://webchat.oftc.net/; title="Tor 
Project IRC" target="_blank">Ask us on #tor
+https://webchat.oftc.net/; title="Tor 
Project IRC" target="_blank">{{ _('Ask us on #tor') }}
   
   
-http://lists.torproject.org/; 
title="Tor Project Mailing List" target="_blank">Write to a mailing list
+http://lists.torproject.org/; 
title="Tor Project Mailing List" target="_blank">{{ _('Write to a mailing 
list') }}
   
 
 
   
 
 
-   Brand Assets
+   {{ _('Brand Assets') }}
 
-  https://styleguide.torproject.org/visuals/#assets; title="The Tor Project 
Brand Assets" target="_blank">The Tor Project
+  https://styleguide.torproject.org/visuals/#assets; title="The Tor Project 
Brand Assets" target="_blank">{{ _('The Tor Project') }}
 
 
-  https://styleguide.torproject.org/visuals/#assets; title="The Tor Browser 
Brand Assets" target="_blank">The Tor Browser
+  https://styleguide.torproject.org/visuals/#assets; title="The Tor Browser 
Brand Assets" target="_blank">{{ _('The Tor Browser') }}
 
 
-  https://styleguide.torproject.org/visuals/#assets; title="Onion Services" 
target="_blank">Onion Services
+  https://styleguide.torproject.org/visuals/#assets; title="Onion Services" 
target="_blank">{{ _('Onion Services') }}
 
 
   
@@ -37,7 +37,7 @@
 
 
   
-Press Releases
+{{ _('Press Releases') }}
   
 
 
@@ -51,16 +51,16 @@
 
 
   
-Coverage
+{{ _('Coverage') }}
   
 
 
   
   
 
-  Date
-  Publication
-  Topic
+  {{ _('Date') }}
+  {{ _('Publication') }}
+  {{ _('Topic') }}
 
   
   
diff --git a/templates/projects.html b/templates/projects.html
index 04d7391..246c9ca 100644
--- a/templates/projects.html
+++ b/templates/projects.html
@@ -2,7 +2,7 @@
   
 
 
-  Previous Openings
+   {{ _('Previous Openings') }}
 
 
   
@@ -30,6 +30,6 @@
 
   
   
-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. 
We invite you to join us on IRC to find how you can get 
involved.
+{{ _("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.") }} {{ _('We invite you to join us on IRC to find how 
you can get involved.') }}
   
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/staging] i18n updates

2019-02-07 Thread emmapeel 
commit 894fa07bb180d04b35ee37b3a2c51a82f859ba7b
Author: emma peel 
Date:   Thu Feb 7 20:15:52 2019 +0100

i18n updates
---
 templates/download-languages.html | 2 +-
 templates/download.html   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/download-languages.html 
b/templates/download-languages.html
index bad8713..85754a9 100644
--- a/templates/download-languages.html
+++ b/templates/download-languages.html
@@ -8,7 +8,7 @@
 
   
 
-  Language
+  {{ _('Language') }}
   Windows
   MacOS
   GNU/Linux
diff --git a/templates/download.html b/templates/download.html
index 0411415..2965aba 100644
--- a/templates/download.html
+++ b/templates/download.html
@@ -32,7 +32,7 @@
 
 
   
-Check out the https://manual.torproject.org; target="_blank">manual for more 
troubleshooting tips.
+  {{ _('Check out the https://manual.torproject.org; target="_blank">manual for more 
troubleshooting tips.')|safe  }}
   
 
 
@@ -40,7 +40,7 @@
 
 
   
-Verify Tor Browser signature https://support.torproject.org/how-to-verify-signature; 
target="_blank">here.
+  {{ _('Verify Tor Browser signature https://support.torproject.org/how-to-verify-signature; 
target="_blank">here.')|safe }}
   
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/staging] i18n updates

2019-02-07 Thread emmapeel 
commit 51ec67d3fe6f9da05101a324cbbd4e85f078ce27
Author: emma peel 
Date:   Thu Feb 7 20:01:01 2019 +0100

i18n updates
---
 templates/footer.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/footer.html b/templates/footer.html
index ce879bf..12a0f43 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -6,8 +6,8 @@
 
   
 
-   Download Tor Browser
-Download Tor Browser to experience real 
private browsing without tracking, surveillance, or censorship.
+   {{ _('Download Tor Browser') 
}}
+{{ _('Download Tor Browser to experience 
real private browsing without tracking, surveillance, or censorship.') }}
 {% set download = site.get('/download') %}
 
   {{ _("Download Tor Browser") }}

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/staging] i18n updates

2019-02-07 Thread emmapeel 
commit 18ca0bab456760d5e8ba2ddbe2deda7d53044e15
Author: emma peel 
Date:   Thu Feb 7 19:05:51 2019 +0100

i18n updates
---
 templates/contact.html | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/templates/contact.html b/templates/contact.html
index 9cbc577..0667b71 100644
--- a/templates/contact.html
+++ b/templates/contact.html
@@ -30,18 +30,18 @@
 
 
   
-Volunteer with Tor
+{{ _('Volunteer with Tor') }}
   
   
-Get 
Involved
+{{ 
_('Get Involved') }}
   
 
 
   
-Join an email list 
+{{ _('Join an email list') }} 
   
   
-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 :)
+{{ _("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 :)") }}
   
 
 
@@ -54,15 +54,15 @@
 
   
   
-Report a bug or give feedback.
-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).
+{{ _('Report a bug or give feedback.') }}
+{{ _('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).') }}
   
   
 
   
   
-Tell us about a bad relay.
-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.
+{{ _('Tell us about a bad relay.') }}
+{{ _('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.') }}
   
 
 
@@ -70,8 +70,8 @@
 
   
   
-Report a security issue.
-If you've found a security issue in one of our 
projects or in our infrastructure, please email 
tor-secur...@lists.torproject.org. If you want to encrypt your mail, you can 
get the GPG public key for the list by contacting 
tor-security-send...@lists.torproject.org or from pool.sks-keyservers.net. Here 
is the fingerprint:
+{{ _('Report a security issue.') }}
+{{ _('If you've found a security issue in one of 
our projects or in our infrastructure, please email 
tor-secur...@lists.torproject.org. If you want to encrypt your mail, you can 
get the GPG public key for the list by contacting 
tor-security-send...@lists.torproject.org or from pool.sks-keyservers.net. Here 
is the fingerprint:') }}
   
   
 gpg --fingerprint 
tor-secur...@lists.torproject.org 
@@ -91,14 +91,14 @@
 
   
 
-  Email us
-  For questions and comments about Tor the non-profit 
organization: trademark questions, affiliation and coordination, contract 
inquiries, etc, please email frontd...@rt.torproject.org. For 
donor-related questions, contact giv...@torproject.org.
+  {{ _('Email us') }}
+  {{ _('For questions and comments about Tor the 
non-profit organization: trademark questions, affiliation and coordination, 
contract inquiries, etc, please email frontd...@rt.torproject.org. For donor-related questions, contact 
giv...@torproject.org')|safe }}.
 
 
   
 
 
-  Send us Mail
+  {{ _('Send us Mail') }}
   The Tor Project 
 
217 1st Ave South #4903
 
Seattle, WA 98194 USA

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/staging] i18n updates

2019-02-07 Thread emmapeel 
commit 5b7077d20314943c96a4af7959bcca5c59ee44b9
Author: emma peel 
Date:   Thu Feb 7 18:22:40 2019 +0100

i18n updates
---
 templates/download-android.html | 12 ++--
 templates/hero-download.html| 10 +-
 templates/macros/jobs.html  |  2 +-
 templates/macros/reports.html   |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/templates/download-android.html b/templates/download-android.html
index 30ebe45..41433fb 100644
--- a/templates/download-android.html
+++ b/templates/download-android.html
@@ -9,18 +9,18 @@
 
   
   
-Get Tor Browser for 
Android.
+{{ _('Get Tor Browser for 
Android.') }}
   
   
-Protect yourself against 
tracking, surveillance, and censorship. 
+{{ _('Protect yourself against 
tracking, surveillance, and censorship.') }}
   
   
-  Download .apk
-  Go to Google Play
-  Go to F-droid S00N
+  {{ _('Download .apk') }}
+  {{ _('Go to Google Play') }}
+  {{ _('Go to F-droid S00N')|safe }}
   
   
-Are you a iOS user? We encourage you to try Onion Browser.
+{{ _('Are you a iOS user? We 
encourage you to try Onion 
Browser.')|safe }}
   
 
 
diff --git a/templates/hero-download.html b/templates/hero-download.html
index c3ab624..17fb171 100644
--- a/templates/hero-download.html
+++ b/templates/hero-download.html
@@ -1,8 +1,8 @@
 
-  Defend yourself.
+  {{ _('Defend yourself.') }}
 
 
-  Protect yourself against tracking, 
surveillance, and censorship. 
+  {{ _('Protect yourself against 
tracking, surveillance, and censorship.') }}
 
 
   {% for id, item in bag('platforms+' + this.alt).items() %}
@@ -30,9 +30,9 @@
   {% endfor %}
 
 
-  Download 
in another language
-  Advanced 
Install Options
+  {{ 
_('Download in another language') }}
+  {{ 
_('Advanced Install Options') }}
 
 
-  Read the latest release 
announcements
+  {{ _('Read the latest release 
announcements') }}
 
diff --git a/templates/macros/jobs.html b/templates/macros/jobs.html
index f180ff9..5adad47 100644
--- a/templates/macros/jobs.html
+++ b/templates/macros/jobs.html
@@ -8,7 +8,7 @@
   
 
   {{ item.summary }}
-  Read more.
+  {{ _('Read more.') }}
 
   
 
diff --git a/templates/macros/reports.html b/templates/macros/reports.html
index b2d9916..d9ccbe3 100644
--- a/templates/macros/reports.html
+++ b/templates/macros/reports.html
@@ -2,7 +2,7 @@
 
   {{ item.title }}
   {{ item.description }}
-  View PDF
+  {{ _('View PDF') }}
 
 {% endmacro %}
 
@@ -16,6 +16,6 @@
 {% endfor %}
   
   {{ item.title }}
-  View PDF
+  {{ _('View PDF') }}
 
 {% endmacro %}

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/staging] i18n updates

2019-02-06 Thread emmapeel 
commit 67fab3182e032342e42f34d5e837c146d51d9f83
Author: emma peel 
Date:   Wed Feb 6 18:16:57 2019 +0100

i18n updates
---
 templates/contact.html | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/contact.html b/templates/contact.html
index 6da9e23..acd3902 100644
--- a/templates/contact.html
+++ b/templates/contact.html
@@ -4,16 +4,16 @@
 
   
 
-   Chat with us on https://webchat.oftc.net/; 
title="Tor Project IRC" target="_blank">OFTC IRC
-  #tor - Ask 
questions about using Tor.
-  #tor-dev - 
Discuss Tor-related coding, protocols, and ideas are all welcome.
-  #tor-project 
- Discuss organization and community related topics: meetups, outreach, 
translation, or website improvements.
-  #tor-meeting 
- Watch or join publicly logged team meetings.
-  #tor-relays - 
Discuss running a Tor relay.
-  #tor-south - 
Talk with Tor’s global south community.
+ {{ _("Chat with us on https://webchat.oftc.net/; title="Tor Project IRC" target="_blank">OFTC 
IRC")|safe }}
+  #tor - {{ 
_("Ask questions about using Tor.") }}
+  #tor-dev - {{ 
_("Discuss Tor-related coding, protocols, and ideas are all welcome.") }}
+  #tor-project 
- {{ _("Discuss organization and community related topics: meetups, outreach, 
translation, or website improvements.") }}
+  #tor-meeting 
- {{ _("Watch or join publicly logged team meetings.") }}
+  #tor-relays - 
{{ _("Discuss running a Tor relay.") }}
+  #tor-south - 
{{ _("Talk with Tor’s global south community.") }}
 
 
-   Find us on Social Media
+ {{ _("Find us on Social Media") }}
   
 https://twitter.com/torproject; title="@torproject" 
target="_blank">Twitter
 https://www.facebook.com/TorProject; title="Tor Project" 
target="_blank">Facebook

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/staging] i18n updates

2019-02-06 Thread emmapeel 
commit 570885b075156fbaf2f202af06ba129561b9a972
Author: emma peel 
Date:   Wed Feb 6 17:24:56 2019 +0100

i18n updates
---
 content/about/sponsors/fastly/contents.lr| 3 ++-
 content/about/sponsors/handshake/contents.lr | 3 ++-
 content/about/sponsors/mdf/contents.lr   | 3 ++-
 content/about/sponsors/nsf-minnesota/contents.lr | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/content/about/sponsors/fastly/contents.lr 
b/content/about/sponsors/fastly/contents.lr
index 1338382..d03094e 100644
--- a/content/about/sponsors/fastly/contents.lr
+++ b/content/about/sponsors/fastly/contents.lr
@@ -13,4 +13,5 @@ logo: /static/images/sponsors/fastly.png
 link: https://www.fastly.com/
 ---
 description:
-Fastly’s global edge cloud platform processes, serves, and secures 
applications as close to users as possible, at the edge of the network. Fastly 
generously hosts our Tor Browser update downloads that can be fetched 
anonymously.
+Fastly’s global edge cloud platform processes, serves, and secures 
applications as close to users as possible, at the edge of the network.
+Fastly generously hosts our Tor Browser update downloads that can be fetched 
anonymously.
diff --git a/content/about/sponsors/handshake/contents.lr 
b/content/about/sponsors/handshake/contents.lr
index 97537b9..16c2d11 100644
--- a/content/about/sponsors/handshake/contents.lr
+++ b/content/about/sponsors/handshake/contents.lr
@@ -14,4 +14,5 @@ link: https://handshake.org/
 ---
 description:
 
-Handshake is a decentralized, permissionless naming protocol compatible with 
DNS where every peer is validating and in charge of managing the root zone with 
the goal of creating an alternative to existing Certificate Authorities. This 
grant was unrestricted, general operating funds for the Tor Project.
+Handshake is a decentralized, permissionless naming protocol compatible with 
DNS where every peer is validating and in charge of managing the root zone with 
the goal of creating an alternative to existing Certificate Authorities.
+This grant was unrestricted, general operating funds for the Tor Project.
diff --git a/content/about/sponsors/mdf/contents.lr 
b/content/about/sponsors/mdf/contents.lr
index 56f96d3..bd27acc 100644
--- a/content/about/sponsors/mdf/contents.lr
+++ b/content/about/sponsors/mdf/contents.lr
@@ -14,4 +14,5 @@ link: http://mediademocracyfund.org/
 ---
 description:
 
-MDF expertise in media and technology policy and extensive partnerships enable 
them to guide their funding partners through the rapidly changing issues and 
develop strategies that address priorities in digital equity and rights. These 
grants were unrestricted, general operating funds for both the Tor Project and 
the Open Observatory of Network Interference (OONI).
+MDF expertise in media and technology policy and extensive partnerships enable 
them to guide their funding partners through the rapidly changing issues and 
develop strategies that address priorities in digital equity and rights.
+These grants were unrestricted, general operating funds for both the Tor 
Project and the Open Observatory of Network Interference (OONI).
diff --git a/content/about/sponsors/nsf-minnesota/contents.lr 
b/content/about/sponsors/nsf-minnesota/contents.lr
index 24095a6..950738c 100644
--- a/content/about/sponsors/nsf-minnesota/contents.lr
+++ b/content/about/sponsors/nsf-minnesota/contents.lr
@@ -14,4 +14,5 @@ link: https://nsf.gov/
 ---
 description:
 
-The National Science Foundation funds research and education in most fields of 
science and engineering. This grant helped us investigate measurement-based 
design and analysis of censorship circumvention schemes.
+The National Science Foundation funds research and education in most fields of 
science and engineering.
+This grant helped us investigate measurement-based design and analysis of 
censorship circumvention schemes.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits