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/conf.php37
-rw-r--r--app/i18n/en/feedback.php12
-rw-r--r--app/i18n/en/gen.php5
-rw-r--r--app/i18n/en/index.php4
-rw-r--r--app/i18n/en/sub.php6
6 files changed, 43 insertions, 41 deletions
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index e94d9fa80..707627782 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -21,11 +21,11 @@ return array(
'ok' => 'Permissions on cache directory are good.',
),
'categories' => array(
- 'nok' => 'Category table is bad configured.',
+ 'nok' => 'Category table is improperly configured.',
'ok' => 'Category table is ok.',
),
'connection' => array(
- 'nok' => 'Connection to the database cannot being established.',
+ 'nok' => 'Connection to the database cannot be established.',
'ok' => 'Connection to the database is ok.',
),
'ctype' => array(
@@ -46,7 +46,7 @@ return array(
'ok' => 'You have the required library to browse the DOM.',
),
'entries' => array(
- 'nok' => 'Entry table is bad configured.',
+ 'nok' => 'Entry table is improperly configured.',
'ok' => 'Entry table is ok.',
),
'favicons' => array(
@@ -54,7 +54,7 @@ return array(
'ok' => 'Permissions on favicons directory are good.',
),
'feeds' => array(
- 'nok' => 'Feed table is bad configured.',
+ 'nok' => 'Feed table is improperly configured.',
'ok' => 'Feed table is ok.',
),
'fileinfo' => array(
@@ -84,8 +84,8 @@ return array(
'ok' => 'Your PHP version is %s, which is compatible with FreshRSS.',
),
'tables' => array(
- 'nok' => 'There is one or more lacking tables in the database.',
- 'ok' => 'Tables are existing in the database.',
+ 'nok' => 'There are one or more missing tables in the database.',
+ 'ok' => 'The appropriate tables exist in the database.',
),
'title' => 'Installation checking',
'tokens' => array(
@@ -103,7 +103,7 @@ return array(
),
'extensions' => array(
'disabled' => 'Disabled',
- 'empty_list' => 'There is no installed extension',
+ 'empty_list' => 'There are no installed extensions',
'enabled' => 'Enabled',
'no_configure_view' => 'This extension cannot be configured.',
'system' => array(
@@ -160,7 +160,7 @@ return array(
'_' => 'Update system',
'apply' => 'Apply',
'check' => 'Check for new updates',
- 'current_version' => 'Your current version of FreshRSS is the %s.',
+ 'current_version' => 'Your current version of FreshRSS is %s.',
'last' => 'Last verification: %s',
'none' => 'No update to apply',
'title' => 'Update system',
@@ -169,8 +169,8 @@ return array(
'articles_and_size' => '%s articles (%s)',
'create' => 'Create new user',
'language' => 'Language',
- 'number' => 'There is %d account created yet',
- 'numbers' => 'There are %d accounts created yet',
+ 'number' => 'There is %d account created',
+ 'numbers' => 'There are %d accounts created',
'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
'password_format' => 'At least 7 characters',
'title' => 'Manage users',
diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index b5ab73510..f4618a1ff 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -8,7 +8,7 @@ return array(
'help' => 'More options are available in the individual feed settings',
'keep_history_by_feed' => 'Minimum number of articles to keep by feed',
'optimize' => 'Optimise database',
- 'optimize_help' => 'To do occasionally to reduce the size of the database',
+ 'optimize_help' => 'Do occasionally to reduce the size of the database',
'purge_now' => 'Purge now',
'title' => 'Archiving',
'ttl' => 'Do not automatically refresh more often than',
@@ -44,10 +44,10 @@ return array(
'filter' => 'Filter applied:',
'get_all' => 'Display all articles',
'get_category' => 'Display "%s" category',
- 'get_favorite' => 'Display favorite articles',
+ 'get_favorite' => 'Display favourite articles',
'get_feed' => 'Display "%s" feed',
'no_filter' => 'No filter',
- 'none' => 'You haven’t created any user query yet.',
+ 'none' => 'You haven’t created any user queries yet.',
'number' => 'Query n°%d',
'order_asc' => 'Display oldest articles first',
'order_desc' => 'Display newest articles first',
@@ -56,14 +56,14 @@ return array(
'state_1' => 'Display read articles',
'state_2' => 'Display unread articles',
'state_3' => 'Display all articles',
- 'state_4' => 'Display favorite articles',
- 'state_5' => 'Display read favorite articles',
- 'state_6' => 'Display unread favorite articles',
- 'state_7' => 'Display favorite articles',
- 'state_8' => 'Display not favorite articles',
- 'state_9' => 'Display read not favorite articles',
- 'state_10' => 'Display unread not favorite articles',
- 'state_11' => 'Display not favorite articles',
+ 'state_4' => 'Display favourite articles',
+ 'state_5' => 'Display read favourite articles',
+ 'state_6' => 'Display unread favourite articles',
+ 'state_7' => 'Display favourite articles',
+ 'state_8' => 'Display not favourite articles',
+ 'state_9' => 'Display read not favourite articles',
+ 'state_10' => 'Display unread not favourite articles',
+ 'state_11' => 'Display not favourite articles',
'state_12' => 'Display all articles',
'state_13' => 'Display read articles',
'state_14' => 'Display unread articles',
@@ -74,7 +74,7 @@ return array(
'_' => 'Profile management',
'delete' => array(
'_' => 'Account deletion',
- 'warn' => 'Your account and all the related data will be deleted.',
+ 'warn' => 'Your account and all related data will be deleted.',
),
'password_api' => 'API password<br /><small>(e.g., for mobile apps)</small>',
'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
@@ -85,21 +85,22 @@ return array(
'_' => 'Reading',
'after_onread' => 'After “mark all as read”,',
'articles_per_page' => 'Number of articles per page',
- 'auto_load_more' => 'Load next articles at the page bottom',
+ 'auto_load_more' => 'Load more articles at the page bottom',
'auto_remove_article' => 'Hide articles after reading',
'mark_updated_article_unread' => 'Mark updated articles as unread',
'confirm_enabled' => 'Display a confirmation dialog on “mark all as read” actions',
'display_articles_unfolded' => 'Show articles unfolded by default',
'display_categories_unfolded' => 'Show categories folded by default',
- 'hide_read_feeds' => 'Hide categories & feeds with no unread article (does not work with “Show all articles” configuration)',
+ 'hide_read_feeds' => 'Hide categories & feeds with no unread articles (does not work with “Show all articles” configuration)',
'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
+ 'sides_close_article' => 'Clicking outside of article text area closes the article',
'jump_next' => 'jump to next unread sibling (feed or category)',
'number_divided_when_reader' => 'Divided by 2 in the reading view.',
'read' => array(
'article_open_on_website' => 'when article is opened on its original website',
'article_viewed' => 'when article is viewed',
'scroll' => 'while scrolling',
- 'upon_reception' => 'upon reception of the article',
+ 'upon_reception' => 'upon receiving the article',
'when' => 'Mark article as read…',
),
'show' => array(
@@ -110,7 +111,7 @@ return array(
),
'sort' => array(
'_' => 'Sort order',
- 'newer_first' => 'Newer first',
+ 'newer_first' => 'Newest first',
'older_first' => 'Oldest first',
),
'sticky_post' => 'Stick the article to the top when opened',
@@ -142,7 +143,7 @@ return array(
'_' => 'Shortcuts',
'article_action' => 'Article actions',
'auto_share' => 'Share',
- 'auto_share_help' => 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',
+ 'auto_share_help' => 'If there is only one sharing mode, it is used. Otherwise, modes are accessible by their number.',
'close_dropdown' => 'Close menus',
'collapse_article' => 'Collapse',
'first_article' => 'Skip to the first article',
@@ -162,7 +163,7 @@ return array(
'shift_for_all_read' => '+ <code>shift</code> to mark all articles as read',
'title' => 'Shortcuts',
'user_filter' => 'Access user filters',
- 'user_filter_help' => 'If there is only one user filter, it is used. Else filters are accessible by their number.',
+ 'user_filter_help' => 'If there is only one user filter, it is used. Otherwise, filters are accessible by their number.',
),
'user' => array(
'articles_and_size' => '%s articles (%s)',
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index e7f6b9f85..334d9a8f5 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -2,7 +2,7 @@
return array(
'admin' => array(
- 'optimization_complete' => 'Optimisation complete',
+ 'optimization_complete' => 'Optimization complete',
),
'access' => array(
'denied' => 'You don’t have permission to access this page',
@@ -39,26 +39,26 @@ return array(
'ok' => '%s is now enabled',
),
'no_access' => 'You have no access on %s',
- 'not_enabled' => '%s is not enabled yet',
+ 'not_enabled' => '%s is not enabled',
'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.',
'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',
+ '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.',
),
'sub' => array(
- 'actualize' => 'Actualise',
+ 'actualize' => 'Updating',
'category' => array(
'created' => 'Category %s has been created.',
'deleted' => 'Category has been deleted.',
'emptied' => 'Category has been emptied',
'error' => 'Category cannot be updated',
'name_exists' => 'Category name already exists.',
- 'no_id' => 'You must precise the id of the category.',
+ 'no_id' => 'You must specify the id of the category.',
'no_name' => 'Category name cannot be empty.',
'not_delete_default' => 'You cannot delete the default category!',
'not_exist' => 'The category does not exist!',
@@ -87,7 +87,7 @@ return array(
'update' => array(
'can_apply' => 'FreshRSS will now be updated to the <strong>version %s</strong>.',
'error' => 'The update process has encountered an error: %s',
- 'file_is_nok' => 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
+ 'file_is_nok' => 'New <strong>version %s</strong> available, but check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
'finished' => 'Update completed!',
'none' => 'No update to apply',
'server_not_found' => 'Update server cannot be found. [%s]',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 1ee5336bd..05281769f 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -103,7 +103,7 @@ return array(
'js' => array(
'category_empty' => 'Empty category',
'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',
- 'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favorites and user queries. It cannot be cancelled!',
+ 'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favourites and user queries. It cannot be cancelled!',
'feedback' => array(
'body_new_articles' => 'There are %%d new articles to read on FreshRSS.',
'request_failed' => 'A request has failed, it may have been caused by Internet connection problems.',
@@ -121,6 +121,7 @@ return array(
'nl' => 'Nederlands',
'ru' => 'Русский',
'tr' => 'Türkçe',
+ 'zh-cn' => '简体中文'
),
'menu' => array(
'about' => 'About',
@@ -173,7 +174,7 @@ return array(
'blank_to_disable' => 'Leave blank to disable',
'by_author' => 'By <em>%s</em>',
'by_default' => 'By default',
- 'damn' => 'Damn!',
+ 'damn' => 'Blast!',
'default_category' => 'Uncategorized',
'no' => 'No',
'not_applicable' => 'Not available',
diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php
index eb6413e3c..a4686de4e 100644
--- a/app/i18n/en/index.php
+++ b/app/i18n/en/index.php
@@ -41,7 +41,7 @@ return array(
'mark_cat_read' => 'Mark category as read',
'mark_feed_read' => 'Mark feed as read',
'newer_first' => 'Newer first',
- 'non-starred' => 'Show all but favorites',
+ 'non-starred' => 'Show all but favourites',
'normal_view' => 'Normal view',
'older_first' => 'Oldest first',
'queries' => 'User queries',
@@ -49,7 +49,7 @@ return array(
'reader_view' => 'Reading view',
'rss_view' => 'RSS feed',
'search_short' => 'Search',
- 'starred' => 'Show only favorites',
+ 'starred' => 'Show only favourites',
'stats' => 'Statistics',
'subscription' => 'Subscriptions management',
'unread' => 'Show only unread',
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index 789433ee6..86600e882 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -10,10 +10,10 @@ return array(
'feed' => array(
'add' => 'Add a RSS feed',
'advanced' => 'Advanced',
- 'archiving' => 'Archivage',
+ 'archiving' => 'Archiving',
'auth' => array(
'configuration' => 'Login',
- 'help' => 'Connection allows to access HTTP protected RSS feeds',
+ 'help' => 'Allows access to HTTP protected RSS feeds',
'http' => 'HTTP Authentication',
'password' => 'HTTP password',
'username' => 'HTTP username',
@@ -22,7 +22,7 @@ return array(
'css_path' => 'Articles CSS path on original website',
'description' => 'Description',
'empty' => 'This feed is empty. Please verify that it is still maintained.',
- 'error' => 'This feed has encountered a problem. Please verify that it is always reachable then actualize it.',
+ 'error' => 'This feed has encountered a problem. Please verify that it is always reachable then update it.',
'in_main_stream' => 'Show in main stream',
'informations' => 'Information',
'keep_history' => 'Minimum number of articles to keep',