December 2019 - tor-commits - lists.torproject.org

[tor/master] Makefile/git scripts: Add the practracker unit tests
by nickm＠torproject.org 04 Dec '19

04 Dec '19

commit 5ce45ac90750ebe9a5d482eef0d9e4a6eb4fbb38 Author: teor <teor(a)torproject.org> Date: Sat Nov 16 21:44:44 2019 +1000 Makefile/git scripts: Add the practracker unit tests Add a check-practracker-unit-test target, and run it as part of "make check". Add the practracker unit tests to scripts/git/pre-commit.git-hook. Part of 32609. --- Makefile.am | 5 ++++- changes/ticket32609 | 3 +++ scripts/git/pre-commit.git-hook | 13 ++++++++----- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 38040a4e7..0c3a4fb76 100644 --- a/Makefile.am +++ b/Makefile.am @@ -253,7 +253,10 @@ test: all shellcheck: $(top_srcdir)/scripts/maint/checkShellScripts.sh -check-local: check-spaces check-changes check-includes check-best-practices shellcheck check-cocci +check-practracker-unit-test: + $(top_srcdir)/scripts/maint/practracker/test_practracker.sh + +check-local: check-spaces check-changes check-includes check-practracker-unit-test check-best-practices shellcheck check-cocci need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \ diff --git a/changes/ticket32609 b/changes/ticket32609 new file mode 100644 index 000000000..2fc3f733f --- /dev/null +++ b/changes/ticket32609 @@ -0,0 +1,3 @@ + o Testing: + - Run the practracker unit tests as part of "make check", and in the + pre-commit git hook. Closes ticket 32609. diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook index c138d2ae2..c5adfaffe 100755 --- a/scripts/git/pre-commit.git-hook +++ b/scripts/git/pre-commit.git-hook @@ -54,6 +54,13 @@ if [ -e scripts/maint/checkShellScripts.sh ]; then scripts/maint/checkShellScripts.sh fi +# Always run the practracker unit tests +PT_DIR=scripts/maint/practracker + +if [ -e "${PT_DIR}/test_practracker.sh" ]; then + "${PT_DIR}/test_practracker.sh" +fi + if [ ! "$CHECK_FILES" ]; then echo "No modified tor-owned source files, skipping further checks" exit 0 @@ -75,13 +82,9 @@ fi # Only call practracker if ${PT_DIR}/.enable_practracker_in_hooks exists # We do this check so that we can enable practracker in hooks in master, and # disable it on maint branches -PT_DIR=scripts/maint/practracker - if [ -e "${PT_DIR}/practracker.py" ]; then if [ -e "${PT_DIR}/.enable_practracker_in_hooks" ]; then - if ! python3 "${PT_DIR}/practracker.py" "$workdir"; then - exit 1 - fi + python3 "${PT_DIR}/practracker.py" "$workdir" fi fi

1 0

[tor/master] practracker: document !advisory in includes.py
by nickm＠torproject.org 04 Dec '19

04 Dec '19

commit b0f1b760aec8fa25fae34be794285fbdfcaaa7e9 Author: teor <teor(a)torproject.org> Date: Tue Dec 3 13:28:55 2019 +1000 practracker: document !advisory in includes.py --- scripts/maint/practracker/includes.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/maint/practracker/includes.py b/scripts/maint/practracker/includes.py index 1d43bd58e..239ea19ea 100755 --- a/scripts/maint/practracker/includes.py +++ b/scripts/maint/practracker/includes.py @@ -13,6 +13,10 @@ file in each directory. This file contains empty lines, #-prefixed comments, filenames (like "lib/foo/bar.h") and file globs (like lib/*/*.h) for files that are permitted. + + The script exits with an error if any non-permitted includes are found. + .may_include files that contain "!advisory" are considered advisory. + Advisory .may_include files only result in warnings, rather than errors. """

1 0

[tor/master] git scripts: Add the checkSpace.pl unit tests
by nickm＠torproject.org 04 Dec '19

04 Dec '19

commit 8861ad85d02c10dc7b1add8d1721c5ae48c930b8 Author: teor <teor(a)torproject.org> Date: Tue Dec 3 13:06:30 2019 +1000 git scripts: Add the checkSpace.pl unit tests Extra testing after 32613. --- scripts/git/pre-commit.git-hook | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook index c5adfaffe..95d566b17 100755 --- a/scripts/git/pre-commit.git-hook +++ b/scripts/git/pre-commit.git-hook @@ -61,6 +61,10 @@ if [ -e "${PT_DIR}/test_practracker.sh" ]; then "${PT_DIR}/test_practracker.sh" fi +if [ -e scripts/maint/checkSpaceTest.sh ]; then + scripts/maint/checkSpaceTest.sh +fi + if [ ! "$CHECK_FILES" ]; then echo "No modified tor-owned source files, skipping further checks" exit 0

1 0

[tor/master] practracker: Test for bad ".c" includes in the unit tests
by nickm＠torproject.org 04 Dec '19

04 Dec '19

commit 19324ff0bae96059155a5b16301528d682b78078 Author: teor <teor(a)torproject.org> Date: Sat Nov 16 21:45:52 2019 +1000 practracker: Test for bad ".c" includes in the unit tests Part of 32522. --- scripts/maint/practracker/testdata/.may_include | 1 + scripts/maint/practracker/testdata/a.c | 3 +++ scripts/maint/practracker/testdata/ex0-expected.txt | 6 +++--- scripts/maint/practracker/testdata/ex1-overbroad-expected.txt | 2 +- scripts/maint/practracker/testdata/ex1.txt | 6 +++--- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/scripts/maint/practracker/testdata/.may_include b/scripts/maint/practracker/testdata/.may_include index 40bf8155d..8542a3580 100644 --- a/scripts/maint/practracker/testdata/.may_include +++ b/scripts/maint/practracker/testdata/.may_include @@ -1,3 +1,4 @@ !advisory permitted.h +ext/good.c diff --git a/scripts/maint/practracker/testdata/a.c b/scripts/maint/practracker/testdata/a.c index 1939773f5..3c338ab40 100644 --- a/scripts/maint/practracker/testdata/a.c +++ b/scripts/maint/practracker/testdata/a.c @@ -5,6 +5,9 @@ # include "permitted.h" +#include "ext/good.c" +#include "bad.c" + int i_am_a_function(void) { diff --git a/scripts/maint/practracker/testdata/ex0-expected.txt b/scripts/maint/practracker/testdata/ex0-expected.txt index 5f3d9e5ae..502005edb 100644 --- a/scripts/maint/practracker/testdata/ex0-expected.txt +++ b/scripts/maint/practracker/testdata/ex0-expected.txt @@ -1,8 +1,8 @@ -problem file-size a.c 38 -problem include-count a.c 4 +problem file-size a.c 41 +problem include-count a.c 6 problem function-size a.c:i_am_a_function() 9 problem function-size a.c:another_function() 12 -problem dependency-violation a.c 3 +problem dependency-violation a.c 4 problem file-size b.c 15 problem function-size b.c:foo() 4 problem function-size b.c:bar() 5 diff --git a/scripts/maint/practracker/testdata/ex1-overbroad-expected.txt b/scripts/maint/practracker/testdata/ex1-overbroad-expected.txt index f69c608f4..b757202da 100644 --- a/scripts/maint/practracker/testdata/ex1-overbroad-expected.txt +++ b/scripts/maint/practracker/testdata/ex1-overbroad-expected.txt @@ -1,2 +1,2 @@ -problem file-size a.c 40 -> 38 +problem file-size a.c 45 -> 41 problem file-size z.c 100 -> 0 diff --git a/scripts/maint/practracker/testdata/ex1.txt b/scripts/maint/practracker/testdata/ex1.txt index c698005d0..af8de0329 100644 --- a/scripts/maint/practracker/testdata/ex1.txt +++ b/scripts/maint/practracker/testdata/ex1.txt @@ -1,6 +1,6 @@ -problem file-size a.c 40 -problem include-count a.c 4 +problem file-size a.c 45 +problem include-count a.c 6 # this problem will produce an error problem function-size a.c:i_am_a_function() 8 # this problem will produce a warning @@ -12,7 +12,7 @@ problem file-size b.c 15 problem file-size z.c 100 problem function-size b.c:bar() 5 -problem dependency-violation a.c 3 +problem dependency-violation a.c 4 problem dependency-violation header.h 3 problem file-size header.h 8 problem include-count header.h 4

1 0

[tor/master] practracker: Add missing .may_include files
by nickm＠torproject.org 04 Dec '19

04 Dec '19

commit 9ad569c71d081992ac644695064ffb39ce88c61a Author: teor <teor(a)torproject.org> Date: Tue Dec 3 13:29:19 2019 +1000 practracker: Add missing .may_include files All of these files contain "*.h", except for: * src/app/config/.may_include * src/test/.may_include which also contain "*.inc". This change prevents includes of "*.c" files, and other unusually named files. Part of 32609. --- src/app/config/.may_include | 2 ++ src/app/main/.may_include | 1 + src/feature/api/.may_include | 1 + src/feature/client/.may_include | 1 + src/feature/control/.may_include | 1 + src/feature/dirauth/.may_include | 1 + src/feature/dircache/.may_include | 1 + src/feature/dirclient/.may_include | 1 + src/feature/dircommon/.may_include | 1 + src/feature/dirparse/.may_include | 1 + src/feature/hibernate/.may_include | 1 + src/feature/hs/.may_include | 1 + src/feature/hs_common/.may_include | 1 + src/feature/keymgt/.may_include | 1 + src/feature/nodelist/.may_include | 1 + src/feature/relay/.may_include | 1 + src/feature/rend/.may_include | 1 + src/feature/stats/.may_include | 1 + src/test/.may_include | 2 ++ src/test/fuzz/.may_include | 1 + src/tools/.may_include | 1 + src/trunnel/.may_include | 1 + src/trunnel/hs/.may_include | 1 + 23 files changed, 25 insertions(+) diff --git a/src/app/config/.may_include b/src/app/config/.may_include new file mode 100644 index 000000000..11c5ffbb1 --- /dev/null +++ b/src/app/config/.may_include @@ -0,0 +1,2 @@ +*.h +*.inc diff --git a/src/app/main/.may_include b/src/app/main/.may_include new file mode 100644 index 000000000..424c745c1 --- /dev/null +++ b/src/app/main/.may_include @@ -0,0 +1 @@ +*.h diff --git a/src/feature/api/.may_include b/src/feature/api/.may_include new file mode 100644 index 000000000..424c745c1 --- /dev/null +++ b/src/feature/api/.may_include @@ -0,0 +1 @@ +*.h diff --git a/src/feature/client/.may_include b/src/feature/client/.may_include new file mode 100644 index 000000000..424c745c1 --- /dev/null +++ b/src/feature/client/.may_include @@ -0,0 +1 @@ +*.h diff --git a/src/feature/control/.may_include b/src/feature/control/.may_include new file mode 100644 index 000000000..424c745c1 --- /dev/null +++ b/src/feature/control/.may_include @@ -0,0 +1 @@ +*.h diff --git a/src/feature/dirauth/.may_include b/src/feature/dirauth/.may_include new file mode 100644 index 000000000..424c745c1 --- /dev/null +++ b/src/feature/dirauth/.may_include @@ -0,0 +1 @@ +*.h diff --git a/src/feature/dircache/.may_include b/src/feature/dircache/.may_include new file mode 100644 index 000000000..424c745c1 --- /dev/null +++ b/src/feature/dircache/.may_include @@ -0,0 +1 @@ +*.h diff --git a/src/feature/dirclient/.may_include b/src/feature/dirclient/.may_include new file mode 100644 index 000000000..424c745c1 --- /dev/null +++ b/src/feature/dirclient/.may_include @@ -0,0 +1 @@ +*.h diff --git a/src/feature/dircommon/.may_include b/src/feature/dircommon/.may_include new file mode 100644 index 000000000..424c745c1 --- /dev/null +++ b/src/feature/dircommon/.may_include @@ -0,0 +1 @@ +*.h diff --git a/src/feature/dirparse/.may_include b/src/feature/dirparse/.may_include new file mode 100644 index 000000000..424c745c1 --- /dev/null +++ b/src/feature/dirparse/.may_include @@ -0,0 +1 @@ +*.h diff --git a/src/feature/hibernate/.may_include b/src/feature/hibernate/.may_include new file mode 100644 index 000000000..424c745c1 --- /dev/null +++ b/src/feature/hibernate/.may_include @@ -0,0 +1 @@ +*.h diff --git a/src/feature/hs/.may_include b/src/feature/hs/.may_include new file mode 100644 index 000000000..424c745c1 --- /dev/null +++ b/src/feature/hs/.may_include @@ -0,0 +1 @@ +*.h diff --git a/src/feature/hs_common/.may_include b/src/feature/hs_common/.may_include new file mode 100644 index 000000000..424c745c1 --- /dev/null +++ b/src/feature/hs_common/.may_include @@ -0,0 +1 @@ +*.h diff --git a/src/feature/keymgt/.may_include b/src/feature/keymgt/.may_include new file mode 100644 index 000000000..424c745c1 --- /dev/null +++ b/src/feature/keymgt/.may_include @@ -0,0 +1 @@ +*.h diff --git a/src/feature/nodelist/.may_include b/src/feature/nodelist/.may_include new file mode 100644 index 000000000..424c745c1 --- /dev/null +++ b/src/feature/nodelist/.may_include @@ -0,0 +1 @@ +*.h diff --git a/src/feature/relay/.may_include b/src/feature/relay/.may_include new file mode 100644 index 000000000..424c745c1 --- /dev/null +++ b/src/feature/relay/.may_include @@ -0,0 +1 @@ +*.h diff --git a/src/feature/rend/.may_include b/src/feature/rend/.may_include new file mode 100644 index 000000000..424c745c1 --- /dev/null +++ b/src/feature/rend/.may_include @@ -0,0 +1 @@ +*.h diff --git a/src/feature/stats/.may_include b/src/feature/stats/.may_include new file mode 100644 index 000000000..424c745c1 --- /dev/null +++ b/src/feature/stats/.may_include @@ -0,0 +1 @@ +*.h diff --git a/src/test/.may_include b/src/test/.may_include new file mode 100644 index 000000000..11c5ffbb1 --- /dev/null +++ b/src/test/.may_include @@ -0,0 +1,2 @@ +*.h +*.inc diff --git a/src/test/fuzz/.may_include b/src/test/fuzz/.may_include new file mode 100644 index 000000000..424c745c1 --- /dev/null +++ b/src/test/fuzz/.may_include @@ -0,0 +1 @@ +*.h diff --git a/src/tools/.may_include b/src/tools/.may_include new file mode 100644 index 000000000..424c745c1 --- /dev/null +++ b/src/tools/.may_include @@ -0,0 +1 @@ +*.h diff --git a/src/trunnel/.may_include b/src/trunnel/.may_include new file mode 100644 index 000000000..424c745c1 --- /dev/null +++ b/src/trunnel/.may_include @@ -0,0 +1 @@ +*.h diff --git a/src/trunnel/hs/.may_include b/src/trunnel/hs/.may_include new file mode 100644 index 000000000..424c745c1 --- /dev/null +++ b/src/trunnel/hs/.may_include @@ -0,0 +1 @@ +*.h

1 0

[tor/master] Merge branch 'ticket32609_squashed'
by nickm＠torproject.org 04 Dec '19

04 Dec '19

commit fcb565612801ebcbbc27d47b19644039dfdebed2 Merge: 2693bf47e 9ad569c71 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 4 12:15:28 2019 -0500 Merge branch 'ticket32609_squashed' Makefile.am | 5 ++++- changes/ticket32609 | 3 +++ scripts/git/pre-commit.git-hook | 17 ++++++++++++----- scripts/maint/practracker/includes.py | 4 ++++ scripts/maint/practracker/testdata/.may_include | 1 + scripts/maint/practracker/testdata/a.c | 3 +++ scripts/maint/practracker/testdata/ex0-expected.txt | 6 +++--- .../practracker/testdata/ex1-overbroad-expected.txt | 2 +- scripts/maint/practracker/testdata/ex1.txt | 6 +++--- src/app/config/.may_include | 2 ++ src/app/main/.may_include | 1 + src/feature/api/.may_include | 1 + src/feature/client/.may_include | 1 + src/feature/control/.may_include | 1 + src/feature/dirauth/.may_include | 1 + src/feature/dircache/.may_include | 1 + src/feature/dirclient/.may_include | 1 + src/feature/dircommon/.may_include | 1 + src/feature/dirparse/.may_include | 1 + src/feature/hibernate/.may_include | 1 + src/feature/hs/.may_include | 1 + src/feature/hs_common/.may_include | 1 + src/feature/keymgt/.may_include | 1 + src/feature/nodelist/.may_include | 1 + src/feature/relay/.may_include | 1 + src/feature/rend/.may_include | 1 + src/feature/stats/.may_include | 1 + src/test/.may_include | 2 ++ src/test/fuzz/.may_include | 1 + src/tools/.may_include | 1 + src/trunnel/.may_include | 1 + src/trunnel/hs/.may_include | 1 + 32 files changed, 59 insertions(+), 13 deletions(-)

1 0

[torspec/master] Include the HS address in ONION_CLIENT_AUTH_VIEW replies.
by asn＠torproject.org 04 Dec '19

04 Dec '19

commit bde95f383ca39ff5e7331264c751f5be5e442a8e Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Dec 4 13:22:24 2019 +0200 Include the HS address in ONION_CLIENT_AUTH_VIEW replies. --- control-spec.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/control-spec.txt b/control-spec.txt index ec43516..18e815e 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1878,11 +1878,12 @@ The server reply format is: "250-ONION_CLIENT_AUTH_VIEW" [SP HSAddress] CRLF - *("250-CLIENT" SP KeyType ":" PrivateKeyBlob + *("250-CLIENT" SP HSAddress SP KeyType ":" PrivateKeyBlob [SP "ClientName=" Nickname] [SP "Flags=" FLAGS] CRLF) "250 OK" CRLF + HSAddress = The onion address under which this credential is stored KeyType = "x25519" is the only one supported right now PrivateKeyBlob = base64 encoding of x25519 key

1 0

[tor/master] control-port: Include HS address in ONION_CLIENT_AUTH_VIEW reply.
by asn＠torproject.org 04 Dec '19

04 Dec '19

commit 2693bf47e8f98d38386d79e48d56ecbaaf781a02 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Dec 4 13:33:07 2019 +0200 control-port: Include HS address in ONION_CLIENT_AUTH_VIEW reply. --- src/feature/control/control_hs.c | 3 ++- src/test/test_hs_control.c | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/feature/control/control_hs.c b/src/feature/control/control_hs.c index 94940a739..128893bc6 100644 --- a/src/feature/control/control_hs.c +++ b/src/feature/control/control_hs.c @@ -239,7 +239,8 @@ encode_client_auth_cred_for_control_port( goto err; } - smartlist_add_asprintf(control_line, "CLIENT x25519:%s", x25519_b64); + smartlist_add_asprintf(control_line, "CLIENT %s x25519:%s", + cred->onion_address, x25519_b64); if (cred->flags) { /* flags are also optional */ if (cred->flags & CLIENT_AUTH_FLAG_IS_PERMANENT) { diff --git a/src/test/test_hs_control.c b/src/test/test_hs_control.c index d064f203a..97a6f259e 100644 --- a/src/test/test_hs_control.c +++ b/src/test/test_hs_control.c @@ -292,8 +292,10 @@ test_hs_control_good_onion_client_auth_add(void *arg) args = tor_strdup(""); #define VIEW_CORRECT_REPLY_NO_ADDR "250-ONION_CLIENT_AUTH_VIEW\r\n" \ - "250-CLIENT x25519:eIIdIGoSZwI2Q/lSzpf92akGki5I+PZIDz37MA5BhlA=\r\n"\ - "250-CLIENT x25519:iJ1tjKCrMAbiFT2bVrCjhbfMDnE1fpaRbIS5ZHKUvEQ=\r\n" \ + "250-CLIENT 2fvhjskjet3n5syd6yfg5lhvwcs62bojmthr35ko5bllr3iqdb4ctdyd " \ + "x25519:iJ1tjKCrMAbiFT2bVrCjhbfMDnE1fpaRbIS5ZHKUvEQ=\r\n" \ + "250-CLIENT jt4grrjwzyz3pjkylwfau5xnjaj23vxmhskqaeyfhrfylelw4hvxcuyd " \ + "x25519:eIIdIGoSZwI2Q/lSzpf92akGki5I+PZIDz37MA5BhlA=\r\n" \ "250 OK\r\n" retval = handle_control_command(&conn, (uint32_t) strlen(args), args); @@ -308,8 +310,9 @@ test_hs_control_good_onion_client_auth_add(void *arg) tor_strdup("jt4grrjwzyz3pjkylwfau5xnjaj23vxmhskqaeyfhrfylelw4hvxcuyd"); #define VIEW_CORRECT_REPLY_JT4 "250-ONION_CLIENT_AUTH_VIEW " \ - "jt4grrjwzyz3pjkylwfau5xnjaj23vxmhskqaeyfhrfylelw4hvxcuyd\r\n" \ - "250-CLIENT x25519:eIIdIGoSZwI2Q/lSzpf92akGki5I+PZIDz37MA5BhlA=\r\n"\ + "jt4grrjwzyz3pjkylwfau5xnjaj23vxmhskqaeyfhrfylelw4hvxcuyd\r\n" \ + "250-CLIENT jt4grrjwzyz3pjkylwfau5xnjaj23vxmhskqaeyfhrfylelw4hvxcuyd " \ + "x25519:eIIdIGoSZwI2Q/lSzpf92akGki5I+PZIDz37MA5BhlA=\r\n" \ "250 OK\r\n" retval = handle_control_command(&conn, (uint32_t) strlen(args), args);

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 04 Dec '19

04 Dec '19

commit f3e8cf25387bce5698a80af51cf5c904727b10e4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 4 15:45:40 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/pt_PT/LC_MESSAGES/messages.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/pt_PT/LC_MESSAGES/messages.po b/locale/pt_PT/LC_MESSAGES/messages.po index 1a2b2230f3..a9769e3636 100644 --- a/locale/pt_PT/LC_MESSAGES/messages.po +++ b/locale/pt_PT/LC_MESSAGES/messages.po @@ -465,7 +465,7 @@ msgstr "Total Doado" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:141 msgid "Total Raised with Mozilla's Match" -msgstr "Total arrecadado com Mozilla Match" +msgstr "Total Recebido com \"Mozilla Match\"" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:152 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:158 @@ -684,7 +684,7 @@ msgstr "" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:526 msgid "Please reload the page and try again." -msgstr "Por favor recarregue a página e tente novamente." +msgstr "Por favor, recarregue a página e tente novamente." #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:530 msgid "There was a problem submitting your request to the server:<br>" @@ -2210,7 +2210,7 @@ msgstr "Obrigado por apoiar a campanha \"Força em Números\" do Tor." #: tmp/cache_locale/60/60fb10a60dd92fe380a6d105fd68d9375e135c65251f204fa37158d9c2e655d9.php:73 #: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:70 msgid "You should receive an email receipt shortly." -msgstr "Deve receber um recibo por e-mail brevemente." +msgstr "Deverá receber um recibo por e-mail brevemente." #: tmp/cache_locale/60/60fb10a60dd92fe380a6d105fd68d9375e135c65251f204fa37158d9c2e655d9.php:75 msgid ""

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 04 Dec '19

04 Dec '19

commit 7ab70e9e2761dfe20dc3236f9e941499651dda5a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 4 15:23:46 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+pt-PT.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/contents+pt-PT.po b/contents+pt-PT.po index fb75c072a8..1ce95d123a 100644 --- a/contents+pt-PT.po +++ b/contents+pt-PT.po @@ -2166,8 +2166,8 @@ msgid "" "Other open tabs and windows from the same website will use the new circuit " "as well once they are reloaded." msgstr "" -"Os outros separadores e janelas abertas do mesmo site utilizarão o novo " -"circuito assim que forem recarregados." +"Os outros separadores e janelas abertas do mesmo site da Web irão utilizar o" +" novo circuito assim que forem recarregados." #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -2218,9 +2218,9 @@ msgid "" "procedure for account recovery, or contacting the operators and explaining " "the situation." msgstr "" -"A melhor maneira de resolver isso é seguir os procedimentos recomendados no " -"site para recuperação de contas, ou contactar os administradores e explicar " -"a situação." +"A única maneira para resolver isto é seguir o procedimento recomendado pelo " +"site para a recuperação de conta, ou contactar os operadores e explicar a " +"situação." #: https//support.torproject.org/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.description) @@ -2926,10 +2926,11 @@ msgid "" "want to protect themselves from discovery, whistleblowers, activists, and " "ordinary people who want to opt out of invasive third party tracking." msgstr "" -"AO bloquear os utilizadores do Tor, estão também a bloquear pessoas em " -"países repressivos que querem usar uma internet livre, assim como " -"jornalistas, investigadores, informadores, ativistas e pessoas comuns que " -"querem ter o poder de decidirem quanto ao rastreamento na internet." +"Ao bloquear utilizadores do Tor, está também a bloquear as pessoas em países" +" repressivos que querem utilizar uma Internet livre, assim como jornalistas " +"e investigadores que querem proteger-se a eles mesmos contra informadores, " +"ativistas e pessoas comuns que querem ter o poder de decidirem quanto à " +"monitorização de terceiros." #: https//support.torproject.org/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -3695,8 +3696,7 @@ msgstr "Isto poderia significar que está numa rede que é censurada." #: https//support.torproject.org/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "Please try connecting with bridges, and that should fix the problem." -msgstr "" -"Por favor tente conectar-se com pontes. Isso deve resolver o problema." +msgstr "Por favor, ligue-se com pontes, e isso deverá resolver o problema." #: https//support.torproject.org/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) @@ -8458,8 +8458,8 @@ msgid "" "If this is your first introduction to Tor Browser, we understand that you " "might think we're bad people who enable even worse people." msgstr "" -"Se este é o seu primeiro contacto com o Tor Browser, nós compreendemos que " -"você possa pensar que somos pessoas más que alimentam o poder de pessoas " +"Se esta é a sua primeira introdução com o Tor Browser, nós compreendemos que" +" possa pensar que nós somos pessoas más que alimentam o poder de pessoas " "ainda piores." #: https//support.torproject.org/misc/misc-5/

1 0