- tor-commits - lists.torproject.org

[snowflake/master] Use reconnect timeout on client (#12)
by serene＠torproject.org 18 Feb '16

18 Feb '16

commit 8a2e7a6041f367a86e3c75df39b010c34649d3b7 Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Feb 17 19:53:11 2016 -0800 Use reconnect timeout on client (#12) --- client/client_test.go | 7 +++++++ client/rendezvous.go | 4 ++++ client/snowflake.go | 50 +++++++++++++++++++++++++------------------------- 3 files changed, 36 insertions(+), 25 deletions(-) diff --git a/client/client_test.go b/client/client_test.go index 399549a..546382f 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -39,6 +39,13 @@ func TestConnect(t *testing.T) { So(mock.destination.Bytes(), ShouldResemble, []byte("test")) }) + Convey("Receive answer fails on nil answer", func() { + c.reset = make(chan struct{}) + c.ReceiveAnswer() + answerChannel <- nil + <-c.reset + }) + Convey("Connect Loop", func() { // TODO }) diff --git a/client/rendezvous.go b/client/rendezvous.go index ea0b338..fe75b09 100644 --- a/client/rendezvous.go +++ b/client/rendezvous.go @@ -5,6 +5,7 @@ package main import ( "bytes" + "errors" "io/ioutil" "log" "net/http" @@ -66,6 +67,9 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( } defer resp.Body.Close() log.Printf("BrokerChannel Response:\n%s\n\n", resp.Status) + if http.StatusOK != resp.StatusCode { + return nil, errors.New("no answer from broker.") + } body, err := ioutil.ReadAll(resp.Body) if nil != err { return nil, err diff --git a/client/snowflake.go b/client/snowflake.go index 907c8ae..6d612ce 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -58,7 +58,7 @@ type SnowflakeChannel interface { // Implements net.Conn interface type webRTCConn struct { - config *webrtc.Configuration + config *webrtc.Configuration pc *webrtc.PeerConnection snowflake SnowflakeChannel // Interface holding the WebRTC DataChannel. broker *BrokerChannel @@ -108,7 +108,6 @@ func (c *webRTCConn) SetWriteDeadline(t time.Time) error { func (c *webRTCConn) PreparePeerConnection() { if nil != c.pc { - log.Printf("PeerConnection already exists.") c.pc.Close() c.pc = nil } @@ -135,12 +134,12 @@ func (c *webRTCConn) PreparePeerConnection() { }() } pc.OnIceCandidate = func(candidate webrtc.IceCandidate) { - log.Printf("OnIceCandidate %s", candidate.Serialize()) + log.Printf("WebRTC: OnIceCandidate %s", candidate.Serialize()) // Allow candidates to accumulate until OnIceComplete. } // TODO: This may soon be deprecated, consider OnIceGatheringStateChange. pc.OnIceComplete = func() { - log.Printf("OnIceComplete") + log.Printf("WebRTC: OnIceComplete") c.offerChannel <- pc.LocalDescription() } // This callback is not expected, as the Client initiates the creation @@ -150,6 +149,7 @@ func (c *webRTCConn) PreparePeerConnection() { panic("Unexpected OnDataChannel!") } c.pc = pc + log.Println("WebRTC: PeerConnection created.") } // Create a WebRTC DataChannel locally. @@ -189,6 +189,7 @@ func (c *webRTCConn) EstablishDataChannel() error { panic("short write") } } + log.Println("WebRTC: DataChannel created.") return nil } @@ -209,15 +210,9 @@ func (c *webRTCConn) SendOffer() error { log.Println("Sending offer via BrokerChannel...\nTarget URL: ", brokerURL, "\nFront URL: ", frontDomain) answer, err := c.broker.Negotiate(c.pc.LocalDescription()) - if nil != err { - log.Printf("BrokerChannel signaling error: %s", err) - return - } - if nil == answer { - log.Printf("BrokerChannel: No answer received.") - // TODO: Should try again here. - c.reset <- struct{}{} - return + if nil != err || nil == answer { + log.Printf("BrokerChannel error: %s", err) + answer = nil } answerChannel <- answer }() @@ -228,17 +223,21 @@ func (c *webRTCConn) SendOffer() error { return nil } -func (c *webRTCConn) ReceiveAnswer() error { - log.Printf("waiting for answer...") - answer, ok := <-answerChannel - if !ok { - // TODO: Don't just fail, try again! - c.pc.Close() - // connection.errorChannel <- errors.New("Bad answer") - return errors.New("Bad answer") - } - log.Printf("Received Answer:\n\n%s\n", answer.Sdp) - return c.pc.SetRemoteDescription(answer) +func (c *webRTCConn) ReceiveAnswer() { + go func() { + answer, ok := <-answerChannel + if !ok || nil == answer { + log.Printf("Failed to retrieve answer. Retrying in %d seconds", ReconnectTimeout) + <-time.After(time.Second * ReconnectTimeout) + c.reset <- struct{}{} + return + } + log.Printf("Received Answer:\n\n%s\n", answer.Sdp) + err := c.pc.SetRemoteDescription(answer) + if nil != err { + c.errorChannel <- err + } + }() } func (c *webRTCConn) sendData(data []byte) { @@ -259,10 +258,11 @@ func (c *webRTCConn) ConnectLoop() { // TODO: When go-webrtc is more stable, it's possible that a new // PeerConnection won't need to be recreated each time. // called once. - c.PreparePeerConnection() + c.PreparePeerConnection() c.EstablishDataChannel() c.SendOffer() c.ReceiveAnswer() + <-c.reset log.Println(" --- snowflake connection reset ---") }

1 0

[snowflake/master] Include answer channel as part of the webRTCConn struct (#12)
by serene＠torproject.org 18 Feb '16

18 Feb '16

commit a1b7e01c5423c69548afdf44c7455736605b5574 Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Feb 17 20:41:33 2016 -0800 Include answer channel as part of the webRTCConn struct (#12) --- client/client_test.go | 4 ++- client/snowflake.go | 78 ++++++++++++++++++++++++++++++++------------------- 2 files changed, 52 insertions(+), 30 deletions(-) diff --git a/client/client_test.go b/client/client_test.go index 546382f..ff15d6d 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -2,6 +2,7 @@ package main import ( "bytes" + "github.com/keroserene/go-webrtc" . "github.com/smartystreets/goconvey/convey" "testing" ) @@ -41,8 +42,9 @@ func TestConnect(t *testing.T) { Convey("Receive answer fails on nil answer", func() { c.reset = make(chan struct{}) + c.answerChannel = make(chan *webrtc.SessionDescription) c.ReceiveAnswer() - answerChannel <- nil + c.answerChannel <- nil <-c.reset }) diff --git a/client/snowflake.go b/client/snowflake.go index 6d612ce..081cb3b 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -28,7 +28,6 @@ var frontDomain string // When a connection handler starts, +1 is written to this channel; when it // ends, -1 is written. var handlerChan = make(chan int) -var answerChannel = make(chan *webrtc.SessionDescription) const ( ReconnectTimeout = 5 @@ -37,7 +36,6 @@ const ( func copyLoop(a, b net.Conn) { var wg sync.WaitGroup wg.Add(2) - go func() { io.Copy(b, a) wg.Done() @@ -46,8 +44,8 @@ func copyLoop(a, b net.Conn) { io.Copy(a, b) wg.Done() }() - wg.Wait() + log.Println("copy loop ended") } // Interface that matches both webrc.DataChannel and for testing. @@ -58,16 +56,17 @@ type SnowflakeChannel interface { // Implements net.Conn interface type webRTCConn struct { - config *webrtc.Configuration - pc *webrtc.PeerConnection - snowflake SnowflakeChannel // Interface holding the WebRTC DataChannel. - broker *BrokerChannel - offerChannel chan *webrtc.SessionDescription - errorChannel chan error - recvPipe *io.PipeReader - writePipe *io.PipeWriter - buffer bytes.Buffer - reset chan struct{} + config *webrtc.Configuration + pc *webrtc.PeerConnection + snowflake SnowflakeChannel // Interface holding the WebRTC DataChannel. + broker *BrokerChannel + offerChannel chan *webrtc.SessionDescription + answerChannel chan *webrtc.SessionDescription + errorChannel chan error + recvPipe *io.PipeReader + writePipe *io.PipeWriter + buffer bytes.Buffer + reset chan struct{} } var webrtcRemote *webRTCConn @@ -164,6 +163,9 @@ func (c *webRTCConn) EstablishDataChannel() error { } dc.OnOpen = func() { log.Println("WebRTC: DataChannel.OnOpen") + // if nil != c.snowflake { + // panic("PeerConnection snowflake already exists.") + // } // Flush the buffer, then enable datachannel. // TODO: Make this more safe dc.Send(c.buffer.Bytes()) @@ -175,14 +177,18 @@ func (c *webRTCConn) EstablishDataChannel() error { // Disable the DataChannel as a write destination. // Future writes will go to the buffer until a new DataChannel is available. log.Println("WebRTC: DataChannel.OnClose") - c.snowflake = nil - c.reset <- struct{}{} // Attempt to negotiate a new datachannel.. + if nil != c.snowflake { + c.snowflake = nil + // Only reset if this OnClose triggered + c.Reset() + } } dc.OnMessage = func(msg []byte) { log.Printf("OnMessage <--- %d bytes", len(msg)) n, err := c.writePipe.Write(msg) if err != nil { // TODO: Maybe shouldn't actually close. + log.Println("Error writing to SOCKS pipe") c.writePipe.CloseWithError(err) } if n != len(msg) { @@ -205,7 +211,7 @@ func (c *webRTCConn) SendOffer() error { log.Printf("----------------") return nil } - // Use Broker... + // Otherwise, use Broker. go func() { log.Println("Sending offer via BrokerChannel...\nTarget URL: ", brokerURL, "\nFront URL: ", frontDomain) @@ -214,7 +220,7 @@ func (c *webRTCConn) SendOffer() error { log.Printf("BrokerChannel error: %s", err) answer = nil } - answerChannel <- answer + c.answerChannel <- answer }() case err := <-c.errorChannel: c.pc.Close() @@ -225,11 +231,11 @@ func (c *webRTCConn) SendOffer() error { func (c *webRTCConn) ReceiveAnswer() { go func() { - answer, ok := <-answerChannel + answer, ok := <-c.answerChannel if !ok || nil == answer { log.Printf("Failed to retrieve answer. Retrying in %d seconds", ReconnectTimeout) <-time.After(time.Second * ReconnectTimeout) - c.reset <- struct{}{} + c.Reset() return } log.Printf("Received Answer:\n\n%s\n", answer.Sdp) @@ -247,6 +253,12 @@ func (c *webRTCConn) sendData(data []byte) { c.buffer.Write(data) return } + // Otherwise, flush buffer if necessary. + for c.buffer.Len() > 0 { + c.snowflake.Send(c.buffer.Bytes()) + log.Println("Flushed ", c.buffer.Len(), " bytes") + c.buffer.Reset() + } log.Printf("Write %d bytes --> WebRTC", len(data)) c.snowflake.Send(data) } @@ -256,18 +268,25 @@ func (c *webRTCConn) ConnectLoop() { for { log.Println("Establishing WebRTC connection...") // TODO: When go-webrtc is more stable, it's possible that a new - // PeerConnection won't need to be recreated each time. - // called once. + // PeerConnection won't need to be re-prepared each time. c.PreparePeerConnection() - c.EstablishDataChannel() - c.SendOffer() - c.ReceiveAnswer() - - <-c.reset - log.Println(" --- snowflake connection reset ---") + err := c.EstablishDataChannel() + if err == nil { + c.SendOffer() + c.ReceiveAnswer() + <-c.reset + log.Println(" --- snowflake connection reset ---") + } } } +func (c *webRTCConn) Reset() { + go func() { + c.reset <- struct{}{} // Attempt to negotiate a new datachannel.. + log.Println("WebRTC resetting...") + }() +} + // Initialize a WebRTC Connection. func dialWebRTC(config *webrtc.Configuration, broker *BrokerChannel) ( *webRTCConn, error) { @@ -275,6 +294,7 @@ func dialWebRTC(config *webrtc.Configuration, broker *BrokerChannel) ( connection.config = config connection.broker = broker connection.offerChannel = make(chan *webrtc.SessionDescription) + connection.answerChannel = make(chan *webrtc.SessionDescription) connection.errorChannel = make(chan error) connection.reset = make(chan struct{}) // Pipes remain the same even when DataChannel gets switched. @@ -363,10 +383,10 @@ func readSignalingMessages(f *os.File) { log.Printf("ignoring invalid signal message %+q", msg) continue } - answerChannel <- sdp + webrtcRemote.answerChannel <- sdp } log.Printf("close answerChannel") - close(answerChannel) + close(webrtcRemote.answerChannel) if err := s.Err(); err != nil { log.Printf("signal FIFO: %s", err) }

1 0

[snowflake/master] Snowflake client now using a reconnect loop (#12)
by serene＠torproject.org 18 Feb '16

18 Feb '16

commit f205a0be59aec40a04580cd46dad1bf6e9eba6c3 Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Feb 17 19:19:11 2016 -0800 Snowflake client now using a reconnect loop (#12) --- client/client_test.go | 4 ++ client/snowflake.go | 151 +++++++++++++++++++++++++++++--------------------- 2 files changed, 93 insertions(+), 62 deletions(-) diff --git a/client/client_test.go b/client/client_test.go index 7b8dad2..399549a 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -38,6 +38,10 @@ func TestConnect(t *testing.T) { So(c.buffer.Bytes(), ShouldEqual, nil) So(mock.destination.Bytes(), ShouldResemble, []byte("test")) }) + + Convey("Connect Loop", func() { + // TODO + }) }) }) diff --git a/client/snowflake.go b/client/snowflake.go index 771e90b..907c8ae 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -28,9 +28,12 @@ var frontDomain string // When a connection handler starts, +1 is written to this channel; when it // ends, -1 is written. var handlerChan = make(chan int) - var answerChannel = make(chan *webrtc.SessionDescription) +const ( + ReconnectTimeout = 5 +) + func copyLoop(a, b net.Conn) { var wg sync.WaitGroup wg.Add(2) @@ -55,14 +58,16 @@ type SnowflakeChannel interface { // Implements net.Conn interface type webRTCConn struct { + config *webrtc.Configuration pc *webrtc.PeerConnection - snowflake SnowflakeChannel // Interface holding the WebRTC DataChannel. + snowflake SnowflakeChannel // Interface holding the WebRTC DataChannel. broker *BrokerChannel offerChannel chan *webrtc.SessionDescription errorChannel chan error recvPipe *io.PipeReader writePipe *io.PipeWriter buffer bytes.Buffer + reset chan struct{} } var webrtcRemote *webRTCConn @@ -72,7 +77,6 @@ func (c *webRTCConn) Read(b []byte) (int, error) { } func (c *webRTCConn) Write(b []byte) (int, error) { - // log.Printf("webrtc Write %d %+q", len(b), string(b)) c.sendData(b) return len(b), nil } @@ -102,10 +106,56 @@ func (c *webRTCConn) SetWriteDeadline(t time.Time) error { return fmt.Errorf("SetWriteDeadline not implemented") } +func (c *webRTCConn) PreparePeerConnection() { + if nil != c.pc { + log.Printf("PeerConnection already exists.") + c.pc.Close() + c.pc = nil + } + pc, err := webrtc.NewPeerConnection(c.config) + if err != nil { + log.Printf("NewPeerConnection: %s", err) + c.errorChannel <- err + } + // Prepare PeerConnection callbacks. + pc.OnNegotiationNeeded = func() { + log.Println("WebRTC: OnNegotiationNeeded") + go func() { + offer, err := pc.CreateOffer() + // TODO: Potentially timeout and retry if ICE isn't working. + if err != nil { + c.errorChannel <- err + return + } + err = pc.SetLocalDescription(offer) + if err != nil { + c.errorChannel <- err + return + } + }() + } + pc.OnIceCandidate = func(candidate webrtc.IceCandidate) { + log.Printf("OnIceCandidate %s", candidate.Serialize()) + // Allow candidates to accumulate until OnIceComplete. + } + // TODO: This may soon be deprecated, consider OnIceGatheringStateChange. + pc.OnIceComplete = func() { + log.Printf("OnIceComplete") + c.offerChannel <- pc.LocalDescription() + } + // This callback is not expected, as the Client initiates the creation + // of the data channel, not the remote peer. + pc.OnDataChannel = func(channel *webrtc.DataChannel) { + log.Println("OnDataChannel") + panic("Unexpected OnDataChannel!") + } + c.pc = pc +} + // Create a WebRTC DataChannel locally. func (c *webRTCConn) EstablishDataChannel() error { dc, err := c.pc.CreateDataChannel("snowflake", webrtc.Init{}) - // Triggers "OnNegotiationNeeded" on the PeerConnection, which will prepare + // Triggers "OnNegotiationNeeded" on the PeerConnection, which will prepare // an SDP offer while other goroutines operating on this struct handle the // signaling. Eventually fires "OnOpen". if err != nil { @@ -126,7 +176,7 @@ func (c *webRTCConn) EstablishDataChannel() error { // Future writes will go to the buffer until a new DataChannel is available. log.Println("WebRTC: DataChannel.OnClose") c.snowflake = nil - // TODO: (Issue #12) Should attempt to renegotiate at this point. + c.reset <- struct{}{} // Attempt to negotiate a new datachannel.. } dc.OnMessage = func(msg []byte) { log.Printf("OnMessage <--- %d bytes", len(msg)) @@ -144,7 +194,7 @@ func (c *webRTCConn) EstablishDataChannel() error { // Block until an offer is available, then send it to either // the Broker or signal pipe. -func (c *webRTCConn) sendOffer() error { +func (c *webRTCConn) SendOffer() error { select { case offer := <-c.offerChannel: if "" == brokerURL { @@ -166,6 +216,7 @@ func (c *webRTCConn) sendOffer() error { if nil == answer { log.Printf("BrokerChannel: No answer received.") // TODO: Should try again here. + c.reset <- struct{}{} return } answerChannel <- answer @@ -177,6 +228,19 @@ func (c *webRTCConn) sendOffer() error { return nil } +func (c *webRTCConn) ReceiveAnswer() error { + log.Printf("waiting for answer...") + answer, ok := <-answerChannel + if !ok { + // TODO: Don't just fail, try again! + c.pc.Close() + // connection.errorChannel <- errors.New("Bad answer") + return errors.New("Bad answer") + } + log.Printf("Received Answer:\n\n%s\n", answer.Sdp) + return c.pc.SetRemoteDescription(answer) +} + func (c *webRTCConn) sendData(data []byte) { // Buffer the data in case datachannel isn't available yet. if nil == c.snowflake { @@ -188,72 +252,35 @@ func (c *webRTCConn) sendData(data []byte) { c.snowflake.Send(data) } +// WebRTC re-establishment loop. Expected in own goroutine. +func (c *webRTCConn) ConnectLoop() { + for { + log.Println("Establishing WebRTC connection...") + // TODO: When go-webrtc is more stable, it's possible that a new + // PeerConnection won't need to be recreated each time. + // called once. + c.PreparePeerConnection() + c.EstablishDataChannel() + c.SendOffer() + c.ReceiveAnswer() + <-c.reset + log.Println(" --- snowflake connection reset ---") + } +} + // Initialize a WebRTC Connection. func dialWebRTC(config *webrtc.Configuration, broker *BrokerChannel) ( *webRTCConn, error) { - pc, err := webrtc.NewPeerConnection(config) - if err != nil { - log.Printf("NewPeerConnection: %s", err) - return nil, err - } connection := new(webRTCConn) + connection.config = config connection.broker = broker - connection.pc = pc connection.offerChannel = make(chan *webrtc.SessionDescription) connection.errorChannel = make(chan error) + connection.reset = make(chan struct{}) // Pipes remain the same even when DataChannel gets switched. connection.recvPipe, connection.writePipe = io.Pipe() - pc.OnNegotiationNeeded = func() { - log.Println("OnNegotiationNeeded") - go func() { - offer, err := pc.CreateOffer() - // TODO: Potentially timeout and retry if ICE isn't working. - if err != nil { - connection.errorChannel <- err - return - } - err = pc.SetLocalDescription(offer) - if err != nil { - connection.errorChannel <- err - return - } - }() - } - pc.OnIceCandidate = func(candidate webrtc.IceCandidate) { - log.Printf("OnIceCandidate %s", candidate.Serialize()) - // Allow candidates to accumulate until OnIceComplete. - } - // TODO: This may soon be deprecated, consider OnIceGatheringStateChange. - pc.OnIceComplete = func() { - log.Printf("OnIceComplete") - connection.offerChannel <- pc.LocalDescription() - } - // This callback is not expected, as the Client initiates the creation - // of the data channel, not the remote peer. - pc.OnDataChannel = func(channel *webrtc.DataChannel) { - log.Println("OnDataChannel") - panic("Unexpected OnDataChannel!") - } - - connection.EstablishDataChannel() - - // TODO: Make this part of a re-establishment loop. - connection.sendOffer() - log.Printf("waiting for answer...") - answer, ok := <-answerChannel - if !ok { - // TODO: Don't just fail, try again! - pc.Close() - return nil, fmt.Errorf("no answer received") - } - log.Printf("Received Answer:\n\n%s\n", answer.Sdp) - err = pc.SetRemoteDescription(answer) - if err != nil { - pc.Close() - return nil, err - } - + go connection.ConnectLoop() return connection, nil }

1 0

[snowflake/master] Disconnections from websocket side also resets browser proxy
by serene＠torproject.org 18 Feb '16

18 Feb '16

commit e35687b587f219e8c1b1323e09765b3ec85daf69 Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Feb 17 19:55:43 2016 -0800 Disconnections from websocket side also resets browser proxy --- proxy/proxypair.coffee | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index e7adfb9..b8db513 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -63,7 +63,7 @@ class ProxyPair @connectRelay() channel.onclose = -> log 'WebRTC DataChannel closed.' - snowflake.ui.setStatus 'disconnected.' + snowflake.ui.setStatus 'disconnected by webrtc.' snowflake.ui.setActive false snowflake.state = MODE.INIT # Change this for multiplexing. @@ -105,6 +105,9 @@ class ProxyPair onClose: (event) => ws = event.target log ws.label + ' closed.' + snowflake.ui.setStatus 'disconnected.' + snowflake.ui.setActive false + snowflake.state = MODE.INIT @flush() @maybeCleanup()

1 0

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

18 Feb '16

commit 3ef2279d1762a0946f5fbce1ea162cc172515927 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 18 20:47:29 2016 +0000 Update translations for torbutton-abouttbupdatedtd_completed --- fi/abouttbupdate.dtd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fi/abouttbupdate.dtd b/fi/abouttbupdate.dtd new file mode 100644 index 0000000..a47156a --- /dev/null +++ b/fi/abouttbupdate.dtd @@ -0,0 +1,6 @@ +<!ENTITY aboutTBUpdate.title "Tor-selaimen Päivitys"> +<!ENTITY aboutTBUpdate.updated "Tor-selain päivitetty."> +<!ENTITY aboutTBUpdate.linkPrefix "Viimeisin ajantasainen informaatio tästä julkaisusta,"> +<!ENTITY aboutTBUpdate.linkLabel "vieraile verkkosivullamme"> +<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.changeLogHeading "Muutosloki:">

1 0

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

18 Feb '16

commit 86c50477d1df9178c69693747c77409c1a1d1c97 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 18 20:47:24 2016 +0000 Update translations for torbutton-abouttbupdatedtd --- fi/abouttbupdate.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi/abouttbupdate.dtd b/fi/abouttbupdate.dtd index dae2919..a47156a 100644 --- a/fi/abouttbupdate.dtd +++ b/fi/abouttbupdate.dtd @@ -3,4 +3,4 @@ <!ENTITY aboutTBUpdate.linkPrefix "Viimeisin ajantasainen informaatio tästä julkaisusta,"> <!ENTITY aboutTBUpdate.linkLabel "vieraile verkkosivullamme"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> +<!ENTITY aboutTBUpdate.changeLogHeading "Muutosloki:">

1 0

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

18 Feb '16

commit 8a4e9f391b725d26d7154dbe4bcadf49a141edbd Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 18 20:46:40 2016 +0000 Update translations for torbutton-abouttorproperties_completed --- fi/abouttor.properties | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/fi/abouttor.properties b/fi/abouttor.properties new file mode 100644 index 0000000..1d9db73 --- /dev/null +++ b/fi/abouttor.properties @@ -0,0 +1,21 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Hae <a href="%1$S">turvallisesti</a> <a href="%2$S">Startpage-hakukoneella</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Hae <a href="%1$S">turvallisesti</a> <a href="%2$S">DuckDuckGo-hakukoneella</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.searchDC.privacy=Hae <a href="%1$S">turvallisesti</a> <a href="%2$S">Disconnect.me-hakukoneella</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/

1 0

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

18 Feb '16

commit 224dc0cb25e0eeada962baee09fd57702908c267 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 18 20:46:33 2016 +0000 Update translations for torbutton-abouttorproperties --- fi/abouttor.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fi/abouttor.properties b/fi/abouttor.properties index d607324..1d9db73 100644 --- a/fi/abouttor.properties +++ b/fi/abouttor.properties @@ -2,19 +2,19 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +aboutTor.searchSP.privacy=Hae <a href="%1$S">turvallisesti</a> <a href="%2$S">Startpage-hakukoneella</a>. # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=Hae <a href="%1$S">turvallisesti</a> <a href="%2$S">DuckDuckGo-hakukoneella</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>. +aboutTor.searchDC.privacy=Hae <a href="%1$S">turvallisesti</a> <a href="%2$S">Disconnect.me-hakukoneella</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above.

1 0

[translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
by translation＠torproject.org 18 Feb '16

18 Feb '16

commit 6aa80ea7d70256e9a7437d7c5534931e1257fabd Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 18 20:46:22 2016 +0000 Update translations for tails-perl5lib_completed --- fi.po | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/fi.po b/fi.po index 97c68ff..48354d5 100644 --- a/fi.po +++ b/fi.po @@ -3,23 +3,35 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Jaakko Helleranta <jaakko(a)helleranta.com>, 2016 # Jorma Karvonen <karvonen.jorma(a)gmail.com>, 2015 +# Propa G, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-06-24 11:37+0200\n" -"PO-Revision-Date: 2015-03-04 15:22+0000\n" -"Last-Translator: Jorma Karvonen <karvonen.jorma(a)gmail.com>\n" -"Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n" +"POT-Creation-Date: 2016-01-25 16:59+0100\n" +"PO-Revision-Date: 2016-02-18 20:19+0000\n" +"Last-Translator: Jaakko Helleranta <jaakko(a)helleranta.com>\n" +"Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../lib/Tails/RunningSystem.pm:153 +#: ../lib/Tails/RunningSystem.pm:159 +msgid "Error" +msgstr "Virhe" + +#: ../lib/Tails/RunningSystem.pm:161 msgid "" "The device Tails is running from cannot be found. Maybe you used the `toram'" " option?" msgstr "Laitetta, jolta Tailsia käytetään, ei tunnistettu. Käytitkö käynnistäessä ’toram’-valitsinta?" + +#: ../lib/Tails/RunningSystem.pm:192 +msgid "" +"The drive Tails is running from cannot be found. Maybe you used the `toram' " +"option?" +msgstr "Asemaa josta Tails ajetaan, ei löydy. Ehkä käytit ’toram’-vaihtoehtoa?"

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 18 Feb '16

18 Feb '16

commit bfa4eefad563481bedd3f17d8e579e489529d4f7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 18 20:46:17 2016 +0000 Update translations for tails-perl5lib --- fi.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fi.po b/fi.po index df5bc85..48354d5 100644 --- a/fi.po +++ b/fi.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Jaakko Helleranta <jaakko(a)helleranta.com>, 2016 # Jorma Karvonen <karvonen.jorma(a)gmail.com>, 2015 # Propa G, 2016 msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-01-25 16:59+0100\n" -"PO-Revision-Date: 2016-02-07 22:48+0000\n" -"Last-Translator: Propa G\n" +"PO-Revision-Date: 2016-02-18 20:19+0000\n" +"Last-Translator: Jaakko Helleranta <jaakko(a)helleranta.com>\n" "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,7 @@ msgstr "" #: ../lib/Tails/RunningSystem.pm:159 msgid "Error" -msgstr "" +msgstr "Virhe" #: ../lib/Tails/RunningSystem.pm:161 msgid ""

1 0