diff options
| author | vipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2009-11-26 12:45:59 +0300 |
|---|---|---|
| committer | vipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2009-11-26 12:45:59 +0300 |
| commit | 8f8f27b1420677288e86103375e96c78f8158cf2 (patch) | |
| tree | 9e05643464aeaeab37b302e72533f1bb4ef34818 /lang | |
| parent | 1c80c8b69fbc63baa6955abb16d808745be4f03a (diff) | |
Tested with PHP 5.3.1
Installation:
* add another step (databaseCheck); warn if not UTF8
* provide charset example in config.ini.sample.php
* missing translation strings from some forms
* handle last step ('finished') being refreshed or language selected
* handle incomplete install (i.e., anonymous user or initial site not created)
index.php:
* handle session.save_path not defined, unable to mkdir, or not writable
MySQLi:
* handle connection error
* uncaught exceptions from Dashboard, ExampleFeedburner, and LanguagesManager
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/en.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lang/en.php b/lang/en.php index f4dea525b9..57823652d7 100644 --- a/lang/en.php +++ b/lang/en.php @@ -706,7 +706,17 @@ $translations = array( 'Installation_PercentDone' => '%s %% Done', 'Installation_NoConfigFound' => 'The Piwik configuration file couldn\'t be found and you are trying to access a Piwik page.<br /><b> » 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_DatabaseSetupServer' => 'database server', + 'Installation_DatabaseSetupLogin' => 'login', + 'Installation_DatabaseSetupPassword' => 'password', + 'Installation_DatabaseSetupDatabaseName' => 'database name', + 'Installation_DatabaseSetupTablePrefix' => 'table prefix', + 'Installation_DatabaseSetupAdapter' => 'adapter', 'Installation_DatabaseErrorConnect' => 'Error while trying to connect to the database server', + 'Installation_DatabaseCheck' => 'Database check', + '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', '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>', @@ -716,6 +726,8 @@ $translations = array( '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>', 'Installation_ContinueToPiwik' => 'Continue to Piwik', 'Installation_SetupWebsite' => 'Setup a website', + 'Installation_SetupWebSiteName' => 'website name', + 'Installation_SetupWebSiteURL' => 'website URL', 'Installation_SetupWebsiteError' => 'There was an error when adding the website', 'Installation_SetupWebsiteSetupSuccess' => 'Website %s created with success!', 'Installation_GeneralSetup' => 'General Setup', |