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

[tpo/master] Update download.html
by hiro＠torproject.org 16 Apr '19

16 Apr '19

commit fe37f172a33fcfcdc10dab73e375b3d37d00806d Author: Antonela <hola(a)antonela.me> Date: Tue Apr 16 12:51:24 2019 -0300 Update download.html --- templates/download.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/download.html b/templates/download.html index 55825c1..61ec23c 100644 --- a/templates/download.html +++ b/templates/download.html @@ -6,13 +6,13 @@ </div> <h3 class="text-primary">{{ _('Get connected') }}</h3> <div class="row pl-3 pr-5 text-tpo"> - <p class="text-tpo"><span class="text-bold">{{ _('If you are in a country where Tor is blocked, you can configure Tor Browser to connect to a bridge during the setup process.') }} </span></p> + <p class="text-tpo"><span class="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.') }}</p> <h6><a href="https://support.torproject.org/{{ this.alt }}" title="{{ _('Support Portal') }}">{{ _('Read other FAQ\'s at our Support Portal') }}</a></h6> -</div> + </div> </div> <div class="col-sm-6"> <div class="col-md-8 order-1">

1 0

[tpo/master] Add source download page
by hiro＠torproject.org 16 Apr '19

16 Apr '19

commit 3050853eb568e5abf815bbcf0fde7563bb270957 Author: hiro <hiro(a)torproject.org> Date: Tue Apr 16 18:19:27 2019 +0200 Add source download page --- databags/versions.ini | 6 ++++++ templates/download-tor.html | 22 ++++++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/databags/versions.ini b/databags/versions.ini index 5fdd461..ab83ca9 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -15,3 +15,9 @@ version = 0.3.5.8 [tor-alpha] version = 0.4.0.3-alpha + +[tor-win32-stable] +version = 0.2.4.22 + +[tor-win32-alpha] +version = 0.2.4.23 diff --git a/templates/download-tor.html b/templates/download-tor.html index 686f452..fda525b 100644 --- a/templates/download-tor.html +++ b/templates/download-tor.html @@ -14,10 +14,28 @@ </tr> </thead> <tbody> + {% set t = bag('versions', 'tor-stable') %} + {% set a = bag('versions', 'tor-alpha') %} + {% set tw = bag('versions', 'tor-win32-stable') %} + {% set aw = bag('versions', 'tor-win32-alpha') %} + {% for id, item in bag('platforms').items() %} + {% if id == 'windows' %} + {% set download_link = 'https://dist.torproject.org/win32/tor-' + tw.version + '-win32.exe' %} + {% set sig_link = download_link + '.asc' %} + {% set alpha_download_link = 'https://dist.torproject.org/win32/tor-' + aw.version + '-win32.exe' %} + {% set alpha_sig_link = alpha_download_link + '.asc' %} + {% else %} + {% set download_link = 'https://dist.torproject.org/tor-' + t.version + '.tar.gz' %} + {% set sig_link = download_link + '.asc' %} + {% set alpha_download_link = 'https://dist.torproject.org/tor-' + a.version + '.tar.gz' %} + {% set alpha_sig_link = alpha_download_link + '.asc' %} + {% endif %} <tr> - <td></td> - <td></td> + <td>{{ item.label }}</td> + <td><a href="{{ download_link }}">stable</a> (<a href="{{ sig_link }}">sig</a>)</td> + <td><a href="{{ alpha_download_link }}">alpha</a> (<a href="{{ alpha_sig_link }}">sig</a>)</td> </tr> + {% endfor %} </tbody> </table> </div>

1 0

[translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed
by translation＠torproject.org 16 Apr '19

16 Apr '19

commit 3a9380ba5816afbc8ff8bd249e2fb4c2b4cfe00f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 16 16:17:54 2019 +0000 Update translations for tbmanual-contentspot_completed --- contents+fr.po | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 3502a2e66..e4005f822 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -3,6 +3,7 @@ # AO <ao(a)localizationlab.org>, 2019 # Emma Peel, 2019 # Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 +# Thomas Prévost <thomasprevost85(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -10,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-09 09:20+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019\n" +"Last-Translator: Thomas Prévost <thomasprevost85(a)gmail.com>, 2019\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,7 +67,7 @@ msgstr "Greffons" #: https//tb-manual.torproject.org/en-US/menu/ #: (content/menu/contents+en-US.lrtopic.body) msgid "Becoming a Tor translator" -msgstr "" +msgstr "Devenir un traducteur Tor" #: https//tb-manual.torproject.org/en-US/about/ #: (content/about/contents+en-US.lrtopic.title) @@ -194,6 +195,9 @@ msgid "" "The safest and simplest way to download Tor Browser is from the official Tor" " Project website at https://www.torproject.org." msgstr "" +"La manière la plus sûre et la plus simple de télécharger le navigateur Tor " +"Browser est de le faire depuis le site officiel du Projet Tor à " +"https://www.torproject.org." #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body)

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 16 Apr '19

16 Apr '19

commit be27f88f4e19b3dcd4dd056819de130f7de4735a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 16 16:17:47 2019 +0000 Update translations for tbmanual-contentspot --- contents+fr.po | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 3502a2e66..e4005f822 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -3,6 +3,7 @@ # AO <ao(a)localizationlab.org>, 2019 # Emma Peel, 2019 # Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 +# Thomas Prévost <thomasprevost85(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -10,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-09 09:20+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019\n" +"Last-Translator: Thomas Prévost <thomasprevost85(a)gmail.com>, 2019\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,7 +67,7 @@ msgstr "Greffons" #: https//tb-manual.torproject.org/en-US/menu/ #: (content/menu/contents+en-US.lrtopic.body) msgid "Becoming a Tor translator" -msgstr "" +msgstr "Devenir un traducteur Tor" #: https//tb-manual.torproject.org/en-US/about/ #: (content/about/contents+en-US.lrtopic.title) @@ -194,6 +195,9 @@ msgid "" "The safest and simplest way to download Tor Browser is from the official Tor" " Project website at https://www.torproject.org." msgstr "" +"La manière la plus sûre et la plus simple de télécharger le navigateur Tor " +"Browser est de le faire depuis le site officiel du Projet Tor à " +"https://www.torproject.org." #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body)

1 0

[tpo/master] Add Tor source code table for each os
by hiro＠torproject.org 16 Apr '19

16 Apr '19

commit 55f39ff267b7d171c61a9d1cd2be3260452fd53b Author: Antonela <hola(a)antonela.me> Date: Tue Apr 16 12:03:22 2019 -0300 Add Tor source code table for each os #29991 --- templates/download-tor.html | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/download-tor.html b/templates/download-tor.html index ed281c5..686f452 100644 --- a/templates/download-tor.html +++ b/templates/download-tor.html @@ -8,6 +8,7 @@ <table class="table"> <thead> <tr> + <th scope="col">OS</th> <th scope="col">Stable</th> <th scope="col">Unstable</th> </tr>

1 0

[tpo/master] Merge pull request #17 from torproject/master
by hiro＠torproject.org 16 Apr '19

16 Apr '19

commit 7bd1eeaf211dc651e88b7cdaaaf76ac54ad9c700 Merge: 55f39ff 1116a29 Author: Antonela <hola(a)antonela.me> Date: Tue Apr 16 12:06:03 2019 -0300 Merge pull request #17 from torproject/master rebase assets/scss/_illos.scss | 15 +++++++++++++++ assets/scss/bootstrap.scss | 1 + assets/static/bootstrap.css | 11 +++++++++++ assets/static/bootstrap.css.map | 4 ++-- assets/static/js/fallback.js | 13 +++++++++++++ templates/download.html | 2 +- templates/home.html | 20 ++++++++++---------- templates/navbar.html | 2 +- 8 files changed, 54 insertions(+), 14 deletions(-)

1 0

[tpo/master] Add x86 on download-android
by hiro＠torproject.org 16 Apr '19

16 Apr '19

commit dbc9857cf65b884c849ec53431127a1aae194d29 Author: Antonela <hola(a)antonela.me> Date: Tue Apr 16 12:49:43 2019 -0300 Add x86 on download-android #29845 --- templates/download-android.html | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/templates/download-android.html b/templates/download-android.html index b6ac863..796fa4c 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -15,10 +15,20 @@ <h3 class="mx-auto defend text-white">{{ _('Protect yourself against tracking, surveillance, and censorship.') }}</h3> </div> <div class="row my-5"> - <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://dist.torproject.org/torbrowser/8.5a10/tor-browser-8.5a10-android-ar…">{{ _('Download .apk') }}</a> - <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">{{ _('Go to Google Play') }}</a> + <div class="col-md-6 text-center"> + <a class="btn btn-lg btn-light text-primary py-1 px-4 my-1" href="https://dist.torproject.org/torbrowser/8.5a10/tor-browser-8.5a10-android-ar…">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">arm</small></a> + <a class="btn btn-primary btn-sm nick mx-3 my-2" href="#"><small>sig</small></a> + <a class="btn btn-lg btn-light text-primary py-1 px-4 my-1" href="https://dist.torproject.org/torbrowser/8.5a10/tor-browser-8.5a10-android-ar…">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">x86</small></a> + <a class="btn btn-primary btn-sm nick mx-3 my-2" href="#"><small>sig</small></a> + </div> + <div class="col-md-3 text-center"> + <a class="btn btn-lg btn-light text-primary py-3 my-1" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">{{ _('Go to Google Play') }}</a> + </div> {% from "macros/downloads.html" import render_fdroid %} - <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a> + <div class="col-md-3 text-center"> + <a class="btn btn-lg btn-light text-primary py-3 my-1 disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a> +  + </div> </div> <div class="row"> <a class="text-light mx-auto nick" href="https://itunes.apple.com/us/app/onion-browser/id519296448?mt=8">{{ _('Are you a iOS user? We encourage you to try Onion Browser.') }} </a>

1 0

[tpo/master] Fix templates
by hiro＠torproject.org 16 Apr '19

16 Apr '19

commit b2e8c07a3d9825f69b47ea4b738bc4c43794fe30 Author: hiro <hiro(a)torproject.org> Date: Tue Apr 16 17:50:18 2019 +0200 Fix templates --- databags/versions.ini | 6 +++--- templates/download-android.html | 9 +++++---- templates/hero-download.html | 5 ++++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/databags/versions.ini b/databags/versions.ini index cbba14e..e8dbb3e 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -4,8 +4,8 @@ release_date = 2019-03-23 win32 = 0.3.5.8 [torbrowser-alpha] -version = 8.5a10 -release_date = 2019-03-25 +version = 8.5a11 +release_date = 2019-04-15 [torbrowser-develop-branch] version = maint-8.0 @@ -14,4 +14,4 @@ version = maint-8.0 version = 0.3.5.8 [tor-alpha] -version = 0.4.0.1-alpha +version = 0.4.0.3-alpha diff --git a/templates/download-android.html b/templates/download-android.html index b6ac863..fc33533 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -15,10 +15,11 @@ <h3 class="mx-auto defend text-white">{{ _('Protect yourself against tracking, surveillance, and censorship.') }}</h3> </div> <div class="row my-5"> - <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://dist.torproject.org/torbrowser/8.5a10/tor-browser-8.5a10-android-ar…">{{ _('Download .apk') }}</a> - <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">{{ _('Go to Google Play') }}</a> - {% from "macros/downloads.html" import render_fdroid %} - <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a> + {% set t = bag('versions', 'torbrowser-alpha') %} + <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }}</a> + <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">{{ _('Go to Google Play') }}</a> + {% from "macros/downloads.html" import render_fdroid %} + <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a> </div> <div class="row"> <a class="text-light mx-auto nick" href="https://itunes.apple.com/us/app/onion-browser/id519296448?mt=8">{{ _('Are you a iOS user? We encourage you to try Onion Browser.') }} </a> diff --git a/templates/hero-download.html b/templates/hero-download.html index 212c837..dfe9704 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -15,15 +15,18 @@ {% endif %} {% if id == 'windows' %} {% set download_link = download_prefix + 'torbrowser-install-win64-' + t.version + '_' + alt + '.exe' %} + {% set sig_link = download_link + '.asc' %} {% elif id == 'apple' %} {% set download_link = download_prefix + 'TorBrowser-' + t.version + '-osx64' + '_' + alt + '.dmg' %} + {% set sig_link = download_link + '.asc' %} {% else %} {% set download_link = download_prefix + 'tor-browser-linux64-' + t.version + '_' + alt + '.tar.xz' %} + {% set sig_link = download_link + '.asc' %} {% endif %} <a class="downloadLink" href="{{ download_link }}"> <i class="text-light fab fa-{{ id }}-png"></i> </a> - <p><small><a class="btn btn-primary btn-sm nick mx-5 my-4" href="#">sig</a></small></p> + <p><small><a class="btn btn-primary btn-sm nick mx-5 my-4" href="{{ sig_link }}">sig</a></small></p> </div> </div> {% endfor %}

1 0

[tpo/master] Merge branch 'master' of https://github.com/holantonela/tpo
by hiro＠torproject.org 16 Apr '19

16 Apr '19

commit 387f14008901b0131610316a9eb116ae1178cefd Merge: dbc9857 7bd1eea Author: Antonela <hola(a)antonela.me> Date: Tue Apr 16 12:49:46 2019 -0300 Merge branch 'master' of https://github.com/holantonela/tpo assets/scss/_illos.scss | 15 +++++++++++++++ assets/scss/bootstrap.scss | 1 + assets/static/bootstrap.css | 11 +++++++++++ assets/static/bootstrap.css.map | 4 ++-- assets/static/js/fallback.js | 13 +++++++++++++ templates/download.html | 2 +- templates/home.html | 20 ++++++++++---------- templates/navbar.html | 2 +- 8 files changed, 54 insertions(+), 14 deletions(-)

1 0

[tpo/master] Update sig and links for android downloads
by hiro＠torproject.org 16 Apr '19

16 Apr '19

commit b4b59e5868c9acda38ec799fe3e1424ce378db9e Merge: b2e8c07 387f140 Author: hiro <hiro(a)torproject.org> Date: Tue Apr 16 17:55:42 2019 +0200 Update sig and links for android downloads databags/versions.ini | 4 ++-- templates/download-android.html | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --cc databags/versions.ini index e8dbb3e,cbba14e..5fdd461 --- a/databags/versions.ini +++ b/databags/versions.ini @@@ -4,8 -4,8 +4,8 @@@ release_date = 2019-03-2 win32 = 0.3.5.8 [torbrowser-alpha] - version = 8.5a11 - release_date = 2019-04-15 + version = 8.5a10 -release_date = 2019-03-25 ++release_date = 2019-03-23 [torbrowser-develop-branch] version = maint-8.0 diff --cc templates/download-android.html index fc33533,796fa4c..6248c8a --- a/templates/download-android.html +++ b/templates/download-android.html @@@ -15,11 -15,20 +15,21 @@@ <h3 class="mx-auto defend text-white">{{ _('Protect yourself against tracking, surveillance, and censorship.') }}</h3> </div> <div class="row my-5"> - {% set t = bag('versions', 'torbrowser-alpha') %} - <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }}</a> - <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">{{ _('Go to Google Play') }}</a> - {% from "macros/downloads.html" import render_fdroid %} - <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a> + <div class="col-md-6 text-center"> - <a class="btn btn-lg btn-light text-primary py-1 px-4 my-1" href="https://dist.torproject.org/torbrowser/8.5a10/tor-browser-8.5a10-android-ar…">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">arm</small></a> - <a class="btn btn-primary btn-sm nick mx-3 my-2" href="#"><small>sig</small></a> - <a class="btn btn-lg btn-light text-primary py-1 px-4 my-1" href="https://dist.torproject.org/torbrowser/8.5a10/tor-browser-8.5a10-android-ar…">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">x86</small></a> - <a class="btn btn-primary btn-sm nick mx-3 my-2" href="#"><small>sig</small></a> ++ {% set t = bag('versions', 'torbrowser-alpha') %} ++ <a class="btn btn-lg btn-light text-primary py-1 px-4 my-1" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">arm</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-armv7-multi.apk.asc"><small>sig</small></a> ++ <a class="btn btn-lg btn-light text-primary py-1 px-4 my-1" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">x86</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-x86-multi.apk.asc"><small>sig</small></a> + </div> + <div class="col-md-3 text-center"> + <a class="btn btn-lg btn-light text-primary py-3 my-1" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">{{ _('Go to Google Play') }}</a> + </div> + {% from "macros/downloads.html" import render_fdroid %} + <div class="col-md-3 text-center"> + <a class="btn btn-lg btn-light text-primary py-3 my-1 disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a> +  + </div> </div> <div class="row"> <a class="text-light mx-auto nick" href="https://itunes.apple.com/us/app/onion-browser/id519296448?mt=8">{{ _('Are you a iOS user? We encourage you to try Onion Browser.') }} </a>

1 0