commit 79be3c2583f761cd9fa450c89bf94e75f8fb9b57 Merge: 9397a07 8a45505 Author: hiro hiro@torproject.org Date: Thu Mar 14 15:22:11 2019 +0100

Merge remote-tracking branch 'anto/master'

assets/static/images/download/get-connected.svg | 1 + assets/static/images/download/stay-safe.svg | 1 + assets/static/images/home/block-trackers.svg | 1 + assets/static/images/home/browse-freely.svg | 1 + assets/static/images/home/encryption.svg | 1 + assets/static/images/home/fingerprinting.svg | 1 + assets/static/images/home/surveillance.svg | 1 + templates/download.html | 12 ++--- templates/home.html | 67 ++++++++++++------------- 9 files changed, 44 insertions(+), 42 deletions(-)

diff --cc templates/download.html index b853a1d,6ec0ee1..21b04c6 --- a/templates/download.html +++ b/templates/download.html @@@ -1,17 -1,15 +1,17 @@@ <div class="container py-3"> <div class="row"> <div class="col-sm-6"> - <div class="col-md-4 order-1"> - <div class="oval-2"></div> + <div class="col-md-8 order-1"> + <img src="{{ '/static/images/download/get-connected.svg'|asseturl }}" class="" alt="{{ _("Get Connected") }}" /> </div> - <h3 class="text-primary display-6 pt-5">{{ _('Get connected') }}</h3> + <h3 class="text-primary display-6">{{ _('Get connected') }}</h3> <div class="row pl-3 pr-5 text-tpo"> - <p class="text-tpo">{{ _('If you are in a country where Tor is blocked, you can <span class="text-primary text-bold">configure</span> Tor to connect to a bridge during the setup process. Select <span class="text-primary">"Tor is censored in my country."</span>')|safe }}</p> + <p class="text-tpo"><span class="text-primary text-bold">{{ _('If you are in a country where Tor is blocked, you can configure Tor to connect to a bridge during the setup process.') }} </span></p> + <p class="text-tpo">{{ _('Select "Tor is censored in my country."') }}</p> </div> <div class="row pl-3 pr-5 text-tpo"> - <p class="text-tpo">{{ _("If Tor is not censored, one of the most common reasons Tor won’t connect is an incorrect system clock. Please make sure it’s set correctly. Read other FAQ’s at our <a href="https://support.torproject.org%5C%22%3E<u>Support Portal</u></a>.")|safe }}</p> + <p class="text-tpo">{{ _('If Tor is not censored, one of the most common reasons Tor won’t connect is an incorrect system clock. Please make sure it’s set correctly.') }}</p> + <p><a href="https://support.torproject.org%5C%22%3E<u>{{ _('Read other FAQ’s at our Support Portal') }}</u></a><p> </div> </div> <div class="col-sm-6">