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

[tor/master] changes file for ticket 30914
by dgoulet＠torproject.org 22 Aug '19

22 Aug '19

commit e8790971f6120cc3e4fd2acd41f5dd0512f52068 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 19 16:24:07 2019 -0400 changes file for ticket 30914 --- changes/ticket30914 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket30914 b/changes/ticket30914 new file mode 100644 index 000000000..c8c008b3d --- /dev/null +++ b/changes/ticket30914 @@ -0,0 +1,4 @@ + o Code simplification and refactoring: + - Lower another layer of object management from confparse.c to + a more general tool. Now typed structure members are accessible + via an abstract type. Implements ticket 30914.

1 0

[tor/master] Use structvar to find the types for config vars.
by dgoulet＠torproject.org 22 Aug '19

22 Aug '19

commit a91ed23403ae28974639a9bdb67530c5c07a0ce6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 19 10:46:07 2019 -0400 Use structvar to find the types for config vars. --- scripts/maint/practracker/exceptions.txt | 2 +- src/app/config/config.c | 30 ++---------------------------- src/lib/confmgt/structvar.c | 26 ++++++++++++++++++++++++++ src/lib/confmgt/structvar.h | 3 +++ 4 files changed, 32 insertions(+), 29 deletions(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 4db452b89..2190fb1ca 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -30,7 +30,7 @@ # Remember: It is better to fix the problem than to add a new exception! problem file-size /src/app/config/config.c 8518 -problem include-count /src/app/config/config.c 87 +problem include-count /src/app/config/config.c 88 problem function-size /src/app/config/config.c:options_act_reversible() 296 problem function-size /src/app/config/config.c:options_act() 589 problem function-size /src/app/config/config.c:resolve_my_address() 192 diff --git a/src/app/config/config.c b/src/app/config/config.c index 37cbe6b2e..8da1e2acd 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -111,6 +111,7 @@ #include "feature/stats/predict_ports.h" #include "feature/stats/rephist.h" #include "lib/compress/compress.h" +#include "lib/confmgt/structvar.h" #include "lib/crypt_ops/crypto_init.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" @@ -8195,37 +8196,10 @@ getinfo_helper_config(control_connection_t *conn, int i; for (i = 0; option_vars_[i].member.name; ++i) { const config_var_t *var = &option_vars_[i]; - const char *type; /* don't tell controller about triple-underscore options */ if (!strncmp(option_vars_[i].member.name, "___", 3)) continue; - switch (var->member.type) { - case CONFIG_TYPE_STRING: type = "String"; break; - case CONFIG_TYPE_FILENAME: type = "Filename"; break; - case CONFIG_TYPE_POSINT: type = "Integer"; break; - case CONFIG_TYPE_UINT64: type = "Integer"; break; - case CONFIG_TYPE_INT: type = "SignedInteger"; break; - case CONFIG_TYPE_INTERVAL: type = "TimeInterval"; break; - case CONFIG_TYPE_MSEC_INTERVAL: type = "TimeMsecInterval"; break; - case CONFIG_TYPE_MEMUNIT: type = "DataSize"; break; - case CONFIG_TYPE_DOUBLE: type = "Float"; break; - case CONFIG_TYPE_BOOL: type = "Boolean"; break; - case CONFIG_TYPE_AUTOBOOL: type = "Boolean+Auto"; break; - case CONFIG_TYPE_ISOTIME: type = "Time"; break; - case CONFIG_TYPE_ROUTERSET: type = "RouterList"; break; - case CONFIG_TYPE_CSV: type = "CommaList"; break; - /* This type accepts more inputs than TimeInterval, but it ignores - * everything after the first entry, so we may as well pretend - * it's a TimeInterval. */ - case CONFIG_TYPE_CSV_INTERVAL: type = "TimeInterval"; break; - case CONFIG_TYPE_LINELIST: type = "LineList"; break; - case CONFIG_TYPE_LINELIST_S: type = "Dependent"; break; - case CONFIG_TYPE_LINELIST_V: type = "Virtual"; break; - default: - case CONFIG_TYPE_OBSOLETE: - case CONFIG_TYPE_EXTENDED: - type = NULL; break; - } + const char *type = struct_var_get_typename(&var->member); if (!type) continue; smartlist_add_asprintf(sl, "%s %s\n",var->member.name,type); diff --git a/src/lib/confmgt/structvar.c b/src/lib/confmgt/structvar.c index 7ea00fbde..38f8e5dd7 100644 --- a/src/lib/confmgt/structvar.c +++ b/src/lib/confmgt/structvar.c @@ -25,6 +25,8 @@ #include "lib/confmgt/typedvar.h" #include "lib/log/util_bug.h" +#include "lib/confmgt/var_type_def_st.h" + #include <stddef.h> /** @@ -198,3 +200,27 @@ struct_var_kvencode(const void *object, const struct_member_t *member) return typed_var_kvencode_ex(member->name, p, def); } + +/** + * Return the official name of this struct member. + **/ +const char * +struct_var_get_name(const struct_member_t *member) +{ + return member->name; +} + +/** + * Return the type name for this struct member. + * + * Do not use the output of this function to inspect a type within Tor. It is + * suitable for debugging, informing the controller or user of a variable's + * type, etc. + **/ +const char * +struct_var_get_typename(const struct_member_t *member) +{ + const var_type_def_t *def = get_type_def(member); + + return def ? def->name : NULL; +} diff --git a/src/lib/confmgt/structvar.h b/src/lib/confmgt/structvar.h index 894098e50..92b9b6fc7 100644 --- a/src/lib/confmgt/structvar.h +++ b/src/lib/confmgt/structvar.h @@ -41,6 +41,9 @@ bool struct_var_eq(const void *a, const void *b, bool struct_var_ok(const void *object, const struct struct_member_t *member); +const char *struct_var_get_name(const struct struct_member_t *member); +const char *struct_var_get_typename(const struct struct_member_t *member); + int struct_var_kvassign(void *object, const struct config_line_t *line, char **errmsg, const struct struct_member_t *member);

1 0

[tor/master] Merge branch 'ticket30914' into ticket30914_merged
by dgoulet＠torproject.org 22 Aug '19

22 Aug '19

commit edf5a327c5a27db218b4240b758669f5572e9565 Merge: 4b1e0dd5b e8790971f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 20 13:57:05 2019 -0400 Merge branch 'ticket30914' into ticket30914_merged changes/ticket30914 | 4 + scripts/maint/practracker/exceptions.txt | 5 +- src/app/config/config.c | 138 +++++++++--------- src/app/config/confparse.c | 178 ++++++++++------------- src/app/config/confparse.h | 25 ++-- src/app/config/statefile.c | 20 ++- src/feature/dirauth/shared_random_state.c | 23 +-- src/feature/nodelist/routerset.c | 62 ++++++++ src/feature/nodelist/routerset.h | 3 + src/lib/conf/conftypes.h | 40 ++++++ src/lib/confmgt/include.am | 2 + src/lib/confmgt/structvar.c | 226 ++++++++++++++++++++++++++++++ src/lib/confmgt/structvar.h | 54 +++++++ src/lib/confmgt/typedvar.c | 18 +-- src/test/test_confparse.c | 59 ++++++-- 15 files changed, 634 insertions(+), 223 deletions(-) diff --cc scripts/maint/practracker/exceptions.txt index 4f3943f21,2190fb1ca..a1d00b9cd --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@@ -29,24 -29,25 +29,24 @@@ # # Remember: It is better to fix the problem than to add a new exception! - problem file-size /src/app/config/config.c 8510 - problem include-count /src/app/config/config.c 87 + problem file-size /src/app/config/config.c 8518 + problem include-count /src/app/config/config.c 88 problem function-size /src/app/config/config.c:options_act_reversible() 296 problem function-size /src/app/config/config.c:options_act() 589 -problem function-size /src/app/config/config.c:resolve_my_address() 192 -problem function-size /src/app/config/config.c:options_validate() 1217 +problem function-size /src/app/config/config.c:resolve_my_address() 190 +problem function-size /src/app/config/config.c:options_validate() 1209 problem function-size /src/app/config/config.c:options_init_from_torrc() 207 -problem function-size /src/app/config/config.c:options_init_from_string() 173 -problem function-size /src/app/config/config.c:options_init_logs() 146 +problem function-size /src/app/config/config.c:options_init_from_string() 171 +problem function-size /src/app/config/config.c:options_init_logs() 145 problem function-size /src/app/config/config.c:parse_bridge_line() 104 -problem function-size /src/app/config/config.c:parse_transport_line() 191 -problem function-size /src/app/config/config.c:parse_dir_authority_line() 151 -problem function-size /src/app/config/config.c:parse_dir_fallback_line() 102 -problem function-size /src/app/config/config.c:parse_port_config() 452 -problem function-size /src/app/config/config.c:parse_ports() 170 -problem function-size /src/app/config/config.c:getinfo_helper_config() 116 -problem function-size /src/app/config/confparse.c:config_assign_value() 205 -problem function-size /src/app/config/confparse.c:config_get_assigned_option() 129 -problem include-count /src/app/main/main.c 67 +problem function-size /src/app/config/config.c:parse_transport_line() 189 +problem function-size /src/app/config/config.c:parse_dir_authority_line() 150 +problem function-size /src/app/config/config.c:parse_dir_fallback_line() 101 +problem function-size /src/app/config/config.c:parse_port_config() 446 +problem function-size /src/app/config/config.c:parse_ports() 168 +problem function-size /src/app/config/config.c:getinfo_helper_config() 113 +problem file-size /src/app/config/or_options_st.h 1112 +problem include-count /src/app/main/main.c 68 problem function-size /src/app/main/main.c:dumpstats() 102 problem function-size /src/app/main/main.c:tor_init() 137 problem function-size /src/app/main/main.c:sandbox_init_filter() 291 @@@ -276,11 -276,10 +276,10 @@@ problem function-size /src/lib/process/ problem function-size /src/lib/process/setuid.c:switch_id() 156 problem function-size /src/lib/sandbox/sandbox.c:prot_strings() 104 problem function-size /src/lib/string/scanf.c:tor_vsscanf() 112 -problem function-size /src/lib/tls/tortls_nss.c:tor_tls_context_new() 153 -problem function-size /src/lib/tls/tortls_openssl.c:tor_tls_context_new() 171 -problem function-size /src/lib/tls/x509_nss.c:tor_tls_create_certificate_internal() 126 +problem function-size /src/lib/tls/tortls_nss.c:tor_tls_context_new() 152 +problem function-size /src/lib/tls/tortls_openssl.c:tor_tls_context_new() 170 +problem function-size /src/lib/tls/x509_nss.c:tor_tls_create_certificate_internal() 121 problem function-size /src/tools/tor-gencert.c:parse_commandline() 111 -problem function-size /src/tools/tor-resolve.c:build_socks5_resolve_request() 104 -problem function-size /src/tools/tor-resolve.c:do_resolve() 174 +problem function-size /src/tools/tor-resolve.c:build_socks5_resolve_request() 102 +problem function-size /src/tools/tor-resolve.c:do_resolve() 171 problem function-size /src/tools/tor-resolve.c:main() 112 -

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 22 Aug '19

22 Aug '19

commit 74396567104fd0dc8fe847c47a63a9aa9a425eff Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 22 20:00:07 2019 +0000 Update translations for support-portal_completed --- contents+pt-BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 227e6f0fa..d04b99286 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -6,11 +6,11 @@ # Greg Strider <gboufleur(a)gmail.com>, 2019 # Emma Peel, 2019 # Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2019 -# Chacal E., 2019 # Communia <ameaneantie(a)riseup.net>, 2019 # erinm, 2019 # Alexei Gonçalves de Oliveira <alexis(a)gessicahellmann.com>, 2019 # Cy Belle <cyb3ll3(a)protonmail.com>, 2019 +# Chacal E., 2019 # msgid "" msgstr "" @@ -18,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-21 12:22+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Cy Belle <cyb3ll3(a)protonmail.com>, 2019\n" +"Last-Translator: Chacal E., 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 22 Aug '19

22 Aug '19

commit cf54f74cfcac11c460d381c6bb0611595bbe7809 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 22 19:59:52 2019 +0000 Update translations for support-portal --- contents+fr.po | 10 +++++----- contents+pt-BR.po | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 1e5b033e6..8f0da3dbf 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -3,8 +3,8 @@ # Emma Peel, 2019 # David Georges, 2019 # Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 -# AO <ao(a)localizationlab.org>, 2019 # erinm, 2019 +# AO <ao(a)localizationlab.org>, 2019 # msgid "" msgstr "" @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-21 12:22+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: erinm, 2019\n" +"Last-Translator: AO <ao(a)localizationlab.org>, 2019\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -6564,15 +6564,15 @@ msgstr "Sujets" #: templates/macros/question.html:12 msgid "Contributors to this page:" -msgstr "" +msgstr "Contributeurs à cette page :" #: templates/macros/question.html:14 msgid "Edit this page" -msgstr "" +msgstr "Modifier cette page" #: templates/macros/question.html:15 msgid "Suggest Feedback" -msgstr "" +msgstr "Laisser une rétroaction" #: templates/macros/question.html:16 msgid "Permalink" diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 8732fde9a..644c21552 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -6,11 +6,11 @@ # Greg Strider <gboufleur(a)gmail.com>, 2019 # Emma Peel, 2019 # Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2019 -# Chacal E., 2019 # Communia <ameaneantie(a)riseup.net>, 2019 # erinm, 2019 # Alexei Gonçalves de Oliveira <alexis(a)gessicahellmann.com>, 2019 # Cy Belle <cyb3ll3(a)protonmail.com>, 2019 +# Chacal E., 2019 # msgid "" msgstr "" @@ -18,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-21 12:22+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Cy Belle <cyb3ll3(a)protonmail.com>, 2019\n" +"Last-Translator: Chacal E., 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -6414,15 +6414,15 @@ msgstr "Tópicos" #: templates/macros/question.html:12 msgid "Contributors to this page:" -msgstr "" +msgstr "Contribuidores para esta página:" #: templates/macros/question.html:14 msgid "Edit this page" -msgstr "" +msgstr "Edite essa página" #: templates/macros/question.html:15 msgid "Suggest Feedback" -msgstr "" +msgstr "Sugerir Feedback" #: templates/macros/question.html:16 msgid "Permalink"

1 0

[translation/tpo-web_completed] Update translations for tpo-web_completed
by translation＠torproject.org 22 Aug '19

22 Aug '19

commit 831d33e1d33fd5f9fa602d330073ee0caab49eb3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 22 19:58:44 2019 +0000 Update translations for tpo-web_completed --- contents+fr.po | 19 ++++++++++++++++--- contents+pt-BR.po | 4 ++-- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 990c3c358..a8be8fe52 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -362,11 +362,20 @@ msgid "" "Defense Advanced Research Projects Agency (DARPA); and the Media Democracy " "Fund." msgstr "" +"Par le passé, le Projet Tor a obtenu des indemnités cy-près de protection de" +" la vie privée distribuées par les subventions pour la protection de la vie " +"privée de la Fondation Rose. L’organisme possède plus de dix ans " +"d’expérience dans la réalisation réussie de projets avec des bailleurs de " +"fonds et des partenaires aussi variés que le Secrétariat d’État des États-" +"Unis, bureau de la démocratie, des droits de la personne et du travail ; la " +"Fondation nationale pour la science (National Science Foundation) ; l’Agence" +" pour les projets de recherche avancée de défense (DARPA) ; ainsi que le " +"Fonds pour la démocratie des médias (Media Democracy Fund)." #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) msgid "#### Contact the Tor Project about a Cy Pres Award" -msgstr "" +msgstr "#### Contacter le Projet Tor au sujet d’une indemnité cy-près" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -376,6 +385,10 @@ msgid "" "contact Sarah Stevenson, Fundraising Director, at " "[sstevenson@torproject.org](mailto:sstevenson@torproject.org)." msgstr "" +"Si vous souhaitez parler à quelqu’un du Projet Tor pour savoir si " +"l’organisme peut convenir pour recevoir une indemnité cy-près, veuillez " +"contacter Sarah Stevenson, directrice du financement, à l’adresse courriel " +"[sstevenson(a)torproject.org]" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -652,8 +665,8 @@ msgid "" "to an uncensored internet, and Tor has become the world's strongest tool for" " privacy and freedom online." msgstr "" -"Nous, chez le Projet Tor, nous battons tous les jours pour que tout le monde" -" ait un accès non censuré à Internet qui protège la vie privée et les " +"Nous, chez le Projet Tor, nous luttons tous les jours pour que tout le monde" +" ait un accès non censuré à Internet, qui protège la vie privée et les " "données personnelles. Tor est devenu l’outil le plus puissant au monde en " "matière de vie privée et de liberté sur Internet." diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 43f73b4e9..e0309ab31 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -7,12 +7,12 @@ # Anna e só <contraexemplos(a)gmail.com>, 2019 # Alexei Gonçalves de Oliveira <alexis(a)gessicahellmann.com>, 2019 # Danihells <dcdcampos75(a)gmail.com>, 2019 -# Chacal E., 2019 # Gus, 2019 # Communia <ameaneantie(a)riseup.net>, 2019 # erinm, 2019 # Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2019 # Emma Peel, 2019 +# Chacal E., 2019 # msgid "" msgstr "" @@ -20,7 +20,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-14 08:34+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: Chacal E., 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 22 Aug '19

22 Aug '19

commit 3f4ab4e131ce73a53bbab8b150c29a7b992437c4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 22 19:58:36 2019 +0000 Update translations for tpo-web --- contents+fr.po | 8 ++++++-- contents+pt-BR.po | 7 +++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index b1662da16..a8be8fe52 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -385,6 +385,10 @@ msgid "" "contact Sarah Stevenson, Fundraising Director, at " "[sstevenson@torproject.org](mailto:sstevenson@torproject.org)." msgstr "" +"Si vous souhaitez parler à quelqu’un du Projet Tor pour savoir si " +"l’organisme peut convenir pour recevoir une indemnité cy-près, veuillez " +"contacter Sarah Stevenson, directrice du financement, à l’adresse courriel " +"[sstevenson(a)torproject.org]" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -661,8 +665,8 @@ msgid "" "to an uncensored internet, and Tor has become the world's strongest tool for" " privacy and freedom online." msgstr "" -"Nous, chez le Projet Tor, nous battons tous les jours pour que tout le monde" -" ait un accès non censuré à Internet qui protège la vie privée et les " +"Nous, chez le Projet Tor, nous luttons tous les jours pour que tout le monde" +" ait un accès non censuré à Internet, qui protège la vie privée et les " "données personnelles. Tor est devenu l’outil le plus puissant au monde en " "matière de vie privée et de liberté sur Internet." diff --git a/contents+pt-BR.po b/contents+pt-BR.po index ce931d2d1..21840e1d1 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -7,12 +7,12 @@ # Anna e só <contraexemplos(a)gmail.com>, 2019 # Alexei Gonçalves de Oliveira <alexis(a)gessicahellmann.com>, 2019 # Danihells <dcdcampos75(a)gmail.com>, 2019 -# Chacal E., 2019 # Gus, 2019 # Communia <ameaneantie(a)riseup.net>, 2019 # erinm, 2019 # Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2019 # Emma Peel, 2019 +# Chacal E., 2019 # msgid "" msgstr "" @@ -20,7 +20,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-14 08:34+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: Chacal E., 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -285,6 +285,9 @@ msgid "" "The Tor Project is a U.S.-based 501(c)3 nonprofit founded in 2006 with the " "mission of advancing human rights and freedoms by:" msgstr "" +"O Projeto Tor é uma organização sem fins lucrativos 501(c)3 com sede nos " +"EUA, fundada em 2006 com a missão de promover os direitos humanos e as " +"liberdades por meio de:" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body)

1 0

[translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed
by translation＠torproject.org 22 Aug '19

22 Aug '19

commit 7cad3cfd8e18c4134d66a5cb9ff10346f487ac52 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 22 19:55:52 2019 +0000 Update translations for tbmanual-contentspot_completed --- contents+fr.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 4aa97ca4b..46dbca009 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -2,8 +2,8 @@ # Thomas Prévost <thomasprevost85(a)gmail.com>, 2019 # Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 # erinm, 2019 -# AO <ao(a)localizationlab.org>, 2019 # Emma Peel, 2019 +# AO <ao(a)localizationlab.org>, 2019 # msgid "" msgstr "" @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-15 12:39+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: AO <ao(a)localizationlab.org>, 2019\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -61,7 +61,7 @@ msgstr "Greffons" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Becoming a Tor translator" -msgstr "" +msgstr "Devenir traducteur de Tor" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -1322,7 +1322,7 @@ msgstr "" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) msgid "##### How to access an onion service" -msgstr "" +msgstr "##### Accéder à un service onion" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -1354,7 +1354,7 @@ msgstr "" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) msgid "##### Troubleshooting" -msgstr "" +msgstr "##### Dépannage" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -2641,15 +2641,15 @@ msgstr "Sujets" #: templates/macros/topic.html:19 msgid "Contributors to this page:" -msgstr "" +msgstr "Contributeurs à cette page :" #: templates/macros/topic.html:21 msgid "Edit this page" -msgstr "" +msgstr "Modifier cette page" #: templates/macros/topic.html:22 msgid "Suggest Feedback" -msgstr "" +msgstr "Laisser une rétroaction" #: templates/macros/topic.html:23 msgid "Permalink"

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 22 Aug '19

22 Aug '19

commit 2880987b2dc32c569235e08bbb1f3ae2da361e6b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 22 19:55:39 2019 +0000 Update translations for tbmanual-contentspot --- contents+fr.po | 10 +++++----- contents+pt-BR.po | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 093260488..46dbca009 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -2,8 +2,8 @@ # Thomas Prévost <thomasprevost85(a)gmail.com>, 2019 # Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 # erinm, 2019 -# AO <ao(a)localizationlab.org>, 2019 # Emma Peel, 2019 +# AO <ao(a)localizationlab.org>, 2019 # msgid "" msgstr "" @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-15 12:39+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: AO <ao(a)localizationlab.org>, 2019\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2641,15 +2641,15 @@ msgstr "Sujets" #: templates/macros/topic.html:19 msgid "Contributors to this page:" -msgstr "" +msgstr "Contributeurs à cette page :" #: templates/macros/topic.html:21 msgid "Edit this page" -msgstr "" +msgstr "Modifier cette page" #: templates/macros/topic.html:22 msgid "Suggest Feedback" -msgstr "" +msgstr "Laisser une rétroaction" #: templates/macros/topic.html:23 msgid "Permalink" diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 95d35081c..db8dcec03 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -2600,15 +2600,15 @@ msgstr "Tópicos" #: templates/macros/topic.html:19 msgid "Contributors to this page:" -msgstr "" +msgstr "Contribuidores para esta página:" #: templates/macros/topic.html:21 msgid "Edit this page" -msgstr "" +msgstr "Edite essa página" #: templates/macros/topic.html:22 msgid "Suggest Feedback" -msgstr "" +msgstr "Sugerir Feedback" #: templates/macros/topic.html:23 msgid "Permalink"

1 0

[translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed
by translation＠torproject.org 22 Aug '19

22 Aug '19

commit f2d8ce6fd795b3835d42388bb58edb525573e0bd Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 22 19:45:43 2019 +0000 Update translations for donatepages-messagespot_completed --- locale/fr/LC_MESSAGES/messages.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index 3a1605e3d..40ff9a6c2 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/locale/fr/LC_MESSAGES/messages.po @@ -1013,12 +1013,12 @@ msgid "" msgstr "" "Des milliers de personnes ont fait des dons pour soutenir le Projet Tor, et " "nous avons aussi reçu des fonds d’un large éventail d’organismes tels que " -"Google, la Fondation Ford, la Fondation Knight, Reddit, la « National " -"Science Foundation » des États-Unis, la Fondation Frontière Électronique, " -"Human Rights Watch, l’Agence suédoise de coopération internationale au " -"développement, le Ministère fédéral allemand des Affaires étrangères, le " -"Laboratoire de recherche naval états-unien, Omidyar Network, SRI " -"International, Radio Free Asia." +"Google, la Fondation Ford, la Fondation Knight, Reddit, la Fondation " +"nationale pour la science (National Science Foundation) des États-Unis, la " +"Fondation Frontière Électronique, Human Rights Watch, l’Agence suédoise de " +"coopération internationale au développement, le Ministère fédéral allemand " +"des Affaires étrangères, le Laboratoire de recherche naval états-unien, " +"Omidyar Network, SRI International, Radio Free Asia." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:150 msgid ""

1 0