January 2022 - tor-commits - lists.torproject.org

[snowflake/main] Refactor event logger setting into function call
by shelikhoo＠torproject.org 25 Jan '22

25 Jan '22

commit 657aaa6ba8b5baadc0d34d9bd0df0914cbc813e3 Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Thu Jan 20 13:17:34 2022 +0000 Refactor event logger setting into function call See also: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow… --- client/lib/snowflake.go | 17 +++++++++++++---- client/snowflake.go | 7 +------ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/client/lib/snowflake.go b/client/lib/snowflake.go index 4f9e663..0f637f2 100644 --- a/client/lib/snowflake.go +++ b/client/lib/snowflake.go @@ -71,6 +71,10 @@ func (addr dummyAddr) String() string { return "dummy" } // https://github.com/Pluggable-Transports/Pluggable-Transports-spec/blob/mast… type Transport struct { dialer *WebRTCDialer + + // EventDispatcher is the event bus for snowflake events. + // When an important event happens, it will be distributed here. + eventDispatcher event.SnowflakeEventDispatcher } // ClientConfig defines how the SnowflakeClient will connect to the broker and Snowflake proxies. @@ -93,9 +97,6 @@ type ClientConfig struct { // Max is the maximum number of snowflake proxy peers that the client should attempt to // connect to. Defaults to 1. Max int - // EventDispatcher is the event bus for snowflake events. - // When an important event happens, it will be distributed here. - EventDispatcher event.SnowflakeEventDispatcher } // NewSnowflakeClient creates a new Snowflake transport client that can spawn multiple @@ -135,7 +136,8 @@ func NewSnowflakeClient(config ClientConfig) (*Transport, error) { if config.Max > max { max = config.Max } - transport := &Transport{dialer: NewWebRTCDialer4E(broker, iceServers, max, config.EventDispatcher)} + eventsLogger := event.NewSnowflakeEventDispatcher() + transport := &Transport{dialer: NewWebRTCDialer4E(broker, iceServers, max, eventsLogger), eventDispatcher: eventsLogger} return transport, nil } @@ -191,6 +193,13 @@ func (t *Transport) Dial() (net.Conn, error) { cleanup = nil return &SnowflakeConn{Stream: stream, sess: sess, pconn: pconn, snowflakes: snowflakes}, nil } +func (t *Transport) AddSnowflakeEventListener(receiver event.SnowflakeEventReceiver) { + t.eventDispatcher.AddSnowflakeEventListener(receiver) +} + +func (t *Transport) RemoveSnowflakeEventListener(receiver event.SnowflakeEventReceiver) { + t.eventDispatcher.RemoveSnowflakeEventListener(receiver) +} // SetRendezvousMethod sets the rendezvous method to the Snowflake broker. func (t *Transport) SetRendezvousMethod(r RendezvousMethod) { diff --git a/client/snowflake.go b/client/snowflake.go index 0ab71a7..5a00206 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -17,7 +17,6 @@ import ( pt "git.torproject.org/pluggable-transports/goptlib.git" sf "git.torproject.org/pluggable-transports/snowflake.git/v2/client/lib" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" "git.torproject.org/pluggable-transports/snowflake.git/v2/common/safelog" ) @@ -91,6 +90,7 @@ func socksAcceptLoop(ln *pt.SocksListener, config sf.ClientConfig, shutdown chan log.Println("Failed to start snowflake transport: ", err) return } + transport.AddSnowflakeEventListener(sf.NewPTEventLogger()) err = conn.Grant(&net.TCPAddr{IP: net.IPv4zero, Port: 0}) if err != nil { log.Printf("conn.Grant error: %s", err) @@ -171,10 +171,6 @@ func main() { iceAddresses := strings.Split(strings.TrimSpace(*iceServersCommas), ",") - eventLogger := event.NewSnowflakeEventDispatcher() - - eventLogger.AddSnowflakeEventListener(sf.NewPTEventLogger()) - config := sf.ClientConfig{ BrokerURL: *brokerURL, AmpCacheURL: *ampCacheURL, @@ -182,7 +178,6 @@ func main() { ICEAddresses: iceAddresses, KeepLocalAddresses: *keepLocalAddresses || *oldKeepLocalAddresses, Max: *max, - EventDispatcher: eventLogger, } // Begin goptlib client process.

1 0

[snowflake/main] Refactor WebRTC Peer, Dialer's name to be readable
by shelikhoo＠torproject.org 25 Jan '22

25 Jan '22

commit 6cb82618a0f82a15dda617957af8bf08780a482b Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Mon Jan 24 11:51:49 2022 +0000 Refactor WebRTC Peer,Dialer's name to be readable See also: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow… --- client/lib/rendezvous.go | 8 ++++---- client/lib/snowflake.go | 2 +- client/lib/webrtc.go | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index 4c2b240..98cd4d6 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -147,11 +147,11 @@ type WebRTCDialer struct { } func NewWebRTCDialer(broker *BrokerChannel, iceServers []webrtc.ICEServer, max int) *WebRTCDialer { - return NewWebRTCDialer4E(broker, iceServers, max, nil) + return NewWebRTCDialerWithEvents(broker, iceServers, max, nil) } -// NewWebRTCDialer4E constructs a new WebRTCDialer. -func NewWebRTCDialer4E(broker *BrokerChannel, iceServers []webrtc.ICEServer, max int, eventLogger event.SnowflakeEventReceiver) *WebRTCDialer { +// NewWebRTCDialerWithEvents constructs a new WebRTCDialer. +func NewWebRTCDialerWithEvents(broker *BrokerChannel, iceServers []webrtc.ICEServer, max int, eventLogger event.SnowflakeEventReceiver) *WebRTCDialer { config := webrtc.Configuration{ ICEServers: iceServers, } @@ -169,7 +169,7 @@ func NewWebRTCDialer4E(broker *BrokerChannel, iceServers []webrtc.ICEServer, max func (w WebRTCDialer) Catch() (*WebRTCPeer, error) { // TODO: [#25591] Fetch ICE server information from Broker. // TODO: [#25596] Consider TURN servers here too. - return NewWebRTCPeer3E(w.webrtcConfig, w.BrokerChannel, w.eventLogger) + return NewWebRTCPeerWithEvents(w.webrtcConfig, w.BrokerChannel, w.eventLogger) } // GetMax returns the maximum number of snowflakes to collect. diff --git a/client/lib/snowflake.go b/client/lib/snowflake.go index 0f637f2..594c62c 100644 --- a/client/lib/snowflake.go +++ b/client/lib/snowflake.go @@ -137,7 +137,7 @@ func NewSnowflakeClient(config ClientConfig) (*Transport, error) { max = config.Max } eventsLogger := event.NewSnowflakeEventDispatcher() - transport := &Transport{dialer: NewWebRTCDialer4E(broker, iceServers, max, eventsLogger), eventDispatcher: eventsLogger} + transport := &Transport{dialer: NewWebRTCDialerWithEvents(broker, iceServers, max, eventsLogger), eventDispatcher: eventsLogger} return transport, nil } diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index 328c3a9..282b54d 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -38,15 +38,15 @@ type WebRTCPeer struct { func NewWebRTCPeer(config *webrtc.Configuration, broker *BrokerChannel) (*WebRTCPeer, error) { - return NewWebRTCPeer3E(config, broker, nil) + return NewWebRTCPeerWithEvents(config, broker, nil) } -// NewWebRTCPeer3E constructs a WebRTC PeerConnection to a snowflake proxy. +// NewWebRTCPeerWithEvents constructs a WebRTC PeerConnection to a snowflake proxy. // // The creation of the peer handles the signaling to the Snowflake broker, including // the exchange of SDP information, the creation of a PeerConnection, and the establishment // of a DataChannel to the Snowflake proxy. -func NewWebRTCPeer3E(config *webrtc.Configuration, +func NewWebRTCPeerWithEvents(config *webrtc.Configuration, broker *BrokerChannel, eventsLogger event.SnowflakeEventReceiver) (*WebRTCPeer, error) { if eventsLogger == nil { eventsLogger = event.NewSnowflakeEventDispatcher()

1 0

[snowflake/main] Add Snowflake Event API interface
by shelikhoo＠torproject.org 25 Jan '22

25 Jan '22

commit 75f770150d6c9943231cb6b8bde0b867137ea26f Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Fri Nov 26 15:12:46 2021 +0000 Add Snowflake Event API interface --- common/event/interface.go | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/common/event/interface.go b/common/event/interface.go new file mode 100644 index 0000000..697f2b7 --- /dev/null +++ b/common/event/interface.go @@ -0,0 +1,45 @@ +package event + +import "github.com/pion/webrtc/v3" + +type SnowflakeEvent interface { + IsSnowflakeEvent() + String() string +} + +type EventOnOfferCreated struct { + SnowflakeEvent + WebRTCLocalDescription *webrtc.SessionDescription + Error error +} + +type EventOnBrokerRendezvous struct { + SnowflakeEvent + WebRTCRemoteDescription *webrtc.SessionDescription + Error error +} + +type EventOnSnowflakeConnected struct { + SnowflakeEvent +} + +type EventOnSnowflakeConnectionFailed struct { + SnowflakeEvent + Error error +} + +type SnowflakeEventReceiver interface { + // OnNewSnowflakeEvent notify receiver about a new event + // This method MUST not block + OnNewSnowflakeEvent(event SnowflakeEvent) +} + +type SnowflakeEventDispatcher interface { + SnowflakeEventReceiver + // AddSnowflakeEventListener allow receiver(s) to receive event notification + // when OnNewSnowflakeEvent is called on the dispatcher. + // Every event listener added will be called when an event is received by the dispatcher. + // The order each listener is called is undefined. + AddSnowflakeEventListener(receiver SnowflakeEventReceiver) + RemoveSnowflakeEventListener(receiver SnowflakeEventReceiver) +}

1 0

[snowflake/main] Add Event Bus Implementation
by shelikhoo＠torproject.org 25 Jan '22

25 Jan '22

commit 5f03f88d730c4b1c298c4c3eeceeba8023f056ff Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Fri Nov 26 16:00:30 2021 +0000 Add Event Bus Implementation This event bus implementation favours simplicity over efficiency and is not suitable for frequent addition and removal of listeners. --- common/event/bus.go | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/common/event/bus.go b/common/event/bus.go new file mode 100644 index 0000000..7e45779 --- /dev/null +++ b/common/event/bus.go @@ -0,0 +1,39 @@ +package event + +import "sync" + +func NewSnowflakeEventDispatcher() SnowflakeEventDispatcher { + return &eventBus{lock: &sync.Mutex{}} +} + +type eventBus struct { + lock *sync.Mutex + listeners []SnowflakeEventReceiver +} + +func (e *eventBus) OnNewSnowflakeEvent(event SnowflakeEvent) { + e.lock.Lock() + defer e.lock.Unlock() + for _, v := range e.listeners { + v.OnNewSnowflakeEvent(event) + } +} + +func (e *eventBus) AddSnowflakeEventListener(receiver SnowflakeEventReceiver) { + e.lock.Lock() + defer e.lock.Unlock() + e.listeners = append(e.listeners, receiver) +} + +func (e *eventBus) RemoveSnowflakeEventListener(receiver SnowflakeEventReceiver) { + e.lock.Lock() + defer e.lock.Unlock() + var newListeners []SnowflakeEventReceiver + for _, v := range e.listeners { + if v != receiver { + newListeners = append(newListeners, v) + } + } + e.listeners = newListeners + return +}

1 0

[translation/tails-misc_release] new translations in tails-misc_release
by translation＠torproject.org 25 Jan '22

25 Jan '22

commit fca8a810f1a070606d6a8ddd3f11567d1af38ecd Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 25 12:17:20 2022 +0000 new translations in tails-misc_release --- is.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is.po b/is.po index 9c14b7624d..94cba493a9 100644 --- a/is.po +++ b/is.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-01-10 09:34+0100\n" -"PO-Revision-Date: 2022-01-25 11:03+0000\n" +"PO-Revision-Date: 2022-01-25 11:59+0000\n" "Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>\n" "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] new translations in tails-misc
by translation＠torproject.org 25 Jan '22

25 Jan '22

commit ca0c731f062e8956863cca87eddf83b8bbc0b093 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 25 12:16:08 2022 +0000 new translations in tails-misc --- is.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/is.po b/is.po index 69f8313f2a..5b86e141bf 100644 --- a/is.po +++ b/is.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-01-10 09:34+0100\n" -"PO-Revision-Date: 2022-01-25 11:03+0000\n" +"PO-Revision-Date: 2022-01-25 11:59+0000\n" "Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>\n" "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n" "MIME-Version: 1.0\n" @@ -2630,7 +2630,7 @@ msgid "" "<tt>bridges(a)torproject.org</tt> from a Gmail or Riseup email address.\n" "\n" "For example, you can send the email from your phone and type the bridge in Tails.\n" -msgstr "" +msgstr "Til að biðja um brú geturðu sent auðan tölvupóst á\n<tt>bridges(a)torproject.org</tt> úr Gmail eða Riseup tölvupóstfangi.\n\nÞannig geturðu t.d. sent tölvupóst úr símanum þínum og skrifað brúna inn í Tails.\n" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:370 msgid "Save bridge to _Persistent Storage" @@ -2660,7 +2660,7 @@ msgstr "• Rangt stillt klukka" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:628 msgid "Your clock and time zone need to be correct to connect to Tor." -msgstr "" +msgstr "Kerfisklukkan þín og tímabeltið þurfa að vera rétt stillt svo hægt sé að tengjast Tor." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:641 msgid "Fix _Clock" @@ -2705,13 +2705,13 @@ msgid "" " 1. Send an empty email to <tt>bridges(a)torproject.org</tt> from a Gmail or Riseup email address.\n" "\n" " 2. Type below one of the bridges that you received by email." -msgstr "" +msgstr "Til að biðja um nýjar brýr geturðu einnig:\n\n 1. Sent auðan tölvupóst á <tt>bridges(a)torproject.org</tt> úr Gmail eða Riseup tölvupóstfangi.\n\n 2. Skrifað inn hér fyrir neðan eina af brúnum sem þú fékkst í tölvupósti." #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:950 msgid "" "<a href=\"doc/anonymous_internet/tor/troubleshoot\">Troubleshooting " "connecting to Tor</a>" -msgstr "" +msgstr "<a href=\"doc/anonymous_internet/tor/troubleshoot\">Finna lausn á vandamálum við að tengjast Tor</a>" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:996 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1404

1 0

[translation/support-portal] new translations in support-portal
by translation＠torproject.org 25 Jan '22

25 Jan '22

commit aae48cd0fb6c3d30bb2629d8d3662e8b25fe1b0b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 25 11:48:59 2022 +0000 new translations in support-portal --- contents+zh-CN.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 654257081b..2be7dd8071 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -841,7 +841,7 @@ msgstr "参考: https://en.wikipedia.org/wiki/Hamburger_button" #: https//support.torproject.org/glossary/hamburger-menu/ #: (content/glossary/hamburger-menu/contents+en.lrword.definition) msgid "![hamburger-menu](/static/images/hamburger-menu.png \"Hamburger Menu\")" -msgstr "![汉堡菜单](/static/images/hamburger-menu.png \"汉堡菜单\")" +msgstr "![菜单](/static/images/hamburger-menu.png \"菜单\")" #: https//support.torproject.org/glossary/hash/ #: (content/glossary/hash/contents+en.lrword.term) @@ -1290,7 +1290,7 @@ msgstr "" msgid "" "Project name. Do not translate \"Onion\", however you can translate " "\"Browser\". Ex: Navegador Onion." -msgstr "项目名称。不要翻译“Onion”，但是你可以翻译“浏览器”。示例：Navegador Onion。" +msgstr "项目名称。不要翻译“Onion”，但是你可以翻译“浏览器”。示例：Onion 浏览器。" #: https//support.torproject.org/glossary/onion-services/ #: (content/glossary/onion-services/contents+en.lrword.term) @@ -1520,8 +1520,8 @@ msgid "" "corresponding [private key](../private-key) is known only by the owner of " "the key pair." msgstr "" -"公钥[public key](../public-key)会被广泛地传递，而它所属的私钥[private key](../private-" -"key)仅被这对密钥的所属者所知晓。" +"公钥（[public key](../public-key)）会被广泛地传递，而它所属的私钥（[private key](../private-" +"key)）仅被这对密钥的所属者所知晓。" #: https//support.torproject.org/glossary/public-key-cryptography/ #: (content/glossary/public-key-cryptography/contents+en.lrword.definition) @@ -1931,7 +1931,7 @@ msgid "" "**Do not translate \"Tor\", however you can translate \"Browser\"**. Example" " in Spanish: Navegador Tor (altering the order because is more natural like " "that in Spanish.)" -msgstr "**不要翻译“Tor”，但是你可以翻译“浏览器”**。西班牙语示例：Navegador Tor（替换顺序因为这样在西班牙语里更自然。）" +msgstr "**不要翻译“Tor”，但是你可以翻译“浏览器”**。示例：Tor 浏览器" #: https//support.torproject.org/glossary/tor-browser/ #: (content/glossary/tor-browser/contents+en.lrword.translation)

1 0

[translation/tails-misc_release] new translations in tails-misc_release
by translation＠torproject.org 25 Jan '22

25 Jan '22

commit c0884aa4099aca8b7a3489e2a5dbca8edeb633fc Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 25 11:47:37 2022 +0000 new translations in tails-misc_release --- zh_CN.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index ad23dfc569..b9d6db5227 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -44,8 +44,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-01-10 09:34+0100\n" -"PO-Revision-Date: 2022-01-10 09:25+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2022-01-25 11:16+0000\n" +"Last-Translator: ff98sha\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -912,27 +912,27 @@ msgid "" "\n" "\n" "The persistent storage on this USB stick will be lost." -msgstr "" +msgstr "\n\n此 USB 存储器上的持久化存储数据都将丢失。" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:638 msgid "Delete Persistent Storage and Reinstall" -msgstr "" +msgstr "删除持久化存储并重新安装" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:640 msgid "" "\n" "\n" "All data on this USB stick will be lost." -msgstr "" +msgstr "\n\n此 USB 存储器上的所有数据都将丢失。" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:641 msgid "Delete All Data and Install" -msgstr "" +msgstr "删除所有数据并安装" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:642 #, python-format msgid "%(description)s%(delete_message)s" -msgstr "" +msgstr "%(description)s%(delete_message)s" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:646 msgid "Confirm the target USB stick" @@ -1179,11 +1179,11 @@ msgstr "语言，管理密码，以及额外设置" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:83 msgid "Tor Bridge" -msgstr "" +msgstr "Tor 网桥" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85 msgid "Save the last bridge that you used to connect to Tor" -msgstr "" +msgstr "保存您上一个用于连接至 Tor 的网桥" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:98 msgid "Browser Bookmarks" @@ -1731,7 +1731,7 @@ msgstr "Tor 连接" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:198 msgid "_Use a bridge that you already know" -msgstr "" +msgstr "_使用你已知的网桥" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:239 msgid "" @@ -2016,7 +2016,7 @@ msgid "" "The Unsafe Browser is not anonymous and the websites that you visit can see " "your real IP address.\\n\\nOnly use the Unsafe Browser to sign in to a " "network using a captive portal." -msgstr "" +msgstr "不安全的浏览器不是匿名的，您访问的网站可以看见您的真实IP地址。\\n\\n只使用不安全的浏览器登陆强制主页。" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 msgid "" @@ -2034,7 +2034,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:61 msgid "_Restart" -msgstr "" +msgstr "_重启" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:62 msgid "_Close" @@ -2042,7 +2042,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67 msgid "Failed to restart the system." -msgstr "" +msgstr "系统重启失败" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:77 msgid "Starting the Unsafe Browser..." @@ -2657,7 +2657,7 @@ msgid "" "<tt>bridges(a)torproject.org</tt> from a Gmail or Riseup email address.\n" "\n" "For example, you can send the email from your phone and type the bridge in Tails.\n" -msgstr "" +msgstr "要获取新的网桥，您可以使用 Gmail 或 Riseup 的电子邮箱地址向 <tt>bridges(a)torproject.org</tt> 发送一封空的电子邮件。\n\n比如，您可以使用您的手机来发送点子邮件，然后将网桥输入到 Tails 中。\n" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:370 msgid "Save bridge to _Persistent Storage" @@ -2687,7 +2687,7 @@ msgstr "• 错误的时钟" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:628 msgid "Your clock and time zone need to be correct to connect to Tor." -msgstr "" +msgstr "你需要正确的时钟和时区以连接至 Tor。" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:641 msgid "Fix _Clock" @@ -2738,7 +2738,7 @@ msgstr "" msgid "" "<a href=\"doc/anonymous_internet/tor/troubleshoot\">Troubleshooting " "connecting to Tor</a>" -msgstr "" +msgstr "<a href=\"doc/anonymous_internet/tor/troubleshoot\">排查 Tor 连接问题</a>" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:996 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1404 @@ -2921,7 +2921,7 @@ msgid "" "Your time zone cannot be used to identify or locate you. Your time zone will" " never be sent over the network and will only be used to fix your clock and " "connect to Tor." -msgstr "" +msgstr "您的时区无法被用于辨别或定位您。您的时区永远不会被发送到网络并将只用于修正您的时钟及连接至 Tor。" #: ../config/chroot_local-includes/usr/share/tails/tca/time-dialog.ui.in:142 msgid "Time zone"

1 0

[translation/tails-misc] new translations in tails-misc
by translation＠torproject.org 25 Jan '22

25 Jan '22

commit 12f82c7bb430d08fe1b1fd9775b7f7332a9cc2b2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 25 11:46:02 2022 +0000 new translations in tails-misc --- zh_CN.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index e5cd9f884b..b9d6db5227 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -44,8 +44,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-01-10 09:34+0100\n" -"PO-Revision-Date: 2022-01-10 09:25+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2022-01-25 11:16+0000\n" +"Last-Translator: ff98sha\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/fenix-torbrowserstringsxml_completed] new translations in fenix-torbrowserstringsxml_completed
by translation＠torproject.org 25 Jan '22

25 Jan '22

commit fde17507af5362dfda27f3f4a972441b091f7a09 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 25 11:45:30 2022 +0000 new translations in fenix-torbrowserstringsxml_completed --- zh-rCN/torbrowser_strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zh-rCN/torbrowser_strings.xml b/zh-rCN/torbrowser_strings.xml index f01404ae81..94419b3be5 100644 --- a/zh-rCN/torbrowser_strings.xml +++ b/zh-rCN/torbrowser_strings.xml @@ -73,4 +73,7 @@  <string name="tor_spoof_english">请求英语版本的网页，增强安全性</string> - </resources> + <string name="tor_useamask_usetor">口罩防病毒，Tor防监控。</string> + <string name="tor_resistsurveillance">抗击“监控”全球流行病。</string> + <string name="tor_donationmatch">您的捐赠会被 Tor 的朋友们配比捐赠。</string> +</resources>

1 0