- Few updates in the messaging

- in DBStats API, table name is not bound using ? in the query, so it has to be escaped

1 files changed, 6 insertions, 4 deletions

diff --git a/lang/en.php b/lang/en.php
index 48b2eb98fb..bef1efcb48 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -191,7 +191,7 @@ $translations = array(
 	'CoreUpdater_YourDatabaseIsOutOfDate' => 'Your Piwik database is out-of-date, and must be upgraded before you can continue.',
 	'CoreUpdater_PiwikWillBeUpgradedFromVersionXToVersionY' => 'Piwik database will be upgraded from version %s to the new version %s.',
 	'CoreUpdater_TheFollowingPluginsWillBeUpgradedX' => 'The following plugins will be updated: %s.',
-	'CoreUpdater_TheUpgradeProcessMayFail' => 'If you have a large Piwik database, updates might take too long to run in the browser. In this situation, you can execute the updates from your command line: <code>$ php path/to/piwik/index.php</code>',
+	'CoreUpdater_TheUpgradeProcessMayFailExecuteCommand' => 'If you have a large Piwik database, updates might take too long to run in the browser. In this situation, you can execute the updates from your command line: %s',
 	'CoreUpdater_TheUpgradeProcessMayTakeAWhilePleaseBePatient' => 'The database upgrade process may take a while, so please be patient.',
 	'CoreUpdater_UpgradePiwik' => 'Upgrade Piwik',
 	'CoreUpdater_ErrorDIYHelp' => 'If you are an advanced user and encounter an error in the database upgrade:',
@@ -720,12 +720,13 @@ Note that it is not necessary to specify the URLs with and without \'www\' as Pi
 	'Installation_DatabaseServerVersion' => 'Database server version',
 	'Installation_DatabaseCreation' => 'Database creation',
 	'Installation_DatabaseClientCharset' => 'Database client character set',
-	'Installation_ConnectionCharacterSetNotUtf8' => 'Client connection to the database server is not UTF8.  You can recompile libmysql --with-charset=utf8 (best option), add <code>charset = utf8</code> to your database configuration (forces an additional query which will slow down the tracker), or leave it as non-utf8 (in which case, your data won\'t be stored as true utf8).',
+	'Installation_ConnectionCharacterSetNotUtf8' => 'Client connection to the database server is not set to UTF8 by default. This is not critical issue: <b>Piwik should work correctly</b>. However for consistency, it is recommended that you do one of the following: <ul style="list-style: disc;margin-left:10px"><li>in your piwik config/config.ini.php, add <code>charset = utf8</code> under the [database] section of your Piwik configuration file <code>config/config.ini.php</code></li><li>recompile libmysql --with-charset=utf8</li></ul>',
 	'Installation_DatabaseTimezone' => 'Database timezone',
-	'Installation_TimezoneMismatch' => 'PHP date.timezone is not the same as the database server timezone',
+	'Installation_TimezoneMismatch' => 'PHP date.timezone is not the same as the database server timezone. This might cause issues with reports not showing data for the right hours of the day. More information at %s',
 	'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',
+	'Installation_JsTagHelpTitle' => 'How to insert the tag in your websites?',
+	'Installation_LargePiwikInstances' => 'Help for large Piwik instances',
 	'Installation_JsTagArchivingHelp' => 'For medium and high traffic websites, check out the  <a target="_blank" href="http://piwik.org/docs/setup-auto-archiving/">How to setup auto archiving page</a> to make Piwik run really fast!',
 	'Installation_Congratulations' => 'Congratulations',
 	'Installation_CongratulationsHelp' => '<p>Congratulations! Your Piwik installation is complete.</p><p>Make sure your JavaScript code is entered on your pages, and wait for your first visitors!</p>',
@@ -801,6 +802,7 @@ Note that it is not necessary to specify the URLs with and without \'www\' as Pi
 	'Goals_ColumnRevenue' => 'Revenue',
 	'DBStats_DatabaseUsage' => 'Database usage',
 	'DBStats_MainDescription' => 'Piwik is storing all your web analytics data in the MySQL database. Currently, Piwik tables are using %s.',
+	'DBStats_LearnMore' => 'To learn more about how Piwik processes data and how to make Piwik work well for medium and high traffic websites, check out the documentation %s.',
 	'DBStats_Table' => 'Table',
 	'DBStats_RowNumber' => 'Row number',
 	'DBStats_DataSize' => 'Data size',