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:
authorvipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2009-09-24 20:51:30 +0400
committervipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2009-09-24 20:51:30 +0400
commit59b387b66763e7f16e9e10aff131e3a7a63400d8 (patch)
tree4c8ab4e25d8dfb87ed35b8f11d55124c1ce48748 /lang
parent8263ba97c16d3191d0aeb66df8459decd5537afa (diff)
refs #984 - adapters no longer default to utf8 connection; add utf8 connection charset test -- warning currently suppressed pending further investigation; in the interim, users can manually add 'charset = utf8' to their config.ini.php to get the desired behaviour
fix bug where skipping step in installation munged session var and a browser restart was necessary fill in default port from adapter restore emulated prepares for pdo_mysql to facilitate use of query cache
Diffstat (limited to 'lang')
-rw-r--r--lang/en.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lang/en.php b/lang/en.php
index 3ca229137d..2b029d01af 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -676,6 +676,7 @@ $translations = array(
'Installation_NoConfigFound' => 'The Piwik configuration file couldn\'t be found and you are trying to access a Piwik page.<br /><b>&nbsp;&nbsp;&raquo; You can <a href=\'index.php\'>install Piwik now</a></b><br /><small>If you installed Piwik before and have some tables in your DB, don\'t worry, you can reuse the same tables and keep your existing data!</small>',
'Installation_DatabaseSetup' => 'Database setup',
'Installation_DatabaseErrorConnect' => 'Error while trying to connect to the database server',
+ 'Installation_ConnectionCharacterSetNotUtf8' => 'Client connection to the database server is not UTF8',
'Installation_JsTag' => 'JavaScript tag',
'Installation_JsTagHelp' => '<p>To count all visitors, you must insert the JavaScript code on all of your pages.</p><p>Your pages do not have to be made with PHP, Piwik will work on all kinds of pages (whether it is HTML, ASP, Perl or any other languages).</p><p>Here is the code you have to insert: (copy and paste on all your pages) </p>',
'Installation_JsTagQuicHelpk' => 'Quick Help',