- tor-commits - lists.torproject.org

[snowflake/master] Fix input handler
by arlo＠torproject.org 18 Mar '16

18 Mar '16

commit df2ea126c84d301e58f59ea08cc42662ed0a9f9a Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Mar 18 11:58:01 2016 -0700 Fix input handler --- proxy/package.json | 3 ++- proxy/snowflake.coffee | 2 +- proxy/ui.coffee | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/proxy/package.json b/proxy/package.json index 0a23eb4..b7e44df 100644 --- a/proxy/package.json +++ b/proxy/package.json @@ -8,7 +8,8 @@ }, "scripts": { "test": "cake test", - "lint": "cake lint" + "lint": "cake lint", + "build": "cake build" }, "author": "Serene Han", "license": "BSD-3-Clause", diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 9686f30..1cdccda 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -207,9 +207,9 @@ init = -> broker = new Broker brokerUrl snowflake = new Snowflake broker, ui - dbg 'Contacting Broker at ' + broker.url log '== snowflake proxy ==' log 'Copy-Paste mode detected.' if COPY_PASTE_ENABLED + dbg 'Contacting Broker at ' + broker.url if not COPY_PASTE_ENABLED relayAddr = Params.getAddress(query, 'relay', DEFAULT_RELAY) snowflake.setRelayAddr relayAddr diff --git a/proxy/ui.coffee b/proxy/ui.coffee index cb25216..c2f898f 100644 --- a/proxy/ui.coffee +++ b/proxy/ui.coffee @@ -22,7 +22,7 @@ class UI @$msglog.value = '' @$send = document.getElementById('send') - @$send.onclick = => { @acceptInput } + @$send.onclick = @acceptInput @$input = document.getElementById('input') @$input.focus()

1 0

[snowflake/master] per-proxypair Snowflake ID generation instead of just one for the Broker (#11)
by arlo＠torproject.org 18 Mar '16

18 Mar '16

commit b1e76420bd7c3838d128407c9822b089c0296bc2 Author: Serene Han <keroserene+git(a)gmail.com> Date: Mon Mar 14 22:12:28 2016 -0700 per-proxypair Snowflake ID generation instead of just one for the Broker (#11) --- proxy/broker.coffee | 19 +++++++------------ proxy/proxypair.coffee | 8 ++++++-- proxy/snowflake.coffee | 30 ++++++++++++++++++++++++------ proxy/spec/broker.spec.coffee | 6 +++--- proxy/util.coffee | 4 ++++ 5 files changed, 44 insertions(+), 23 deletions(-) diff --git a/proxy/broker.coffee b/proxy/broker.coffee index 78577e7..9eb378c 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -12,21 +12,16 @@ STATUS_GATEWAY_TIMEOUT = 504 MESSAGE_TIMEOUT = 'Timed out waiting for a client offer.' MESSAGE_UNEXPECTED = 'Unexpected status.' -genSnowflakeID = -> - Math.random().toString(36).substring(2) - # Represents a broker running remotely. class Broker clients: 0 - id: null # When interacting with the Broker, snowflake must generate a unique session # ID so the Broker can keep track of which signalling channel it's speaking # to. constructor: (@url) -> @clients = 0 - @id = genSnowflakeID() # Ensure url has the right protocol + trailing slash. @url = 'http://' + @url if 0 == @url.indexOf('localhost', 0) @url = 'https://' + @url if 0 != @url.indexOf('http', 0) @@ -37,7 +32,7 @@ class Broker # waits for a response containing some client offer that the Broker chooses # for this proxy.. # TODO: Actually support multiple clients. - getClientOffer: => + getClientOffer: (id) => new Promise (fulfill, reject) => xhr = new XMLHttpRequest() xhr.onreadystatechange = -> @@ -53,12 +48,12 @@ class Broker snowflake.ui.setStatus ' failure. Please refresh.' reject MESSAGE_UNEXPECTED @_xhr = xhr # Used by spec to fake async Broker interaction - @_postRequest xhr, 'proxy', @id + @_postRequest id, xhr, 'proxy', id # Assumes getClientOffer happened, and a WebRTC SDP answer has been generated. # Sends it back to the broker, which passes it to back to the original client. - sendAnswer: (answer) -> - dbg @id + ' - Sending answer back to broker...\n' + sendAnswer: (id, answer) -> + dbg id + ' - Sending answer back to broker...\n' dbg answer.sdp xhr = new XMLHttpRequest() xhr.onreadystatechange = -> @@ -73,14 +68,14 @@ class Broker dbg 'Broker ERROR: Unexpected ' + xhr.status + ' - ' + xhr.statusText snowflake.ui.setStatus ' failure. Please refresh.' - @_postRequest xhr, 'answer', JSON.stringify(answer) + @_postRequest id, xhr, 'answer', JSON.stringify(answer) # urlSuffix for the broker is different depending on what action # is desired. - _postRequest: (xhr, urlSuffix, payload) => + _postRequest: (id, xhr, urlSuffix, payload) => try xhr.open 'POST', @url + urlSuffix - xhr.setRequestHeader('X-Session-ID', @id) + xhr.setRequestHeader('X-Session-ID', id) catch err ### An exception happens here when, for example, NoScript allows the domain diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index db53612..3a3fb01 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -3,6 +3,8 @@ Represents a single: client <-- webrtc --> snowflake <-- websocket --> relay +Every ProxyPair has a Snowflake ID, which is necessary when responding to the +Broker with an WebRTC answer. ### class ProxyPair @@ -16,10 +18,12 @@ class ProxyPair running: true active: false # Whether serving a client. flush_timeout_id: null - onCleanup: null + onCleanup: null + id: null constructor: (@clientAddr, @relayAddr, @rateLimit) -> @active = false + @id = genSnowflakeID() # Prepare a WebRTC PeerConnection and await for an SDP offer. begin: -> @@ -38,7 +42,7 @@ class ProxyPair if COPY_PASTE_ENABLED Signalling.send @pc.localDescription else - snowflake.broker.sendAnswer @pc.localDescription + snowflake.broker.sendAnswer @id, @pc.localDescription # OnDataChannel triggered remotely from the client when connection succeeds. @pc.ondatachannel = (dc) => channel = dc.channel diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index e8c00aa..7cc01c9 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -84,6 +84,9 @@ class Snowflake for i in [1..CONNECTIONS_PER_CLIENT] @makeProxyPair @relayAddr return if COPY_PASTE_ENABLED + log 'ProxyPair Slots: ' + @proxyPairs.length + log 'Snowflake IDs: ' + (@proxyPairs.map (p) -> p.id).join ' | ' + timer = null # Temporary countdown. countdown = (msg, sec) => @@ -99,22 +102,37 @@ class Snowflake msg = 'polling for client... ' msg += '[retries: ' + @retries + ']' if @retries > 0 @ui.setStatus msg - recv = @broker.getClientOffer() - @retries++ + # Pick an available ProxyPair to poll with. + pair = @nextAvailableProxyPair() + if !pair + log 'No more available ProxyPair slots.' + countdown(err, DEFAULT_BROKER_POLL_INTERVAL / 1000) + return + log 'Polling for ' + pair.id + recv = @broker.getClientOffer pair.id recv.then (desc) => offer = JSON.parse desc dbg 'Received:\n\n' + offer.sdp + '\n' - @receiveOffer offer + console.log desc + sdp = new RTCSessionDescription offer + # @receiveOffer offer + if pair.receiveWebRTCOffer sdp + @sendAnswer pair if 'offer' == sdp.type , (err) -> countdown(err, DEFAULT_BROKER_POLL_INTERVAL / 1000) + @retries++ findClients() + # Returns the first ProxyPair that's available to connect. + nextAvailableProxyPair: -> + return @proxyPairs.find (pp, i, arr) -> return !pp.active + # Receive an SDP offer from some client assigned by the Broker, + # TODO: remove receiveOffer: (desc) => sdp = new RTCSessionDescription desc - # Use the first proxyPair that's available. - pair = @proxyPairs.find (pp, i, arr) -> return !pp.active + pair = @nextAvailableProxyPair() if pair.receiveWebRTCOffer sdp @sendAnswer pair if 'offer' == sdp.type @@ -190,7 +208,7 @@ init = -> broker = new Broker brokerUrl snowflake = new Snowflake broker, ui - dbg 'Contacting Broker at ' + broker.url + '\nSnowflake ID: ' + broker.id + dbg 'Contacting Broker at ' + broker.url log '== snowflake proxy ==' log 'Copy-Paste mode detected.' if COPY_PASTE_ENABLED diff --git a/proxy/spec/broker.spec.coffee b/proxy/spec/broker.spec.coffee index db936c1..aef115f 100644 --- a/proxy/spec/broker.spec.coffee +++ b/proxy/spec/broker.spec.coffee @@ -76,9 +76,9 @@ describe 'Broker', -> it 'responds to the broker with answer', -> b = new Broker 'fake' spyOn(b, '_postRequest') - b.sendAnswer 123 + b.sendAnswer 'fake id', 123 expect(b._postRequest).toHaveBeenCalledWith( - jasmine.any(Object), 'answer', '123') + 'fake id', jasmine.any(Object), 'answer', '123') it 'POST XMLHttpRequests to the broker', -> b = new Broker 'fake' @@ -86,7 +86,7 @@ describe 'Broker', -> spyOn(b._xhr, 'open') spyOn(b._xhr, 'setRequestHeader') spyOn(b._xhr, 'send') - b._postRequest b._xhr, 'test', 'data' + b._postRequest 0, b._xhr, 'test', 'data' expect(b._xhr.open).toHaveBeenCalled() expect(b._xhr.setRequestHeader).toHaveBeenCalled() expect(b._xhr.send).toHaveBeenCalled() diff --git a/proxy/util.coffee b/proxy/util.coffee index ea65e63..a5b247c 100644 --- a/proxy/util.coffee +++ b/proxy/util.coffee @@ -5,6 +5,10 @@ Contains helpers for parsing query strings and other utilities. ### +genSnowflakeID = -> + Math.random().toString(36).substring(2) + + Query = ### Parse a URL query string or application/x-www-form-urlencoded body. The

1 0

[snowflake/master] better checks on receiveOffer (#11)
by arlo＠torproject.org 18 Mar '16

18 Mar '16

commit 490b8b33b78e318267088d79e362a44d88cc8228 Author: Serene Han <keroserene+git(a)gmail.com> Date: Tue Mar 15 20:13:39 2016 -0700 better checks on receiveOffer (#11) --- proxy/proxypair.coffee | 4 +++- proxy/snowflake.coffee | 35 +++++++++++++++-------------------- proxy/spec/snowflake.spec.coffee | 16 ++++++++++++---- 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index 3a3fb01..3ed6c6c 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -51,7 +51,9 @@ class ProxyPair @client = channel receiveWebRTCOffer: (offer) -> - console.assert 'offer' == offer.type + if 'offer' != offer.type + log 'Invalid SDP received -- was not an offer.' + return false try err = @pc.setRemoteDescription offer catch e diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 7cc01c9..4f38029 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -50,12 +50,11 @@ CONFIRMATION_MESSAGE = "You're currently serving a Tor user via Snowflake." # Minimum viable snowflake for now - just 1 client. class Snowflake - relayAddr: null + relayAddr: null proxyPairs: [] - - rateLimit: null - state: MODE.INIT - retries: 0 + rateLimit: null + state: MODE.INIT + retries: 0 constructor: (@broker, @ui) -> rateLimitBytes = undefined @@ -108,16 +107,8 @@ class Snowflake log 'No more available ProxyPair slots.' countdown(err, DEFAULT_BROKER_POLL_INTERVAL / 1000) return - log 'Polling for ' + pair.id recv = @broker.getClientOffer pair.id - recv.then (desc) => - offer = JSON.parse desc - dbg 'Received:\n\n' + offer.sdp + '\n' - console.log desc - sdp = new RTCSessionDescription offer - # @receiveOffer offer - if pair.receiveWebRTCOffer sdp - @sendAnswer pair if 'offer' == sdp.type + recv.then (desc) => @receiveOffer pair, desc , (err) -> countdown(err, DEFAULT_BROKER_POLL_INTERVAL / 1000) @retries++ @@ -129,12 +120,16 @@ class Snowflake return @proxyPairs.find (pp, i, arr) -> return !pp.active # Receive an SDP offer from some client assigned by the Broker, - # TODO: remove - receiveOffer: (desc) => - sdp = new RTCSessionDescription desc - pair = @nextAvailableProxyPair() - if pair.receiveWebRTCOffer sdp - @sendAnswer pair if 'offer' == sdp.type + # |pair| - an available ProxyPair. + receiveOffer: (pair, desc) => + console.assert !pair.active + try + offer = JSON.parse desc + dbg 'Received:\n\n' + offer.sdp + '\n' + sdp = new RTCSessionDescription offer + @sendAnswer pair if pair.receiveWebRTCOffer sdp + catch e + log 'ERROR: Unable to receive Offer: ' + e sendAnswer: (pair) -> next = (sdp) -> diff --git a/proxy/spec/snowflake.spec.coffee b/proxy/spec/snowflake.spec.coffee index ca7661b..417b6e6 100644 --- a/proxy/spec/snowflake.spec.coffee +++ b/proxy/spec/snowflake.spec.coffee @@ -47,14 +47,22 @@ describe 'Snowflake', -> expect(s.retries).toBe 1 expect(s.broker.getClientOffer).toHaveBeenCalled() - it 'receives SDP offer', -> + it 'receives SDP offer and sends answer', -> s = new Snowflake(new FakeBroker(), fakeUI) - s.proxyPairs[0] = { receiveWebRTCOffer: -> } - spyOn(s.proxyPairs[0], 'receiveWebRTCOffer').and.returnValue true + pair = { receiveWebRTCOffer: -> } + spyOn(pair, 'receiveWebRTCOffer').and.returnValue true spyOn(s, 'sendAnswer') - s.receiveOffer { 'type': 'offer', 'sdp': 'foo' } + s.receiveOffer pair, '{"type":"offer","sdp":"foo"}' expect(s.sendAnswer).toHaveBeenCalled() + it 'does not send answer when receiving invalid offer', -> + s = new Snowflake(new FakeBroker(), fakeUI) + pair = { receiveWebRTCOffer: -> } + spyOn(pair, 'receiveWebRTCOffer').and.returnValue false + spyOn(s, 'sendAnswer') + s.receiveOffer pair, '{"type":"not a good offer","sdp":"foo"}' + expect(s.sendAnswer).not.toHaveBeenCalled() + it 'can make a proxypair', -> s = new Snowflake(new FakeBroker(), fakeUI) s.makeProxyPair()

1 0

[snowflake/master] snowflake proxy continues to poll broker until at capacity (#11)
by arlo＠torproject.org 18 Mar '16

18 Mar '16

commit afd814773ac8cdc4ad4f3d2eac05b0e41ff6f964 Author: Serene Han <keroserene+git(a)gmail.com> Date: Thu Mar 17 15:57:38 2016 -0700 snowflake proxy continues to poll broker until at capacity (#11) --- proxy/snowflake.coffee | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 4f38029..9686f30 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -85,11 +85,14 @@ class Snowflake return if COPY_PASTE_ENABLED log 'ProxyPair Slots: ' + @proxyPairs.length log 'Snowflake IDs: ' + (@proxyPairs.map (p) -> p.id).join ' | ' + @pollBroker() - timer = null - # Temporary countdown. + # Regularly poll Broker for clients to serve until this snowflake is + # serving at capacity, at which point stop polling. + pollBroker: -> + # Temporary countdown. TODO: Simplify countdown = (msg, sec) => - @ui.setStatus msg + ' (Retrying in ' + sec + ' seconds...)' + @ui.setStatus msg + ' (Polling in ' + sec + ' seconds...)' sec-- if sec >= 0 setTimeout((-> countdown(msg, sec)), 1000) @@ -97,18 +100,18 @@ class Snowflake findClients() # Poll broker for clients. findClients = => - clearTimeout timer - msg = 'polling for client... ' - msg += '[retries: ' + @retries + ']' if @retries > 0 - @ui.setStatus msg - # Pick an available ProxyPair to poll with. pair = @nextAvailableProxyPair() if !pair - log 'No more available ProxyPair slots.' - countdown(err, DEFAULT_BROKER_POLL_INTERVAL / 1000) + log 'At client capacity.' + # Do nothing until a new proxyPair is available. return + msg = 'polling for client... ' + msg += '[retries: ' + @retries + ']' if @retries > 0 + @ui.setStatus msg recv = @broker.getClientOffer pair.id - recv.then (desc) => @receiveOffer pair, desc + recv.then (desc) => + @receiveOffer pair, desc + countdown('Serving 1 new client.', DEFAULT_BROKER_POLL_INTERVAL / 1000) , (err) -> countdown(err, DEFAULT_BROKER_POLL_INTERVAL / 1000) @retries++ @@ -144,6 +147,7 @@ class Snowflake pair.onCleanup = (event) => # Delete from the list of active proxy pairs. @proxyPairs.splice(@proxyPairs.indexOf(pair), 1) + @pollBroker() pair.begin() # Stop all proxypairs.

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 18 Mar '16

18 Mar '16

commit a5e2dd962a0c5a0081e7d6d462768d3c858894ab Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 18 13:45:04 2016 +0000 Update translations for bridgedb --- lt/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lt/LC_MESSAGES/bridgedb.po b/lt/LC_MESSAGES/bridgedb.po index a461f49..9369b17 100644 --- a/lt/LC_MESSAGES/bridgedb.po +++ b/lt/LC_MESSAGES/bridgedb.po @@ -13,7 +13,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-03-18 13:15+0000\n" +"PO-Revision-Date: 2016-03-18 13:20+0000\n" "Last-Translator: AG <aiste.gvildyte(a)gmail.com>\n" "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n" "MIME-Version: 1.0\n" @@ -77,7 +77,7 @@ msgstr "" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "" +msgstr "Įvyko klaida įkeliant jūsų QR kodą." #: bridgedb/https/templates/bridges.html:73 msgid "" @@ -275,7 +275,7 @@ msgstr "" #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" -msgstr "" +msgstr "Mano tiltai neveikia! Man reikia pagalbos!" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:117

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 18 Mar '16

18 Mar '16

commit 1d2cbce18dd87267ab7c33a75124cba122611b17 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 18 13:15:04 2016 +0000 Update translations for bridgedb --- lt/LC_MESSAGES/bridgedb.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lt/LC_MESSAGES/bridgedb.po b/lt/LC_MESSAGES/bridgedb.po index b274592..a461f49 100644 --- a/lt/LC_MESSAGES/bridgedb.po +++ b/lt/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# AG <aiste.gvildyte(a)gmail.com>, 2016 # Moo, 2015 # Saule Papeckyte <saule.papeckyte(a)gmail.com>, 2015 # Edgaras7 <system(a)vippsystems.com>, 2014 @@ -12,8 +13,8 @@ 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: 2015-12-02 23:02+0000\n" -"Last-Translator: Moo\n" +"PO-Revision-Date: 2016-03-18 13:15+0000\n" +"Last-Translator: AG <aiste.gvildyte(a)gmail.com>\n" "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,11 +56,11 @@ msgstr "Kontaktai" #: bridgedb/https/templates/bridges.html:35 msgid "Select All" -msgstr "" +msgstr "Pažymėti viską" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "" +msgstr "Rodyti QR kodą" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines"

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 18 Mar '16

18 Mar '16

commit c2676d3f68e750f0640cc21ac8bfd0f0d67dd3ec Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 18 09:15:49 2016 +0000 Update translations for torbutton-torbuttonproperties --- hr/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr/torbutton.properties b/hr/torbutton.properties index d303488..750e733 100644 --- a/hr/torbutton.properties +++ b/hr/torbutton.properties @@ -62,7 +62,7 @@ torbutton.slider_notification_button = Open security settings torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? +canvas.siteprompt=Ova stranica (%S) je pokušala izvući podatke HTML5 slike, koji mogu biti korišteni kako bi se unikatno identificiralo Vaše računalo.\n\nTreba li Tor Browser dopustiti ovoj stranici izvlačenje podataka HTML5 slike? canvas.notNow=Ne sada canvas.notNowAccessKey=N canvas.allow=Dozvoli ubuduce

1 0

[translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
by translation＠torproject.org 18 Mar '16

18 Mar '16

commit 70ad50e375f0c61ed4060607b48fe20b647dcf72 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 18 08:46:17 2016 +0000 Update translations for torbutton-aboutdialogdtd --- hr/aboutdialog.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr/aboutdialog.dtd b/hr/aboutdialog.dtd index 5099ad7..ba59803 100644 --- a/hr/aboutdialog.dtd +++ b/hr/aboutdialog.dtd @@ -1,4 +1,4 @@ -<!ENTITY project.start "&brandShortName; is developed by "> +<!ENTITY project.start "&brandShortName; razvija">  <!ENTITY project.tpoLink "the &vendorShortName;"> <!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online.">

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 18 Mar '16

18 Mar '16

commit 68115a5ee5df4510bb3af27b8a335abb652c5a14 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 18 08:46:09 2016 +0000 Update translations for tor-and-https --- hr.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hr.po b/hr.po index 8446c65..e0cc440 100644 --- a/hr.po +++ b/hr.po @@ -1,13 +1,14 @@ # # Translators: +# Igor <lyricaltumor(a)gmail.com>, 2016 # Vlado V. <vlays(a)mail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+0000\n" -"PO-Revision-Date: 2015-04-28 15:33+0000\n" -"Last-Translator: Vlado V. <vlays(a)mail.com>\n" -"Language-Team: Croatian (http://www.transifex.com/projects/p/torproject/language/hr/)\n" +"PO-Revision-Date: 2016-03-18 08:19+0000\n" +"Last-Translator: Igor <lyricaltumor(a)gmail.com>\n" +"Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,7 +21,7 @@ msgstr "" #. languages (e.g. Arabic or Hebrew). #: C/tor-and-https.svg:3 msgid "ltr" -msgstr "" +msgstr "s lijeva nadesno" #. (itstool) path: svg/title #: C/tor-and-https.svg:14

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 18 Mar '16

18 Mar '16

commit 23945f4e6d354942dbb8face04feba7189dbe47a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 18 08:46:00 2016 +0000 Update translations for torbutton-torbuttondtd --- hr/torbutton.dtd | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/hr/torbutton.dtd b/hr/torbutton.dtd index d493f00..ad18093 100644 --- a/hr/torbutton.dtd +++ b/hr/torbutton.dtd @@ -24,7 +24,7 @@ <!ENTITY torbutton.pref_connection_more_info.text "Torbutton je trenutno omogućen. Ukoliko želite promijeniti Vaše ne-Tor proxy postavke, molimo Vas da onemogućite Torbutton i vratite se ovdje. Ukoliko želite promijeniti Vaše Tor postavke, molimo Vas, koristite prozor Torbutton postavki."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site"> +<!ENTITY torbutton.context_menu.new_circuit "Novi Tor krug za ovu stranicu"> <!ENTITY torbutton.context_menu.new_circuit_key "Z"> <!ENTITY torbutton.context_menu.toggle "Promijeni Tor status"> <!ENTITY torbutton.context_menu.toggle.key "P"> @@ -36,7 +36,7 @@ <!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Provjeri Nadogradnje za Tor Pretraživač.."> <!ENTITY torbutton.context_menu.downloadUpdate.key "O"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections…"> +<!ENTITY torbutton.context_menu.cookieProtections "Zaštita kolačića..."> <!ENTITY torbutton.context_menu.cookieProtections.key "Z"> <!ENTITY torbutton.context_menu.copyTor "Kopiraj Tor URL"> <!ENTITY torbutton.context_menu.copyTor.key "k"> @@ -152,34 +152,34 @@ <!ENTITY torbutton.prefs.sec_caption "Nivo Sigurnosti"> <!ENTITY torbutton.prefs.sec_low "Nisko (zadano)"> <!ENTITY torbutton.prefs.sec_low_usable_desc "Ovo pruža najupotrebljiviji doživljaj."> -<!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled."> +<!ENTITY torbutton.prefs.sec_low_desc "Na ovoj sigurnosnoj razini, sve značajke preglednika su omogućene."> +<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Mehanizam za prikaz SVG OpenType fonta je onemogućen."> <!ENTITY torbutton.prefs.sec_med_low "Srednje-Nisko"> <!ENTITY torbutton.prefs.sec_gen_desc "Na ovom sigurnosnom nivou, primjenjuju se sljedeće promjene (prijeđi mišem za detalje)"> <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video i audio mediji postaju klik-za-pokrenuti prek NoScripte."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "Možda ćete morati koristiti NoScript alatnu traku na nekim stranicama kako bi omogućili ove medijske objekte."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Neke JavaScript optimizacije performansi su isključene."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "Skripte mogu biti sporije na nekim stranicama."> <!ENTITY torbutton.prefs.sec_jar_desc "Udaljene JAR datoteke su blokirane."> <!ENTITY torbutton.prefs.sec_jar_tooltip "JAR datoteke su ekstremno rijetke ne webu, ali mogu biti izvor XSS i ostalih napada."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> +<!ENTITY torbutton.prefs.sec_mathml_desc "Neki mehanizmi prikaza matematičkih jednadžbi su onemogućeni."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML je onemogućen."> <!ENTITY torbutton.prefs.sec_med_high "Srednje-Visoko"> <!ENTITY torbutton.prefs.sec_all_jit_desc "Sve JavaScript optimizacije performansi su onemogućene."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> +<!ENTITY torbutton.prefs.sec_font_rend_desc "Neke značajke prikazivanja fontoca su onemogućene."> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Mehanizam za prikaz Graphite fonta je onemogućen."> <!ENTITY torbutton.prefs.sec_svg_desc "Neki tipovi slika su onemogućeni."> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG format je onemogućen."> <!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript je onemogućen po zadanom na svim ne-HTTPS stranicama."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript može biti omogućen posebice za svaku stranicu putem gumba na NoScript alatnoj traci."> <!ENTITY torbutton.prefs.sec_high "Visoko"> <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript je onemogućen po zadanom na svim stranicama."> <!ENTITY torbutton.prefs.sec_audio_video_desc "Većina audio i video formata su onemogućeni."> -<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled."> +<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM je jedini kodek koji ostaje omogućen."> <!ENTITY torbutton.prefs.sec_webfonts_desc "Neki fontovi i ikone mogu biti netočno prikazani."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Fontovi pružani od strane web-stranica su blokirani."> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> -<!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> +<!ENTITY torbutton.prefs.sec_custom "Prilagođene vrijednosti"> +<!ENTITY torbutton.circuit_display.title "Tor krug za ovu stranicu">

1 0