May 2020 - tor-commits - lists.torproject.org

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 13 May '20

13 May '20

commit 9d0ccbaf9f9f9973ab127219e05c4f5f9b6780cb Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 13 12:51:46 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- fr/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torbutton.properties b/fr/torbutton.properties index 13970d826c..0fa18876ac 100644 --- a/fr/torbutton.properties +++ b/fr/torbutton.properties @@ -91,7 +91,7 @@ onionServices.rendezvousFailed.longDescription=Détails : %S – Échec de renc # Tor SOCKS error 0xF4: onionServices.clientAuthMissing.pageTitle=Une autorisation est exigée onionServices.clientAuthMissing.header=Le site onion exige une authentification -onionServices.clientAuthMissing=Le site onion exige une clé, mais aucune n'a été indiquée. +onionServices.clientAuthMissing=Le site onion exige une clé, mais aucune n'a été indiquée. onionServices.clientAuthMissing.longDescription=Détails : %S – Le client a téléchargé le descripteur du site demandé, mais n’a pas réussi à déchiffrer son contenu, car il manque les renseignements d’autorisation du client. # Tor SOCKS error 0xF5: onionServices.clientAuthIncorrect.pageTitle=Échec d’autorisation

1 0

[tor-browser-build/master] Bug 34043: Update snowflake to persist sessions across proxies
by gk＠torproject.org 13 May '20

13 May '20

commit 8547db1c629adf1bbdabcb44e2245944920472e6 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Feb 10 16:06:08 2020 -0700 Bug 34043: Update snowflake to persist sessions across proxies This brings in changes related to #33745 Merge a turbotunnel branch #33897 Remove buffering from WebRTCPeer #34042 Reduce DataChannelTimeout The new dependencies kcp-go and smux form the new inner session layer. There's a patch to kcp-go to remove dependencies required for features we don't use. --- projects/goxnet/config | 2 + projects/kcp-go/config | 24 + projects/kcp-go/remove-crypt-fec.patch | 1019 ++++++++++++++++++++++++++++++++ projects/smux/config | 16 + projects/snowflake/build | 3 + projects/snowflake/config | 6 +- 6 files changed, 1069 insertions(+), 1 deletion(-) diff --git a/projects/goxnet/config b/projects/goxnet/config index 5394875..7656795 100644 --- a/projects/goxnet/config +++ b/projects/goxnet/config @@ -11,6 +11,8 @@ var: use_container: 1 go_lib: golang.org/x/net go_lib_install: + - golang.org/x/net/ipv4 + - golang.org/x/net/ipv6 - golang.org/x/net/proxy - golang.org/x/net/dns/dnsmessage go_lib_deps: diff --git a/projects/kcp-go/config b/projects/kcp-go/config new file mode 100644 index 0000000..7551a5e --- /dev/null +++ b/projects/kcp-go/config @@ -0,0 +1,24 @@ +version: '[% c("abbrev") %]' +git_url: https://github.com/xtaci/kcp-go +git_hash: 831b5b267373f6fbd3548849a3925c4e70806de2 # v5.5.11 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/xtaci/kcp-go + go_lib_deps: + - goerrors + - goxnet + +input_files: + - project: container-image + - name: go + project: go + - name: goerrors + project: goerrors + - name: goxnet + project: goxnet + - filename: remove-crypt-fec.patch diff --git a/projects/kcp-go/remove-crypt-fec.patch b/projects/kcp-go/remove-crypt-fec.patch new file mode 100644 index 0000000..5693ac5 --- /dev/null +++ b/projects/kcp-go/remove-crypt-fec.patch @@ -0,0 +1,1019 @@ +From 0b9d0759f979a5d828b747ea51771f307c53d221 Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Thu, 9 Apr 2020 11:27:44 -0600 +Subject: [PATCH] Remove crypt and FEC dependencies. + +--- + crypt.go | 618 ----------------------------------------------------- + fec.go | 337 ----------------------------- + removed.go | 29 +++ + 3 files changed, 29 insertions(+), 955 deletions(-) + delete mode 100644 crypt.go + delete mode 100644 fec.go + create mode 100644 removed.go + +diff --git a/crypt.go b/crypt.go +deleted file mode 100644 +index d882852..0000000 +--- a/crypt.go ++++ /dev/null +@@ -1,618 +0,0 @@ +-package kcp +- +-import ( +- "crypto/aes" +- "crypto/cipher" +- "crypto/des" +- "crypto/sha1" +- "unsafe" +- +- xor "github.com/templexxx/xorsimd" +- "github.com/tjfoc/gmsm/sm4" +- +- "golang.org/x/crypto/blowfish" +- "golang.org/x/crypto/cast5" +- "golang.org/x/crypto/pbkdf2" +- "golang.org/x/crypto/salsa20" +- "golang.org/x/crypto/tea" +- "golang.org/x/crypto/twofish" +- "golang.org/x/crypto/xtea" +-) +- +-var ( +- initialVector = []byte{167, 115, 79, 156, 18, 172, 27, 1, 164, 21, 242, 193, 252, 120, 230, 107} +- saltxor = `sH3CIVoF#rWLtJo6` +-) +- +-// BlockCrypt defines encryption/decryption methods for a given byte slice. +-// Notes on implementing: the data to be encrypted contains a builtin +-// nonce at the first 16 bytes +-type BlockCrypt interface { +- // Encrypt encrypts the whole block in src into dst. +- // Dst and src may point at the same memory. +- Encrypt(dst, src []byte) +- +- // Decrypt decrypts the whole block in src into dst. +- // Dst and src may point at the same memory. +- Decrypt(dst, src []byte) +-} +- +-type salsa20BlockCrypt struct { +- key [32]byte +-} +- +-// NewSalsa20BlockCrypt https://en.wikipedia.org/wiki/Salsa20 +-func NewSalsa20BlockCrypt(key []byte) (BlockCrypt, error) { +- c := new(salsa20BlockCrypt) +- copy(c.key[:], key) +- return c, nil +-} +- +-func (c *salsa20BlockCrypt) Encrypt(dst, src []byte) { +- salsa20.XORKeyStream(dst[8:], src[8:], src[:8], &c.key) +- copy(dst[:8], src[:8]) +-} +-func (c *salsa20BlockCrypt) Decrypt(dst, src []byte) { +- salsa20.XORKeyStream(dst[8:], src[8:], src[:8], &c.key) +- copy(dst[:8], src[:8]) +-} +- +-type sm4BlockCrypt struct { +- encbuf [sm4.BlockSize]byte // 64bit alignment enc/dec buffer +- decbuf [2 * sm4.BlockSize]byte +- block cipher.Block +-} +- +-// NewSM4BlockCrypt https://github.com/tjfoc/gmsm/tree/master/sm4 +-func NewSM4BlockCrypt(key []byte) (BlockCrypt, error) { +- c := new(sm4BlockCrypt) +- block, err := sm4.NewCipher(key) +- if err != nil { +- return nil, err +- } +- c.block = block +- return c, nil +-} +- +-func (c *sm4BlockCrypt) Encrypt(dst, src []byte) { encrypt(c.block, dst, src, c.encbuf[:]) } +-func (c *sm4BlockCrypt) Decrypt(dst, src []byte) { decrypt(c.block, dst, src, c.decbuf[:]) } +- +-type twofishBlockCrypt struct { +- encbuf [twofish.BlockSize]byte +- decbuf [2 * twofish.BlockSize]byte +- block cipher.Block +-} +- +-// NewTwofishBlockCrypt https://en.wikipedia.org/wiki/Twofish +-func NewTwofishBlockCrypt(key []byte) (BlockCrypt, error) { +- c := new(twofishBlockCrypt) +- block, err := twofish.NewCipher(key) +- if err != nil { +- return nil, err +- } +- c.block = block +- return c, nil +-} +- +-func (c *twofishBlockCrypt) Encrypt(dst, src []byte) { encrypt(c.block, dst, src, c.encbuf[:]) } +-func (c *twofishBlockCrypt) Decrypt(dst, src []byte) { decrypt(c.block, dst, src, c.decbuf[:]) } +- +-type tripleDESBlockCrypt struct { +- encbuf [des.BlockSize]byte +- decbuf [2 * des.BlockSize]byte +- block cipher.Block +-} +- +-// NewTripleDESBlockCrypt https://en.wikipedia.org/wiki/Triple_DES +-func NewTripleDESBlockCrypt(key []byte) (BlockCrypt, error) { +- c := new(tripleDESBlockCrypt) +- block, err := des.NewTripleDESCipher(key) +- if err != nil { +- return nil, err +- } +- c.block = block +- return c, nil +-} +- +-func (c *tripleDESBlockCrypt) Encrypt(dst, src []byte) { encrypt(c.block, dst, src, c.encbuf[:]) } +-func (c *tripleDESBlockCrypt) Decrypt(dst, src []byte) { decrypt(c.block, dst, src, c.decbuf[:]) } +- +-type cast5BlockCrypt struct { +- encbuf [cast5.BlockSize]byte +- decbuf [2 * cast5.BlockSize]byte +- block cipher.Block +-} +- +-// NewCast5BlockCrypt https://en.wikipedia.org/wiki/CAST-128 +-func NewCast5BlockCrypt(key []byte) (BlockCrypt, error) { +- c := new(cast5BlockCrypt) +- block, err := cast5.NewCipher(key) +- if err != nil { +- return nil, err +- } +- c.block = block +- return c, nil +-} +- +-func (c *cast5BlockCrypt) Encrypt(dst, src []byte) { encrypt(c.block, dst, src, c.encbuf[:]) } +-func (c *cast5BlockCrypt) Decrypt(dst, src []byte) { decrypt(c.block, dst, src, c.decbuf[:]) } +- +-type blowfishBlockCrypt struct { +- encbuf [blowfish.BlockSize]byte +- decbuf [2 * blowfish.BlockSize]byte +- block cipher.Block +-} +- +-// NewBlowfishBlockCrypt https://en.wikipedia.org/wiki/Blowfish_(cipher) +-func NewBlowfishBlockCrypt(key []byte) (BlockCrypt, error) { +- c := new(blowfishBlockCrypt) +- block, err := blowfish.NewCipher(key) +- if err != nil { +- return nil, err +- } +- c.block = block +- return c, nil +-} +- +-func (c *blowfishBlockCrypt) Encrypt(dst, src []byte) { encrypt(c.block, dst, src, c.encbuf[:]) } +-func (c *blowfishBlockCrypt) Decrypt(dst, src []byte) { decrypt(c.block, dst, src, c.decbuf[:]) } +- +-type aesBlockCrypt struct { +- encbuf [aes.BlockSize]byte +- decbuf [2 * aes.BlockSize]byte +- block cipher.Block +-} +- +-// NewAESBlockCrypt https://en.wikipedia.org/wiki/Advanced_Encryption_Standard +-func NewAESBlockCrypt(key []byte) (BlockCrypt, error) { +- c := new(aesBlockCrypt) +- block, err := aes.NewCipher(key) +- if err != nil { +- return nil, err +- } +- c.block = block +- return c, nil +-} +- +-func (c *aesBlockCrypt) Encrypt(dst, src []byte) { encrypt(c.block, dst, src, c.encbuf[:]) } +-func (c *aesBlockCrypt) Decrypt(dst, src []byte) { decrypt(c.block, dst, src, c.decbuf[:]) } +- +-type teaBlockCrypt struct { +- encbuf [tea.BlockSize]byte +- decbuf [2 * tea.BlockSize]byte +- block cipher.Block +-} +- +-// NewTEABlockCrypt https://en.wikipedia.org/wiki/Tiny_Encryption_Algorithm +-func NewTEABlockCrypt(key []byte) (BlockCrypt, error) { +- c := new(teaBlockCrypt) +- block, err := tea.NewCipherWithRounds(key, 16) +- if err != nil { +- return nil, err +- } +- c.block = block +- return c, nil +-} +- +-func (c *teaBlockCrypt) Encrypt(dst, src []byte) { encrypt(c.block, dst, src, c.encbuf[:]) } +-func (c *teaBlockCrypt) Decrypt(dst, src []byte) { decrypt(c.block, dst, src, c.decbuf[:]) } +- +-type xteaBlockCrypt struct { +- encbuf [xtea.BlockSize]byte +- decbuf [2 * xtea.BlockSize]byte +- block cipher.Block +-} +- +-// NewXTEABlockCrypt https://en.wikipedia.org/wiki/XTEA +-func NewXTEABlockCrypt(key []byte) (BlockCrypt, error) { +- c := new(xteaBlockCrypt) +- block, err := xtea.NewCipher(key) +- if err != nil { +- return nil, err +- } +- c.block = block +- return c, nil +-} +- +-func (c *xteaBlockCrypt) Encrypt(dst, src []byte) { encrypt(c.block, dst, src, c.encbuf[:]) } +-func (c *xteaBlockCrypt) Decrypt(dst, src []byte) { decrypt(c.block, dst, src, c.decbuf[:]) } +- +-type simpleXORBlockCrypt struct { +- xortbl []byte +-} +- +-// NewSimpleXORBlockCrypt simple xor with key expanding +-func NewSimpleXORBlockCrypt(key []byte) (BlockCrypt, error) { +- c := new(simpleXORBlockCrypt) +- c.xortbl = pbkdf2.Key(key, []byte(saltxor), 32, mtuLimit, sha1.New) +- return c, nil +-} +- +-func (c *simpleXORBlockCrypt) Encrypt(dst, src []byte) { xor.Bytes(dst, src, c.xortbl) } +-func (c *simpleXORBlockCrypt) Decrypt(dst, src []byte) { xor.Bytes(dst, src, c.xortbl) } +- +-type noneBlockCrypt struct{} +- +-// NewNoneBlockCrypt does nothing but copying +-func NewNoneBlockCrypt(key []byte) (BlockCrypt, error) { +- return new(noneBlockCrypt), nil +-} +- +-func (c *noneBlockCrypt) Encrypt(dst, src []byte) { copy(dst, src) } +-func (c *noneBlockCrypt) Decrypt(dst, src []byte) { copy(dst, src) } +- +-// packet encryption with local CFB mode +-func encrypt(block cipher.Block, dst, src, buf []byte) { +- switch block.BlockSize() { +- case 8: +- encrypt8(block, dst, src, buf) +- case 16: +- encrypt16(block, dst, src, buf) +- default: +- panic("unsupported cipher block size") +- } +-} +- +-// optimized encryption for the ciphers which works in 8-bytes +-func encrypt8(block cipher.Block, dst, src, buf []byte) { +- tbl := buf[:8] +- block.Encrypt(tbl, initialVector) +- n := len(src) / 8 +- base := 0 +- repeat := n / 8 +- left := n % 8 +- ptr_tbl := (*uint64)(unsafe.Pointer(&tbl[0])) +- +- for i := 0; i < repeat; i++ { +- s := src[base:][0:64] +- d := dst[base:][0:64] +- // 1 +- *(*uint64)(unsafe.Pointer(&d[0])) = *(*uint64)(unsafe.Pointer(&s[0])) ^ *ptr_tbl +- block.Encrypt(tbl, d[0:8]) +- // 2 +- *(*uint64)(unsafe.Pointer(&d[8])) = *(*uint64)(unsafe.Pointer(&s[8])) ^ *ptr_tbl +- block.Encrypt(tbl, d[8:16]) +- // 3 +- *(*uint64)(unsafe.Pointer(&d[16])) = *(*uint64)(unsafe.Pointer(&s[16])) ^ *ptr_tbl +- block.Encrypt(tbl, d[16:24]) +- // 4 +- *(*uint64)(unsafe.Pointer(&d[24])) = *(*uint64)(unsafe.Pointer(&s[24])) ^ *ptr_tbl +- block.Encrypt(tbl, d[24:32]) +- // 5 +- *(*uint64)(unsafe.Pointer(&d[32])) = *(*uint64)(unsafe.Pointer(&s[32])) ^ *ptr_tbl +- block.Encrypt(tbl, d[32:40]) +- // 6 +- *(*uint64)(unsafe.Pointer(&d[40])) = *(*uint64)(unsafe.Pointer(&s[40])) ^ *ptr_tbl +- block.Encrypt(tbl, d[40:48]) +- // 7 +- *(*uint64)(unsafe.Pointer(&d[48])) = *(*uint64)(unsafe.Pointer(&s[48])) ^ *ptr_tbl +- block.Encrypt(tbl, d[48:56]) +- // 8 +- *(*uint64)(unsafe.Pointer(&d[56])) = *(*uint64)(unsafe.Pointer(&s[56])) ^ *ptr_tbl +- block.Encrypt(tbl, d[56:64]) +- base += 64 +- } +- +- switch left { +- case 7: +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *ptr_tbl +- block.Encrypt(tbl, dst[base:]) +- base += 8 +- fallthrough +- case 6: +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *ptr_tbl +- block.Encrypt(tbl, dst[base:]) +- base += 8 +- fallthrough +- case 5: +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *ptr_tbl +- block.Encrypt(tbl, dst[base:]) +- base += 8 +- fallthrough +- case 4: +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *ptr_tbl +- block.Encrypt(tbl, dst[base:]) +- base += 8 +- fallthrough +- case 3: +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *ptr_tbl +- block.Encrypt(tbl, dst[base:]) +- base += 8 +- fallthrough +- case 2: +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *ptr_tbl +- block.Encrypt(tbl, dst[base:]) +- base += 8 +- fallthrough +- case 1: +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *ptr_tbl +- block.Encrypt(tbl, dst[base:]) +- base += 8 +- fallthrough +- case 0: +- xorBytes(dst[base:], src[base:], tbl) +- } +-} +- +-// optimized encryption for the ciphers which works in 16-bytes +-func encrypt16(block cipher.Block, dst, src, buf []byte) { +- tbl := buf[:16] +- block.Encrypt(tbl, initialVector) +- n := len(src) / 16 +- base := 0 +- repeat := n / 8 +- left := n % 8 +- for i := 0; i < repeat; i++ { +- s := src[base:][0:128] +- d := dst[base:][0:128] +- // 1 +- xor.Bytes16Align(d[0:16], s[0:16], tbl) +- block.Encrypt(tbl, d[0:16]) +- // 2 +- xor.Bytes16Align(d[16:32], s[16:32], tbl) +- block.Encrypt(tbl, d[16:32]) +- // 3 +- xor.Bytes16Align(d[32:48], s[32:48], tbl) +- block.Encrypt(tbl, d[32:48]) +- // 4 +- xor.Bytes16Align(d[48:64], s[48:64], tbl) +- block.Encrypt(tbl, d[48:64]) +- // 5 +- xor.Bytes16Align(d[64:80], s[64:80], tbl) +- block.Encrypt(tbl, d[64:80]) +- // 6 +- xor.Bytes16Align(d[80:96], s[80:96], tbl) +- block.Encrypt(tbl, d[80:96]) +- // 7 +- xor.Bytes16Align(d[96:112], s[96:112], tbl) +- block.Encrypt(tbl, d[96:112]) +- // 8 +- xor.Bytes16Align(d[112:128], s[112:128], tbl) +- block.Encrypt(tbl, d[112:128]) +- base += 128 +- } +- +- switch left { +- case 7: +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- block.Encrypt(tbl, dst[base:]) +- base += 16 +- fallthrough +- case 6: +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- block.Encrypt(tbl, dst[base:]) +- base += 16 +- fallthrough +- case 5: +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- block.Encrypt(tbl, dst[base:]) +- base += 16 +- fallthrough +- case 4: +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- block.Encrypt(tbl, dst[base:]) +- base += 16 +- fallthrough +- case 3: +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- block.Encrypt(tbl, dst[base:]) +- base += 16 +- fallthrough +- case 2: +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- block.Encrypt(tbl, dst[base:]) +- base += 16 +- fallthrough +- case 1: +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- block.Encrypt(tbl, dst[base:]) +- base += 16 +- fallthrough +- case 0: +- xorBytes(dst[base:], src[base:], tbl) +- } +-} +- +-// decryption +-func decrypt(block cipher.Block, dst, src, buf []byte) { +- switch block.BlockSize() { +- case 8: +- decrypt8(block, dst, src, buf) +- case 16: +- decrypt16(block, dst, src, buf) +- default: +- panic("unsupported cipher block size") +- } +-} +- +-// decrypt 8 bytes block, all byte slices are supposed to be 64bit aligned +-func decrypt8(block cipher.Block, dst, src, buf []byte) { +- tbl := buf[0:8] +- next := buf[8:16] +- block.Encrypt(tbl, initialVector) +- n := len(src) / 8 +- base := 0 +- repeat := n / 8 +- left := n % 8 +- ptr_tbl := (*uint64)(unsafe.Pointer(&tbl[0])) +- ptr_next := (*uint64)(unsafe.Pointer(&next[0])) +- +- for i := 0; i < repeat; i++ { +- s := src[base:][0:64] +- d := dst[base:][0:64] +- // 1 +- block.Encrypt(next, s[0:8]) +- *(*uint64)(unsafe.Pointer(&d[0])) = *(*uint64)(unsafe.Pointer(&s[0])) ^ *ptr_tbl +- // 2 +- block.Encrypt(tbl, s[8:16]) +- *(*uint64)(unsafe.Pointer(&d[8])) = *(*uint64)(unsafe.Pointer(&s[8])) ^ *ptr_next +- // 3 +- block.Encrypt(next, s[16:24]) +- *(*uint64)(unsafe.Pointer(&d[16])) = *(*uint64)(unsafe.Pointer(&s[16])) ^ *ptr_tbl +- // 4 +- block.Encrypt(tbl, s[24:32]) +- *(*uint64)(unsafe.Pointer(&d[24])) = *(*uint64)(unsafe.Pointer(&s[24])) ^ *ptr_next +- // 5 +- block.Encrypt(next, s[32:40]) +- *(*uint64)(unsafe.Pointer(&d[32])) = *(*uint64)(unsafe.Pointer(&s[32])) ^ *ptr_tbl +- // 6 +- block.Encrypt(tbl, s[40:48]) +- *(*uint64)(unsafe.Pointer(&d[40])) = *(*uint64)(unsafe.Pointer(&s[40])) ^ *ptr_next +- // 7 +- block.Encrypt(next, s[48:56]) +- *(*uint64)(unsafe.Pointer(&d[48])) = *(*uint64)(unsafe.Pointer(&s[48])) ^ *ptr_tbl +- // 8 +- block.Encrypt(tbl, s[56:64]) +- *(*uint64)(unsafe.Pointer(&d[56])) = *(*uint64)(unsafe.Pointer(&s[56])) ^ *ptr_next +- base += 64 +- } +- +- switch left { +- case 7: +- block.Encrypt(next, src[base:]) +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *(*uint64)(unsafe.Pointer(&tbl[0])) +- tbl, next = next, tbl +- base += 8 +- fallthrough +- case 6: +- block.Encrypt(next, src[base:]) +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *(*uint64)(unsafe.Pointer(&tbl[0])) +- tbl, next = next, tbl +- base += 8 +- fallthrough +- case 5: +- block.Encrypt(next, src[base:]) +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *(*uint64)(unsafe.Pointer(&tbl[0])) +- tbl, next = next, tbl +- base += 8 +- fallthrough +- case 4: +- block.Encrypt(next, src[base:]) +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *(*uint64)(unsafe.Pointer(&tbl[0])) +- tbl, next = next, tbl +- base += 8 +- fallthrough +- case 3: +- block.Encrypt(next, src[base:]) +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *(*uint64)(unsafe.Pointer(&tbl[0])) +- tbl, next = next, tbl +- base += 8 +- fallthrough +- case 2: +- block.Encrypt(next, src[base:]) +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *(*uint64)(unsafe.Pointer(&tbl[0])) +- tbl, next = next, tbl +- base += 8 +- fallthrough +- case 1: +- block.Encrypt(next, src[base:]) +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *(*uint64)(unsafe.Pointer(&tbl[0])) +- tbl, next = next, tbl +- base += 8 +- fallthrough +- case 0: +- xorBytes(dst[base:], src[base:], tbl) +- } +-} +- +-func decrypt16(block cipher.Block, dst, src, buf []byte) { +- tbl := buf[0:16] +- next := buf[16:32] +- block.Encrypt(tbl, initialVector) +- n := len(src) / 16 +- base := 0 +- repeat := n / 8 +- left := n % 8 +- for i := 0; i < repeat; i++ { +- s := src[base:][0:128] +- d := dst[base:][0:128] +- // 1 +- block.Encrypt(next, s[0:16]) +- xor.Bytes16Align(d[0:16], s[0:16], tbl) +- // 2 +- block.Encrypt(tbl, s[16:32]) +- xor.Bytes16Align(d[16:32], s[16:32], next) +- // 3 +- block.Encrypt(next, s[32:48]) +- xor.Bytes16Align(d[32:48], s[32:48], tbl) +- // 4 +- block.Encrypt(tbl, s[48:64]) +- xor.Bytes16Align(d[48:64], s[48:64], next) +- // 5 +- block.Encrypt(next, s[64:80]) +- xor.Bytes16Align(d[64:80], s[64:80], tbl) +- // 6 +- block.Encrypt(tbl, s[80:96]) +- xor.Bytes16Align(d[80:96], s[80:96], next) +- // 7 +- block.Encrypt(next, s[96:112]) +- xor.Bytes16Align(d[96:112], s[96:112], tbl) +- // 8 +- block.Encrypt(tbl, s[112:128]) +- xor.Bytes16Align(d[112:128], s[112:128], next) +- base += 128 +- } +- +- switch left { +- case 7: +- block.Encrypt(next, src[base:]) +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- tbl, next = next, tbl +- base += 16 +- fallthrough +- case 6: +- block.Encrypt(next, src[base:]) +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- tbl, next = next, tbl +- base += 16 +- fallthrough +- case 5: +- block.Encrypt(next, src[base:]) +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- tbl, next = next, tbl +- base += 16 +- fallthrough +- case 4: +- block.Encrypt(next, src[base:]) +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- tbl, next = next, tbl +- base += 16 +- fallthrough +- case 3: +- block.Encrypt(next, src[base:]) +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- tbl, next = next, tbl +- base += 16 +- fallthrough +- case 2: +- block.Encrypt(next, src[base:]) +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- tbl, next = next, tbl +- base += 16 +- fallthrough +- case 1: +- block.Encrypt(next, src[base:]) +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- tbl, next = next, tbl +- base += 16 +- fallthrough +- case 0: +- xorBytes(dst[base:], src[base:], tbl) +- } +-} +- +-// per bytes xors +-func xorBytes(dst, a, b []byte) int { +- n := len(a) +- if len(b) < n { +- n = len(b) +- } +- if n == 0 { +- return 0 +- } +- +- for i := 0; i < n; i++ { +- dst[i] = a[i] ^ b[i] +- } +- return n +-} +diff --git a/fec.go b/fec.go +deleted file mode 100644 +index 97cd40b..0000000 +--- a/fec.go ++++ /dev/null +@@ -1,337 +0,0 @@ +-package kcp +- +-import ( +- "encoding/binary" +- "sync/atomic" +- +- "github.com/klauspost/reedsolomon" +-) +- +-const ( +- fecHeaderSize = 6 +- fecHeaderSizePlus2 = fecHeaderSize + 2 // plus 2B data size +- typeData = 0xf1 +- typeParity = 0xf2 +- fecExpire = 60000 +-) +- +-// fecPacket is a decoded FEC packet +-type fecPacket []byte +- +-func (bts fecPacket) seqid() uint32 { return binary.LittleEndian.Uint32(bts) } +-func (bts fecPacket) flag() uint16 { return binary.LittleEndian.Uint16(bts[4:]) } +-func (bts fecPacket) data() []byte { return bts[6:] } +- +-// fecElement has auxcilliary time field +-type fecElement struct { +- fecPacket +- ts uint32 +-} +- +-// fecDecoder for decoding incoming packets +-type fecDecoder struct { +- rxlimit int // queue size limit +- dataShards int +- parityShards int +- shardSize int +- rx []fecElement // ordered receive queue +- +- // caches +- decodeCache [][]byte +- flagCache []bool +- +- // zeros +- zeros []byte +- +- // RS decoder +- codec reedsolomon.Encoder +-} +- +-func newFECDecoder(rxlimit, dataShards, parityShards int) *fecDecoder { +- if dataShards <= 0 || parityShards <= 0 { +- return nil +- } +- if rxlimit < dataShards+parityShards { +- return nil +- } +- +- dec := new(fecDecoder) +- dec.rxlimit = rxlimit +- dec.dataShards = dataShards +- dec.parityShards = parityShards +- dec.shardSize = dataShards + parityShards +- codec, err := reedsolomon.New(dataShards, parityShards) +- if err != nil { +- return nil +- } +- dec.codec = codec +- dec.decodeCache = make([][]byte, dec.shardSize) +- dec.flagCache = make([]bool, dec.shardSize) +- dec.zeros = make([]byte, mtuLimit) +- return dec +-} +- +-// decode a fec packet +-func (dec *fecDecoder) decode(in fecPacket) (recovered [][]byte) { +- // insertion +- n := len(dec.rx) - 1 +- insertIdx := 0 +- for i := n; i >= 0; i-- { +- if in.seqid() == dec.rx[i].seqid() { // de-duplicate +- return nil +- } else if _itimediff(in.seqid(), dec.rx[i].seqid()) > 0 { // insertion +- insertIdx = i + 1 +- break +- } +- } +- +- // make a copy +- pkt := fecPacket(xmitBuf.Get().([]byte)[:len(in)]) +- copy(pkt, in) +- elem := fecElement{pkt, currentMs()} +- +- // insert into ordered rx queue +- if insertIdx == n+1 { +- dec.rx = append(dec.rx, elem) +- } else { +- dec.rx = append(dec.rx, fecElement{}) +- copy(dec.rx[insertIdx+1:], dec.rx[insertIdx:]) // shift right +- dec.rx[insertIdx] = elem +- } +- +- // shard range for current packet +- shardBegin := pkt.seqid() - pkt.seqid()%uint32(dec.shardSize) +- shardEnd := shardBegin + uint32(dec.shardSize) - 1 +- +- // max search range in ordered queue for current shard +- searchBegin := insertIdx - int(pkt.seqid()%uint32(dec.shardSize)) +- if searchBegin < 0 { +- searchBegin = 0 +- } +- searchEnd := searchBegin + dec.shardSize - 1 +- if searchEnd >= len(dec.rx) { +- searchEnd = len(dec.rx) - 1 +- } +- +- // re-construct datashards +- if searchEnd-searchBegin+1 >= dec.dataShards { +- var numshard, numDataShard, first, maxlen int +- +- // zero caches +- shards := dec.decodeCache +- shardsflag := dec.flagCache +- for k := range dec.decodeCache { +- shards[k] = nil +- shardsflag[k] = false +- } +- +- // shard assembly +- for i := searchBegin; i <= searchEnd; i++ { +- seqid := dec.rx[i].seqid() +- if _itimediff(seqid, shardEnd) > 0 { +- break +- } else if _itimediff(seqid, shardBegin) >= 0 { +- shards[seqid%uint32(dec.shardSize)] = dec.rx[i].data() +- shardsflag[seqid%uint32(dec.shardSize)] = true +- numshard++ +- if dec.rx[i].flag() == typeData { +- numDataShard++ +- } +- if numshard == 1 { +- first = i +- } +- if len(dec.rx[i].data()) > maxlen { +- maxlen = len(dec.rx[i].data()) +- } +- } +- } +- +- if numDataShard == dec.dataShards { +- // case 1: no loss on data shards +- dec.rx = dec.freeRange(first, numshard, dec.rx) +- } else if numshard >= dec.dataShards { +- // case 2: loss on data shards, but it's recoverable from parity shards +- for k := range shards { +- if shards[k] != nil { +- dlen := len(shards[k]) +- shards[k] = shards[k][:maxlen] +- copy(shards[k][dlen:], dec.zeros) +- } else if k < dec.dataShards { +- shards[k] = xmitBuf.Get().([]byte)[:0] +- } +- } +- if err := dec.codec.ReconstructData(shards); err == nil { +- for k := range shards[:dec.dataShards] { +- if !shardsflag[k] { +- // recovered data should be recycled +- recovered = append(recovered, shards[k]) +- } +- } +- } +- dec.rx = dec.freeRange(first, numshard, dec.rx) +- } +- } +- +- // keep rxlimit +- if len(dec.rx) > dec.rxlimit { +- if dec.rx[0].flag() == typeData { // track the unrecoverable data +- atomic.AddUint64(&DefaultSnmp.FECShortShards, 1) +- } +- dec.rx = dec.freeRange(0, 1, dec.rx) +- } +- +- // timeout policy +- current := currentMs() +- numExpired := 0 +- for k := range dec.rx { +- if _itimediff(current, dec.rx[k].ts) > fecExpire { +- numExpired++ +- continue +- } +- break +- } +- if numExpired > 0 { +- dec.rx = dec.freeRange(0, numExpired, dec.rx) +- } +- return +-} +- +-// free a range of fecPacket +-func (dec *fecDecoder) freeRange(first, n int, q []fecElement) []fecElement { +- for i := first; i < first+n; i++ { // recycle buffer +- xmitBuf.Put([]byte(q[i].fecPacket)) +- } +- +- if first == 0 && n < cap(q)/2 { +- return q[n:] +- } +- copy(q[first:], q[first+n:]) +- return q[:len(q)-n] +-} +- +-// release all segments back to xmitBuf +-func (dec *fecDecoder) release() { +- if n := len(dec.rx); n > 0 { +- dec.rx = dec.freeRange(0, n, dec.rx) +- } +-} +- +-type ( +- // fecEncoder for encoding outgoing packets +- fecEncoder struct { +- dataShards int +- parityShards int +- shardSize int +- paws uint32 // Protect Against Wrapped Sequence numbers +- next uint32 // next seqid +- +- shardCount int // count the number of datashards collected +- maxSize int // track maximum data length in datashard +- +- headerOffset int // FEC header offset +- payloadOffset int // FEC payload offset +- +- // caches +- shardCache [][]byte +- encodeCache [][]byte +- +- // zeros +- zeros []byte +- +- // RS encoder +- codec reedsolomon.Encoder +- } +-) +- +-func newFECEncoder(dataShards, parityShards, offset int) *fecEncoder { +- if dataShards <= 0 || parityShards <= 0 { +- return nil +- } +- enc := new(fecEncoder) +- enc.dataShards = dataShards +- enc.parityShards = parityShards +- enc.shardSize = dataShards + parityShards +- enc.paws = 0xffffffff / uint32(enc.shardSize) * uint32(enc.shardSize) +- enc.headerOffset = offset +- enc.payloadOffset = enc.headerOffset + fecHeaderSize +- +- codec, err := reedsolomon.New(dataShards, parityShards) +- if err != nil { +- return nil +- } +- enc.codec = codec +- +- // caches +- enc.encodeCache = make([][]byte, enc.shardSize) +- enc.shardCache = make([][]byte, enc.shardSize) +- for k := range enc.shardCache { +- enc.shardCache[k] = make([]byte, mtuLimit) +- } +- enc.zeros = make([]byte, mtuLimit) +- return enc +-} +- +-// encodes the packet, outputs parity shards if we have collected quorum datashards +-// notice: the contents of 'ps' will be re-written in successive calling +-func (enc *fecEncoder) encode(b []byte) (ps [][]byte) { +- // The header format: +- // | FEC SEQID(4B) | FEC TYPE(2B) | SIZE (2B) | PAYLOAD(SIZE-2) | +- // |<-headerOffset |<-payloadOffset +- enc.markData(b[enc.headerOffset:]) +- binary.LittleEndian.PutUint16(b[enc.payloadOffset:], uint16(len(b[enc.payloadOffset:]))) +- +- // copy data from payloadOffset to fec shard cache +- sz := len(b) +- enc.shardCache[enc.shardCount] = enc.shardCache[enc.shardCount][:sz] +- copy(enc.shardCache[enc.shardCount][enc.payloadOffset:], b[enc.payloadOffset:]) +- enc.shardCount++ +- +- // track max datashard length +- if sz > enc.maxSize { +- enc.maxSize = sz +- } +- +- // Generation of Reed-Solomon Erasure Code +- if enc.shardCount == enc.dataShards { +- // fill '0' into the tail of each datashard +- for i := 0; i < enc.dataShards; i++ { +- shard := enc.shardCache[i] +- slen := len(shard) +- copy(shard[slen:enc.maxSize], enc.zeros) +- } +- +- // construct equal-sized slice with stripped header +- cache := enc.encodeCache +- for k := range cache { +- cache[k] = enc.shardCache[k][enc.payloadOffset:enc.maxSize] +- } +- +- // encoding +- if err := enc.codec.Encode(cache); err == nil { +- ps = enc.shardCache[enc.dataShards:] +- for k := range ps { +- enc.markParity(ps[k][enc.headerOffset:]) +- ps[k] = ps[k][:enc.maxSize] +- } +- } +- +- // counters resetting +- enc.shardCount = 0 +- enc.maxSize = 0 +- } +- +- return +-} +- +-func (enc *fecEncoder) markData(data []byte) { +- binary.LittleEndian.PutUint32(data, enc.next) +- binary.LittleEndian.PutUint16(data[4:], typeData) +- enc.next++ +-} +- +-func (enc *fecEncoder) markParity(data []byte) { +- binary.LittleEndian.PutUint32(data, enc.next) +- binary.LittleEndian.PutUint16(data[4:], typeParity) +- // sequence wrap will only happen at parity shard +- enc.next = (enc.next + 1) % enc.paws +-} +diff --git a/removed.go b/removed.go +new file mode 100644 +index 0000000..5ecf446 +--- /dev/null ++++ b/removed.go +@@ -0,0 +1,29 @@ ++package kcp ++ ++// Dummy implementations for types from crypt.go and fec.go, removed to reduce ++// dependencies. ++ ++const ( ++ fecHeaderSize = 6 ++ fecHeaderSizePlus2 = fecHeaderSize + 2 ++ typeData = 0xf1 ++ typeParity = 0xf2 ++) ++ ++type ( ++ BlockCrypt interface { ++ Encrypt(_, _ []byte) ++ Decrypt(_, _ []byte) ++ } ++ fecDecoder struct{} ++ fecEncoder struct{} ++ fecPacket []byte ++) ++ ++func newFECDecoder(rxlimit, dataShards, parityShards int) *fecDecoder { return nil } ++func newFECEncoder(dataShards, parityShards, offset int) *fecEncoder { return nil } ++ ++func (_ *fecDecoder) decode(in fecPacket) [][]byte { panic("disabled") } ++func (_ *fecDecoder) release() { panic("disabled") } ++func (_ *fecEncoder) encode(b []byte) [][]byte { panic("disabled") } ++func (_ fecPacket) flag() uint16 { panic("disabled") } +-- +2.20.1 + diff --git a/projects/smux/config b/projects/smux/config new file mode 100644 index 0000000..54d2a11 --- /dev/null +++ b/projects/smux/config @@ -0,0 +1,16 @@ +version: '[% c("abbrev") %]' +git_url: https://github.com/xtaci/smux +git_hash: c6969d8a76874342611f4b544d05b1590f1a76b1 # v1.5.12 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/xtaci/smux + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/snowflake/build b/projects/snowflake/build index 1aede45..2724dd9 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -8,6 +8,8 @@ mkdir -p $PTDIR $DOCSDIR tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/pion-webrtc') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/kcp-go') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/smux') %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz @@ -18,6 +20,7 @@ ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/snowflake.git # Fix gopath location of versioned dependencies ln -sf "$GOPATH/src/github.com/pion/webrtc" "$GOPATH/src/github.com/pion/webrtc/v2" ln -sf "$GOPATH/src/github.com/pion/sdp" "$GOPATH/src/github.com/pion/sdp/v2" +ln -sf "$GOPATH/src/github.com/xtaci/kcp-go" "$GOPATH/src/github.com/xtaci/kcp-go/v5" cd client go build -ldflags '-s' diff --git a/projects/snowflake/config b/projects/snowflake/config index b81f1f5..efd0707 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://git.torproject.org/pluggable-transports/snowflake.git -git_hash: ea01bf41c3011590938b079ed96c7b35cb40588b +git_hash: 7043a055f9fb0680281ecffd7d458a43f2ce65b5 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -18,3 +18,7 @@ input_files: project: goptlib - name: pion-webrtc project: pion-webrtc + - name: kcp-go + project: kcp-go + - name: smux + project: smux

1 0

[translation/torbutton-torbuttonproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties_completed
by translation＠torproject.org 13 May '20

13 May '20

commit bb1001a6c6fa414dfdf413bdfdeb69e7349ef206 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 13 05:21:47 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- es-AR/torbutton.properties | 83 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/es-AR/torbutton.properties b/es-AR/torbutton.properties index f568cdbb1f..bf0645fea5 100644 --- a/es-AR/torbutton.properties +++ b/es-AR/torbutton.properties @@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = País desconocido torbutton.circuit_display.guard = Guarda torbutton.circuit_display.guard_note = Tu nodo [Guarda] puede no cambiar. torbutton.circuit_display.learn_more = Más informacion +# torbutton.circuit_display.click_to_copy = Click to Copy +# torbutton.circuit_display.copied = Copied! torbutton.content_sizer.margin_tooltip = El Navegador Tor añade éste margen para hacer el ancho y alto de tu ventana menos distintivo, y de ésta manera reduce la habilidad de cualquiera para rastrearte en línea. torbutton.panel.tooltip.disabled = Cliquear para habilitar Tor torbutton.panel.tooltip.enabled = Cliquear para deshabilitar Tor @@ -58,3 +60,84 @@ updateDownloadingPanelUILabel=Descargando actualización %S # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Conexión encriptada (Servicio Onion, %1$S, claves de %2$S bits, %3$S) pageInfo_OnionEncryption=Conexión encriptada (Servicio Onion) + +# Onion services strings. Strings are kept here for ease of translation. +# onionServices.learnMore=Learn more +# onionServices.errorPage.browser=Browser +# onionServices.errorPage.network=Network +# onionServices.errorPage.onionSite=Onionsite +# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with +# an error code, e.g., 0xF3. +# Tor SOCKS error 0xF0: +# onionServices.descNotFound.pageTitle=Problem Loading Onionsite +# onionServices.descNotFound.header=Onionsite Not Found +# onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +# onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. +# Tor SOCKS error 0xF1: +# onionServices.descInvalid.pageTitle=Problem Loading Onionsite +# onionServices.descInvalid.header=Onionsite Cannot Be Reached +# onionServices.descInvalid=The onionsite is unreachable due an internal error. +# onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. +# Tor SOCKS error 0xF2: +# onionServices.introFailed.pageTitle=Problem Loading Onionsite +# onionServices.introFailed.header=Onionsite Has Disconnected +# onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +# onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. +# Tor SOCKS error 0xF3: +# onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite +# onionServices.rendezvousFailed.header=Unable to Connect to Onionsite +# onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. +# onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. +# Tor SOCKS error 0xF4: +# onionServices.clientAuthMissing.pageTitle=Authorization Required +# onionServices.clientAuthMissing.header=Onionsite Requires Authentication +# onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided. +# onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. +# Tor SOCKS error 0xF5: +# onionServices.clientAuthIncorrect.pageTitle=Authorization Failed +# onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed +# onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. +# onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. +# Tor SOCKS error 0xF6: +# onionServices.badAddress.pageTitle=Problem Loading Onionsite +# onionServices.badAddress.header=Invalid Onionsite Address +# onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. +# onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. +# Tor SOCKS error 0xF7: +# onionServices.introTimedOut.pageTitle=Problem Loading Onionsite +# onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out +# onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. +# onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. +# +# LOCALIZATION NOTE: %S will be replaced with the .onion address. +# onionServices.authPrompt.description=%S is requesting your private key. +# onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +# onionServices.authPrompt.done=Done +# onionServices.authPrompt.doneAccessKey=d +# onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) +# onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +# onionServices.authPreferences.header=Onion Services Authentication +# onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +# onionServices.authPreferences.savedKeys=Saved Keys… +# onionServices.authPreferences.dialogTitle=Onion Service Keys +# onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +# onionServices.authPreferences.onionSite=Onionsite +# onionServices.authPreferences.onionKey=Key +# onionServices.authPreferences.remove=Remove +# onionServices.authPreferences.removeAll=Remove All +# onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +# onionServices.authPreferences.failedToRemoveKey=Unable to remove key + +# Onion-Location strings. +# onionLocation.alwaysPrioritize=Always Prioritize Onions +# onionLocation.alwaysPrioritizeAccessKey=a +# onionLocation.notNow=Not Now +# onionLocation.notNowAccessKey=n +# onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. +# onionLocation.tryThis=Try Onion Services +# onionLocation.onionAvailable=.onion available +# onionLocation.learnMore=Learn more… +# onionLocation.always=Always +# onionLocation.askEverytime=Ask every time +# onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +# onionLocation.onionServicesTitle=Onion Services

1 0

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 13 May '20

13 May '20

commit 4e02a7672d25d428c407228647e7d04781f5dbc6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 13 05:21:40 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- es-AR/torbutton.properties | 52 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/es-AR/torbutton.properties b/es-AR/torbutton.properties index 500dbef330..8500751533 100644 --- a/es-AR/torbutton.properties +++ b/es-AR/torbutton.properties @@ -82,7 +82,7 @@ onionServices.descInvalid.longDescription= Detalles:% S — El descriptor del se onionServices.introFailed.pageTitle=Problema al cargar el sitio Onion onionServices.introFailed.header=El sitio Onion se ha desconectado onionServices.introFailed=La causa más probable es que el sitio Onion está fuera de línea. Póngase en contacto con el administrador del sitio Onion. -onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. +onionServices.introFailed.longDescription=Detalles:%S — Falló la introducción, lo que significa que se encontró el descriptor pero el servicio ya no está conectado al punto de introducción. Es probable que el servicio haya cambiado su descriptor o que no se esté ejecutando. # Tor SOCKS error 0xF3: onionServices.rendezvousFailed.pageTitle=Problema al cargar el sitio Onion onionServices.rendezvousFailed.header=No se puede conectar al sitio Onio @@ -102,42 +102,42 @@ onionServices.clientAuthIncorrect.longDescription=Detalles:% S — El cliente pu onionServices.badAddress.pageTitle=Problema al cargar el sitio Onion onionServices.badAddress.header=Dirección de sitio Onion no válida onionServices.badAddress=La dirección del sitio Onion proporcionada no es válida. Por favor verifique que lo haya ingresado correctamente. -onionServices.badAddress.longDescription=Detalles:% S — La dirección .onion proporcionada no es válida. Este error se devuelve debido a uno de los siguientes motivos: la suma de comprobación de la dirección no coincide, la clave pública ed25519 no es válida o la codificación no es válida. +onionServices.badAddress.longDescription=Detalles:% S — La dirección .onion proporcionada no es válida. Este error se devuelve debido a uno de los siguientes motivos: la suma de verificación de la dirección no coincide, la clave pública ed25519 no es válida o la codificación no es válida. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problema al cargar el sitio Onion -onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out -onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. -onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. +onionServices.introTimedOut.pageTitle=Problema al cargar sitio Onion +onionServices.introTimedOut.header=El tiempo de creación del circuito de sitio Onion se agotó +onionServices.introTimedOut=No se pudo conectar al sitio Onion, posiblemente debido a una mala conexión de red. +onionServices.introTimedOut.longDescription=Detalles: %S — El tiempo de espera de conexión al servicio Onion solicitado se agotó al intentar construir el circuito de encuentro. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S is requesting your private key. -onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +onionServices.authPrompt.description=%S está solicitando su clave privada. +onionServices.authPrompt.keyPlaceholder=Ingrese su clave privada para este servicio Onion onionServices.authPrompt.done=Hecho onionServices.authPrompt.doneAccessKey=d -onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key -onionServices.authPreferences.header=Onion Services Authentication -onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. -onionServices.authPreferences.savedKeys=Saved Keys… -onionServices.authPreferences.dialogTitle=Onion Service Keys -onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPrompt.invalidKey=Ingrese una clave válida (52 Base32 caracteres o 44 Base64 caracteres) +onionServices.authPrompt.failedToSetKey=No se puede configurar Tor con tu clave +onionServices.authPreferences.header=Autenticación de servicios Onion +onionServices.authPreferences.overview=Algunos servicios Onion requieren que se identifique con una clave (un tipo de contraseña) antes de poder acceder a ellos. +onionServices.authPreferences.savedKeys=Claves guardadas ... +onionServices.authPreferences.dialogTitle=Claves de servicio Onion +onionServices.authPreferences.dialogIntro=Las claves para los siguientes sitios Onion se almacenan en su computadora onionServices.authPreferences.onionSite=Sitio Onion onionServices.authPreferences.onionKey=Clave criptográfica onionServices.authPreferences.remove=Remover -onionServices.authPreferences.removeAll=Remove All -onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor -onionServices.authPreferences.failedToRemoveKey=Unable to remove key +onionServices.authPreferences.removeAll=Remover todo +onionServices.authPreferences.failedToGetKeys=No se puede recuperar claves de Tor +onionServices.authPreferences.failedToRemoveKey=No se puede eliminar la clave # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=Siempre priorice las Onions onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=Ahora no onionLocation.notNowAccessKey=j -onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. -onionLocation.tryThis=Try Onion Services -onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… -onionLocation.always=Always -onionLocation.askEverytime=Ask every time -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.description=Hay una versión más privada y segura de este sitio disponible en la red Tor a través de servicios Onion. Los servicios Onion ayudan a los editores de sitios web y a sus visitantes a vencer la vigilancia y la censura. +onionLocation.tryThis=Prueba los servicios Onion +onionLocation.onionAvailable=.onion disponible +onionLocation.learnMore=Aprende más… +onionLocation.always=Siempre +onionLocation.askEverytime=Pregunta cuando quieras +onionLocation.prioritizeOnionsDescription=Pregunta cuando quieras onionLocation.onionServicesTitle=Servicios Onion

1 0

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 13 May '20

13 May '20

commit 86a43c2bf11b596c5d4b94bb858d27aa8a2d0e04 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 13 04:51:38 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- es-AR/torbutton.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/es-AR/torbutton.properties b/es-AR/torbutton.properties index 747dfed2c5..500dbef330 100644 --- a/es-AR/torbutton.properties +++ b/es-AR/torbutton.properties @@ -87,7 +87,7 @@ onionServices.introFailed.longDescription=Details: %S — Introduction failed, w onionServices.rendezvousFailed.pageTitle=Problema al cargar el sitio Onion onionServices.rendezvousFailed.header=No se puede conectar al sitio Onio onionServices.rendezvousFailed=El sitio Onion está ocupado o la red Tor está sobrecargada. Intenta nuevamente más tarde. -onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. +onionServices.rendezvousFailed.longDescription=Detalles:% S — El cliente no se pudo reunir con el servicio, lo que significa que el cliente no pudo finalizar la conexión. # Tor SOCKS error 0xF4: onionServices.clientAuthMissing.pageTitle=Autorización requerida onionServices.clientAuthMissing.header=El sitio Onion requiere autenticación @@ -96,13 +96,13 @@ onionServices.clientAuthMissing.longDescription=Detalles:% S — El descriptor d # Tor SOCKS error 0xF5: onionServices.clientAuthIncorrect.pageTitle=Autorización fallida onionServices.clientAuthIncorrect.header=Autenticación del sitio Onion fallida -onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. -onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. +onionServices.clientAuthIncorrect=La clave proporcionada es incorrecta o ha sido revocada. Póngase en contacto con el administrador del sitio Onion. +onionServices.clientAuthIncorrect.longDescription=Detalles:% S — El cliente pudo descargar el descriptor del servicio de Onion solicitado, pero no pudo descifrar su contenido utilizando la información de autorización del cliente proporcionada. Esto puede significar que el acceso ha sido revocado. # Tor SOCKS error 0xF6: onionServices.badAddress.pageTitle=Problema al cargar el sitio Onion -onionServices.badAddress.header=Invalid Onionsite Address -onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. -onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. +onionServices.badAddress.header=Dirección de sitio Onion no válida +onionServices.badAddress=La dirección del sitio Onion proporcionada no es válida. Por favor verifique que lo haya ingresado correctamente. +onionServices.badAddress.longDescription=Detalles:% S — La dirección .onion proporcionada no es válida. Este error se devuelve debido a uno de los siguientes motivos: la suma de comprobación de la dirección no coincide, la clave pública ed25519 no es válida o la codificación no es válida. # Tor SOCKS error 0xF7: onionServices.introTimedOut.pageTitle=Problema al cargar el sitio Onion onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 13 May '20

13 May '20

commit 0aed8fa43c8db7443961db4f23943c67b7385343 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 13 03:15:34 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+zh-CN.po | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index b2f3e2ec37..add82daed0 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -1374,7 +1374,7 @@ msgstr "" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) msgid "* How much monthly traffic is included? Is bandwidth \"unmetered\"?" -msgstr "" +msgstr "* 包括了多少每月通信流量？带宽没有被测量吗？" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) @@ -5669,6 +5669,8 @@ msgid "" "* Using a DNS provider that censors its results (such as some " "[OpenDNS](http://www.opendns.com) or Quad (9 9.9.9.9) configurations)." msgstr "" +"* 使用审查它的结果（比如一些[开源域名解析服务](http://www.opendns.com) 或Quad (9.9.9.9.9) " +"配置）的域名解析服务提供商。" #: https//community.torproject.org/relay/community-resources/bad-relays/ #: (content/relay-operations/community-resources/bad-relays/contents+en.lrpage.body) @@ -6631,7 +6633,7 @@ msgstr "" msgid "" "Avoid having actual meetings or long email discussions, and make it clear " "that you don't need their official legal opinion yet." -msgstr "" +msgstr "避免真实会面或长邮件交流，说明清楚您还暂时不需要他们的官方法律意见。" #: https//community.torproject.org/relay/community-resources/tor-relay-universities/ #: (content/relay-operations/community-resources/tor-relay-universities/contents+en.lrpage.body) @@ -6767,6 +6769,9 @@ msgid "" "using the `MaxAdvertisedBandwidth` to attract less traffic from the Tor " "network. Lastly, you can scale back your exit policy." msgstr "" +"如果有太多投诉，您有几个方法可以减少它们。首先，您应该遵循[Tor " +"中继服务器文件](https://community.torproject.org/relay) " +"里的小贴士，比如选择一个描述性的主机名或获取一个您自己的IP地址。如果这不起作用，您可以减少您的中继服务器公示的速度，通过使用“最大公示带宽”来吸引更少的通信流量。最后，您可以减少您出口法规里的规定的流量。" #: https//community.torproject.org/relay/community-resources/tor-relay-universities/ #: (content/relay-operations/community-resources/tor-relay-universities/contents+en.lrpage.body) @@ -7095,7 +7100,7 @@ msgstr "" msgid "" "An exit relay may forward traffic that is considered unlawful, and that " "traffic may be attributed to the operator of a relay." -msgstr "" +msgstr "出口节点会传递被认为是违法的通信，并且那个通信会被归给中继服务器的运行者。" #: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/ #: (content/relay-operations/community-resources/eff-tor-legal-faq/contents+en.lrpage.body) @@ -9715,7 +9720,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/debianubuntu/ #: (content/relay-operations/technical-setup/guard/debianubuntu/contents+en.lrpage.body) msgid "# 3. Package Installation" -msgstr "" +msgstr "# 3. 安装软件包" #: https//community.torproject.org/relay/setup/guard/debianubuntu/ #: (content/relay-operations/technical-setup/guard/debianubuntu/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 13 May '20

13 May '20

commit 7d3ee183a9f1a041721e98b8a9a7f3c686d9a6fa Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 13 02:45:30 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+zh-CN.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 3895a50258..b2f3e2ec37 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -3339,7 +3339,7 @@ msgstr "" #: https//community.torproject.org/localization/becoming-tor-translator/ #: (content/localization/becoming-tor-translator/contents+en.lrpage.body) msgid "1. Click the blue 'Join Team' button on the far right:" -msgstr "" +msgstr "1. 点击最右端蓝色的“加入队伍”按钮。" #: https//community.torproject.org/localization/becoming-tor-translator/ #: (content/localization/becoming-tor-translator/contents+en.lrpage.body) @@ -6948,6 +6948,8 @@ msgid "" "and human rights. It is not a tool designed or intended to be used to break " "the law, either by Tor users or Tor relay operators." msgstr "" +"** 不**。Tor 开发的宗旨就是为了保护言论自由，隐私和人权。不管是对于使用Tor 的用户还是Tor " +"中继服务器的运行者来说，它都不是用来打破法律的工具。" #: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/ #: (content/relay-operations/community-resources/eff-tor-legal-faq/contents+en.lrpage.body) @@ -9966,7 +9968,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.body) msgid "Append the following section to `/etc/login.conf`:" -msgstr "" +msgstr "将以下部分附加到`/etc/login.conf`:" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.body)

1 0

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 13 May '20

13 May '20

commit cec4f980d42c37c37114976a4975fabf5a89e119 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 13 02:22:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- es-AR/torbutton.properties | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/es-AR/torbutton.properties b/es-AR/torbutton.properties index 0c53466efd..747dfed2c5 100644 --- a/es-AR/torbutton.properties +++ b/es-AR/torbutton.properties @@ -72,30 +72,30 @@ onionServices.errorPage.onionSite=Sitio Onion onionServices.descNotFound.pageTitle=Problema al cargar el sitio Onion onionServices.descNotFound.header=Sitio Onion no encontrado onionServices.descNotFound=La causa más probable es que el sitio Onion está fuera de línea. Póngase en contacto con el administrador del sitio Onion. -onionServices.descNotFound.longDescription=Detalles:% S: el descriptor del servicio Onion solicitado no se puede encontrar en el hashring y, por lo tanto, el cliente no puede acceder al servicio. +onionServices.descNotFound.longDescription=Detalles:% S — El descriptor del servicio Onion solicitado no se puede encontrar en el hashring y, por lo tanto, el cliente no puede acceder al servicio. # Tor SOCKS error 0xF1: onionServices.descInvalid.pageTitle=Problema al cargar el sitio Onion -onionServices.descInvalid.header=Onionsite Cannot Be Reached -onionServices.descInvalid=The onionsite is unreachable due an internal error. -onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. +onionServices.descInvalid.header=No se puede acceder al sitio onion +onionServices.descInvalid=No se puede acceder al sitio Onion debido a un error interno. +onionServices.descInvalid.longDescription= Detalles:% S — El descriptor del servicio de cebolla solicitado no se puede analizar o la validación de firma falló. # Tor SOCKS error 0xF2: onionServices.introFailed.pageTitle=Problema al cargar el sitio Onion -onionServices.introFailed.header=Onionsite Has Disconnected +onionServices.introFailed.header=El sitio Onion se ha desconectado onionServices.introFailed=La causa más probable es que el sitio Onion está fuera de línea. Póngase en contacto con el administrador del sitio Onion. onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. # Tor SOCKS error 0xF3: onionServices.rendezvousFailed.pageTitle=Problema al cargar el sitio Onion -onionServices.rendezvousFailed.header=Unable to Connect to Onionsite -onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. +onionServices.rendezvousFailed.header=No se puede conectar al sitio Onio +onionServices.rendezvousFailed=El sitio Onion está ocupado o la red Tor está sobrecargada. Intenta nuevamente más tarde. onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required -onionServices.clientAuthMissing.header=Onionsite Requires Authentication -onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided. -onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. +onionServices.clientAuthMissing.pageTitle=Autorización requerida +onionServices.clientAuthMissing.header=El sitio Onion requiere autenticación +onionServices.clientAuthMissing=El acceso al sitio Onion requiere una clave, pero no se proporcionó ninguna. +onionServices.clientAuthMissing.longDescription=Detalles:% S — El descriptor del servicio Onion solicitado no se puede analizar o la validación de firma falló. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed -onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed +onionServices.clientAuthIncorrect.pageTitle=Autorización fallida +onionServices.clientAuthIncorrect.header=Autenticación del sitio Onion fallida onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. # Tor SOCKS error 0xF6:

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 13 May '20

13 May '20

commit 3579de76383260ad89f3c0a682927ffeba65f40a Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 13 02:15:32 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+zh-CN.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index fdcd31a7d3..3895a50258 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -1868,7 +1868,7 @@ msgstr "" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "Complete this checklist before running a Tor training." -msgstr "" +msgstr "在开始Tor 培训前先完成这个核对清单。" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) @@ -2617,7 +2617,7 @@ msgid "" "As part of this step, Bob gives its introduction point a special " "\"authentication key\", so that if any clients come for introductions later " "the introduction point can use that key to match them to Bob." -msgstr "" +msgstr "作为此步骤的一部分，Bob 赋予它的传入点一个特别的“验证密钥”，这样一来，如果有任何来自传入点的客户，都可以通过密钥匹配给Bob." #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -8198,7 +8198,7 @@ msgstr "" msgid "" "# \"Ext\" means \"extended\", not \"external\". Don't try to set a specific" " port number, nor listen on 0.0.0.0." -msgstr "" +msgstr "# \"Ext\" 代表“extended”，而不是“external”。不要试图设置一个特定的接口数字，也不要听从0.0.0.0." #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)

1 0

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 13 May '20

13 May '20

commit 8b9bb5afef08ab57256ad0c5027a6659547d430a Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 13 01:51:50 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- es-AR/torbutton.properties | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/es-AR/torbutton.properties b/es-AR/torbutton.properties index d86b208aa9..0c53466efd 100644 --- a/es-AR/torbutton.properties +++ b/es-AR/torbutton.properties @@ -69,22 +69,22 @@ onionServices.errorPage.onionSite=Sitio Onion # LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with # an error code, e.g., 0xF3. # Tor SOCKS error 0xF0: -onionServices.descNotFound.pageTitle=Problem Loading Onionsite -onionServices.descNotFound.header=Onionsite Not Found -onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. -onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. +onionServices.descNotFound.pageTitle=Problema al cargar el sitio Onion +onionServices.descNotFound.header=Sitio Onion no encontrado +onionServices.descNotFound=La causa más probable es que el sitio Onion está fuera de línea. Póngase en contacto con el administrador del sitio Onion. +onionServices.descNotFound.longDescription=Detalles:% S: el descriptor del servicio Onion solicitado no se puede encontrar en el hashring y, por lo tanto, el cliente no puede acceder al servicio. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite +onionServices.descInvalid.pageTitle=Problema al cargar el sitio Onion onionServices.descInvalid.header=Onionsite Cannot Be Reached onionServices.descInvalid=The onionsite is unreachable due an internal error. onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite +onionServices.introFailed.pageTitle=Problema al cargar el sitio Onion onionServices.introFailed.header=Onionsite Has Disconnected -onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.introFailed=La causa más probable es que el sitio Onion está fuera de línea. Póngase en contacto con el administrador del sitio Onion. onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite +onionServices.rendezvousFailed.pageTitle=Problema al cargar el sitio Onion onionServices.rendezvousFailed.header=Unable to Connect to Onionsite onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. @@ -99,12 +99,12 @@ onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite +onionServices.badAddress.pageTitle=Problema al cargar el sitio Onion onionServices.badAddress.header=Invalid Onionsite Address onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite +onionServices.introTimedOut.pageTitle=Problema al cargar el sitio Onion onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.

1 0