tor-commits August 2018

tor-commits@lists.torproject.org

17 participants
2581 discussions

[tor-browser-build/master] Bug 27397: add arma's key C218525819F78451 to ./keyring/tor.gpg
by gk＠torproject.org 31 Aug '18

31 Aug '18

commit 4247dac61d501c2118a0a096fed453c04ba01ce8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 31 14:23:14 2018 +0200 Bug 27397: add arma's key C218525819F78451 to ./keyring/tor.gpg --- keyring/tor.gpg | Bin 21817 -> 159585 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/tor.gpg b/keyring/tor.gpg index 51eeb40..45b333f 100644 Binary files a/keyring/tor.gpg and b/keyring/tor.gpg differ

1 0

[webwml/master] Fix android logo
by hiro＠torproject.org 31 Aug '18

31 Aug '18

commit 2a1cb3a1afa120671cfd5f1e7c85a923dce8b1c0 Author: hiro <hiro(a)torproject.org> Date: Fri Aug 31 14:48:50 2018 +0200 Fix android logo --- css/layout.css | 10 +++++----- css/layout.min.css | 2 +- images/icon-android24.png | Bin 0 -> 13418 bytes 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/css/layout.css b/css/layout.css index 0f70e60f..821b33b8 100644 --- a/css/layout.css +++ b/css/layout.css @@ -499,11 +499,11 @@ table tr img { } .android24 { -/* Icon from the Crystal set - * author: Everaldo Coelho - * source: http://www.everaldo.com/crystal/ - * license: LGPL v2 */ - background: url("../images/icon-android24.png") no-repeat scroll left center transparent; +/* author: Google - Android Logo + * source: http://www.android.com/branding.html + * license: Creative Commons Atribución 3.0 Unported */ + background: url("../images/icon-android24.png") no-repeat scroll left center transparent; + background-size: 24px; } .smartphone24 { diff --git a/css/layout.min.css b/css/layout.min.css index 3018e59d..eb15adeb 100644 --- a/css/layout.min.css +++ b/css/layout.min.css @@ -1 +1 @@ -@charset "UTF-8";body{background:#fff}#wrap{width:960px;margin:0 auto}.left{float:left}.right{float:right}.twenty{width:20%}.thirty{width:30%}.forty{width:40%}.fifty{width:50%}.sixty{width:60%}.hundred{width:100%}.nopad{padding:0}.toppad{padding-top:10px}.toptwenty{margin-top:20px}.topforty{margin-top:40px}.hidden{display:none}#header{width:960px;height:97px;margin-bottom:23px;position:relative}h1#logo{margin:0;float:left}h1#logo a,h1#logo a:visited{background:url(../images/tor-logo.png) left top no-repeat;background-size:150px 97px;text-indent:-9999px;overflow:hidden;width:150px;height:97px;display:block}#nav{position:absolute;top:30px;left:115px;float:right}#nav ul{height:50px;float:right;margin-bottom:0}#nav ul li{float:left;display:inline;width:auto}#calltoaction{height:30px;float:right;margin-top:100px;margin-right:5px;text-align:center}#calltoaction ul{padding:0;margin:0;height:30px;list-style:none;float:right}#calltoaction ul li{list-style:none;display:inline;float:none;width :100px;margin-left:0}#calltoaction ul li a:link,#calltoaction ul li a:visited{display:block;background:url(../images/cta-buttons.jpg) top center no-repeat #885ca4;padding:4px 8px;color:#fff;font-weight:bold;text-decoration:none;font-size:13px;line-height:22px;height:22px;width:84px;float:left;text-shadow:1px 1px 0 #111}#calltoaction ul li:hover a{background:url(../images/cta-buttons.jpg) bottom center no-repeat #ff9800;font-weight:bold;text-shadow:1px 1px 0 #111}#calltoaction ul li:first-child a:link,#calltoaction ul li:first-child a:visited,#calltoaction ul li:hover:first-child a{-webkit-border-top-left-radius:7px;-webkit-border-bottom-left-radius:7px;-moz-border-radius-topleft:7px;-moz-border-radius-bottomleft:7px;border-top-left-radius:7px;border-bottom-left-radius:7px}#calltoaction ul li:first-child a:link,#calltoaction ul li:first-child a:visited{background:url(../images/cta-buttons.jpg) top left no-repeat #885ca4}#calltoaction ul li:hover:first-child a{background:url(../images /cta-buttons.jpg) bottom left no-repeat #ff9800}#calltoaction ul li:last-child a:link,#calltoaction ul li:last-child a:visited,#calltoaction ul li:hover:last-child a{-webkit-border-top-right-radius:7px;-webkit-border-bottom-right-radius:7px;-moz-border-radius-topright:7px;-moz-border-radius-bottomright:7px;border-top-right-radius:7px;border-bottom-right-radius:7px}#calltoaction ul li:last-child a:link,#calltoaction ul li:last-child a:visited{background:url(../images/cta-buttons.jpg) top right no-repeat #885ca4;color:#fff}#calltoaction ul li:hover:last-child a{background:url(../images/cta-buttons.jpg) bottom right no-repeat #ff9800}#banner{background:url(../images/bg-banner.jpg) left top no-repeat;height:200px;width:600px;padding:23px 15px;margin-bottom:15px}#download a:link,#download a:visited{margin:-17px 0 0;background:url(../images/button-download.png) left top no-repeat;width:257px;height:79px;float:left;padding:35px 0 0 80px;text-decoration:none}#download a .download-tor{backgr ound:url(../images/button-download-arrow.png) right center no-repeat;font-family:"Arial Narrow",Arial,sans-serif;color:#fff;font-size:2.167em;letter-spacing:1px;padding-right:25px}#download a .version{color:#bda5cc;font-size:1.167em;line-height:1.167em}#download a .info{color:#bda5cc;font-size:.833em;line-height:.833em}#download a:hover{background-position:0 -114px}#download a:hover .version,#download a:hover .info{color:#f1c6a1}#banner ul{background:#387520 url(../images/banner-gradient.jpg) left top repeat-x;border:1px solid #366b32;width:180px;float:right;margin:0 15px 0 0;padding:10px 10px 10px 30px}#banner ul li{list-style:url(../images/white-bullet.png) outside;padding:5px 0}#content{width:960px}#content img{max-width:710px}#breadcrumbs{padding:0 0 10px 5px}#home #maincol{float:left;width:620px;margin-right:20px}#maincol{float:right;width:710px;margin-bottom:20px}#dow-don-left,#maincol-left{float:left;width:710px;margin-bottom:20px}#maincol .topforty .icon img{border:0}.subcol {width:280px;float:left;margin:0 0 25px}#content .first{margin-right:20px}#home #sidecol{float:right;width:300px}#sidecol{float:left;width:230px;margin-right:20px}#dow-don-right,#sidecol-right{float:right;width:230px;margin-left:20px;padding-top:100px}#torusers{margin:0 0 27px}.user{margin:0 0 12px;height:auto}.user img,.project-icon{border:1px solid #cac8a7;float:left;margin:3px 10px 0 0}.user p{margin:0}.img-shadow{float:left;background:url(../images/shadowAlpha.png) no-repeat bottom right !important;background:url(../images/shadow.gif) no-repeat bottom right;margin:10px 0 10px 10px !important;margin:10px 0 10px 5px}.img-shadow .infoblock,.img-shadow .important-infoblock,.img-shadow .custom-infoblock,.img-shadow #sidenav,.img-shadow .sidenav-sub{display:block;position:relative;margin:-6px 6px 6px -6px;background-color:#fff;border:1px solid #ddd}.img-shadow .important-infoblock{background-color:#f7f8f0;border:1px solid #eeefe8}.img-shadow .infoblock,.img-shadow .important-infoblock {padding:15px;width:188px}.img-shadow .custom-infoblock{padding:15px;height:120px;width:426px}.img-shadow .infoblock p,.img-shadow .important-infoblock p,.img-shadow .custom-infoblock p{margin:0}.img-shadow #sidenav,.img-shadow .sidenav-sub{padding:10px 0 0;width:218px}#sidenav ul li,.sidenav-sub ul li{border-bottom:1px solid #ddd}#sidenav ul li.dropdown a:link,#sidenav ul li.dropdown a:visited{background:url(../images/sidenav-arrow.gif) left center no-repeat}#sidenav ul li.dropdown a.active{background:url(../images/sidenav-arrow-active.gif) left center no-repeat}.sidenav-sub ul li.dropdown a:link,.sidenav-sub ul li.dropdown a:visited{background:url(../images/sidenav-arrow.gif) left top no-repeat;margin-top:12px}#sidenav ul li a:link,#sidenav ul li a:visited{display:block;height:auto;padding:8px 15px 8px 26px}#sidenav ul li ul li a:link,#sidenav ul li ul li a:visited{padding-left:37px}.sidenav-sub ul li a:link,.sidenav-sub ul li a:visited{display:block;padding:0 15px 10px 26px;line- height:16px}#sidenav ul li.active{background:url(../images/sidenav-active.png) left center no-repeat;width:230px;border:0}#sidenav ul li ul li ul li a:link,#sidenav ul li ul li ul li a:visited{padding-left:48px}#press tr:nth-child(even){background-color:#e5e5e5}table{width:100%}td{padding:12px}table td img,table tr img{border:0;float:left;margin-right:10px}.icon{float:left;width:auto;margin-right:15px;padding:10px 0;border:0}.calendar{background:url(../images/icon-calendar.jpg) left top no-repeat;float:left;margin-right:10px;width:45px;height:54px;text-align:center;padding:4px 0}.fauxhead{background:url(../images/table-arrow.jpg) right top no-repeat;width:100%;height:11px}#home-our-projects td{height:92px;width:296px;padding:6px}#ecosystem_presentation{height:30px;padding-top:10px;padding-left:60px;vertical-align:middle;background:url("../images/video.png") no-repeat scroll left center transparent;font-size:1.7em;font-weight:bold}#ecosystem_presentation a{text-decoration:none}.proje ct{float:left;padding:6px;border:1px solid #cac8a7;height:76px;width:284px;-webkit-border-radius:10px;-moz-border-radius:10px;border-radius:10px}.project img{border:0;margin-right:6px}.beige{background:#f5f5df}.gray{background:#e0e0e0}.meta{float:right;width:auto}.windows24{background:url("../images/icon-windows24.png") no-repeat scroll left center transparent}.mac24{background:url("../images/icon-mac24.png") no-repeat scroll left center transparent}.linux24{background:url("../images/icon-linux24.png") no-repeat scroll left center transparent}.android24{background:url("../images/icon-android24.png") no-repeat scroll left center transparent}.smartphone24{background:url("../images/icon-smartphone24.png") no-repeat scroll left center transparent}.sourcecode24{background:url("../images/icon-sourcecode24.png") no-repeat scroll left center transparent}.windows24,.mac24,.linux24,.android24,.smartphone24,.sourcecode24{display:block;line-height:32px;padding:0 0 0 33px}.accordionButton{backgr ound:url("../images/table-title.jpg") repeat-x left bottom #885ca4;color:#fff;margin:0;font-size:1.1em;font-weight:bold;height:32px;float:left;_float:none;border:1px solid #fff;border-bottom:0;cursor:pointer;-webkit-border-top-left-radius:7px;-webkit-border-top-right-radius:7px;-moz-border-radius-topleft:7px;-moz-border-radius-topright:7px;border-top-left-radius:7px;border-top-right-radius:7px;position:relative;padding-left:30px;width:680px}.accordionButton:hover{background:url("../images/table-title-hover.jpg") repeat-x left bottom #885ca4;text-shadow:1px 1px 0 rgba(17,17,17,1)}.on:before,.off:before{position:absolute;content:'';height:0;width:0;font-size:0;line-height:0}.on:before{top:14px;left:10px;border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #fff}.off:before{top:9px;left:14px;border-bottom:7px solid transparent;border-top:7px solid transparent;border-left:7px solid #fff}.accordionContent{width:708px;float:left;_float:none;background:# fff;display:block}.accordionContent .fauxhead{width:710px}.package{float:left;height:280px;margin:0;padding:25px 20px 20px 20px;border-top:1px solid #888}.package h2{margin-bottom:3px}.package p{margin-top:16px;padding-left:10px}.downloads{display:block;float:left;width:238px;padding:0 16px 0 0;text-align:center}.lang{float:right;display:none;width:80px;height:20px;margin:0 7px 0 0;padding:0 0 0 3px;background-color:#fefff7;border:2px solid #cccfb8;border-top:0;-webkit-border-bottom-left-radius:5px;-webkit-border-bottom-right-radius:5px;-moz-border-radius-bottomleft:5px;-moz-border-radius-bottomright:5px;border-bottom-left-radius:5px;border-bottom-right-radius:5px}.button{text-align:center;display:block;width:234px;height:69px;text-decoration:none;background:url(../images/button-downloadpage.png) bottom left no-repeat;margin:0 auto 8px auto;text-shadow:1px 1px 0 rgba(17,17,17,1);-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.button .strong{display:block;padding: 10px 0 0 57px}.button .normal{padding:5px 0 0 57px;display:block}.sig{display:block;margin:3px 0 20px 0}.easy{width:712px;margin-bottom:10px;padding-bottom:8px}#download-donate{background-attachment:scroll;background-clip:border-box;background-color:transparent;background-image:url(../images/headerbg.jpg);background-origin:padding-box;background-position:0 0;background-repeat:no-repeat;background-size:100% 100%}.easy .package h2,.easy .package em{display:block;width:100%;text-align:left}.easy .package h2{padding-top:10px;padding-bottom:5px}.easy .package em{font-size:1.2em;padding-top:8px;padding-bottom:4px}.easy .package p{padding-left:0;font-size:15px;text-align:justify}.easy .package p.alt-dl{text-align:left;text-indent:0;padding-left:0;margin-top:32px}.all-dl{display:block;text-align:left;width:100%;font-size:15px}.all-dl a{text-decoration:none;font-weight:bold}.all-dl a:hover{text-decoration:underline}.easy .package{float:none;padding:0 8px 0 12px}.open{display:block}.lang-alt{ line-height:15px;font-size:10px;float:right;margin-right:10px}.expander{text-align:right;float:right;padding:10px 20px 0 0;font-size:15px;display:none}.title{background:url(../images/table-title-arrow.jpg) right top no-repeat;padding:10px 25px 0 10px;height:33px;float:left}.title a:link,.title a:visited{background:url(../images/table-title.jpg) left top no-repeat;height:33px;display:block}.paypal{float:left;width:auto;min-height:159px;max-width:365px}.paypal span{padding-right:20px}.warning-top{width:618px;padding:10px 10px 10px 60px;margin:0 10px 0 10px;display:block;background:url("../images/warning.png") no-repeat scroll 2px 23px #fffeb6;border:1px solid #a6a427;border-bottom:0;-webkit-border-top-left-radius:5px;-webkit-border-top-right-radius:5px;-moz-border-radius-topleft:5px;-moz-border-radius-topright:5px;border-top-left-radius:5px;border-top-right-radius:5px}.warning-top h2{padding-right:15px;padding-left:0;margin-bottom:5px}.warning-top p{padding-left:10px;margin-bottom:0}. warning{float:left;_float:none;padding:25px 25px;margin-top:4px}.warning p{padding-left:10px}.focus{background:#f4f2c7;border:1px solid #ebd4a9;padding:10px 15px}.focus .icon{float:left;width:auto;margin-right:10px}.featured-project{width:313px}input,select{margin:0 3px 10px 0}input.textfield{padding:0 10px;vertical-align:top}.donate-btn{background:left top no-repeat;height:26px;width:92px;text-indent:-9999px;overflow:hidden;border:0;vertical-align:top;margin-top:5px}.donate-btn:hover{background-position:0 -26px;cursor:pointer}.signup{background:#96c35a;border-top:1px solid #6ab334;border-left:1px solid #6ab334;border-bottom:1px solid #5a952b;border-right:1px solid #5a952b;height:31px;padding:0 5px;vertical-align:top;color:#222c14;font-weight:bold;font-size:1em;line-height:1em}.signup:hover{background:#6ab334}select#lang{float:left;width:160px;margin-right:3px}.go{background:#96c35a;border-top:1px solid #6ab334;border-left:1px solid #6ab334;border-bottom:1px solid #5a952b;border-rig ht:1px solid #5a952b;padding:0 5px;vertical-align:top;color:#222c14;font-weight:bold;font-size:1em;line-height:1em;height:18px}.go:hover{background:#6ab334}#footer{width:1024px;height:200px;border-top:1px solid #ddd;padding:20px 0;margin:20px 0 0}.onion{float:left;width:88px;padding-right:20px;height:100%}#footer .about{width:180px;padding-right:30px;border-right:1px solid #ddd;float:left}#footer .newsletter{padding:0 0 15px 30px;width:auto;margin-left:308px}#footer input.textfield{width:220px;height:26px}#footer input{margin:0}#footer .col{float:left;width:100px;margin-left:20px}#footer .first{margin-left:30px}#footer .wider{width:201px}small{margin:0 auto 0 auto;text-align:center;font-size:10px;font-style:italic}.hlist{text-align:center;display:block;width:100%;padding:0;list-style:none;margin:0 0 18px 0}.hlist li{display:inline-block;border-right:1px solid #444;margin-left:-4px}.hlist li.last{border-right:0 solid #444}.hlist a{display:block;top:0;right:0;bottom:0;left:0;text-deco ration:none;font-weight:bold;padding:0 8px}.dbox{float:none;text-align:center;color:#222;border:0;padding:1.4em .7em;width:163px;margin:0 0 0 10px}.dbox p{display:block;padding:0;margin:0}.dbox h2{padding:13px 0 15px 0;position:relative;color:black;font-family:Helvetica,Arial,sans-serif;font-size:18px;font-weight:normal;height:35px;margin-bottom:-20px;margin-left:-6px;z-index:-10}.dbox input.donate-btn{background:url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;height:68px;width:186px;margin-top:0;display:block;background-color:transparent;color:transparent;margin:10px auto 10px auto;padding:0}.dbox span{float:left;padding-right:0}.dbox div label{padding:0 10px 0 0}.dbox h6#ppinfo{width:100%;text-align:center;margin:-15px auto 0 auto}.dbox small,.dbox.donate #ppinfo{margin:0 auto 0 auto;text-align:center;font-size:10px;font-style:normal}.dbox.dl{float:none;width:177px;margin:0 5px 20px 5px}.dbox.dl input.amount{width:87px}.dbox.donate{float:none;padding:30px 30px;wi dth:626px;min-height:0;max-width:none;text-align:left}.dbox.donate input,.dbox.donate select{padding-bottom:0;margin-bottom:0}.dbox.donate .drow{margin:0 0 0 20px}.dbox.donate .drow div{padding:0;width:auto;display:block}.dbox.donate h3{padding-left:0;color:#23300e;margin:0 0 10px 0}.dbox.donate h4{padding-left:20px}.dbox.donate p{padding:5px 20px 15px 40px}.dbox.donate span{float:left;padding-right:0}.dbox.donate div label{padding:0 10px 0 0}.dbox.donate .type{padding-left:20px}.dbox.donate select#t3{width:auto;margin-bottom:0}.dbox.donate ul.amounts{width:auto}.dbox.donate ul.amounts li{display:inline-block}.dbox.donate ul.amounts li label{padding:0 0 0 5px}.dbox.donate input.donate-btn{background:url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;height:26px;width:115px;margin-top:-3px;display:inline-block;background-color:transparent;color:transparent;border:0 solid transparent}.dbox.dsmall{position:relative;display:inline-block;width:170px;height:140px;text-align :center;margin:0 10px;vertical-align:top}.dbox.dsmall input.donate-btn{background:url() left top no-repeat transparent;width:auto;height:auto;margin-top:0;display:block;background-color:transparent;color:transparent;border:0 solid transparent}.dbox.dsmall div label{padding:0}.dbox.dsmall small{display:block;position:absolute;width:172px;float:none;bottom:20px;margin:0 auto}.givv p{text-align:justify;margin-top:10px;font-size:11px;line-height:13px}dwolla p{text-align:justify;margin-top:10px;font-size:11px;line-height:13px}div.blogRow,div.blogFirstRow{height:40px;padding:3px 10px;margin:0}div.blogLastRow{height:20px;text-align:center}div.blogFirstRow{height:22px;background:url(../images/table-head.jpg) left top repeat-x #885ca4}.blogRow:hover{background:#f6ffd5}div.blogRow1,div.blogRow3{background:#eee8f1}.blogFeed a{text-decoration:none}.blogFeed p{margin:0;font-size:12px}p.blogTitle{font-weight:bold;text-decoration:underline}p.blogAuthor{color:#000;text-align:right;margin-top:-20px} p.blogAuthor em{color:#4e6a20;text-align:right;margin-top:-20px}p.blogDate{color:#000}.blogFeed h2{font-size:1.467em;margin:0;line-height:23px;color:#f6f6ed}#projectpage td{width:50%}.projectbox{width:710px;position:relative;margin-bottom:80px}.projectbox .name{font-size:1.5em;font-weight:bold}.projectbox a img{float:none;position:absolute;top:0;left:0}.projectbox .projecesc{margin-left:100px}.clearfix:after{content:".";display:block;height:0;clear:both;visibility:hidden}.clearfix{display:inline-block}/*\*/* html .clearfix{height:1%}.clearfix{display:block}/**/.joblink{display:block;font-size:128%;font-weight:bold;padding:10px 5px;text-align:right}.joblink a{text-decoration:none}.dropbtn{background-color:white;padding:16px 0 0 0;font-size:100%;border:0;cursor:pointer}.dropdown{position:relative;display:inline-block;padding:0;margin-top:-16px;top:0}.dropdown-content{display:none;position:absolute;background-color:#f9f9f9;box-shadow:0 8px 16px 0 rgba(0,0,0,0.2);z-index:1;margin:48px 0 0 0}.dropdown-content a{color:black;padding-top:12px 16px;text-decoration:none;display:block}.dropdown:hover .dropdown-content{display:block} \ No newline at end of file +@charset "UTF-8";body{background:#fff}#wrap{width:960px;margin:0 auto}.left{float:left}.right{float:right}.twenty{width:20%}.thirty{width:30%}.forty{width:40%}.fifty{width:50%}.sixty{width:60%}.hundred{width:100%}.nopad{padding:0}.toppad{padding-top:10px}.toptwenty{margin-top:20px}.topforty{margin-top:40px}.hidden{display:none}#header{width:960px;height:97px;margin-bottom:23px;position:relative}h1#logo{margin:0;float:left}h1#logo a,h1#logo a:visited{background:url(../images/tor-logo.png) left top no-repeat;background-size:150px 97px;text-indent:-9999px;overflow:hidden;width:150px;height:97px;display:block}#nav{position:absolute;top:30px;left:115px;float:right}#nav ul{height:50px;float:right;margin-bottom:0}#nav ul li{float:left;display:inline;width:auto}#calltoaction{height:30px;float:right;margin-top:100px;margin-right:5px;text-align:center}#calltoaction ul{padding:0;margin:0;height:30px;list-style:none;float:right}#calltoaction ul li{list-style:none;display:inline;float:none;width :100px;margin-left:0}#calltoaction ul li a:link,#calltoaction ul li a:visited{display:block;background:url(../images/cta-buttons.jpg) top center no-repeat #885ca4;padding:4px 8px;color:#fff;font-weight:bold;text-decoration:none;font-size:13px;line-height:22px;height:22px;width:84px;float:left;text-shadow:1px 1px 0 #111}#calltoaction ul li:hover a{background:url(../images/cta-buttons.jpg) bottom center no-repeat #ff9800;font-weight:bold;text-shadow:1px 1px 0 #111}#calltoaction ul li:first-child a:link,#calltoaction ul li:first-child a:visited,#calltoaction ul li:hover:first-child a{-webkit-border-top-left-radius:7px;-webkit-border-bottom-left-radius:7px;-moz-border-radius-topleft:7px;-moz-border-radius-bottomleft:7px;border-top-left-radius:7px;border-bottom-left-radius:7px}#calltoaction ul li:first-child a:link,#calltoaction ul li:first-child a:visited{background:url(../images/cta-buttons.jpg) top left no-repeat #885ca4}#calltoaction ul li:hover:first-child a{background:url(../images /cta-buttons.jpg) bottom left no-repeat #ff9800}#calltoaction ul li:last-child a:link,#calltoaction ul li:last-child a:visited,#calltoaction ul li:hover:last-child a{-webkit-border-top-right-radius:7px;-webkit-border-bottom-right-radius:7px;-moz-border-radius-topright:7px;-moz-border-radius-bottomright:7px;border-top-right-radius:7px;border-bottom-right-radius:7px}#calltoaction ul li:last-child a:link,#calltoaction ul li:last-child a:visited{background:url(../images/cta-buttons.jpg) top right no-repeat #885ca4;color:#fff}#calltoaction ul li:hover:last-child a{background:url(../images/cta-buttons.jpg) bottom right no-repeat #ff9800}#banner{background:url(../images/bg-banner.jpg) left top no-repeat;height:200px;width:600px;padding:23px 15px;margin-bottom:15px}#download a:link,#download a:visited{margin:-17px 0 0;background:url(../images/button-download.png) left top no-repeat;width:257px;height:79px;float:left;padding:35px 0 0 80px;text-decoration:none}#download a .download-tor{backgr ound:url(../images/button-download-arrow.png) right center no-repeat;font-family:"Arial Narrow",Arial,sans-serif;color:#fff;font-size:2.167em;letter-spacing:1px;padding-right:25px}#download a .version{color:#bda5cc;font-size:1.167em;line-height:1.167em}#download a .info{color:#bda5cc;font-size:.833em;line-height:.833em}#download a:hover{background-position:0 -114px}#download a:hover .version,#download a:hover .info{color:#f1c6a1}#banner ul{background:#387520 url(../images/banner-gradient.jpg) left top repeat-x;border:1px solid #366b32;width:180px;float:right;margin:0 15px 0 0;padding:10px 10px 10px 30px}#banner ul li{list-style:url(../images/white-bullet.png) outside;padding:5px 0}#content{width:960px}#content img{max-width:710px}#breadcrumbs{padding:0 0 10px 5px}#home #maincol{float:left;width:620px;margin-right:20px}#maincol{float:right;width:710px;margin-bottom:20px}#dow-don-left,#maincol-left{float:left;width:710px;margin-bottom:20px}#maincol .topforty .icon img{border:0}.subcol {width:280px;float:left;margin:0 0 25px}#content .first{margin-right:20px}#home #sidecol{float:right;width:300px}#sidecol{float:left;width:230px;margin-right:20px}#dow-don-right,#sidecol-right{float:right;width:230px;margin-left:20px;padding-top:100px}#torusers{margin:0 0 27px}.user{margin:0 0 12px;height:auto}.user img,.project-icon{border:1px solid #cac8a7;float:left;margin:3px 10px 0 0}.user p{margin:0}.img-shadow{float:left;background:url(../images/shadowAlpha.png) no-repeat bottom right !important;background:url(../images/shadow.gif) no-repeat bottom right;margin:10px 0 10px 10px !important;margin:10px 0 10px 5px}.img-shadow .infoblock,.img-shadow .important-infoblock,.img-shadow .custom-infoblock,.img-shadow #sidenav,.img-shadow .sidenav-sub{display:block;position:relative;margin:-6px 6px 6px -6px;background-color:#fff;border:1px solid #ddd}.img-shadow .important-infoblock{background-color:#f7f8f0;border:1px solid #eeefe8}.img-shadow .infoblock,.img-shadow .important-infoblock {padding:15px;width:188px}.img-shadow .custom-infoblock{padding:15px;height:120px;width:426px}.img-shadow .infoblock p,.img-shadow .important-infoblock p,.img-shadow .custom-infoblock p{margin:0}.img-shadow #sidenav,.img-shadow .sidenav-sub{padding:10px 0 0;width:218px}#sidenav ul li,.sidenav-sub ul li{border-bottom:1px solid #ddd}#sidenav ul li.dropdown a:link,#sidenav ul li.dropdown a:visited{background:url(../images/sidenav-arrow.gif) left center no-repeat}#sidenav ul li.dropdown a.active{background:url(../images/sidenav-arrow-active.gif) left center no-repeat}.sidenav-sub ul li.dropdown a:link,.sidenav-sub ul li.dropdown a:visited{background:url(../images/sidenav-arrow.gif) left top no-repeat;margin-top:12px}#sidenav ul li a:link,#sidenav ul li a:visited{display:block;height:auto;padding:8px 15px 8px 26px}#sidenav ul li ul li a:link,#sidenav ul li ul li a:visited{padding-left:37px}.sidenav-sub ul li a:link,.sidenav-sub ul li a:visited{display:block;padding:0 15px 10px 26px;line- height:16px}#sidenav ul li.active{background:url(../images/sidenav-active.png) left center no-repeat;width:230px;border:0}#sidenav ul li ul li ul li a:link,#sidenav ul li ul li ul li a:visited{padding-left:48px}#press tr:nth-child(even){background-color:#e5e5e5}table{width:100%}td{padding:12px}table td img,table tr img{border:0;float:left;margin-right:10px}.icon{float:left;width:auto;margin-right:15px;padding:10px 0;border:0}.calendar{background:url(../images/icon-calendar.jpg) left top no-repeat;float:left;margin-right:10px;width:45px;height:54px;text-align:center;padding:4px 0}.fauxhead{background:url(../images/table-arrow.jpg) right top no-repeat;width:100%;height:11px}#home-our-projects td{height:92px;width:296px;padding:6px}#ecosystem_presentation{height:30px;padding-top:10px;padding-left:60px;vertical-align:middle;background:url("../images/video.png") no-repeat scroll left center transparent;font-size:1.7em;font-weight:bold}#ecosystem_presentation a{text-decoration:none}.proje ct{float:left;padding:6px;border:1px solid #cac8a7;height:76px;width:284px;-webkit-border-radius:10px;-moz-border-radius:10px;border-radius:10px}.project img{border:0;margin-right:6px}.beige{background:#f5f5df}.gray{background:#e0e0e0}.meta{float:right;width:auto}.windows24{background:url("../images/icon-windows24.png") no-repeat scroll left center transparent}.mac24{background:url("../images/icon-mac24.png") no-repeat scroll left center transparent}.linux24{background:url("../images/icon-linux24.png") no-repeat scroll left center transparent}.android24{background: url("../images/icon-android24.png") no-repeat scroll left center transparent;background-size:24px;}.smartphone24{background:url("../images/icon-smartphone24.png") no-repeat scroll left center transparent}.sourcecode24{background:url("../images/icon-sourcecode24.png") no-repeat scroll left center transparent}.windows24,.mac24,.linux24,.android24,.smartphone24,.sourcecode24{display:block;line-height:32px;padding:0 0 0 33px} .accordionButton{background:url("../images/table-title.jpg") repeat-x left bottom #885ca4;color:#fff;margin:0;font-size:1.1em;font-weight:bold;height:32px;float:left;_float:none;border:1px solid #fff;border-bottom:0;cursor:pointer;-webkit-border-top-left-radius:7px;-webkit-border-top-right-radius:7px;-moz-border-radius-topleft:7px;-moz-border-radius-topright:7px;border-top-left-radius:7px;border-top-right-radius:7px;position:relative;padding-left:30px;width:680px}.accordionButton:hover{background:url("../images/table-title-hover.jpg") repeat-x left bottom #885ca4;text-shadow:1px 1px 0 rgba(17,17,17,1)}.on:before,.off:before{position:absolute;content:'';height:0;width:0;font-size:0;line-height:0}.on:before{top:14px;left:10px;border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #fff}.off:before{top:9px;left:14px;border-bottom:7px solid transparent;border-top:7px solid transparent;border-left:7px solid #fff}.accordionContent{width:708px;float:left;_ float:none;background:#fff;display:block}.accordionContent .fauxhead{width:710px}.package{float:left;height:280px;margin:0;padding:25px 20px 20px 20px;border-top:1px solid #888}.package h2{margin-bottom:3px}.package p{margin-top:16px;padding-left:10px}.downloads{display:block;float:left;width:238px;padding:0 16px 0 0;text-align:center}.lang{float:right;display:none;width:80px;height:20px;margin:0 7px 0 0;padding:0 0 0 3px;background-color:#fefff7;border:2px solid #cccfb8;border-top:0;-webkit-border-bottom-left-radius:5px;-webkit-border-bottom-right-radius:5px;-moz-border-radius-bottomleft:5px;-moz-border-radius-bottomright:5px;border-bottom-left-radius:5px;border-bottom-right-radius:5px}.button{text-align:center;display:block;width:234px;height:69px;text-decoration:none;background:url(../images/button-downloadpage.png) bottom left no-repeat;margin:0 auto 8px auto;text-shadow:1px 1px 0 rgba(17,17,17,1);-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.button .strong {display:block;padding:10px 0 0 57px}.button .normal{padding:5px 0 0 57px;display:block}.sig{display:block;margin:3px 0 20px 0}.easy{width:712px;margin-bottom:10px;padding-bottom:8px}#download-donate{background-attachment:scroll;background-clip:border-box;background-color:transparent;background-image:url(../images/headerbg.jpg);background-origin:padding-box;background-position:0 0;background-repeat:no-repeat;background-size:100% 100%}.easy .package h2,.easy .package em{display:block;width:100%;text-align:left}.easy .package h2{padding-top:10px;padding-bottom:5px}.easy .package em{font-size:1.2em;padding-top:8px;padding-bottom:4px}.easy .package p{padding-left:0;font-size:15px;text-align:justify}.easy .package p.alt-dl{text-align:left;text-indent:0;padding-left:0;margin-top:32px}.all-dl{display:block;text-align:left;width:100%;font-size:15px}.all-dl a{text-decoration:none;font-weight:bold}.all-dl a:hover{text-decoration:underline}.easy .package{float:none;padding:0 8px 0 12px}.open{d isplay:block}.lang-alt{line-height:15px;font-size:10px;float:right;margin-right:10px}.expander{text-align:right;float:right;padding:10px 20px 0 0;font-size:15px;display:none}.title{background:url(../images/table-title-arrow.jpg) right top no-repeat;padding:10px 25px 0 10px;height:33px;float:left}.title a:link,.title a:visited{background:url(../images/table-title.jpg) left top no-repeat;height:33px;display:block}.paypal{float:left;width:auto;min-height:159px;max-width:365px}.paypal span{padding-right:20px}.warning-top{width:618px;padding:10px 10px 10px 60px;margin:0 10px 0 10px;display:block;background:url("../images/warning.png") no-repeat scroll 2px 23px #fffeb6;border:1px solid #a6a427;border-bottom:0;-webkit-border-top-left-radius:5px;-webkit-border-top-right-radius:5px;-moz-border-radius-topleft:5px;-moz-border-radius-topright:5px;border-top-left-radius:5px;border-top-right-radius:5px}.warning-top h2{padding-right:15px;padding-left:0;margin-bottom:5px}.warning-top p{padding-left :10px;margin-bottom:0}.warning{float:left;_float:none;padding:25px 25px;margin-top:4px}.warning p{padding-left:10px}.focus{background:#f4f2c7;border:1px solid #ebd4a9;padding:10px 15px}.focus .icon{float:left;width:auto;margin-right:10px}.featured-project{width:313px}input,select{margin:0 3px 10px 0}input.textfield{padding:0 10px;vertical-align:top}.donate-btn{background:left top no-repeat;height:26px;width:92px;text-indent:-9999px;overflow:hidden;border:0;vertical-align:top;margin-top:5px}.donate-btn:hover{background-position:0 -26px;cursor:pointer}.signup{background:#96c35a;border-top:1px solid #6ab334;border-left:1px solid #6ab334;border-bottom:1px solid #5a952b;border-right:1px solid #5a952b;height:31px;padding:0 5px;vertical-align:top;color:#222c14;font-weight:bold;font-size:1em;line-height:1em}.signup:hover{background:#6ab334}select#lang{float:left;width:160px;margin-right:3px}.go{background:#96c35a;border-top:1px solid #6ab334;border-left:1px solid #6ab334;border-bottom:1px s olid #5a952b;border-right:1px solid #5a952b;padding:0 5px;vertical-align:top;color:#222c14;font-weight:bold;font-size:1em;line-height:1em;height:18px}.go:hover{background:#6ab334}#footer{width:1024px;height:200px;border-top:1px solid #ddd;padding:20px 0;margin:20px 0 0}.onion{float:left;width:88px;padding-right:20px;height:100%}#footer .about{width:180px;padding-right:30px;border-right:1px solid #ddd;float:left}#footer .newsletter{padding:0 0 15px 30px;width:auto;margin-left:308px}#footer input.textfield{width:220px;height:26px}#footer input{margin:0}#footer .col{float:left;width:100px;margin-left:20px}#footer .first{margin-left:30px}#footer .wider{width:201px}small{margin:0 auto 0 auto;text-align:center;font-size:10px;font-style:italic}.hlist{text-align:center;display:block;width:100%;padding:0;list-style:none;margin:0 0 18px 0}.hlist li{display:inline-block;border-right:1px solid #444;margin-left:-4px}.hlist li.last{border-right:0 solid #444}.hlist a{display:block;top:0;right:0;bo ttom:0;left:0;text-decoration:none;font-weight:bold;padding:0 8px}.dbox{float:none;text-align:center;color:#222;border:0;padding:1.4em .7em;width:163px;margin:0 0 0 10px}.dbox p{display:block;padding:0;margin:0}.dbox h2{padding:13px 0 15px 0;position:relative;color:black;font-family:Helvetica,Arial,sans-serif;font-size:18px;font-weight:normal;height:35px;margin-bottom:-20px;margin-left:-6px;z-index:-10}.dbox input.donate-btn{background:url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;height:68px;width:186px;margin-top:0;display:block;background-color:transparent;color:transparent;margin:10px auto 10px auto;padding:0}.dbox span{float:left;padding-right:0}.dbox div label{padding:0 10px 0 0}.dbox h6#ppinfo{width:100%;text-align:center;margin:-15px auto 0 auto}.dbox small,.dbox.donate #ppinfo{margin:0 auto 0 auto;text-align:center;font-size:10px;font-style:normal}.dbox.dl{float:none;width:177px;margin:0 5px 20px 5px}.dbox.dl input.amount{width:87px}.dbox.donate{float:no ne;padding:30px 30px;width:626px;min-height:0;max-width:none;text-align:left}.dbox.donate input,.dbox.donate select{padding-bottom:0;margin-bottom:0}.dbox.donate .drow{margin:0 0 0 20px}.dbox.donate .drow div{padding:0;width:auto;display:block}.dbox.donate h3{padding-left:0;color:#23300e;margin:0 0 10px 0}.dbox.donate h4{padding-left:20px}.dbox.donate p{padding:5px 20px 15px 40px}.dbox.donate span{float:left;padding-right:0}.dbox.donate div label{padding:0 10px 0 0}.dbox.donate .type{padding-left:20px}.dbox.donate select#t3{width:auto;margin-bottom:0}.dbox.donate ul.amounts{width:auto}.dbox.donate ul.amounts li{display:inline-block}.dbox.donate ul.amounts li label{padding:0 0 0 5px}.dbox.donate input.donate-btn{background:url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;height:26px;width:115px;margin-top:-3px;display:inline-block;background-color:transparent;color:transparent;border:0 solid transparent}.dbox.dsmall{position:relative;display:inline-block;width:170px; height:140px;text-align:center;margin:0 10px;vertical-align:top}.dbox.dsmall input.donate-btn{background:url() left top no-repeat transparent;width:auto;height:auto;margin-top:0;display:block;background-color:transparent;color:transparent;border:0 solid transparent}.dbox.dsmall div label{padding:0}.dbox.dsmall small{display:block;position:absolute;width:172px;float:none;bottom:20px;margin:0 auto}.givv p{text-align:justify;margin-top:10px;font-size:11px;line-height:13px}dwolla p{text-align:justify;margin-top:10px;font-size:11px;line-height:13px}div.blogRow,div.blogFirstRow{height:40px;padding:3px 10px;margin:0}div.blogLastRow{height:20px;text-align:center}div.blogFirstRow{height:22px;background:url(../images/table-head.jpg) left top repeat-x #885ca4}.blogRow:hover{background:#f6ffd5}div.blogRow1,div.blogRow3{background:#eee8f1}.blogFeed a{text-decoration:none}.blogFeed p{margin:0;font-size:12px}p.blogTitle{font-weight:bold;text-decoration:underline}p.blogAuthor{color:#000;text-align: right;margin-top:-20px}p.blogAuthor em{color:#4e6a20;text-align:right;margin-top:-20px}p.blogDate{color:#000}.blogFeed h2{font-size:1.467em;margin:0;line-height:23px;color:#f6f6ed}#projectpage td{width:50%}.projectbox{width:710px;position:relative;margin-bottom:80px}.projectbox .name{font-size:1.5em;font-weight:bold}.projectbox a img{float:none;position:absolute;top:0;left:0}.projectbox .projecesc{margin-left:100px}.clearfix:after{content:".";display:block;height:0;clear:both;visibility:hidden}.clearfix{display:inline-block}/*\*/* html .clearfix{height:1%}.clearfix{display:block}/**/.joblink{display:block;font-size:128%;font-weight:bold;padding:10px 5px;text-align:right}.joblink a{text-decoration:none}.dropbtn{background-color:white;padding:16px 0 0 0;font-size:100%;border:0;cursor:pointer}.dropdown{position:relative;display:inline-block;padding:0;margin-top:-16px;top:0}.dropdown-content{display:none;position:absolute;background-color:#f9f9f9;box-shadow:0 8px 16px 0 rgba(0,0,0,0.2); z-index:1;margin:48px 0 0 0}.dropdown-content a{color:black;padding-top:12px 16px;text-decoration:none;display:block}.dropdown:hover .dropdown-content{display:block} diff --git a/images/icon-android24.png b/images/icon-android24.png new file mode 100644 index 00000000..2ff47a3b Binary files /dev/null and b/images/icon-android24.png differ

1 0

[torbirdy/master] Remove redundant code for displaying first-run dialog
by sukhbir＠torproject.org 31 Aug '18

31 Aug '18

commit 9d81a38f8340a655141a4b14b62078d2c562648e Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Aug 30 16:39:23 2018 -0400 Remove redundant code for displaying first-run dialog In 25113d0, we added support for displaying information about TorBirdy after it was installed and running for the first time. It was suggested that this may confuse the users so it was disabled in dfb1dc8. This commit removes the obsolete code instead of just disabling the preference. --- chrome/content/firstruninfo.js | 19 ------------------- chrome/content/firstruninfo.xul | 25 ------------------------- chrome/content/overlay.js | 8 -------- chrome/locale/en/torbirdy.dtd | 2 -- chrome/locale/en/torbirdy.properties | 3 --- defaults/preferences/prefs.js | 1 - 6 files changed, 58 deletions(-) diff --git a/chrome/content/firstruninfo.js b/chrome/content/firstruninfo.js deleted file mode 100644 index cecae4a..0000000 --- a/chrome/content/firstruninfo.js +++ /dev/null @@ -1,19 +0,0 @@ -if (!org) var org = {}; -if (!org.torbirdy) org.torbirdy = {}; - -if (!org.torbirdy.firstrun) org.torbirdy.firstrun = new function() { - var pub = {}; - - pub.onLoad = function() { - var strings = document.getElementById("torbirdy-strings-firstrun"); - - var description = document.getElementById("torbirdy-firstrun-info"); - description.textContent = strings.getString("torbirdy.firstrun"); - - var torbirdyWebsite = strings.getString("torbirdy.website"); - var website = document.getElementById("torbirdy-website"); - website.value = torbirdyWebsite; - }; - - return pub; -}; diff --git a/chrome/content/firstruninfo.xul b/chrome/content/firstruninfo.xul deleted file mode 100644 index 17fd73a..0000000 --- a/chrome/content/firstruninfo.xul +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0"?> -<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> - -<!DOCTYPE overlay SYSTEM "chrome://castironthunderbirdclub/locale/torbirdy.dtd"> - -<dialog id="castironthunderbird-firstrun-info" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - title="&torbirdy.firstrun.title;" - buttons="accept" - onload="return org.torbirdy.firstrun.onLoad();" - ondialogaccept="window.close();"> - - <script type="application/javascript" - src="chrome://castironthunderbirdclub/content/firstruninfo.js"></script> - - <stringbundleset id="stringbundleset"> - <stringbundle id="torbirdy-strings-firstrun" src="chrome://castironthunderbirdclub/locale/torbirdy.properties"/> - </stringbundleset> - - <vbox flex="1" pack="start"> - <description id="torbirdy-firstrun-info" style="white-space: pre-wrap; width: 400px"></description> - <textbox id="torbirdy-website" readonly="true" /> - </vbox> - -</dialog> diff --git a/chrome/content/overlay.js b/chrome/content/overlay.js index f0c0304..e590827 100644 --- a/chrome/content/overlay.js +++ b/chrome/content/overlay.js @@ -15,14 +15,6 @@ window.TorBirdy = { onLoad: function() { - var infoRun = "extensions.torbirdy.info_run"; - if (prefs.getBoolPref(infoRun)) { - window.open("chrome://castironthunderbirdclub/content/firstruninfo.xul", - "FirstRunWindow", - "chrome, dialog, centerscreen, resizable=no"); - prefs.setBoolPref(infoRun, false); - } - // Check if we are running Whonix. var whonix = false; if (env.exists("WHONIX")) { diff --git a/chrome/locale/en/torbirdy.dtd b/chrome/locale/en/torbirdy.dtd index c88803a..330b377 100644 --- a/chrome/locale/en/torbirdy.dtd +++ b/chrome/locale/en/torbirdy.dtd @@ -56,5 +56,3 @@ <!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)"> <!ENTITY torbirdy.panel.usewhonix.label "Use Whonix"> <!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences"> - -<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run"> diff --git a/chrome/locale/en/torbirdy.properties b/chrome/locale/en/torbirdy.properties index 4f645eb..0bc5db6 100644 --- a/chrome/locale/en/torbirdy.properties +++ b/chrome/locale/en/torbirdy.properties @@ -13,6 +13,3 @@ torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wiz torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. torbirdy.email.advanced.nextwarning=Show this warning next time torbirdy.email.advanced.title=TorBirdy Advanced Settings - -torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. -torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js index ea316d3..f4d92c9 100644 --- a/defaults/preferences/prefs.js +++ b/defaults/preferences/prefs.js @@ -8,7 +8,6 @@ pref("extensions.torbirdy.enigmail.confirmemail", false); pref("extensions.torbirdy.gpg_already_torified", false); pref("extensions.torbirdy.timezone", true); pref("extensions.torbirdy.whonix_run", true); -pref("extensions.torbirdy.info_run", false); pref("extensions.torbirdy.emailwizard", false); pref("extensions.torbirdy.fetchall", false); pref("extensions.torbirdy.defaultprotocol", 0); // 0 - POP3, 1 - IMAP

1 0

[torbirdy/master] Restrict status bar update to TorBirdy
by sukhbir＠torproject.org 31 Aug '18

31 Aug '18

commit cdfba9e3bd586bf2e761ddf171f6ed2769a7ce85 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Aug 30 22:22:03 2018 -0400 Restrict status bar update to TorBirdy A user reported that the TorBirdy status bar is updated if they toggle the state of themes (enable/disable). This commit fixes that issue by restricting the status bar update to TorBirdy. --- components/torbirdy.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/torbirdy.js b/components/torbirdy.js index 6c2be57..077b218 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -480,16 +480,16 @@ TorBirdy.prototype = { }, onUninstalling: function(addon, needsRestart) { - this.onStateChange(); if (addon.id == TB_ID) { + this.onStateChange(); this._uninstall = true; this.resetUserPrefs(); } }, onOperationCancelled: function(addon) { - this.onStateChange(); if (addon.id == TB_ID) { + this.onStateChange(); this._uninstall = false; this.setPrefs(); }

1 0

[webwml/master] download: add TBA (#27305)
by hiro＠torproject.org 31 Aug '18

31 Aug '18

commit 8cea7405ef0fe807c211af58df3be84dea02d8ad Author: traumschule <traumschuleriebau(a)riseup.net> Date: Tue Aug 28 07:39:21 2018 +0200 download: add TBA (#27305) --- css/layout.css | 9 +++++++ css/layout.min.css | 2 +- download/en/download-easy.wml | 44 +++++++++++++++++++++----------- download/en/download.wml | 58 +++++++++++++++++++++++++++++++++---------- include/versions.wmi | 3 ++- 5 files changed, 87 insertions(+), 29 deletions(-) diff --git a/css/layout.css b/css/layout.css index 0c4fea05..0f70e60f 100644 --- a/css/layout.css +++ b/css/layout.css @@ -498,6 +498,14 @@ table tr img { background: url("../images/icon-linux24.png") no-repeat scroll left center transparent; } +.android24 { +/* Icon from the Crystal set + * author: Everaldo Coelho + * source: http://www.everaldo.com/crystal/ + * license: LGPL v2 */ + background: url("../images/icon-android24.png") no-repeat scroll left center transparent; + } + .smartphone24 { /* Icon from the Crystal set * author: Everaldo Coelho @@ -517,6 +525,7 @@ table tr img { .windows24, .mac24, .linux24, +.android24, .smartphone24, .sourcecode24 { display: block; diff --git a/css/layout.min.css b/css/layout.min.css index 71463b5a..3018e59d 100644 --- a/css/layout.min.css +++ b/css/layout.min.css @@ -1 +1 @@ -@charset "UTF-8";body{background:#fff}#wrap{width:960px;margin:0 auto}.left{float:left}.right{float:right}.twenty{width:20%}.thirty{width:30%}.forty{width:40%}.fifty{width:50%}.sixty{width:60%}.hundred{width:100%}.nopad{padding:0}.toppad{padding-top:10px}.toptwenty{margin-top:20px}.topforty{margin-top:40px}.hidden{display:none}#header{width:960px;height:97px;margin-bottom:23px;position:relative}h1#logo{margin:0;float:left}h1#logo a,h1#logo a:visited{background:url(../images/tor-logo.png) left top no-repeat; background-size: 150px 97px; text-indent:-9999px;overflow:hidden;width:150px;height:97px;display:block}#nav{position:absolute;top:30px;left:115px;float:right}#nav ul{height:50px;float:right;margin-bottom:0}#nav ul li{float:left;display:inline;width:auto}#calltoaction{height:30px;float:right;margin-top:100px;margin-right:5px;text-align:center}#calltoaction ul{padding:0;margin:0;height:30px;list-style:none;float:right}#calltoaction ul li{list-style:none;display:inline;float:none;wi dth:100px;margin-left:0}#calltoaction ul li a:link,#calltoaction ul li a:visited{display:block;background:url(../images/cta-buttons.jpg) top center no-repeat #885ca4;padding:4px 8px;color:#fff;font-weight:bold;text-decoration:none;font-size:13px;line-height:22px;height:22px;width:84px;float:left;text-shadow:1px 1px 0 #111}#calltoaction ul li:hover a{background:url(../images/cta-buttons.jpg) bottom center no-repeat #ff9800;font-weight:bold;text-shadow:1px 1px 0 #111}#calltoaction ul li:first-child a:link,#calltoaction ul li:first-child a:visited,#calltoaction ul li:hover:first-child a{-webkit-border-top-left-radius:7px;-webkit-border-bottom-left-radius:7px;-moz-border-radius-topleft:7px;-moz-border-radius-bottomleft:7px;border-top-left-radius:7px;border-bottom-left-radius:7px}#calltoaction ul li:first-child a:link,#calltoaction ul li:first-child a:visited{background:url(../images/cta-buttons.jpg) top left no-repeat #885ca4}#calltoaction ul li:hover:first-child a{background:url(../ima ges/cta-buttons.jpg) bottom left no-repeat #ff9800}#calltoaction ul li:last-child a:link,#calltoaction ul li:last-child a:visited,#calltoaction ul li:hover:last-child a{-webkit-border-top-right-radius:7px;-webkit-border-bottom-right-radius:7px;-moz-border-radius-topright:7px;-moz-border-radius-bottomright:7px;border-top-right-radius:7px;border-bottom-right-radius:7px}#calltoaction ul li:last-child a:link,#calltoaction ul li:last-child a:visited{background:url(../images/cta-buttons.jpg) top right no-repeat #885ca4;color:#fff}#calltoaction ul li:hover:last-child a{background:url(../images/cta-buttons.jpg) bottom right no-repeat #ff9800}#banner{background:url(../images/bg-banner.jpg) left top no-repeat;height:200px;width:600px;padding:23px 15px;margin-bottom:15px}#download a:link,#download a:visited{margin:-17px 0 0;background:url(../images/button-download.png) left top no-repeat;width:257px;height:79px;float:left;padding:35px 0 0 80px;text-decoration:none}#download a .download-tor{bac kground:url(../images/button-download-arrow.png) right center no-repeat;font-family:"Arial Narrow",Arial,sans-serif;color:#fff;font-size:2.167em;letter-spacing:1px;padding-right:25px}#download a .version{color:#bda5cc;font-size:1.167em;line-height:1.167em}#download a .info{color:#bda5cc;font-size:.833em;line-height:.833em}#download a:hover{background-position:0 -114px}#download a:hover .version,#download a:hover .info{color:#f1c6a1}#banner ul{background:#387520 url(../images/banner-gradient.jpg) left top repeat-x;border:1px solid #366b32;width:180px;float:right;margin:0 15px 0 0;padding:10px 10px 10px 30px}#banner ul li{list-style:url(../images/white-bullet.png) outside;padding:5px 0}#content{width:960px}#content img{max-width:710px}#breadcrumbs{padding:0 0 10px 5px}#home #maincol{float:left;width:620px;margin-right:20px}#maincol{float:right;width:710px;margin-bottom:20px}#dow-don-left,#maincol-left{float:left;width:710px;margin-bottom:20px}#maincol .topforty .icon img{border:0}.sub col{width:280px;float:left;margin:0 0 25px}#content .first{margin-right:20px}#home #sidecol{float:right;width:300px}#sidecol{float:left;width:230px;margin-right:20px}#dow-don-right,#sidecol-right{float:right;width:230px;margin-left:20px;padding-top:100px}#torusers{margin:0 0 27px}.user{margin:0 0 12px;height:auto}.user img,.project-icon{border:1px solid #cac8a7;float:left;margin:3px 10px 0 0}.user p{margin:0}.img-shadow{float:left;background:url(../images/shadowAlpha.png) no-repeat bottom right!important;background:url(../images/shadow.gif) no-repeat bottom right;margin:10px 0 10px 10px!important;margin:10px 0 10px 5px}.img-shadow .infoblock,.img-shadow .important-infoblock,.img-shadow .custom-infoblock,.img-shadow #sidenav,.img-shadow .sidenav-sub{display:block;position:relative;margin:-6px 6px 6px -6px;background-color:#fff;border:1px solid #ddd}.img-shadow .important-infoblock{background-color:#f7f8f0;border:1px solid #eeefe8}.img-shadow .infoblock,.img-shadow .important-infobloc k{padding:15px;width:188px}.img-shadow .custom-infoblock{padding:15px;height:120px;width:426px}.img-shadow .infoblock p,.img-shadow .important-infoblock p,.img-shadow .custom-infoblock p{margin:0}.img-shadow #sidenav,.img-shadow .sidenav-sub{padding:10px 0 0;width:218px}#sidenav ul li,.sidenav-sub ul li{border-bottom:1px solid #ddd}#sidenav ul li.dropdown a:link,#sidenav ul li.dropdown a:visited{background:url(../images/sidenav-arrow.gif) left center no-repeat}#sidenav ul li.dropdown a.active{background:url(../images/sidenav-arrow-active.gif) left center no-repeat}.sidenav-sub ul li.dropdown a:link,.sidenav-sub ul li.dropdown a:visited{background:url(../images/sidenav-arrow.gif) left top no-repeat;margin-top:12px}#sidenav ul li a:link,#sidenav ul li a:visited{display:block;height:auto;padding:8px 15px 8px 26px}#sidenav ul li ul li a:link,#sidenav ul li ul li a:visited{padding-left:37px}.sidenav-sub ul li a:link,.sidenav-sub ul li a:visited{display:block;padding:0 15px 10px 26px;line -height:16px}#sidenav ul li.active{background:url(../images/sidenav-active.png) left center no-repeat;width:230px;border:0}#sidenav ul li ul li ul li a:link,#sidenav ul li ul li ul li a:visited{padding-left:48px}#press tr:nth-child(even){background-color: #e5e5e5;}table{width:100%}td{padding:12px}table td img,table tr img{border:0;float:left;margin-right:10px}.icon{float:left;width:auto;margin-right:15px;padding:10px 0;border:0}.calendar{background:url(../images/icon-calendar.jpg) left top no-repeat;float:left;margin-right:10px;width:45px;height:54px;text-align:center;padding:4px 0}.fauxhead{background:url(../images/table-arrow.jpg) right top no-repeat;width:100%;height:11px}#home-our-projects td{height:92px;width:296px;padding:6px}#ecosystem_presentation{height:30px;padding-top:10px;padding-left:60px;vertical-align:middle;background:url("../images/video.png") no-repeat scroll left center transparent;font-size:1.7em;font-weight:bold}#ecosystem_presentation a{text-decoration:none}.pr oject{float:left;padding:6px;border:1px solid #cac8a7;height:76px;width:284px;-webkit-border-radius:10px;-moz-border-radius:10px;border-radius:10px}.project img{border:0;margin-right:6px}.beige{background:#f5f5df}.gray{background:#e0e0e0}.meta{float:right;width:auto}.windows24{background:url("../images/icon-windows24.png") no-repeat scroll left center transparent}.mac24{background:url("../images/icon-mac24.png") no-repeat scroll left center transparent}.linux24{background:url("../images/icon-linux24.png") no-repeat scroll left center transparent}.smartphone24{background:url("../images/icon-smartphone24.png") no-repeat scroll left center transparent}.sourcecode24{background:url("../images/icon-sourcecode24.png") no-repeat scroll left center transparent}.windows24,.mac24,.linux24,.smartphone24,.sourcecode24{display:block;line-height:32px;padding:0 0 0 33px}.accordionButton{background:url("../images/table-title.jpg") repeat-x left bottom #885ca4;color:#fff;margin:0;font-size:1.1em;font -weight:bold;height:32px;float:left;_float:none;border:1px solid #fff;border-bottom:0;cursor:pointer;-webkit-border-top-left-radius:7px;-webkit-border-top-right-radius:7px;-moz-border-radius-topleft:7px;-moz-border-radius-topright:7px;border-top-left-radius:7px;border-top-right-radius:7px;position:relative;padding-left:30px;width:680px}.accordionButton:hover{background:url("../images/table-title-hover.jpg") repeat-x left bottom #885ca4;text-shadow:1px 1px 0 rgba(17,17,17,1)}.on:before,.off:before{position:absolute;content:'';height:0;width:0;font-size:0;line-height:0}.on:before{top:14px;left:10px;border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #fff}.off:before{top:9px;left:14px;border-bottom:7px solid transparent;border-top:7px solid transparent;border-left:7px solid #fff}.accordionContent{width:708px;float:left;_float:none;background:#fff;display:block}.accordionContent .fauxhead{width:710px}.package{float:left;height:280px;margin:0;padding :25px 20px 20px 20px;border-top:1px solid #888}.package h2{margin-bottom:3px}.package p{margin-top:16px;padding-left:10px}.downloads{display:block;float:left;width:238px;padding:0 16px 0 0;text-align:center}.lang{float:right;display:none;width:80px;height:20px;margin:0 7px 0 0;padding:0 0 0 3px;background-color:#fefff7;border:2px solid #cccfb8;border-top:0;-webkit-border-bottom-left-radius:5px;-webkit-border-bottom-right-radius:5px;-moz-border-radius-bottomleft:5px;-moz-border-radius-bottomright:5px;border-bottom-left-radius:5px;border-bottom-right-radius:5px}.button{text-align:center;display:block;width:234px;height:69px;text-decoration:none;background:url(../images/button-downloadpage.png) bottom left no-repeat;margin:0 auto 8px auto;text-shadow:1px 1px 0 rgba(17,17,17,1);-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.button .strong{display:block;padding:10px 0 0 57px}.button .normal{padding:5px 0 0 57px;display:block}.sig{display:block;margin:3px 0 20px 0}.ea sy{width:712px;margin-bottom:10px;padding-bottom:8px}#download-donate{background-attachment:scroll;background-clip:border-box;background-color:transparent;background-image:url(../images/headerbg.jpg);background-origin:padding-box;background-position:0 0;background-repeat:no-repeat;background-size:100% 100%}.easy .package h2,.easy .package em{display:block;width:100%;text-align:left}.easy .package h2{padding-top:10px;padding-bottom:5px}.easy .package em{font-size:1.2em;padding-top:8px;padding-bottom:4px}.easy .package p{padding-left:0;font-size:15px;text-align:justify}.easy .package p.alt-dl{text-align:left;text-indent:0;padding-left:0;margin-top:32px}.all-dl{display:block;text-align:left;width:100%;font-size:15px}.all-dl a{text-decoration:none;font-weight:bold}.all-dl a:hover{text-decoration:underline}.easy .package{float:none;padding:0 8px 0 12px}.open{display:block}.lang-alt{line-height:15px;font-size:10px;float:right;margin-right:10px}.expander{text-align:right;float:right;paddin g:10px 20px 0 0;font-size:15px;display:none}.title{background:url(../images/table-title-arrow.jpg) right top no-repeat;padding:10px 25px 0 10px;height:33px;float:left}.title a:link,.title a:visited{background:url(../images/table-title.jpg) left top no-repeat;height:33px;display:block}.paypal{float:left;width:auto;min-height:159px;max-width:365px}.paypal span{padding-right:20px}.warning-top{width:618px;padding:10px 10px 10px 60px;margin:0 10px 0 10px;display:block;background:url("../images/warning.png") no-repeat scroll 2px 23px #fffeb6;border:1px solid #a6a427;border-bottom:0;-webkit-border-top-left-radius:5px;-webkit-border-top-right-radius:5px;-moz-border-radius-topleft:5px;-moz-border-radius-topright:5px;border-top-left-radius:5px;border-top-right-radius:5px}.warning-top h2{padding-right:15px;padding-left:0;margin-bottom:5px}.warning-top p{padding-left:10px;margin-bottom:0}.warning{float:left;_float:none;padding:25px 25px;margin-top:4px}.warning p{padding-left:10px}.focus{backgro und:#f4f2c7;border:1px solid #ebd4a9;padding:10px 15px}.focus .icon{float:left;width:auto;margin-right:10px}.featured-project{width:313px}input,select{margin:0 3px 10px 0}input.textfield{padding:0 10px;vertical-align:top}.donate-btn{background:left top no-repeat;height:26px;width:92px;text-indent:-9999px;overflow:hidden;border:0;vertical-align:top;margin-top:5px}.donate-btn:hover{background-position:0 -26px;cursor:pointer}.signup{background:#96c35a;border-top:1px solid #6ab334;border-left:1px solid #6ab334;border-bottom:1px solid #5a952b;border-right:1px solid #5a952b;height:31px;padding:0 5px;vertical-align:top;color:#222c14;font-weight:bold;font-size:1em;line-height:1em}.signup:hover{background:#6ab334}select#lang{float:left;width:160px;margin-right:3px}.go{background:#96c35a;border-top:1px solid #6ab334;border-left:1px solid #6ab334;border-bottom:1px solid #5a952b;border-right:1px solid #5a952b;padding:0 5px;vertical-align:top;color:#222c14;font-weight:bold;font-size:1em;line-hei ght:1em;height:18px}.go:hover{background:#6ab334}#footer{width:1024px;height:200px;border-top:1px solid #ddd;padding:20px 0;margin:20px 0 0}.onion{float:left;width:88px;padding-right:20px;height:100%}#footer .about{width:180px;padding-right:30px;border-right:1px solid #ddd;float:left}#footer .newsletter{padding:0 0 15px 30px;width:auto;margin-left:308px}#footer input.textfield{width:220px;height:26px}#footer input{margin:0}#footer .col{float:left;width:100px;margin-left:20px}#footer .first{margin-left:30px}#footer .wider{width:201px}small{margin:0 auto 0 auto;text-align:center;font-size:10px;font-style:italic}.hlist{text-align:center;display:block;width:100%;padding:0;list-style:none;margin:0 0 18px 0}.hlist li{display:inline-block;border-right:1px solid #444;margin-left:-4px}.hlist li.last{border-right:0 solid #444}.hlist a{display:block;top:0;right:0;bottom:0;left:0;text-decoration:none;font-weight:bold;padding:0 8px}.dbox{float:none;text-align:center;color:#222;border:0;padding:1 .4em .7em;width:163px;margin:0 0 0 10px}.dbox p{display:block;padding:0;margin:0}.dbox h2{padding:13px 0 15px 0;position:relative;color:black;font-family:Helvetica,Arial,sans-serif;font-size:18px;font-weight:normal;height:35px;margin-bottom:-20px;margin-left:-6px;z-index:-10}.dbox input.donate-btn{background:url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;height:68px;width:186px;margin-top:0;display:block;background-color:transparent;color:transparent;margin:10px auto 10px auto;padding:0}.dbox span{float:left;padding-right:0}.dbox div label{padding:0 10px 0 0}.dbox h6#ppinfo{width:100%;text-align:center;margin:-15px auto 0 auto}.dbox small,.dbox.donate #ppinfo{margin:0 auto 0 auto;text-align:center;font-size:10px;font-style:normal}.dbox.dl{float:none;width:177px;margin:0 5px 20px 5px}.dbox.dl input.amount{width:87px}.dbox.donate{float:none;padding:30px 30px;width:626px;min-height:0;max-width:none;text-align:left}.dbox.donate input,.dbox.donate select{padding-bottom :0;margin-bottom:0}.dbox.donate .drow{margin:0 0 0 20px}.dbox.donate .drow div{padding:0;width:auto;display:block}.dbox.donate h3{padding-left:0;color:#23300e;margin:0 0 10px 0}.dbox.donate h4{padding-left:20px}.dbox.donate p{padding:5px 20px 15px 40px}.dbox.donate span{float:left;padding-right:0}.dbox.donate div label{padding:0 10px 0 0}.dbox.donate .type{padding-left:20px}.dbox.donate select#t3{width:auto;margin-bottom:0}.dbox.donate ul.amounts{width:auto}.dbox.donate ul.amounts li{display:inline-block}.dbox.donate ul.amounts li label{padding:0 0 0 5px}.dbox.donate input.donate-btn{background:url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;height:26px;width:115px;margin-top:-3px;display:inline-block;background-color:transparent;color:transparent;border:0 solid transparent}.dbox.dsmall{position:relative;display:inline-block;width:170px;height:140px;text-align:center;margin:0 10px;vertical-align:top}.dbox.dsmall input.donate-btn{background:url() left top no-repeat transparent;width:auto;height:auto;margin-top:0;display:block;background-color:transparent;color:transparent;border:0 solid transparent}.dbox.dsmall div label{padding:0}.dbox.dsmall small{display:block;position:absolute;width:172px;float:none;bottom:20px;margin:0 auto}.givv p{text-align:justify;margin-top:10px;font-size:11px;line-height:13px}dwolla p{text-align:justify;margin-top:10px;font-size:11px;line-height:13px}div.blogRow,div.blogFirstRow{height:40px;padding:3px 10px;margin:0}div.blogLastRow{height:20px;text-align:center}div.blogFirstRow{height:22px;background:url(../images/table-head.jpg) left top repeat-x #885ca4}.blogRow:hover{background:#f6ffd5}div.blogRow1,div.blogRow3{background:#eee8f1}.blogFeed a{text-decoration:none}.blogFeed p{margin:0;font-size:12px}p.blogTitle{font-weight:bold;text-decoration:underline}p.blogAuthor{color:#000;text-align:right;margin-top:-20px}p.blogAuthor em{color:#4e6a20;text-align:right;margin-top:-20px}p.blogDate{color:#000}.blogFeed h2{font-siz e:1.467em;margin:0;line-height:23px;color:#f6f6ed}#projectpage td{width:50%}.projectbox{width:710px;position:relative;margin-bottom:80px}.projectbox .name{font-size:1.5em;font-weight:bold}.projectbox a img{float:none;position:absolute;top:0;left:0}.projectbox .projectdesc{margin-left:100px}.clearfix:after{content:".";display:block;height:0;clear:both;visibility:hidden}.clearfix{display:inline-block}/*\*/* html .clearfix{height:1%}.clearfix{display:block}/**/.joblink{display:block;font-size:128%;font-weight:bold;padding:10px 5px;text-align:right}.joblink a{text-decoration:none}.dropbtn{background-color:white;padding:16px 0 0 0;font-size:100%;border:0;cursor:pointer}.dropdown{position:relative;display:inline-block;padding:0;margin-top:-16px;top:0}.dropdown-content{display:none;position:absolute;background-color:#f9f9f9;box-shadow:0 8px 16px 0 rgba(0,0,0,0.2);z-index:1;margin:48px 0 0 0}.dropdown-content a{color:black;padding-top:12px 16px;text-decoration:none;display:block}.dropdown:h over .dropdown-content{display:block} +@charset "UTF-8";body{background:#fff}#wrap{width:960px;margin:0 auto}.left{float:left}.right{float:right}.twenty{width:20%}.thirty{width:30%}.forty{width:40%}.fifty{width:50%}.sixty{width:60%}.hundred{width:100%}.nopad{padding:0}.toppad{padding-top:10px}.toptwenty{margin-top:20px}.topforty{margin-top:40px}.hidden{display:none}#header{width:960px;height:97px;margin-bottom:23px;position:relative}h1#logo{margin:0;float:left}h1#logo a,h1#logo a:visited{background:url(../images/tor-logo.png) left top no-repeat;background-size:150px 97px;text-indent:-9999px;overflow:hidden;width:150px;height:97px;display:block}#nav{position:absolute;top:30px;left:115px;float:right}#nav ul{height:50px;float:right;margin-bottom:0}#nav ul li{float:left;display:inline;width:auto}#calltoaction{height:30px;float:right;margin-top:100px;margin-right:5px;text-align:center}#calltoaction ul{padding:0;margin:0;height:30px;list-style:none;float:right}#calltoaction ul li{list-style:none;display:inline;float:none;width :100px;margin-left:0}#calltoaction ul li a:link,#calltoaction ul li a:visited{display:block;background:url(../images/cta-buttons.jpg) top center no-repeat #885ca4;padding:4px 8px;color:#fff;font-weight:bold;text-decoration:none;font-size:13px;line-height:22px;height:22px;width:84px;float:left;text-shadow:1px 1px 0 #111}#calltoaction ul li:hover a{background:url(../images/cta-buttons.jpg) bottom center no-repeat #ff9800;font-weight:bold;text-shadow:1px 1px 0 #111}#calltoaction ul li:first-child a:link,#calltoaction ul li:first-child a:visited,#calltoaction ul li:hover:first-child a{-webkit-border-top-left-radius:7px;-webkit-border-bottom-left-radius:7px;-moz-border-radius-topleft:7px;-moz-border-radius-bottomleft:7px;border-top-left-radius:7px;border-bottom-left-radius:7px}#calltoaction ul li:first-child a:link,#calltoaction ul li:first-child a:visited{background:url(../images/cta-buttons.jpg) top left no-repeat #885ca4}#calltoaction ul li:hover:first-child a{background:url(../images /cta-buttons.jpg) bottom left no-repeat #ff9800}#calltoaction ul li:last-child a:link,#calltoaction ul li:last-child a:visited,#calltoaction ul li:hover:last-child a{-webkit-border-top-right-radius:7px;-webkit-border-bottom-right-radius:7px;-moz-border-radius-topright:7px;-moz-border-radius-bottomright:7px;border-top-right-radius:7px;border-bottom-right-radius:7px}#calltoaction ul li:last-child a:link,#calltoaction ul li:last-child a:visited{background:url(../images/cta-buttons.jpg) top right no-repeat #885ca4;color:#fff}#calltoaction ul li:hover:last-child a{background:url(../images/cta-buttons.jpg) bottom right no-repeat #ff9800}#banner{background:url(../images/bg-banner.jpg) left top no-repeat;height:200px;width:600px;padding:23px 15px;margin-bottom:15px}#download a:link,#download a:visited{margin:-17px 0 0;background:url(../images/button-download.png) left top no-repeat;width:257px;height:79px;float:left;padding:35px 0 0 80px;text-decoration:none}#download a .download-tor{backgr ound:url(../images/button-download-arrow.png) right center no-repeat;font-family:"Arial Narrow",Arial,sans-serif;color:#fff;font-size:2.167em;letter-spacing:1px;padding-right:25px}#download a .version{color:#bda5cc;font-size:1.167em;line-height:1.167em}#download a .info{color:#bda5cc;font-size:.833em;line-height:.833em}#download a:hover{background-position:0 -114px}#download a:hover .version,#download a:hover .info{color:#f1c6a1}#banner ul{background:#387520 url(../images/banner-gradient.jpg) left top repeat-x;border:1px solid #366b32;width:180px;float:right;margin:0 15px 0 0;padding:10px 10px 10px 30px}#banner ul li{list-style:url(../images/white-bullet.png) outside;padding:5px 0}#content{width:960px}#content img{max-width:710px}#breadcrumbs{padding:0 0 10px 5px}#home #maincol{float:left;width:620px;margin-right:20px}#maincol{float:right;width:710px;margin-bottom:20px}#dow-don-left,#maincol-left{float:left;width:710px;margin-bottom:20px}#maincol .topforty .icon img{border:0}.subcol {width:280px;float:left;margin:0 0 25px}#content .first{margin-right:20px}#home #sidecol{float:right;width:300px}#sidecol{float:left;width:230px;margin-right:20px}#dow-don-right,#sidecol-right{float:right;width:230px;margin-left:20px;padding-top:100px}#torusers{margin:0 0 27px}.user{margin:0 0 12px;height:auto}.user img,.project-icon{border:1px solid #cac8a7;float:left;margin:3px 10px 0 0}.user p{margin:0}.img-shadow{float:left;background:url(../images/shadowAlpha.png) no-repeat bottom right !important;background:url(../images/shadow.gif) no-repeat bottom right;margin:10px 0 10px 10px !important;margin:10px 0 10px 5px}.img-shadow .infoblock,.img-shadow .important-infoblock,.img-shadow .custom-infoblock,.img-shadow #sidenav,.img-shadow .sidenav-sub{display:block;position:relative;margin:-6px 6px 6px -6px;background-color:#fff;border:1px solid #ddd}.img-shadow .important-infoblock{background-color:#f7f8f0;border:1px solid #eeefe8}.img-shadow .infoblock,.img-shadow .important-infoblock {padding:15px;width:188px}.img-shadow .custom-infoblock{padding:15px;height:120px;width:426px}.img-shadow .infoblock p,.img-shadow .important-infoblock p,.img-shadow .custom-infoblock p{margin:0}.img-shadow #sidenav,.img-shadow .sidenav-sub{padding:10px 0 0;width:218px}#sidenav ul li,.sidenav-sub ul li{border-bottom:1px solid #ddd}#sidenav ul li.dropdown a:link,#sidenav ul li.dropdown a:visited{background:url(../images/sidenav-arrow.gif) left center no-repeat}#sidenav ul li.dropdown a.active{background:url(../images/sidenav-arrow-active.gif) left center no-repeat}.sidenav-sub ul li.dropdown a:link,.sidenav-sub ul li.dropdown a:visited{background:url(../images/sidenav-arrow.gif) left top no-repeat;margin-top:12px}#sidenav ul li a:link,#sidenav ul li a:visited{display:block;height:auto;padding:8px 15px 8px 26px}#sidenav ul li ul li a:link,#sidenav ul li ul li a:visited{padding-left:37px}.sidenav-sub ul li a:link,.sidenav-sub ul li a:visited{display:block;padding:0 15px 10px 26px;line- height:16px}#sidenav ul li.active{background:url(../images/sidenav-active.png) left center no-repeat;width:230px;border:0}#sidenav ul li ul li ul li a:link,#sidenav ul li ul li ul li a:visited{padding-left:48px}#press tr:nth-child(even){background-color:#e5e5e5}table{width:100%}td{padding:12px}table td img,table tr img{border:0;float:left;margin-right:10px}.icon{float:left;width:auto;margin-right:15px;padding:10px 0;border:0}.calendar{background:url(../images/icon-calendar.jpg) left top no-repeat;float:left;margin-right:10px;width:45px;height:54px;text-align:center;padding:4px 0}.fauxhead{background:url(../images/table-arrow.jpg) right top no-repeat;width:100%;height:11px}#home-our-projects td{height:92px;width:296px;padding:6px}#ecosystem_presentation{height:30px;padding-top:10px;padding-left:60px;vertical-align:middle;background:url("../images/video.png") no-repeat scroll left center transparent;font-size:1.7em;font-weight:bold}#ecosystem_presentation a{text-decoration:none}.proje ct{float:left;padding:6px;border:1px solid #cac8a7;height:76px;width:284px;-webkit-border-radius:10px;-moz-border-radius:10px;border-radius:10px}.project img{border:0;margin-right:6px}.beige{background:#f5f5df}.gray{background:#e0e0e0}.meta{float:right;width:auto}.windows24{background:url("../images/icon-windows24.png") no-repeat scroll left center transparent}.mac24{background:url("../images/icon-mac24.png") no-repeat scroll left center transparent}.linux24{background:url("../images/icon-linux24.png") no-repeat scroll left center transparent}.android24{background:url("../images/icon-android24.png") no-repeat scroll left center transparent}.smartphone24{background:url("../images/icon-smartphone24.png") no-repeat scroll left center transparent}.sourcecode24{background:url("../images/icon-sourcecode24.png") no-repeat scroll left center transparent}.windows24,.mac24,.linux24,.android24,.smartphone24,.sourcecode24{display:block;line-height:32px;padding:0 0 0 33px}.accordionButton{backgr ound:url("../images/table-title.jpg") repeat-x left bottom #885ca4;color:#fff;margin:0;font-size:1.1em;font-weight:bold;height:32px;float:left;_float:none;border:1px solid #fff;border-bottom:0;cursor:pointer;-webkit-border-top-left-radius:7px;-webkit-border-top-right-radius:7px;-moz-border-radius-topleft:7px;-moz-border-radius-topright:7px;border-top-left-radius:7px;border-top-right-radius:7px;position:relative;padding-left:30px;width:680px}.accordionButton:hover{background:url("../images/table-title-hover.jpg") repeat-x left bottom #885ca4;text-shadow:1px 1px 0 rgba(17,17,17,1)}.on:before,.off:before{position:absolute;content:'';height:0;width:0;font-size:0;line-height:0}.on:before{top:14px;left:10px;border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #fff}.off:before{top:9px;left:14px;border-bottom:7px solid transparent;border-top:7px solid transparent;border-left:7px solid #fff}.accordionContent{width:708px;float:left;_float:none;background:# fff;display:block}.accordionContent .fauxhead{width:710px}.package{float:left;height:280px;margin:0;padding:25px 20px 20px 20px;border-top:1px solid #888}.package h2{margin-bottom:3px}.package p{margin-top:16px;padding-left:10px}.downloads{display:block;float:left;width:238px;padding:0 16px 0 0;text-align:center}.lang{float:right;display:none;width:80px;height:20px;margin:0 7px 0 0;padding:0 0 0 3px;background-color:#fefff7;border:2px solid #cccfb8;border-top:0;-webkit-border-bottom-left-radius:5px;-webkit-border-bottom-right-radius:5px;-moz-border-radius-bottomleft:5px;-moz-border-radius-bottomright:5px;border-bottom-left-radius:5px;border-bottom-right-radius:5px}.button{text-align:center;display:block;width:234px;height:69px;text-decoration:none;background:url(../images/button-downloadpage.png) bottom left no-repeat;margin:0 auto 8px auto;text-shadow:1px 1px 0 rgba(17,17,17,1);-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.button .strong{display:block;padding: 10px 0 0 57px}.button .normal{padding:5px 0 0 57px;display:block}.sig{display:block;margin:3px 0 20px 0}.easy{width:712px;margin-bottom:10px;padding-bottom:8px}#download-donate{background-attachment:scroll;background-clip:border-box;background-color:transparent;background-image:url(../images/headerbg.jpg);background-origin:padding-box;background-position:0 0;background-repeat:no-repeat;background-size:100% 100%}.easy .package h2,.easy .package em{display:block;width:100%;text-align:left}.easy .package h2{padding-top:10px;padding-bottom:5px}.easy .package em{font-size:1.2em;padding-top:8px;padding-bottom:4px}.easy .package p{padding-left:0;font-size:15px;text-align:justify}.easy .package p.alt-dl{text-align:left;text-indent:0;padding-left:0;margin-top:32px}.all-dl{display:block;text-align:left;width:100%;font-size:15px}.all-dl a{text-decoration:none;font-weight:bold}.all-dl a:hover{text-decoration:underline}.easy .package{float:none;padding:0 8px 0 12px}.open{display:block}.lang-alt{ line-height:15px;font-size:10px;float:right;margin-right:10px}.expander{text-align:right;float:right;padding:10px 20px 0 0;font-size:15px;display:none}.title{background:url(../images/table-title-arrow.jpg) right top no-repeat;padding:10px 25px 0 10px;height:33px;float:left}.title a:link,.title a:visited{background:url(../images/table-title.jpg) left top no-repeat;height:33px;display:block}.paypal{float:left;width:auto;min-height:159px;max-width:365px}.paypal span{padding-right:20px}.warning-top{width:618px;padding:10px 10px 10px 60px;margin:0 10px 0 10px;display:block;background:url("../images/warning.png") no-repeat scroll 2px 23px #fffeb6;border:1px solid #a6a427;border-bottom:0;-webkit-border-top-left-radius:5px;-webkit-border-top-right-radius:5px;-moz-border-radius-topleft:5px;-moz-border-radius-topright:5px;border-top-left-radius:5px;border-top-right-radius:5px}.warning-top h2{padding-right:15px;padding-left:0;margin-bottom:5px}.warning-top p{padding-left:10px;margin-bottom:0}. warning{float:left;_float:none;padding:25px 25px;margin-top:4px}.warning p{padding-left:10px}.focus{background:#f4f2c7;border:1px solid #ebd4a9;padding:10px 15px}.focus .icon{float:left;width:auto;margin-right:10px}.featured-project{width:313px}input,select{margin:0 3px 10px 0}input.textfield{padding:0 10px;vertical-align:top}.donate-btn{background:left top no-repeat;height:26px;width:92px;text-indent:-9999px;overflow:hidden;border:0;vertical-align:top;margin-top:5px}.donate-btn:hover{background-position:0 -26px;cursor:pointer}.signup{background:#96c35a;border-top:1px solid #6ab334;border-left:1px solid #6ab334;border-bottom:1px solid #5a952b;border-right:1px solid #5a952b;height:31px;padding:0 5px;vertical-align:top;color:#222c14;font-weight:bold;font-size:1em;line-height:1em}.signup:hover{background:#6ab334}select#lang{float:left;width:160px;margin-right:3px}.go{background:#96c35a;border-top:1px solid #6ab334;border-left:1px solid #6ab334;border-bottom:1px solid #5a952b;border-rig ht:1px solid #5a952b;padding:0 5px;vertical-align:top;color:#222c14;font-weight:bold;font-size:1em;line-height:1em;height:18px}.go:hover{background:#6ab334}#footer{width:1024px;height:200px;border-top:1px solid #ddd;padding:20px 0;margin:20px 0 0}.onion{float:left;width:88px;padding-right:20px;height:100%}#footer .about{width:180px;padding-right:30px;border-right:1px solid #ddd;float:left}#footer .newsletter{padding:0 0 15px 30px;width:auto;margin-left:308px}#footer input.textfield{width:220px;height:26px}#footer input{margin:0}#footer .col{float:left;width:100px;margin-left:20px}#footer .first{margin-left:30px}#footer .wider{width:201px}small{margin:0 auto 0 auto;text-align:center;font-size:10px;font-style:italic}.hlist{text-align:center;display:block;width:100%;padding:0;list-style:none;margin:0 0 18px 0}.hlist li{display:inline-block;border-right:1px solid #444;margin-left:-4px}.hlist li.last{border-right:0 solid #444}.hlist a{display:block;top:0;right:0;bottom:0;left:0;text-deco ration:none;font-weight:bold;padding:0 8px}.dbox{float:none;text-align:center;color:#222;border:0;padding:1.4em .7em;width:163px;margin:0 0 0 10px}.dbox p{display:block;padding:0;margin:0}.dbox h2{padding:13px 0 15px 0;position:relative;color:black;font-family:Helvetica,Arial,sans-serif;font-size:18px;font-weight:normal;height:35px;margin-bottom:-20px;margin-left:-6px;z-index:-10}.dbox input.donate-btn{background:url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;height:68px;width:186px;margin-top:0;display:block;background-color:transparent;color:transparent;margin:10px auto 10px auto;padding:0}.dbox span{float:left;padding-right:0}.dbox div label{padding:0 10px 0 0}.dbox h6#ppinfo{width:100%;text-align:center;margin:-15px auto 0 auto}.dbox small,.dbox.donate #ppinfo{margin:0 auto 0 auto;text-align:center;font-size:10px;font-style:normal}.dbox.dl{float:none;width:177px;margin:0 5px 20px 5px}.dbox.dl input.amount{width:87px}.dbox.donate{float:none;padding:30px 30px;wi dth:626px;min-height:0;max-width:none;text-align:left}.dbox.donate input,.dbox.donate select{padding-bottom:0;margin-bottom:0}.dbox.donate .drow{margin:0 0 0 20px}.dbox.donate .drow div{padding:0;width:auto;display:block}.dbox.donate h3{padding-left:0;color:#23300e;margin:0 0 10px 0}.dbox.donate h4{padding-left:20px}.dbox.donate p{padding:5px 20px 15px 40px}.dbox.donate span{float:left;padding-right:0}.dbox.donate div label{padding:0 10px 0 0}.dbox.donate .type{padding-left:20px}.dbox.donate select#t3{width:auto;margin-bottom:0}.dbox.donate ul.amounts{width:auto}.dbox.donate ul.amounts li{display:inline-block}.dbox.donate ul.amounts li label{padding:0 0 0 5px}.dbox.donate input.donate-btn{background:url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;height:26px;width:115px;margin-top:-3px;display:inline-block;background-color:transparent;color:transparent;border:0 solid transparent}.dbox.dsmall{position:relative;display:inline-block;width:170px;height:140px;text-align :center;margin:0 10px;vertical-align:top}.dbox.dsmall input.donate-btn{background:url() left top no-repeat transparent;width:auto;height:auto;margin-top:0;display:block;background-color:transparent;color:transparent;border:0 solid transparent}.dbox.dsmall div label{padding:0}.dbox.dsmall small{display:block;position:absolute;width:172px;float:none;bottom:20px;margin:0 auto}.givv p{text-align:justify;margin-top:10px;font-size:11px;line-height:13px}dwolla p{text-align:justify;margin-top:10px;font-size:11px;line-height:13px}div.blogRow,div.blogFirstRow{height:40px;padding:3px 10px;margin:0}div.blogLastRow{height:20px;text-align:center}div.blogFirstRow{height:22px;background:url(../images/table-head.jpg) left top repeat-x #885ca4}.blogRow:hover{background:#f6ffd5}div.blogRow1,div.blogRow3{background:#eee8f1}.blogFeed a{text-decoration:none}.blogFeed p{margin:0;font-size:12px}p.blogTitle{font-weight:bold;text-decoration:underline}p.blogAuthor{color:#000;text-align:right;margin-top:-20px} p.blogAuthor em{color:#4e6a20;text-align:right;margin-top:-20px}p.blogDate{color:#000}.blogFeed h2{font-size:1.467em;margin:0;line-height:23px;color:#f6f6ed}#projectpage td{width:50%}.projectbox{width:710px;position:relative;margin-bottom:80px}.projectbox .name{font-size:1.5em;font-weight:bold}.projectbox a img{float:none;position:absolute;top:0;left:0}.projectbox .projecesc{margin-left:100px}.clearfix:after{content:".";display:block;height:0;clear:both;visibility:hidden}.clearfix{display:inline-block}/*\*/* html .clearfix{height:1%}.clearfix{display:block}/**/.joblink{display:block;font-size:128%;font-weight:bold;padding:10px 5px;text-align:right}.joblink a{text-decoration:none}.dropbtn{background-color:white;padding:16px 0 0 0;font-size:100%;border:0;cursor:pointer}.dropdown{position:relative;display:inline-block;padding:0;margin-top:-16px;top:0}.dropdown-content{display:none;position:absolute;background-color:#f9f9f9;box-shadow:0 8px 16px 0 rgba(0,0,0,0.2);z-index:1;margin:48px 0 0 0}.dropdown-content a{color:black;padding-top:12px 16px;text-decoration:none;display:block}.dropdown:hover .dropdown-content{display:block} \ No newline at end of file diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml index 3fd71967..68e5c699 100644 --- a/download/en/download-easy.wml +++ b/download/en/download-easy.wml @@ -143,25 +143,41 @@ </div> </div> </div> - - <div id="android" class="easy android"> + + <div id="android" class="easy android"> <div class="package" style="padding-top: 13px; border-top: 0px;"> <div class="desc"> - <h2>Orbot - Tor for Android</h2> - <p>Our software is available for Android-based phones, tablets, - and computers from the <a href="https://guardianproject.info/">Guardian Project</a> in - their <a href= "https://guardianproject.info/fdroid/">F-Droid Repository</a> or - the <a href="https://play.google.com/store/apps/details?id=org.torproject.android">Google - Play Store</a>. <a href="<page docs/android>">Learn more »</a> - </p> + <h2>Tor Browser for Android</h2> + <p> + Introducing Tor Browser for Android, the mobile browser with the + highest privacy protections ever available and on par with Tor + Browser for desktop. You can download the alpha release on + <a href="https://play.google.com/store/apps/details?id=org.torproject.android">GooglePlay</a> + or <a href="">FDroid</a>, or you can get the apk by clicking on the + button bellow. + </p> + <p> + Note: For this release, you also need to install Orbot, you can + learn more about it + <a href="https://www.torproject.org/docs/android.html.en">here</a>. + </p> + <p> + Known issue: Our Security Slider is now under ‘Security Settings, + but because of a small issue, it’s only showing up after you restart + the app. We plan on fixing it for the next release. + </p> + <form class="downloads"> + <a class="button" href="../dist/torbrowser/<version-torbrowserbundleandroid>/TorBrowser-<version-torbrowserbundleandroid>"><span class="strong">Download</span><span class="normal">Android</span></a> + <div class="sig"> + (<a class="android-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundleandroid>/TorBrowser-<version-torbrowserbundleandroid>.asc">sig</a>) + <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + </div> + </form> </div> - <form class="downloads"> - <a class="button" href="https://guardianproject.info/apps/orbot/?src=tbb_download"><span class="strong">Download</span><span class="normal">Orbot</span></a> - </form> </div> - </div> + </div> <p class="all-dl">Looking For Something Else? <a href="<page download/download>">View All Downloads</a></p> - <br> +<br> </div>  diff --git a/download/en/download.wml b/download/en/download.wml index b6149b51..13ae60f0 100644 --- a/download/en/download.wml +++ b/download/en/download.wml @@ -149,24 +149,56 @@ custom configurations. All an apt-get or yum install away.</p> </div> </div>  - - <div id="smartphone" class="accordionButton on"> - <span class="smartphone24">Tor for Smartphones</span></div> + + <div id="android" class="accordionButton on"> + <span class="android24">Android</span> + </div> <div class="accordionContent"> - <div class="fauxhead"></div> - + <div class="fauxhead"></div> <div class="package" style="padding-top: 13px; border-top: 0px;"> - <div class="downloads"> - <a class="additional" href="<page docs/android>">Installation Instructions</a> - </div> + <form class="downloads"> + <a class="button" href="../dist/torbrowser/<version-torbrowserbundleandroid>/TorBrowser-<version-torbrowserbundleandroid>"><span class="strong">Download</span><span class="normal">Android</span></a> + <div class="sig"> + (<a class="android-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundleandroid>/TorBrowser-<version-torbrowserbundleandroid>.asc">sig</a>) + <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + </div> + </form> - <h2>Android Bundle</h2> - <p>Our software is available for Android-based phones, tablets, and computers from the <a href="https://guardianproject.info/">Guardian Project</a> in their <a href= "https://guardianproject.info/2012/03/15/our-new-f-droid-app-repository/">F-Droid Repository</a> or the <a href="https://play.google.com/store/apps/details?id=org.torproject.android">Google Play Store</a>.</p> - </div> + <h2>Tor Browser</h2> + <p> + Introducing Tor Browser for Android, the mobile browser with the + highest privacy protections ever available and on par with Tor + Browser for desktop. You can download the alpha release on + <a href="https://play.google.com/store/apps/details?id=org.torproject.android">GooglePlay</a> + or <a href="">FDroid</a>, or you can get the apk by clicking on the + button bellow. + </p> + <p> + Note: For this release, <b>you also need to install Orbot</b>, you can + learn more about it + <a href="/docs/android.html.en">here</a>. + </p> + <p> + Known issue: Our Security Slider is now under ‘Security Settings, + but because of a small issue, it’s only showing up after you restart + the app. We plan on fixing it for the next release. + </p> + </div> + </div> + + + + <div id="smartphone" class="accordionButton on"> + <span class="smartphone24">Smartphone</span> </div> - + <div class="accordionContent"> + <div class="fauxhead"></div> + <div class="package" style="padding-top: 13px; border-top: 0px; border-bottom: 1px solid #888888;"> + </div> + + </div>  - <div class="accordionButton on"> + <div id="source" class="accordionButton on"> <span class="sourcecode24">Source Code</span></div> <div class="accordionContent"> <div class="fauxhead"></div> diff --git a/include/versions.wmi b/include/versions.wmi index c85a1b8f..45d6e82f 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -18,6 +18,8 @@ <let releasedate-torbrowserbundlelinux64=releasedate-torbrowserbundle-all /> <let version-torbrowserbundleosx64=version-torbrowserbundle-all /> <let releasedate-torbrowserbundleosx64=releasedate-torbrowserbundle-all /> +<let version-torbrowserbundleandroid=version-torbrowserbundle-all /> +<let releasedate-torbrowserbundleandroid=releasedate-torbrowserbundle-all /> <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundle>/tor-win32-<version-win32-stable>.zip</define-tag> @@ -38,7 +40,6 @@ <let version-torbrowserbundleosx64beta=version-torbrowserbundlebeta-all /> <let releasedate-torbrowserbundleosx64beta=releasedate-torbrowserbundlebeta-all /> - <define-tag file-source-stable whitespace=delete>tor-<version-stable>.tar.gz</define-tag> <define-tag package-source-stable whitespace=delete>../dist/<file-source-stable></define-tag> <define-tag file-source-alpha whitespace=delete>tor-<version-alpha>.tar.gz</define-tag>

1 0

[webwml/master] Add apk link and versions to download and delete blank spaces
by hiro＠torproject.org 31 Aug '18

31 Aug '18

commit 9af751d80a23cea24e4ca553de4da7f5f54be418 Author: hiro <hiro(a)torproject.org> Date: Fri Aug 31 12:53:56 2018 +0200 Add apk link and versions to download and delete blank spaces --- download/en/download.wml | 9 ++++----- include/versions.wmi | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/download/en/download.wml b/download/en/download.wml index 13ae60f0..b66bd3c6 100644 --- a/download/en/download.wml +++ b/download/en/download.wml @@ -157,9 +157,9 @@ custom configurations. All an apt-get or yum install away.</p> <div class="fauxhead"></div> <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <a class="button" href="../dist/torbrowser/<version-torbrowserbundleandroid>/TorBrowser-<version-torbrowserbundleandroid>"><span class="strong">Download</span><span class="normal">Android</span></a> + <a class="button" href="../dist/torbrowser/mobile/<version-torbrowserbundleandroid>/tor-browser-android-arm-<version-torbrowserbundleandroid>.apk"><span class="strong">Download</span><span class="normal">Android</span></a> <div class="sig"> - (<a class="android-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundleandroid>/TorBrowser-<version-torbrowserbundleandroid>.asc">sig</a>) + (<a class="android-tbb-sig" href="../dist/torbrowser/mobile/<version-torbrowserbundleandroid>/TorBrowser-<version-torbrowserbundleandroid>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> @@ -180,8 +180,8 @@ custom configurations. All an apt-get or yum install away.</p> </p> <p> Known issue: Our Security Slider is now under ‘Security Settings, - but because of a small issue, it’s only showing up after you restart - the app. We plan on fixing it for the next release. + but because of a small issue, it’s only showing up after you restart + the app. We plan on fixing it for the next release. </p> </div> </div> @@ -195,7 +195,6 @@ custom configurations. All an apt-get or yum install away.</p> <div class="fauxhead"></div> <div class="package" style="padding-top: 13px; border-top: 0px; border-bottom: 1px solid #888888;"> </div> - </div>  <div id="source" class="accordionButton on"> diff --git a/include/versions.wmi b/include/versions.wmi index 5b71d635..b227fbcb 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -46,4 +46,5 @@ <define-tag package-source-alpha whitespace=delete>../dist/<file-source-alpha></define-tag> # *** tor browser android *** -<define-tag version-torbrowserbundleandroid whitespace=delete>1.0a1</define-tag> \ No newline at end of file +<define-tag version-torbrowserbundleandroid whitespace=delete>1.0a1</define-tag> +<define-tag releasedate-torbrowserbundleandroid whitespace=delete>2018-08-31</define-tag> \ No newline at end of file

1 0

[webwml/master] Merge branch 'download-tba'
by hiro＠torproject.org 31 Aug '18

31 Aug '18

commit a98301970bc69ed94ab0cbde24d37ffa86dc64e0 Merge: 281d0b00 120c0c49 Author: hiro <hiro(a)torproject.org> Date: Fri Aug 31 12:46:07 2018 +0200 Merge branch 'download-tba' css/layout.css | 9 +++++++ css/layout.min.css | 2 +- download/en/download-easy.wml | 44 +++++++++++++++++++++----------- download/en/download.wml | 58 +++++++++++++++++++++++++++++++++---------- include/versions.wmi | 5 +++- 5 files changed, 89 insertions(+), 29 deletions(-)

1 0

[webwml/master] Add new line at the end of file
by hiro＠torproject.org 31 Aug '18

31 Aug '18

commit d0078ff3de6e7d20ec80c959089eb11101c36f23 Author: hiro <hiro(a)torproject.org> Date: Fri Aug 31 12:54:41 2018 +0200 Add new line at the end of file --- include/versions.wmi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/versions.wmi b/include/versions.wmi index b227fbcb..b0ae6963 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -47,4 +47,4 @@ # *** tor browser android *** <define-tag version-torbrowserbundleandroid whitespace=delete>1.0a1</define-tag> -<define-tag releasedate-torbrowserbundleandroid whitespace=delete>2018-08-31</define-tag> \ No newline at end of file +<define-tag releasedate-torbrowserbundleandroid whitespace=delete>2018-08-31</define-tag>

1 0

[webwml/master] Add apk link and version variable
by hiro＠torproject.org 31 Aug '18

31 Aug '18

commit 120c0c4987e72c75cbb61e30709d82a8c7e54f03 Author: hiro <hiro(a)torproject.org> Date: Fri Aug 31 12:45:44 2018 +0200 Add apk link and version variable --- download/en/download-easy.wml | 4 ++-- include/versions.wmi | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml index 68e5c699..c2e42d06 100644 --- a/download/en/download-easy.wml +++ b/download/en/download-easy.wml @@ -167,9 +167,9 @@ the app. We plan on fixing it for the next release. </p> <form class="downloads"> - <a class="button" href="../dist/torbrowser/<version-torbrowserbundleandroid>/TorBrowser-<version-torbrowserbundleandroid>"><span class="strong">Download</span><span class="normal">Android</span></a> + <a class="button" href="../dist/torbrowser/mobile/<version-torbrowserbundleandroid>/tor-browser-android-arm-<version-torbrowserbundleandroid>.apk"><span class="strong">Download</span><span class="normal">Android</span></a> <div class="sig"> - (<a class="android-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundleandroid>/TorBrowser-<version-torbrowserbundleandroid>.asc">sig</a>) + (<a class="android-tbb-sig" href="../dist/torbrowser/mobile/<version-torbrowserbundleandroid>/TorBrowser-<version-torbrowserbundleandroid>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> diff --git a/include/versions.wmi b/include/versions.wmi index 45d6e82f..5b71d635 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -45,3 +45,5 @@ <define-tag file-source-alpha whitespace=delete>tor-<version-alpha>.tar.gz</define-tag> <define-tag package-source-alpha whitespace=delete>../dist/<file-source-alpha></define-tag> +# *** tor browser android *** +<define-tag version-torbrowserbundleandroid whitespace=delete>1.0a1</define-tag> \ No newline at end of file

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 31 Aug '18

31 Aug '18

commit 2840c430bf4280a2ac8fbdbd17074f1bf90e64ca Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 31 08:18:38 2018 +0000 Update translations for tor-launcher-network-settings_completed --- hi/network-settings.dtd | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/hi/network-settings.dtd b/hi/network-settings.dtd new file mode 100644 index 000000000..35916b563 --- /dev/null +++ b/hi/network-settings.dtd @@ -0,0 +1,62 @@ +<!ENTITY torsettings.dialog.title "टोर संजाल व्यवस्था"> +<!ENTITY torsettings.wizard.title.default "टोर से कनेक्ट करें"> +<!ENTITY torsettings.wizard.title.configure "टोर संजाल व्यवस्था"> +<!ENTITY torsettings.wizard.title.connecting "एक कनेक्शन की स्थापना"> + + +<!ENTITY torlauncher.localePicker.title "टोर विचरक भाषा "> +<!ENTITY torlauncher.localePicker.prompt "कृपा भाषा चुनें"> + + + +<!ENTITY torSettings.connectPrompt "टोर से कनेक्ट करने के लिए "कनेक्ट" पर क्लिक करें।"> +<!ENTITY torSettings.configurePrompt "नेटवर्क सेटिंग्स को समायोजित करने के लिए "कॉन्फ़िगर करें" पर क्लिक करें यदि आप ऐसे देश में हैं जो सेंसर टोर (जैसे मिस्र, चीन, तुर्की) या यदि आप किसी ऐसे निजी नेटवर्क से कनेक्ट हो रहे हैं जिसके लिए प्रॉक्सी की आवश्यकता है।"> +<!ENTITY torSettings.configure "कॉन्फ़िगर"> +<!ENTITY torSettings.connect "जोड़ें"> + + + +<!ENTITY torsettings.startingTor "टोर शुरू करने की प्रतीक्षा कर रहा है ..."> +<!ENTITY torsettings.restartTor "टोर पुनरारंभ करें"> +<!ENTITY torsettings.reconfigTor "पुन: कॉन्फ़िगर"> + +<!ENTITY torsettings.discardSettings.prompt "आपने टोर ब्रिड्जस को कॉन्फ़िगर किया है या आपने स्थानीय प्रॉक्सी सेटिंग्स   दर्ज की हैं। टोर नेटवर्क से सीधा कनेक्शन बनाने के लिए, इन सेटिंग्स को हटा दिया जाना चाहिए।"> +<!ENTITY torsettings.discardSettings.proceed "सेटिंग्स हटाएँ और कनेक्ट करें"> + +<!ENTITY torsettings.optional "ऐच्छिक"> + +<!ENTITY torsettings.useProxy.checkbox "मैं इंटरनेट से कनेक्ट करने के लिए प्रॉक्सी का उपयोग करता हूं"> +<!ENTITY torsettings.useProxy.type "प्रॉक्सी प्रकार:"> +<!ENTITY torsettings.useProxy.type.placeholder "प्रॉक्सी प्रकार का चयन करें"> +<!ENTITY torsettings.useProxy.address "पता :"> +<!ENTITY torsettings.useProxy.address.placeholder "IP पता या मेजबाननाम"> +<!ENTITY torsettings.useProxy.port "पोर्ट/द्वार :"> +<!ENTITY torsettings.useProxy.username "उपयोगकर्ता नाम"> +<!ENTITY torsettings.useProxy.password "पासवर्ड"> +<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> +<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> +<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> +<!ENTITY torsettings.firewall.checkbox "यह कंप्यूटर फ़ायरवॉल के माध्यम से जाता है जो केवल कुछ पोर्ट्स के कनेक्शन की अनुमति देता है..."> +<!ENTITY torsettings.firewall.allowedPorts "अनुमति प्राप्त पोर्ट्स "> +<!ENTITY torsettings.useBridges.checkbox "टोर मेरे देश में सेंसर किया गया है"> +<!ENTITY torsettings.useBridges.default "एक अंतर्निर्मित पुल का चयन करें"> +<!ENTITY torsettings.useBridges.default.placeholder "एक पुल का चयन करें"> +<!ENTITY torsettings.useBridges.bridgeDB "Torproject.org से एक पुल का अनुरोध करें"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "छवि से अक्षर दर्ज करें"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "एक नई चुनौती प्राप्त करें"> +<!ENTITY torsettings.useBridges.captchaSubmit "जमा करें"> +<!ENTITY torsettings.useBridges.custom "एक पुल प्रदान करें जो मुझे पता है"> +<!ENTITY torsettings.useBridges.label "एक विश्वसनीय स्रोत से पुल जानकारी दर्ज करें।"> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> + +<!ENTITY torsettings.copyLog "क्लिपबोर्ड पर टोर लॉग कॉपी करें"> + +<!ENTITY torsettings.proxyHelpTitle "प्रॉक्सी मदद"> +<!ENTITY torsettings.proxyHelp1 "किसी कंपनी, स्कूल या विश्वविद्यालय नेटवर्क   से कनेक्ट करते समय स्थानीय प्रॉक्सी की आवश्यकता हो सकती है। यदि आप सुनिश्चित नहीं हैं कि प्रॉक्सी की आवश्यकता है, तो किसी अन्य ब्राउज़र में इंटरनेट सेटिंग्स देखें या अपने सिस्टम की नेटवर्क सेटिंग्स जांचें।"> + +<!ENTITY torsettings.bridgeHelpTitle "ब्रिज रिले सहायता"> +<!ENTITY torsettings.bridgeHelp1 "पुल असूचीबद्ध रिले हैं जो टोर नेटवर्क   से कनेक्शन को अवरुद्ध करना अधिक कठिन बनाते हैं। सेंसरशिप से बचने के लिए प्रत्येक प्रकार का पुल एक अलग विधि का उपयोग करता है।   Obfs वाले लोग आपके ट्रैफ़िक को यादृच्छिक शोर की तरह दिखते हैं, और नम्र लोग आपके ट्रैफिक को टोर के बजाय उस सेवा से कनेक्ट करने की तरह दिखते हैं।"> +<!ENTITY torsettings.bridgeHelp2 "कुछ देशों में कुछ पुल काम करते हैं, लेकिन अन्य   नहीं, क्योंकि कुछ देशों ने टोर को अवरुद्ध करने का प्रयास किया है। यदि आप अनिश्चित हैं कि आपके देश में कौन से पुल काम करते हैं, तो torproject.org/about/contact.html#support पर जाएं"> + + +<!ENTITY torprogress.pleaseWait "कुछ देर रुकिए। हम टोर की संजाल से जुड़ रहे हैं। कुछ मिनट लग सकते हैं।">

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2018