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

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 21 Nov '18

21 Nov '18

commit 682f7a1f316fed0ad03c47e908b6d437c4ee39ed Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 21 14:45:20 2018 +0000 Update translations for bridgedb_completed --- fr/LC_MESSAGES/bridgedb.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po index fe7dd4f89..153b7c45e 100644 --- a/fr/LC_MESSAGES/bridgedb.po +++ b/fr/LC_MESSAGES/bridgedb.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# AO <ao(a)localizationlab.org>, 2018 # apaddlingduck, 2014 # Boubou <cece31840(a)gmail.com>, 2015 # Cryptie <cryptie(a)fsfe.org>, 2014 # elouann, 2015 # fayçal fatihi <ofaycal.geo.x(a)gmail.com>, 2014 -# French language coordinator <french.coordinator(a)rbox.me>, 2017-2018 -# French language coordinator <french.coordinator(a)rbox.me>, 2016-2017 +# AO <ao(a)localizationlab.org>, 2017-2018 +# AO <ao(a)localizationlab.org>, 2016-2017 # Frisson Reynald <frissonreynald(a)yahoo.fr>, 2014 # hpatte, 2014 # Lucas Leroy <lerlucas(a)rocketmail.com>, 2014 @@ -22,15 +23,15 @@ # syl_, 2016 # themen <themen2004(a)gmail.com>, 2014 # Towinet, 2014-2015 -# French language coordinator <french.coordinator(a)rbox.me>, 2015 +# AO <ao(a)localizationlab.org>, 2015 # Yannick Heintz, 2014 msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: 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-04-18 15:58+0000\n" -"Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" +"PO-Revision-Date: 2018-11-21 14:37+0000\n" +"Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,7 +53,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Désolé ! Quelque chose a mal tourné avec votre requête." +msgstr "Désolé ! Un problème est survenu à la suite de votre requête." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 21 Nov '18

21 Nov '18

commit 8f65f57ed65dae81df746311e2eeae093fdefac6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 21 14:45:15 2018 +0000 Update translations for bridgedb --- fr/LC_MESSAGES/bridgedb.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po index fe7dd4f89..153b7c45e 100644 --- a/fr/LC_MESSAGES/bridgedb.po +++ b/fr/LC_MESSAGES/bridgedb.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# AO <ao(a)localizationlab.org>, 2018 # apaddlingduck, 2014 # Boubou <cece31840(a)gmail.com>, 2015 # Cryptie <cryptie(a)fsfe.org>, 2014 # elouann, 2015 # fayçal fatihi <ofaycal.geo.x(a)gmail.com>, 2014 -# French language coordinator <french.coordinator(a)rbox.me>, 2017-2018 -# French language coordinator <french.coordinator(a)rbox.me>, 2016-2017 +# AO <ao(a)localizationlab.org>, 2017-2018 +# AO <ao(a)localizationlab.org>, 2016-2017 # Frisson Reynald <frissonreynald(a)yahoo.fr>, 2014 # hpatte, 2014 # Lucas Leroy <lerlucas(a)rocketmail.com>, 2014 @@ -22,15 +23,15 @@ # syl_, 2016 # themen <themen2004(a)gmail.com>, 2014 # Towinet, 2014-2015 -# French language coordinator <french.coordinator(a)rbox.me>, 2015 +# AO <ao(a)localizationlab.org>, 2015 # Yannick Heintz, 2014 msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: 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-04-18 15:58+0000\n" -"Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" +"PO-Revision-Date: 2018-11-21 14:37+0000\n" +"Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,7 +53,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Désolé ! Quelque chose a mal tourné avec votre requête." +msgstr "Désolé ! Un problème est survenu à la suite de votre requête." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug"

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 21 Nov '18

21 Nov '18

commit 98123867c27f82c986c3aea663a3f9c092747f7e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 21 14:45:09 2018 +0000 Update translations for abouttor-homepage_completed --- fr/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/aboutTor.dtd b/fr/aboutTor.dtd index 959842c6d..6690a0913 100644 --- a/fr/aboutTor.dtd +++ b/fr/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.ready.label "Explorez, en toute confidentialité."> <!ENTITY aboutTor.ready2.label "Vous êtes prêts pour l’expérience de navigation la plus confidentielle au monde."> -<!ENTITY aboutTor.failure.label "Une erreur s’est produite !"> +<!ENTITY aboutTor.failure.label "Un problème est survenu !"> <!ENTITY aboutTor.failure2.label "Tor ne fonctionne pas dans ce navigateur."> <!ENTITY aboutTor.search.label "Chercher avec DuckDuckGo">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 21 Nov '18

21 Nov '18

commit d65da6c030c3bbfacd8b0bb6a374c16fdbd7b9d6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 21 14:45:03 2018 +0000 Update translations for abouttor-homepage --- fr/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/aboutTor.dtd b/fr/aboutTor.dtd index 959842c6d..6690a0913 100644 --- a/fr/aboutTor.dtd +++ b/fr/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.ready.label "Explorez, en toute confidentialité."> <!ENTITY aboutTor.ready2.label "Vous êtes prêts pour l’expérience de navigation la plus confidentielle au monde."> -<!ENTITY aboutTor.failure.label "Une erreur s’est produite !"> +<!ENTITY aboutTor.failure.label "Un problème est survenu !"> <!ENTITY aboutTor.failure2.label "Tor ne fonctionne pas dans ce navigateur."> <!ENTITY aboutTor.search.label "Chercher avec DuckDuckGo">

1 0

[sbws/master] tests, v3bwfile: rename bwl_str to raw_bwl_str
by juga＠torproject.org 21 Nov '18

21 Nov '18

commit 9f537092cae2611f16f298a04175034e21360de5 Author: juga0 <juga(a)riseup.net> Date: Wed Nov 21 13:36:45 2018 +0000 tests, v3bwfile: rename bwl_str to raw_bwl_str --- tests/unit/lib/test_v3bwfile.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py index 2987aca..f9c50d5 100644 --- a/tests/unit/lib/test_v3bwfile.py +++ b/tests/unit/lib/test_v3bwfile.py @@ -38,7 +38,8 @@ header_extra_ls = [timestamp_l, version_l, software_l, software_version_l, TERMINATOR] header_extra_str = LINE_SEP.join(header_extra_ls) + LINE_SEP -bwl_str = "bw=56 bw_mean=61423 bw_median=55656 "\ +# Line produced without any scaling. +raw_bwl_str = "bw=56 bw_mean=61423 bw_median=55656 "\ "desc_bw_avg=1000000000 desc_bw_obs_last=524288 "\ "desc_bw_obs_mean=524288 error_circ=0 error_misc=0 error_stream=1 " \ "master_key_ed25519=g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s " \ @@ -46,7 +47,7 @@ bwl_str = "bw=56 bw_mean=61423 bw_median=55656 "\ "node_id=$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA rtt=456 success=1 " \ "time=2018-04-17T14:09:07\n" -v3bw_str = header_extra_str + bwl_str +v3bw_str = header_extra_str + raw_bwl_str def test_v3bwheader_str(): @@ -219,7 +220,7 @@ def test_v3bwline_from_results_file(datadir): bwl = V3BWLine.from_data(d, fp) # bw store now B, not KB bwl.bw = round(bwl.bw / 1000) - assert bwl_str == str(bwl) + assert raw_bwl_str == str(bwl) def test_from_results_read(datadir, tmpdir, conf, args):

1 0

[sbws/master] generate: remove toflow option, it's the default
by juga＠torproject.org 21 Nov '18

21 Nov '18

commit ea1f58a885246040cd802f0888aacb51358f40a9 Author: juga0 <juga(a)riseup.net> Date: Mon Nov 19 18:15:06 2018 +0000 generate: remove toflow option, it's the default So that is less confusing that it's the default. We already have an option for linear scaling and no scaling. --- sbws/core/generate.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sbws/core/generate.py b/sbws/core/generate.py index 674956f..bd01b05 100644 --- a/sbws/core/generate.py +++ b/sbws/core/generate.py @@ -40,10 +40,12 @@ def gen_parser(sub): 'are, but scale them such that we have a budget of ' 'scale_constant * num_measured_relays = bandwidth to give ' 'out, and we do so proportionally') - p.add_argument('-t', '--scale-torflow', action='store_const', - default=True, const=False, - help='If specified, do not use bandwidth values as they ' - 'are, but scale them in the way Torflow does.') + p.add_argument('-t', '--scale-torflow', action='store_true', + default=True, + help='If specified, scale measurements using torflow\'s ' + 'method. This option is kept for compatibility with older ' + 'versions and it is silently ignored, since it is the ' + 'default.') p.add_argument('-w', '--raw', action='store_true', help='If specified, do use bandwidth raw measurements ' 'without any scaling.')

1 0

[sbws/master] v3bwfile: ensure torflow's scaling is the default
by juga＠torproject.org 21 Nov '18

21 Nov '18

commit 54078bd486720f664e583f2604b4260edee0c511 Author: juga0 <juga(a)riseup.net> Date: Mon Nov 19 18:29:50 2018 +0000 v3bwfile: ensure torflow's scaling is the default Even if that method is call from generate with torflow's scaling by default. --- sbws/lib/v3bwfile.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index ffc15a1..23387a9 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -485,7 +485,8 @@ class V3BWFile(object): @classmethod def from_results(cls, results, state_fpath='', scale_constant=SBWS_SCALE_CONSTANT, - scaling_method=None, torflow_obs=TORFLOW_OBS_LAST, + scaling_method=TORFLOW_SCALING, + torflow_obs=TORFLOW_OBS_LAST, torflow_cap=TORFLOW_BW_MARGIN, torflow_round_digs=PROP276_ROUND_DIG, secs_recent=None, secs_away=None, min_num=0,

1 0

[sbws/master] v3bwfile: remove TODO about torflow's scaling
by juga＠torproject.org 21 Nov '18

21 Nov '18

commit cc9ce5287ae8cfce8712aaba73db64d88ff808ec Author: juga0 <juga(a)riseup.net> Date: Mon Nov 19 18:40:30 2018 +0000 v3bwfile: remove TODO about torflow's scaling --- sbws/lib/v3bwfile.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 23387a9..a4511c7 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -509,8 +509,6 @@ class V3BWFile(object): 'relay_fp2': [Result1, Result2, ...]} """ - # TODO: change scaling_method to TORFLOW_SCALING before getting this - # in production log.info('Processing results to generate a bandwidth list file.') header = V3BWHeader.from_results(results, state_fpath) bw_lines_raw = []

1 0

[sbws/master] generate: comment torflow's scaling is default
by juga＠torproject.org 21 Nov '18

21 Nov '18

commit eead1060b4ee58be3b537f1142af46c94fa9e81e Author: juga0 <juga(a)riseup.net> Date: Mon Nov 19 18:29:20 2018 +0000 generate: comment torflow's scaling is default --- sbws/core/generate.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbws/core/generate.py b/sbws/core/generate.py index bd01b05..42e081a 100644 --- a/sbws/core/generate.py +++ b/sbws/core/generate.py @@ -81,6 +81,8 @@ def main(args, conf): elif args.raw: scaling_method = None else: + # sbws will scale as torflow until we have a better algorithm for + # scaling (#XXX) scaling_method = TORFLOW_SCALING if args.secs_recent: fresh_days = ceil(args.secs_recent / 24 / 60 / 60)

1 0

[sbws/master] generate: Include in help torflow's scaling method
by juga＠torproject.org 21 Nov '18

21 Nov '18

commit f72f255f6ee712e5b37e5830b7468506f75ca341 Author: juga0 <juga(a)riseup.net> Date: Mon Nov 19 18:35:10 2018 +0000 generate: Include in help torflow's scaling method --- sbws/core/generate.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sbws/core/generate.py b/sbws/core/generate.py index 42e081a..f9b46cb 100644 --- a/sbws/core/generate.py +++ b/sbws/core/generate.py @@ -22,7 +22,9 @@ def gen_parser(sub): '(latest.v3bw is an atomically created symlink in the same '\ 'directory as output.) '\ 'If the file is transferred to another host, it should be written to '\ - 'a temporary path, then renamed to the V3BandwidthsFile path.' + 'a temporary path, then renamed to the V3BandwidthsFile path.\n'\ + 'The default scaling method is torflow\'s one. To use different'\ + 'scaling methods or no scaling, see the options.' p = sub.add_parser('generate', description=d, formatter_class=ArgumentDefaultsHelpFormatter) p.add_argument('--output', default=None, type=str,

1 0