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

[translation/fenix-torbrowserstringsxml] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml
by translation＠torproject.org 16 Apr '21

16 Apr '21

commit 4f6ab46a4f0034fd4fb7e5a3299cd886139d86f9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 16 16:45:19 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstr… --- th/torbrowser_strings.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/th/torbrowser_strings.xml b/th/torbrowser_strings.xml index b9965ef8c0..25bda95bd5 100644 --- a/th/torbrowser_strings.xml +++ b/th/torbrowser_strings.xml @@ -2,8 +2,16 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <resources> +  + <string name="preferences_disable_normal_mode">อนุญาตเฉพาะโหมดดูเว็บแบบส่วนตัว</string> +  + <string name="preferences_donate">บริจาคให้กับ Tor Project</string> +  + <string name="preferences_allow_screenshots">อนุญาตให้จับภาพหน้าจอ</string> + <string name="tor_bootstrap_connect">เชื่อมต่อ</string> <string name="tor_bootstrap_connecting">กำลังติดต่อ</string> + <string name="tor_bootstrap_connecting_failed">การเชื่อมต่อล้มเหลว</string> <string name="tor_bootstrap_quick_start_label">เริ่มแบบด่วน</string> <string name="tor_bootstrap_swipe_for_logs">ปัดไปทางซ้ายเพื่อดูล็อก Tor</string> <string name="tor_onboarding_donate_button">บริจาคตอนนี้</string> @@ -14,6 +22,7 @@ <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_obfs4">obfs4</string> <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_meek_azure">meek-azure</string> <string name="preferences_tor_network_settings_bridge_config_user_provided_bridge">จัดหาสะพานที่ฉันรู้จัก</string> + <string name="preferences_tor_network_settings_status">สถานะปัจจุบัน</string> <string name="preferences_tor_network_settings_state">สถานะ: %s</string> <string name="preferences_tor_network_settings_yes">ใช่</string> <string name="preferences_tor_network_settings_no">ไม่</string> @@ -34,4 +43,5 @@ <string name="tor_security_level_safest_option">ปลอดภัยที่สุด</string> <string name="tor_useamask_usetor">ใช้หน้ากาก ใช้ Tor</string> <string name="tor_resistsurveillance">ต้านเชื้อสอดแนมระบาด</string> - </resources> + <string name="tor_donationmatch">การบริจาคของคุณจะถูกสมทบเท่ากันโดย Friends of Tor</string> +</resources>

1 0

[community/slideshow] reduce locales in config, correct .htaccess file to prevent 404s, make model translatable
by emmapeel＠torproject.org 16 Apr '21

16 Apr '21

commit 86478c3023a91203299c65477e6e0df542651b98 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 25 08:10:43 2021 +0100 reduce locales in config, correct .htaccess file to prevent 404s, make model translatable --- .htaccess | 2 +- community.lektorproject | 8 ++++---- configs/i18n.ini | 2 +- databags/alternatives.ini | 6 +++--- models/page.ini | 1 + models/text.ini | 2 ++ 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.htaccess b/.htaccess index 548371a..1e7a96d 100644 --- a/.htaccess +++ b/.htaccess @@ -9,7 +9,7 @@ RewriteRule ^(en|en-US)$ / [R=302,L] RewriteRule ^(en|en-US)/(.*) /$2 [R=302,L] # Rewrites for languages that have a different mapping in the page than in TBB -RewriteRule ^(es-ES|es-MX|es-CO)(.*) /es$2 [R=302,L] +RewriteRule ^(es-ES|es-MX|es-CO|es-AR)(.*) /es$2 [R=302,L] # we have only one translation for this locales RewriteRule ^(bn-BD|bn-IN)(.*) /bn$2 [R=302,L] diff --git a/community.lektorproject b/community.lektorproject index 1725581..b933b44 100644 --- a/community.lektorproject +++ b/community.lektorproject @@ -10,8 +10,8 @@ primary = yes url_prefix = / locale = en -[alternatives.es-AR] -name = Español Arg (es-AR) +[alternatives.es] +name = Español (es) primary = yes -url_prefix = /es-AR/ -locale = es-AR +url_prefix = /es/ +locale = es diff --git a/configs/i18n.ini b/configs/i18n.ini index 38f6d4b..53c9865 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = es,es-AR,de,fr,it,pt-BR,ru +translations = es i18npath = i18n translate_paragraphwise = False url_prefix = https://community.torproject.org/ diff --git a/databags/alternatives.ini b/databags/alternatives.ini index 1bd9fd2..f2a0d37 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -4,8 +4,8 @@ order = order-last url = / language = English (en) -[es-AR] +[es] direction = text-left order = order-last -url = /es-AR/ -language = Español Arg. (es-AR) +url = /es/ +language = Español diff --git a/models/page.ini b/models/page.ini index 0671112..61ad278 100644 --- a/models/page.ini +++ b/models/page.ini @@ -15,6 +15,7 @@ translate = True [fields.section] label = Section type = string +translate = True [fields.cta] label = Call To Action diff --git a/models/text.ini b/models/text.ini index 75e24ba..380668d 100644 --- a/models/text.ini +++ b/models/text.ini @@ -1,7 +1,9 @@ [model] name = Text label = Text +translate = True [fields.body] label = Body type = text +translate = True

1 0

[community/slideshow] fix rtl page and card layout. will-fix: https://gitlab.torproject.org/tpo/web/community/-/issues/186
by emmapeel＠torproject.org 16 Apr '21

16 Apr '21

commit ed17b1a7dc35e9c1d18a758141b4fd133736ec44 Author: emma peel <emma.peel(a)riseup.net> Date: Sat Mar 27 07:57:52 2021 +0100 fix rtl page and card layout. will-fix: https://gitlab.torproject.org/tpo/web/community/-/issues/186 --- templates/homepage.html | 9 +++++---- templates/layout.html | 3 ++- templates/two-columns-page.html | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/templates/homepage.html b/templates/homepage.html index d01c9ff..361ac35 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -1,4 +1,5 @@ -<!doctype html> +<!doctype html>{% set locale = bag('alternatives', this.alt) %} +<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ this.alt }}" {% if locale.direction == 'text-right' %}dir="rtl"{% endif %}> {% include 'meta.html' %} <title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> @@ -8,19 +9,19 @@ </header> <div class="page"> <div class="container-fluid bg-{{ this.color }}"> - <div class="row flex-xl-nowrap {{ bag('alternatives', this.alt, 'order') }}"> + <div class="row flex-xl-nowrap {{ locale.direction }}"> {% include 'hero.html' %} </div> </div> <div class="container-fluid"> <div class="row flex-xl-nowrap"> - <main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'order') }}"> + <main role="main" class="mx-auto col-12 {{ locale.direction }}"> {% include this.html %} </main> </div> </div> <div class="container"> - <div class="row p-5 m-3 border"> + <div class="row p-5 m-3 border {{ locale.direction }}"> <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> diff --git a/templates/layout.html b/templates/layout.html index 663c51b..e036c02 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -1,4 +1,5 @@ <!doctype html> +<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ this.alt }}" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl"{% endif %}> {% include 'meta.html' %} <body class="no-gutters"> <header> @@ -9,7 +10,7 @@ {% 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') }}"> + <main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'direction') }}"> {% include this.html %} </main> </div> diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html index 1b4883a..d71e970 100644 --- a/templates/two-columns-page.html +++ b/templates/two-columns-page.html @@ -2,7 +2,7 @@ <div class="row"> {% include 'sidenav.html' %} - <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-sm-12 col-xs-12 col-md-8 col-lg-8 pt-3 mt-5 mr-auto {{ bag('alternatives', this.alt, 'direction') }}"> <div class="col-10"> {{ this.body }} </div>

1 0

[community/slideshow] link anchor to "featured .onion site" section
by emmapeel＠torproject.org 16 Apr '21

16 Apr '21

commit b3d5c508a4136b201ae2f0b5d8a7fd1b9562602f Author: himandrisharma27 <himandrisharma27(a)gmail.com> Date: Sat Mar 27 09:45:11 2021 +0000 link anchor to "featured .onion site" section --- templates/onion-services.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/onion-services.html b/templates/onion-services.html index a42891a..603d459 100644 --- a/templates/onion-services.html +++ b/templates/onion-services.html @@ -32,7 +32,7 @@ {{ _('Check out the code') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i> </a> </div> - <div class="row py-5 text-center mx-auto"> + <div id="featured-onions" class="row py-5 text-center mx-auto"> <h2 class="display-4 text-primary text-center mx-auto">{{ _('Featured .onion sites') }}</h2> </div> <div class="row mx-auto">

1 0

[community/slideshow] replacing gitlab links to avoid redirects
by emmapeel＠torproject.org 16 Apr '21

16 Apr '21

commit 89ebf3264282f7c089597d916e553694570a5e81 Author: nah <nah(a)riseup.net> Date: Mon Mar 22 10:03:42 2021 -0300 replacing gitlab links to avoid redirects new links for downloading personas --- content/user-research/persona/contents.lr | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/content/user-research/persona/contents.lr b/content/user-research/persona/contents.lr index 147cee9..33efd66 100644 --- a/content/user-research/persona/contents.lr +++ b/content/user-research/persona/contents.lr @@ -15,13 +15,14 @@ key: 4 html: two-columns-page.html --- body: + Persona is a tool that represents the needs, thoughts, and goals of the target user. We created personas because they help us to drive human-centered design processes. As part of our global south travels during 2018 and 2019, we got the lucky chance to meet a lot of different Tor users: from activists to journalists, all of them with different motivations, but demanding a usable private and secure tool to access the Internet. With the Community Team, we have been working collecting and mapping real user stories and finding patterns across them. It is how our Personas emerged from our in field research. ### Tor Personas -* [Jelani, the human rights defender](https://dip.torproject.org/torproject/ux/research/tree/master/per… -* [Aleisha, the privacy looker](https://dip.torproject.org/torproject/ux/research/tree/master/perso… -* [Fernanda, the feminist activist](https://dip.torproject.org/torproject/ux/research/tree/master/per… -* [Fatima, the censored user](https://dip.torproject.org/torproject/ux/research/tree/master/persona… -* [Alex, the fearless journalist](https://dip.torproject.org/torproject/ux/research/tree/master/p… +* Jelani, the human rights defender: [View on Gitlab](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/persona… · [Download PDF](https://gitlab.torproject.org/tpo/ux/research/-/raw/master/persona/jel… +* Aleisha, the privacy looker: [View on Gitlab](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/persona… · [Download PDF](https://gitlab.torproject.org/tpo/ux/research/-/raw/master/persona/ale… +* Fernanda, the feminist activist: [View on Gitlab](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/persona… · [Download PDF](https://gitlab.torproject.org/tpo/ux/research/-/raw/master/persona/fer… +* Fatima, the censored user: [View on Gitlab](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/persona… · [Download PDF](https://gitlab.torproject.org/tpo/ux/research/-/raw/master/persona/fat… +* Alex, the fearless journalist: [View on Gitlab](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/persona… · [Download PDF](https://gitlab.torproject.org/tpo/ux/research/-/raw/master/persona/ale…

1 0

[community/slideshow] add language code to name
by emmapeel＠torproject.org 16 Apr '21

16 Apr '21

commit b4bc97f26a11f969b7765c7866400f45b6d301ed Author: emma peel <emma.peel(a)riseup.net> Date: Sat Mar 27 08:03:45 2021 +0100 add language code to name --- databags/alternatives.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/alternatives.ini b/databags/alternatives.ini index f2a0d37..774371b 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -8,4 +8,4 @@ language = English (en) direction = text-left order = order-last url = /es/ -language = Español +language = Español (es)

1 0

[community/slideshow] Update contents.lr
by emmapeel＠torproject.org 16 Apr '21

16 Apr '21

commit a00f110f69afad3d938bfb125864023854990548 Author: 5iwek <60261537+5iwek(a)users.noreply.github.com> Date: Mon Mar 29 12:50:45 2021 +0200 Update contents.lr The site's domain has changed. --- content/relay-operations/community-resources/good-bad-isps/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/community-resources/good-bad-isps/contents.lr b/content/relay-operations/community-resources/good-bad-isps/contents.lr index dc4bb3c..34c8af9 100644 --- a/content/relay-operations/community-resources/good-bad-isps/contents.lr +++ b/content/relay-operations/community-resources/good-bad-isps/contents.lr @@ -213,7 +213,7 @@ For network diversity and stronger anonymity, you should avoid providers and cou | **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** | |-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------| -| [Hitme.net.pl](http://hitme.net.pl/) | - | Yes | Yes | Yes | - | 12/06/2017 | +| [Hitme.pl](http://hitme.pl/) | - | Yes | Yes | No | They block accounts if you receive an abuse report | 29/03/2021 | | [Hostowisko.pl](http://www.hostowisko.pl/) | - | Yes | Yes | ? | - | 27/08/2013 | | [Exone](http://www.exone.pl/) | - | Yes | Yes | ? | - | 28/08/2013 | | [e24cloud](http://www.e24cloud.com/en) | - | Yes | Yes | ? | - | 01/10/2013 |

1 0

[community/slideshow] Added parentheses
by emmapeel＠torproject.org 16 Apr '21

16 Apr '21

commit 81495ca09d0bf6656a85e3756958119e7a867137 Author: kulsoomzahra <kulsoomzahra24(a)gmail.com> Date: Sat Apr 3 21:49:40 2021 +0530 Added parentheses Addressing the issue : Parentheses missing in definition of "501(c)(3) nonprofit organization" --- templates/outreach-talk.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/outreach-talk.html b/templates/outreach-talk.html index 72443f8..ce98d72 100644 --- a/templates/outreach-talk.html +++ b/templates/outreach-talk.html @@ -52,7 +52,7 @@ <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> + <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>

1 0

[community/slideshow] fix the pagenav for showing translated terms
by emmapeel＠torproject.org 16 Apr '21

16 Apr '21

commit a099b03937cde8baec48873ab0ded871db40fa89 Author: emma peel <emma.peel(a)riseup.net> Date: Sat Mar 27 08:32:16 2021 +0100 fix the pagenav for showing translated terms --- templates/pagenav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/pagenav.html b/templates/pagenav.html index 617242d..077df73 100644 --- a/templates/pagenav.html +++ b/templates/pagenav.html @@ -8,7 +8,7 @@ <li{% if this.is_child_of(abs_path) %} class="nav-item active border-active" {% else %} class="nav-item" {% endif %}> {% set elm = site.get(item.path) %} {% if elm %} - <a class="nav-link" href="{{ elm.path|url }}">{{ item.label }} + <a class="nav-link" href="{{ elm.path|url }}">{{ _(item.label) }} {% endif %} {% if this.is_child_of(abs_path) %} <span class="sr-only">(current)</span>

1 0

[community/slideshow] make translated strings appear in homepage. will-fix: https://gitlab.torproject.org/tpo/web/community/-/issues/172
by emmapeel＠torproject.org 16 Apr '21

16 Apr '21

commit 2f7a1d62ee29cea081715109e7eb09590c808ada Author: emma peel <emma.peel(a)riseup.net> Date: Sat Mar 27 07:52:33 2021 +0100 make translated strings appear in homepage. will-fix: https://gitlab.torproject.org/tpo/web/community/-/issues/172 --- templates/home.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/home.html b/templates/home.html index 2ceb15e..09449f0 100644 --- a/templates/home.html +++ b/templates/home.html @@ -11,13 +11,13 @@ <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> - <p class="card-text">{{ child.subtitle }}</p> + <h2 class="card-title ">{{ _(child.title) }}</h2> + <p class="card-text">{{ _(child.subtitle) }}</p> <div class="illo-container"> - <img src="/static/images/home/png/{{ child.section_id }}.png" class="img-fluid" alt="{{ child.section }}" /> + <img src="/static/images/home/png/{{ child.section_id }}.png" class="img-fluid" alt="{{ _(child.section) }}" /> </div> </div> - <a href="{{ child.path|url }}" class="btn btn-primary">{{ child.cta }}</a> + <a href="{{ child.path|url }}" class="btn btn-primary">{{ _(child.cta) }}</a> </div> </div> {% endfor %}

1 0