February 2017 - tor-commits - lists.torproject.org

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 02 Feb '17

02 Feb '17

commit aa45a55b3808b3602b9ce7e5bc847f5aa33be649 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 2 16:18:14 2017 +0000 Update translations for tails-greeter-2_completed --- es/es.po | 172 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 92 insertions(+), 80 deletions(-) diff --git a/es/es.po b/es/es.po index ef6a56a..c85958c 100644 --- a/es/es.po +++ b/es/es.po @@ -1,14 +1,14 @@ -# Tails GDM Greeter -# Copyright (C) 2016 Tails devlopers -# This file is distributed under the same license as the tails-greeter package. -# Tails devloppers <tails(a)boum.org>, 2016. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-03 13:14+0000\n" +"POT-Creation-Date: 2017-01-31 10:47+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: strel <strelnic(a)gmail.com>, 2016\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" @@ -92,12 +92,24 @@ msgstr "Falsificar todas las direcciones MAC (predeterminado)" msgid "Don't spoof MAC addresses" msgstr "No falsificar las direcciones MAC " -#: ../data/greeter.ui.h:17 +#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514 +msgid "Cannot unlock encrypted storage with this passphrase." +msgstr "" +"No se puede desbloquear el almacenamiento cifrado con esta contraseña." + +#: ../data/greeter.ui.h:18 +msgid "" +"You will configure the Tor bridge and local proxy later on after connecting " +"to a network." +msgstr "" +"Configurará el puente Tor y el proxy local, después de conectarse a la red." + +#: ../data/greeter.ui.h:19 msgid "Welcome to Tails!" msgstr "¡Bienvenido a Tails! " #. This string will never be displayed in the 1st version of the greeter. -#: ../data/greeter.ui.h:19 +#: ../data/greeter.ui.h:21 msgctxt "" msgid "" "To get guided through Tails' settings, click on <b>Take a Tour</b> above" @@ -105,77 +117,83 @@ msgstr "" "Para hacer una visita guiada a la configuración de Tails, pulse <b>Hacer un " "recorrido</b> " -#: ../data/greeter.ui.h:20 +#: ../data/greeter.ui.h:22 msgid "Language & Region" msgstr "Idioma y región " -#: ../data/greeter.ui.h:21 +#: ../data/greeter.ui.h:23 msgid "Default Settings" msgstr "Configuración por defecto" -#: ../data/greeter.ui.h:22 +#: ../data/greeter.ui.h:24 msgid "Save Language & Region Settings" msgstr "Guardar la configuración regional y de idioma" -#: ../data/greeter.ui.h:23 +#: ../data/greeter.ui.h:25 msgid "Language" msgstr "Idioma" -#: ../data/greeter.ui.h:24 +#: ../data/greeter.ui.h:26 msgid "Keyboard Layout" msgstr "Configuración del teclado" -#: ../data/greeter.ui.h:25 +#: ../data/greeter.ui.h:27 msgid "Formats" msgstr "Formatos " -#: ../data/greeter.ui.h:26 +#: ../data/greeter.ui.h:28 msgid "Time Zone" msgstr "Zona horaria " -#: ../data/greeter.ui.h:27 +#: ../data/greeter.ui.h:29 msgid "Encrypted Persistent Storage" msgstr "Almacenamiento cifrado permanente" -#: ../data/greeter.ui.h:28 +#: ../data/greeter.ui.h:30 msgid "Show Passphrase" msgstr "Mostrar contraseña" -#: ../data/greeter.ui.h:29 +#: ../data/greeter.ui.h:31 msgid "Configure Persistent Storage" msgstr "Configurar almacenamiento permanente" -#: ../data/greeter.ui.h:30 +#: ../data/greeter.ui.h:32 msgid "Enter your passphrase to unlock the persistent storage" msgstr "" "Introduzca su contraseña para desbloquear el almacenamiento permanente" -#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798 -#: ../tailsgreeter/gui.py:962 +#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460 +#: ../tailsgreeter/gui.py:510 msgid "Unlock" msgstr "Desbloquear " -#: ../data/greeter.ui.h:32 +#: ../data/greeter.ui.h:34 msgid "Relock Persistent Storage" msgstr "Bloquear de nuevo el almacenamiento permanente" -#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514 +#: ../data/greeter.ui.h:35 +msgid "Your persistent storage is unlocked. Restart Tails to lock it again." +msgstr "" +"Su almacenamiento persistente está desbloqueado. Reinicie Tails para " +"bloquearlo de nuevo." + +#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554 msgid "Additional Settings" msgstr "Configuraciones adicionales " -#: ../data/greeter.ui.h:34 +#: ../data/greeter.ui.h:37 msgid "Save Additional Settings" msgstr "Guardar configuraciones adicionales " -#: ../data/greeter.ui.h:35 +#: ../data/greeter.ui.h:38 msgid "Add an additional setting" msgstr "Añadir un ajuste adicional" -#: ../data/greeter.ui.h:36 +#: ../data/greeter.ui.h:39 msgid "Network Configuration" msgstr "Configuración de red" -#: ../data/greeter.ui.h:37 +#: ../data/greeter.ui.h:40 msgid "" "If your Internet connection is censored, filtered, or proxied you can " "configure a Tor bridge or a local proxy. To work completely offline, you can" @@ -186,20 +204,20 @@ msgstr "" "trabajar completamente desconectado, puede deshabilitar todas las conexiones" " de red." -#: ../data/greeter.ui.h:38 +#: ../data/greeter.ui.h:41 msgid "Connect directly to the Tor network (default)" msgstr "Conectar directamente a la red Tor (predeterminado) " -#: ../data/greeter.ui.h:39 +#: ../data/greeter.ui.h:42 msgid "Configure a Tor bridge, firewall, or proxy settings" msgstr "" "Configurar los ajustes de un puente de Tor, un cortafuegos o un proxy " -#: ../data/greeter.ui.h:40 +#: ../data/greeter.ui.h:43 msgid "Disable all networking" msgstr "Deshabilitar todas las conexiones de red " -#: ../data/greeter.ui.h:41 +#: ../data/greeter.ui.h:44 msgid "" "The default settings are safe in most situations. To add a custom setting, " "press the \"+\" button below." @@ -207,79 +225,63 @@ msgstr "" "La configuración predeterminada es la más segura la mayoría de las veces. " "Para añadir una configuración personalizada, pulse el botón \"+\"." -#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717 +#: ../data/greeter.ui.h:45 msgid "Off (default)" msgstr "Desactivada (predeterminado) " -#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715 +#: ../data/greeter.ui.h:46 msgid "On (default)" msgstr "Activada (predeterminado) " -#: ../data/greeter.ui.h:44 +#: ../data/greeter.ui.h:47 msgid "Network Connection" msgstr "Conexión a la red " -#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914 +#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367 msgid "Direct (default)" msgstr "Directa (predeterminado) " -#: ../tailsgreeter/gui.py:456 -msgid "Shutdown" -msgstr "Cerrar " +#: ../tailsgreeter/gui.py:373 +msgid "Bridge & Proxy" +msgstr "Puente y proxy " -#: ../tailsgreeter/gui.py:462 -msgid "Start Tails" -msgstr "Iniciar Tails " +#: ../tailsgreeter/gui.py:379 +msgid "Offline" +msgstr "Desconectado" + +#: ../tailsgreeter/gui.py:463 +msgid "Failed to relock persistent storage." +msgstr "No se pudo volver a bloquear el almacenamiento permanente." -#: ../tailsgreeter/gui.py:523 +#: ../tailsgreeter/gui.py:481 +msgid "Unlocking…" +msgstr "Desbloqueando... " + +#: ../tailsgreeter/gui.py:562 msgid "Cancel" msgstr "Cancelar " -#: ../tailsgreeter/gui.py:527 +#: ../tailsgreeter/gui.py:566 msgid "Add" msgstr "Añadir " -#: ../tailsgreeter/gui.py:534 +#: ../tailsgreeter/gui.py:572 msgid "Back" msgstr "Atrás " -#: ../tailsgreeter/gui.py:652 -msgid "Unlocking…" -msgstr "Desbloqueando... " - -#: ../tailsgreeter/gui.py:680 -msgid "" -"You will configure the Tor bridge and local proxy later on after connecting " -"to a network." -msgstr "" -"Configurará el puente Tor y el proxy local, después de conectarse a la red." - -#: ../tailsgreeter/gui.py:720 -msgid "On" -msgstr "Activado " - -#: ../tailsgreeter/gui.py:722 -msgid "Off" -msgstr "Desactivado " - -#: ../tailsgreeter/gui.py:801 -msgid "Failed to relock persistent storage." -msgstr "No se pudo volver a bloquear el almacenamiento permanente." +#: ../tailsgreeter/gui.py:658 +msgid "Shutdown" +msgstr "Cerrar " -#: ../tailsgreeter/gui.py:920 -msgid "Bridge & Proxy" -msgstr "Puente y proxy " +#: ../tailsgreeter/gui.py:664 +msgid "Start Tails" +msgstr "Iniciar Tails " -#: ../tailsgreeter/gui.py:926 -msgid "Offline" -msgstr "Desconectado" +#: ../tailsgreeter/language.py:119 +msgid "default:LTR" +msgstr "predeterminado:LTR" -#: ../tailsgreeter/gui.py:965 -msgid "Cannot unlock encrypted storage with this passphrase." -msgstr "" -"No se puede desbloquear el almacenamiento cifrado con esta contraseña." - -#: ../tailsgreeter/persistence.py:96 +#: ../tailsgreeter/persistence.py:89 #, python-brace-format msgid "" "live-persist failed with return code {returncode}:\n" @@ -288,8 +290,7 @@ msgstr "" "live-persist falló con un código de retorno {returncode}\n" "{stderr}" -#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163 -#: ../tailsgreeter/persistence.py:186 +#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137 #, python-brace-format msgid "" "cryptsetup failed with return code {returncode}:\n" @@ -300,7 +301,18 @@ msgstr "" "{stdout}\n" "{stderr}" -#: ../tailsgreeter/persistence.py:206 +#: ../tailsgreeter/persistence.py:154 +#, python-brace-format +msgid "" +"live-persist failed with return code {returncode}:\n" +"{stdout}\n" +"{stderr}" +msgstr "" +"live-persist ha fallado con código de retorno {returncode}:\n" +"{stdout}\n" +"{stderr}" + +#: ../tailsgreeter/persistence.py:168 #, python-brace-format msgid "" "umount failed with return code {returncode}:\n"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 02 Feb '17

02 Feb '17

commit 0a0bbcd999958aeb989f2a9add9dfc557ee1aa69 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 2 16:18:10 2017 +0000 Update translations for tails-greeter-2 --- es/es.po | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/es/es.po b/es/es.po index 58a260d..c85958c 100644 --- a/es/es.po +++ b/es/es.po @@ -174,6 +174,8 @@ msgstr "Bloquear de nuevo el almacenamiento permanente" #: ../data/greeter.ui.h:35 msgid "Your persistent storage is unlocked. Restart Tails to lock it again." msgstr "" +"Su almacenamiento persistente está desbloqueado. Reinicie Tails para " +"bloquearlo de nuevo." #: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554 msgid "Additional Settings" @@ -277,7 +279,7 @@ msgstr "Iniciar Tails " #: ../tailsgreeter/language.py:119 msgid "default:LTR" -msgstr "" +msgstr "predeterminado:LTR" #: ../tailsgreeter/persistence.py:89 #, python-brace-format @@ -306,6 +308,9 @@ msgid "" "{stdout}\n" "{stderr}" msgstr "" +"live-persist ha fallado con código de retorno {returncode}:\n" +"{stdout}\n" +"{stderr}" #: ../tailsgreeter/persistence.py:168 #, python-brace-format

1 0

[tor/master] In dirserv_single_reachability_test, node can be const.
by nickm＠torproject.org 02 Feb '17

02 Feb '17

commit d732409402c18c447eea7e06f32885706377ebd3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 2 09:36:36 2017 -0500 In dirserv_single_reachability_test, node can be const. --- src/or/dirserv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 59d0c88..d1670bf 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3263,13 +3263,13 @@ dirserv_single_reachability_test(time_t now, routerinfo_t *router) { const or_options_t *options = get_options(); channel_t *chan = NULL; - node_t *node = NULL; + const node_t *node = NULL; tor_addr_t router_addr; const ed25519_public_key_t *ed_id_key; (void) now; tor_assert(router); - node = node_get_mutable_by_id(router->cache_info.identity_digest); + node = node_get_by_id(router->cache_info.identity_digest); tor_assert(node); if (options->AuthDirTestEd25519LinkKeys &&

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug21294_030_02'
by nickm＠torproject.org 02 Feb '17

02 Feb '17

commit 96dce88d80f422914eb93a7236e5dc1eaed4cfb6 Merge: 6777cd0 5f6d53c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 2 09:07:20 2017 -0500 Merge remote-tracking branch 'dgoulet/bug21294_030_02' src/test/test_options.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/master] test: Fix test after log message changed in #21294
by nickm＠torproject.org 02 Feb '17

02 Feb '17

commit 5f6d53cefada83296414908d441b925b1e007c94 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Feb 2 09:03:14 2017 -0500 test: Fix test after log message changed in #21294 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_options.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index 41c015b..e822404 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -2826,8 +2826,8 @@ test_options_validate__single_onion(void *ignored) tt_int_op(ret, OP_EQ, -1); tt_str_op(msg, OP_EQ, "HiddenServiceNonAnonymousMode is incompatible with " "using Tor as an anonymous client. Please set " - "Socks/Trans/NATD/DNSPort to 0, or HiddenServiceNonAnonymousMode " - "to 0, or use the non-anonymous Tor2webMode."); + "Socks/Trans/NATD/DNSPort to 0, or revert " + "HiddenServiceNonAnonymousMode to 0."); tor_free(msg); free_options_test_data(tdata);

1 0

[tor/master] Call monotime_init() earlier.
by nickm＠torproject.org 02 Feb '17

02 Feb '17

commit d183ec231be0e3f560f844bf2d118e2c71bda25f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 31 13:02:49 2017 -0500 Call monotime_init() earlier. We need to call it before nt_service_parse_options(), since nt_service_parse_options() can call back into nt_service_main(), which calls do_main_loop(). Fixes bug 21356; bugfix on 0.2.9.1-alpha. --- changes/ticket21356 | 4 ++++ src/or/main.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/ticket21356 b/changes/ticket21356 new file mode 100644 index 0000000..394238b --- /dev/null +++ b/changes/ticket21356 @@ -0,0 +1,4 @@ + o Minor bugfixes (Windows services): + - Be sure to initialize the monotonic time subsystem before using it, + even when running as an NT service. + Fixes bug 21356; bugfix on 0.2.9.1-alpha. diff --git a/src/or/main.c b/src/or/main.c index 66a8571..89cfb2e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3443,6 +3443,7 @@ tor_main(int argc, char *argv[]) update_approx_time(time(NULL)); tor_threads_init(); init_logging(0); + monotime_init(); #ifdef USE_DMALLOC { /* Instruct OpenSSL to use our internal wrappers for malloc, @@ -3476,8 +3477,6 @@ tor_main(int argc, char *argv[]) #endif } - monotime_init(); - switch (get_options()->command) { case CMD_RUN_TOR: #ifdef NT_SERVICE

1 0

[tor/master] Merge remote-tracking branch 'public/bug21356_029'
by nickm＠torproject.org 02 Feb '17

02 Feb '17

commit 6777cd0a8486a4930ec3020fdf31dc2be1c34f9b Merge: b11f00c d183ec2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 2 09:03:13 2017 -0500 Merge remote-tracking branch 'public/bug21356_029' changes/ticket21356 | 4 ++++ src/or/main.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[torspec/master] Tweak description
by nickm＠torproject.org 02 Feb '17

02 Feb '17

commit d9e76007acb3935c49778f01a858a4b84cf2bf00 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 2 08:51:18 2017 -0500 Tweak description --- guard-spec.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/guard-spec.txt b/guard-spec.txt index a1e8e93..731ad97 100644 --- a/guard-spec.txt +++ b/guard-spec.txt @@ -473,11 +473,11 @@ random from {USABLE_FILTERED_GUARDS}. Set its {is_pending} field to true. The circuit is <usable_if_no_better_guard>. - If during the above algorithm we exhaust all sampled guards before finding a - reachable one, then we proceed by marking all guards as <maybe> reachable so - that we can keep on sampling. + * Otherwise, if USABLE_FILTERED_GUARDS is empty, we have exhausted + all the sampled guards. In this case we proceed by marking all guards + as <maybe> reachable so that we can keep on sampling. - When we finally connect to a guard, we update the {last_tried_connect} time + Whenever we yield a guard, we update the {last_tried_connect} time for the guard to 'now.' In some cases (for example, when we need a certain directory feature,

1 0

[torspec/master] guard-spec.txt: If we exhaust all guards, start from top again.
by nickm＠torproject.org 02 Feb '17

02 Feb '17

commit 65e24ed3f1255b0b836af1a3cefbb16e414c4ab8 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Feb 2 13:36:58 2017 +0200 guard-spec.txt: If we exhaust all guards, start from top again. --- guard-spec.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/guard-spec.txt b/guard-spec.txt index 87e16a7..a1e8e93 100644 --- a/guard-spec.txt +++ b/guard-spec.txt @@ -473,7 +473,12 @@ random from {USABLE_FILTERED_GUARDS}. Set its {is_pending} field to true. The circuit is <usable_if_no_better_guard>. - We update the {last_tried_connect} time for the guard to 'now.' + If during the above algorithm we exhaust all sampled guards before finding a + reachable one, then we proceed by marking all guards as <maybe> reachable so + that we can keep on sampling. + + When we finally connect to a guard, we update the {last_tried_connect} time + for the guard to 'now.' In some cases (for example, when we need a certain directory feature, or when we need to avoid using a certain exit as a guard), we need to

1 0

[tor/master] config: Stop recommending Tor2web if in non anonymous mode
by nickm＠torproject.org 02 Feb '17

02 Feb '17

commit 83df35921485ac46e1da0c6789b4b2dbbedf16e6 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 1 11:55:26 2017 -0500 config: Stop recommending Tor2web if in non anonymous mode Because we don't allow client functionalities in non anonymous mode, recommending Tor2web is a bad idea. If a user wants to use Tor2web as a client (losing all anonymity), it should run a second tor, not use it with a single onion service tor. Fixes #21294. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug21294 | 6 ++++++ src/or/config.c | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/bug21294 b/changes/bug21294 new file mode 100644 index 0000000..96da1c1 --- /dev/null +++ b/changes/bug21294 @@ -0,0 +1,6 @@ + o Minor bugfix (logging); + - Don't recommend to use Tor2web in non anonymous mode. In that mode, we + disable client functionalities and recommending Tor2web as a solution is + a bad idea because in that case client loses all anonymity. Tor2web + should really only be used in very specific cases and with users + *knowing* what they do. Fixes #21294; bugfix on tor-0.2.9.3-alpha. diff --git a/src/or/config.c b/src/or/config.c index a07719e..8016282 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2942,8 +2942,7 @@ options_validate_single_onion(or_options_t *options, char **msg) !options->Tor2webMode) { REJECT("HiddenServiceNonAnonymousMode is incompatible with using Tor as " "an anonymous client. Please set Socks/Trans/NATD/DNSPort to 0, or " - "HiddenServiceNonAnonymousMode to 0, or use the non-anonymous " - "Tor2webMode."); + "revert HiddenServiceNonAnonymousMode to 0."); } /* If you run a hidden service in non-anonymous mode, the hidden service

1 0