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

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Winkler <github@lw1.at>2019-04-03 00:37:08 +0300
committerdiosmosis <diosmosis@users.noreply.github.com>2019-04-03 00:37:08 +0300
commit7172c71bb95e1a3139bf807773abc6846fedbdf0 (patch)
treeaefda4f3991d6b42cbccf741724a8685539b595c
parent98e53787f9d23a3bcb4fe0601fbfc6e23c4f3b03 (diff)
spellcheck en.json files (#14135)
* spellcheck en.json files * fix WidgetsListTest * additional fixes * simplify sentence * Fixing tests.
-rw-r--r--lang/en.json6
-rw-r--r--plugins/CoreAdminHome/lang/en.json6
-rw-r--r--plugins/CorePluginsAdmin/lang/en.json2
-rw-r--r--plugins/CoreUpdater/lang/en.json2
-rw-r--r--plugins/CustomVariables/lang/en.json2
-rw-r--r--plugins/Diagnostics/lang/en.json2
-rw-r--r--plugins/Ecommerce/lang/en.json2
-rw-r--r--plugins/GeoIp2/lang/en.json2
-rw-r--r--plugins/Insights/lang/en.json4
-rw-r--r--plugins/Installation/lang/en.json6
-rw-r--r--plugins/Login/lang/en.json2
-rw-r--r--plugins/Marketplace/lang/en.json4
-rw-r--r--plugins/MobileMessaging/lang/en.json6
-rw-r--r--plugins/PrivacyManager/lang/en.json10
-rw-r--r--plugins/SitesManager/lang/en.json2
-rw-r--r--plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml2
-rw-r--r--plugins/UserCountry/lang/en.json2
-rw-r--r--plugins/UsersManager/lang/en.json4
-rw-r--r--tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml4
19 files changed, 35 insertions, 35 deletions
diff --git a/lang/en.json b/lang/en.json
index 442c49570a..502efb8677 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -187,9 +187,9 @@
"ExceptionLanguageFileNotFound": "Language file '%s' not found.",
"ExceptionMethodNotFound": "The method '%1$s' does not exist or is not available in the module '%2$s'.",
"ExceptionMissingFile": "Missing file: %s",
- "ExceptionUnexpectedFile": "Files were found in your Matomo but we didn't expect them.",
+ "ExceptionUnexpectedFile": "Files were found in your Matomo, but we didn't expect them.",
"ExceptionUnexpectedFilePleaseDelete": "Please delete these files to prevent errors.",
- "ExceptionUnexpectedDirectory": "Directories were found in your Matomo but we didn't expect them.",
+ "ExceptionUnexpectedDirectory": "Directories were found in your Matomo, but we didn't expect them.",
"ExceptionUnexpectedDirectoryPleaseDelete": "Please delete these directories to prevent errors.",
"ExceptionFileToDelete": "File to delete: %s",
"ExceptionDirectoryToDelete": "Directory to delete: %s",
@@ -237,7 +237,7 @@
"Hide": "hide",
"HoursMinutes": "%1$s hours %2$s min",
"Id": "Id",
- "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Assuming archiving is fast for your setup, you can setup the crontab to run more frequently.",
+ "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Assuming archiving is fast for your setup, you can set up the crontab to run more frequently.",
"InfoFor": "Info for %s",
"Installed": "Installed",
"InvalidDateRange": "Invalid Date Range, Please Try Again",
diff --git a/plugins/CoreAdminHome/lang/en.json b/plugins/CoreAdminHome/lang/en.json
index 47f3889021..ce9d23cc06 100644
--- a/plugins/CoreAdminHome/lang/en.json
+++ b/plugins/CoreAdminHome/lang/en.json
@@ -28,7 +28,7 @@
"HttpTrackingApiDescription": "The %1$sHTTP Tracking API%2$s allows you to track anything. This may be useful if you are using a programming language for which no SDK exists yet. It may also be useful when you want to track devices or application in a special way.",
"JSTracking_CampaignKwdParam": "Campaign Keyword parameter",
"JSTracking_CampaignNameParam": "Campaign Name parameter",
- "JSTracking_CodeNoteBeforeClosingHead": "Make sure this code is on every page of your website. We recommend to paste it immediately before the closing %1$s tag.",
+ "JSTracking_CodeNoteBeforeClosingHead": "Make sure this code is on every page of your website. We recommend pasting it immediately before the closing %1$s tag.",
"JSTracking_CustomCampaignQueryParam": "Use custom query parameter names for the campaign name & keyword",
"JSTracking_CrossDomain": "By default, the visitor ID that identifies a unique visitor is stored in the browser's first party cookies which can only be accessed by pages on the same domain. Enabling cross domain linking lets you track all the actions and pageviews of a specific visitor into the same visit even when they view pages on several domains. Whenever a user clicks on a link to one of your website's alias URLs, it will append a URL parameter pk_vid forwarding the Visitor ID.",
"JSTracking_CrossDomain_NeedsMultipleDomains": "Note: To use cross domain linking, you must specify more than one domain name (URLs) for your website.",
@@ -51,7 +51,7 @@
"JSTracking_VisitorCustomVars": "Track custom variables for this visitor",
"JSTracking_VisitorCustomVarsDesc": "For example, with variable name \"Type\" and value \"Customer\".",
"JSTracking_EndNote": "Note: You can generate a customized tracking code in the %1$sTracking Code%2$s admin section.",
- "JSTrackingIntro1": "You can track visitors to your website many different ways. The recommended way to do it is through JavaScript. To use this method you must make sure every webpage of your website has some JavaScript code, which you can generate here.",
+ "JSTrackingIntro1": "You can track visitors to your website in many different ways. The recommended way to do it is through JavaScript. To use this method you must make sure every webpage of your website has some JavaScript code, which you can generate here.",
"JSTrackingIntro2": "Once you have the JavaScript tracking code for your website, copy and paste it to all the pages you want to track with Matomo.",
"JSTrackingIntro3b": "In most websites, blogs, CMS, etc. you can use a pre-made plugin to do the technical work for you. (See our %1$slist of plugins used to integrate Matomo%2$s.) If no plugin exists you can edit your website templates and add this code to the &lt;/head&gt; tag which is often defined in a 'header.php', 'header.tpl' or similar template file.",
"JSTrackingIntro4": "If you don't want to use JavaScript to track visitors, %1$sgenerate an image tracking link below%2$s.",
@@ -112,7 +112,7 @@
"CheckToOptIn": "Check this box to opt-in.",
"MissingTrackingCodeEmailSubject": "No traffic for %s recorded in Matomo Analytics, get started now",
"JsTrackingCodeMissingEmail1": "A few days ago you added the website '%s' to your Matomo Analytics. We just checked and your Matomo doesn't seem to have any recorded traffic for this website.",
- "JsTrackingCodeMissingEmail2": "To begin tracking data and getting insights into your users, you'll need to setup tracking in your website or mobile app. For websites simply embed the tracking code right before the %s tag.",
+ "JsTrackingCodeMissingEmail2": "To begin tracking data and getting insights into your users, you'll need to set up tracking in your website or mobile app. For websites simply embed the tracking code right before the %s tag.",
"JsTrackingCodeMissingEmail3": "To find and customize your tracking code, %1$sclick here%2$s (or have a look at the %3$sJavaScript Tracking Client guide%4$s).",
"TrackingFailuresIntroduction": "This page lists tracking failures that happened during the last %s days. Please note that only the most common kind of tracking failures are recorded and not all of them.",
"NoKnownFailures": "There are no known tracking failures.",
diff --git a/plugins/CorePluginsAdmin/lang/en.json b/plugins/CorePluginsAdmin/lang/en.json
index b7ed466470..020b96d3f7 100644
--- a/plugins/CorePluginsAdmin/lang/en.json
+++ b/plugins/CorePluginsAdmin/lang/en.json
@@ -66,7 +66,7 @@
"TagManagerTeaserEmailSuperUserBody": "Hi,%1$sMatomo Tag Manager is now available within Matomo and I would love to use this new feature. As you have Super User access, could you activate this feature through the Tag Manager page in the top menu?%2$sThe Matomo URL is %3$s.%4$sThanks",
"WhatIsTagManager": "What is a Tag Manager?",
"WhatIsTagManagerDetails1": "Similar to how a Content Management System (CMS) brings you all the flexibility to publish content for your website without having the technical HTML/CSS knowledge, a Tag Management System (TMS) is your go-to for simplifying the process of embedding first and third-party application tracking tags (also known as snippets or pixels) on your website.",
- "WhatIsTagManagerDetails2": "Say you want to see the results of your conversions/goals, newsletter signups, social widgets, exit popups and remarketing campaigns; what was once a highly technical and time consuming process is now easily done within the TMS and takes only a few clicks to implement.",
+ "WhatIsTagManagerDetails2": "Say you want to see the results of your conversions/goals, newsletter signups, social widgets, exit popups and remarketing campaigns; what was once a highly technical and time-consuming process is now easily done within the TMS and takes only a few clicks to implement.",
"TagManagerLearnMoreInUserGuide": "Learn more in the Tag Manager User Guide",
"WhyUsingATagManager": "Why a Tag Manager?",
"WhyUsingATagManagerDetails1": "A Tag Manager makes your life easier! You no longer need to wait on a developer to modify any first or third-party snippets on your website as the Tag Manager gives you a stress-free experience to make these changes and deploy your website yourself.",
diff --git a/plugins/CoreUpdater/lang/en.json b/plugins/CoreUpdater/lang/en.json
index 1fc8cb454e..f12cd06854 100644
--- a/plugins/CoreUpdater/lang/en.json
+++ b/plugins/CoreUpdater/lang/en.json
@@ -24,7 +24,7 @@
"HelpMessageIntroductionWhenError": "The above is the core error message. It should help explain the cause, but if you require further help please:",
"HelpMessageIntroductionWhenWarning": "The update completed successfuly, however there were issues during the process. Please read the above descriptions for details. For further help:",
"HighTrafficPiwikServerEnableMaintenance": "If you manage a high traffic Matomo server, we recommend to %1$smomentarily disable visitor Tracking and put the Matomo User Interface in maintenance mode%2$s.",
- "IncompatbilePluginsWillBeDisabledInfo": "Note: some plugins are not compatible with Matomo %s. We will update them if there is an update on the Marketplace, otherwise we will be disable them when you upgrade:",
+ "IncompatbilePluginsWillBeDisabledInfo": "Note: some plugins are not compatible with Matomo %s. We will update them if there is an update on the Marketplace, otherwise we will disable them when you upgrade:",
"InstallingTheLatestVersion": "Installing the latest version",
"LatestBetaRelease": "Latest beta release",
"LatestStableRelease": "Latest stable release",
diff --git a/plugins/CustomVariables/lang/en.json b/plugins/CustomVariables/lang/en.json
index 614a2f4e94..20fa625e53 100644
--- a/plugins/CustomVariables/lang/en.json
+++ b/plugins/CustomVariables/lang/en.json
@@ -15,7 +15,7 @@
"Unused": "Unused",
"CreateNewSlot": "Increase the number of available Custom Variables slots",
"UsageDetails": "%1$s visits and %2$s actions since creation of this website.",
- "CreatingCustomVariableTakesTime": "Creating a new custom variable slot can take a long time depending on the size of your database. Therefore it is only possible to do this via a command which needs to be executed on the command line.",
+ "CreatingCustomVariableTakesTime": "Creating a new custom variable slot can take a long time depending on the size of your database. Therefore, it is only possible to do this via a command which needs to be executed on the command line.",
"CurrentAvailableCustomVariables": "Currently you can use up to %s Custom Variables per site.",
"ToCreateCustomVarExecute": "To create a new custom variable slot execute the following command within your Matomo installation: ",
"SlotsReportIsGeneratedOverTime": "Data for this report will be populated over time. It may take a day or two to see any data and a few weeks until the report is fully accurate.",
diff --git a/plugins/Diagnostics/lang/en.json b/plugins/Diagnostics/lang/en.json
index d228ab5c83..b8cba0c349 100644
--- a/plugins/Diagnostics/lang/en.json
+++ b/plugins/Diagnostics/lang/en.json
@@ -3,7 +3,7 @@
"ConfigFileTitle": "Config file",
"MysqlMaxPacketSize": "Max Packet Size",
"MysqlMaxPacketSizeWarning": "It is recommended to configure a 'max_allowed_packet' size in your MySQL database of at least %1$s. Configured is currently %2$s.",
- "ConfigFileIntroduction": "Here you can view the Matomo configuration. If you are running Matomo in a load balanced environment the page might be different depending from which server this page is loaded. Rows with a different background color are changed config values that are specified for example in the %1$s file.",
+ "ConfigFileIntroduction": "Here you can view the Matomo configuration. If you are running Matomo in a load balanced environment, the page might be different depending on from which server this page is loaded. Rows with a different background color are changed config values that are specified for example in the %1$s file.",
"HideUnchanged": "If you want to see only changed values you can %1$shide all unchanged values%2$s.",
"Sections": "Sections",
"CronArchivingLastRunCheck": "Last Successful Archiving Completion",
diff --git a/plugins/Ecommerce/lang/en.json b/plugins/Ecommerce/lang/en.json
index 850ecfb661..958bea3ed7 100644
--- a/plugins/Ecommerce/lang/en.json
+++ b/plugins/Ecommerce/lang/en.json
@@ -1,6 +1,6 @@
{
"Ecommerce": {
- "PluginDescription": "Ecommerce lets you track when users add products to carts, and when they convert to a ecommerce sale. Also track products and product categories views and abandoned carts.",
+ "PluginDescription": "Ecommerce lets you track when users add products to carts, and when they convert to an ecommerce sale. Also track products and product categories views and abandoned carts.",
"Sales": "Sales",
"Order": "Order",
"Orders": "Orders",
diff --git a/plugins/GeoIp2/lang/en.json b/plugins/GeoIp2/lang/en.json
index 2c341eb62f..0ad99cd838 100644
--- a/plugins/GeoIp2/lang/en.json
+++ b/plugins/GeoIp2/lang/en.json
@@ -3,7 +3,7 @@
"CannotFindGeoIPDatabaseInArchive": "No valid GeoIP database could be found in tar archive %1$s!",
"CannotUnzipGeoIPFile": "Could not unzip GeoIP file in %1$s: %2$s",
"PluginDescription": "Provides GeoIP2 location providers.",
- "LocationProviderDesc_Php": "This location provider is the most simple to install as it does not require server configuration (ideal for shared hosting!). It uses a GeoIP 2 database and MaxMind's PHP API to accurately determine the location of your visitors.",
+ "LocationProviderDesc_Php": "This location provider is the simplest to install as it does not require server configuration (ideal for shared hosting!). It uses a GeoIP 2 database and MaxMind's PHP API to accurately determine the location of your visitors.",
"LocationProviderDesc_Php_WithExtension": "This location provider is speeded up by the installed %1$smaxminddb%2$s extension.",
"LocationProviderDesc_ServerModule": "This location provider uses the GeoIP 2 module that has been installed in your HTTP server. This provider is fast and accurate, but %1$scan only be used with normal browser tracking.%2$s",
"LocationProviderDesc_ServerModule2": "If you have to import log files or do something else that requires setting IP addresses, use the %3$sPHP GeoIP 2 implementation%4$s and install %1$smaxminddb extension%2$s.",
diff --git a/plugins/Insights/lang/en.json b/plugins/Insights/lang/en.json
index d9c0935773..edab7e7fdc 100644
--- a/plugins/Insights/lang/en.json
+++ b/plugins/Insights/lang/en.json
@@ -1,6 +1,6 @@
{
"Insights": {
- "PluginDescription": "Provides Insights about your traffic. Insights are available as dashboard widgets as well as a new icon in reports to let you see most important trends in your data.",
+ "PluginDescription": "Provides Insights about your traffic. Insights are available as dashboard widgets as well as a new icon in reports, letting you see most important trends in your data.",
"ControlComparedToDescription": "Growth compared to the",
"ControlFilterByDescription": "Show all, only movers, only new or only disappeared",
"DatePeriodCombinationNotSupported": "It is not possible to generate insights for this date and period combination.",
@@ -26,7 +26,7 @@
"TitleConsideredMoversAndShakersGrowth": "%1$s changed from %2$s to %3$s compared to %4$s. Based on this an evolution of each row of %5$s%% is expected.",
"TitleRowChangeDetails": "'%1$s' changed from %2$s (%3$s) to %4$s (%5$s) %6$s.",
"TitleRowDisappearedDetails": "'%1$s' decreased by %2$s and disappeared in %3$s compared to %4$s.",
- "TitleRowMoverAndShaker": "This row had an higher impact than the average.",
+ "TitleRowMoverAndShaker": "This row had a higher impact than the average.",
"TitleRowNewDetails": "'%1$s' increased by %2$s and is new compared to %3$s.",
"WeekComparedToPreviousWeek": "previous week",
"WidgetCategory": "Insights",
diff --git a/plugins/Installation/lang/en.json b/plugins/Installation/lang/en.json
index 2662fd9b31..62a4d747a9 100644
--- a/plugins/Installation/lang/en.json
+++ b/plugins/Installation/lang/en.json
@@ -31,7 +31,7 @@
"JSTracking_Intro": "To track your web traffic with Matomo you need to make sure some extra code is added to each of your webpages.",
"LargePiwikInstances": "Help for users with high traffic websites",
"Legend": "Legend",
- "LoadDataInfileRecommended": "If your Matomo server tracks high traffic websites (eg. > 100,000 pages per month), we recommend to try fix this problem.",
+ "LoadDataInfileRecommended": "If your Matomo server tracks high traffic websites (eg. > 100,000 pages per month), we recommend trying to fix this problem.",
"LoadDataInfileUnavailableHelp": "Using %1$s will greatly speed Matomo's archiving process up. To make it available to Matomo, try updating your PHP & MySQL software and make sure your database user has the %2$s privilege.",
"NfsFilesystemWarning": "Your server is using an NFS filesystem.",
"NfsFilesystemWarningSuffixAdmin": "This means Matomo will be extremely slow when using file based sessions.",
@@ -95,7 +95,7 @@
"SystemCheckJsonHelp": "The php5-json extension is required for Matomo to read and write JSON data.",
"SystemCheckMailHelp": "Feedback and Lost Password messages will not be sent without mail().",
"SystemCheckMbstring": "mbstring",
- "SystemCheckMbstringHelp": "The mbstring extension is required to handle multibyte characters in the User interface and API responses. Also please check that mbstring.func_overload is set to \"0\" in php.ini.",
+ "SystemCheckMbstringHelp": "The mbstring extension is required to handle multibyte characters in the User interface and API responses. Also, please check that mbstring.func_overload is set to \"0\" in php.ini.",
"SystemCheckMemoryLimit": "Memory limit",
"SystemCheckMemoryLimitHelp": "On a high traffic website, the archiving process may require more memory than currently allowed. If necessary, change the memory_limit directive in your php.ini file.",
"SystemCheckNoErrorsOrWarnings": "There are no errors or warnings",
@@ -105,7 +105,7 @@
"SystemCheckOtherExtensions": "Other extensions",
"SystemCheckOtherFunctions": "Other functions",
"SystemCheckPageSpeedDisabled": "PageSpeed disabled",
- "SystemCheckPageSpeedWarning": "We recommend to disable the PageSpeed Module in your web server %s: PageSpeed was reported to cause several issues with Matomo, such as: broken Pages reports, broken Row Evolution, and other issues which are hard to troubleshoot. Please disable mod_pagespeed on this server.",
+ "SystemCheckPageSpeedWarning": "We recommend disabling the PageSpeed Module in your web server %s: PageSpeed was reported to cause several issues with Matomo, such as: broken Pages reports, broken Row Evolution, and other issues which are hard to troubleshoot. Please disable mod_pagespeed on this server.",
"SystemCheckPackHelp": "The pack() function is required to track visitors in Matomo.",
"SystemCheckParseIniFileHelp": "This built-in function has been disabled on your host. Matomo will attempt to emulate this function but may encounter further security restrictions. Tracker performance will also be impacted.",
"SystemCheckPdoAndMysqliHelp": "On a GNU\/Linux server you can compile php with the following options: %1$s In your php.ini, add the following lines: %2$s",
diff --git a/plugins/Login/lang/en.json b/plugins/Login/lang/en.json
index 663361ff0c..e37014a0fd 100644
--- a/plugins/Login/lang/en.json
+++ b/plugins/Login/lang/en.json
@@ -24,7 +24,7 @@
"CurrentlyBlockedIPs": "Currently blocked IPs",
"IPsAlwaysBlocked": "These IPs are always blocked",
"UnblockAllIPs": "Unblock all currently blocked IPs",
- "CurrentlyBlockedIPsUnblockInfo": "You can unblock IPs that are currently blocked so they can log in again in case they were falsely flagged and need to be able to log in again.",
+ "CurrentlyBlockedIPsUnblockInfo": "You can unblock IPs that are currently blocked, so they can log in again in case they were falsely flagged and need to be able to log in again.",
"CurrentlyBlockedIPsUnblockConfirm": "Are you sure you want to unblock all currently blocked IPs?",
"LoginPasswordNotCorrect": "Wrong Username and password combination.",
"LostYourPassword": "Lost your password?",
diff --git a/plugins/Marketplace/lang/en.json b/plugins/Marketplace/lang/en.json
index 334ed3db12..53a38401a2 100644
--- a/plugins/Marketplace/lang/en.json
+++ b/plugins/Marketplace/lang/en.json
@@ -65,7 +65,7 @@
"NoValidSubscriptionNoUpdates": "Once a subscription is expired you will no longer receive any updates for this plugin.",
"PluginSubscriptionsList": "This is a list of subscriptions associated with your license key.",
"PaidPluginsNoLicenseKeyIntro": "If you have purchased a %1$spremium paid plugin%2$s, please insert the received licence key below.",
- "PaidPluginsWithLicenseKeyIntro": "A valid license key has been set up. For security reasons we do not show the license key here. If you have lost your license key please contact the Matomo team.",
+ "PaidPluginsWithLicenseKeyIntro": "A valid license key has been set up. For security reasons we do not show the license key here. If you have lost your license key, please contact the Matomo team.",
"PaidPluginsNoLicenseKeyIntroNoSuperUserAccess": "In case you have purchased a %1$spremium paid plugin%2$s on the Marketplace please ask a user with Super User access to add the license key.",
"PluginDescription": "Extend and expand the functionality of Matomo via the Marketplace by downloading plugins and themes.",
"PluginKeywords": "Keywords",
@@ -106,7 +106,7 @@
"PluginUploadDisabled": "Plugin upload is disabled in config file. In order to enable this feature please update your configuration or contact your administrator",
"LicenseKeyExpiresSoon": "Your license key expires soon, please contact %1$s.",
"LicenseKeyIsExpired": "Your license key is expired, please contact %1$s.",
- "MultiServerEnvironmentWarning": "You cannot install or update the plugin directly as you are using Matomo on multiple servers. The plugin would be only installed on one server. Instead download the plugin and deploy it manually to all your servers.",
+ "MultiServerEnvironmentWarning": "You cannot install or update the plugin directly as you are using Matomo on multiple servers. The plugin would be only installed on one server. Instead, download the plugin and deploy it manually to all your servers.",
"AutoUpdateDisabledWarning": "You cannot install or update the plugin directly as automatic updates are disabled in the config. To enable automatic updates set %1$s in %2$s.",
"ViewRepositoryChangelog": "View the changes"
}
diff --git a/plugins/MobileMessaging/lang/en.json b/plugins/MobileMessaging/lang/en.json
index d8892d3c7c..b5a2a4f13d 100644
--- a/plugins/MobileMessaging/lang/en.json
+++ b/plugins/MobileMessaging/lang/en.json
@@ -21,14 +21,14 @@
"Settings_InvalidActivationCode": "Code entered was not valid, please try again.",
"Settings_LetUsersManageAPICredential": "Allow users to manage their own SMS provider",
"Settings_LetUsersManageAPICredential_No_Help": "All users are able to receive SMS Reports and will use your account's credits.",
- "Settings_LetUsersManageAPICredential_Yes_Help": "Each user will be able to setup their own SMS API Account and will not use your credit.",
+ "Settings_LetUsersManageAPICredential_Yes_Help": "Each user will be able to set up their own SMS API Account and will not use your credit.",
"Settings_ManagePhoneNumbers": "Manage Phone Numbers",
"Settings_PhoneActivated": "Phone number validated! You can now receive SMS with your stats.",
"Settings_PhoneNumber": "Phone Number",
"Settings_PhoneNumbers_Add": "Add a new Phone Number",
"Settings_PhoneNumbers_CountryCode_Help": "If you do not know the phone country code, look for your country here.",
"Settings_PhoneNumbers_Help": "Before receiving SMS (text messages) reports on a phone, the phone number must be entered below.",
- "Settings_PhoneNumbers_HelpAdd": "When you click \"Add\", a SMS containing a code will be sent to the phone. The user receiving the code should then login to Matomo, click on Settings, then click on Mobile Messaging. After entering the code, the user will be able to receive text reports on their phone.",
+ "Settings_PhoneNumbers_HelpAdd": "When you click \"Add\", an SMS containing a code will be sent to the phone. The user receiving the code should then login to Matomo, click on Settings, then click on Mobile Messaging. After entering the code, the user will be able to receive text reports on their phone.",
"Settings_PleaseSignUp": "To create SMS reports and receive short text messages with your websites' stats on your mobile phone, please sign up with the SMS API and enter your information below.",
"Settings_SMSAPIAccount": "Manage SMS API Account",
"Settings_SMSProvider": "SMS Provider",
@@ -36,7 +36,7 @@
"Settings_SuspiciousPhoneNumber": "If you don't receive the text message, you may try without the leading zero. ie. %s",
"Settings_UpdateOrDeleteAccount": "You can also %1$supdate%2$s or %3$sdelete%4$s this account.",
"Settings_ValidatePhoneNumber": "Validate",
- "Settings_VerificationCodeJustSent": "We just sent a SMS to this number with a code: please enter this code above and click \"Validate\".",
+ "Settings_VerificationCodeJustSent": "We just sent an SMS to this number with a code: please enter this code above and click \"Validate\".",
"SettingsMenu": "Mobile Messaging",
"SMS_Content_Too_Long": "[too long]",
"Available_Credits": "Available credits: %1$s",
diff --git a/plugins/PrivacyManager/lang/en.json b/plugins/PrivacyManager/lang/en.json
index cc8cecc187..34bd5b5bb3 100644
--- a/plugins/PrivacyManager/lang/en.json
+++ b/plugins/PrivacyManager/lang/en.json
@@ -3,7 +3,7 @@
"AnonymizeData": "Anonymize data",
"AnonymizeIpDescription": "Select \"Yes\" if you want Matomo not to track fully qualified IP-Addresses.",
"AnonymizeIpInlineHelp": "Anonymize the last byte(s) of visitors IP addresses to comply with your local privacy laws\/guidelines.",
- "AnonymizeIpExtendedHelp": "When users visit your website, Matomo will not use the full IP address (such as %1$s) but instead Matomo will anonymise it first (to %2$s). IP address anonymisation is one of the requirements set by the privacy laws in some countries such as Germany.",
+ "AnonymizeIpExtendedHelp": "When users visit your website, Matomo will not use the full IP address (such as %1$s) but instead Matomo will anonymize it first (to %2$s). IP address anonymisation is one of the requirements set by the privacy laws in some countries such as Germany.",
"AnonymizeIpMaskLengtDescription": "Select how many bytes of the visitors' IPs should be masked.",
"AnonymizeIpMaskLength": "%1$s byte(s) - e.g. %2$s",
"AskingForConsent": "Asking for consent",
@@ -33,7 +33,7 @@
"DoNotTrack_Description": "Do Not Track is a technology and policy proposal that enables users to opt out of tracking by websites they do visit, including analytics services, advertising networks, and social platforms.",
"DoNotTrack_Disable": "Disable Do Not Track support",
"DoNotTrack_Disabled": "Matomo is currently tracking all visitors, even when they specified \"I do not want to be tracked\" in their web browsers.",
- "DoNotTrack_DisabledMoreInfo": "We recommend to respect your visitors privacy and enable DoNotTrack support.",
+ "DoNotTrack_DisabledMoreInfo": "We recommend enabling DoNotTrack support to respect your visitors' privacy",
"DoNotTrack_Enable": "Enable Do Not Track support",
"DoNotTrack_Enabled": "You are currently respecting your users Privacy, Bravo!",
"DoNotTrack_EnabledMoreInfo": "When users have set their web browser to \"I do not want to be tracked\" (DoNotTrack is enabled) then Matomo will not track these visits.",
@@ -62,13 +62,13 @@
"ReportsDataSavedEstimate": "Database size",
"SaveSettingsBeforePurge": "You have changed the data deletion settings. Please save them before starting a purge.",
"SeeAlsoOurOfficialGuidePrivacy": "See also our official guide: %1$sWeb Analytics Privacy%2$s",
- "TeaserHeader": "On this page, you can customize Matomo to make it privacy compliant with existing legislations, by: %1$s anonymizing the visitor IP%2$s, %3$s automatically remove old visitor logs from the database%4$s, and %5$s anonymise previously tracked raw users' data%6$s.",
+ "TeaserHeader": "On this page, you can customize Matomo to make it privacy compliant with existing legislations, by: %1$s anonymizing the visitor IP%2$s, %3$s automatically remove old visitor logs from the database%4$s, and %5$s anonymize previously tracked raw users' data%6$s.",
"TeaserHeadline": "Privacy Settings",
"UseAnonymizedIpForVisitEnrichment": "Also use the Anonymized IP addresses when enriching visits.",
- "UseAnonymizedIpForVisitEnrichmentNote": "Plugins such as Geo Location via IP and Provider improve visitor's metadata. By default these plugins use the anonymized IP addresses. If you select 'No', then the non-anonymized full IP address will be used instead, resulting in less privacy but better data accuracy.",
+ "UseAnonymizedIpForVisitEnrichmentNote": "Plugins such as Geo Location via IP and Provider improve visitor's metadata. By default, these plugins use the anonymized IP addresses. If you select 'No', then the non-anonymized full IP address will be used instead, resulting in less privacy but better data accuracy.",
"PseudonymizeUserIdNote": "When you enable this option, the User ID will be replaced by a pseudonym to avoid directly storing and displaying personally identifiable information such as an email address. In technical terms: given your User ID, Matomo will process the User ID pseudonym using a salted hash function.",
"PseudonymizeUserIdNote2": "Note: replacing with a pseudonym is not the same as anonymisation. In GDPR terms: the User ID pseudonym still counts as personal data. The original User ID could still be identified if certain additional information is available (which only Matomo and your data processor has access to).",
- "AnonymizeOrderIdNote": "Because an Order ID can be cross referenced with another system, typically an ecommerce shop, the Order ID may count as personal information under the GDPR. When you enable this option, an Order ID will be automatically anonymized so no personal information will be tracked.",
+ "AnonymizeOrderIdNote": "Because an Order ID can be cross-referenced with another system, typically an ecommerce shop, the Order ID may count as personal information under the GDPR. When you enable this option, an Order ID will be automatically anonymized so no personal information will be tracked.",
"UseAnonymizeIp": "Anonymize Visitors' IP addresses",
"UseAnonymizeTrackingData": "Anonymize Tracking Data",
"UseAnonymizeUserId": "Anonymize User ID",
diff --git a/plugins/SitesManager/lang/en.json b/plugins/SitesManager/lang/en.json
index aed0dc631c..4a3560279d 100644
--- a/plugins/SitesManager/lang/en.json
+++ b/plugins/SitesManager/lang/en.json
@@ -86,7 +86,7 @@
"UTCTimeIs": "UTC time is %s.",
"OnlyMatchedUrlsAllowed": "Only track visits and actions when the action URL starts with one of the above URLs.",
"OnlyMatchedUrlsAllowedHelp": "When enabled, Matomo will only track internal actions when the Page URL is one of the known URLs for your website. This prevents people from spamming your analytics with URLs for other websites.",
- "OnlyMatchedUrlsAllowedHelpExamples": "The domain and the path has to be an exact match and each valid subdomain has to be specified separately. For example when the known URLs are 'http:\/\/example.com\/path' and 'http:\/\/good.example.com', tracking requests for 'http:\/\/example.com\/otherpath' or 'http:\/\/bad.example.com' are ignored.",
+ "OnlyMatchedUrlsAllowedHelpExamples": "The domain and the path have to be an exact match and each valid subdomain has to be specified separately. For example when the known URLs are 'http:\/\/example.com\/path' and 'http:\/\/good.example.com', tracking requests for 'http:\/\/example.com\/otherpath' or 'http:\/\/bad.example.com' are ignored.",
"WebsitesManagement": "Websites Management",
"XManagement": "Manage %s",
"ChooseMeasurableTypeHeadline": "What would you like to measure?",
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 35b7307c03..b8c2e45eea 100644
--- a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml
+++ b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml
@@ -38,7 +38,7 @@ https://www.example.org/</placeholder>
</uiControlAttributes>
<availableValues />
<description />
- <inlineHelp>When enabled, Matomo will only track internal actions when the Page URL is one of the known URLs for your website. This prevents people from spamming your analytics with URLs for other websites.&lt;br /&gt;The domain and the path has to be an exact match and each valid subdomain has to be specified separately. For example when the known URLs are 'http://example.com/path' and 'http://good.example.com', tracking requests for 'http://example.com/otherpath' or 'http://bad.example.com' are ignored.</inlineHelp>
+ <inlineHelp>When enabled, Matomo will only track internal actions when the Page URL is one of the known URLs for your website. This prevents people from spamming your analytics with URLs for other websites.&lt;br /&gt;The domain and the path have to be an exact match and each valid subdomain has to be specified separately. For example when the known URLs are 'http://example.com/path' and 'http://good.example.com', tracking requests for 'http://example.com/otherpath' or 'http://bad.example.com' are ignored.</inlineHelp>
<templateFile />
<introduction />
<condition />
diff --git a/plugins/UserCountry/lang/en.json b/plugins/UserCountry/lang/en.json
index 38694d78f5..03c530bcc1 100644
--- a/plugins/UserCountry/lang/en.json
+++ b/plugins/UserCountry/lang/en.json
@@ -36,7 +36,7 @@
"GeoIPIncorrectDatabaseFormat": "Your GeoIP database does not seem to have the correct format. It may be corrupt. Make sure you are using the binary version and try replacing it with another copy.",
"GeoIpLocationProviderDesc_Pecl1": "This location provider uses a GeoIP database and a PECL module to accurately and efficiently determine the location of your visitors.",
"GeoIpLocationProviderDesc_Pecl2": "There are no limitations with this provider, so it is the one we recommend using.",
- "GeoIpLocationProviderDesc_Php1": "This location provider is the most simple to install as it does not require server configuration (ideal for shared hosting!). It uses a GeoIP database and MaxMind's PHP API to accurately determine the location of your visitors.",
+ "GeoIpLocationProviderDesc_Php1": "This location provider is the simplest to install as it does not require server configuration (ideal for shared hosting!). It uses a GeoIP database and MaxMind's PHP API to accurately determine the location of your visitors.",
"GeoIpLocationProviderDesc_Php2": "If your website gets a lot of traffic, you may find that this location provider is too slow. In this case, you should install the %1$sPECL extension%2$s or a %3$sserver module%4$s.",
"GeoIpLocationProviderDesc_ServerBased1": "This location provider uses the GeoIP module that has been installed in your HTTP server. This provider is fast and accurate, but %1$scan only be used with normal browser tracking.%2$s",
"GeoIpLocationProviderDesc_ServerBased2": "If you have to import log files or do something else that requires setting IP addresses, use the %1$sPECL GeoIP implementation (recommended)%2$s or the %3$sPHP GeoIP implementation%4$s.",
diff --git a/plugins/UsersManager/lang/en.json b/plugins/UsersManager/lang/en.json
index 95293636e7..69179b7cf5 100644
--- a/plugins/UsersManager/lang/en.json
+++ b/plugins/UsersManager/lang/en.json
@@ -4,7 +4,7 @@
"UsesTwoFactorAuthentication": "Uses two-factor authentication",
"TwoFactorAuthentication": "Two-factor authentication",
"ResetTwoFactorAuthentication": "Reset two-factor authentication",
- "ResetTwoFactorAuthenticationInfo": "If the user can no longer log in due to lost recovery codes or a lost authentication device, you can reset two-factor authentication for the user so they can log in again.",
+ "ResetTwoFactorAuthenticationInfo": "If the user can no longer log in due to lost recovery codes or a lost authentication device, you can reset two-factor authentication for the user, so they can log in again.",
"AddUser": "Add a new user",
"AddExistingUser": "Add an existing user",
"AddNewUser": "Add new user",
@@ -56,7 +56,7 @@
"GiveViewAccess": "Give view access for %1$s",
"GiveViewAccessTitle": "Give an existing user access to view reports for %s",
"GiveViewAccessInstructions": "To give an existing user view access for %s enter the username or email address of an existing user",
- "IfYouWouldLikeToChangeThePasswordTypeANewOne": "If you would like to change the password type a new one. Otherwise leave this blank.",
+ "IfYouWouldLikeToChangeThePasswordTypeANewOne": "If you would like to change the password type a new one. Otherwise, leave this blank.",
"YourCurrentPassword": "Your current password",
"CurrentPasswordNotCorrect": "The current password you entered is not correct.",
"ConfirmWithPassword": "Please enter your password to confirm this change.",
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml
index ad6e2349cf..15ce61cdf6 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml
@@ -43,7 +43,7 @@ https://www.example.org/</placeholder>
</uiControlAttributes>
<availableValues />
<description />
- <inlineHelp>When enabled, Matomo will only track internal actions when the Page URL is one of the known URLs for your website. This prevents people from spamming your analytics with URLs for other websites.&lt;br /&gt;The domain and the path has to be an exact match and each valid subdomain has to be specified separately. For example when the known URLs are 'http://example.com/path' and 'http://good.example.com', tracking requests for 'http://example.com/otherpath' or 'http://bad.example.com' are ignored.</inlineHelp>
+ <inlineHelp>When enabled, Matomo will only track internal actions when the Page URL is one of the known URLs for your website. This prevents people from spamming your analytics with URLs for other websites.&lt;br /&gt;The domain and the path have to be an exact match and each valid subdomain has to be specified separately. For example when the known URLs are 'http://example.com/path' and 'http://good.example.com', tracking requests for 'http://example.com/otherpath' or 'http://bad.example.com' are ignored.</inlineHelp>
<templateFile />
<introduction />
<condition />
@@ -290,7 +290,7 @@ https://www.example.org/</placeholder>
</uiControlAttributes>
<availableValues />
<description />
- <inlineHelp>When enabled, Matomo will only track internal actions when the Page URL is one of the known URLs for your website. This prevents people from spamming your analytics with URLs for other websites.&lt;br /&gt;The domain and the path has to be an exact match and each valid subdomain has to be specified separately. For example when the known URLs are 'http://example.com/path' and 'http://good.example.com', tracking requests for 'http://example.com/otherpath' or 'http://bad.example.com' are ignored.</inlineHelp>
+ <inlineHelp>When enabled, Matomo will only track internal actions when the Page URL is one of the known URLs for your website. This prevents people from spamming your analytics with URLs for other websites.&lt;br /&gt;The domain and the path have to be an exact match and each valid subdomain has to be specified separately. For example when the known URLs are 'http://example.com/path' and 'http://good.example.com', tracking requests for 'http://example.com/otherpath' or 'http://bad.example.com' are ignored.</inlineHelp>
<templateFile />
<introduction />
<condition />