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
path: root/lang
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2018-04-24 04:26:39 +0300
committerMatthieu Aubry <mattab@users.noreply.github.com>2018-04-24 04:26:39 +0300
commit34c4a857126cd936ff1e9b1a4fb590306be1c879 (patch)
tree65dece270b9cbc891953f6cdc89824d825c1ca54 /lang
parent718eb0e315e4d47c6a72185be6e8d097b1df4765 (diff)
GDPR + Add a couple of new platform features especially around validating settings (#12558)
* add a couple of new platform features especially around validating settings * more validators and other tweaks * few tweaks * allow plugins to add header script in JS tests * some work on gdpr * remove email feature * menu update * add date tooltip * make sure privacy has its own icon * added some text * add opt out info * better titles * add some information about webserver logs * add log import notice * give angular some time to render * show border around iframe * make sure to place a notification in modal dialog if needed * when opening a modal, make sure the top part is visible * disable newsletter sign up by default * command line tool to anonymize and remove previously tracked raw data * implement some basic consent features into piwik.js * minor tweak * schedule entries to anonymize data in past * let users anonymize historical data * better overview * better naming * explain consent tracking * add legitimate interest * new menu structure for privacy * use a proper db table for scheduled anonymizations * add some tracker tests * some tests and fixes * couple of fixes and tests * starting to add some UI tests * more tweaks * add missing file * fix jslint * have the field full width * more tweaks * create directory if needed * various fixes * fix some tests * make sure keys will be always returned in same order * more fixes * fix some tests * apply feedback from review * fix some tests * this might fix mysqli tests * fix some tests * trying to fix mysqli tests * fix system test * fix comment * remove some duplicated code * update method name * trigger event when logs need to be deleted * add possibility to anonymize userId and orderId * trigger event in tracking code page * expire consent in hours * post another event * update wording for privacy GDPR * fix various ui tests * fix some tests * trying to fix ui tests * trigger another test run * fix system test * fix some ui tests * show a table of contents on tracking code page, fix title, add mobile apps and API * fix ui test * 3.5.0-b2 update * Re-generate piwik.js * fix job status and selector style * make sure to include only sites with admin access * some tweaks * fix some ui tests * fix some ui tests * fix test
Diffstat (limited to 'lang')
-rw-r--r--lang/en.json11
1 files changed, 11 insertions, 0 deletions
diff --git a/lang/en.json b/lang/en.json
index 099735796a..7343ce84c0 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -219,6 +219,7 @@
"GiveUsYourFeedback": "Give us Feedback!",
"Goal": "Goal",
"GoTo": "Go to %s",
+ "GoTo2": "Go to",
"GraphHelp": "More information about displaying graphs in Matomo.",
"HelloUser": "Hello, %s!",
"Help": "Help",
@@ -442,6 +443,16 @@
"YouMustUpgradePhpVersionToReceiveLatestPiwik": "You must upgrade your PHP version in order to receive the latest Matomo update.",
"PiwikCannotBeUpgradedBecausePhpIsTooOld": "Matomo cannot be upgraded to the latest major version because your PHP version is too old.",
"PleaseUpgradeYourPhpVersionSoYourPiwikDataStaysSecure": "Please upgrade your PHP version to at least PHP %s so your Matomo analytics data stays secure.",
+ "ValidatorErrorEmptyValue": "A value needs to be provided.",
+ "ValidatorErrorNotANumber": "The value is not a number.",
+ "ValidatorErrorNumberTooLow": "The value \"%1$s\" is too low. The value needs to be at least %2$s.",
+ "ValidatorErrorNumberTooHigh": "The value \"%1$s\" is too high. The value should be at most %2$s",
+ "ValidatorErrorCharacterTooShort": "The value contains \"%1$s\" characters but needs to contain at least %2$s characters.",
+ "ValidatorErrorCharacterTooLong": "The value contains \"%1$s\" characters but should contain at most %2$s characters.",
+ "ValidatorErrorNotUrlLike": "The value \"%s\" does not look like a URL.",
+ "ValidatorErrorNotEmailLike": "The value \"%s\" does not look like a valid email.",
+ "ValidatorErrorXNotWhitelisted": "The value \"%1$s\" is not allowed, use one of: %2$s.",
+ "ValidatorErrorInvalidDateTimeFormat": "The date \"%1$s\" does not have the correct format, please use %2$s",
"WarningFileIntegrityNoManifest": "File integrity check could not be performed due to missing manifest.inc.php.",
"WarningFileIntegrityNoManifestDeployingFromGit": "If you are deploying Matomo from Git, this message is normal.",
"WarningFileIntegrityNoMd5file": "File integrity check could not be completed due to missing md5_file() function.",