November 2016 - tor-commits - lists.torproject.org

[webwml/staging] Move current campaign redirects up
by sebastian＠torproject.org 23 Nov '16

23 Nov '16

commit 247d8d6b408acbb1aa124f82231c76dabca99c24 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Nov 18 14:53:28 2016 +0100 Move current campaign redirects up --- .htaccess | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/.htaccess b/.htaccess index 32d7306..8f54d2d 100644 --- a/.htaccess +++ b/.htaccess @@ -69,6 +69,27 @@ RewriteRule ^include/$ / [R=301,L] RewriteRule ^js/$ / [R=301,L] # Donation campagin +# 2016 +RewriteRule ^donate/donate-homepage-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-twitter-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-share-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-fb-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-blog-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-email-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-de(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-es(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-fa(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-fr(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-it(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-nl(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-pt(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L] + +# 2015 RewriteRule ^donate/donate-twitter(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L] @@ -95,21 +116,3 @@ RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L] # yuck, https://twitter.com/torproject/status/677928074630049793 RewriteRule ^Donate/Donate-Twitter(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate/donate-homepage-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-twitter-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-share-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-fb-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-blog-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-email-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-de(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-es(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-fa(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-fr(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-it(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-nl(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-pt(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L]

1 0

[webwml/staging] Bug 20415: 2016 Donation banner
by sebastian＠torproject.org 23 Nov '16

23 Nov '16

commit c27d7dd8d7a192ce0e99bc9bb217469a3ab2916d Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Nov 15 02:05:59 2016 -0500 Bug 20415: 2016 Donation banner --- css/layout.css | 158 ++++++++++++++++++++++++++++++++++++++++++++++ en/index.wml | 32 ++++++++++ images/onion-heart.png | Bin 0 -> 10592 bytes images/tor-roots-only.png | Bin 0 -> 119059 bytes js/donation_banner.js | 36 +++++++++++ 5 files changed, 226 insertions(+) diff --git a/css/layout.css b/css/layout.css index 8a79d9d..87f6b5c 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1296,3 +1296,161 @@ p.blogDate { } /* End hide from IE-mac */ +#banner-container { + -khtml-user-select: none; /* Konqueror */ + -moz-user-select: none; /* Firefox */ + -ms-user-select: none; /* Internet Explorer/Edge */ + -webkit-touch-callout: none; /* iOS Safari */ + -webkit-user-select: none; /* Chrome/Safari/Opera */ + background-color: #406; + background-opacity: 10%; + background-size: cover; + background: radial-gradient(circle, #406 90%, #203 100%); + border-bottom: 6px solid #305; + border-top: 5px solid #305; + display: flex; + height: 120px; + justify-content: center; + left: 0px; + margin-top: 36px; + min-width: 900px; + opacity: 1; + position: absolute; + user-select: none; + width: 100%; + z-index: 1; +} +#banner-container:before { + background-image: url('../images/tor-roots-only.png'); + background-position: 50% 50%; + background-repeat: no-repeat; + background-size: cover; + content: ' '; + display: block; + height: 100%; + left: 0; + opacity: 0.20; + position: absolute; + top: 0; + width: 100%; +} +#banner-contents-container { + align-items: center; + display: flex; + flex-direction: row; + height: 100%; + max-width: 700px; + position: relative; + width: 700px; +} +#banner-text { + align-self: stretch; + color: white; + display: flex; + flex-direction: column; + flex: 1 1 auto; + font-family: sans-serif; + font-size: 24px; + margin: 10px 20px 10px 20px; + max-height: 100%; + padding: 0px; +} +#banner-tagline { + align-items: center; + display: flex; + flex: 2 2 67%; + font-weight: bold; + justify-content: center; + max-width: 469px; + text-align: center; +} +#banner-heart { + align-items: center; + color: #f8f8a0; + display: flex; + flex: 1 1 33%; + justify-content: center; + text-align: center; + white-space: nowrap; +} +#banner-logo-container { + display: inline-block; + flex: 0 0 auto; + margin: 0px; + position: relative; +} +#banner-logo { + height: 155px; + position: relative; + padding-bottom: 40px; + width: 108px; +} +#banner-donate-button-container { + background-color: #FFD; + border: 4px solid #204; + color: #A20; + display: block; + flex-grow: 0.0; + flex: 0; + height: 50px; + letter-spacing: -0.00em; + opacity: 100%; + padding-bottom: 5px; + padding-left: 5px; + padding-right: 5px; + padding-top: 5px; + width: 100px; +} +#banner-donate-button-container:hover { + border-color: #610; +} +#banner-donate-button-container:active { + border-color: #A20; +} +#banner-donate-button { + align-items: center; + display: flex; + flex-direction: column; + font-family: sans-serif; + font-size: 18px; + font-weight: bold; + height: 100%; + text-align: center; + width: 100%; +} +#banner-donate-button-text { + align-self: stretch; + align-items: center; + display: flex; + justify-content: center; + flex: 2 2 67%; +} +#banner-donate-button-arrow { + flex: 1 1 33%; + font-size: 14px; + line-height: 14px; +} +#banner-donate-button-arrow:-moz-dir(rtl) { + transform: scaleX(-1); +} +#banner-donate-button-link { + flex: 0 0 auto; + text-decoration: none; +} +#banner-donate-button-link:link { + color: #A20; +} +#banner-donate-button-link:hover { + color: #C40; +} +#banner-donate-button-link:visited { + color: #408; +} +#banner-donate-button-linka:active { + color: black; +} +#banner-spacer { + height: 180px; + position: relative; + top: 0; +} diff --git a/en/index.wml b/en/index.wml index 836d3b0..4b9a92a 100644 --- a/en/index.wml +++ b/en/index.wml @@ -2,6 +2,38 @@ # Revision: $Revision$ # Translation-Priority: 1-high + <div id="banner-container" class="onions-bg"> + <div id="banner-contents-container"> + <div id="banner-logo-container"> + <img id="banner-logo" alt="Tor Onion-Heart Logo" + src="images/onion-heart.png"/> + </div> + <div id="banner-text"> + <div id="banner-tagline"> + <span> + <noscript>Protecting Journalists, Activists & Whistleblowers Since 2006</noscript> + </span></div> + <div id="banner-heart"> + <span> + Tor is at the heart of Internet freedom + </span> + </div> + </div> + <a id="banner-donate-button-link" + href="./donate/donate-homepage-en"> + <div id="banner-donate-button-container"> + <div id="banner-donate-button"> + <div id="banner-donate-button-text"> + <span>Donate Now! »</span> + </div> + </div> + </div> + </a> + </div> + </div> + <div id="banner-spacer"></div> + <script src="js/donation_banner.js"></script> + #include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8" <div id="home"> diff --git a/images/onion-heart.png b/images/onion-heart.png new file mode 100644 index 0000000..e1c0bdf Binary files /dev/null and b/images/onion-heart.png differ diff --git a/images/tor-roots-only.png b/images/tor-roots-only.png new file mode 100644 index 0000000..db92ab4 Binary files /dev/null and b/images/tor-roots-only.png differ diff --git a/js/donation_banner.js b/js/donation_banner.js new file mode 100644 index 0000000..35823db --- /dev/null +++ b/js/donation_banner.js @@ -0,0 +1,36 @@ +/* jshint esnext:true */ + +var kTaglines = [ + "Millions of People Depend on Tor for Online Security & Privacy", + "A Network of People Protecting People", + "Surveillance = Oppression", + "Protecting Journalists, Activists & Whistleblowers Since 2006", +]; + +var kTaglineSizes = [ + 26, + 32, + 32, + 26, +]; + +var sel = function (selector) { + return document.querySelector(selector) +}; + +// Returns a random integer x, such that 0 <= x < max +var randomInteger = function (max) { + return Math.floor(max * Math.random()); +}; + +// The main donation banner function. +var runDonationBanner = function () { + // Load random tag line once page is loaded + var index = randomInteger(4); + var taglineElement = sel("#banner-tagline span"); + taglineElement.innerText = kTaglines[index]; + taglineElement.style.fontSize = kTaglineSizes[index]; +}; + +// Run banner code on load. +window.addEventListener("load", runDonationBanner);

1 0

[webwml/staging] Bug 20734: Fix links and redirects for new donation site
by sebastian＠torproject.org 23 Nov '16

23 Nov '16

commit ec139b4def237b41e1176587507aee78f14b379e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Nov 22 01:02:06 2016 -0500 Bug 20734: Fix links and redirects for new donation site --- .htaccess | 7 +++-- css/layout.css | 1 + donate/en/donate-foot.wml | 0 donate/en/donate-options.wml | 2 +- download/en/download-easy.wml | 56 +----------------------------------- download/en/download-unix.wml | 2 +- download/en/download.wml | 66 +------------------------------------------ include/foot.wmi | 2 +- include/navigation.wmi | 2 +- projects/en/torbrowser.wml | 2 +- 10 files changed, 13 insertions(+), 127 deletions(-) diff --git a/.htaccess b/.htaccess index 8f54d2d..3608c30 100644 --- a/.htaccess +++ b/.htaccess @@ -88,13 +88,16 @@ RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L] RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L] RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L] RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-button(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-download(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-foot(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate.html.en https://donate.torproject.org [R=302,L] # 2015 RewriteRule ^donate/donate-twitter(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate/donate-download(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate/donate-button(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/giving-tue-blog(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-roger(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-george-torwell(.*) /donate/donate$1 [R=302,L] diff --git a/css/layout.css b/css/layout.css index 8a79d9d..45b4513 100644 --- a/css/layout.css +++ b/css/layout.css @@ -276,6 +276,7 @@ body { float: right; width: 230px; margin-left: 20px; + padding-top: 100px; } #torusers { margin: 0 0 27px; } diff --git a/donate/en/donate-foot.wml b/donate/en/donate-foot.wml new file mode 100644 index 0000000..e69de29 diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 6596d87..144cff9 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -13,7 +13,7 @@ form#makeDonation { <div id="content" class="container" style="padding-bottom: 85px"> <div id="maincol"> <h1>More Ways to Donate to Tor</h1> - <p><b>Note: if you wish to donate to The Tor Project by <a href="donate.html.en">credit card or PayPal, please click here</a>.</b></p> + <p><b>Note: if you wish to donate to The Tor Project by <a href="<page donate/donate>">credit card or PayPal, please click here</a>.</b></p> <p>The Tor Project also offers the following alternative donation methods (If you would like to receive a Thank-You Gift after making a donation with one of the methods below, please email giving(a)torproject.org.)</p> <ul class="hlist"> <li><a href="#bitcoin">Bitcoin</a></li> diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml index 6fd6e71..98de49f 100644 --- a/download/en/download-easy.wml +++ b/download/en/download-easy.wml @@ -144,61 +144,7 @@ <div id="dow-don-right"> - - - <script async type="text/javascript"> - function displayVals() { - var t3 = $("#t3").val(); - var amount = $("#amount").val(); - if(t3 != 0){ - $('#a3').val(amount); - $('#p3').val(1); - $('#cmd').val('_xclick-subscriptions'); - $('#item_name').val('Tor Project Membership'); - $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>'); - }else{ - $('#a3').val(0); - $('#p3').val(0); - $('#cmd').val('_donations'); - $('#item_name').val('Donation to the Tor Project'); - $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); - } - if( !t3 ) { - $('#cmd').val('_donations'); - $('#item_name').val('Donation to the Tor Project'); - $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); - } - } - $(function(){ - $("#amount").change(displayVals); - $("#t3").change(displayVals); - displayVals(); - }); - </script> -<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post"> - <h2><big style="font-weight: bold; font-size: 1.2em;">Help</big><small style="font-size: 0.9em;" > Create more </small><big style="font-weight: bold; font-size: 1.2em;">Tor</big><big style="font-size: 1.2em;">!</big></h2> - <p> - <input type="hidden" name="currency_code" class="cur" value="USD"> - <input type="hidden" id="a3" name="a3" value="0"> - <input type="hidden" id="t3" name="t3" value="0"> - <input type="hidden" id="amount" class="amount" name="amount" value="10" size="10"> - <input type="hidden" id="p3" name="p3" value="1"> - <input type="hidden" name="sra" value="1"> - <input type="hidden" name="src" value="1"> - <input type="hidden" name="no_shipping" value="1"> - <input type="hidden" name="no_note" value="1"> - <input type="hidden" id="cmd" name="cmd" value="_donations"> - <input type="hidden" name="business" value="donations(a)torproject.org"> - <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> - <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou"> - <input type="hidden" name="cancel_return" value="https://www.torproject.org/download/download-easy"> - </p> - <h6 id="ppinfo" style="height:0px;"></h6> - <p> - <input class="donate-btn" type="submit" name="donate" value="Donate"> - </p> - <p><a href="<page donate/donate>">Other donation options...</a></p> -</form>  +<a href="<page donate/donate-download>"><img src="../images/btn_donateCC_LG.gif"></a> </div>  diff --git a/download/en/download-unix.wml b/download/en/download-unix.wml index be152ba..1993b47 100644 --- a/download/en/download-unix.wml +++ b/download/en/download-unix.wml @@ -116,7 +116,7 @@ under the <a href="<gitblob>LICENSE">3-clause BSD license</a>. <p> There is no fee for installing Tor, or using the Tor network, but if you want Tor to become faster and more usable please consider -<a href="<page donate/donate>">making a tax-deductible donation to The Tor Project</a>. +<a href="<page donate/donate-download>">making a tax-deductible donation to The Tor Project</a>. </p> </div> diff --git a/download/en/download.wml b/download/en/download.wml index c111ee2..482850a 100644 --- a/download/en/download.wml +++ b/download/en/download.wml @@ -356,71 +356,7 @@ Code</a></li> </div> </div>  - <script async type="text/javascript"> - function displayVals() { - var t3 = $("#t3").val(); - var amount = $("#amount").val(); - if(t3 != 0){ - $('#a3').val(amount); - $('#p3').val(1); - $('#cmd').val('_xclick-subscriptions'); - $('#item_name').val('Tor Project Membership'); - $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>'); - }else{ - $('#a3').val(0); - $('#p3').val(0); - $('#cmd').val('_donations'); - $('#item_name').val('Donation to the Tor Project'); - $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); - } - if( !t3 ) { - $('#cmd').val('_donations'); - $('#item_name').val('Donation to the Tor Project'); - $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); - } - } - $(function(){ - $("#amount").change(displayVals); - $("#t3").change(displayVals); - displayVals(); - }); - </script> -<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post" style="float:left; margin-bottom:10px;"> - <h2>Donate to Tor</h2> - <p> - <select name="currency_code" class="cur"> - <option value="USD" selected="selected">$</option> - <option value="EUR">€</option> - <option value="GBP">£</option> - <option value="YEN">¥</option> - </select> - <input type="text" id="amount" class="amount" name="amount" value="5" size="10"> - </p> - <p> - <input type="hidden" id="a3" name="a3" value="0"> - <select id="t3" name="t3"> - <option value="0">One-time Donation</option> - <option value="M">Monthly Subscription</option> - </select> - </p> - <p> - <input type="hidden" id="p3" name="p3" value="1"> - <input type="hidden" name="sra" value="1"> - <input type="hidden" name="src" value="1"> - <input type="hidden" name="no_shipping" value="1"> - <input type="hidden" name="no_note" value="1"> - <input type="hidden" id="cmd" name="cmd" value="_donations"> - <input type="hidden" name="business" value="donations(a)torproject.org"> - <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> - <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou.html"> - <input type="hidden" name="cancel_return" value="https://www.torproject.org/download/download.html"> - </p> - <h6 id="ppinfo" style="height:0px;"></h6> - <p> - <input class="donate-btn" type="submit" name="donate" value="Donate"> - </p> - <p><a href="<page donate/donate>">Other donation options...</a></p> -</form> +<a href="<page donate/donate-download>"><img src="../images/btn_donateCC_LG.gif"></a>   <div class="img-shadow"> diff --git a/include/foot.wmi b/include/foot.wmi index 5e6cb4e..c7e97aa 100644 --- a/include/foot.wmi +++ b/include/foot.wmi @@ -43,7 +43,7 @@ <div class="col"> <h4>Get Involved</h4> <ul> - <li><a href="<page donate/donate>">Donate</a></li> + <li><a href="<page donate/donate-foot>">Donate</a></li> <li><a href="<page docs/documentation>#MailingLists">Mailing Lists</a></li> <li><a href="<page docs/hidden-services>">Hidden Services</a></li> <li><a href="<page getinvolved/translation>">Translations</a></li> diff --git a/include/navigation.wmi b/include/navigation.wmi index 3cfec53..36b985b 100644 --- a/include/navigation.wmi +++ b/include/navigation.wmi @@ -22,7 +22,7 @@ my @calltoaction = ( 'download/download-easy' , 'Download', 'getinvolved/volunteer' , 'Get Involved', - 'donate/donate' , 'Donate', + 'donate/donate-button' , 'Donate', ); :> diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index c94a298..19f12e2 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -30,7 +30,7 @@ It can run off a USB flash drive, comes with a pre-configured web browser to protect your anonymity, and is self-contained (portable).</p> - <p style="padding-top:10px;"><a href="<page donate/donate>">Do you like what we do? Please consider making a donation »</a></p> + <p style="padding-top:10px;"><a href="<page donate/donate-download>">Do you like what we do? Please consider making a donation »</a></p> </div> <div class="pjsplash"> <a class="button" href="#downloads">

1 0

[webwml/staging] Merge remote-tracking branch 'arthuredelstein/20415'
by sebastian＠torproject.org 23 Nov '16

23 Nov '16

commit 42d36dce3b3aecf8d0d49f847e77feb2d2d389e4 Merge: ec139b4 c27d7dd Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Nov 22 23:36:13 2016 +0100 Merge remote-tracking branch 'arthuredelstein/20415' css/layout.css | 158 ++++++++++++++++++++++++++++++++++++++++++++++ en/index.wml | 32 ++++++++++ images/onion-heart.png | Bin 0 -> 10592 bytes images/tor-roots-only.png | Bin 0 -> 119059 bytes js/donation_banner.js | 36 +++++++++++ 5 files changed, 226 insertions(+)

1 0

[webwml/staging] Merge branch 'master' into staging
by sebastian＠torproject.org 23 Nov '16

23 Nov '16

commit d5eb3a4be8cbc762a38fdcd456959c8e4e54f3cb Merge: 497b708 42d36dc Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Nov 22 23:37:07 2016 +0100 Merge branch 'master' into staging .htaccess | 7 +- css/layout.css | 159 ++++++++++++++++++++++++++++++++++++++++++ donate/en/donate-foot.wml | 0 donate/en/donate-options.wml | 2 +- download/en/download-easy.wml | 56 +-------------- download/en/download-unix.wml | 2 +- download/en/download.wml | 66 +----------------- en/index.wml | 32 +++++++++ images/onion-heart.png | Bin 0 -> 10592 bytes images/tor-roots-only.png | Bin 0 -> 119059 bytes include/foot.wmi | 2 +- include/navigation.wmi | 2 +- js/donation_banner.js | 36 ++++++++++ projects/en/torbrowser.wml | 2 +- 14 files changed, 239 insertions(+), 127 deletions(-)

1 0

[onionoo/master] Onionoo's new operator guide, task-20670.
by karsten＠torproject.org 22 Nov '16

22 Nov '16

commit 58fe8e1216fed3086244f96cf2e4f3eda9a87610 Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Nov 21 20:48:07 2016 +0100 Onionoo's new operator guide, task-20670. --- INSTALL | 134 -------------------------------- INSTALL.md | 258 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 2 +- 3 files changed, 259 insertions(+), 135 deletions(-) diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 5692196..0000000 --- a/INSTALL +++ /dev/null @@ -1,134 +0,0 @@ -Clone the Onionoo server repository ------------------------------------ - -Create working directory /srv/onionoo/, make it writable for the metrics -user, and clone the Onionoo server repository into it. Commands prefixed -with # are meant to be run by root, commands with $ by user metrics: - -# mkdir /srv/onionoo -# chown metrics:metrics /srv/onionoo -$ git clone https://git.torproject.org/onionoo.git /srv/onionoo/ -$ cd /srv/onionoo - - -Install Java 1.7 or higher and ant 1.8 or higher ------------------------------------------------- - -$ javac -version -javac 1.7.0_65 - -$ ant -version -Apache Ant version 1.8.0 compiled on March 11 2010 - - -Provide required .jar files ---------------------------- - -Download .jar files listed in the build.xml classpath. Onionoo usually -uses Debian stable provided libraries; see vagrant/bootstrap.sh for Debian -package names. If you download .jar files elsewhere, please edit the -corresponding paths in build.xml. - -DescripTor is provided by The Tor Project and can be found here: - https://dist.torproject.org/descriptor/ -Download the tar.gz file with the version number listed in build.xml. -The README inside the tar.gz file has all the information about DescripTor -and explains how to verify the downloaded files. - -Attempt to compile the Java sources to make sure that everything works -correctly: - -$ ant compile - - -Download GeoIP and ASN database files -------------------------------------- - -Onionoo uses an IP-to-city database and an IP-to-ASN database to provide -additional information about a relay's location. - -First, create the geoip/ directory and change to it: - -$ mkdir -p geoip -$ cd geoip/ - -Download the most recent MaxMind GeoLite2 City database and unzip it in -the current directory, junking paths: - -$ wget https://geolite.maxmind.com/download/geoip/database/GeoLite2-City-CSV.zip -$ unzip -j GeoLite2-City-CSV.zip - -Download the most recent MaxMind GeoLite ASN database file and unzip it in -the current directory: - -$ wget https://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum2.zip -$ unzip GeoIPASNum2.zip - -Change back to the root working directory: - -$ cd ../ - - -Test the hourly data processing process ---------------------------------------- - -Run the data processing process that will afterwards be run once per hour. - -Create a .jar file: - -$ ant jar - -The initial run may take a while: - -$ java -DLOGBASE=/path/to/logfiles -Xmx4g -jar dist/onionoo-<version>.jar - - -Set up an hourly cronjob ------------------------- - -Add a crontab line similar to the command above: - -15 * * * * cd /srv/onionoo/ && java -DLOGBASE=/path/to/logfiles \ - -Xmx4g -jar dist/onionoo-<version>.jar - - -Run the web server ------------------- - -Create a .war file: - -$ ant war - -Start the Onionoo server - -$ java -DLOGBASE=/path/to/logfiles -Xmx4g -jar dist/onionoo-<version>.war - -The Onionoo server should now be available at -http://localhost:8080/. - - -Configure Embedded Jetty ------------------------- - -Settings for the embedded jetty can be found in etc/jetty.xml -If you change anything, run - -$ ant clean war - -again. - - -Configure logging ------------------ - -Logging can be configured inside etc/logback.xml -If you change anything, run - -$ ant clean war jar - -again. - -The command line option LOGBASE is the path for the log files. -In case you forget to set it, you'll find the logs in the current -path in the folder LOGBASE_IS_UNDEFINED/ - diff --git a/INSTALL.md b/INSTALL.md new file mode 100644 index 0000000..4c650bb --- /dev/null +++ b/INSTALL.md @@ -0,0 +1,258 @@ +# Onionoo Operator's Guide + +Welcome to Onionoo! Onionoo is a web-based protocol to learn about Tor relays +and bridges. Onionoo itself was not designed as a service for human beings—at +least not directly. Onionoo provides the data for other applications and +websites which in turn present Tor network status information to humans. + +This document describes how to set up your very own Onionoo instance. It was +written with an audience in mind that has at least some experience with running +services and is comfortable with the command line. It's not required that you +know how to read or even write Java code, though. + +Before we go ahead with setting up your Onionoo instance, let us pause for a +moment and reflect why you'd want to do that as opposed to simply using data +from an existing Onionoo instance. + +Onionoo is a service, and the best reason for running a Onionoo service +instance is to offer your collected Tor network data to others. + +Another reason might be to aggregate Tor network data, possibly from your +test-network and provide it to your working or research group. And of course +you might want to run an Onionoo instance for testing purposes. In all these +cases, setting up an Onionoo instance might make sense. + +However, if you only want to use Tor network data as a client, even as input for +another service you're developing, you don't have to and probably shouldn't run +an Onionoo instance. In that case it's sufficient to use the [Onionoo protocol] +(https://onionoo.torproject.org/protocol.html) or even one of [Onionoo's +clients] (https://onionoo.torproject.org/index.html) + + +## Setting up the host + +You'll need a host with at least 200G disk space and 8G RAM. + +In the following we'll assume that your host runs Debian stable as operating +system. Onionoo should run on any other Linux or possibly even *BSD, though +you'll be mostly on your own with those. And as Java is available on a variety +of other operating systems, those might work, too, but, again, you'll be on your +own. + +Onionoo does not require installing many or specific dependencies on the host +system. All it needs are a Java Runtime Environment version 7 or higher. + +The Onionoo service runs entirely under a non-privileged user account. Any +user account will do, but feel free to create a new user account just for the +Onionoo service, if you prefer. + +The Onionoo service requires running in a working directory where it can store +data and statistics files. This working directory currently is +```/srv/onionoo.torproject.org/onionoo```. + +Onionoo does not require setting up a database. + +This concludes the host setup. All following setup steps can be performed with +the non-privileged user account. + + +## Setting up the service + +### Obtaining the code + +Onionoo releases are available at: + +```https://dist.torproject.org/onionoo/``` + +Choose the latest tarball and signature file, verify the signature on the +tarball, and extract the tarball in a location of your choice which will create +a subdirectory called `onionoo-<version>/`. + + +### Obtaining additional data + +Onionoo uses an IP-to-city database and an IP-to-ASN database to provide +additional information about a relay's location. + +MaxMind GeoLite2 City is available at: +https://geolite.maxmind.com/download/geoip/database/GeoLite2-City-CSV.zip + +And the most recent MaxMind GeoLite ASN database file can be found at +https://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum2.zip + + +### Planning the service setup + +Currently Onionoo expects all files to be in the working folder +```/srv/onionoo.torproject.org/onionoo/``` +This is not as strict as it seems as this path can be a symbolic link. + +The updater needs to be run in `/srv/onionoo.torproject.org/onionoo/`, +but the web application war file can be started anywhere on the filesystem +as long as the executing user has access to everything in +`/srv/onionoo.torproject.org/onionoo/`. + +The additional data downloaded above needs to be unzipped to +```/srv/onionoo.torproject.org/onionoo/geoip``` + +Onionoo consists of a background updater with an internal scheduler and +an embedded Jetty web module. + +The release tarball contains an executable .jar file, the updater: + +```onionoo-<version>/generated/dist/signed/onionoo-<version>.jar``` + +Copy this .jar file into the working directory and run it: + +```java -jar collector-<version>.jar --help``` + +Onionoo will print the usage text for the updater. + +There is also an executable war file, the web application with an embedded +Jetty: + +```onionoo-<version>/generated/dist/signed/onionoo-<version>.war``` + +By default, Onionoo is configured to run the updater hourly and provide the +web pages on http://localhost:8080/. The exact timing for the hourly update +runs is logged at start-up. + + +### Performing the initial run + +When you have made a plan how to configure your Onionoo instance, take a +look at the usage imformation: + +```Please provide only a single execution: + [no argument] Run steps 1--3 repeatedly once per hour. + --single-run Run steps 1--3 only for a single time, then exit. + --download-only Only run step 1: download recent descriptors, then exit. + --update-only Only run step 2: update internal status files, then exit. + --write-only Only run step 3: write output document files, then exit. + --help Print out this help message and exit.``` + + +Run the Java process using: + +```java -Xmx4g -DLOGBASE=<your-log-dir> -jar onionoo-<version>.jar --single-run``` + +The option `-Xmx4g` sets the maximum heap space to 4G, which is based on the +recommended 8G total RAM size for the host. If you have more memory to spare, +feel free to adapt this option as needed. Note that there is no option to limit +the amount of disk space used. + +This may take a while. Read the logs to learn if the run was successful. + + +### Scheduling periodic runs + +The next step in setting up the Onionoo instance is to run continuously in the +background. Just omit the argument above, i.e.: + +```java -Xmx4g -DLOGBASE=<your-log-dir> -jar onionoo-<version>.jar``` + + +### Setting up the website + +Start the Onionoo server + +```java -Xmx4g -DLOGBASE=<your-log-dir> -jar onionoo-<version>.war``` + +Check the logs in <your-log-dir>. The Onionoo server should now be available +at http://localhost:8080/. The Onionoo protocol is available on your new +instance http://localhost:8080/protocol.html and also has some example links +to query your Onionoo instance. + +We recommend setting up an HTTP server that redirects to Onionoo. Please +consult your favorite http server documentation as this topic is not in the +scope of this document. + + +## Maintaining the service + +### Monitoring the service + +The most important information about your Onionoo instance is whether it is +alive. Otherwise, if it dies and you don't notice, you might be losing data +that is not available at the data sources anymore. You should set up a +notification mechanism of your choice to be informed quickly when the background +updater dies. + +Other than fatal issues, a good source for learning about issues with your +Onionoo instance are its logs. Be sure to read the logs every now and then, +and look out for warnings and errors. Maybe set up another notification to be +informed quickly of new warnings or errors. + + +### Changing logging options + +Onionoo uses Logback for logging and comes with a default logging +configuration that creates a common log file that rotates once per day and a +separate log file only for error level log statements as well as a statistics +logfile. If you want to change logging options, copy the default logging +configuration from `onionoo-<version>/src/main/resources/logback.xml` to your +working directory, edit your copy, and execute the .jar file as follows: + +```java -Xmx4g -DLOGBASE=<your-log-dir> -jar -cp .:onionoo-<version>.jar +org.torproject.onionoo.cron.Main``` + +Internally, Onionoo uses the Simple Logging Facade for Java (SLF4J) and ships +with the Logback implementation for SLF4J. If you prefer a different logging +framework, you can provide and use that instead. For more detailed information, +or if you have different logging needs, please refer to the [Logback +documentation](http://logback.qos.ch/), and for switching to a different +framework to the [SFL4J website](http://www.slf4j.org/). + + +### Changing configuration options + +Onionoo doesn't require configuration. If you're not happy with the scheduling +settings, you can configure your own scheduling pattern by using the `single-run` +command line argument and supply this line to an external scheduler. + +Settings for the embedded Jetty currently require usage of Ant, which is not +in scope for this document. The Jetty configuration can be found in +`onionoo-<version>/src/main/resources/jetty.xml` +If you change anything, run `ant clean war` and use the resulting war file in +`onionoo-<version>/generated/dist`. + + +### Stopping the service + +If you need to stop the background updater for some reason, like rebooting the +host, the Java process needs to be killed. Make sure by looking at the log, +that the update process is finished and idle. But, even if a run needs to be +forcefully interrupted, all should be fine again after the next completed round. + +The web application also just has to be terminated forcefully. + + +### Upgrading and downgrading + +If you need to upgrade to a newer release or downgrade to a previous release, +download that tarball and extract it, and copy over the executable .jar and +.war files. Stop the current service version as described above, possibly +adapt settings if necessary, and restart the Java processes using the new +.jar and .war files. Don't forget to update the version number in the command +that ensures that the executable files get executed automatically after a reboot. +Watch the logs to see if the upgrade or downgrade was successful. + + +### Backing up data and settings + +A backup of your Onionoo instance should include the directories `status` and +`out` in `/srv/onionoo.torproject.org/onionoo/`. + + +### Performing recurring tasks + +Most of Onionoo is designed to just run in the background forever. One +exception are the files in `/srv/onionoo.torproject.org/onionoo/geoip` that +should be updated once per month. + + +### Resolving common issues + +Onionoo might run into issues from time to time, but fortunately there are no +known issues that operators would have to be aware of. + diff --git a/README.md b/README.md index df71660..a18626f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ information to humans. Onionoo _users_ should head over to `https://onionoo.torproject.org/` to learn more about using Onionoo. -Onionoo _service operators_ should read `INSTALL`. +Onionoo _service operators_ should read `INSTALL.md`. Onionoo _contributors_ should start reading `CONTRIB.md` and, once it's available, run `ant doc` and read the generated JavaDocs.

1 0

[tor-browser/tor-browser-45.5.0esr-6.5-1] Bug 20707: Avoid localization failure in about:preferences
by gk＠torproject.org 22 Nov '16

22 Nov '16

commit 70b2e4769bc4a7dd877e8ca82403d71561dbeec8 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Nov 18 12:42:22 2016 -0800 Bug 20707: Avoid localization failure in about:preferences This fixes problem with our 20244 patches in non-US-English locales. If those patches are uplifted, then Mozilla can localize the strings. In the meantime, this patch removes our localizable strings from privacy.xul altogether. Our torbutton code overlays localized strings anyway. (This patch should not be uplifted.) --- browser/components/preferences/in-content/privacy.xul | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/components/preferences/in-content/privacy.xul index d180ee2..0487db7 100644 --- a/browser/components/preferences/in-content/privacy.xul +++ b/browser/components/preferences/in-content/privacy.xul @@ -137,8 +137,8 @@ <hbox align="center"> <checkbox id="thirdpartyIsolateCB" preference="privacy.thirdparty.isolate" - accesskey="&thirdpartyIsolate.accesskey;" - label="&thirdpartyIsolate.label;" + accesskey="R" + label="Restrict third party cookies and other tracking data" onsyncfrompreference="return gPrivacyPane.readThirdPartyIsolate();" onsynctopreference="return gPrivacyPane.writeThirdPartyIsolate();"/> </hbox> @@ -147,8 +147,8 @@ <hbox align="center"> <checkbox id="resistFingerprintingCB" preference="privacy.resistFingerprinting" - accesskey="&resistFingerprinting.accesskey;" - label="&resistFingerprinting.label;" /> + accesskey="F" + label="Change details that distinguish you from other Tor Browser users" /> </hbox> </vbox> </groupbox>

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 22 Nov '16

22 Nov '16

commit 8dd0130dfade191758fbeb50d4952a8d89415d52 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 22 19:15:07 2016 +0000 Update translations for bridgedb_completed --- es/LC_MESSAGES/bridgedb.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po index 6608147..c31a3bb 100644 --- a/es/LC_MESSAGES/bridgedb.po +++ b/es/LC_MESSAGES/bridgedb.po @@ -23,7 +23,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-11-22 18:42+0000\n" +"PO-Revision-Date: 2016-11-22 18:56+0000\n" "Last-Translator: strel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -143,7 +143,7 @@ msgstr "Ahora %s añade los puentes de red al Navegador Tor %s" #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "¡%sS%sólo dame puentes de red! " +msgstr "¡%sS%solo dame puentes de red! " #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" @@ -260,7 +260,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Además, BridgeDB tiene un montón de puentes de red sencillos %s sin ningún Pluggable Transport %s, lo que tal vez no suena tan molón, pero que aún pueden ayudar a eludir la censura en Internet en muchos casos.\n\n\n" +msgstr "Además, BridgeDB tiene un montón de puentes de red estándar %s sin ningún Pluggable Transport %s (transporte conectable), lo que tal vez no suena tan molón, pero que todavía pueden ayudar a eludir la censura en Internet en muchos casos.\n\n\n" #: bridgedb/strings.py:101 msgid "What are bridges?" @@ -281,7 +281,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "Otra forma de obtener puentes de red es enviar un correo electrónico a %s. Por favor, observe que tiene que enviar el correo usando la dirección de uno de los siguientes proveedores de correo:\n%s, %s o %s." +msgstr "Otra forma de obtener puentes de red es enviar un correo a %s. Por favor, observe que tiene que enviar el correo usando la dirección de uno de los siguientes proveedores de correo electrónico:\n%s, %s o %s." #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" @@ -350,7 +350,7 @@ msgstr "Para introducir puentes de red en el navegador Tor, primero vaya a la %s msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "Cuando el cuadro de 'Configuraciones de red Tor' aparezca, haz clic en 'Configurar'\ny sigue al asistente hasta que pregunte:" +msgstr "Cuando aparezca el cuadro 'Configuración de red Tor', haz clic en 'Configurar'\ny sigue al asistente hasta que pregunte:" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:155 @@ -366,7 +366,7 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Selecciona 'Sí' y luego haz clic en 'Siguiente'. Para configurar tus nuevos\npuentes, copia y pega las líneas de puentes en el cuadro de texto.\nPor último, haz clic en 'Conectar', ¡y listo! Si hay algún problema, prueba en el botón 'Ayuda' en el asistente de 'Configuraciones de red Tor' para asistencia adicional." +msgstr "Selecciona 'Sí' y luego haz clic en 'Siguiente'. Para configurar tus nuevos\npuentes, copia y pega las líneas de puentes de red en el recuadro de texto.\nPor último, haz clic en 'Conectar', ¡y listo! Si hay algún problema, prueba en el botón 'Ayuda' en el asistente de 'Configuración de red Tor' para asistencia adicional." #: bridgedb/strings.py:167 msgid "Displays this message."

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 22 Nov '16

22 Nov '16

commit 13ce041436ce70e87059ad532536c9f452976631 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 22 19:15:02 2016 +0000 Update translations for bridgedb --- es/LC_MESSAGES/bridgedb.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po index 6608147..c31a3bb 100644 --- a/es/LC_MESSAGES/bridgedb.po +++ b/es/LC_MESSAGES/bridgedb.po @@ -23,7 +23,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-11-22 18:42+0000\n" +"PO-Revision-Date: 2016-11-22 18:56+0000\n" "Last-Translator: strel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -143,7 +143,7 @@ msgstr "Ahora %s añade los puentes de red al Navegador Tor %s" #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "¡%sS%sólo dame puentes de red! " +msgstr "¡%sS%solo dame puentes de red! " #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" @@ -260,7 +260,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Además, BridgeDB tiene un montón de puentes de red sencillos %s sin ningún Pluggable Transport %s, lo que tal vez no suena tan molón, pero que aún pueden ayudar a eludir la censura en Internet en muchos casos.\n\n\n" +msgstr "Además, BridgeDB tiene un montón de puentes de red estándar %s sin ningún Pluggable Transport %s (transporte conectable), lo que tal vez no suena tan molón, pero que todavía pueden ayudar a eludir la censura en Internet en muchos casos.\n\n\n" #: bridgedb/strings.py:101 msgid "What are bridges?" @@ -281,7 +281,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "Otra forma de obtener puentes de red es enviar un correo electrónico a %s. Por favor, observe que tiene que enviar el correo usando la dirección de uno de los siguientes proveedores de correo:\n%s, %s o %s." +msgstr "Otra forma de obtener puentes de red es enviar un correo a %s. Por favor, observe que tiene que enviar el correo usando la dirección de uno de los siguientes proveedores de correo electrónico:\n%s, %s o %s." #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" @@ -350,7 +350,7 @@ msgstr "Para introducir puentes de red en el navegador Tor, primero vaya a la %s msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "Cuando el cuadro de 'Configuraciones de red Tor' aparezca, haz clic en 'Configurar'\ny sigue al asistente hasta que pregunte:" +msgstr "Cuando aparezca el cuadro 'Configuración de red Tor', haz clic en 'Configurar'\ny sigue al asistente hasta que pregunte:" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:155 @@ -366,7 +366,7 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Selecciona 'Sí' y luego haz clic en 'Siguiente'. Para configurar tus nuevos\npuentes, copia y pega las líneas de puentes en el cuadro de texto.\nPor último, haz clic en 'Conectar', ¡y listo! Si hay algún problema, prueba en el botón 'Ayuda' en el asistente de 'Configuraciones de red Tor' para asistencia adicional." +msgstr "Selecciona 'Sí' y luego haz clic en 'Siguiente'. Para configurar tus nuevos\npuentes, copia y pega las líneas de puentes de red en el recuadro de texto.\nPor último, haz clic en 'Conectar', ¡y listo! Si hay algún problema, prueba en el botón 'Ayuda' en el asistente de 'Configuración de red Tor' para asistencia adicional." #: bridgedb/strings.py:167 msgid "Displays this message."

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 22 Nov '16

22 Nov '16

commit f88841129fca6abb278d14caf882132ac5d226cb Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 22 18:45:08 2016 +0000 Update translations for bridgedb_completed --- es/LC_MESSAGES/bridgedb.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po index 185d522..6608147 100644 --- a/es/LC_MESSAGES/bridgedb.po +++ b/es/LC_MESSAGES/bridgedb.po @@ -23,7 +23,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-11-22 18:10+0000\n" +"PO-Revision-Date: 2016-11-22 18:42+0000\n" "Last-Translator: strel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,7 @@ msgstr "Mostrar código QR" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "Código QR para sus líneas de puente de red" +msgstr "Código QR para sus líneas de puentes de red" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -143,7 +143,7 @@ msgstr "Ahora %s añade los puentes de red al Navegador Tor %s" #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "¡Tan %sS%solo dame puentes de red! " +msgstr "¡%sS%sólo dame puentes de red! " #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" @@ -171,7 +171,7 @@ msgstr "¡%sS%sí!" #: bridgedb/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "%sO%sbtener bridges" +msgstr "%sG%set Bridges" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" @@ -179,7 +179,7 @@ msgstr "[Este es un mensaje automático; por favor no responda.]" #: bridgedb/strings.py:45 msgid "Here are your bridges:" -msgstr "Aquí tiene sus puentes de red (bridges):" +msgstr "Aquí tiene sus puentes de red:" #: bridgedb/strings.py:47 #, python-format @@ -191,7 +191,7 @@ msgstr "Ha excedido el límite de cuota. Por favor, ¡más despacio! El tiempo m #: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "COMMANDs: (combine COMMANDs para especificar múltiples opciones simultáneamente)" +msgstr "COMMANDs: (combine COMMANDs (comandos) para especificar múltiples opciones simultáneamente)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: bridgedb/strings.py:53 @@ -201,7 +201,7 @@ msgstr "¡Bienvenido a BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" -msgstr "Transport actualmente soportado TYPEs:" +msgstr "Transport TYPEs (tipos de transporte) soportados actualmente:" #: bridgedb/strings.py:56 #, python-format @@ -269,7 +269,7 @@ msgstr "¿Qué son los puentes de red?" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "Los %s puentes de red %s (bridges) son repetidores Tor que le ayudan a eludir la censura." +msgstr "Los %s puentes de red %s (bridges) son ciertos repetidores Tor que le ayudan a eludir la censura." #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" @@ -377,16 +377,16 @@ msgstr "Muestra este mensaje." #. "plain-ol'-vanilla" bridges. #: bridgedb/strings.py:171 msgid "Request vanilla bridges." -msgstr "Solicitar puente estándar." +msgstr "Solicitar puentes estándar." #: bridgedb/strings.py:172 msgid "Request IPv6 bridges." -msgstr "Solicitar puente IPv6." +msgstr "Solicitar puente de red IPv6." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." -msgstr "Solicitar un Pluggable Transport por TYPE." +msgstr "Solicitar un Pluggable Transport (transporte conectable) por TYPE (tipo)." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG".

1 0