August 2018 - tor-commits - lists.torproject.org

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 06 Aug '18

06 Aug '18

commit 1113a7d516a0da6d6b6690b02cc22c093433cbcd Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 6 17:15:04 2018 +0000 Update translations for bridgedb --- ka/LC_MESSAGES/bridgedb.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ka/LC_MESSAGES/bridgedb.po b/ka/LC_MESSAGES/bridgedb.po index 31ab5f3e4..fe5031ed5 100644 --- a/ka/LC_MESSAGES/bridgedb.po +++ b/ka/LC_MESSAGES/bridgedb.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-08-04 21:02+0000\n" +"PO-Revision-Date: 2018-08-06 17:13+0000\n" "Last-Translator: A. C. <georgianization(a)outlook.com>\n" "Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n" "MIME-Version: 1.0\n" @@ -71,7 +71,7 @@ msgstr "" #: bridgedb/https/templates/bridges.html:67 #: bridgedb/https/templates/bridges.html:125 msgid "Uh oh, spaghettios!" -msgstr "" +msgstr "უჰ, რაღაც რიგზე ვერაა!" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." @@ -97,17 +97,17 @@ msgstr "" #: bridgedb/https/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "" +msgstr "ნაბიჯი %s1%s" #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "" +msgstr "ჩამოტვირთეთ %s Tor Browser %s" #: bridgedb/https/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "" +msgstr "ნაბიჯი %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format @@ -117,7 +117,7 @@ msgstr "" #: bridgedb/https/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "" +msgstr "ნაბიჯი %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format @@ -305,7 +305,7 @@ msgstr "" #: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" -msgstr "" +msgstr "გესაჭიროებათ IPv6-მისამართები?" #: bridgedb/strings.py:135 #, python-format

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 06 Aug '18

06 Aug '18

commit 3c2b01c154b9d265467f0dc2dc6be2a80dbeb0ad Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 6 16:16:46 2018 +0000 Update translations for tails-misc_completed --- ca.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ca.po b/ca.po index a813df726..c9d9c73db 100644 --- a/ca.po +++ b/ca.po @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-07-24 08:44+0800\n" -"PO-Revision-Date: 2018-07-30 16:37+0000\n" -"Last-Translator: Aleix Vidal i Gaya <aleix.vidal(a)gmail.com>\n" +"PO-Revision-Date: 2018-08-06 16:12+0000\n" +"Last-Translator: escufi <escufi(a)gmail.com>\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 06 Aug '18

06 Aug '18

commit 46a8f9c48ec98d4d133dd918eb718a4d7f5b393c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 6 16:16:41 2018 +0000 Update translations for tails-misc --- ca.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ca.po b/ca.po index a813df726..c9d9c73db 100644 --- a/ca.po +++ b/ca.po @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-07-24 08:44+0800\n" -"PO-Revision-Date: 2018-07-30 16:37+0000\n" -"Last-Translator: Aleix Vidal i Gaya <aleix.vidal(a)gmail.com>\n" +"PO-Revision-Date: 2018-08-06 16:12+0000\n" +"Last-Translator: escufi <escufi(a)gmail.com>\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 06 Aug '18

06 Aug '18

commit 40deb99c542b9b3b7d29281b68660998a514d50d Merge: bf33ddd29 a54e94878 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 6 10:39:59 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug26994 | 3 +++ src/test/test_bwmgt.c | 35 ++++++++++++++++++++--------------- 2 files changed, 23 insertions(+), 15 deletions(-)

1 0

[tor/maint-0.3.4] Rename SEC identifier to BW_SEC in test_bwmgt.h
by nickm＠torproject.org 06 Aug '18

06 Aug '18

commit a54e94878a438a269659387b9e6eea84f7e12771 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 6 10:39:14 2018 -0400 Rename SEC identifier to BW_SEC in test_bwmgt.h Apparently Solaris 10 defines SEC somewhere in its headers, causing a compilation problem. Fixes bug 26994; bugfix on 0.3.4.1-alpha. --- changes/bug26994 | 3 +++ src/test/test_bwmgt.c | 35 ++++++++++++++++++++--------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/changes/bug26994 b/changes/bug26994 new file mode 100644 index 000000000..664894a7f --- /dev/null +++ b/changes/bug26994 @@ -0,0 +1,3 @@ + o Minor bugfixes (portability): + - Avoid a compilation error in test_bwmgt.c on Solaris 10. + Fixes bug 26994; bugfix on 0.3.4.1-alpha. diff --git a/src/test/test_bwmgt.c b/src/test/test_bwmgt.c index 268917005..463a36b24 100644 --- a/src/test/test_bwmgt.c +++ b/src/test/test_bwmgt.c @@ -124,46 +124,52 @@ test_bwmgt_token_buf_refill(void *arg) { (void)arg; token_bucket_rw_t b; - const uint32_t SEC = + const uint32_t BW_SEC = (uint32_t)monotime_msec_to_approx_coarse_stamp_units(1000); token_bucket_rw_init(&b, 16*KB, 64*KB, START_TS); /* Make the buffer much emptier, then let one second elapse. */ token_bucket_rw_dec_read(&b, 48*KB); tt_int_op(b.read_bucket.bucket, OP_EQ, 16*KB); - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + BW_SEC)); tt_int_op(b.read_bucket.bucket, OP_GT, 32*KB - 300); tt_int_op(b.read_bucket.bucket, OP_LT, 32*KB + 300); /* Another half second. */ - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + BW_SEC*3/2)); tt_int_op(b.read_bucket.bucket, OP_GT, 40*KB - 400); tt_int_op(b.read_bucket.bucket, OP_LT, 40*KB + 400); - tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, START_TS + SEC*3/2); + tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, START_TS + BW_SEC*3/2); /* No time: nothing happens. */ { const uint32_t bucket_orig = b.read_bucket.bucket; - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + BW_SEC*3/2)); tt_int_op(b.read_bucket.bucket, OP_EQ, bucket_orig); } /* Another 30 seconds: fill the bucket. */ - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2 + SEC*30)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, + START_TS + BW_SEC*3/2 + BW_SEC*30)); tt_int_op(b.read_bucket.bucket, OP_EQ, b.cfg.burst); - tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, START_TS + SEC*3/2 + SEC*30); + tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, + START_TS + BW_SEC*3/2 + BW_SEC*30); /* Another 30 seconds: nothing happens. */ - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2 + SEC*60)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, + START_TS + BW_SEC*3/2 + BW_SEC*60)); tt_int_op(b.read_bucket.bucket, OP_EQ, b.cfg.burst); - tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, START_TS + SEC*3/2 + SEC*60); + tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, + START_TS + BW_SEC*3/2 + BW_SEC*60); /* Empty the bucket, let two seconds pass, and make sure that a refill is * noticed. */ tt_int_op(1, OP_EQ, token_bucket_rw_dec_read(&b, b.cfg.burst)); tt_int_op(0, OP_EQ, b.read_bucket.bucket); - tt_int_op(1, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2 + SEC*61)); - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2 + SEC*62)); + tt_int_op(1, OP_EQ, token_bucket_rw_refill(&b, + START_TS + BW_SEC*3/2 + BW_SEC*61)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, + START_TS + BW_SEC*3/2 + BW_SEC*62)); tt_int_op(b.read_bucket.bucket, OP_GT, 32*KB-400); tt_int_op(b.read_bucket.bucket, OP_LT, 32*KB+400); @@ -172,16 +178,16 @@ test_bwmgt_token_buf_refill(void *arg) token_bucket_rw_dec_read(&b, b.read_bucket.bucket+16*KB)); tt_int_op(-16*KB, OP_EQ, b.read_bucket.bucket); // half a second passes... - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*64)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + BW_SEC*64)); tt_int_op(b.read_bucket.bucket, OP_GT, -8*KB-300); tt_int_op(b.read_bucket.bucket, OP_LT, -8*KB+300); // a second passes - tt_int_op(1, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*65)); + tt_int_op(1, OP_EQ, token_bucket_rw_refill(&b, START_TS + BW_SEC*65)); tt_int_op(b.read_bucket.bucket, OP_GT, 8*KB-400); tt_int_op(b.read_bucket.bucket, OP_LT, 8*KB+400); // We step a second backwards, and nothing happens. - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*64)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + BW_SEC*64)); tt_int_op(b.read_bucket.bucket, OP_GT, 8*KB-400); tt_int_op(b.read_bucket.bucket, OP_LT, 8*KB+400); @@ -225,4 +231,3 @@ struct testcase_t bwmgt_tests[] = { BWMGT(token_buf_helpers), END_OF_TESTCASES }; -

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 06 Aug '18

06 Aug '18

commit abf88af4887782f6952d90755d64f946d4958e6d Merge: 258460466 a54e94878 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 6 10:39:59 2018 -0400 Merge branch 'maint-0.3.4' changes/bug26994 | 3 +++ src/test/test_bwmgt.c | 35 ++++++++++++++++++++--------------- 2 files changed, 23 insertions(+), 15 deletions(-)

1 0

[tor/release-0.3.4] Rename SEC identifier to BW_SEC in test_bwmgt.h
by nickm＠torproject.org 06 Aug '18

06 Aug '18

commit a54e94878a438a269659387b9e6eea84f7e12771 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 6 10:39:14 2018 -0400 Rename SEC identifier to BW_SEC in test_bwmgt.h Apparently Solaris 10 defines SEC somewhere in its headers, causing a compilation problem. Fixes bug 26994; bugfix on 0.3.4.1-alpha. --- changes/bug26994 | 3 +++ src/test/test_bwmgt.c | 35 ++++++++++++++++++++--------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/changes/bug26994 b/changes/bug26994 new file mode 100644 index 000000000..664894a7f --- /dev/null +++ b/changes/bug26994 @@ -0,0 +1,3 @@ + o Minor bugfixes (portability): + - Avoid a compilation error in test_bwmgt.c on Solaris 10. + Fixes bug 26994; bugfix on 0.3.4.1-alpha. diff --git a/src/test/test_bwmgt.c b/src/test/test_bwmgt.c index 268917005..463a36b24 100644 --- a/src/test/test_bwmgt.c +++ b/src/test/test_bwmgt.c @@ -124,46 +124,52 @@ test_bwmgt_token_buf_refill(void *arg) { (void)arg; token_bucket_rw_t b; - const uint32_t SEC = + const uint32_t BW_SEC = (uint32_t)monotime_msec_to_approx_coarse_stamp_units(1000); token_bucket_rw_init(&b, 16*KB, 64*KB, START_TS); /* Make the buffer much emptier, then let one second elapse. */ token_bucket_rw_dec_read(&b, 48*KB); tt_int_op(b.read_bucket.bucket, OP_EQ, 16*KB); - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + BW_SEC)); tt_int_op(b.read_bucket.bucket, OP_GT, 32*KB - 300); tt_int_op(b.read_bucket.bucket, OP_LT, 32*KB + 300); /* Another half second. */ - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + BW_SEC*3/2)); tt_int_op(b.read_bucket.bucket, OP_GT, 40*KB - 400); tt_int_op(b.read_bucket.bucket, OP_LT, 40*KB + 400); - tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, START_TS + SEC*3/2); + tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, START_TS + BW_SEC*3/2); /* No time: nothing happens. */ { const uint32_t bucket_orig = b.read_bucket.bucket; - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + BW_SEC*3/2)); tt_int_op(b.read_bucket.bucket, OP_EQ, bucket_orig); } /* Another 30 seconds: fill the bucket. */ - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2 + SEC*30)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, + START_TS + BW_SEC*3/2 + BW_SEC*30)); tt_int_op(b.read_bucket.bucket, OP_EQ, b.cfg.burst); - tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, START_TS + SEC*3/2 + SEC*30); + tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, + START_TS + BW_SEC*3/2 + BW_SEC*30); /* Another 30 seconds: nothing happens. */ - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2 + SEC*60)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, + START_TS + BW_SEC*3/2 + BW_SEC*60)); tt_int_op(b.read_bucket.bucket, OP_EQ, b.cfg.burst); - tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, START_TS + SEC*3/2 + SEC*60); + tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, + START_TS + BW_SEC*3/2 + BW_SEC*60); /* Empty the bucket, let two seconds pass, and make sure that a refill is * noticed. */ tt_int_op(1, OP_EQ, token_bucket_rw_dec_read(&b, b.cfg.burst)); tt_int_op(0, OP_EQ, b.read_bucket.bucket); - tt_int_op(1, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2 + SEC*61)); - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2 + SEC*62)); + tt_int_op(1, OP_EQ, token_bucket_rw_refill(&b, + START_TS + BW_SEC*3/2 + BW_SEC*61)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, + START_TS + BW_SEC*3/2 + BW_SEC*62)); tt_int_op(b.read_bucket.bucket, OP_GT, 32*KB-400); tt_int_op(b.read_bucket.bucket, OP_LT, 32*KB+400); @@ -172,16 +178,16 @@ test_bwmgt_token_buf_refill(void *arg) token_bucket_rw_dec_read(&b, b.read_bucket.bucket+16*KB)); tt_int_op(-16*KB, OP_EQ, b.read_bucket.bucket); // half a second passes... - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*64)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + BW_SEC*64)); tt_int_op(b.read_bucket.bucket, OP_GT, -8*KB-300); tt_int_op(b.read_bucket.bucket, OP_LT, -8*KB+300); // a second passes - tt_int_op(1, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*65)); + tt_int_op(1, OP_EQ, token_bucket_rw_refill(&b, START_TS + BW_SEC*65)); tt_int_op(b.read_bucket.bucket, OP_GT, 8*KB-400); tt_int_op(b.read_bucket.bucket, OP_LT, 8*KB+400); // We step a second backwards, and nothing happens. - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*64)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + BW_SEC*64)); tt_int_op(b.read_bucket.bucket, OP_GT, 8*KB-400); tt_int_op(b.read_bucket.bucket, OP_LT, 8*KB+400); @@ -225,4 +231,3 @@ struct testcase_t bwmgt_tests[] = { BWMGT(token_buf_helpers), END_OF_TESTCASES }; -

1 0

[tor/master] Rename SEC identifier to BW_SEC in test_bwmgt.h
by nickm＠torproject.org 06 Aug '18

06 Aug '18

commit a54e94878a438a269659387b9e6eea84f7e12771 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 6 10:39:14 2018 -0400 Rename SEC identifier to BW_SEC in test_bwmgt.h Apparently Solaris 10 defines SEC somewhere in its headers, causing a compilation problem. Fixes bug 26994; bugfix on 0.3.4.1-alpha. --- changes/bug26994 | 3 +++ src/test/test_bwmgt.c | 35 ++++++++++++++++++++--------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/changes/bug26994 b/changes/bug26994 new file mode 100644 index 000000000..664894a7f --- /dev/null +++ b/changes/bug26994 @@ -0,0 +1,3 @@ + o Minor bugfixes (portability): + - Avoid a compilation error in test_bwmgt.c on Solaris 10. + Fixes bug 26994; bugfix on 0.3.4.1-alpha. diff --git a/src/test/test_bwmgt.c b/src/test/test_bwmgt.c index 268917005..463a36b24 100644 --- a/src/test/test_bwmgt.c +++ b/src/test/test_bwmgt.c @@ -124,46 +124,52 @@ test_bwmgt_token_buf_refill(void *arg) { (void)arg; token_bucket_rw_t b; - const uint32_t SEC = + const uint32_t BW_SEC = (uint32_t)monotime_msec_to_approx_coarse_stamp_units(1000); token_bucket_rw_init(&b, 16*KB, 64*KB, START_TS); /* Make the buffer much emptier, then let one second elapse. */ token_bucket_rw_dec_read(&b, 48*KB); tt_int_op(b.read_bucket.bucket, OP_EQ, 16*KB); - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + BW_SEC)); tt_int_op(b.read_bucket.bucket, OP_GT, 32*KB - 300); tt_int_op(b.read_bucket.bucket, OP_LT, 32*KB + 300); /* Another half second. */ - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + BW_SEC*3/2)); tt_int_op(b.read_bucket.bucket, OP_GT, 40*KB - 400); tt_int_op(b.read_bucket.bucket, OP_LT, 40*KB + 400); - tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, START_TS + SEC*3/2); + tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, START_TS + BW_SEC*3/2); /* No time: nothing happens. */ { const uint32_t bucket_orig = b.read_bucket.bucket; - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + BW_SEC*3/2)); tt_int_op(b.read_bucket.bucket, OP_EQ, bucket_orig); } /* Another 30 seconds: fill the bucket. */ - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2 + SEC*30)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, + START_TS + BW_SEC*3/2 + BW_SEC*30)); tt_int_op(b.read_bucket.bucket, OP_EQ, b.cfg.burst); - tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, START_TS + SEC*3/2 + SEC*30); + tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, + START_TS + BW_SEC*3/2 + BW_SEC*30); /* Another 30 seconds: nothing happens. */ - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2 + SEC*60)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, + START_TS + BW_SEC*3/2 + BW_SEC*60)); tt_int_op(b.read_bucket.bucket, OP_EQ, b.cfg.burst); - tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, START_TS + SEC*3/2 + SEC*60); + tt_uint_op(b.last_refilled_at_timestamp, OP_EQ, + START_TS + BW_SEC*3/2 + BW_SEC*60); /* Empty the bucket, let two seconds pass, and make sure that a refill is * noticed. */ tt_int_op(1, OP_EQ, token_bucket_rw_dec_read(&b, b.cfg.burst)); tt_int_op(0, OP_EQ, b.read_bucket.bucket); - tt_int_op(1, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2 + SEC*61)); - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*3/2 + SEC*62)); + tt_int_op(1, OP_EQ, token_bucket_rw_refill(&b, + START_TS + BW_SEC*3/2 + BW_SEC*61)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, + START_TS + BW_SEC*3/2 + BW_SEC*62)); tt_int_op(b.read_bucket.bucket, OP_GT, 32*KB-400); tt_int_op(b.read_bucket.bucket, OP_LT, 32*KB+400); @@ -172,16 +178,16 @@ test_bwmgt_token_buf_refill(void *arg) token_bucket_rw_dec_read(&b, b.read_bucket.bucket+16*KB)); tt_int_op(-16*KB, OP_EQ, b.read_bucket.bucket); // half a second passes... - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*64)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + BW_SEC*64)); tt_int_op(b.read_bucket.bucket, OP_GT, -8*KB-300); tt_int_op(b.read_bucket.bucket, OP_LT, -8*KB+300); // a second passes - tt_int_op(1, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*65)); + tt_int_op(1, OP_EQ, token_bucket_rw_refill(&b, START_TS + BW_SEC*65)); tt_int_op(b.read_bucket.bucket, OP_GT, 8*KB-400); tt_int_op(b.read_bucket.bucket, OP_LT, 8*KB+400); // We step a second backwards, and nothing happens. - tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + SEC*64)); + tt_int_op(0, OP_EQ, token_bucket_rw_refill(&b, START_TS + BW_SEC*64)); tt_int_op(b.read_bucket.bucket, OP_GT, 8*KB-400); tt_int_op(b.read_bucket.bucket, OP_LT, 8*KB+400); @@ -225,4 +231,3 @@ struct testcase_t bwmgt_tests[] = { BWMGT(token_buf_helpers), END_OF_TESTCASES }; -

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 06 Aug '18

06 Aug '18

commit 2edd7dd812f5e647cfb305ea5ccd3f75cd3d4b5e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 6 13:46:44 2018 +0000 Update translations for tor-launcher-network-settings_completed --- de/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/network-settings.dtd b/de/network-settings.dtd index 28bb8b79e..33caee29e 100644 --- a/de/network-settings.dtd +++ b/de/network-settings.dtd @@ -52,7 +52,7 @@ <!ENTITY torsettings.copyLog "Tor-Protokoll in die Zwischenablage kopieren"> <!ENTITY torsettings.proxyHelpTitle "Proxy-Hilfe"> -<!ENTITY torsettings.proxyHelp1 "Ein lokaler Proxy wird verwendet, wenn Sie sich aus einem Unternehmens-, Schul- oder Universitätsnetzwerk heraus verbinden. Wenn Sie sich nicht sicher sind, wie Sie diese Frage beantworten sollen, sehen Sie sich die Interneteinstellungen in einem anderen Browser an oder überprüfen Sie die Netzwerkeinstellungen des Systems um zu bestimmen, ob sie einen lokalen Proxyserver benötigen."> +<!ENTITY torsettings.proxyHelp1 "Unter Umständen ist ein lokaler Proxy nötig, um sich von einem eingeschränkten Netzwerk eines Unternehmens, einer Schule oder Universität zu verbinden. Im Zweifelsfall kann die Einstellung in einem anderen Browser oder die System-Netzwerkeinstellung .verglichen werden."> <!ENTITY torsettings.bridgeHelpTitle "Hilfe zum Brückenrelais"> <!ENTITY torsettings.bridgeHelp1 "Brücken sind nicht aufgelistete Vermittler, die es schwieriger machen, Verbindungen zum Tor-Netzwerk zu blockieren.  Jede Art von Brücke verwendet eine andere Methode, um Zensur zu vermeiden.  Die vom Typ obfs lassen Ihren Datenverkehr wie Zufallsrauschen aussehen und die vom Typ meek lassen Ihren Datenverkehr aussehen, als ob Sie eine Verbindung zu diesem jeweiligen Dienst herstellen anstatt zu Tor.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 06 Aug '18

06 Aug '18

commit 667fe71889dcad9d365b3a88c39f124109dc89d4 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 6 13:46:40 2018 +0000 Update translations for tor-launcher-network-settings --- de/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/network-settings.dtd b/de/network-settings.dtd index 3777ff154..33caee29e 100644 --- a/de/network-settings.dtd +++ b/de/network-settings.dtd @@ -52,7 +52,7 @@ <!ENTITY torsettings.copyLog "Tor-Protokoll in die Zwischenablage kopieren"> <!ENTITY torsettings.proxyHelpTitle "Proxy-Hilfe"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> +<!ENTITY torsettings.proxyHelp1 "Unter Umständen ist ein lokaler Proxy nötig, um sich von einem eingeschränkten Netzwerk eines Unternehmens, einer Schule oder Universität zu verbinden. Im Zweifelsfall kann die Einstellung in einem anderen Browser oder die System-Netzwerkeinstellung .verglichen werden."> <!ENTITY torsettings.bridgeHelpTitle "Hilfe zum Brückenrelais"> <!ENTITY torsettings.bridgeHelp1 "Brücken sind nicht aufgelistete Vermittler, die es schwieriger machen, Verbindungen zum Tor-Netzwerk zu blockieren.  Jede Art von Brücke verwendet eine andere Methode, um Zensur zu vermeiden.  Die vom Typ obfs lassen Ihren Datenverkehr wie Zufallsrauschen aussehen und die vom Typ meek lassen Ihren Datenverkehr aussehen, als ob Sie eine Verbindung zu diesem jeweiligen Dienst herstellen anstatt zu Tor.">

1 0