Merge pull request #1786 from FreshRSS/dev1.10.0

FreshRSS 1.10.0

6 files changed, 25 insertions, 5 deletions

diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 187b66a8c..1f857dbab 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -175,12 +175,15 @@ return array(
 	'user' => array(
 		'articles_and_size' => '%s articles (%s)',
 		'create' => 'Create new user',
+		'delete_users' => 'Delete user',
 		'language' => 'Language',
 		'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',
+		'selected' => 'Selected user',
 		'title' => 'Manage users',
+		'update_users' => 'Update user',
 		'user_list' => 'List of users',
 		'username' => 'Username',
 		'users' => 'Users',
diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index e4eeb74b7..60231b825 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -37,6 +37,7 @@ return array(
 			'no_limit' => 'No limit',
 			'thin' => 'Thin',
 		),
+		'show_nav_buttons' => 'Show the navigation buttons',
 	),
 	'query' => array(
 		'_' => 'User queries',
@@ -148,6 +149,7 @@ return array(
 		'collapse_article' => 'Collapse',
 		'first_article' => 'Skip to the first article',
 		'focus_search' => 'Access search box',
+		'global_view' => 'Switch to global view',
 		'help' => 'Display documentation',
 		'javascript' => 'JavaScript must be enabled in order to use shortcuts',
 		'last_article' => 'Skip to the last article',
@@ -157,13 +159,17 @@ return array(
 		'navigation' => 'Navigation',
 		'navigation_help' => 'With the "Shift" modifier, navigation shortcuts apply on feeds.<br/>With the "Alt" modifier, navigation shortcuts apply on categories.',
 		'next_article' => 'Skip to the next article',
+		'normal_view' => 'Switch to normal view',
 		'other_action' => 'Other actions',
 		'previous_article' => 'Skip to the previous article',
+		'reading_view' => 'Switch to reading view',
+		'rss_view' => 'Open RSS view in a new tab',
 		'see_on_website' => 'See on original website',
 		'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. Otherwise, filters are accessible by their number.',
+		'views' => 'Views',
 	),
 	'user' => array(
 		'articles_and_size' => '%s articles (%s)',
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index 334d9a8f5..ad7f87fd9 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -101,6 +101,10 @@ return array(
 			'_' => 'User %s has been deleted',
 			'error' => 'User %s cannot be deleted',
 		),
+		'updated' => array(
+			'_' => 'User %s has been updated',
+			'error' => 'User %s has not been updated',
+		),
 	),
 	'profile' => array(
 		'error' => 'Your profile cannot be modified',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index ac48e3486..82cd4da72 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -19,6 +19,7 @@ return array(
 		'see_website' => 'See website',
 		'submit' => 'Submit',
 		'truncate' => 'Delete all articles',
+		'update' => 'Update',
 	),
 	'auth' => array(
 		'email' => 'Email address',
diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php
index a4686de4e..29dccc9ed 100644
--- a/app/i18n/en/index.php
+++ b/app/i18n/en/index.php
@@ -41,18 +41,18 @@ 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 favourites',
+		'non-starred' => 'Show non-favourites',
 		'normal_view' => 'Normal view',
 		'older_first' => 'Oldest first',
 		'queries' => 'User queries',
-		'read' => 'Show only read',
+		'read' => 'Show read',
 		'reader_view' => 'Reading view',
 		'rss_view' => 'RSS feed',
 		'search_short' => 'Search',
-		'starred' => 'Show only favourites',
+		'starred' => 'Show favourites',
 		'stats' => 'Statistics',
 		'subscription' => 'Subscriptions management',
-		'unread' => 'Show only unread',
+		'unread' => 'Show unread',
 	),
 	'share' => 'Share',
 	'tag' => array(
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index 47b15ae7a..b9bae7955 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -32,12 +32,18 @@ return array(
 		'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 update it.',
-		'in_main_stream' => 'Show in main stream',
 		'informations' => 'Information',
 		'keep_history' => 'Minimum number of articles to keep',
 		'moved_category_deleted' => 'When you delete a category, its feeds are automatically classified under <em>%s</em>.',
+		'mute' => 'mute',
 		'no_selected' => 'No feed selected.',
 		'number_entries' => '%d articles',
+		'priority' => array(
+			'_' => 'Visibility',
+			'archived' => 'Do not show (archived)',
+			'main_stream' => 'Show in main stream',
+			'normal' => 'Show in its category',
+		),
 		'stats' => 'Statistics',
 		'think_to_add' => 'You may add some feeds.',
 		'title' => 'Title',