Skip to content

1464 Improve English Translations #1465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Alkarex merged 6 commits into from
Mar 26, 2017
Merged

1464 Improve English Translations #1465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
be0bcfe
Merge pull request #1455 from FreshRSS/dev
Alkarex Mar 11, 2017
fd028c6
Minor changes to english word choice/grammar to improve user experien…
jlefler Mar 21, 2017
e7b153f
Merge remote-tracking branch 'FreshRSS/dev' into 1464-improve-english…
Alkarex Mar 26, 2017
cae6780
Minor i18n English changes
Alkarex Mar 26, 2017
b8cc4a4
i18n: A few more favourites
Alkarex Mar 26, 2017
8a92bde
i18n English misc.
Alkarex Mar 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
## 2017-xx-xx FreshRSS 1.7.0-dev
* Compatibility:
* Add support for PHP 7.1 [#1471](https://github.com/FreshRSS/FreshRSS/issues/1471)
* I18n
* Improve English [#1465](https://github.com/FreshRSS/FreshRSS/pull/1465)


## 2017-03-11 FreshRSS 1.6.3
Expand Down
1 change: 1 addition & 0 deletions CREDITS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ People are sorted by name so please keep this order.
* [Guillaume Hayot](https://github.com/postblue): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:postblue), [Web](https://postblue.info/)
* [hckweb](https://github.com/hckweb): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=hckweb)
* [Jaussoin Timothée](https://github.com/edhelas): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=edhelas), [Web](http://edhelas.movim.eu/)
* [jlefler](https://github.com/jlefler): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:jlefler)
* [Julien Reichardt](https://github.com/j8r): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=j8r), [Web](https://blog.jrei.ch/)
* [Kevin Papst](https://github.com/kevinpapst): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=kevinpapst), [Web](http://www.kevinpapst.de/)
* [Luc Didry](https://github.com/ldidry): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ldidry), [Web](https://www.fiat-tux.fr/)
Expand Down
20 changes: 10 additions & 10 deletions app/i18n/en/admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
'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(
Expand All @@ -46,15 +46,15 @@
'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(
'nok' => 'Check permissions on <em>./data/favicons</em> directory. HTTP server must have rights to write into',
'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(
Expand Down Expand Up @@ -84,8 +84,8 @@
'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(
Expand All @@ -103,7 +103,7 @@
),
'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(
Expand Down Expand Up @@ -160,7 +160,7 @@
'_' => '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',
Expand All @@ -169,8 +169,8 @@
'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',
Expand Down
36 changes: 18 additions & 18 deletions app/i18n/en/conf.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
'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',
Expand Down Expand Up @@ -44,10 +44,10 @@
'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',
Expand All @@ -56,14 +56,14 @@
'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',
Expand All @@ -74,7 +74,7 @@
'_' => '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>',
Expand All @@ -85,21 +85,21 @@
'_' => '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',
'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(
Expand All @@ -110,7 +110,7 @@
),
'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',
Expand Down Expand Up @@ -142,7 +142,7 @@
'_' => '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',
Expand All @@ -162,7 +162,7 @@
'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)',
Expand Down
10 changes: 5 additions & 5 deletions app/i18n/en/feedback.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -39,26 +39,26 @@
'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!',
Expand Down
4 changes: 2 additions & 2 deletions app/i18n/en/gen.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

return array(
'action' => array(
'actualize' => 'Actualize',
'actualize' => 'Updating',
Copy link
Copy Markdown
Member

@Alkarex Alkarex Apr 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this one is wrong:
image
Should be something like Actualize or Update

Copy link
Copy Markdown
Member

@Alkarex Alkarex Apr 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in #1492

'back_to_rss_feeds' => '← Go back to your RSS feeds',
'cancel' => 'Cancel',
'create' => 'Create',
Expand Down Expand Up @@ -103,7 +103,7 @@
'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.',
Expand Down
4 changes: 2 additions & 2 deletions app/i18n/en/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@
'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',
'read' => 'Show only read',
'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',
Expand Down
6 changes: 3 additions & 3 deletions app/i18n/en/sub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
'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',
Expand All @@ -22,7 +22,7 @@
'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',
Expand Down