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

[translation/tbmanual-contentspot_completed] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
by translation＠torproject.org 18 Dec '19

18 Dec '19

commit aca8e3e11b7e684bf7d0001d9f77d552b2d6a8fd Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 18 22:23:36 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspo… --- contents+lt.po | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/contents+lt.po b/contents+lt.po index b4d2a6ea51..7939962c5e 100644 --- a/contents+lt.po +++ b/contents+lt.po @@ -34,7 +34,7 @@ msgstr "Dokumentacija" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Press" -msgstr "" +msgstr "Žiniasklaida" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -1402,7 +1402,7 @@ msgstr "" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) msgid "### HOW TO ACCESS AN ONION SERVICE" -msgstr "" +msgstr "### KAIP PASIEKTI ONION PASLAUGĄ" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -1986,6 +1986,13 @@ msgid "" " displaying correctly, so Tor Browser’s default setting is to allow all " "websites to run scripts in \"Standard\" mode." msgstr "" +"Naudotojai, kuriems, naršant internete, reikia aukšto saugumo lygmens, " +"turėtų nusistatyti Tor Naršyklės [Saugumo sliaužiklį](/lt/security-slider) į" +" „Saugesnį“ (kuris išjungia „JavaScript“ ne HTTPS internetinėse svetainėse) " +"arba „Saugiausią“ (kuris tai atlieka visose internetinėse svetainėse). Vis " +"dėlto, išjungus „JavaScript“ daugelis internetinių svetainių nebus tinkamai " +"atvaizduojamos, todėl numatytasis Tor Naršyklės nustatymas yra leisti visoms" +" internetinėms svetainėms vykdyti scenarijus „Standartinėje“ veiksenoje." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -2243,6 +2250,11 @@ msgid "" "executable text files when they are opened\" to \"Ask every time\", then " "click OK." msgstr "" +"* Norėdami paleisti Tor Naršyklę Ubuntu sistemose, naudotojai turi įvykdyti " +"apvalkalo scenarijų. Atverkite „Failus“ („Unity“ naršyklę), atverkite " +"„Nuostatas“ → Elgsenos skirtuką → Nustatykite „Vykdyti vykdomuosius " +"tekstinius failus, kai jie atveriami“ į „Klausti kiekvieną kartą“, tada " +"spustelėkite Gerai." #: https//tb-manual.torproject.org/known-issues/ #: (content/known-issues/contents+en.lrtopic.body)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 18 Dec '19

18 Dec '19

commit 82f7293191e09668ad92f5b2d8858af15ccb85f0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 18 22:21:11 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+lt.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/contents+lt.po b/contents+lt.po index 1598f21bdb..7939962c5e 100644 --- a/contents+lt.po +++ b/contents+lt.po @@ -1986,13 +1986,13 @@ msgid "" " displaying correctly, so Tor Browser’s default setting is to allow all " "websites to run scripts in \"Standard\" mode." msgstr "" -"Vartotojai, kuriems reikalingas aukštas saugumo lygis naršant internete, " -"turėtų nustatyti Tor Naršyklės [Apsaugos slankiklį](/lt/security-slider) į " -"„Saugesnis“ (kuris išjungia „JavaScript“ ne HTTPS svetainėse) arba " -"„Saugiausias“ (kuris tai daro visoms svetainėms). Tačiau išjungus " -"„JavaScript“ daugelis svetainių nebus tinkamai rodomos, todėl numatytasis " -"Tor Naršyklės nustatymas yra leisti visoms svetainėms paleisti scenarijus " -"„standartiniu“ režimu." +"Naudotojai, kuriems, naršant internete, reikia aukšto saugumo lygmens, " +"turėtų nusistatyti Tor Naršyklės [Saugumo sliaužiklį](/lt/security-slider) į" +" „Saugesnį“ (kuris išjungia „JavaScript“ ne HTTPS internetinėse svetainėse) " +"arba „Saugiausią“ (kuris tai atlieka visose internetinėse svetainėse). Vis " +"dėlto, išjungus „JavaScript“ daugelis internetinių svetainių nebus tinkamai " +"atvaizduojamos, todėl numatytasis Tor Naršyklės nustatymas yra leisti visoms" +" internetinėms svetainėms vykdyti scenarijus „Standartinėje“ veiksenoje." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -2251,9 +2251,9 @@ msgid "" "click OK." msgstr "" "* Norėdami paleisti Tor Naršyklę Ubuntu sistemose, naudotojai turi įvykdyti " -"apvalkalo scenarijų. Atidarykite „Failai“ („Unity“ naršyklė), atidarykite " -"„Nuostatos“ → „Elgesio“ skirtuką → Nustatykite „Vykdyti vykdomuosius " -"tekstinius failus, kai jie atidaromi“, į „Klausti kiekvieną kartą“, tada " +"apvalkalo scenarijų. Atverkite „Failus“ („Unity“ naršyklę), atverkite " +"„Nuostatas“ → Elgsenos skirtuką → Nustatykite „Vykdyti vykdomuosius " +"tekstinius failus, kai jie atveriami“ į „Klausti kiekvieną kartą“, tada " "spustelėkite Gerai." #: https//tb-manual.torproject.org/known-issues/

1 0

[translation/tbmanual-contentspot_completed] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
by translation＠torproject.org 18 Dec '19

18 Dec '19

commit 4a319df15374d4e87e5f946fcb454f72701b9961 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 18 21:53:42 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspo… --- contents+lt.po | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/contents+lt.po b/contents+lt.po index 870321175f..b4d2a6ea51 100644 --- a/contents+lt.po +++ b/contents+lt.po @@ -1922,6 +1922,14 @@ msgid "" "operators, or to an outside observer. For this reason, Flash is disabled by " "default in Tor Browser, and enabling it is not recommended." msgstr "" +"Vaizdo įrašų svetainės, tokios kaip „Vimeo“, vaizdo įrašų turiniui rodyti " +"naudoja „Flash grotuvo“ papildinį. Deja, ši programinė įranga veikia " +"nepriklausomai nuo Tor Naršyklės ir negali būti lengvai priversta paklusti " +"Tor Naršyklės įgaliotojo serverio nustatymams. Todėl šis grotuvas, " +"internetinės svetainės, kurioje lankotės, operatoriams ar išoriniam " +"stebėtojui, gali atskleisti tikrąją jūsų buvimo vietą ir IP adresą. Dėl šios" +" priežasties, pagal numatymą, „Flash grotuvas“ Tor naršyklėje yra išjungtas," +" o jį įjungti yra nerekomenduojama." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1947,6 +1955,11 @@ msgid "" "Unfortunately, JavaScript can also enable attacks on the security of the " "browser, which might lead to deanonymization." msgstr "" +"JavaScript yra programavimo kalba, kurią internetinės svetainės naudoja tam," +" kad pateiktų interaktyvius elementus, tokius kaip vaizdo įrašai, animacija," +" garso įrašai ir būsenos laiko linijos. Deja, JavaScript taip pat gali " +"įgalinti išpuolius prieš naršyklės saugumą, o tai gali privesti prie " +"deanonimizavimo." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1957,6 +1970,11 @@ msgid "" "control the JavaScript (and other scripts) that runs on individual web " "pages, or block it entirely." msgstr "" +"Tor Naršyklėje yra priedas, pavadinimu „NoScript“. Jį galite pasiekti " +"mėsainio (≡) meniu (pagrindiniame meniu) „Nuostatose“, tada pasirinkę " +"„Tinkinti“ ir nutempę „S“ piktogramą į viršutinę dešinę lango dalį. " +"„NoScript“ leidžia jums atskirose internetinėse svetainėse valdyti " +"JavaScript (ir kitus scenarijus), arba visiškai ją blokuoti." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 18 Dec '19

18 Dec '19

commit db8c5ded7dfefda927a0019b65da81ec1d3d54eb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 18 21:51:15 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+lt.po | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/contents+lt.po b/contents+lt.po index 55a7aecfa9..1598f21bdb 100644 --- a/contents+lt.po +++ b/contents+lt.po @@ -1922,13 +1922,14 @@ msgid "" "operators, or to an outside observer. For this reason, Flash is disabled by " "default in Tor Browser, and enabling it is not recommended." msgstr "" -"Vaizdo įrašų svetainėse, tokiose kaip „Vimeo“, vaizdo įrašų turiniui rodyti " -"naudojamas „Flash Player“ papildinys. Deja, ši programinė įranga veikia " +"Vaizdo įrašų svetainės, tokios kaip „Vimeo“, vaizdo įrašų turiniui rodyti " +"naudoja „Flash grotuvo“ papildinį. Deja, ši programinė įranga veikia " "nepriklausomai nuo Tor Naršyklės ir negali būti lengvai priversta paklusti " -"Tor Naršyklė tarpinio serverio nustatymams. Todėl jis gali atskleisti " -"tikrąją jūsų buvimo vietą ir IP adresą tinklalapio operatoriams ar išoriniam" -" stebėtojui. Dėl šios priežasties „Flash“ pagal numatytuosius nustatymus Tor" -" naršyklėje yra išjungta, o įjungti nerekomenduojama." +"Tor Naršyklės įgaliotojo serverio nustatymams. Todėl šis grotuvas, " +"internetinės svetainės, kurioje lankotės, operatoriams ar išoriniam " +"stebėtojui, gali atskleisti tikrąją jūsų buvimo vietą ir IP adresą. Dėl šios" +" priežasties, pagal numatymą, „Flash grotuvas“ Tor naršyklėje yra išjungtas," +" o jį įjungti yra nerekomenduojama." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1954,10 +1955,11 @@ msgid "" "Unfortunately, JavaScript can also enable attacks on the security of the " "browser, which might lead to deanonymization." msgstr "" -"JavaScript yra programavimo kalba, kuria svetainės naudojasi teikdamos " -"interaktyvius elementus, tokius kaip vaizdo įrašai, animacija, garso įrašai " -"ir būsenos terminai. Deja, JavaScript taip pat gali įgalinti išpuolius prieš" -" naršyklės saugumą, o tai gali sukelti deanonimizavimą." +"JavaScript yra programavimo kalba, kurią internetinės svetainės naudoja tam," +" kad pateiktų interaktyvius elementus, tokius kaip vaizdo įrašai, animacija," +" garso įrašai ir būsenos laiko linijos. Deja, JavaScript taip pat gali " +"įgalinti išpuolius prieš naršyklės saugumą, o tai gali privesti prie " +"deanonimizavimo." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1968,11 +1970,11 @@ msgid "" "control the JavaScript (and other scripts) that runs on individual web " "pages, or block it entirely." msgstr "" -"Tor naršyklėje yra priedas, vadinamas „NoScript“. Jį galite pasiekti " -"hamburger meniu (pagrindiniame meniu) „Parinktyse“, tada pasirinkite " -"„Tinkinti“ ir vilkite „S“ piktogramą į viršutinę dešinę lango dalį. " -"„NoScript“ leidžia valdyti JavaScript (ir kitus scenarijus), kurie veikia " -"atskiruose tinklalapiuose, arba visiškai jį blokuoti." +"Tor Naršyklėje yra priedas, pavadinimu „NoScript“. Jį galite pasiekti " +"mėsainio (≡) meniu (pagrindiniame meniu) „Nuostatose“, tada pasirinkę " +"„Tinkinti“ ir nutempę „S“ piktogramą į viršutinę dešinę lango dalį. " +"„NoScript“ leidžia jums atskirose internetinėse svetainėse valdyti " +"JavaScript (ir kitus scenarijus), arba visiškai ją blokuoti." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body)

1 0

[metrics-web/master] Add two BridgeDB request graphs.
by karsten＠torproject.org 18 Dec '19

18 Dec '19

commit 1e056fc82a4d22fbeefb99c2a1cc96246de0afa5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Dec 16 17:34:31 2019 +0100 Add two BridgeDB request graphs. Implements #32135. --- src/main/R/rserver/rserve-init.R | 56 ++++++++ .../torproject/metrics/stats/bridgedb/Main.java | 148 +++++++++++++++++++++ .../metrics/stats/collectdescs/Main.java | 1 + .../org/torproject/metrics/stats/main/Main.java | 6 +- src/main/resources/web.xml | 8 ++ src/main/resources/web/json/categories.json | 2 + src/main/resources/web/json/metrics.json | 22 +++ .../resources/web/jsps/reproducible-metrics.jsp | 42 ++++++ src/main/resources/web/jsps/stats.jsp | 41 ++++++ 9 files changed, 324 insertions(+), 2 deletions(-) diff --git a/src/main/R/rserver/rserve-init.R b/src/main/R/rserver/rserve-init.R index 5eac4d7..c4f1b7f 100644 --- a/src/main/R/rserver/rserve-init.R +++ b/src/main/R/rserver/rserve-init.R @@ -1721,3 +1721,59 @@ write_userstats_censorship_events <- function(start, end, path) { write.csv(r, path, quote = FALSE, row.names = FALSE) } +prepare_bridgedb_transport <- function(start_p = NULL, end_p = NULL) { + read_csv(file = paste(stats_dir, "bridgedb-stats.csv", sep = ""), + col_types = cols( + date = col_date(format = ""), + distributor = col_skip(), + transport = col_character(), + requests = col_double())) %>% + filter(if (!is.null(start_p)) date >= as.Date(start_p) else TRUE) %>% + filter(if (!is.null(end_p)) date <= as.Date(end_p) else TRUE) %>% + group_by(date, transport) %>% + summarize(requests = sum(requests)) %>% + arrange(date, transport) +} + +plot_bridgedb_transport <- function(start_p, end_p, path_p) { + prepare_bridgedb_transport(start_p, end_p) %>% + complete(date = full_seq(date, period = 1), nesting(transport)) %>% + ggplot(aes(x = date, y = requests, colour = transport)) + + geom_line(na.rm = TRUE) + + scale_x_date(name = "", breaks = custom_breaks, + labels = custom_labels, minor_breaks = custom_minor_breaks) + + scale_y_continuous(name = "", labels = formatter, limits = c(0, NA)) + + scale_colour_hue(name = "") + + ggtitle("BridgeDB requests by requested transport") + + labs(caption = copyright_notice) + ggsave(filename = path_p, width = 8, height = 5, dpi = 150) +} + +prepare_bridgedb_distributor <- function(start_p = NULL, end_p = NULL) { + read_csv(file = paste(stats_dir, "bridgedb-stats.csv", sep = ""), + col_types = cols( + date = col_date(format = ""), + distributor = col_character(), + transport = col_skip(), + requests = col_double())) %>% + filter(if (!is.null(start_p)) date >= as.Date(start_p) else TRUE) %>% + filter(if (!is.null(end_p)) date <= as.Date(end_p) else TRUE) %>% + group_by(date, distributor) %>% + summarize(requests = sum(requests)) %>% + arrange(date, distributor) +} + +plot_bridgedb_distributor <- function(start_p, end_p, path_p) { + prepare_bridgedb_distributor(start_p, end_p) %>% + complete(date = full_seq(date, period = 1), nesting(distributor)) %>% + ggplot(aes(x = date, y = requests, colour = distributor)) + + geom_line(na.rm = TRUE) + + scale_x_date(name = "", breaks = custom_breaks, + labels = custom_labels, minor_breaks = custom_minor_breaks) + + scale_y_continuous(name = "", labels = formatter, limits = c(0, NA)) + + scale_colour_hue(name = "") + + ggtitle("BridgeDB requests by distributor") + + labs(caption = copyright_notice) + ggsave(filename = path_p, width = 8, height = 5, dpi = 150) +} + diff --git a/src/main/java/org/torproject/metrics/stats/bridgedb/Main.java b/src/main/java/org/torproject/metrics/stats/bridgedb/Main.java new file mode 100644 index 0000000..16c3c21 --- /dev/null +++ b/src/main/java/org/torproject/metrics/stats/bridgedb/Main.java @@ -0,0 +1,148 @@ +/* Copyright 2019 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.metrics.stats.bridgedb; + +import org.torproject.descriptor.BridgedbMetrics; +import org.torproject.descriptor.Descriptor; +import org.torproject.descriptor.DescriptorSourceFactory; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardOpenOption; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; + +public class Main { + + private static Logger log = LoggerFactory.getLogger(Main.class); + + private static final Path bridgedbStatsCsvFile + = org.torproject.metrics.stats.main.Main.modulesDir.toPath() + .resolve("bridgedb/stats/bridgedb-stats.csv"); + + private static File[] descriptorsDirectories = new File[] { + new File(org.torproject.metrics.stats.main.Main.descriptorsDir, + "archive/bridgedb-metrics"), + new File(org.torproject.metrics.stats.main.Main.descriptorsDir, + "recent/bridgedb-metrics") }; + + /** Executes this data-processing module. */ + public static void main(String[] args) throws IOException { + SortedMap<String, Long> previousStatistics + = readBridgedbStatsFile(bridgedbStatsCsvFile); + SortedMap<String, Long> currentStatistics = parseStatistics( + previousStatistics, descriptorsDirectories); + writeBridgedbStatsFile(bridgedbStatsCsvFile, currentStatistics); + } + + static SortedMap<String, Long> + readBridgedbStatsFile(Path bridgedbStatsCsvFile) throws IOException { + SortedMap<String, Long> readStatistics = new TreeMap<>(); + if (Files.exists(bridgedbStatsCsvFile)) { + for (String line : Files.readAllLines(bridgedbStatsCsvFile)) { + if (line.startsWith("date")) { + continue; + } + String[] lineParts = line.split(","); + if (lineParts.length != 4) { + log.warn("Skipping unrecognized line '{}' in {}.", line, + bridgedbStatsCsvFile.toAbsolutePath()); + continue; + } + String key = String.format("%s,%s,%s", lineParts[0], lineParts[1], + lineParts[2]); + long value = Long.parseLong(lineParts[3]); + readStatistics.put(key, value); + } + log.debug("Read {} containing {} non-header lines.", bridgedbStatsCsvFile, + readStatistics.size()); + } + return readStatistics; + } + + static SortedMap<String, Long> parseStatistics( + SortedMap<String, Long> previousStatistics, + File[] descriptorsDirectories) { + SortedMap<String, Long> currentStatistics + = new TreeMap<>(previousStatistics); + for (Descriptor descriptor : DescriptorSourceFactory + .createDescriptorReader().readDescriptors(descriptorsDirectories)) { + if (!(descriptor instanceof BridgedbMetrics)) { + continue; + } + BridgedbMetrics bridgedbMetrics = (BridgedbMetrics) descriptor; + if (!"1".equals(bridgedbMetrics.bridgedbMetricsVersion())) { + log.warn("Unable to process BridgeDB metrics version {} != 1.", + bridgedbMetrics.bridgedbMetricsVersion()); + continue; + } + if (!bridgedbMetrics.bridgedbMetricCounts().isPresent()) { + continue; + } + String bridgedbMetricsEndDate = bridgedbMetrics.bridgedbMetricsEnd() + .toLocalDate().toString(); + SortedMap<String, Long> parsedStatistics = new TreeMap<>(); + for (Map.Entry<String, Long> bridgedbMetricCount + : bridgedbMetrics.bridgedbMetricCounts().get().entrySet()) { + String[] keyParts = bridgedbMetricCount.getKey().split("\\."); + if (keyParts.length < 3) { + /* Unable to extract relevant key parts. */ + continue; + } + if (bridgedbMetricCount.getValue() < 10) { + log.warn("Skipping too small BridgeDB metric count {} < 10 in {}.", + bridgedbMetricCount.getValue(), + descriptor.getDescriptorFile().getAbsolutePath()); + continue; + } + String distributor = keyParts[0]; + String transport = keyParts[1]; + String ccOrEmail = keyParts[2]; + if (ccOrEmail.equals("zz")) { + /* Skip requests coming in over Tor exits. */ + continue; + } + String key = String.format("%s,%s,%s", bridgedbMetricsEndDate, + distributor, transport); + long countsSoFar = parsedStatistics.getOrDefault(key, 0L); + countsSoFar += bridgedbMetricCount.getValue() - 5L; + parsedStatistics.put(key, countsSoFar); + } + if (!Collections.disjoint(currentStatistics.keySet(), + parsedStatistics.keySet())) { + /* Statististics for this date (and any combination of distributor and + * transport) are already contained. */ + continue; + } + currentStatistics.putAll(parsedStatistics); + } + return currentStatistics; + } + + static void writeBridgedbStatsFile(Path bridgedbStatsCsvFile, + SortedMap<String, Long> currentStatistics) throws IOException { + if (!Files.exists(bridgedbStatsCsvFile.getParent())) { + Files.createDirectories(bridgedbStatsCsvFile.getParent()); + } + List<String> lines = new ArrayList<>(); + lines.add("date,distributor,transport,requests"); + for (Map.Entry<String, Long> statistic : currentStatistics.entrySet()) { + lines.add(String.format("%s,%d", statistic.getKey(), + statistic.getValue())); + } + Files.write(bridgedbStatsCsvFile, lines, StandardOpenOption.CREATE); + log.debug("Wrote {} containing {} non-header lines.", bridgedbStatsCsvFile, + lines.size() - 1); + } +} + 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 1d0d840..26911ab 100644 --- a/src/main/java/org/torproject/metrics/stats/collectdescs/Main.java +++ b/src/main/java/org/torproject/metrics/stats/collectdescs/Main.java @@ -20,6 +20,7 @@ public class Main { DescriptorSourceFactory.createDescriptorCollector(); collector.collectDescriptors( "https://collector.torproject.org", new String[] { + "/recent/bridgedb-metrics/", "/recent/bridge-descriptors/extra-infos/", "/recent/bridge-descriptors/server-descriptors/", "/recent/bridge-descriptors/statuses/", diff --git a/src/main/java/org/torproject/metrics/stats/main/Main.java b/src/main/java/org/torproject/metrics/stats/main/Main.java index 1dec6a3..4ea15b4 100644 --- a/src/main/java/org/torproject/metrics/stats/main/Main.java +++ b/src/main/java/org/torproject/metrics/stats/main/Main.java @@ -56,7 +56,8 @@ public class Main { org.torproject.metrics.stats.clients.Main.class, org.torproject.metrics.stats.servers.Main.class, org.torproject.metrics.stats.webstats.Main.class, - org.torproject.metrics.stats.totalcw.Main.class + org.torproject.metrics.stats.totalcw.Main.class, + org.torproject.metrics.stats.bridgedb.Main.class }; for (Class<?> module : modules) { @@ -84,7 +85,8 @@ public class Main { new File(modulesDir, "clients/stats/userstats-combined.csv"), new File(modulesDir, "servers/stats"), new File(modulesDir, "webstats/stats"), - new File(modulesDir, "totalcw/stats") + new File(modulesDir, "totalcw/stats"), + new File(modulesDir, "bridgedb/stats") }; List<String> copiedFiles = new ArrayList<>(); for (File moduleStatsDir : moduleStatsDirs) { diff --git a/src/main/resources/web.xml b/src/main/resources/web.xml index 10d12ee..08a3bcd 100644 --- a/src/main/resources/web.xml +++ b/src/main/resources/web.xml @@ -57,6 +57,8 @@ <url-pattern>/bridges-ipv6.html</url-pattern> <url-pattern>/advbw-ipv6.html</url-pattern> <url-pattern>/totalcw.html</url-pattern> + <url-pattern>/bridgedb-transport.html</url-pattern> + <url-pattern>/bridgedb-distributor.html</url-pattern> </servlet-mapping> <servlet> @@ -201,6 +203,12 @@ <url-pattern>/totalcw.png</url-pattern> <url-pattern>/totalcw.pdf</url-pattern> <url-pattern>/totalcw.csv</url-pattern> + <url-pattern>/bridgedb-transport.png</url-pattern> + <url-pattern>/bridgedb-transport.pdf</url-pattern> + <url-pattern>/bridgedb-transport.csv</url-pattern> + <url-pattern>/bridgedb-distributor.png</url-pattern> + <url-pattern>/bridgedb-distributor.pdf</url-pattern> + <url-pattern>/bridgedb-distributor.csv</url-pattern> </servlet-mapping> <servlet> diff --git a/src/main/resources/web/json/categories.json b/src/main/resources/web/json/categories.json index 3771631..d091ed7 100644 --- a/src/main/resources/web/json/categories.json +++ b/src/main/resources/web/json/categories.json @@ -11,6 +11,8 @@ "userstats-bridge-transport", "userstats-bridge-combined", "userstats-bridge-version", + "bridgedb-transport", + "bridgedb-distributor", "userstats-relay-table", "userstats-censorship-events", "userstats-bridge-table", diff --git a/src/main/resources/web/json/metrics.json b/src/main/resources/web/json/metrics.json index 54ce78b..b8921c7 100644 --- a/src/main/resources/web/json/metrics.json +++ b/src/main/resources/web/json/metrics.json @@ -447,5 +447,27 @@ "start", "end" ] + }, + { + "id": "bridgedb-transport", + "title": "BridgeDB requests by requested transport", + "type": "Graph", + "description": "<p>This graph shows the number of BridgeDB requests for each requested transport. BridgeDB requests over Tor are not included in these numbers.</p>", + "function": "bridgedb_transport", + "parameters": [ + "start", + "end" + ] + }, + { + "id": "bridgedb-distributor", + "title": "BridgeDB requests by distributor", + "type": "Graph", + "description": "<p>This graph shows the number of BridgeDB requests for each distributor. HTTPS requests over Tor are not included in these numbers.</p>", + "function": "bridgedb_distributor", + "parameters": [ + "start", + "end" + ] } ] diff --git a/src/main/resources/web/jsps/reproducible-metrics.jsp b/src/main/resources/web/jsps/reproducible-metrics.jsp index 9b21aa7..ed3ad4c 100644 --- a/src/main/resources/web/jsps/reproducible-metrics.jsp +++ b/src/main/resources/web/jsps/reproducible-metrics.jsp @@ -230,6 +230,48 @@ We therefore refer to Step 4 of the <a href="#relay-users">Relay users</a> descr </div> <div class="container"> +<h3 id="bridgedb-requests" class="hover">BridgeDB requests +<a href="#bridgedb-requests" class="anchor">#</a> +</h3> + +<p>BridgeDB metrics contain aggregated information about requests to the BridgeDB service. +BridgeDB keeps track of each request per distribution method (HTTPS, moat, email), per bridge type (e.g., <code>vanilla</code> or <code>obfs4</code>) per country code or email provider (e.g., <code>"ru"</code> or <code>"gmail"</code>) per request success (<code>"success"</code> or <code>"fail"</code>). +Every 24 hours, BridgeDB writes these metrics to disk and then begins a new measurement interval.</p> + +<p>The following description applies to the following graphs:</p> + +<ul> +<li>BridgeDB requests by requested transport <a href="/bridgedb-transport.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a></li> +<li>BridgeDB requests by distributor <a href="/bridgedb-distributor.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a></li> +</ul> + +<h4>Step 1: Parse BridgeDB metrics to obtain reported request numbers</h4> + +<p>Obtain BridgeDB metrics from <a href="/collector.html#type-bridgedb-metrics">CollecTor</a>. +Refer to the <a href="https://gitweb.torproject.org/bridgedb.git/tree/doc/bridgedb-metrics-spec.t…">BridgeDB metrics specification</a> for details on the descriptor format.</p> + +<h4>Step 2: Skip requests coming in over Tor exits</h4> + +<p>Skip any request counts with <code>"zz"</code> as their <code>CC/EMAIL</code> metrics key part. +We use the <code>"zz"</code> pseudo country code for requests originating from Tor exit relays. +We're discarding these requests because <a href="https://bugs.torproject.org/32117">bots use the Tor network to crawl BridgeDB</a>, and including bot requests would provide a +false sense of how users interact with BridgeDB. +Note that BridgeDB maintains a separate distribution pool for requests coming from Tor exit relays.</p> + +<h4>Step 3: Aggregate requests by date, distributor, and transport</h4> + +<p>BridgeDB metrics contain request numbers broken down by distributor, bridge type, and a few more dimensions. +For our purposes we only care about total request numbers by date and either distributor or transport. +Our total request number includes both successful (i.e., the user ended up getting bridge lines) +and unsuccessful (e.g., the user failed to solve the CAPTCHA) requests. +We're using request sums by these three dimensions as aggregates and we are subtracting <code>bin_size/2</code> +from each count to better approximate the count before binning. +As date we're using the date of the BridgeDB metrics interval end. +If we encounter more than one BridgeDB metrics interval end on the same UTC date (which shouldn't be possible with an interval length of 24 hours), we arbitrarily keep whichever we process first.</p> + +</div> + +<div class="container"> <h2><i class="fa fa-server fa-fw" aria-hidden="true"></i> Servers <a href="#servers" name="servers" class="anchor">#</a></h2> diff --git a/src/main/resources/web/jsps/stats.jsp b/src/main/resources/web/jsps/stats.jsp index 3ce295d..25eb239 100644 --- a/src/main/resources/web/jsps/stats.jsp +++ b/src/main/resources/web/jsps/stats.jsp @@ -54,6 +54,7 @@ https://metrics.torproject.org/identifier.csv <li><b>June 2, 2019:</b> Added <a href="#onionperf-throughput">Throughput</a> graph.</li> <li><b>August 5, 2019:</b> Re-added the <a href="#bandwidth">Total relay bandwidth</a> graph due to popular demand.</li> <li><b>October 2, 2019:</b> Added <a href="#webstats-tb-channel">Tor Browser updates by release channel</a> graph.</li> +<li><b>December 18, 2019:</b> Added <a href="#bridgedb-transport">BridgeDB requests by requested transport</a> and <a href="#bridgedb-distributor">BridgeDB requests by distributor</a> graphs.</li> </ul> </div> @@ -178,6 +179,46 @@ using bridges, which can be either <b>"v4"</b> or <b>"v6"</b>.</li> <li><b>frac:</b> Fraction of bridges in percent that the estimate is based on.</li> </ul> +<h3>BridgeDB requests by requested transport +<a href="/bridgedb-transport.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> +<a href="/bridgedb-transport.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> +<a href="#bridgedb-transport" name="bridgedb-transport" class="anchor">#</a></h3> + +<h4>Parameters</h4> + +<ul> +<li><b>start:</b> First UTC date (YYYY-MM-DD) to include in the file.</li> +<li><b>end:</b> Last UTC date (YYYY-MM-DD) to include in the file.</li> +</ul> + +<h4>Columns</h4> + +<ul> +<li><b>date:</b> UTC date (YYYY-MM-DD) when requests were sent to BridgeDB.</li> +<li><b>transport:</b> Name of the pluggable transport protocol, which includes <code>"obfs2"</code>, <code>"obfs3"</code>, <code>"obfs4"</code>, <code>"scramblesuit"</code>, and <code>"fte"</code>, and which will change in the future.</li> +<li><b>requests:</b> Approximate number of requests for the given transport.</li> +</ul> + +<h3>BridgeDB requests by distributor +<a href="/bridgedb-distributor.html" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> graph</a> +<a href="/bridgedb-distributor.csv" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> data</a> +<a href="#bridgedb-distributor" name="bridgedb-distributor" class="anchor">#</a></h3> + +<h4>Parameters</h4> + +<ul> +<li><b>start:</b> First UTC date (YYYY-MM-DD) to include in the file.</li> +<li><b>end:</b> Last UTC date (YYYY-MM-DD) to include in the file.</li> +</ul> + +<h4>Columns</h4> + +<ul> +<li><b>date:</b> UTC date (YYYY-MM-DD) when requests were sent to BridgeDB.</li> +<li><b>distributor:</b> Name of BridgeDB's distributor, which includes <code>"https"</code>, <code>"email"</code>, and <code>"moat"</code>, and which may change in the future.</li> +<li><b>requests:</b> Approximate number of requests for the given distributor.</li> +</ul> + </div> <div class="container">

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 18 Dec '19

18 Dec '19

commit 203a697747df615092645387fe7bf1d8519293d3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 18 18:54:43 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ja.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index 4125a58865..a9c2898c82 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -134,7 +134,7 @@ msgstr "Tor ブラウザーを使用する際、誰が私が訪問したウェ #: https//support.torproject.org/tbb/tbb-3/ #: (content/tbb/tbb-3/contents+en.lrquestion.description) msgid "Tor Browser prevents people from knowing the websites you visit." -msgstr "" +msgstr "Torブラウザーはあなたが訪れたウェブサイトを他人に知られることを防いでくれます。" #: https//support.torproject.org/faq/faq-1/ #: (content/faq/faq-1/contents+en.lrquestion.description) @@ -166,7 +166,7 @@ msgstr "私たちのWEBサイトは検閲によりブロックされました。 msgid "" "Tor Browser can certainly help people access your website in places where it" " is blocked." -msgstr "" +msgstr "Tor ブラウザはネット接続が遮断された場所で確実にあなたのウェブサイトにアクセスできるよう手助けします。" #: https//support.torproject.org/faq/faq-2/ #: (content/faq/faq-2/contents+en.lrquestion.description) @@ -221,7 +221,7 @@ msgstr "" msgid "" "It's strongly discouraged to install new add-ons in Tor Browser, because " "they can compromise your privacy and security." -msgstr "Torブラウザに新しいアドオンをインストールすることは、プライバシーとセキュリティの両方を損なう可能性があるため、強くお勧めします。" +msgstr "Torブラウザーに新しいアドオンをインストールすることは、プライバシーとセキュリティの両方を損なう可能性があるため、強くお勧めします。" #: https//support.torproject.org/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.description) @@ -387,12 +387,12 @@ msgstr "" #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.title) msgid "Is there a backdoor in Tor?" -msgstr "" +msgstr "Torにはバックドアはありますか？" #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) msgid "There is absolutely no backdoor in Tor." -msgstr "" +msgstr "Torにバックドアは絶対に存在しません。" #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) @@ -410,7 +410,7 @@ msgstr "" #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) msgid "We will never put a backdoor in Tor." -msgstr "" +msgstr "我々がTorにバックドアを設置することは絶対にありません。" #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) @@ -7901,7 +7901,7 @@ msgstr "" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "Your nick is verified!" -msgstr "" +msgstr "あなたのニックネームが認証されました。" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -8342,7 +8342,7 @@ msgstr "追跡と監視から身を守る。検閲を回避する。" #: templates/layout.html:10 msgid "Tor Project | Support" -msgstr "" +msgstr "Torプロジェクトをサポート" #: templates/sidenav.html:4 templates/sidenav.html:36 msgid "Topics"

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 18 Dec '19

18 Dec '19

commit 2a8c948adfc51db4cc8e6e63fa73a487bbcf9d53 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 18 18:45:33 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/de/LC_MESSAGES/messages.po | 47 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po index eecc213a35..94f1c7745d 100644 --- a/locale/de/LC_MESSAGES/messages.po +++ b/locale/de/LC_MESSAGES/messages.po @@ -924,6 +924,11 @@ msgid "" "supporting their unrestricted availability and use, and furthering their " "scientific and popular understanding." msgstr "" +"Die Mission des Tor Project ist es, die Menschenrechte und Freiheiten zu " +"fördern, indem es kostenlose und offene Anonymitäts- und " +"Datenschutztechnologien entwickelt und einsetzt, ihre uneingeschränkte " +"Verfügbarkeit und Nutzung unterstützt und ihr wissenschaftliches und " +"populäres Verständnis fördert." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:155 msgid "" @@ -932,10 +937,15 @@ msgid "" "target=\"_blank\">Tor Browser</a>, which enables people to browse the " "internet anonymously." msgstr "" +"Das Hauptprodukt des Tor Project ist <a " +"href=\"https://www.torproject.org/download/download-easy.html.en\" " +"target=\"_blank\">Tor Browser</a>, mit dem man anonym im Internet surfen " +"kann." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:157 msgid "The Tor Project is a 501(c)3 tax-exempt non-profit organization." msgstr "" +"Das Tor Project ist eine 501(c)3 steuerbefreite Non-profit-Organization." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:159 msgid "It was founded in 2006." @@ -1013,6 +1023,9 @@ msgid "" "href=\"https://www.torproject.org/projects/torbrowser.html.en\"><span " "class=\"links\">download Tor Browser</span></a>." msgstr "" +"Um zu beginnen, musst du <a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/projects/torbrowser.html.en\"><span " +"class=\"links\">Tor Browser herunterladen</span></a>." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:198 msgid "" @@ -1026,6 +1039,15 @@ msgid "" " and <a class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://www.torproject.org/download/#android\">Android</a>." msgstr "" +"Wir bieten Anleitungen zum Herunterladen für <a class=\"hyperlinks links\" " +"target=\"_blank\" " +"href=\"https://www.torproject.org/projects/torbrowser.html.en#windows\">Windows</a>," +" <a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/projects/torbrowser.html.en#macosx\">Mac " +"OS X</a>, <a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/projects/torbrowser.html.en#linux\">Linux</a>," +" und <a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/download/#android\">Android</a>." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:204 msgid "What kinds of people support Tor?" @@ -1047,6 +1069,15 @@ msgid "" "Germany, the U.S. Naval Research Laboratory, Omidyar Network, SRI " "International, and Open Technology Fund." msgstr "" +"Tausende von Personen haben gespendet, um das Tor Project zu unterstützen, " +"und wir haben auch Mittel von <a class=\"hyperlinks links\" " +"href=\"https://www.torproject.org/about/sponsors/\" " +"target=\"_blank\">verschiedenen Organisationen</a> erhalten, darunter " +"Google, die Ford Foundation, die Knight Foundation, Reddit, die U.S. " +"National Science Foundation, die Electronic Frontier Foundation, Human " +"Rights Watch, die Swedish International Development Cooperation Agency, das " +"Auswärtige Amt Deutschlands, das U.S. Naval Research Laboratory, Omidyar " +"Network, SRI International und Open Technology Fund." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:212 msgid "" @@ -1055,6 +1086,10 @@ msgid "" "target=\"_blank\">running Tor relays</a> to help carry traffic for other " "users." msgstr "" +"Die Leute unterstützen Tor auch auf nicht-finanzielle Weise, z.B. indem sie " +"<a class=\"hyperlinks links\" " +"href=\"https://community.torproject.org/relay/\" target=\"_blank\">Tor " +"Relays</a> betreiben, um den Traffic für andere Benutzer zu transportieren." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:214 msgid "" @@ -1102,6 +1137,9 @@ msgid "" "<a class=\"hyperlinks links\" href=\"https://youtu.be/JWII85UlzKw\" " "target=\"_blank\">Watch this video</a> to learn more about how Tor works." msgstr "" +"<a class=\"hyperlinks links\" href=\"https://youtu.be/JWII85UlzKw\" " +"target=\"_blank\">Schau dieses Video</a>, um mehr darüber zu erfahren, wie " +"Tor arbeitet." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:237 msgid "" @@ -1117,6 +1155,9 @@ msgid "" "href=\"https://support.torproject.org/faq/\">This Tor Project FAQ</a> has " "answers to all those questions, and more." msgstr "" +"<a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://support.torproject.org/faq/\">Das Tor Project F&A</a> hat " +"Antworten auf alle diese Fragen, und weitere." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:247 msgid "Does the Tor software work?" @@ -1150,6 +1191,12 @@ msgid "" "book Data and Goliath, security expert Bruce Schneier wrote, \"the current " "best tool to protect your anonymity when browsing the web is Tor.\"" msgstr "" +"Die Electronic Frontier Foundation sagt, dass Tor <a class=\"hyperlinks " +"links\" target=\"_blank\" href=\"https://www.eff.org/deeplinks/2014/07/7" +"-things-you-should-know-about-tor\">eine der stärksten Anonymitätssoftware " +"anbietet, die es gibt</a>, und in seinem Buch Data and Goliath schrieb der " +"Sicherheitsexperte Bruce Schneier: \"Das derzeit beste Tool zum Schutz Ihrer" +" Anonymität beim Surfen im Internet ist Tor\"." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:261 msgid "Is what Tor does legal? Can I get in trouble for using it?"

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 18 Dec '19

18 Dec '19

commit d6941b76cb4231e28f2114b1c8c473516a18dcda Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 18 18:15:36 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/de/LC_MESSAGES/messages.po | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po index 6353235f0f..eecc213a35 100644 --- a/locale/de/LC_MESSAGES/messages.po +++ b/locale/de/LC_MESSAGES/messages.po @@ -9,14 +9,14 @@ # Traumschule Riebau <traumschuleriebau(a)riseup.net>, 2019 # c8faa9c4b9d81319c5c2fd62ae3a9956, 2019 # John Weber, 2019 -# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 # Not AName <atzeje(a)web.de>, 2019 # erinm, 2019 # Philipp . <Kuschat(a)gmx.de>, 2019 +# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 # msgid "" msgstr "" -"Last-Translator: Philipp . <Kuschat(a)gmx.de>, 2019\n" +"Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019\n" "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -547,6 +547,8 @@ msgid "" "Get this year's Take Back the Internet With Tor t-shirt and the Tor: " "Strength in Numbers t-shirt." msgstr "" +"Hol dir das diesjährige Take Back the Internet with Tor-T-Shirt und Tor: " +"Strength in numbers-T-Shirt. " #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:277 msgid "sweatshirt" @@ -560,7 +562,7 @@ msgstr "" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:294 msgid "how do you want to <span class=\"lime\">DONATE</span>?" -msgstr "" +msgstr "wie willst du <span class=\"lime\">SPENDEN</span>?" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:300 msgid "Credit Card" @@ -854,6 +856,10 @@ msgid "" "links\" href=\"https://2019.www.torproject.org/donate/donate.html.en\" " "target=\"_blank\">credit card or PayPal, please click here.</a>" msgstr "" +"Hinweis: Wenn du per <a class=\"hyperlinks links\" " +"href=\"https://2019.www.torproject.org/donate/donate.html.en\" " +"target=\"_blank\"> Kreditkarte oder PayPal für das Tor Project spenden " +"möchtest, klicke bitte hier.</a>" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:95 msgid "" @@ -863,15 +869,15 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:102 msgid "Bitcoin and Other Cryptocurrencies" -msgstr "" +msgstr "Bitcoin und andere Kryptowährungen" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:108 msgid "BTCPayServer" -msgstr "" +msgstr "BTCPayServer" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:112 msgid "BottlePay" -msgstr "" +msgstr "BottlePay" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:116 msgid "Amazon Smile" @@ -883,17 +889,19 @@ msgstr "Unterstützung geben" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:126 msgid "EU Bank Transfer" -msgstr "" +msgstr "EU Bank Transfer" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:132 msgid "" "Checks</a> or <a class=\"hyperlinks links\" href=\"/%langcode%/donor-faq" "#donate-anonymous\">Money Orders</a>" msgstr "" +"Schecks</a> oder <a class=\"hyperlinks links\" href=\"/%langcode%/donor-faq" +"#donate-anonymous\">Geldüberweisungen</a>" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:138 msgid "Stock Donation" -msgstr "" +msgstr "Aktienspende" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:143 msgid "" @@ -901,6 +909,9 @@ msgid "" "making a donation with one of the methods above, please email <span " "class=\"email\">giving(at)torproject.org</span>." msgstr "" +"Wenn du Fragen hast oder nach einer Spende mit einer der oben genannten " +"Methoden ein Dankgeschenk erhalten möchtest, schicke bitte eine E-Mail an " +"<span class=\"email\">giving(at)torproject.org</span>." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:149 msgid "What is the Tor Project and what does it do?"

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 18 Dec '19

18 Dec '19

commit 169906c8a99e3530e065776d5fbcd3b7469a2117 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 18 17:25:15 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ja.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index ccbc54ce95..4125a58865 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -5,8 +5,8 @@ # Emma Peel, 2019 # ue zaeco, 2019 # Tokumei Nanashi, 2019 -# 987 pluto <pluto987(a)protonmail.com>, 2019 # h345u37g3 h345u37g3, 2019 +# 987 pluto <pluto987(a)protonmail.com>, 2019 # msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: h345u37g3 h345u37g3, 2019\n" +"Last-Translator: 987 pluto <pluto987(a)protonmail.com>, 2019\n" "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2786,7 +2786,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-editing-torrc/ #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description) msgid "On macOS:" -msgstr "" +msgstr "macOSにて" #: https//support.torproject.org/tbb/tbb-editing-torrc/ #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 18 Dec '19

18 Dec '19

commit ac89a31ff81b554299f7bcd54fb0d9632ca2027e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 18 17:21:08 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ja.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index b54fe38920..52527c0aac 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -6,8 +6,8 @@ # Emma Peel, 2019 # Tokumei Nanashi, 2019 # 323484, 2019 -# 987 pluto <pluto987(a)protonmail.com>, 2019 # h345u37g3 h345u37g3, 2019 +# 987 pluto <pluto987(a)protonmail.com>, 2019 # msgid "" msgstr "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-29 10:58+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: h345u37g3 h345u37g3, 2019\n" +"Last-Translator: 987 pluto <pluto987(a)protonmail.com>, 2019\n" "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1467,6 +1467,7 @@ msgid "" "Wait for the update to download and install, then Tor Browser will restart " "itself. You will now be running the latest version." msgstr "" +"アップデートをダウンロードやインストールするまで待機する。Tor ブラウザを自身で再起動する際、次回、Tor ブラウザが最新バージョンで起動されます。" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) @@ -1582,7 +1583,7 @@ msgstr "" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) msgid "### KNOWN ISSUES" -msgstr "" +msgstr "### 既知の問題" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) @@ -1701,7 +1702,7 @@ msgstr "Tor Browser のシステムからの削除は簡単です。" #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) msgid "On Windows:" -msgstr "" +msgstr "ウィンドウズ上にて" #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) @@ -1723,7 +1724,7 @@ msgstr "* ごみ箱を空にします。" #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) msgid "On macOS:" -msgstr "" +msgstr "macOSにて" #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) @@ -1790,7 +1791,7 @@ msgstr "" #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) msgid "On Linux:" -msgstr "" +msgstr "リナックス上で" #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) @@ -1900,12 +1901,12 @@ msgstr "" #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.title) msgid "MAKE TOR BROWSER PORTABLE" -msgstr "" +msgstr "Tor ブラウザをポータブルにしよう" #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.description) msgid "How to install Tor Browser onto removable media" -msgstr "" +msgstr "Tor ブラウザをリムーバブルメディアへインストールする方法" #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body)

1 0