June 2021 - tor-commits - lists.torproject.org

[manual/master] you cannot disguise facts, only traffic. reported by translator, thanks ao!
by emmapeel＠torproject.org 22 Jun '21

22 Jun '21

commit 5ab9ebc636939af2adf3f9046edb47f3e0f3501e Author: emma peel <emma.peel(a)riseup.net> Date: Tue Jun 22 17:29:04 2021 +0200 you cannot disguise facts, only traffic. reported by translator, thanks ao! --- content/bridges/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/bridges/contents.lr b/content/bridges/contents.lr index 9512b1b..a94ad62 100644 --- a/content/bridges/contents.lr +++ b/content/bridges/contents.lr @@ -13,7 +13,7 @@ body: Most [Pluggable Transports](/circumvention), such as obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges are run by volunteers; unlike ordinary relays, however, they are not listed publicly, so an adversary cannot identify them easily. -Using bridges in combination with pluggable transports helps to disguise the fact that you are using Tor, but may slow down the connection compared to using ordinary Tor relays. +Using bridges in combination with pluggable transports helps to conceal the fact that you are using Tor, but may slow down the connection compared to using ordinary Tor relays. Other pluggable transports, like meek, use different anti-censorship techniques that do not rely on bridges. You do not need to obtain bridge addresses in order to use these transports.

1 0

[manual/master] grammar. reported by translator, thanks!
by emmapeel＠torproject.org 22 Jun '21

22 Jun '21

commit 07e0b9cde6eec26266d3c913534ec0214a11927b Author: emma peel <emma.peel(a)riseup.net> Date: Tue Jun 22 18:02:45 2021 +0200 grammar. reported by translator, thanks! --- content/circumvention/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/circumvention/contents.lr b/content/circumvention/contents.lr index e9bdc42..2b98024 100644 --- a/content/circumvention/contents.lr +++ b/content/circumvention/contents.lr @@ -24,7 +24,7 @@ Currently there are three pluggable transports available, but more are being dev obfs4 </td> <td> - obfs4 makes Tor traffic look random, and also prevents censors from finding bridges by Internet scanning. obfs4 bridges are less likely to be blocked than its predecessor, obfs3 bridges. + obfs4 makes Tor traffic look random, and also prevents censors from finding bridges by Internet scanning. obfs4 bridges are less likely to be blocked than its predecessors, obfs3 bridges. </td> </tr> <tr class="odd">

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 22 Jun '21

22 Jun '21

commit bc4d14b9c4e245d55d40f9aad71cc66350ee825a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 22 15:45:11 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+es.po b/contents+es.po index c9cb486208..9c102ba8ce 100644 --- a/contents+es.po +++ b/contents+es.po @@ -1368,7 +1368,7 @@ msgid "" "- Learn more about our users by reading [Tor's user " "personas](https://community.torproject.org/user-research/persona)." msgstr "" -"- Aprende más acerca de nuestros usuarios leyendo [personas, de usuarios " +"- Aprende más acerca de nuestros usuarios leyendo [personas de usuarios de " "Tor](https://community.torproject.org/user-research/persona)." #: https//community.torproject.org/user-research/reports/

1 0

[community/translations] content, templates changes from master
by emmapeel＠torproject.org 22 Jun '21

22 Jun '21

commit 8140d8f3529416ee86521e1270561251c01ccd80 Author: emma peel <emma.peel(a)riseup.net> Date: Tue Jun 22 17:12:59 2021 +0200 content, templates changes from master --- content/user-research/guidelines/contents.lr | 2 +- templates/blocks/slide.html | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/content/user-research/guidelines/contents.lr b/content/user-research/guidelines/contents.lr index 159b0e7..2e57285 100644 --- a/content/user-research/guidelines/contents.lr +++ b/content/user-research/guidelines/contents.lr @@ -62,7 +62,7 @@ Thank the participant for their willingness to participate and explain that we a The interview should not last longer than 20 minutes. You can take notes on the printed material you will carry with you, or on your computer. -While we're not interested in the specific charactersitics of individual participants, it's important for us to be able to determine the reach of our training sessions, usability workshops and interviews. +While we're not interested in the specific characteristics of individual participants, it's important for us to be able to determine the reach of our training sessions, usability workshops and interviews. Distribute the demographics questionnaire among the participants, and help answer their questions about how to fill it in if they have any. Don't forget to thank the participant again at the end of the interview. diff --git a/templates/blocks/slide.html b/templates/blocks/slide.html index 2d89823..57158fe 100644 --- a/templates/blocks/slide.html +++ b/templates/blocks/slide.html @@ -9,6 +9,26 @@ <h5>{{ this.author }}</h5> {% endif %} </section> +{% elif this.slide_layout == "image_left" %} + <section class="slide-image-left" {% if this.background != "white" %} data-background-color="{{ this.background }}" {% else %} data-background-color="white" {% endif %} > + <h2>{{ this.title }}</h2> + {% if this.image %} + <div style="display: inline-block; vertical-align: top; width: 46%; float: left;"><img data-src="{{ this.image }}"></div> + {% endif %} + <div style="display: inline-block; width: 46%;"> + {{ this.description }} + </div> + </section> +{% elif this.slide_layout == "image_right" %} + <section class="slide-image-right" {% if this.background != "white" %} data-background-color="{{ this.background }}" {% else %} data-background-color="white" {% endif %} > + <h2>{{ this.title }}</h2> + <div style="display: inline-block; width: 46%;"> + {{ this.description }} + </div> + {% if this.image %} + <div style="display: inline-block; vertical-align: top; width: 46%; float: right;"><img data-src="{{ this.image }}"></div> + {% endif %} + </section> {% else %} <section {% if this.background != "white" %} data-background-color="{{ this.background }}" {% else %} data-background-color="white" {% endif %} > <h2>{{ this.title }}</h2>

1 0

[community/translations] content updates
by emmapeel＠torproject.org 22 Jun '21

22 Jun '21

commit 3671f74fb4e0fc1d90475227e36eba94a477f78b Author: emma peel <emma.peel(a)riseup.net> Date: Tue Jun 22 17:23:50 2021 +0200 content updates --- i18n/contents.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/i18n/contents.pot b/i18n/contents.pot index 2c2fa6f..ddcab27 100644 --- a/i18n/contents.pot +++ b/i18n/contents.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-06-16 15:58+CET\n" +"POT-Creation-Date: 2021-06-22 17:18+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL(a)li.org>\n" @@ -661,7 +661,7 @@ msgstr "" #: https://community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lr:page.body) msgid "" -"While we're not interested in the specific charactersitics of individual " +"While we're not interested in the specific characteristics of individual " "participants, it's important for us to be able to determine the reach of our " "training sessions, usability workshops and interviews." msgstr ""

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 22 Jun '21

22 Jun '21

commit ddfae47582a8eecb5b9a98c685b21966653e0875 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 22 15:15:12 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/contents+es.po b/contents+es.po index 9c929c1ebd..c9cb486208 100644 --- a/contents+es.po +++ b/contents+es.po @@ -711,7 +711,7 @@ msgid "" "Join us at any time on our IRC channel #tor-ux or our [mailing " "list](https://lists.torproject.org/cgi-bin/mailman/listinfo/ux)." msgstr "" -"Únetenos cuando quieras en nuestro canal IRC #tor-ux o nuestra [lista de " +"Únete cuando quieras en nuestro canal IRC #tor-ux o nuestra [lista de " "correo](https://lists.torproject.org/cgi-bin/mailman/listinfo/ux)." #: https//community.torproject.org/user-research/guidelines/ @@ -720,7 +720,7 @@ msgid "" "**We strongly recommend that you run through the plan for your session with " "the trainer**." msgstr "" -"**Recomendamos enfáticamente que recorras el plan para tu sesión con el " +"**Recomendamos enfáticamente que repases el plan para tu sesión con el " "entrenador**." #: https//community.torproject.org/user-research/guidelines/ @@ -756,7 +756,7 @@ msgid "" "Reporting](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/comm…" " templates." msgstr "" -"Antes de tu sesión, lee e imprime las plantillas [Cuestionario sobre " +"Antes de tu sesión, lee e imprime las plantillas del [Cuestionario sobre " "características " "demográficas](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/s…" "/user_demographics-en.md) e [Informe de Investigación de " @@ -829,8 +829,8 @@ msgid "" "participants, it's important for us to be able to determine the reach of our" " training sessions, usability workshops and interviews." msgstr "" -"Mientras que no estamos interesados en las características específicas de " -"los participantes individuales, es importante para nosotros ser capaces de " +"Aunque no estamos interesados en las características específicas de los " +"participantes individuales, es importante para nosotros ser capaces de " "determinar el alcance de nuestras sesiones de entrenamiento, talleres de " "usabilidad y entrevistas." @@ -841,8 +841,7 @@ msgid "" "answer their questions about how to fill it in if they have any." msgstr "" "Distribuye el cuestionario sobre características demográficas entre los " -"participantes, y ayúdalos a responder sus preguntas acerca de cómo " -"completarlo si es que tienen alguna." +"participantes, y ayúdalos a resolver dudas acerca de cómo completarlo." #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body) @@ -863,7 +862,7 @@ msgid "" "Before ending the session, coordinate with the trainer to solicit feedback " "from the participants." msgstr "" -"Antes de finalizar la sesión, coordina con el entrenador para solicitarles " +"Antes de finalizar la sesión, coordina con el formador para solicitarles " "comentarios a los participantes." #: https//community.torproject.org/user-research/guidelines/ @@ -880,8 +879,8 @@ msgid "" " to fill it in with what they think about: 1. the software, service or skill" " they just learned; 2. the Tor Project; and 3. Tor in general." msgstr "" -"Dar a cada participante un color diferente de post-it por pregunta, y " -"solicitarles que lo completen con lo que piensan acerca de: 1. el software, " +"Da a cada participante un color diferente de post-it por pregunta, y " +"solícitales que lo completen con lo que piensan acerca de: 1. el software, " "servicio o habilidad que acaban de aprender; 2. el Tor Project; y 3. Tor en " "general." @@ -891,8 +890,8 @@ msgid "" "Their feedback can also take the form of questions - keep in mind that any " "feedback is a good feedback." msgstr "" -"Sus comentarios también pueden aparecer en forma de preguntas - ten presente" -" que cualquier comentario es un buen comentario." +"Sus comentarios también pueden aparecer en forma de preguntas - recuerda que" +" cualquier comentario es un buen comentario." #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body) @@ -907,8 +906,7 @@ msgid "" "future." msgstr "" "Queremos saber cómo estuvo para tí la sesión, cómo podemos mejorar nuestro " -"soporte a futuro, y si planeas mantenerte administrando investigación de " -"usuario para Tor." +"soporte a futuro, y si planeas hacer más investigación de usuario para Tor." #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body) @@ -917,9 +915,9 @@ msgid "" "address so we can send you a researcher kit too (including a t-shirt and " "stickers)." msgstr "" -"Luego de que tu investigación esté completa, te solicitaremos que completes " -"un formulario con tu dirección, de manera que también podamos enviarte un " -"kit de investigador (incluyendo una remera y autoadhesivos)." +"Una vez que hayas finalizado tu investigación, te solicitaremos que " +"completes un formulario con tu dirección, de manera que también podamos " +"enviarte un kit de investigador (incluyendo una remera y autoadhesivos)." #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body) @@ -976,7 +974,7 @@ msgid "" "4. Allow the UX team time to discuss each issue and forward it to developers" " when necessary." msgstr "" -"4. Permite al equipo de Experiencia de Usuario tiempo para discutir cada " +"4. Dale tiempo al equipo de Experiencia de Usuario para discutir cada " "incidencia y remitirla a los desarrolladores cuando sea necesario." #: https//community.torproject.org/user-research/guidelines/

1 0

[community/master] typo
by emmapeel＠torproject.org 22 Jun '21

22 Jun '21

commit 3e78d6b1f8df7f319d66ceb4b4f9f243830679aa Author: emma peel <emma.peel(a)riseup.net> Date: Tue Jun 22 16:59:16 2021 +0200 typo --- content/user-research/guidelines/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/user-research/guidelines/contents.lr b/content/user-research/guidelines/contents.lr index 159b0e7..2e57285 100644 --- a/content/user-research/guidelines/contents.lr +++ b/content/user-research/guidelines/contents.lr @@ -62,7 +62,7 @@ Thank the participant for their willingness to participate and explain that we a The interview should not last longer than 20 minutes. You can take notes on the printed material you will carry with you, or on your computer. -While we're not interested in the specific charactersitics of individual participants, it's important for us to be able to determine the reach of our training sessions, usability workshops and interviews. +While we're not interested in the specific characteristics of individual participants, it's important for us to be able to determine the reach of our training sessions, usability workshops and interviews. Distribute the demographics questionnaire among the participants, and help answer their questions about how to fill it in if they have any. Don't forget to thank the participant again at the end of the interview.

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] Merge remote-tracking branch 'richardgl/40476' into tor-browser-78.11.0esr-10.5-1
by sysrqb＠torproject.org 22 Jun '21

22 Jun '21

commit 8157aa761f342864c3c8b6109b24758ae7ead1ea Merge: 9c9884c27d5a 0f2ac709c048 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Jun 22 14:58:49 2021 +0000 Merge remote-tracking branch 'richardgl/40476' into tor-browser-78.11.0esr-10.5-1 netwerk/protocol/http/nsCORSListenerProxy.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] fixup! Bug 40475: Include clearing CORS preflight cache
by sysrqb＠torproject.org 22 Jun '21

22 Jun '21

commit 0f2ac709c04851627d75a7eb9ba32a4ecf7debf7 Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Jun 22 15:37:00 2021 +0200 fixup! Bug 40475: Include clearing CORS preflight cache --- netwerk/protocol/http/nsCORSListenerProxy.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/netwerk/protocol/http/nsCORSListenerProxy.cpp b/netwerk/protocol/http/nsCORSListenerProxy.cpp index d9b658af881b..6d2e160c2a9b 100644 --- a/netwerk/protocol/http/nsCORSListenerProxy.cpp +++ b/netwerk/protocol/http/nsCORSListenerProxy.cpp @@ -348,7 +348,9 @@ void nsCORSListenerProxy::Shutdown() { /* static */ void nsCORSListenerProxy::Clear() { - sPreflightCache->Clear(); + if (sPreflightCache) { + sPreflightCache->Clear(); + } } nsCORSListenerProxy::nsCORSListenerProxy(nsIStreamListener* aOuter,

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 22 Jun '21

22 Jun '21

commit 4c16b7a88f2035b4e266a76e397dfaf253260be1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 22 14:15:12 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/contents+es.po b/contents+es.po index 7eb48d871c..9c929c1ebd 100644 --- a/contents+es.po +++ b/contents+es.po @@ -14,8 +14,8 @@ # Ines Branco Lopez <ibranco(a)fibgar.org>, 2021 # strel, 2021 # erinm, 2021 -# Emma Peel, 2021 # Zuhualime Akoochimoya, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -23,7 +23,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-16 15:58+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: Zuhualime Akoochimoya, 2021\n" +"Last-Translator: Emma Peel, 2021\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" @@ -73,8 +73,8 @@ msgid "" "Below, you'll find some different ways to volunteer with the Tor community " "as well as resources to better help you help Tor." msgstr "" -"Debajo encontrarás algunas maneras diferentes de colaborar con la comunidad " -"Tor, como así también recursos que te ayudarán a ayudar a Tor." +"Debajo encontrarás algunas maneras de colaborar con la comunidad Tor, como " +"así también recursos que te ayudarán a ayudar a Tor." #: https//community.torproject.org/user-research/ #: (content/user-research/contents+en.lrpage.title) @@ -625,9 +625,9 @@ msgid "" "At Tor, we don't collect invasive data about user behavior, only the data " "necessary to improve our services. We test our software, not people." msgstr "" -"En Tor, no recolectamos datos invasivos acerca del comportamiento de los " +"En Tor no recolectamos datos invasivos acerca del comportamiento de los " "usuarios, solo los necesarios para mejorar nuestros servicios. Probamos " -"nuestro software, no las personas." +"nuestro software, no a las personas." #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body) @@ -665,7 +665,7 @@ msgid "" "This way, we can learn how to facilitate better access to information " "through Tor. By listening, we learn." msgstr "" -"De esta manera, podemos aprender cómo facilitar un mejor acceso a la " +"De esta manera podemos aprender cómo facilitar un mejor acceso a la " "información a través de Tor. Al escuchar, aprendemos." #: https//community.torproject.org/user-research/guidelines/ @@ -702,8 +702,8 @@ msgid "" "You don't have to do this alone - we can support you with meetings, guides, " "and mentorship too if you wish." msgstr "" -"No tienes que hacer esto solo - podemos también soportarte con encuentros, " -"guías y mentoría si así lo deseas." +"No tienes que hacerlo en solitario - podemos también apoyarte con " +"encuentros, guías y mentoría si así lo deseas." #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body)

1 0