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

[webwml/master] Updates links on the volunteering page related to Tor sub-projects
by sebastian＠torproject.org 21 Jun '16

21 Jun '16

commit a990a7f7ed4d4c1692bd5ed05fc3619ca7069e80 Author: Iain R. Learmonth <irl(a)debian.org> Date: Wed Jun 8 21:19:06 2016 +0100 Updates links on the volunteering page related to Tor sub-projects * Some URLs had (or were missing) trailing slashes which resulted in redirects. * All of the "bug tracker" links to the Tor trac were using old component names and have been updated. * The domain previously hosting the Incognito project website appears to have been taken over by a domain squatter, the link has been replaced with an archive.org link. * The homepage for Shadow is now hosted on GitHub, the umn.edu site has a redirect in place currently. * The ExperimenTor website is now available using HTTPS. * The txtorcon documentation is hosted on readthedocs which now uses a .io domain for the hosted documentation instead of the .org. * OONI now uses GitHub for code hosting and issue tracking. * The panopticlick PDF file on the EFF website has changed URL (the old URL producing a 404). --- getinvolved/en/volunteer.wml | 54 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index aaf8259..8aa3707 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -64,8 +64,8 @@ meetings around the world.</li> or how to use it. Some have already started on <a href="https://media.torproject.org/video/">Tor's Media server</a>, <a - href="http://www.howcast.com/videos/90601-How-To-Circumvent-an-Internet-Proxy">Howcast</a>, - and <a href="http://www.youtube.com/thetorproject">YouTube</a>.</li> + href="http://www.howcast.com/videos/90601-How-To-Circumvent-an-Internet-Proxy/">Howcast</a>, + and <a href="http://www.youtube.com/c/thetorproject">YouTube</a>.</li> <li>Create a poster around a theme, such as "Tor for Freedom!"</li> <li>Create a t-shirt design that incorporates "<a href="https://check.torproject.org/">Congratulations! You are using @@ -401,7 +401,7 @@ meetings around the world.</li> <a id="project-torbrowser"></a> <h3><a href="<page projects/torbrowser>">Tor Browser</a> (<a href="https://gitweb.torproject.org/tor-browser.git">code</a>, <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug + href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>, <a href="https://www.torproject.org/projects/torbrowser/design/">design doc</a>)</h3> <p> @@ -433,7 +433,7 @@ meetings around the world.</li> <a id="project-nyx"></a> <h3><a href="https://www.atagar.com/arm/">Nyx</a> (<a href="https://gitweb.torproject.org/nyx.git">code</a>, <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug + href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> <p> @@ -452,7 +452,7 @@ meetings around the world.</li> <a id="project-orbot"></a> <h3><a href="https://guardianproject.info/apps/orbot/">Orbot</a> (<a href="https://gitweb.torproject.org/orbot.git">code</a>, <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug + href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> <p> @@ -465,15 +465,15 @@ meetings around the world.</li> <h3><a href="https://tails.boum.org/">The Amnesic Incognito Live System</a> (<a href="https://git-tails.immerda.ch/tails/">code</a>, <a href="https://labs.riseup.net/code/projects/tails">bug - tracker</a>, <a href="https://tails.boum.org/doc">documentation</a>, <a + tracker</a>, <a href="https://tails.boum.org/doc/">documentation</a>, <a href="https://tails.boum.org/contribute/design/">design</a>, <a - href="https://tails.boum.org/contribute">contribute</a>)</h3> + href="https://tails.boum.org/contribute/">contribute</a>)</h3> <p> The Amnesic Incognito Live System is a live CD/USB distribution preconfigured so that everything is safely routed through Tor and leaves no trace on the local system. This is a merger of the Amnesia and <a - href="http://www.anonymityanywhere.com/incognito/">Incognito</a> projects, + href="https://web.archive.org/web/20080512054152/http://anonymityanywhere.com/inc…">Incognito</a> projects, and still under very active development. </p> @@ -490,7 +490,7 @@ meetings around the world.</li> <a id="project-torsocks"></a> <h3>Torsocks (<a href="https://gitweb.torproject.org/torsocks.git">code</a>, <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug + href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> <p> @@ -502,7 +502,7 @@ meetings around the world.</li> <a id="project-tormessenger"></a> <h3><a href="https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger">Tor Messenger</a> (<a href="https://gitweb.torproject.org/tor-messenger-build.git">code</a>, <a - href="https://trac.torproject.org/projects/tor/query?status=!closed&component=Tor…">bug tracker</a>)</h3> + href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> <p> Tor Messenger is a cross-platform chat program that aims to be secure by default and sends all of its traffic over Tor. @@ -521,7 +521,7 @@ meetings around the world.</li> <a id="project-obfsproxy"></a> <h3><a href="<page projects/obfsproxy>">Obfsproxy</a> (<a href="https://gitweb.torproject.org/pluggable-transports/obfsproxy.git">code</a>, - <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug + <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> <p> @@ -532,7 +532,7 @@ meetings around the world.</li> <a id="project-flash-proxy"></a> <h3><a href="https://crypto.stanford.edu/flashproxy/">Flash Proxy</a> (<a href="https://gitweb.torproject.org/flashproxy.git">code</a>, <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug + href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> <p> @@ -542,7 +542,7 @@ meetings around the world.</li> <a id="project-chutney"></a> <h3>Chutney (<a href="https://gitweb.torproject.org/chutney.git">code</a>, - <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug + <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> <p> @@ -551,7 +551,7 @@ meetings around the world.</li> </p> <a id="project-shadow"></a> - <h3><a href="https://shadow.cs.umn.edu/">Shadow</a> (<a + <h3><a href="http://shadow.github.io/">Shadow</a> (<a href="https://github.com/shadow">code</a>, <a href="https://github.com/shadow/shadow/issues">bug tracker</a>)</h3> @@ -561,7 +561,7 @@ meetings around the world.</li> Tor software as a plug-in. Shadow is open-source software that enables accurate, efficient, controlled, and repeatable Tor experimentation. For another simulator, see <a - href="http://crysp.uwaterloo.ca/software/exptor/">ExperimenTor</a>. + href="https://crysp.uwaterloo.ca/software/exptor/">ExperimenTor</a>. </p> <a id="project-stem"></a> @@ -581,7 +581,7 @@ meetings around the world.</li> </p> <a id="project-txtorcon"></a> - <h3><a href="https://txtorcon.readthedocs.org">Txtorcon</a> (<a + <h3><a href="https://txtorcon.readthedocs.io/en/latest/">Txtorcon</a> (<a href="https://github.com/meejah/txtorcon">code</a>, <a href="https://github.com/meejah/txtorcon/issues">bug tracker</a>)</h3> @@ -647,7 +647,7 @@ meetings around the world.</li> <a id="project-compass"></a> <h3><a href="https://compass.torproject.org/">Compass</a> (<a href="https://gitweb.torproject.org/compass.git">code</a>, <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug + href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> <p> @@ -658,7 +658,7 @@ meetings around the world.</li> <a id="project-onionoo"></a> <h3><a href="https://onionoo.torproject.org/">Onionoo</a> (<a href="https://gitweb.torproject.org/onionoo.git">code</a>, - <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> + <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> <p> Onionoo is a JSON based protocol to learn information about currently @@ -685,7 +685,7 @@ meetings around the world.</li> <a id="project-doctor"></a> <h3>DocTor (<a href="https://gitweb.torproject.org/doctor.git">code</a>, <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug + href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> <p> @@ -698,7 +698,7 @@ meetings around the world.</li> <a id="project-weather"></a> <h3><a href="https://trac.torproject.org/projects/tor/wiki/org/roadmaps/Weather">Weather</a> (<a href="https://gitweb.torproject.org/weather.git">code</a>, <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug + href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> <p> @@ -711,7 +711,7 @@ meetings around the world.</li> <a id="project-gettor"></a> <h3><a href="https://trac.torproject.org/projects/tor/wiki/org/roadmaps/GetTor">GetTor</a> (<a href="https://gitweb.torproject.org/gettor.git">code</a>, <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug + href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> <p> @@ -722,7 +722,7 @@ meetings around the world.</li> <a id="project-torcheck"></a> <h3><a href="https://trac.torproject.org/projects/tor/wiki/org/roadmaps/TorCheck">TorCheck</a> (<a href="https://gitweb.torproject.org/check.git">code</a>, <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug + href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> <p> @@ -732,7 +732,7 @@ meetings around the world.</li> <a id="project-bridgedb"></a> <h3><a href="https://trac.torproject.org/projects/tor/wiki/org/roadmaps/BridgeDB">BridgeDB</a> (<a href="https://gitweb.torproject.org/bridgedb.git">code</a>, <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug + href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> <p> @@ -742,8 +742,8 @@ meetings around the world.</li> <a id="project-ooni-probe"></a> <h3><a href="https://ooni.torproject.org/">Ooni Probe</a> (<a - href="https://gitweb.torproject.org/ooni-probe.git">code</a>, <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug + href="https://github.com/TheTorProject/ooni-probe/">code</a>, <a + href="https://github.com/TheTorProject/ooni-probe/issues">bug tracker</a>)</h3> <p> @@ -764,7 +764,7 @@ meetings around the world.</li> <a id="project-torflow"></a> <h3><a href="https://trac.torproject.org/projects/tor/wiki/org/roadmaps/TorFlow">TorFlow</a> (<a href="https://gitweb.torproject.org/torflow.git">code</a>, <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug + href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> <p> @@ -1104,7 +1104,7 @@ verification issues</a> as part of the application process. The <a href="https://panopticlick.eff.org">Panopticlick project by the EFF</a> revolutionized how people think about <a -href="https://panopticlick.eff.org/browser-uniqueness.pdf">browser +href="https://panopticlick.eff.org/static/browser-uniqueness.pdf">browser fingerprinting</a>, both by developing tests and metrics to measure browser fingerprintability, and by crowdsourcing the evaluation and contribution of individual browser features to overall fingerprintability.

1 0

[webwml/master] Add original widget.js and widget.min.js sources
by sebastian＠torproject.org 20 Jun '16

20 Jun '16

commit c85ec84cb843db158c846f3d52cddffa8104b366 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Jun 21 01:53:30 2016 +0200 Add original widget.js and widget.min.js sources --- rule-41/widget.js.orig | 381 +++++++++++++++++++++++++++++++++++++++++++++ rule-41/widget.min.js-orig | 42 +++++ 2 files changed, 423 insertions(+) diff --git a/rule-41/widget.js.orig b/rule-41/widget.js.orig new file mode 100644 index 0000000..4d6f7f6 --- /dev/null +++ b/rule-41/widget.js.orig @@ -0,0 +1,381 @@ +/* + + ______ ______ ______ + | ____| | ____| | ____| + | |__ | |__ | |__ + | __| | __| | __| + | |____ | | | | + |______| |_| |_| + + ============================================================================= + + Support the NoGlobalWarrants.org campaign by installing this banner on your site. + + <sina(a)eff.org> for support + + ============================================================================= + + @source: https://github.com/EFForg/ngw-banner + + @licstart The following is the entire license notice for the + JavaScript code in this page. + + Copyright (C) 2016 Electronic Frontier Foundation <https://eff.org> + + The JavaScript code in this page is free software: you can + redistribute it and/or modify it under the terms of the GNU + General Public License (GNU GPL) as published by the Free Software + Foundation, either version 3 of the License, or (at your option) any + later version. The code is distributed WITHOUT ANY WARRANTY; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU GPL for more details. + + As additional permission under GNU GPL version 3 section 7, you may + distribute non-source (e.g., minimized or compacted) forms of that + code without the copy of the GNU GPL normally required by section + 4, provided you include this license notice and a URL through which + recipients can access the Corresponding Source. + + @licend The above is the entire license notice for the JavaScript + code in this page. + +*/ + +// Wrap widget in function to protect scope +var _banner_config = (typeof banner_config !== 'undefined') ? banner_config : {}; + +(function (window, widgetConfig) { + + // Do configuration + widgetConfig.show_style = widgetConfig.show_style || 'banner'; + widgetConfig.debug = widgetConfig.debug || false; + widgetConfig.localAssets = widgetConfig.localAssets || false; + widgetConfig.callOnly = widgetConfig.callOnly || false; + widgetConfig.startAsMinimized = widgetConfig.startAsMinimized || false; + widgetConfig.disableDate = widgetConfig.disableDate || false; + widgetConfig.campaign = widgetConfig.campaign || 'noglobalwarrants'; + widgetConfig.cookieTimeout = widgetConfig.cookieTimeout || null; + + function debug() { + if (widgetConfig.debug) { + if (this.console) { + console.log.apply(console, arguments); + } + } + } + + // Setup + var activeCampaign; + var ASSET_URL; + + if (widgetConfig.localAssets) { + ASSET_URL = '../banner_content/'; + } else { + ASSET_URL = 'https://www.eff.org/ngw/banner_content/'; + } + + // Cookie helpers, taken from w3schools + function setCookie(c_name, value, seconds) { + var exdate = new Date(new Date().getTime() + seconds * 1000); + var c_value = escape(value) + ((seconds === null) ? '' : '; expires=' + + exdate.toUTCString()); + document.cookie = c_name + '=' + c_value; + } + + function getCookie(c_name) { + var c_value = document.cookie; + var c_start = c_value.indexOf(' ' + c_name + '='); + + if (c_start === -1) { + c_start = c_value.indexOf(c_name + '='); + } + + if (c_start === -1) { + c_value = null; + } else { + c_start = c_value.indexOf('=', c_start) + 1; + var c_end = c_value.indexOf(';', c_start); + if (c_end === -1) { c_end = c_value.length; } + c_value = unescape(c_value.substring(c_start, c_end)); + } + + return c_value; + } + + // Define checks + var checks = { + correctDate: function (callback) { + debug('correctDate()'); + + // This used to check the date by getting it from a server, but now just uses the device's local date. + + window.dateCallBackFailSafe = setTimeout(function () { + var today = new Date(); + if (today.getDate() === activeCampaign.runDate.day && today.getMonth() === activeCampaign.runDate.month - 1 && today.getFullYear() === activeCampaign.runDate.year) { + callback({activeToday: true}); + } else { + callback({activeToday: false}); + } + }, 1); + } + }; + + // Define campaigns + var campaign = { + noglobalwarrants: { + cookieName: 'noglobalwarrants_hasseen', + runDate: { + day: 21, + month: 6, // Use natural month, e.g. January = 1 + year: 2016 + }, + size: { + desktop: { + heightOpened: '300px', + heightMinimized: '50px' + }, + mobile: { + heightOpened: '100px', + heightMinimized: '0px' + } + }, + styles: { + banner: { + campaignSpacer: 'height: 50px;', + campaignContainer: 'background: #000; position: fixed; ' + + 'width: 100%; bottom: 0; left: 0; z-index: 100000; padding: 0; ' + + '-webkit-box-sizing: border-box; -moz-box-sizing: border-box;', + iframeContainer: 'position: relative; height: 350px; width: 100%; ' + + 'margin: 0; background: #08A013; z-index: 1;', + iframe: 'width: 100%; height: 100%; border: 0; margin: 0; ' + + 'padding: 0; background: #08A013;', + footerOverlay: 'cursor: pointer; position: absolute; bottom: 0; ' + + 'height: 50px; width: 100%; margin: 0; background: none; ' + + 'z-index: 2;', + closeButton: 'border: 0; height: 26px; width: 26px; ' + + 'cursor: pointer; position: absolute; top: 20px; right: 20px; ' + + 'background: url("' + ASSET_URL + 'imgs/close-button.png") no-repeat right top;', + mobileCloseButton: 'border: 0; height: 20px; width: 20px; ' + + 'cursor: pointer; position: absolute;top: 10px; right: 10px; ' + + 'background: url("' + ASSET_URL + + 'imgs/close-button-mobile.png") no-repeat right top;', + openButton: 'border: 0; height: 26px; width: 26px; ' + + 'cursor: pointer; position: absolute; bottom: 10px; ' + + 'right: 20px; background: url("' + ASSET_URL + + 'imgs/open-button.png") no-repeat right top;' + } + }, + minimized: false, + show: function (options) { + debug('show()', options); + + var cookie = getCookie(activeCampaign.cookieName); + + if (widgetConfig.startAsMinimized && cookie === null) { + this.minimized = true; + } + + var style = activeCampaign.styles[activeCampaign.config.show_style]; + + if (style.overlay) { + var overlay = document.createElement('div'); + overlay.style.cssText = style.overlay; + document.body.appendChild(overlay); + } + + // Create a spacer to prevent the container from covering up + // parts of the containing page when minimized + + if(document.getElementById("campaign-spacer")){ + document.body.removeChild(document.getElementById("campaign-spacer")); + } + + if(document.getElementById("campaign-container")){ + document.body.removeChild(document.getElementById("campaign-container")); + } + + var campaignSpacer = document.createElement('div'); + window.campaignSpacer = campaignSpacer; + campaignSpacer.style.cssText = style.campaignSpacer; + campaignSpacer.setAttribute("id", "campaign-spacer"); + campaignSpacer.setAttribute("class", "campaign-spacer"); + // Create a container + var campaignContainer = document.createElement('div'); + window.campaignContainer = campaignContainer; + campaignContainer.style.cssText = style.campaignContainer; + campaignContainer.setAttribute("id", "campaign-container"); + campaignContainer.setAttribute("class", "campaign-container"); + + // Create a container for the iframe so we can do padding and + // border-radius properly + var iframeContainer = document.createElement('div'); + + iframeContainer.style.cssText = style.iframeContainer; + + var e = document.documentElement, + g = document.getElementsByTagName('body')[0], + x = window.innerWidth || e.clientWidth || g.clientWidth; + + if (x < 767) { + if (!this.minimized) { + iframeContainer.style.height = '100px'; + } else { + iframeContainer.style.height = '0px'; + } + } else { + // Find out if user has minimized via cookie + if (this.minimized) { + iframeContainer.style.height = '50px'; + } else { + iframeContainer.style.height = activeCampaign.size.desktop.heightOpened; + } + var footerOverlay = document.createElement('div'); + footerOverlay.style.cssText = style.footerOverlay; + campaignContainer.appendChild(footerOverlay); + } + + // Append Iframe and campaign container to document + campaignContainer.appendChild(iframeContainer); + + document.body.appendChild(campaignSpacer); + document.body.appendChild(campaignContainer); + + var firstTime = true; + + if (cookie !== null) { + firstTime = false; + } + + // a Hack, if mobile set firsttime to false so splash page never shows + if (x < 767) { + firstTime = false; + } + + var iframe = document.createElement('iframe'); + + iframe.style.cssText = style.iframe; + + var us = iframe.src = ASSET_URL + activeCampaign.config.show_style + + '.html?firstTime=' + firstTime; + + iframeContainer.appendChild(iframe); + + var that = this; + + if (x > 767) { + that.fullSize = true; + // Setup a close button + var closeButton = document.createElement('button'); + closeButton.style.cssText = style.closeButton; + iframeContainer.appendChild(closeButton); + + // Setup a open button + var openButton = document.createElement('button'); + openButton.style.cssText = style.openButton; + iframeContainer.appendChild(openButton); + + if (this.minimized) { + openButton.style.display = 'block'; + closeButton.style.display = 'none'; + footerOverlay.style.display = 'block'; + } else { + openButton.style.display = 'none'; + closeButton.style.display = 'block'; + footerOverlay.style.display = 'none'; + } + + var toggleDisplay = function () { + if (!that.minimized) { + iframeContainer.style.height = '50px'; + that.minimized = true; + footerOverlay.style.display = 'block'; + closeButton.style.display = 'none'; + openButton.style.display = 'block'; + setCookie(activeCampaign.cookieName, '{"minimized": true}', + widgetConfig.cookieTimeout); + } else { + iframeContainer.style.height = '300px'; + that.minimized = false; + footerOverlay.style.display = 'none'; + openButton.style.display = 'none'; + closeButton.style.display = 'block'; + setCookie(activeCampaign.cookieName, '{"minimized": false}', + widgetConfig.cookieTimeout); + } + }; + + footerOverlay.onclick = toggleDisplay; + closeButton.onclick = toggleDisplay; + } else { + that.fullSize = false; + var mobileCloseButton = document.createElement('button'); + mobileCloseButton.style.cssText = style.mobileCloseButton; + iframeContainer.appendChild(mobileCloseButton); + debug(that.minimized); + if (that.minimized) { + + mobileCloseButton.style.display = 'none'; + } else { + mobileCloseButton.style.display = 'block'; + } + mobileCloseButton.onclick = function () { + setCookie(activeCampaign.cookieName, '{"minimized": true}', + widgetConfig.cookieTimeout); + document.body.removeChild(campaignContainer); + }; + } + }, + init: function (config) { + activeCampaign.config = config; + + var cookie = getCookie(activeCampaign.cookieName); + var that = this; + + if (cookie) { + this.minimized = JSON.parse(cookie).minimized; + } + + checks.correctDate(function (response) { + debug('correctDate() callback', response); + + clearTimeout(window.dateCallBackFailSafe); + + if (response && (response.activeToday || + widgetConfig.disableDate || widgetConfig.debug)) { + + activeCampaign.show({ + location: null, + widgetConfig: widgetConfig + }); + + if (window.addEventListener) window.addEventListener('resize', function() { + var w = window, + d = document, + e = d.documentElement, + g = d.getElementsByTagName('body')[0], + x = w.innerWidth || e.clientWidth || g.clientWidth, + y = w.innerHeight|| e.clientHeight|| g.clientHeight; + if((that.fullSize && x < 767) || (!that.fullSize && x > 767)) { + if(window.tdwfbResizeCallback) { + clearTimeout(window.tdwfbResizeCallback); + } + window.tdwfbResizeCallback = setTimeout(function () { + that.show({location: window.tdwfbLocation, widgetConfig: widgetConfig}); + windowWidth = x; + }, 50); + } + }, false); + } + }); + } + } + }; + + // Load campaign if it exists + if (typeof campaign[widgetConfig.campaign] !== 'undefined') { + activeCampaign = campaign[widgetConfig.campaign]; + activeCampaign.init(widgetConfig); + } else { + return false; + } +})(window, _banner_config); \ No newline at end of file diff --git a/rule-41/widget.min.js-orig b/rule-41/widget.min.js-orig new file mode 100644 index 0000000..ead54c3 --- /dev/null +++ b/rule-41/widget.min.js-orig @@ -0,0 +1,42 @@ +/* + + ______ ______ ______ + | ____| | ____| | ____| + | |__ | |__ | |__ + | __| | __| | __| + | |____ | | | | + |______| |_| |_| + + ============================================================================= + + Support the NoGlobalWarrants.org campaign by installing this banner on your site. + + <sina(a)eff.org> for support + + ============================================================================= + + @source: https://github.com/EFForg/ngw-banner + + @licstart The following is the entire license notice for the + JavaScript code in this page. + + Copyright (C) 2016 Electronic Frontier Foundation <https://eff.org> + + The JavaScript code in this page is free software: you can + redistribute it and/or modify it under the terms of the GNU + General Public License (GNU GPL) as published by the Free Software + Foundation, either version 3 of the License, or (at your option) any + later version. The code is distributed WITHOUT ANY WARRANTY; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU GPL for more details. + + As additional permission under GNU GPL version 3 section 7, you may + distribute non-source (e.g., minimized or compacted) forms of that + code without the copy of the GNU GPL normally required by section + 4, provided you include this license notice and a URL through which + recipients can access the Corresponding Source. + + @licend The above is the entire license notice for the JavaScript + code in this page. + +*/var _banner_config=typeof banner_config!=="undefined"?banner_config:{};(function(window,widgetConfig){widgetConfig.show_style=widgetConfig.show_style||"banner";widgetConfig.debug=widgetConfig.debug||false;widgetConfig.localAssets=widgetConfig.localAssets||false;widgetConfig.callOnly=widgetConfig.callOnly||false;widgetConfig.startAsMinimized=widgetConfig.startAsMinimized||false;widgetConfig.disableDate=widgetConfig.disableDate||false;widgetConfig.campaign=widgetConfig.campaign||"noglobalwarrants";widgetConfig.cookieTimeout=widgetConfig.cookieTimeout||null;function debug(){if(widgetConfig.debug){if(this.console){console.log.apply(console,arguments)}}}var activeCampaign;var ASSET_URL;if(widgetConfig.localAssets){ASSET_URL="../banner_content/"}else{ASSET_URL="https://www.eff.org/ngw/banner_content/"}function setCookie(c_name,value,seconds){var exdate=new Date((new Date).getTime()+seconds*1e3);var c_value=escape(value)+(seconds===null?"":"; expires="+exdate.toUTCString());document.cook ie=c_name+"="+c_value}function getCookie(c_name){var c_value=document.cookie;var c_start=c_value.indexOf(" "+c_name+"=");if(c_start===-1){c_start=c_value.indexOf(c_name+"=")}if(c_start===-1){c_value=null}else{c_start=c_value.indexOf("=",c_start)+1;var c_end=c_value.indexOf(";",c_start);if(c_end===-1){c_end=c_value.length}c_value=unescape(c_value.substring(c_start,c_end))}return c_value}var checks={correctDate:function(callback){debug("correctDate()");window.dateCallBackFailSafe=setTimeout(function(){var today=new Date;if(today.getDate()===activeCampaign.runDate.day&&today.getMonth()===activeCampaign.runDate.month-1&&today.getFullYear()===activeCampaign.runDate.year){callback({activeToday:true})}else{callback({activeToday:false})}},1)}};var campaign={noglobalwarrants:{cookieName:"noglobalwarrants_hasseen",runDate:{day:21,month:6,year:2016},size:{desktop:{heightOpened:"300px",heightMinimized:"50px"},mobile:{heightOpened:"100px",heightMinimized:"0px"}},styles:{banner:{campaignSpacer:"h eight: 50px;",campaignContainer:"background: #000; position: fixed; "+"width: 100%; bottom: 0; left: 0; z-index: 100000; padding: 0; "+"-webkit-box-sizing: border-box; -moz-box-sizing: border-box;",iframeContainer:"position: relative; height: 350px; width: 100%; "+"margin: 0; background: #08A013; z-index: 1;",iframe:"width: 100%; height: 100%; border: 0; margin: 0; "+"padding: 0; background: #08A013;",footerOverlay:"cursor: pointer; position: absolute; bottom: 0; "+"height: 50px; width: 100%; margin: 0; background: none; "+"z-index: 2;",closeButton:"border: 0; height: 26px; width: 26px; "+"cursor: pointer; position: absolute; top: 20px; right: 20px; "+'background: url("'+ASSET_URL+'imgs/close-button.png") no-repeat right top;',mobileCloseButton:"border: 0; height: 20px; width: 20px; "+"cursor: pointer; position: absolute;top: 10px; right: 10px; "+'background: url("'+ASSET_URL+'imgs/close-button-mobile.png") no-repeat right top;',openButton:"border: 0; height: 26px; width: 26px; "+"c ursor: pointer; position: absolute; bottom: 10px; "+'right: 20px; background: url("'+ASSET_URL+'imgs/open-button.png") no-repeat right top;'}},minimized:false,show:function(options){debug("show()",options);var cookie=getCookie(activeCampaign.cookieName);if(widgetConfig.startAsMinimized&&cookie===null){this.minimized=true}var style=activeCampaign.styles[activeCampaign.config.show_style];if(style.overlay){var overlay=document.createElement("div");overlay.style.cssText=style.overlay;document.body.appendChild(overlay)}if(document.getElementById("campaign-spacer")){document.body.removeChild(document.getElementById("campaign-spacer"))}if(document.getElementById("campaign-container")){document.body.removeChild(document.getElementById("campaign-container"))}var campaignSpacer=document.createElement("div");window.campaignSpacer=campaignSpacer;campaignSpacer.style.cssText=style.campaignSpacer;campaignSpacer.setAttribute("id","campaign-spacer");campaignSpacer.setAttribute("class","campaign-spa cer");var campaignContainer=document.createElement("div");window.campaignContainer=campaignContainer;campaignContainer.style.cssText=style.campaignContainer;campaignContainer.setAttribute("id","campaign-container");campaignContainer.setAttribute("class","campaign-container");var iframeContainer=document.createElement("div");iframeContainer.style.cssText=style.iframeContainer;var e=document.documentElement,g=document.getElementsByTagName("body")[0],x=window.innerWidth||e.clientWidth||g.clientWidth;if(x<767){if(!this.minimized){iframeContainer.style.height="100px"}else{iframeContainer.style.height="0px"}}else{if(this.minimized){iframeContainer.style.height="50px"}else{iframeContainer.style.height=activeCampaign.size.desktop.heightOpened}var footerOverlay=document.createElement("div");footerOverlay.style.cssText=style.footerOverlay;campaignContainer.appendChild(footerOverlay)}campaignContainer.appendChild(iframeContainer);document.body.appendChild(campaignSpacer);document.body.appendCh ild(campaignContainer);var firstTime=true;if(cookie!==null){firstTime=false}if(x<767){firstTime=false}var iframe=document.createElement("iframe");iframe.style.cssText=style.iframe;var us=iframe.src=ASSET_URL+activeCampaign.config.show_style+".html?firstTime="+firstTime;iframeContainer.appendChild(iframe);var that=this;if(x>767){that.fullSize=true;var closeButton=document.createElement("button");closeButton.style.cssText=style.closeButton;iframeContainer.appendChild(closeButton);var openButton=document.createElement("button");openButton.style.cssText=style.openButton;iframeContainer.appendChild(openButton);if(this.minimized){openButton.style.display="block";closeButton.style.display="none";footerOverlay.style.display="block"}else{openButton.style.display="none";closeButton.style.display="block";footerOverlay.style.display="none"}var toggleDisplay=function(){if(!that.minimized){iframeContainer.style.height="50px";that.minimized=true;footerOverlay.style.display="block";closeButton.styl e.display="none";openButton.style.display="block";setCookie(activeCampaign.cookieName,'{"minimized": true}',widgetConfig.cookieTimeout)}else{iframeContainer.style.height="300px";that.minimized=false;footerOverlay.style.display="none";openButton.style.display="none";closeButton.style.display="block";setCookie(activeCampaign.cookieName,'{"minimized": false}',widgetConfig.cookieTimeout)}};footerOverlay.onclick=toggleDisplay;closeButton.onclick=toggleDisplay}else{that.fullSize=false;var mobileCloseButton=document.createElement("button");mobileCloseButton.style.cssText=style.mobileCloseButton;iframeContainer.appendChild(mobileCloseButton);debug(that.minimized);if(that.minimized){mobileCloseButton.style.display="none"}else{mobileCloseButton.style.display="block"}mobileCloseButton.onclick=function(){setCookie(activeCampaign.cookieName,'{"minimized": true}',widgetConfig.cookieTimeout);document.body.removeChild(campaignContainer)}}},init:function(config){activeCampaign.config=config;var cook ie=getCookie(activeCampaign.cookieName);var that=this;if(cookie){this.minimized=JSON.parse(cookie).minimized}checks.correctDate(function(response){debug("correctDate() callback",response);clearTimeout(window.dateCallBackFailSafe);if(response&&(response.activeToday||widgetConfig.disableDate||widgetConfig.debug)){activeCampaign.show({location:null,widgetConfig:widgetConfig});if(window.addEventListener)window.addEventListener("resize",function(){var w=window,d=document,e=d.documentElement,g=d.getElementsByTagName("body")[0],x=w.innerWidth||e.clientWidth||g.clientWidth,y=w.innerHeight||e.clientHeight||g.clientHeight;if(that.fullSize&&x<767||!that.fullSize&&x>767){if(window.tdwfbResizeCallback){clearTimeout(window.tdwfbResizeCallback)}window.tdwfbResizeCallback=setTimeout(function(){that.show({location:window.tdwfbLocation,widgetConfig:widgetConfig});windowWidth=x},50)}},false)}})}}};if(typeof campaign[widgetConfig.campaign]!=="undefined"){activeCampaign=campaign[widgetConfig.campaign];a ctiveCampaign.init(widgetConfig)}else{return false}})(window,_banner_config); \ No newline at end of file

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 20 Jun '16

20 Jun '16

commit fbd2489c27400abfec15b5fdab4c425aa0ce0350 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 20 23:15:39 2016 +0000 Update translations for liveusb-creator_completed --- hu/hu.po | 141 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 76 insertions(+), 65 deletions(-) diff --git a/hu/hu.po b/hu/hu.po index 20da3b3..7f83d95 100644 --- a/hu/hu.po +++ b/hu/hu.po @@ -5,7 +5,8 @@ # Translators: # benewfy <benewfy(a)gmail.com>, 2015 # blackc0de <complic(a)vipmail.hu>, 2015 -# Blackywantscookies <gaborcika(a)citromail.hu>, 2014 +# Blackywantscookies, 2014 +# Blackywantscookies, 2016 # Gábor Ginál dr. <ginalgabor(a)gmail.com>, 2014 # kane <zsogelencser(a)gmail.com>, 2013 # Lajos Pasztor <mrlajos(a)gmail.com>, 2014 @@ -16,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-04 10:45+0200\n" -"PO-Revision-Date: 2015-08-09 23:54+0000\n" -"Last-Translator: benewfy <benewfy(a)gmail.com>\n" +"POT-Creation-Date: 2015-11-02 21:23+0100\n" +"PO-Revision-Date: 2016-06-20 22:55+0000\n" +"Last-Translator: Blackywantscookies\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +35,7 @@ msgstr "\"Klónozás & Telepítés\"" msgid "\"Install from ISO\"" msgstr "\"Telepítés ISO-ból\"" -#: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149 +#: ../liveusb/dialog.py:157 ../liveusb/launcher_ui.py:153 #, python-format msgid "%(distribution)s Installer" msgstr "%(distribution)s Telepítő" @@ -59,51 +60,61 @@ msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" msgid "%s already bootable" msgstr "%s már bootolható" -#: ../liveusb/launcher_ui.py:156 -msgid "" -"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" -"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" -"p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" -"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Kell segítség? Olvassa el a </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">dokumentációt</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" - -#: ../liveusb/launcher_ui.py:151 -msgid "" -"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" -"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" -"p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Másolja a futó Tail-okat az USB-re vagy SD kártyára. Minden adat a célmeghajtón el fog veszni.</span></p></body></html>" - -#: ../liveusb/launcher_ui.py:153 +#: ../liveusb/launcher_ui.py:160 msgid "" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Másolja a futó Tail-okat egy már telepített Tail eszközre. Ha vannak más adatok az eszközön, azok meg lesznek őrizve.</span></p></body></html>" +"</style></head><body style=\" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a>.</p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Segítségre van szükséged? Olvasd el a <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">dokumentációt</span></a>.</p></body></html>" #: ../liveusb/launcher_ui.py:155 msgid "" -"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" -"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" -"p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Frissítsen egy már telepített Tail eszközt az új ISO képről.</span></p></body></html>" +"<ul>\n" +"<li>Install Tails on another USB stick by copying the Tails system that you are currently using..</li>\n" +"\n" +"<li>The USB stick that you install on is formatted and all data is lost.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" +"\n" +"</ul>" +msgstr "<ul>\n<li>Telepítsd fel a Tails-t egy másik USB-re úgy, hogy átmásolod azt a Tails rendszert amit jelenleg használsz..</li>\n\n\n<li>Az USB amire telepítesz az formázva van és minden adat el van vesze róla.</li>\n\n<li>A titkosított tartós tárhelye a Tails USB-nek amit jelenleg használsz nincs lemásolva.</li>\n\n</ul>" + +#: ../liveusb/launcher_ui.py:157 +msgid "" +"<ul>\n" +"<li>Upgrade another Tails USB stick to the same version of Tails that you are currently using.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" +"\n" +"\n" +"</ul>" +msgstr "<ul>\n<li>Frissíts egy másik Tails USB-t ugyanazzal a Tails verzióval amit jelenleg használsz.</li>\n\n<li>A titkosított állandó tárhelye a Tails USB-nek amit frissítettél meg van őrizve.</li>\n\n<li>A titkosított állandó tárhelye a Tails USB-nek amit jelenleg használsz nincs lemásolva.</li>\n\n\n</ul>\n</ul>" + +#: ../liveusb/launcher_ui.py:159 +msgid "" +"<ul>\n" +"<li>Upgrade another Tails USB stick to the version of an ISO image.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" +"\n" +"</ul>" +msgstr "<ul>\n<li>Frissíts egy másik Tails USB-t, hogy egy ISO kép verzió legyen.</li>\n\n<li>A titkosított állandó tárhelye a Tails USB-nek amit frissítettél meg van őrizve.</li>\n\n<li>A titkosított állandó tárhelye a Tails USB-nek amit jelenleg használsz nincs lemásolva.</li>\n\n</ul>" -#: ../liveusb/dialog.py:154 +#: ../liveusb/dialog.py:161 msgid "Alt+B" msgstr "Alt+B" -#: ../liveusb/dialog.py:153 +#: ../liveusb/dialog.py:160 msgid "Browse" msgstr "Tallóz" -#: ../liveusb/dialog.py:160 +#: ../liveusb/dialog.py:167 msgid "" "By allocating extra space on your USB stick for a persistent overlay, you " "will be able to store data and make permanent modifications to your live " @@ -125,20 +136,6 @@ msgstr "Nem található" msgid "Cannot find device %s" msgstr "A(z) %s eszköz nem található" -#: ../liveusb/launcher_ui.py:150 -msgid "" -"Clone\n" -"&&\n" -"Install" -msgstr "Klónozás\n&&\nTelepítés" - -#: ../liveusb/launcher_ui.py:152 -msgid "" -"Clone\n" -"&&\n" -"Upgrade" -msgstr "Klónozás\n&&\nFrissítés" - #: ../liveusb/creator.py:417 #, python-format msgid "Creating %sMB persistent overlay" @@ -149,7 +146,7 @@ msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." msgstr "Az eszköz még nem csatolt, így nem meghatározható a szabad hely mennyisége." -#: ../liveusb/dialog.py:157 +#: ../liveusb/dialog.py:164 #, python-format msgid "Download %(distribution)s" msgstr "%(distribution)s letöltése" @@ -209,13 +206,19 @@ msgstr "Az ISO MD5 összeg ellenőrzése sikeres" msgid "ISO MD5 checksum verification failed" msgstr "Az ISO MD5 összeg ellenőrzése sikertelen" -#: ../liveusb/dialog.py:156 +#: ../liveusb/dialog.py:163 msgid "" "If you do not select an existing Live ISO, the selected release will be " "downloaded for you." msgstr "Ha nem választasz ki egy létező \"live\" ISO-t akkor a kijelölt kiadás fog letöltődni." -#: ../liveusb/dialog.py:165 +#: ../liveusb/launcher_ui.py:154 +msgid "" +"Install\n" +"by cloning" +msgstr "Telepítés\nklónozással" + +#: ../liveusb/dialog.py:172 msgid "Install Tails" msgstr "Tails telepítése" @@ -297,7 +300,7 @@ msgstr "A %(device)s eszköz partícionálása" msgid "Persistent Storage" msgstr "Állandó tároló" -#: ../liveusb/dialog.py:161 +#: ../liveusb/dialog.py:168 msgid "Persistent Storage (0 MB)" msgstr "Állandó tárhely (0 MB)" @@ -351,7 +354,7 @@ msgstr "A forrás típusa nem teszi lehetővé az ISO MD5 összeg ellenőrzésé msgid "Synchronizing data on disk..." msgstr "Adat lemezre szinkronizálása..." -#: ../liveusb/dialog.py:159 +#: ../liveusb/dialog.py:166 msgid "Target Device" msgstr "Cél eszköz" @@ -375,14 +378,14 @@ msgid "" "A more detailed error log has been written to '%(filename)s'." msgstr "Hiba történt a következő parancs futtatásakor: `%(command)s`.\nRészletes hiba bejegyzés készül a '%(filename)s' fájlba." -#: ../liveusb/dialog.py:151 +#: ../liveusb/dialog.py:158 msgid "" "This button allows you to browse for an existing Live system ISO that you " "have previously downloaded. If you do not select one, a release will be " "downloaded for you automatically." msgstr "Ezzel a gombbal böngészni tudsz egy létező live rendszer ISO-t amit előzőleg letöltöttél. Ha nem válsztasz ki egyet sem akkor automatikusan letöltődik." -#: ../liveusb/dialog.py:164 +#: ../liveusb/dialog.py:171 msgid "" "This button will begin the LiveUSB creation process. This entails " "optionally downloading a release (if an existing one wasn't selected), " @@ -390,19 +393,19 @@ msgid "" "installing the bootloader." msgstr "Ezzel a gombbal tudod megkezdeni a Live USB létrehozását. Opcionálisan letöltődik egy kiadás (ha nem válsztottál egyet sem), az ISO kicsomagolása az USB eszközre, állandó tárhely létrehozása és a rendszerbetöltő telepítése." -#: ../liveusb/dialog.py:158 +#: ../liveusb/dialog.py:165 msgid "" "This is the USB stick that you want to install your Live system on. This " "device must be formatted with the FAT filesystem." msgstr "Ez az USB eszköz amire telepíteni akarod a live rendszert. Az eszközt FAT fájlrendszerrel kell formázni." -#: ../liveusb/dialog.py:163 +#: ../liveusb/dialog.py:170 msgid "" "This is the progress bar that will indicate how far along in the LiveUSB " "creation process you are" msgstr "Ez mutatja a Live USB létrehozásának folyamatát" -#: ../liveusb/dialog.py:162 +#: ../liveusb/dialog.py:169 msgid "This is the status console, where all messages get written to." msgstr "Ez a státusz konzol, ahol minden üzenet kiíródik." @@ -531,11 +534,19 @@ msgstr "Nem támogatott fájlrendszer: %s\nKérem mentse le az adatait, majd ala msgid "Updating properties of system partition %(system_partition)s" msgstr "A rendszer partíciók tulajdonságának frissítése %(system_partition)s" -#: ../liveusb/launcher_ui.py:154 -msgid "Upgrade from ISO" -msgstr "Frissítés ISO-ból" +#: ../liveusb/launcher_ui.py:156 +msgid "" +"Upgrade\n" +"by cloning" +msgstr "Frissítés\nklónozással" + +#: ../liveusb/launcher_ui.py:158 +msgid "" +"Upgrade\n" +"from ISO" +msgstr "Frissítés\nISO-ból" -#: ../liveusb/dialog.py:152 +#: ../liveusb/dialog.py:159 msgid "Use existing Live system ISO" msgstr "Meglévő Live rendszer ISO használata" @@ -601,6 +612,6 @@ msgstr "Megpróbálhatja újra, így folytatva a letöltést" msgid "You must run this application as root" msgstr "Az alkalmazást root-ként kell futtatnia" -#: ../liveusb/dialog.py:155 +#: ../liveusb/dialog.py:162 msgid "or" msgstr "vagy"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 20 Jun '16

20 Jun '16

commit 7cbffd7c0c44dab8475d8c6491a96f36613c9f51 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 20 23:15:35 2016 +0000 Update translations for liveusb-creator --- hu/hu.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hu/hu.po b/hu/hu.po index 3ae54ed..7f83d95 100644 --- a/hu/hu.po +++ b/hu/hu.po @@ -5,7 +5,8 @@ # Translators: # benewfy <benewfy(a)gmail.com>, 2015 # blackc0de <complic(a)vipmail.hu>, 2015 -# Blackywantscookies <gaborcika(a)citromail.hu>, 2014 +# Blackywantscookies, 2014 +# Blackywantscookies, 2016 # Gábor Ginál dr. <ginalgabor(a)gmail.com>, 2014 # kane <zsogelencser(a)gmail.com>, 2013 # Lajos Pasztor <mrlajos(a)gmail.com>, 2014 @@ -17,8 +18,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2016-03-21 16:31+0000\n" -"Last-Translator: benewfy <benewfy(a)gmail.com>\n" +"PO-Revision-Date: 2016-06-20 22:55+0000\n" +"Last-Translator: Blackywantscookies\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -78,7 +79,7 @@ msgid "" "<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" "\n" "</ul>" -msgstr "" +msgstr "<ul>\n<li>Telepítsd fel a Tails-t egy másik USB-re úgy, hogy átmásolod azt a Tails rendszert amit jelenleg használsz..</li>\n\n\n<li>Az USB amire telepítesz az formázva van és minden adat el van vesze róla.</li>\n\n<li>A titkosított tartós tárhelye a Tails USB-nek amit jelenleg használsz nincs lemásolva.</li>\n\n</ul>" #: ../liveusb/launcher_ui.py:157 msgid "" @@ -91,7 +92,7 @@ msgid "" "\n" "\n" "</ul>" -msgstr "" +msgstr "<ul>\n<li>Frissíts egy másik Tails USB-t ugyanazzal a Tails verzióval amit jelenleg használsz.</li>\n\n<li>A titkosított állandó tárhelye a Tails USB-nek amit frissítettél meg van őrizve.</li>\n\n<li>A titkosított állandó tárhelye a Tails USB-nek amit jelenleg használsz nincs lemásolva.</li>\n\n\n</ul>\n</ul>" #: ../liveusb/launcher_ui.py:159 msgid "" @@ -103,7 +104,7 @@ msgid "" "<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" "\n" "</ul>" -msgstr "" +msgstr "<ul>\n<li>Frissíts egy másik Tails USB-t, hogy egy ISO kép verzió legyen.</li>\n\n<li>A titkosított állandó tárhelye a Tails USB-nek amit frissítettél meg van őrizve.</li>\n\n<li>A titkosított állandó tárhelye a Tails USB-nek amit jelenleg használsz nincs lemásolva.</li>\n\n</ul>" #: ../liveusb/dialog.py:161 msgid "Alt+B"

1 0

[torbirdy/master] Update port to 9150 (related to #19049)
by sukhbir＠torproject.org 20 Jun '16

20 Jun '16

commit de52ae9026cb207faf69e2218ec0a5e26009b220 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jun 20 10:29:52 2016 -0400 Update port to 9150 (related to #19049) --- chrome/content/preferences.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js index c843d3c..59fe209 100644 --- a/chrome/content/preferences.js +++ b/chrome/content/preferences.js @@ -41,7 +41,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { if (pub.prefs.getBoolPref("extensions.torbirdy.enigmail.throwkeyid")) { opts += "--throw-keyids "; } - var proxy = "socks5h://127.0.0.1:9050"; + var proxy = "socks5h://127.0.0.1:9150"; if (anonService === "jondo") { proxy = "http://127.0.0.1:4001"; }

1 0

[tor/master] util: zero target buffer of base*_encode/decode
by nickm＠torproject.org 20 Jun '16

20 Jun '16

commit 49e8f47505a64f46981e3caa8c167594ae6936ff Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Jun 20 13:47:19 2016 -0400 util: zero target buffer of base*_encode/decode Make sure to memset(0) the destination buffer so we don't leave any uninitialized data. Fixes #19462 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/common/util_format.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/common/util_format.c b/src/common/util_format.c index 009db7b..9009e1a 100644 --- a/src/common/util_format.c +++ b/src/common/util_format.c @@ -46,6 +46,9 @@ base32_encode(char *dest, size_t destlen, const char *src, size_t srclen) tor_assert(base32_encoded_size(srclen) <= destlen); tor_assert(destlen < SIZE_T_CEILING); + /* Make sure we leave no uninitialized data in the destination buffer. */ + memset(dest, 0, destlen); + for (i=0,bit=0; bit < nbits; ++i, bit+=5) { /* set v to the 16-bit value starting at src[bits/8], 0-padded. */ v = ((uint8_t)src[bit/8]) << 8; @@ -75,6 +78,7 @@ base32_decode(char *dest, size_t destlen, const char *src, size_t srclen) tor_assert((nbits/8) <= destlen); /* We need enough space. */ tor_assert(destlen < SIZE_T_CEILING); + /* Make sure we leave no uninitialized data in the destination buffer. */ memset(dest, 0, destlen); /* Convert base32 encoded chars to the 5-bit values that they represent. */ @@ -197,7 +201,8 @@ base64_encode(char *dest, size_t destlen, const char *src, size_t srclen, if (enclen > INT_MAX) return -1; - memset(dest, 0, enclen); + /* Make sure we leave no uninitialized data in the destination buffer. */ + memset(dest, 0, destlen); /* XXX/Yawning: If this ends up being too slow, this can be sped up * by separating the multiline format case and the normal case, and @@ -398,6 +403,7 @@ base64_decode(char *dest, size_t destlen, const char *src, size_t srclen) if (destlen > SIZE_T_CEILING) return -1; + /* Make sure we leave no uninitialized data in the destination buffer. */ memset(dest, 0, destlen); /* Iterate over all the bytes in src. Each one will add 0 or 6 bits to the @@ -472,6 +478,9 @@ base16_encode(char *dest, size_t destlen, const char *src, size_t srclen) tor_assert(destlen >= srclen*2+1); tor_assert(destlen < SIZE_T_CEILING); + /* Make sure we leave no uninitialized data in the destination buffer. */ + memset(dest, 0, destlen); + cp = dest; end = src+srclen; while (src<end) { @@ -532,6 +541,7 @@ base16_decode(char *dest, size_t destlen, const char *src, size_t srclen) if (destlen < srclen/2 || destlen > INT_MAX) return -1; + /* Make sure we leave no uninitialized data in the destination buffer. */ memset(dest, 0, destlen); end = src+srclen;

1 0

[torspec/master] prop250: fix typo in section 1.2
by dgoulet＠torproject.org 20 Jun '16

20 Jun '16

commit ab9952fce37c0084a27b39a660cb812c05789c8e Author: Ivan Markin <twim(a)riseup.net> Date: Mon Jun 20 14:57:17 2016 -0400 prop250: fix typo in section 1.2 Fixes #19469 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/250-commit-reveal-consensus.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/250-commit-reveal-consensus.txt b/proposals/250-commit-reveal-consensus.txt index 0e7675e..d386dcb 100644 --- a/proposals/250-commit-reveal-consensus.txt +++ b/proposals/250-commit-reveal-consensus.txt @@ -73,7 +73,7 @@ Supersedes: 225 However, directory authority operators feel unsafe running a third-party script that opens TCP ports and accepts connections from the Internet. Hence, this proposal aims to embed the commit-and-reveal idea in the Tor - voting process which should makes it smoother to deploy and maintain. + voting process which should make it smoother to deploy and maintain. Another idea proposed specifically for Tor is Nick Hopper's "A threshold signature-based proposal for a shared RNG" which was never turned into an

1 0

[tor/master] mark sanitize_blacklist.txt as obsolete
by nickm＠torproject.org 20 Jun '16

20 Jun '16

commit 400b425078c581bbeb8b5ebeaf45a1d3c22ee0f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 20 13:42:14 2016 -0400 mark sanitize_blacklist.txt as obsolete --- contrib/clang/sanitize_blacklist.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/contrib/clang/sanitize_blacklist.txt b/contrib/clang/sanitize_blacklist.txt index 03d1e70..c71cc4d 100644 --- a/contrib/clang/sanitize_blacklist.txt +++ b/contrib/clang/sanitize_blacklist.txt @@ -2,6 +2,17 @@ # syntax specified in http://clang.llvm.org/docs/SanitizerSpecialCaseList.html # for more info see http://clang.llvm.org/docs/AddressSanitizer.html +# +# Tor notes: This file is obsolete! +# +# It was necessary in order to apply the sanitizers to all of tor. But +# we don't believe that's a good idea: some parts of tor need constant-time +# behavior that is hard to guarantee with these sanitizers. +# +# If you need this behavior, then please consider --enable-expensive-hardening, +# and report bugs as needed. +# + # usage: # 1. configure tor build: # ./configure \

1 0

[tor/master] Patch from dgoulet: fix a base16 problem that manifested w stem
by nickm＠torproject.org 20 Jun '16

20 Jun '16

commit 2f75b34dcede23dad8835a941539935e82cf7988 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 20 13:37:45 2016 -0400 Patch from dgoulet: fix a base16 problem that manifested w stem --- src/or/control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/control.c b/src/or/control.c index f956307..6e5dcf6 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1264,7 +1264,7 @@ handle_control_authenticate(control_connection_t *conn, uint32_t len, password_len = i/2; password = tor_malloc(password_len + 1); if (base16_decode(password, password_len+1, body, i) - != (int) (password_len+1)) { + != (int) password_len) { connection_write_str_to_buf( "551 Invalid hexadecimal encoding. Maybe you tried a plain text " "password? If so, the standard requires that you put it in "

1 0

[tor/master] Coverage hack for test_switch_id.sh
by nickm＠torproject.org 20 Jun '16

20 Jun '16

commit 5fbd195918b4f5ad73130547c2ca58fd69baded0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 20 11:15:47 2016 -0400 Coverage hack for test_switch_id.sh This hack provides a way to make sure we can see coverage from test-switch-id. If you set OVERRIDE_GCDA_PERMISSIONS_HACK, we temporarily make the .gcda files mode 0666 before we run the test scripts, and then we set them to 0644 again afterwards. That's necessary because the test_switch_id.sh script does a setuid() to 'nobody' part way through, and drops the ability to change its mind back. --- src/test/test_switch_id.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/test/test_switch_id.sh b/src/test/test_switch_id.sh index 1b4e099..79c44f2 100755 --- a/src/test/test_switch_id.sh +++ b/src/test/test_switch_id.sh @@ -10,6 +10,10 @@ if test "`id -u nobody`" = ""; then exit 1 fi +if test "$OVERRIDE_GCDA_PERMISSIONS_HACK" = "yes"; then + find src -type f -name '*gcda' -print0 | xargs -0 chmod 0666 +fi + "${builddir:-.}/src/test/test-switch-id" nobody setuid || exit 1 "${builddir:-.}/src/test/test-switch-id" nobody root-bind-low || exit 1 "${builddir:-.}/src/test/test-switch-id" nobody setuid-strict || exit 1 @@ -19,6 +23,9 @@ fi "${builddir:-.}/src/test/test-switch-id" nobody have-caps || exit 1 "${builddir:-.}/src/test/test-switch-id" nobody setuid-keepcaps || exit 1 +if test "$OVERRIDE_GCDA_PERMISSIONS_HACK" = "yes"; then + find src -type f -name '*gcda' -print0 | xargs -0 chmod 0644 +fi echo "All okay"

1 0