Merge pull request #12 from ooni/explorer-circumvention-tests

Explorer circumvention tests

explorer/en/strings.csv

@@ -12,6 +12,8 @@ Tests.BridgeReachability.Name,Tor Bridge Reachability Test,
 Tests.TCPConnect.Name,TCP Connect Test,
 Tests.DNSConsistency.Name,DNS Consistency Test,
 Tests.HTTPRequests.Name,HTTP Requests Test,
+Tests.Psiphon.Name,Psiphon Test,
+Tests.Tor.Name,Tor Test,
 Tests.Groups.Webistes.Name,Websites,
 Tests.Groups.Instant Messagging.Name,Instant Messaging,
 Tests.Groups.Middlebox.Name,Middleboxes,
@@ -191,6 +193,24 @@ Measurement.Details.SummaryText.TorVanilla.Reachable,"OONI's Vanilla Tor test su
 
 This means that the Tor network was reachable from {network} in {country} on {date}.",
 Measurement.Details.VanillaTor.Endpoint.Label.Reachability,Reachability,
+Measurement.Status.Hint.Psiphon.Reachable,Psiphon is accessible,
+Measurement.Status.Hint.Psiphon.Blocked,Psiphon is likely blocked,
+Measurement.Status.Hint.Psiphon.BootstrappingError,Error in bootstrapping Psiphon,
+Measurement.Details.SummaryText.Psiphon.OK,"On {date}, Psiphon was reachable on {network} in {country}.",
+Measurement.Details.SummaryText.Psiphon.Blocked,"On {date}, the testing of Psiphon presented signs of blocking on {network} in {country}.",
+Measurement.Details.SummaryText.Psiphon.BootstrappingError,"On {date}, there was an error in bootstrapping Psiphon on {network} in {country}.",
+Measurement.Details.Psiphon.BootstrapTime.Label,Bootstrap Time,
+Measurement.Details.SummaryText.Tor.OK,,
+Measurement.Details.SummaryText.Tor.Blocked,,
+Measurement.Details.Tor.Bridges.Label.Title,Tor Browser Bridges,
+Measurement.Details.Tor.Bridges.Label.OK,{bridgesAccessible}/{bridgesTotal} OK,
+Measurement.Details.Tor.DirAuth.Label.Title,Directory Authorities,
+Measurement.Details.Tor.DirAuth.Label.OK,{dirAuthAccessible}/{dirAuthTotal} OK,
+Measurement.Details.Tor.Table.Header.Name,Name,
+Measurement.Details.Tor.Table.Header.Address,Address,
+Measurement.Details.Tor.Table.Header.Type,Type,
+Measurement.Details.Tor.Table.Header.Connect,Connect,
+Measurement.Details.Tor.Table.Header.Handshake,Handshake,
 Measurement.Hero.Status.Default,Measurement Report,
 Navbar.Search,Search,
 Navbar.Countries,Countries,
@@ -296,7 +316,7 @@ Country.Overview.NwInterference.Websites.NoData,Not enough data available on blo
 Country.Overview.Heading.TestsByClass,Measurement Coverage,
 Country.Overview.Heading.TestsByClass.Description,"The graph below provides an overview of OONI Probe measurement coverage. It shows how many results have been collected from each OONI Probe test category, as well as how many networks have been covered by tests. 
 
-By looking at this graph, you can understand if there is enough data to draw meaningful conclusions. If there is not enough data and you are in the country in question, [install OONI Probe](https://ooni.io/install), run tests, and contribute data!",
+By looking at this graph, you can understand if there is enough data to draw meaningful conclusions. If there is not enough data and you are in the country in question, [install OONI Probe](https://ooni.org/install), run tests, and contribute data!",
 Country.Overview.TestsByClass.Websites,Websites,
 Country.Overview.TestsByClass.InstantMessaging,Instant Messaging,
 Country.Overview.TestsByClass.Performance,Performance,
@@ -316,11 +336,11 @@ Country.PeriodFilter.Option.3Months,Last 3 Months,
 Country.PeriodFilter.Option.6Months,Last 6 Months,
 Country.Websites.Description,"Check whether websites have been blocked.
 
-Testing methodology: OONI's [Web Connectivity test](https://ooni.io/nettest/web-connectivity/), designed to measure the DNS, HTTP, and TCP/IP blocking of websites. 
+Testing methodology: OONI's [Web Connectivity test](https://ooni.org/nettest/web-connectivity/), designed to measure the DNS, HTTP, and TCP/IP blocking of websites. 
 
 Tested websites: [Citizen Lab test lists](https://github.com/citizenlab/test-lists)
 
-If you'd like to see results on the testing of different websites, please [contribute to test lists](https://ooni.io/get-involved/contribute-test-lists/) or test the sites of your choice via the [OONI Probe mobile app](https://ooni.io/install/). 
+If you'd like to see results on the testing of different websites, please [contribute to test lists](https://ooni.org/get-involved/contribute-test-lists/) or test the sites of your choice via the [OONI Probe mobile app](https://ooni.org/install/). 
 
 Please note that unless a block page is served, some anomalous measurements may contain false positives. We therefore encourage you to examine anomalous measurements in depth and over time.",
 Country.Websites.Description.MoreLinkText,,
@@ -337,15 +357,15 @@ Country.Websites.URLCharts.Pagination.Previous,Previous Page,
 Country.Websites.URLCharts.Pagination.Next,Next Page,
 Country.Apps.Description,"Check whether instant messaging apps and circumvention tools are blocked.
 
-The following results were collected through the use of [OONI Probe tests](https://ooni.io/nettest/) designed to measure the blocking of WhatsApp, Facebook Messenger, and Telegram. 
+The following results were collected through the use of [OONI Probe tests](https://ooni.org/nettest/) designed to measure the blocking of WhatsApp, Facebook Messenger, and Telegram. 
 
 We also share results on the testing of circumvention tools, like [Tor](https://www.torproject.org/). ",
 Country.Apps.Label.LastTested,Last tested,
 Country.Apps.Label.TestedNetworks,tested networks,
 Country.Apps.Button.ShowMore,Show More,
 Country.NetworkProperties.Description,"Check the speed and performance of networks.
 
-The following results were collected through the use of [OONI Probe's performance and middlebox tests](https://ooni.io/nettest/). You can check the speed and performance of tested networks, as well as video streaming performance. 
+The following results were collected through the use of [OONI Probe's performance and middlebox tests](https://ooni.org/nettest/). You can check the speed and performance of tested networks, as well as video streaming performance. 
 
 You can also learn whether middleboxes were detected in tested networks. Middleboxes are network appliances that can be used for a variety of networking purposes (such as caching), but sometimes they're used to implement internet censorship and/or surveillance.",
 Country.NetworkProperties.Heading.Summary,Summary,
@@ -364,8 +384,8 @@ Country.NetworkProperties.InfoBox.Label.Middleboxes.Found,Middleboxes detected,
 Country.NetworkProperties.InfoBox.Label.Middleboxes.NotFound,No middleboxes detected,
 Country.NetworkProperties.Button.ShowMore,Show more networks,
 Search.Sidebar.Domain,Domain,
-Search.Sidebar.Domain.Placeholder,e.g. twitter.com,
-Search.Sidebar.Domain.Error,"Please enter a valid domain name, such as twitter.com",
+Search.Sidebar.Domain.Placeholder,e.g. twitter.com or 1.1.1.1,
+Search.Sidebar.Domain.Error,"Please enter a valid domain name or IP address, such as twitter.com or 1.1.1.1",
 Search.Sidebar.Status,Status,
 Search.Sidebar.TestName,Test Name,
 Search.Sidebar.TestName.AllTests,Any,
@@ -420,6 +440,12 @@ Search.LegacyTests.Results,,
 Search.Results.Empty.Heading,No Results Found,
 Search.Results.Empty.Description,Please try changing the filters to get better results.,
 Search.Button.LoadMore,Load more,
+Search.Error.Message,"This query took too long to complete. Please try adjusting the search filters or view the example queries in the [Highlights section of the homepage](/#highlights).
+
+If you are interested in using OONI data in batch, we recommend the [ooni-data Amazon S3 bucket](https://ooni.org/post/mining-ooni-data/) or the [OONI PostgreSQL MetaDB](https://github.com/ooni/sysadmin/blob/master/docs/metadb-sharing.md).
+
+We are working on improving the performance of OONI Explorer. To track our work on this, [see the open issues on the ooni/api repository](https://github.com/ooni/api/issues?q=is%3Aissue+is%3Aopen+label%3Aoptimization).",
+Search.Error.Details.Label,Server Response,
 Home.Banner.Title.UncoverEvidence,Uncover evidence of internet censorship worldwide,
 Home.Banner.Subtitle.ExploreCensorshipEvents,Open data collected by the global OONI community,
 Home.Banner.Button.Explore,Explore,
@@ -430,7 +456,7 @@ Home.About.SummaryText,"OONI Explorer is an open data resource on internet censo
 
 Since 2012, millions of network measurements have been collected from more than 200 countries. OONI Explorer sheds light on internet censorship and other forms of network interference worldwide.
 
-To contribute to this open dataset, [install OONI Probe](https://ooni.io/install/) and run tests!",
+To contribute to this open dataset, [install OONI Probe](https://ooni.org/install/) and run tests!",
 Home.Websites&Apps.Title,Blocking of Websites & Apps,
 Home.Websites&Apps.SummaryText,"Discover blocked websites around the world. Check whether WhatsApp, Facebook Messenger, and Telegram are blocked.",
 Home.Search&Filter.Title,Search,
@@ -440,11 +466,11 @@ Home.NetworkProperties.SummaryText,Check the speed and performance of thousands
 Home.MonthlyStats.Title,Monthly coverage worldwide,
 Home.MonthlyStats.SummaryText,"OONI Explorer hosts millions of network measurements collected from more than 200 countries since 2012. Every day, OONI Explorer is updated with new measurements!
 
-Last month, {measurementCount} OONI Probe measurements were collected from {networkCount} networks in {countryCount} countries. Explore the monthly usage of [OONI Probe](https://ooni.io/install/) through the stats below.",
+Last month, {measurementCount} OONI Probe measurements were collected from {networkCount} networks in {countryCount} countries. Explore the monthly usage of [OONI Probe](https://ooni.org/install/) through the stats below.",
 Home.Highlights.Title,Highlights,
 Home.Highlights.Description,"What can you learn from OONI Explorer? 
 
-Below we share some stories from [research reports](https://ooni.io/post/) based on OONI data.
+Below we share some stories from [research reports](https://ooni.org/post/) based on OONI data.
 
 We share these case studies to demonstrate how OONI's openly available data can be used and what types of stories can be told.