Merge branch 'FreshRSS/dev' into dev

app/i18n/en/conf.php

@@ -5,9 +5,9 @@ return array(
 		'_' => 'Archiving',
 		'advanced' => 'Advanced',
 		'delete_after' => 'Remove articles after',
-		'help' => 'More options are available in the individual stream settings',
+		'help' => 'More options are available in the individual feed settings',
 		'keep_history_by_feed' => 'Minimum number of articles to keep by feed',
-		'optimize' => 'Optimize database',
+		'optimize' => 'Optimise database',
 		'optimize_help' => 'To do occasionally to reduce the size of the database',
 		'purge_now' => 'Purge now',
 		'title' => 'Archiving',
@@ -72,7 +72,7 @@ return array(
 	),
 	'profile' => array(
 		'_' => 'Profile management',
-		'email_persona' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+		'email_persona' => 'Login email address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',
 		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
 		'password_format' => 'At least 7 characters',

app/i18n/en/gen.php

@@ -150,7 +150,7 @@ return array(
 		'wallabag' => 'wallabag',
 	),
 	'short' => array(
-		'attention' => 'Attention!',
+		'attention' => 'Warning!',
 		'blank_to_disable' => 'Leave blank to disable',
 		'by_author' => 'By <em>%s</em>',
 		'by_default' => 'By default',

app/i18n/en/sub.php

@@ -18,7 +18,7 @@ return array(
 			'password' => 'HTTP password',
 			'username' => 'HTTP username',
 		),
-		'css_help' => 'Retrieves truncated RSS feeds (attention, requires more time!)',
+		'css_help' => 'Retrieves truncated RSS feeds (caution, requires more time!)',
 		'css_path' => 'Articles CSS path on original website',
 		'description' => 'Description',
 		'empty' => 'This feed is empty. Please verify that it is still maintained.',
@@ -26,7 +26,7 @@ return array(
 		'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, their feeds are automatically classified under <em>%s</em>.',
+		'moved_category_deleted' => 'When you delete a category, its feeds are automatically classified under <em>%s</em>.',
 		'no_selected' => 'No feed selected.',
 		'number_entries' => '%d articles',
 		'stats' => 'Statistics',