Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/API/lang/en.json18
-rw-r--r--plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png4
-rw-r--r--tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml2
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_glossary.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_glossary_widgetized.png4
7 files changed, 19 insertions, 19 deletions
diff --git a/plugins/API/lang/en.json b/plugins/API/lang/en.json
index 5b93cfff98..112e2c0419 100644
--- a/plugins/API/lang/en.json
+++ b/plugins/API/lang/en.json
@@ -1,18 +1,18 @@
{
"API": {
"ChangeTokenHint": "If you want to change this token, please go to your %1$spersonal settings page%2$s.",
- "GenerateVisits": "If you don't have data for today you can first generate some data using the %1$s plugin. You can enable the %2$s plugin, then click on the 'Visitor Generator' menu in the Matomo Admin area.",
+ "GenerateVisits": "If you don't have data for today, you can generate some using the %1$s plugin by going to 'Development → Visitor Generator' in the administration area of Matomo.",
"KeepTokenSecret": "This token_auth is as secret as your login and password, %1$s do not share it%2$s!",
- "LoadedAPIs": "Successfully loaded %s APIs",
- "MoreInformation": "For more information about the Matomo APIs, please have a look at the %1$s Introduction to Matomo API %2$s and the %3$s Matomo API Reference %4$s.",
- "PluginDescription": "All the data in Matomo is available through simple APIs. This plugin is the web service entry point, that you can call to get your Web Analytics data in xml, json, php, csv, etc.",
+ "LoadedAPIs": "Loaded %s APIs",
+ "MoreInformation": "More info about the Matomo APIs available in %1$sIntroduction to Matomo API%2$s and the %3$sMatomo API Reference%4$s.",
+ "PluginDescription": "All the data in Matomo is available through simple APIs. This plugin is the web-service entry point, that you can call to get your web analytics data in XML, JSON, PHP, CSV, etc.",
"ReportingApiReference": "Reporting API Reference",
- "TopLinkTooltip": "Access your Web Analytics data programmatically through a simple API in json, xml, etc.",
+ "TopLinkTooltip": "Access your Web Analytics data programmatically through a simple API in JSON, XML, etc.",
"UserAuthentication": "User authentication",
- "UsingTokenAuth": "If you want to %1$s request data within a script, a crontab, etc. %2$s you need to add the URL parameter %3$s to the API calls URLs that require authentication.",
+ "UsingTokenAuth": "If you want to %1$srequest data within a script, a crontab, etc.%2$s you need to add the '%3$s' URL parameter to the API calls for URLs that require authentication.",
"Glossary": "Glossary",
- "MainMetricsReportDocumentation": "This report gives you an overview over the most important metrics across all categories and plugins.",
- "LearnAboutCommonlyUsedTerms2": "Learn about the commonly used terms to make the most of Matomo Analytics.",
+ "MainMetricsReportDocumentation": "This report gives an overview of the most important metrics across all categories and plugins.",
+ "LearnAboutCommonlyUsedTerms2": "Learn about commonly used terms to make the most of Matomo analytics.",
"EvolutionMetricName": "%s Evolution"
}
-} \ No newline at end of file
+}
diff --git a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png
index a7315ae5cd..33c8dec8ee 100644
--- a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png
+++ b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4b713af0c769a9175d73a73d15f5c58063a2b9135533f1943d97011ca923f93e
-size 244192
+oid sha256:89550e1ff12411bb6bf3e727cc45417ec492c3393d780145b89566f26bb8cab9
+size 243791
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml
index 6646058108..307b5e8712 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml
@@ -201,7 +201,7 @@
</row>
<row>
<name>Main metrics (API)</name>
- <documentation>This report gives you an overview over the most important metrics across all categories and plugins.</documentation>
+ <documentation>This report gives an overview of the most important metrics across all categories and plugins.</documentation>
</row>
<row>
<name>Operating System families (Visitors)</name>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
index f4feeb23a5..569a8762ed 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
@@ -2676,7 +2676,7 @@
<name>Main metrics</name>
<module>API</module>
<action>get</action>
- <documentation>This report gives you an overview over the most important metrics across all categories and plugins.</documentation>
+ <documentation>This report gives an overview of the most important metrics across all categories and plugins.</documentation>
<metrics>
<nb_pageviews>Pageviews</nb_pageviews>
<nb_uniq_pageviews>Unique Pageviews</nb_uniq_pageviews>
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
index 79e3c14747..7f28b7e3f8 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e820a493cdb2310ac704047976813511bc01310a060b7396b0ea646c4b586aec
-size 5020591
+oid sha256:efd7f09e8c6a298c9ef8b926047003fb5aea516f4c027979e5ec34fd7166a089
+size 5019273
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_glossary.png b/tests/UI/expected-screenshots/UIIntegrationTest_glossary.png
index 8bb8814af3..308372433d 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_glossary.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_glossary.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4f321b873633ff84532035123aa25ffb00d92f8c299ee21b3d75bc203bd72031
-size 604651
+oid sha256:930e30f4161388868725081d1edcbfb5e1182d0ed18a8b2a7d79336cf20926a8
+size 604068
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_glossary_widgetized.png b/tests/UI/expected-screenshots/UIIntegrationTest_glossary_widgetized.png
index ba5dc0f123..4d529bd4c0 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_glossary_widgetized.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_glossary_widgetized.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:87a8e9807dfd8881aa63a79f61f20f0afd7bab18470bb01e3e87fbfff6957a35
-size 751553
+oid sha256:fa08ffd2e1cc0255a362bace54a9827a76a23a3f4f7cc87024f98251b87a6c0a
+size 751117