diff options
| author | Stefan Giehl <stefan@matomo.org> | 2022-08-02 12:49:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-02 12:49:17 +0300 |
| commit | 11d2db020381ad2bdeedb006e380dae5f56b920f (patch) | |
| tree | 769aeef215ff02760ea0837cc3606eb92ec3e8a5 | |
| parent | 908ea17c764255239c4e6573189b65c637700b1f (diff) | |
Combines various translation source string update PRs (#19542)
* Live plugin language reworked (#19438)
* Live plugin language reworked
* Sentence casing
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* Visited earlier, subcategories
* Reverted to "visits log"
* RowActionTooltipWithDimension reverted
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* Update plugins/Live/lang/en.json
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* updates expected test files
* Tour pluging language reworked (#19499)
* updates expected test files
* Transitions plugin language reworked (#19497)
* Transitions plugin language reworked
* Suggested changes made
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* Launch transitions sentence
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* UserCountry plugin language reworked (#19479)
* UserCountry plugin language reworked
* Suggested changes and fixes
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* Deduplication
* Steps for accurate geolocation
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* TwoFactorAuth plugin language reworked (#19482)
* TwoFactorAuth plugin language reworked
* Suggested changes and clarifications made
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* Avoiding misinterpretations
* Clarifications
* Spelling: your old codes
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* prerequisite
* - log in
Co-authored-by: Stefan Giehl <stefan@matomo.org>
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* fix syntax
* updates expected test files
* fix placeholder
Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
125 files changed, 522 insertions, 522 deletions
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png index cd8e55ae87..e7ef3730f5 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:924ae218a7fd6cb96012cf4b970cca14304949ca242eea9381a203f8d96a3056 -size 377602 +oid sha256:6bc66b9f11daac3043e99ae7ef3d7de0bd59454c8a074623744817675b414320 +size 377570 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png index b93548b2ef..3ca9c026ef 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e41d2055efe8ea46fbbf43c0b48c6c21a2c2b3f53f8ccc742c60191e33f20019 -size 67584 +oid sha256:7b0c2f5a4ebe7ea50e482c82779b2a72f92e983f0d5ebd3468eb0aa4663a864c +size 67879 diff --git a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png index aa338bce86..a41a95e798 100644 --- a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png +++ b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df7d02a293aeb8a5149cadc4569400f72b13a2c5e444d4613d03246bab46ff48 -size 180693 +oid sha256:e3bc0533030394c11a6526bcf0306331f1eefb22b8c23d8f3bc71332f592f591 +size 180486 diff --git a/plugins/CustomDimensions/tests/System/expected/test___API.getReportPagesMetadata.xml b/plugins/CustomDimensions/tests/System/expected/test___API.getReportPagesMetadata.xml index 29fb3baeb7..9f4331eb0f 100644 --- a/plugins/CustomDimensions/tests/System/expected/test___API.getReportPagesMetadata.xml +++ b/plugins/CustomDimensions/tests/System/expected/test___API.getReportPagesMetadata.xml @@ -185,7 +185,7 @@ <id>Transitions_Transitions</id> <name>Transitions</name> <order>46</order> - <help><p>Transitions gives you a report that shows the things your visitors did directly before and after viewing a certain page. This page will explain how to access, understand, and use the powerful Transitions report.</p><p><a href="https://matomo.org/docs/transitions/?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=UserGuides" rel="noreferrer noopener" target="_blank">More Details</a></p></help> + <help><p>Transitions is a report showing the things your visitors did directly before and after viewing a given page. This page explains how to access, understand, and use the powerful "Transitions" report.</p><p><a href="https://matomo.org/docs/transitions/?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=UserGuides" rel="noreferrer noopener" target="_blank">More details</a></p></help> </subcategory> <widgets> <row> @@ -1154,7 +1154,7 @@ <id>UserCountry_SubmenuLocations</id> <name>Locations</name> <order>10</order> - <help><p>The Locations section is the best way to find out where people are when they visit your site. It reveals the countries, continents, regions, cities that you visitors come from, in tables and map form. Additionally, you can see what language their browser is set to, helping identify international visitors in alternative locations.</p></help> + <help><p>The "Locations" section is the best way to find out what countries, continents, regions, and cities your website visitors come from — in table and map form. It also says what language their browser is set to, helping identify international visitors in alternative locations.</p></help> </subcategory> <widgets> <row> @@ -1415,11 +1415,11 @@ <id>General_RealTime</id> <name>Real-time</name> <order>7</order> - <help><p>The Visits in Real-time report shows the real-time flow of visits to your website. It includes a real-time counter of your visits and page views in the last 24 hours and the previous 30 minutes.</p><p>This report refreshes every 5 seconds and displays new visits (or existing visitors that view a new page) at the top of the list with a fade-in effect.</p></help> + <help><p>The visits in the real-time report show the real-time flow of visits to your website. It includes a real-time counter of your visits and page views in the last 24 hours and the previous 30 minutes.</p><p>This report refreshes every 5 seconds and displays new visits (or existing visitors that view a new page) at the top of the list with a fade-in effect.</p></help> </subcategory> <widgets> <row> - <name>Visits in Real-time</name> + <name>Visits in real-time</name> <module>Live</module> <action>widget</action> <order>20</order> @@ -1445,7 +1445,7 @@ <id>Live_VisitorLog</id> <name>Visits Log</name> <order>5</order> - <help><p>The Visits Log shows you every visit your website receives in detail. You can see what actions each visitor has taken, how they got to your site, a bit about who they are, and more (while still complying with your local privacy regulations).</p><p>While other reports in Matomo show how your visitors behave at an aggregate level, the Visits Log provides granular detail. You can also use segments to narrow it down to specific types of visits to understand your visitors better.</p><p><a href="https://matomo.org/docs/real-time/?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=UserGuides" target="_blank" rel="noreferrer noopener">Learn more in the Visits Log guide.</a></p></help> + <help><p>The visits log shows you every visit your website receives in detail. Find out which actions each visitor has performed, how they got to your site, a bit about who they are, and more (while still complying with your local privacy regulations).</p><p>While other reports in Matomo show how your visitors behave at an aggregate level, the visits log provides granular detail. You can also use segments to narrow it down to specific types of visits to understand your visitors better.</p><p><a href="https://matomo.org/docs/real-time/?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=UserGuides" target="_blank" rel="noreferrer noopener">Learn more in the visit-log guide.</a></p></help> </subcategory> <widgets> <row> diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_segmented_visitor_log.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_segmented_visitor_log.png index 4a3942c249..4dcc9308e6 100644 --- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_segmented_visitor_log.png +++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_segmented_visitor_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:589f2cd2a14365c1fbd62311cc847d78b73cc3657f68126a208e14bf1a98d244 -size 83595 +oid sha256:8cd810533b88947f657a22e365eea118bb1b7cbc3a221a2c80c1c8e630e8d8af +size 84656 diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_transitions.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_transitions.png index ba82cf5f7a..39fd885428 100644 --- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_transitions.png +++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_transitions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:340e24cadb96e7599741b76e25a80a0f753b3e7f93938302ab721a9970a80881 -size 48484 +oid sha256:0b8d0445c1f7b1785be43b62dc1a565535ea7d9895b4e142bc7887142706bacc +size 48670 diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_segmented_visitorlog.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_segmented_visitorlog.png index 2d67dc15ff..bee1c70422 100644 --- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_segmented_visitorlog.png +++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_segmented_visitorlog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86854b7e767844affcff9d19103693b0dbb4bf9c209a3915e8761ca9455ea787 -size 118656 +oid sha256:795e47b1f61a14d39cc2c89d6aca772cb6c57021d784009c3893fc5e4533d9ce +size 118779 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png index ce27088fd1..a4c684cfd2 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86402b32e55753a093278fd35f58402b31b230bd48fb924cfcf79ddb81eab4a5 -size 298745 +oid sha256:28c9b308488f31d5d1721681a474cf5bb5e87de4c3918769ca28f720d232cdd4 +size 298390 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_small_screen.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_small_screen.png index 92d12781dc..6fb2c16f5d 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_small_screen.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_small_screen.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3bacb35a00aa2ba327d2736d50fa85e03ceb1274e82f8284b772bfe957067b61 -size 239399 +oid sha256:32e67872c09aa07f5070f04dcc6663ede57fc0351bd5efa542ab2129fc424c7a +size 238399 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png index 3b87b989ce..bbf28f9773 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a535b81c408e49784d121e8b747e2d7a534486bae714ca4c3d158e004c78f7c6 -size 66491 +oid sha256:95edb91b4cc6794e1d1c51bf1b3c44a720ee4215a030e76b24f603af4655e87c +size 66275 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png index aa07fca5b4..924fbd55d7 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fdbb845abe10929aaae52fbf33bfeb3745638dc1fadf5417382df1411b000ff -size 78674 +oid sha256:a0514385854b38ed2b783cfcad5043b7b6d044bfaa218149e2fe303c9c4fda3e +size 78461 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png index 08aa2f8a61..dc61999f24 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8cb1c2cdbfd3729f3f470f16af1202f7ed1f1a178924cde0412d980d881cec54 -size 382763 +oid sha256:3b0829df71533c90182a3b4ec46229d368451a7e5475ab12ca8285632b271324 +size 381622 diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml index 31f3f57891..86fa3614c6 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml @@ -9,7 +9,7 @@ <module>UserCountry</module> <action>getCountry</action> <dimension>Country</dimension> - <documentation>This report shows which country your visitors were in when they accessed your website.</documentation> + <documentation>Shows which country your visitors connected from when accessing your website.</documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> diff --git a/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_ecommerce.png b/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_ecommerce.png index 6a66904b4f..ea5b36e7f6 100644 --- a/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_ecommerce.png +++ b/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_ecommerce.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8cc5d0a442b27bdb6498f85ce0eeebb475d736a91a6bfd242f358805a62623a -size 81709 +oid sha256:def949e67b7e83b7c3ee5bd17852f65fd3a4e4e17a802be0f0ec88fb87a8df8c +size 81694 diff --git a/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_individual_goal.png b/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_individual_goal.png index e1ec1ce4a9..3e9d737c4e 100644 --- a/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_individual_goal.png +++ b/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_individual_goal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:874e205c76d8942963997e47083903e7212423146f3f6b806622e4916d054b89 -size 219519 +oid sha256:f8d2b669ad4a8af08e077c59294fd77bce30bbac859c4c6ea1ec8e385346802c +size 219483 diff --git a/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_individual_goal_updated.png b/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_individual_goal_updated.png index eece18fb33..b86b7d7474 100644 --- a/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_individual_goal_updated.png +++ b/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_individual_goal_updated.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f89b85a1328a97cffc79f8ac7a724f386b576b38105611fee19b61770a589d4 -size 220339 +oid sha256:8cd309d80b78be75106d272e33af853ee5cddd4d1205f707393ad7be48145a98 +size 220299 diff --git a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png index 86e25d3d79..4971fe5e84 100644 --- a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png +++ b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:531fb5e2454ea22c51dc0abb2858953c826cec073069b033cae2e0507c1f6824 -size 363130 +oid sha256:d1a6974d8cae7d5cb793967740aa2631941febb01142050bf611ac2d1aebe6de +size 352084 diff --git a/plugins/Live/lang/en.json b/plugins/Live/lang/en.json index 169b047812..d41c77b99a 100644 --- a/plugins/Live/lang/en.json +++ b/plugins/Live/lang/en.json @@ -1,69 +1,69 @@ { "Live": { - "AveragePageGenerationTime": "Each page took on average %1$s to load for this visitor.", + "AveragePageGenerationTime": "Each page took %1$s to load for this visitor on average.", "CalculatedOverNPageViews": "Calculated using this visitor's last %1$s page views.", - "ClickToViewMoreAboutVisit": "Click to view more information about this visit", - "ClickToViewAllActions": "Click to view all actions of this group in detail", - "ConvertedNGoals": "Converted %s Goals", + "ClickToViewMoreAboutVisit": "Click for more info about this visit", + "ClickToViewAllActions": "Click for all actions of this group in detail", + "ConvertedNGoals": "Converted %s goals", "FirstVisit": "First visit", "GoalType": "Type", "HideMap": "hide map", - "KeywordRankedOnSearchResultForThisVisitor": "The keyword %1$s was ranked %2$s on the %3$s search result page for this visitor", + "KeywordRankedOnSearchResultForThisVisitor": "The keyword \"%1$s\" was ranked %2$s on the %3$s search result page for this visitor", "LastHours": "Last %s hours", "LastMinutes": "Last %s minutes", "LastVisit": "Last visit", "LinkVisitorLog": "View detailed visits log", - "LoadMoreVisits": "Load more visits", - "LimitedSummary": "The information in this profile summarizes the last %1$s visits. This user had more visits in total.", + "LoadMoreVisits": "Load more", + "LimitedSummary": "The info in this profile summarizes the last %1$s visits. This user had more visits in total.", "LimitedVisitsShown": "Only the last %1$s visits are shown. This user had more visits in total.", "MorePagesNotDisplayed": "more pages by this visitor are not displayed", "NbVisitor": "1 visitor", "NbVisitors": "%s visitors", "NextVisitor": "Next visitor", - "NoMoreVisits": "There are no more visits for this visitor.", + "NoMoreVisits": "These are all the visits for this visitor.", "PageRefreshed": "Number of times this page was viewed \/ refreshed in a row.", - "PluginDescription": "Provides the live Visitor Log and lets you watch your visitors live in the real-time dashboard widget. The plugin also lets you see a Visitor profile for any given user.", + "PluginDescription": "Provides the live visits log and lets you watch your visitors live in the real-time dashboard widget. A visitor profile can be browsed for any given user.", "PreviousVisitor": "Previous visitor", "RealTimeVisitors": "Real-time Visits", - "RealTimeVisitorCount": "Real Time Visitor Count", + "RealTimeVisitorCount": "Real-time visitor count", "Referrer_URL": "Referrer URL", "ShowMap": "show map", "ActionsAndDuration": "%1$s actions in %2$s", "SimpleRealTimeWidget_Message": "%1$s and %2$s in the last %3$s", "ViewVisitorProfile": "View visitor profile", - "DisableVisitorProfile": "Disable visitor profile only", - "DisableVisitorProfileDescription": "Here you can disable the visitor profile feature. All visits log related features will remain working.", + "DisableVisitorProfile": "Turn off visitor profiles", + "DisableVisitorProfileDescription": "All visits-log related features always function.", "VisitedPages": "Visited pages", "RevisitedPages": "Pages viewed more than once", "ToggleActions": "Toggle visibility of all actions", - "TopVisitedPages": "Top visited pages", + "TopVisitedPages": "Most visited pages", "VisitsLog": "Visits Log", - "DisableVisitsLogAndProfile": "Disable visits log & visitor profile", - "DisableVisitsLogAndProfileDescription": "Here you can disable the visits log and visitor profile feature. This will also disable features that depend on such like the ecommerce log, the segmented visits log, the realtime map or the realtime widget. This might be required to comply with your local privacy laws\/guidelines.", - "QueryMaxExecutionTimeExceeded": "The query took too long to execute.", - "QueryMaxExecutionTimeExceededReasonDateRange": "This can happen if the selected date range is too large. Please try to select a smaller date range.", - "QueryMaxExecutionTimeExceededReasonSegment": "This can happen if the selected segment doesn't match any visit. Please try to check your selected segment.", - "QueryMaxExecutionTimeExceededReasonUnknown": "Please try again. If it happens repeatedly, please get in touch with the administrator or support.", + "DisableVisitsLogAndProfile": "Turn off visits log and visitor profiles", + "DisableVisitsLogAndProfileDescription": "Also removes features that depend on these, like the e-commerce log, the segmented visits-log, the real-time map or the real-time widget. May be required to comply with local privacy laws\/guidelines.", + "QueryMaxExecutionTimeExceeded": "Could not run the query in time.", + "QueryMaxExecutionTimeExceededReasonDateRange": "Maybe the selected date range is too wide?", + "QueryMaxExecutionTimeExceededReasonSegment": "Maybe the selected segment didn't match any visits?", + "QueryMaxExecutionTimeExceededReasonUnknown": "Please try again. Get in touch with your administrator or support if the problem persists.", "VisitorLog": "Visits Log", - "VisitorLogDocumentation": "This table shows the latest visits within the selected date range. You can see when a visitor's last visit occurred by hovering over the date of a visit. %1$s If the date range includes today, you can see your visitors real time! %2$s The data displayed here is always live, regardless of whether and how often you are using the archiving cron job.", - "VisitorLogNoDataMessagePurged": "Likely the data has been purged because the regular deletion of old raw data is enabled and the date for this report is more than %s days old. A super user can change this setting by going to Administration => Privacy.", + "VisitorLogDocumentation": "This table shows the latest visits within the selected date range. Hover over the date of a vist to find out when the most recent one occured. %1$s If the date range includes today, you can see your visitors in real-time. %2$s The data displayed here is always live, regardless of whether and how often you make use of the archiving cron-job.", + "VisitorLogNoDataMessagePurged": "The data has likely been purged because the regular deletion of old raw data is on, and the date for this report is more than %s days old. A superuser can change this setting by going to Administration → Privacy.", "VisitorProfile": "Visitor profile", - "VisitorsInRealTime": "Visits in Real-time", - "VisitorsLastVisit": "This visitor's last visit was %s days ago.", + "VisitorsInRealTime": "Visits in real-time", + "VisitorsLastVisit": "Also visited %s days earlier.", "VisitsFrom": "%1$s%2$s visits%3$s from", "VisitSummary": "Spent a total of %1$s%2$s on the website%3$s, and viewed %4$s pages%5$s in %6$s visits%7$s.", "VisitSummaryWithActionDetails": "Spent a total of %1$s%2$s on the website%3$s, and performed %4$s actions%5$s (%6$s) in %7$s visits%8$s.", - "RowActionTooltipDefault": "Show Visits Log segmented by this row", - "RowActionTooltipWithDimension": "Show Visits Log segmented by this %s", - "RowActionTooltipTitle": "Open segmented Visits Log", - "SegmentedVisitorLogTitle": "Visits Log showing visits where %1$s is \"%2$s\"", - "OnClickPause": "%s is started. Click to pause.", - "OnClickStart": "%s is stopped. Click to start.", + "RowActionTooltipDefault": "Show the visits log segmented by this row", + "RowActionTooltipWithDimension": "Show the visits log segmented by this %s", + "RowActionTooltipTitle": "Open the segmented visits log", + "SegmentedVisitorLogTitle": "Visits log showing visits where %1$s is \"%2$s\"", + "OnClickPause": "%s is running… Click to pause it.", + "OnClickStart": "%s is stopped. Click to start it.", "ClickToSeeAllContents": "Click to see each content interaction\/impression", - "VisitorLogSubcategoryHelp1": "The Visits Log shows you every visit your website receives in detail. You can see what actions each visitor has taken, how they got to your site, a bit about who they are, and more (while still complying with your local privacy regulations).", - "VisitorLogSubcategoryHelp2": "While other reports in Matomo show how your visitors behave at an aggregate level, the Visits Log provides granular detail. You can also use segments to narrow it down to specific types of visits to understand your visitors better.", - "VisitorLogSubcategoryHelp3": "Learn more in the Visits Log guide.", - "RealTimeHelp1": "The Visits in Real-time report shows the real-time flow of visits to your website. It includes a real-time counter of your visits and page views in the last 24 hours and the previous 30 minutes.", + "VisitorLogSubcategoryHelp1": "The visits log shows you every visit your website receives in detail. Find out which actions each visitor has performed, how they got to your site, a bit about who they are, and more (while still complying with your local privacy regulations).", + "VisitorLogSubcategoryHelp2": "While other reports in Matomo show how your visitors behave at an aggregate level, the visits log provides granular detail. You can also use segments to narrow it down to specific types of visits to understand your visitors better.", + "VisitorLogSubcategoryHelp3": "Learn more in the visit-log guide.", + "RealTimeHelp1": "The visits in the real-time report show the real-time flow of visits to your website. It includes a real-time counter of your visits and page views in the last 24 hours and the previous 30 minutes.", "RealTimeHelp2": "This report refreshes every 5 seconds and displays new visits (or existing visitors that view a new page) at the top of the list with a fade-in effect." } -}
\ No newline at end of file +} diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_purged.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_purged.png index 2cca44f651..26ecae3cf3 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_purged.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_purged.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:387cc4a8be04a52a1e90729c1f56eb2a59e0686a777661bd49bdcac0d6c2d3e9 -size 20894 +oid sha256:952b04164c113f5d94ff159069bab1ff03b638e582402862da14cf67d8bae639 +size 21504 diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png index de766e7b08..583b12ab98 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ceea0fc6b0635bb2a015546c197d4788313325825fc7ad760a052be5cf79dbb2 -size 427936 +oid sha256:96b8bfbebfa750348ce4a00c98379bf1d534fbdd8dca95819dddb8aa69acba2f +size 427301 diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_action_details.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_action_details.png index c464013968..2dd2a7d3a5 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_action_details.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_action_details.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eff6994356ae945258f9acadabf27ab8b3a0cc8afa4688bd96fc44cac0cdbf58 -size 301108 +oid sha256:1d427db219440ccdf3e2b812b108fe02f7058c93de2902750feba716088bf54f +size 300989 diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_actions_hidden.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_actions_hidden.png index 522639c829..07ffbf5cd7 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_actions_hidden.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_actions_hidden.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3bffc5b302e94213c4627fa7c960e2fc0116c16212b83aeaaf41e9be9f92ee5f -size 263702 +oid sha256:033bb82fd319ffdcc489baf4bf95e532460ee7f9a13cdb146ee9b8d08379883e +size 263575 diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_limited.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_limited.png index 2efa9bfc30..f6be18b3e0 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_limited.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_limited.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c51b51b8259f877085051b73f0eba5adea8844e4df71f98b678c84e4ceb85aa0 -size 316169 +oid sha256:07a27a292b9988e327862b19fa7bddd349a9e9d22e98f597bf35772a6ab5a813 +size 315727 diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_more_visits.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_more_visits.png index 9b63e38303..90b5ec89db 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_more_visits.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_more_visits.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29c1ac44f55a825abe2fa4c7711d85588a9f964d17ba56224fa50ac548536f52 -size 454421 +oid sha256:8a4d73c737ee72766a6425460123e51fc50a2298b09b385feab8fd0bcab1629c +size 454248 diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_visit_details.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_visit_details.png index ddf446840d..1a0a65b282 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_visit_details.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_visit_details.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85ca17fdc186d913d21fe38f65a4e0c08f192b9c6dc9ba1aa37d64b71da8c626 -size 274871 +oid sha256:c41d0a900bd8d3ba5b60b70d96f203f4fd37c7307de5dc7c82746c1e927943fe +size 274749 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded.png index 44667542fb..9b4befb341 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f249e9cbfc8f6ee07607cb953b96a8dd1f871d468834ea3808e152815841ea4c -size 108849 +oid sha256:51605ec1cd8f5c500654a965c32e18c1a44d5b058a9cafeb68077c80f69adc30 +size 109176 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded_from_actions.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded_from_actions.png index 30760f63ee..9dc6705167 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded_from_actions.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded_from_actions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd435257a86a2ed634884f44a4c02584839f21e797022cf3f5c099e324e0627b -size 77916 +oid sha256:bc0b1136980becd3afbfd298b3b69f72f737dac39d272ace05859d56be82b77e +size 78250 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png index f7f4dfb7f1..dc79c6a7cc 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:badfedee0377cf1825eac084d09d4e78fa2be6cbe1e5a42d0fc755b005829e69 -size 106348 +oid sha256:81e932ee23050d2c14422f9daee3acac6b36c53fa788d788e78e76d9c7685df0 +size 106702 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_change.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_change.png index a4f80d5663..56b132ae76 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_change.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_change.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a701ee45201215b8ec896f20ed39e31d5f53c7a797b893cd6b6251ceea55fbaf -size 211791 +oid sha256:5eb2f6b4aeeae465bda62060364ca86d63f10b688630bf32f536a923446d5cc9 +size 212216 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_link_clicks.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_link_clicks.png index 0ffc5e6066..15dda933f7 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_link_clicks.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_link_clicks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38cce031c12f83d0ded2839c969338f408635d769b466df55d4d56193fa7ea53 -size 115350 +oid sha256:722e26dccf28e10d6bf193e65a062f3a7fe2ed7a49a7f2b14b0adf88651d7da9 +size 115679 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_new_links.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_new_links.png index 925616ab39..3ab53e8efb 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_new_links.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_new_links.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5fa4372a99b33d5198b0c930819e7552bd38171133e22714708c460b84bedd3e -size 117411 +oid sha256:04969aa0def5fbc643f0798ff4dc2dc451b7fbe38be92011ac03bc5a0e954b60 +size 117799 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_period_change.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_period_change.png index 0bac002c40..0deb3ec377 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_period_change.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_period_change.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7206af018288375c9d07cdbfbf025c3da5be80a4bc80b2a0879bee9cfe3b0f23 -size 213892 +oid sha256:2960e18a0be15b9162aea5ece878e1fece4d9c6388c2e94d9b442e8db643ad13 +size 214290 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_row_evolution.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_row_evolution.png index 20d53d2134..102133d213 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_row_evolution.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_row_evolution.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cbd4c062efb601c054f31ff9aacc07a4bcddb365333e467a6b1e3f5d3ba1268f -size 100117 +oid sha256:c37bfe9402997176e4d3c2f229f6cad18ccc0df502812767803727bbffe3606b +size 100201 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_transitions.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_transitions.png index 61897b7cd1..bf35214701 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_transitions.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_transitions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46cfbc750760c4da95c026de6554680f8b81b7fe5238dd0241d93b8e652cbefd -size 150664 +oid sha256:d7763836ead91976c9da8249d162378b1e4aa07f740f6f8d76fb07aa83a9dd07 +size 150709 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_showprofile.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_showprofile.png index 9c2d280591..58404f3fcf 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_showprofile.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_showprofile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5fba8cd4d49466b4bf0f30942a24b1e61bdb62d0e681f8013d891e2a7e03a470 -size 324647 +oid sha256:4e7f40dceb94a8356d26f88bc27a4d6b713d2e47a96d24f0a38b5e41419475a7 +size 324151 diff --git a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml index 0c9820dfcb..ec126b4734 100644 --- a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml +++ b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml @@ -256,7 +256,7 @@ https://www.example.org/</placeholder> <settings> <row> <name>disable_visitor_log</name> - <title>Disable visits log & visitor profile</title> + <title>Turn off visits log and visitor profiles</title> <value>0</value> <defaultValue>0</defaultValue> <type>boolean</type> @@ -265,7 +265,7 @@ https://www.example.org/</placeholder> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Here you can disable the visits log and visitor profile feature. This will also disable features that depend on such like the ecommerce log, the segmented visits log, the realtime map or the realtime widget. This might be required to comply with your local privacy laws/guidelines.</inlineHelp> + <inlineHelp>Also removes features that depend on these, like the e-commerce log, the segmented visits-log, the real-time map or the real-time widget. May be required to comply with local privacy laws/guidelines.</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -273,7 +273,7 @@ https://www.example.org/</placeholder> </row> <row> <name>disable_visitor_profile</name> - <title>Disable visitor profile only</title> + <title>Turn off visitor profiles</title> <value>0</value> <defaultValue>0</defaultValue> <type>boolean</type> @@ -282,7 +282,7 @@ https://www.example.org/</placeholder> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Here you can disable the visitor profile feature. All visits log related features will remain working.</inlineHelp> + <inlineHelp>All visits-log related features always function.</inlineHelp> <templateFile /> <introduction /> <condition>disable_visitor_log==0</condition> diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_site_edit_url.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_site_edit_url.png index 0cc7ff1efd..411f71682c 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_site_edit_url.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_site_edit_url.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fda752b4a36129a30d2f31f382f62d0ef65fb8dfb5719c4a626b0299d751dc4 -size 391919 +oid sha256:842fa540739ba6eb056bb155455eb1735ef3554f05d4300fcdcb30944d755fdf +size 380304 diff --git a/plugins/Tour/lang/en.json b/plugins/Tour/lang/en.json index d446852f30..a864ec16dc 100644 --- a/plugins/Tour/lang/en.json +++ b/plugins/Tour/lang/en.json @@ -1,55 +1,55 @@ { "Tour": { - "PluginDescription": "Become a Matomo Expert in no time by completing challenges that get you familiar with Matomo.", + "PluginDescription": "Become an expert by completing challenges to get to know Matomo.", "Tour": "Tour", "Engagement": "Engagement", "UploadLogo": "Upload your logo", - "AddUser": "Add another user", - "AddWebsite": "Add another website", + "AddUser": "Add a user", + "AddWebsite": "Add a website", "AddReport": "Add a scheduled report", "AddSegment": "Add a segment", "AddAnnotation": "Add an annotation", - "BrowseMarketplace": "Browse Marketplace", + "BrowseMarketplace": "Browse the marketplace", "PreviousChallenges": "Previous challenges", "NextChallenges": "Next challenges", "RowEvolution": "Row evolution", "ViewX": "View %s", "SetupX": "Setup %s", "SelectDateRange": "Select a date range", - "SelectDateRangeDescription": "Select a date range in the calendar.", + "SelectDateRangeDescription": "Select a time span in the calendar.", "ChangeVisualisation": "Change a visualisation", - "ChangeVisualisationDescription": "View a report and select the visualisation icon at the bottom of a report to view the same report in a different visualisation.", + "ChangeVisualisationDescription": "Browse a report and select the visualisation icon at the bottom of a report to change its visualisation.", "FlattenActions": "Flatten a page report", - "FlattenActionsDescription": "Go to Behaviour => Pages and click in the bottom of the report on the cog icon to flatten the report. A flattened report changes the hierarchy from a grouped report to a list.", - "ViewRowEvolutionDescription": "Row evolution shows you the current & past metric data for any row in any report.", - "ViewVisitsLogDescription": "The visits Log shows you all the individual visits and actions each visitor took on your site.", - "ViewVisitorProfileDescription": "The visitor log helps you to understand your visitors’ individual behavior by summarizing and listing your visitors’ visits.", - "ShareAllChallengesCompleted": "Just unlocked the %1$s achievement by completing all Matomo challenges.", - "ChallengeCompleted": "Congratulations, you have completed this challenge.", - "BecomeMatomoExpert": "Become a Matomo Expert", - "YouCanCallYourselfExpert": "You can now call yourself a true %1$sMatomo Expert%2$s.", - "StatusLevel": "You are currently a %1$s. Complete %2$s more challenges and you become a %3$s.", + "FlattenActionsDescription": "Go to Behaviour → Pages and click the cog icon in the bottom of the report to flatten it. This changes the hierarchy from a grouped report to a list.", + "ViewRowEvolutionDescription": "Shows the current and past metric data for any row in any report.", + "ViewVisitsLogDescription": "Shows all the individual visits and actions each visitor made on your website.", + "ViewVisitorProfileDescription": "Understand your visitors’ individual behavior by summarizing and listing your visitors’ visits.", + "ShareAllChallengesCompleted": "%1$s achievement unlocked by completing all Matomo challenges.", + "ChallengeCompleted": "Congratulations, the challenge is complete.", + "BecomeMatomoExpert": "Become a Matomo expert", + "YouCanCallYourselfExpert": "You can now call yourself a true %1$sMatomo expert%2$s.", + "StatusLevel": "You are currently a %1$s. Complete %2$s more challenges and become a %3$s.", "ConfigureGeolocationDescription": "Ensure the location of your visitors is correctly detected.", - "DisableBrowserArchiving": "Disable browser archiving for better performance", + "DisableBrowserArchiving": "Turn off web-browser archiving for better performance", "SkipThisChallenge": "Skip this challenge", "ShareYourAchievementOn": "Share your achievement on %1$s.", - "MatomoBeginner": "Matomo Beginner", - "MatomoIntermediate": "Matomo Intermediate", + "MatomoBeginner": "Matomo beginner", + "MatomoIntermediate": "Matomo intermediate", "MatomoTalent": "Matomo Talent", - "MatomoProfessional": "Matomo Professional", - "MatomoExpert": "Matomo Expert", - "ConfigureGeolocation": "Configure geolocation", - "CustomiseDashboard": "Customise dashboard", - "CustomiseDashboardDescription": "You can add new widgets to your Dashboard, to ensure it reports on all of your most important metrics.", + "MatomoProfessional": "Matomo professional", + "MatomoExpert": "Matomo expert", + "ConfigureGeolocation": "Set up geolocation", + "CustomiseDashboard": "Set up your dashboard", + "CustomiseDashboardDescription": "Add widgets to your dashboard to ensure it reports all your most important metrics.", "DefineGoal": "Add a goal", - "DefineGoalDescription": "Conversion tracking is a great way to identify whether you are meeting your current business objectives, identify new objectives, view and analyse your performance, and learn how to increase your conversions, conversion rates, and revenue per visit.", - "EmbedTrackingCode": "Embed tracking code", - "CompletionTitle": "Well done!", - "CompletionMessage": "You have completed all the challenges. Give yourself a pat on the back.", - "Part1Title": "Welcome to Matomo %1$s. This widget will help you become a Matomo expert in no time.", - "Part2Title": "Keep it up %1$s! You’re well on your way to becoming a Matomo expert.", - "Part3Title": "Great progress %1$s! If you continue like this, you’ll be an expert in no time!", - "Part4Title": "Great progress %1$s! Only a few more challenges to complete.", - "OnlyVisibleToSuperUser": "Only you as a %1$sSuper User%2$s can see this widget." + "DefineGoalDescription": "Conversion tracking is a great way to identify whether you are meeting your current objectives, to identify new ones, view and analyse performance. You can also learn to increase your conversions, conversion rates, and revenue per visit.", + "EmbedTrackingCode": "Embed a tracking code", + "CompletionTitle": "Well done.", + "CompletionMessage": "You have completed all challenges. Give yourself a pat on the back.", + "Part1Title": "Welcome to Matomo %1$s. This widget helps you become a Matomo expert.", + "Part2Title": "Keep it up %1$s. You’re well on your way to becoming a Matomo expert.", + "Part3Title": "You are on the right track %1$s. Continue, and become a Matomo expert.", + "Part4Title": "Great progress %1$s. Only a few more challenges to complete.", + "OnlyVisibleToSuperUser": "Only you as a %1$ssuperuser%2$s can see this widget." } -}
\ No newline at end of file +} diff --git a/plugins/Tour/tests/System/expected/test___Tour.getChallenges.xml b/plugins/Tour/tests/System/expected/test___Tour.getChallenges.xml index 0ba15f444d..29de712efa 100644 --- a/plugins/Tour/tests/System/expected/test___Tour.getChallenges.xml +++ b/plugins/Tour/tests/System/expected/test___Tour.getChallenges.xml @@ -2,7 +2,7 @@ <result> <row> <id>track_data</id> - <name>Embed tracking code</name> + <name>Embed a tracking code</name> <description>Matomo offers you various ways to embed the tracking code for your website, mobile app, and even for any device or application.</description> <isCompleted>1</isCompleted> <isSkipped>0</isSkipped> @@ -11,7 +11,7 @@ <row> <id>define_goal</id> <name>Add a goal</name> - <description>Conversion tracking is a great way to identify whether you are meeting your current business objectives, identify new objectives, view and analyse your performance, and learn how to increase your conversions, conversion rates, and revenue per visit.</description> + <description>Conversion tracking is a great way to identify whether you are meeting your current objectives, to identify new ones, view and analyse performance. You can also learn to increase your conversions, conversion rates, and revenue per visit.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>index.php?module=Goals&action=manage</url> @@ -26,7 +26,7 @@ </row> <row> <id>add_user</id> - <name>Add another user</name> + <name>Add a user</name> <description>Users Management lets you add new users, edit existing users and give them access to view or administrate websites.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -34,7 +34,7 @@ </row> <row> <id>add_website</id> - <name>Add another website</name> + <name>Add a website</name> <description>Websites management lets you add a new website and edit existing websites.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -43,7 +43,7 @@ <row> <id>flatten_actions</id> <name>Flatten a page report</name> - <description>Go to Behaviour => Pages and click in the bottom of the report on the cog icon to flatten the report. A flattened report changes the hierarchy from a grouped report to a list.</description> + <description>Go to Behaviour → Pages and click the cog icon in the bottom of the report to flatten it. This changes the hierarchy from a grouped report to a list.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/graphs-and-visualisations-in-matomo/#flattening-reports</url> @@ -51,7 +51,7 @@ <row> <id>change_visualisations</id> <name>Change a visualisation</name> - <description>View a report and select the visualisation icon at the bottom of a report to view the same report in a different visualisation.</description> + <description>Browse a report and select the visualisation icon at the bottom of a report to change its visualisation.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/graphs-and-visualisations-in-matomo/</url> @@ -66,8 +66,8 @@ </row> <row> <id>customise_dashboard</id> - <name>Customise dashboard</name> - <description>You can add new widgets to your Dashboard, to ensure it reports on all of your most important metrics.</description> + <name>Set up your dashboard</name> + <description>Add widgets to your dashboard to ensure it reports all your most important metrics.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/dashboards/create-dashboards-and-customise-widgets-and-layout/</url> @@ -91,14 +91,14 @@ <row> <id>setup_twofa</id> <name>Setup Two-factor authentication</name> - <description>Two-factor authentication increase your account security by adding an additional layer of verification when you log in. Each time you log in you will not only be asked to provide your login and password, but also an additional authentication token which changes periodically and is generated for example on your mobile device. This means that even when someone knows your username and password, they still won't be able to log in unless they have access to your mobile device for example.</description> + <description>Two-factor authentication increases account security by also asking you for a code generated on a mobile device, or one of the remaining recovery codes (in addition to your password) to log in.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/general/faq_27245</url> </row> <row> <id>disable_browser_archiving</id> - <name>Disable browser archiving for better performance</name> + <name>Turn off web-browser archiving for better performance</name> <description /> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -106,7 +106,7 @@ </row> <row> <id>configure_geolocation</id> - <name>Configure geolocation</name> + <name>Set up geolocation</name> <description>Ensure the location of your visitors is correctly detected.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -115,7 +115,7 @@ <row> <id>select_date_range</id> <name>Select a date range</name> - <description>Select a date range in the calendar.</description> + <description>Select a time span in the calendar.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/data-selectors-in-matomo/</url> @@ -123,7 +123,7 @@ <row> <id>view_visits_log</id> <name>View Visits Log</name> - <description>The visits Log shows you all the individual visits and actions each visitor took on your site.</description> + <description>Shows all the individual visits and actions each visitor made on your website.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/the-visits-log-report/</url> @@ -131,7 +131,7 @@ <row> <id>view_visitor_profile</id> <name>View Visitor profile</name> - <description>The visitor log helps you to understand your visitors’ individual behavior by summarizing and listing your visitors’ visits.</description> + <description>Understand your visitors’ individual behavior by summarizing and listing your visitors’ visits.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/docs/user-profile/</url> @@ -139,14 +139,14 @@ <row> <id>view_row_evolution</id> <name>View Row evolution</name> - <description>Row evolution shows you the current & past metric data for any row in any report.</description> + <description>Shows the current and past metric data for any row in any report.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/docs/row-evolution/</url> </row> <row> <id>browse_marketplace</id> - <name>Browse Marketplace</name> + <name>Browse the marketplace</name> <description>Extend and expand the functionality of Matomo via the Marketplace by downloading plugins and themes.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> diff --git a/plugins/Tour/tests/System/expected/test___Tour.getLevel.xml b/plugins/Tour/tests/System/expected/test___Tour.getLevel.xml index ef46d821fa..b95b6216bf 100644 --- a/plugins/Tour/tests/System/expected/test___Tour.getLevel.xml +++ b/plugins/Tour/tests/System/expected/test___Tour.getLevel.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <description>Welcome to Matomo superUserLogin. This widget will help you become a Matomo expert in no time.</description> + <description>Welcome to Matomo superUserLogin. This widget helps you become a Matomo expert.</description> <currentLevel>1</currentLevel> - <currentLevelName>Matomo Beginner</currentLevelName> - <nextLevelName>Matomo Intermediate</nextLevelName> + <currentLevelName>Matomo beginner</currentLevelName> + <nextLevelName>Matomo intermediate</nextLevelName> <numLevelsTotal>5</numLevelsTotal> <challengesNeededForNextLevel>4</challengesNeededForNextLevel> </row> diff --git a/plugins/Tour/tests/System/expected/test_nothingCompleted__Tour.getLevel.xml b/plugins/Tour/tests/System/expected/test_nothingCompleted__Tour.getLevel.xml index ef46d821fa..b95b6216bf 100644 --- a/plugins/Tour/tests/System/expected/test_nothingCompleted__Tour.getLevel.xml +++ b/plugins/Tour/tests/System/expected/test_nothingCompleted__Tour.getLevel.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <description>Welcome to Matomo superUserLogin. This widget will help you become a Matomo expert in no time.</description> + <description>Welcome to Matomo superUserLogin. This widget helps you become a Matomo expert.</description> <currentLevel>1</currentLevel> - <currentLevelName>Matomo Beginner</currentLevelName> - <nextLevelName>Matomo Intermediate</nextLevelName> + <currentLevelName>Matomo beginner</currentLevelName> + <nextLevelName>Matomo intermediate</nextLevelName> <numLevelsTotal>5</numLevelsTotal> <challengesNeededForNextLevel>4</challengesNeededForNextLevel> </row> diff --git a/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_all_completed.png b/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_all_completed.png index 18624a6375..9c5c1fa690 100644 --- a/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_all_completed.png +++ b/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_all_completed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b75b898d99401b8b0076866eb2c8a2bf3d957a8ad4fd02bf3f2796fbc0ac9493 -size 22386 +oid sha256:38079e2fba6da108579f9c296521688e9f930123e64b24a519412144f271d779 +size 22194 diff --git a/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_complete_some_challenges.png b/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_complete_some_challenges.png index 4f336d0fa5..27916bc586 100644 --- a/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_complete_some_challenges.png +++ b/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_complete_some_challenges.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:decf6f2cd94465610bb84f5302fa2a026f49c78fabea834a3807abf9b7aadcae -size 40566 +oid sha256:1242da3a3cc0f29bc15ff34245b63db5c2a5d1d5207398f0a2fe196d742a4107 +size 38762 diff --git a/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_complete_some_challenges_page_2.png b/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_complete_some_challenges_page_2.png index 8845786876..021fa00195 100644 --- a/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_complete_some_challenges_page_2.png +++ b/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_complete_some_challenges_page_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83de682b5c924c781938b09ca89420f9a2bc601314e56a19918fd092dde0dd16 -size 41775 +oid sha256:91b07169525b43480b0cc579938791a817e446f4c4a5ec2c84eac0d8037c77b8 +size 41078 diff --git a/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_complete_some_challenges_page_3.png b/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_complete_some_challenges_page_3.png index fd82f5e97d..840e153749 100644 --- a/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_complete_some_challenges_page_3.png +++ b/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_complete_some_challenges_page_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:643dedcb2ffa58f41c98af2b1fb5c5e9b79f2bb01e95692c67d17c3931508db7 -size 44497 +oid sha256:c3e3f707b082bdb69b5b20920ff83051b5d950b963bccf198ff7f30ab80b212e +size 43863 diff --git a/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_initial.png b/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_initial.png index c1ae6ce987..2ea2e4ac81 100644 --- a/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_initial.png +++ b/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78e18a68f2298dab05e57fa45f71badec65f595a45cc575313ff75f13d12eaf1 -size 41246 +oid sha256:f268a3bf7edfd7b04d48f19eb5bdbad5784a79ed49c5dc41101444c62eec3f7f +size 39910 diff --git a/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_none_completed.png b/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_none_completed.png index b19a128d0b..9459d6c4f4 100644 --- a/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_none_completed.png +++ b/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_none_completed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b49b505ae8c3502e0741956c34909169f743101324334d6238b542031cb6287 -size 41429 +oid sha256:44538ad64e9693154dc9b3c6c7eda96e54a428216fa0a904e95aade3f09768a0 +size 40110 diff --git a/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_skipped_goal.png b/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_skipped_goal.png index a7f5991dc4..cde3292455 100644 --- a/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_skipped_goal.png +++ b/plugins/Tour/tests/UI/expected-screenshots/Tour_widget_skipped_goal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fa12ddc8c0e6751ebf7aa1deb391ce90e402ec0e1607243cbf2948cde88ac2b -size 41216 +oid sha256:9258614fa21d5bbcaab1b6051dc93a017ada1de17d42f6ba19ea012535468454 +size 39902 diff --git a/plugins/Transitions/lang/en.json b/plugins/Transitions/lang/en.json index 71cdb25bb5..243f7c1425 100644 --- a/plugins/Transitions/lang/en.json +++ b/plugins/Transitions/lang/en.json @@ -1,7 +1,7 @@ { "Transitions": { "BouncesInline": "%s bounces", - "DirectEntries": "Direct Entries", + "DirectEntries": "Direct entries", "Transitions": "Transitions", "ErrorBack": "Go back to the previous action", "ExitsInline": "%s exits", @@ -9,34 +9,34 @@ "NumDownloads": "%s downloads", "NumOutlinks": "%s outlinks", "TopX": "Top %s labels", - "FeatureDescription": "Transitions gives you a report that shows the things your visitors did directly before and after viewing a certain page. This page will explain how to access, understand, and use the powerful Transitions report.", + "FeatureDescription": "Transitions is a report showing the things your visitors did directly before and after viewing a given page. This page explains how to access, understand, and use the powerful \"Transitions\" report.", "AvailableInOtherReports": "Did you know? Transitions are also available as a row action in the following reports:", - "AvailableInOtherReports2": "Simply hover a row in any of these reports and click on the transition icon %s to launch it.", - "FromCampaigns": "From Campaigns", - "FromPreviousPages": "From Internal Pages", + "AvailableInOtherReports2": "Launch transitions by clicking their icon (%s) after hovering a row in any of these reports.", + "FromCampaigns": "From campaigns", + "FromPreviousPages": "From internal pages", "FromPreviousPagesInline": "%s from internal pages", - "FromPreviousSiteSearches": "From Internal Search", + "FromPreviousSiteSearches": "From internal search", "FromPreviousSiteSearchesInline": "%s from internal searches", - "FromSearchEngines": "From Search Engines", - "FromSocialNetworks": "From Social Networks", - "FromWebsites": "From Websites", + "FromSearchEngines": "From search engines", + "FromSocialNetworks": "From social networks", + "FromWebsites": "From websites", "IncomingTraffic": "Incoming traffic", "LoopsInline": "%s page reloads", - "NoDataForAction": "There's no data for %s", - "NoDataForActionDetails": "Either the action had no pageviews during the period %s or it is invalid.", - "PeriodNotAllowed": "Time period not allowed", - "PeriodNotAllowedDetails": "This feature is not available for this period, try selecting a period with fewer days", + "NoDataForAction": "No data for %s", + "NoDataForActionDetails": "Either the action had no pageviews during the period, or it is invalid.", + "PeriodNotAllowed": "Select a valid time period", + "PeriodNotAllowedDetails": "Try selecting a period with fewer days for this feature.", "OutgoingTraffic": "Outgoing traffic", - "PluginDescription": "Reports previous and following actions for each page URL in a new Transitions report, available in the Actions reports via a new icon.", + "PluginDescription": "Reports previous and following actions for each page URL in a new \"Transitions\" report, available in the \"Actions\" reports via a new icon.", "ShareOfAllPageviews": "This page had %1$s pageviews (%2$s of all pageviews)", - "ToFollowingPages": "To Internal Pages", + "ToFollowingPages": "To internal pages", "ToFollowingPagesInline": "%s to internal pages", - "ToFollowingSiteSearches": "Internal Searches", + "ToFollowingSiteSearches": "Internal searches", "ToFollowingSiteSearchesInline": "%s internal searches", "XOfAllPageviews": "%s of all views of this page", "XOutOfYVisits": "%1$s (out of %2$s)", - "PageURLTransitions": "Page URL Transitions", - "TransitionsSubcategoryHelp1": "Transitions gives you a report that shows the things your visitors did directly before and after viewing a certain page. This page will explain how to access, understand, and use the powerful Transitions report.", - "TransitionsSubcategoryHelp2": "More Details" + "PageURLTransitions": "Page URL transitions", + "TransitionsSubcategoryHelp1": "Transitions is a report showing the things your visitors did directly before and after viewing a given page. This page explains how to access, understand, and use the powerful \"Transitions\" report.", + "TransitionsSubcategoryHelp2": "More details" } -}
\ No newline at end of file +} diff --git a/plugins/Transitions/tests/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml b/plugins/Transitions/tests/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml index 30c7e6f089..a1981e6040 100644 --- a/plugins/Transitions/tests/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml +++ b/plugins/Transitions/tests/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml @@ -69,14 +69,14 @@ </downloads> <referrers> <row> - <label>Direct Entries</label> + <label>Direct entries</label> <shortName>direct</shortName> <visits>1</visits> <details> </details> </row> <row> - <label>From Search Engines</label> + <label>From search engines</label> <shortName>search</shortName> <visits>2</visits> <details> @@ -91,7 +91,7 @@ </details> </row> <row> - <label>From Websites</label> + <label>From websites</label> <shortName>website</shortName> <visits>1</visits> <details> @@ -102,7 +102,7 @@ </details> </row> <row> - <label>From Campaigns</label> + <label>From campaigns</label> <shortName>campaign</shortName> <visits>1</visits> <details> diff --git a/plugins/Transitions/tests/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml b/plugins/Transitions/tests/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml index 95b947f64c..524970d303 100644 --- a/plugins/Transitions/tests/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml +++ b/plugins/Transitions/tests/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml @@ -77,14 +77,14 @@ </downloads> <referrers> <row> - <label>Direct Entries</label> + <label>Direct entries</label> <shortName>direct</shortName> <visits>1</visits> <details> </details> </row> <row> - <label>From Search Engines</label> + <label>From search engines</label> <shortName>search</shortName> <visits>2</visits> <details> @@ -99,7 +99,7 @@ </details> </row> <row> - <label>From Websites</label> + <label>From websites</label> <shortName>website</shortName> <visits>1</visits> <details> @@ -110,7 +110,7 @@ </details> </row> <row> - <label>From Campaigns</label> + <label>From campaigns</label> <shortName>campaign</shortName> <visits>1</visits> <details> diff --git a/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml b/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml index c9753b7748..465c8c21e3 100644 --- a/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml +++ b/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml @@ -85,14 +85,14 @@ </downloads> <referrers> <row> - <label>Direct Entries</label> + <label>Direct entries</label> <shortName>direct</shortName> <visits>1</visits> <details> </details> </row> <row> - <label>From Search Engines</label> + <label>From search engines</label> <shortName>search</shortName> <visits>2</visits> <details> @@ -107,7 +107,7 @@ </details> </row> <row> - <label>From Websites</label> + <label>From websites</label> <shortName>website</shortName> <visits>1</visits> <details> diff --git a/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml b/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml index 7a9e5f8737..4f6392b1df 100644 --- a/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml +++ b/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml @@ -97,14 +97,14 @@ </downloads> <referrers> <row> - <label>Direct Entries</label> + <label>Direct entries</label> <shortName>direct</shortName> <visits>1</visits> <details> </details> </row> <row> - <label>From Search Engines</label> + <label>From search engines</label> <shortName>search</shortName> <visits>2</visits> <details> @@ -119,7 +119,7 @@ </details> </row> <row> - <label>From Websites</label> + <label>From websites</label> <shortName>website</shortName> <visits>1</visits> <details> diff --git a/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml b/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml index d8cd9f39d0..2f836ce84a 100644 --- a/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml +++ b/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml @@ -73,14 +73,14 @@ </downloads> <referrers> <row> - <label>Direct Entries</label> + <label>Direct entries</label> <shortName>direct</shortName> <visits>1</visits> <details> </details> </row> <row> - <label>From Search Engines</label> + <label>From search engines</label> <shortName>search</shortName> <visits>2</visits> <details> @@ -95,7 +95,7 @@ </details> </row> <row> - <label>From Websites</label> + <label>From websites</label> <shortName>website</shortName> <visits>1</visits> <details> @@ -106,7 +106,7 @@ </details> </row> <row> - <label>From Campaigns</label> + <label>From campaigns</label> <shortName>campaign</shortName> <visits>1</visits> <details> diff --git a/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml b/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml index 1498ae3757..6dc79e4190 100644 --- a/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml +++ b/plugins/Transitions/tests/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml @@ -81,14 +81,14 @@ </downloads> <referrers> <row> - <label>Direct Entries</label> + <label>Direct entries</label> <shortName>direct</shortName> <visits>1</visits> <details> </details> </row> <row> - <label>From Search Engines</label> + <label>From search engines</label> <shortName>search</shortName> <visits>2</visits> <details> @@ -103,7 +103,7 @@ </details> </row> <row> - <label>From Websites</label> + <label>From websites</label> <shortName>website</shortName> <visits>1</visits> <details> @@ -114,7 +114,7 @@ </details> </row> <row> - <label>From Campaigns</label> + <label>From campaigns</label> <shortName>campaign</shortName> <visits>1</visits> <details> diff --git a/plugins/Transitions/tests/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageTitle_day.xml b/plugins/Transitions/tests/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageTitle_day.xml index c9753b7748..465c8c21e3 100644 --- a/plugins/Transitions/tests/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageTitle_day.xml +++ b/plugins/Transitions/tests/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageTitle_day.xml @@ -85,14 +85,14 @@ </downloads> <referrers> <row> - <label>Direct Entries</label> + <label>Direct entries</label> <shortName>direct</shortName> <visits>1</visits> <details> </details> </row> <row> - <label>From Search Engines</label> + <label>From search engines</label> <shortName>search</shortName> <visits>2</visits> <details> @@ -107,7 +107,7 @@ </details> </row> <row> - <label>From Websites</label> + <label>From websites</label> <shortName>website</shortName> <visits>1</visits> <details> diff --git a/plugins/Transitions/tests/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageUrl_day.xml b/plugins/Transitions/tests/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageUrl_day.xml index 30c7e6f089..a1981e6040 100644 --- a/plugins/Transitions/tests/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageUrl_day.xml +++ b/plugins/Transitions/tests/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageUrl_day.xml @@ -69,14 +69,14 @@ </downloads> <referrers> <row> - <label>Direct Entries</label> + <label>Direct entries</label> <shortName>direct</shortName> <visits>1</visits> <details> </details> </row> <row> - <label>From Search Engines</label> + <label>From search engines</label> <shortName>search</shortName> <visits>2</visits> <details> @@ -91,7 +91,7 @@ </details> </row> <row> - <label>From Websites</label> + <label>From websites</label> <shortName>website</shortName> <visits>1</visits> <details> @@ -102,7 +102,7 @@ </details> </row> <row> - <label>From Campaigns</label> + <label>From campaigns</label> <shortName>campaign</shortName> <visits>1</visits> <details> diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_titles.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_titles.png index b09c60c13b..cce2089acf 100644 --- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_titles.png +++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_titles.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8eb1e46648822142aad3a666db0532e3555460de8fc238610520c8c82582cae5 -size 69838 +oid sha256:d1031fd9010344175afe02fd02299fa00e8d2723ebab0b289c94e70ed1889f17 +size 69898 diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png index 969d9f1488..dee4ff8eb9 100644 --- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png +++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:666d1e0bc17844d8b9ae45fa3beebb1ab7150578d60c1de531ea34bd56b0c2b5 -size 78767 +oid sha256:1d53e43df29afbeef98321a2cc9364a8d8e991b444045aeaefceb42611d59d0c +size 78910 diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_no_data_widget.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_no_data_widget.png index 3694b57ccd..ada224b89c 100644 --- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_no_data_widget.png +++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_no_data_widget.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d27573ead1eb43a421c5a3ca586ca149e581cbe91ea87b36e070cc657421cf3f -size 25933 +oid sha256:375f6f5925738d60f78003d9706784daabaad7fc83ba5cf8432bcd10c5346c22 +size 25426 diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_period_not_allowed.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_period_not_allowed.png index 976aeea667..b2c8113031 100644 --- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_period_not_allowed.png +++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_period_not_allowed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca385ca3a495d798fa1cdbb0896cc156650d40b84b8e3ff1af2a130d808f7f19 -size 44318 +oid sha256:80634fafd0499167d3ef7624f63599aa9108192577e00daf2237560ffc3e383f +size 44380 diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_type_title.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_type_title.png index cd3e0206b9..a962ce59e3 100644 --- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_type_title.png +++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_type_title.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1742ff06f3cdd0f77f64059489fae3a81456523b91e8bf38314d4abbe8dd365f -size 182448 +oid sha256:b7f5689c6e6fc9efdf5cf02e316cd07318e698571344317065d3511d40f0ab06 +size 181676 diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_url.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_url.png index ed410690e9..989b0b2624 100644 --- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_url.png +++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_url.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7549a8453fbbc08412ebe916e36dd92927d97782fcad5807694ac220e9fbbac5 -size 79832 +oid sha256:597da3020e16c19b92ed57529b2514dffd7de9a17aa64436ac9830d8205a85f8 +size 79319 diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_report.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_report.png index 3355e195f4..ca9dcccffa 100644 --- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_report.png +++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_report.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8ac8fbaec85494049d0346f15ae8c2b7861ad55e9b34a7454ae5e75ad5e37cc -size 112399 +oid sha256:2edace8ddf233b94decdc9e2acc8b2731d994f25fc14e9b6ebd1f732e3a46af4 +size 112662 diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_widget.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_widget.png index c0b9ef1bb0..89451e8f74 100644 --- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_widget.png +++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_widget.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:599bf12771cbf0f1c5fd274e111d4fdcdf5d51e992426d6074f7f745e65fa49b -size 106290 +oid sha256:0e74547aee8e6383a8291531b7249e53c4d4212c638924a3e6bf8b2149d02aa0 +size 105787 diff --git a/plugins/TwoFactorAuth/lang/en.json b/plugins/TwoFactorAuth/lang/en.json index c1d4665472..a76abb184c 100644 --- a/plugins/TwoFactorAuth/lang/en.json +++ b/plugins/TwoFactorAuth/lang/en.json @@ -2,50 +2,50 @@ "TwoFactorAuth": { "TwoFactorAuthentication": "Two-factor authentication", "TwoFAShort": "2FA", - "TwoFactorAuthenticationIntro": "%1$sTwo-factor authentication%2$s increase your account security by adding an additional layer of verification when you log in. Each time you log in you will not only be asked to provide your login and password, but also an additional authentication token which changes periodically and is generated for example on your mobile device. This means that even when someone knows your username and password, they still won't be able to log in unless they have access to your mobile device for example.", - "TwoFactorAuthenticationIsEnabled": "Two-factor authentication is currently enabled.", - "TwoFactorAuthenticationIsDisabled": "Two-factor authentication is currently disabled.", - "TwoFactorAuthenticationRequired": "Two-factor authentication is required to be enabled for everyone, you cannot disable it.", - "ConfigureDifferentDevice": "Configure a different device", + "TwoFactorAuthenticationIntro": "%1$sTwo-factor authentication%2$s increases account security by also asking you for a code generated on a mobile device, or one of the remaining recovery codes (in addition to your password) to log in.", + "TwoFactorAuthenticationIsEnabled": "Two-factor authentication on.", + "TwoFactorAuthenticationIsDisabled": "Two-factor authentication off.", + "TwoFactorAuthenticationRequired": "Two-factor authentication is required for everyone, you cannot turn it off.", + "ConfigureDifferentDevice": "Set up a new device", "SetUpTwoFactorAuthentication": "Set up two-factor authentication (2FA)", - "RequiredToSetUpTwoFactorAuthentication": "You are required to set up two-factor authentication before you can log in", + "RequiredToSetUpTwoFactorAuthentication": "You must set up two-factor authentication before logging in.", "AuthenticationCode": "Authentication code", "Verify": "Verify", "StepX": "Step %s", - "MissingAuthCodeAPI": "Please specify two-factor authentication code.", - "InvalidAuthCode": "The two-factor authentication code is not correct.", - "RequiredAuthCodeNotConfiguredAPI": "You are required to set up two-factor authentication. Please log in to your account.", - "VerifyIdentifyExplanation": "Open the two-factor authentication app on your device to view your authentication code and verify your identity.", - "DontHaveYourMobileDevice": "Don’t have your mobile device?", + "MissingAuthCodeAPI": "Please specify a two-factor authentication code.", + "InvalidAuthCode": "Incorrect two-factor authentication code.", + "RequiredAuthCodeNotConfiguredAPI": "You must set up two-factor authentication. Please log in to do so.", + "VerifyIdentifyExplanation": "Verify yourself by opening the two-factor authentication app on your device to get your authentication code.", + "DontHaveYourMobileDevice": "Don't have your mobile device?", "EnterRecoveryCodeInstead": "Enter one of your recovery codes", - "AskSuperUserResetAuthenticationCode": "Ask super user to reset your authentication code", + "AskSuperUserResetAuthenticationCode": "Ask a superuser to reset your authentication code", "SetupIntroFollowSteps": "Please follow these steps to set up two-factor authentication:", - "SetupFinishedTitle": "Congratulations! Your account is now more secure.", - "SetupFinishedSubtitle": "You have successfully set up two-factor authentication. Next time you log in, you will need to also enter the authentication code. Make sure you have your mobile device or your backup codes with you.", - "WarningChangingConfiguredDevice": "You are about to change the configured two-factor authentication device. This will invalidate any previously configured device.", + "SetupFinishedTitle": "Your account is now more secure.", + "SetupFinishedSubtitle": "You have now set up two-factor authentication. From now on you need to enter an authentication code to log in. Make sure you have your mobile device or your backup codes with you.", + "WarningChangingConfiguredDevice": "You are about to change the configured two-factor authentication device, invalidating the one you had before.", "ShowRecoveryCodes": "Show recovery codes", "ConfirmSetup": "Confirm setup", "NotPossibleToLogIn": "Cannot log in to Matomo Analytics", - "LostAuthenticationDevice": "Hi,%1$sI have two-factor authentication enabled and lost my authentication device. Could you please reset two-factor authentication for my username %5$s? You can find the instructions for this here: %6$s.%2$sThe Matomo URL is %3$s.%4$sThanks", - "WrongAuthCodeTryAgain": "Wrong authentication code entered. Please try again.", - "DisableTwoFA": "Disable two-factor authentication", - "EnableTwoFA": "Enable two-factor authentication", - "ConfirmDisableTwoFA": "Are you sure you want to disable two-factor authentication for your account? Having two-factor authentication enabled increases your account security.", - "VerifyAuthCodeIntro": "Please enter the six-digit code from your authenticator app below to confirm you have successfully set up on your device.", - "VerifyAuthCodeHelp": "Please enter the six-digit code that has been generated on your mobile device after scanning the bar code.", + "LostAuthenticationDevice": "Hi,%1$sI have two-factor authentication and lost my authentication device. Could you please reset the two-factor authentication for my username \"%5$s\"? Instructions here: %6$s.%2$sThe Matomo URL is %3$s.%4$sThanks", + "WrongAuthCodeTryAgain": "Wrong authentication code. Please try again.", + "DisableTwoFA": "Turn off two-factor authentication", + "EnableTwoFA": "Turn on two-factor authentication", + "ConfirmDisableTwoFA": "Turn off two-factor authentication for your account? This will lower your account security.", + "VerifyAuthCodeIntro": "Please enter the six-digit code from your OTP app below to confirm you have set up on your device.", + "VerifyAuthCodeHelp": "Please enter the six-digit code generated on your mobile device after scanning the barcode.", "Your2FaAuthSecret": "Your two-factor authentication secret", - "SetupAuthenticatorOnDevice": "Setup authenticator on your device", - "SetupAuthenticatorOnDeviceStep1": "Install an authenticator app, for example:", - "SetupAuthenticatorOnDeviceStep2": "Next, open the app and scan the below bar code with the two-factor authentication app on your phone. If you can’t scan the barcode, %1$senter this code%2$s instead.", - "SetupBackupRecoveryCodes": "Please backup your recovery codes using one of the above methods before continuing the two-factor authentication setup.", + "SetupAuthenticatorOnDevice": "Set up an OTP app on your device", + "SetupAuthenticatorOnDeviceStep1": "Install an OTP app, for example:", + "SetupAuthenticatorOnDeviceStep2": "Next, open the app and scan the barcode below with the OTP app on your mobile device. %1$sEnter this code%2$s if you can't scan the barcode.", + "SetupBackupRecoveryCodes": "Please save your recovery codes securely using one of the methods above before continuing.", "RecoveryCodes": "Recovery codes", - "RecoveryCodesExplanation": "You can use recovery codes to access your account when you cannot receive two-factor authentication codes, for example when you don't have your mobile device with you.", - "RecoveryCodesSecurity": "Please treat your recovery codes with the same level of security as you would your password!", - "RecoveryCodesAllUsed": "All recovery codes have been used, it is highly recommended you regenerate your recovery codes.", - "RecoveryCodesRegenerated": "Recovery codes have been regenerated. Make sure to download or print the newly generated codes.", + "RecoveryCodesExplanation": "You can use recovery codes to access your account when you cannot receive two-factor authentication codes (for example when you don't have your mobile device with you).", + "RecoveryCodesSecurity": "Please protect your recovery codes like a password.", + "RecoveryCodesAllUsed": "All recovery codes have been used. You must generate new ones.", + "RecoveryCodesRegenerated": "Recovery codes generated. Make sure to download or print out the newly generated codes.", "GenerateNewRecoveryCodes": "Generate new recovery codes", - "GenerateNewRecoveryCodesInfo": "When you generate new recovery codes, your old codes won’t work anymore. Make sure to download or print your new codes.", + "GenerateNewRecoveryCodesInfo": "Generating new recovery codes means your old ones won't work anymore. Download or print out your new codes.", "RequireTwoFAForAll": "Require two-factor authentication for everyone", - "RequireTwoFAForAllInformation": "When enabled, every user has to enable two factor authentication. Enforcing 2FA will require all users to have access to a device where they can install an authenticator app. You can only enable this if you already have two factor authentication set up yourself." + "RequireTwoFAForAllInformation": "Requires other users also log in with 2FA by using an OTP app on their mobile device. (As a prerequisite, you must use 2FA yourself.)" } -}
\ No newline at end of file +} diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified.png index 1b433ac09c..8fa0640eff 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e0118420990876aedea3de99d01a4265a48657e4ab31944b184256fb06abf1c -size 41177 +oid sha256:772869a00bea1a576ba1a7723a4b160d75c977dc9ecc87e144f2d4637f9c4624 +size 41531 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified_wrong_code.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified_wrong_code.png index 9154560f36..6dc5fc9f01 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified_wrong_code.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified_wrong_code.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5ded36bd07974ec329f2b10b0ea442b0e1cbcce62338b97e269dacedd093769 -size 48834 +oid sha256:728dd8b690de99338af10dcdb596d32073a8489799fdcbbfd1bd0e6d75b469c9 +size 47986 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step2.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step2.png index f954cb94b3..20698df7ed 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step2.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d48acfb0bee9aea9e3e2b9847dba1f1ab62ae0aee6d88b12ff134cf06dd9da29 -size 60139 +oid sha256:a8483eb5cc0071e198329db8c7100ba06a0da6cc8c2a703d573e0bf0b3dbcb31 +size 57998 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step1.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step1.png index b522f495a0..293e751f74 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step1.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d418c2c6a6ebf3e7c95ed839e18f330aeed156d2cc1371fa4ec008d1fb883d54 -size 92484 +oid sha256:e64e4de3e4a8a3812af0b4db92287db1475139ce08a741fc51c75583f5b20965 +size 85135 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step2.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step2.png index 77a35e6ce5..bcd36ac969 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step2.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7926caf73a1860283e2eef62d5aac0dea3bdd94aada0dd41bcece2e5f9c3197c -size 125529 +oid sha256:f4698773a1109217c1a045b72d980b9fb2be85d37af92ec384a996f0cb2fa211 +size 120431 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png index f017cb3c08..56ebf5fea7 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1c18522b3cec0b11757039987abd9ceba1b125c3e379657bce51522597c3ec2 -size 162328 +oid sha256:7b9a026af53e00fe1d068e011fcf653232540d036c9b0640292cadaa01f4fbef +size 154084 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step1.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step1.png index 81943adc30..8b54f9495b 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step1.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8b37ab111c80837ddb451bd9c7eb7ab9e7dd9bc8994476088a6cfbaa4c5d6de -size 66859 +oid sha256:42124bc73cc6c45fde7f6397023f7bb654574892fd6d0bfd973ffc0642fe829e +size 63297 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step2.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step2.png index d85d5a5bac..33487ce143 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step2.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1f3c1af5c9a2f6c2ce1c9222eec9d833c38f61b689f2aa1118461f8499aba3d -size 86228 +oid sha256:8d77685dcbc9996a5878336b1e843c6979bc7c65c76a84b5d0f72c73f475e669 +size 83492 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png index 389351c553..dca0c57926 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1188f261fc033679860dbdc5bf6cdaf9a0f0d4246f6435e04882390d73c4aadb -size 114098 +oid sha256:6735b30f0436a4b17733012ac3babef1f0d5f63bd5cdd1509c46a14d4618df5b +size 108932 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step4.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step4.png index aa7cf15880..b210b203ca 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step4.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2058c1ae548aa0e2101b7fc818c6239cd34ee4de650a776cd66d27aaab41fa0 -size 30322 +oid sha256:abcd09dc2b4df5b5047576f9bf2d6377ed1ea608790e3f71c83ddf9786b6bf6b +size 26511 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step1.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step1.png index f34da61680..203a2485eb 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step1.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3be79fe62492bdb97492bd5150216fff4468c9ae3ffab548ebcb1439459e4738 -size 14166 +oid sha256:f6176915cd1dd8d36e08810ad9f3c1b6014ac70663f99c8e6bc71fb636c34260 +size 9805 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step3.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step3.png index 27987bf12b..18a7dd4eb7 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step3.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c8af4bce2cbfb44c6c4ad37057c4986423c615f829f93608226a224a663289a -size 44042 +oid sha256:2a65302c5f48432ede95f9b04b8550a323f68065eeb4b5ef4fb7fb519e32082d +size 26496 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled.png index 79a6b8b3a0..c0d6fa479e 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fc401f84f8ae04fba130470f7e0f1708f9b3ae38556478592173f538a0452b5 -size 47350 +oid sha256:f66fee6f7cb3c72b0ad7efe75de67d7e68570a4799fc0c362f4c3cbde77b030c +size 29708 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled_required.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled_required.png index 896ab6d587..4a77a54fa8 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled_required.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled_required.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b86748ca1940df1abd0fce75648d9ee2702dd5b4a0aa4e008f660f3425472e0f -size 51823 +oid sha256:e1ece418bf5932f9e7e35868aeb93975e5472aa7c12597ffdf5a8162594e6ed0 +size 33162 diff --git a/plugins/UserCountry/lang/en.json b/plugins/UserCountry/lang/en.json index deed27baf9..88285acbed 100644 --- a/plugins/UserCountry/lang/en.json +++ b/plugins/UserCountry/lang/en.json @@ -1,51 +1,51 @@ { "UserCountry": { - "CannotLocalizeLocalIP": "IP address %s is a local address and cannot be geolocated.", + "CannotLocalizeLocalIP": "The IP address \"%s\" is local, so it cannot be geolocated.", "City": "City", "CityAndCountry": "%1$s, %2$s", "Continent": "Continent", "Continents": "Continents", "Country": "Country", "CountryCode": "Country code", - "country_a1": "Anonymous Proxy", - "country_a2": "Satellite Provider", + "country_a1": "Anonymous proxy", + "country_a2": "Satellite provider", "country_cat": "Catalan-speaking communities", - "country_o1": "Other Country", - "VisitLocation": "Visit Location", - "CurrentLocationIntro": "According to this provider, your current location is", - "DefaultLocationProviderDesc1": "The default location provider guesses a visitor's country based on the language they use.", - "DefaultLocationProviderDesc2": "This is not very accurate, so %1$swe recommend installing and using %2$sa geolocation database%3$s.%4$s", - "DefaultLocationProviderExplanation": "You are using the default location provider, which means Matomo will guess the visitor's location based on the language they use. %1$sRead this%2$s to learn how to setup more accurate geolocation.", - "DisabledLocationProvider": "Disables the geolocation.", + "country_o1": "Other country", + "VisitLocation": "Visitor location", + "CurrentLocationIntro": "This provider determines your current location to be", + "DefaultLocationProviderDesc1": "The default location provider determines the country visitors connect from based on their selected language.", + "DefaultLocationProviderDesc2": "This is not very accurate, so %1$sinstall and use a %2$sgeolocation database%3$s%4$s.", + "DefaultLocationProviderExplanation": "You are using the default location provider, so the country visitors connect from is determined from their selected language. %1$sLearn how to set up more accurate geolocation%2$s.", + "DisabledLocationProvider": "Turns off geolocation.", "DistinctCountries": "%s distinct countries", "FromDifferentCities": "different cities", - "GeoIPDocumentationSuffix": "In order to see data for this report, you must setup GeoIP in the Geolocation admin tab. The commercial %1$sMaxmind%2$s GeoIP databases are more accurate than the free ones. To see how accurate they are, click %3$shere%4$s.", + "GeoIPDocumentationSuffix": "Set up GeoIP in the Geolocation admin tab to provide data for this report. The commercial %1$sMaxMind%2$s GeoIP databases are more accurate than the gratis ones. %3$sClick here%4$s to see how accurate they are.", "Geolocation": "Geolocation", - "GeolocationPageDesc": "On this page you can change how Matomo determines visitor locations.", - "GeolocationProviderBroken": "The configured geolocation provider %1$s is broken. Please fix the provider or configure another one to get geolocation working again.", - "GeolocationProviderUnavailable": "The configured geolocation provider %1$s is not available anymore, please configure another one.", - "getCityDocumentation": "This report shows the cities your visitors were in when they accessed your website.", - "getContinentDocumentation": "This report shows which continent your visitors were in when they accessed your website.", - "getCountryDocumentation": "This report shows which country your visitors were in when they accessed your website.", - "getRegionDocumentation": "This report shows which region your visitors were in when they accessed your website.", + "GeolocationPageDesc": "Here you can change how Matomo determines visitor locations.", + "GeolocationProviderBroken": "Your geolocation provider (%1$s) is broken. Please fix the provider, or set up another one.", + "GeolocationProviderUnavailable": "Your geolocation provider (%1$s) is no longer available. Please set up another one.", + "getCityDocumentation": "Shows the cities your visitors connected from when accessing your website.", + "getContinentDocumentation": "Shows which continent your visitors connected from when accessing your website.", + "getCountryDocumentation": "Shows which country your visitors connected from when accessing your website.", + "getRegionDocumentation": "Shows which region your visitors connected from when accessing website.", "HowToInstallGeoIPDatabases": "How do I get geolocation databases?", "Latitude": "Latitude", "Latitudes": "Latitudes", "Location": "Location", - "LocationProvider": "Location Provider", + "LocationProvider": "Location provider", "Longitude": "Longitude", "Longitudes": "Longitudes", - "NoDataForGeoIPReport1": "There is no data for this report because there is either no location data available or visitor IP addresses cannot be geolocated.", - "NoDataForGeoIPReport2": "To enable accurate geolocation, change the settings %1$shere%2$s and use a %3$scity level database%4$s.", - "NoProviders": "There are currently no additional geolocation providers available. Matomo recommends using the %1$sdbip%2$s databases, but this requires activating the GeoIp2 plugin. (Alternatively you can install a third party plugin that provides it's own geolocation functionality from the marketplace.)", - "PluginDescription": "Reports the location of your visitors: country, region, city and geographic coordinates (latitude\/longitude).", + "NoDataForGeoIPReport1": "No data for this report, as there is either no location data available, or visitor IP addresses cannot be geolocated.", + "NoDataForGeoIPReport2": "%1$sChange these settings%2$s, and use a %3$scity-level database%4$s to get accurate geolocation.", + "NoProviders": "No additional geolocation providers available. %1$sDB-IP%2$s is recommended, but requires the GeoIp2 plugin. (You can also install a third-party geolocation plugin from the marketplace.)", + "PluginDescription": "Reports the location of your visitors: country, region, city and geographic coordinates (latitude and longitude).", "Region": "Region", "SubmenuLocations": "Locations", - "TestIPLocatorFailed": "Matomo tried checking the location of a known IP address (%1$s), but your server returned no information. This provider may not be configured correctly (the geolocation database may be named incorrectly or located in the wrong directory, for instance).", - "ToGeolocateOldVisits": "To get location data for your old visits, use the script described %1$shere%2$s.", - "WidgetLocation": "Visitor Location", - "GeoIpDbIpAccuracyNote": "Note: the DBIP databases are free and can be downloaded automatically, but geolocation results (specifically city results) are not as accurate as MaxMind's. MaxMind, however, requires that you create an account even for the free database. If you want to use MaxMind's geolocation database, you can start the process %1$shere%2$s", - "MaxMindLinkExplanation": "If you are using MaxMind's geolocation databases and you do not already know how to generate your download URL, %1$sclick here to learn how%2$s.", - "LocationsSubcategoryHelp": "The Locations section is the best way to find out where people are when they visit your site. It reveals the countries, continents, regions, cities that you visitors come from, in tables and map form. Additionally, you can see what language their browser is set to, helping identify international visitors in alternative locations." + "TestIPLocatorFailed": "Couldn't find the location of the IP address \"%1$s\". Maybe this provider is not set up correctly, the geolocation database is incorrectly named, or in the wrong folder?", + "ToGeolocateOldVisits": "Use %1$this script%2$s to get location data for your old visits.", + "WidgetLocation": "Visitor location", + "GeoIpDbIpAccuracyNote": "The DB-IP geolocation databases are gratis and can be auto-downloaded. MaxMind is more accurate for cities, but requires %1$making an account%2$s.", + "MaxMindLinkExplanation": "%1$sClick here to learn how to generate your download URL%2$s if you are using MaxMind's geolocation.", + "LocationsSubcategoryHelp": "The \"Locations\" section is the best way to find out what countries, continents, regions, and cities your website visitors come from — in table and map form. It also says what language their browser is set to, helping identify international visitors in alternative locations." } -}
\ No newline at end of file +} diff --git a/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_geoip2.png b/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_geoip2.png index 3efae3951b..a967a9a288 100644 --- a/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_geoip2.png +++ b/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_geoip2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61efd451e6bd350c71beb3ea6da0e40e0f4ee9a1add39252ae39b0b1e530f976 -size 260278 +oid sha256:1dc3d52d5ff669cdd07ffcf997cf9ce980a058a825f9418b2c75afc6fcff5a5a +size 258781 diff --git a/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_geoip2_no_provider.png b/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_geoip2_no_provider.png index a236cc76d8..58ad8d9a2c 100644 --- a/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_geoip2_no_provider.png +++ b/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_geoip2_no_provider.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a15ce0840e134885bc87ec6fa97a2e15425d2412faf06b7f79279328e3708b8 -size 269720 +oid sha256:58fb0511a71a604563851bc0cfe087ea10304729c1fb9da981f705cee0ead6a8 +size 268242 diff --git a/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_no_providers.png b/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_no_providers.png index 86d911fa77..2e8386b386 100644 --- a/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_no_providers.png +++ b/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_no_providers.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:219dba7d0c5fabfa578cad517c226bd263111ddb72348a15ed022d9289ee1d3b -size 80454 +oid sha256:93e7bda87eb7ec8fc8064dec369f54191f4b7cecadab664df66a3690ea6a65a2 +size 73203 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load_security.png b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load_security.png index 378ab83e16..6892384716 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load_security.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load_security.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcf6e92490d2f5dfaaf8a648976233acfe4df3c3db20a24db8f3a60da4d7f97f -size 123681 +oid sha256:58a3569b8e8aaac2aa55fe72a8b24c84f20e7e0fc83062333506c0115590d565 +size 106096 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_resend_success.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_resend_success.png index 85e0487639..624c0abd58 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_resend_success.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_resend_success.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:872a7d7d5e77075eb287078de6b69449a0f0542208ab7fa5b7b1ece277bd5300 -size 187470 +oid sha256:0956675e38a3ce34f49164629ad353014bf36964c5ec286f673cb74a0bf412fe +size 187399 diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Tour.getChallenges.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Tour.getChallenges.xml index aaaf36d1f0..bf4aa102a3 100644 --- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Tour.getChallenges.xml +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Tour.getChallenges.xml @@ -2,7 +2,7 @@ <result> <row> <id>track_data</id> - <name>Embed tracking code</name> + <name>Embed a tracking code</name> <description>Matomo offers you various ways to embed the tracking code for your website, mobile app, and even for any device or application.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -11,7 +11,7 @@ <row> <id>define_goal</id> <name>Add a goal</name> - <description>Conversion tracking is a great way to identify whether you are meeting your current business objectives, identify new objectives, view and analyse your performance, and learn how to increase your conversions, conversion rates, and revenue per visit.</description> + <description>Conversion tracking is a great way to identify whether you are meeting your current objectives, to identify new ones, view and analyse performance. You can also learn to increase your conversions, conversion rates, and revenue per visit.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>index.php?module=Goals&action=manage</url> @@ -26,7 +26,7 @@ </row> <row> <id>add_user</id> - <name>Add another user</name> + <name>Add a user</name> <description>Users Management lets you add new users, edit existing users and give them access to view or administrate websites.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -34,7 +34,7 @@ </row> <row> <id>add_website</id> - <name>Add another website</name> + <name>Add a website</name> <description>Websites management lets you add a new website and edit existing websites.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -43,7 +43,7 @@ <row> <id>flatten_actions</id> <name>Flatten a page report</name> - <description>Go to Behaviour => Pages and click in the bottom of the report on the cog icon to flatten the report. A flattened report changes the hierarchy from a grouped report to a list.</description> + <description>Go to Behaviour → Pages and click the cog icon in the bottom of the report to flatten it. This changes the hierarchy from a grouped report to a list.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/graphs-and-visualisations-in-matomo/#flattening-reports</url> @@ -51,7 +51,7 @@ <row> <id>change_visualisations</id> <name>Change a visualisation</name> - <description>View a report and select the visualisation icon at the bottom of a report to view the same report in a different visualisation.</description> + <description>Browse a report and select the visualisation icon at the bottom of a report to change its visualisation.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/graphs-and-visualisations-in-matomo/</url> @@ -66,8 +66,8 @@ </row> <row> <id>customise_dashboard</id> - <name>Customise dashboard</name> - <description>You can add new widgets to your Dashboard, to ensure it reports on all of your most important metrics.</description> + <name>Set up your dashboard</name> + <description>Add widgets to your dashboard to ensure it reports all your most important metrics.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/dashboards/create-dashboards-and-customise-widgets-and-layout/</url> @@ -91,14 +91,14 @@ <row> <id>setup_twofa</id> <name>Setup Two-factor authentication</name> - <description>Two-factor authentication increase your account security by adding an additional layer of verification when you log in. Each time you log in you will not only be asked to provide your login and password, but also an additional authentication token which changes periodically and is generated for example on your mobile device. This means that even when someone knows your username and password, they still won't be able to log in unless they have access to your mobile device for example.</description> + <description>Two-factor authentication increases account security by also asking you for a code generated on a mobile device, or one of the remaining recovery codes (in addition to your password) to log in.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/general/faq_27245</url> </row> <row> <id>disable_browser_archiving</id> - <name>Disable browser archiving for better performance</name> + <name>Turn off web-browser archiving for better performance</name> <description /> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -106,7 +106,7 @@ </row> <row> <id>configure_geolocation</id> - <name>Configure geolocation</name> + <name>Set up geolocation</name> <description>Ensure the location of your visitors is correctly detected.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -115,7 +115,7 @@ <row> <id>select_date_range</id> <name>Select a date range</name> - <description>Select a date range in the calendar.</description> + <description>Select a time span in the calendar.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/data-selectors-in-matomo/</url> @@ -123,7 +123,7 @@ <row> <id>view_visits_log</id> <name>View Visits Log</name> - <description>The visits Log shows you all the individual visits and actions each visitor took on your site.</description> + <description>Shows all the individual visits and actions each visitor made on your website.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/the-visits-log-report/</url> @@ -131,7 +131,7 @@ <row> <id>view_visitor_profile</id> <name>View Visitor profile</name> - <description>The visitor log helps you to understand your visitors’ individual behavior by summarizing and listing your visitors’ visits.</description> + <description>Understand your visitors’ individual behavior by summarizing and listing your visitors’ visits.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/docs/user-profile/</url> @@ -139,14 +139,14 @@ <row> <id>view_row_evolution</id> <name>View Row evolution</name> - <description>Row evolution shows you the current & past metric data for any row in any report.</description> + <description>Shows the current and past metric data for any row in any report.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/docs/row-evolution/</url> </row> <row> <id>browse_marketplace</id> - <name>Browse Marketplace</name> + <name>Browse the marketplace</name> <description>Extend and expand the functionality of Matomo via the Marketplace by downloading plugins and themes.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Tour.getLevel.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Tour.getLevel.xml index bd57da48fb..0fd47c9b8a 100644 --- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Tour.getLevel.xml +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Tour.getLevel.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <description>Welcome to Matomo superUserLogin. This widget will help you become a Matomo expert in no time.</description> + <description>Welcome to Matomo superUserLogin. This widget helps you become a Matomo expert.</description> <currentLevel>1</currentLevel> - <currentLevelName>Matomo Beginner</currentLevelName> - <nextLevelName>Matomo Intermediate</nextLevelName> + <currentLevelName>Matomo beginner</currentLevelName> + <nextLevelName>Matomo intermediate</nextLevelName> <numLevelsTotal>5</numLevelsTotal> <challengesNeededForNextLevel>5</challengesNeededForNextLevel> </row> diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_processedReportSingle__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_processedReportSingle__API.getProcessedReport_day.xml index f7528ea493..fc656b23c9 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_processedReportSingle__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_processedReportSingle__API.getProcessedReport_day.xml @@ -9,7 +9,7 @@ <module>UserCountry</module> <action>getContinent</action> <dimension>Continent</dimension> - <documentation>This report shows which continent your visitors were in when they accessed your website.</documentation> + <documentation>Shows which continent your visitors connected from when accessing your website.</documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Tour.getChallenges.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Tour.getChallenges.xml index cd2390bea0..d0be16d0c7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Tour.getChallenges.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Tour.getChallenges.xml @@ -2,7 +2,7 @@ <result> <row> <id>track_data</id> - <name>Embed tracking code</name> + <name>Embed a tracking code</name> <description>Matomo offers you various ways to embed the tracking code for your website, mobile app, and even for any device or application.</description> <isCompleted>1</isCompleted> <isSkipped>0</isSkipped> @@ -11,7 +11,7 @@ <row> <id>define_goal</id> <name>Add a goal</name> - <description>Conversion tracking is a great way to identify whether you are meeting your current business objectives, identify new objectives, view and analyse your performance, and learn how to increase your conversions, conversion rates, and revenue per visit.</description> + <description>Conversion tracking is a great way to identify whether you are meeting your current objectives, to identify new ones, view and analyse performance. You can also learn to increase your conversions, conversion rates, and revenue per visit.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>index.php?module=Goals&action=manage</url> @@ -26,7 +26,7 @@ </row> <row> <id>add_user</id> - <name>Add another user</name> + <name>Add a user</name> <description>Users Management lets you add new users, edit existing users and give them access to view or administrate websites.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -34,7 +34,7 @@ </row> <row> <id>add_website</id> - <name>Add another website</name> + <name>Add a website</name> <description>Websites management lets you add a new website and edit existing websites.</description> <isCompleted>1</isCompleted> <isSkipped>0</isSkipped> @@ -43,7 +43,7 @@ <row> <id>flatten_actions</id> <name>Flatten a page report</name> - <description>Go to Behaviour => Pages and click in the bottom of the report on the cog icon to flatten the report. A flattened report changes the hierarchy from a grouped report to a list.</description> + <description>Go to Behaviour → Pages and click the cog icon in the bottom of the report to flatten it. This changes the hierarchy from a grouped report to a list.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/graphs-and-visualisations-in-matomo/#flattening-reports</url> @@ -51,7 +51,7 @@ <row> <id>change_visualisations</id> <name>Change a visualisation</name> - <description>View a report and select the visualisation icon at the bottom of a report to view the same report in a different visualisation.</description> + <description>Browse a report and select the visualisation icon at the bottom of a report to change its visualisation.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/graphs-and-visualisations-in-matomo/</url> @@ -66,8 +66,8 @@ </row> <row> <id>customise_dashboard</id> - <name>Customise dashboard</name> - <description>You can add new widgets to your Dashboard, to ensure it reports on all of your most important metrics.</description> + <name>Set up your dashboard</name> + <description>Add widgets to your dashboard to ensure it reports all your most important metrics.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/dashboards/create-dashboards-and-customise-widgets-and-layout/</url> @@ -91,14 +91,14 @@ <row> <id>setup_twofa</id> <name>Setup Two-factor authentication</name> - <description>Two-factor authentication increase your account security by adding an additional layer of verification when you log in. Each time you log in you will not only be asked to provide your login and password, but also an additional authentication token which changes periodically and is generated for example on your mobile device. This means that even when someone knows your username and password, they still won't be able to log in unless they have access to your mobile device for example.</description> + <description>Two-factor authentication increases account security by also asking you for a code generated on a mobile device, or one of the remaining recovery codes (in addition to your password) to log in.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/general/faq_27245</url> </row> <row> <id>disable_browser_archiving</id> - <name>Disable browser archiving for better performance</name> + <name>Turn off web-browser archiving for better performance</name> <description /> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -106,7 +106,7 @@ </row> <row> <id>configure_geolocation</id> - <name>Configure geolocation</name> + <name>Set up geolocation</name> <description>Ensure the location of your visitors is correctly detected.</description> <isCompleted>1</isCompleted> <isSkipped>0</isSkipped> @@ -115,7 +115,7 @@ <row> <id>select_date_range</id> <name>Select a date range</name> - <description>Select a date range in the calendar.</description> + <description>Select a time span in the calendar.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/data-selectors-in-matomo/</url> @@ -123,7 +123,7 @@ <row> <id>view_visits_log</id> <name>View Visits Log</name> - <description>The visits Log shows you all the individual visits and actions each visitor took on your site.</description> + <description>Shows all the individual visits and actions each visitor made on your website.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/the-visits-log-report/</url> @@ -131,7 +131,7 @@ <row> <id>view_visitor_profile</id> <name>View Visitor profile</name> - <description>The visitor log helps you to understand your visitors’ individual behavior by summarizing and listing your visitors’ visits.</description> + <description>Understand your visitors’ individual behavior by summarizing and listing your visitors’ visits.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/docs/user-profile/</url> @@ -139,14 +139,14 @@ <row> <id>view_row_evolution</id> <name>View Row evolution</name> - <description>Row evolution shows you the current & past metric data for any row in any report.</description> + <description>Shows the current and past metric data for any row in any report.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/docs/row-evolution/</url> </row> <row> <id>browse_marketplace</id> - <name>Browse Marketplace</name> + <name>Browse the marketplace</name> <description>Extend and expand the functionality of Matomo via the Marketplace by downloading plugins and themes.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Tour.getLevel.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Tour.getLevel.xml index 594d582310..917a231ecb 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Tour.getLevel.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Tour.getLevel.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <description>Welcome to Matomo superUserLogin. This widget will help you become a Matomo expert in no time.</description> + <description>Welcome to Matomo superUserLogin. This widget helps you become a Matomo expert.</description> <currentLevel>1</currentLevel> - <currentLevelName>Matomo Beginner</currentLevelName> - <nextLevelName>Matomo Intermediate</nextLevelName> + <currentLevelName>Matomo beginner</currentLevelName> + <nextLevelName>Matomo intermediate</nextLevelName> <numLevelsTotal>5</numLevelsTotal> <challengesNeededForNextLevel>2</challengesNeededForNextLevel> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Tour.getChallenges.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Tour.getChallenges.xml index 7596528397..d64aebf1e2 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Tour.getChallenges.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Tour.getChallenges.xml @@ -2,7 +2,7 @@ <result> <row> <id>track_data</id> - <name>Embed tracking code</name> + <name>Embed a tracking code</name> <description>Matomo offers you various ways to embed the tracking code for your website, mobile app, and even for any device or application.</description> <isCompleted>1</isCompleted> <isSkipped>0</isSkipped> @@ -11,7 +11,7 @@ <row> <id>define_goal</id> <name>Add a goal</name> - <description>Conversion tracking is a great way to identify whether you are meeting your current business objectives, identify new objectives, view and analyse your performance, and learn how to increase your conversions, conversion rates, and revenue per visit.</description> + <description>Conversion tracking is a great way to identify whether you are meeting your current objectives, to identify new ones, view and analyse performance. You can also learn to increase your conversions, conversion rates, and revenue per visit.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>index.php?module=Goals&action=manage</url> @@ -26,7 +26,7 @@ </row> <row> <id>add_user</id> - <name>Add another user</name> + <name>Add a user</name> <description>Users Management lets you add new users, edit existing users and give them access to view or administrate websites.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -34,7 +34,7 @@ </row> <row> <id>add_website</id> - <name>Add another website</name> + <name>Add a website</name> <description>Websites management lets you add a new website and edit existing websites.</description> <isCompleted>1</isCompleted> <isSkipped>0</isSkipped> @@ -43,7 +43,7 @@ <row> <id>flatten_actions</id> <name>Flatten a page report</name> - <description>Go to Behaviour => Pages and click in the bottom of the report on the cog icon to flatten the report. A flattened report changes the hierarchy from a grouped report to a list.</description> + <description>Go to Behaviour → Pages and click the cog icon in the bottom of the report to flatten it. This changes the hierarchy from a grouped report to a list.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/graphs-and-visualisations-in-matomo/#flattening-reports</url> @@ -51,7 +51,7 @@ <row> <id>change_visualisations</id> <name>Change a visualisation</name> - <description>View a report and select the visualisation icon at the bottom of a report to view the same report in a different visualisation.</description> + <description>Browse a report and select the visualisation icon at the bottom of a report to change its visualisation.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/graphs-and-visualisations-in-matomo/</url> @@ -66,8 +66,8 @@ </row> <row> <id>customise_dashboard</id> - <name>Customise dashboard</name> - <description>You can add new widgets to your Dashboard, to ensure it reports on all of your most important metrics.</description> + <name>Set up your dashboard</name> + <description>Add widgets to your dashboard to ensure it reports all your most important metrics.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/dashboards/create-dashboards-and-customise-widgets-and-layout/</url> @@ -91,14 +91,14 @@ <row> <id>setup_twofa</id> <name>Setup Two-factor authentication</name> - <description>Two-factor authentication increase your account security by adding an additional layer of verification when you log in. Each time you log in you will not only be asked to provide your login and password, but also an additional authentication token which changes periodically and is generated for example on your mobile device. This means that even when someone knows your username and password, they still won't be able to log in unless they have access to your mobile device for example.</description> + <description>Two-factor authentication increases account security by also asking you for a code generated on a mobile device, or one of the remaining recovery codes (in addition to your password) to log in.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/general/faq_27245</url> </row> <row> <id>disable_browser_archiving</id> - <name>Disable browser archiving for better performance</name> + <name>Turn off web-browser archiving for better performance</name> <description /> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -106,7 +106,7 @@ </row> <row> <id>configure_geolocation</id> - <name>Configure geolocation</name> + <name>Set up geolocation</name> <description>Ensure the location of your visitors is correctly detected.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -115,7 +115,7 @@ <row> <id>select_date_range</id> <name>Select a date range</name> - <description>Select a date range in the calendar.</description> + <description>Select a time span in the calendar.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/data-selectors-in-matomo/</url> @@ -123,7 +123,7 @@ <row> <id>view_visits_log</id> <name>View Visits Log</name> - <description>The visits Log shows you all the individual visits and actions each visitor took on your site.</description> + <description>Shows all the individual visits and actions each visitor made on your website.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/the-visits-log-report/</url> @@ -131,7 +131,7 @@ <row> <id>view_visitor_profile</id> <name>View Visitor profile</name> - <description>The visitor log helps you to understand your visitors’ individual behavior by summarizing and listing your visitors’ visits.</description> + <description>Understand your visitors’ individual behavior by summarizing and listing your visitors’ visits.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/docs/user-profile/</url> @@ -139,14 +139,14 @@ <row> <id>view_row_evolution</id> <name>View Row evolution</name> - <description>Row evolution shows you the current & past metric data for any row in any report.</description> + <description>Shows the current and past metric data for any row in any report.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/docs/row-evolution/</url> </row> <row> <id>browse_marketplace</id> - <name>Browse Marketplace</name> + <name>Browse the marketplace</name> <description>Extend and expand the functionality of Matomo via the Marketplace by downloading plugins and themes.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Tour.getLevel.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Tour.getLevel.xml index 24d5129552..2d8db1f626 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Tour.getLevel.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Tour.getLevel.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <description>Welcome to Matomo superUserLogin. This widget will help you become a Matomo expert in no time.</description> + <description>Welcome to Matomo superUserLogin. This widget helps you become a Matomo expert.</description> <currentLevel>1</currentLevel> - <currentLevelName>Matomo Beginner</currentLevelName> - <nextLevelName>Matomo Intermediate</nextLevelName> + <currentLevelName>Matomo beginner</currentLevelName> + <nextLevelName>Matomo intermediate</nextLevelName> <numLevelsTotal>5</numLevelsTotal> <challengesNeededForNextLevel>3</challengesNeededForNextLevel> </row> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml index 67a9babc07..bdd0dd09db 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml @@ -259,7 +259,7 @@ https://www.example.org/</placeholder> <settings> <row> <name>disable_visitor_log</name> - <title>Disable visits log & visitor profile</title> + <title>Turn off visits log and visitor profiles</title> <value>0</value> <defaultValue>0</defaultValue> <type>boolean</type> @@ -268,7 +268,7 @@ https://www.example.org/</placeholder> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Here you can disable the visits log and visitor profile feature. This will also disable features that depend on such like the ecommerce log, the segmented visits log, the realtime map or the realtime widget. This might be required to comply with your local privacy laws/guidelines.</inlineHelp> + <inlineHelp>Also removes features that depend on these, like the e-commerce log, the segmented visits-log, the real-time map or the real-time widget. May be required to comply with local privacy laws/guidelines.</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -276,7 +276,7 @@ https://www.example.org/</placeholder> </row> <row> <name>disable_visitor_profile</name> - <title>Disable visitor profile only</title> + <title>Turn off visitor profiles</title> <value>0</value> <defaultValue>0</defaultValue> <type>boolean</type> @@ -285,7 +285,7 @@ https://www.example.org/</placeholder> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Here you can disable the visitor profile feature. All visits log related features will remain working.</inlineHelp> + <inlineHelp>All visits-log related features always function.</inlineHelp> <templateFile /> <introduction /> <condition>disable_visitor_log==0</condition> @@ -579,7 +579,7 @@ https://www.example.org/</placeholder> <settings> <row> <name>disable_visitor_log</name> - <title>Disable visits log & visitor profile</title> + <title>Turn off visits log and visitor profiles</title> <value>0</value> <defaultValue>0</defaultValue> <type>boolean</type> @@ -588,7 +588,7 @@ https://www.example.org/</placeholder> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Here you can disable the visits log and visitor profile feature. This will also disable features that depend on such like the ecommerce log, the segmented visits log, the realtime map or the realtime widget. This might be required to comply with your local privacy laws/guidelines.</inlineHelp> + <inlineHelp>Also removes features that depend on these, like the e-commerce log, the segmented visits-log, the real-time map or the real-time widget. May be required to comply with local privacy laws/guidelines.</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -596,7 +596,7 @@ https://www.example.org/</placeholder> </row> <row> <name>disable_visitor_profile</name> - <title>Disable visitor profile only</title> + <title>Turn off visitor profiles</title> <value>0</value> <defaultValue>0</defaultValue> <type>boolean</type> @@ -605,7 +605,7 @@ https://www.example.org/</placeholder> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Here you can disable the visitor profile feature. All visits log related features will remain working.</inlineHelp> + <inlineHelp>All visits-log related features always function.</inlineHelp> <templateFile /> <introduction /> <condition>disable_visitor_log==0</condition> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml index 4d2d8f54fe..01beb895eb 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml @@ -43,7 +43,7 @@ </row> <row> <name>City (Visitors)</name> - <documentation>This report shows the cities your visitors were in when they accessed your website.<br/>In order to see data for this report, you must setup GeoIP in the Geolocation admin tab. The commercial <a rel="noreferrer noopener" target="_blank" href="http://www.maxmind.com/?rId=piwik">Maxmind</a> GeoIP databases are more accurate than the free ones. To see how accurate they are, click <a rel="noreferrer noopener" target="_blank" href="http://www.maxmind.com/en/city_accuracy?rId=piwik">here</a>.</documentation> + <documentation>Shows the cities your visitors connected from when accessing your website.<br/>Set up GeoIP in the Geolocation admin tab to provide data for this report. The commercial <a rel="noreferrer noopener" target="_blank" href="http://www.maxmind.com/?rId=piwik">MaxMind</a> GeoIP databases are more accurate than the gratis ones. <a rel="noreferrer noopener" target="_blank" href="http://www.maxmind.com/en/city_accuracy?rId=piwik">Click here</a> to see how accurate they are.</documentation> </row> <row> <name>Configurations (Visitors)</name> @@ -61,11 +61,11 @@ </row> <row> <name>Continent (Visitors)</name> - <documentation>This report shows which continent your visitors were in when they accessed your website.</documentation> + <documentation>Shows which continent your visitors connected from when accessing your website.</documentation> </row> <row> <name>Country (Visitors)</name> - <documentation>This report shows which country your visitors were in when they accessed your website.</documentation> + <documentation>Shows which country your visitors connected from when accessing your website.</documentation> </row> <row> <name>Custom Variables (Visitors)</name> @@ -248,7 +248,7 @@ </row> <row> <name>Region (Visitors)</name> - <documentation>This report shows which region your visitors were in when they accessed your website.<br/>In order to see data for this report, you must setup GeoIP in the Geolocation admin tab. The commercial <a rel="noreferrer noopener" target="_blank" href="http://www.maxmind.com/?rId=piwik">Maxmind</a> GeoIP databases are more accurate than the free ones. To see how accurate they are, click <a rel="noreferrer noopener" target="_blank" href="http://www.maxmind.com/en/city_accuracy?rId=piwik">here</a>.</documentation> + <documentation>Shows which region your visitors connected from when accessing website.<br/>Set up GeoIP in the Geolocation admin tab to provide data for this report. The commercial <a rel="noreferrer noopener" target="_blank" href="http://www.maxmind.com/?rId=piwik">MaxMind</a> GeoIP databases are more accurate than the gratis ones. <a rel="noreferrer noopener" target="_blank" href="http://www.maxmind.com/en/city_accuracy?rId=piwik">Click here</a> to see how accurate they are.</documentation> </row> <row> <name>Returning Visits (Actions)</name> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml index 7dfd04caa5..a247bdee1e 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml @@ -7,7 +7,7 @@ <module>UserCountry</module> <action>getCountry</action> <dimension>Country</dimension> - <documentation>This report shows which country your visitors were in when they accessed your website.</documentation> + <documentation>Shows which country your visitors connected from when accessing your website.</documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml index d1da02f4da..f74dce7912 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml @@ -9,7 +9,7 @@ <module>UserCountry</module> <action>getCountry</action> <dimension>Country</dimension> - <documentation>This report shows which country your visitors were in when they accessed your website.</documentation> + <documentation>Shows which country your visitors connected from when accessing your website.</documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> 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 95e95937da..7fbe5a8ba7 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -107,7 +107,7 @@ <module>UserCountry</module> <action>getCountry</action> <dimension>Country</dimension> - <documentation>This report shows which country your visitors were in when they accessed your website.</documentation> + <documentation>Shows which country your visitors connected from when accessing your website.</documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -145,7 +145,7 @@ <module>UserCountry</module> <action>getContinent</action> <dimension>Continent</dimension> - <documentation>This report shows which continent your visitors were in when they accessed your website.</documentation> + <documentation>Shows which continent your visitors connected from when accessing your website.</documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -183,7 +183,7 @@ <module>UserCountry</module> <action>getRegion</action> <dimension>Region</dimension> - <documentation>This report shows which region your visitors were in when they accessed your website.<br/>In order to see data for this report, you must setup GeoIP in the Geolocation admin tab. The commercial <a rel="noreferrer noopener" target="_blank" href="http://www.maxmind.com/?rId=piwik">Maxmind</a> GeoIP databases are more accurate than the free ones. To see how accurate they are, click <a rel="noreferrer noopener" target="_blank" href="http://www.maxmind.com/en/city_accuracy?rId=piwik">here</a>.</documentation> + <documentation>Shows which region your visitors connected from when accessing website.<br/>Set up GeoIP in the Geolocation admin tab to provide data for this report. The commercial <a rel="noreferrer noopener" target="_blank" href="http://www.maxmind.com/?rId=piwik">MaxMind</a> GeoIP databases are more accurate than the gratis ones. <a rel="noreferrer noopener" target="_blank" href="http://www.maxmind.com/en/city_accuracy?rId=piwik">Click here</a> to see how accurate they are.</documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -262,7 +262,7 @@ <module>UserCountry</module> <action>getCity</action> <dimension>City</dimension> - <documentation>This report shows the cities your visitors were in when they accessed your website.<br/>In order to see data for this report, you must setup GeoIP in the Geolocation admin tab. The commercial <a rel="noreferrer noopener" target="_blank" href="http://www.maxmind.com/?rId=piwik">Maxmind</a> GeoIP databases are more accurate than the free ones. To see how accurate they are, click <a rel="noreferrer noopener" target="_blank" href="http://www.maxmind.com/en/city_accuracy?rId=piwik">here</a>.</documentation> + <documentation>Shows the cities your visitors connected from when accessing your website.<br/>Set up GeoIP in the Geolocation admin tab to provide data for this report. The commercial <a rel="noreferrer noopener" target="_blank" href="http://www.maxmind.com/?rId=piwik">MaxMind</a> GeoIP databases are more accurate than the gratis ones. <a rel="noreferrer noopener" target="_blank" href="http://www.maxmind.com/en/city_accuracy?rId=piwik">Click here</a> to see how accurate they are.</documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml index 7eb7fdf267..5e33e7ffa2 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml @@ -119,7 +119,7 @@ <id>Transitions_Transitions</id> <name>Transitions</name> <order>46</order> - <help><p>Transitions gives you a report that shows the things your visitors did directly before and after viewing a certain page. This page will explain how to access, understand, and use the powerful Transitions report.</p><p><a href="https://matomo.org/docs/transitions/?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=UserGuides" rel="noreferrer noopener" target="_blank">More Details</a></p></help> + <help><p>Transitions is a report showing the things your visitors did directly before and after viewing a given page. This page explains how to access, understand, and use the powerful "Transitions" report.</p><p><a href="https://matomo.org/docs/transitions/?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=UserGuides" rel="noreferrer noopener" target="_blank">More details</a></p></help> </subcategory> <widgets> <row> @@ -989,7 +989,7 @@ <id>UserCountry_SubmenuLocations</id> <name>Locations</name> <order>10</order> - <help><p>The Locations section is the best way to find out where people are when they visit your site. It reveals the countries, continents, regions, cities that you visitors come from, in tables and map form. Additionally, you can see what language their browser is set to, helping identify international visitors in alternative locations.</p></help> + <help><p>The "Locations" section is the best way to find out what countries, continents, regions, and cities your website visitors come from — in table and map form. It also says what language their browser is set to, helping identify international visitors in alternative locations.</p></help> </subcategory> <widgets> <row> @@ -1250,11 +1250,11 @@ <id>General_RealTime</id> <name>Real-time</name> <order>7</order> - <help><p>The Visits in Real-time report shows the real-time flow of visits to your website. It includes a real-time counter of your visits and page views in the last 24 hours and the previous 30 minutes.</p><p>This report refreshes every 5 seconds and displays new visits (or existing visitors that view a new page) at the top of the list with a fade-in effect.</p></help> + <help><p>The visits in the real-time report show the real-time flow of visits to your website. It includes a real-time counter of your visits and page views in the last 24 hours and the previous 30 minutes.</p><p>This report refreshes every 5 seconds and displays new visits (or existing visitors that view a new page) at the top of the list with a fade-in effect.</p></help> </subcategory> <widgets> <row> - <name>Visits in Real-time</name> + <name>Visits in real-time</name> <module>Live</module> <action>widget</action> <order>20</order> @@ -1280,7 +1280,7 @@ <id>Live_VisitorLog</id> <name>Visits Log</name> <order>5</order> - <help><p>The Visits Log shows you every visit your website receives in detail. You can see what actions each visitor has taken, how they got to your site, a bit about who they are, and more (while still complying with your local privacy regulations).</p><p>While other reports in Matomo show how your visitors behave at an aggregate level, the Visits Log provides granular detail. You can also use segments to narrow it down to specific types of visits to understand your visitors better.</p><p><a href="https://matomo.org/docs/real-time/?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=UserGuides" target="_blank" rel="noreferrer noopener">Learn more in the Visits Log guide.</a></p></help> + <help><p>The visits log shows you every visit your website receives in detail. Find out which actions each visitor has performed, how they got to your site, a bit about who they are, and more (while still complying with your local privacy regulations).</p><p>While other reports in Matomo show how your visitors behave at an aggregate level, the visits log provides granular detail. You can also use segments to narrow it down to specific types of visits to understand your visitors better.</p><p><a href="https://matomo.org/docs/real-time/?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=UserGuides" target="_blank" rel="noreferrer noopener">Learn more in the visit-log guide.</a></p></help> </subcategory> <widgets> <row> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml index 75d1c0a56c..355b54997c 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml @@ -335,56 +335,56 @@ </row> <row> <type>dimension</type> - <category>Visit Location</category> + <category>Visitor location</category> <name>City</name> <segment>city</segment> <acceptedValues>Sydney, Sao Paolo, Rome, etc.</acceptedValues> </row> <row> <type>dimension</type> - <category>Visit Location</category> + <category>Visitor location</category> <name>Continent</name> <segment>continentCode</segment> <acceptedValues>eur, asi, amc, amn, ams, afr, ant, oce</acceptedValues> </row> <row> <type>dimension</type> - <category>Visit Location</category> + <category>Visitor location</category> <name>Country</name> <segment>countryName</segment> <acceptedValues>Germany, France, Spain, ...</acceptedValues> </row> <row> <type>dimension</type> - <category>Visit Location</category> + <category>Visitor location</category> <name>Country code</name> <segment>countryCode</segment> <acceptedValues>ISO 3166-1 alpha-2 country codes (de, us, fr, in, es, etc.)</acceptedValues> </row> <row> <type>dimension</type> - <category>Visit Location</category> + <category>Visitor location</category> <name>Language</name> <segment>languageCode</segment> <acceptedValues>de, fr, en-gb, zh-cn, etc.</acceptedValues> </row> <row> <type>dimension</type> - <category>Visit Location</category> + <category>Visitor location</category> <name>Latitude</name> <segment>latitude</segment> <acceptedValues>-33.578, 40.830, etc.<br/>You can select visitors within a lat/long range using &segment=lat>X;lat<Y;long>M;long<N.</acceptedValues> </row> <row> <type>dimension</type> - <category>Visit Location</category> + <category>Visitor location</category> <name>Longitude</name> <segment>longitude</segment> <acceptedValues>-70.664, 14.326, etc.</acceptedValues> </row> <row> <type>dimension</type> - <category>Visit Location</category> + <category>Visitor location</category> <name>Region</name> <segment>regionCode</segment> <acceptedValues>01 02, OR, P8, etc.<br/>eg. region=BFC;country=fr</acceptedValues> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml index 3cae2121df..f938ecbd30 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml @@ -22,7 +22,7 @@ <isWide>0</isWide> </row> <row> - <name>Real Time Visitor Count</name> + <name>Real-time visitor count</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -217,7 +217,7 @@ <id>Live_VisitorLog</id> <name>Visits Log</name> <order>5</order> - <help><p>The Visits Log shows you every visit your website receives in detail. You can see what actions each visitor has taken, how they got to your site, a bit about who they are, and more (while still complying with your local privacy regulations).</p><p>While other reports in Matomo show how your visitors behave at an aggregate level, the Visits Log provides granular detail. You can also use segments to narrow it down to specific types of visits to understand your visitors better.</p><p><a href="https://matomo.org/docs/real-time/?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=UserGuides" target="_blank" rel="noreferrer noopener">Learn more in the Visits Log guide.</a></p></help> + <help><p>The visits log shows you every visit your website receives in detail. Find out which actions each visitor has performed, how they got to your site, a bit about who they are, and more (while still complying with your local privacy regulations).</p><p>While other reports in Matomo show how your visitors behave at an aggregate level, the visits log provides granular detail. You can also use segments to narrow it down to specific types of visits to understand your visitors better.</p><p><a href="https://matomo.org/docs/real-time/?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=UserGuides" target="_blank" rel="noreferrer noopener">Learn more in the visit-log guide.</a></p></help> </subcategory> <module>Live</module> <action>getLastVisitsDetails</action> @@ -235,7 +235,7 @@ <isReport>1</isReport> </row> <row> - <name>Visits in Real-time</name> + <name>Visits in real-time</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -247,7 +247,7 @@ <id>General_RealTime</id> <name>Real-time</name> <order>7</order> - <help><p>The Visits in Real-time report shows the real-time flow of visits to your website. It includes a real-time counter of your visits and page views in the last 24 hours and the previous 30 minutes.</p><p>This report refreshes every 5 seconds and displays new visits (or existing visitors that view a new page) at the top of the list with a fade-in effect.</p></help> + <help><p>The visits in the real-time report show the real-time flow of visits to your website. It includes a real-time counter of your visits and page views in the last 24 hours and the previous 30 minutes.</p><p>This report refreshes every 5 seconds and displays new visits (or existing visitors that view a new page) at the top of the list with a fade-in effect.</p></help> </subcategory> <module>Live</module> <action>widget</action> @@ -297,7 +297,7 @@ <id>UserCountry_SubmenuLocations</id> <name>Locations</name> <order>10</order> - <help><p>The Locations section is the best way to find out where people are when they visit your site. It reveals the countries, continents, regions, cities that you visitors come from, in tables and map form. Additionally, you can see what language their browser is set to, helping identify international visitors in alternative locations.</p></help> + <help><p>The "Locations" section is the best way to find out what countries, continents, regions, and cities your website visitors come from — in table and map form. It also says what language their browser is set to, helping identify international visitors in alternative locations.</p></help> </subcategory> <module>UserCountryMap</module> <action>visitorMap</action> @@ -322,7 +322,7 @@ <id>UserCountry_SubmenuLocations</id> <name>Locations</name> <order>10</order> - <help><p>The Locations section is the best way to find out where people are when they visit your site. It reveals the countries, continents, regions, cities that you visitors come from, in tables and map form. Additionally, you can see what language their browser is set to, helping identify international visitors in alternative locations.</p></help> + <help><p>The "Locations" section is the best way to find out what countries, continents, regions, and cities your website visitors come from — in table and map form. It also says what language their browser is set to, helping identify international visitors in alternative locations.</p></help> </subcategory> <module>UserCountry</module> <action>getCity</action> @@ -349,7 +349,7 @@ <id>UserCountry_SubmenuLocations</id> <name>Locations</name> <order>10</order> - <help><p>The Locations section is the best way to find out where people are when they visit your site. It reveals the countries, continents, regions, cities that you visitors come from, in tables and map form. Additionally, you can see what language their browser is set to, helping identify international visitors in alternative locations.</p></help> + <help><p>The "Locations" section is the best way to find out what countries, continents, regions, and cities your website visitors come from — in table and map form. It also says what language their browser is set to, helping identify international visitors in alternative locations.</p></help> </subcategory> <module>UserCountry</module> <action>getContinent</action> @@ -376,7 +376,7 @@ <id>UserCountry_SubmenuLocations</id> <name>Locations</name> <order>10</order> - <help><p>The Locations section is the best way to find out where people are when they visit your site. It reveals the countries, continents, regions, cities that you visitors come from, in tables and map form. Additionally, you can see what language their browser is set to, helping identify international visitors in alternative locations.</p></help> + <help><p>The "Locations" section is the best way to find out what countries, continents, regions, and cities your website visitors come from — in table and map form. It also says what language their browser is set to, helping identify international visitors in alternative locations.</p></help> </subcategory> <module>UserCountry</module> <action>getCountry</action> @@ -403,7 +403,7 @@ <id>UserCountry_SubmenuLocations</id> <name>Locations</name> <order>10</order> - <help><p>The Locations section is the best way to find out where people are when they visit your site. It reveals the countries, continents, regions, cities that you visitors come from, in tables and map form. Additionally, you can see what language their browser is set to, helping identify international visitors in alternative locations.</p></help> + <help><p>The "Locations" section is the best way to find out what countries, continents, regions, and cities your website visitors come from — in table and map form. It also says what language their browser is set to, helping identify international visitors in alternative locations.</p></help> </subcategory> <module>UserCountry</module> <action>getRegion</action> @@ -430,7 +430,7 @@ <id>UserCountry_SubmenuLocations</id> <name>Locations</name> <order>10</order> - <help><p>The Locations section is the best way to find out where people are when they visit your site. It reveals the countries, continents, regions, cities that you visitors come from, in tables and map form. Additionally, you can see what language their browser is set to, helping identify international visitors in alternative locations.</p></help> + <help><p>The "Locations" section is the best way to find out what countries, continents, regions, and cities your website visitors come from — in table and map form. It also says what language their browser is set to, helping identify international visitors in alternative locations.</p></help> </subcategory> <module>UserLanguage</module> <action>getLanguage</action> @@ -457,7 +457,7 @@ <id>UserCountry_SubmenuLocations</id> <name>Locations</name> <order>10</order> - <help><p>The Locations section is the best way to find out where people are when they visit your site. It reveals the countries, continents, regions, cities that you visitors come from, in tables and map form. Additionally, you can see what language their browser is set to, helping identify international visitors in alternative locations.</p></help> + <help><p>The "Locations" section is the best way to find out what countries, continents, regions, and cities your website visitors come from — in table and map form. It also says what language their browser is set to, helping identify international visitors in alternative locations.</p></help> </subcategory> <module>UserLanguage</module> <action>getLanguageCode</action> @@ -1543,7 +1543,7 @@ <id>Transitions_Transitions</id> <name>Transitions</name> <order>46</order> - <help><p>Transitions gives you a report that shows the things your visitors did directly before and after viewing a certain page. This page will explain how to access, understand, and use the powerful Transitions report.</p><p><a href="https://matomo.org/docs/transitions/?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=UserGuides" rel="noreferrer noopener" target="_blank">More Details</a></p></help> + <help><p>Transitions is a report showing the things your visitors did directly before and after viewing a given page. This page explains how to access, understand, and use the powerful "Transitions" report.</p><p><a href="https://matomo.org/docs/transitions/?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=UserGuides" rel="noreferrer noopener" target="_blank">More details</a></p></help> </subcategory> <module>Transitions</module> <action>getTransitions</action> @@ -3924,7 +3924,7 @@ <isWide>0</isWide> </row> <row> - <name>Become a Matomo Expert</name> + <name>Become a Matomo expert</name> <category> <id>About Matomo</id> <name>About Matomo</name> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml index 9202c13a21..52bc524588 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml @@ -9,7 +9,7 @@ <module>UserCountry</module> <action>getCountry</action> <dimension>Country</dimension> - <documentation>This report shows which country your visitors were in when they accessed your website.</documentation> + <documentation>Shows which country your visitors connected from when accessing your website.</documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Tour.getChallenges.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Tour.getChallenges.xml index aaaf36d1f0..bf4aa102a3 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Tour.getChallenges.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Tour.getChallenges.xml @@ -2,7 +2,7 @@ <result> <row> <id>track_data</id> - <name>Embed tracking code</name> + <name>Embed a tracking code</name> <description>Matomo offers you various ways to embed the tracking code for your website, mobile app, and even for any device or application.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -11,7 +11,7 @@ <row> <id>define_goal</id> <name>Add a goal</name> - <description>Conversion tracking is a great way to identify whether you are meeting your current business objectives, identify new objectives, view and analyse your performance, and learn how to increase your conversions, conversion rates, and revenue per visit.</description> + <description>Conversion tracking is a great way to identify whether you are meeting your current objectives, to identify new ones, view and analyse performance. You can also learn to increase your conversions, conversion rates, and revenue per visit.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>index.php?module=Goals&action=manage</url> @@ -26,7 +26,7 @@ </row> <row> <id>add_user</id> - <name>Add another user</name> + <name>Add a user</name> <description>Users Management lets you add new users, edit existing users and give them access to view or administrate websites.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -34,7 +34,7 @@ </row> <row> <id>add_website</id> - <name>Add another website</name> + <name>Add a website</name> <description>Websites management lets you add a new website and edit existing websites.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -43,7 +43,7 @@ <row> <id>flatten_actions</id> <name>Flatten a page report</name> - <description>Go to Behaviour => Pages and click in the bottom of the report on the cog icon to flatten the report. A flattened report changes the hierarchy from a grouped report to a list.</description> + <description>Go to Behaviour → Pages and click the cog icon in the bottom of the report to flatten it. This changes the hierarchy from a grouped report to a list.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/graphs-and-visualisations-in-matomo/#flattening-reports</url> @@ -51,7 +51,7 @@ <row> <id>change_visualisations</id> <name>Change a visualisation</name> - <description>View a report and select the visualisation icon at the bottom of a report to view the same report in a different visualisation.</description> + <description>Browse a report and select the visualisation icon at the bottom of a report to change its visualisation.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/graphs-and-visualisations-in-matomo/</url> @@ -66,8 +66,8 @@ </row> <row> <id>customise_dashboard</id> - <name>Customise dashboard</name> - <description>You can add new widgets to your Dashboard, to ensure it reports on all of your most important metrics.</description> + <name>Set up your dashboard</name> + <description>Add widgets to your dashboard to ensure it reports all your most important metrics.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/dashboards/create-dashboards-and-customise-widgets-and-layout/</url> @@ -91,14 +91,14 @@ <row> <id>setup_twofa</id> <name>Setup Two-factor authentication</name> - <description>Two-factor authentication increase your account security by adding an additional layer of verification when you log in. Each time you log in you will not only be asked to provide your login and password, but also an additional authentication token which changes periodically and is generated for example on your mobile device. This means that even when someone knows your username and password, they still won't be able to log in unless they have access to your mobile device for example.</description> + <description>Two-factor authentication increases account security by also asking you for a code generated on a mobile device, or one of the remaining recovery codes (in addition to your password) to log in.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/general/faq_27245</url> </row> <row> <id>disable_browser_archiving</id> - <name>Disable browser archiving for better performance</name> + <name>Turn off web-browser archiving for better performance</name> <description /> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -106,7 +106,7 @@ </row> <row> <id>configure_geolocation</id> - <name>Configure geolocation</name> + <name>Set up geolocation</name> <description>Ensure the location of your visitors is correctly detected.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -115,7 +115,7 @@ <row> <id>select_date_range</id> <name>Select a date range</name> - <description>Select a date range in the calendar.</description> + <description>Select a time span in the calendar.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/data-selectors-in-matomo/</url> @@ -123,7 +123,7 @@ <row> <id>view_visits_log</id> <name>View Visits Log</name> - <description>The visits Log shows you all the individual visits and actions each visitor took on your site.</description> + <description>Shows all the individual visits and actions each visitor made on your website.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/the-visits-log-report/</url> @@ -131,7 +131,7 @@ <row> <id>view_visitor_profile</id> <name>View Visitor profile</name> - <description>The visitor log helps you to understand your visitors’ individual behavior by summarizing and listing your visitors’ visits.</description> + <description>Understand your visitors’ individual behavior by summarizing and listing your visitors’ visits.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/docs/user-profile/</url> @@ -139,14 +139,14 @@ <row> <id>view_row_evolution</id> <name>View Row evolution</name> - <description>Row evolution shows you the current & past metric data for any row in any report.</description> + <description>Shows the current and past metric data for any row in any report.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/docs/row-evolution/</url> </row> <row> <id>browse_marketplace</id> - <name>Browse Marketplace</name> + <name>Browse the marketplace</name> <description>Extend and expand the functionality of Matomo via the Marketplace by downloading plugins and themes.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Tour.getLevel.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Tour.getLevel.xml index bd57da48fb..0fd47c9b8a 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Tour.getLevel.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Tour.getLevel.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <description>Welcome to Matomo superUserLogin. This widget will help you become a Matomo expert in no time.</description> + <description>Welcome to Matomo superUserLogin. This widget helps you become a Matomo expert.</description> <currentLevel>1</currentLevel> - <currentLevelName>Matomo Beginner</currentLevelName> - <nextLevelName>Matomo Intermediate</nextLevelName> + <currentLevelName>Matomo beginner</currentLevelName> + <nextLevelName>Matomo intermediate</nextLevelName> <numLevelsTotal>5</numLevelsTotal> <challengesNeededForNextLevel>5</challengesNeededForNextLevel> </row> diff --git a/tests/PHPUnit/System/expected/test_noVisit__Tour.getChallenges.xml b/tests/PHPUnit/System/expected/test_noVisit__Tour.getChallenges.xml index aaaf36d1f0..bf4aa102a3 100644 --- a/tests/PHPUnit/System/expected/test_noVisit__Tour.getChallenges.xml +++ b/tests/PHPUnit/System/expected/test_noVisit__Tour.getChallenges.xml @@ -2,7 +2,7 @@ <result> <row> <id>track_data</id> - <name>Embed tracking code</name> + <name>Embed a tracking code</name> <description>Matomo offers you various ways to embed the tracking code for your website, mobile app, and even for any device or application.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -11,7 +11,7 @@ <row> <id>define_goal</id> <name>Add a goal</name> - <description>Conversion tracking is a great way to identify whether you are meeting your current business objectives, identify new objectives, view and analyse your performance, and learn how to increase your conversions, conversion rates, and revenue per visit.</description> + <description>Conversion tracking is a great way to identify whether you are meeting your current objectives, to identify new ones, view and analyse performance. You can also learn to increase your conversions, conversion rates, and revenue per visit.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>index.php?module=Goals&action=manage</url> @@ -26,7 +26,7 @@ </row> <row> <id>add_user</id> - <name>Add another user</name> + <name>Add a user</name> <description>Users Management lets you add new users, edit existing users and give them access to view or administrate websites.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -34,7 +34,7 @@ </row> <row> <id>add_website</id> - <name>Add another website</name> + <name>Add a website</name> <description>Websites management lets you add a new website and edit existing websites.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -43,7 +43,7 @@ <row> <id>flatten_actions</id> <name>Flatten a page report</name> - <description>Go to Behaviour => Pages and click in the bottom of the report on the cog icon to flatten the report. A flattened report changes the hierarchy from a grouped report to a list.</description> + <description>Go to Behaviour → Pages and click the cog icon in the bottom of the report to flatten it. This changes the hierarchy from a grouped report to a list.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/graphs-and-visualisations-in-matomo/#flattening-reports</url> @@ -51,7 +51,7 @@ <row> <id>change_visualisations</id> <name>Change a visualisation</name> - <description>View a report and select the visualisation icon at the bottom of a report to view the same report in a different visualisation.</description> + <description>Browse a report and select the visualisation icon at the bottom of a report to change its visualisation.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/graphs-and-visualisations-in-matomo/</url> @@ -66,8 +66,8 @@ </row> <row> <id>customise_dashboard</id> - <name>Customise dashboard</name> - <description>You can add new widgets to your Dashboard, to ensure it reports on all of your most important metrics.</description> + <name>Set up your dashboard</name> + <description>Add widgets to your dashboard to ensure it reports all your most important metrics.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/dashboards/create-dashboards-and-customise-widgets-and-layout/</url> @@ -91,14 +91,14 @@ <row> <id>setup_twofa</id> <name>Setup Two-factor authentication</name> - <description>Two-factor authentication increase your account security by adding an additional layer of verification when you log in. Each time you log in you will not only be asked to provide your login and password, but also an additional authentication token which changes periodically and is generated for example on your mobile device. This means that even when someone knows your username and password, they still won't be able to log in unless they have access to your mobile device for example.</description> + <description>Two-factor authentication increases account security by also asking you for a code generated on a mobile device, or one of the remaining recovery codes (in addition to your password) to log in.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/general/faq_27245</url> </row> <row> <id>disable_browser_archiving</id> - <name>Disable browser archiving for better performance</name> + <name>Turn off web-browser archiving for better performance</name> <description /> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -106,7 +106,7 @@ </row> <row> <id>configure_geolocation</id> - <name>Configure geolocation</name> + <name>Set up geolocation</name> <description>Ensure the location of your visitors is correctly detected.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> @@ -115,7 +115,7 @@ <row> <id>select_date_range</id> <name>Select a date range</name> - <description>Select a date range in the calendar.</description> + <description>Select a time span in the calendar.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/data-selectors-in-matomo/</url> @@ -123,7 +123,7 @@ <row> <id>view_visits_log</id> <name>View Visits Log</name> - <description>The visits Log shows you all the individual visits and actions each visitor took on your site.</description> + <description>Shows all the individual visits and actions each visitor made on your website.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/faq/reports/the-visits-log-report/</url> @@ -131,7 +131,7 @@ <row> <id>view_visitor_profile</id> <name>View Visitor profile</name> - <description>The visitor log helps you to understand your visitors’ individual behavior by summarizing and listing your visitors’ visits.</description> + <description>Understand your visitors’ individual behavior by summarizing and listing your visitors’ visits.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/docs/user-profile/</url> @@ -139,14 +139,14 @@ <row> <id>view_row_evolution</id> <name>View Row evolution</name> - <description>Row evolution shows you the current & past metric data for any row in any report.</description> + <description>Shows the current and past metric data for any row in any report.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> <url>https://matomo.org/docs/row-evolution/</url> </row> <row> <id>browse_marketplace</id> - <name>Browse Marketplace</name> + <name>Browse the marketplace</name> <description>Extend and expand the functionality of Matomo via the Marketplace by downloading plugins and themes.</description> <isCompleted>0</isCompleted> <isSkipped>0</isSkipped> diff --git a/tests/PHPUnit/System/expected/test_noVisit__Tour.getLevel.xml b/tests/PHPUnit/System/expected/test_noVisit__Tour.getLevel.xml index bd57da48fb..0fd47c9b8a 100644 --- a/tests/PHPUnit/System/expected/test_noVisit__Tour.getLevel.xml +++ b/tests/PHPUnit/System/expected/test_noVisit__Tour.getLevel.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <description>Welcome to Matomo superUserLogin. This widget will help you become a Matomo expert in no time.</description> + <description>Welcome to Matomo superUserLogin. This widget helps you become a Matomo expert.</description> <currentLevel>1</currentLevel> - <currentLevelName>Matomo Beginner</currentLevelName> - <nextLevelName>Matomo Intermediate</nextLevelName> + <currentLevelName>Matomo beginner</currentLevelName> + <nextLevelName>Matomo intermediate</nextLevelName> <numLevelsTotal>5</numLevelsTotal> <challengesNeededForNextLevel>5</challengesNeededForNextLevel> </row> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml index 76e0e5b142..d1cd00618e 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml @@ -9,7 +9,7 @@ <module>UserCountry</module> <action>getCountry</action> <dimension>Country</dimension> - <documentation>This report shows which country your visitors were in when they accessed your website.</documentation> + <documentation>Shows which country your visitors connected from when accessing your website.</documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_actions>Actions</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml index 76e0e5b142..d1cd00618e 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml @@ -9,7 +9,7 @@ <module>UserCountry</module> <action>getCountry</action> <dimension>Country</dimension> - <documentation>This report shows which country your visitors were in when they accessed your website.</documentation> + <documentation>Shows which country your visitors connected from when accessing your website.</documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_actions>Actions</nb_actions> diff --git a/tests/UI/expected-screenshots/Comparison_segmented_visitorlog.png b/tests/UI/expected-screenshots/Comparison_segmented_visitorlog.png index 034c860e3e..6be83c5a4a 100644 --- a/tests/UI/expected-screenshots/Comparison_segmented_visitorlog.png +++ b/tests/UI/expected-screenshots/Comparison_segmented_visitorlog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f8b6f360b48a4548983db0c138e4d6b3ecafdfc3d1f041ab0542f4c3c2fe3a8 -size 406514 +oid sha256:827e92407f29eddb46c254194d7a4cf20ff913cd7c435a27a4de376c76dbc7e5 +size 406609 diff --git a/tests/UI/expected-screenshots/Comparison_transitions.png b/tests/UI/expected-screenshots/Comparison_transitions.png index ac46385a50..f46c92066e 100644 --- a/tests/UI/expected-screenshots/Comparison_transitions.png +++ b/tests/UI/expected-screenshots/Comparison_transitions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3211f2eef2a9fb34395837d285a02cfb8f99bccf617184e220c331943957038 -size 203973 +oid sha256:849d24bce1ec6c2247f0e059030540f86789bf09bb98ce3e1f2fae1965ab9710 +size 203527 diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png index 8301c6836a..7900ac673d 100644 --- a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png +++ b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37c0f3eaae3a0a4a32ce7a99f507089fbfb3713f160c799bc76b9065cdec07aa -size 547481 +oid sha256:f410432470a8cacf09dcf3b1ecdbd6e95dc4a6d5d5b46ec6175107613d333d9f +size 536031 diff --git a/tests/UI/expected-screenshots/SupportedBrowser_page_loads_when_browser_supported.png b/tests/UI/expected-screenshots/SupportedBrowser_page_loads_when_browser_supported.png index 870735e70b..e01f541127 100644 --- a/tests/UI/expected-screenshots/SupportedBrowser_page_loads_when_browser_supported.png +++ b/tests/UI/expected-screenshots/SupportedBrowser_page_loads_when_browser_supported.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9dfef2a8aefaf88516afbe41f01e89b222948ddd63a39962c24b1d3192fcd8c -size 223194 +oid sha256:0c99f2238101ee395fd823165d30c2a035ebec85bbce04c44f2c3d70ae3b57f3 +size 222948 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks_vlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks_vlog.png index be82358dcb..24119e3aac 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks_vlog.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks_vlog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70a72d1914fc918fa179ca1fd34cd016a59957294a07feadc578e001faf03315 -size 76259 +oid sha256:b5bf272882cb6ac9f2ba9b82aafe67992ca9cfb04e448735786467d67de39e7d +size 76470 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index 5b6de18ac8..db5f9c01cb 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8442922a8eedac307aefab7a5fc0ee075031cbda162c384b0eeb160adc451ac7 -size 5253917 +oid sha256:8070b7f6ca8a558942190f28c4bb5c5d53aa36e0411b06a25afab0dffc26d2b6 +size 5237083 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png index 076241cdf9..6621ceb236 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3704b9796dc1724da564dd4eb43e5fdd9a6635f984ff687d7bae8144106b1d9d -size 1094528 +oid sha256:a26c9c112f7cd1b60888cb4b09493f41d87428f21c104f5e1a5ceaaac8fa2619 +size 1093979 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png index 47007d94df..011f549447 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30b8f43244c84b569fb1bb9c74c131d35c66e62cdd36043f964b037e3bb80bae -size 1096224 +oid sha256:82bdb442fe6b4c02d3f214e6f03341c7773048d34bccfae444bb7ef4e67cde7c +size 1095747 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png index da2547581e..91beec88be 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93ea21b85aa82bb81a4d96d4fffcedaea305ae5e15f28193fa23133e768c00cf -size 1308053 +oid sha256:d0374c064b8310a2192135fdb5018814a7f798f62d777d4e220b79422a4e2fb7 +size 1289408 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png index 5aeeb94e56..9e2ad2ac7d 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf7a129b4cf01fa971da8bfc7edc0ed2cce85844b743079a6f23670045fe4164 -size 1649359 +oid sha256:f73c45a9f25a0d3bdb275f337a5c6d1dfa35cf91398eea960d4deee91e7c7a91 +size 1649634 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png index 19a189d1fa..fcb5c7a58d 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35efac08e669ef9c14edc780612db5448399c886035d12ee1b83fd4ee9f17b27 -size 706120 +oid sha256:1ec360a961fc5c47f47e8137667420ed89c76e6fe69ffcde02302e8e8e5d97a4 +size 704446 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png index 6a66904b4f..ea5b36e7f6 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8cc5d0a442b27bdb6498f85ce0eeebb475d736a91a6bfd242f358805a62623a -size 81709 +oid sha256:def949e67b7e83b7c3ee5bd17852f65fd3a4e4e17a802be0f0ec88fb87a8df8c +size 81694 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_not_segmented.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_not_segmented.png index ef94a390c6..fe512f7946 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_not_segmented.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_not_segmented.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f00dbb5c576a742119d14dd06e346d0cceef4daa0bf088895eaeb9c2e9f2478 -size 556349 +oid sha256:559eba6babb96cb51c2b38208226a28d227d192e98817087ece0c232b4f8a7e2 +size 555729 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png index d1efb6f94e..2082fd11bf 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe35e28fe4d034fb1a1e72e5a5e83c9c107faa38ff824bdd2add21431c93ef80 -size 184673 +oid sha256:7719354d81f54e05705b8198216163fb34416fbbb90842011d5cec7c2f7514ca +size 184694 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_visits.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_visits.png index eff66b3671..55d825a33a 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_visits.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_visits.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17f74783fd34c327908f8632d4a243ebba8bdeb166bfcfa47e6575fd5ab15685 -size 71086 +oid sha256:d0a43820737071ccd123fd94b11b0f0bf2f1661abbe99da2dc576449905694d4 +size 70886 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png index 5af4b1e216..9372eb842f 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca16afeb0ecef22c27460bb0160e0cd0bbfe0faff894b04abf67a3d5a326f363 -size 190800 +oid sha256:621771072770b7b888fae5b4c494a0986d16f99c9f4735edb33508742ccad860 +size 190701 diff --git a/tests/UI/expected-screenshots/enable_framed_pages_embed_whole_app.png b/tests/UI/expected-screenshots/enable_framed_pages_embed_whole_app.png index 9ddea21995..df6da00b77 100644 --- a/tests/UI/expected-screenshots/enable_framed_pages_embed_whole_app.png +++ b/tests/UI/expected-screenshots/enable_framed_pages_embed_whole_app.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ebcb7f8f1c2f00647f6d27c9d2511fb1615d0458d34e6074f1449dfc46a4ddee -size 232624 +oid sha256:4d57746551a9524cb004de3d953f813a283b1da8d65525a624aef562efc3085f +size 232366 |
