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

[tor/master] Add --format argument to --key-expiration option. #30045
by nickm＠torproject.org 04 Aug '20

04 Aug '20

commit 1474ab33956eefd9b75ef9a3e238ec7f855b8c7e Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Sat Aug 1 00:03:06 2020 +0100 Add --format argument to --key-expiration option. #30045 --- changes/feature30045 | 6 +++ doc/man/tor.1.txt | 14 +++++-- scripts/maint/practracker/exceptions.txt | 4 +- src/app/config/config.c | 35 ++++++++++++++++ src/app/config/or_options_st.h | 5 +++ src/feature/relay/routerkeys.c | 28 ++++++++++--- src/test/test_key_expiration.sh | 70 ++++++++++++++++++++++++++++++-- 7 files changed, 147 insertions(+), 15 deletions(-) diff --git a/changes/feature30045 b/changes/feature30045 new file mode 100644 index 0000000000..9a0b8c041a --- /dev/null +++ b/changes/feature30045 @@ -0,0 +1,6 @@ + o Minor features (admin tools): + - Add new --format argument to -key-expiration option to allow + specifying the time format of expiration date. Adds Unix + timestamp format support. Patch by Daniel Pinto. Closes + ticket 30045. + diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index edb8593142..6e504c8a82 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -174,16 +174,22 @@ The following options in this section are only recognized on the If the file descriptor is not specified, the passphrase is read from the terminal by default. -[[opt-key-expiration]] **`--key-expiration`** [__purpose__]:: +[[opt-key-expiration]] **`--key-expiration`** [__purpose__] [**`--format`** **`iso8601`**|**`timestamp`**]:: The __purpose__ specifies which type of key certificate to determine the expiration of. The only currently recognised __purpose__ is "sign". + + Running **`tor --key-expiration sign`** will attempt to find your signing key certificate and will output, both in the logs as well - as to stdout, the signing key certificate's expiration time in - ISO-8601 format. For example, the output sent to stdout will be - of the form: "signing-cert-expiry: 2017-07-25 08:30:15 UTC" + as to stdout. The optional **`--format`** argument lets you specify + the time format. Currently, **`iso8601`** and **`timestamp`** are + supported. If **`--format`** is not specified, the signing key + certificate's expiration time will be in ISO-8601 format. For example, + the output sent to stdout will be of the form: + "signing-cert-expiry: 2017-07-25 08:30:15 UTC". If **`--format`** **`timestamp`** + is specified, the signing key certificate's expiration time will be in + Unix timestamp format. For example, the output sent to stdout will be of the form: + "signing-cert-expiry: 1500971415". [[opt-dbg]] **--dbg-**...:: Tor may support other options beginning with the string "dbg". These diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index b2a34b808a..95c5665fb3 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -37,7 +37,7 @@ problem file-size /src/app/config/config.c 7525 problem include-count /src/app/config/config.c 81 problem function-size /src/app/config/config.c:options_act() 381 problem function-size /src/app/config/config.c:options_validate_cb() 794 -problem function-size /src/app/config/config.c:options_init_from_torrc() 198 +problem function-size /src/app/config/config.c:options_init_from_torrc() 231 problem function-size /src/app/config/config.c:options_init_from_string() 103 problem function-size /src/app/config/config.c:options_init_logs() 125 problem function-size /src/app/config/config.c:parse_bridge_line() 104 @@ -47,7 +47,7 @@ problem function-size /src/app/config/config.c:parse_dir_fallback_line() 101 problem function-size /src/app/config/config.c:port_parse_config() 435 problem function-size /src/app/config/config.c:parse_ports() 132 problem function-size /src/app/config/resolve_addr.c:resolve_my_address_v4() 197 -problem file-size /src/app/config/or_options_st.h 1050 +problem file-size /src/app/config/or_options_st.h 1069 problem include-count /src/app/main/main.c 71 problem function-size /src/app/main/main.c:dumpstats() 102 problem function-size /src/app/main/main.c:tor_init() 109 diff --git a/src/app/config/config.c b/src/app/config/config.c index a70c1d651e..1c6d4acd3e 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -2468,6 +2468,8 @@ static const struct { { .name="--key-expiration", .takes_argument=ARGUMENT_OPTIONAL, .command=CMD_KEY_EXPIRATION }, + { .name="--format", + .takes_argument=ARGUMENT_NECESSARY }, { .name="--newpass" }, { .name="--no-passphrase" }, { .name="--passphrase-fd", @@ -4425,6 +4427,39 @@ options_init_from_torrc(int argc, char **argv) } } + const config_line_t *format_line = config_line_find(cmdline_only_options, + "--format"); + if (format_line) { + if (command == CMD_KEY_EXPIRATION) { + const char *v = format_line->value; + // keep the same order as enum key_expiration_format + const char *formats[] = { "iso8601", "timestamp" }; + const int formats_len = sizeof(formats) / sizeof(formats[0]); + int format = -1; + for (int i = 0; i < formats_len; i++) { + if (!strcmp(v, formats[i])) { + format = i; + break; + } + } + + if (format < 0) { + log_err(LD_CONFIG, "Invalid --format value %s", escaped(v)); + retval = -1; + goto err; + } else { + get_options_mutable()->key_expiration_format = format; + } + } else { + log_err(LD_CONFIG, "--format specified without --key-expiration!"); + retval = -1; + goto err; + } + } else { + get_options_mutable()->key_expiration_format = + KEY_EXPIRATION_FORMAT_ISO8601; + } + if (config_line_find(cmdline_only_options, "--newpass")) { if (command == CMD_KEYGEN) { get_options_mutable()->change_key_passphrase = 1; diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 68be5711ce..774b476476 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -944,6 +944,11 @@ struct or_options_t { * ed25519 identity key except from tor --keygen */ int OfflineMasterKey; + enum { + KEY_EXPIRATION_FORMAT_ISO8601 = 0, + KEY_EXPIRATION_FORMAT_TIMESTAMP + } key_expiration_format; + enum { FORCE_PASSPHRASE_AUTO=0, FORCE_PASSPHRASE_ON, diff --git a/src/feature/relay/routerkeys.c b/src/feature/relay/routerkeys.c index d3de83cb86..f0fd101efd 100644 --- a/src/feature/relay/routerkeys.c +++ b/src/feature/relay/routerkeys.c @@ -519,19 +519,34 @@ print_cert_expiration(const char *expiration, /** * Log when a certificate, cert, with some description and - * stored in a file named fname, is going to expire. + * stored in a file named fname, is going to expire. Formats the expire + * time according to time_format. Valid time formats are in the + * key_expiration_format enum, in or_options_t. */ static void log_ed_cert_expiration(const tor_cert_t *cert, const char *description, - const char *fname) { - char expiration[ISO_TIME_LEN+1]; - + const char *fname, + int time_format) { if (BUG(!cert)) { /* If the specified key hasn't been loaded */ log_warn(LD_OR, "No %s key loaded; can't get certificate expiration.", description); } else { - format_local_iso_time(expiration, cert->valid_until); + char expiration[ISO_TIME_LEN+1]; + switch (time_format) { + case KEY_EXPIRATION_FORMAT_ISO8601: + format_local_iso_time(expiration, cert->valid_until); + break; + + case KEY_EXPIRATION_FORMAT_TIMESTAMP: + tor_snprintf(expiration, sizeof(expiration), "%"PRId64, + (int64_t) cert->valid_until); + break; + + default: + log_err(LD_BUG, "Unknown time format value: %d.", time_format); + return; + } log_notice(LD_OR, "The %s certificate stored in %s is valid until %s.", description, fname, expiration); print_cert_expiration(expiration, description); @@ -567,7 +582,8 @@ log_master_signing_key_cert_expiration(const or_options_t *options) /* If we do have a signing key, log the expiration time. */ if (signing_key) { - log_ed_cert_expiration(signing_key, "signing", fn); + int time_format = options->key_expiration_format; + log_ed_cert_expiration(signing_key, "signing", fn, time_format); } else { log_warn(LD_OR, "Could not load signing key certificate from %s, so " \ "we couldn't learn anything about certificate expiration.", fn); diff --git a/src/test/test_key_expiration.sh b/src/test/test_key_expiration.sh index 2238f7aa78..1ba8179aa1 100755 --- a/src/test/test_key_expiration.sh +++ b/src/test/test_key_expiration.sh @@ -61,6 +61,11 @@ fi CASE1=$dflt CASE2=$dflt CASE3=$dflt +CASE4=$dflt +CASE5=$dflt +CASE6=$dflt +CASE7=$dflt +CASE8=$dflt if [ $# -ge 1 ]; then eval "CASE${1}"=1 @@ -125,16 +130,17 @@ if [ "$CASE1" = 1 ]; then ${TOR} ${QUIETLY} --key-expiration 2>"$FN" || true grep "No valid argument to --key-expiration found!" "$FN" >/dev/null || \ - die "Tor didn't mention supported --key-expiration argmuents" + die "Tor didn't mention supported --key-expiration arguments" echo "==== Case 1: ok" fi if [ "$CASE2" = 1 ]; then - echo "==== Case 2: Start Tor with --key-expiration 'sign' and make sure it prints an expiration." + echo "==== Case 2: Start Tor with --key-expiration 'sign' and make sure it" + echo " prints an expiration using ISO8601 date format." ${TOR} ${QUIETLY} --key-expiration sign 2>"$FN" - grep "signing-cert-expiry:" "$FN" >/dev/null || \ + grep "signing-cert-expiry: [0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\} [0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\}" "$FN" >/dev/null || \ die "Tor didn't print an expiration" echo "==== Case 2: ok" @@ -160,3 +166,61 @@ if [ "$CASE3" = 1 ]; then echo "==== Case 3: ok" fi + +if [ "$CASE4" = 1 ]; then + echo "==== Case 4: Start Tor with --format iso8601 and make sure it prints an" + echo " error message due to missing --key-expiration argument." + + ${TOR} --format iso8601 > "$FN" 2>&1 || true + grep -- "--format specified without --key-expiration!" "$FN" >/dev/null || \ + die "Tor didn't print a missing --key-expiration error message" + + echo "==== Case 4: ok" +fi + +if [ "$CASE5" = 1 ]; then + echo "==== Case 5: Start Tor with --key-expiration 'sign' --format '' and" + echo " make sure it prints an error message due to missing value." + + ${TOR} --key-expiration sign --format > "$FN" 2>&1 || true + grep "Command-line option '--format' with no value. Failing." "$FN" >/dev/null || \ + die "Tor didn't print a missing format value error message" + + echo "==== Case 5: ok" +fi + +if [ "$CASE6" = 1 ]; then + echo "==== Case 6: Start Tor with --key-expiration 'sign' --format 'invalid'" + echo " and make sure it prints an error message due to invalid" + echo " value." + + ${TOR} --key-expiration sign --format invalid > "$FN" 2>&1 || true + grep "Invalid --format value" "$FN" >/dev/null || \ + die "Tor didn't print an invalid format value error message" + + echo "==== Case 6: ok" +fi + +if [ "$CASE7" = 1 ]; then + echo "==== Case 7: Start Tor with --key-expiration 'sign' --format 'iso8601'" + echo " and make sure it prints an expiration using ISO8601 date" + echo " format." + + ${TOR} ${QUIETLY} --key-expiration sign --format iso8601 2>"$FN" + grep "signing-cert-expiry: [0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\} [0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\}" "$FN" >/dev/null || \ + die "Tor didn't print an expiration" + + echo "==== Case 7: ok" +fi + +if [ "$CASE8" = 1 ]; then + echo "==== Case 8: Start Tor with --key-expiration 'sign' --format 'timestamp'" + echo " and make sure it prints an expiration using timestamp date" + echo " format." + + ${TOR} ${QUIETLY} --key-expiration sign --format timestamp 2>"$FN" + grep "signing-cert-expiry: [0-9]\{5,\}" "$FN" >/dev/null || \ + die "Tor didn't print an expiration" + + echo "==== Case 8: ok" +fi

1 0

[tor/master] Minor style improvements. #30045
by nickm＠torproject.org 04 Aug '20

04 Aug '20

commit ccdd0d801ae952d4c8219eea9acdd3acfd438924 Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Mon Aug 3 20:08:17 2020 +0100 Minor style improvements. #30045 --- scripts/maint/practracker/exceptions.txt | 4 ++-- src/app/config/config.c | 3 +-- src/app/config/or_options_st.h | 11 +++++++---- src/feature/relay/routerkeys.c | 7 +++---- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 95c5665fb3..b7d6d609b8 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -37,7 +37,7 @@ problem file-size /src/app/config/config.c 7525 problem include-count /src/app/config/config.c 81 problem function-size /src/app/config/config.c:options_act() 381 problem function-size /src/app/config/config.c:options_validate_cb() 794 -problem function-size /src/app/config/config.c:options_init_from_torrc() 231 +problem function-size /src/app/config/config.c:options_init_from_torrc() 230 problem function-size /src/app/config/config.c:options_init_from_string() 103 problem function-size /src/app/config/config.c:options_init_logs() 125 problem function-size /src/app/config/config.c:parse_bridge_line() 104 @@ -47,7 +47,7 @@ problem function-size /src/app/config/config.c:parse_dir_fallback_line() 101 problem function-size /src/app/config/config.c:port_parse_config() 435 problem function-size /src/app/config/config.c:parse_ports() 132 problem function-size /src/app/config/resolve_addr.c:resolve_my_address_v4() 197 -problem file-size /src/app/config/or_options_st.h 1069 +problem file-size /src/app/config/or_options_st.h 1072 problem include-count /src/app/main/main.c 71 problem function-size /src/app/main/main.c:dumpstats() 102 problem function-size /src/app/main/main.c:tor_init() 109 diff --git a/src/app/config/config.c b/src/app/config/config.c index 1c6d4acd3e..23f280891b 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -4434,9 +4434,8 @@ options_init_from_torrc(int argc, char **argv) const char *v = format_line->value; // keep the same order as enum key_expiration_format const char *formats[] = { "iso8601", "timestamp" }; - const int formats_len = sizeof(formats) / sizeof(formats[0]); int format = -1; - for (int i = 0; i < formats_len; i++) { + for (unsigned i = 0; i < ARRAY_LENGTH(formats); i++) { if (!strcmp(v, formats[i])) { format = i; break; diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 774b476476..9d620c7b62 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -35,6 +35,12 @@ typedef enum { TCP_PROXY_PROTOCOL_HAPROXY } tcp_proxy_protocol_t; +/** Enumeration of available time formats for output of --key-expiration */ +typedef enum { + KEY_EXPIRATION_FORMAT_ISO8601 = 0, + KEY_EXPIRATION_FORMAT_TIMESTAMP +} key_expiration_format_t; + /** Configuration options for a Tor process. */ struct or_options_t { uint32_t magic_; @@ -944,10 +950,7 @@ struct or_options_t { * ed25519 identity key except from tor --keygen */ int OfflineMasterKey; - enum { - KEY_EXPIRATION_FORMAT_ISO8601 = 0, - KEY_EXPIRATION_FORMAT_TIMESTAMP - } key_expiration_format; + key_expiration_format_t key_expiration_format; enum { FORCE_PASSPHRASE_AUTO=0, diff --git a/src/feature/relay/routerkeys.c b/src/feature/relay/routerkeys.c index f0fd101efd..744a73d936 100644 --- a/src/feature/relay/routerkeys.c +++ b/src/feature/relay/routerkeys.c @@ -520,14 +520,13 @@ print_cert_expiration(const char *expiration, /** * Log when a certificate, cert, with some description and * stored in a file named fname, is going to expire. Formats the expire - * time according to time_format. Valid time formats are in the - * key_expiration_format enum, in or_options_t. + * time according to time_format. */ static void log_ed_cert_expiration(const tor_cert_t *cert, const char *description, const char *fname, - int time_format) { + key_expiration_format_t time_format) { if (BUG(!cert)) { /* If the specified key hasn't been loaded */ log_warn(LD_OR, "No %s key loaded; can't get certificate expiration.", description); @@ -582,7 +581,7 @@ log_master_signing_key_cert_expiration(const or_options_t *options) /* If we do have a signing key, log the expiration time. */ if (signing_key) { - int time_format = options->key_expiration_format; + key_expiration_format_t time_format = options->key_expiration_format; log_ed_cert_expiration(signing_key, "signing", fn, time_format); } else { log_warn(LD_OR, "Could not load signing key certificate from %s, so " \

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/100'
by nickm＠torproject.org 04 Aug '20

04 Aug '20

commit 04926126ee7fd9bbaefe5890d238fd8156124a5b Merge: e069b0af4b ccdd0d801a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 4 13:28:51 2020 -0400 Merge remote-tracking branch 'tor-gitlab/mr/100' changes/feature30045 | 6 +++ doc/man/tor.1.txt | 14 +++++-- scripts/maint/practracker/exceptions.txt | 4 +- src/app/config/config.c | 34 ++++++++++++++++ src/app/config/or_options_st.h | 8 ++++ src/feature/relay/routerkeys.c | 27 +++++++++--- src/test/test_key_expiration.sh | 70 ++++++++++++++++++++++++++++++-- 7 files changed, 148 insertions(+), 15 deletions(-)

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 04 Aug '20

04 Aug '20

commit 833efefa2c68297c7a4e060ab8a9ed7346b967a7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 4 13:16:49 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es.po b/es.po index e05f291354..bd3daa7668 100644 --- a/es.po +++ b/es.po @@ -15,14 +15,14 @@ # Manuel Herrera <ma_herrer(a)yahoo.com.mx>, 2013 # de1ca222968aa9b5291789e94a1b3b8a_f1329af, 2018 # strel, 2013-2018 -# Zuhualime Akoochimoya, 2018 +# Zuhualime Akoochimoya, 2018,2020 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-27 05:58+0200\n" -"PO-Revision-Date: 2020-08-01 10:26+0000\n" -"Last-Translator: Emma Peel\n" +"PO-Revision-Date: 2020-08-04 13:04+0000\n" +"Last-Translator: Zuhualime Akoochimoya\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 04 Aug '20

04 Aug '20

commit 0a29bdd45a48538e7ec6d91f327733efec72f724 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 4 13:16:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- es.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/es.po b/es.po index c5af90151a..4b143bed4e 100644 --- a/es.po +++ b/es.po @@ -15,14 +15,14 @@ # Manuel Herrera <ma_herrer(a)yahoo.com.mx>, 2013 # de1ca222968aa9b5291789e94a1b3b8a_f1329af, 2018 # strel, 2013-2018 -# Zuhualime Akoochimoya, 2018 +# Zuhualime Akoochimoya, 2018,2020 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-27 05:58+0200\n" -"PO-Revision-Date: 2020-08-01 10:26+0000\n" -"Last-Translator: Emma Peel\n" +"PO-Revision-Date: 2020-08-04 13:04+0000\n" +"Last-Translator: Zuhualime Akoochimoya\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1413,7 +1413,7 @@ msgid "" "The Unsafe Browser is not anonymous and the websites that you visit can see " "your real IP address.\\n\\nOnly use the Unsafe Browser to log in to a " "captive portal or browse trusted web pages on the local network." -msgstr "" +msgstr "El Navegador Inseguro no es anónimo, y los sitios web que visitas pueden ver tu dirección IP real.\\n\\nSolo usa el Navegador Inseguro para iniciar sesión en un portal cautivo o navegar páginas web en las cuales confías, en la red local." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51 msgid "Starting the Unsafe Browser..." @@ -1447,7 +1447,7 @@ msgstr "Navegador No Seguro" msgid "" "The Unsafe Browser was not enabled in the Welcome Screen.\\n\\nTo use the Unsafe Browser, restart Tails and enable the Unsafe Browser in the additional settings of the Welcome Screen.\\n\n" "To always enable the Unsafe Browser, turn on the Welcome Screen feature of the Persistent Storage." -msgstr "" +msgstr "El Navegador Inseguro no fue habilitado en la Pantalla de Bienvenida.\\n\\nPara usar el Navegador Inseguro, vuelve a arrancar Tails y habilita el Navegador Inseguro en los ajustes adicionales de la Pantalla de Bienvenida.\\n\nPara habilitar siempre el Navegador Inseguro, activa la característica Pantalla de Bienvenida del Almacenamiento Persistente." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:99 msgid "" @@ -1637,7 +1637,7 @@ msgid "" "A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n" "\n" "The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals." -msgstr "" +msgstr "El Navegador Inseguro te permite iniciar sesión en un portal cautivo.\n\nUn portal cautivo es una página web que es mostrada antes de que puedas acceder al Internet. Los portales cautivos usualmente requieren iniciar sesión en la red o ingresar información tal como una dirección de correo electrónico.\n\nEl Navegador Inseguro no es anónimo, y puede deanonimizarte. Úsalo solamente para iniciar sesión en portales cautivos." #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572 msgid "Disable the Unsafe Browser (default)"

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 04 Aug '20

04 Aug '20

commit f434531fc72ba338caf4ef0bac60ad5e4d8ad0c9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 4 10:46:42 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- sv.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv.po b/sv.po index fda013f4a3..3bca016fd0 100644 --- a/sv.po +++ b/sv.po @@ -14,7 +14,7 @@ # Jonatan Nyberg <jonatan.nyberg.karl(a)gmail.com>, 2017 # Jonatan Nyberg <jonatan.nyberg.karl(a)gmail.com>, 2018-2020 # Jonatan Nyberg <jonatan.nyberg.karl(a)gmail.com>, 2017 -# pilino1234 <pilino1234(a)zoho.eu>, 2016 +# Martin H <pilino1234(a)zoho.eu>, 2016 # 56de39dbda2b12eb73bb0082f99d9075_c272587, 2014 # ph AA, 2015 # phst, 2015

1 0

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

04 Aug '20

commit e00693b8448f219fd43803fe3f892a866b68e349 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 4 10:45:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/sw/LC_MESSAGES/messages.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/sw/LC_MESSAGES/messages.po b/locale/sw/LC_MESSAGES/messages.po index f926e4b560..bdd135fdba 100644 --- a/locale/sw/LC_MESSAGES/messages.po +++ b/locale/sw/LC_MESSAGES/messages.po @@ -393,7 +393,7 @@ msgstr "" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:152 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:158 msgid "donate" -msgstr "" +msgstr "Toa" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:154 msgid "once"

1 0

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

03 Aug '20

commit 78b1c1ec296b2efff97d42259c6cf74a56556eaf Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 3 22:45:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/es/LC_MESSAGES/messages.po | 44 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po index ca192fadf3..7236402d35 100644 --- a/locale/es/LC_MESSAGES/messages.po +++ b/locale/es/LC_MESSAGES/messages.po @@ -2542,6 +2542,9 @@ msgid "" "Contributions may be tax deductible pursuant to the provisions of sec. " "170(c) of the Internal Revenue Code of 1986, 26 U.S.C. ¤170(c)." msgstr "" +"Las contribuciones pueden ser deducibles de impuestos de acuerdo a las " +"provisiones de la sección 170(c) del Código Tributario Interno de 1986, 26 " +"U.S.C. ¤170(c)." #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:111 msgid "New Jersey" @@ -2557,10 +2560,17 @@ msgid "" "href=\"https://www.state.nj.us/lps/ca/charfrm.htm\" target=\"_blank\" " "class=\"hyperlinks links\">www.state.nj.us/lps/ca/charfrm.htm</a>." msgstr "" +"La Información cursada con el fiscal general concerniente a esta " +"solicitación caritativa y el porcentaje de contribuciones recibidas por la " +"caridad durante el último periodo reportado que fuera dedicado al propósito " +"caritativo puede ser obtenida del fiscal general del estado de New Jersey " +"llamando al (973) 504-6215, y está disponible en Internet en <a " +"href=\"https://www.state.nj.us/lps/ca/charfrm.htm\" target=\"_blank\" " +"class=\"hyperlinks links\">www.state.nj.us/lps/ca/charfrm.htm</a>." #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:115 msgid "Registration with the attorney general does not imply endorsement." -msgstr "" +msgstr "El registro con el fiscal general no implica apoyo." #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:119 msgid "New York" @@ -2573,6 +2583,10 @@ msgid "" "href=\"https://www.charitiesnys.com\" target=\"_blank\" class=\"hyperlinks " "links\">www.charitiesnys.com</a>." msgstr "" +"Por solicitud, de la Oficina de Caridades del Fiscal General, 28 Liberty " +"Street, New York, NY 10005, 1-212-416-8686 o <a " +"href=\"https://www.charitiesnys.com\" target=\"_blank\" class=\"hyperlinks " +"links\">www.charitiesnys.com</a>." #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:125 msgid "North Carolina" @@ -2583,10 +2597,13 @@ msgid "" "Financial information about this organization and a copy of its license are " "available from the State Solicitation Licensing Branch at 1-919-814-5400." msgstr "" +"La información financiera acerca de esta organización y una copia de su " +"licencia están puestas a disposición por la Rama Licenciataria de " +"Solicitaciones Estatales, al 1-919-814-5400." #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:129 msgid "The license is not an endorsement by the state." -msgstr "" +msgstr "La licencia no es un apoyo por parte del estado." #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:133 msgid "Pennsylvania" @@ -2598,6 +2615,9 @@ msgid "" " may be obtained from the Pennsylvania Department of State by calling toll-" "free, within Pennsylvania, 1-800-732-0999." msgstr "" +"El registro oficial y la información financiera de The Tor Project, Inc. " +"puede ser obtenida del Departamento de Estado de Pennsylvania llamando sin " +"cargo, dentro de Pennsylvania, al 1-800-732-0999." #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:139 msgid "Virginia" @@ -2608,6 +2628,8 @@ msgid "" "From the State Office of Consumer Affairs in the Department of Agriculture " "and Consumer Affairs, P.O. Box 1163, Richmond, VA 23218." msgstr "" +"De la Oficina de Estado para Asuntos del Consumidor en el Departamento de " +"Agricultura y Asuntos del Consumidor, P.O. Box 1163, Richmond, VA 23218." #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:145 msgid "Washington" @@ -2619,6 +2641,9 @@ msgid "" "href=\"http://www.sos.wa.gov/charities\" target=\"_blank\" " "class=\"hyperlinks links\">http://www.sos.wa.gov/charities/</a>" msgstr "" +"Del Secretario de Estado al 1-800-332-4483 o <a " +"href=\"http://www.sos.wa.gov/charities\" target=\"_blank\" " +"class=\"hyperlinks links\">http://www.sos.wa.gov/charities/</a>" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:151 msgid "West Virginia" @@ -2630,6 +2655,9 @@ msgid "" "financial documents from the Secretary of State, State Capitol, Charleston, " "WV 25305." msgstr "" +"Los residentes de West Virginia pueden obtener un sumario del registro y " +"documentos financieros del Secretario de Estado, Capitolio Estatal, " +"Charleston, WV 25305." #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:157 msgid "Wisconsin" @@ -2641,12 +2669,17 @@ msgid "" "liabilities, fund balances, revenue and expenses for the preceding fiscal " "year will be provided to any person upon request." msgstr "" +"Una declaración financiera de la organización caritativa revelando activos, " +"pasivos, balances del fondo, recaudación y gastos para el año fiscal " +"precedente será provista a cualquier persona por solicitud." #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:163 msgid "" "Registration with a state agency does not constitute or imply endorsement, " "approval or recommendation by that state." msgstr "" +"El registro con una agencia estatal no constituye o implica apoyo, " +"aprobación o recomendación por ese estado." #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:167 msgid "" @@ -2658,6 +2691,13 @@ msgid "" "paper/\" target=\"_blank\" class=\"hyperlinks links\">charitable state " "registrations</a>." msgstr "" +"Más información acerca de <a href=\"http://www.labyrinthinc.com/charity-" +"resources/nonprofit-regulations/fundraising-disclosure-statements/\" " +"target=\"_blank\" class=\"hyperlinks links\">verborres de declaraciones " +"estatales</a> y <a href=\"http://www.labyrinthinc.com/charity-resources" +"/annual-charitable-state-registrations/charity-solicitation-registration-" +"white-paper/\" target=\"_blank\" class=\"hyperlinks links\">registros " +"estatales de caridades</a>." #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:175 msgid "Back to Donate FAQ"

1 0

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

03 Aug '20

commit c1d6476abc51d4aa9310d794cdd356df44b103b0 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 3 22:15:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/es/LC_MESSAGES/messages.po | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po index 984f7e3b05..ca192fadf3 100644 --- a/locale/es/LC_MESSAGES/messages.po +++ b/locale/es/LC_MESSAGES/messages.po @@ -5,9 +5,8 @@ # str4d <str4d(a)i2pmail.org>, 2018 # Martus Translations <translations(a)martus.org>, 2018 # strel, 2018 -# Anatoli F. Peña Castillo <djanatoli(a)gmail.com>, 2018 -# Zuhualime Akoochimoya, 2019 -# sim, 2019 +# Anatoli Pena <djanatoli(a)gmail.com>, 2018 +# de1ca222968aa9b5291789e94a1b3b8a_f1329af, 2019 # Alfredo Duro <AlfredoDuroexplota(a)protonmail.com>, 2019 # eulalio barbero espinosa <eulaliob(a)gmail.com>, 2019 # Emma Peel, 2019 @@ -15,10 +14,11 @@ # Bry, 2020 # David Figuera <dfb(a)fastmail.com>, 2020 # Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2020 +# Zuhualime Akoochimoya, 2020 # msgid "" msgstr "" -"Last-Translator: Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2020\n" +"Last-Translator: Zuhualime Akoochimoya, 2020\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -2317,7 +2317,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:843 msgid "State Registration Disclosures" -msgstr "" +msgstr "Declaraciones de Registros Estatales" #: tmp/cache_locale/6c/6cd01cfbd4684dcca4eada963c78b5d694a2f40cd309be9366b080c410b3c5a0.php:53 msgid "Subscribed | Tor" @@ -2464,11 +2464,11 @@ msgstr "Quiero ser Voluntario" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:53 msgid "Tor State Nonprofit Disclosures" -msgstr "" +msgstr "Declaraciones Estatales Sin Fines de Lucro de Tor" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:64 msgid "State Nonprofit Disclosures" -msgstr "" +msgstr "Declaraciones Estatales Sin Fines de Lucro" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:79 msgid "" @@ -2489,16 +2489,22 @@ msgid "" " the state, 1-800-435-7352 (800-HELP-FLA), or visiting " "www.FloridaConsumerHelp.com." msgstr "" +"una copia del registro oficial y de la información financiera puede ser " +"obtenida de la división de servicios al consumidor llamando sin cargo, " +"dentro del estado, al 1-800-435-7352 (800-HELP-FLA), o visitando " +"www.FloridaConsumerHelp.com." #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:87 msgid "" "Registration does not imply endorsement, approval, or recommendation by the " "state." msgstr "" +"El registo no implica el apoyo, aprobación, o recomendación por parte del " +"estado." #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:89 msgid "Florida Registration #CH58356" -msgstr "" +msgstr "Registro de Florida #CH58356" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:93 msgid "Georgia" @@ -2510,6 +2516,10 @@ msgid "" "summary is available upon request at The Tor Project, Inc.; 217 First Avenue" " South #4903; Seattle, WA 98194 and phone number 206-420-3136." msgstr "" +"Una descripción completa y ajustada de nuestros programas y el sumario de " +"nuestras declaraciones financieras están disponibles por solicitud al The " +"Tor Project, Inc.; 217 First Avenue South #4903; Seattle, WA 98194, y al " +"número de teléfono 206-420-3136." #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:99 msgid "Maryland" @@ -2520,6 +2530,8 @@ msgid "" "For the cost of copies and postage, from the Office of the Secretary of " "State, State House, Annapolis, MD 21401." msgstr "" +"Por el costo de las copias y envío postal, desde la Oficina del Secretario " +"de Estado, Casa Estatal, Annapolis, MD 21401." #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:105 msgid "Nevada"

1 0

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

03 Aug '20

commit 42de0bb05b885d6f5dcfa31e3d3d20812f25f18a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 3 20:48:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/contents+ar.po b/contents+ar.po index a324a5d44d..0ddc76fa17 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -1400,6 +1400,9 @@ msgid "" "desktop operating systems are Windows, macOS and Linux. Android and iOS are " "the dominant mobile operating systems." msgstr "" +"برنامج النظام الرئيسي الذي يدير أجهزة الكمبيوتر وموارد البرامج ويوفر خدمات " +"مشتركة لبرامج الكمبيوتر. أكثر أنظمة تشغيل سطح المكتب استخدامًا هي ويندوز و " +"ماك او اس و لينكس. اندرويد و اي او اس هما أنظمة التشغيل المحمولة السائدة." #: https//support.torproject.org/glossary/orbot/ #: (content/glossary/orbot/contents+en.lrword.term) @@ -1416,6 +1419,13 @@ msgid "" "[traffic](../traffic) and hide it by bouncing through a series of computers " "around the world." msgstr "" +"[Orbot] " +"(https://play.google.com/store/apps/details؟id=org.torproject.android) عبارة" +" عن [تطبيق] (../ تطبيق) مجاني من The Guardian Project يمكّن التطبيقات الأخرى" +" على الجهاز لاستخدام الإنترنت بشكل أكثر أمانًا. يستخدم Orbot [Tor] (../ tor-" +"tor-network-core-tor) لـ [تشفير] (../ تشفير) الإنترنت الخاص بك [حركة المرور]" +" (../ حركة المرور) وإخفائه عن طريق الارتداد عبر سلسلة من أجهزة الكمبيوتر حول" +" العالم." #: https//support.torproject.org/glossary/orfox/ #: (content/glossary/orfox/contents+en.lrword.term)

1 0