- tor-commits - lists.torproject.org

[tor/main] sandbox: Allow use with fragile hardening
by nickm＠torproject.org 29 Sep '21

29 Sep '21

commit fbf2e7e9218b8e0ffabcd59fab2322d7c2c7178c Author: Simon South <simon(a)simonsouth.net> 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 0000000000..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 02222e5a1c..a78e4a7ac7 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -58,6 +58,10 @@ #include <linux/futex.h> #include <sys/file.h> +#ifdef ENABLE_FRAGILE_HARDENING +#include <sys/ptrace.h> +#endif + #include <stdarg.h> #include <seccomp.h> #include <signal.h> @@ -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; (void) filter; +#ifdef ENABLE_FRAGILE_HARDENING + rc = seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(rt_sigprocmask), + SCMP_CMP(0, SCMP_CMP_EQ, SIG_BLOCK)); + if (rc) + return rc; +#endif + rc = seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(rt_sigprocmask), SCMP_CMP(0, SCMP_CMP_EQ, SIG_UNBLOCK)); if (rc) @@ -1202,6 +1274,9 @@ static sandbox_filter_func_t filter_func[] = { sb_open, sb_openat, sb_opendir, +#ifdef ENABLE_FRAGILE_HARDENING + sb_ptrace, +#endif sb_rename, #ifdef __NR_fcntl64 sb_fcntl64,

1 0

[tor/main] configure.ac: Define ENABLE_COVERAGE macro
by nickm＠torproject.org 29 Sep '21

29 Sep '21

commit 3bc3a108955c7b25a13808a2cfefcc77d2364cf4 Author: Simon South <simon(a)simonsouth.net> 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.])

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 29 Sep '21

29 Sep '21

commit 3fb349cde7fdd93672dea29a4eedc8a16003d740 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 29 20:45:22 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- 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)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 29 Sep '21

29 Sep '21

commit 6ef9f4dd23b2a029b5dc55d146f502d4495c686c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 29 20:15:21 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- 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 <cristina(a)cji.ro>, 2021 # eduard pintilie <eduard.pintilie(a)gmail.com>, 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+0000\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)

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 29 Sep '21

29 Sep '21

commit 781a672cdfbc57208a0865465ddcf9ae65a885d8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 29 17:46:45 2021 +0000 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+0000\n" +"PO-Revision-Date: 2021-09-29 17:26+0000\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"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 29 Sep '21

29 Sep '21

commit 1eeef69018a46c429a229dea23664483f76c011c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 29 17:45:55 2021 +0000 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+0000\n" +"PO-Revision-Date: 2021-09-29 17:26+0000\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 <tt>bridges(a)torproject.org</tt> from a Gmail or Riseup email address.\n" "\n" "2. Type below one of the bridges that you received by email." -msgstr "" +msgstr "Para pedir novas Pontes do Tor, você pode também:\n\n1. Enviar um email vazio para <tt>bridges(a)torproject.org</tt> 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 "<b>_Hide to my local network that I'm connecting to Tor (safer)</b>" @@ -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 ""

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 29 Sep '21

29 Sep '21

commit c53fb873a144abbb2ce0a8df62158d5af2462565 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 29 17:16:42 2021 +0000 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 <gilberto.jsc(a)gmail.com>, 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+0000\n" -"Last-Translator: Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>\n" +"PO-Revision-Date: 2021-09-29 17:14+0000\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"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 29 Sep '21

29 Sep '21

commit 80ce195f418c283ac497db774b5635d9ea1cd0e3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 29 17:15:53 2021 +0000 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 <gilberto.jsc(a)gmail.com>, 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+0000\n" -"Last-Translator: Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>\n" +"PO-Revision-Date: 2021-09-29 17:14+0000\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 "<a href=\"doc/anonymous_internet/tor\">Saiba mais sobre as pontes Tor</a #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:146 msgid "Use a _default bridge" -msgstr "" +msgstr "Use uma Ponte _padrão" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:170 msgid "obfs4 (recommended)" @@ -2626,7 +2627,7 @@ msgstr "Nenhum" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:225 msgid "_Request a new bridge" -msgstr "" +msgstr "_Solicite uma nova Ponte" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:260 msgid "_Type in a bridge that I already know" @@ -2644,7 +2645,7 @@ msgstr "Atualmente no Tails, apenas as pontes obfs4 escondem que você está usa #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:372 msgid "Save bridge to _Persistent Storage" -msgstr "" +msgstr "Salve uma Ponte em Armazenamento _Persistente" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:397 msgid "Save bridge to Persistent Storage" @@ -2676,7 +2677,7 @@ msgstr "Para evitar ataques à rede, seu fuso horário e relógio precisam estar #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:639 msgid "Fix _Clock" -msgstr "" +msgstr "Conserte o _Relógio" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:676 msgid "• Public network" @@ -2690,7 +2691,7 @@ msgstr "Se você estiver em uma loja, hotel ou aeroporto, pode ser necessário e #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:709 msgid "Try _Signing in to the Network" -msgstr "" +msgstr "Tente fazer _Login na Rede" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747 msgid "• Local proxy"

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 29 Sep '21

29 Sep '21

commit 6f03204e69075c6d8d8b670e73262217619f0ce8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 29 14:16:54 2021 +0000 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+0000\n" +"PO-Revision-Date: 2021-09-29 13:52+0000\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"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 29 Sep '21

29 Sep '21

commit 5913c4646eebfe4310576c46e59fabbf0b794dbb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 29 14:15:58 2021 +0000 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+0000\n" +"PO-Revision-Date: 2021-09-29 13:52+0000\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"

1 0