[tor-commits] [tpo/staging] Merge remote-tracking branch 'anto/master'

2019-05-29 Thread emmapeel 
commit 1cb3fbbd846b571b8973e6ee8445cd2eef37c104
Merge: f8fa754 b7d1e5f
Author: hiro 
Date:   Fri Apr 26 15:08:32 2019 +0200

Merge remote-tracking branch 'anto/master'

 templates/footer.html | 1 +
 templates/navbar.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/staging] Merge remote-tracking branch 'anto/master'

2019-05-29 Thread emmapeel 
commit 71faa51259a83a5a0af82b13518aa5da144837de
Merge: 984abba 988c3f7
Author: hiro 
Date:   Tue Apr 16 19:24:04 2019 +0200

Merge remote-tracking branch 'anto/master'

 templates/hero-download.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/staging] Merge remote-tracking branch 'anto/master'

2019-05-29 Thread emmapeel 
commit 4743c462d280eb95fb1950586048e462c74b20f3
Merge: 3050853 fe37f17
Author: hiro 
Date:   Tue Apr 16 18:19:45 2019 +0200

Merge remote-tracking branch 'anto/master'

 templates/download.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/staging] Merge remote-tracking branch 'anto/master'

2019-05-29 Thread emmapeel 
commit a5e1f7e5725a0c33af45a0ee0a9b5930cd60d37c
Merge: 2da591e 26fa04a
Author: hiro 
Date:   Tue Apr 16 16:18:14 2019 +0200

Merge remote-tracking branch 'anto/master'

 content/download/tor/contents.lr | 13 +
 templates/download-tor.html  | 23 +++
 templates/hero-download-tor.html |  6 ++
 templates/hero-download.html |  5 ++---
 4 files changed, 44 insertions(+), 3 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/staging] Merge remote-tracking branch 'anto/master'

2019-05-29 Thread emmapeel 
commit 2da591e7e6a791b7f235927fa5ee3457c20bd094
Merge: 5832fc2 b06deec
Author: hiro 
Date:   Tue Apr 16 15:16:18 2019 +0200

Merge remote-tracking branch 'anto/master'

 assets/static/images/home/png/block-trackers.png   | Bin 0 -> 18192 bytes
 assets/static/images/home/png/block-track...@2x.png| Bin 0 -> 42047 bytes
 assets/static/images/home/png/block-track...@3x.png| Bin 0 -> 66496 bytes
 assets/static/images/home/png/browse-freely.png| Bin 0 -> 27282 bytes
 assets/static/images/home/png/browse-fre...@2x.png | Bin 0 -> 62800 bytes
 assets/static/images/home/png/browse-fre...@3x.png | Bin 0 -> 99137 bytes
 assets/static/images/home/png/encryption.png   | Bin 0 -> 19727 bytes
 assets/static/images/home/png/encrypt...@2x.png| Bin 0 -> 44050 bytes
 assets/static/images/home/png/encrypt...@3x.png| Bin 0 -> 70895 bytes
 assets/static/images/home/png/fingerprinting.png   | Bin 0 -> 28619 bytes
 assets/static/images/home/png/fingerprint...@2x.png| Bin 0 -> 64240 bytes
 assets/static/images/home/png/fingerprint...@3x.png| Bin 0 -> 100068 bytes
 assets/static/images/home/png/surveillance.png | Bin 0 -> 18021 bytes
 assets/static/images/home/png/surveilla...@2x.png  | Bin 0 -> 40297 bytes
 assets/static/images/home/png/surveilla...@3x.png  | Bin 0 -> 63810 bytes
 assets/static/images/home/{ => svg}/block-trackers.svg |   0
 assets/static/images/home/{ => svg}/browse-freely.svg  |   0
 assets/static/images/home/{ => svg}/encryption.svg |   0
 assets/static/images/home/{ => svg}/fingerprinting.svg |   0
 assets/static/images/home/{ => svg}/surveillance.svg   |   0
 20 files changed, 0 insertions(+), 0 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/staging] Merge remote-tracking branch 'anto/master'

2019-04-06 Thread emmapeel 
commit 9cc3292334af9a8ea97e08ecbb97db08f59e295e
Merge: 0022d64 985626e
Author: hiro 
Date:   Tue Mar 26 21:13:45 2019 +0100

Merge remote-tracking branch 'anto/master'

 assets/static/images/tb85/TB8.svg | 179 ++
 assets/static/images/tb85/tb85.png| Bin 46123 -> 58564 bytes
 assets/static/images/tb85/t...@2x.png | Bin 107230 -> 147986 bytes
 content/about/people/antonela/contents.lr |   2 +
 templates/download-android.html   |   2 +-
 templates/hero-home.html  |   2 +-
 templates/history.html|   2 +-
 templates/navbar.html |   2 +-
 templates/people.html |   5 +-
 9 files changed, 188 insertions(+), 6 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/staging] Merge remote-tracking branch 'anto/master'

2019-03-14 Thread hiro 
commit 79be3c2583f761cd9fa450c89bf94e75f8fb9b57
Merge: 9397a07 8a45505
Author: hiro 
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 @@@
  

  
-   
- 
+   
+   

-   {{ _('Get connected') }}
+   {{ _('Get connected') }}

 -  {{ _('If you are in a country where Tor is 
blocked, you can configure Tor to 
connect to a bridge during the setup process. Select "Tor is censored in my country."')|safe }}
 +  {{ 
_('If you are in a country where Tor is blocked, you can configure Tor to 
connect to a bridge during the setup process.') }} 
 +  {{ _('Select "Tor is censored in my 
country."') }}


 -  {{ _("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 https://support.torproject.org\;>Support Portal.")|safe }}
 +  {{ _('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.') }}
 +  https://support.torproject.org\;>{{ _('Read 
other FAQ’s at our Support Portal') }}

  
  



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/staging] Merge remote-tracking branch 'anto/master'

2019-02-11 Thread hiro 
commit 7da0e6ab8d8cb033621f376c989997566d32593d
Merge: d118c85 cd42e3b
Author: hiro 
Date:   Mon Feb 11 18:07:17 2019 +0100

Merge remote-tracking branch 'anto/master'

 content/thank-you/contents.lr | 2 +-
 templates/thank-you.html  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/staging] Merge remote-tracking branch 'anto/master' into staging

2019-02-07 Thread hiro 
commit a3793923d6b9e1f4aa6554da0fddfc6bf97982cb
Merge: 2e5954a 947e9a7
Author: hiro 
Date:   Thu Feb 7 13:40:03 2019 +0100

Merge remote-tracking branch 'anto/master' into staging

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits