[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

[translation]

commit 0cd8033f3ebe78c629b45c7d9a0c78ba80b9c589
Author: Translation commit bot 
Date:   Thu Sep 30 04:46:48 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+id.po | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contents+id.po b/contents+id.po
index 8401a0b2cd..b40dfb520f 100644
--- a/contents+id.po
+++ b/contents+id.po
@@ -11,6 +11,7 @@
 # Evanna Audrey , 2021
 # erinm, 2021
 # Emma Peel, 2021
+# Sidiq Pangestu , 2021
 # 
 msgid ""
 msgstr ""
@@ -18,7 +19,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-03 10:01+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Emma Peel, 2021\n"
+"Last-Translator: Sidiq Pangestu , 2021\n"
 "Language-Team: Indonesian (https://www.transifex.com/otf/teams/1519/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1931,6 +1932,8 @@ msgid ""
 "When you are prompted to update Tor Browser, click on hamburger menu (main "
 "menu), then select “Restart to update Tor browser”."
 msgstr ""
+"Ketika Anda diminta untuk memperbarui Tor Browser, klik menu hamburger (menu"
+" utama), kemudian pilih \"Mulai ulang untuk Memperbarui Tor Browser\""
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/main] configure.ac: Define ENABLE_COVERAGE macro

[nickm]

commit 3bc3a108955c7b25a13808a2cfefcc77d2364cf4
Author: Simon South 
Date:   Thu Sep 23 09:21:13 2021 -0400

configure.ac: Define ENABLE_COVERAGE macro

Allow conditional compilation based on whether the "--enable-coverage"
configure option was specified.
---
 configure.ac | 5 +
 1 file changed, 5 insertions(+)

diff --git a/configure.ac b/configure.ac
index b4617a4003..f010c547b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,6 +119,11 @@ AM_CONDITIONAL(USE_RUST, test "x$enable_rust" = "xyes")
 AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes")
 AM_CONDITIONAL(USE_OPENSSL, test "x$enable_nss" != "xyes")
 
+if test "x$enable_coverage" = "xyes"; then
+  AC_DEFINE(ENABLE_COVERAGE, 1,
+   [Defined if coverage support is enabled for the unit tests])
+fi
+
 if test "x$enable_nss" = "xyes"; then
   AC_DEFINE(ENABLE_NSS, 1,
[Defined if we're building with NSS.])



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/main] sandbox: Allow use with fragile hardening

[nickm]

commit fbf2e7e9218b8e0ffabcd59fab2322d7c2c7178c
Author: Simon South 
Date:   Fri Sep 24 14:08:58 2021 -0400

sandbox: Allow use with fragile hardening

When building with --enable-fragile-hardening, add or relax Linux
seccomp rules to allow AddressSanitizer to execute normally if the
process terminates with the sandbox active.

Further resolves issue 11477.
---
 changes/issue11477|  8 +
 src/app/main/main.c   |  7 +
 src/lib/sandbox/sandbox.c | 75 +++
 3 files changed, 90 insertions(+)

diff --git a/changes/issue11477 b/changes/issue11477
new file mode 100644
index 00..bb5d9e4099
--- /dev/null
+++ b/changes/issue11477
@@ -0,0 +1,8 @@
+  o Minor bugfixes (fragile-hardening, sandbox):
+- When building with --enable-fragile-hardening, add or relax Linux
+  seccomp rules to allow AddressSanitizer to execute normally if the
+  process terminates with the sandbox active. This has the side
+  effect of disabling the filtering of file- and directory-open
+  requests on most systems and dilutes the effectiveness of the
+  sandbox overall, as a wider range of system calls must be
+  permitted. Fixes bug 11477; bugfix on 0.2.5.4-alpha.
diff --git a/src/app/main/main.c b/src/app/main/main.c
index 89564490e6..0959b0db71 100644
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -1343,6 +1343,13 @@ tor_run_main(const tor_main_configuration_t *tor_cfg)
   pubsub_connect();
 
   if (get_options()->Sandbox && get_options()->command == CMD_RUN_TOR) {
+#ifdef ENABLE_FRAGILE_HARDENING
+log_warn(LD_CONFIG, "Sandbox is enabled but this Tor was built using "
+ "fragile compiler hardening. The sandbox may be unable to filter "
+ "requests to open files and directories and its overall "
+ "effectiveness will be reduced.");
+#endif
+
 sandbox_cfg_t* cfg = sandbox_init_filter();
 
 if (sandbox_init(cfg)) {
diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c
index 0e5a1c..a78e4a7ac7 100644
--- a/src/lib/sandbox/sandbox.c
+++ b/src/lib/sandbox/sandbox.c
@@ -58,6 +58,10 @@
 #include 
 #include 
 
+#ifdef ENABLE_FRAGILE_HARDENING
+#include 
+#endif
+
 #include 
 #include 
 #include 
@@ -191,6 +195,9 @@ static int filter_nopar_gen[] = {
 SCMP_SYS(getgid32),
 #endif
 SCMP_SYS(getpid),
+#ifdef ENABLE_FRAGILE_HARDENING
+SCMP_SYS(getppid),
+#endif
 #ifdef __NR_getrlimit
 SCMP_SYS(getrlimit),
 #endif
@@ -532,6 +539,24 @@ sb_open(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
 
   int use_openat = libc_uses_openat_for_open();
 
+#ifdef ENABLE_FRAGILE_HARDENING
+  /* AddressSanitizer uses the "open" syscall to access information about the
+   * running process via the filesystem, so that call must be allowed without
+   * restriction or the sanitizer will be unable to execute normally when the
+   * process terminates. */
+  rc = seccomp_rule_add_0(ctx, SCMP_ACT_ALLOW, SCMP_SYS(open));
+  if (rc != 0) {
+log_err(LD_BUG,"(Sandbox) failed to add open syscall, received "
+"libseccomp error %d", rc);
+return rc;
+  }
+
+  /* If glibc also uses only the "open" syscall to open files on this system
+   * there is no need to consider any additional rules. */
+  if (!use_openat)
+return 0;
+#endif
+
   // for each dynamic parameter filters
   for (elem = filter; elem != NULL; elem = elem->next) {
 smp_param_t *param = elem->param;
@@ -687,6 +712,34 @@ sb_opendir(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
   return 0;
 }
 
+#ifdef ENABLE_FRAGILE_HARDENING
+/**
+ * Function responsible for setting up the ptrace syscall for
+ * the seccomp filter sandbox.
+ */
+static int
+sb_ptrace(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
+{
+  int rc;
+  pid_t pid = getpid();
+  (void) filter;
+
+  rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(ptrace),
+  SCMP_CMP(0, SCMP_CMP_EQ, PTRACE_ATTACH),
+  SCMP_CMP(1, SCMP_CMP_EQ, pid));
+  if (rc)
+return rc;
+
+  rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(ptrace),
+  SCMP_CMP(0, SCMP_CMP_EQ, PTRACE_GETREGS),
+  SCMP_CMP(1, SCMP_CMP_EQ, pid));
+  if (rc)
+return rc;
+
+  return 0;
+}
+#endif
+
 /**
  * Function responsible for setting up the socket syscall for
  * the seccomp filter sandbox.
@@ -1009,6 +1062,18 @@ sb_prctl(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
   int rc = 0;
   (void) filter;
 
+#ifdef ENABLE_FRAGILE_HARDENING
+  rc = seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(prctl),
+  SCMP_CMP(0, SCMP_CMP_EQ, PR_GET_DUMPABLE));
+  if (rc)
+return rc;
+
+  rc = seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(prctl),
+  SCMP_CMP(0, SCMP_CMP_EQ, PR_SET_PTRACER));
+  if (rc)
+return rc;
+#endif
+
   rc = seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(prctl),
   SCMP_CMP(0, SCMP_CMP_EQ, PR_SET_DUMPABLE));
   if (rc)
@@ -1053,6 +1118,13 @@ sb_rt_sigprocmask(scmp_filter_ctx ctx, sandbox_cfg_t 
*filter)
   int rc = 0;
   

[tor-commits] [tor/main] configure.ac: Define ENABLE_FRAGILE_HARDENING macro

[nickm]

commit 352677556e14480753f75e8abe1f584f1580f1b2
Author: Simon South 
Date:   Wed Sep 22 14:42:45 2021 -0400

configure.ac: Define ENABLE_FRAGILE_HARDENING macro

Allow conditional compilation based on whether the
"--enable-fragile-hardening" configure option was specified.
---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure.ac b/configure.ac
index 23ba4b0d2d..b4617a4003 100644
--- a/configure.ac
+++ b/configure.ac
@@ -233,6 +233,7 @@ AC_ARG_ENABLE(fragile-hardening,
 AS_HELP_STRING(--enable-fragile-hardening, [enable more fragile and 
expensive compiler hardening; makes Tor slower]))
 if test "x$enable_expensive_hardening" = "xyes" || test 
"x$enable_fragile_hardening" = "xyes"; then
   fragile_hardening="yes"
+  AC_DEFINE(ENABLE_FRAGILE_HARDENING, 1, [Defined if we're building with 
additional, fragile and expensive compiler hardening])
   AC_DEFINE(DEBUG_SMARTLIST, 1, [Enable smartlist debugging])
 fi
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/main] test: Add sandbox unit tests

[nickm]

commit 1a10948260d915d4982415e37dd6495bca9ef545
Author: Simon South 
Date:   Thu Sep 2 11:04:23 2021 -0400

test: Add sandbox unit tests
---
 changes/issue16803  |   2 +
 src/test/include.am |   1 +
 src/test/test.c |   4 +
 src/test/test.h |   1 +
 src/test/test_sandbox.c | 348 
 5 files changed, 356 insertions(+)

diff --git a/changes/issue16803 b/changes/issue16803
new file mode 100644
index 00..7d0dd833e2
--- /dev/null
+++ b/changes/issue16803
@@ -0,0 +1,2 @@
+  o Testing:
+- Add unit tests for the Linux seccomp sandbox. Resolves issue 16803.
diff --git a/src/test/include.am b/src/test/include.am
index 0dc1630044..fb2c03ceb9 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -231,6 +231,7 @@ src_test_test_SOURCES += \
src/test/test_routerkeys.c \
src/test/test_routerlist.c \
src/test/test_routerset.c \
+   src/test/test_sandbox.c \
src/test/test_scheduler.c \
src/test/test_sendme.c \
src/test/test_shared_random.c \
diff --git a/src/test/test.c b/src/test/test.c
index 0aa1353ec2..c38d78da30 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -52,6 +52,7 @@
 #include "core/crypto/onion_fast.h"
 #include "core/crypto/onion_tap.h"
 #include "core/or/policies.h"
+#include "lib/sandbox/sandbox.h"
 #include "app/config/statefile.h"
 #include "lib/crypt_ops/crypto_curve25519.h"
 #include "feature/nodelist/networkstatus.h"
@@ -732,6 +733,9 @@ struct testgroup_t testgroups[] = {
   { "routerkeys/", routerkeys_tests },
   { "routerlist/", routerlist_tests },
   { "routerset/" , routerset_tests },
+#ifdef USE_LIBSECCOMP
+  { "sandbox/" , sandbox_tests },
+#endif
   { "scheduler/", scheduler_tests },
   { "sendme/", sendme_tests },
   { "shared-random/", sr_tests },
diff --git a/src/test/test.h b/src/test/test.h
index 0a22043acc..e17bce427c 100644
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -184,6 +184,7 @@ extern struct testcase_t router_tests[];
 extern struct testcase_t routerkeys_tests[];
 extern struct testcase_t routerlist_tests[];
 extern struct testcase_t routerset_tests[];
+extern struct testcase_t sandbox_tests[];
 extern struct testcase_t scheduler_tests[];
 extern struct testcase_t sendme_tests[];
 extern struct testcase_t socks_tests[];
diff --git a/src/test/test_sandbox.c b/src/test/test_sandbox.c
new file mode 100644
index 00..e5064c58ec
--- /dev/null
+++ b/src/test/test_sandbox.c
@@ -0,0 +1,348 @@
+/* Copyright (c) 2021, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+#ifndef _LARGEFILE64_SOURCE
+/**
+ * Temporarily required for O_LARGEFILE flag. Needs to be removed
+ * with the libevent fix.
+ */
+#define _LARGEFILE64_SOURCE
+#endif /* !defined(_LARGEFILE64_SOURCE) */
+
+#include "orconfig.h"
+
+#include "lib/sandbox/sandbox.h"
+
+#ifdef USE_LIBSECCOMP
+
+#include 
+#ifdef HAVE_FCNTL_H
+#include 
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include 
+#endif
+#ifdef HAVE_UNISTD_H
+#include 
+#endif
+
+#include "core/or/or.h"
+
+#include "test/test.h"
+#include "test/log_test_helpers.h"
+
+typedef struct {
+  sandbox_cfg_t *cfg;
+
+  char *file_ops_allowed;
+  char *file_ops_blocked;
+
+  char *file_rename_target_allowed;
+
+  char *dir_ops_allowed;
+  char *dir_ops_blocked;
+} sandbox_data_t;
+
+/* All tests are skipped when coverage support is enabled (see further below)
+ * as the sandbox interferes with the use of gcov.  Prevent a compiler warning
+ * by omitting these definitions in that case. */
+#ifndef ENABLE_COVERAGE
+static void *
+setup_sandbox(const struct testcase_t *testcase)
+{
+  sandbox_data_t *data = tor_malloc_zero(sizeof(*data));
+
+  (void)testcase;
+
+  /* Establish common file and directory names within the test suite's
+   * temporary directory. */
+  data->file_ops_allowed = tor_strdup(get_fname("file_ops_allowed"));
+  data->file_ops_blocked = tor_strdup(get_fname("file_ops_blocked"));
+
+  data->file_rename_target_allowed =
+tor_strdup(get_fname("file_rename_target_allowed"));
+
+  data->dir_ops_allowed = tor_strdup(get_fname("dir_ops_allowed"));
+  data->dir_ops_blocked = tor_strdup(get_fname("dir_ops_blocked"));
+
+  /* Create the corresponding filesystem objects. */
+  creat(data->file_ops_allowed, S_IRWXU);
+  creat(data->file_ops_blocked, S_IRWXU);
+  mkdir(data->dir_ops_allowed, S_IRWXU);
+  mkdir(data->dir_ops_blocked, S_IRWXU);
+
+  /* Create the sandbox configuration. */
+  data->cfg = sandbox_cfg_new();
+
+  sandbox_cfg_allow_open_filename(&data->cfg,
+  tor_strdup(data->file_ops_allowed));
+  sandbox_cfg_allow_open_filename(&data->cfg,
+  tor_strdup(data->dir_ops_allowed));
+
+  sandbox_cfg_allow_chmod_filename(&data->cfg,
+   tor_strdup(data->file_ops_allowed));
+  sandbox_cfg_allow_chmod_filename(&data->cfg,
+   tor_strdup(data->dir_ops_allowed));
+  sandbo

[tor-commits] [translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot

[translation]

commit 3fb349cde7fdd93672dea29a4eedc8a16003d740
Author: Translation commit bot 
Date:   Wed Sep 29 20:45:22 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+ro.po | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/contents+ro.po b/contents+ro.po
index 1b88d33f1d..90483ef7ca 100644
--- a/contents+ro.po
+++ b/contents+ro.po
@@ -10247,6 +10247,11 @@ msgid ""
 "whom you're going to converse knows nothing about Tor. Assume this same "
 "person isn't going to trust anything you say."
 msgstr ""
+"* Citiți [Prezentare generală Tor] "
+"(https://2019.www.torproject.org/about/overview.html.en). Fiți pregătit să 
"
+"rezumați și să răspundeți la întrebări de bază. Să presupunem că 
persoana cu"
+" care urmează să conversați nu știe nimic despre Tor. Să presupunem că "
+"aceeași persoană nu va avea încredere în nimic din ceea ce spui."
 
 #: 
https//community.torproject.org/relay/community-resources/tor-abuse-templates/
 #: 
(content/relay/community-resources/tor-abuse-templates/contents+en.lrpage.body)
@@ -13238,6 +13243,8 @@ msgid ""
 "| [Tailored VPS](http://tailoredvps.com/) | - | Yes | Yes | Yes(?) | -  | - "
 "|"
 msgstr ""
+"| [VPS personalizat] (http://tailoredvps.com/) | - | Da | Da | Da (?) | - | "
+"- |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot

[translation]

commit 6ef9f4dd23b2a029b5dc55d146f502d4495c686c
Author: Translation commit bot 
Date:   Wed Sep 29 20:15:21 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+ro.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/contents+ro.po b/contents+ro.po
index f57338c64a..1b88d33f1d 100644
--- a/contents+ro.po
+++ b/contents+ro.po
@@ -10,6 +10,7 @@
 # Cristina Lupu , 2021
 # eduard pintilie , 2021
 # Emma Peel, 2021
+# Legend Youtuber, 2021
 # 
 msgid ""
 msgstr ""
@@ -17,7 +18,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-06-29 12:10+CET\n"
 "PO-Revision-Date: 2019-12-11 10:50+\n"
-"Last-Translator: Emma Peel, 2021\n"
+"Last-Translator: Legend Youtuber, 2021\n"
 "Language-Team: Romanian (https://www.transifex.com/otf/teams/1519/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1832,7 +1833,7 @@ msgstr ""
 #: https//community.torproject.org/training/checklist/
 #: (content/training/checklist/contents+en.lrpage.body)
 msgid "* Leave an e-mail for further contact and support"
-msgstr ""
+msgstr "* Lăsați un e-mail pentru contact și asistență ulterioară"
 
 #: https//community.torproject.org/training/checklist/
 #: (content/training/checklist/contents+en.lrpage.body)
@@ -6312,7 +6313,7 @@ msgstr ""
 #: https//community.torproject.org/outreach/meetup/
 #: (content/outreach/meetup/contents+en.lrpage.subtitle)
 msgid "Learn how to organize a Tor meetup with your friends."
-msgstr ""
+msgstr "Aflați cum să organizați o întâlnire Tor cu prietenii dvs."
 
 #: https//community.torproject.org/outreach/meetup/
 #: (content/outreach/meetup/contents+en.lrpage.body)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

[translation]

commit 781a672cdfbc57208a0865465ddcf9ae65a885d8
Author: Translation commit bot 
Date:   Wed Sep 29 17:46:45 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 pt_BR.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR.po b/pt_BR.po
index 61de4d9a9f..283f3d395e 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -38,7 +38,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-06 12:01+0200\n"
-"PO-Revision-Date: 2021-09-29 17:14+\n"
+"PO-Revision-Date: 2021-09-29 17:26+\n"
 "Last-Translator: Henrique Casellato\n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

[translation]

commit 1eeef69018a46c429a229dea23664483f76c011c
Author: Translation commit bot 
Date:   Wed Sep 29 17:45:55 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 pt_BR.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pt_BR.po b/pt_BR.po
index a5921e3fb8..75cf946b58 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -38,7 +38,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-06 12:01+0200\n"
-"PO-Revision-Date: 2021-09-29 17:14+\n"
+"PO-Revision-Date: 2021-09-29 17:26+\n"
 "Last-Translator: Henrique Casellato\n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -2718,7 +2718,7 @@ msgid ""
 "1. Send an empty email to brid...@torproject.org from a Gmail or 
Riseup email address.\n"
 "\n"
 "2. Type below one of the bridges that you received by email."
-msgstr ""
+msgstr "Para pedir novas Pontes do Tor, você pode também:\n\n1. Enviar um 
email vazio para brid...@torproject.org pelo Gmail ou pelo endereço 
de email Riseup.\n\n2. Escreva abaixo uma das pontes que você recebeu por 
email."
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:971
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1379
@@ -2752,14 +2752,14 @@ msgstr "O Tails tentará maneiras diferentes de se 
conectar ao Tor até ter suce
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1123
 msgid "Configure a Tor _bridge"
-msgstr ""
+msgstr "Configure uma _Ponte Tor"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1169
 msgid ""
 "Tor bridges are secret Tor relays. Use a bridge as your first Tor relay if 
connections to Tor are blocked, for example in some countries, by some public 
networks, or by some parental controls.\n"
 "\n"
 "Choose this option if you already know that you need a bridge. Otherwise, 
Tails will autodetect whether you need a bridge to connect to Tor from your 
local network."
-msgstr ""
+msgstr "As Pontes Tor são relés Tor secretos. Use uma ponte como seu 
primeiro relé do Tor caso as conexões com o Tor estejam bloqueadas, por 
exemplo, em alguns países, por algumas redes públicas ou por alguns controles 
dos pais.\n\nEscolha esta opção se você já sabe que precisa de uma Ponte. 
Caso não, Tails irá detectar automaticamente se você necessita de uma Ponte 
para conectar-se ao Tor de sua rede local. "
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1211
 msgid "_Hide to my local network that I'm connecting to Tor (safer)"
@@ -2778,7 +2778,7 @@ msgid ""
 "Our team is doing its best to help you connect to Tor using the most discrete 
types of Tor bridges.\n"
 "\n"
 "You will have to do extra configuration if you don't know any Tor bridges 
yet, if you connect from a public Wi-Fi network, or if you are in the Eastern 
Hemisphere."
-msgstr ""
+msgstr "Tails só se conectará ao Tor depois de configurar as pontes do Tor. 
As pontes são relés secretos do Tor que escondem que você está se 
conectando ao Tor.\n\nNossa equipe está fazendo o possível para ajudá-lo a 
se conectar ao Tor usando os tipos mais discretos de pontes Tor.\n\nVocê terá 
que fazer uma configuração extra se ainda não conhecer nenhuma ponte Tor, 
caso se conectar a uma rede Wi-Fi pública ou se estiver no hemisfério 
oriental."
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1324
 msgid ""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

[translation]

commit c53fb873a144abbb2ce0a8df62158d5af2462565
Author: Translation commit bot 
Date:   Wed Sep 29 17:16:42 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 pt_BR.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pt_BR.po b/pt_BR.po
index 306719f170..61de4d9a9f 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -16,6 +16,7 @@
 # Eduardo Luis Voltolini Tafner, 2013
 # Emma Peel, 2018
 # Gilberto José Souza Coutinho , 2015
+# Henrique Casellato, 2021
 # Igor Bk 13, 2020
 # Isabel Ferreira, 2014
 # john smith, 2015
@@ -37,8 +38,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-06 12:01+0200\n"
-"PO-Revision-Date: 2021-09-10 00:47+\n"
-"Last-Translator: Eduardo Addad de Oliveira \n"
+"PO-Revision-Date: 2021-09-29 17:14+\n"
+"Last-Translator: Henrique Casellato\n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

[translation]

commit 80ce195f418c283ac497db774b5635d9ea1cd0e3
Author: Translation commit bot 
Date:   Wed Sep 29 17:15:53 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 pt_BR.po | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pt_BR.po b/pt_BR.po
index 127cb5cda9..a5921e3fb8 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -16,6 +16,7 @@
 # Eduardo Luis Voltolini Tafner, 2013
 # Emma Peel, 2018
 # Gilberto José Souza Coutinho , 2015
+# Henrique Casellato, 2021
 # Igor Bk 13, 2020
 # Isabel Ferreira, 2014
 # john smith, 2015
@@ -37,8 +38,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-06 12:01+0200\n"
-"PO-Revision-Date: 2021-09-10 00:47+\n"
-"Last-Translator: Eduardo Addad de Oliveira \n"
+"PO-Revision-Date: 2021-09-29 17:14+\n"
+"Last-Translator: Henrique Casellato\n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2609,7 +2610,7 @@ msgstr "Saiba mais 
sobre as pontes Tor___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

[translation]

commit 6f03204e69075c6d8d8b670e73262217619f0ce8
Author: Translation commit bot 
Date:   Wed Sep 29 14:16:54 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 zh_CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_CN.po b/zh_CN.po
index ba2fb6879c..a4e65ced49 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -43,7 +43,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-06 12:01+0200\n"
-"PO-Revision-Date: 2021-09-29 13:38+\n"
+"PO-Revision-Date: 2021-09-29 13:52+\n"
 "Last-Translator: jack will\n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

[translation]

commit 5913c4646eebfe4310576c46e59fabbf0b794dbb
Author: Translation commit bot 
Date:   Wed Sep 29 14:15:58 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 zh_CN.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zh_CN.po b/zh_CN.po
index 8881eaf659..1ed2f4145a 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -43,7 +43,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-06 12:01+0200\n"
-"PO-Revision-Date: 2021-09-29 13:38+\n"
+"PO-Revision-Date: 2021-09-29 13:52+\n"
 "Last-Translator: jack will\n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -287,7 +287,7 @@ msgstr "可用的增量升级，需要有 {memory_needed} 
空闲内存，而目
 msgid ""
 "An error ocurred while detecting available upgrades.\n"
 "This should not happen. Please report a bug."
-msgstr 
"检查更新时发生错误。\n这不应该发生，请把错误反馈给我们。"
+msgstr 
"检查更新时发生错误。\n这不应该发生，请把漏洞反馈给我们。"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:469
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:488
@@ -1793,7 +1793,7 @@ msgid ""
 "Tails will continue connecting to Tor after you close the Tor Connection 
assistant.\n"
 "\n"
 "If connecting to Tor fails, you will have to wait again until the end of the 
progress bar to be able to troubleshoot your connection."
-msgstr ""
+msgstr "Tails 将在您关闭Tor 连接助手后继续连接Tor\n\n 
如果连接至Tor 失败了，您将必须再次等待
至进程结束才能排除您的连接故障"
 
 #: config/chroot_local-includes/usr/local/bin/thunderbird:41
 msgid "You need to migrate your OpenPGP keys"
@@ -2888,7 +2888,7 @@ msgstr "端口"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:2095
 msgid "_Save Proxy Settings"
-msgstr "保存代理设置(_S)"
+msgstr "保存代理设置 (_S)"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/time-dialog.ui.in:7
 msgid "Tor Connection - Fix Clock"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json

[translation]

commit df566261c0090f2b76a5dabee77d080229996579
Author: Translation commit bot 
Date:   Wed Sep 29 14:15:53 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
---
 zh_CN/messages.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zh_CN/messages.json b/zh_CN/messages.json
index 0ae4f9d0e6..af17e4c4ee 100644
--- a/zh_CN/messages.json
+++ b/zh_CN/messages.json
@@ -39,13 +39,13 @@
 "message": "Snowflake 
是一个用来对抗互联网审查的系统。被审查的人们可以使用 
Snowflake 来访问互联网。他们的连接将通过由志愿者
们所运行的 Snowflake 代理来访问网络。了解更多关于 Snowflake 
如何运行的资讯，请参阅https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/wikis/home\";>文档
 wiki。"
   },
   "browser": {
-"message": "Use Snowflake"
+"message": "使用 Snowflake"
   },
   "censoredUsers": {
 "message": 
"如果您的互联网访问是受到审查的，您应该下载 https://www.torproject.org/download/\";>Tor 浏览器。"
   },
   "extension": {
-"message": "Run a Proxy"
+"message": "运行一个代理"
   },
   "installExtension": {
 "message": 
"如果您的互联网访问并未受到审查，你
可以考虑安装 Snowflake 
拓展来帮助那些身陷审查网络中的用户。无需担
心人们通过您的代理访问哪些网站。他们可见的 IP 
地址是他们的 Tor 出口节点的 IP 地址，而不是您的。"
@@ -57,7 +57,7 @@
 "message": "安装到 Google Chrome 浏览器"
   },
   "installStandalone": {
-"message": "If you would like to run a command-line version of the 
Snowflake proxy on your desktop or server, see our https://community.torproject.org/relay/setup/snowflake/standalone/\";>community
 documentation for running a standalone Snowflake proxy."
+"message": 
"如果您想要在您的桌面或服务器运行一个命令行版本的Snowflake代理，看我们的https://community.torproject.org/relay/setup/snowflake/standalone/\";>社区文档以运行一个独立的Snowflake代理"
   },
   "reportingBugs": {
 "message": "报告缺陷"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

[translation]

commit 246d8fed81a4098c1caf70ba64b2438f5a5f432b
Author: Translation commit bot 
Date:   Wed Sep 29 13:46:39 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 zh_CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_CN.po b/zh_CN.po
index fc7e7f74ac..ba2fb6879c 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -43,7 +43,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-06 12:01+0200\n"
-"PO-Revision-Date: 2021-09-29 13:13+\n"
+"PO-Revision-Date: 2021-09-29 13:38+\n"
 "Last-Translator: jack will\n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

[translation]

commit b77cfc90a134b9af7cd5cfd304649b0c5d889cc8
Author: Translation commit bot 
Date:   Wed Sep 29 13:45:52 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 zh_CN.po | 34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/zh_CN.po b/zh_CN.po
index 5f5266beb5..8881eaf659 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -43,7 +43,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-06 12:01+0200\n"
-"PO-Revision-Date: 2021-09-29 13:13+\n"
+"PO-Revision-Date: 2021-09-29 13:38+\n"
 "Last-Translator: jack will\n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -1727,7 +1727,7 @@ msgstr "Tor 连接"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:197
 msgid "_Use a bridge that I already know"
-msgstr ""
+msgstr "_使用一个我已知的网桥"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:238
 msgid ""
@@ -2046,7 +2046,7 @@ msgid ""
 "The Unsafe Browser was not enabled in the Welcome Screen.\\n\\nTo use the "
 "Unsafe Browser, restart Tails and enable the Unsafe Browser in the "
 "additional settings of the Welcome Screen."
-msgstr ""
+msgstr "在欢迎页中没有启用不安全的浏览器。要使用不安å…
¨çš„浏览器，重启 Tails 并在欢迎页的额外的设置中启用。"
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:95
 msgid ""
@@ -2397,7 +2397,7 @@ msgid ""
 "A captive portal is a web page that is displayed before you can access the 
Internet. Captive portals usually require you to log in to the network or enter 
information such as an email address.\n"
 "\n"
 "The Unsafe Browser is not anonymous and can deanonymize you. Use it only to 
sign in to networks."
-msgstr ""
+msgstr "非安全浏览器å…
è®¸æ‚¨ä½¿ç”¨å¼ºåˆ¶é—¨æˆ·ç™»å½•ç½‘络。\n\n强制门户是在您可以访问 
Internet 之前显示的网页。 
强制网络门户通常需要登录网络或输å…
¥é‚®ç®±åœ°å€ç­‰ä¿¡æ¯ã€‚\n\n非安å…
¨æµè§ˆå™¨ä¸æ˜¯åŒ¿åçš„，可以对您进行去匿名化。仅
用于登录网络。"
 
 #: 
../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:574
 msgid "Disable the Unsafe Browser (default)"
@@ -2671,11 +2671,11 @@ msgstr "• 错误的时钟"
 msgid ""
 "To prevent network attacks, your time zone and clock need to be correct to "
 "connect to Tor using a bridge."
-msgstr ""
+msgstr 
"要防止网络攻击，您需要使用一个网桥将您的时区和时钟正确的连接至
 Tor"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:639
 msgid "Fix _Clock"
-msgstr ""
+msgstr "修复_时钟"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:676
 msgid "• Public network"
@@ -2689,7 +2689,7 @@ msgstr "如果您在商店、é…
’店或机场，您可能需要使用强制门户
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:709
 msgid "Try _Signing in to the Network"
-msgstr ""
+msgstr "尝试登录网络"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
 msgid "• Local proxy"
@@ -2750,18 +2750,18 @@ msgstr "Tails 会尝试不同的方式连接到 Tor 
直到成功。\n\n监视您
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1123
 msgid "Configure a Tor _bridge"
-msgstr ""
+msgstr "配置一个 Tor 网桥"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1169
 msgid ""
 "Tor bridges are secret Tor relays. Use a bridge as your first Tor relay if 
connections to Tor are blocked, for example in some countries, by some public 
networks, or by some parental controls.\n"
 "\n"
 "Choose this option if you already know that you need a bridge. Otherwise, 
Tails will autodetect whether you need a bridge to connect to Tor from your 
local network."
-msgstr ""
+msgstr "Tor 网桥是秘密的 Tor 中继。 如果连接到 Tor 
被封锁，例如在某些国家、公å…
±ç½‘络或家长控制中，则使用网桥作为您的第一个 Tor 
中继。\n\n如果您已经知道您需要桥接，请选择此选项。 
否则，Tails 
将自动检测您是否需要网桥才能从本地网络连接到 Tor。"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1211
 msgid "_Hide to my local network that I'm connecting to Tor (safer)"
-msgstr ""
+msgstr "_隐藏到我连接到 Tor 的本地网络（更安全）"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1261
 msgid ""
@@ -2776,7 +2776,7 @@ msgid ""
 "Our team is doing its best to help you connect to Tor using the most discrete 
types of Tor bridges.\n"
 "\n"
 "You will have to do extra configuration if you don't know any Tor bridges 
yet, if you connect from a public Wi-Fi network, or if you are in the Eastern 
Hemisphere."
-msgstr ""
+msgstr "Tails 只会在您é…

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

[translation]

commit 13998af857b3dea912964bc1bbc6f9fcc41d0c39
Author: Translation commit bot 
Date:   Wed Sep 29 13:16:51 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 zh_CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_CN.po b/zh_CN.po
index cc8e8e0a20..fc7e7f74ac 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -43,7 +43,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-06 12:01+0200\n"
-"PO-Revision-Date: 2021-09-29 12:42+\n"
+"PO-Revision-Date: 2021-09-29 13:13+\n"
 "Last-Translator: jack will\n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

[translation]

commit 59645357fcde62e2a4385bb980431531f6fd832f
Author: Translation commit bot 
Date:   Wed Sep 29 13:16:01 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 zh_CN.po | 36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/zh_CN.po b/zh_CN.po
index b78513d538..5f5266beb5 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -43,7 +43,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-06 12:01+0200\n"
-"PO-Revision-Date: 2021-09-29 12:42+\n"
+"PO-Revision-Date: 2021-09-29 13:13+\n"
 "Last-Translator: jack will\n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -1733,13 +1733,13 @@ msgstr ""
 msgid ""
 "To save your bridge, unlock you "
 "Persistent Storage."
-msgstr ""
+msgstr "要保存网桥，解锁您的持久化存储."
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:245
 msgid ""
 "To save your bridge, create a "
 "Persistent Storage on your Tails USB stick."
-msgstr ""
+msgstr "要保存网桥，创建一个持久
化存储于您的Tails USB设备上"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:265
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:668
@@ -1754,7 +1754,7 @@ msgstr "您需要配置 obfs4 
网桥来隐藏您正在使用 Tor"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:325
 msgid "Failed to configure your Persistent Storage"
-msgstr ""
+msgstr "配置持久化存储失败。"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:419
 msgid "Connecting to Tor without bridges…"
@@ -1767,7 +1767,7 @@ msgstr "正在通过默认网桥连接至 Tor……"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:433
 msgid "Connecting to Tor with a custom bridge…"
-msgstr ""
+msgstr "正在通过一个自定义网桥连接至 Tor……"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:542
 msgid ""
@@ -1786,7 +1786,7 @@ msgstr "如果你想隐藏你正在使用 
Tor，则需要设置桥接"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:962
 msgid "Are you sure you want to lose progress?"
-msgstr ""
+msgstr "您确认您想要失去进度吗？"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:966
 msgid ""
@@ -2561,7 +2561,7 @@ msgstr "PGP 密钥（可选）"
 
 #: ../config/chroot_local-includes/usr/share/whisperback/whisperback.ui.in:470
 msgid "Please know that we are not able to reply to every bug report."
-msgstr ""
+msgstr "请知晓我们没有能力回复每一份漏洞报告"
 
 #: ../config/chroot_local-includes/usr/share/whisperback/whisperback.ui.in:502
 #: ../config/chroot_local-includes/usr/share/whisperback/whisperback.ui.in:613
@@ -2594,7 +2594,7 @@ msgstr "配置一个 Tor 网桥"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:76
 msgid "heading"
-msgstr ""
+msgstr "标题"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:94
 msgid ""
@@ -2608,7 +2608,7 @@ msgstr "了解有å…
³ Tor 网桥的更多
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:146
 msgid "Use a _default bridge"
-msgstr ""
+msgstr "使用一个默认网桥"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:170
 msgid "obfs4 (recommended)"
@@ -2625,11 +2625,11 @@ msgstr "无"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:225
 msgid "_Request a new bridge"
-msgstr ""
+msgstr "_请求一个新网桥"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:260
 msgid "_Type in a bridge that I already know"
-msgstr ""
+msgstr "_输入一个我已知的网桥"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:283
 msgid ""
@@ -2643,21 +2643,21 @@ msgstr "目前在 Tails 中，只有 obfs4 
网桥会隐藏您正在使用 Tor。
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:372
 msgid "Save bridge to _Persistent Storage"
-msgstr ""
+msgstr "保存网桥至永久储存"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:397
 msgid "Save bridge to Persistent Storage"
-msgstr ""
+msgstr "保存网桥至持久化存储"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:398
 msgid "toggle-button"
-msgstr ""
+msgstr "切换-按钮"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:538
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:936
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1336
 msgid "_Connect to Tor"
-msgstr ""
+msgstr "_连接 Tor 网络"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:

[tor-commits] [translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed

[translation]

commit 975a4c7dffe5016d5775d84049c9fa6a51569b99
Author: Translation commit bot 
Date:   Wed Sep 29 12:47:54 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
---
 zh-CN/network-settings.dtd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zh-CN/network-settings.dtd b/zh-CN/network-settings.dtd
index eebd84f91a..d1de1b69bf 100644
--- a/zh-CN/network-settings.dtd
+++ b/zh-CN/network-settings.dtd
@@ -92,4 +92,5 @@
 
 
 
+
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings

[translation]

commit 30c6bbf5e84bfd5d119dd84369a9e669da7dba51
Author: Translation commit bot 
Date:   Wed Sep 29 12:47:52 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
---
 zh-CN/network-settings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh-CN/network-settings.dtd b/zh-CN/network-settings.dtd
index 2d03c5d191..af8a8160e1 100644
--- a/zh-CN/network-settings.dtd
+++ b/zh-CN/network-settings.dtd
@@ -92,5 +92,5 @@
 
 
 
-
+
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

[translation]

commit 370ff459017af84e432534f306e9da971ab34173
Author: Translation commit bot 
Date:   Wed Sep 29 12:46:46 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 zh_CN.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/zh_CN.po b/zh_CN.po
index 0ce3f25c33..cc8e8e0a20 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -16,6 +16,7 @@
 # Herman Koe , 2018
 # 5b4c6a53e2e9f6d66be0455f2c8d22a2, 2014
 # Lafrenze Laurant, 2018
+# jack will, 2021
 # James David, 2019
 # Meng San, 2014
 # Lafrenze Laurant, 2018
@@ -42,8 +43,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-06 12:01+0200\n"
-"PO-Revision-Date: 2021-09-06 12:26+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-09-29 12:42+\n"
+"Last-Translator: jack will\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"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

[translation]

commit 6cb15701f025c1200c9523ae66f929ef89a327d2
Author: Translation commit bot 
Date:   Wed Sep 29 12:46:01 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 zh_CN.po | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/zh_CN.po b/zh_CN.po
index 35c7a6a5b7..b78513d538 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -16,6 +16,7 @@
 # Herman Koe , 2018
 # 5b4c6a53e2e9f6d66be0455f2c8d22a2, 2014
 # Lafrenze Laurant, 2018
+# jack will, 2021
 # James David, 2019
 # Meng San, 2014
 # Lafrenze Laurant, 2018
@@ -42,8 +43,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-06 12:01+0200\n"
-"PO-Revision-Date: 2021-09-06 12:26+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-09-29 12:42+\n"
+"Last-Translator: jack will\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"
@@ -1174,11 +1175,11 @@ msgstr "语言，管理密码，以及额外设置"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:83
 msgid "Tor Bridges"
-msgstr ""
+msgstr "Tor 网桥"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
 msgid "Save the last bridges 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"
@@ -2706,7 +2707,7 @@ msgstr "配置本地代理(_P)"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:818
 msgid "• Bridge over email"
-msgstr ""
+msgstr "•通过电子邮件获得网桥"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:838
 msgid ""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

[translation]

commit 267b2c91ed86297621bc55f29c895ca52d8760aa
Author: Translation commit bot 
Date:   Wed Sep 29 11:47:06 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+my.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contents+my.po b/contents+my.po
index f2bff13b4c..f7c3c43895 100644
--- a/contents+my.po
+++ b/contents+my.po
@@ -2947,7 +2947,7 @@ msgstr "* ပရောက်စီ 
သတ်မှတ်ထားပါက Tor 
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid "* The Tor Browser package is dated January 1, 2000 00:00:00 UTC."
 msgstr ""
-"* Tor ဘရောက်ဇာ ပက်ကေ့ချ်၏ ရက်စ
ွဲမှာ 2000 ခုနှစ်၊ ဇန်နဝါရီလ 1 
ရက် 00:00:00 "
+"* Tor ဘရောက်ဇာ ပက်ကေ့ချ်၏ ရက်စ
ွဲမှာ ၂၀၀၀ ခုနှစ်၊ ဇန်နဝါရီလ 
၁ ရက် 00:00:00 "
 "UTC ဖြစ်သည်။"
 
 #: https//tb-manual.torproject.org/known-issues/
@@ -3024,7 +3024,7 @@ msgid ""
 "developed by the Tor Project."
 msgstr ""
 "Android သုံး Tor ဘရောက်ဇာသည် Tor Project မှ 
ပံ့ပိုးပြီး ရေးသားထားသည့် "
-"တစ်ခုတည်းသော တရားဝင် 
မိုဘိုင်းသုံး ဘရောက်ဇာဖြစ
်သည်။"
+"တစ်ခုတည်းသော တရားဝင် 
မိုဘိုင်းသုံး ဘရောက်ဇာ ဖြစ
်သည်။"
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
@@ -3065,8 +3065,8 @@ msgid ""
 "Non-technical users should get Tor Browser for Android, as this is stable "
 "and less prone to errors."
 msgstr ""
-"Android သုံး Tor ဘရောက်ဇာသည် 
တည်ငြိမ်ပြီး ချွတ်ယွင်းချက် 
ဖြစ်ပေါ်ခြင်း "
-"ပိုနည်းသောကြောင့် 
နည်းပညာမကျွမ်းကျင်သော 
အသုံးပြုသူများ ရယူသုံးစ
ွဲသင့်သည်။"
+"Android သုံး Tor ဘရောက်ဇာသည် 
တည်ငြိမ်ပြီး ချို့ယွင်းချက် 
ဖြစ်ပေါ်ခြင်း "
+"ပိုနည်းသောကြောင့် နည်းပညာ 
မကျွမ်းကျင်သော 
အသုံးပြုသူများ ရယူသုံးစ
ွဲသင့်သည်။"
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
@@ -3075,7 +3075,7 @@ msgid ""
 "Project website."
 msgstr ""
 "Android သုံး Tor ဘရောက်ဇာကို Play Store၊ 
F-Droid နှင့် Tor Project "
-"ဝက်ဘ်ဆိုက်တွင် 
ရရှိနိုင်သည်။"
+"ဝက်ဘ်ဆိုက်တို့တွင် 
ရရှိနိုင်သည်။"
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

[translation]

commit 151750fb405431264412d07b36974577d3b722a3
Author: Translation commit bot 
Date:   Wed Sep 29 10:47:01 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+my.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contents+my.po b/contents+my.po
index edfa65d729..f2bff13b4c 100644
--- a/contents+my.po
+++ b/contents+my.po
@@ -2200,8 +2200,8 @@ msgid ""
 "manually."
 msgstr ""
 "Tor ဘရောက်ဇာ ဗားရှင်းအသစ် 
ထွက်သည်နှင့် ဆော့ဝဲကို 
အပ်ဒိတ်လုပ်ရန် သင့်အား "
-"အသိပေးပါမည်- ဟမ်ဘာဂါမီနူး 
(အဓိကမီနူး) တွင် အထက်သို့ 
ညွှန်ပြနေသော မြားပါသည့် "
-"အစိမ်းရောင် စက်ဝိုင်းကို 
ပြသပါမည်။ Tor ဘရောက်ဇာကို 
ဖွင့်ချိန်တွင် "
+"အသိပေးပါမည် - ဟမ်ဘာဂါမီနူး 
(အဓိကမီနူး) တွင် အထက်သို့ 
ညွှန်ပြနေသော မြားပါသည့်"
+" အစိမ်းရောင် စက်ဝိုင်းကို 
ပြသပါမည်။ Tor ဘရောက်ဇာကို 
ဖွင့်ချိန်တွင် "
 "အပ်ဒိတ်လုပ်ရန် စာဖြင့် 
ညွှန်ပြချက်ကို 
တွေ့နိုင်ပါသည်။ သင်သည် 
ဘရောက်ဇာကို "
 "အလိုအလျောက် သို့မဟုတ် 
ကိုယ်တိုင် 
အပ်ဒိတ်လုပ်နိုင်ပါသည်။"
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

[translation]

commit 2172ccfe367959c06a7a4d9f51f0a4a8da1bb106
Author: Translation commit bot 
Date:   Wed Sep 29 10:17:19 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+my.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+my.po b/contents+my.po
index be3b74ebbf..edfa65d729 100644
--- a/contents+my.po
+++ b/contents+my.po
@@ -1872,7 +1872,7 @@ msgid ""
 "| XF5 | Onion site Authentication Failed | The provided key is incorrect or "
 "has been revoked. Contact the onion site administrator. |"
 msgstr ""
-"| XF5 | Onion ဝက်ဘ်ဆိုက် စစ
်မှန်ကြောင်းသက်သေပြခြင်း 
မအောင်မြင်ပါ | "
+"| XF5 | Onion ဝက်ဘ်ဆိုက် စစ
်မှန်ကြောင်း သက်သေပြခြင်း 
မအောင်မြင်ပါ | "
 "စကားဝှက်သော့ မှားနေသည် 
သို့မဟုတ် 
ပြန်လည်ရုပ်သိမ်းခံထားရသည်။ 
onion ဝက်ဘ်ဆိုက်"
 " စီမံခန့်ခွဲသူကို 
ဆက်သွယ်ပါ။ |"
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

[translation]

commit ea4b7f7321acb7e7f1b5f98aace20ebf58eb01e5
Author: Translation commit bot 
Date:   Wed Sep 29 09:47:14 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+my.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contents+my.po b/contents+my.po
index 7135193f01..be3b74ebbf 100644
--- a/contents+my.po
+++ b/contents+my.po
@@ -1578,7 +1578,7 @@ msgid ""
 "connections)."
 msgstr ""
 "* Tor သုံးစွဲသူများနှင့် onion 
ဝန်ဆောင်မှုများအကြား 
ဒေတာအသွားအလာအားလုံးကို "
-"အဆုံးမှအဆုံးသို့ 
ကုဒ်ဖြင့်ပြောင်းလဲထားသောကြောင့်
 [HTTPS ဖြင့် "
+"အဆုံးမှအဆုံးသို့ ကုဒ်ဖြင့် 
ပြောင်းလဲထားသောကြောင့် [HTTPS 
ဖြင့် "
 "ချိတ်ဆက်ခြင်း](/my/secure-connections) 
အတွက် စိတ်ပူရန် မလိုအပ်ပါ။"
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1608,7 +1608,7 @@ msgid ""
 msgstr ""
 
"အခြားဝက်ဘ်ဆိုက်များကဲ့သို့ပင်
 onion ဝန်ဆောင်မှုတစ်ခုနှင့် 
ချိတ်ဆက်ရန် ၎င်း၏ "
 "လိပ်စာကို သိဖို့ လိုအပ်သည်။ 
onion လိပ်စာသည် အလျင်းသင့်သလို 
ရွေးချယ်ထားသော "
-"အက္ခရာနှင့်ဂဏန်း 56 လုံးပါစ
ာတန်း ဖြစ်ပြီး \".onion\" ဖြင့် 
အဆုံးသတ်သည်။"
+"အက္ခရာနှင့်ဂဏန်း ၅၆ လုံးပါ စ
ာတန်း ဖြစ်ပြီး \".onion\" ဖြင့် 
အဆုံးသတ်သည်။"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/main] simple grammar issues in prop321

[arma]

commit e06b912e9d95a7ebf7663ecd150ba5262a3f6f18
Author: Roger Dingledine 
Date:   Wed Sep 29 05:21:39 2021 -0400

simple grammar issues in prop321
---
 proposals/321-happy-families.md | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/proposals/321-happy-families.md b/proposals/321-happy-families.md
index 288ba66..f9ac7b4 100644
--- a/proposals/321-happy-families.md
+++ b/proposals/321-happy-families.md
@@ -19,7 +19,7 @@ we can de-duplicate families which sometimes helps.)  Adding 
or
 removing a server from the family requires all the other servers to
 change their torrc settings.
 
-The is growth in size is not just a theoretical problem. Family
+This growth in size is not just a theoretical problem. Family
 declarations currently make up a little over 55% of the
 microdescriptors in the directory--around 24% after compression.
 The largest family has around 270 members.  With Walking Onions, 270
@@ -34,7 +34,7 @@ requirements and providing a more detailed migration plan.
 In this design, every family has a master ed25519 "family key".  A node
 is in the family iff its server descriptor includes a certificate of its
 ed25519 identity key with the family key.  The certificate
-format the one in the tor-certs.txt spec; we would allocate a new
+format is the one in the tor-certs.txt spec; we would allocate a new
 certificate type for this usage.  These certificates would need to
 include the signing key in the appropriate extension.
 
@@ -93,7 +93,7 @@ need to do in this event would be to move to a new private 
family
 key.
 
 A more orthodox method would be to keep the private key somewhere
-offline, and using it to generate a certificate for each relay in
+offline, and use it to generate a certificate for each relay in
 the family as needed.  These certificates should be made with
 long-enough lifetimes, and relays should warn when they are going to
 expire soon.
@@ -186,8 +186,8 @@ microdescriptors' family lines:
digest of the microdescriptor listed in the original votes.  (This
calculation is deterministic.)
 
-The problem with this approach is that authorities would have to s
-to fetch microdescriptors they do not have in order to replace their
+The problem with this approach is that authorities would have to
+fetch microdescriptors they do not have in order to replace their
 family lines.  Currently, voting never requires an authority to
 fetch a microdescriptor from another authority.  If we implement
 vote compression and diffs as in the Walking Onions proposal,

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits