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-08-29 20:51:52 +0400
committervipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2009-08-29 20:51:52 +0400
commit9bb91822314efe0a7badbad427d7fcffbaa079b2 (patch)
tree7589d83eb482e1688fb6f1aec83ada50e9700d46 /lang
parentd367657f57f72f56a72c1e25a4b80b181f05cbf4 (diff)
fixes #956 - remove Piwik's utf8_encode check from libs/upgradephp. Added Installation checks for json and xml extensions. Tweak system check layout.
Diffstat (limited to 'lang')
-rw-r--r--lang/en.php12
1 files changed, 9 insertions, 3 deletions
diff --git a/lang/en.php b/lang/en.php
index e85e30c812..7483846871 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -705,10 +705,16 @@ $translations = array(
'Installation_SystemCheckPdoMysql' => 'PDO MySQL extension',
'Installation_SystemCheckExtensions' => 'Other required extensions',
'Installation_SystemCheckPdoHelp' => "On a Linux server you can compile php with the following option: %s\nIn your php.ini, add the following lines: %s",
- 'Installation_SystemCheckPhpPdoSite' => 'More information on the <a style="color:red" href="http://php.net/pdo">PHP website</a>.',
+ 'Installation_SystemCheckPhpPdoSite' => 'More information on: <a style="color:red" href="http://php.net/pdo">PHP PDO</a>.',
'Installation_SystemCheckWinPdoHelp' => 'On a Windows server you can add the following lines to your php.ini: %s',
- 'Installation_SystemCheckSplHelp' => 'You need to configure and rebuild PHP with the Standard PHP Library enabled (by default).',
- 'Installation_SystemCheckZlibHelp' => 'You need to configure and rebuild PHP with zlib support enabled, --with-zlib.',
+ 'Installation_SystemCheckSplHelp' => 'You need to configure and rebuild PHP with the Standard PHP Library (SPL) enabled (by default).',
+ 'Installation_SystemCheckZlibHelp' => 'You need to configure and rebuild PHP with "zlib" support enabled, --with-zlib.',
+ 'Installation_SystemCheckJson' => 'JSON',
+ 'Installation_SystemCheckJsonHelp' => 'You need to configure and rebuild PHP with either "json" or "xml" extensions enabled.',
+ 'Installation_SystemCheckJsonSite' => 'More information on: <a style="color:red" href="http://php.net/json">PHP JSON</a>.',
+ 'Installation_SystemCheckXml' => 'XML',
+ 'Installation_SystemCheckXmlHelp' => 'Some third-party plugins and developer libraries may require the "xml" extension.',
+ 'Installation_SystemCheckXmlSite' => 'More information on: <a style="color:red" href="http://php.net/xml">PHP XML</a>.',
'Installation_SystemCheckWriteDirs' => 'Directories with write access',
'Installation_SystemCheckWriteDirsHelp' => 'To fix this error on your Linux system, try typing in the following command(s)',
'Installation_SystemCheckMemoryLimit' => 'Memory limit',