diff --git a/LEGALNOTICE b/LEGALNOTICE index 14ee74c5534..614c1901fba 100644 --- a/LEGALNOTICE +++ b/LEGALNOTICE @@ -1,6 +1,6 @@ COPYRIGHT - Piwik - Open Source Web Analytics + Piwik - free/libre analytics platform The software package is: diff --git a/README.md b/README.md index a377eab0298..8c12c5a0636 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,13 @@ We are grateful if you can share the Job Description with your friends and colle ## Description -Piwik is the leading Free/Libre open source Web Analytics platform. +Piwik is the leading Free/Libre open analytics platform. Piwik is a full featured PHP MySQL software program that you download and install on your own webserver. At the end of the five minute installation process you will be given a JavaScript code. Simply copy and paste this tag on websites you wish to track and access your analytics reports in real time. -Piwik aims to be a Free software alternative to Google Analytics, and is already used on more than 1,000,000 websites. +Piwik aims to be a Free software alternative to Google Analytics, and is already used on more than 1,000,000 websites. Privacy is built-in! ## Mission Statement diff --git a/core/API/DataTableGenericFilter.php b/core/API/DataTableGenericFilter.php index 0fe56c57d01..6db2f2b4763 100644 --- a/core/API/DataTableGenericFilter.php +++ b/core/API/DataTableGenericFilter.php @@ -1,6 +1,6 @@ Piwik page"); - echo "Piwik is a free open source web analytics that lets you keep control of your data."; + echo "Piwik is a free/libre web analytics that lets you keep control of your data."; break; case self::STATE_NOSCRIPT_REQUEST: diff --git a/core/Tracker/Action.php b/core/Tracker/Action.php index 63a93c1ec38..625bd9e4edb 100644 --- a/core/Tracker/Action.php +++ b/core/Tracker/Action.php @@ -1,6 +1,6 @@ Piwik is an open source web analytics software that makes it easy to get the information you want from your visitors.<\/p>

This process is split up into %s easy steps and will take around 5 minutes.<\/p>", + "WelcomeHelp": "

Piwik is a free/libre web analytics software that makes it easy to get the information you want from your visitors.<\/p>

This process is split up into %s easy steps and will take around 5 minutes.<\/p>", "WelcomeToCommunity": "Welcome to the Piwik community!" }, "LanguagesManager": { diff --git a/libs/PiwikTracker/PiwikTracker.php b/libs/PiwikTracker/PiwikTracker.php index f6bfe1da1f5..3afc2db93a2 100644 --- a/libs/PiwikTracker/PiwikTracker.php +++ b/libs/PiwikTracker/PiwikTracker.php @@ -1,6 +1,6 @@ {% if not isCustomLogo %}Piwik › {% endif %}{{ 'CoreAdminHome_Administration'|translate }} - + {% include "@CoreHome/_favicon.twig" %} diff --git a/plugins/Morpheus/templates/dashboard.twig b/plugins/Morpheus/templates/dashboard.twig index a2dfff69ca5..89484103318 100644 --- a/plugins/Morpheus/templates/dashboard.twig +++ b/plugins/Morpheus/templates/dashboard.twig @@ -9,7 +9,7 @@ {{ siteName|raw }} - {% if isCustomLogo == false %}Piwik › {% endif %} {{ 'CoreHome_WebAnalyticsReports'|translate }} - + {% include "@CoreHome/_favicon.twig" %} diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php index 19ec7a241c2..37f3b73b0b0 100755 --- a/plugins/MultiSites/API.php +++ b/plugins/MultiSites/API.php @@ -1,6 +1,6 @@ - + {% include "@CoreHome/_favicon.twig" %} diff --git a/plugins/PrivacyManager/Config.php b/plugins/PrivacyManager/Config.php index 88ca3a00b33..fe7d95e7b62 100644 --- a/plugins/PrivacyManager/Config.php +++ b/plugins/PrivacyManager/Config.php @@ -1,6 +1,6 @@ cliMulti->request($urls); $message = "Response was: " . substr( implode("\n\n", $response), 0, 4000); - $this->assertTrue(false !== strpos($response[0], ''), $message); + $this->assertTrue(false !== strpos($response[0], ''), $message); $this->assertTrue(false !== strpos($response[0], 'Widgetize the full dashboard'). $message); } diff --git a/tests/PHPUnit/Integration/Core/CronArchive/FixedSiteIdsTest.php b/tests/PHPUnit/Integration/Core/CronArchive/FixedSiteIdsTest.php index de4c23d63b4..847af0e3c83 100644 --- a/tests/PHPUnit/Integration/Core/CronArchive/FixedSiteIdsTest.php +++ b/tests/PHPUnit/Integration/Core/CronArchive/FixedSiteIdsTest.php @@ -1,6 +1,6 @@