August 2020 - tor-commits - lists.torproject.org

[tpo/staging] merge master
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit d4461c53986f2731325efdbbfac379fb22f4bbf0 Merge: e3c55352 f7a9ced7 Author: emma peel <emma.peel(a)riseup.net> Date: Mon Nov 25 19:31:46 2019 +0100 merge master content/about/cy-pres/contents.lr | 2 +- content/download/languages/contents.lr | 2 +- content/menu/contents.lr | 3 +++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr … [View More] | 19 +++++++++++++++++++ .../bbc-news-launches-tor-mirror-site/contents.lr | 19 +++++++++++++++++++ .../fungerer-torbrowser-primaer-browser/contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../torbrowser/RecommendedTBBVersions/contents.lr | 6 +++++- databags/about+ar.ini | 1 - databags/about+de.ini | 1 - databags/about+es.ini | 1 - databags/about+fr.ini | 1 - databags/about+id.ini | 1 - databags/about+is.ini | 1 - databags/about+it.ini | 1 - databags/about+ka.ini | 1 - databags/about+ko.ini | 1 - databags/about+pt-BR.ini | 1 - databags/about+ru.ini | 1 - databags/about+tr.ini | 1 - databags/about+zh-CN.ini | 1 - databags/{about+en.ini => about.ini} | 1 + databags/download-alternatives-alpha.ini | 2 +- databags/download-alternatives.ini | 2 +- databags/links.ini | 1 + databags/menu+bn-BD.ini | 1 - databags/menu+de.ini | 1 - databags/menu+en.ini | 1 - databags/menu+es.ini | 1 - databags/menu+fr.ini | 1 - databags/menu+id.ini | 1 - databags/menu+is.ini | 1 - databags/menu+it.ini | 1 - databags/menu+ka.ini | 1 - databags/menu+ko.ini | 1 - databags/menu+pt-BR.ini | 1 - databags/menu+ru.ini | 1 - databags/menu+tr.ini | 1 - databags/menu+zh-CN.ini | 19 ------------------- databags/menu.ini | 1 + databags/menu_footer+ar.ini | 1 - databags/menu_footer+de.ini | 1 - databags/menu_footer+en.ini | 1 - databags/menu_footer+es.ini | 1 - databags/menu_footer+fr.ini | 1 - databags/menu_footer+id.ini | 1 - databags/menu_footer+is.ini | 1 - databags/menu_footer+it.ini | 1 - databags/menu_footer+ka.ini | 1 - databags/menu_footer+ko.ini | 1 - databags/menu_footer+pt-BR.ini | 1 - databags/menu_footer+ru.ini | 1 - databags/menu_footer+tr.ini | 1 - databags/menu_footer+zh-CN.ini | 1 - databags/menu_footer.ini | 1 + databags/versions.ini | 7 ++----- lego | 2 +- templates/about.html | 3 ++- templates/download-android.html | 2 +- templates/download.html | 2 +- templates/home.html | 2 +- templates/homepage.html | 3 ++- templates/layout.html | 3 ++- 70 files changed, 237 insertions(+), 76 deletions(-) diff --cc templates/download-android.html index 9cdb1944,bcb8fccc..968a5794 --- a/templates/download-android.html +++ b/templates/download-android.html @@@ -14,16 -14,9 +14,16 @@@ <div class="row"> <h3 class="mx-auto text-center text-white">{{ _('Protect yourself against tracking, surveillance, and censorship.') }}</h3> </div> + </div> + <div class="d-none d-lg-block col-lg-4"> + <img class="img-fluid p-5" height="auto" src="{{ 'static/images/tor-browser-mobile-window/png/TBAa-onboarding(a)2x.png'|asseturl }}"> + </div> + </div> + <div class="row col-lg-10 mx-auto"> + <div class="col-lg-12 py-5 mt-5"> <div class="row my-5"> <div class="col-xl-6 mx-auto text-center"> - {% set t = bag('versions', 'torbrowser-stable-android') %} + {% set t = bag('versions', 'torbrowser-stable') %} <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">aarch64</small></a> <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk.asc"><small>sig</small></a> [View Less]

1 0

[tpo/staging] add Japanese website translation
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit b4dca33fb507334ee9b0cf7aa24cb5840145043b Author: emma peel <emma.peel(a)riseup.net> Date: Wed Nov 6 11:59:14 2019 +0100 add Japanese website translation --- configs/i18n.ini | 2 +- databags/about+ja.ini | 1 + databags/alternatives.ini | 6 ++++++ databags/menu+ja.ini | 1 + databags/menu_footer+ja.ini | 1 + tpo.lektorproject | 5 +++++ 6 files changed, 15 insertions(+), 1 deletion(-) diff --git a/configs/i18n.ini b/configs/i18n.ini … [View More]

1 0

[tpo/staging] add zh-TW website translation
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit e3c55352832053d67a6478e1f6a544dbe35aa216 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Nov 6 13:26:05 2019 +0100 add zh-TW website translation --- databags/about+zh-TW.ini | 1 + databags/menu+zh-TW.ini | 1 + databags/menu_footer+zh-TW.ini | 1 + 3 files changed, 3 insertions(+) diff --git a/databags/about+zh-TW.ini b/databags/about+zh-TW.ini new file mode 120000 index 00000000..234b9482 --- /dev/null +++ b/databags/about+zh-TW.ini @@ -0,0 +1 @@ +about+… [View More]

1 0

[tpo/staging] More ltr-rtl fixes
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit 39e050aeaeb811bd24de210a157bb6b49ad4c6bd Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 13:45:50 2019 +0100 More ltr-rtl fixes --- templates/homepage.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/homepage.html b/templates/homepage.html index 4daff165..52e41a21 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -5,9 +5,9 @@ {% include 'hero.html' %} </div> </div> - <… [View More]

1 0

[tpo/staging] add Magyar website translation
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit f220d2e61ca7ad8f79f102380c8cc4460ce39857 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Nov 6 12:17:07 2019 +0100 add Magyar website translation --- configs/i18n.ini | 2 +- databags/about+hu.ini | 1 + databags/alternatives.ini | 6 ++++++ databags/menu+hu.ini | 1 + databags/menu_footer+hu.ini | 1 + tpo.lektorproject | 5 +++++ 6 files changed, 15 insertions(+), 1 deletion(-) diff --git a/configs/i18n.ini b/configs/i18n.ini … [View More]

1 0

[tpo/staging] add Dutch to the website translations
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit 1ec37ecc6245275ff519df6cceed964448f4d7c7 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Nov 6 12:54:57 2019 +0100 add Dutch to the website translations --- configs/i18n.ini | 2 +- tpo.lektorproject | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configs/i18n.ini b/configs/i18n.ini index a2cb42db..6647fc68 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = ar,bn,ca,da,de,es,fr,he,hu,id,is,it,ja,… [View More]

1 0

[tpo/staging] add Dutch language
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit 40dbd8fa9c68ffb9edd12fa9898fbcf0d88153bb Author: emma peel <emma.peel(a)riseup.net> Date: Wed Nov 6 12:55:45 2019 +0100 add Dutch language --- databags/about+nl.ini | 1 + databags/menu+nl.ini | 1 + databags/menu_footer+nl.ini | 1 + 3 files changed, 3 insertions(+) diff --git a/databags/about+nl.ini b/databags/about+nl.ini new file mode 120000 index 00000000..234b9482 --- /dev/null +++ b/databags/about+nl.ini @@ -0,0 +1 @@ +about+en.ini \ No newline at end … [View More]

1 0

[tpo/staging] Merge commit '22ad2b69d76ee1b581225100a80cc7e08399eb03' into staging
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit e723575a0af21667a143f85817af2c7f6164cd67 Merge: d4461c53 22ad2b69 Author: hiro <hiro(a)torproject.org> Date: Mon Nov 25 21:57:53 2019 +0100 Merge commit '22ad2b69d76ee1b581225100a80cc7e08399eb03' into staging templates/about.html | 2 +- templates/homepage.html | 2 +- templates/layout.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tpo/staging] Merge branch 'master' into staging
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit 4ba8a9e6c95ea5e93d6eb0c42cff18699d560f65 Merge: 5631c01b ac549585 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Nov 6 11:04:30 2019 +0100 Merge branch 'master' into staging .htaccess | 6 +- assets/static/images/home/png/take-back(a)3x.png | Bin 0 -> 124543 bytes assets/static/images/home/svg/take-back.svg | 7902 ++++++++++++++++++++ content/about/history/contents.lr | 4 +- .../about/… [View More]

1 0

[tpo/staging] add zh-TW website translation
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit a2ea232654b0920b07b560d7d82d8680972660dc Author: emma peel <emma.peel(a)riseup.net> Date: Wed Nov 6 13:25:37 2019 +0100 add zh-TW website translation --- configs/i18n.ini | 2 +- databags/alternatives.ini | 6 ++++++ tpo.lektorproject | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/configs/i18n.ini b/configs/i18n.ini index 6647fc68..d120302b 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -… [View More]

1 0