aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-10-22 13:47:08 +0200
committerGravatar GitHub <noreply@github.com> 2016-10-22 13:47:08 +0200
commit5c0bab836add987c1c8e55a0e5e424ae6bf11f81 (patch)
tree38edf0f96dd86ec0a7a777d7c2fd86aa681039f4
parent40b5d3f933e27f37894f58f99c63409f2cdd2d5a (diff)
parent7ef23b0836bb273a877eb9468300da302798b45f (diff)
Merge pull request #1339 from Alkarex/i18n-install-corrections
i18n install corrections
-rw-r--r--CHANGELOG.md2
-rw-r--r--app/i18n/en/install.php4
-rw-r--r--app/i18n/fr/install.php4
-rw-r--r--app/i18n/it/install.php4
-rw-r--r--app/i18n/nl/install.php4
-rw-r--r--app/i18n/ru/install.php4
-rw-r--r--app/i18n/tr/install.php4
7 files changed, 14 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7c15d5a0..84db24290 100644
--- a/CHANGELOG.md
+++ b/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
diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
index 55afba0ca..63d31fe53 100644
--- a/app/i18n/en/install.php
+++ b/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',
diff --git a/app/i18n/fr/install.php b/app/i18n/fr/install.php
index 99437234f..c50807107 100644
--- a/app/i18n/fr/install.php
+++ b/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',
diff --git a/app/i18n/it/install.php b/app/i18n/it/install.php
index b907bd51c..2fa298508 100644
--- a/app/i18n/it/install.php
+++ b/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',
diff --git a/app/i18n/nl/install.php b/app/i18n/nl/install.php
index 28318d4cb..bd2ba0cce 100644
--- a/app/i18n/nl/install.php
+++ b/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',
diff --git a/app/i18n/ru/install.php b/app/i18n/ru/install.php
index 925601011..bad59bbb3 100644
--- a/app/i18n/ru/install.php
+++ b/app/i18n/ru/install.php
@@ -25,9 +25,9 @@ return array(
),
'host' => 'Хост',
'prefix' => 'Префикс таблицы',
- 'password' => 'Пароль HTTP',
+ 'password' => 'Пароль базы данных',
'type' => 'Тип базы данных',
- 'username' => 'Имя пользователя HTTP',
+ 'username' => 'Имя пользователя базы данных',
),
'check' => array(
'_' => 'Проверки',
diff --git a/app/i18n/tr/install.php b/app/i18n/tr/install.php
index 62ddb6ddc..4daa45099 100644
--- a/app/i18n/tr/install.php
+++ b/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',