Merge pull request #1346 from FreshRSS/dev1.6.0

Merge 1.6.0-dev in master

1 files changed, 13 insertions, 13 deletions

diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
index d1c5f37c8..63d31fe53 100644
--- a/app/i18n/en/install.php
+++ b/app/i18n/en/install.php
@@ -4,7 +4,7 @@ return array(
 	'action' => array(
 		'finish' => 'Complete installation',
 		'fix_errors_before' => 'Please fix errors before skipping to the next step.',
-		'keep_install' => 'Keep previous installation',
+		'keep_install' => 'Keep previous configuration',
 		'next_step' => 'Go to the next step',
 		'reinstall' => 'Reinstall FreshRSS',
 	),
@@ -25,9 +25,9 @@ return array(
 		),
 		'host' => 'Host',
 		'prefix' => 'Table prefix',
-		'password' => 'HTTP password',
+		'password' => 'Database password',
 		'type' => 'Type of database',
-		'username' => 'HTTP username',
+		'username' => 'Database username',
 	),
 	'check' => array(
 		'_' => 'Checks',
@@ -37,19 +37,19 @@ return array(
 			'ok' => 'Permissions on cache directory are good.',
 		),
 		'ctype' => array(
-			'nok' => 'You lack a required library for character type checking (php-ctype).',
+			'nok' => 'Cannot find a required library for character type checking (php-ctype).',
 			'ok' => 'You have the required library for character type checking (ctype).',
 		),
 		'curl' => array(
-			'nok' => 'You lack cURL (php5-curl package).',
-			'ok' => 'You have cURL extension.',
+			'nok' => 'Cannot find the cURL library (php-curl package).',
+			'ok' => 'You have the cURL library.',
 		),
 		'data' => array(
 			'nok' => 'Check permissions on <em>./data</em> directory. HTTP server must have rights to write into',
 			'ok' => 'Permissions on data directory are good.',
 		),
 		'dom' => array(
-			'nok' => 'You lack a required library to browse the DOM.',
+			'nok' => 'Cannot find a required library to browse the DOM.',
 			'ok' => 'You have the required library to browse the DOM.',
 		),
 		'favicons' => array(
@@ -61,20 +61,20 @@ return array(
 			'ok' => 'Your HTTP REFERER is known and corresponds to your server.',
 		),
 		'json' => array(
-			'nok' => 'You lack a recommended library to parse JSON.',
+			'nok' => 'Cannot find a recommended library to parse JSON.',
 			'ok' => 'You have a recommended library to parse JSON.',
 		),
 		'minz' => array(
-			'nok' => 'You lack the Minz framework.',
+			'nok' => 'Cannot find the Minz framework.',
 			'ok' => 'You have the Minz framework.',
 		),
 		'pcre' => array(
-			'nok' => 'You lack a required library for regular expressions (php-pcre).',
+			'nok' => 'Cannot find a required library for regular expressions (php-pcre).',
 			'ok' => 'You have the required library for regular expressions (PCRE).',
 		),
 		'pdo' => array(
-			'nok' => 'You lack PDO or one of the supported drivers (pdo_mysql, pdo_sqlite).',
-			'ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite).',
+			'nok' => 'Cannot find PDO or one of the supported drivers (pdo_mysql, pdo_sqlite, pdo_pgsql).',
+			'ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
 			'nok' => 'Your PHP version is %s but FreshRSS requires at least version %s.',
@@ -85,7 +85,7 @@ return array(
 			'ok' => 'Permissions on users directory are good.',
 		),
 		'xml' => array(
-			'nok' => 'You lack the required library to parse XML.',
+			'nok' => 'Cannot find the required library to parse XML.',
 			'ok' => 'You have the required library to parse XML.',
 		),
 	),