March 2020 - tor-commits - lists.torproject.org

[tor/master] fix typo in comment
by arma＠torproject.org 19 Mar '20

19 Mar '20

commit 987247bd76f1ca1ccffdee6348d240c876f78dfb Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Mar 19 00:41:57 2020 -0400 fix typo in comment --- src/feature/hs/hs_cell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/feature/hs/hs_cell.c b/src/feature/hs/hs_cell.c index dd5fefd7e..fc9f4a265 100644 --- a/src/feature/hs/hs_cell.c +++ b/src/feature/hs/hs_cell.c @@ -758,7 +758,7 @@ hs_cell_parse_intro_established(const uint8_t *payload, size_t payload_len) * INTRO2 MAC to ensure that the keys are the right ones. * * Return NULL on failure to either produce the key material or on MAC - * valication. Else a newly allocated intro keys object. */ + * validation. Else return a newly allocated intro keys object. */ static hs_ntor_intro_cell_keys_t * get_introduce2_keys_and_verify_mac(hs_cell_introduce2_data_t *data, const uint8_t *encrypted_section,

1 0

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

19 Mar '20

commit c87ce4d71a13019ca6aa70e4ecacc88678e71e31 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 19 00:45:35 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/es/LC_MESSAGES/messages.po | 40 ++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po index 7b9b2ab232..726eaf8026 100644 --- a/locale/es/LC_MESSAGES/messages.po +++ b/locale/es/LC_MESSAGES/messages.po @@ -10,14 +10,14 @@ # erinm, 2019 # eulalio barbero espinosa <eulaliob(a)gmail.com>, 2019 # Zuhualime Akoochimoya, 2019 -# Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2019 # Emma Peel, 2020 # Bry, 2020 # David Figuera <dfb(a)fastmail.com>, 2020 +# Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2020 # msgid "" msgstr "" -"Last-Translator: David Figuera <dfb(a)fastmail.com>, 2020\n" +"Last-Translator: Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2020\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -1130,7 +1130,7 @@ msgid "" "Please make your monthly donation now and stand with the Tor Project at this" " critical time." msgstr "" -"Por favor haz ahora su donación mensual y apoya a Tor Project en estos " +"Por favor haga ahora su donación mensual y apoya a Tor Project en estos " "críticos momentos. " #: tmp/cache_locale/94/94c6c1969d2fadbd23c135ac864b97902daca8f5c816b03864ea5c4970a167cf.php:109 @@ -1232,15 +1232,16 @@ msgid "" "links\" href=\"https://2019.www.torproject.org/donate/donate.html.en\" " "target=\"_blank\">credit card or PayPal, please click here.</a>" msgstr "" -"Nota: Si quieres donar al Proyecto Tor por tarjeta de credito o PayPal, haz " -"clic aqui." +"Nota: Si quieres donar al Tor Project con <a class=\"hyperlinks links\" " +"href=\"https://2019.www.torproject.org/donate/donate.html.es\" " +"target=\"_blank\">tarjeta de credito o PayPal, haz clic aqui.</a>" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:95 msgid "" "The Tor Project also offers the following alternative donation methods:" msgstr "" -"El Proyecto Tor tambien ofrece los siguientes méthodos alternativos para " -"donar: " +"El Tor Porject tambien ofrece los siguientes métodos de donación " +"alternativos:" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:102 msgid "Bitcoin and Other Cryptocurrencies" @@ -1284,7 +1285,8 @@ msgid "" msgstr "" "Si tiene cualquier pregunta o le gustaría recibir un regalo de " "agradecimiento despues de hacer una donación con uno de los métodos arriba, " -"por favor envíenos un correo electrónico a giving(at)torproject.org." +"por favor envíenos un correo electrónico a <span " +"class=\"email\">giving(at)torproject.org</span>." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:149 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:66 @@ -2924,7 +2926,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:83 msgid "Florida" -msgstr "" +msgstr "Florida" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:85 msgid "" @@ -2957,7 +2959,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:99 msgid "Maryland" -msgstr "" +msgstr "Maryland" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:101 msgid "" @@ -2967,7 +2969,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:105 msgid "Nevada" -msgstr "" +msgstr "Nevada" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:107 msgid "" @@ -2977,7 +2979,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:111 msgid "New Jersey" -msgstr "" +msgstr "New Jersey" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:113 msgid "" @@ -2996,7 +2998,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:119 msgid "New York" -msgstr "" +msgstr "New York" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:121 msgid "" @@ -3008,7 +3010,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:125 msgid "North Carolina" -msgstr "" +msgstr "North Carolina" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:127 msgid "" @@ -3022,7 +3024,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:133 msgid "Pennsylvania" -msgstr "" +msgstr "Pennsylvania" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:135 msgid "" @@ -3033,7 +3035,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:139 msgid "Virginia" -msgstr "" +msgstr "Virginia" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:141 msgid "" @@ -3043,7 +3045,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:145 msgid "Washington" -msgstr "" +msgstr "Washington" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:147 msgid "" @@ -3054,7 +3056,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:151 msgid "West Virginia" -msgstr "" +msgstr "West Virginia" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:153 msgid "" @@ -3065,7 +3067,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:157 msgid "Wisconsin" -msgstr "" +msgstr "Wisconsin" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:159 msgid ""

1 0

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

19 Mar '20

commit 06d02dff37c04fc3f188e50c7b57cdb2f84c3f2c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 19 00:23:34 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es-AR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index 0e99691bd0..8f5c7ca456 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -1,8 +1,8 @@ # Translators: # Emma Peel, 2019 -# Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2019 # erinm, 2019 # Zuhualime Akoochimoya, 2019 +# Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2020 # msgid "" msgstr "" @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-02-27 18:30+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Zuhualime Akoochimoya, 2019\n" +"Last-Translator: Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2020\n" "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -7941,7 +7941,7 @@ msgstr "Soporte" #: https//support.torproject.org/misc/menu/ #: (content/misc/menu/contents+en.lrquestion.description) msgid "Community" -msgstr "" +msgstr "Comunidad" #: https//support.torproject.org/misc/misc-1/ #: (content/misc/misc-1/contents+en.lrquestion.title)

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 19 Mar '20

19 Mar '20

commit c13be25369f8c197682fc4107c8cf91586db86cf Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 19 00:23:03 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+es-AR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index 35784a3e92..3e28e4b5a3 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -1,8 +1,8 @@ # Translators: # ezemelano <melanoeze(a)gmail.com>, 2019 -# Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2019 # Zuhualime Akoochimoya, 2019 # erinm, 2020 +# Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2020 # msgid "" msgstr "" @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-02-24 13:39+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: erinm, 2020\n" +"Last-Translator: Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2020\n" "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -149,7 +149,7 @@ msgstr "" #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "Community" -msgstr "" +msgstr "Comunidad" #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.title)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 19 Mar '20

19 Mar '20

commit 048fc61e7a1fdfbe7ac0b7b8225c6463fcf6c53e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 19 00:20:01 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+es-AR.po | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index 5108861e88..6814d87db4 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -3,6 +3,7 @@ # Emma Peel, 2018 # erinm, 2019 # Zuhualime Akoochimoya, 2020 +# Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2020 # msgid "" msgstr "" @@ -10,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-15 15:58+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Zuhualime Akoochimoya, 2020\n" +"Last-Translator: Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2020\n" "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +56,7 @@ msgstr "Soporte" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Community" -msgstr "" +msgstr "Comunidad" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -152,17 +153,17 @@ msgstr "Siendo traductor para Tor" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Making Tor Browser portable" -msgstr "" +msgstr "Hacer portable el Navegador Tor" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Installation" -msgstr "" +msgstr "Instalación" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.title) msgid "ABOUT TOR BROWSER" -msgstr "" +msgstr "ACERCA DEL NAVEGADOR TOR" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.description) @@ -221,11 +222,15 @@ msgid "" " valid for a single session (until Tor Browser is exited or a [New Identity" "](/managing-identities/#new-identity) is requested)." msgstr "" +"Por defecto, el Navegador Tor no guarda ningún historial de navegación. Las " +"Cookies son válidas para una sola sesión (hasta que el Navegador Tor sea " +"cerrado o una [Nueva Identidad](/es/managing-identities/#nueva-identidad) " +"sea solicitada)." #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) msgid "### HOW TOR WORKS" -msgstr "" +msgstr "### COMO FUNCIONA TOR" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) @@ -267,7 +272,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.title) msgid "DOWNLOADING" -msgstr "" +msgstr "DESCARGANDO" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.description) @@ -280,6 +285,9 @@ msgid "" "The safest and simplest way to download Tor Browser is from the official Tor" " Project website at https://www.torproject.org/download." msgstr "" +"La manera más segura y simple de descargar el Navegador Tor es desde el " +"sitio web oficial del Proyecto Tor en " +"https://www.torproject.org/es/download." #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -312,7 +320,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### MIRRORS" -msgstr "" +msgstr "### ESPEJOS" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -322,11 +330,16 @@ msgid "" "mirrors, either through [EFF](https://tor.eff.org), [Calyx " "Institute](https://tor.calyxinstitute.org) or [CCC](https://tor.ccc.de)." msgstr "" +"Si no sos capaz de descargar el Navegador Tor del sitio web oficial del " +"Proyecto Tor, puedes intentar descargarlo de uno de nuestros sitios espejo " +"oficiales, tanto a través de [EFF](https://tor.eff.org/es), [Calyx " +"Institute](https://tor.calyxinstitute.org/es) o " +"[CCC](https://tor.ccc.de/es)." #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### GETTOR" -msgstr "" +msgstr "### GETTOR" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -342,7 +355,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### TO USE GETTOR VIA EMAIL:" -msgstr "" +msgstr "### USAR GETTOR VÍA CORREO ELECTRÓNICO:" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -375,7 +388,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "### TO USE GETTOR VIA JABBER/XMPP (JITSI, COYIM, ETC.):" -msgstr "" +msgstr "### USAR GETTOR VÍA JABBER/XMPP (JITSI, COYIM, ETC.):" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -390,7 +403,7 @@ msgstr "" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.title) msgid "INSTALLATION" -msgstr "" +msgstr "INSTALACION" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.description) @@ -1853,7 +1866,7 @@ msgstr "* Borrá la carpeta del Navegador Tor o la aplicación." #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) msgid "* Empty your Trash." -msgstr "* Vaciá la basura." +msgstr "* Vaciá la papelera." #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 18 Mar '20

18 Mar '20

commit b5f5995c8d77d2d5af367e87a38409aad5fc4179 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 18 23:53:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/contents+es.po b/contents+es.po index 140ed2dcb1..75d7f7bafa 100644 --- a/contents+es.po +++ b/contents+es.po @@ -3,10 +3,10 @@ # erinm, 2019 # eulalio barbero espinosa <eulaliob(a)gmail.com>, 2019 # Nicolas Sera-Leyva <nseraleyva(a)internews.org>, 2019 -# Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2019 # Zuhualime Akoochimoya, 2020 # Emma Peel, 2020 # David Figuera <dfb(a)fastmail.com>, 2020 +# Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2020 # msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-02-27 18:30+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: David Figuera <dfb(a)fastmail.com>, 2020\n" +"Last-Translator: Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2020\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1147,10 +1147,10 @@ msgid "" "false positives and you have nothing to worry about." msgstr "" "Si descargaste el Navegador Tor desde [nuestra página " -"principal](https://www.torproject.org/download/) o usaste " +"principal](https://www.torproject.org/es/download/) o usaste " "[GetTor](https://gettor.torproject.org/) y [lo " -"verificaste](https://support.torproject.org/tbb/how-to-verify-signature/), " -"esto son falsas alarmas y no tienes de qué preocuparte." +"verificaste](https://support.torproject.org/es/tbb/how-to-verify-" +"signature/), esto son falsas alarmas y no tienes de qué preocuparte." #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.description) @@ -1170,8 +1170,8 @@ msgid "" msgstr "" "Para asegurarte de que el programa Tor que descargas es el que nosotros " "hemos creado y no ha sido modificado por ningún atacante, puedes [verificar " -"la firma digital del Navegador Tor](https://support.torproject.org/tbb/how-" -"to-verify-signature/)." +"la firma digital del Navegador Tor](https://support.torproject.org/es/tbb" +"/how-to-verify-signature/)." #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.description) @@ -1181,7 +1181,7 @@ msgid "" " from blocking access to Tor Browser." msgstr "" "También puede que desees [añadir excepciones a algunos " -"procesos](https://support.torproject.org/tbb/tbb-10) para evitar que los " +"procesos](https://support.torproject.org/es/tbb/tbb-10) para evitar que los " "antivirus bloqueen el acceso al Navegador Tor." #: https//support.torproject.org/tbb/how-to-verify-signature/ @@ -3172,7 +3172,7 @@ msgid "" "and similar services should only send the cookie over an SSL link." msgstr "" "En teoría, solo el acceso físico podría comprometer tu sistema porque Gmail " -"y otros servicios similares utilizan SSL." +"y otros servicios similares utilizan SSL para enviar la cookie." #: https//support.torproject.org/tbb/tbb-45/ #: (content/tbb/tbb-45/contents+en.lrquestion.description) @@ -10450,7 +10450,7 @@ msgstr "" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description) msgid "Importing GPG key 0x3621CD35:" -msgstr "" +msgstr "Importando llave GPG 0x3621CD35:" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description)

1 0

[bridgedb/develop] Merge branch 'fix-moat-api-doc' into develop
by phw＠torproject.org 18 Mar '20

18 Mar '20

commit 580222dc556718db1799f2b22304147783becc4c Merge: f23c021 c894bbe Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Mar 18 14:39:26 2020 -0700 Merge branch 'fix-moat-api-doc' into develop README.rst | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)

1 0

[bridgedb/develop] Fixed Moat API documentation.
by phw＠torproject.org 18 Mar '20

18 Mar '20

commit c894bbe1070adeadfe6a6e8f1a02c8e46075159b Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Wed Mar 18 21:09:37 2020 +0100 Fixed Moat API documentation. --- README.rst | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/README.rst b/README.rst index 896d25d..1a338ea 100644 --- a/README.rst +++ b/README.rst @@ -406,14 +406,14 @@ The client SHOULD direct all requests via the Meek reflector at ``MEEK_REFECTOR` Requesting Bridges """""""""""""""""" -The client MUST send a ``POST /meek/moat/fetch`` containing the following JSON:: +The client MUST send a ``POST /moat/fetch`` containing the following JSON:: { - "data": { + "data": [{ "version": "0.1.0", "type": "client-transports", "supported": [ "TRANSPORT", "TRANSPORT", ... ], - } + }] } where: @@ -437,14 +437,14 @@ the "best" transport from the list of supported transports, and respond with the following JSON containing a CAPTCHA challenge:: { - "data": { + "data": [{ "id": "1", "type": "moat-challenge", "version": "0.1.0", "transport": "TRANSPORT", "image": "CAPTCHA", "challenge": "CHALLENGE", - } + }] } where: @@ -463,14 +463,14 @@ If there is no overlap with the transports which BridgeDB supports, the moat server will respond with the list of transports which is *does* support:: { - "data": { + "data": [{ "id": "1", "type": "moat-challenge", "version": "0.1.0", "transport": [ "TRANSPORT", "TRANSPORT", ... ], "image": "CAPTCHA", "challenge": "CHALLENGE", - } + }] } @@ -478,10 +478,10 @@ Responding to a CAPTCHA challenge """"""""""""""""""""""""""""""""" To propose a solution to a CAPTCHA, the client MUST send a request for ``POST -/meek/moat/check``, where the body of the request contains the following JSON:: +/moat/check``, where the body of the request contains the following JSON:: { - "data": { + "data": [{ "id": "2", "type": "moat-solution", "version": "0.1.0", @@ -489,7 +489,7 @@ To propose a solution to a CAPTCHA, the client MUST send a request for ``POST "challenge": "CHALLENGE", "solution": "SOLUTION", "qrcode": "BOOLEAN", - } + }] } @@ -515,13 +515,13 @@ If the ``SOLUTION`` was successful for the supplied ``CHALLENGE``, the server responds ``200 OK`` with the following JSON:: { - "data": { + "data": [{ "id": "3", "type": "moat-bridges", "version": "0.1.0", "bridges": [ "BRIDGE_LINE", ... ], "qrcode": "QRCODE", - } + }] } where: @@ -557,8 +557,8 @@ where: Other Responses """"""""""""""" -If the client requested some page other than ``/meek/moat/fetch``, or -``/meek/moat/check``, the server MUST respond with ``501 Not Implemented``. +If the client requested some page other than ``/moat/fetch``, or +``/moat/check``, the server MUST respond with ``501 Not Implemented``. If the client attempts any other HTTP method, other than ``POST``, the server MUST respond ``403 FORBIDDEN``.

1 0

[bridgedb/develop] Merge branch 'enhancement/33008' into develop
by phw＠torproject.org 18 Mar '20

18 Mar '20

commit f23c0213bb1f1e030eaae5d1ac2b26d2a91244e4 Merge: ef9ea5c bdf192d Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Mar 18 10:37:54 2020 -0700 Merge branch 'enhancement/33008' into develop CHANGELOG | 5 + bridgedb/distributors/https/server.py | 13 ++- bridgedb/distributors/https/templates/base.html | 4 +- bridgedb/distributors/https/templates/info.html | 40 ++++++++ bridgedb/i18n/templates/bridgedb.pot | 128 ++++++++++++++++++++---- bridgedb/strings.py | 41 ++++++++ 6 files changed, 207 insertions(+), 24 deletions(-)

1 0

[bridgedb/develop] Add an info page to BridgeDB.
by phw＠torproject.org 18 Mar '20

18 Mar '20

commit bdf192de48baf2a67f47833358ec970c0bc3b5fd Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Mar 10 15:34:26 2020 -0700 Add an info page to BridgeDB. This commit adds an info page to BridgeDB. Tor's Relay Search for bridges will link to this info page because it explains BridgeDB's bridge distribution mechanisms. This fixes <https://bugs.torproject.org/33008>. --- CHANGELOG | 5 + bridgedb/distributors/https/server.py | 13 ++- bridgedb/distributors/https/templates/base.html | 4 +- bridgedb/distributors/https/templates/info.html | 40 ++++++++ bridgedb/i18n/templates/bridgedb.pot | 128 ++++++++++++++++++++---- bridgedb/strings.py | 41 ++++++++ 6 files changed, 207 insertions(+), 24 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 163fc6c..b0e8275 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ + * FIXES https://bugs.torproject.org/33008 + Add an info page, available at bridges.torproject.org/info. Relay + Search links to this info page to explain to bridge operators what their + bridge distribution mechanism means. + Changes in version 0.9.4 - 2020-02-19 * FIXES https://bugs.torproject.org/30946 diff --git a/bridgedb/distributors/https/server.py b/bridgedb/distributors/https/server.py index 503744e..be99262 100644 --- a/bridgedb/distributors/https/server.py +++ b/bridgedb/distributors/https/server.py @@ -389,13 +389,14 @@ class TranslatedTemplateResource(CustomErrorHandlingResource, CSPResource): """ isLeaf = True - def __init__(self, template=None): + def __init__(self, template=None, showFaq=True): """Create a new :api:`Resource <twisted.web.resource.Resource>` for a Mako-templated webpage. """ gettext.install("bridgedb") CSPResource.__init__(self) self.template = template + self.showFaq = showFaq def render_GET(self, request): self.setCSPHeader(request) @@ -409,7 +410,8 @@ class TranslatedTemplateResource(CustomErrorHandlingResource, CSPResource): getSortedLangList(), rtl=rtl, lang=langs[0], - langOverride=translations.isLangOverridden(request)) + langOverride=translations.isLangOverridden(request), + showFaq=self.showFaq) except Exception as err: # pragma: no cover rendered = replaceErrorPage(request, err) request.setHeader("Content-Type", "text/html; charset=utf-8") @@ -435,6 +437,11 @@ class OptionsResource(TranslatedTemplateResource): TranslatedTemplateResource.__init__(self, 'options.html') +class InfoResource(TranslatedTemplateResource): + def __init__(self): + TranslatedTemplateResource.__init__(self, 'info.html', showFaq=False) + + class HowtoResource(TranslatedTemplateResource): """A resource which explains how to use bridges.""" @@ -1133,6 +1140,7 @@ def addWebServer(config, distributor): index = IndexResource() options = OptionsResource() howto = HowtoResource() + info = InfoResource() robots = static.File(os.path.join(TEMPLATE_DIR, 'robots.txt')) assets = static.File(os.path.join(TEMPLATE_DIR, 'assets/')) keys = static.Data(strings.BRIDGEDB_OPENPGP_KEY.encode('utf-8'), 'text/plain') @@ -1148,6 +1156,7 @@ def addWebServer(config, distributor): root.putChild(b'assets', assets) root.putChild(b'options', options) root.putChild(b'howto', howto) + root.putChild(b'info', info) root.putChild(b'maintenance', maintenance) root.putChild(b'error', resource500) root.putChild(CSPResource.reportURI, csp) diff --git a/bridgedb/distributors/https/templates/base.html b/bridgedb/distributors/https/templates/base.html index fb54e81..b42d252 100644 --- a/bridgedb/distributors/https/templates/base.html +++ b/bridgedb/distributors/https/templates/base.html @@ -1,7 +1,7 @@ ## -*- coding: utf-8 -*- <%namespace name="base" file="base.html" inheritable="True"/> -<%page args="strings, langs, rtl=False, lang='en', langOverride=False, **kwargs"/> +<%page args="strings, langs, rtl=False, lang='en', langOverride=False, showFaq=True, **kwargs"/> <!DOCTYPE html> <html lang="${lang}"> @@ -59,6 +59,7 @@ ${next.body(strings, langs, rtl=rtl, lang=lang, langOverride=langOverride, **kwargs)} + % if showFaq: <div class="faq"> <div class="row-fluid marketing"> @@ -84,6 +85,7 @@ ${next.body(strings, langs, rtl=rtl, lang=lang, langOverride=langOverride, **kwa </p> </div> </div>  + % endif <div class="footer footer-small"> <hr> diff --git a/bridgedb/distributors/https/templates/info.html b/bridgedb/distributors/https/templates/info.html new file mode 100644 index 0000000..32f9e0a --- /dev/null +++ b/bridgedb/distributors/https/templates/info.html @@ -0,0 +1,40 @@ +## -*- coding: utf-8 -*- + +<%inherit file="base.html"/> +<%page args="strings, langs, rtl=False, lang='en', langOverride=False, **kwargs"/> + +<div class="container-fluid container-fluid-outer-96"> + <div class="container-fluid container-fluid-inner"> + <p> + <h3>${_(strings.BRIDGEDB_INFO[0])}</h3> + <p>${_(strings.BRIDGEDB_INFO[1]) % \ + ("""<a href="https://metrics.torproject.org/bridgedb-distributor.html">""", + """</a>""")}</p> + + <div class="row-fluid marketing"> + <h4><a name="https">HTTPS</a></h4> + <p>${_(strings.BRIDGEDB_INFO[2]) % \ + ("""<a href="https://bridges.torproject.org/options">""", + """</a>""")}</p> + + <h4><a name="moat">Moat</a></h4> + <p>${_(strings.BRIDGEDB_INFO[3]) % \ + ("""<a href="about:preferences#tor">""", + """</a>""")}</p> + + <h4><a name="email">Email</a></h4> + <p>${_(strings.BRIDGEDB_INFO[4]) % \ + ("""<a href="mailto:bridges@torproject.org">""", + """</a>""")}</p> + + <h4><a name="reserved">${_(strings.BRIDGEDB_INFO[5])}</a></h4> + <p>${_(strings.BRIDGEDB_INFO[6]) % \ + ("""<a href="https://collector.torproject.org/archive/bridge-pool-assignments/">""", + """</a>""")}</p> + + <h4><a name="none">${_(strings.BRIDGEDB_INFO[7])}</a></h4> + <p>${_(strings.BRIDGEDB_INFO[8])}</p> + </div> + </p> + </div> +</div> diff --git a/bridgedb/i18n/templates/bridgedb.pot b/bridgedb/i18n/templates/bridgedb.pot index be57a8b..8d442df 100644 --- a/bridgedb/i18n/templates/bridgedb.pot +++ b/bridgedb/i18n/templates/bridgedb.pot @@ -5,11 +5,11 @@ # msgid "" msgstr "" -"Project-Id-Version: bridgedb 0.9.2+5.gfd960bd.dirty\n" +"Project-Id-Version: bridgedb 0.9.4+6.g963ce80.dirty\n" "Report-Msgid-Bugs-To: " "'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…" "=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" -"POT-Creation-Date: 2020-02-18 13:39-0800\n" +"POT-Creation-Date: 2020-03-18 09:23-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -37,6 +37,7 @@ msgstr "" #. variable. #. We use our metrics singleton to keep track of BridgeDB metrics such as #. "number of failed HTTPS bridge requests." +#. Convert all key/value pairs from bytes to str. #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): #. "BridgeDB" @@ -45,7 +46,7 @@ msgstr "" #. "obfs4" #. "Tor" #. "Tor Browser" -#: bridgedb/distributors/https/server.py:135 +#: bridgedb/distributors/https/server.py:154 msgid "Sorry! Something went wrong with your request." msgstr "" @@ -53,15 +54,15 @@ msgstr "" msgid "Language" msgstr "" -#: bridgedb/distributors/https/templates/base.html:92 +#: bridgedb/distributors/https/templates/base.html:94 msgid "Report a Bug" msgstr "" -#: bridgedb/distributors/https/templates/base.html:95 +#: bridgedb/distributors/https/templates/base.html:97 msgid "Source Code" msgstr "" -#: bridgedb/distributors/https/templates/base.html:98 +#: bridgedb/distributors/https/templates/base.html:100 msgid "Changelog" msgstr "" @@ -214,7 +215,7 @@ msgstr "" msgid "Hello, friend!" msgstr "" -#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58 +#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58 msgid "Public Keys" msgstr "" @@ -314,32 +315,117 @@ msgid "Get Bridges!" msgstr "" #: bridgedb/strings.py:130 +msgid "Bridge distribution mechanisms" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat". +#: bridgedb/strings.py:132 +#, python-format +msgid "" +"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", " +"\"Moat\",\n" +"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB " +"use\n" +"the pseudo-mechanism \"None\". The following list briefly explains how these" +"\n" +"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of " +"the\n" +"mechanisms is." +msgstr "" + +#: bridgedb/strings.py:138 +#, python-format +msgid "" +"The \"HTTPS\" distribution mechanism hands out bridges over this website. To" +" get\n" +"bridges, go to %sbridges.torproject.org%s, select your preferred options, and" +"\n" +"solve the subsequent CAPTCHA." +msgstr "" + +#: bridgedb/strings.py:142 +#, python-format +msgid "" +"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to" +"\n" +"request bridges from inside their Tor Browser settings. To get bridges, go " +"to\n" +"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve" +" the\n" +"subsequent CAPTCHA, and Tor Browser will automatically add your new\n" +"bridges." +msgstr "" + +#: bridgedb/strings.py:148 +#, python-format +msgid "" +"Users can request bridges from the \"Email\" distribution mechanism by " +"sending an\n" +"email to %sbridges(a)torproject.org%s and writing \"get transport obfs4\" in " +"the\n" +"email body." +msgstr "" + +#: bridgedb/strings.py:152 +msgid "Reserved" +msgstr "" + +#: bridgedb/strings.py:153 +#, python-format +msgid "" +"BridgeDB maintains a small number of bridges that are not distributed\n" +"automatically. Instead, we reserve these bridges for manual distribution and" +"\n" +"hand them out to NGOs and other organizations and individuals that need\n" +"bridges. Bridges that are distributed over the \"Reserved\" mechanism may " +"not\n" +"see users for a long time. Note that the \"Reserved\" distribution mechanism" +" is\n" +"called \"Unallocated\" in %sbridge pool assignment%s files." +msgstr "" + +#: bridgedb/strings.py:160 +msgid "None" +msgstr "" + +#: bridgedb/strings.py:161 +msgid "" +"Bridges whose distribution mechanism is \"None\" are not distributed by " +"BridgeDB.\n" +"It is the bridge operator's responsibility to distribute their bridges to\n" +"users. Note that on Relay Search, a freshly set up bridge's distribution\n" +"mechanism says \"None\" for up to approximately one day. Be a bit patient, " +"and\n" +"it will then change to the bridge's actual distribution mechanism.\n" +msgstr "" + +#: bridgedb/strings.py:171 msgid "Please select options for bridge type:" msgstr "" -#: bridgedb/strings.py:131 +#: bridgedb/strings.py:172 msgid "Do you need IPv6 addresses?" msgstr "" -#: bridgedb/strings.py:132 +#: bridgedb/strings.py:173 #, python-format msgid "Do you need a %s?" msgstr "" -#: bridgedb/strings.py:136 +#: bridgedb/strings.py:177 msgid "Your browser is not displaying images properly." msgstr "" -#: bridgedb/strings.py:137 +#: bridgedb/strings.py:178 msgid "Enter the characters from the image above..." msgstr "" -#: bridgedb/strings.py:141 +#: bridgedb/strings.py:182 msgid "How to start using your bridges" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: bridgedb/strings.py:143 +#: bridgedb/strings.py:184 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -348,7 +434,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:148 +#: bridgedb/strings.py:189 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and " "follow\n" @@ -356,7 +442,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:152 +#: bridgedb/strings.py:193 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor " "connections\n" @@ -364,7 +450,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:156 +#: bridgedb/strings.py:197 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and" @@ -373,29 +459,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: bridgedb/strings.py:164 +#: bridgedb/strings.py:205 msgid "Displays this message." msgstr "" #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: bridgedb/strings.py:168 +#: bridgedb/strings.py:209 msgid "Request vanilla bridges." msgstr "" -#: bridgedb/strings.py:169 +#: bridgedb/strings.py:210 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:171 +#: bridgedb/strings.py:212 msgid "Request a Pluggable Transport by TYPE." msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:174 +#: bridgedb/strings.py:215 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" diff --git a/bridgedb/strings.py b/bridgedb/strings.py index e97c68a..ca2feaa 100644 --- a/bridgedb/strings.py +++ b/bridgedb/strings.py @@ -126,6 +126,47 @@ BRIDGES = { 1: _("Get Bridges!"), } +BRIDGEDB_INFO = { + 0: _("Bridge distribution mechanisms"), + # TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat". + 1: _("""\ +BridgeDB implements four mechanisms to distribute bridges: "HTTPS", "Moat", +"Email", and "Reserved". Bridges that are not distributed over BridgeDB use +the pseudo-mechanism "None". The following list briefly explains how these +mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the +mechanisms is."""), + 2: _("""\ +The "HTTPS" distribution mechanism hands out bridges over this website. To get +bridges, go to %sbridges.torproject.org%s, select your preferred options, and +solve the subsequent CAPTCHA."""), + 3: _("""\ +The "Moat" distribution mechanism is part of Tor Browser, allowing users to +request bridges from inside their Tor Browser settings. To get bridges, go to +your Tor Browser's %sTor settings%s, click on "request a new bridge", solve the +subsequent CAPTCHA, and Tor Browser will automatically add your new +bridges."""), + 4: _("""\ +Users can request bridges from the "Email" distribution mechanism by sending an +email to %sbridges(a)torproject.org%s and writing "get transport obfs4" in the +email body."""), + 5: _("Reserved"), + 6: _("""\ +BridgeDB maintains a small number of bridges that are not distributed +automatically. Instead, we reserve these bridges for manual distribution and +hand them out to NGOs and other organizations and individuals that need +bridges. Bridges that are distributed over the "Reserved" mechanism may not +see users for a long time. Note that the "Reserved" distribution mechanism is +called "Unallocated" in %sbridge pool assignment%s files."""), + 7: _("None"), + 8: _("""\ +Bridges whose distribution mechanism is "None" are not distributed by BridgeDB. +It is the bridge operator's responsibility to distribute their bridges to +users. Note that on Relay Search, a freshly set up bridge's distribution +mechanism says "None" for up to approximately one day. Be a bit patient, and +it will then change to the bridge's actual distribution mechanism. +"""), +} + OPTIONS = { 0: _("Please select options for bridge type:"), 1: _("Do you need IPv6 addresses?"),

1 0