Merge branch 'FreshRSS/dev' into cli

CHANGELOG.md

@@ -36,6 +36,8 @@
 * SQL
 	* Slightly modified several SQL requests (MySQL, SQLite) to simplify support of PostgreSQL [#1195](https://github.com/FreshRSS/FreshRSS/pull/1195)
 	* Increase performances by removing a superfluous category request [#1316](https://github.com/FreshRSS/FreshRSS/pull/1316)
+* I18n
+	* Fix some messages during installation [#1339](https://github.com/FreshRSS/FreshRSS/pull/1339)
 * UI
 	* Download icon 💾 for podcasts [#1236](https://github.com/FreshRSS/FreshRSS/issues/1236)
 * SimplePie

app/i18n/en/install.php

@@ -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',

app/i18n/fr/install.php

@@ -24,10 +24,10 @@ return array(
 			'ok' => 'La configuration de la base de données a été enregistrée.',
 		),
 		'host' => 'Hôte',
-		'password' => 'Mot de passe',
+		'password' => 'Mot de passe pour base de données',
 		'prefix' => 'Préfixe des tables',
 		'type' => 'Type de base de données',
-		'username' => 'Nom d’utilisateur',
+		'username' => 'Nom d’utilisateur pour base de données',
 	),
 	'check' => array(
 		'_' => 'Vérifications',

app/i18n/it/install.php

@@ -25,9 +25,9 @@ return array(
 		),
 		'host' => 'Host',
 		'prefix' => 'Prefisso tabella',
-		'password' => 'HTTP password',
+		'password' => 'Password del database',
 		'type' => 'Tipo di database',
-		'username' => 'HTTP username',
+		'username' => 'Nome utente del database',
 	),
 	'check' => array(
 		'_' => 'Controlli',

app/i18n/nl/install.php

@@ -25,9 +25,9 @@ return array(
 		),
 		'host' => 'Host',
 		'prefix' => 'Tabel voorvoegsel',
-		'password' => 'HTTP wachtwoord',
+		'password' => 'Database wachtwoord',
 		'type' => 'Type database',
-		'username' => 'HTTP gebruikersnaam',
+		'username' => 'Database gebruikersnaam',
 	),
 	'check' => array(
 		'_' => 'Controles',

app/i18n/ru/install.php

@@ -25,9 +25,9 @@ return array(
 		),
 		'host' => 'Хост',
 		'prefix' => 'Префикс таблицы',
-		'password' => 'Пароль HTTP',
+		'password' => 'Пароль базы данных',
 		'type' => 'Тип базы данных',
-		'username' => 'Имя пользователя HTTP',
+		'username' => 'Имя пользователя базы данных',
 	),
 	'check' => array(
 		'_' => 'Проверки',

app/i18n/tr/install.php

@@ -25,9 +25,9 @@ return array(
 		),
 		'host' => 'Sunucu',
 		'prefix' => 'Tablo ön eki',
-		'password' => 'HTTP şifre',
+		'password' => 'Veritabanı şifresi',
 		'type' => 'Veritabanı türü',
-		'username' => 'HTTP kullanıcı adı',
+		'username' => 'Veritabanı kullanıcı adı',
 	),
 	'check' => array(
 		'_' => 'Kontroller',