aboutsummaryrefslogtreecommitdiff
path: root/app/i18n/en
diff options
context:
space:
mode:
Diffstat (limited to 'app/i18n/en')
-rw-r--r--app/i18n/en/admin.php20
-rw-r--r--app/i18n/en/feedback.php6
-rw-r--r--app/i18n/en/install.php26
-rw-r--r--app/i18n/en/sub.php4
4 files changed, 28 insertions, 28 deletions
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index a88552087..e5286d948 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -29,12 +29,12 @@ return array(
'ok' => 'Connection to the database is ok.',
),
'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',
@@ -42,7 +42,7 @@ return array(
),
'database' => 'Database installation',
'dom' => array(
- 'nok' => 'You lack a required library to browse the DOM (php-xml package).',
+ 'nok' => 'Cannot find a required library to browse the DOM (php-xml package).',
'ok' => 'You have the required library to browse the DOM.',
),
'entries' => array(
@@ -59,20 +59,20 @@ return array(
),
'files' => 'File installation',
'json' => array(
- 'nok' => 'You lack JSON (php5-json package).',
+ 'nok' => 'Cannot find JSON (php5-json package).',
'ok' => 'You have JSON extension.',
),
'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(
'_' => 'PHP installation',
@@ -93,7 +93,7 @@ return array(
'ok' => 'Permissions on users directory are good.',
),
'zip' => array(
- 'nok' => 'You lack ZIP extension (php5-zip package).',
+ 'nok' => 'Cannot find ZIP extension (php-zip package).',
'ok' => 'You have ZIP extension.',
),
),
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index 7ce2ae9cf..e7f6b9f85 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -43,12 +43,12 @@ return array(
'not_found' => '%s does not exist',
),
'import_export' => array(
- 'export_no_zip_extension' => 'Zip extension is not present on your server. Please try to export files one by one.',
+ 'export_no_zip_extension' => 'ZIP extension is not present on your server. Please try to export files one by one.',
'feeds_imported' => 'Your feeds have been imported and will now be updated',
'feeds_imported_with_errors' => 'Your feeds have been imported but some errors occurred',
'file_cannot_be_uploaded' => 'File cannot be uploaded!',
- 'no_zip_extension' => 'Zip extension is not present on your server.',
- 'zip_error' => 'An error occured during Zip import.',
+ 'no_zip_extension' => 'ZIP extension is not present on your server.',
+ 'zip_error' => 'An error occured during ZIP import.',
),
'sub' => array(
'actualize' => 'Actualise',
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.',
),
),
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index aaaa02827..789433ee6 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -44,8 +44,8 @@ return array(
'export_opml' => 'Export list of feeds (OPML)',
'export_starred' => 'Export your favourites',
'feed_list' => 'List of %s articles',
- 'file_to_import' => 'File to import<br />(OPML, Json or Zip)',
- 'file_to_import_no_zip' => 'File to import<br />(OPML or Json)',
+ 'file_to_import' => 'File to import<br />(OPML, JSON or ZIP)',
+ 'file_to_import_no_zip' => 'File to import<br />(OPML or JSON)',
'import' => 'Import',
'starred_list' => 'List of favourite articles',
'title' => 'Import / export',