[i18n] Update en-UK grammar and style (#3068)

Taken from <https://github.com/FreshRSS/FreshRSS/pull/3060>

64 files changed, 341 insertions, 341 deletions

diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php
index 9b11ca928..5ad1fd4d1 100644
--- a/app/i18n/cz/admin.php
+++ b/app/i18n/cz/admin.php
@@ -67,8 +67,8 @@ return array(
 			'ok' => 'Máte rozšíření JSON.',
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	// TODO - Translation
-			'ok' => 'You have the recommended library mbstring for Unicode.',	// TODO - Translation
+			'nok' => 'Cannot find the recommended mbstring library for Unicode.',	// TODO - Translation
+			'ok' => 'You have the recommended mbstring library for Unicode.',	// TODO - Translation
 		),
 		'minz' => array(
 			'nok' => 'Nemáte framework Minz.',
@@ -163,10 +163,10 @@ return array(
 			'help' => 'in seconds',	// TODO - Translation
 			'number' => 'Duration to keep logged in',	// TODO - Translation
 		),
-		'force_email_validation' => 'Force email addresses validation',	// TODO - Translation
+		'force_email_validation' => 'Force email address validation',	// TODO - Translation
 		'instance-name' => 'Instance name',	// TODO - Translation
-		'max-categories' => 'Categories per user limit',	// TODO - Translation
-		'max-feeds' => 'Feeds per user limit',	// TODO - Translation
+		'max-categories' => 'Max number of categories per user',	// TODO - Translation
+		'max-feeds' => 'Max number of feeds per user',	// TODO - Translation
 		'registration' => array(
 			'help' => '0 znamená žádná omezení účtu',
 			'number' => 'Maximální počet účtů',
diff --git a/app/i18n/cz/conf.php b/app/i18n/cz/conf.php
index 073e10f0a..5bdc115a5 100644
--- a/app/i18n/cz/conf.php
+++ b/app/i18n/cz/conf.php
@@ -11,7 +11,7 @@ return array(
 		'keep_max' => 'Maximum number of articles to keep',	// TODO - Translation
 		'keep_min_by_feed' => 'Zachovat tento minimální počet článků v každém kanálu',
 		'keep_period' => 'Maximum age of articles to keep',	// TODO - Translation
-		'keep_unreads' => 'Never delete unreads',	// TODO - Translation
+		'keep_unreads' => 'Never delete unread articles',	// TODO - Translation
 		'maintenance' => 'Maintenance',	// TODO - Translation
 		'optimize' => 'Optimalizovat databázi',
 		'optimize_help' => 'Občasná údržba zmenší velikost databáze',
@@ -98,7 +98,7 @@ return array(
 	'reading' => array(
 		'_' => 'Čtení',
 		'after_onread' => 'Po “označit vše jako přečtené”,',
-		'always_show_favorites' => 'Show all articles in favorites by default',	// TODO - Translation
+		'always_show_favorites' => 'Show all articles in favourites by default',	// TODO - Translation
 		'articles_per_page' => 'Počet článků na stranu',
 		'auto_load_more' => 'Načítat další články dole na stránce',
 		'auto_remove_article' => 'Po přečtení články schovat',
diff --git a/app/i18n/cz/feedback.php b/app/i18n/cz/feedback.php
index 315be55aa..45522dd3b 100644
--- a/app/i18n/cz/feedback.php
+++ b/app/i18n/cz/feedback.php
@@ -101,7 +101,7 @@ return array(
 			'selector_preview' => array(
 				'http_error' => 'Failed to load website content.',	// TODO - Translation
 				'no_entries' => 'There are no articles in this feed. You need at least one article to create a preview.',	// TODO - Translation
-				'no_feed' => 'Internal error (feed can’t be found).',	// TODO - Translation
+				'no_feed' => 'Internal error (feed cannot be found).',	// TODO - Translation
 				'no_result' => 'The selector didn\'t match anything. As a fallback the original feed text will be displayed instead.',	// TODO - Translation
 				'selector_empty' => 'The selector is empty. You need to define one to create a preview.',	// TODO - Translation
 			),
diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index 33de7dd0f..29cacc274 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -210,7 +210,7 @@ return array(
 		'default_category' => 'Nezařazeno',
 		'no' => 'Ne',
 		'not_applicable' => 'Not available',	// TODO - Translation
-		'ok' => 'Ok!',	// TODO - Translation
+		'ok' => 'Okay!',	// TODO - Translation
 		'or' => 'nebo',
 		'yes' => 'Ano',
 	),
diff --git a/app/i18n/cz/sub.php b/app/i18n/cz/sub.php
index 4e91fd4df..9f8bf0516 100644
--- a/app/i18n/cz/sub.php
+++ b/app/i18n/cz/sub.php
@@ -7,7 +7,7 @@ return array(
 		'title' => 'API',	// TODO - Translation
 	),
 	'bookmarklet' => array(
-		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',	// TODO - Translation
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click the "Subscribe" button in any page you want to subscribe to.',	// TODO - Translation
 		'label' => 'Subscribe',	// TODO - Translation
 		'title' => 'Bookmarklet',	// TODO - Translation
 	),
@@ -67,10 +67,10 @@ return array(
 		),
 		'show' => array(
 			'all' => 'Show all feeds',	// TODO - Translation
-			'error' => 'Show only feeds with error',	// TODO - Translation
+			'error' => 'Show only feeds with errors',	// TODO - Translation
 		),
 		'showing' => array(
-			'error' => 'Showing only feeds with error',	// TODO - Translation
+			'error' => 'Showing only feeds with errors',	// TODO - Translation
 		),
 		'ssl_verify' => 'Verify SSL security',	// TODO - Translation
 		'stats' => 'Statistika',
@@ -102,7 +102,7 @@ return array(
 		'title' => 'Import / export',	// TODO - Translation
 	),
 	'menu' => array(
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'bookmark' => 'Přihlásit (FreshRSS bookmark)',
 		'import_export' => 'Import / export',	// TODO - Translation
@@ -117,7 +117,7 @@ return array(
 	),
 	'title' => array(
 		'_' => 'Správa subskripcí',
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'add_tag' => 'Add a tag',	// TODO - Translation
diff --git a/app/i18n/cz/user.php b/app/i18n/cz/user.php
index 32614cc36..7816efcbc 100644
--- a/app/i18n/cz/user.php
+++ b/app/i18n/cz/user.php
@@ -3,19 +3,19 @@
 return array(
 	'email' => array(
 		'feedback' => array(
-			'invalid' => 'The email address is invalid.',	// TODO - Translation
-			'required' => 'The email address is required.',	// TODO - Translation
+			'invalid' => 'This email address is invalid.',	// TODO - Translation
+			'required' => 'An email address is required.',	// TODO - Translation
 		),
 		'validation' => array(
 			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.',	// TODO - Translation
-			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.',	// TODO - Translation
+			'email_sent_to' => 'We sent you an email at <strong>%s</strong>. Please follow its instructions to validate your address.',	// TODO - Translation
 			'feedback' => array(
-				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.',	// TODO - Translation
+				'email_failed' => 'We couldn’t send you an email because of a server configuration error.',	// TODO - Translation
 				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
-				'error' => 'The email address failed to be validated.',	// TODO - Translation
-				'ok' => 'The email address has been validated.',	// TODO - Translation
-				'unneccessary' => 'The email address was already validated.',	// TODO - Translation
-				'wrong_token' => 'The email address failed to be validated due to a wrong token.',	// TODO - Translation
+				'error' => 'Email address validation failed.',	// TODO - Translation
+				'ok' => 'This email address has been validated.',	// TODO - Translation
+				'unneccessary' => 'This email address was already validated.',	// TODO - Translation
+				'wrong_token' => 'This email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
 			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
 			'resend_email' => 'Resend the email',	// TODO - Translation
@@ -24,7 +24,7 @@ return array(
 	),
 	'mailer' => array(
 		'email_need_validation' => array(
-			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:',	// TODO - Translation
+			'body' => 'You’ve just registered on %s, but you still need to validate your email address. For that, just follow the link:',	// TODO - Translation
 			'title' => 'You need to validate your account',	// TODO - Translation
 			'welcome' => 'Welcome %s,',	// TODO - Translation
 		),
@@ -38,7 +38,7 @@ return array(
 		),
 	),
 	'username' => array(
-		'invalid' => 'The username is invalid.',	// TODO - Translation
-		'taken' => 'The username %s is taken.',	// TODO - Translation
+		'invalid' => 'This username is invalid.',	// TODO - Translation
+		'taken' => 'This username, %s, is taken.',	// TODO - Translation
 	),
 );
diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php
index 86a73bd2c..d205a6301 100644
--- a/app/i18n/de/conf.php
+++ b/app/i18n/de/conf.php
@@ -98,7 +98,7 @@ return array(
 	'reading' => array(
 		'_' => 'Lesen',
 		'after_onread' => 'Nach „Alle als gelesen markieren“,',
-		'always_show_favorites' => 'Show all articles in favorites by default',	// TODO - Translation
+		'always_show_favorites' => 'Show all articles in favourites by default',	// TODO - Translation
 		'articles_per_page' => 'Anzahl der Artikel pro Seite',
 		'auto_load_more' => 'Die nächsten Artikel am Seitenende laden',
 		'auto_remove_article' => 'Artikel nach dem Lesen verstecken',
diff --git a/app/i18n/de/feedback.php b/app/i18n/de/feedback.php
index e0c1db9b0..501f51fcd 100644
--- a/app/i18n/de/feedback.php
+++ b/app/i18n/de/feedback.php
@@ -101,7 +101,7 @@ return array(
 			'selector_preview' => array(
 				'http_error' => 'Failed to load website content.',	// TODO - Translation
 				'no_entries' => 'There are no articles in this feed. You need at least one article to create a preview.',	// TODO - Translation
-				'no_feed' => 'Internal error (feed can’t be found).',	// TODO - Translation
+				'no_feed' => 'Internal error (feed cannot be found).',	// TODO - Translation
 				'no_result' => 'The selector didn\'t match anything. As a fallback the original feed text will be displayed instead.',	// TODO - Translation
 				'selector_empty' => 'The selector is empty. You need to define one to create a preview.',	// TODO - Translation
 			),
diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php
index f337e46d5..7cad7fbb9 100644
--- a/app/i18n/de/sub.php
+++ b/app/i18n/de/sub.php
@@ -102,7 +102,7 @@ return array(
 		'title' => 'Importieren / Exportieren',
 	),
 	'menu' => array(
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'bookmark' => 'Abonnieren (FreshRSS-Lesezeichen)',
 		'import_export' => 'Importieren / Exportieren',
@@ -117,7 +117,7 @@ return array(
 	),
 	'title' => array(
 		'_' => 'Abonnementverwaltung',
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'add_tag' => 'Add a tag',	// TODO - Translation
diff --git a/app/i18n/de/user.php b/app/i18n/de/user.php
index d9bfb3db2..36bc55dac 100644
--- a/app/i18n/de/user.php
+++ b/app/i18n/de/user.php
@@ -38,7 +38,7 @@ return array(
 		),
 	),
 	'username' => array(
-		'invalid' => 'The username is invalid.',	// TODO - Translation
-		'taken' => 'The username %s is taken.',	// TODO - Translation
+		'invalid' => 'This username is invalid.',	// TODO - Translation
+		'taken' => 'This username, %s, is taken.',	// TODO - Translation
 	),
 );
diff --git a/app/i18n/en-us/user.php b/app/i18n/en-us/user.php
index 1189029c7..9330a13c6 100644
--- a/app/i18n/en-us/user.php
+++ b/app/i18n/en-us/user.php
@@ -8,11 +8,11 @@ return array(
 		),
 		'validation' => array(
 			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.',
-			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its instructions to validate your address.',
+			'email_sent_to' => 'We sent you an email at <strong>%s</strong>. Please follow its instructions to validate your address.',
 			'feedback' => array(
 				'email_failed' => 'We couldn’t send you an email because of a server configuration error.',
 				'email_sent' => 'An email has been sent to your address.',
-				'error' => 'This email address validation failed.',
+				'error' => 'Email address validation failed.',
 				'ok' => 'This email address has been validated.',
 				'unneccessary' => 'This email address was already validated.',
 				'wrong_token' => 'This email address failed to be validated due to a wrong token.',
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index b4aef304f..7983495d1 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -2,7 +2,7 @@
 
 return array(
 	'auth' => array(
-		'allow_anonymous' => 'Allow anonymous reading of the articles of the default user (%s)',
+		'allow_anonymous' => 'Allow anonymous reading of the default user\'s articles (%s)',
 		'allow_anonymous_refresh' => 'Allow anonymous refresh of the articles',
 		'api_enabled' => 'Allow <abbr>API</abbr> access <small>(required for mobile apps)</small>',
 		'form' => 'Web form (traditional, requires JavaScript)',
@@ -17,16 +17,16 @@ return array(
 	),
 	'check_install' => array(
 		'cache' => array(
-			'nok' => 'Check permissions on <em>./data/cache</em> directory. HTTP server must have rights to write into',
-			'ok' => 'Permissions on cache directory are good.',
+			'nok' => 'Check permissions on <em>./data/cache</em> directory. HTTP server must have write permission.',
+			'ok' => 'Permissions on the cache directory are good.',
 		),
 		'categories' => array(
 			'nok' => 'Category table is improperly configured.',
-			'ok' => 'Category table is ok.',
+			'ok' => 'Category table is okay.',
 		),
 		'connection' => array(
 			'nok' => 'Connection to the database cannot be established.',
-			'ok' => 'Connection to the database is ok.',
+			'ok' => 'Connection to the database is okay.',
 		),
 		'ctype' => array(
 			'nok' => 'Cannot find a required library for character type checking (php-ctype).',
@@ -37,8 +37,8 @@ return array(
 			'ok' => 'You have the cURL library.',
 		),
 		'data' => array(
-			'nok' => 'Check permissions on <em>./data</em> directory. HTTP server must have rights to write into',
-			'ok' => 'Permissions on data directory are good.',
+			'nok' => 'Check permissions on <em>./data</em> directory. HTTP server must have write permission.',
+			'ok' => 'Permissions on the data directory are good.',
 		),
 		'database' => 'Database installation',
 		'dom' => array(
@@ -47,15 +47,15 @@ return array(
 		),
 		'entries' => array(
 			'nok' => 'Entry table is improperly configured.',
-			'ok' => 'Entry table is ok.',
+			'ok' => 'Entry table is okay.',
 		),
 		'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.',
+			'nok' => 'Check permissions on <em>./data/favicons</em> directory. HTTP server must have write permission.',
+			'ok' => 'Permissions on the favicons directory are good.',
 		),
 		'feeds' => array(
 			'nok' => 'Feed table is improperly configured.',
-			'ok' => 'Feed table is ok.',
+			'ok' => 'Feed table is okay.',
 		),
 		'fileinfo' => array(
 			'nok' => 'Cannot find the PHP fileinfo library (fileinfo package).',
@@ -64,11 +64,11 @@ return array(
 		'files' => 'File installation',
 		'json' => array(
 			'nok' => 'Cannot find JSON (php-json package).',
-			'ok' => 'You have JSON extension.',
+			'ok' => 'You have the JSON extension.',
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',
-			'ok' => 'You have the recommended library mbstring for Unicode.',
+			'nok' => 'Cannot find the recommended mbstring library for Unicode.',
+			'ok' => 'You have the recommended mbstring library for Unicode.',
 		),
 		'minz' => array(
 			'nok' => 'Cannot find the Minz framework.',
@@ -85,24 +85,24 @@ return array(
 		'php' => array(
 			'_' => 'PHP installation',
 			'nok' => 'Your PHP version is %s but FreshRSS requires at least version %s.',
-			'ok' => 'Your PHP version is %s, which is compatible with FreshRSS.',
+			'ok' => 'Your PHP version (%s) is compatible with FreshRSS.',
 		),
 		'tables' => array(
 			'nok' => 'There are one or more missing tables in the database.',
 			'ok' => 'The appropriate tables exist in the database.',
 		),
-		'title' => 'Installation checking',
+		'title' => 'Installation check',
 		'tokens' => array(
-			'nok' => 'Check permissions on <em>./data/tokens</em> directory. HTTP server must have rights to write into',
-			'ok' => 'Permissions on tokens directory are good.',
+			'nok' => 'Check permissions on <em>./data/tokens</em> directory. HTTP server must have write permission',
+			'ok' => 'Permissions on the tokens directory are good.',
 		),
 		'users' => array(
-			'nok' => 'Check permissions on <em>./data/users</em> directory. HTTP server must have rights to write into',
-			'ok' => 'Permissions on users directory are good.',
+			'nok' => 'Check permissions on <em>./data/users</em> directory. HTTP server must have write permission',
+			'ok' => 'Permissions on the users directory are good.',
 		),
 		'zip' => array(
-			'nok' => 'Cannot find ZIP extension (php-zip package).',
-			'ok' => 'You have ZIP extension.',
+			'nok' => 'Cannot find the ZIP extension (php-zip package).',
+			'ok' => 'You have the ZIP extension.',
 		),
 	),
 	'extensions' => array(
@@ -117,7 +117,7 @@ return array(
 		'no_configure_view' => 'This extension cannot be configured.',
 		'system' => array(
 			'_' => 'System extensions',
-			'no_rights' => 'System extension (you have no rights on it)',
+			'no_rights' => 'System extension (you do not have the required permissions)',
 		),
 		'title' => 'Extensions',
 		'update' => 'Update available',
@@ -145,7 +145,7 @@ return array(
 			'main' => 'Main statistics',
 			'repartition' => 'Articles repartition',
 		),
-		'no_idle' => 'There is no idle feed!',
+		'no_idle' => 'There are no idle feeds!',
 		'number_entries' => '%d articles',
 		'percent_of_total' => '%% of total',
 		'repartition' => 'Articles repartition',
@@ -163,10 +163,10 @@ return array(
 			'help' => 'in seconds',
 			'number' => 'Duration to keep logged in',
 		),
-		'force_email_validation' => 'Force email addresses validation',
+		'force_email_validation' => 'Force email address validation',
 		'instance-name' => 'Instance name',
-		'max-categories' => 'Categories per user limit',
-		'max-feeds' => 'Feeds per user limit',
+		'max-categories' => 'Max number of categories per user',
+		'max-feeds' => 'Max number of feeds per user',
 		'registration' => array(
 			'help' => '0 means that there is no account limit',
 			'number' => 'Max number of accounts',
diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index 7b06b26b3..b3e8750db 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -5,16 +5,16 @@ return array(
 		'_' => 'Archiving',
 		'delete_after' => 'Remove articles after',
 		'exception' => 'Purge exception',
-		'help' => 'More options are available in the individual feed settings',
+		'help' => 'More options are available in the individual feed\'s settings',
 		'keep_favourites' => 'Never delete favourites',
 		'keep_labels' => 'Never delete labels',
 		'keep_max' => 'Maximum number of articles to keep',
-		'keep_min_by_feed' => 'Minimum number of articles to keep by feed',
+		'keep_min_by_feed' => 'Minimum number of articles to keep per feed',
 		'keep_period' => 'Maximum age of articles to keep',
-		'keep_unreads' => 'Never delete unreads',
+		'keep_unreads' => 'Never delete unread articles',
 		'maintenance' => 'Maintenance',
-		'optimize' => 'Optimise database',
-		'optimize_help' => 'Do occasionally to reduce the size of the database',
+		'optimize' => 'Optimize database',
+		'optimize_help' => 'Run occasionally to reduce the size of the database',
 		'policy' => 'Purge policy',
 		'policy_warning' => 'If no purge policy is selected, every article will be kept.',
 		'purge_now' => 'Purge now',
@@ -42,10 +42,10 @@ return array(
 		'title' => 'Display',
 		'width' => array(
 			'content' => 'Content width',
-			'large' => 'Large',
+			'large' => 'Wide',
 			'medium' => 'Medium',
-			'no_limit' => 'No limit',
-			'thin' => 'Thin',
+			'no_limit' => 'Full Width',
+			'thin' => 'Narrow',
 		),
 	),
 	'profile' => array(
@@ -98,9 +98,9 @@ return array(
 	'reading' => array(
 		'_' => 'Reading',
 		'after_onread' => 'After “mark all as read”,',
-		'always_show_favorites' => 'Show all articles in favorites by default',
+		'always_show_favorites' => 'Show all articles in favourites by default',
 		'articles_per_page' => 'Number of articles per page',
-		'auto_load_more' => 'Load more articles at the page bottom',
+		'auto_load_more' => 'Load more articles at the bottom of the page',
 		'auto_remove_article' => 'Hide articles after reading',
 		'confirm_enabled' => 'Display a confirmation dialog on “mark all as read” actions',
 		'display_articles_unfolded' => 'Show articles unfolded by default',
@@ -109,13 +109,13 @@ return array(
 		'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
 		'jump_next' => 'jump to next unread sibling (feed or category)',
 		'mark_updated_article_unread' => 'Mark updated articles as unread',
-		'number_divided_when_reader' => 'Divided by 2 in the reading view.',
+		'number_divided_when_reader' => 'Divide 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',
+			'article_open_on_website' => 'when the article is opened on its original website',
+			'article_viewed' => 'when the article is viewed',
 			'scroll' => 'while scrolling',
 			'upon_reception' => 'upon receiving the article',
-			'when' => 'Mark article as read…',
+			'when' => 'Mark an article as read…',
 		),
 		'show' => array(
 			'_' => 'Articles to display',
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index 5bd5469ca..6a0efd902 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -3,7 +3,7 @@
 return array(
 	'access' => array(
 		'denied' => 'You don’t have permission to access this page',
-		'not_found' => 'You are looking for a page which doesn’t exist',
+		'not_found' => 'You are looking for a page that doesn’t exist',
 	),
 	'admin' => array(
 		'optimization_complete' => 'Optimization complete',
@@ -16,7 +16,7 @@ return array(
 	),
 	'auth' => array(
 		'form' => array(
-			'not_set' => 'A problem occurred during authentication system configuration. Please retry later.',
+			'not_set' => 'A problem occurred during authentication system configuration. Please try again later.',
 			'set' => 'Form is now your default authentication system.',
 		),
 		'login' => array(
@@ -29,7 +29,7 @@ return array(
 		'no_password_set' => 'Administrator password hasn’t been set. This feature isn’t available.',
 	),
 	'conf' => array(
-		'error' => 'An error occurred during configuration saving',
+		'error' => 'An error occurred while saving configuration',
 		'query_created' => 'Query "%s" has been created.',
 		'shortcuts_updated' => 'Shortcuts have been updated',
 		'updated' => 'Configuration has been updated',
@@ -51,11 +51,11 @@ return array(
 		'removed' => '%s removed',
 	),
 	'import_export' => array(
-		'export_no_zip_extension' => 'ZIP extension is not present on your server. Please try to export files one by one.',
+		'export_no_zip_extension' => 'The 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',
 		'file_cannot_be_uploaded' => 'File cannot be uploaded!',
-		'no_zip_extension' => 'ZIP extension is not present on your server.',
+		'no_zip_extension' => 'The ZIP extension is not present on your server.',
 		'zip_error' => 'An error occurred during ZIP import.',
 	),
 	'profile' => array(
@@ -93,7 +93,7 @@ return array(
 			'invalid_url' => 'URL <em>%s</em> is invalid',
 			'n_actualized' => '%d feeds have been updated',
 			'n_entries_deleted' => '%d articles have been deleted',
-			'no_refresh' => 'There is no feed to refresh…',
+			'no_refresh' => 'There are no feeds to refresh',
 			'not_added' => '<em>%s</em> could not be added',
 			'not_found' => 'Feed cannot be found',
 			'over_max' => 'You have reached your limit of feeds (%d)',
@@ -101,7 +101,7 @@ return array(
 			'selector_preview' => array(
 				'http_error' => 'Failed to load website content.',
 				'no_entries' => 'There are no articles in this feed. You need at least one article to create a preview.',
-				'no_feed' => 'Internal error (feed can’t be found).',
+				'no_feed' => 'Internal error (feed cannot be found).',
 				'no_result' => 'The selector didn\'t match anything. As a fallback the original feed text will be displayed instead.',
 				'selector_empty' => 'The selector is empty. You need to define one to create a preview.',
 			),
@@ -112,8 +112,8 @@ 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' => '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!',
+		'file_is_nok' => 'New <strong>version %s</strong> available, but check permissions on <em>%s</em> directory. HTTP server must have have write permission',
+		'finished' => 'Update complete!',
 		'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 25cb0a977..f94148fd6 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -120,10 +120,10 @@ return array(
 		'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.',
+			'request_failed' => 'A request has failed, it may have been caused by internet connection problems.',
 			'title_new_articles' => 'FreshRSS: new articles!',
 		),
-		'new_article' => 'There are new available articles, click to refresh the page.',
+		'new_article' => 'There are new articles available, click to refresh the page.',
 		'should_be_activated' => 'JavaScript must be enabled',
 	),
 	'lang' => array(
@@ -149,7 +149,7 @@ return array(
 		'admin' => 'Administration',
 		'archiving' => 'Archiving',
 		'authentication' => 'Authentication',
-		'check_install' => 'Installation checking',
+		'check_install' => 'Installation check',
 		'configuration' => 'Configuration',
 		'display' => 'Display',
 		'extensions' => 'Extensions',
@@ -210,7 +210,7 @@ return array(
 		'default_category' => 'Uncategorized',
 		'no' => 'No',
 		'not_applicable' => 'Not available',
-		'ok' => 'Ok!',
+		'ok' => 'Okay!',
 		'or' => 'or',
 		'yes' => 'Yes',
 	),
diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php
index c90683755..04a865ee0 100644
--- a/app/i18n/en/index.php
+++ b/app/i18n/en/index.php
@@ -4,7 +4,7 @@ return array(
 	'about' => array(
 		'_' => 'About',
 		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
-		'bugs_reports' => 'Bugs reports',
+		'bugs_reports' => 'Bug reports',
 		'credits' => 'Credits',
 		'credits_content' => 'Some design elements come from <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> although FreshRSS doesn’t use this framework. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> come from <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police has been created by <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS is based on <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, a PHP framework.',
 		'freshrss_description' => 'FreshRSS is a RSS feeds aggregator to self-host like <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> or <a href="https://github.com/LeedRSS/Leed">Leed</a>. It is light and easy to take in hand while being powerful and configurable tool.',
@@ -16,8 +16,8 @@ return array(
 		'website' => 'Website',
 	),
 	'feed' => array(
-		'add' => 'You may add some feeds.',
-		'empty' => 'There is no article to show.',
+		'add' => 'Please add some feeds.',
+		'empty' => 'There are no articles to show.',
 		'rss_of' => 'RSS feed of %s',
 		'title' => 'Your RSS feeds',
 		'title_fav' => 'Your favourites',
@@ -32,8 +32,8 @@ return array(
 	'menu' => array(
 		'about' => 'About FreshRSS',
 		'add_query' => 'Add a query',
-		'before_one_day' => 'Before one day',
-		'before_one_week' => 'Before one week',
+		'before_one_day' => 'Older than one day',
+		'before_one_week' => 'Older than one week',
 		'favorites' => 'Favourites (%s)',
 		'global_view' => 'Global view',
 		'main_stream' => 'Main stream',
@@ -52,7 +52,7 @@ return array(
 		'search_short' => 'Search',
 		'starred' => 'Show favourites',
 		'stats' => 'Statistics',
-		'subscription' => 'Subscriptions management',
+		'subscription' => 'Subscription management',
 		'tags' => 'My labels',
 		'unread' => 'Show unread',
 	),
diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
index 8c2fd9523..048774a1e 100644
--- a/app/i18n/en/install.php
+++ b/app/i18n/en/install.php
@@ -3,7 +3,7 @@
 return array(
 	'action' => array(
 		'finish' => 'Complete installation',
-		'fix_errors_before' => 'Please fix errors before skipping to the next step.',
+		'fix_errors_before' => 'Please all fix errors before continuing to the next step.',
 		'keep_install' => 'Keep previous configuration',
 		'next_step' => 'Go to the next step',
 		'reinstall' => 'Reinstall FreshRSS',
@@ -20,7 +20,7 @@ return array(
 		'_' => 'Database',
 		'conf' => array(
 			'_' => 'Database configuration',
-			'ko' => 'Verify your database information.',
+			'ko' => 'Verify your database configuration.',
 			'ok' => 'Database configuration has been saved.',
 		),
 		'host' => 'Host',
@@ -33,11 +33,11 @@ return array(
 		'_' => 'Checks',
 		'already_installed' => 'We have detected that FreshRSS is already installed!',
 		'cache' => array(
-			'nok' => 'Check permissions on <em>./data/cache</em> directory. HTTP server must have rights to write into',
-			'ok' => 'Permissions on cache directory are good.',
+			'nok' => 'Check permissions on the <em>./data/cache</em> directory. The HTTP server must have write permission.',
+			'ok' => 'Permissions on the cache directory are good.',
 		),
 		'ctype' => array(
-			'nok' => 'Cannot find a required library for character type checking (php-ctype).',
+			'nok' => 'Cannot find the required library for character type checking (php-ctype).',
 			'ok' => 'You have the required library for character type checking (ctype).',
 		),
 		'curl' => array(
@@ -45,16 +45,16 @@ return array(
 			'ok' => 'You have the cURL library.',
 		),
 		'data' => array(
-			'nok' => 'Check permissions on <em>./data</em> directory. HTTP server must have rights to write into',
-			'ok' => 'Permissions on data directory are good.',
+			'nok' => 'Check permissions on the <em>./data</em> directory. The HTTP server must have write permission.',
+			'ok' => 'Permissions on the data directory are good.',
 		),
 		'dom' => array(
-			'nok' => 'Cannot find a required library to browse the DOM.',
+			'nok' => 'Cannot find the required library to browse the DOM.',
 			'ok' => 'You have the required library to browse the DOM.',
 		),
 		'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.',
+			'nok' => 'Check permissions on the <em>./data/favicons</em> directory. The HTTP server must have write permission.',
+			'ok' => 'Permissions on the favicons directory are good.',
 		),
 		'fileinfo' => array(
 			'nok' => 'Cannot find the PHP fileinfo library (fileinfo package).',
@@ -65,8 +65,8 @@ return array(
 			'ok' => 'Your HTTP REFERER is known and corresponds to your server.',
 		),
 		'json' => array(
-			'nok' => 'Cannot find a recommended library to parse JSON.',
-			'ok' => 'You have a recommended library to parse JSON.',
+			'nok' => 'Cannot find the recommended library to parse JSON.',
+			'ok' => 'You have the recommended library to parse JSON.',
 		),
 		'mbstring' => array(
 			'nok' => 'Cannot find the recommended library mbstring for Unicode.',
@@ -77,7 +77,7 @@ return array(
 			'ok' => 'You have the Minz framework.',
 		),
 		'pcre' => array(
-			'nok' => 'Cannot find a required library for regular expressions (php-pcre).',
+			'nok' => 'Cannot find the required library for regular expressions (php-pcre).',
 			'ok' => 'You have the required library for regular expressions (PCRE).',
 		),
 		'pdo' => array(
@@ -85,12 +85,12 @@ return array(
 			'ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
-			'nok' => 'Your PHP version is %s but FreshRSS requires at least version %s.',
-			'ok' => 'Your PHP version is %s, which is compatible with FreshRSS.',
+			'nok' => 'Your PHP version is %s, but FreshRSS requires at least version %s.',
+			'ok' => 'Your PHP version, %s, is compatible with FreshRSS.',
 		),
 		'users' => array(
-			'nok' => 'Check permissions on <em>./data/users</em> directory. HTTP server must have rights to write into',
-			'ok' => 'Permissions on users directory are good.',
+			'nok' => 'Check permissions on the <em>./data/users</em> directory. The HTTP server must have write permissions',
+			'ok' => 'Permissions on the users directory are good.',
 		),
 		'xml' => array(
 			'nok' => 'Cannot find the required library to parse XML.',
@@ -104,7 +104,7 @@ return array(
 	'congratulations' => 'Congratulations!',
 	'default_user' => 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
 	'delete_articles_after' => 'Remove articles after',
-	'fix_errors_before' => 'Please fix errors before skipping to the next step.',
+	'fix_errors_before' => 'Please fix errors before continuing to the next step.',
 	'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
 	'js' => array(
 		'confirm_reinstall' => 'You will lose your previous configuration by reinstalling FreshRSS. Are you sure you want to continue?',
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index 7dee8e8ab..27fc8be36 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -7,7 +7,7 @@ return array(
 		'title' => 'API',
 	),
 	'bookmarklet' => array(
-		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click the "Subscribe" button in any page you want to subscribe to.',
 		'label' => 'Subscribe',
 		'title' => 'Bookmarklet',
 	),
@@ -67,17 +67,17 @@ return array(
 		),
 		'show' => array(
 			'all' => 'Show all feeds',
-			'error' => 'Show only feeds with error',
+			'error' => 'Show only feeds with errors',
 		),
 		'showing' => array(
-			'error' => 'Showing only feeds with error',
+			'error' => 'Showing only feeds with errors',
 		),
 		'ssl_verify' => 'Verify SSL security',
 		'stats' => 'Statistics',
 		'think_to_add' => 'You may add some feeds.',
 		'timeout' => 'Timeout in seconds',
 		'title' => 'Title',
-		'title_add' => 'Add a RSS feed',
+		'title_add' => 'Add an RSS feed',
 		'ttl' => 'Do not automatically refresh more often than',
 		'url' => 'Feed URL',
 		'validator' => 'Check the validity of the feed',
@@ -102,11 +102,11 @@ return array(
 		'title' => 'Import / export',
 	),
 	'menu' => array(
-		'add' => 'Add a feed/a category',
+		'add' => 'Add a feed or category',
 		'add_feed' => 'Add a feed',
 		'bookmark' => 'Subscribe (FreshRSS bookmark)',
 		'import_export' => 'Import / export',
-		'subscription_management' => 'Subscriptions management',
+		'subscription_management' => 'Subscription management',
 		'subscription_tools' => 'Subscription tools',
 		'tag_management' => 'Tag management',
 	),
@@ -116,8 +116,8 @@ return array(
 		'old_name' => 'Old name',
 	),
 	'title' => array(
-		'_' => 'Subscriptions management',
-		'add' => 'Add a feed/a category',
+		'_' => 'Subscription management',
+		'add' => 'Add a feed or category',
 		'add_category' => 'Add a category',
 		'add_feed' => 'Add a feed',
 		'add_tag' => 'Add a tag',
diff --git a/app/i18n/en/user.php b/app/i18n/en/user.php
index fe8e2aa7c..9330a13c6 100644
--- a/app/i18n/en/user.php
+++ b/app/i18n/en/user.php
@@ -3,19 +3,19 @@
 return array(
 	'email' => array(
 		'feedback' => array(
-			'invalid' => 'The email address is invalid.',
-			'required' => 'The email address is required.',
+			'invalid' => 'This email address is invalid.',
+			'required' => 'An email address is required.',
 		),
 		'validation' => array(
 			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.',
-			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.',
+			'email_sent_to' => 'We sent you an email at <strong>%s</strong>. Please follow its instructions to validate your address.',
 			'feedback' => array(
-				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.',
+				'email_failed' => 'We couldn’t send you an email because of a server configuration error.',
 				'email_sent' => 'An email has been sent to your address.',
-				'error' => 'The email address failed to be validated.',
-				'ok' => 'The email address has been validated.',
-				'unneccessary' => 'The email address was already validated.',
-				'wrong_token' => 'The email address failed to be validated due to a wrong token.',
+				'error' => 'Email address validation failed.',
+				'ok' => 'This email address has been validated.',
+				'unneccessary' => 'This email address was already validated.',
+				'wrong_token' => 'This email address failed to be validated due to a wrong token.',
 			),
 			'need_to' => 'You need to validate your email address before being able to use %s.',
 			'resend_email' => 'Resend the email',
@@ -24,7 +24,7 @@ return array(
 	),
 	'mailer' => array(
 		'email_need_validation' => array(
-			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:',
+			'body' => 'You’ve just registered on %s, but you still need to validate your email address. For that, just follow the link:',
 			'title' => 'You need to validate your account',
 			'welcome' => 'Welcome %s,',
 		),
@@ -38,7 +38,7 @@ return array(
 		),
 	),
 	'username' => array(
-		'invalid' => 'The username is invalid.',
-		'taken' => 'The username %s is taken.',
+		'invalid' => 'This username is invalid.',
+		'taken' => 'This username, %s, is taken.',
 	),
 );
diff --git a/app/i18n/es/admin.php b/app/i18n/es/admin.php
index 1916ffc4a..752294e08 100755
--- a/app/i18n/es/admin.php
+++ b/app/i18n/es/admin.php
@@ -67,8 +67,8 @@ return array(
 			'ok' => 'Dispones de la extensión JSON.',
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	// TODO - Translation
-			'ok' => 'You have the recommended library mbstring for Unicode.',	// TODO - Translation
+			'nok' => 'Cannot find the recommended mbstring library for Unicode.',	// TODO - Translation
+			'ok' => 'You have the recommended mbstring library for Unicode.',	// TODO - Translation
 		),
 		'minz' => array(
 			'nok' => 'No se ha podido localizar el entorno Minz.',
@@ -163,7 +163,7 @@ return array(
 			'help' => 'in seconds',	// TODO - Translation
 			'number' => 'Duration to keep logged in',	// TODO - Translation
 		),
-		'force_email_validation' => 'Force email addresses validation',	// TODO - Translation
+		'force_email_validation' => 'Force email address validation',	// TODO - Translation
 		'instance-name' => 'Nombre de la fuente',
 		'max-categories' => 'Límite de categorías por usuario',
 		'max-feeds' => 'Límite de fuentes por usuario',
diff --git a/app/i18n/es/conf.php b/app/i18n/es/conf.php
index 2540c9728..28076f9a7 100755
--- a/app/i18n/es/conf.php
+++ b/app/i18n/es/conf.php
@@ -11,7 +11,7 @@ return array(
 		'keep_max' => 'Maximum number of articles to keep',	// TODO - Translation
 		'keep_min_by_feed' => 'Número mínimo de artículos a conservar por fuente',
 		'keep_period' => 'Maximum age of articles to keep',	// TODO - Translation
-		'keep_unreads' => 'Never delete unreads',	// TODO - Translation
+		'keep_unreads' => 'Never delete unread articles',	// TODO - Translation
 		'maintenance' => 'Maintenance',	// TODO - Translation
 		'optimize' => 'Optimizar la base de datos',
 		'optimize_help' => 'Ejecuta la optimización de vez en cuando para reducir el tamaño de la base de datos',
@@ -98,7 +98,7 @@ return array(
 	'reading' => array(
 		'_' => 'Lectura',
 		'after_onread' => 'Tras “marcar todo como leído”,',
-		'always_show_favorites' => 'Show all articles in favorites by default',	// TODO - Translation
+		'always_show_favorites' => 'Show all articles in favourites by default',	// TODO - Translation
 		'articles_per_page' => 'Número de artículos por página',
 		'auto_load_more' => 'Cargar más artículos al final de la página',
 		'auto_remove_article' => 'Ocultar artículos tras la lectura',
diff --git a/app/i18n/es/feedback.php b/app/i18n/es/feedback.php
index b0e76fc46..358c954de 100755
--- a/app/i18n/es/feedback.php
+++ b/app/i18n/es/feedback.php
@@ -101,7 +101,7 @@ return array(
 			'selector_preview' => array(
 				'http_error' => 'Failed to load website content.',	// TODO - Translation
 				'no_entries' => 'There are no articles in this feed. You need at least one article to create a preview.',	// TODO - Translation
-				'no_feed' => 'Internal error (feed can’t be found).',	// TODO - Translation
+				'no_feed' => 'Internal error (feed cannot be found).',	// TODO - Translation
 				'no_result' => 'The selector didn\'t match anything. As a fallback the original feed text will be displayed instead.',	// TODO - Translation
 				'selector_empty' => 'The selector is empty. You need to define one to create a preview.',	// TODO - Translation
 			),
diff --git a/app/i18n/es/sub.php b/app/i18n/es/sub.php
index accc7b170..8003b8c7d 100755
--- a/app/i18n/es/sub.php
+++ b/app/i18n/es/sub.php
@@ -7,7 +7,7 @@ return array(
 		'title' => 'API',	// TODO - Translation
 	),
 	'bookmarklet' => array(
-		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',	// TODO - Translation
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click the "Subscribe" button in any page you want to subscribe to.',	// TODO - Translation
 		'label' => 'Subscribe',	// TODO - Translation
 		'title' => 'Bookmarklet',	// TODO - Translation
 	),
@@ -67,10 +67,10 @@ return array(
 		),
 		'show' => array(
 			'all' => 'Show all feeds',	// TODO - Translation
-			'error' => 'Show only feeds with error',	// TODO - Translation
+			'error' => 'Show only feeds with errors',	// TODO - Translation
 		),
 		'showing' => array(
-			'error' => 'Showing only feeds with error',	// TODO - Translation
+			'error' => 'Showing only feeds with errors',	// TODO - Translation
 		),
 		'ssl_verify' => 'Verify SSL security',	// TODO - Translation
 		'stats' => 'Estadísticas',
@@ -102,7 +102,7 @@ return array(
 		'title' => 'Importar / exportar',
 	),
 	'menu' => array(
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'bookmark' => 'Suscribirse (favorito FreshRSS)',
 		'import_export' => 'Importar / exportar',
@@ -117,7 +117,7 @@ return array(
 	),
 	'title' => array(
 		'_' => 'Administración de suscripciones',
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'add_tag' => 'Add a tag',	// TODO - Translation
diff --git a/app/i18n/es/user.php b/app/i18n/es/user.php
index 32614cc36..7816efcbc 100644
--- a/app/i18n/es/user.php
+++ b/app/i18n/es/user.php
@@ -3,19 +3,19 @@
 return array(
 	'email' => array(
 		'feedback' => array(
-			'invalid' => 'The email address is invalid.',	// TODO - Translation
-			'required' => 'The email address is required.',	// TODO - Translation
+			'invalid' => 'This email address is invalid.',	// TODO - Translation
+			'required' => 'An email address is required.',	// TODO - Translation
 		),
 		'validation' => array(
 			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.',	// TODO - Translation
-			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.',	// TODO - Translation
+			'email_sent_to' => 'We sent you an email at <strong>%s</strong>. Please follow its instructions to validate your address.',	// TODO - Translation
 			'feedback' => array(
-				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.',	// TODO - Translation
+				'email_failed' => 'We couldn’t send you an email because of a server configuration error.',	// TODO - Translation
 				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
-				'error' => 'The email address failed to be validated.',	// TODO - Translation
-				'ok' => 'The email address has been validated.',	// TODO - Translation
-				'unneccessary' => 'The email address was already validated.',	// TODO - Translation
-				'wrong_token' => 'The email address failed to be validated due to a wrong token.',	// TODO - Translation
+				'error' => 'Email address validation failed.',	// TODO - Translation
+				'ok' => 'This email address has been validated.',	// TODO - Translation
+				'unneccessary' => 'This email address was already validated.',	// TODO - Translation
+				'wrong_token' => 'This email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
 			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
 			'resend_email' => 'Resend the email',	// TODO - Translation
@@ -24,7 +24,7 @@ return array(
 	),
 	'mailer' => array(
 		'email_need_validation' => array(
-			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:',	// TODO - Translation
+			'body' => 'You’ve just registered on %s, but you still need to validate your email address. For that, just follow the link:',	// TODO - Translation
 			'title' => 'You need to validate your account',	// TODO - Translation
 			'welcome' => 'Welcome %s,',	// TODO - Translation
 		),
@@ -38,7 +38,7 @@ return array(
 		),
 	),
 	'username' => array(
-		'invalid' => 'The username is invalid.',	// TODO - Translation
-		'taken' => 'The username %s is taken.',	// TODO - Translation
+		'invalid' => 'This username is invalid.',	// TODO - Translation
+		'taken' => 'This username, %s, is taken.',	// TODO - Translation
 	),
 );
diff --git a/app/i18n/he/admin.php b/app/i18n/he/admin.php
index f33ffab67..2c814be55 100644
--- a/app/i18n/he/admin.php
+++ b/app/i18n/he/admin.php
@@ -22,11 +22,11 @@ return array(
 		),
 		'categories' => array(
 			'nok' => 'Category table is bad configured.',
-			'ok' => 'Category table is ok.',	// TODO - Translation
+			'ok' => 'Category table is okay.',	// TODO - Translation
 		),
 		'connection' => array(
 			'nok' => 'Connection to the database cannot being established.',
-			'ok' => 'Connection to the database is ok.',	// TODO - Translation
+			'ok' => 'Connection to the database is okay.',	// TODO - Translation
 		),
 		'ctype' => array(
 			'nok' => 'הספרייה הנדרשת ל character type checking (php-ctype) אינה מותקנת',
@@ -46,16 +46,16 @@ return array(
 			'ok' => 'הספרייה הנדרשת לסיור ב DOM מותקנת',
 		),
 		'entries' => array(
-			'nok' => 'Entry table is bad configured.',
-			'ok' => 'Entry table is ok.',	// TODO - Translation
+			'nok' => 'Entry table is improperly configured.',	// TODO - Translation
+			'ok' => 'Entry table is okay.',	// TODO - Translation
 		),
 		'favicons' => array(
-			'nok' => 'Check permissions on <em>./data/favicons</em> directory. HTTP server must have rights to write into',	// TODO - Translation
+			'nok' => 'Check permissions on <em>./data/favicons</em> directory. HTTP server must have write permission.',	// TODO - Translation
 			'ok' => 'ההרשאות בתיקיית הfavicons תקינות',
 		),
 		'feeds' => array(
 			'nok' => 'Feed table is bad configured.',
-			'ok' => 'Feed table is ok.',	// TODO - Translation
+			'ok' => 'Feed table is okay.',	// TODO - Translation
 		),
 		'fileinfo' => array(
 			'nok' => 'Cannot find the PHP fileinfo library (fileinfo package).',	// TODO - Translation
@@ -64,11 +64,11 @@ return array(
 		'files' => 'File installation',	// TODO - Translation
 		'json' => array(
 			'nok' => 'You lack JSON (php-json package).',
-			'ok' => 'You have JSON extension.',	// TODO - Translation
+			'ok' => 'You have the JSON extension.',	// TODO - Translation
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	// TODO - Translation
-			'ok' => 'You have the recommended library mbstring for Unicode.',	// TODO - Translation
+			'nok' => 'Cannot find the recommended mbstring library for Unicode.',	// TODO - Translation
+			'ok' => 'You have the recommended mbstring library for Unicode.',	// TODO - Translation
 		),
 		'minz' => array(
 			'nok' => 'You lack the Minz framework.',
@@ -91,18 +91,18 @@ return array(
 			'nok' => 'There is one or more lacking tables in the database.',
 			'ok' => 'Tables are existing in the database.',
 		),
-		'title' => 'Installation checking',	// TODO - Translation
+		'title' => 'Installation check',	// TODO - Translation
 		'tokens' => array(
-			'nok' => 'Check permissions on <em>./data/tokens</em> directory. HTTP server must have rights to write into',	// TODO - Translation
-			'ok' => 'Permissions on tokens directory are good.',	// TODO - Translation
+			'nok' => 'Check permissions on <em>./data/tokens</em> directory. HTTP server must have write permission',	// TODO - Translation
+			'ok' => 'Permissions on the tokens directory are good.',	// TODO - Translation
 		),
 		'users' => array(
-			'nok' => 'Check permissions on <em>./data/users</em> directory. HTTP server must have rights to write into',	// TODO - Translation
-			'ok' => 'Permissions on users directory are good.',	// TODO - Translation
+			'nok' => 'Check permissions on <em>./data/users</em> directory. HTTP server must have write permission',	// TODO - Translation
+			'ok' => 'Permissions on the users directory are good.',	// TODO - Translation
 		),
 		'zip' => array(
 			'nok' => 'You lack ZIP extension (php-zip package).',
-			'ok' => 'You have ZIP extension.',	// TODO - Translation
+			'ok' => 'You have the ZIP extension.',	// TODO - Translation
 		),
 	),
 	'extensions' => array(
@@ -117,7 +117,7 @@ return array(
 		'no_configure_view' => 'This extension cannot be configured.',	// TODO - Translation
 		'system' => array(
 			'_' => 'System extensions',	// TODO - Translation
-			'no_rights' => 'System extension (you have no rights on it)',	// TODO - Translation
+			'no_rights' => 'System extension (you do not have the required permissions)',	// TODO - Translation
 		),
 		'title' => 'Extensions',	// TODO - Translation
 		'update' => 'Update available',	// TODO - Translation
@@ -163,10 +163,10 @@ return array(
 			'help' => 'in seconds',	// TODO - Translation
 			'number' => 'Duration to keep logged in',	// TODO - Translation
 		),
-		'force_email_validation' => 'Force email addresses validation',	// TODO - Translation
+		'force_email_validation' => 'Force email address validation',	// TODO - Translation
 		'instance-name' => 'Instance name',	// TODO - Translation
-		'max-categories' => 'Categories per user limit',	// TODO - Translation
-		'max-feeds' => 'Feeds per user limit',	// TODO - Translation
+		'max-categories' => 'Max number of categories per user',	// TODO - Translation
+		'max-feeds' => 'Max number of feeds per user',	// TODO - Translation
 		'registration' => array(
 			'help' => '0 means that there is no account limit',	// TODO - Translation
 			'number' => 'Max number of accounts',	// TODO - Translation
diff --git a/app/i18n/he/conf.php b/app/i18n/he/conf.php
index 4806a8114..3d2e87788 100644
--- a/app/i18n/he/conf.php
+++ b/app/i18n/he/conf.php
@@ -9,9 +9,9 @@ return array(
 		'keep_favourites' => 'Never delete favourites',	// TODO - Translation
 		'keep_labels' => 'Never delete labels',	// TODO - Translation
 		'keep_max' => 'Maximum number of articles to keep',	// TODO - Translation
-		'keep_min_by_feed' => 'Minimum number of articles to keep by feed',	// TODO - Translation
+		'keep_min_by_feed' => 'Minimum number of articles to keep per feed',	// TODO - Translation
 		'keep_period' => 'Maximum age of articles to keep',	// TODO - Translation
-		'keep_unreads' => 'Never delete unreads',	// TODO - Translation
+		'keep_unreads' => 'Never delete unread articles',	// TODO - Translation
 		'maintenance' => 'Maintenance',	// TODO - Translation
 		'optimize' => 'מיטוב בסיס הנתונים',
 		'optimize_help' => 'ביצוע לעיתים קרובות על מנת למטב את בסיס הנתונים',
@@ -98,7 +98,7 @@ return array(
 	'reading' => array(
 		'_' => 'קריאה',
 		'after_onread' => 'לאחר “סימון הכל כנקרא”,',
-		'always_show_favorites' => 'Show all articles in favorites by default',	// TODO - Translation
+		'always_show_favorites' => 'Show all articles in favourites by default',	// TODO - Translation
 		'articles_per_page' => 'מספר המאמרים בעמוד',
 		'auto_load_more' => 'טעינת המאמר הבא סוף העמוד',
 		'auto_remove_article' => 'Hide articles after reading',	// TODO - Translation
diff --git a/app/i18n/he/feedback.php b/app/i18n/he/feedback.php
index be5b74165..05a264f26 100644
--- a/app/i18n/he/feedback.php
+++ b/app/i18n/he/feedback.php
@@ -29,7 +29,7 @@ return array(
 		'no_password_set' => 'לא הוגדרה סיסמת מנהל. תכונה זו אינה זמינה.',
 	),
 	'conf' => array(
-		'error' => 'An error occurred during configuration saving',	// TODO - Translation
+		'error' => 'An error occurred while saving configuration',	// TODO - Translation
 		'query_created' => 'השאילתה "%s" נוצרה.',
 		'shortcuts_updated' => 'קיצורי הדרך עודכנו',
 		'updated' => 'ההגדרות עודכנו',
@@ -101,7 +101,7 @@ return array(
 			'selector_preview' => array(
 				'http_error' => 'Failed to load website content.',	// TODO - Translation
 				'no_entries' => 'There are no articles in this feed. You need at least one article to create a preview.',	// TODO - Translation
-				'no_feed' => 'Internal error (feed can’t be found).',	// TODO - Translation
+				'no_feed' => 'Internal error (feed cannot be found).',	// TODO - Translation
 				'no_result' => 'The selector didn\'t match anything. As a fallback the original feed text will be displayed instead.',	// TODO - Translation
 				'selector_empty' => 'The selector is empty. You need to define one to create a preview.',	// TODO - Translation
 			),
diff --git a/app/i18n/he/gen.php b/app/i18n/he/gen.php
index bfa345b06..86bdf132e 100644
--- a/app/i18n/he/gen.php
+++ b/app/i18n/he/gen.php
@@ -120,7 +120,7 @@ return array(
 		'confirm_action_feed_cat' => 'האם אתם בטוחים שברצוניכם לבצע פעולה זו? מועדפים ושאילתות עשויות לאבוד. אין אפשרות לבטל אותה!',
 		'feedback' => array(
 			'body_new_articles' => 'ישנם	\\d מאמרים חדשים לקרוא ב FreshRSS.',
-			'request_failed' => 'A request has failed, it may have been caused by Internet connection problems.',	// TODO - Translation
+			'request_failed' => 'A request has failed, it may have been caused by internet connection problems.',	// TODO - Translation
 			'title_new_articles' => 'FreshRSS: מאמרים חדשים!',
 		),
 		'new_article' => 'מאמרים חדשים זמינים, לחצו לרענון העמוד.',
@@ -149,7 +149,7 @@ return array(
 		'admin' => 'ניהול',
 		'archiving' => 'ארכוב',
 		'authentication' => 'Authentication',	// TODO - Translation
-		'check_install' => 'Installation checking',	// TODO - Translation
+		'check_install' => 'Installation check',	// TODO - Translation
 		'configuration' => 'הגדרות',
 		'display' => 'תצוגה',
 		'extensions' => 'Extensions',	// TODO - Translation
diff --git a/app/i18n/he/install.php b/app/i18n/he/install.php
index aa23bfb91..f8de459f2 100644
--- a/app/i18n/he/install.php
+++ b/app/i18n/he/install.php
@@ -33,7 +33,7 @@ return array(
 		'_' => 'בדיקות',
 		'already_installed' => 'We have detected that FreshRSS is already installed!',	// TODO - Translation
 		'cache' => array(
-			'nok' => 'Check permissions on <em>./data/cache</em> directory. HTTP server must have rights to write into',	// TODO - Translation
+			'nok' => 'Check permissions on the <em>./data/cache</em> directory. The HTTP server must have write permission.',	// TODO - Translation
 			'ok' => 'ההרשאות בתיקיית המטמון תקינות',
 		),
 		'ctype' => array(
@@ -45,7 +45,7 @@ return array(
 			'ok' => 'יש לכם את גירסת %s של cURL',
 		),
 		'data' => array(
-			'nok' => 'Check permissions on <em>./data</em> directory. HTTP server must have rights to write into',	// TODO - Translation
+			'nok' => 'Check permissions on the <em>./data</em> directory. The HTTP server must have write permission.',	// TODO - Translation
 			'ok' => 'ההרשאות בתיקיית הדאטא תקינות',
 		),
 		'dom' => array(
@@ -53,7 +53,7 @@ return array(
 			'ok' => 'הספרייה הנדרשת לסיור ב DOM מותקנת',
 		),
 		'favicons' => array(
-			'nok' => 'Check permissions on <em>./data/favicons</em> directory. HTTP server must have rights to write into',	// TODO - Translation
+			'nok' => 'Check permissions on the <em>./data/favicons</em> directory. The HTTP server must have write permission.',	// TODO - Translation
 			'ok' => 'ההרשאות בתיקיית הfavicons תקינות',
 		),
 		'fileinfo' => array(
@@ -65,8 +65,8 @@ return array(
 			'ok' => 'הHTTP REFERER ידוע ותאם לשרת שלך.',
 		),
 		'json' => array(
-			'nok' => 'Cannot find a recommended library to parse JSON.',	// TODO - Translation
-			'ok' => 'You have a recommended library to parse JSON.',	// TODO - Translation
+			'nok' => 'Cannot find the recommended library to parse JSON.',	// TODO - Translation
+			'ok' => 'You have the recommended library to parse JSON.',	// TODO - Translation
 		),
 		'mbstring' => array(
 			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	// TODO - Translation
@@ -89,8 +89,8 @@ return array(
 			'ok' => 'גירסת PHP שלכם היא %s, שתואמת ל FreshRSS',
 		),
 		'users' => array(
-			'nok' => 'Check permissions on <em>./data/users</em> directory. HTTP server must have rights to write into',	// TODO - Translation
-			'ok' => 'Permissions on users directory are good.',	// TODO - Translation
+			'nok' => 'Check permissions on the <em>./data/users</em> directory. The HTTP server must have write permissions',	// TODO - Translation
+			'ok' => 'Permissions on the users directory are good.',	// TODO - Translation
 		),
 		'xml' => array(
 			'nok' => 'Cannot find the required library to parse XML.',	// TODO - Translation
diff --git a/app/i18n/he/sub.php b/app/i18n/he/sub.php
index 33972c061..9c563a336 100644
--- a/app/i18n/he/sub.php
+++ b/app/i18n/he/sub.php
@@ -7,7 +7,7 @@ return array(
 		'title' => 'API',	// TODO - Translation
 	),
 	'bookmarklet' => array(
-		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',	// TODO - Translation
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click the "Subscribe" button in any page you want to subscribe to.',	// TODO - Translation
 		'label' => 'Subscribe',	// TODO - Translation
 		'title' => 'Bookmarklet',	// TODO - Translation
 	),
@@ -67,10 +67,10 @@ return array(
 		),
 		'show' => array(
 			'all' => 'Show all feeds',	// TODO - Translation
-			'error' => 'Show only feeds with error',	// TODO - Translation
+			'error' => 'Show only feeds with errors',	// TODO - Translation
 		),
 		'showing' => array(
-			'error' => 'Showing only feeds with error',	// TODO - Translation
+			'error' => 'Showing only feeds with errors',	// TODO - Translation
 		),
 		'ssl_verify' => 'Verify SSL security',	// TODO - Translation
 		'stats' => 'סטטיסטיקות',
@@ -102,7 +102,7 @@ return array(
 		'title' => 'יבוא / יצוא ',
 	),
 	'menu' => array(
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'bookmark' => 'הרשמה (FreshRSS סימניית)',
 		'import_export' => 'יבוא / יצוא ',
@@ -117,7 +117,7 @@ return array(
 	),
 	'title' => array(
 		'_' => 'ניהול הרשמות',
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'add_tag' => 'Add a tag',	// TODO - Translation
diff --git a/app/i18n/he/user.php b/app/i18n/he/user.php
index 32614cc36..7816efcbc 100644
--- a/app/i18n/he/user.php
+++ b/app/i18n/he/user.php
@@ -3,19 +3,19 @@
 return array(
 	'email' => array(
 		'feedback' => array(
-			'invalid' => 'The email address is invalid.',	// TODO - Translation
-			'required' => 'The email address is required.',	// TODO - Translation
+			'invalid' => 'This email address is invalid.',	// TODO - Translation
+			'required' => 'An email address is required.',	// TODO - Translation
 		),
 		'validation' => array(
 			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.',	// TODO - Translation
-			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.',	// TODO - Translation
+			'email_sent_to' => 'We sent you an email at <strong>%s</strong>. Please follow its instructions to validate your address.',	// TODO - Translation
 			'feedback' => array(
-				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.',	// TODO - Translation
+				'email_failed' => 'We couldn’t send you an email because of a server configuration error.',	// TODO - Translation
 				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
-				'error' => 'The email address failed to be validated.',	// TODO - Translation
-				'ok' => 'The email address has been validated.',	// TODO - Translation
-				'unneccessary' => 'The email address was already validated.',	// TODO - Translation
-				'wrong_token' => 'The email address failed to be validated due to a wrong token.',	// TODO - Translation
+				'error' => 'Email address validation failed.',	// TODO - Translation
+				'ok' => 'This email address has been validated.',	// TODO - Translation
+				'unneccessary' => 'This email address was already validated.',	// TODO - Translation
+				'wrong_token' => 'This email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
 			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
 			'resend_email' => 'Resend the email',	// TODO - Translation
@@ -24,7 +24,7 @@ return array(
 	),
 	'mailer' => array(
 		'email_need_validation' => array(
-			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:',	// TODO - Translation
+			'body' => 'You’ve just registered on %s, but you still need to validate your email address. For that, just follow the link:',	// TODO - Translation
 			'title' => 'You need to validate your account',	// TODO - Translation
 			'welcome' => 'Welcome %s,',	// TODO - Translation
 		),
@@ -38,7 +38,7 @@ return array(
 		),
 	),
 	'username' => array(
-		'invalid' => 'The username is invalid.',	// TODO - Translation
-		'taken' => 'The username %s is taken.',	// TODO - Translation
+		'invalid' => 'This username is invalid.',	// TODO - Translation
+		'taken' => 'This username, %s, is taken.',	// TODO - Translation
 	),
 );
diff --git a/app/i18n/it/admin.php b/app/i18n/it/admin.php
index 2a034e837..f2137f331 100644
--- a/app/i18n/it/admin.php
+++ b/app/i18n/it/admin.php
@@ -67,8 +67,8 @@ return array(
 			'ok' => 'Estensione JSON presente.',
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	// TODO - Translation
-			'ok' => 'You have the recommended library mbstring for Unicode.',	// TODO - Translation
+			'nok' => 'Cannot find the recommended mbstring library for Unicode.',	// TODO - Translation
+			'ok' => 'You have the recommended mbstring library for Unicode.',	// TODO - Translation
 		),
 		'minz' => array(
 			'nok' => 'Manca il framework Minz.',
@@ -163,7 +163,7 @@ return array(
 			'help' => 'in seconds',	// TODO - Translation
 			'number' => 'Duration to keep logged in',	// TODO - Translation
 		),
-		'force_email_validation' => 'Force email addresses validation',	// TODO - Translation
+		'force_email_validation' => 'Force email address validation',	// TODO - Translation
 		'instance-name' => 'Nome istanza',
 		'max-categories' => 'Limite categorie per utente',
 		'max-feeds' => 'Limite feeds per utente',
diff --git a/app/i18n/it/conf.php b/app/i18n/it/conf.php
index 4d5f278fb..d3e303b1f 100644
--- a/app/i18n/it/conf.php
+++ b/app/i18n/it/conf.php
@@ -11,7 +11,7 @@ return array(
 		'keep_max' => 'Maximum number of articles to keep',	// TODO - Translation
 		'keep_min_by_feed' => 'Numero minimo di articoli da mantenere per feed',
 		'keep_period' => 'Maximum age of articles to keep',	// TODO - Translation
-		'keep_unreads' => 'Never delete unreads',	// TODO - Translation
+		'keep_unreads' => 'Never delete unread articles',	// TODO - Translation
 		'maintenance' => 'Maintenance',	// TODO - Translation
 		'optimize' => 'Ottimizza database',
 		'optimize_help' => 'Da fare occasionalmente per ridurre le dimensioni del database',
@@ -98,7 +98,7 @@ return array(
 	'reading' => array(
 		'_' => 'Lettura',
 		'after_onread' => 'Dopo “segna tutto come letto”,',
-		'always_show_favorites' => 'Show all articles in favorites by default',	// TODO - Translation
+		'always_show_favorites' => 'Show all articles in favourites by default',	// TODO - Translation
 		'articles_per_page' => 'Numero di articoli per pagina',
 		'auto_load_more' => 'Carica articoli successivi a fondo pagina',
 		'auto_remove_article' => 'Nascondi articoli dopo la lettura',
diff --git a/app/i18n/it/feedback.php b/app/i18n/it/feedback.php
index d9c6cca75..30462f4d6 100644
--- a/app/i18n/it/feedback.php
+++ b/app/i18n/it/feedback.php
@@ -101,7 +101,7 @@ return array(
 			'selector_preview' => array(
 				'http_error' => 'Failed to load website content.',	// TODO - Translation
 				'no_entries' => 'There are no articles in this feed. You need at least one article to create a preview.',	// TODO - Translation
-				'no_feed' => 'Internal error (feed can’t be found).',	// TODO - Translation
+				'no_feed' => 'Internal error (feed cannot be found).',	// TODO - Translation
 				'no_result' => 'The selector didn\'t match anything. As a fallback the original feed text will be displayed instead.',	// TODO - Translation
 				'selector_empty' => 'The selector is empty. You need to define one to create a preview.',	// TODO - Translation
 			),
diff --git a/app/i18n/it/install.php b/app/i18n/it/install.php
index de860a30d..bc55c623a 100644
--- a/app/i18n/it/install.php
+++ b/app/i18n/it/install.php
@@ -66,7 +66,7 @@ return array(
 		),
 		'json' => array(
 			'nok' => 'You lack a recommended library to parse JSON.',
-			'ok' => 'You have a recommended library to parse JSON.',	// TODO - Translation
+			'ok' => 'You have the recommended library to parse JSON.',	// TODO - Translation
 		),
 		'mbstring' => array(
 			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	// TODO - Translation
diff --git a/app/i18n/it/sub.php b/app/i18n/it/sub.php
index e47f6a83d..cbcba647b 100644
--- a/app/i18n/it/sub.php
+++ b/app/i18n/it/sub.php
@@ -7,7 +7,7 @@ return array(
 		'title' => 'API',	// TODO - Translation
 	),
 	'bookmarklet' => array(
-		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',	// TODO - Translation
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click the "Subscribe" button in any page you want to subscribe to.',	// TODO - Translation
 		'label' => 'Subscribe',	// TODO - Translation
 		'title' => 'Bookmarklet',	// TODO - Translation
 	),
@@ -67,10 +67,10 @@ return array(
 		),
 		'show' => array(
 			'all' => 'Show all feeds',	// TODO - Translation
-			'error' => 'Show only feeds with error',	// TODO - Translation
+			'error' => 'Show only feeds with errors',	// TODO - Translation
 		),
 		'showing' => array(
-			'error' => 'Showing only feeds with error',	// TODO - Translation
+			'error' => 'Showing only feeds with errors',	// TODO - Translation
 		),
 		'ssl_verify' => 'Verify SSL security',	// TODO - Translation
 		'stats' => 'Statistiche',
@@ -102,7 +102,7 @@ return array(
 		'title' => 'Importa / esporta',
 	),
 	'menu' => array(
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'bookmark' => 'Bookmark (trascina nei preferiti)',
 		'import_export' => 'Importa / esporta',
@@ -117,7 +117,7 @@ return array(
 	),
 	'title' => array(
 		'_' => 'Gestione sottoscrizioni',
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'add_tag' => 'Add a tag',	// TODO - Translation
diff --git a/app/i18n/it/user.php b/app/i18n/it/user.php
index 32614cc36..7816efcbc 100644
--- a/app/i18n/it/user.php
+++ b/app/i18n/it/user.php
@@ -3,19 +3,19 @@
 return array(
 	'email' => array(
 		'feedback' => array(
-			'invalid' => 'The email address is invalid.',	// TODO - Translation
-			'required' => 'The email address is required.',	// TODO - Translation
+			'invalid' => 'This email address is invalid.',	// TODO - Translation
+			'required' => 'An email address is required.',	// TODO - Translation
 		),
 		'validation' => array(
 			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.',	// TODO - Translation
-			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.',	// TODO - Translation
+			'email_sent_to' => 'We sent you an email at <strong>%s</strong>. Please follow its instructions to validate your address.',	// TODO - Translation
 			'feedback' => array(
-				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.',	// TODO - Translation
+				'email_failed' => 'We couldn’t send you an email because of a server configuration error.',	// TODO - Translation
 				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
-				'error' => 'The email address failed to be validated.',	// TODO - Translation
-				'ok' => 'The email address has been validated.',	// TODO - Translation
-				'unneccessary' => 'The email address was already validated.',	// TODO - Translation
-				'wrong_token' => 'The email address failed to be validated due to a wrong token.',	// TODO - Translation
+				'error' => 'Email address validation failed.',	// TODO - Translation
+				'ok' => 'This email address has been validated.',	// TODO - Translation
+				'unneccessary' => 'This email address was already validated.',	// TODO - Translation
+				'wrong_token' => 'This email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
 			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
 			'resend_email' => 'Resend the email',	// TODO - Translation
@@ -24,7 +24,7 @@ return array(
 	),
 	'mailer' => array(
 		'email_need_validation' => array(
-			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:',	// TODO - Translation
+			'body' => 'You’ve just registered on %s, but you still need to validate your email address. For that, just follow the link:',	// TODO - Translation
 			'title' => 'You need to validate your account',	// TODO - Translation
 			'welcome' => 'Welcome %s,',	// TODO - Translation
 		),
@@ -38,7 +38,7 @@ return array(
 		),
 	),
 	'username' => array(
-		'invalid' => 'The username is invalid.',	// TODO - Translation
-		'taken' => 'The username %s is taken.',	// TODO - Translation
+		'invalid' => 'This username is invalid.',	// TODO - Translation
+		'taken' => 'This username, %s, is taken.',	// TODO - Translation
 	),
 );
diff --git a/app/i18n/kr/admin.php b/app/i18n/kr/admin.php
index a2f4112da..2d56165e1 100644
--- a/app/i18n/kr/admin.php
+++ b/app/i18n/kr/admin.php
@@ -163,7 +163,7 @@ return array(
 			'help' => '초',
 			'number' => '로그인 유지 시간',
 		),
-		'force_email_validation' => 'Force email addresses validation',	// TODO - Translation
+		'force_email_validation' => 'Force email address validation',	// TODO - Translation
 		'instance-name' => '인스턴스 이름',
 		'max-categories' => '사용자별 카테고리 개수 제한',
 		'max-feeds' => '사용자별 피드 개수 제한',
diff --git a/app/i18n/kr/conf.php b/app/i18n/kr/conf.php
index 1de08131f..d2786b677 100644
--- a/app/i18n/kr/conf.php
+++ b/app/i18n/kr/conf.php
@@ -11,7 +11,7 @@ return array(
 		'keep_max' => 'Maximum number of articles to keep',	// TODO - Translation
 		'keep_min_by_feed' => '피드별 최소 유지 글 개수',
 		'keep_period' => 'Maximum age of articles to keep',	// TODO - Translation
-		'keep_unreads' => 'Never delete unreads',	// TODO - Translation
+		'keep_unreads' => 'Never delete unread articles',	// TODO - Translation
 		'maintenance' => 'Maintenance',	// TODO - Translation
 		'optimize' => '데이터베이스 최적화',
 		'optimize_help' => '데이터베이스 크기를 줄이기 위해 가끔씩 수행해주세요',
@@ -98,7 +98,7 @@ return array(
 	'reading' => array(
 		'_' => '읽기',
 		'after_onread' => '“모두 읽음으로 표시” 후,',
-		'always_show_favorites' => 'Show all articles in favorites by default',	// TODO - Translation
+		'always_show_favorites' => 'Show all articles in favourites by default',	// TODO - Translation
 		'articles_per_page' => '페이지당 글 수',
 		'auto_load_more' => '페이지 하단에 다다르면 글 더 불러오기',
 		'auto_remove_article' => '글을 읽은 후 숨기기',
diff --git a/app/i18n/kr/feedback.php b/app/i18n/kr/feedback.php
index e6745c3a5..d7e428196 100644
--- a/app/i18n/kr/feedback.php
+++ b/app/i18n/kr/feedback.php
@@ -101,7 +101,7 @@ return array(
 			'selector_preview' => array(
 				'http_error' => 'Failed to load website content.',	// TODO - Translation
 				'no_entries' => 'There are no articles in this feed. You need at least one article to create a preview.',	// TODO - Translation
-				'no_feed' => 'Internal error (feed can’t be found).',	// TODO - Translation
+				'no_feed' => 'Internal error (feed cannot be found).',	// TODO - Translation
 				'no_result' => 'The selector didn\'t match anything. As a fallback the original feed text will be displayed instead.',	// TODO - Translation
 				'selector_empty' => 'The selector is empty. You need to define one to create a preview.',	// TODO - Translation
 			),
diff --git a/app/i18n/kr/sub.php b/app/i18n/kr/sub.php
index c4c62aabb..ff80f5a5b 100644
--- a/app/i18n/kr/sub.php
+++ b/app/i18n/kr/sub.php
@@ -102,7 +102,7 @@ return array(
 		'title' => '불러오기 / 내보내기',
 	),
 	'menu' => array(
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'bookmark' => '구독하기 (FreshRSS 북마클릿)',
 		'import_export' => '불러오기 / 내보내기',
@@ -117,7 +117,7 @@ return array(
 	),
 	'title' => array(
 		'_' => '구독 관리',
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'add_tag' => 'Add a tag',	// TODO - Translation
diff --git a/app/i18n/kr/user.php b/app/i18n/kr/user.php
index 32614cc36..7816efcbc 100644
--- a/app/i18n/kr/user.php
+++ b/app/i18n/kr/user.php
@@ -3,19 +3,19 @@
 return array(
 	'email' => array(
 		'feedback' => array(
-			'invalid' => 'The email address is invalid.',	// TODO - Translation
-			'required' => 'The email address is required.',	// TODO - Translation
+			'invalid' => 'This email address is invalid.',	// TODO - Translation
+			'required' => 'An email address is required.',	// TODO - Translation
 		),
 		'validation' => array(
 			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.',	// TODO - Translation
-			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.',	// TODO - Translation
+			'email_sent_to' => 'We sent you an email at <strong>%s</strong>. Please follow its instructions to validate your address.',	// TODO - Translation
 			'feedback' => array(
-				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.',	// TODO - Translation
+				'email_failed' => 'We couldn’t send you an email because of a server configuration error.',	// TODO - Translation
 				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
-				'error' => 'The email address failed to be validated.',	// TODO - Translation
-				'ok' => 'The email address has been validated.',	// TODO - Translation
-				'unneccessary' => 'The email address was already validated.',	// TODO - Translation
-				'wrong_token' => 'The email address failed to be validated due to a wrong token.',	// TODO - Translation
+				'error' => 'Email address validation failed.',	// TODO - Translation
+				'ok' => 'This email address has been validated.',	// TODO - Translation
+				'unneccessary' => 'This email address was already validated.',	// TODO - Translation
+				'wrong_token' => 'This email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
 			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
 			'resend_email' => 'Resend the email',	// TODO - Translation
@@ -24,7 +24,7 @@ return array(
 	),
 	'mailer' => array(
 		'email_need_validation' => array(
-			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:',	// TODO - Translation
+			'body' => 'You’ve just registered on %s, but you still need to validate your email address. For that, just follow the link:',	// TODO - Translation
 			'title' => 'You need to validate your account',	// TODO - Translation
 			'welcome' => 'Welcome %s,',	// TODO - Translation
 		),
@@ -38,7 +38,7 @@ return array(
 		),
 	),
 	'username' => array(
-		'invalid' => 'The username is invalid.',	// TODO - Translation
-		'taken' => 'The username %s is taken.',	// TODO - Translation
+		'invalid' => 'This username is invalid.',	// TODO - Translation
+		'taken' => 'This username, %s, is taken.',	// TODO - Translation
 	),
 );
diff --git a/app/i18n/oc/sub.php b/app/i18n/oc/sub.php
index 49e071ba0..93a88b199 100644
--- a/app/i18n/oc/sub.php
+++ b/app/i18n/oc/sub.php
@@ -102,7 +102,7 @@ return array(
 		'title' => 'Importar / Exportar',
 	),
 	'menu' => array(
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'bookmark' => 'Sabonar (marcapagina FreshRSS)',
 		'import_export' => 'Importar / Exportar',
@@ -117,7 +117,7 @@ return array(
 	),
 	'title' => array(
 		'_' => 'Gestion dels abonaments',
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'add_tag' => 'Add a tag',	// TODO - Translation
diff --git a/app/i18n/pt-br/sub.php b/app/i18n/pt-br/sub.php
index ad6301716..bfd731a69 100644
--- a/app/i18n/pt-br/sub.php
+++ b/app/i18n/pt-br/sub.php
@@ -102,7 +102,7 @@ return array(
 		'title' => 'Importar / exportar',
 	),
 	'menu' => array(
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'bookmark' => 'Inscreva-se (FreshRSS favoritos)',
 		'import_export' => 'Importar / exportar',
@@ -117,7 +117,7 @@ return array(
 	),
 	'title' => array(
 		'_' => 'Gerenciamento de inscrições',
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'add_tag' => 'Add a tag',	// TODO - Translation
diff --git a/app/i18n/ru/admin.php b/app/i18n/ru/admin.php
index cb22898c7..27cde7550 100644
--- a/app/i18n/ru/admin.php
+++ b/app/i18n/ru/admin.php
@@ -67,8 +67,8 @@ return array(
 			'ok' => 'У вас установлена библиотека для работы с JSON.',
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	// TODO - Translation
-			'ok' => 'You have the recommended library mbstring for Unicode.',	// TODO - Translation
+			'nok' => 'Cannot find the recommended mbstring library for Unicode.',	// TODO - Translation
+			'ok' => 'You have the recommended mbstring library for Unicode.',	// TODO - Translation
 		),
 		'minz' => array(
 			'nok' => 'У вас не установлен фрейворк Minz.',
@@ -102,7 +102,7 @@ return array(
 		),
 		'zip' => array(
 			'nok' => 'You lack ZIP extension (php-zip package).',
-			'ok' => 'You have ZIP extension.',	// TODO - Translation
+			'ok' => 'You have the ZIP extension.',	// TODO - Translation
 		),
 	),
 	'extensions' => array(
@@ -163,7 +163,7 @@ return array(
 			'help' => 'in seconds',	// TODO - Translation
 			'number' => 'Duration to keep logged in',	// TODO - Translation
 		),
-		'force_email_validation' => 'Force email addresses validation',	// TODO - Translation
+		'force_email_validation' => 'Force email address validation',	// TODO - Translation
 		'instance-name' => 'Название этого сервера',
 		'max-categories' => 'Количество категорий на пользователя',
 		'max-feeds' => 'Количество статей на пользователя',
diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php
index 355247987..88764c3d4 100644
--- a/app/i18n/ru/conf.php
+++ b/app/i18n/ru/conf.php
@@ -9,9 +9,9 @@ return array(
 		'keep_favourites' => 'Never delete favourites',	// TODO - Translation
 		'keep_labels' => 'Never delete labels',	// TODO - Translation
 		'keep_max' => 'Maximum number of articles to keep',	// TODO - Translation
-		'keep_min_by_feed' => 'Minimum number of articles to keep by feed',	// TODO - Translation
+		'keep_min_by_feed' => 'Minimum number of articles to keep per feed',	// TODO - Translation
 		'keep_period' => 'Maximum age of articles to keep',	// TODO - Translation
-		'keep_unreads' => 'Never delete unreads',	// TODO - Translation
+		'keep_unreads' => 'Never delete unread articles',	// TODO - Translation
 		'maintenance' => 'Maintenance',	// TODO - Translation
 		'optimize' => 'Оптимизировать базу данных',
 		'optimize_help' => 'To do occasionally to reduce the size of the database',
@@ -42,10 +42,10 @@ return array(
 		'title' => 'Display',	// TODO - Translation
 		'width' => array(
 			'content' => 'Content width',	// TODO - Translation
-			'large' => 'Large',	// TODO - Translation
+			'large' => 'Wide',	// TODO - Translation
 			'medium' => 'Medium',	// TODO - Translation
-			'no_limit' => 'No limit',	// TODO - Translation
-			'thin' => 'Thin',	// TODO - Translation
+			'no_limit' => 'Full Width',	// TODO - Translation
+			'thin' => 'Narrow',	// TODO - Translation
 		),
 	),
 	'profile' => array(
@@ -98,7 +98,7 @@ return array(
 	'reading' => array(
 		'_' => 'Reading',	// TODO - Translation
 		'after_onread' => 'After “mark all as read”,',	// TODO - Translation
-		'always_show_favorites' => 'Show all articles in favorites by default',	// TODO - Translation
+		'always_show_favorites' => 'Show all articles in favourites by default',	// TODO - Translation
 		'articles_per_page' => 'Number of articles per page',	// TODO - Translation
 		'auto_load_more' => 'Load next articles at the page bottom',
 		'auto_remove_article' => 'Hide articles after reading',	// TODO - Translation
@@ -109,13 +109,13 @@ return array(
 		'img_with_lazyload' => 'Use "lazy load" mode to load pictures',	// TODO - Translation
 		'jump_next' => 'jump to next unread sibling (feed or category)',	// TODO - Translation
 		'mark_updated_article_unread' => 'Mark updated articles as unread',	// TODO - Translation
-		'number_divided_when_reader' => 'Divided by 2 in the reading view.',	// TODO - Translation
+		'number_divided_when_reader' => 'Divide by 2 in the reading view.',	// TODO - Translation
 		'read' => array(
-			'article_open_on_website' => 'when article is opened on its original website',	// TODO - Translation
-			'article_viewed' => 'when article is viewed',	// TODO - Translation
+			'article_open_on_website' => 'when the article is opened on its original website',	// TODO - Translation
+			'article_viewed' => 'when the article is viewed',	// TODO - Translation
 			'scroll' => 'while scrolling',	// TODO - Translation
 			'upon_reception' => 'upon reception of the article',
-			'when' => 'Mark article as read…',	// TODO - Translation
+			'when' => 'Mark an article as read…',	// TODO - Translation
 		),
 		'show' => array(
 			'_' => 'Articles to display',	// TODO - Translation
diff --git a/app/i18n/ru/feedback.php b/app/i18n/ru/feedback.php
index d0f0cc669..4f57dcf08 100644
--- a/app/i18n/ru/feedback.php
+++ b/app/i18n/ru/feedback.php
@@ -3,7 +3,7 @@
 return array(
 	'access' => array(
 		'denied' => 'You don’t have permission to access this page',	// TODO - Translation
-		'not_found' => 'You are looking for a page which doesn’t exist',	// TODO - Translation
+		'not_found' => 'You are looking for a page that doesn’t exist',	// TODO - Translation
 	),
 	'admin' => array(
 		'optimization_complete' => 'Optimisation complete',
@@ -16,7 +16,7 @@ return array(
 	),
 	'auth' => array(
 		'form' => array(
-			'not_set' => 'A problem occurred during authentication system configuration. Please retry later.',	// TODO - Translation
+			'not_set' => 'A problem occurred during authentication system configuration. Please try again later.',	// TODO - Translation
 			'set' => 'Form is now your default authentication system.',	// TODO - Translation
 		),
 		'login' => array(
@@ -29,7 +29,7 @@ return array(
 		'no_password_set' => 'Administrator password hasn’t been set. This feature isn’t available.',	// TODO - Translation
 	),
 	'conf' => array(
-		'error' => 'An error occurred during configuration saving',	// TODO - Translation
+		'error' => 'An error occurred while saving configuration',	// TODO - Translation
 		'query_created' => 'Query "%s" has been created.',	// TODO - Translation
 		'shortcuts_updated' => 'Shortcuts have been updated',	// TODO - Translation
 		'updated' => 'Configuration has been updated',	// TODO - Translation
@@ -51,11 +51,11 @@ return array(
 		'removed' => '%s removed',	// TODO - Translation
 	),
 	'import_export' => array(
-		'export_no_zip_extension' => 'ZIP extension is not present on your server. Please try to export files one by one.',	// TODO - Translation
+		'export_no_zip_extension' => 'The ZIP extension is not present on your server. Please try to export files one by one.',	// TODO - Translation
 		'feeds_imported' => 'Your feeds have been imported and will now be updated',	// TODO - Translation
 		'feeds_imported_with_errors' => 'Your feeds have been imported but some errors occurred',
 		'file_cannot_be_uploaded' => 'File cannot be uploaded!',	// TODO - Translation
-		'no_zip_extension' => 'ZIP extension is not present on your server.',	// TODO - Translation
+		'no_zip_extension' => 'The ZIP extension is not present on your server.',	// TODO - Translation
 		'zip_error' => 'An error occurred during ZIP import.',	// TODO - Translation
 	),
 	'profile' => array(
@@ -93,7 +93,7 @@ return array(
 			'invalid_url' => 'URL <em>%s</em> is invalid',	// TODO - Translation
 			'n_actualized' => '%d feeds have been updated',	// TODO - Translation
 			'n_entries_deleted' => '%d articles have been deleted',	// TODO - Translation
-			'no_refresh' => 'There is no feed to refresh…',	// TODO - Translation
+			'no_refresh' => 'There are no feeds to refresh',	// TODO - Translation
 			'not_added' => '<em>%s</em> could not be added',	// TODO - Translation
 			'not_found' => 'Feed cannot be found',	// TODO - Translation
 			'over_max' => 'You have reached your limit of feeds (%d)',	// TODO - Translation
@@ -101,7 +101,7 @@ return array(
 			'selector_preview' => array(
 				'http_error' => 'Failed to load website content.',	// TODO - Translation
 				'no_entries' => 'There are no articles in this feed. You need at least one article to create a preview.',	// TODO - Translation
-				'no_feed' => 'Internal error (feed can’t be found).',	// TODO - Translation
+				'no_feed' => 'Internal error (feed cannot be found).',	// TODO - Translation
 				'no_result' => 'The selector didn\'t match anything. As a fallback the original feed text will be displayed instead.',	// TODO - Translation
 				'selector_empty' => 'The selector is empty. You need to define one to create a preview.',	// TODO - Translation
 			),
@@ -112,8 +112,8 @@ return array(
 	'update' => array(
 		'can_apply' => 'FreshRSS will now be updated to the <strong>version %s</strong>.',	// TODO - Translation
 		'error' => 'The update process has encountered an error: %s',	// TODO - Translation
-		'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',	// TODO - Translation
-		'finished' => 'Update completed!',	// TODO - Translation
+		'file_is_nok' => 'New <strong>version %s</strong> available, but check permissions on <em>%s</em> directory. HTTP server must have have write permission',	// TODO - Translation
+		'finished' => 'Update complete!',	// TODO - Translation
 		'none' => 'No update to apply',	// TODO - Translation
 		'server_not_found' => 'Update server cannot be found. [%s]',	// TODO - Translation
 	),
diff --git a/app/i18n/ru/gen.php b/app/i18n/ru/gen.php
index c2aeaf454..4adca1f1f 100644
--- a/app/i18n/ru/gen.php
+++ b/app/i18n/ru/gen.php
@@ -120,10 +120,10 @@ return array(
 		'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!',
 		'feedback' => array(
 			'body_new_articles' => 'There are %%d new articles to read on FreshRSS.',	// TODO - Translation
-			'request_failed' => 'A request has failed, it may have been caused by Internet connection problems.',	// TODO - Translation
+			'request_failed' => 'A request has failed, it may have been caused by internet connection problems.',	// TODO - Translation
 			'title_new_articles' => 'FreshRSS: new articles!',	// TODO - Translation
 		),
-		'new_article' => 'There are new available articles, click to refresh the page.',	// TODO - Translation
+		'new_article' => 'There are new articles available, click to refresh the page.',	// TODO - Translation
 		'should_be_activated' => 'JavaScript must be enabled',	// TODO - Translation
 	),
 	'lang' => array(
@@ -149,7 +149,7 @@ return array(
 		'admin' => 'Administration',	// TODO - Translation
 		'archiving' => 'Archiving',	// TODO - Translation
 		'authentication' => 'Authentication',	// TODO - Translation
-		'check_install' => 'Installation checking',	// TODO - Translation
+		'check_install' => 'Installation check',	// TODO - Translation
 		'configuration' => 'Configuration',	// TODO - Translation
 		'display' => 'Display',	// TODO - Translation
 		'extensions' => 'Extensions',	// TODO - Translation
@@ -210,7 +210,7 @@ return array(
 		'default_category' => 'Uncategorized',	// TODO - Translation
 		'no' => 'No',	// TODO - Translation
 		'not_applicable' => 'Not available',	// TODO - Translation
-		'ok' => 'Ok!',	// TODO - Translation
+		'ok' => 'Okay!',	// TODO - Translation
 		'or' => 'or',	// TODO - Translation
 		'yes' => 'Yes',	// TODO - Translation
 	),
diff --git a/app/i18n/ru/index.php b/app/i18n/ru/index.php
index 65011032d..8e60180d1 100644
--- a/app/i18n/ru/index.php
+++ b/app/i18n/ru/index.php
@@ -4,7 +4,7 @@ return array(
 	'about' => array(
 		'_' => 'About',	// TODO - Translation
 		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',	// TODO - Translation
-		'bugs_reports' => 'Bugs reports',	// TODO - Translation
+		'bugs_reports' => 'Bug reports',	// TODO - Translation
 		'credits' => 'Credits',	// TODO - Translation
 		'credits_content' => 'Some design elements come from <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> although FreshRSS doesn’t use this framework. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> come from <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police has been created by <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS is based on <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, a PHP framework.',	// TODO - Translation
 		'freshrss_description' => 'FreshRSS is a RSS feeds aggregator to self-host like <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> or <a href="https://github.com/LeedRSS/Leed">Leed</a>. It is light and easy to take in hand while being powerful and configurable tool.',	// TODO - Translation
@@ -16,8 +16,8 @@ return array(
 		'website' => 'Website',	// TODO - Translation
 	),
 	'feed' => array(
-		'add' => 'You may add some feeds.',	// TODO - Translation
-		'empty' => 'There is no article to show.',	// TODO - Translation
+		'add' => 'Please add some feeds.',	// TODO - Translation
+		'empty' => 'There are no articles to show.',	// TODO - Translation
 		'rss_of' => 'RSS feed of %s',	// TODO - Translation
 		'title' => 'Your RSS feeds',	// TODO - Translation
 		'title_fav' => 'Your favourites',	// TODO - Translation
@@ -32,8 +32,8 @@ return array(
 	'menu' => array(
 		'about' => 'About FreshRSS',	// TODO - Translation
 		'add_query' => 'Add a query',	// TODO - Translation
-		'before_one_day' => 'Before one day',	// TODO - Translation
-		'before_one_week' => 'Before one week',	// TODO - Translation
+		'before_one_day' => 'Older than one day',	// TODO - Translation
+		'before_one_week' => 'Older than one week',	// TODO - Translation
 		'favorites' => 'Favourites (%s)',	// TODO - Translation
 		'global_view' => 'Global view',	// TODO - Translation
 		'main_stream' => 'Main stream',	// TODO - Translation
@@ -52,7 +52,7 @@ return array(
 		'search_short' => 'Search',	// TODO - Translation
 		'starred' => 'Show only favorites',
 		'stats' => 'Statistics',	// TODO - Translation
-		'subscription' => 'Subscriptions management',	// TODO - Translation
+		'subscription' => 'Subscription management',	// TODO - Translation
 		'tags' => 'My labels',	// TODO - Translation
 		'unread' => 'Show only unread',
 	),
diff --git a/app/i18n/ru/install.php b/app/i18n/ru/install.php
index 610813a67..b7530f7d4 100644
--- a/app/i18n/ru/install.php
+++ b/app/i18n/ru/install.php
@@ -65,8 +65,8 @@ return array(
 			'ok' => 'Ваш HTTP REFERER известен и соотвествует вашему серверу.',
 		),
 		'json' => array(
-			'nok' => 'Cannot find a recommended library to parse JSON.',	// TODO - Translation
-			'ok' => 'You have a recommended library to parse JSON.',	// TODO - Translation
+			'nok' => 'Cannot find the recommended library to parse JSON.',	// TODO - Translation
+			'ok' => 'You have the recommended library to parse JSON.',	// TODO - Translation
 		),
 		'mbstring' => array(
 			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	// TODO - Translation
diff --git a/app/i18n/ru/sub.php b/app/i18n/ru/sub.php
index a312f9e54..27234c361 100644
--- a/app/i18n/ru/sub.php
+++ b/app/i18n/ru/sub.php
@@ -7,7 +7,7 @@ return array(
 		'title' => 'API',	// TODO - Translation
 	),
 	'bookmarklet' => array(
-		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',	// TODO - Translation
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click the "Subscribe" button in any page you want to subscribe to.',	// TODO - Translation
 		'label' => 'Subscribe',	// TODO - Translation
 		'title' => 'Bookmarklet',	// TODO - Translation
 	),
@@ -67,17 +67,17 @@ return array(
 		),
 		'show' => array(
 			'all' => 'Show all feeds',	// TODO - Translation
-			'error' => 'Show only feeds with error',	// TODO - Translation
+			'error' => 'Show only feeds with errors',	// TODO - Translation
 		),
 		'showing' => array(
-			'error' => 'Showing only feeds with error',	// TODO - Translation
+			'error' => 'Showing only feeds with errors',	// TODO - Translation
 		),
 		'ssl_verify' => 'Verify SSL security',	// TODO - Translation
 		'stats' => 'Statistics',	// TODO - Translation
 		'think_to_add' => 'You may add some feeds.',	// TODO - Translation
 		'timeout' => 'Timeout in seconds',	// TODO - Translation
 		'title' => 'Title',	// TODO - Translation
-		'title_add' => 'Add a RSS feed',	// TODO - Translation
+		'title_add' => 'Add an RSS feed',	// TODO - Translation
 		'ttl' => 'Do not automatically refresh more often than',	// TODO - Translation
 		'url' => 'Feed URL',	// TODO - Translation
 		'validator' => 'Check the validity of the feed',	// TODO - Translation
@@ -102,11 +102,11 @@ return array(
 		'title' => 'Import / export',	// TODO - Translation
 	),
 	'menu' => array(
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'bookmark' => 'Subscribe (FreshRSS bookmark)',	// TODO - Translation
 		'import_export' => 'Import / export',	// TODO - Translation
-		'subscription_management' => 'Subscriptions management',	// TODO - Translation
+		'subscription_management' => 'Subscription management',	// TODO - Translation
 		'subscription_tools' => 'Subscription tools',	// TODO - Translation
 		'tag_management' => 'Tag management',	// TODO - Translation
 	),
@@ -116,8 +116,8 @@ return array(
 		'old_name' => 'Old name',	// TODO - Translation
 	),
 	'title' => array(
-		'_' => 'Subscriptions management',	// TODO - Translation
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'_' => 'Subscription management',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'add_tag' => 'Add a tag',	// TODO - Translation
diff --git a/app/i18n/ru/user.php b/app/i18n/ru/user.php
index 32614cc36..7816efcbc 100644
--- a/app/i18n/ru/user.php
+++ b/app/i18n/ru/user.php
@@ -3,19 +3,19 @@
 return array(
 	'email' => array(
 		'feedback' => array(
-			'invalid' => 'The email address is invalid.',	// TODO - Translation
-			'required' => 'The email address is required.',	// TODO - Translation
+			'invalid' => 'This email address is invalid.',	// TODO - Translation
+			'required' => 'An email address is required.',	// TODO - Translation
 		),
 		'validation' => array(
 			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.',	// TODO - Translation
-			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.',	// TODO - Translation
+			'email_sent_to' => 'We sent you an email at <strong>%s</strong>. Please follow its instructions to validate your address.',	// TODO - Translation
 			'feedback' => array(
-				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.',	// TODO - Translation
+				'email_failed' => 'We couldn’t send you an email because of a server configuration error.',	// TODO - Translation
 				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
-				'error' => 'The email address failed to be validated.',	// TODO - Translation
-				'ok' => 'The email address has been validated.',	// TODO - Translation
-				'unneccessary' => 'The email address was already validated.',	// TODO - Translation
-				'wrong_token' => 'The email address failed to be validated due to a wrong token.',	// TODO - Translation
+				'error' => 'Email address validation failed.',	// TODO - Translation
+				'ok' => 'This email address has been validated.',	// TODO - Translation
+				'unneccessary' => 'This email address was already validated.',	// TODO - Translation
+				'wrong_token' => 'This email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
 			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
 			'resend_email' => 'Resend the email',	// TODO - Translation
@@ -24,7 +24,7 @@ return array(
 	),
 	'mailer' => array(
 		'email_need_validation' => array(
-			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:',	// TODO - Translation
+			'body' => 'You’ve just registered on %s, but you still need to validate your email address. For that, just follow the link:',	// TODO - Translation
 			'title' => 'You need to validate your account',	// TODO - Translation
 			'welcome' => 'Welcome %s,',	// TODO - Translation
 		),
@@ -38,7 +38,7 @@ return array(
 		),
 	),
 	'username' => array(
-		'invalid' => 'The username is invalid.',	// TODO - Translation
-		'taken' => 'The username %s is taken.',	// TODO - Translation
+		'invalid' => 'This username is invalid.',	// TODO - Translation
+		'taken' => 'This username, %s, is taken.',	// TODO - Translation
 	),
 );
diff --git a/app/i18n/sk/admin.php b/app/i18n/sk/admin.php
index de7329483..eb5f5e8f0 100644
--- a/app/i18n/sk/admin.php
+++ b/app/i18n/sk/admin.php
@@ -163,7 +163,7 @@ return array(
 			'help' => 'v sekundách',
 			'number' => 'Dobra, počas ktorej ste prihlásený',
 		),
-		'force_email_validation' => 'Force email addresses validation',	// TODO - Translation
+		'force_email_validation' => 'Force email address validation',	// TODO - Translation
 		'instance-name' => 'Názov inštancie',
 		'max-categories' => 'Limit počtu kategórií pre používateľa',
 		'max-feeds' => 'Limit počtu kanálov pre používateľov',
diff --git a/app/i18n/sk/conf.php b/app/i18n/sk/conf.php
index 3274b3a31..9d4540cda 100644
--- a/app/i18n/sk/conf.php
+++ b/app/i18n/sk/conf.php
@@ -11,7 +11,7 @@ return array(
 		'keep_max' => 'Maximum number of articles to keep',	// TODO - Translation
 		'keep_min_by_feed' => 'Minimálny počet článkov kanála na zachovanie',
 		'keep_period' => 'Maximum age of articles to keep',	// TODO - Translation
-		'keep_unreads' => 'Never delete unreads',	// TODO - Translation
+		'keep_unreads' => 'Never delete unread articles',	// TODO - Translation
 		'maintenance' => 'Maintenance',	// TODO - Translation
 		'optimize' => 'Optimalizovať databázu',
 		'optimize_help' => 'Občas vykonajte na zmenšenie veľkosti databázy',
@@ -98,7 +98,7 @@ return array(
 	'reading' => array(
 		'_' => 'Čítanie',
 		'after_onread' => 'Po “Označiť všetko ako prečítané”,',
-		'always_show_favorites' => 'Show all articles in favorites by default',	// TODO - Translation
+		'always_show_favorites' => 'Show all articles in favourites by default',	// TODO - Translation
 		'articles_per_page' => 'Počet článkov na jednu stranu',
 		'auto_load_more' => 'Načítať ďalšie články dolu na stránke',
 		'auto_remove_article' => 'Skryť články po prečítaní',
diff --git a/app/i18n/sk/feedback.php b/app/i18n/sk/feedback.php
index 04017c95c..026848447 100644
--- a/app/i18n/sk/feedback.php
+++ b/app/i18n/sk/feedback.php
@@ -101,7 +101,7 @@ return array(
 			'selector_preview' => array(
 				'http_error' => 'Failed to load website content.',	// TODO - Translation
 				'no_entries' => 'There are no articles in this feed. You need at least one article to create a preview.',	// TODO - Translation
-				'no_feed' => 'Internal error (feed can’t be found).',	// TODO - Translation
+				'no_feed' => 'Internal error (feed cannot be found).',	// TODO - Translation
 				'no_result' => 'The selector didn\'t match anything. As a fallback the original feed text will be displayed instead.',	// TODO - Translation
 				'selector_empty' => 'The selector is empty. You need to define one to create a preview.',	// TODO - Translation
 			),
diff --git a/app/i18n/sk/sub.php b/app/i18n/sk/sub.php
index 5c2848bcd..68df8c6f3 100644
--- a/app/i18n/sk/sub.php
+++ b/app/i18n/sk/sub.php
@@ -102,7 +102,7 @@ return array(
 		'title' => 'Import / export',
 	),
 	'menu' => array(
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'bookmark' => 'Odoberať (záložka FreshRSS)',
 		'import_export' => 'Import / export',
@@ -117,7 +117,7 @@ return array(
 	),
 	'title' => array(
 		'_' => 'Správa odoberaných kanálov',
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'add_tag' => 'Add a tag',	// TODO - Translation
diff --git a/app/i18n/sk/user.php b/app/i18n/sk/user.php
index 32614cc36..7816efcbc 100644
--- a/app/i18n/sk/user.php
+++ b/app/i18n/sk/user.php
@@ -3,19 +3,19 @@
 return array(
 	'email' => array(
 		'feedback' => array(
-			'invalid' => 'The email address is invalid.',	// TODO - Translation
-			'required' => 'The email address is required.',	// TODO - Translation
+			'invalid' => 'This email address is invalid.',	// TODO - Translation
+			'required' => 'An email address is required.',	// TODO - Translation
 		),
 		'validation' => array(
 			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.',	// TODO - Translation
-			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.',	// TODO - Translation
+			'email_sent_to' => 'We sent you an email at <strong>%s</strong>. Please follow its instructions to validate your address.',	// TODO - Translation
 			'feedback' => array(
-				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.',	// TODO - Translation
+				'email_failed' => 'We couldn’t send you an email because of a server configuration error.',	// TODO - Translation
 				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
-				'error' => 'The email address failed to be validated.',	// TODO - Translation
-				'ok' => 'The email address has been validated.',	// TODO - Translation
-				'unneccessary' => 'The email address was already validated.',	// TODO - Translation
-				'wrong_token' => 'The email address failed to be validated due to a wrong token.',	// TODO - Translation
+				'error' => 'Email address validation failed.',	// TODO - Translation
+				'ok' => 'This email address has been validated.',	// TODO - Translation
+				'unneccessary' => 'This email address was already validated.',	// TODO - Translation
+				'wrong_token' => 'This email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
 			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
 			'resend_email' => 'Resend the email',	// TODO - Translation
@@ -24,7 +24,7 @@ return array(
 	),
 	'mailer' => array(
 		'email_need_validation' => array(
-			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:',	// TODO - Translation
+			'body' => 'You’ve just registered on %s, but you still need to validate your email address. For that, just follow the link:',	// TODO - Translation
 			'title' => 'You need to validate your account',	// TODO - Translation
 			'welcome' => 'Welcome %s,',	// TODO - Translation
 		),
@@ -38,7 +38,7 @@ return array(
 		),
 	),
 	'username' => array(
-		'invalid' => 'The username is invalid.',	// TODO - Translation
-		'taken' => 'The username %s is taken.',	// TODO - Translation
+		'invalid' => 'This username is invalid.',	// TODO - Translation
+		'taken' => 'This username, %s, is taken.',	// TODO - Translation
 	),
 );
diff --git a/app/i18n/tr/admin.php b/app/i18n/tr/admin.php
index 61615c9fa..9299edc30 100644
--- a/app/i18n/tr/admin.php
+++ b/app/i18n/tr/admin.php
@@ -67,8 +67,8 @@ return array(
 			'ok' => 'JSON eklentisi sorunsuz.',
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	// TODO - Translation
-			'ok' => 'You have the recommended library mbstring for Unicode.',	// TODO - Translation
+			'nok' => 'Cannot find the recommended mbstring library for Unicode.',	// TODO - Translation
+			'ok' => 'You have the recommended mbstring library for Unicode.',	// TODO - Translation
 		),
 		'minz' => array(
 			'nok' => 'Minz framework eksik.',
@@ -163,7 +163,7 @@ return array(
 			'help' => 'in seconds',	// TODO - Translation
 			'number' => 'Duration to keep logged in',	// TODO - Translation
 		),
-		'force_email_validation' => 'Force email addresses validation',	// TODO - Translation
+		'force_email_validation' => 'Force email address validation',	// TODO - Translation
 		'instance-name' => 'Örnek isim',
 		'max-categories' => 'Kullanıcı başına kategori limiti',
 		'max-feeds' => 'Kullanıcı başına akış limiti',
diff --git a/app/i18n/tr/conf.php b/app/i18n/tr/conf.php
index 61c00d064..460801890 100644
--- a/app/i18n/tr/conf.php
+++ b/app/i18n/tr/conf.php
@@ -11,7 +11,7 @@ return array(
 		'keep_max' => 'Maximum number of articles to keep',	// TODO - Translation
 		'keep_min_by_feed' => 'Akışta en az tutulacak makale sayısı',
 		'keep_period' => 'Maximum age of articles to keep',	// TODO - Translation
-		'keep_unreads' => 'Never delete unreads',	// TODO - Translation
+		'keep_unreads' => 'Never delete unread articles',	// TODO - Translation
 		'maintenance' => 'Maintenance',	// TODO - Translation
 		'optimize' => 'Veritabanı optimize et',
 		'optimize_help' => 'Bu işlem bazen veritabanı boyutunu düşürmeye yardımcı olur',
@@ -98,7 +98,7 @@ return array(
 	'reading' => array(
 		'_' => 'Okuma',
 		'after_onread' => '"Hepsini okundu say" dedinten sonra,',
-		'always_show_favorites' => 'Show all articles in favorites by default',	// TODO - Translation
+		'always_show_favorites' => 'Show all articles in favourites by default',	// TODO - Translation
 		'articles_per_page' => 'Sayfa başına makale sayısı',
 		'auto_load_more' => 'Sayfa sonunda yeni makaleleri yükle',
 		'auto_remove_article' => 'Okuduktan sonra makaleleri gizle',
diff --git a/app/i18n/tr/feedback.php b/app/i18n/tr/feedback.php
index 90b77360b..6fdbd7133 100644
--- a/app/i18n/tr/feedback.php
+++ b/app/i18n/tr/feedback.php
@@ -101,7 +101,7 @@ return array(
 			'selector_preview' => array(
 				'http_error' => 'Failed to load website content.',	// TODO - Translation
 				'no_entries' => 'There are no articles in this feed. You need at least one article to create a preview.',	// TODO - Translation
-				'no_feed' => 'Internal error (feed can’t be found).',	// TODO - Translation
+				'no_feed' => 'Internal error (feed cannot be found).',	// TODO - Translation
 				'no_result' => 'The selector didn\'t match anything. As a fallback the original feed text will be displayed instead.',	// TODO - Translation
 				'selector_empty' => 'The selector is empty. You need to define one to create a preview.',	// TODO - Translation
 			),
diff --git a/app/i18n/tr/sub.php b/app/i18n/tr/sub.php
index c4406699d..c1da28d42 100644
--- a/app/i18n/tr/sub.php
+++ b/app/i18n/tr/sub.php
@@ -7,7 +7,7 @@ return array(
 		'title' => 'API',	// TODO - Translation
 	),
 	'bookmarklet' => array(
-		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',	// TODO - Translation
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click the "Subscribe" button in any page you want to subscribe to.',	// TODO - Translation
 		'label' => 'Subscribe',	// TODO - Translation
 		'title' => 'Bookmarklet',	// TODO - Translation
 	),
@@ -67,10 +67,10 @@ return array(
 		),
 		'show' => array(
 			'all' => 'Show all feeds',	// TODO - Translation
-			'error' => 'Show only feeds with error',	// TODO - Translation
+			'error' => 'Show only feeds with errors',	// TODO - Translation
 		),
 		'showing' => array(
-			'error' => 'Showing only feeds with error',	// TODO - Translation
+			'error' => 'Showing only feeds with errors',	// TODO - Translation
 		),
 		'ssl_verify' => 'Verify SSL security',	// TODO - Translation
 		'stats' => 'İstatistikler',
@@ -102,7 +102,7 @@ return array(
 		'title' => 'İçe / dışa aktar',
 	),
 	'menu' => array(
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'bookmark' => 'Abonelik (FreshRSS yer imleri)',
 		'import_export' => 'İçe / dışa aktar',
@@ -117,7 +117,7 @@ return array(
 	),
 	'title' => array(
 		'_' => 'Abonelik yönetimi',
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'add_tag' => 'Add a tag',	// TODO - Translation
diff --git a/app/i18n/tr/user.php b/app/i18n/tr/user.php
index 32614cc36..7816efcbc 100644
--- a/app/i18n/tr/user.php
+++ b/app/i18n/tr/user.php
@@ -3,19 +3,19 @@
 return array(
 	'email' => array(
 		'feedback' => array(
-			'invalid' => 'The email address is invalid.',	// TODO - Translation
-			'required' => 'The email address is required.',	// TODO - Translation
+			'invalid' => 'This email address is invalid.',	// TODO - Translation
+			'required' => 'An email address is required.',	// TODO - Translation
 		),
 		'validation' => array(
 			'change_email' => 'You can change your email address <a href="%s">on the profile page</a>.',	// TODO - Translation
-			'email_sent_to' => 'We sent you an email at <strong>%s</strong>, please follow its indications to validate your address.',	// TODO - Translation
+			'email_sent_to' => 'We sent you an email at <strong>%s</strong>. Please follow its instructions to validate your address.',	// TODO - Translation
 			'feedback' => array(
-				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.',	// TODO - Translation
+				'email_failed' => 'We couldn’t send you an email because of a server configuration error.',	// TODO - Translation
 				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
-				'error' => 'The email address failed to be validated.',	// TODO - Translation
-				'ok' => 'The email address has been validated.',	// TODO - Translation
-				'unneccessary' => 'The email address was already validated.',	// TODO - Translation
-				'wrong_token' => 'The email address failed to be validated due to a wrong token.',	// TODO - Translation
+				'error' => 'Email address validation failed.',	// TODO - Translation
+				'ok' => 'This email address has been validated.',	// TODO - Translation
+				'unneccessary' => 'This email address was already validated.',	// TODO - Translation
+				'wrong_token' => 'This email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
 			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
 			'resend_email' => 'Resend the email',	// TODO - Translation
@@ -24,7 +24,7 @@ return array(
 	),
 	'mailer' => array(
 		'email_need_validation' => array(
-			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:',	// TODO - Translation
+			'body' => 'You’ve just registered on %s, but you still need to validate your email address. For that, just follow the link:',	// TODO - Translation
 			'title' => 'You need to validate your account',	// TODO - Translation
 			'welcome' => 'Welcome %s,',	// TODO - Translation
 		),
@@ -38,7 +38,7 @@ return array(
 		),
 	),
 	'username' => array(
-		'invalid' => 'The username is invalid.',	// TODO - Translation
-		'taken' => 'The username %s is taken.',	// TODO - Translation
+		'invalid' => 'This username is invalid.',	// TODO - Translation
+		'taken' => 'This username, %s, is taken.',	// TODO - Translation
 	),
 );
diff --git a/app/i18n/zh-cn/feedback.php b/app/i18n/zh-cn/feedback.php
index 677154ea9..446989aac 100644
--- a/app/i18n/zh-cn/feedback.php
+++ b/app/i18n/zh-cn/feedback.php
@@ -101,7 +101,7 @@ return array(
 			'selector_preview' => array(
 				'http_error' => '无法加载网站内容！无法加载网站内容！',
 				'no_entries' => '您的订阅中没有任何条目。您至少需要一个条目来创建一个预览。.',
-				'no_feed' => 'Internal error (feed can’t be found).',	// TODO - Translation
+				'no_feed' => 'Internal error (feed cannot be found).',	// TODO - Translation
 				'no_result' => '选择器没有匹配到任何东西。作为备用，原始的feed文本将被显示出来。',
 				'selector_empty' => '选择器是空的。你需要一个来创建预览。',
 			),
diff --git a/app/i18n/zh-cn/sub.php b/app/i18n/zh-cn/sub.php
index e36e628fc..ae427575f 100644
--- a/app/i18n/zh-cn/sub.php
+++ b/app/i18n/zh-cn/sub.php
@@ -102,7 +102,7 @@ return array(
 		'title' => '导入/导出',
 	),
 	'menu' => array(
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'bookmark' => '订阅（FreshRSS 书签）',
 		'import_export' => '导入/导出',
@@ -117,7 +117,7 @@ return array(
 	),
 	'title' => array(
 		'_' => '订阅管理',
-		'add' => 'Add a feed/a category',	// TODO - Translation
+		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'add_tag' => 'Add a tag',	// TODO - Translation