- tor-commits - lists.torproject.org

[metrics-web/master] Switch from OnionPerf's .tpf to .json files.
by karsten＠torproject.org 04 May '20

04 May '20

commit 5cdcfc0180cbb7d15e4226d229f11abbb75074b5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon May 4 09:53:56 2020 +0200 Switch from OnionPerf's .tpf to .json files. Implements #34109. --- CHANGELOG.md | 4 +++- build.xml | 2 +- src/main/java/org/torproject/metrics/stats/collectdescs/Main.java | 2 +- src/main/java/org/torproject/metrics/stats/onionperf/Main.java | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index abef5bd..0e23889 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,9 @@ - Estimate bridge users by country based on requests by country, if available, to get more accurate numbers than those obtained from unique IP address counts. - - Update to metrics-lib 2.11.0 and ExoneraTor 4.4.0. + - Update to metrics-lib 2.12.2 and ExoneraTor 4.4.0. + - Switch from processing Torperf .tpf to OnionPerf analysis .json + files. * Minor changes - Make Jetty host configurable. diff --git a/build.xml b/build.xml index d407c33..422f969 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="javadoc-title" value="MetricsWeb API Documentation"/> <property name="implementation-title" value="metrics-web" /> <property name="release.version" value="1.3.0-dev" /> - <property name="metricslibversion" value="2.11.0" /> + <property name="metricslibversion" value="2.12.2" /> <property name="exoneratorversion" value="4.4.0" /> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" diff --git a/src/main/java/org/torproject/metrics/stats/collectdescs/Main.java b/src/main/java/org/torproject/metrics/stats/collectdescs/Main.java index ca7a9b3..1679627 100644 --- a/src/main/java/org/torproject/metrics/stats/collectdescs/Main.java +++ b/src/main/java/org/torproject/metrics/stats/collectdescs/Main.java @@ -29,7 +29,7 @@ public class Main { "/recent/relay-descriptors/extra-infos/", "/recent/relay-descriptors/server-descriptors/", "/recent/relay-descriptors/votes/", - "/recent/torperf/", + "/recent/onionperf/", "/recent/webstats/" }, 0L, org.torproject.metrics.stats.main.Main.descriptorsDir, true); } diff --git a/src/main/java/org/torproject/metrics/stats/onionperf/Main.java b/src/main/java/org/torproject/metrics/stats/onionperf/Main.java index e1b063c..56a689b 100644 --- a/src/main/java/org/torproject/metrics/stats/onionperf/Main.java +++ b/src/main/java/org/torproject/metrics/stats/onionperf/Main.java @@ -97,9 +97,9 @@ public class Main { DescriptorReader dr = DescriptorSourceFactory.createDescriptorReader(); for (Descriptor d : dr.readDescriptors( new File(org.torproject.metrics.stats.main.Main.descriptorsDir, - "archive/torperf"), + "archive/onionperf"), new File(org.torproject.metrics.stats.main.Main.descriptorsDir, - "recent/torperf"))) { + "recent/onionperf"))) { if (!(d instanceof TorperfResult)) { continue; }

1 0

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

04 May '20

commit 2337b6baafa86833a0787dc84e9583608f6c1196 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 4 07:45:43 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/zh_CN/LC_MESSAGES/messages.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po index 3129a9424c..a41a0949dc 100644 --- a/locale/zh_CN/LC_MESSAGES/messages.po +++ b/locale/zh_CN/LC_MESSAGES/messages.po @@ -1142,7 +1142,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:95 msgid "" "The Tor Project also offers the following alternative donation methods:" -msgstr "" +msgstr "Tor 项目还提供以下几个替代的捐助方式：" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:102 msgid "Bitcoin and Other Cryptocurrencies" @@ -1150,7 +1150,7 @@ msgstr "比特币和其他加密货币" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:108 msgid "BTCPayServer" -msgstr "" +msgstr "BTC支付服务器" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:112 msgid "BottlePay"

1 0

[metrics-web/master] Stop rounding y axis labels with units.
by karsten＠torproject.org 04 May '20

04 May '20

commit 95d4c5a59bbc19902d70c06cf9720657c88686e5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon May 4 09:33:19 2020 +0200 Stop rounding y axis labels with units. The unit_format function in our somewhat outdated scales package rounds labels to whichever we accuracy we ask for. However, in some cases this is difficult to do right (e.g., Time to download files over Tor graph with measurements apparently getting faster over time), in other cases it's impossible (Advertised bandwidth distribution graph with 1st and 99th percentile having different orders of magnitude). The new custom_unit_format function does not round labels and instead determines more reasonably how many digits it needs to print. Fixes #34103. --- src/main/R/rserver/rserve-init.R | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/src/main/R/rserver/rserve-init.R b/src/main/R/rserver/rserve-init.R index 2890da2..e1074ee 100644 --- a/src/main/R/rserver/rserve-init.R +++ b/src/main/R/rserver/rserve-init.R @@ -337,6 +337,16 @@ formatter <- function(x, ...) { format(x, ..., scientific = FALSE, big.mark = " ") } +# Helper function that takes a unit as input and returns a format function that +# takes breaks as input and returns labels with that unit as output. In contrast +# to the unit_format function in our somewhat outdated scales package this +# function determines more reasonably how many digits it needs to print. +custom_unit_format <- function(unit) { + function(x) { + paste(format(x, scientific = FALSE, big.mark = " "), unit) + } +} + theme_update( # Make plot title centered, and leave some room to the plot. plot.title = element_text(hjust = 0.5, margin = margin(b = 11)), @@ -515,7 +525,7 @@ plot_dirbytes <- function(start_p, end_p, path_p) { scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", - labels = unit_format(accuracy = 0.1, unit = "Gbit/s"), + labels = custom_unit_format(unit = "Gbit/s"), limits = c(0, NA)) + scale_colour_hue(name = "", breaks = c("dirwrite", "dirread"), @@ -589,7 +599,7 @@ plot_torperf <- function(start_p, end_p, server_p, filesize_p, path_p) { geom_line(aes(colour = source), size = 0.75) + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + - scale_y_continuous(name = "", labels = unit_format(unit = "s"), + scale_y_continuous(name = "", labels = custom_unit_format(unit = "s"), limits = c(0, NA)) + scale_fill_hue(name = "Source") + scale_colour_hue(name = "Source") + @@ -677,7 +687,7 @@ plot_onionperf_buildtimes <- function(start_p, end_p, path_p) { facet_grid(position ~ .) + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + - scale_y_continuous(name = "", labels = unit_format(unit = "ms"), + scale_y_continuous(name = "", labels = custom_unit_format(unit = "ms"), limits = c(0, NA)) + scale_fill_hue(name = "Source") + scale_colour_hue(name = "Source") + @@ -715,7 +725,7 @@ plot_onionperf_latencies <- function(start_p, end_p, server_p, path_p) { geom_line(aes(y = low, colour = source), size = 0.375) + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + - scale_y_continuous(name = "", labels = unit_format(unit = "ms"), + scale_y_continuous(name = "", labels = custom_unit_format(unit = "ms"), limits = c(0, NA)) + scale_fill_hue(name = "Source") + scale_colour_hue(name = "Source") + @@ -755,7 +765,7 @@ plot_onionperf_throughput <- function(start_p, end_p, server_p, path_p) { geom_line(aes(y = low / 1000, colour = source), size = 0.375) + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + - scale_y_continuous(name = "", labels = unit_format(unit = "Mbps"), + scale_y_continuous(name = "", labels = custom_unit_format(unit = "Mbps"), limits = c(0, NA)) + scale_fill_hue(name = "Source") + scale_colour_hue(name = "Source") + @@ -848,7 +858,7 @@ plot_bandwidth_flags <- function(start_p, end_p, path_p) { geom_area() + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + - scale_y_continuous(name = "", labels = unit_format(unit = "Gbit/s"), + scale_y_continuous(name = "", labels = custom_unit_format(unit = "Gbit/s"), limits = c(0, NA)) + scale_fill_manual(name = "", values = c("#03B3FF", "#39FF02", "#FFFF00", "#AAAA99")) + @@ -872,7 +882,7 @@ plot_bandwidth <- function(start_p, end_p, path_p) { geom_line() + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + - scale_y_continuous(name = "", labels = unit_format(unit = "Gbit/s"), + scale_y_continuous(name = "", labels = custom_unit_format(unit = "Gbit/s"), limits = c(0, NA)) + scale_colour_hue(name = "", h.start = 90, breaks = c("advbw", "bwhist"), @@ -1177,7 +1187,7 @@ plot_advbwdist_perc <- function(start_p, end_p, p_p, path_p) { scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", - labels = unit_format(accuracy = 0.01, unit = "Gbit/s"), + labels = custom_unit_format(unit = "Gbit/s"), limits = c(0, NA)) + scale_colour_hue(name = "Percentile") + ggtitle("Advertised bandwidth distribution") + @@ -1216,7 +1226,7 @@ plot_advbwdist_relay <- function(start_p, end_p, n_p, path_p) { scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", - labels = unit_format(accuracy = 0.01, unit = "Gbit/s"), + labels = custom_unit_format(unit = "Gbit/s"), limits = c(0, NA)) + scale_colour_hue(name = "n") + ggtitle("Advertised bandwidth of n-th fastest relays") + @@ -1277,7 +1287,7 @@ plot_hidserv_rend_relayed_cells <- function(start_p, end_p, path_p) { geom_line() + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + - scale_y_continuous(name = "", labels = unit_format(unit = "Gbit/s"), + scale_y_continuous(name = "", labels = custom_unit_format(unit = "Gbit/s"), limits = c(0, NA)) + ggtitle("Onion-service traffic") + labs(caption = copyright_notice) @@ -1644,7 +1654,7 @@ plot_advbw_ipv6 <- function(start_p, end_p, path_p) { geom_line() + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + - scale_y_continuous(name = "", labels = unit_format(unit = "Gbit/s"), + scale_y_continuous(name = "", labels = custom_unit_format(unit = "Gbit/s"), limits = c(0, NA)) + scale_colour_hue(name = "", h.start = 90, breaks = c("total", "total_guard", "total_exit", "reachable_guard",

1 0

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

04 May '20

commit b7d8c3c363c3e1ad73c1ed0e27dcf0c20bcae86f Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 4 07:15:42 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/zh_CN/LC_MESSAGES/messages.po | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po index 299f152409..3129a9424c 100644 --- a/locale/zh_CN/LC_MESSAGES/messages.po +++ b/locale/zh_CN/LC_MESSAGES/messages.po @@ -1,3 +1,4 @@ +# # Translators: # Mingye Wang <arthur200126(a)gmail.com>, 2018 # Chi-Hsun Tsai, 2018 @@ -14,10 +15,11 @@ # 忻然李 <2544304894(a)qq.com>, 2020 # Scott Rhodes <starring169(a)gmail.com>, 2020 # ff98sha, 2020 +# Runzhe Liang <18051080098(a)163.com>, 2020 # msgid "" msgstr "" -"Last-Translator: ff98sha, 2020\n" +"Last-Translator: Runzhe Liang <18051080098(a)163.com>, 2020\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -319,7 +321,7 @@ msgstr "XXL" #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:47 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:70 msgid "Privacy and freedom online should be the default." -msgstr "" +msgstr "网上隐私和自由应该是被默认的。" #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:49 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:72 @@ -962,7 +964,7 @@ msgstr "使用 Tor 夺回互联网" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:557 msgid "Gift selected" -msgstr "" +msgstr "已选择捐赠" #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:61 #: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:68 @@ -1125,7 +1127,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:87 msgid "How else can I donate to the Tor Project?" -msgstr "" +msgstr "我还能如何捐助Tor 项目？" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:91 msgid "" @@ -1133,6 +1135,9 @@ msgid "" "links\" href=\"https://2019.www.torproject.org/donate/donate.html.en\" " "target=\"_blank\">credit card or PayPal, please click here.</a>" msgstr "" +"注意：如果您希望使用<a class=\"hyperlinks links\" " +"href=\"https://2019.www.torproject.org/donate/donate.html.en\" " +"target=\"_blank\">信用卡或PayPal捐助Tor 项目，请点击此处。</a>" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:95 msgid ""

1 0

[translation/tbmanual-contentspot_completed] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
by translation＠torproject.org 04 May '20

04 May '20

commit 6a27464e1f587909158f0fa1efe4712336084f99 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 4 06:50:26 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspo… --- contents+zh-CN.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index a12a4198ae..85fc2bdd80 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -8,8 +8,8 @@ # ヨイツの賢狼ホロ, 2020 # ff98sha, 2020 # Cloud P <heige.pcloud(a)outlook.com>, 2020 -# Runzhe Liang <18051080098(a)163.com>, 2020 # Scott Rhodes <starring169(a)gmail.com>, 2020 +# Runzhe Liang <18051080098(a)163.com>, 2020 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-04-12 08:00+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Scott Rhodes <starring169(a)gmail.com>, 2020\n" +"Last-Translator: Runzhe Liang <18051080098(a)163.com>, 2020\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 04 May '20

04 May '20

commit 1df2f7ca53999b2f8552a6107d998c77d0dea979 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 4 06:50:18 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+zh-CN.po | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 748b856794..d0feef9e1a 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -8,8 +8,8 @@ # ヨイツの賢狼ホロ, 2020 # ff98sha, 2020 # Cloud P <heige.pcloud(a)outlook.com>, 2020 -# Runzhe Liang <18051080098(a)163.com>, 2020 # Scott Rhodes <starring169(a)gmail.com>, 2020 +# Runzhe Liang <18051080098(a)163.com>, 2020 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-04-12 08:00+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Scott Rhodes <starring169(a)gmail.com>, 2020\n" +"Last-Translator: Runzhe Liang <18051080098(a)163.com>, 2020\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2800,7 +2800,7 @@ msgstr "在随后的三年，Orfox持续优化并成为了人们更隐私地浏 msgid "" "than standard browsers, and Orfox was crucial for helping people circumvent " "censorship and access blocked sites and critical resources." -msgstr "" +msgstr "比普通浏览器，而且Orfox在帮助人们躲避审查，访问被禁网站和关键资源方面十分重要。" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2808,11 +2808,13 @@ msgid "" "In 2019, [Orfox was sunsetted](https://blog.torproject.org/orfox-paved-way-" "tor-browser-android) after the official Tor Browser for" msgstr "" +"2019年，在官方的安卓版Tor 浏览器发布后[Orfox被废止了](https://blog.torproject.org/orfox-paved-" +"way-tor-browser-android)。" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "Android was released." -msgstr "" +msgstr "安卓版Tor 浏览器发布" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2830,12 +2832,12 @@ msgstr "Orbot是一个允许其他应用使用 Tor 网络的免费代理的应 msgid "" "Orbot uses Tor to encrypt your Internet traffic. Then you can use it with " "other apps installed on your mobile device to" -msgstr "" +msgstr "Orbot用Tor 来加密您的网络通讯。然后您就可以使用它和其他安装在您的移动设备上的应用来" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "circumvent censorship and protect against surveillance." -msgstr "" +msgstr "躲避审查并防止监视。" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2843,6 +2845,9 @@ msgid "" "Orbot can be downloaded and installed from [Google " "Play](https://play.google.com/store/apps/details?id=org.torproject.android)." msgstr "" +"Orbot " +"可以从[谷歌商店](https://play.google.com/store/apps/details?id=org.torproject.andr…" +" 里下载并安装。" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2851,6 +2856,8 @@ msgid "" "portal](https://support.torproject.org/tormobile/tormobile-6/) to know if " "you need both Tor Browser for Android and Orbot or either one." msgstr "" +"查看[我们的帮助页面](https://support.torproject.org/tormobile/tormobile-6/) " +"来得知您是需要同时安装安卓版Tor 浏览器和Orbot还是只需要安装二者之一。" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2860,7 +2867,7 @@ msgstr "### iOS版 Tor 浏览器" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "There is no Tor Browser for iOS." -msgstr "" +msgstr "没有iOS版的Tor 浏览器" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body)

1 0

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

04 May '20

commit 20d16c74dd4b329e2867dd4202796d68d97890cf Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 4 05:54:13 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es-AR.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index 674a8f3cce..9e6a1e724b 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -1,8 +1,10 @@ +# # Translators: # Emma Peel, 2019 # Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2020 # Zuhualime Akoochimoya, 2020 # erinm, 2020 +# Burro Moro <burromoro(a)riseup.net>, 2020 # msgid "" msgstr "" @@ -10,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-04-15 19:40+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: erinm, 2020\n" +"Last-Translator: Burro Moro <burromoro(a)riseup.net>, 2020\n" "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -10293,6 +10295,7 @@ msgstr "" #: lego/templates/banner.html:11 templates/banner.html:11 msgid "Tracking, surveillance, and censorship are widespread online." msgstr "" +"El seguimiento, la vigilancia y la censura están muy extendidos en línea." #: lego/templates/banner.html:20 templates/banner.html:20 msgid "TAKE BACK THE INTERNET WITH TOR"

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 04 May '20

04 May '20

commit ec9f9081526d14394ade0c52ac61955f1c8100b0 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 4 05:53:37 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+es-AR.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index 3e28e4b5a3..56b30a7450 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -1,8 +1,10 @@ +# # Translators: # ezemelano <melanoeze(a)gmail.com>, 2019 # Zuhualime Akoochimoya, 2019 # erinm, 2020 # Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2020 +# Burro Moro <burromoro(a)riseup.net>, 2020 # msgid "" msgstr "" @@ -10,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-02-24 13:39+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2020\n" +"Last-Translator: Burro Moro <burromoro(a)riseup.net>, 2020\n" "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -668,6 +670,7 @@ msgstr "" #: lego/templates/banner.html:11 templates/banner.html:11 msgid "Tracking, surveillance, and censorship are widespread online." msgstr "" +"El seguimiento, la vigilancia y la censura están muy extendidos en línea." #: lego/templates/banner.html:20 templates/banner.html:20 msgid "TAKE BACK THE INTERNET WITH TOR"

1 0

[translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
by translation＠torproject.org 04 May '20

04 May '20

commit eaeca1e2feffbe49721a41350d3930d2ef020bb6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 4 05:53:22 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- es-AR/network-settings.dtd | 83 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/es-AR/network-settings.dtd b/es-AR/network-settings.dtd new file mode 100644 index 0000000000..5ee67eca38 --- /dev/null +++ b/es-AR/network-settings.dtd @@ -0,0 +1,83 @@ +<!ENTITY torsettings.dialog.title "Configuraciones de la red Tor"> +<!ENTITY torsettings.wizard.title.default "Conectar a Tor"> +<!ENTITY torsettings.wizard.title.configure "Configuraciones de la red Tor"> +<!ENTITY torsettings.wizard.title.connecting "Estableciendo una conexión"> + + +<!ENTITY torlauncher.localePicker.title "Idioma del Navegador Tor"> +<!ENTITY torlauncher.localePicker.prompt "Por favor seleccioná un idioma "> + + + +<!ENTITY torSettings.connectPrompt "Cliqueá "Conectar" para conectar a Tor."> +<!ENTITY torSettings.configurePrompt "Cliqueá "Configurar" para modificar los ajustes de red si estás en un país que censura Tor (tales como Egipto, China, Turquía) o si te estás conectando desde una red privada que requiere un proxy."> +<!ENTITY torSettings.configure "Configurar"> +<!ENTITY torSettings.connect "Conectar"> + + + +<!ENTITY torsettings.startingTor "Esperando que Tor arranque..."> +<!ENTITY torsettings.restartTor "Reiniciar Tor"> +<!ENTITY torsettings.reconfigTor "Reconfigurar"> + +<!ENTITY torsettings.discardSettings.prompt "Has configurado puentes Tor o has entrado ajustes para proxy local.  Para hacer una conexión directa a la red de Tor, éstos ajustes deben ser removidos."> +<!ENTITY torsettings.discardSettings.proceed "Remover ajustes y conectar"> + +<!ENTITY torsettings.optional "Opcional"> + +<!ENTITY torsettings.useProxy.checkbox "Uso un proxy para conectar a Internet"> +<!ENTITY torsettings.useProxy.type ""> +<!ENTITY torsettings.useProxy.type.placeholder "seleccioná un tipo de proxy"> +<!ENTITY torsettings.useProxy.address ""> +<!ENTITY torsettings.useProxy.address.placeholder "Dirección IP o nombre de equipo"> +<!ENTITY torsettings.useProxy.port ""> +<!ENTITY torsettings.useProxy.username ""> +<!ENTITY torsettings.useProxy.password ""> +<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> +<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> +<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> +<!ENTITY torsettings.firewall.checkbox "Esta computadora pasa a través de un cortafuegos que sólo permite conexiones a ciertos puertos"> +<!ENTITY torsettings.firewall.allowedPorts ""> +<!ENTITY torsettings.useBridges.checkbox "Tor está censurado en mi país"> +<!ENTITY torsettings.useBridges.default "Seleccioná un puente incorporado"> +<!ENTITY torsettings.useBridges.default.placeholder "seleccioná un puente"> +<!ENTITY torsettings.useBridges.bridgeDB "Solicitá un puente desde torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Entrá los caracteres de la imagen"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Obtené un nuevo desafío"> +<!ENTITY torsettings.useBridges.captchaSubmit "Enviar"> +<!ENTITY torsettings.useBridges.custom "Proveer un puente que conozco"> +<!ENTITY torsettings.useBridges.label "Entrar información de puente desde una fuente confiable."> +<!ENTITY torsettings.useBridges.placeholder "tipo dirección:puerto (uno por línea)"> + +<!ENTITY torsettings.copyLog "Copiar la bitácora Tor al Portapapeles"> + +<!ENTITY torsettings.proxyHelpTitle "Ayuda para Proxy"> +<!ENTITY torsettings.proxyHelp1 "Un proxy local puede ser necesario cuando te estés conectando a través de una red de una compañía, escuela o universidad. Si no estás seguro si un proxy es necesario, mirá los ajustes de Internet en otro navegador o revisá tus ajustes de red del sistema."> + +<!ENTITY torsettings.bridgeHelpTitle "Ayuda para relevo puente"> +<!ENTITY torsettings.bridgeHelp1 "Puentes son relevos no listados que hacen más dificultoso bloquear conexiones a la red de Tor.  Cada uno de los tipos de puente usa un método diferente para evitar censura.  Los obfs hacen que tu tráfico parezca ruido aleatorio, y los meek hacen que tu tráfico parezca que se está conectando a otro servicio en vez de Tor."> +<!ENTITY torsettings.bridgeHelp2 "Por la manera en que ciertos países intentan bloquear a Tor, ciertos puentes funcionan en ciertos países pero no otros.  Si no estás seguro acerca de cuáles puentes funcionan en tu país, visitá torproject.org/about/contact.html#support"> + + +<!ENTITY torprogress.pleaseWait "Por favor, esperá mientras establecemos una conexión a la red de Tor.  Puede tardar varios minutos."> + + +<!ENTITY torPreferences.categoryTitle ""> +<!ENTITY torPreferences.torSettings ""> +<!ENTITY torPreferences.torSettingsDescription "" > +<!ENTITY torPreferences.learnMore ""> +<!ENTITY torPreferences.bridges ""> +<!ENTITY torPreferences.bridgesDescription ""> +<!ENTITY torPreferences.useBridge ""> +<!ENTITY torPreferences.requestNewBridge ""> +<!ENTITY torPreferences.provideBridge ""> +<!ENTITY torPreferences.advanced ""> +<!ENTITY torPreferences.advancedDescription ""> +<!ENTITY torPreferences.firewallPortsPlaceholder ""> +<!ENTITY torPreferences.requestBridgeDialogTitle ""> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt ""> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt ""> +<!ENTITY torPreferences.requestBridgeErrorBadSolution ""> +<!ENTITY torPreferences.viewTorLogs ""> +<!ENTITY torPreferences.viewLogs ""> +<!ENTITY torPreferences.torLogsDialogTitle "">

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 04 May '20

04 May '20

commit e64b04e44aafea1e16ff3e9b973640872eab3668 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 4 05:53:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- es-AR/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es-AR/network-settings.dtd b/es-AR/network-settings.dtd index 002de49565..1c353d2003 100644 --- a/es-AR/network-settings.dtd +++ b/es-AR/network-settings.dtd @@ -79,5 +79,5 @@ <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solucioná el CAPTCHA para solicitar un puente."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "La solución no es correcta. Por favor intentá de nuevo."> <!ENTITY torPreferences.viewTorLogs "Ver la bitácora sucesos de Tor."> -<!ENTITY torPreferences.viewLogs "View Logs…"> +<!ENTITY torPreferences.viewLogs "Ver bitácora de sucesos"> <!ENTITY torPreferences.torLogsDialogTitle "Bitácora de eventos de Tor">

1 0