Sfoglia il codice sorgente

Minor i18n English changes

Add credits.
Keep British spelling of favourites in the user interface, USA spelling
in the code.
Alexandre Alapetite 9 anni fa
parent
commit
cae67808fe
6 ha cambiato i file con 9 aggiunte e 6 eliminazioni
  1. 2 0
      CHANGELOG.md
  2. 1 0
      CREDITS.md
  3. 1 1
      app/i18n/en/admin.php
  4. 1 1
      app/i18n/en/conf.php
  5. 1 1
      app/i18n/en/gen.php
  6. 3 3
      app/i18n/en/index.php

+ 2 - 0
CHANGELOG.md

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

+ 1 - 0
CREDITS.md

@@ -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/)

+ 1 - 1
app/i18n/en/admin.php

@@ -138,7 +138,7 @@ return array(
 		'number_entries' => '%d articles',
 		'percent_of_total' => '%% of total',
 		'repartition' => 'Articles repartition',
-		'status_favorites' => 'Favorites',
+		'status_favorites' => 'Favourites',
 		'status_read' => 'Read',
 		'status_total' => 'Total',
 		'status_unread' => 'Unread',

+ 1 - 1
app/i18n/en/conf.php

@@ -142,7 +142,7 @@ return array(
 		'_' => 'Shortcuts',
 		'article_action' => 'Article actions',
 		'auto_share' => 'Share',
-		'auto_share_help' => 'If there is only one sharing mode, it is used. Other 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',

+ 1 - 1
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.',

+ 3 - 3
app/i18n/en/index.php

@@ -21,7 +21,7 @@ return array(
 		'rss_of' => 'RSS feed of %s',
 		'title' => 'Your RSS feeds',
 		'title_global' => 'Global view',
-		'title_fav' => 'Your favorites',
+		'title_fav' => 'Your favourites',
 	),
 	'log' => array(
 		'_' => 'Logs',
@@ -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',