diff --git a/LICENSE.txt b/LICENSE.txt index 20d40b6bce..a830bff330 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - Copyright (C) + EspoCRM - Open Source CRM + Copyright (C) 2014 Yuri Kuznetsov, Taras Machyshyn, Alex Avramenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - Copyright (C) + EspoCRM Copyright (C) 2014 Yuri Kuznetsov, Taras Machyshyn, Alex Avramenko This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/install/core/i18n/en_US.php b/install/core/i18n/en_US.php index 3f311dd970..03a35ff6a2 100644 --- a/install/core/i18n/en_US.php +++ b/install/core/i18n/en_US.php @@ -2,16 +2,9 @@ return array( 'Main page title' => 'Welcome to EspoCRM', - 'Main page header' => 'Welcome to EspoCRM. Before installing, please check if you have the following information:
-
- Database host
- Database name
- Database username
- Database password
-

-Please select the language to use EspoCRM.', - 'Start page title' => 'Start page title', - 'Step1 page title' => 'Step1 page title', + 'Main page header' => '', + 'Start page title' => 'License Agreement', + 'Step1 page title' => 'License Agreement', 'License Agreement' => 'License Agreement', 'I accept the agreement' => 'I accept the agreement', 'Choose your language:' => 'Choose your language:', @@ -20,13 +13,13 @@ Please select the language to use EspoCRM.', 'Database User Name' => 'Database User Name', 'Database User Password' => 'Database User Password', 'Database driver' => 'Database driver', - 'Step2 page title' => 'Step2 page title', - 'Step3 page title' => 'Step3 page title', - 'Admin Name' => 'Admin Name', + 'Step2 page title' => 'Database configuration', + 'Step3 page title' => 'Administrator Setup', + 'User Name' => 'User Name', 'Password' => 'Password', - 'Confirm Password' => 'Confirm Password', - 'Errors page title' => 'Errors page title', - 'Finish page title' => 'Finish page title', + 'Confirm Password' => 'Confirm your Password', + 'Errors page title' => 'Errors', + 'Finish page title' => 'Success', 'Congratulation! Welcome to EspoCRM!' => 'Congratulation! Welcome to EspoCRM!', 'admin' => 'admin', @@ -57,7 +50,7 @@ Please select the language to use EspoCRM.', ), 'user languages' => array( 'en_US' => 'English (US)', - 'de_DE' => 'German', + //'de_DE' => 'German', ), // controll 'Start' => 'Start', @@ -65,7 +58,7 @@ Please select the language to use EspoCRM.', 'Next' => 'Next', 'Go to EspoCRM' => 'Go to EspoCRM', 'Re-check' => 'Re-check', - 'Test settings' => 'Test settings', + 'Test settings' => 'Test Connection', // db errors '1049' => 'Unknown database', diff --git a/install/core/tpl/main.tpl b/install/core/tpl/main.tpl index 06f54af94e..d0f0359592 100644 --- a/install/core/tpl/main.tpl +++ b/install/core/tpl/main.tpl @@ -1,9 +1,15 @@ +
+

{$langs['Main page title']}

+