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 <thomas.steur@googlemail.com>2014-02-07 10:43:27 +0400
committerThomas Steur <thomas.steur@googlemail.com>2014-02-07 10:43:27 +0400
commitd0e5faa1301164e88bb89e4681e604a2e6e659b7 (patch)
tree8c0f9758236d4945aab0be81c4297f57d87eed34 /lang
parentd3a423d10a483a6f41835a4c863df7fd294c2d5c (diff)
refs #4631 started to work on installing updates during installation in case we reuse existing tables. Problem: In case there are updates available and one of those updates writes a config the installer thinks we are already done. Therefore we do now create the config file as early as possible and before the install the updates. We create the config file once we have the database information. Also allows us to remove the db_infos session hack. While installation is in progress we set a flag in General currently named install_in_progress (tbd)
Diffstat (limited to 'lang')
-rw-r--r--lang/en.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/lang/en.json b/lang/en.json
index 1dbcea0f44..227b1e4f4f 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -1135,6 +1135,7 @@
"SystemCheckTracker": "Tracker status",
"SystemCheckTrackerHelp": "GET request to piwik.php failed. Try whitelisting this URL from HTTP Authentication and disable mod_security (you may have to ask your webhost).",
"Tables": "Creating the Tables",
+ "ReusingTables": "Reusing the Tables",
"TablesWithSameNamesFound": "Some %1$s tables in your database %2$s have the same names as the tables Piwik is trying to create",
"TablesFound": "The following tables have been found in the database",
"TablesWarningHelp": "Either choose to reuse the existing database tables or select a clean install to erase all existing data in the database.",