diff options
| author | Stefan Giehl <stefan@matomo.org> | 2018-12-31 06:36:01 +0300 |
|---|---|---|
| committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2018-12-31 06:36:01 +0300 |
| commit | 008e4eb40a7522a1aef5c20b8293ddd7eef7e033 (patch) | |
| tree | 6d4abc960498d65fad2628bb8b9fce8f7294dd7a | |
| parent | aab30ac04217cc7a8776bf459149bf895eec67eb (diff) | |
replaces some remaining occurrences of Piwik with Matomo (#13922)
* replaces some remaining ocurrences of Piwik with Matomo
* update tests
10 files changed, 11 insertions, 11 deletions
diff --git a/lang/en.json b/lang/en.json index c7ab56eacf..5311b46444 100644 --- a/lang/en.json +++ b/lang/en.json @@ -502,7 +502,7 @@ "Advanced": "Advanced", "AnonymousAccess": "Anonymous access", "AnonymousTracking": "Anonymous tracking", - "AskForAnonymousTrackingPermission": "When enabled, Matomo Mobile will send anonymous usage data to piwik.org. The intent is to use this data to help Matomo Mobile developers better understand how the app is used. Information sent is: menus and settings clicked on, OS name and version, any error displayed in Matomo Mobile. We will NOT track any of your analytics data. This anonymous data will never be made public. You can disable\/enable anonymous tracking in Settings at any time.", + "AskForAnonymousTrackingPermission": "When enabled, Matomo Mobile will send anonymous usage data to matomo.org. The intent is to use this data to help Matomo Mobile developers better understand how the app is used. Information sent is: menus and settings clicked on, OS name and version, any error displayed in Matomo Mobile. We will NOT track any of your analytics data. This anonymous data will never be made public. You can disable\/enable anonymous tracking in Settings at any time.", "ChooseHttpTimeout": "Choose HTTP timeout value", "ChooseMetric": "Choose metric", "ChooseReport": "Choose a report", diff --git a/plugins/CoreHome/lang/en.json b/plugins/CoreHome/lang/en.json index e0c8367cad..d1e6613199 100644 --- a/plugins/CoreHome/lang/en.json +++ b/plugins/CoreHome/lang/en.json @@ -52,7 +52,7 @@ "ReportGeneratedOn": "Report generated on %s", "ReportGeneratedXAgo": "Report generated %s ago", "SharePiwikLong": "Hi! I just found a great piece of free software: Matomo!\n\nMatomo will let you track visitors to your website for free. You should definitely check it out!", - "SharePiwikShort": "Piwik! Free\/libre web analytics. Own your data.", + "SharePiwikShort": "Matomo! Free\/libre web analytics. Own your data.", "ShareThis": "Share this", "ShortcutsAvailable": "Available shortcuts", "ShortcutZenMode": "for Zen mode", diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject a4acfdaf224bd5a70a646eb3e0a52cc5a24acb9 +Subproject 452d2b652e09c64cfaf82f54d2f5c3767f77731 diff --git a/plugins/CustomVariables/lang/en.json b/plugins/CustomVariables/lang/en.json index f500382a2d..614a2f4e94 100644 --- a/plugins/CustomVariables/lang/en.json +++ b/plugins/CustomVariables/lang/en.json @@ -3,7 +3,7 @@ "ColumnCustomVariableName": "Custom Variable name", "ColumnCustomVariableValue": "Custom Variable value", "CustomVariables": "Custom Variables", - "CustomVariablesReportDocumentation": "This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. %1$s For more information about Custom Variables in general, read the %2$sCustom Variables documentation on piwik.org%3$s", + "CustomVariablesReportDocumentation": "This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. %1$s For more information about Custom Variables in general, read the %2$sCustom Variables documentation on matomo.org%3$s", "PluginDescription": "Custom Variables are (name, value) pairs that you can assign using the Javascript API to visitors or any of their action. Matomo will then report how many visits, pages, conversions for each of these custom names and values. View the detailed Custom Variables for each user and action in the Visitor Log. This plugin is required to use Ecommerce Analytics feature!", "ScopePage": "scope page", "ScopeVisit": "scope visit", diff --git a/plugins/Referrers/lang/en.json b/plugins/Referrers/lang/en.json index 914984dd97..53019f50ec 100644 --- a/plugins/Referrers/lang/en.json +++ b/plugins/Referrers/lang/en.json @@ -3,7 +3,7 @@ "AllReferrersReportDocumentation": "This report shows all your Referrers in one unified report, listing all Websites, Search keywords and Campaigns used by your visitors to find your website.", "Campaigns": "Campaigns", "CampaignsDocumentation": "Visitors that came to your website as the result of a campaign. %1$s See the %2$s report for more details.", - "CampaignsReportDocumentation": "This report shows which campaigns led visitors to your website. %1$s For more information about tracking campaigns, read the %2$scampaigns documentation on piwik.org%3$s", + "CampaignsReportDocumentation": "This report shows which campaigns led visitors to your website. %1$s For more information about tracking campaigns, read the %2$scampaigns documentation on matomo.org%3$s", "ColumnCampaign": "Campaign", "CampaignPageUrlHelp": "The URL of the page that this campaign goes to, for example 'http://example.org/offer.html'.", "CampaignNameHelp": "Choose a name that describes what the campaign is created for and that distinguishes your campaign from your other campaigns. For example 'Email-SummerDeals' or 'PaidAds-SummerDeals'.", diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml index eb9edb0969..5de76050ff 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml @@ -9,7 +9,7 @@ <module>CustomVariables</module> <action>getCustomVariables</action> <dimension>Custom Variable name</dimension> - <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer noopener" target="_blank">Custom Variables documentation on piwik.org</a></documentation> + <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer noopener" target="_blank">Custom Variables documentation on matomo.org</a></documentation> <dimensions> <CustomVariables_CustomVariableName>Custom Variable name</CustomVariables_CustomVariableName> <CustomVariables_CustomVariableValue>Custom Variable value</CustomVariables_CustomVariableValue> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml index eea2006cac..47e15998d8 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml @@ -9,7 +9,7 @@ <module>CustomVariables</module> <action>getCustomVariables</action> <dimension>Custom Variable name</dimension> - <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer noopener" target="_blank">Custom Variables documentation on piwik.org</a></documentation> + <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer noopener" target="_blank">Custom Variables documentation on matomo.org</a></documentation> <dimensions> <CustomVariables_CustomVariableName>Custom Variable name</CustomVariables_CustomVariableName> <CustomVariables_CustomVariableValue>Custom Variable value</CustomVariables_CustomVariableValue> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml index ee8144607a..e15047f0e1 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml @@ -18,7 +18,7 @@ </row> <row> <name>Campaigns (Referrers)</name> - <documentation>This report shows which campaigns led visitors to your website. <br /> For more information about tracking campaigns, read the <a href="https://matomo.org/docs/tracking-campaigns/" rel="noreferrer noopener" target="_blank">campaigns documentation on piwik.org</a></documentation> + <documentation>This report shows which campaigns led visitors to your website. <br /> For more information about tracking campaigns, read the <a href="https://matomo.org/docs/tracking-campaigns/" rel="noreferrer noopener" target="_blank">campaigns documentation on matomo.org</a></documentation> </row> <row> <name>Channel Type (Referrers)</name> @@ -42,7 +42,7 @@ </row> <row> <name>Custom Variables (Visitors)</name> - <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer noopener" target="_blank">Custom Variables documentation on piwik.org</a></documentation> + <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer noopener" target="_blank">Custom Variables documentation on matomo.org</a></documentation> </row> <row> <name>Downloads (Actions)</name> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index 00c1cb20c4..ee8dd7fc97 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -903,7 +903,7 @@ <module>CustomVariables</module> <action>getCustomVariables</action> <dimension>Custom Variable name</dimension> - <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer noopener" target="_blank">Custom Variables documentation on piwik.org</a></documentation> + <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer noopener" target="_blank">Custom Variables documentation on matomo.org</a></documentation> <dimensions> <CustomVariables_CustomVariableName>Custom Variable name</CustomVariables_CustomVariableName> <CustomVariables_CustomVariableValue>Custom Variable value</CustomVariables_CustomVariableValue> @@ -1875,7 +1875,7 @@ <module>Referrers</module> <action>getCampaigns</action> <dimension>Campaign</dimension> - <documentation>This report shows which campaigns led visitors to your website. <br /> For more information about tracking campaigns, read the <a href="https://matomo.org/docs/tracking-campaigns/" rel="noreferrer noopener" target="_blank">campaigns documentation on piwik.org</a></documentation> + <documentation>This report shows which campaigns led visitors to your website. <br /> For more information about tracking campaigns, read the <a href="https://matomo.org/docs/tracking-campaigns/" rel="noreferrer noopener" target="_blank">campaigns documentation on matomo.org</a></documentation> <dimensions> <Referrers_Campaign>Campaign</Referrers_Campaign> <Referrers_Keyword>Keyword</Referrers_Keyword> diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml index 15872ebe0f..4ca3ebdac2 100644 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml @@ -8,7 +8,7 @@ <module>CustomVariables</module> <action>getCustomVariablesValuesFromNameId</action> <dimension>Custom Variable value</dimension> - <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer noopener" target="_blank">Custom Variables documentation on piwik.org</a></documentation> + <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer noopener" target="_blank">Custom Variables documentation on matomo.org</a></documentation> <isSubtableReport>1</isSubtableReport> <metrics> <nb_visits>Visits</nb_visits> |