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

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

25 Aug '20

commit 1cd4280999f14362480860c922cb2429658edb32 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 25 06:48:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es-AR.po | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index fe40b9b93d..46cdd51ca4 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -3866,6 +3866,8 @@ msgstr "" #: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.title) msgid "What are grey bars on resized Tor Browser window?" msgstr "" +"¿Qué son las barras grises en un ventana del Navegador Tor con su tamaño " +"modificado?" #: https//support.torproject.org/tbb/maximized-torbrowser-window/ #: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description) @@ -3874,6 +3876,9 @@ msgid "" " a multiple of 200px x 100px to prevent fingerprinting the screen " "dimensions." msgstr "" +"El Navegador Tor en su modo por defecto está iniciándose con una ventana de " +"contenido redondeada a un múltiplo de 200px x 100px, para prevenir la " +"determinación de la huella digital de las dimensiones de la pantalla." #: https//support.torproject.org/tbb/maximized-torbrowser-window/ #: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description) @@ -3881,6 +3886,8 @@ msgid "" "The strategy here is to put all users in a couple of buckets to make it " "harder to single them out." msgstr "" +"Aquí, la estrategia es poner a todos los usuarios en un par de 'bolsas', " +"para hacer más dificultoso que puedan ser individualizados." #: https//support.torproject.org/tbb/maximized-torbrowser-window/ #: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description) @@ -3888,6 +3895,8 @@ msgid "" "That works so far until users start to resize their windows (e.g. by " "maximizing them or going into fullscreen mode)." msgstr "" +"Eso funciona bien hasta que los usuarios empiezan a variar el tamaño de sus " +"ventanas (ej.: maximizándolas, o yendo al modo de pantalla completa)." #: https//support.torproject.org/tbb/maximized-torbrowser-window/ #: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description) @@ -3899,6 +3908,12 @@ msgid "" "2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-" "fingerprinting-technique-called-letterboxing/)." msgstr "" +"El Navegador Tor 9 viene con una defensa contra la determinación de la " +"huella digital para esos escenarios también, la cual es llamada " +"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)), una " +"técnica desarrollada por Mozilla y [presentada en " +"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-" +"fingerprinting-technique-called-letterboxing/)." #: https//support.torproject.org/tbb/maximized-torbrowser-window/ #: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description) @@ -3908,6 +3923,11 @@ msgid "" "of screen size buckets that prevent singling them out with the help of " "screen dimensions." msgstr "" +"Funciona añadiendo márgenes blancos a una ventana de navegador, de manera " +"que el tamaño de la misma sea tan cercano como sea posible al deseado, " +"mientras que los usuarios todavía están en un par de bolsas de tamaños de " +"pantalla que evita individualizarlos con la ayuda de las dimensiones de la " +"pantalla." #: https//support.torproject.org/tbb/maximized-torbrowser-window/ #: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description) @@ -3916,6 +3936,9 @@ msgid "" "sizes and this makes it harder to single out users on basis of screen size, " "as many users will have same screen size." msgstr "" +"En palabras simples, esta técnica agrupa los usuarios de ciertos tamaños de " +"pantalla, y esto hace más difícil individualizarlos con base en este dato, " +"ya que muchos usuarios tendrán el mismo tamaño de pantalla." #: https//support.torproject.org/tbb/tbb-1/ #: (content/tbb/tbb-1/contents+en.lrquestion.title) @@ -3943,6 +3966,10 @@ msgid "" "out <a href=\"https://blog.torproject.org\">blog.torproject.org</a> for a " "post on the most recent stable Tor Browser to see if your issue is listed." msgstr "" +"Si empezaste a tener dificultades con tu Navegador Tor luego de actualizar, " +"revisá <a href=\"https://blog.torproject.org\">blog.torproject.org</a> por " +"una entrada acerca del Navegador Tor estable más reciente, para ver si tu " +"dificultad está listada." #: https//support.torproject.org/tbb/tbb-1/ #: (content/tbb/tbb-1/contents+en.lrquestion.description) @@ -3950,6 +3977,8 @@ msgid "" "If your issue is not listed, please file a [bug " "report](https://trac.torproject.org) about what you're experiencing." msgstr "" +"Si tu dificultad no está listada, por favor enviá un [reporte de " +"error](https://trac.torproject.org) acerca de lo que estás experimentando." #: https//support.torproject.org/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.title) @@ -4007,7 +4036,7 @@ msgstr "* obfs4proxy.exe (si usás puentes)" #: https//support.torproject.org/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) msgid "* For macOS" -msgstr "" +msgstr "* Para macOS:" #: https//support.torproject.org/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) @@ -4072,6 +4101,9 @@ msgid "" " on your Desktop, though be aware that you may have accidentally deselected " "the option to create a shortcut." msgstr "" +"El ajuste por defecto en el instalador para Windows también crea un atajo " +"para vos en tu Escritorio, aunque tené en cuenta que accidentalmente podrías" +" haber descliqueado la opción para crear el atajo." #: https//support.torproject.org/tbb/tbb-11/ #: (content/tbb/tbb-11/contents+en.lrquestion.description) @@ -4103,6 +4135,8 @@ msgstr "¿Puedo usar Flash en el Navegador Tor?" msgid "" "Flash is disabled in Tor Browser, and we recommend you to not enable it." msgstr "" +"Flash está deshabilitado en el Navegador Tor, y te recomendamos que no lo " +"habilites." #: https//support.torproject.org/tbb/tbb-12/ #: (content/tbb/tbb-12/contents+en.lrquestion.description) @@ -4157,6 +4191,10 @@ msgid "" "take a look at the [Tails live operating system](https://tails.boum.org/) " "which you can start on almost any computer from a USB stick or a DVD." msgstr "" +"Si necesitás estar seguro que todo el tráfico irá a través de la red Tor, " +"dale una mirada al [sistema operativo \"vivo\" " +"Tails](https://tails.boum.org/), al cual podés iniciar en casi cualquier " +"computadora desde una memoria USB o un DVD." #: https//support.torproject.org/tbb/tbb-14/ #: (content/tbb/tbb-14/contents+en.lrquestion.title) @@ -4183,6 +4221,9 @@ msgid "" "Installing new add-ons may affect Tor Browser in unforeseen ways and " "potentially make your Tor Browser fingerprint unique." msgstr "" +"Instalar nuevas adiciones podría afectar al Navegador Tor de maneras " +"imprevistas, y potencialmente hacer que la huella digital del tuyo sea " +"única." #: https//support.torproject.org/tbb/tbb-14/ #: (content/tbb/tbb-14/contents+en.lrquestion.description)

1 0

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

25 Aug '20

commit e2815282fad7c3e9e8544a7003517207c79baaec Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 25 06:17:56 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es-AR.po | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index f198bab6b0..fe40b9b93d 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -3681,6 +3681,10 @@ msgid "" " import the key using the **Workaround (using a public key)** section " "instead." msgstr "" +"Si obtenés un mensaje de error, algo ha salido mal, y no podés continuar " +"hasta que te hayas dado cuenta de por qué esto no funcionó. En vez, podrías " +"ser capaz de importar la clave usando la sección **Solución alternativa " +"(usando una clave pública)**." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3688,6 +3692,8 @@ msgid "" "After importing the key, you can save it to a file (identifying it by " "fingerprint here):" msgstr "" +"Después de importar la clave, podés guardarla en un archivo (identificándolo" +" aquí por la huella digital):" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3705,11 +3711,14 @@ msgid "" "gone wrong and you cannot continue until you've figured out why this didn't " "work." msgstr "" +"Si `./tor.keyring` no existe después de correr este comando, algo ha salido " +"mal, y no podés continuar hata que te hayas dado cuenta por qué esto no " +"funcionó." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "### Verifying the signature" -msgstr "" +msgstr "### Verificando la firma" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3719,6 +3728,10 @@ msgid "" "file itself, and verify it with a command that asks GnuPG to verify the file" " that you downloaded." msgstr "" +"Para verificar la firma del paquete que descargaste, necesitarás descargar " +"el correspondiente archivo \".asc\" de firma, como así también el archivo " +"instalador en sí mismo, y verificarlo con un comando que le preguanta a " +"GnuPG que verifique el archivo que descargaste." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3726,6 +3739,8 @@ msgid "" "The examples below assume that you downloaded these two files to your " "\"Downloads\" folder." msgstr "" +"Los ejemplos de abajo asumen que descargaste estos dos archivos a tu carpeta" +" \"Descargas\"." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3734,6 +3749,9 @@ msgid "" " you will have downloaded a different version than 9.0 and you may not have " "chosen the English (en-US) version." msgstr "" +"Tené en cuenta que estos comandos usan nombres de archivo de ejemplo, y los " +"tuyos serán diferentes: vos habrás descargado una versión diferente de la " +"9.0, y puede que no hayas elegido la versión Inglesa (en-US)." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3758,6 +3776,8 @@ msgstr "" msgid "" "#### For GNU/Linux users (change 64 to 32 if you have the 32-bit package):" msgstr "" +"#### Para usuarios GNU/Linux (cambiar 64 a 32 si tenés el paquete de " +"32-bit):" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3771,7 +3791,7 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "The result of the command should produce something like this:" -msgstr "" +msgstr "El resultado del comando debiera producir algo como esto:" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3799,11 +3819,15 @@ msgid "" "something went wrong with one of the previous steps, or you forgot that " "these commands use example file names and yours will be a little different." msgstr "" +"Si obtenés mensajes de error conteniendo 'No such file or directory', o bien" +" algo salió mal con uno de los pasos previos, o te olvidaste que estos " +"comandos usan nombres de archivo de ejemplo, y los tuyos serán un poco " +"diferentes." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" -msgstr "" +msgstr "#### Solución alternativa (usando una clave pública)" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3813,6 +3837,10 @@ msgid "" "known/openpgpkey/torproject.org/hu/kounek7zrdx745qydx6p59t9mqjpuhdf) " "instead. Alternatively, you may use the following command:" msgstr "" +"Si encontrás errores que no podés arreglar, tomate la libertad de [descargar" +" y usar esta clave pública](https://openpgpkey.torproject.org/.well-" +"known/openpgpkey/torproject.org/hu/kounek7zrdx745qydx6p59t9mqjpuhdf) en vez." +" Alternativamente, podrías usar el siguiente comand:" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3831,6 +3859,8 @@ msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." msgstr "" +"También podés querer [aprender más acerca de " +"GnuPG](https://www.gnupg.org/documentation/)." #: https//support.torproject.org/tbb/maximized-torbrowser-window/ #: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.title)

1 0

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

25 Aug '20

commit 046fdd3de6d7bcf28a6bf869bfd07b05b8d7f434 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 25 05:47:52 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es-AR.po | 99 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 68 insertions(+), 31 deletions(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index 07c5348003..f198bab6b0 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -3615,17 +3615,20 @@ msgid "" "Import the Tor Browser Developers signing key " "(0xEF6E286DDA85EA2A4BA7DE684E2C6E8793298290):" msgstr "" +"Importá la clave de firma de los Desarrolladores de Navegador Tor " +"(0xEF6E286DDA85EA2A4BA7DE684E2C6E8793298290):" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser(a)torproject.org" msgstr "" +"gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser(a)torproject.org" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "This should show you something like:" -msgstr "" +msgstr "Esto debiera mostrarte algo como:" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3633,26 +3636,28 @@ msgid "" "gpg: key 4E2C6E8793298290: public key \"Tor Browser Developers (signing key)" " <torbrowser(a)torproject.org>\" imported" msgstr "" +"gpg: key 4E2C6E8793298290: public key \"Tor Browser Developers (signing key)" +" <torbrowser(a)torproject.org>\" imported" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "gpg: Total number processed: 1" -msgstr "" +msgstr "gpg: Total number processed: 1" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "gpg: imported: 1" -msgstr "" +msgstr "gpg: imported: 1" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "pub rsa4096 2014-12-15 [C] [expires: 2020-08-24]" -msgstr "" +msgstr "pub rsa4096 2014-12-15 [C] [expires: 2020-08-24]" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "EF6E286DDA85EA2A4BA7DE684E2C6E8793298290" -msgstr "" +msgstr "EF6E286DDA85EA2A4BA7DE684E2C6E8793298290" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3660,11 +3665,13 @@ msgid "" "uid [ unknown] Tor Browser Developers (signing key) " "<torbrowser(a)torproject.org>" msgstr "" +"uid [ unknown] Tor Browser Developers (signing key) " +"<torbrowser(a)torproject.org>" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "sub rsa4096 2018-05-26 [S] [expires: 2020-09-12]" -msgstr "" +msgstr "sub rsa4096 2018-05-26 [S] [expires: 2020-09-12]" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3688,6 +3695,8 @@ msgid "" "gpg --output ./tor.keyring --export " "0xEF6E286DDA85EA2A4BA7DE684E2C6E8793298290" msgstr "" +"gpg --output ./tor.keyring --export " +"0xEF6E286DDA85EA2A4BA7DE684E2C6E8793298290" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3732,6 +3741,8 @@ msgid "" "gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-" "US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe" msgstr "" +"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-" +"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3739,6 +3750,8 @@ msgid "" "gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc " "~/Downloads/TorBrowser-9.0-osx64_en-US.dmg" msgstr "" +"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-US.dmg.asc " +"~/Downloads/TorBrowser-9.0-osx64_en-US.dmg" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3752,6 +3765,8 @@ msgid "" "gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-" "US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz" msgstr "" +"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-" +"US.tar.xz.asc ~/Downloads/tor-browser-linux64-9.0_en-US.tar.xz" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3761,12 +3776,12 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "gpgv: Signature made 07/08/19 04:03:49 Pacific Daylight Time" -msgstr "" +msgstr "gpgv: Signature made 07/08/19 04:03:49 Pacific Daylight Time" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "gpgv: using RSA key EB774491D9FF06E2" -msgstr "" +msgstr "gpgv: using RSA key EB774491D9FF06E2" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3774,6 +3789,8 @@ msgid "" "gpgv: Good signature from \"Tor Browser Developers (signing key) " "<torbrowser(a)torproject.org>\"" msgstr "" +"gpgv: Good signature from \"Tor Browser Developers (signing key) " +"<torbrowser(a)torproject.org>\"" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3804,6 +3821,9 @@ msgid "" "known/openpgpkey/torproject.org/hu/kounek7zrdx745qydx6p59t9mqjpuhdf |gpg " "--import -" msgstr "" +"curl -s https://openpgpkey.torproject.org/.well-" +"known/openpgpkey/torproject.org/hu/kounek7zrdx745qydx6p59t9mqjpuhdf |gpg " +"--import -" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -7391,12 +7411,12 @@ msgstr "" #: https//support.torproject.org/operators/operators-4/ #: (content/operators/operators-4/contents+en.lrquestion.description) msgid "$ deb https://deb.torproject.org/torproject.org version main" -msgstr "" +msgstr "$ deb https://deb.torproject.org/torproject.org version main" #: https//support.torproject.org/operators/operators-4/ #: (content/operators/operators-4/contents+en.lrquestion.description) msgid "$ deb-src https://deb.torproject.org/torproject.org version main" -msgstr "" +msgstr "$ deb-src https://deb.torproject.org/torproject.org version main" #: https//support.torproject.org/operators/operators-4/ #: (content/operators/operators-4/contents+en.lrquestion.description) @@ -7414,6 +7434,9 @@ msgid "" "https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…" " | sudo apt-key add -" msgstr "" +"$ curl " +"https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…" +" | sudo apt-key add -" #: https//support.torproject.org/operators/operators-4/ #: (content/operators/operators-4/contents+en.lrquestion.description) @@ -8739,17 +8762,17 @@ msgstr "" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "gpg --fingerprint tor-security(a)lists.torproject.org" -msgstr "" +msgstr "gpg --fingerprint tor-security(a)lists.torproject.org" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "pub 4096R/1A7BF184 2017-03-13" -msgstr "" +msgstr "pub 4096R/1A7BF184 2017-03-13" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "Key fingerprint = 8B90 4624 C5A2 8654 E453 9BC2 E135 A8B4 1A7B F184" -msgstr "" +msgstr "Key fingerprint = 8B90 4624 C5A2 8654 E453 9BC2 E135 A8B4 1A7B F184" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -8759,7 +8782,7 @@ msgstr "" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "sub 4096R/C00942E4 2017-03-13" -msgstr "" +msgstr "sub 4096R/C00942E4 2017-03-13" #: https//support.torproject.org/misc/menu/ #: (content/misc/menu/contents+en.lrquestion.description) @@ -9463,22 +9486,22 @@ msgstr "" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "*!NickServ*checkverify" -msgstr "" +msgstr "*!NickServ*checkverify" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "Usermodechange: +R" -msgstr "" +msgstr "Usermodechange: +R" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "!NickServ- Successfully set +R on your nick." -msgstr "" +msgstr "!NickServ- Successfully set +R on your nick." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "````" -msgstr "" +msgstr "````" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -9559,7 +9582,7 @@ msgstr "" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) msgid "# apt install apt-transport-https" -msgstr "" +msgstr "# apt install apt-transport-https" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -9571,12 +9594,12 @@ msgstr "" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) msgid "deb https://deb.torproject.org/torproject.org <DISTRIBUTION> main" -msgstr "" +msgstr "deb https://deb.torproject.org/torproject.org <DISTRIBUTION> main" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) msgid "deb-src https://deb.torproject.org/torproject.org <DISTRIBUTION> main" -msgstr "" +msgstr "deb-src https://deb.torproject.org/torproject.org <DISTRIBUTION> main" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -9589,6 +9612,8 @@ msgid "" "deb https://deb.torproject.org/torproject.org tor-" "experimental-0.3.4.x-<DISTRIBUTION> main" msgstr "" +"deb https://deb.torproject.org/torproject.org tor-" +"experimental-0.3.4.x-<DISTRIBUTION> main" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -9596,6 +9621,8 @@ msgid "" "deb-src https://deb.torproject.org/torproject.org tor-" "experimental-0.3.4.x-<DISTRIBUTION> main" msgstr "" +"deb-src https://deb.torproject.org/torproject.org tor-" +"experimental-0.3.4.x-<DISTRIBUTION> main" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -9608,6 +9635,8 @@ msgid "" "deb https://deb.torproject.org/torproject.org tor-nightly-" "master-<DISTRIBUTION> main" msgstr "" +"deb https://deb.torproject.org/torproject.org tor-nightly-" +"master-<DISTRIBUTION> main" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -9615,6 +9644,8 @@ msgid "" "deb-src https://deb.torproject.org/torproject.org tor-nightly-" "master-<DISTRIBUTION> main" msgstr "" +"deb-src https://deb.torproject.org/torproject.org tor-nightly-" +"master-<DISTRIBUTION> main" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -9640,12 +9671,16 @@ msgid "" "https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…" " | gpg --import" msgstr "" +"# wget -qO- " +"https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…" +" | gpg --import" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) msgid "" "# gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add -" msgstr "" +"# gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add -" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -9664,12 +9699,12 @@ msgstr "" #: https//support.torproject.org/apt/apt-over-tor/ #: (content/apt/apt-3/contents+en.lrquestion.description) msgid "# apt update" -msgstr "" +msgstr "# apt update" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) msgid "# apt install tor deb.torproject.org-keyring" -msgstr "" +msgstr "# apt install tor deb.torproject.org-keyring" #: https//support.torproject.org/apt/tor-ubuntu/ #: (content/apt/apt-2/contents+en.lrquestion.title) @@ -9713,7 +9748,7 @@ msgstr "" #: https//support.torproject.org/apt/apt-over-tor/ #: (content/apt/apt-3/contents+en.lrquestion.description) msgid "# apt install apt-transport-tor" -msgstr "" +msgstr "# apt install apt-transport-tor" #: https//support.torproject.org/apt/apt-over-tor/ #: (content/apt/apt-3/contents+en.lrquestion.description) @@ -9728,7 +9763,7 @@ msgstr "" #: https//support.torproject.org/apt/apt-over-tor/ #: (content/apt/apt-3/contents+en.lrquestion.description) msgid "deb tor://sdscoq7snqtznauu.onion/torproject.org <DISTRIBUTION> main" -msgstr "" +msgstr "deb tor://sdscoq7snqtznauu.onion/torproject.org <DISTRIBUTION> main" #: https//support.torproject.org/apt/apt-over-tor/ #: (content/apt/apt-3/contents+en.lrquestion.description) @@ -9741,6 +9776,8 @@ msgid "" "deb tor://sdscoq7snqtznauu.onion/torproject.org tor-nightly-" "master-<DISTRIBUTION> main" msgstr "" +"deb tor://sdscoq7snqtznauu.onion/torproject.org tor-nightly-" +"master-<DISTRIBUTION> main" #: https//support.torproject.org/apt/apt-over-tor/ #: (content/apt/apt-3/contents+en.lrquestion.description) @@ -9750,7 +9787,7 @@ msgstr "" #: https//support.torproject.org/apt/apt-over-tor/ #: (content/apt/apt-3/contents+en.lrquestion.description) msgid "# apt install tor" -msgstr "" +msgstr "# apt install tor" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.title) @@ -9822,12 +9859,12 @@ msgstr "" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description) msgid "gpgcheck=1" -msgstr "" +msgstr "gpgcheck=1" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description) msgid "gpgkey=https://rpm.torproject.org/centos/public_gpg.key" -msgstr "" +msgstr "gpgkey=https://rpm.torproject.org/centos/public_gpg.key" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description) @@ -9852,7 +9889,7 @@ msgstr "" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description) msgid "gpgkey=https://rpm.torproject.org/fedora/public_gpg.key" -msgstr "" +msgstr "gpgkey=https://rpm.torproject.org/fedora/public_gpg.key" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description) @@ -9878,7 +9915,7 @@ msgstr "" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description) msgid "Importing GPG key 0x3621CD35:" -msgstr "" +msgstr "Importing GPG key 0x3621CD35:" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description) @@ -9888,7 +9925,7 @@ msgstr "" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description) msgid "Fingerprint: 999E C8E3 14BC 8D46 022D 6C7D E217 C30C 3621 CD35" -msgstr "" +msgstr "Fingerprint: 999E C8E3 14BC 8D46 022D 6C7D E217 C30C 3621 CD35" #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description)

1 0

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

25 Aug '20

commit bd5f3f78662693610a2c9cef24c95697ea8c308a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 25 05:17:52 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es-AR.po | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index 1d071640a4..07c5348003 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -3503,6 +3503,8 @@ msgid "" "Therefore every time a new file is uploaded a new signature is generated " "with a different date." msgstr "" +"Por lo tanto, cada vez que un nuevo archivo es subido, una nueva firma es " +"generada con una fecha diferente." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3510,11 +3512,13 @@ msgid "" "As long as you have verified the signature you should not worry that the " "reported date may vary." msgstr "" +"Mientras hayas verificado la firma, no debieras preocuparte porque la fecha " +"informada pudiera variar." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "### Installing GnuPG" -msgstr "" +msgstr "### Instalando GnuPG" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3522,11 +3526,13 @@ msgid "" "First of all you need to have GnuPG installed before you can verify " "signatures." msgstr "" +"Primero de todo, necesitás tener GnuPG instalado antes de que puedas " +"verificar firmas." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### For Windows users:" -msgstr "" +msgstr "#### Para usuarios de Windows:" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3534,6 +3540,8 @@ msgid "" "If you run Windows, [download Gpg4win](https://gpg4win.org/download.html) " "and run its installer." msgstr "" +"Si ejecutás Windows, [descargá Gpg4win](https://gpg4win.org/download.html) y" +" corré su instalador." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3541,11 +3549,13 @@ msgid "" "In order to verify the signature you will need to type a few commands in " "windows command-line, `cmd.exe`." msgstr "" +"Con el fin de verificar la firma, necesitarás tipear unos pocos comandos en " +"la línea de comandos de Windows, `cmd.exe`." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### For macOS users:" -msgstr "" +msgstr "#### Para usuarios de macOS:" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3553,6 +3563,7 @@ msgid "" "If you are using macOS, you can [install " "GPGTools](https://www.gpgtools.org)." msgstr "" +"Si estás usando macOS, podés [instalar GPGTools](https://www.gpgtools.org)." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3560,11 +3571,13 @@ msgid "" "In order to verify the signature you will need to type a few commands in the" " Terminal (under \"Applications\")." msgstr "" +"Con el fin de verificar la firma, necesitarás tipear unos pocos comandos en " +"la Terminal (bajo \"Aplicaciones\")." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### For GNU/Linux users:" -msgstr "" +msgstr "#### Para usuarios de GNU/Linux:" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3572,6 +3585,9 @@ msgid "" "If you are using GNU/Linux, then you probably already have GnuPG in your " "system, as most GNU/Linux distributions come with it preinstalled." msgstr "" +"Si estás usando GNU/Linux, entonces, probablemente, ya tenés GnuPG en tu " +"sistema, ya que la mayoría de las distribuciones GNU/Linux vienen con eso " +"preinstalado." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3579,16 +3595,19 @@ msgid "" "In order to verify the signature you will need to type a few commands in a " "terminal window. How to do this will vary depending on your distribution." msgstr "" +"Con el fin de verificar la firma, necesitarás tipear unos pocos comandos en " +"una ventana de terminal. Cómo hacer esto variará dependiendo de tu " +"distribución." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "### Fetching the Tor Developers key" -msgstr "" +msgstr "### Obteniendo la clave de los Desarrolladores de Tor" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "The Tor Browser team signs Tor Browser releases." -msgstr "" +msgstr "El equipo del Navegador Tor firma los lanzamientos del mismo." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)

1 0

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

25 Aug '20

commit 266697d3b92363c1bc7f68e13e9bf67acffa1cc9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 25 04:47:49 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es-AR.po | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contents+es-AR.po b/contents+es-AR.po index 5b60bda055..1d071640a4 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -3476,6 +3476,8 @@ msgid "" "These are example file names and will not exactly match the file names that " "you download." msgstr "" +"Estos son nombres de archivo de ejemplo, y no coincidirán exactamente con " +"los nombres de archivos que descargaste." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3483,6 +3485,8 @@ msgid "" "We now show how you can verify the downloaded file's digital signature on " "different operating systems." msgstr "" +"Ahora mostramos cómo podés verificar la firma digital de los archivos " +"descargados en diferentes sistemas operativos." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3490,6 +3494,8 @@ msgid "" "Please notice that a signature is dated the moment the package has been " "signed." msgstr "" +"Por favor tené en cuenta que una firma es fechada en el momento en que el " +"paquete ha sido firmado." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)

1 0

[orbot/master] Merge branch 'bitmold-vpn_disable'
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit c30011869c6dbb49816122e839e5b84e75c4a5b5 Merge: 53cdad1f 992b3108 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Aug 3 15:01:02 2020 -0400 Merge branch 'bitmold-vpn_disable' .../org/torproject/android/OrbotMainActivity.java | 22 +++++++++++++++++++++- .../torproject/android/service/OrbotService.java | 15 ++++++++++++--- 2 files changed, 33 insertions(+), 4 deletions(-)

1 0

[orbot/master] Fixes #364 Bridge Wizard status TextView is preserved on device rotation
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit e006fce7afd4891372aa4c4030732717c8dd9733 Author: bim <dsnake(a)protonmail.com> Date: Sat Jul 18 18:40:45 2020 -0400 Fixes #364 Bridge Wizard status TextView is preserved on device rotation --- .../ui/onboarding/BridgeWizardActivity.java | 37 +++++++++++++--------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java index 6b76a3f2..3fae30d3 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java @@ -29,12 +29,14 @@ public class BridgeWizardActivity extends AppCompatActivity { private static int MOAT_REQUEST_CODE = 666; - private TextView mTvStatus; + private static TextView mTvStatus; private RadioButton mBtDirect; private RadioButton mBtObfs4; private RadioButton mBtMeek; private RadioButton mBtCustom; + private static final String BUNDLE_KEY_TV_STATUS_VISIBILITY = "visibility"; + private static final String BUNDLE_KEY_TV_STATUS_TEXT = "text"; @Override protected void onCreate(Bundle savedInstanceState) { @@ -49,7 +51,12 @@ public class BridgeWizardActivity extends AppCompatActivity { } mTvStatus = findViewById(R.id.lbl_bridge_test_status); - mTvStatus.setVisibility(View.GONE); + if (savedInstanceState == null) { + mTvStatus.setVisibility(View.GONE); + } else { + mTvStatus.setVisibility(savedInstanceState.getInt(BUNDLE_KEY_TV_STATUS_VISIBILITY, View.GONE)); + mTvStatus.setText(savedInstanceState.getString(BUNDLE_KEY_TV_STATUS_TEXT, "")); + } setTitle(getString(R.string.bridges)); @@ -86,7 +93,6 @@ public class BridgeWizardActivity extends AppCompatActivity { @Override protected void onResume() { super.onResume(); - evaluateBridgeListState(); } @@ -117,8 +123,7 @@ public class BridgeWizardActivity extends AppCompatActivity { else { evaluateBridgeListState(); } - } - else { + } else { super.onActivityResult(requestCode, resultCode, data); } } @@ -165,14 +170,20 @@ public class BridgeWizardActivity extends AppCompatActivity { // Post Code if (result) { mTvStatus.setText(R.string.testing_bridges_success); - } else { mTvStatus.setText(R.string.testing_bridges_fail); - } } } + + @Override + public void onSaveInstanceState(Bundle savedInstanceState) { + savedInstanceState.putInt(BUNDLE_KEY_TV_STATUS_VISIBILITY, mTvStatus.getVisibility()); + savedInstanceState.putString(BUNDLE_KEY_TV_STATUS_TEXT, mTvStatus.getText().toString()); + super.onSaveInstanceState(savedInstanceState); + } + @SuppressWarnings("SameParameterValue") private static boolean isHostReachable(String serverAddress, int serverTCPport, int timeoutMS) { boolean connected = false; @@ -185,8 +196,7 @@ public class BridgeWizardActivity extends AppCompatActivity { connected = true; socket.close(); } - } - catch (IOException e) { + } catch (IOException e) { e.printStackTrace(); } @@ -198,14 +208,11 @@ public class BridgeWizardActivity extends AppCompatActivity { if (!Prefs.bridgesEnabled()) { mBtDirect.setChecked(true); - } - else if (Prefs.getBridgesList().equals("meek")) { + } else if (Prefs.getBridgesList().equals("meek")) { mBtMeek.setChecked(true); - } - else if (Prefs.getBridgesList().equals("obfs4")) { + } else if (Prefs.getBridgesList().equals("obfs4")) { mBtObfs4.setChecked(true); - } - else { + } else { mBtCustom.setChecked(true); } }

1 0

[orbot/master] Merge branch 'master' of github.com:guardianproject/orbot
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 3bcb762542adf86d1c04bb9829a8f8f42b268d1d Merge: c3001186 8990c904 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Aug 3 15:01:18 2020 -0400 Merge branch 'master' of github.com:guardianproject/orbot app/src/main/AndroidManifest.xml | 5 +- .../android/ui/onboarding/CustomSlideBigText.java | 77 ++++++---------------- .../android/ui/onboarding/OnboardingActivity.java | 72 +++----------------- 3 files changed, 35 insertions(+), 119 deletions(-)

1 0

[orbot/master] Fixes #358
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 76a52f7f88c0e9d1a35ba96f108263aee28b1aea Author: bim <dsnake(a)protonmail.com> Date: Sun Jul 19 15:12:07 2020 -0400 Fixes #358 ~ BridgeWizard bridge options are selected correctly when the wizard is opened/closed. ~ Custom Bridges option is behind a button now that is only visible when the radio button is set ~ Some String updates to make it clear a given connection test is for bridges or not --- .../ui/onboarding/BridgeWizardActivity.java | 45 +++++++++++++++------- .../main/res/layout/activity_custom_bridges.xml | 2 +- app/src/main/res/layout/content_bridge_wizard.xml | 8 ++++ app/src/main/res/values/strings.xml | 6 ++- 4 files changed, 45 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java index 27f24164..f641c81d 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java @@ -28,7 +28,8 @@ import java.net.SocketAddress; public class BridgeWizardActivity extends AppCompatActivity { - private static int MOAT_REQUEST_CODE = 666; + private static final int MOAT_REQUEST_CODE = 666; + private static final int CUSTOM_BRIDGES_REQUEST_CODE = 1312; private static TextView mTvStatus; private static HostTester runningHostTest; @@ -38,6 +39,8 @@ public class BridgeWizardActivity extends AppCompatActivity { private RadioButton mBtMeek; private RadioButton mBtCustom; + private View mBtnConfgiureCustomBridges; + private static final String BUNDLE_KEY_TV_STATUS_VISIBILITY = "visibility"; private static final String BUNDLE_KEY_TV_STATUS_TEXT = "text"; @@ -63,14 +66,18 @@ public class BridgeWizardActivity extends AppCompatActivity { setTitle(getString(R.string.bridges)); - findViewById(R.id.btnMoat).setOnClickListener(v -> startActivityForResult(new Intent(BridgeWizardActivity.this, MoatActivity.class), - MOAT_REQUEST_CODE)); + findViewById(R.id.btnMoat).setOnClickListener(v -> { + cancelHostTestIfRunning(); + startActivityForResult(new Intent(BridgeWizardActivity.this, MoatActivity.class), MOAT_REQUEST_CODE); + }); mBtDirect = findViewById(R.id.btnBridgesDirect); - mBtDirect.setOnClickListener(v -> { + mBtDirect.setOnCheckedChangeListener((buttonView, isChecked) -> { + if (!isChecked) return; Prefs.setBridgesList(""); Prefs.putBridgesEnabled(false); testBridgeConnection(); + }); mBtObfs4 = findViewById(R.id.btnBridgesObfs4); @@ -91,10 +98,18 @@ public class BridgeWizardActivity extends AppCompatActivity { mBtCustom = findViewById(R.id.btnCustomBridges); mBtCustom.setOnCheckedChangeListener((buttonView, isChecked) -> { - if (isChecked) return; - cancelHostTestIfRunning(); - startActivity(new Intent(BridgeWizardActivity.this, CustomBridgesActivity.class)); + if (isChecked) { + cancelHostTestIfRunning(); + mTvStatus.setVisibility(View.GONE); + mBtnConfgiureCustomBridges.setVisibility(View.VISIBLE); + } else { + mBtnConfgiureCustomBridges.setVisibility(View.GONE); + } }); + + mBtnConfgiureCustomBridges = findViewById(R.id.btnConfigureCustomBridges); + mBtnConfgiureCustomBridges.setOnClickListener(v -> + startActivityForResult(new Intent(BridgeWizardActivity.this, CustomBridgesActivity.class), CUSTOM_BRIDGES_REQUEST_CODE)); } @Override @@ -130,12 +145,13 @@ public class BridgeWizardActivity extends AppCompatActivity { else { evaluateBridgeListState(); } + } else if (requestCode == CUSTOM_BRIDGES_REQUEST_CODE) { + if (noBridgesSet()) mBtDirect.setChecked(true); } else { super.onActivityResult(requestCode, resultCode, data); } } - private void testBridgeConnection() { cancelHostTestIfRunning(); HostTester hostTester = new HostTester(); @@ -157,7 +173,7 @@ public class BridgeWizardActivity extends AppCompatActivity { protected void onPreExecute() { // Pre Code mTvStatus.setVisibility(View.VISIBLE); - mTvStatus.setText(R.string.testing_bridges); + mTvStatus.setText(mBtDirect.isChecked() ? R.string.testing_tor_direct : R.string.testing_bridges); } @Override @@ -181,14 +197,14 @@ public class BridgeWizardActivity extends AppCompatActivity { // Post Code runningHostTest = null; if (result) { - mTvStatus.setText(R.string.testing_bridges_success); + int stringRes = mBtDirect.isChecked() ? R.string.testing_tor_direct_success : R.string.testing_bridges_success; + mTvStatus.setText(stringRes); } else { mTvStatus.setText(R.string.testing_bridges_fail); } } } - @Override public void onSaveInstanceState(Bundle savedInstanceState) { savedInstanceState.putInt(BUNDLE_KEY_TV_STATUS_VISIBILITY, mTvStatus.getVisibility()); @@ -224,8 +240,7 @@ public class BridgeWizardActivity extends AppCompatActivity { private void evaluateBridgeListState() { Log.d(getClass().getSimpleName(), String.format("bridgesEnabled=%b, bridgesList=%s", Prefs.bridgesEnabled(), Prefs.getBridgesList())); - - if (!Prefs.bridgesEnabled()) { + if (noBridgesSet()) { mBtDirect.setChecked(true); } else if (Prefs.getBridgesList().equals("meek")) { mBtMeek.setChecked(true); @@ -243,5 +258,7 @@ public class BridgeWizardActivity extends AppCompatActivity { } } - + private static boolean noBridgesSet() { + return !Prefs.bridgesEnabled() || Prefs.getBridgesList().trim().equals(""); + } } diff --git a/app/src/main/res/layout/activity_custom_bridges.xml b/app/src/main/res/layout/activity_custom_bridges.xml index 8a7b2998..add6a6fc 100644 --- a/app/src/main/res/layout/activity_custom_bridges.xml +++ b/app/src/main/res/layout/activity_custom_bridges.xml @@ -91,7 +91,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="12dp" - android:text="@string/get_bridges_email" /> + android:text="@string/get_bridges_email_request" /> </LinearLayout> diff --git a/app/src/main/res/layout/content_bridge_wizard.xml b/app/src/main/res/layout/content_bridge_wizard.xml index 5c3d990e..0b75ffa4 100644 --- a/app/src/main/res/layout/content_bridge_wizard.xml +++ b/app/src/main/res/layout/content_bridge_wizard.xml @@ -67,6 +67,14 @@ </RadioGroup> + <Button + android:id="@+id/btnConfigureCustomBridges" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/configure_custom_bridges" + android:visibility="gone" /> + <TextView android:id="@+id/lbl_bridge_test_status" android:layout_width="match_parent" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 308174e7..bbf55492 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -172,6 +172,7 @@ <string name="bridge_mode">Request New Bridge</string> <string name="get_bridges_email">Email</string> + <string name="get_bridges_email_request">Request Bridges via Email</string> <string name="get_bridges_web">Web</string> <string name="activate">Activate</string> @@ -242,7 +243,9 @@ <string name="pref_disable_ipv4_summary">Tells exits not to connect to IPv4 addresses</string> <string name="app_shortcuts">Tor-Enabled Apps</string> <string name="testing_bridges">Testing bridge connection to Tor....</string> + <string name="testing_tor_direct">Testing connection to Tor...</string> <string name="testing_bridges_success">Success. Bridge configuration is good!</string> + <string name="testing_tor_direct_success">Success. Tor connection is good!</string> <string name="testing_bridges_fail">FAILED. Try another option</string> <string name="bridge_direct_connect">Connect directly to Tor (Best)</string> <string name="bridge_community">Connect through community servers</string> @@ -270,7 +273,8 @@  <string name="request_bridges_from_torproject">Request Bridges from torproject.org</string> <string name="custom_bridges">Custom Bridges</string> - + <string name="configure_custom_bridges">Configure Custom Bridges</string> +  <string name="use_custom_bridges">Use Custom Bridges</string> <string name="in_a_browser">In a browser, visit %s and tap "Get Bridges" > "Just Give Me Bridges!"</string>

1 0

[orbot/master] Fixes #366 Prevents multiple HostTests from running concurrently and closes any ongoing
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit aa8a53258eb01a0f0467d5f6132f672655264bfc Author: bim <dsnake(a)protonmail.com> Date: Sun Jul 19 14:22:12 2020 -0400 Fixes #366 Prevents multiple HostTests from running concurrently and closes any ongoing network requests once the BridgeWizardActivity loses focus --- app/src/main/AndroidManifest.xml | 7 +++- .../ui/onboarding/BridgeWizardActivity.java | 46 +++++++++++++++++----- 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 43109382..fa7a54d4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,10 @@ android:name=".ui.onboarding.OnboardingActivity" android:configChanges="orientation|screenSize|screenLayout" /> - <activity android:name=".ui.onboarding.BridgeWizardActivity" /> + <activity + android:name=".ui.onboarding.BridgeWizardActivity" + android:configChanges="orientation|screenSize" /> + <activity android:name=".ui.onboarding.MoatActivity" android:windowSoftInputMode="stateHidden" /> @@ -172,4 +175,4 @@ </application> -</manifest> \ No newline at end of file +</manifest> diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java index 3fae30d3..27f24164 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java @@ -8,6 +8,7 @@ import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; import android.view.View; +import android.widget.CompoundButton; import android.widget.RadioButton; import android.widget.TextView; @@ -30,6 +31,8 @@ public class BridgeWizardActivity extends AppCompatActivity { private static int MOAT_REQUEST_CODE = 666; private static TextView mTvStatus; + private static HostTester runningHostTest; + private RadioButton mBtDirect; private RadioButton mBtObfs4; private RadioButton mBtMeek; @@ -71,23 +74,27 @@ public class BridgeWizardActivity extends AppCompatActivity { }); mBtObfs4 = findViewById(R.id.btnBridgesObfs4); - mBtObfs4.setOnClickListener(v -> { + mBtObfs4.setOnCheckedChangeListener((buttonView, isChecked) -> { + if (!isChecked) return; Prefs.setBridgesList("obfs4"); Prefs.putBridgesEnabled(true); testBridgeConnection(); }); - mBtMeek = findViewById(R.id.btnBridgesMeek); - mBtMeek.setOnClickListener(v -> { + mBtMeek.setOnCheckedChangeListener((buttonView, isChecked) -> { + if (!isChecked) return; Prefs.setBridgesList("meek"); Prefs.putBridgesEnabled(true); testBridgeConnection(); }); - mBtCustom = findViewById(R.id.btnCustomBridges); - mBtCustom.setOnClickListener(view -> startActivity(new Intent(BridgeWizardActivity.this, CustomBridgesActivity.class))); + mBtCustom.setOnCheckedChangeListener((buttonView, isChecked) -> { + if (isChecked) return; + cancelHostTestIfRunning(); + startActivity(new Intent(BridgeWizardActivity.this, CustomBridgesActivity.class)); + }); } @Override @@ -130,15 +137,19 @@ public class BridgeWizardActivity extends AppCompatActivity { private void testBridgeConnection() { + cancelHostTestIfRunning(); + HostTester hostTester = new HostTester(); if (TextUtils.isEmpty(Prefs.getBridgesList()) || (!Prefs.bridgesEnabled())) { - new HostTester().execute("check.torproject.org", "443"); + hostTester.execute("check.torproject.org", "443"); } else if (Prefs.getBridgesList().equals("meek")) { - new HostTester().execute("meek.azureedge.net", "443", "d2cly7j4zqgua7.cloudfront.net", "443"); + hostTester.execute("meek.azureedge.net", "443", "d2cly7j4zqgua7.cloudfront.net", "443"); } else if (Prefs.getBridgesList().equals("obfs4")) { - new HostTester().execute("85.17.30.79", "443", "154.35.22.9", "443", "192.99.11.54", "443"); + hostTester.execute("85.17.30.79", "443", "154.35.22.9", "443", "192.99.11.54", "443"); } else { + hostTester = null; mTvStatus.setText(""); } + if (hostTester != null) runningHostTest = hostTester; } private class HostTester extends AsyncTask<String, Void, Boolean> { @@ -153,10 +164,10 @@ public class BridgeWizardActivity extends AppCompatActivity { protected Boolean doInBackground(String... host) { // Background Code for (int i = 0; i < host.length; i++) { + if (isCancelled()) return null; String testHost = host[i]; i++; //move to the port int testPort = Integer.parseInt(host[i]); - if (isHostReachable(testHost, testPort, 10000)) { return true; } @@ -168,6 +179,7 @@ public class BridgeWizardActivity extends AppCompatActivity { @Override protected void onPostExecute(Boolean result) { // Post Code + runningHostTest = null; if (result) { mTvStatus.setText(R.string.testing_bridges_success); } else { @@ -184,6 +196,13 @@ public class BridgeWizardActivity extends AppCompatActivity { super.onSaveInstanceState(savedInstanceState); } + @Override + public void onDestroy() { + cancelHostTestIfRunning(); + mTvStatus = null; + super.onDestroy(); + } + @SuppressWarnings("SameParameterValue") private static boolean isHostReachable(String serverAddress, int serverTCPport, int timeoutMS) { boolean connected = false; @@ -216,4 +235,13 @@ public class BridgeWizardActivity extends AppCompatActivity { mBtCustom.setChecked(true); } } + + private static void cancelHostTestIfRunning() { + if (runningHostTest != null) { + runningHostTest.cancel(true); + runningHostTest = null; + } + } + + }

1 0