[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tpo/staging] merge master
commit d4461c53986f2731325efdbbfac379fb22f4bbf0
Merge: e3c55352 f7a9ced7
Author: emma peel <emma.peel@xxxxxxxxxx>
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 | 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@xxxxxx'|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>
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits