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

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 04 Mar '21

04 Mar '21

commit 7b0b72592a09bdc159e746b47d16de8c42cfff3a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 4 19:17:52 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+bn.po | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/contents+bn.po b/contents+bn.po index ecd50b159e..ce0a20913f 100644 --- a/contents+bn.po +++ b/contents+bn.po @@ -3211,6 +3211,8 @@ msgid "" "gpg --output ./tor.keyring --export " "0xEF6E286DDA85EA2A4BA7DE684E2C6E8793298290" msgstr "" +"gpg --output ./tor.keyring --export " +"0xEF6E286DDA85EA2A4BA7DE684E2C6E8793298290" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3362,6 +3364,7 @@ msgstr "" msgid "" "`$ gpg --keyserver keys.openpgp.org --search-keys torbrowser(a)torproject.org`" msgstr "" +"`$ gpg --keyserver keys.openpgp.org --search-keys torbrowser(a)torproject.org`" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -8469,7 +8472,7 @@ msgstr "" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "gpg --fingerprint tor-security(a)lists.torproject.org" -msgstr "" +msgstr "gpg --fingerprint tor-security(a)lists.torproject.org" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -9412,6 +9415,9 @@ msgid "" "https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…" " | gpg --import" msgstr "" +"# wget -qO- " +"https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…" +" | gpg --import" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -9579,37 +9585,37 @@ msgstr "" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description) msgid "[tor]" -msgstr "" +msgstr "[tor]" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description) msgid "name=Tor for Enterprise Linux $releasever - $basearch" -msgstr "" +msgstr "name=Tor for Enterprise Linux $releasever - $basearch" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description) msgid "baseurl=https://rpm.torproject.org/centos/$releasever/$basearch" -msgstr "" +msgstr "baseurl=https://rpm.torproject.org/centos/$releasever/$basearch" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description) msgid "enabled=1" -msgstr "" +msgstr "enabled=1" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description) msgid "gpgcheck=1" -msgstr "" +msgstr "gpgcheck=1" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description) msgid "gpgkey=https://rpm.torproject.org/centos/public_gpg.key" -msgstr "" +msgstr "gpgkey=https://rpm.torproject.org/centos/public_gpg.key" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description) msgid "cost=100" -msgstr "" +msgstr "cost=100" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description) @@ -9619,17 +9625,17 @@ msgstr "" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description) msgid "name=Tor for Fedora $releasever - $basearch" -msgstr "" +msgstr "name=Tor for Fedora $releasever - $basearch" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description) msgid "baseurl=https://rpm.torproject.org/fedora/$releasever/$basearch" -msgstr "" +msgstr "baseurl=https://rpm.torproject.org/fedora/$releasever/$basearch" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description) msgid "gpgkey=https://rpm.torproject.org/fedora/public_gpg.key" -msgstr "" +msgstr "gpgkey=https://rpm.torproject.org/fedora/public_gpg.key" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description) @@ -10745,6 +10751,7 @@ msgstr "" msgid "" "[Tarball](https://archive.org/details/tor_metrics_old_user_number_estimates_…" msgstr "" +"[Tarball](https://archive.org/details/tor_metrics_old_user_number_estimates_…" #: https//support.torproject.org/metrics/bridge-users/ #: (content/metrics/bridge-users/contents+en.lrquestion.title)

1 0

[community/translations] update templates
by emmapeel＠torproject.org 04 Mar '21

04 Mar '21

commit 5350a8cfb2b01376dd851af638077b90d1850ab1 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 4 20:06:25 2021 +0100 update templates --- templates/blocks/slide.html | 5 +++ templates/gsoc.html | 27 +++++++++++++ templates/home.html | 4 +- templates/homepage.html | 8 +++- templates/macros/projects.html | 24 ++++++++++++ templates/meta.html | 5 ++- templates/onion-services.html | 19 ++++++++- templates/outreach-materials.html | 36 +++++++++++++++++ templates/outreach-talk.html | 81 +++++++++++++++++++++++++++++++++++++++ templates/project.html | 49 +++++++++++++++++++++++ templates/relay-associations.html | 35 +++++++++++++++++ templates/sidenav.html | 5 +-- templates/slideshow.html | 63 ++++++++++++++++++++++++++++++ templates/two-columns-page.html | 9 +++-- 14 files changed, 358 insertions(+), 12 deletions(-) diff --git a/templates/blocks/slide.html b/templates/blocks/slide.html new file mode 100644 index 0000000..5f96574 --- /dev/null +++ b/templates/blocks/slide.html @@ -0,0 +1,5 @@ +<section data-background-color="{{ this.background }}"> + <h2>{{ this.title }}</h2> + {{ this.description }} + +</section> diff --git a/templates/gsoc.html b/templates/gsoc.html new file mode 100644 index 0000000..115f666 --- /dev/null +++ b/templates/gsoc.html @@ -0,0 +1,27 @@ +<div class="container py-5"> + <div class="row py-5"> + <div class="col-lg-12"> + {{ this.body }} + </div> + </div> + <div class="col-12"> + {% from "macros/projects.html" import render_active %} + {% for child in this.children.filter(F.active == True).all() %} + <div class="row"> + {{ render_active(child, this.alt) }} + </div> + {% endfor %} + </div> + <div class="row py-5 text-center mx-auto"> + <p class="text-center">{{ _('None of these ideas seem appealing? You may also want to propose your own project idea — which often results in the best projects.') }} <a href="mailto:gso@torproject.org">{{ _('We invite you to contact us to discuss your own project idea.') }}</a></p> + </div> + <div class="row"> + <h2>Past Projects</h2> + <p class="text-center">{{ _('Here are some successful projects which have been implemented in the past by Google Summer of Code and Outreachy participants') }}</p> + <ul> + {% for child in this.children.filter(F.active == False).filter(F.completed == True).all() %} + <li><a href={{ child.url }}>{{ child.title }}</a></li> + {% endfor %} + </ul> + </div> +</div> diff --git a/templates/home.html b/templates/home.html index 8b6f12f..2ceb15e 100644 --- a/templates/home.html +++ b/templates/home.html @@ -7,8 +7,8 @@ <section> <div class="container"> <div class="row"> - {% for child in this.children|sort(attribute='key') %} - <div class="col-sm-6 col-md-4 col-sm-12 col-xl-4 py-4"> + {% for child in site.query('/').filter(F.section_id != 'gsoc')|sort(attribute='key') %} + <div class="col-lg-4 col-md-6 col-sm-12 py-4"> <div class="card h-100 p-2"> <div class="card-body"> <h2 class="card-title ">{{ child.title }}</h2> diff --git a/templates/homepage.html b/templates/homepage.html index 9f7db9e..d01c9ff 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -19,7 +19,13 @@ </main> </div> </div> - </div> + <div class="container"> + <div class="row p-5 m-3 border"> + <p> + {{ _('The Tor Project is committed to fostering an inclusive environment and community. Tor is a place where people should feel safe to engage, share their point of view, and participate.') }} Read our <a href="https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.t…" title="Code of Conduct" target="_blank">Code of Conduct</a>, <a href="https://gitweb.torproject.org/community/policies.git/tree/social_contract.t…" title="Social Contract" target="_blank">Social Contract</a>, <a href="https://gitweb.torproject.org/community/policies.git/tree/statement_of_valu…" title="Statement of Values" target="_blank">Statement of Values</a> and learn about the <a href="https://gitweb.torproject.org/community/policies.git/tree/community_council…" title="Tor Commmunity Council" target="_blank">Tor Community Council</a>. + </p> + </div> + </div> <footer> {% include 'footer.html' %} </footer> diff --git a/templates/macros/projects.html b/templates/macros/projects.html new file mode 100644 index 0000000..a4e2850 --- /dev/null +++ b/templates/macros/projects.html @@ -0,0 +1,24 @@ +{% macro render_active(item, alternative) %} +<div class="card border-0"> + <div class="card-header bg-white border-0" id="headingOne"> + <h5 class="mb-0"> + <a href="{{ item.path|url }}">{{ item.title }}</a> + </h5> + Languages: + {% for lang in item.languages %} + <span class="badge badge-primary">{{ lang }}</span> + {% endfor %} + <br> + Mentors: + {% for person in item.mentors %} + <span class="badge badge-secondary">{{ person }}</span> + {% endfor %} + </div> + <div> + <div class="card-body"> + {{ item.subtitle }} + <a href="{{ item.path|url }}">{{ _('Read more.') }}</a> + </div> + </div> +</div> +{% endmacro %} diff --git a/templates/meta.html b/templates/meta.html index bcda0da..a265687 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -2,6 +2,9 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }} | {{ this.title }}"> <link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> -<link rel="stylesheet" href="{{ '/static/fonts/open-iconic/font/css/open-iconic-bootstrap.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> + +<link rel="icon" type="image/x-icon" href="{{ '/static/images/favicon.ico'|asseturl }}"> + +<link rel="icon" type="image/png" href="{{ '/static/images/favicon.png'|asseturl }}"> <title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> diff --git a/templates/onion-services.html b/templates/onion-services.html index a4a7ed6..a42891a 100644 --- a/templates/onion-services.html +++ b/templates/onion-services.html @@ -26,7 +26,7 @@ <div class="row py-5 text-center mx-auto"> <h2 class="display-4 text-primary text-center mx-auto">{{ _('Onionize any website') }}</h2> <p class="text-center"> - {{ _('There\'s a toolkit that lets you take any existing website and host it as a .onion site. You would want do this because .onion sites are more secure than just regular sites. We show you how to use this toolkit and onionize a site.') }} + {{ _('There\'s a toolkit that lets you take any existing website and host it as a .onion site too. You would do this because .onion sites are more secure than just regular sites. There is an installation guide for how to use this toolkit to onionize your site.') }} </p> <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="https://github.com/alecmuffett/eotk"> {{ _('Check out the code') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i> @@ -50,6 +50,23 @@ </div> </div> {% endfor %} + </div> + <div class="row py-5 text-center mx-auto"> + <h2 class="display-4 text-primary text-center mx-auto">{{ _('Tools') }}</h2> + </div> + <div class="row mx-auto d-flex flex-wrap align-items-center"> + {% for id, item in bag('onion-tools').items() %} + {% if item.active == "True" %} + <div class="col-4"> + <div class="card h-50 border-0"> + <a href="{{ item.link }}"><img class="card-img-top h-100 w-50 mx-auto d-block" src="{{ item.image|asseturl }}"></a> + <div class="card-body"> + <p class="card-text text-primary text-center"><a href="{{ item.link }}">{{ item.label }}</a></p> + </div> + </div> + </div> + {% endif %} + {% endfor %} </div> <div class="row py-5 text-center mx-auto"> <h2 class="display-4 text-primary text-center mx-auto my-3">{{ _('Learn More') }}</h2> diff --git a/templates/outreach-materials.html b/templates/outreach-materials.html new file mode 100644 index 0000000..d0bdaa8 --- /dev/null +++ b/templates/outreach-materials.html @@ -0,0 +1,36 @@ +<div class="row pt-5"> + {% include 'sidenav.html' %} + <div class="col-sm-12 col-xs-12 ml-sm-auto col-md-9 col-lg-9 {{ bag('alternatives', this.alt, 'order') }}"> + {{ this.body }} + <div class="container py-3"> + <div class="row"> + <table class="table"> + <thead> + <tr> + <th scope="col">Title</th> + <th scope="col">Type</th> + <th scope="col">Links</th> + <th scope="col">Last Updated</th> + </tr> + </thead> + <tbody> + {% for id, item in bag('outreach-materials').items() %} + <tr> + <td>{{ item.label }}</td> + <td>{{ item.type }}</td> + <td> + {% if item.type=='handout' %} + <a href="{{item.location}}{{item.filename_front}}">Front</a> / <a href="{{item.location}}{{item.filename_back}}">Back</a> + {% else %} + <a href="{{item.location}}{{item.filename}}">File</a> + {% endif %} + </td> + <td>{{ item.year }}</td> + </tr> + {% endfor %} + </tbody> + </table> + </div> + </div> + </div> +</div> \ No newline at end of file diff --git a/templates/outreach-talk.html b/templates/outreach-talk.html new file mode 100644 index 0000000..72443f8 --- /dev/null +++ b/templates/outreach-talk.html @@ -0,0 +1,81 @@ +<div class="row"> + <div class="container"> + <h3 class="py-5">{{ _('Word of mouth is critical to reaching new people and helping them protect themselves online. Here\'s how you can help: ') }}</h3> + <div class="row"> + <div class="col-md-6 col-sm-12 col-xl-4 py-4"> + <div class="card h-100 p-2"> + <div class="card-body"> + <span class="display-4 text-primary"> + <i class="fas fa-users pb-4"></i> + </span> + <h2 class="card-title ">{{ _('Privacy and freedom are human rights.') }}</h2> + <p class="card-text">{{ _('These rights are denied online around the world, but Tor gives them back.') }}</p> + </div> + </div> + </div> + <div class="col-md-6 col-sm-12 col-xl-4 py-4"> + <div class="card h-100 p-2"> + <div class="card-body"> + <span class="display-4 text-primary"> + <i class="fas fa-cookie-bite pb-4"></i> + </span> + <h2 class="card-title">{{ _('Tracking and surveillance are widespread.') }}</h2> + <p class="card-text">{{ _('We think privacy should be the default online, and that\'s what our software provides.') }}</p> + </div> + </div> + </div> + <div class="col-md-6 col-sm-12 col-xl-4 py-4"> + <div class="card h-100 p-2"> + <div class="card-body"> + <span class="display-4 text-primary"> + <i class="fas fa-person-booth pb-4"></i> + </span> + <h2 class="card-title">{{ _('Privacy isn\'t about having something to hide.') }}</h2> + <p class="card-text">{{ _('Privacy is about protecting who we are as human beings: our fears, our relationships, and our vulnerabilities.') }}</p> + </div> + </div> + </div> + <div class="col-md-6 col-sm-12 col-xl-4 py-4"> + <div class="card h-100 p-2"> + <div class="card-body"> + <span class="display-4 text-primary"> + <i class="fas fa-eye-slash pb-4"></i> + </span> + <h2 class="card-title">{{ _('People shouldn\'t be exploited for using the internet.') }}</h2> + <p class="card-text">{{ _('Trackers are harvesting our every move, but a safer internet is possible.') }}</p> + </div> + </div> + </div> + <div class="col-md-6 col-sm-12 col-xl-4 py-4"> + <div class="card h-100 p-2"> + <div class="card-body"> + <span class="display-4 text-primary"> + <i class="fas fa-hand-holding-heart pb-4"></i> + </span> + <h2 class="card-title">{{ _('Tor software is developed by the Tor Project, a 501(c)3 nonprofit organization.') }}</h2> + <p class="card-text">{{ _('We build free and open source software anyone can use.') }}</p> + </div> + </div> + </div> + <div class="col-md-6 col-sm-12 col-xl-4 py-4"> + <div class="card h-100 p-2"> + <div class="card-body"> + <span class="display-4 text-primary"> + <i class="fas fa-globe-africa pb-4"></i> + </span> + <h2 class="card-title">{{ _('Tor software is used by millions of people around the world.') }}</h2> + <p class="card-text">{{ _('Journalists, activists, and everyday internet users rely on Tor.') }}</p> + </div> + </div> + </div> + </div> + + <div class="card mt-5"> + <ul class="list-group list-group-flush"> +  + <li class="list-group-item"> + <a href="{{ this.parent|url }}">{{ _("Back to previous page: ") }}{{ this.parent.title }}</a> - <a href="https://github.com/torproject/community/edit/master/content{{ this.path }}/contents.lr">{{ _("Edit this page") }}</a> + </li> + </ul> + </div> +</div> diff --git a/templates/project.html b/templates/project.html new file mode 100644 index 0000000..f9c5623 --- /dev/null +++ b/templates/project.html @@ -0,0 +1,49 @@ +<!doctype html> +{% include 'meta.html' %} +<body class="no-gutters"> + <header> + {% include 'navbar.html' %} + </header> + <div class="page"> + {% include 'header.html' %} + {% include 'pagenav.html' %} + <div class="container-fluid"> + <div class="row flex-xl-nowrap"> + <main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'order') }}"> + <div class="container py-3 mt-5"> + <h4>Project Title: {{ this.title }}</h4> + <span class="badge badge-primary">{{ this.languages }}</span> <span class="badge badge-secondary">{{ this.difficulty }}</span> + </div> + <div class="container py-3 mt-5"> + <h4>Project Summary:</h4> + <p> + {{ this.subtitle }} + </p> + </div> + <div class="container py-3"> + <h4>Project Description:</h4> + <p> + {{ this.body }} + </p> + </div> + <div class="container py-3"> + <h4>Mentors:</h4> + <p> + {{ this.mentors }} + </p> + </div> + </main> + </div> + <div class="card mt-5"> + <ul class="list-group list-group-flush"> + <li class="list-group-item"> + <a href="{{ this.parent|url }}">{{ _("Back to ") }}{{ this.parent.title }}</a> + </li> + </ul> + </div> + </div> +</div> +<footer> + {% include 'footer.html' %} +</footer> +</body> diff --git a/templates/relay-associations.html b/templates/relay-associations.html new file mode 100644 index 0000000..10448d8 --- /dev/null +++ b/templates/relay-associations.html @@ -0,0 +1,35 @@ +<div class="row pt-5"> + {% include 'sidenav.html' %} + <div class="col-sm-12 col-xs-12 ml-sm-auto col-md-9 col-lg-9 {{ bag('alternatives', this.alt, 'order') }}"> + {{ this.body }} + <div class="container py-3"> + <div class="row"> + <table class="table"> + <thead> + <tr> + <th scope="col">Organization Name</th> + <th scope="col">Country</th> + </tr> + </thead> + <tbody> + {% for id, item in bag('relay-associations').items() %} + {% if item.active == 'True' %} + <tr> + <td> + {% if item.link|length %} + <a href="{{ item.link }}">{{ item.label }}</a> + {% else %} + {{ item.label }} + {% endif %} + </td> + + <td>{{ item.country }}</td> + </tr> + {% endif %} + {% endfor %} + </tbody> + </table> + </div> + </div> + </div> +</div> \ No newline at end of file diff --git a/templates/sidenav.html b/templates/sidenav.html index ebcbeff..5ac15c8 100644 --- a/templates/sidenav.html +++ b/templates/sidenav.html @@ -1,9 +1,8 @@ <div class="container-fluid sidebar col-xs-12 col-sm-12 col-md-3 col-lg-3"> <nav class="smalltopics no-background navbar navbar-expand-lg navbar-light bg-white p-0 fixed"> <label class="side-toggler" for="menu-toggle"> - <a class="btn btn-lg outline-primary text-primary navbar-toggler chevron" data-toggle="collapse" data-target="#navbarSupportedTopicsContent" aria-controls="navbarSupportedTopicsContent" aria-expanded="false" aria-label="Toggle navigation"> - <span class="oi oi-chevron-top chevron-up"></span> - <span class="oi oi-chevron-bottom chevron-down"></span> + <a class="btn btn-lg outline-primary text-primary navbar-toggler collapsed" data-toggle="collapse" data-target="#navbarSupportedTopicsContent" aria-controls="navbarSupportedTopicsContent" aria-expanded="false" aria-label="Toggle navigation"> + <i class="fas"></i> </a> </label> <input type="checkbox" id="menu-toggle"/> diff --git a/templates/slideshow.html b/templates/slideshow.html new file mode 100644 index 0000000..260c123 --- /dev/null +++ b/templates/slideshow.html @@ -0,0 +1,63 @@ +<!doctype html> +<html lang="en"> + <head> + <meta charset="utf-8"> + <title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> + <meta name="description" content="{{ _('Tor Project') }} | {{ this.description }}"> + <meta name="author" content="{{ this.author }}"> + <meta name="apple-mobile-web-app-capable" content="yes"> + <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <link rel="stylesheet" href="{{ '/static/revealjs/dist/reset.css'|asseturl }}"> + <link rel="stylesheet" href="{{ '/static/revealjs/dist/reveal.css'|asseturl }}"> + <link rel="stylesheet" href="{{ '/static/revealjs/dist/theme/tor.css'|asseturl }}" id="theme"> + <link rel="stylesheet" href="{{ '/static/revealjs/plugin/highlight/monokai.css'|asseturl }}" id="highlight-theme"> + </head> + <body> + <div class="reveal"> +  + <div class="slides"> + <section data-background-color="{{ this.background }}" data-background-image="{{ this.image|asseturl }}" data-background-position="bottom right" data-background-size="3em"> + <h1>{{ this.title }}</h1> + <h2>{{ this.subtitle }}</h2> + <p>{{ this.author }}</p> + </section> + + {{ this.slides }} + + <div class="footer"> + <div class="left"> + <a href="https://torproject.org">torproject.org</a> + </div> + <div class="right"> + <img src="{{ '/static/images/tor-logo/White.png'|asseturl }}"> + </div> + </div> + </div> + + </div> + + <script src="{{ '/static/revealjs/dist/reveal.js'|asseturl }}"></script> + <script src="{{ '/static/revealjs/plugin/zoom/zoom.js'|asseturl }}"></script> + <script src="{{ '/static/revealjs/plugin/notes/notes.js'|asseturl }}"></script> + <script src="{{ '/static/revealjs/plugin/search/search.js'|asseturl }}"></script> + <script src="{{ '/static/revealjs/plugin/markdown/markdown.js'|asseturl }}"></script> + <script src="{{ '/static/revealjs/plugin/highlight/highlight.js'|asseturl }}"></script> + + <script> + // Also available as an ES module, see: + // https://revealjs.com/initialization/ + Reveal.initialize({ + controls: true, + progress: true, + center: true, + hash: true, + + // Learn about plugins: https://revealjs.com/plugins/ + plugins: [ RevealZoom, RevealNotes, RevealSearch, RevealMarkdown, RevealHighlight ] + }); + + </script> + + </body> +</html> diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html index 5151905..1b4883a 100644 --- a/templates/two-columns-page.html +++ b/templates/two-columns-page.html @@ -1,10 +1,11 @@ - {% include 'breadcrumb.html' %} <div class="row"> {% include 'sidenav.html' %} - <div class="col-sm-12 col-xs-12 col-md-8 col-lg-8 pt-3 mr-auto {{ bag('alternatives', this.alt, 'order') }}"> - {{ this.body }} + <div class="col-sm-12 col-xs-12 col-md-8 col-lg-8 pt-3 mt-5 mr-auto {{ bag('alternatives', this.alt, 'order') }}"> + <div class="col-10"> + {{ this.body }} + </div> <div class="row"> {% for child in this.children|sort(attribute='key') %} <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-3"> @@ -26,7 +27,7 @@ <ul class="list-group list-group-flush">  <li class="list-group-item"> - <a href="{{ this.parent|url }}">{{ _("Back to previous page: ") }}{{ this.parent.title }}</a> - <a href="https://github.com/torproject/community/edit/master/content{{ this.path }}/contents.lr">{{ _("Edit this page") }}</a> + <a href="{{ this.parent|url }}">{{ _("Back to previous page: ") }}{{ this.parent.title }}</a> - <a href="https://github.com/torproject/community/edit/master/content{{ this.path }}/contents.lr">{{ _("Edit this page") }}</a> </li> </ul> </div>

1 0

[community/translations] update lego
by emmapeel＠torproject.org 04 Mar '21

04 Mar '21

commit ff7a459d9f549a202eff9b8018797d269e75c25c Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 4 17:53:40 2021 +0100 update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index abbf18c..4cb4064 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit abbf18cb1bbca70caeb8913d2b60f0cb9332f287 +Subproject commit 4cb4064486b300f04573b4dde54afa6835dafa63

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 04 Mar '21

04 Mar '21

commit 61237dce1fe48eacc5413b7b5850625d45196a91 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 4 16:48:15 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contents+es.po b/contents+es.po index dc67e75ed1..fead87d7f6 100644 --- a/contents+es.po +++ b/contents+es.po @@ -502,7 +502,7 @@ msgstr "" #: https//www.torproject.org/releases/tor-browser-10-0/ #: (content/releases/tor-browser-10-0/contents+en.lrpage.body) msgid "**Give Feedback**" -msgstr "" +msgstr "**Danos tu opinión**" #: https//www.torproject.org/releases/tor-browser-95/ #: (content/releases/tor-browser-95/contents+en.lrpage.body) @@ -1994,6 +1994,8 @@ msgstr "" msgid "" "We need your help to keep Tor secure and safe for millions across the globe." msgstr "" +"Necesitamos tu ayuda para mantener a Tor seguro y protegido para millones de" +" personas en todo el mundo." #: templates/thank-you.html:10 msgid "Want to join our community? Getting involved with Tor is easy."

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 04 Mar '21

04 Mar '21

commit 3ce96cf740fafeccd5c267b5c6214668d5ff12ac Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 4 16:45:11 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/contents+es.po b/contents+es.po index dc997985f5..a4d6d8772d 100644 --- a/contents+es.po +++ b/contents+es.po @@ -8160,7 +8160,7 @@ msgid "" "comments. https://www.torproject.org/projects/tordnsel.html.en" msgstr "" "También puedes usar esta DNSRBL para permitir que solamente IPs de Tor lean " -"comentarios, pero no los posteen. " +"comentarios, pero no puedan publicar " "https://www.torproject.org/projects/tordnsel.html.en" #: https//community.torproject.org/relay/community-resources/tor-abuse-templates/ @@ -10434,7 +10434,7 @@ msgid "" "that you don't need their official legal opinion yet." msgstr "" "Evita tener reuniones en persona o largas discusiones por correo " -"electrónico, y deja claro que todavía no necesitas su opinión legal oficial." +"electrónico, y deja claro que no necesitas su opinión legal oficial." #: https//community.torproject.org/relay/community-resources/tor-relay-universities/ #: (content/relay-operations/community-resources/tor-relay-universities/contents+en.lrpage.body) @@ -10619,13 +10619,13 @@ msgid "" "using the `MaxAdvertisedBandwidth` to attract less traffic from the Tor " "network. Lastly, you can scale back your exit policy." msgstr "" -"Si hay demasiadas quejas ingresando, hay varios planteamientos que puedes " -"tomar para reducirlas. Primero, deberías seguir los consejos en la " -"[documentación de repetidores Tor](https://community.torproject.org/relay), " -"tales como elegir un nombre de equipo descriptivo, u obtener tu propia " -"dirección IP. Si eso no funciona, puedes reducir la velocidad anunciada de " -"tu repetidor, usando la directiva `MaxAdvertisedBandwidth` para atraer menos" -" tráfico desde la red Tor. Por último, puedes reducir tu política de salida." +"Si recibes muchas quejas, hay varias cosas que puedes hacer para reducirlas." +" Primero, deberías seguir los consejos en la [documentación de repetidores " +"Tor](https://community.torproject.org/relay), tales como elegir un nombre de" +" equipo descriptivo, u obtener tu propia dirección IP. Si eso no funciona, " +"puedes reducir la velocidad anunciada de tu repetidor, usando la directiva " +"`MaxAdvertisedBandwidth` para atraer menos tráfico desde la red Tor. Por " +"último, puedes reducir tu política de salida." #: https//community.torproject.org/relay/community-resources/tor-relay-universities/ #: (content/relay-operations/community-resources/tor-relay-universities/contents+en.lrpage.body)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 04 Mar '21

04 Mar '21

commit 35524ca2d4ee896f1b951eb5656435d683faf4a7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 4 16:18:35 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 2 +- contents+de.po | 1 + contents+es.po | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/contents+ar.po b/contents+ar.po index 89dc83f33c..542464aa8e 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -9771,7 +9771,7 @@ msgstr "" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "gpg --fingerprint tor-security(a)lists.torproject.org" -msgstr "gpg - بصمة tor-security(a)lists.torproject.org" +msgstr "gpg --fingerprint tor-security(a)lists.torproject.org" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) diff --git a/contents+de.po b/contents+de.po index fb000ec81b..7f2a8fbb9e 100644 --- a/contents+de.po +++ b/contents+de.po @@ -4199,6 +4199,7 @@ msgstr "" msgid "" "`$ gpg --keyserver keys.openpgp.org --search-keys torbrowser(a)torproject.org`" msgstr "" +"`$ gpg --keyserver keys.openpgp.org --search-keys torbrowser(a)torproject.org`" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) diff --git a/contents+es.po b/contents+es.po index 238bbbcc47..ff7d68167d 100644 --- a/contents+es.po +++ b/contents+es.po @@ -4173,6 +4173,7 @@ msgstr "" msgid "" "`$ gpg --keyserver keys.openpgp.org --search-keys torbrowser(a)torproject.org`" msgstr "" +"`$ gpg --keyserver keys.openpgp.org --search-keys torbrowser(a)torproject.org`" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)

1 0

[translation/torbutton-aboutdialogdtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdialogdtd
by translation＠torproject.org 04 Mar '21

04 Mar '21

commit 1cc15adcc4cad64e0df882e8507bb905075c1066 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 4 16:18:05 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdial… --- my/aboutdialog.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/my/aboutdialog.dtd b/my/aboutdialog.dtd index d6e50a99e6..1f1359c8c8 100644 --- a/my/aboutdialog.dtd +++ b/my/aboutdialog.dtd @@ -1,6 +1,6 @@ <!ENTITY project.start "&brandShortName; ကို ">  -<!ENTITY project.tpoLink "the &vendorShortName;"> +<!ENTITY project.tpoLink "&vendorShortName; မှတီထွင်သည်။ "> <!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> <!ENTITY help.start "ကူညီချင်ပါသလား">

1 0

[community/master] Add Focal Fossa as supported release in how to install obfs4proxy
by gus＠torproject.org 04 Mar '21

04 Mar '21

commit 2bfaeda62e50163bd02e0a4144b1f2208f1b18ce Author: kulsoomzahra <kulsoomzahra24(a)gmail.com> Date: Wed Mar 3 19:48:19 2021 +0530 Add Focal Fossa as supported release in how to install obfs4proxy Added to the docs that Ubuntu focal supports obfs4proxy package installation --- .../relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr index 8dfc9e7..4d25952 100644 --- a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr +++ b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr @@ -15,7 +15,7 @@ Get the latest version of Tor. If you're on Debian stable, `sudo apt-get install ### 2. Install obfs4proxy On [Debian](https://packages.debian.org/search?keywords=obfs4proxy), the `obfs4proxy` package is available in unstable, testing, and stable. -On [Ubuntu](https://packages.ubuntu.com/search?keywords=obfs4proxy), bionic, cosmic, disco, and eoan have the package. +On [Ubuntu](https://packages.ubuntu.com/search?keywords=obfs4proxy), bionic, cosmic, disco, eoan, and focal have the package. If you're running any of them, `sudo apt-get install obfs4proxy` should work. If not, you can [build it from source](https://gitlab.com/yawning/obfs4#installation).

1 0

[community/master] Merge branch 'add-focal-support'
by gus＠torproject.org 04 Mar '21

04 Mar '21

commit 11c25c357aa5a34790156217cb2c9fbaf2a1d15d Merge: 860810f 2bfaeda Author: gus <gus(a)torproject.org> Date: Thu Mar 4 09:08:20 2021 -0500 Merge branch 'add-focal-support' .../relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[community/master] Merge branch 'onion-guide-fanzine'
by gus＠torproject.org 04 Mar '21

04 Mar '21

commit 860810f51271ae7b389a571e210de47bd33c4ffe Merge: a351353 f876026 Author: gus <gus(a)torproject.org> Date: Thu Mar 4 09:04:01 2021 -0500 Merge branch 'onion-guide-fanzine' .../outreach/print/onion-guide-fanzine-EN.pdf | Bin 0 -> 343902 bytes .../outreach/print/onion-guide-fanzine-ES.pdf | Bin 0 -> 342504 bytes .../outreach/print/onion-guide-fanzine-PT_BR.pdf | Bin 0 -> 345662 bytes .../images/outreach/print/onion-guide-fanzine.pdf | Bin 346542 -> 0 bytes databags/outreach-materials.ini | 22 +++++++++++++++++---- 5 files changed, 18 insertions(+), 4 deletions(-)

1 0