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

[tor/maint-0.4.0] changes: add file for #21377
by teor＠torproject.org 26 Mar '19

26 Mar '19

commit 6ecf9590eae8cac125705d2f99b284de998d5649 Author: juga0 <juga(a)riseup.net> Date: Fri Dec 21 17:10:19 2018 +0000 changes: add file for #21377 --- changes/ticket21377 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket21377 b/changes/ticket21377 new file mode 100644 index 000000000..2bf5149a0 --- /dev/null +++ b/changes/ticket21377 @@ -0,0 +1,4 @@ + o Minor features (dircache): + - When a directory authority is using a bandwidth file to obtain the + bandwidth values that will be included in the next vote, serve this + bandwidth file at /tor/status-vote/next/bandwidth. Closes ticket 21377. \ No newline at end of file

1 0

[tor/master] bwauth: check if a bw file could be read
by teor＠torproject.org 26 Mar '19

26 Mar '19

commit b75e2539f9994dc04ee7662445878e8486eb77b0 Author: juga0 <juga(a)riseup.net> Date: Wed Nov 7 12:04:09 2018 +0000 bwauth: check if a bw file could be read Before serving it by HTTP. --- src/feature/dircache/dircache.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c index 2aaaf7be1..d9625ee69 100644 --- a/src/feature/dircache/dircache.c +++ b/src/feature/dircache/dircache.c @@ -1453,13 +1453,15 @@ handle_get_next_bandwidth(dir_connection_t *conn, int lifetime = 60; char *bandwidth = read_file_to_str(options->V3BandwidthsFile, RFTS_IGNORE_MISSING, NULL); - size_t len = strlen(bandwidth); - write_http_response_header(conn, len, NO_METHOD, lifetime); - connection_buf_add(bandwidth, len, TO_CONN(conn)); - tor_free(bandwidth); - } else { - write_short_http_response(conn, 404, "Not found"); + if (bandwidth != NULL) { + site_t len = strlen(bandwidth); + write_http_response_header(conn, len, NO_METHOD, lifetime); + connection_buf_add(bandwidth, len, TO_CONN(conn)); + tor_free(bandwidth); + return 0; + } } + write_short_http_response(conn, 404, "Not found"); return 0; }

1 0

[tor/master] bwauth: check and use compression serving bw file
by teor＠torproject.org 26 Mar '19

26 Mar '19

commit 4d3502e45bc9b0da91b32c362a7995f33cee0539 Author: juga0 <juga(a)riseup.net> Date: Wed Nov 7 12:15:31 2018 +0000 bwauth: check and use compression serving bw file --- src/feature/dircache/dircache.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c index d9625ee69..e5ea9f73b 100644 --- a/src/feature/dircache/dircache.c +++ b/src/feature/dircache/dircache.c @@ -1449,14 +1449,28 @@ handle_get_next_bandwidth(dir_connection_t *conn, (void)args; log_debug(LD_DIR, "Getting next bandwidth."); const or_options_t *options = get_options(); + const compress_method_t compress_method = + find_best_compression_method(args->compression_supported, 1); + if (options->V3BandwidthsFile) { int lifetime = 60; char *bandwidth = read_file_to_str(options->V3BandwidthsFile, RFTS_IGNORE_MISSING, NULL); if (bandwidth != NULL) { - site_t len = strlen(bandwidth); - write_http_response_header(conn, len, NO_METHOD, lifetime); - connection_buf_add(bandwidth, len, TO_CONN(conn)); + ssize_t len = strlen(bandwidth); + write_http_response_header(conn, compress_method != NO_METHOD ? -1 : len, + compress_method, BANDWIDTH_CACHE_LIFETIME); + if (compress_method != NO_METHOD) { + conn->compress_state = tor_compress_new(1, compress_method, + choose_compression_level(len/2)); + log_debug(LD_DIR, "Compressing bandwidth file."); + connection_buf_add_compress(bandwidth, len, conn, 0); + /* Flush the compression state. */ + connection_buf_add_compress("", 0, conn, 1); + } else { + log_debug(LD_DIR, "Not compressing bandwidth file."); + connection_buf_add(bandwidth, len, TO_CONN(conn)); + } tor_free(bandwidth); return 0; }

1 0

[tor/maint-0.4.0] dircache: fix identation and remove unneded goto
by teor＠torproject.org 26 Mar '19

26 Mar '19

commit da7a8d7624b76053210bad6f830df7842a4b30f1 Author: juga0 <juga(a)riseup.net> Date: Mon Nov 19 17:27:41 2018 +0000 dircache: fix identation and remove unneded goto --- src/test/test_dir_handle_get.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index 0cd7e1050..22f5a9b3d 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -2548,14 +2548,14 @@ test_dir_handle_get_status_vote_next_bandwidth(void* data) * If it would, the size and content would be different than the original. */ - done: - UNMOCK(get_options); - UNMOCK(connection_write_to_buf_impl_); - connection_free_minimal(TO_CONN(conn)); - tor_free(header); - tor_free(body); - tor_free(expires); - or_options_free(mock_options); mock_options = NULL; + done: + UNMOCK(get_options); + UNMOCK(connection_write_to_buf_impl_); + connection_free_minimal(TO_CONN(conn)); + tor_free(header); + tor_free(body); + tor_free(expires); + or_options_free(mock_options); } static void

1 0

[tor/master] test: check that .../bandwidth.z is compressed
by teor＠torproject.org 26 Mar '19

26 Mar '19

commit a4bf3be8bce662c77422fb88072e4685083e90b2 Author: juga0 <juga(a)riseup.net> Date: Wed Nov 7 12:40:51 2018 +0000 test: check that .../bandwidth.z is compressed --- src/test/test_dir_handle_get.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index 6d478f6b4..0cd7e1050 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -2529,6 +2529,25 @@ test_dir_handle_get_status_vote_next_bandwidth(void* data) tt_int_op(body_used, OP_EQ, strlen(body)); tt_str_op(content, OP_EQ, body); + tor_free(header); + tor_free(body); + + /* Request the file using compression, the result should be the same. */ + tt_int_op(0, OP_EQ, directory_handle_command_get(conn, + GET("/tor/status-vote/next/bandwidth.z"), NULL, 0)); + + fetch_from_buf_http(TO_CONN(conn)->outbuf, &header, MAX_HEADERS_SIZE, + &body, &body_used, strlen(content)+1, 0); + + tt_assert(header); + tt_ptr_op(strstr(header, "HTTP/1.0 200 OK\r\n"), OP_EQ, header); + tt_assert(strstr(header, "Content-Encoding: deflate\r\n")); + + /* Since using connection_write_to_buf_mock instead of mocking + * connection_buf_add_compress, the content is not actually compressed. + * If it would, the size and content would be different than the original. + */ + done: UNMOCK(get_options); UNMOCK(connection_write_to_buf_impl_);

1 0

[tor/master] test: Check bw file cache lifetime
by teor＠torproject.org 26 Mar '19

26 Mar '19

commit fb4a40c32c4a7e5b7175ea2c635687b6b24a29d0 Author: juga0 <juga(a)riseup.net> Date: Wed Nov 7 12:38:45 2018 +0000 test: Check bw file cache lifetime --- src/test/test_dir_handle_get.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index 8b2ee3eca..6d478f6b4 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -2516,6 +2516,16 @@ test_dir_handle_get_status_vote_next_bandwidth(void* data) tt_assert(strstr(header, "Content-Encoding: identity\r\n")); tt_assert(strstr(header, "Content-Length: 167\r\n")); + /* Check cache lifetime */ + char expbuf[RFC1123_TIME_LEN+1]; + time_t now = time(NULL); + /* BANDWIDTH_CACHE_LIFETIME is defined in dircache.c. */ + format_rfc1123_time(expbuf, (time_t)(now + 30*60)); + char *expires = NULL; + /* Change to 'Cache-control: max-age=%d' if using http/1.1. */ + tor_asprintf(&expires, "Expires: %s\r\n", expbuf); + tt_assert(strstr(header, expires)); + tt_int_op(body_used, OP_EQ, strlen(body)); tt_str_op(content, OP_EQ, body); @@ -2525,6 +2535,7 @@ test_dir_handle_get_status_vote_next_bandwidth(void* data) connection_free_minimal(TO_CONN(conn)); tor_free(header); tor_free(body); + tor_free(expires); or_options_free(mock_options); mock_options = NULL; }

1 0

[tor/master] bwauth: remove declaring args, they are now in use
by teor＠torproject.org 26 Mar '19

26 Mar '19

commit 892b918b6610d662a9536d29c4edf9f4eac5da88 Author: juga0 <juga(a)riseup.net> Date: Thu Nov 8 09:13:54 2018 +0000 bwauth: remove declaring args, they are now in use --- src/feature/dircache/dircache.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c index 0f92dfaea..14c6302c2 100644 --- a/src/feature/dircache/dircache.c +++ b/src/feature/dircache/dircache.c @@ -1447,7 +1447,6 @@ static int handle_get_next_bandwidth(dir_connection_t *conn, const get_handler_args_t *args) { - (void)args; log_debug(LD_DIR, "Getting next bandwidth."); const or_options_t *options = get_options(); const compress_method_t compress_method =

1 0

[tor/master] bwauth: increment bw file cache lifetime
by teor＠torproject.org 26 Mar '19

26 Mar '19

commit 76271347438ff03796a9424019860332f50c5134 Author: juga0 <juga(a)riseup.net> Date: Wed Nov 7 12:19:20 2018 +0000 bwauth: increment bw file cache lifetime Increment bw file cache lifetime when serving it by HTTP. And add a constant to define that lifetime. --- src/feature/dircache/dircache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c index e5ea9f73b..0f92dfaea 100644 --- a/src/feature/dircache/dircache.c +++ b/src/feature/dircache/dircache.c @@ -49,7 +49,8 @@ #define ROUTERDESC_BY_DIGEST_CACHE_LIFETIME (48*60*60) #define ROBOTS_CACHE_LIFETIME (24*60*60) #define MICRODESC_CACHE_LIFETIME (48*60*60) - +/* Bandwidth files change every hour. */ +#define BANDWIDTH_CACHE_LIFETIME (30*60) /** Parse an HTTP request string <b>headers</b> of the form * \verbatim * "\%s [http[s]://]\%s HTTP/1..." @@ -1453,7 +1454,6 @@ handle_get_next_bandwidth(dir_connection_t *conn, find_best_compression_method(args->compression_supported, 1); if (options->V3BandwidthsFile) { - int lifetime = 60; char *bandwidth = read_file_to_str(options->V3BandwidthsFile, RFTS_IGNORE_MISSING, NULL); if (bandwidth != NULL) {

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 26 Mar '19

26 Mar '19

commit 441a8ae06654325d4a0eb81ce632243ba5f14a1c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 26 08:21:34 2019 +0000 Update translations for support-portal --- contents+el.po | 89 +++++++++++++++++++++++++++++-------------------------- contents+zh-CN.po | 86 ++++++++++++++++++++++++++--------------------------- 2 files changed, 90 insertions(+), 85 deletions(-) diff --git a/contents+el.po b/contents+el.po index 99e1aa649..82f2dc413 100644 --- a/contents+el.po +++ b/contents+el.po @@ -5,8 +5,8 @@ # Panos <alwayslivid(a)protonmail.com>, 2019 # erinm, 2019 # A Papac <ap909219(a)protonmail.com>, 2019 -# Emma Peel, 2019 # Adrian Pappas <pappasadrian(a)gmail.com>, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-03-19 08:55+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Adrian Pappas <pappasadrian(a)gmail.com>, 2019\n" +"Last-Translator: Emma Peel, 2019\n" "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,6 +41,11 @@ msgid "" "translation tool. In order to begin contributing you will have to sign up " "with Transifex. Below is an outline of how to sign up and begin." msgstr "" +"Αν ενδιαφέρεστε να βοηθήσετε το project με τη μετάφραση του manual ή του Tor" +" Browser στη γλώσσα σας, η βοήθειά σας θα εκτιμηθεί ιδιαίτερα! Για να " +"ξεκινήσετε να συνεισφέρετε θα πρέπει να εγγραφείτε στο Transifex, το τρίτο " +"μέρος που διευκολύνει με τις μεταφράσεις μας. Παρακάτω περιγράφεται το πώς " +"να εγγραφείτε και να ξεκινήσετε." #: https//support.torproject.org/becoming-tor-translator/ #: (content/becoming-tor-translator/contents+en.lrquestion.description) @@ -3927,7 +3932,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Atlas" -msgstr "" +msgstr "### Atlas" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -3939,7 +3944,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## B" -msgstr "" +msgstr "## B" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4030,12 +4035,12 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## C" -msgstr "" +msgstr "## C" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### captcha" -msgstr "" +msgstr "### captcha" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4100,7 +4105,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Compass" -msgstr "" +msgstr "### Compass" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4171,7 +4176,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## D" -msgstr "" +msgstr "## D" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4201,7 +4206,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## E" -msgstr "" +msgstr "## E" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4247,7 +4252,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### ExoneraTor" -msgstr "" +msgstr "### ExoneraTor" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4262,12 +4267,12 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## F" -msgstr "" +msgstr "## F" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Firefox" -msgstr "" +msgstr "### Firefox" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4329,7 +4334,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### fte" -msgstr "" +msgstr "### fte" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4341,12 +4346,12 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## G" -msgstr "" +msgstr "## G" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### GetTor" -msgstr "" +msgstr "### GetTor" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4595,7 +4600,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## N" -msgstr "" +msgstr "## N" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4668,7 +4673,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### NoScript" -msgstr "" +msgstr "### NoScript" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4696,12 +4701,12 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## O" -msgstr "" +msgstr "## O" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### obfs3" -msgstr "" +msgstr "### obfs3" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4786,7 +4791,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Onionoo" -msgstr "" +msgstr "### Onionoo" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4843,7 +4848,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Orbot" -msgstr "" +msgstr "### Orbot" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4858,7 +4863,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Orfox" -msgstr "" +msgstr "### Orfox" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4873,7 +4878,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## P" -msgstr "" +msgstr "## P" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4991,12 +4996,12 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## Q" -msgstr "" +msgstr "## Q" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## R" -msgstr "" +msgstr "## R" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5014,12 +5019,12 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## S" -msgstr "" +msgstr "## S" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Satori" -msgstr "" +msgstr "### Satori" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5033,7 +5038,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### ScrambleSuit" -msgstr "" +msgstr "### ScrambleSuit" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5133,7 +5138,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Stem" -msgstr "" +msgstr "### Stem" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5159,12 +5164,12 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## T" -msgstr "" +msgstr "## T" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Tails" -msgstr "" +msgstr "### Tails" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5253,7 +5258,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Tor Browser" -msgstr "" +msgstr "### Tor Browser" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5371,7 +5376,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Tor Messenger" -msgstr "" +msgstr "### Tor Messenger" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5397,7 +5402,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### TorBirdy" -msgstr "" +msgstr "### TorBirdy" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5409,7 +5414,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Torbutton" -msgstr "" +msgstr "### Torbutton" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5438,7 +5443,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Torsocks" -msgstr "" +msgstr "### Torsocks" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5457,7 +5462,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Tor2Web" -msgstr "" +msgstr "### Tor2Web" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5477,7 +5482,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### TPI" -msgstr "" +msgstr "### TPI" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5487,7 +5492,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### tpo" -msgstr "" +msgstr "### tpo" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5566,17 +5571,17 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## X" -msgstr "" +msgstr "## X" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## Y" -msgstr "" +msgstr "## Y" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## Z" -msgstr "" +msgstr "## Z" #: https//support.torproject.org/misc/menu/ #: (content/misc/menu/contents+en.lrquestion.description) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 43657f673..54c481bef 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -3562,7 +3562,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Atlas" -msgstr "" +msgstr "### Atlas" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -3574,7 +3574,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## B" -msgstr "" +msgstr "## B" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -3665,7 +3665,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## C" -msgstr "" +msgstr "## C" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -3735,7 +3735,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Compass" -msgstr "" +msgstr "### Compass" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -3806,7 +3806,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## D" -msgstr "" +msgstr "## D" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -3836,7 +3836,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## E" -msgstr "" +msgstr "## E" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -3882,7 +3882,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### ExoneraTor" -msgstr "" +msgstr "### ExoneraTor" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -3897,12 +3897,12 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## F" -msgstr "" +msgstr "## F" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Firefox" -msgstr "" +msgstr "### Firefox" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -3976,12 +3976,12 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## G" -msgstr "" +msgstr "## G" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### GetTor" -msgstr "" +msgstr "### GetTor" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -3994,7 +3994,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### GSoC" -msgstr "" +msgstr "### GSoC" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4019,7 +4019,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## H" -msgstr "" +msgstr "## H" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4076,7 +4076,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### HTTPS" -msgstr "" +msgstr "### HTTPS" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4107,7 +4107,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## I" -msgstr "" +msgstr "## I" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4153,12 +4153,12 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## J" -msgstr "" +msgstr "## J" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### JavaScript" -msgstr "" +msgstr "### JavaScript" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4180,7 +4180,7 @@ msgstr "## K" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## L" -msgstr "" +msgstr "## L" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4197,12 +4197,12 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## M" -msgstr "" +msgstr "## M" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### meek" -msgstr "" +msgstr "### meek" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4230,7 +4230,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## N" -msgstr "" +msgstr "## N" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4336,7 +4336,7 @@ msgstr "## O" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### obfs3" -msgstr "" +msgstr "### obfs3" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4350,7 +4350,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### obfs4" -msgstr "" +msgstr "### obfs4" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4376,7 +4376,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### OONI" -msgstr "" +msgstr "### OONI" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4478,7 +4478,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Orbot" -msgstr "" +msgstr "### Orbot" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4493,7 +4493,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Orfox" -msgstr "" +msgstr "### Orfox" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4508,7 +4508,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## P" -msgstr "" +msgstr "## P" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4631,7 +4631,7 @@ msgstr "## Q" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## R" -msgstr "" +msgstr "## R" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4649,12 +4649,12 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## S" -msgstr "" +msgstr "## S" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Satori" -msgstr "" +msgstr "### Satori" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4768,7 +4768,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Stem" -msgstr "" +msgstr "### Stem" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4794,7 +4794,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## T" -msgstr "" +msgstr "## T" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4888,7 +4888,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Tor Browser" -msgstr "" +msgstr "### Tor Browser" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5006,7 +5006,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Tor Messenger" -msgstr "" +msgstr "### Tor Messenger" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5032,7 +5032,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### TorBirdy" -msgstr "" +msgstr "### TorBirdy" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5092,7 +5092,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Tor2Web" -msgstr "" +msgstr "### Tor2Web" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5112,7 +5112,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### TPI" -msgstr "" +msgstr "### TPI" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5122,7 +5122,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### tpo" -msgstr "" +msgstr "### tpo" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5147,12 +5147,12 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## U" -msgstr "" +msgstr "## U" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## V" -msgstr "" +msgstr "## V" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5201,17 +5201,17 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## X" -msgstr "" +msgstr "## X" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## Y" -msgstr "" +msgstr "## Y" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## Z" -msgstr "" +msgstr "## Z" #: https//support.torproject.org/misc/menu/ #: (content/misc/menu/contents+en.lrquestion.description)

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 26 Mar '19

26 Mar '19

commit aedb5b5a395bc48d1470330690dab11d8cf7698b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 26 08:21:07 2019 +0000 Update translations for tpo-web --- contents+es.po | 6 +++--- contents+zh-CN.po | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+es.po b/contents+es.po index 6a93e38ae..73b1e73cf 100644 --- a/contents+es.po +++ b/contents+es.po @@ -5,9 +5,9 @@ # Zuhualime Akoochimoya, 2019 # erinm, 2019 # Antonela D <antonela(a)torproject.org>, 2019 -# Emma Peel, 2019 # Daniel Gray, 2019 # eulalio barbero espinosa <eulaliob(a)gmail.com>, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-03-19 18:48+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>, 2019\n" +"Last-Translator: Emma Peel, 2019\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2604,7 +2604,7 @@ msgstr "Tor Project" #: templates/contact.html:8 msgid "Chat with us on" -msgstr "" +msgstr "Chatea con nosotros en" #: templates/contact.html:9 msgid "Ask questions about using Tor." diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 64575dfbe..ade148c35 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -2523,7 +2523,7 @@ msgstr "" #: templates/press.html:7 msgid "Get support" -msgstr "" +msgstr "获取客户支持" #: templates/press.html:9 msgid "Visit our Support Portal"

1 0