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

[tpo/master] update content
by hiro＠torproject.org 11 Feb '19

11 Feb '19

commit a0e956ac2e0c6d651d5767dd8fcbdcc44f8193d2 Author: Antonela <hola(a)antonela.me> Date: Sat Feb 9 17:27:01 2019 +0100 update content --- templates/contact.html | 6 +++--- templates/download-options.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/contact.html b/templates/contact.html index 8416122..e4dcc18 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -38,7 +38,7 @@ </div> <div class="container pt-5 justify-content-center"> <div class="row ml-5 mr-5"> - <h4 class="text-primary">{{ _('Join an email list') }} <small class="fa fa-arrow-right p-1" title="icon arrow-right" aria-hidden="true"></small></h4> + <a class=" h4 text-primary" href="https://lists.torproject.org" target="_blank">{{ _('Join an email list') }} <small class="fa fa-arrow-right p-1" title="icon arrow-right" aria-hidden="true"></small></a> </div> <div class="row ml-5 mr-5 pt-3 preamble"> <p>{{ _("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 :)") }}</p> @@ -54,14 +54,14 @@ <div class="oval-3 mt-3"><i class="fas fa-spider text-primary"></i></div> </div> <div class="row mt-3 mr-5"> - <h4 class="text-primary">{{ _('Report a bug or give feedback.') }}</h4> + <a class="h4 text-primary" href="https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugF…" target="_blank">{{ _('Report a bug or give feedback.') }}</a> <p class="text-tpo">{{ _('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).') }}</p> </div> <div class="row"> <div class="oval-3 mt-3"><i class="fas fa-flag text-primary"></i></div> </div> <div class="row mt-3 mr-5"> - <h4 class="text-primary">{{ _('Tell us about a bad relay.') }}</h4> + <a class="h4 text-primary" href="https://trac.torproject.org/projects/tor/wiki/doc/ReportingBadRelays" target="_blank">{{ _('Tell us about a bad relay.') }}</a> <p class="text-tpo">{{ _('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.') }}</p> </div> </div> diff --git a/templates/download-options.html b/templates/download-options.html index 28d7ccc..e8c79a7 100644 --- a/templates/download-options.html +++ b/templates/download-options.html @@ -1,6 +1,6 @@ <div class="container py-3 mt-5"> <div class="row"> - <p>We need two lines here about why we release alphas, how it works in the development cycle and also a link to repos or documentation.</p> + <p>{{ _('Before we release a stable version of our software, we release an alpha version to test features and find bugs. Please only download an alpha if you are okay with some things not working properly, want to help us find and report bugs, and are not putting yourself at risk.') }}</p> </div> </div> <div class="container py-3">

1 0

[tpo/master] translations info
by hiro＠torproject.org 11 Feb '19

11 Feb '19

commit 5412f7abb4ba3ce8e0f9fab77d70913544f9b82c Author: emma peel <emma.peel(a)riseup.net> Date: Sat Feb 9 17:37:36 2019 +0100 translations info --- content/download/languages/contents.lr | 1 + content/download/options/contents.lr | 3 +++ templates/download-languages.html | 5 ----- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/content/download/languages/contents.lr b/content/download/languages/contents.lr index 095941e..d55af50 100644 --- a/content/download/languages/contents.lr +++ b/content/download/languages/contents.lr @@ -11,3 +11,4 @@ color: dark title: Download Tor Browser in your language --- body: +We want everyone to be able to enjoy Tor Browser in their own language. Tor Browser is now available in 25 different languages, and we are working to add more. Want to help us translate? [See here](https://tb-manual.torproject.org/becoming-tor-translator/) diff --git a/content/download/options/contents.lr b/content/download/options/contents.lr index f3e48e7..eff395d 100644 --- a/content/download/options/contents.lr +++ b/content/download/options/contents.lr @@ -11,3 +11,6 @@ color: dark title: Download Tor Browser Alpha --- body: + +Before we release a stable version of our software, we release an alpha version to test features and find bugs. +Please only download an alpha if you are okay with some things not working properly, want to help us find and [report bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToRepo…, and are not putting yourself at risk. diff --git a/templates/download-languages.html b/templates/download-languages.html index 85754a9..c882774 100644 --- a/templates/download-languages.html +++ b/templates/download-languages.html @@ -1,8 +1,3 @@ -<div class="container py-3 mt-5"> - <div class="row"> - <p>We need copy here. Tor Browser is made in large part by volunteers around the world. That’s why we offer it in 90 languages (and why there’s heart and soul in every.)</p> - </div> -</div> <div class="container py-3"> <div class="row"> <table class="table">

1 0

[tpo/master] Fix merge conflicts
by hiro＠torproject.org 11 Feb '19

11 Feb '19

commit 92550c7544109d181ef3bd12eb721d1f90e7b094 Merge: 10c27b5 ab06e0d Author: hiro <hiro(a)torproject.org> Date: Mon Feb 11 12:40:04 2019 +0100 Fix merge conflicts content/thank-you/contents.lr | 15 +++++++++++++++ databags/menu+en.ini | 16 ++++++---------- databags/menu+es.ini | 16 ++++++---------- databags/menu+fr.ini | 16 ++++++---------- templates/contact.html | 6 +++--- templates/download-options.html | 5 +++++ templates/thank-you.html | 21 +++++++++++++++++++++ 7 files changed, 62 insertions(+), 33 deletions(-)

1 0

[tpo/master] update top menu
by hiro＠torproject.org 11 Feb '19

11 Feb '19

commit ab06e0d04d528cc3fa3baa34ae75f7ca34568e29 Author: Antonela <hola(a)antonela.me> Date: Sat Feb 9 18:21:20 2019 +0100 update top menu --- databags/menu+en.ini | 14 +++----------- databags/menu+es.ini | 14 +++----------- databags/menu+fr.ini | 14 +++----------- 3 files changed, 9 insertions(+), 33 deletions(-) diff --git a/databags/menu+en.ini b/databags/menu+en.ini index 7fa14ac..fd03492 100644 --- a/databags/menu+en.ini +++ b/databags/menu+en.ini @@ -6,22 +6,14 @@ label = About path = https://www.torproject.org/docs/documentation.html.en label = Documentation -[press] -path = /press -label = Press +[support] +path = https://support.torproject.org/ +label = Support [blog] path = https://blog.torproject.org label = Blog -[newsletter] -path = https://newsletter.torproject.org -label = Newsletter - -[contact] -path = /contact -label = Contact - [donate] path = https://donate.torproject.org label = Donate diff --git a/databags/menu+es.ini b/databags/menu+es.ini index 7fa14ac..fd03492 100644 --- a/databags/menu+es.ini +++ b/databags/menu+es.ini @@ -6,22 +6,14 @@ label = About path = https://www.torproject.org/docs/documentation.html.en label = Documentation -[press] -path = /press -label = Press +[support] +path = https://support.torproject.org/ +label = Support [blog] path = https://blog.torproject.org label = Blog -[newsletter] -path = https://newsletter.torproject.org -label = Newsletter - -[contact] -path = /contact -label = Contact - [donate] path = https://donate.torproject.org label = Donate diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini index 7fa14ac..fd03492 100644 --- a/databags/menu+fr.ini +++ b/databags/menu+fr.ini @@ -6,22 +6,14 @@ label = About path = https://www.torproject.org/docs/documentation.html.en label = Documentation -[press] -path = /press -label = Press +[support] +path = https://support.torproject.org/ +label = Support [blog] path = https://blog.torproject.org label = Blog -[newsletter] -path = https://newsletter.torproject.org -label = Newsletter - -[contact] -path = /contact -label = Contact - [donate] path = https://donate.torproject.org label = Donate

1 0

[tpo/staging] add thank-you page
by hiro＠torproject.org 11 Feb '19

11 Feb '19

commit 65f399605445092093894f8e6e2524529b0b6c3d Author: Antonela <hola(a)antonela.me> Date: Sat Feb 9 18:02:12 2019 +0100 add thank-you page --- content/thank-you/contents.lr | 15 +++++++++++++++ templates/thank-you.html | 21 +++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/content/thank-you/contents.lr b/content/thank-you/contents.lr new file mode 100644 index 0000000..8fca5b5 --- /dev/null +++ b/content/thank-you/contents.lr @@ -0,0 +1,15 @@ +_template: thank-you.html +--- +section: the tor project +--- +section_id: the_tor_project +--- +html: thank-you.html +--- +color: primary +--- +title: success +--- +body: + +You’re equipped to browse freely. Tor is the strongest tool for privacy and freedom online. It is free and open source software maintained by the Tor Project and a community of volunteers worldwide. We need your help to keep Tor secure and safe for millions across the globe. diff --git a/templates/thank-you.html b/templates/thank-you.html new file mode 100644 index 0000000..f87f80f --- /dev/null +++ b/templates/thank-you.html @@ -0,0 +1,21 @@ +<div class="container py-3"> + <div class="row border-bottom border-light"><p></p></div> +</div> +<div class="container py-3"> + <div class="row p-3"> + <h3 class="text-primary">{{ _('Want to join our community? Getting involved with Tor is easy.') }}</h3> + </div> +</div> +<div class="container"> + <div class="row"> + <div class="col-md-4"> + <h4>{ _('Sign up for Tor News and get updates and opportunities from across the organization and community.') }}</h4> + </div> + <div class="col-md-4"> + <h4>{{ _('Run a relay to make the network faster and more decentralized.') }}</h4> + </div> + <div class="col-md-4"> + <h4>{{ _('Use your skills to volunteer.') }}</h4> + </div> + </div> +</div>

1 0

[tpo/staging] update top menu
by hiro＠torproject.org 11 Feb '19

11 Feb '19

commit ab06e0d04d528cc3fa3baa34ae75f7ca34568e29 Author: Antonela <hola(a)antonela.me> Date: Sat Feb 9 18:21:20 2019 +0100 update top menu --- databags/menu+en.ini | 14 +++----------- databags/menu+es.ini | 14 +++----------- databags/menu+fr.ini | 14 +++----------- 3 files changed, 9 insertions(+), 33 deletions(-) diff --git a/databags/menu+en.ini b/databags/menu+en.ini index 7fa14ac..fd03492 100644 --- a/databags/menu+en.ini +++ b/databags/menu+en.ini @@ -6,22 +6,14 @@ label = About path = https://www.torproject.org/docs/documentation.html.en label = Documentation -[press] -path = /press -label = Press +[support] +path = https://support.torproject.org/ +label = Support [blog] path = https://blog.torproject.org label = Blog -[newsletter] -path = https://newsletter.torproject.org -label = Newsletter - -[contact] -path = /contact -label = Contact - [donate] path = https://donate.torproject.org label = Donate diff --git a/databags/menu+es.ini b/databags/menu+es.ini index 7fa14ac..fd03492 100644 --- a/databags/menu+es.ini +++ b/databags/menu+es.ini @@ -6,22 +6,14 @@ label = About path = https://www.torproject.org/docs/documentation.html.en label = Documentation -[press] -path = /press -label = Press +[support] +path = https://support.torproject.org/ +label = Support [blog] path = https://blog.torproject.org label = Blog -[newsletter] -path = https://newsletter.torproject.org -label = Newsletter - -[contact] -path = /contact -label = Contact - [donate] path = https://donate.torproject.org label = Donate diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini index 7fa14ac..fd03492 100644 --- a/databags/menu+fr.ini +++ b/databags/menu+fr.ini @@ -6,22 +6,14 @@ label = About path = https://www.torproject.org/docs/documentation.html.en label = Documentation -[press] -path = /press -label = Press +[support] +path = https://support.torproject.org/ +label = Support [blog] path = https://blog.torproject.org label = Blog -[newsletter] -path = https://newsletter.torproject.org -label = Newsletter - -[contact] -path = /contact -label = Contact - [donate] path = https://donate.torproject.org label = Donate

1 0

[tpo/staging] Merge pull request #5 from torproject/master
by hiro＠torproject.org 11 Feb '19

11 Feb '19

1 0

[tpo/staging] add donate link into menu
by hiro＠torproject.org 11 Feb '19

11 Feb '19

commit 1c2068b8aef19bd46f264b2cc84ea655c4c09951 Author: Antonela <hola(a)antonela.me> Date: Sat Feb 9 17:35:15 2019 +0100 add donate link into menu --- databags/menu+en.ini | 4 ++++ databags/menu+es.ini | 4 ++++ databags/menu+fr.ini | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/databags/menu+en.ini b/databags/menu+en.ini index 01a8760..7fa14ac 100644 --- a/databags/menu+en.ini +++ b/databags/menu+en.ini @@ -21,3 +21,7 @@ label = Newsletter [contact] path = /contact label = Contact + +[donate] +path = https://donate.torproject.org +label = Donate diff --git a/databags/menu+es.ini b/databags/menu+es.ini index 01a8760..7fa14ac 100644 --- a/databags/menu+es.ini +++ b/databags/menu+es.ini @@ -21,3 +21,7 @@ label = Newsletter [contact] path = /contact label = Contact + +[donate] +path = https://donate.torproject.org +label = Donate diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini index 01a8760..7fa14ac 100644 --- a/databags/menu+fr.ini +++ b/databags/menu+fr.ini @@ -21,3 +21,7 @@ label = Newsletter [contact] path = /contact label = Contact + +[donate] +path = https://donate.torproject.org +label = Donate

1 0

[tpo/staging] update content
by hiro＠torproject.org 11 Feb '19

11 Feb '19

commit a0e956ac2e0c6d651d5767dd8fcbdcc44f8193d2 Author: Antonela <hola(a)antonela.me> Date: Sat Feb 9 17:27:01 2019 +0100 update content --- templates/contact.html | 6 +++--- templates/download-options.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/contact.html b/templates/contact.html index 8416122..e4dcc18 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -38,7 +38,7 @@ </div> <div class="container pt-5 justify-content-center"> <div class="row ml-5 mr-5"> - <h4 class="text-primary">{{ _('Join an email list') }} <small class="fa fa-arrow-right p-1" title="icon arrow-right" aria-hidden="true"></small></h4> + <a class=" h4 text-primary" href="https://lists.torproject.org" target="_blank">{{ _('Join an email list') }} <small class="fa fa-arrow-right p-1" title="icon arrow-right" aria-hidden="true"></small></a> </div> <div class="row ml-5 mr-5 pt-3 preamble"> <p>{{ _("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 :)") }}</p> @@ -54,14 +54,14 @@ <div class="oval-3 mt-3"><i class="fas fa-spider text-primary"></i></div> </div> <div class="row mt-3 mr-5"> - <h4 class="text-primary">{{ _('Report a bug or give feedback.') }}</h4> + <a class="h4 text-primary" href="https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugF…" target="_blank">{{ _('Report a bug or give feedback.') }}</a> <p class="text-tpo">{{ _('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).') }}</p> </div> <div class="row"> <div class="oval-3 mt-3"><i class="fas fa-flag text-primary"></i></div> </div> <div class="row mt-3 mr-5"> - <h4 class="text-primary">{{ _('Tell us about a bad relay.') }}</h4> + <a class="h4 text-primary" href="https://trac.torproject.org/projects/tor/wiki/doc/ReportingBadRelays" target="_blank">{{ _('Tell us about a bad relay.') }}</a> <p class="text-tpo">{{ _('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.') }}</p> </div> </div> diff --git a/templates/download-options.html b/templates/download-options.html index 28d7ccc..e8c79a7 100644 --- a/templates/download-options.html +++ b/templates/download-options.html @@ -1,6 +1,6 @@ <div class="container py-3 mt-5"> <div class="row"> - <p>We need two lines here about why we release alphas, how it works in the development cycle and also a link to repos or documentation.</p> + <p>{{ _('Before we release a stable version of our software, we release an alpha version to test features and find bugs. Please only download an alpha if you are okay with some things not working properly, want to help us find and report bugs, and are not putting yourself at risk.') }}</p> </div> </div> <div class="container py-3">

1 0

[tpo/staging] Fix merge conflicts
by hiro＠torproject.org 11 Feb '19

11 Feb '19

commit 92550c7544109d181ef3bd12eb721d1f90e7b094 Merge: 10c27b5 ab06e0d Author: hiro <hiro(a)torproject.org> Date: Mon Feb 11 12:40:04 2019 +0100 Fix merge conflicts content/thank-you/contents.lr | 15 +++++++++++++++ databags/menu+en.ini | 16 ++++++---------- databags/menu+es.ini | 16 ++++++---------- databags/menu+fr.ini | 16 ++++++---------- templates/contact.html | 6 +++--- templates/download-options.html | 5 +++++ templates/thank-you.html | 21 +++++++++++++++++++++ 7 files changed, 62 insertions(+), 33 deletions(-)

1 0