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:
authormattab <matthieu.aubry@gmail.com>2014-12-15 10:25:22 +0300
committermattab <matthieu.aubry@gmail.com>2014-12-15 10:25:22 +0300
commitc93d3e84a48cdfe5cf397b2fbd2e215014c5777d (patch)
treec6315bec3cb1bd47e7dd1c53cc1e3ee1158a6d3d /lang
parent12d4618aebf7d0658e28fef3d50c6ba2d5fb449e (diff)
Fixes #6529 Throw an exception when codebase is older than schema to prevent broken race conditions
Diffstat (limited to 'lang')
-rw-r--r--lang/en.json3
1 files changed, 3 insertions, 0 deletions
diff --git a/lang/en.json b/lang/en.json
index de10952b1b..b68df794c2 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -145,9 +145,12 @@
"ErrorRequest": "Oops\u2026 there was a problem during the request. Maybe the server had a temporary issue, or maybe you requested a report with too much data. Please try again. If this error occurs repeatedly please %scontact your Piwik administrator%s for assistance.",
"EvolutionOverPeriod": "Evolution over the period",
"EvolutionSummaryGeneric": "%1$s in %2$s compared to %3$s in %4$s. Evolution: %5$s",
+ "ExceptionContactSupportGeneric": "If you still have this issue please %scontact your Piwik administrator%s for assistance. ",
"ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "The user has to be either a Super User or the user '%s' itself.",
"ExceptionConfigurationFileNotFound": "The configuration file {%s} has not been found or could not be read.",
"ExceptionDatabaseVersion": "Your %1$s version is %2$s but Piwik requires at least %3$s.",
+ "ExceptionDatabaseVersionNewerThanCodebase": "Your Piwik codebase is running the old version %1$s and we have detected that your Piwik Database has already been upgraded to the newer version %2$s.",
+ "ExceptionDatabaseVersionNewerThanCodebaseWait": "Maybe your Piwik administrators are currently finishing the upgrade process. Please try again in a few minutes.",
"ExceptionFileIntegrity": "Integrity check failed: %s",
"ExceptionFilesizeMismatch": "File size mismatch: %1$s (expected length: %2$s, found: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Your %1$s client version is %2$s which is incompatible with server version %3$s.",