Merge pull request #2599 from FreshRSS/dev1.15.0

FreshRSS 1.15

93 files changed, 2005 insertions, 120 deletions

diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php
index 68127f571..a2a509560 100644
--- a/app/i18n/cz/admin.php
+++ b/app/i18n/cz/admin.php
@@ -163,6 +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
 		'instance-name' => 'Instance name', //TODO - Translation
 		'max-categories' => 'Categories per user limit', //TODO - Translation
 		'max-feeds' => 'Feeds per user limit', //TODO - Translation
diff --git a/app/i18n/cz/conf.php b/app/i18n/cz/conf.php
index a2618e310..056e895a7 100644
--- a/app/i18n/cz/conf.php
+++ b/app/i18n/cz/conf.php
@@ -3,13 +3,21 @@
 return array(
 	'archiving' => array(
 		'_' => 'Archivace',
-		'advanced' => 'Pokročilé',
 		'delete_after' => 'Smazat články starší než',
+		'exception' => 'Purge exception',	//TODO - Translation
 		'help' => 'Více možností je dostupných v nastavení jednotlivých kanálů',
-		'keep_history_by_feed' => 'Zachovat tento minimální počet článků v každém kanálu',
+		'keep_favourites' => 'Never delete favourites',	//TODO - Translation
+		'keep_min_by_feed' => 'Zachovat tento minimální počet článků v každém kanálu',
+		'keep_labels' => 'Never delete labels',	//TODO - Translation
+		'keep_unreads' => 'Never delete unreads',	//TODO - Translation
+		'maintenance' => 'Maintenance',	//TODO - Translation
 		'optimize' => 'Optimalizovat databázi',
 		'optimize_help' => 'Občasná údržba zmenší velikost databáze',
+		'policy' => 'Purge policy',	//TODO - Translation
+		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	//TODO - Translation
 		'purge_now' => 'Vyčistit nyní',
+		'keep_max' => 'Maximum number of articles to keep',	//TODO - Translation
+		'keep_period' => 'Maximum age of articles to keep',	//TODO - Translation
 		'title' => 'Archivace',
 		'ttl' => 'Neaktualizovat častěji než',
 	),
@@ -21,6 +29,7 @@ return array(
 			'publication_date' => 'Datum vydání',
 			'related_tags' => 'Související tagy',	//TODO - Translation
 			'sharing' => 'Sdílení',
+			'display_authors' => 'Authors',  //TODO - Translation
 			'top_line' => 'Horní řádek',
 		),
 		'language' => 'Jazyk',
@@ -45,6 +54,7 @@ return array(
 			'_' => 'Smazání účtu',
 			'warn' => 'Váš účet bude smazán spolu se všemi souvisejícími daty',
 		),
+		'email' => 'Email',
 		'password_api' => 'Password API<br /><small>(tzn. pro mobilní aplikace)</small>',
 		'password_form' => 'Heslo<br /><small>(pro přihlášení webovým formulářem)</small>',
 		'password_format' => 'Alespoň 7 znaků',
@@ -133,7 +143,6 @@ return array(
 		'diaspora' => 'Diaspora*',
 		'email' => 'Email',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'more_information' => 'Více informací',
 		'print' => 'Tisk',
 		'remove' => 'Remove sharing method',	//TODO - Translation
diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index 08fce0280..de1456187 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -3,6 +3,7 @@
 return array(
 	'action' => array(
 		'actualize' => 'Aktualizovat',
+		'back' => '← Go back', //TODO - Translation
 		'back_to_rss_feeds' => '← Zpět na seznam RSS kanálů',
 		'cancel' => 'Zrušit',
 		'create' => 'Vytvořit',
@@ -22,6 +23,7 @@ return array(
 		'update' => 'Update',	//TODO - Translation
 	),
 	'auth' => array(
+		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.', // TODO - Translation
 		'email' => 'Email',
 		'keep_logged_in' => 'Zapamatovat přihlášení <small>(%s dny)</small>',
 		'login' => 'Login',
@@ -160,15 +162,22 @@ return array(
 		'nothing_to_load' => 'Žádné nové články',
 		'previous' => 'Předchozí',
 	),
+	'period' => array(
+		'days' => 'days',	//TODO - Translation
+		'hours' => 'hours',	//TODO - Translation
+		'months' => 'months',	//TODO - Translation
+		'weeks' => 'weeks',	//TODO - Translation
+		'years' => 'years',	//TODO - Translation
+	),
 	'share' => array(
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
 		'email' => 'Email',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'gnusocial' => 'GNU social',
 		'jdh' => 'Journal du hacker',
 		'Known' => 'Known based sites',
+		'lemmy' => 'Lemmy',
 		'linkedin' => 'LinkedIn',
 		'mastodon' => 'Mastodon',
 		'movim' => 'Movim',
diff --git a/app/i18n/cz/index.php b/app/i18n/cz/index.php
index 00f424fe8..078ca5ca1 100644
--- a/app/i18n/cz/index.php
+++ b/app/i18n/cz/index.php
@@ -7,7 +7,7 @@ return array(
 		'bugs_reports' => 'Hlášení chyb',
 		'credits' => 'Poděkování',
 		'credits_content' => 'Některé designové prvky pocházejí z <a href="http://twitter.github.io/bootstrap/">Bootstrap</a>, FreshRSS ale tuto platformu nevyužívá. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Ikony</a> pocházejí z <a href="https://www.gnome.org/">GNOME projektu</a>. Font <em>Open Sans</em> vytvořil <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS je založen na PHP framework <a href="https://github.com/marienfressinaud/MINZ">Minz</a>.',
-		'freshrss_description' => 'FreshRSS je čtečka RSS kanálů určená k provozu na vlastním serveru, podobná <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> nebo <a href="http://leed.idleman.fr/">Leed</a>. Je to nenáročný a jednoduchý, zároveň ale mocný a konfigurovatelný nástroj.',
+		'freshrss_description' => 'FreshRSS je čtečka RSS kanálů určená k provozu na vlastním serveru, podobná <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> nebo <a href="https://github.com/LeedRSS/Leed">Leed</a>. Je to nenáročný a jednoduchý, zároveň ale mocný a konfigurovatelný nástroj.',
 		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">na Github</a>',
 		'license' => 'Licence',
 		'project_website' => 'Stránka projektu',
@@ -15,6 +15,9 @@ return array(
 		'version' => 'Verze',
 		'website' => 'Webové stránka',
 	),
+	'tos' => array(
+		'title' => 'Terms of Service', // TODO - Translation
+	),
 	'feed' => array(
 		'add' => 'Můžete přidat kanály.',
 		'empty' => 'Žádné články k zobrazení.',
diff --git a/app/i18n/cz/sub.php b/app/i18n/cz/sub.php
index b2bdf416b..f2c259d15 100644
--- a/app/i18n/cz/sub.php
+++ b/app/i18n/cz/sub.php
@@ -13,9 +13,12 @@ return array(
 	'category' => array(
 		'_' => 'Kategorie',
 		'add' => 'Přidat kategorii',
+		'archiving' => 'Archivace',
 		'empty' => 'Vyprázdit kategorii',
 		'information' => 'Informace',
 		'new' => 'Nová kategorie',
+		'position' => 'Display position',	//TODO - Translation
+		'position_help' => 'To control category sort order',	//TODO - Translation
 		'title' => 'Název',
 	),
 	'feed' => array(
@@ -40,7 +43,7 @@ return array(
 			'help' => 'Write one search filter per line.',	//TODO - Translation
 		),
 		'information' => 'Informace',
-		'keep_history' => 'Zachovat tento minimální počet článků',
+		'keep_min' => 'Zachovat tento minimální počet článků',
 		'moved_category_deleted' => 'Po smazání kategorie budou v ní obsažené kanály automaticky přesunuty do <em>%s</em>.',
 		'mute' => 'mute',	//TODO - Translation
 		'no_selected' => 'Nejsou označeny žádné kanály.',
@@ -72,6 +75,7 @@ return array(
 	),
 	'firefox' => array(
 		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',// TODO
+		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	//TODO - Translation
 		'title' => 'Firefox feed reader',	//TODO - Translation
 	),
 	'import_export' => array(
diff --git a/app/i18n/cz/user.php b/app/i18n/cz/user.php
new file mode 100644
index 000000000..3a8343c11
--- /dev/null
+++ b/app/i18n/cz/user.php
@@ -0,0 +1,37 @@
+<?php
+
+return array(
+	'email' => array(
+		'feedback' => array(
+			'invalid' => 'The email address is invalid.', //TODO - Translation
+			'required' => 'The 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
+			'feedback' => array(
+				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //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
+			),
+			'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+			'resend_email' => 'Resend the email', //TODO - Translation
+			'title' => 'Email address validation', //TODO - Translation
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'You must accept the Terms of Service to be able to register.', // TODO - Translation
+		),
+	),
+	'mailer' => array(
+		'email_need_validation' => array(
+			'title' => 'You need to validate your account', //TODO - Translation
+			'welcome' => 'Welcome %s,', //TODO - Translation
+			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+		),
+	),
+);
diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
index f0307dcab..d075bf28f 100644
--- a/app/i18n/de/admin.php
+++ b/app/i18n/de/admin.php
@@ -159,6 +159,7 @@ return array(
 	'system' => array(
 		'_' => 'Systemeinstellungen',
 		'auto-update-url' => 'Auto-update URL',
+		'force_email_validation' => 'Force email addresses validation', //TODO - Translation
 		'instance-name' => 'Dein Reader Name',
 		'max-categories' => 'Anzahl erlaubter Kategorien pro Benutzer',
 		'max-feeds' => 'Anzahl erlaubter Feeds pro Benutzer',
diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php
index 40209576e..89bbfc10e 100644
--- a/app/i18n/de/conf.php
+++ b/app/i18n/de/conf.php
@@ -3,13 +3,21 @@
 return array(
 	'archiving' => array(
 		'_' => 'Archivierung',
-		'advanced' => 'Erweitert',
 		'delete_after' => 'Entferne Artikel nach',
+		'exception' => 'Purge exception',	//TODO - Translation
 		'help' => 'Weitere Optionen sind in den Einstellungen der individuellen Feeds verfügbar.',
-		'keep_history_by_feed' => 'Minimale Anzahl an Artikeln, die pro Feed behalten werden',
+		'keep_favourites' => 'Never delete favourites',	//TODO - Translation
+		'keep_min_by_feed' => 'Minimale Anzahl an Artikeln, die pro Feed behalten werden',
+		'keep_labels' => 'Never delete labels',	//TODO - Translation
+		'keep_unreads' => 'Never delete unreads',	//TODO - Translation
+		'maintenance' => 'Maintenance',	//TODO - Translation
 		'optimize' => 'Datenbank optimieren',
 		'optimize_help' => 'Sollte gelegentlich durchgeführt werden, um die Größe der Datenbank zu reduzieren.',
+		'policy' => 'Purge policy',	//TODO - Translation
+		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	//TODO - Translation
 		'purge_now' => 'Jetzt bereinigen',
+		'keep_max' => 'Maximum number of articles to keep',	//TODO - Translation
+		'keep_period' => 'Maximum age of articles to keep',	//TODO - Translation
 		'title' => 'Archivierung',
 		'ttl' => 'Aktualisiere automatisch nicht öfter als',
 	),
@@ -21,6 +29,7 @@ return array(
 			'publication_date' => 'Datum der Veröffentlichung',
 			'related_tags' => 'Verwandte Tags',
 			'sharing' => 'Teilen',
+			'display_authors' => 'Authors',  //TODO - Translation
 			'top_line' => 'Kopfzeile',
 		),
 		'language' => 'Sprache',
@@ -45,6 +54,7 @@ return array(
 			'_' => 'Accountlöschung',
 			'warn' => 'Dein Account und alle damit bezogenen Daten werden gelöscht.',
 		),
+		'email' => 'E-Mail-Adresse',
 		'password_api' => 'Passwort-API<br /><small>(z. B. für mobile Anwendungen)</small>',
 		'password_form' => 'Passwort<br /><small>(für die Anmeldemethode per Webformular)</small>',
 		'password_format' => 'mindestens 7 Zeichen',
@@ -133,7 +143,6 @@ return array(
 		'diaspora' => 'Diaspora*',
 		'email' => 'E-Mail',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'more_information' => 'Weitere Informationen',
 		'print' => 'Drucken',
 		'remove' => 'Entferne Teilen-Dienst',
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index c02a55b2c..e2dd2a251 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -3,6 +3,7 @@
 return array(
 	'action' => array(
 		'actualize' => 'Aktualisieren',
+		'back' => '← Go back', //TODO - Translation
 		'back_to_rss_feeds' => '← Zurück zu Ihren RSS-Feeds gehen',
 		'cancel' => 'Abbrechen',
 		'create' => 'Erstellen',
@@ -22,6 +23,7 @@ return array(
 		'update' => 'Aktualisieren',
 	),
 	'auth' => array(
+		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.', // TODO - Translation
 		'email' => 'E-Mail-Adresse',
 		'keep_logged_in' => 'Eingeloggt bleiben <small>(%s Tage)</small>',
 		'login' => 'Anmelden',
@@ -160,15 +162,22 @@ return array(
 		'nothing_to_load' => 'Es gibt keine weiteren Artikel',
 		'previous' => 'Vorherige',
 	),
+	'period' => array(
+		'days' => 'days',	//TODO - Translation
+		'hours' => 'hours',	//TODO - Translation
+		'months' => 'months',	//TODO - Translation
+		'weeks' => 'weeks',	//TODO - Translation
+		'years' => 'years',	//TODO - Translation
+	),
 	'share' => array(
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
 		'email' => 'E-Mail',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'gnusocial' => 'GNU social',
 		'jdh' => 'Journal du hacker',
 		'Known' => 'Known-Seite (https://withknown.com)',
+		'lemmy' => 'Lemmy',
 		'linkedin' => 'LinkedIn',
 		'mastodon' => 'Mastodon',
 		'movim' => 'Movim',
diff --git a/app/i18n/de/index.php b/app/i18n/de/index.php
index 10172e6f5..85ab3bb26 100644
--- a/app/i18n/de/index.php
+++ b/app/i18n/de/index.php
@@ -7,7 +7,7 @@ return array(
 		'bugs_reports' => 'Fehlerberichte',
 		'credits' => 'Credits',
 		'credits_content' => 'Einige Designelemente stammen von <a href="http://twitter.github.io/bootstrap/">Bootstrap</a>, obwohl FreshRSS dieses Framework nicht nutzt. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> stammen vom <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> Font wurde von <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a> erstellt. FreshRSS basiert auf <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, einem PHP-Framework.',
-		'freshrss_description' => 'FreshRSS ist ein RSS-Feedsaggregator zum selbst hosten wie zum Beispiel <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> oder <a href="http://leed.idleman.fr/">Leed</a>. Er ist leicht und einfach zu handhaben und gleichzeitig ein leistungsstarkes und konfigurierbares Werkzeug.',
+		'freshrss_description' => 'FreshRSS ist ein RSS-Feedsaggregator zum selbst hosten wie zum Beispiel <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> oder <a href="https://github.com/LeedRSS/Leed">Leed</a>. Er ist leicht und einfach zu handhaben und gleichzeitig ein leistungsstarkes und konfigurierbares Werkzeug.',
 		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',
 		'license' => 'Lizenz',
 		'project_website' => 'Projekt-Webseite',
@@ -15,6 +15,9 @@ return array(
 		'version' => 'Version',
 		'website' => 'Webseite',
 	),
+	'tos' => array(
+		'title' => 'Terms of Service', // TODO - Translation
+	),
 	'feed' => array(
 		'add' => 'Sie können Feeds hinzufügen.',
 		'empty' => 'Es gibt keinen Artikel zum Anzeigen.',
diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php
index abc01b954..754ac0866 100644
--- a/app/i18n/de/sub.php
+++ b/app/i18n/de/sub.php
@@ -13,9 +13,12 @@ return array(
 	'category' => array(
 		'_' => 'Kategorie',
 		'add' => 'Eine Kategorie hinzufügen',
+		'archiving' => 'Archivierung',
 		'empty' => 'Leere Kategorie',
 		'information' => 'Information',
 		'new' => 'Neue Kategorie',
+		'position' => 'Display position',	//TODO - Translation
+		'position_help' => 'To control category sort order',	//TODO - Translation
 		'title' => 'Titel',
 	),
 	'feed' => array(
@@ -40,7 +43,7 @@ return array(
 			'help' => 'Write one search filter per line.',	//TODO - Translation
 		),
 		'information' => 'Information',
-		'keep_history' => 'Minimale Anzahl an Artikeln, die behalten wird',
+		'keep_min' => 'Minimale Anzahl an Artikeln, die behalten wird',
 		'moved_category_deleted' => 'Wenn Sie eine Kategorie entfernen, werden deren Feeds automatisch in die Kategorie <em>%s</em> eingefügt.',
 		'mute' => 'Stumm schalten',
 		'no_selected' => 'Kein Feed ausgewählt.',
@@ -72,6 +75,7 @@ return array(
 	),
 	'firefox' => array(
 		'documentation' => 'Folge den <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">hier</a> beschriebenen Schritten um FreshRSS zu Deiner Firefox RSS-Reader Liste hinzuzufügen.',
+		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	//TODO - Translation
 		'title' => 'Firefox RSS-Reader',
 	),
 	'import_export' => array(
diff --git a/app/i18n/de/user.php b/app/i18n/de/user.php
new file mode 100644
index 000000000..3a8343c11
--- /dev/null
+++ b/app/i18n/de/user.php
@@ -0,0 +1,37 @@
+<?php
+
+return array(
+	'email' => array(
+		'feedback' => array(
+			'invalid' => 'The email address is invalid.', //TODO - Translation
+			'required' => 'The 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
+			'feedback' => array(
+				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //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
+			),
+			'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+			'resend_email' => 'Resend the email', //TODO - Translation
+			'title' => 'Email address validation', //TODO - Translation
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'You must accept the Terms of Service to be able to register.', // TODO - Translation
+		),
+	),
+	'mailer' => array(
+		'email_need_validation' => array(
+			'title' => 'You need to validate your account', //TODO - Translation
+			'welcome' => 'Welcome %s,', //TODO - Translation
+			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+		),
+	),
+);
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 004089ffc..c5ab183e8 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -159,6 +159,7 @@ return array(
 	'system' => array(
 		'_' => 'System configuration',
 		'auto-update-url' => 'Auto-update server URL',
+		'force_email_validation' => 'Force email addresses validation',
 		'instance-name' => 'Instance name',
 		'max-categories' => 'Categories per user limit',
 		'max-feeds' => 'Feeds per user limit',
diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index fde78f5b5..2d4e06550 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -3,13 +3,21 @@
 return array(
 	'archiving' => array(
 		'_' => 'Archiving',
-		'advanced' => 'Advanced',
 		'delete_after' => 'Remove articles after',
+		'exception' => 'Purge exception',
 		'help' => 'More options are available in the individual feed settings',
-		'keep_history_by_feed' => 'Minimum number of articles to keep by feed',
+		'keep_favourites' => 'Never delete favourites',
+		'keep_min_by_feed' => 'Minimum number of articles to keep by feed',
+		'keep_labels' => 'Never delete labels',
+		'keep_unreads' => 'Never delete unreads',
+		'maintenance' => 'Maintenance',
 		'optimize' => 'Optimise database',
 		'optimize_help' => 'Do 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',
+		'keep_max' => 'Maximum number of articles to keep',
+		'keep_period' => 'Maximum age of articles to keep',
 		'title' => 'Archiving',
 		'ttl' => 'Do not automatically refresh more often than',
 	),
@@ -21,6 +29,7 @@ return array(
 			'publication_date' => 'Date of publication',
 			'related_tags' => 'Article tags',
 			'sharing' => 'Sharing',
+			'display_authors' => 'Authors',
 			'top_line' => 'Top line',
 		),
 		'language' => 'Language',
@@ -45,6 +54,7 @@ return array(
 			'_' => 'Account deletion',
 			'warn' => 'Your account and all related data will be deleted.',
 		),
+		'email' => 'Email address',
 		'password_api' => 'API password<br /><small>(e.g., for mobile apps)</small>',
 		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
 		'password_format' => 'At least 7 characters',
@@ -133,7 +143,6 @@ return array(
 		'diaspora' => 'Diaspora*',
 		'email' => 'Email',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'more_information' => 'More information',
 		'print' => 'Print',
 		'remove' => 'Remove sharing method',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 32f5ee02e..fc1bd587a 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -3,6 +3,7 @@
 return array(
 	'action' => array(
 		'actualize' => 'Actualize',
+		'back' => '← Go back',
 		'back_to_rss_feeds' => '← Go back to your RSS feeds',
 		'cancel' => 'Cancel',
 		'create' => 'Create',
@@ -22,6 +23,7 @@ return array(
 		'update' => 'Update',
 	),
 	'auth' => array(
+		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.',
 		'email' => 'Email address',
 		'keep_logged_in' => 'Keep me logged in <small>(%s days)</small>',
 		'login' => 'Login',
@@ -127,6 +129,7 @@ return array(
 		'oc' => 'Occitan',
 		'pt-br' => 'Português (Brasil)',
 		'ru' => 'Русский',
+		'sk' => 'Slovenčina',
 		'tr' => 'Türkçe',
 		'zh-cn' => '简体中文',
 	),
@@ -160,15 +163,22 @@ return array(
 		'nothing_to_load' => 'There are no more articles',
 		'previous' => 'Previous',
 	),
+	'period' => array(
+		'days' => 'days',
+		'hours' => 'hours',
+		'months' => 'months',
+		'weeks' => 'weeks',
+		'years' => 'years',
+	),
 	'share' => array(
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
 		'email' => 'Email',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'gnusocial' => 'GNU social',
 		'jdh' => 'Journal du hacker',
 		'Known' => 'Known based sites',
+		'lemmy' => 'Lemmy',
 		'linkedin' => 'LinkedIn',
 		'mastodon' => 'Mastodon',
 		'movim' => 'Movim',
diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php
index 46c415816..71bf8b53e 100644
--- a/app/i18n/en/index.php
+++ b/app/i18n/en/index.php
@@ -7,7 +7,7 @@ return array(
 		'bugs_reports' => 'Bugs 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="http://leed.idleman.fr/">Leed</a>. It is light and easy to take in hand while being powerful and configurable tool.',
+		'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.',
 		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',
 		'license' => 'License',
 		'project_website' => 'Project website',
@@ -15,6 +15,9 @@ return array(
 		'version' => 'Version',
 		'website' => 'Website',
 	),
+	'tos' => array(
+		'title' => 'Terms of Service',
+	),
 	'feed' => array(
 		'add' => 'You may add some feeds.',
 		'empty' => 'There is no article to show.',
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index fde01f9df..252177940 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -13,9 +13,12 @@ return array(
 	'category' => array(
 		'_' => 'Category',
 		'add' => 'Add a category',
+		'archiving' => 'Archiving',
 		'empty' => 'Empty category',
 		'information' => 'Information',
 		'new' => 'New category',
+		'position' => 'Display position',
+		'position_help' => 'To control category sort order',
 		'title' => 'Title',
 	),
 	'feed' => array(
@@ -40,7 +43,7 @@ return array(
 			'help' => 'Write one search filter per line.',
 		),
 		'information' => 'Information',
-		'keep_history' => 'Minimum number of articles to keep',
+		'keep_min' => 'Minimum number of articles to keep',
 		'moved_category_deleted' => 'When you delete a category, its feeds are automatically classified under <em>%s</em>.',
 		'mute' => 'mute',
 		'no_selected' => 'No feed selected.',
@@ -72,6 +75,7 @@ return array(
 	),
 	'firefox' => array(
 		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',
+		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',
 		'title' => 'Firefox feed reader',
 	),
 	'import_export' => array(
diff --git a/app/i18n/en/user.php b/app/i18n/en/user.php
new file mode 100644
index 000000000..54d8dfa4d
--- /dev/null
+++ b/app/i18n/en/user.php
@@ -0,0 +1,37 @@
+<?php
+
+return array(
+	'email' => array(
+		'feedback' => array(
+			'invalid' => 'The email address is invalid.',
+			'required' => 'The 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.',
+			'feedback' => array(
+				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.',
+				'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.',
+			),
+			'need_to' => 'You need to validate your email address before being able to use %s.',
+			'resend_email' => 'Resend the email',
+			'title' => 'Email address validation',
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'You must accept the Terms of Service to be able to register.',
+		),
+	),
+	'mailer' => array(
+		'email_need_validation' => array(
+			'title' => 'You need to validate your account',
+			'welcome' => 'Welcome %s,',
+			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:',
+		),
+	),
+);
diff --git a/app/i18n/es/admin.php b/app/i18n/es/admin.php
index 0ec8549bd..1af3bdcb2 100755
--- a/app/i18n/es/admin.php
+++ b/app/i18n/es/admin.php
@@ -159,6 +159,7 @@ return array(
 	'system' => array(
 		'_' => 'Configuración del sistema',
 		'auto-update-url' => 'URL de auto-actualización',
+		'force_email_validation' => 'Force email addresses 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 b7d87f375..7a93a87de 100755
--- a/app/i18n/es/conf.php
+++ b/app/i18n/es/conf.php
@@ -3,13 +3,21 @@
 return array(
 	'archiving' => array(
 		'_' => 'Archivo',
-		'advanced' => 'Avanzado',
 		'delete_after' => 'Eliminar artículos tras',
+		'exception' => 'Purge exception',	//TODO - Translation
 		'help' => 'Hay más opciones disponibles en los ajustes de la fuente',
-		'keep_history_by_feed' => 'Número mínimo de artículos a conservar por fuente',
+		'keep_favourites' => 'Never delete favourites',	//TODO - Translation
+		'keep_min_by_feed' => 'Número mínimo de artículos a conservar por fuente',
+		'keep_labels' => 'Never delete labels',	//TODO - Translation
+		'keep_unreads' => 'Never delete unreads',	//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',
+		'policy' => 'Purge policy',	//TODO - Translation
+		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	//TODO - Translation
 		'purge_now' => 'Limpiar ahora',
+		'keep_max' => 'Maximum number of articles to keep',	//TODO - Translation
+		'keep_period' => 'Maximum age of articles to keep',	//TODO - Translation
 		'title' => 'Archivo',
 		'ttl' => 'No actualizar automáticamente más de',
 	),
@@ -21,6 +29,7 @@ return array(
 			'publication_date' => 'Fecha de publicación',
 			'related_tags' => 'Etiquetas relacionadas',
 			'sharing' => 'Compartir',
+			'display_authors' => 'Authors',  //TODO - Translation
 			'top_line' => 'Línea superior',
 		),
 		'language' => 'Idioma',
@@ -45,6 +54,7 @@ return array(
 			'_' => 'Borrar cuenta',
 			'warn' => 'Tu cuenta y todos los datos asociados serán eliminados.',
 		),
+		'email' => 'Correo electrónico',
 		'password_api' => 'Contraseña API <br /><small>(para apps móviles, por ej.)</small>',
 		'password_form' => 'Contraseña<br /><small>(para el método de identificación por formulario web)</small>',
 		'password_format' => 'Mínimo de 7 caracteres',
@@ -133,7 +143,6 @@ return array(
 		'diaspora' => 'Diaspora*',
 		'email' => 'Email',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'more_information' => 'Más información',
 		'print' => 'Print',
 		'remove' => 'Remove sharing method',	//TODO - Translation
diff --git a/app/i18n/es/gen.php b/app/i18n/es/gen.php
index db36e5f5b..538ddc8fe 100755
--- a/app/i18n/es/gen.php
+++ b/app/i18n/es/gen.php
@@ -3,6 +3,7 @@
 return array(
 	'action' => array(
 		'actualize' => 'Actualizar',
+		'back' => '← Go back', //TODO - Translation
 		'back_to_rss_feeds' => '← regresar a tus fuentes RSS',
 		'cancel' => 'Cancelar',
 		'create' => 'Crear',
@@ -22,6 +23,7 @@ return array(
 		'update' => 'Update',	//TODO - Translation
 	),
 	'auth' => array(
+		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.', // TODO - Translation
 		'email' => 'Correo electrónico',
 		'keep_logged_in' => 'Mantenerme identificado <small>(%s días)</small>',
 		'login' => 'Conectar',
@@ -160,15 +162,22 @@ return array(
 		'nothing_to_load' => 'No hay más artículos',
 		'previous' => 'Anterior',
 	),
+	'period' => array(
+		'days' => 'days',	//TODO - Translation
+		'hours' => 'hours',	//TODO - Translation
+		'months' => 'months',	//TODO - Translation
+		'weeks' => 'weeks',	//TODO - Translation
+		'years' => 'years',	//TODO - Translation
+	),
 	'share' => array(
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
 		'email' => 'Email',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'gnusocial' => 'GNU social',
 		'jdh' => 'Journal du hacker',
 		'Known' => 'Known based sites',
+		'lemmy' => 'Lemmy',
 		'linkedin' => 'LinkedIn',
 		'mastodon' => 'Mastodon',
 		'movim' => 'Movim',
diff --git a/app/i18n/es/index.php b/app/i18n/es/index.php
index d7a42537b..8977ee70b 100755
--- a/app/i18n/es/index.php
+++ b/app/i18n/es/index.php
@@ -7,7 +7,7 @@ return array(
 		'bugs_reports' => 'Informe de fallos',
 		'credits' => 'Créditos',
 		'credits_content' => 'Aunque FreshRSS no usa ese entorno, algunos elementos del diseño están obtenidos de <a href="http://twitter.github.io/bootstrap/">Bootstrap</a>. Los <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Iconos</a> han sido obtenidos del <a href="https://www.gnome.org/">proyecto GNOME</a>. La fuente <em>Open Sans</em> es una creación de <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS usa el entorno PHP <a href="https://github.com/marienfressinaud/MINZ">Minz</a>.',
-		'freshrss_description' => 'FreshRSS es un agregador de fuentes RSS de alojamiento privado al estilo de <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> o <a href="http://leed.idleman.fr/">Leed</a>. Es una herramienta potente, pero ligera y fácil de usar y configurar.',
+		'freshrss_description' => 'FreshRSS es un agregador de fuentes RSS de alojamiento privado al estilo de <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> o <a href="https://github.com/LeedRSS/Leed">Leed</a>. Es una herramienta potente, pero ligera y fácil de usar y configurar.',
 		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">en Github</a>',
 		'license' => 'Licencia',
 		'project_website' => 'Web del proyecto',
@@ -15,6 +15,9 @@ return array(
 		'version' => 'Versión',
 		'website' => 'Web',
 	),
+	'tos' => array(
+		'title' => 'Terms of Service', // TODO - Translation
+	),
 	'feed' => array(
 		'add' => 'Puedes añadir fuentes.',
 		'empty' => 'No hay artículos a mostrar.',
diff --git a/app/i18n/es/sub.php b/app/i18n/es/sub.php
index 7d33c59fa..f1640b76b 100755
--- a/app/i18n/es/sub.php
+++ b/app/i18n/es/sub.php
@@ -13,9 +13,12 @@ return array(
 	'category' => array(
 		'_' => 'Categoría',
 		'add' => 'Añadir a la categoría',
+		'archiving' => 'Archivo',
 		'empty' => 'Vaciar categoría',
 		'information' => 'Información',
 		'new' => 'Nueva categoría',
+		'position' => 'Display position',	//TODO - Translation
+		'position_help' => 'To control category sort order',	//TODO - Translation
 		'title' => 'Título',
 	),
 	'feed' => array(
@@ -40,7 +43,7 @@ return array(
 			'help' => 'Write one search filter per line.',	//TODO - Translation
 		),
 		'information' => 'Información',
-		'keep_history' => 'Número mínimo de artículos a conservar',
+		'keep_min' => 'Número mínimo de artículos a conservar',
 		'moved_category_deleted' => 'Al borrar una categoría todas sus fuentes pasan automáticamente a la categoría <em>%s</em>.',
 		'mute' => 'mute',	//TODO - Translation
 		'no_selected' => 'No hay funentes seleccionadas.',
@@ -72,6 +75,7 @@ return array(
 	),
 	'firefox' => array(
 		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',	//TODO - Translation
+		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	//TODO - Translation
 		'title' => 'Firefox feed reader',	//TODO - Translation
 	),
 	'import_export' => array(
diff --git a/app/i18n/es/user.php b/app/i18n/es/user.php
new file mode 100644
index 000000000..3a8343c11
--- /dev/null
+++ b/app/i18n/es/user.php
@@ -0,0 +1,37 @@
+<?php
+
+return array(
+	'email' => array(
+		'feedback' => array(
+			'invalid' => 'The email address is invalid.', //TODO - Translation
+			'required' => 'The 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
+			'feedback' => array(
+				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //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
+			),
+			'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+			'resend_email' => 'Resend the email', //TODO - Translation
+			'title' => 'Email address validation', //TODO - Translation
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'You must accept the Terms of Service to be able to register.', // TODO - Translation
+		),
+	),
+	'mailer' => array(
+		'email_need_validation' => array(
+			'title' => 'You need to validate your account', //TODO - Translation
+			'welcome' => 'Welcome %s,', //TODO - Translation
+			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+		),
+	),
+);
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index 74605b5ee..6002617fc 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -159,6 +159,7 @@ return array(
 	'system' => array(
 		'_' => 'Configuration du système',
 		'auto-update-url' => 'URL du service de mise à jour',
+		'force_email_validation' => 'Forcer la validation des adresses email',
 		'instance-name' => 'Nom de l’instance',
 		'max-categories' => 'Limite de catégories par utilisateur',
 		'max-feeds' => 'Limite de flux par utilisateur',
diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php
index ef29a360e..020c94085 100644
--- a/app/i18n/fr/conf.php
+++ b/app/i18n/fr/conf.php
@@ -3,13 +3,21 @@
 return array(
 	'archiving' => array(
 		'_' => 'Archivage',
-		'advanced' => 'Avancé',
 		'delete_after' => 'Supprimer les articles après',
+		'exception' => 'Exception de nettoyage',
 		'help' => 'D’autres options sont disponibles dans la configuration individuelle des flux.',
-		'keep_history_by_feed' => 'Nombre minimum d’articles à conserver par flux',
+		'keep_favourites' => 'Ne jamais supprimer les articles favoris',
+		'keep_min_by_feed' => 'Nombre minimum d’articles à conserver par flux',
+		'keep_labels' => 'Ne jamais supprimer les articles étiquetés',
+		'keep_unreads' => 'Ne jamais supprimer les articles non lus',
+		'maintenance' => 'Maintenance',
 		'optimize' => 'Optimiser la base de données',
 		'optimize_help' => 'À faire de temps en temps pour réduire la taille de la BDD',
+		'policy' => 'Politique de nettoyage',
+		'policy_warning' => 'Si aucune politique de nettoyage n’est sélectionnée, tous les articles seront conservés.',
 		'purge_now' => 'Purger maintenant',
+		'keep_max' => 'Nombre maximum d’articles à conserver',
+		'keep_period' => 'Âge maximum des articles à conserver',
 		'title' => 'Archivage',
 		'ttl' => 'Ne pas automatiquement rafraîchir plus souvent que',
 	),
@@ -21,6 +29,7 @@ return array(
 			'publication_date' => 'Date de publication',
 			'related_tags' => 'Tags de l’article',
 			'sharing' => 'Partage',
+			'display_authors' => 'Authors',  //TODO - Translation
 			'top_line' => 'Ligne du haut',
 		),
 		'language' => 'Langue',
@@ -45,6 +54,7 @@ return array(
 			'_' => 'Suppression du compte',
 			'warn' => 'Le compte et toutes les données associées vont être supprimées.',
 		),
+		'email' => 'Adresse email',
 		'password_api' => 'Mot de passe API<br /><small>(ex. : pour applis mobiles)</small>',
 		'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
 		'password_format' => '7 caractères minimum',
@@ -133,7 +143,6 @@ return array(
 		'diaspora' => 'Diaspora*',
 		'email' => 'Courriel',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'more_information' => 'Plus d’informations',
 		'print' => 'Print',
 		'remove' => 'Supprimer la méthode de partage',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 86d8461e6..a6875dd05 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -3,6 +3,7 @@
 return array(
 	'action' => array(
 		'actualize' => 'Actualiser',
+		'back' => '← Retour',
 		'back_to_rss_feeds' => '← Retour à vos flux RSS',
 		'cancel' => 'Annuler',
 		'create' => 'Créer',
@@ -22,6 +23,7 @@ return array(
 		'update' => 'Mettre à jour',
 	),
 	'auth' => array(
+		'accept_tos' => 'Accepter les <a href="%s">Conditions Générales d’Utilisation</a>.',
 		'email' => 'Adresse courriel',
 		'keep_logged_in' => 'Rester connecté <small>(%s jours)</small>',
 		'login' => 'Connexion',
@@ -160,15 +162,22 @@ return array(
 		'nothing_to_load' => 'Fin des articles',
 		'previous' => 'Précédent',
 	),
+	'period' => array(
+		'days' => 'jours',
+		'hours' => 'heures',
+		'months' => 'mois',
+		'weeks' => 'semaines',
+		'years' => 'années',
+	),
 	'share' => array(
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
 		'email' => 'Courriel',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'gnusocial' => 'GNU social',
 		'jdh' => 'Journal du hacker',
 		'Known' => 'Sites basés sur Known',
+		'lemmy' => 'Lemmy',
 		'linkedin' => 'LinkedIn',
 		'mastodon' => 'Mastodon',
 		'movim' => 'Movim',
diff --git a/app/i18n/fr/index.php b/app/i18n/fr/index.php
index c9595e449..489de3849 100644
--- a/app/i18n/fr/index.php
+++ b/app/i18n/fr/index.php
@@ -7,7 +7,7 @@ return array(
 		'bugs_reports' => 'Rapports de bugs',
 		'credits' => 'Crédits',
 		'credits_content' => 'Des éléments de design sont issus du <a href="http://twitter.github.io/bootstrap/">projet Bootstrap</a> bien que FreshRSS n’utilise pas ce framework. Les <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">icônes</a> sont issues du <a href="https://www.gnome.org/">projet GNOME</a>. La police <em>Open Sans</em> utilisée a été créée par <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS repose sur <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, un framework PHP.',
-		'freshrss_description' => 'FreshRSS est un agrégateur de flux RSS à auto-héberger à l’image de <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> ou <a href="http://leed.idleman.fr/">Leed</a>. Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable.',
+		'freshrss_description' => 'FreshRSS est un agrégateur de flux RSS à auto-héberger à l’image de <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> ou <a href="https://github.com/LeedRSS/Leed">Leed</a>. Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable.',
 		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">sur Github</a>',
 		'license' => 'Licence',
 		'project_website' => 'Site du projet',
@@ -15,6 +15,9 @@ return array(
 		'version' => 'Version',
 		'website' => 'Site Internet',
 	),
+	'tos' => array(
+		'title' => 'Conditions Générales d’Utilisation',
+	),
 	'feed' => array(
 		'add' => 'Vous pouvez ajouter des flux.',
 		'empty' => 'Il n’y a aucun article à afficher.',
diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php
index df44150c2..e12444315 100644
--- a/app/i18n/fr/sub.php
+++ b/app/i18n/fr/sub.php
@@ -13,9 +13,12 @@ return array(
 	'category' => array(
 		'_' => 'Catégorie',
 		'add' => 'Ajouter une catégorie',
+		'archiving' => 'Archivage',
 		'empty' => 'Catégorie vide',
 		'information' => 'Informations',
 		'new' => 'Nouvelle catégorie',
+		'position' => 'Position d’affichage',
+		'position_help' => 'Pour contrôler l’ordre de tri des catégories',
 		'title' => 'Titre',
 	),
 	'feed' => array(
@@ -40,7 +43,7 @@ return array(
 			'help' => 'Écrivez une recherche par ligne.',
 		),
 		'information' => 'Informations',
-		'keep_history' => 'Nombre minimum d’articles à conserver',
+		'keep_min' => 'Nombre minimum d’articles à conserver',
 		'moved_category_deleted' => 'Lors de la suppression d’une catégorie, ses flux seront automatiquement classés dans <em>%s</em>.',
 		'mute' => 'muet',
 		'no_selected' => 'Aucun flux sélectionné.',
@@ -72,6 +75,7 @@ return array(
 	),
 	'firefox' => array(
 		'documentation' => 'Suivre les étapes décrites <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">ici</a> pour ajouter FreshRSS à la liste des lecteurs de flux dans Firefox.',
+		'obsolete_63' => 'À partir de la version 63, Firefox ne supporte plus l’ajout de services d’abonnements.',
 		'title' => 'Lecteur de flux dans Firefox',
 	),
 	'import_export' => array(
diff --git a/app/i18n/fr/user.php b/app/i18n/fr/user.php
new file mode 100644
index 000000000..7b531c749
--- /dev/null
+++ b/app/i18n/fr/user.php
@@ -0,0 +1,37 @@
+<?php
+
+return array(
+	'email' => array(
+		'feedback' => array(
+			'invalid' => 'L’adresse email est invalide.',
+			'required' => 'L’adresse email est requise.',
+		),
+		'validation' => array(
+			'change_email' => 'Vous pouvez changer votre adresse email <a href="%s">dans votre profil</a>.',
+			'email_sent_to' => 'Nous venons d’envoyer un email à <strong>%s</strong>, veuillez suivre ses indications pour valider votre adresse.',
+			'feedback' => array(
+				'email_failed' => 'Nous n’avons pas pu vous envoyer d’email à cause d’une mauvaise configuration du serveur.',
+				'email_sent' => 'Un email a été envoyé à votre adresse.',
+				'error' => 'L’adresse email n’a pas pu être validée.',
+				'ok' => 'L’adresse email a été validée.',
+				'unnecessary' => 'L’adresse email a déjà été validée.',
+				'wrong_token' => 'L’adresse email n’a pas pu être validée à cause d’un mauvais token.',
+			),
+			'need_to' => 'Vous devez valider votre adresse email avant de pouvoir utiliser %s.',
+			'resend_email' => 'Renvoyer l’email',
+			'title' => 'Validation de l’adresse email',
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'Vous devez accepter les conditions générales d’utilisation pour pouvoir vous inscrire.',
+		),
+	),
+	'mailer' => array(
+		'email_need_validation' => array(
+			'title' => 'Vous devez valider votre compte',
+			'welcome' => 'Bienvenue %s,',
+			'body' => 'Vous venez de vous inscrire sur %s mais vous devez encore valider votre adresse email. Pour cela, veuillez cliquer sur ce lien :',
+		),
+	),
+);
diff --git a/app/i18n/he/admin.php b/app/i18n/he/admin.php
index e0dfc405d..759b74e2a 100644
--- a/app/i18n/he/admin.php
+++ b/app/i18n/he/admin.php
@@ -163,6 +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
 		'instance-name' => 'Instance name', //TODO - Translation
 		'max-categories' => 'Categories per user limit', //TODO - Translation
 		'max-feeds' => 'Feeds per user limit', //TODO - Translation
diff --git a/app/i18n/he/conf.php b/app/i18n/he/conf.php
index 1eb447911..b987f21f4 100644
--- a/app/i18n/he/conf.php
+++ b/app/i18n/he/conf.php
@@ -3,13 +3,21 @@
 return array(
 	'archiving' => array(
 		'_' => 'ארכוב',
-		'advanced' => 'מתקדם',
 		'delete_after' => 'מחיקת מאמרים לאחר',
+		'exception' => 'Purge exception',	//TODO - Translation
 		'help' => 'אפשרויות נוספות זמינות בזרמים ספציפיים',
-		'keep_history_by_feed' => 'Minimum number of articles to keep by feed',	//TODO - Translation
+		'keep_favourites' => 'Never delete favourites',	//TODO - Translation
+		'keep_min_by_feed' => 'Minimum number of articles to keep by feed',
+		'keep_labels' => 'Never delete labels',	//TODO - Translation
+		'keep_unreads' => 'Never delete unreads',	//TODO - Translation
+		'maintenance' => 'Maintenance',	//TODO - Translation
 		'optimize' => 'מיטוב בסיס הנתונים',
 		'optimize_help' => 'ביצוע לעיתים קרובות על מנת למטב את בסיס הנתונים',
+		'policy' => 'Purge policy',	//TODO - Translation
+		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	//TODO - Translation
 		'purge_now' => 'ניקוי עכשיו',
+		'keep_max' => 'Maximum number of articles to keep',	//TODO - Translation
+		'keep_period' => 'Maximum age of articles to keep',	//TODO - Translation
 		'title' => 'ארכוב',
 		'ttl' => 'אין לרענן אוטומטית יותר מ',
 	),
@@ -21,6 +29,7 @@ return array(
 			'publication_date' => 'תאריך הפרסום',
 			'related_tags' => 'תגיות קשורות',	//TODO - Translation
 			'sharing' => 'שיתוף',
+			'display_authors' => 'Authors',  //TODO - Translation
 			'top_line' => 'שורה עליונה',
 		),
 		'language' => 'שפה',
@@ -45,6 +54,7 @@ return array(
 			'_' => 'Account deletion',	//TODO - Translation
 			'warn' => 'Your account and all related data will be deleted.',	//TODO - Translation
 		),
+		'email' => 'Email address',	//TODO - Translation
 		'password_api' => 'סיסמת API<br /><small>(לדוגמה ליישומים סלולריים)</small>',
 		'password_form' => 'סיסמה<br /><small>(לשימוש בטפוס ההרשמה)</small>',
 		'password_format' => 'At least 7 characters',	//TODO - Translation
@@ -133,7 +143,6 @@ return array(
 		'diaspora' => 'Diaspora*',
 		'email' => 'דואר אלקטרוני',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'more_information' => 'מידע נוסף',
 		'print' => 'הדפסה',
 		'remove' => 'Remove sharing method',	//TODO - Translation
diff --git a/app/i18n/he/gen.php b/app/i18n/he/gen.php
index cf4a1fcda..34e6d77de 100644
--- a/app/i18n/he/gen.php
+++ b/app/i18n/he/gen.php
@@ -3,6 +3,7 @@
 return array(
 	'action' => array(
 		'actualize' => 'מימוש',
+		'back' => '← Go back', //TODO - Translation
 		'back_to_rss_feeds' => '← חזרה להזנות הRSS שלך',
 		'cancel' => 'ביטול',
 		'create' => 'יצירה',
@@ -22,6 +23,7 @@ return array(
 		'update' => 'Update',	//TODO - Translation
 	),
 	'auth' => array(
+		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.', // TODO - Translation
 		'email' => 'Email address',	//TODO - Translation
 		'keep_logged_in' => 'השאר מחובר <small>חודש</small>',
 		'login' => 'כניסה לחשבון',
@@ -160,15 +162,22 @@ return array(
 		'nothing_to_load' => 'אין מאמרים נוספים',
 		'previous' => 'הקודם',
 	),
+	'period' => array(
+		'days' => 'days',	//TODO - Translation
+		'hours' => 'hours',	//TODO - Translation
+		'months' => 'months',	//TODO - Translation
+		'weeks' => 'weeks',	//TODO - Translation
+		'years' => 'years',	//TODO - Translation
+	),
 	'share' => array(
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
 		'email' => 'דואר אלקטרוני',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'gnusocial' => 'GNU social',
 		'jdh' => 'Journal du hacker',
 		'Known' => 'Known based sites',
+		'lemmy' => 'Lemmy',
 		'linkedin' => 'LinkedIn',
 		'mastodon' => 'Mastodon',
 		'movim' => 'Movim',
diff --git a/app/i18n/he/index.php b/app/i18n/he/index.php
index e01a02773..7cd1945e7 100644
--- a/app/i18n/he/index.php
+++ b/app/i18n/he/index.php
@@ -7,7 +7,7 @@ return array(
 		'bugs_reports' => 'דיווח באגים',
 		'credits' => 'קרדיטים',
 		'credits_content' => 'מאפייני עיצוב מסויימים הגיעו מ <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> אף על פי ש FreshRSS אינו משתמש בתשתית הזו. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">סמלילים</a> הגיעו מ <a href="https://www.gnome.org/"> פרוייקט GNOME </a>. <em>Open Sans</em> הגופן police נוצר על ידי <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Favicons נאספים בעזרת <a href="https://getfavicon.appspot.com/">getFavicon API</a>. FreshRSS מבוסס על <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, תשתית PHP.',
-		'freshrss_description' => 'FreshRSS הוא קורא RSS לאחסון עצמי בדומה ל <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> או <a href="http://leed.idleman.fr/">Leed</a>. אינו צורך משאבים רבים, וקל לתפעול אך בו בזמן חזק וניתן להתאמה.',
+		'freshrss_description' => 'FreshRSS הוא קורא RSS לאחסון עצמי בדומה ל <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> או <a href="https://github.com/LeedRSS/Leed">Leed</a>. אינו צורך משאבים רבים, וקל לתפעול אך בו בזמן חזק וניתן להתאמה.',
 		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">בגיטהאב</a>',
 		'license' => 'רישיון',
 		'project_website' => 'אתר',
@@ -15,6 +15,9 @@ return array(
 		'version' => 'גרסה',
 		'website' => 'אתר',
 	),
+	'tos' => array(
+		'title' => 'Terms of Service', // TODO - Translation
+	),
 	'feed' => array(
 		'add' => 'ניתן להוסיף הזנות חדשות.',
 		'empty' => 'אין מאמר להצגה.',
diff --git a/app/i18n/he/sub.php b/app/i18n/he/sub.php
index 8a629defb..3fd0f267a 100644
--- a/app/i18n/he/sub.php
+++ b/app/i18n/he/sub.php
@@ -13,9 +13,12 @@ return array(
 	'category' => array(
 		'_' => 'קטגוריה',
 		'add' => 'הוספת קטגוריה',
+		'archiving' => 'ארכוב',
 		'empty' => 'Empty category',	//TODO - Translation
 		'information' => 'מידע',
 		'new' => 'קטגוריה חדשה',
+		'position' => 'Display position',	//TODO - Translation
+		'position_help' => 'To control category sort order',	//TODO - Translation
 		'title' => 'כותרת',
 	),
 	'feed' => array(
@@ -40,7 +43,7 @@ return array(
 			'help' => 'Write one search filter per line.',	//TODO - Translation
 		),
 		'information' => 'מידע',
-		'keep_history' => 'מסםר מינימלי של מאמרים לשמור',
+		'keep_min' => 'מסםר מינימלי של מאמרים לשמור',
 		'moved_category_deleted' => 'כאשר הקטגוריה נמחקת ההזנות שבתוכה אוטומטית מקוטלגות תחת  <em>%s</em>.',
 		'mute' => 'mute',	//TODO - Translation
 		'no_selected' => 'אף הזנה לא נבחרה.',
@@ -72,6 +75,7 @@ return array(
 	),
 	'firefox' => array(
 		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',	//TODO - Translation
+		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	//TODO - Translation
 		'title' => 'Firefox feed reader',	//TODO - Translation
 	),
 	'import_export' => array(
diff --git a/app/i18n/he/user.php b/app/i18n/he/user.php
new file mode 100644
index 000000000..3a8343c11
--- /dev/null
+++ b/app/i18n/he/user.php
@@ -0,0 +1,37 @@
+<?php
+
+return array(
+	'email' => array(
+		'feedback' => array(
+			'invalid' => 'The email address is invalid.', //TODO - Translation
+			'required' => 'The 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
+			'feedback' => array(
+				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //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
+			),
+			'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+			'resend_email' => 'Resend the email', //TODO - Translation
+			'title' => 'Email address validation', //TODO - Translation
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'You must accept the Terms of Service to be able to register.', // TODO - Translation
+		),
+	),
+	'mailer' => array(
+		'email_need_validation' => array(
+			'title' => 'You need to validate your account', //TODO - Translation
+			'welcome' => 'Welcome %s,', //TODO - Translation
+			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+		),
+	),
+);
diff --git a/app/i18n/it/admin.php b/app/i18n/it/admin.php
index d4253e9ba..8bb6c7bfe 100644
--- a/app/i18n/it/admin.php
+++ b/app/i18n/it/admin.php
@@ -159,6 +159,7 @@ return array(
 	'system' => array(
 		'_' => 'Configurazione di sistema',
 		'auto-update-url' => 'Auto-update server URL',	//TODO - Translation
+		'force_email_validation' => 'Force email addresses 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 df4a5ebeb..4bdaad33d 100644
--- a/app/i18n/it/conf.php
+++ b/app/i18n/it/conf.php
@@ -3,13 +3,21 @@
 return array(
 	'archiving' => array(
 		'_' => 'Archiviazione',
-		'advanced' => 'Avanzate',
 		'delete_after' => 'Rimuovi articoli dopo',
+		'exception' => 'Purge exception',	//TODO - Translation
 		'help' => 'Altre opzioni sono disponibili nelle impostazioni dei singoli feed',
-		'keep_history_by_feed' => 'Numero minimo di articoli da mantenere per feed',
+		'keep_favourites' => 'Never delete favourites',	//TODO - Translation
+		'keep_min_by_feed' => 'Numero minimo di articoli da mantenere per feed',
+		'keep_labels' => 'Never delete labels',	//TODO - Translation
+		'keep_unreads' => 'Never delete unreads',	//TODO - Translation
+		'maintenance' => 'Maintenance',	//TODO - Translation
 		'optimize' => 'Ottimizza database',
 		'optimize_help' => 'Da fare occasionalmente per ridurre le dimensioni del database',
+		'policy' => 'Purge policy',	//TODO - Translation
+		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	//TODO - Translation
 		'purge_now' => 'Cancella ora',
+		'keep_max' => 'Maximum number of articles to keep',	//TODO - Translation
+		'keep_period' => 'Maximum age of articles to keep',	//TODO - Translation
 		'title' => 'Archiviazione',
 		'ttl' => 'Non effettuare aggiornamenti per più di',
 	),
@@ -21,6 +29,7 @@ return array(
 			'publication_date' => 'Data di pubblicazione',
 			'related_tags' => 'Tags correlati',	//TODO - Translation
 			'sharing' => 'Condivisione',
+			'display_authors' => 'Authors',  //TODO - Translation
 			'top_line' => 'Barra in alto',
 		),
 		'language' => 'Lingua',
@@ -45,6 +54,7 @@ return array(
 			'_' => 'Cancellazione account',
 			'warn' => 'Il tuo account e tutti i dati associati saranno cancellati.',
 		),
+		'email' => 'Indirizzo email',
 		'password_api' => 'Password API<br /><small>(e.g., per applicazioni mobili)</small>',
 		'password_form' => 'Password<br /><small>(per il login classico)</small>',
 		'password_format' => 'Almeno 7 caratteri',
@@ -133,7 +143,6 @@ return array(
 		'diaspora' => 'Diaspora*',
 		'email' => 'Email',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'more_information' => 'Ulteriori informazioni',
 		'print' => 'Stampa',
 		'remove' => 'Remove sharing method',	//TODO - Translation
diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index 9cc40ffe3..50d4b4e6c 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -3,6 +3,7 @@
 return array(
 	'action' => array(
 		'actualize' => 'Aggiorna',
+		'back' => '← Go back', //TODO - Translation
 		'back_to_rss_feeds' => '← Indietro',
 		'cancel' => 'Annulla',
 		'create' => 'Crea',
@@ -22,6 +23,7 @@ return array(
 		'update' => 'Update', // TODO
 	),
 	'auth' => array(
+		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.', // TODO - Translation
 		'email' => 'Indirizzo email',
 		'keep_logged_in' => 'Ricorda i dati <small>(%s giorni)</small>',
 		'login' => 'Accedi',
@@ -160,15 +162,22 @@ return array(
 		'nothing_to_load' => 'Non ci sono altri articoli',
 		'previous' => 'Precedente',
 	),
+	'period' => array(
+		'days' => 'days',	//TODO - Translation
+		'hours' => 'hours',	//TODO - Translation
+		'months' => 'months',	//TODO - Translation
+		'weeks' => 'weeks',	//TODO - Translation
+		'years' => 'years',	//TODO - Translation
+	),
 	'share' => array(
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
 		'email' => 'Email',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'gnusocial' => 'GNU social',
 		'jdh' => 'Journal du hacker',
 		'Known' => 'Siti basati su Known',
+		'lemmy' => 'Lemmy',
 		'linkedin' => 'LinkedIn',
 		'mastodon' => 'Mastodon',
 		'movim' => 'Movim',
diff --git a/app/i18n/it/index.php b/app/i18n/it/index.php
index 8162b1639..16c695a12 100644
--- a/app/i18n/it/index.php
+++ b/app/i18n/it/index.php
@@ -7,7 +7,7 @@ return array(
 		'bugs_reports' => 'Bugs',
 		'credits' => 'Crediti',
 		'credits_content' => 'Alcuni elementi di design provengono da <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> sebbene FreshRSS non usi questo framework. Le <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">icone</a> provengono dal progetto <a href="https://www.gnome.org/">GNOME</a>. Il carattere <em>Open Sans</em> è stato creato da <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS è basato su <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, un framework PHP.',
-		'freshrss_description' => 'FreshRSS è un aggregatore di feeds RSS da installare sul proprio host come <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> o <a href="http://leed.idleman.fr/">Leed</a>. Leggero e facile da mantenere pur essendo molto configurabile e potente.',
+		'freshrss_description' => 'FreshRSS è un aggregatore di feeds RSS da installare sul proprio host come <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> o <a href="https://github.com/LeedRSS/Leed">Leed</a>. Leggero e facile da mantenere pur essendo molto configurabile e potente.',
 		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">su Github</a>',
 		'license' => 'Licenza',
 		'project_website' => 'Sito del progetto',
@@ -15,6 +15,9 @@ return array(
 		'version' => 'Versione',
 		'website' => 'Sito',
 	),
+	'tos' => array(
+		'title' => 'Terms of Service', // TODO - Translation
+	),
 	'feed' => array(
 		'add' => 'Aggiungi un Feed RSS',
 		'empty' => 'Non ci sono articoli da mostrare.',
diff --git a/app/i18n/it/sub.php b/app/i18n/it/sub.php
index 50738d9e3..78db7b0a6 100644
--- a/app/i18n/it/sub.php
+++ b/app/i18n/it/sub.php
@@ -13,9 +13,12 @@ return array(
 	'category' => array(
 		'_' => 'Categoria',
 		'add' => 'Aggiungi una categoria',
+		'archiving' => 'Archiviazione',
 		'empty' => 'Categoria vuota',
 		'information' => 'Informazioni',
 		'new' => 'Nuova categoria',
+		'position' => 'Display position',	//TODO - Translation
+		'position_help' => 'To control category sort order',	//TODO - Translation
 		'title' => 'Titolo',
 	),
 	'feed' => array(
@@ -40,7 +43,7 @@ return array(
 			'help' => 'Write one search filter per line.',	//TODO - Translation
 		),
 		'information' => 'Informazioni',
-		'keep_history' => 'Numero minimo di articoli da mantenere',
+		'keep_min' => 'Numero minimo di articoli da mantenere',
 		'moved_category_deleted' => 'Cancellando una categoria i feed al suo interno verranno classificati automaticamente come <em>%s</em>.',
 		'mute' => 'mute',	//TODO - Translation
 		'no_selected' => 'Nessun feed selezionato.',
@@ -72,6 +75,7 @@ return array(
 	),
 	'firefox' => array(
 		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',	//TODO - Translation
+		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	//TODO - Translation
 		'title' => 'Firefox feed reader',	//TODO - Translation
 	),
 	'import_export' => array(
diff --git a/app/i18n/it/user.php b/app/i18n/it/user.php
new file mode 100644
index 000000000..3a8343c11
--- /dev/null
+++ b/app/i18n/it/user.php
@@ -0,0 +1,37 @@
+<?php
+
+return array(
+	'email' => array(
+		'feedback' => array(
+			'invalid' => 'The email address is invalid.', //TODO - Translation
+			'required' => 'The 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
+			'feedback' => array(
+				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //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
+			),
+			'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+			'resend_email' => 'Resend the email', //TODO - Translation
+			'title' => 'Email address validation', //TODO - Translation
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'You must accept the Terms of Service to be able to register.', // TODO - Translation
+		),
+	),
+	'mailer' => array(
+		'email_need_validation' => array(
+			'title' => 'You need to validate your account', //TODO - Translation
+			'welcome' => 'Welcome %s,', //TODO - Translation
+			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+		),
+	),
+);
diff --git a/app/i18n/kr/admin.php b/app/i18n/kr/admin.php
index 6312bd3fe..4a8e425d5 100644
--- a/app/i18n/kr/admin.php
+++ b/app/i18n/kr/admin.php
@@ -159,6 +159,7 @@ return array(
 	'system' => array(
 		'_' => '시스템 설정',
 		'auto-update-url' => '자동 업데이트 서버 URL',
+		'force_email_validation' => 'Force email addresses validation', //TODO - Translation
 		'instance-name' => '인스턴스 이름',
 		'max-categories' => '사용자별 카테고리 개수 제한',
 		'max-feeds' => '사용자별 피드 개수 제한',
diff --git a/app/i18n/kr/conf.php b/app/i18n/kr/conf.php
index acd4c40c1..1e77d0098 100644
--- a/app/i18n/kr/conf.php
+++ b/app/i18n/kr/conf.php
@@ -3,13 +3,21 @@
 return array(
 	'archiving' => array(
 		'_' => '보관',
-		'advanced' => '고급 설정',
 		'delete_after' => '다음 기간보다 오래된 글 삭제',
+		'exception' => 'Purge exception',	//TODO - Translation
 		'help' => '더 자세한 옵션은 개별 피드 설정에 있습니다',
-		'keep_history_by_feed' => '피드별 최소 유지 글 개수',
+		'keep_favourites' => 'Never delete favourites',	//TODO - Translation
+		'keep_min_by_feed' => '피드별 최소 유지 글 개수',
+		'keep_labels' => 'Never delete labels',	//TODO - Translation
+		'keep_unreads' => 'Never delete unreads',	//TODO - Translation
+		'maintenance' => 'Maintenance',	//TODO - Translation
 		'optimize' => '데이터베이스 최적화',
 		'optimize_help' => '데이터베이스 크기를 줄이기 위해 가끔씩 수행해주세요',
+		'policy' => 'Purge policy',	//TODO - Translation
+		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	//TODO - Translation
 		'purge_now' => '지금 삭제',
+		'keep_max' => 'Maximum number of articles to keep',	//TODO - Translation
+		'keep_period' => 'Maximum age of articles to keep',	//TODO - Translation
 		'title' => '보관',
 		'ttl' => '다음 시간이 지나기 전에 새로고침 금지',
 	),
@@ -21,6 +29,7 @@ return array(
 			'publication_date' => '발행일',
 			'related_tags' => '관련 태그',
 			'sharing' => '공유',
+			'display_authors' => 'Authors',  //TODO - Translation
 			'top_line' => '상단',
 		),
 		'language' => '언어',
@@ -45,6 +54,7 @@ return array(
 			'_' => '계정 삭제',
 			'warn' => '당신의 계정과 관련된 모든 데이터가 삭제됩니다.',
 		),
+		'email' => '메일 주소',
 		'password_api' => 'API 암호<br /><small>(예: 모바일 애플리케이션)</small>',
 		'password_form' => '암호<br /><small>(웹폼 로그인 방식 사용시)</small>',
 		'password_format' => '7 글자 이상이어야 합니다',
@@ -133,7 +143,6 @@ return array(
 		'diaspora' => 'Diaspora*',
 		'email' => '메일',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'more_information' => '자세한 정보',
 		'print' => '인쇄',
 		'remove' => '공유 방법 삭제',
diff --git a/app/i18n/kr/gen.php b/app/i18n/kr/gen.php
index f7855c499..fdc95d431 100644
--- a/app/i18n/kr/gen.php
+++ b/app/i18n/kr/gen.php
@@ -3,6 +3,7 @@
 return array(
 	'action' => array(
 		'actualize' => '새 글 가져오기',
+		'back' => '← Go back', //TODO - Translation
 		'back_to_rss_feeds' => '← RSS 피드로 돌아가기',
 		'cancel' => '취소',
 		'create' => '생성',
@@ -22,6 +23,7 @@ return array(
 		'update' => '변경',
 	),
 	'auth' => array(
+		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.', // TODO - Translation
 		'email' => '메일 주소',
 		'keep_logged_in' => '로그인 유지 <small>(%s 일)</small>',
 		'login' => '로그인',
@@ -160,15 +162,22 @@ return array(
 		'nothing_to_load' => '더 이상 글이 없습니다',
 		'previous' => '이전',
 	),
+	'period' => array(
+		'days' => 'days',	//TODO - Translation
+		'hours' => 'hours',	//TODO - Translation
+		'months' => 'months',	//TODO - Translation
+		'weeks' => 'weeks',	//TODO - Translation
+		'years' => 'years',	//TODO - Translation
+	),
 	'share' => array(
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
 		'email' => '메일',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'gnusocial' => 'GNU social',
 		'jdh' => 'Journal du hacker',
 		'Known' => 'Known based sites',
+		'lemmy' => 'Lemmy',
 		'linkedin' => 'LinkedIn',
 		'mastodon' => 'Mastodon',
 		'movim' => 'Movim',
diff --git a/app/i18n/kr/index.php b/app/i18n/kr/index.php
index bebc8bdec..6e582d906 100644
--- a/app/i18n/kr/index.php
+++ b/app/i18n/kr/index.php
@@ -7,7 +7,7 @@ return array(
 		'bugs_reports' => '버그 제보하기',
 		'credits' => '크레딧',
 		'credits_content' => 'FreshRSS는 <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> 프레임워크를 사용하진 않지만, 일부 디자인 요소를 가져왔습니다. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">아이콘들</a>은 <a href="https://www.gnome.org/">GNOME 프로젝트</a>에서 가져왔습니다. <em>Open Sans</em> 글꼴은 <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>가 제작하였습니다. FreshRSS는 PHP 프레임워크인 <a href="https://github.com/marienfressinaud/MINZ">Minz</a>에 기반하고 있습니다.',
-		'freshrss_description' => 'FreshRSS는 <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> 또는 <a href="http://leed.idleman.fr/">Leed</a>와 같은 셀프 호스팅 기반의 RSS 피드 수집기입니다. FreshRSS는 강력하고 다양한 설정을 할 수 있으면서 도 가볍고 사용하기 쉽습니다.',
+		'freshrss_description' => 'FreshRSS는 <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> 또는 <a href="https://github.com/LeedRSS/Leed">Leed</a>와 같은 셀프 호스팅 기반의 RSS 피드 수집기입니다. FreshRSS는 강력하고 다양한 설정을 할 수 있으면서 도 가볍고 사용하기 쉽습니다.',
 		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">Github 저장소에 제보</a>',
 		'license' => '라이센스',
 		'project_website' => '프로젝트 웹사이트',
@@ -15,6 +15,9 @@ return array(
 		'version' => '버전',
 		'website' => '웹사이트',
 	),
+	'tos' => array(
+		'title' => 'Terms of Service', // TODO - Translation
+	),
 	'feed' => array(
 		'add' => '피드를 추가하세요.',
 		'empty' => '글이 없습니다.',
diff --git a/app/i18n/kr/sub.php b/app/i18n/kr/sub.php
index f8eccfa27..ac45e4e73 100644
--- a/app/i18n/kr/sub.php
+++ b/app/i18n/kr/sub.php
@@ -13,9 +13,12 @@ return array(
 	'category' => array(
 		'_' => '카테고리',
 		'add' => '카테고리 추가',
+		'archiving' => '보관',
 		'empty' => '빈 카테고리',
 		'information' => '정보',
 		'new' => '새 카테고리',
+		'position' => 'Display position',	//TODO - Translation
+		'position_help' => 'To control category sort order',	//TODO - Translation
 		'title' => '제목',
 	),
 	'feed' => array(
@@ -40,7 +43,7 @@ return array(
 			'help' => 'Write one search filter per line.',	//TODO - Translation
 		),
 		'information' => '정보',
-		'keep_history' => '최소 유지 글 개수',
+		'keep_min' => '최소 유지 글 개수',
 		'moved_category_deleted' => '카테고리를 삭제하면, 해당 카테고리 아래에 있던 피드들은 자동적으로 <em>%s</em> 아래로 분류됩니다.',
 		'mute' => '무기한 새로고침 금지',
 		'no_selected' => '선택된 피드가 없습니다.',
@@ -72,6 +75,7 @@ return array(
 	),
 	'firefox' => array(
 		'documentation' => 'FreshRSS를 Firefox 피드 리더에 추가하기 위해서는 <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">여기</a>의 설명을 따르세요.',
+		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	//TODO - Translation
 		'title' => 'Firefox 피드 리더',
 	),
 	'import_export' => array(
diff --git a/app/i18n/kr/user.php b/app/i18n/kr/user.php
new file mode 100644
index 000000000..3a8343c11
--- /dev/null
+++ b/app/i18n/kr/user.php
@@ -0,0 +1,37 @@
+<?php
+
+return array(
+	'email' => array(
+		'feedback' => array(
+			'invalid' => 'The email address is invalid.', //TODO - Translation
+			'required' => 'The 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
+			'feedback' => array(
+				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //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
+			),
+			'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+			'resend_email' => 'Resend the email', //TODO - Translation
+			'title' => 'Email address validation', //TODO - Translation
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'You must accept the Terms of Service to be able to register.', // TODO - Translation
+		),
+	),
+	'mailer' => array(
+		'email_need_validation' => array(
+			'title' => 'You need to validate your account', //TODO - Translation
+			'welcome' => 'Welcome %s,', //TODO - Translation
+			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+		),
+	),
+);
diff --git a/app/i18n/nl/admin.php b/app/i18n/nl/admin.php
index e5d126eb8..1083c630b 100644
--- a/app/i18n/nl/admin.php
+++ b/app/i18n/nl/admin.php
@@ -159,6 +159,7 @@ return array(
 	'system' => array(
 		'_' => 'Systeem configuratie',
 		'auto-update-url' => 'Automatische update server URL',
+		'force_email_validation' => 'Emailadresvalidatie forceren',
 		'instance-name' => 'Voorbeeld naam',
 		'max-categories' => 'Categorielimiet per gebruiker',
 		'max-feeds' => 'Feedlimiet per gebruiker',
diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.php
index fa84ae184..ca6627cbb 100644
--- a/app/i18n/nl/conf.php
+++ b/app/i18n/nl/conf.php
@@ -1,15 +1,23 @@
 <?php
-/* Dutch translation by Wanabo. http://www.nieuwskop.be */
+
 return array(
 	'archiving' => array(
 		'_' => 'Archivering',
-		'advanced' => 'Geavanceerd',
 		'delete_after' => 'Verwijder artikelen na',
+		'exception' => 'Zuiveringsuitzondering',
 		'help' => 'Meer opties zijn beschikbaar in de persoonlijke stroom instellingen',
-		'keep_history_by_feed' => 'Minimum aantal te behouden artikelen in de feed',
-		'optimize' => 'Optimaliseer database',
+		'keep_favourites' => 'Favorieten nooit verwijderen',
+		'keep_min_by_feed' => 'Minimum aantal te behouden artikelen in de feed',
+		'keep_labels' => 'Labels nooit verwijderen',
+		'keep_unreads' => 'Ongelezen artikels nooit verwijderen',
+		'maintenance' => 'Onderhoud',
+		'optimize' => 'Database optimaliseren',
 		'optimize_help' => 'Doe dit zo af en toe om de omvang van de database te verkleinen',
+		'policy' => 'Zuiveringsbeleid',
+		'policy_warning' => 'Zonder zuiveringsbeleid wordt elk artikel bewaard.',
 		'purge_now' => 'Schoon nu op',
+		'keep_max' => 'Maximaal aantal artikelen om te behouden',
+		'keep_period' => 'Maximumleeftijd artikelen om te behouden',
 		'title' => 'Archivering',
 		'ttl' => 'Vernieuw niet automatisch meer dan',
 	),
@@ -21,6 +29,7 @@ return array(
 			'publication_date' => 'Publicatie datum',
 			'related_tags' => 'Gerelateerde labels',
 			'sharing' => 'Delen',
+			'display_authors' => 'Auteurs',
 			'top_line' => 'Bovenaan',
 		),
 		'language' => 'Taal',
@@ -45,6 +54,7 @@ return array(
 			'_' => 'Account verwijderen',
 			'warn' => 'Uw account en alle gerelateerde gegvens worden verwijderd.',
 		),
+		'email' => 'Email adres',
 		'password_api' => 'Wachtwoord API<br /><small>(e.g., voor mobiele apps)</small>',
 		'password_form' => 'Wachtwoord<br /><small>(voor de Web-formulier log in methode)</small>',
 		'password_format' => 'Ten minste 7 tekens',
@@ -133,7 +143,6 @@ return array(
 		'diaspora' => 'Diaspora*',
 		'email' => 'Email',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'more_information' => 'Meer informatie',
 		'print' => 'Afdrukken',
 		'remove' => 'Deelmethode verwijderen',
diff --git a/app/i18n/nl/feedback.php b/app/i18n/nl/feedback.php
index 25378360b..97e1a71b8 100644
--- a/app/i18n/nl/feedback.php
+++ b/app/i18n/nl/feedback.php
@@ -75,7 +75,7 @@ return array(
 		),
 		'feed' => array(
 			'actualized' => '<em>%s</em> vernieuwd',
-			'actualizeds' => 'RSS feeds vernieuwd',
+			'actualizeds' => 'RSS-feeds vernieuwd',
 			'added' => 'RSS feed <em>%s</em> toegevoegd',
 			'already_subscribed' => 'Al geabonneerd op <em>%s</em>',
 			'deleted' => 'Feed verwijderd',
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index bdf2e0abd..fdbb866fc 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -3,6 +3,7 @@
 return array(
 	'action' => array(
 		'actualize' => 'Actualiseren',
+		'back' => '← Terug',
 		'back_to_rss_feeds' => '← Ga terug naar je RSS feeds',
 		'cancel' => 'Annuleren',
 		'create' => 'Opslaan',
@@ -22,6 +23,7 @@ return array(
 		'update' => 'Updaten',
 	),
 	'auth' => array(
+		'accept_tos' => 'Ik accepteer de <a href="%s">gebruiksvoorwaarden</a>.',
 		'email' => 'Email adres',
 		'keep_logged_in' => 'Ingelogd blijven voor <small>(%s dagen)</small>',
 		'login' => 'Log in',
@@ -160,25 +162,16 @@ return array(
 		'nothing_to_load' => 'Er zijn geen artikelen meer',
 		'previous' => 'Vorige',
 	),
+	'period' => array(
+		'days' => 'dagen',
+		'hours' => 'uren',
+		'months' => 'maanden',
+		'weeks' => 'weken',
+		'years' => 'jaren',
+	),
 	'share' => array(
-		'blogotext' => 'Blogotext',
-		'diaspora' => 'Diaspora*',
 		'email' => 'Email',
-		'facebook' => 'Facebook',
-		'g+' => 'Google+',
-		'gnusocial' => 'GNU social',
-		'jdh' => 'Journal du hacker',
-		'Known' => 'Known based sites',
-		'linkedin' => 'LinkedIn',
-		'mastodon' => 'Mastodon',
-		'movim' => 'Movim',
-		'pinboard' => 'Pinboard',
-		'pocket' => 'Pocket',
-		'print' => 'Print',
-		'shaarli' => 'Shaarli',
-		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag v1',
-		'wallabagv2' => 'wallabag v2',
+		'Known' => 'Known-gebaseerde sites',
 	),
 	'short' => array(
 		'attention' => 'Attentie!',
diff --git a/app/i18n/nl/index.php b/app/i18n/nl/index.php
index d202b812a..22720f927 100644
--- a/app/i18n/nl/index.php
+++ b/app/i18n/nl/index.php
@@ -7,19 +7,22 @@ return array(
 		'bugs_reports' => 'Rapporteer fouten',
 		'credits' => 'Waarderingen',
 		'credits_content' => 'Sommige ontwerp elementen komen van <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> alhoewel FreshRSS dit raamwerk niet gebruikt. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Pictogrammen</a> komen van het <a href="https://www.gnome.org/">GNOME project</a>. <em>De Open Sans</em> font police is gemaakt door <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS is gebaseerd op <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, een PHP raamwerk. Nederlandse vertaling door Wanabo, <a href="http://www.nieuwskop.be" title="NieuwsKop">NieuwsKop.be</a>. Link naar de Nederlandse vertaling, <a href="https://github.com/Wanabo/FreshRSS-Dutch-translation/tree/master">FreshRSS-Dutch-translation</a>.',
-		'freshrss_description' => 'FreshRSS is een RSS feed aggregator om zelf te hosten zoals <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> of <a href="http://leed.idleman.fr/">Leed</a>. Het gebruikt weinig systeembronnen en is makkelijk te administreren terwijl het een krachtig en makkelijk te configureren programma is.',
+		'freshrss_description' => 'FreshRSS is een RSS-feed aggregator om zelf te hosten, net als <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> of <a href="https://github.com/LeedRSS/Leed">Leed</a>. Het gebruikt weinig systeembronnen en is makkelijk te beheren terwijl het een krachtig en makkelijk te configureren programma is.',
 		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">op Github</a>',
-		'license' => 'License',
-		'project_website' => 'Project website',
+		'license' => 'Licentie',
+		'project_website' => 'Projectwebsite',
 		'title' => 'Over',
 		'version' => 'Versie',
 		'website' => 'Website',
 	),
+	'tos' => array(
+		'title' => 'Gebruiksvoorwaarden',
+	),
 	'feed' => array(
 		'add' => 'U kunt wat feeds toevoegen.',
 		'empty' => 'Er is geen artikel om te laten zien.',
-		'rss_of' => 'RSS feed van %s',
-		'title' => 'Overzicht RSS feeds',
+		'rss_of' => 'RSS-feed van %s',
+		'title' => 'Overzicht RSS-feeds',
 		'title_global' => 'Globale weergave',
 		'title_fav' => 'Uw favorieten',
 	),
@@ -48,7 +51,7 @@ return array(
 		'queries' => 'Gebruikers queries',
 		'read' => 'Laat alleen gelezen zien',
 		'reader_view' => 'Lees modus',
-		'rss_view' => 'RSS feed',
+		'rss_view' => 'RSS-feed',
 		'search_short' => 'Zoeken',
 		'starred' => 'Laat alleen favorieten zien',
 		'stats' => 'Statistieken',
diff --git a/app/i18n/nl/sub.php b/app/i18n/nl/sub.php
index b59515f42..8a3af6064 100644
--- a/app/i18n/nl/sub.php
+++ b/app/i18n/nl/sub.php
@@ -13,34 +13,37 @@ return array(
 	'category' => array(
 		'_' => 'Categorie',
 		'add' => 'Voeg categorie toe',
+		'archiving' => 'Archiveren',
 		'empty' => 'Lege categorie',
 		'information' => 'Informatie',
 		'new' => 'Nieuwe categorie',
+		'position' => 'Weergavepositie',
+		'position_help' => 'Om de categorieweergave-sorteervolgorde te controleren',
 		'title' => 'Titel',
 	),
 	'feed' => array(
-		'add' => 'Voeg een RSS feed toe',
+		'add' => 'Voeg een RSS-feed toe',
 		'advanced' => 'Geavanceerd',
 		'archiving' => 'Archiveren',
 		'auth' => array(
 			'configuration' => 'Log in',
-			'help' => 'Verbinding toestaan toegang te krijgen tot HTTP beveiligde RSS feeds',
+			'help' => 'Verbinding toestaan toegang te krijgen tot HTTP beveiligde RSS-feeds',
 			'http' => 'HTTP Authenticatie',
 			'password' => 'HTTP wachtwoord',
 			'username' => 'HTTP gebruikers naam',
 		),
 		'clear_cache' => 'Cache altijd leegmaken',
-		'css_help' => 'Haalt verstoorde RSS feeds op (attentie, heeft meer tijd nodig!)',
-		'css_path' => 'Artikelen CSS pad op originele website',
+		'css_help' => 'Haalt onvolledige RSS-feeds op (attentie, heeft meer tijd nodig!)',
+		'css_path' => 'CSS-pad van artikelen op originele website',
 		'description' => 'Omschrijving',
 		'empty' => 'Deze feed is leeg. Controleer of deze nog actueel is.',
 		'error' => 'Deze feed heeft problemen. Verifieer a.u.b het doeladres en actualiseer het.',
 		'filteractions' => array(
-			'_' => 'Filter actions',	//TODO - Translation
-			'help' => 'Write one search filter per line.',	//TODO - Translation
+			'_' => 'Filteracties',
+			'help' => 'Voer één zoekfilter per lijn in.',
 		),
 		'information' => 'Informatie',
-		'keep_history' => 'Minimum aantal artikelen om te houden',
+		'keep_min' => 'Minimum aantal artikelen om te houden',
 		'moved_category_deleted' => 'Als u een categorie verwijderd, worden de feeds automatisch geclassificeerd onder <em>%s</em>.',
 		'mute' => 'demp',
 		'no_selected' => 'Geen feed geselecteerd.',
@@ -64,14 +67,15 @@ return array(
 		'think_to_add' => 'Voeg wat feeds toe.',
 		'timeout' => 'Time-out in seconden',
 		'title' => 'Titel',
-		'title_add' => 'Voeg een RSS feed toe',
+		'title_add' => 'Voeg een RSS-feed toe',
 		'ttl' => 'Vernieuw automatisch niet vaker dan',
-		'url' => 'Feed URL',
+		'url' => 'Feed-url',
 		'validator' => 'Controleer de geldigheid van de feed',
-		'website' => 'Website URL',
+		'website' => 'Website-url',
 	),
 	'firefox' => array(
 		'documentation' => 'Volg de stappen die <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">hier</a> beschreven worden om FreshRSS aan de Firefox-nieuwslezerlijst toe te voegen.',
+		'obsolete_63' => 'Vanaf versie 63 en nieuwer, heeft Firefox de mogelijkheid om zelf niewslezers toe te voegen verwijderd voor online diensten.',
 		'title' => 'Firefox-nieuwslezer',
 	),
 	'import_export' => array(
diff --git a/app/i18n/nl/user.php b/app/i18n/nl/user.php
new file mode 100644
index 000000000..f98a6b2fd
--- /dev/null
+++ b/app/i18n/nl/user.php
@@ -0,0 +1,37 @@
+<?php
+
+return array(
+	'email' => array(
+		'feedback' => array(
+			'invalid' => 'Het emailadres is niet geldig.',
+			'required' => 'Het emailadres is vereist.',
+		),
+		'validation' => array(
+			'change_email' => 'Het emailadres kan worden gewijzigd <a href="%s">op de profielpagina</a>.',
+			'email_sent_to' => 'Er is een email verzonden naar <strong>%s</strong>. Volg de instructies om het emailadres te valideren.',
+			'feedback' => array(
+				'email_failed' => 'Er kon geen email worden verzonden vanwege een incorrecte configuratie van de server.',
+				'email_sent' => 'Er is een email naar het adres verzonden.',
+				'error' => 'Het emailadres kon niet worden gevalideerd.',
+				'ok' => 'Het emailadres is gevalideerd.',
+				'unneccessary' => 'Het emailadres is al eerder gevalideerd.',
+				'wrong_token' => 'Het emailadres kon niet worden gevalideerd vanwege een fout token.',
+			),
+			'need_to' => 'Het emailadres %1 moet worden gevalideerd voordat het kan worden gebruikt.',
+			'resend_email' => 'Email opnieuw sturen',
+			'title' => 'Emailadresvalidatie',
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'De gebruiksvoorwaarden moeten worden geaccepteerd om te kunnen registeren.',
+		),
+	),
+	'mailer' => array(
+		'email_need_validation' => array(
+			'title' => 'Je account moet worden gevalideerd',
+			'welcome' => 'Welkom %s,',
+			'body' => 'Je hebt je net geregistreerd op %s, maar je moet je email nog valideren. Volg daarvoor de link:',
+		),
+	),
+);
diff --git a/app/i18n/oc/admin.php b/app/i18n/oc/admin.php
index 2f8ede873..1fb8d5c3a 100644
--- a/app/i18n/oc/admin.php
+++ b/app/i18n/oc/admin.php
@@ -163,6 +163,7 @@ return array(
 			'help' => 'en segondas',
 			'number' => 'Durada de téner d’ésser connectat',
 		),
+		'force_email_validation' => 'Forçar la validacion de las adreças electronicas',
 		'instance-name' => 'Nom de l’instància',
 		'max-categories' => 'Limita de categoria per utilizaire',
 		'max-feeds' => 'Limita de fluxes per utilizaire',
diff --git a/app/i18n/oc/conf.php b/app/i18n/oc/conf.php
index 1596950ea..e123c03c5 100644
--- a/app/i18n/oc/conf.php
+++ b/app/i18n/oc/conf.php
@@ -2,15 +2,24 @@
 
 return array(
 	'archiving' => array(
-		'_' => 'Archivar',
+		'_' => 'Archius',
 		'advanced' => 'Avançat',
 		'delete_after' => 'Levar los articles aprèp',
+		'exception' => 'Excepcion de purga',
 		'help' => 'Mai d’opcions son disponiblas dins la configuracion individuala dels fluxes',
-		'keep_history_by_feed' => 'Nombre minimum d’articles de servar per flux',
+		'keep_favourites' => 'Jamai suprimir los favorits',
+		'keep_min_by_feed' => 'Nombre minimum d’articles de servar per flux',
+		'keep_labels' => 'Jamai suprimir las etiquetas',
+		'keep_unreads' => 'Jamai suprimir los pas legits',
+		'maintenance' => 'Entreten',
 		'optimize' => 'Optimizar la basa de donada',
 		'optimize_help' => 'De far de temps en temps per redusir la talha de la basa de donadas',
+		'policy' => 'Politica de purga',
+		'policy_warning' => 'Se cap de politica de purga es pas seleccionada, totes los articles seràn gardats',
 		'purge_now' => 'Purgar ara',
-		'title' => 'Archivar',
+		'keep_max' => 'Nombre maximum d’articles de gardar',
+		'keep_period' => 'Atge maximum dels articles de gardar',
+		'title' => 'Archius',
 		'ttl' => 'Actualizar pas automaticament mai sovent que',
 	),
 	'display' => array(
@@ -21,6 +30,7 @@ return array(
 			'publication_date' => 'Data de publicacion',
 			'related_tags' => 'Etiquetas ligadas',
 			'sharing' => 'Partatge',
+			'display_authors' => 'Autors',
 			'top_line' => 'Linha amont',
 		),
 		'language' => 'Lenga',
@@ -45,6 +55,7 @@ return array(
 			'_' => 'Supression del compte',
 			'warn' => 'Lo compte e totas las donadas ligadas seràn suprimits.',
 		),
+		'email' => 'Adreça de corrièl',
 		'password_api' => 'Senhal API<br /><small>(ex. : per las aplicacions mobil)</small>',
 		'password_form' => 'Senhal API<br /><small>(ex. : per la connexion via formulari)</small>',
 		'password_format' => 'Almens 7 caractèrs',
@@ -133,7 +144,6 @@ return array(
 		'diaspora' => 'Diaspora*',
 		'email' => 'Corrièl',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'more_information' => 'Mai d’informacions',
 		'print' => 'Imprimir',
 		'remove' => 'Suprimir lo metòde de partatge',
diff --git a/app/i18n/oc/gen.php b/app/i18n/oc/gen.php
index 7f9793283..a5bd003c2 100644
--- a/app/i18n/oc/gen.php
+++ b/app/i18n/oc/gen.php
@@ -3,6 +3,7 @@
 return array(
 	'action' => array(
 		'actualize' => 'Actualizar',
+		'back' => '← Tornar',
 		'back_to_rss_feeds' => '← Tornar a vòstres fluxes RSS',
 		'cancel' => 'Anullar',
 		'create' => 'Crear',
@@ -22,6 +23,7 @@ return array(
 		'update' => 'Actualizar',
 	),
 	'auth' => array(
+		'accept_tos' => 'Accepti las <a href="%s">condicions d’utilizacion</a>.',
 		'email' => 'Adreça de corrièl',
 		'keep_logged_in' => 'Demorar connectat <small>(%s jorns) </small>',
 		'login' => 'Connexion',
@@ -49,7 +51,7 @@ return array(
 		'Aug' => '\\a\\g\\o\\s\\t',
 		'aug' => 'agost',
 		'august' => 'agost',
-		'before_yesterday' => 'Abans ièr',
+		'before_yesterday' => 'Anterior a ièr',
 		'Dec' => '\\d\\e\\c\\e\\m\\b\\r\\e',
 		'dec' => 'dec.',
 		'december' => 'decembre',
@@ -160,15 +162,22 @@ return array(
 		'nothing_to_load' => 'I a pas mai d’articles',
 		'previous' => 'Precedent',
 	),
+	'period' => array(
+		'days' => 'jorns',
+		'hours' => 'oras',
+		'months' => 'meses',
+		'weeks' => 'setmanas',
+		'years' => 'ans',
+	),
 	'share' => array(
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
 		'email' => 'Corrièl',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'gnusocial' => 'GNU social',
 		'jdh' => 'Journal du hacker',
 		'Known' => 'Sites basats sus Known',
+		'lemmy' => 'Lemmy',
 		'linkedin' => 'LinkedIn',
 		'mastodon' => 'Mastodon',
 		'movim' => 'Movim',
diff --git a/app/i18n/oc/index.php b/app/i18n/oc/index.php
index 5cc71c9a9..763d24139 100644
--- a/app/i18n/oc/index.php
+++ b/app/i18n/oc/index.php
@@ -7,7 +7,7 @@ return array(
 		'bugs_reports' => 'Senhalament de problèmas',
 		'credits' => 'Crèdits',
 		'credits_content' => 'Unes elements de l’estil venon del <a href="http://twitter.github.io/bootstrap/">projècte Bootstrap</a> encara que FreshRSS utilize pas aqueste framework. Las <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">icònas</a> venon del <a href="https://www.gnome.org/">projècte GNOME</a>. La polissa <em>Open Sans</em> utilizada foguèt creada per en <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS es basat sus <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, un framework PHP.',
-		'freshrss_description' => 'FreshRSS es un agregador de fluxes RSS per l’auto-albergar tal coma <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> o <a href="http://projet.idleman.fr/leed/">Leed</a>. Sa tòca es d’èsser leugièr e de bon utilizar de prima abòrd mas tanben d’èsser potent e parametrable.',
+		'freshrss_description' => 'FreshRSS es un agregador de fluxes RSS per l’auto-albergar tal coma <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> o <a href="https://github.com/LeedRSS/Leed">Leed</a>. Sa tòca es d’èsser leugièr e de bon utilizar de prima abòrd mas tanben d’èsser potent e parametrable.',
 		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',
 		'license' => 'Licéncia',
 		'project_website' => 'Site del projècte',
@@ -15,6 +15,9 @@ return array(
 		'website' => 'Site internet',
 		'version' => 'Version',
 	),
+	'tos' => array(
+		'title' => 'Condicions d’utilizacion',
+	),
 	'feed' => array(
 		'add' => 'Podètz ajustar de fluxes.',
 		'empty' => 'I a pas cap de flux de mostrar.',
diff --git a/app/i18n/oc/sub.php b/app/i18n/oc/sub.php
index eae9dff29..98a7521eb 100644
--- a/app/i18n/oc/sub.php
+++ b/app/i18n/oc/sub.php
@@ -12,9 +12,12 @@ return array(
 	'category' => array(
 		'_' => 'Categoria',
 		'add' => 'Ajustar una categoria',
+		'archiving' => 'Archivar',
 		'empty' => 'Categoria voida',
 		'information' => 'Informacions',
 		'new' => 'Nòva categoria',
+		'position' => 'Mostrar la posicion',
+		'position_help' => 'Per contrarotlar l’òrdre de tria de la categoria',
 		'title' => 'Títol',
 	),
 	'feed' => array(
@@ -39,7 +42,7 @@ return array(
 			'help' => 'Escrivètz una recèrca per linha.',
 		),
 		'information' => 'Informacions',
-		'keep_history' => 'Nombre minimum d’articles de servar',
+		'keep_min' => 'Nombre minimum d’articles de servar',
 		'moved_category_deleted' => 'Quand escafatz una categoria, sos fluxes son automaticament classats dins <em>%s</em>.',
 		'mute' => 'mut',
 		'no_selected' => 'Cap de flux pas seleccionat.',
@@ -71,6 +74,7 @@ return array(
 	),
 	'firefox' => array(
 		'documentation' => 'Seguissètz las etapas descrichas <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">aquí</a> per ajustar FreshRSS a la lista dels lectors de flux de Firefox.',
+		'obsolete_63' => 'A partir de la version 63 e las seguentas, Firefox permet pas mai d’ajustar vòstres pròpris servicis d’abonament.',
 		'title' => 'Lector de flux de Firefox',
 	),
 	'import_export' => array(
diff --git a/app/i18n/oc/user.php b/app/i18n/oc/user.php
new file mode 100644
index 000000000..655aa052c
--- /dev/null
+++ b/app/i18n/oc/user.php
@@ -0,0 +1,37 @@
+<?php
+
+return array(
+	'email' => array(
+		'feedback' => array(
+			'invalid' => 'L’adreça electronica es invalida.',
+			'required' => 'L’adreça electronica es requesida.',
+		),
+		'validation' => array(
+			'change_email' => 'Podètz cambiar l’adreça electronica <a href="%s">sus la pagina de perfil</a>.',
+			'email_sent_to' => 'Vos avèm enviat un corrièl a <strong>%s</strong>, mercés de seguir las consignas per validar l’adreça electronica.',
+			'feedback' => array(
+				'email_failed' => 'Avèm pas pogut vos enviar un corrièl a causa d’una marrida configuracion del servidor.',
+				'email_sent' => 'Avèm enviat un corrièl a vòstra adreça.',
+				'error' => 'Fracàs de la validacion de l’adreça electronica.',
+				'ok' => 'L’adreça electronica es estada validada.',
+				'unneccessary' => 'L’adreça es ja estada validada.',
+				'wrong_token' => 'Fracàs de la validacion de l’adreça a causa d’un marrit geton.',
+			),
+			'need_to' => 'Devèètz validar vòstra adreça electronica abans de poder utilizar %s.',
+			'resend_email' => 'Tornar enviar lo corrièl',
+			'title' => 'Validacion de l’adreça electronica',
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'Vos cal acceptar las condicions d’utilizacion per poder vos inscriure.',
+		),
+	),
+	'mailer' => array(
+		'email_need_validation' => array(
+			'title' => 'Vos cal validar vòstra adreça electronica',
+			'welcome' => 'La benvenguda %s,',
+			'body' => 'Venètz de vos marcar sus %s mas vos cal encara validar l’adreça electronica. Per aquò far, seguissètz lo ligam :',
+		),
+	),
+);
diff --git a/app/i18n/pt-br/admin.php b/app/i18n/pt-br/admin.php
index 82559c67b..cef6694c2 100644
--- a/app/i18n/pt-br/admin.php
+++ b/app/i18n/pt-br/admin.php
@@ -159,6 +159,7 @@ return array(
 	'system' => array(
 		'_' => 'Configuração do sistema',
 		'auto-update-url' => 'URL do servidor para atualização automática',
+		'force_email_validation' => 'Force email addresses validation', //TODO - Translation
 		'instance-name' => 'Nome da instância',
 		'max-categories' => 'Limite de categorias por usuário',
 		'max-feeds' => 'Limite de Feeds por usuário',
diff --git a/app/i18n/pt-br/conf.php b/app/i18n/pt-br/conf.php
index 8f5eb7746..5e43cc373 100644
--- a/app/i18n/pt-br/conf.php
+++ b/app/i18n/pt-br/conf.php
@@ -3,13 +3,21 @@
 return array(
 	'archiving' => array(
 		'_' => 'Arquivar',
-		'advanced' => 'Avançado',
 		'delete_after' => 'Remover artigos depois',
+		'exception' => 'Purge exception',	//TODO - Translation
 		'help' => 'Mais opções estão disponíveis nas configurações individuais do feed',
-		'keep_history_by_feed' => 'Número mínimo de artigos para deixar no feed',
+		'keep_favourites' => 'Never delete favourites',	//TODO - Translation
+		'keep_min_by_feed' => 'Número mínimo de artigos para deixar no feed',
+		'keep_labels' => 'Never delete labels',	//TODO - Translation
+		'keep_unreads' => 'Never delete unreads',	//TODO - Translation
+		'maintenance' => 'Maintenance',	//TODO - Translation
 		'optimize' => 'Otimizar banco de dados',
 		'optimize_help' => 'Faça ocasionalmente para reduzir o tamanho do banco de dados',
+		'policy' => 'Purge policy',	//TODO - Translation
+		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	//TODO - Translation
 		'purge_now' => 'Purge agora',
+		'keep_max' => 'Maximum number of articles to keep',	//TODO - Translation
+		'keep_period' => 'Maximum age of articles to keep',	//TODO - Translation
 		'title' => 'Arquivar',
 		'ttl' => 'Não atualize automaticamente mais frequente que',
 	),
@@ -21,6 +29,7 @@ return array(
 			'publication_date' => 'Data da publicação',
 			'related_tags' => 'Tags relacionadas',	//TODO - Translation
 			'sharing' => 'Compartilhar',
+			'display_authors' => 'Authors',  //TODO - Translation
 			'top_line' => 'Linha superior',
 		),
 		'language' => 'Ídioma',
@@ -45,6 +54,7 @@ return array(
 			'_' => 'Remover conta',
 			'warn' => 'Sua conta e todos os dados relacionados serão removidos.',
 		),
+		'email' => 'Endereço de e-mail',
 		'password_api' => 'Senha da API<br /><small>(p.s., para aplicativos móveis)</small>',
 		'password_form' => 'Senha<br /><small>(para o método de formulário web)</small>',
 		'password_format' => 'Ao menos 7 caracteres',
@@ -133,7 +143,6 @@ return array(
 		'diaspora' => 'Diaspora*',
 		'email' => 'Email',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'more_information' => 'Mais informação',
 		'print' => 'Imprimir',
 		'remove' => 'Remove sharing method',	//TODO - Translation
diff --git a/app/i18n/pt-br/gen.php b/app/i18n/pt-br/gen.php
index 46ae53eb4..0e7f367ee 100644
--- a/app/i18n/pt-br/gen.php
+++ b/app/i18n/pt-br/gen.php
@@ -3,6 +3,7 @@
 return array(
 	'action' => array(
 		'actualize' => 'Atualizar',
+		'back' => '← Go back', //TODO - Translation
 		'back_to_rss_feeds' => '← Volte para o seu feeds RSS',
 		'cancel' => 'Cancelar',
 		'create' => 'Criar',
@@ -22,6 +23,7 @@ return array(
 		'update' => 'Update',	//TODO - Translation
 	),
 	'auth' => array(
+		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.', // TODO - Translation
 		'email' => 'Endereço de e-mail',
 		'keep_logged_in' => 'Mantenha logado por <small>(%s days)</small>',
 		'login' => 'Login',
@@ -160,15 +162,22 @@ return array(
 		'nothing_to_load' => 'Não há mais artigos',
 		'previous' => 'Anterior',
 	),
+	'period' => array(
+		'days' => 'days',	//TODO - Translation
+		'hours' => 'hours',	//TODO - Translation
+		'months' => 'months',	//TODO - Translation
+		'weeks' => 'weeks',	//TODO - Translation
+		'years' => 'years',	//TODO - Translation
+	),
 	'share' => array(
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
 		'email' => 'Email',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'gnusocial' => 'GNU social',
 		'jdh' => 'Journal du hacker',
 		'Known' => 'Known based sites',
+		'lemmy' => 'Lemmy',
 		'linkedin' => 'LinkedIn',
 		'mastodon' => 'Mastodon',
 		'movim' => 'Movim',
diff --git a/app/i18n/pt-br/index.php b/app/i18n/pt-br/index.php
index e5807ed95..fac17e171 100644
--- a/app/i18n/pt-br/index.php
+++ b/app/i18n/pt-br/index.php
@@ -7,7 +7,7 @@ return array(
 		'bugs_reports' => 'Reportar Bugs',
 		'credits' => 'Créditos',
 		'credits_content' => 'Alguns elementos de design vieram do <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> Embora FreshRRS não utiliza este framework. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Ícones</a> vieram do <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police foi criada por <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS é baseado no <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, um framework PHP.',
-		'freshrss_description' => 'FreshRSS é um RSS feeds aggregator para um host próprio como o <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> ou <a href="http://leed.idleman.fr/">Leed</a>. É leve e fácil de utilizar enquanto é uma ferramenta poderosa e configurável. ',
+		'freshrss_description' => 'FreshRSS é um RSS feeds aggregator para um host próprio como o <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> ou <a href="https://github.com/LeedRSS/Leed">Leed</a>. É leve e fácil de utilizar enquanto é uma ferramenta poderosa e configurável. ',
 		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">no Github</a>',
 		'license' => 'licença',
 		'project_website' => 'Site do projeto',
@@ -15,6 +15,9 @@ return array(
 		'version' => 'Versão',
 		'website' => 'Site',
 	),
+	'tos' => array(
+		'title' => 'Terms of Service', // TODO - Translation
+	),
 	'feed' => array(
 		'add' => 'Você pode adicionar alguns feeds.',
 		'empty' => 'Não há nenhum artigo para mostrar.',
diff --git a/app/i18n/pt-br/sub.php b/app/i18n/pt-br/sub.php
index d4bea33c4..04e0c85ab 100644
--- a/app/i18n/pt-br/sub.php
+++ b/app/i18n/pt-br/sub.php
@@ -13,9 +13,12 @@ return array(
 	'category' => array(
 		'_' => 'Categoria',
 		'add' => 'Adicionar uma categoria',
+		'archiving' => 'Arquivar',
 		'empty' => 'Categoria vazia',
 		'information' => 'Informações',
 		'new' => 'Nova categoria',
+		'position' => 'Display position',	//TODO - Translation
+		'position_help' => 'To control category sort order',	//TODO - Translation
 		'title' => 'Título',
 	),
 	'feed' => array(
@@ -40,7 +43,7 @@ return array(
 			'help' => 'Write one search filter per line.',	//TODO - Translation
 		),
 		'information' => 'Informações',
-		'keep_history' => 'Número mínimo de artigos para manter',
+		'keep_min' => 'Número mínimo de artigos para manter',
 		'moved_category_deleted' => 'Quando você deleta uma categoria, seus feeds são automaticamente classificados como <em>%s</em>.',
 		'mute' => 'mute',	//TODO - Translation
 		'no_selected' => 'Nenhum feed selecionado.',
@@ -70,6 +73,11 @@ return array(
 		'validator' => 'Verifique a validade do feed',
 		'website' => 'URL do site',
 	),
+	'firefox' => array(
+		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',// TODO
+		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	//TODO - Translation
+		'title' => 'Firefox feed reader',	//TODO - Translation
+	),
 	'import_export' => array(
 		'export' => 'Exportar',
 		'export_opml' => 'Exporta a lista dos feeds (OPML)',
diff --git a/app/i18n/pt-br/user.php b/app/i18n/pt-br/user.php
new file mode 100644
index 000000000..3a8343c11
--- /dev/null
+++ b/app/i18n/pt-br/user.php
@@ -0,0 +1,37 @@
+<?php
+
+return array(
+	'email' => array(
+		'feedback' => array(
+			'invalid' => 'The email address is invalid.', //TODO - Translation
+			'required' => 'The 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
+			'feedback' => array(
+				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //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
+			),
+			'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+			'resend_email' => 'Resend the email', //TODO - Translation
+			'title' => 'Email address validation', //TODO - Translation
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'You must accept the Terms of Service to be able to register.', // TODO - Translation
+		),
+	),
+	'mailer' => array(
+		'email_need_validation' => array(
+			'title' => 'You need to validate your account', //TODO - Translation
+			'welcome' => 'Welcome %s,', //TODO - Translation
+			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+		),
+	),
+);
diff --git a/app/i18n/ru/admin.php b/app/i18n/ru/admin.php
index c9a7d6683..adf091df9 100644
--- a/app/i18n/ru/admin.php
+++ b/app/i18n/ru/admin.php
@@ -159,6 +159,7 @@ return array(
 	'system' => array(
 		'_' => 'Системные настройки',
 		'auto-update-url' => 'Адрес сервера для автоматического обновления',
+		'force_email_validation' => 'Force email addresses validation', //TODO - Translation
 		'instance-name' => 'Название этого сервера',
 		'max-categories' => 'Количество категорий на пользователя',
 		'max-feeds' => 'Количество статей на пользователя',
diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php
index 841477964..7a80587f8 100644
--- a/app/i18n/ru/conf.php
+++ b/app/i18n/ru/conf.php
@@ -3,13 +3,21 @@
 return array(
 	'archiving' => array(
 		'_' => 'Архивация',
-		'advanced' => 'Продвинутые настройки',
 		'delete_after' => 'Удалять статьи после',
+		'exception' => 'Purge exception',	//TODO - Translation
 		'help' => 'Каждую подписку можно настроить более гибко',
-		'keep_history_by_feed' => 'Minimum number of articles to keep by feed', 	//TODO - Translation
+		'keep_favourites' => 'Never delete favourites',	//TODO - Translation
+		'keep_min_by_feed' => 'Minimum number of articles to keep by feed',	//TODO - Translation
+		'keep_labels' => 'Never delete labels',	//TODO - Translation
+		'keep_unreads' => 'Never delete unreads',	//TODO - Translation
+		'maintenance' => 'Maintenance',	//TODO - Translation
 		'optimize' => 'Оптимизировать базу данных',
-		'optimize_help' => 'To do occasionally to reduce the size of the database', 	//TODO - Translation
+		'optimize_help' => 'To do occasionally to reduce the size of the database',	//TODO - Translation
+		'policy' => 'Purge policy',	//TODO - Translation
+		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	//TODO - Translation
 		'purge_now' => 'Очистить сейчас',
+		'keep_max' => 'Maximum number of articles to keep',	//TODO - Translation
+		'keep_period' => 'Maximum age of articles to keep',	//TODO - Translation
 		'title' => 'Архивация',
 		'ttl' => 'Не обновлять чаще чем',
 	),
@@ -21,6 +29,7 @@ return array(
 			'publication_date' => 'Date of publication',	//TODO - Translation
 			'related_tags' => 'Related tags',	//TODO - Translation
 			'sharing' => 'Sharing',	//TODO - Translation
+			'display_authors' => 'Authors',  //TODO - Translation
 			'top_line' => 'Top line',	//TODO - Translation
 		),
 		'language' => 'Язык',
@@ -45,6 +54,7 @@ return array(
 			'_' => 'Account deletion',	//TODO - Translation
 			'warn' => 'Your account and all the related data will be deleted.',	//TODO - Translation
 		),
+		'email' => 'Email address',	//TODO - Translation
 		'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',	//TODO - Translation
 		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',	//TODO - Translation
 		'password_format' => 'At least 7 characters',	//TODO - Translation
@@ -133,7 +143,6 @@ return array(
 		'diaspora' => 'Diaspora*',
 		'email' => 'Email',	//TODO - Translation
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'more_information' => 'More information',	//TODO - Translation
 		'print' => 'Print',	//TODO - Translation
 		'remove' => 'Remove sharing method',	//TODO - Translation
diff --git a/app/i18n/ru/gen.php b/app/i18n/ru/gen.php
index b55c6b667..5200a7005 100644
--- a/app/i18n/ru/gen.php
+++ b/app/i18n/ru/gen.php
@@ -3,6 +3,7 @@
 return array(
 	'action' => array(
 		'actualize' => 'Actualize',	//TODO - Translation
+		'back' => '← Go back', //TODO - Translation
 		'back_to_rss_feeds' => '← Go back to your RSS feeds',	//TODO - Translation
 		'cancel' => 'Cancel',	//TODO - Translation
 		'create' => 'Create',	//TODO - Translation
@@ -22,6 +23,7 @@ return array(
 		'update' => 'Update',	//TODO - Translation
 	),
 	'auth' => array(
+		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.', // TODO - Translation
 		'email' => 'Email address',	//TODO - Translation
 		'keep_logged_in' => 'Keep me logged in <small>(%s дней)</small>',	//TODO - Translation
 		'login' => 'Login',	//TODO - Translation
@@ -160,15 +162,22 @@ return array(
 		'nothing_to_load' => 'There are no more articles',	//TODO - Translation
 		'previous' => 'Previous',	//TODO - Translation
 	),
+	'period' => array(
+		'days' => 'days',	//TODO - Translation
+		'hours' => 'hours',	//TODO - Translation
+		'months' => 'months',	//TODO - Translation
+		'weeks' => 'weeks',	//TODO - Translation
+		'years' => 'years',	//TODO - Translation
+	),
 	'share' => array(
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
 		'email' => 'Email',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'gnusocial' => 'GNU social',
 		'jdh' => 'Journal du hacker',
 		'Known' => 'Known based sites',
+		'lemmy' => 'Lemmy',
 		'linkedin' => 'LinkedIn',
 		'mastodon' => 'Mastodon',
 		'movim' => 'Movim',
diff --git a/app/i18n/ru/index.php b/app/i18n/ru/index.php
index 977777178..b5f022cd2 100644
--- a/app/i18n/ru/index.php
+++ b/app/i18n/ru/index.php
@@ -7,7 +7,7 @@ return array(
 		'bugs_reports' => 'Bugs 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="http://leed.idleman.fr/">Leed</a>. It is light and easy to take in hand while being powerful and configurable tool.',	//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
 		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',	//TODO - Translation
 		'license' => 'License',	//TODO - Translation
 		'project_website' => 'Project website',	//TODO - Translation
@@ -15,6 +15,9 @@ return array(
 		'version' => 'Version',	//TODO - Translation
 		'website' => 'Website',	//TODO - Translation
 	),
+	'tos' => array(
+		'title' => 'Terms of Service', // TODO - Translation
+	),
 	'feed' => array(
 		'add' => 'You may add some feeds.',	//TODO - Translation
 		'empty' => 'There is no article to show.',	//TODO - Translation
diff --git a/app/i18n/ru/sub.php b/app/i18n/ru/sub.php
index a2c4e4690..e8cdeb89d 100644
--- a/app/i18n/ru/sub.php
+++ b/app/i18n/ru/sub.php
@@ -13,9 +13,12 @@ return array(
 	'category' => array(
 		'_' => 'Category',	//TODO - Translation
 		'add' => 'Add a category',	//TODO - Translation
+		'archiving' => 'Archivage',	//TODO - Translation
 		'empty' => 'Empty category',	//TODO - Translation
 		'information' => 'Information',	//TODO - Translation
 		'new' => 'New category',	//TODO - Translation
+		'position' => 'Display position',	//TODO - Translation
+		'position_help' => 'To control category sort order',	//TODO - Translation
 		'title' => 'Title',	//TODO - Translation
 	),
 	'feed' => array(
@@ -40,7 +43,7 @@ return array(
 			'help' => 'Write one search filter per line.',	//TODO - Translation
 		),
 		'information' => 'Information',	//TODO - Translation
-		'keep_history' => 'Minimum number of articles to keep',	//TODO - Translation
+		'keep_min' => 'Minimum number of articles to keep',	//TODO - Translation
 		'moved_category_deleted' => 'When you delete a category, its feeds are automatically classified under <em>%s</em>.',	//TODO - Translation
 		'mute' => 'mute',	//TODO - Translation
 		'no_selected' => 'No feed selected.',	//TODO - Translation
@@ -72,6 +75,7 @@ return array(
 	),
 	'firefox' => array(
 		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',	//TODO - Translation
+		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	//TODO - Translation
 		'title' => 'Firefox feed reader',	//TODO - Translation
 	),
 	'import_export' => array(
diff --git a/app/i18n/ru/user.php b/app/i18n/ru/user.php
new file mode 100644
index 000000000..3a8343c11
--- /dev/null
+++ b/app/i18n/ru/user.php
@@ -0,0 +1,37 @@
+<?php
+
+return array(
+	'email' => array(
+		'feedback' => array(
+			'invalid' => 'The email address is invalid.', //TODO - Translation
+			'required' => 'The 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
+			'feedback' => array(
+				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //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
+			),
+			'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+			'resend_email' => 'Resend the email', //TODO - Translation
+			'title' => 'Email address validation', //TODO - Translation
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'You must accept the Terms of Service to be able to register.', // TODO - Translation
+		),
+	),
+	'mailer' => array(
+		'email_need_validation' => array(
+			'title' => 'You need to validate your account', //TODO - Translation
+			'welcome' => 'Welcome %s,', //TODO - Translation
+			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+		),
+	),
+);
diff --git a/app/i18n/sk/admin.php b/app/i18n/sk/admin.php
new file mode 100644
index 000000000..347204f37
--- /dev/null
+++ b/app/i18n/sk/admin.php
@@ -0,0 +1,199 @@
+<?php
+
+return array(
+	'auth' => array(
+		'allow_anonymous' => 'Povoliť čítanie článkov prednastaveného používateľa (%s) bez prihlásenia.',
+		'allow_anonymous_refresh' => 'Povoliť obnovenie článkov bez prihlásenia',
+		'api_enabled' => 'Povoliť prístup cez <abbr>API</abbr> <small>(vyžadujú mobilné aplikácie)</small>',
+		'form' => 'Webový formulár (traditičný, vyžaduje JavaScript)',
+		'http' => 'HTTP (pre pokročilých používateľov s HTTPS)',
+		'none' => 'Žiadny (nebezpečné)',
+		'title' => 'Prihlásenie',
+		'title_reset' => 'Reset prihlásenia',
+		'token' => 'Token prihlásenia',
+		'token_help' => 'Povoliť prístup k výstupu RSS prednastaveného používateľa bez prihlásenia:',
+		'type' => 'Spôsob prihlásenia',
+		'unsafe_autologin' => 'Povoliť nebezpečné automatické prihlásenie pomocou webového formulára: ',
+	),
+	'check_install' => array(
+		'cache' => array(
+			'nok' => 'Overte prístupové práva priečinka <em>./data/cache</em>. HTTP server musí mať právo doň zapisovať.',
+			'ok' => 'Prístupové práva priečinka pre vyrovnávaciu pamäť sú OK.',
+		),
+		'categories' => array(
+			'nok' => 'Tabuľka kategórií je nesprávne nastavená.',
+			'ok' => 'Tabuľka kategórií je OK.',
+		),
+		'connection' => array(
+			'nok' => 'Nepodarilo sa vytvoriť pripojenie k databáze.',
+			'ok' => 'Pripojenie k databáze je OK.',
+		),
+		'ctype' => array(
+			'nok' => 'Nepodarilo sa nájsť požadovanú knižnicu na kontrolu typu znakov (php-ctype).',
+			'ok' => 'Našla sa požadovaná knižnica na kontrolu typu znakov (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'Nepodarilo sa nájsť knižnicu cURL (balík php-curl).',
+			'ok' => 'Našla sa knižnica cURL.',
+		),
+		'data' => array(
+			'nok' => 'Skontrolujte oprávnenia prístupu do priečinku <em>./data</em>. HTTP server musí mať právo doň zapisovať.',
+			'ok' => 'Oprávnenia prístupu do priečinku údajov sú OK.',
+		),
+		'database' => 'Inštalácia databázy',
+		'dom' => array(
+			'nok' => 'Nepodarilo sa nájsť požadovanú knižnicu na prehliadanie DOM.',
+			'ok' => 'Našla sa požadovaná knižnica na prehliadanie DOM.',
+		),
+		'entries' => array(
+			'nok' => 'Tabuľka článkov je nesprávne nastavená.',
+			'ok' => 'Tabuľka článkov je OK.',
+		),
+		'favicons' => array(
+			'nok' => 'Skontrolujte oprávnenia prístupu do priečinku <em>./data/favicons</em>. HTTP server musí mať právo doň zapisovať.',
+			'ok' => 'Oprávnenia prístupu do priečinku ikôn obľúbených sú OK.',
+		),
+		'feeds' => array(
+			'nok' => 'Tabuľka kanálov je nesprávne nastavená.',
+			'ok' => 'Tabuľka kanálov je OK.',
+		),
+		'fileinfo' => array(
+			'nok' => 'Nepodarilo sa nájsť knižniuc PHP fileinfo (balík fileinfo).',
+			'ok' => 'Našla sa knižnica fileinfo.',
+		),
+		'files' => 'Inštalácia súborov',
+		'json' => array(
+			'nok' => 'Nepodarilo sa nájsť požadovanú knižnicu na spracovanie formátu JSON.',
+			'ok' => 'Našla sa požadovaná knižnica na spracovanie formátu JSON.',
+		),
+		'mbstring' => array(
+			'nok' => 'Nepodarilo sa nájsť požadovanú knižnicu mbstring pre Unicode.',
+			'ok' => 'Našla sa požadovaná knižnica mbstring pre Unicode.',
+		),
+		'minz' => array(
+			'nok' => 'Nepodarilo sa nájsť framework Minz.',
+			'ok' => 'Našiel sa framework Minz.',
+		),
+		'pcre' => array(
+			'nok' => 'Nepodarilo sa nájsť požadovanú knižnicu pre regulárne výrazy (php-pcre).',
+			'ok' => 'Našla sa požadovaná knižnica pre regulárne výrazy (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'Nepodarilo sa nájsť PDO alebo niektorý z podporovaných ovládačov (pdo_mysql, pdo_sqlite, pdo_pgsql).',
+			'ok' => 'Našiel sa PDO a aspoň jeden z podporovaných ovládačov (pdo_mysql, pdo_sqlite, pdo_pgsql).',
+		),
+		'php' => array(
+			'_' => 'Inštalácia PHP',
+			'nok' => 'Vaša verzia PHP je %s, ale FreshRSS vyžaduje minimálne verziu %s.',
+			'ok' => 'Vaša verzia PHP %s je kompatibilná s FreshRSS.',
+		),
+		'tables' => array(
+			'nok' => 'V databáze chýba jedna alebo viacero tabuliek.',
+			'ok' => 'V databáze sa nachádzajú všetky potrebné tabuľky.',
+		),
+		'title' => 'Kontrola inštalácie',
+		'tokens' => array(
+			'nok' => 'Skontrolujte oprávnenia prístupu do priečinku <em>./data/tokens</em>. HTTP server musí mať právo doň zapisovať.',
+			'ok' => 'Oprávnenia prístupu do priečinku tokens sú OK.',
+		),
+		'users' => array(
+			'nok' => 'Skontrolujte oprávnenia prístupu do priečinku <em>./data/users</em>. HTTP server musí mať právo doň zapisovať.',
+			'ok' => 'Oprávnenia prístupu do priečinku používateľov sú OK.',
+		),
+		'zip' => array(
+			'nok' => 'Nepodarilo sa nájsť rozšírenie ZIP (balík php-zip).',
+			'ok' => 'Rozšírenie ZIP sa našlo.',
+		),
+	),
+	'extensions' => array(
+		'author' => 'Autor',
+		'community' => 'Rozšírenia od komunity',
+		'description' => 'Popis',
+		'disabled' => 'Zakázané',
+		'empty_list' => 'Žiadne nainštalované rozšírenia',
+		'enabled' => 'Povolené',
+		'latest' => 'Nainštalované',
+		'name' => 'Názov',
+		'no_configure_view' => 'Toto rozšírenie nemá nastavenia.',
+		'system' => array(
+			'_' => 'Systémové rozšírenia',
+			'no_rights' => 'Systémové rozšírenie (nemáte oprávnenia)',
+		),
+		'title' => 'Rozšírenia',
+		'update' => 'Sú dostupné aktualizácie',
+		'user' => 'Používateľské rozšírenia',
+		'version' => 'Verzia',
+	),
+	'stats' => array(
+		'_' => 'Štatistiky',
+		'all_feeds' => 'Všetky kanály',
+		'category' => 'Kategória',
+		'entry_count' => 'Počet položiek',
+		'entry_per_category' => 'Položiek v kategórii',
+		'entry_per_day' => 'Položiek za deň (posledných 30 dní)',
+		'entry_per_day_of_week' => 'Za deň v týždni (priemer: %.2f správy)',
+		'entry_per_hour' => 'Za hodinu (priemer: %.2f správy)',
+		'entry_per_month' => 'Za mesiac (priemer: %.2f správy)',
+		'entry_repartition' => 'Rozdelenie článkov',
+		'feed' => 'Kanál',
+		'feed_per_category' => 'Kanálov v kategórii',
+		'idle' => 'Neaktívne kanály',
+		'main' => 'Hlavné štatistiky',
+		'main_stream' => 'Všetky kanály',
+		'menu' => array(
+			'idle' => 'Neaktívne kanály',
+			'main' => 'Hlavné štatistiky',
+			'repartition' => 'Rozdelenie článkov',
+		),
+		'no_idle' => 'Žiadne neaktívne kanály!',
+		'number_entries' => 'Počet článkov: %d',
+		'percent_of_total' => 'Z celkového počtu: %%',
+		'repartition' => 'Rozdelenie článkov',
+		'status_favorites' => 'Obľúbené',
+		'status_read' => 'Prečítané',
+		'status_total' => 'Spolu',
+		'status_unread' => 'Neprečítané',
+		'title' => 'Štatistiky',
+		'top_feed' => 'Top 10 kanálov',
+	),
+	'system' => array(
+		'_' => 'Nastavenia systému',
+		'auto-update-url' => 'Odkaz na aktualizačný server',
+		'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',
+		'cookie-duration' => array(
+			'help' => 'v sekundách',
+			'number' => 'Dobra, počas ktorej ste prihlásený',
+		),
+		'registration' => array(
+			'help' => '0 znamená žiadny limit počtu účtov',
+			'number' => 'Maximálny počt účtov',
+		),
+	),
+	'update' => array(
+		'_' => 'Aktualizácia systému',
+		'apply' => 'Použiť',
+		'check' => 'Skontrolovať aktualizácie',
+		'current_version' => 'Vaša aktuálna verzia FreshRSS: %s',
+		'last' => 'Posledná kontrola: %s',
+		'none' => 'Žiadna nová aktualizácia',
+		'title' => 'Aktualizácia systému',
+	),
+	'user' => array(
+		'articles_and_size' => '%s článkov (%s)',
+		'create' => 'Vytvoriť nového používateľa',
+		'delete_users' => 'Zmazať používateľa',
+		'language' => 'Jazyk',
+		'number' => 'Je vytvorený používateľ: %d',
+		'numbers' => 'Je vytvorených používateľov: %d',
+		'password_form' => 'Heslo<br /><small>(pre spôsob prihlásenia cez webový formulár)</small>',
+		'password_format' => 'Minimálne 7 znakov',
+		'selected' => 'Označený používateľ',
+		'title' => 'Správa používateľov',
+		'update_users' => 'Sktualizovať používateľov',
+		'user_list' => 'Zoznam používateľov',
+		'username' => 'Používateľské meno',
+		'users' => 'Používatelia',
+	),
+);
diff --git a/app/i18n/sk/conf.php b/app/i18n/sk/conf.php
new file mode 100644
index 000000000..2e2289b79
--- /dev/null
+++ b/app/i18n/sk/conf.php
@@ -0,0 +1,188 @@
+<?php
+
+return array(
+	'archiving' => array(
+		'_' => 'Archivovanie',
+		'advanced' => 'Pokročilé',
+		'delete_after' => 'Vymazať články po',
+		'help' => 'Viac možností nájdete v nastaveniach kanála',
+		'keep_min_by_feed' => 'Minimálny počet článkov kanála na zachovanie',
+		'optimize' => 'Optimalizovať databázu',
+		'optimize_help' => 'Občas vykonajte na zmenšenie veľkosti databázy',
+		'purge_now' => 'Vyčistiť teraz',
+		'title' => 'Archivovanie',
+		'ttl' => 'Neaktualizovať častejšie ako',
+	),
+	'display' => array(
+		'_' => 'Zobrazenie',
+		'icon' => array(
+			'bottom_line' => 'Spodný riadok',
+			'display_authors' => 'Autori',
+			'entry' => 'Ikony článku',
+			'publication_date' => 'Dátum zverejnenia',
+			'related_tags' => 'Značky článku',
+			'sharing' => 'Zdieľanie',
+			'top_line' => 'Horný riadok',
+		),
+		'language' => 'Jazyk',
+		'notif_html5' => array(
+			'seconds' => 'sekundy (0 znamená bez limitu)',
+			'timeout' => 'Limit HTML5 oznámenia',
+		),
+		'show_nav_buttons' => 'Zobraziť tlačidlá oznámenia',
+		'theme' => 'Vzhľad',
+		'title' => 'Zobraziť',
+		'width' => array(
+			'content' => 'Šírka obsahu',
+			'large' => 'Veľká',
+			'medium' => 'Stredná',
+			'no_limit' => 'Bez obmedzenia',
+			'thin' => 'Úzka',
+		),
+	),
+	'profile' => array(
+		'_' => 'Správca profilu',
+		'delete' => array(
+			'_' => 'Vymazanie účtu',
+			'warn' => 'Váš účet a všetky údaje v ňom budú vymazané.',
+		),
+		'password_api' => 'Heslo API<br /><small>(pre mobilné aplikácie)</small>',
+		'password_form' => 'Heslo<br /><small>(pre spôsob prihlásenia cez webový formulár)</small>',
+		'password_format' => 'Najmenej 7 znakov',
+		'title' => 'Profil',
+	),
+	'query' => array(
+		'_' => 'Dopyty používateľa',
+		'deprecated' => 'Tento dopyt už nie je platný. Kategória alebo kanál boli vymazané.',
+		'display' => 'Zobraziť výsledky dopytu používateľa',
+		'filter' => 'Použitý filter:',
+		'get_all' => 'Zobraziť všetky články',
+		'get_category' => 'Zobraziť kategóriu "%s"',
+		'get_favorite' => 'Zobraziť obľúbené články',
+		'get_feed' => 'Zobraziť kanál "%s"',
+		'no_filter' => 'Žiadny filter',
+		'none' => 'Zatiaľ ste nevytvorili používateľský dopyt.',
+		'number' => 'Dopyt číslo %d',
+		'order_asc' => 'Zobraziť staršie články hore',
+		'order_desc' => 'Zobraziť novšie články hore',
+		'remove' => 'Vymazať dopyt používateľa',
+		'search' => 'Vyhľadáva sa: "%s"',
+		'state_0' => 'Zobraziť všetky články',
+		'state_1' => 'Zobraziť prečítané články',
+		'state_2' => 'Zobraziť neprečítané články',
+		'state_3' => 'Zobraziť všetky články',
+		'state_4' => 'Zobraziť obľúbené články',
+		'state_5' => 'Zobraziť prečítané obľúbené články',
+		'state_6' => 'Zobraziť neprečítané obľúbené články',
+		'state_7' => 'Zobraziť obľúbené články',
+		'state_8' => 'Zobraziť neobľúbené články',
+		'state_9' => 'Zobraziť prečítané neobľúbené články',
+		'state_10' => 'Zobraziť neprečítané neobľúbené články',
+		'state_11' => 'Zobraziť neobľúbené články',
+		'state_12' => 'Zobraziť všetky články',
+		'state_13' => 'Zobraziť prečítané články',
+		'state_14' => 'Zobraziť neprečítané články',
+		'state_15' => 'Zobraziť všetky články',
+		'title' => 'Používateľské dopyty',
+	),
+	'reading' => array(
+		'_' => 'Čítanie',
+		'after_onread' => 'Po “Označiť všetko ako prečítané”,',
+		'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í',
+		'confirm_enabled' => 'Zobraziť potvrdzovací dialóg po kliknutí na “Označiť všetko ako prečítané”',
+		'display_articles_unfolded' => 'Zobraziť články otvorené',
+		'display_categories_unfolded' => 'Zobraziť kategórie otvorené',
+		'hide_read_feeds' => 'Skryť kategórie a kanály s nulovým počtom neprečítaných článkov (nefunguje s nastaveným “Zobraziť všetky články”)',
+		'img_with_lazyload' => 'Pre načítanie obrázkov použiť "lazy load"',
+		'jump_next' => 'skočiť na ďalší neprečítaný (kanál ale kategóriu)',
+		'mark_updated_article_unread' => 'Označiť aktualizované články ako neprečítané',
+		'number_divided_when_reader' => 'V režime čítania predeliť na dve časti.',
+		'read' => array(
+			'article_open_on_website' => 'keď je článok otvorený na svojej webovej stránke',
+			'article_viewed' => 'keď je článok zobrazený',
+			'scroll' => 'počas skrolovania',
+			'upon_reception' => 'po načítaní článku',
+			'when' => 'Označiť článok ako prečítaný…',
+		),
+		'show' => array(
+			'_' => 'Článkov na zobrazenie',
+			'adaptive' => 'Vyberte zobrazenie',
+			'all_articles' => 'Zobraziť všetky články',
+			'unread' => 'Zobraziť iba neprečítané',
+		),
+		'sides_close_article' => 'Po kliknutí mimo textu článku sa článok zatvorí',
+		'sort' => array(
+			'_' => 'Poradie',
+			'newer_first' => 'Novšie hore',
+			'older_first' => 'Staršie hore',
+		),
+		'sticky_post' => 'Po otvorení posunúť článok hore',
+		'title' => 'Čítanie',
+		'view' => array(
+			'default' => 'Prednastavené zobrazenie',
+			'global' => 'Prehľadné zobrazenie',
+			'normal' => 'Základné zobrazenie',
+			'reader' => 'Zobrazenie na čítanie',
+		),
+	),
+	'sharing' => array(
+		'_' => 'Zdieľanie',
+		'add' => 'Pridať spôsob zdieľania',
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'E-mail',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'more_information' => 'Viac informácií',
+		'print' => 'Tlač',
+		'remove' => 'Odstrániť spôsob zdieľania',
+		'shaarli' => 'Shaarli',
+		'share_name' => 'Meno pre zobrazenie',
+		'share_url' => 'Zdieľaný odkaz',
+		'title' => 'Zdieľanie',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'shortcut' => array(
+		'_' => 'Skratky',
+		'article_action' => 'Akcie článku',
+		'auto_share' => 'Zdieľať',
+		'auto_share_help' => 'Ak je nastavený iba jeden spôsob zdieľania, použije sa. Inak si spôsoby zdieľania vyberá používateľ podľa čísla.',
+		'close_dropdown' => 'Zavrie menu',
+		'collapse_article' => 'Zroluje článok',
+		'first_article' => 'Otvorí prvý článok',
+		'focus_search' => 'Vyhľadávanie',
+		'global_view' => 'Prepne do prehľadného zobrazenia',
+		'help' => 'Zobrazí dokumentáciu',
+		'javascript' => 'JavaScript musí byť povolený, ak chcete používať skratky',
+		'last_article' => 'Otvorí posledný článok',
+		'load_more' => 'Načíta viac článkov',
+		'mark_favorite' => 'O(d)značí ako obľúbené',
+		'mark_read' => 'O(d)značí ako prečítané',
+		'navigation' => 'Navigácia',
+		'navigation_help' => 'Po stlačení skratky s klávesou "Shift", sa skratky navigácie vzťahujú na kanály.<br/>Po stlačení skratky s klávesou "Alt", sa skratky navigácie vzťahujú na kategórie.',
+		'navigation_no_mod_help' => 'Tieto skratky navigácie nepodporujú klávesy "Shift" a "Alt".',
+		'next_article' => 'Otvorí ďalší článok',
+		'normal_view' => 'Prepne do základného zobrazenia',
+		'other_action' => 'Ostatné akcie',
+		'previous_article' => 'Otvorí predošlý článok',
+		'reading_view' => 'Prepne do zobrazenia na čítanie',
+		'rss_view' => 'Otvorí zobrazenie RSS v novej záložke',
+		'see_on_website' => 'Zobrazí na webovej stránke',
+		'shift_for_all_read' => '+ <code>shift</code> na označenie všetkých článkov ako prečítaných',
+		'skip_next_article' => 'Prejde na ďalší bez otvorenia',
+		'skip_previous_article' => 'Prejde na predošlý bez otvorenia',
+		'title' => 'Skratky',
+		'user_filter' => 'Použiť používateľské filtre',
+		'user_filter_help' => 'Ak je nastavený iba jeden spôsob zdieľania, použije sa. Inak si spôsoby zdieľania vyberá používateľ podľa čísla.',
+		'views' => 'Zobrazenia',
+	),
+	'user' => array(
+		'articles_and_size' => '%s článkov (%s)',
+		'current' => 'Aktuálny používateľ',
+		'is_admin' => 'je administrátor',
+		'users' => 'Používatelia',
+	),
+);
diff --git a/app/i18n/sk/feedback.php b/app/i18n/sk/feedback.php
new file mode 100644
index 000000000..9aee79068
--- /dev/null
+++ b/app/i18n/sk/feedback.php
@@ -0,0 +1,116 @@
+<?php
+
+return array(
+	'admin' => array(
+		'optimization_complete' => 'Optimalizácia dokončená',
+	),
+	'access' => array(
+		'denied' => 'Na prístup k tejto stránke nemáte oprávnenie',
+		'not_found' => 'Hľadáte stránku, ktorá neexistuje',
+	),
+	'auth' => array(
+		'form' => array(
+			'not_set' => 'Nastavl problém pri nastavovaní prihlasovacieho systému. Prosím, skúste to znova neskôr.',
+			'set' => 'Webový formulár je teraz váš prednastavený prihlasovací spôsob.',
+		),
+		'login' => array(
+			'invalid' => 'Nesprávne prihlasovacie údaje',
+			'success' => 'Úspešne ste sa prihlásili',
+		),
+		'logout' => array(
+			'success' => 'Boli ste odhlásený',
+		),
+		'no_password_set' => 'Heslo administrátora nebolo nastavené. Táto funkcia nie je dostupná.',
+	),
+	'conf' => array(
+		'error' => 'Vyskytla sa chyba počas ukladania nastavaní',
+		'query_created' => 'Dopyt "%s" bol vytvorený.',
+		'shortcuts_updated' => 'Skratky boli aktualizované',
+		'updated' => 'Nastavenia boli aktualizované',
+	),
+	'extensions' => array(
+		'already_enabled' => '%s už je povolené',
+		'disable' => array(
+			'ko' => '%s sa nepodarilo nainštalovať. <a href="%s">Prečítajte si záznamy FreshRSS</a>, ak chcete poznať podrobnosti.',
+			'ok' => '%s je teraz zakázaný',
+		),
+		'enable' => array(
+			'ko' => '%s sa nepodarilo povoliť. <a href="%s">Prečítajte si záznamy FreshRSS</a>, ak chcete poznať podrobnosti.',
+			'ok' => '%s je teraz povolený',
+		),
+		'no_access' => 'Nemáte prístup k %s',
+		'not_enabled' => '%s nie je povolený',
+		'not_found' => '%s neexistuje',
+	),
+	'import_export' => array(
+		'export_no_zip_extension' => 'ZIP rozšírenie sa na vašom serveri nenachádza. Prosím, skúste exportovať súbory pojednom.',
+		'feeds_imported' => 'Váš kanál bol importovaný a bude aktualizovaný',
+		'feeds_imported_with_errors' => 'Vaše kanály boli importované, ale vyskytli sa chyby',
+		'file_cannot_be_uploaded' => 'Súbor sa nepodarilo nahrať!',
+		'no_zip_extension' => 'ZIP rozšírenie sa na vašom serveri nenachádza.',
+		'zip_error' => 'Počas importovania ZIP sa vyskytla chyba.',
+	),
+	'profile' => array(
+		'error' => 'Váš profil nie je možné upraviť',
+		'updated' => 'Váš profil bol upravený',
+	),
+	'sub' => array(
+		'actualize' => 'Aktualizácia',
+		'articles' => array(
+			'marked_read' => 'Vybraté články boli označené ako prečítané.',
+			'marked_unread' => 'Články boli označené ako neprečítané.',
+		),
+		'category' => array(
+			'created' => 'Kategória %s bola vytvorená.',
+			'deleted' => 'Kategória bola odstránená.',
+			'emptied' => 'Kategória bola vyprázdnená',
+			'error' => 'Nepodarilo sa aktualizovať kategóriu',
+			'name_exists' => 'Názov kategórie už existuje.',
+			'no_id' => 'Musíte zadať ID kategórie.',
+			'no_name' => 'Názov kategórie nemôže byť prázdny.',
+			'not_delete_default' => 'Nemôžete odstrániť prednastavenú kategóriu!',
+			'not_exist' => 'Kategória neexistuje!',
+			'over_max' => 'Dosiahli ste limit počtu kategórií (%d)',
+			'updated' => 'Kategória bola aktualizovaná.',
+		),
+		'feed' => array(
+			'actualized' => '<em>%s</em> bol aktualizovaný',
+			'actualizeds' => 'RSS kanál bol aktualizovaný',
+			'added' => 'RSS kanál <em>%s</em> bol pridaný',
+			'already_subscribed' => 'Tento RSS kanál už odoberáte: <em>%s</em>',
+			'deleted' => 'Kanál bol vymazaný',
+			'error' => 'Kanál sa nepodarilo aktualizovať',
+			'internal_problem' => 'Kanál sa nepodarilo pridať. <a href="%s">Prečítajte si záznamy FreshRSS</a>, ak chcete poznať podrobnosti. Skúste pridať kanál pomocou <code>#force_feed</code> v odkaze (URL).',
+			'invalid_url' => 'Odkaz <em>%s</em> je neplatný',
+			'n_actualized' => 'Počet aktualizovaných kanálov: %d',
+			'n_entries_deleted' => 'Počet vymazaných článkov: %d',
+			'no_refresh' => 'Žiadny kanál sa neaktualizoval…',
+			'not_added' => 'Kanál <em>%s</em> sa nepodarilo pridať',
+			'over_max' => 'Dosiahli ste limit počtu kanálov (%d)',
+			'updated' => 'Kanál bol aktualizovaný',
+		),
+		'purge_completed' => 'Čistenie ukončené. Počet vymazaných článkov: %d',
+	),
+	'update' => array(
+		'can_apply' => 'FreshRSS sa teraz aktualizuje <strong>na verziu %s</strong>.',
+		'error' => 'Počas aktualizácie sa vyskytla chyba: %s',
+		'file_is_nok' => 'Je dostupná nová <strong>verzia %s</strong>, ale skontrolujte prístupové práva priečinka <em>%s</em>. HTTP server musí mať právo doň zapisovať.',
+		'finished' => 'Aktualizácia prebehla úspešne!',
+		'none' => 'Žiadne aktualizácie',
+		'server_not_found' => 'Nepodarilo sa nájsť server s aktualizáciami. [%s]',
+	),
+	'user' => array(
+		'created' => array(
+			'_' => 'Používateľ %s bol vytvorený',
+			'error' => 'Používateľ %s nebol vytvorený',
+		),
+		'deleted' => array(
+			'_' => 'Používateľ %s bol vymazaný',
+			'error' => 'Používateľ %s nebol vymazaný',
+		),
+		'updated' => array(
+			'_' => 'Používateľ %s bol aktualizovaný',
+			'error' => 'Používateľ %s nebol aktualizovaný',
+		),
+	),
+);
diff --git a/app/i18n/sk/gen.php b/app/i18n/sk/gen.php
new file mode 100644
index 000000000..7303ffa9f
--- /dev/null
+++ b/app/i18n/sk/gen.php
@@ -0,0 +1,181 @@
+<?php
+
+return array(
+	'action' => array(
+		'actualize' => 'Aktualizovať',
+		'back_to_rss_feeds' => '← Späť na vaše RSS kanály',
+		'cancel' => 'Zrušiť',
+		'create' => 'Vytvoriť',
+		'disable' => 'Zakázať',
+		'empty' => 'Vyprázdniť',
+		'enable' => 'Povoliť',
+		'export' => 'Exportovať',
+		'filter' => 'Filtrovať',
+		'import' => 'Importovať',
+		'manage' => 'Spravovať',
+		'mark_favorite' => 'Označiť ako obľúbené',
+		'mark_read' => 'Označiť ako prečítané',
+		'remove' => 'Odstrániť',
+		'see_website' => 'Zobraziť webovú stránku',
+		'submit' => 'Poslať',
+		'truncate' => 'Vymazať všetky články',
+		'update' => 'Aktualizovať',
+	),
+	'auth' => array(
+		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.', // TODO - Translation
+		'email' => 'E-mailová adresa',
+		'keep_logged_in' => 'Zostať prihlásený <small>(počet dní: %s)</small>',
+		'login' => 'Prihlásiť',
+		'logout' => 'Odhlásiť',
+		'password' => array(
+			'_' => 'Heslo',
+			'format' => '<small>Najmenej 7 znakov</small>',
+		),
+		'registration' => array(
+			'_' => 'Nový účet',
+			'ask' => 'Vytvoriť účet?',
+			'title' => 'Vytvorenie účtu',
+		),
+		'reset' => 'Reset prihlásenia',
+		'username' => array(
+			'_' => 'Používateľské meno',
+			'admin' => 'Administrátorské používateľské meno',
+			'format' => '<small>maximálne 16 alfanumerických znakov</small>',
+		),
+	),
+	'date' => array(
+		'Apr' => '\\A\\p\\r\\í\\l',
+		'apr' => 'Apr.',
+		'april' => 'Apríl',
+		'Aug' => '\\A\\u\\g\\u\\s\\t',
+		'aug' => 'Aug.',
+		'august' => 'August',
+		'before_yesterday' => 'Predvčerom',
+		'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r',
+		'dec' => 'Dec.',
+		'december' => 'December',
+		'Feb' => '\\F\\e\\b\\r\\u\\á\\r',
+		'feb' => 'Feb.',
+		'february' => 'Február',
+		'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',
+		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',
+		'fri' => 'Pi',
+		'Jan' => '\\J\\a\\n\\u\\á\\r',
+		'jan' => 'Jan.',
+		'january' => 'Január',
+		'Jul' => '\\J\\ú\\l',
+		'jul' => 'Júl',
+		'july' => 'Júl',
+		'Jun' => '\\J\\ú\\n',
+		'jun' => 'Jún',
+		'june' => 'Jún',
+		'last_3_month' => 'Posledné 3 mesiace',
+		'last_6_month' => 'Posledných 6 mesiacov',
+		'last_month' => 'Posledný mesiac',
+		'last_week' => 'Posledný týždeň',
+		'last_year' => 'Posledný rok',
+		'Mar' => '\\M\\a\\r\\e\\c',
+		'mar' => 'Mar.',
+		'march' => 'Marec',
+		'May' => '\\M\\á\\j',
+		'may' => 'Máj',
+		'may_' => 'Máj',
+		'mon' => 'Po',
+		'month' => 'mesiace',
+		'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
+		'nov' => 'Nov.',
+		'november' => 'November',
+		'Oct' => '\\O\\k\\t\\ó\\b\\e\\r',
+		'oct' => 'Okt.',
+		'october' => 'Október',
+		'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
+		'sat' => 'So',
+		'sep' => 'Sept.',
+		'september' => 'September',
+		'sun' => 'Ne',
+		'thu' => 'Št',
+		'today' => 'Dnes',
+		'tue' => 'Ut',
+		'wed' => 'St',
+		'yesterday' => 'Včera',
+	),
+	'freshrss' => array(
+		'_' => 'FreshRSS',
+		'about' => 'O FreshRSS',
+	),
+	'js' => array(
+		'category_empty' => 'Prázdna kategória',
+		'confirm_action' => 'Určite chcete vykonať túto akciu? Zmeny budú nezvratné!',
+		'confirm_action_feed_cat' => 'Určite chcete vykonať túto akciu? Prídete o súvisiace obľúbené a používateľské dopyty. Zmeny budú nezvratné!',
+		'feedback' => array(
+			'body_new_articles' => 'Počet nových článkov v čítačke FreshRSS: %%d',
+			'request_failed' => 'Nepodarilo sa spracovať váš dopyt, pravdepodobne kvôli problému s pripojením do internetu.',
+			'title_new_articles' => 'FreshRSS: nové články!',
+		),
+		'new_article' => 'Našli sa nové články. Kliknite na obnovenie stránky.',
+		'should_be_activated' => 'Musíte povoliť JavaScript',
+	),
+	'menu' => array(
+		'about' => 'O FreshRSS',
+		'admin' => 'Administrácia',
+		'archiving' => 'Archivácia',
+		'authentication' => 'Prihlásenie',
+		'check_install' => 'Kontroloa inštalácie',
+		'configuration' => 'Nastavenia',
+		'display' => 'Zobrazenie',
+		'extensions' => 'Rozšírenia',
+		'logs' => 'Záznamy',
+		'queries' => 'Používateľské dopyty',
+		'reading' => 'Čítanie',
+		'search' => 'Hľadajte slová alebo #značky',
+		'sharing' => 'Zdieľanie',
+		'shortcuts' => 'Skratky',
+		'stats' => 'Štatistiky',
+		'system' => 'Nastavenie systému',
+		'update' => 'Aktualizácia',
+		'user_management' => 'Spravovať používateľov',
+		'user_profile' => 'Profil',
+	),
+	'pagination' => array(
+		'first' => 'Prvý',
+		'last' => 'Posledný',
+		'load_more' => 'Načítať viac článkov',
+		'mark_all_read' => 'Označiť všetko prečítané',
+		'next' => 'Ďalší',
+		'nothing_to_load' => 'Žiadne nové články',
+		'previous' => 'Predošlý',
+	),
+	'share' => array(
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'E-mail',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'gnusocial' => 'GNU social',
+		'jdh' => 'Journal du hacker',
+		'Known' => 'Stránky založené na Known',
+		'linkedin' => 'LinkedIn',
+		'mastodon' => 'Mastodon',
+		'movim' => 'Movim',
+		'pinboard' => 'Pinboard',
+		'pocket' => 'Pocket',
+		'print' => 'Print',
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag v1',
+		'wallabagv2' => 'wallabag v2',
+	),
+	'short' => array(
+		'attention' => 'Upozornenie!',
+		'blank_to_disable' => 'Ak chcete zakázať, ponechajte prázdne',
+		'by_author' => 'Od:',
+		'by_default' => 'Prednastavené',
+		'damn' => 'Sakra!',
+		'default_category' => 'Bez kategórie',
+		'no' => 'Nie',
+		'not_applicable' => 'Nie je k dispozícii',
+		'ok' => 'OK',
+		'or' => 'alebo',
+		'yes' => 'Áno',
+	),
+);
diff --git a/app/i18n/sk/index.php b/app/i18n/sk/index.php
new file mode 100644
index 000000000..ae5a077b0
--- /dev/null
+++ b/app/i18n/sk/index.php
@@ -0,0 +1,66 @@
+<?php
+
+return array(
+	'about' => array(
+		'_' => 'O FreshRSS',
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+		'bugs_reports' => 'Nahlásiť chybu',
+		'credits' => 'Poďakovanie',
+		'credits_content' => 'Niektoré časti vzhľadu pochádzajú z <a href="http://twitter.github.io/bootstrap/">Bootstrap</a>u, aj keď FreshRSS tento framework nepoužíva. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Ikony</a> sú z <a href="https://www.gnome.org/">GNOME project</a>. Font <em>Open Sans</em> zabezpečil <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS je založený na PHP frameworku <a href="https://github.com/marienfressinaud/MINZ">Minz</a>.',
+		'freshrss_description' => 'FreshRSS je čítačka RSS kanálov, ktorú môžete nasadiť na vlastný server podobne ako <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> alebo <a href="https://github.com/LeedRSS/Leed">Leed</a>. Ide o jednoduchý a zároveň dobre nastaviteľný nástroj.',
+		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">na Github</a>e',
+		'license' => 'Licencia',
+		'project_website' => 'Webová stránka projektu',
+		'title' => 'O FreshRSS',
+		'version' => 'Verzia',
+		'website' => 'Webová stránka',
+	),
+	'tos' => array(
+		'title' => 'Terms of Service', // TODO - Translation
+	),
+	'feed' => array(
+		'add' => 'Môžete pridať kanály.',
+		'empty' => 'Žiadne články.',
+		'rss_of' => 'RSS kanál pre %s',
+		'title' => 'Vaše RSS kanály',
+		'title_global' => 'Prehľad',
+		'title_fav' => 'Vaše obľúbené',
+	),
+	'log' => array(
+		'_' => 'Záznamy',
+		'clear' => 'Vymazať záznamy',
+		'empty' => 'Súbor záznamu je prázdny',
+		'title' => 'Záznamy',
+	),
+	'menu' => array(
+		'about' => 'O FreshRSS',
+		'add_query' => 'Vytvoriť dopyt',
+		'before_one_day' => 'Pred 1 dňom',
+		'before_one_week' => 'Pred 1 týždňom',
+		'favorites' => 'Obľúbené (%s)',
+		'global_view' => 'Prehľad',
+		'main_stream' => 'Všetky kanály',
+		'mark_all_read' => 'Označiť všetko ako prečítané',
+		'mark_cat_read' => 'Označiť kategóriu ako prečítanú',
+		'mark_feed_read' => 'Označiť kanál ako prečítaný',
+		'mark_selection_unread' => 'Označiť označené ako prečítané',
+		'newer_first' => 'Novšie hore',
+		'non-starred' => 'Zobraziť všetko okrem obľúbených',
+		'normal_view' => 'Základné zobrazenie',
+		'older_first' => 'Staršie hore',
+		'queries' => 'Používateľské dopyty',
+		'read' => 'Zobraziť prečítané',
+		'reader_view' => 'Zobrazenie na čítanie',
+		'rss_view' => 'RSS kanál',
+		'search_short' => 'Hľadať',
+		'starred' => 'Zobraziť obľúbené',
+		'stats' => 'Štatistiky',
+		'subscription' => 'Správca odberov',
+		'tags' => 'Moje nálepky',
+		'unread' => 'Zobraziť neprečítané',
+	),
+	'share' => 'Zdieľať',
+	'tag' => array(
+		'related' => 'Značky článku',
+	),
+);
diff --git a/app/i18n/sk/install.php b/app/i18n/sk/install.php
new file mode 100644
index 000000000..08fbfeef9
--- /dev/null
+++ b/app/i18n/sk/install.php
@@ -0,0 +1,123 @@
+<?php
+
+return array(
+	'action' => array(
+		'finish' => 'Dokončiť inštaláciu',
+		'fix_errors_before' => 'Prosím, pred pokračovaním opravte chyby.',
+		'keep_install' => 'Použiť predošlé nastavenia',
+		'next_step' => 'Ďalší krok',
+		'reinstall' => 'Preinštalovať FreshRSS',
+	),
+	'auth' => array(
+		'form' => 'Webový formulár (tradičný, vyžaduje JavaScript)',
+		'http' => 'HTTP (pre pokročilých používateľov s HTTPS)',
+		'none' => 'Žiadny (nebezpečné)',
+		'password_form' => 'Heslo<br /><small>(pre prihlásenie cez webový formulár)</small>',
+		'password_format' => 'Najmenej 7 znakov',
+		'type' => 'Spôsob prihlásenia',
+	),
+	'bdd' => array(
+		'_' => 'Databáza',
+		'conf' => array(
+			'_' => 'Nastavenia databázy',
+			'ko' => 'Skontrolovať vaše informácie o databáze.',
+			'ok' => 'Nastavenia databázy boli uložené.',
+		),
+		'host' => 'Server',
+		'password' => 'Heslo databázy',
+		'prefix' => 'Predpona názvu tabuľky',
+		'type' => 'Druh databázy',
+		'username' => 'Používateľské meno databázy',
+	),
+	'check' => array(
+		'_' => 'Kontrola',
+		'already_installed' => 'Zistilo sa, že FreshRSS je už nainštalovaný!',
+		'cache' => array(
+			'nok' => 'Skontrolujte oprávnenia prístupu do priečinku <em>./data/cache</em>. HTTP server musí mať právo doň zapisovať.',
+			'ok' => 'Oprávnenia prístupu do priečinku vyrovnávacej pamäte sú OK.',
+		),
+		'ctype' => array(
+			'nok' => 'Nepodarilo sa nájsť požadovanú knižnicu na kontrolu typu znakov (php-ctype).',
+			'ok' => 'Našla sa požadovaná knižnica na kontrolu typu znakov (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'Nepodarilo sa nájsť knižnicu cURL (balík php-curl).',
+			'ok' => 'Našla sa knižnica cURL.',
+		),
+		'data' => array(
+			'nok' => 'Skontrolujte oprávnenia prístupu do priečinku <em>./data</em>. HTTP server musí mať právo doň zapisovať.',
+			'ok' => 'Oprávnenia prístupu do priečinku údajov sú OK.',
+		),
+		'dom' => array(
+			'nok' => 'Nepodarilo sa nájsť požadovanú knižnicu na prehliadanie DOM.',
+			'ok' => 'Našla sa požadovaná knižnica na prehliadanie DOM.',
+		),
+		'favicons' => array(
+			'nok' => 'Skontrolujte oprávnenia prístupu do priečinku <em>./data/favicons</em>. HTTP server musí mať právo doň zapisovať.',
+			'ok' => 'Oprávnenia prístupu do priečinku ikôn obľúbených sú OK.',
+		),
+		'fileinfo' => array(
+			'nok' => 'Nepodarilo sa nájsť knižniuc PHP fileinfo (balík fileinfo).',
+			'ok' => 'Našla sa knižnica fileinfo.',
+		),
+		'http_referer' => array(
+			'nok' => 'Prosím, skontrolujte, či ste nezmenili váš HTTP REFERER.',
+			'ok' => 'Váš HTTP REFERER je OK.',
+		),
+		'json' => array(
+			'nok' => 'Nepodarilo sa nájsť požadovanú knižnicu na spracovanie formátu JSON.',
+			'ok' => 'Našla sa požadovaná knižnica na spracovanie formátu JSON.',
+		),
+		'mbstring' => array(
+			'nok' => 'Nepodarilo sa nájsť požadovanú knižnicu mbstring pre Unicode.',
+			'ok' => 'Našla sa požadovaná knižnica mbstring pre Unicode.',
+		),
+		'minz' => array(
+			'nok' => 'Nepodarilo sa nájsť framework Minz.',
+			'ok' => 'Našiel sa framework Minz.',
+		),
+		'pcre' => array(
+			'nok' => 'Nepodarilo sa nájsť požadovanú knižnicu pre regulárne výrazy (php-pcre).',
+			'ok' => 'Našla sa požadovaná knižnica pre regulárne výrazy (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'Nepodarilo sa nájsť PDO alebo niektorý z podporovaných ovládačov (pdo_mysql, pdo_sqlite, pdo_pgsql).',
+			'ok' => 'Našiel sa PDO a aspoň jeden z podporovaných ovládačov (pdo_mysql, pdo_sqlite, pdo_pgsql).',
+		),
+		'php' => array(
+			'nok' => 'Vaša verzia PHP je %s, ale FreshRSS vyžaduje minimálne verziu %s.',
+			'ok' => 'Vaša verzia PHP %s je kompatibilná s FreshRSS.',
+		),
+		'users' => array(
+			'nok' => 'Skontrolujte oprávnenia prístupu do priečinku <em>./data/users</em>. HTTP server musí mať právo doň zapisovať.',
+			'ok' => 'Oprávnenia prístupu do priečinku používateľov sú OK.',
+		),
+		'xml' => array(
+			'nok' => 'Nepodarilo sa nájsť požadovanú knižnicu na spracovanie formátu XML.',
+			'ok' => 'Našla sa požadovaná knižnica na spracovanie formátu XML.',
+		),
+	),
+	'conf' => array(
+		'_' => 'Hlavné nastavenia',
+		'ok' => 'Hlavné nastavenia boli uložené.',
+	),
+	'congratulations' => 'Nastavenia!',
+	'default_user' => 'Hlavné používateľské meno <small>(najviac 16 alfanumerických znakov)</small>',
+	'delete_articles_after' => 'Vymazať články po',
+	'fix_errors_before' => 'Prosím, pred pokračovaním opravte chyby.',
+	'javascript_is_better' => 'FreshRSS si užijete viac, keď povolíte JavaScript',
+	'js' => array(
+		'confirm_reinstall' => 'Ak budete pokračovať v preinštalovaní FreshRSS, stratíte vaše predošlé nastavenia. Naozaj chcete pokračovať?',
+	),
+	'language' => array(
+		'_' => 'Jazyk',
+		'choose' => 'Vyberte jazyk pre FreshRSS',
+		'defined' => 'Jazyk bol nastavený.',
+	),
+	'not_deleted' => 'Niečo sa nepodarilo. Musíte ručne zmazať súbor <em>%s</em>.',
+	'ok' => 'Inštalácia bola úspešná.',
+	'step' => 'krok %d',
+	'steps' => 'Kroky',
+	'title' => 'Inštalácia · FreshRSS',
+	'this_is_the_end' => 'Toto je koniec',
+);
diff --git a/app/i18n/sk/sub.php b/app/i18n/sk/sub.php
new file mode 100644
index 000000000..3149c370b
--- /dev/null
+++ b/app/i18n/sk/sub.php
@@ -0,0 +1,103 @@
+<?php
+
+return array(
+	'api' => array(
+		'documentation' => 'Skopírujte tento odkaz a použite ho v inom programe.',
+		'title' => 'API',
+	),
+	'bookmarklet' => array(
+		'documentation' => 'Presunte toto tlačidlo do vašich záložiek, alebo kliknite pravým a zvoľte "Uložiť odkaz do záložiek". Potom kliknite na tlačidlo "Odoberať" na ktorejkoľvek stránke, ktorú chcete odoberať.',
+		'label' => 'Odoberať',
+		'title' => 'Záložka',
+	),
+	'category' => array(
+		'_' => 'Kategória',
+		'add' => 'Pridať kategóriu',
+		'empty' => 'Prázdna kategória',
+		'information' => 'Informácia',
+		'new' => 'Nová kategória',
+		'position' => 'Display position',	//TODO - Translation
+		'position_help' => 'To control category sort order',	//TODO - Translation
+		'title' => 'Názov',
+	),
+	'feed' => array(
+		'add' => 'Pridať RSS kanál',
+		'advanced' => 'Pokročilé',
+		'archiving' => 'Archivovanie',
+		'auth' => array(
+			'configuration' => 'Prihlásenie',
+			'help' => 'Povoliť prístup do kanálov chránených cez HTTP.',
+			'http' => 'Prihlásenie cez HTTP',
+			'password' => 'Heslo pre HTTP',
+			'username' => 'Používateľské meno pre HTTP',
+		),
+		'clear_cache' => 'Vždy vymazať vyrovnávaciu pamäť',
+		'css_help' => 'Stiahnuť skrátenú verziu RSS kanála (pozor, vyžaduje viac času!)',
+		'css_path' => 'Pôvodný CSS súbor článku z webovej stránky',
+		'description' => 'Popis',
+		'empty' => 'Tento kanál je prázdny. Overte, prosím, či je ešte spravovaný autorom.',
+		'error' => 'Vyskytol sa problém s týmto kanálom. Overte, prosím, či kanál stále existuje, potom ho obnovte.',
+		'filteractions' => array(
+			'_' => 'Filtrovať akcie',
+			'help' => 'Napíšte jeden výraz hľadania na riadok.',
+		),
+		'information' => 'Informácia',
+		'keep_min' => 'Minimálny počet článkov na uchovanie',
+		'moved_category_deleted' => 'Keď vymažete kategóriu, jej kanály sa automaticky zaradia pod <em>%s</em>.',
+		'mute' => 'stíšiť',
+		'no_selected' => 'Nevybrali ste kanál.',
+		'number_entries' => 'Počet článkov: %d',
+		'priority' => array(
+			'_' => 'Viditeľnosť',
+			'archived' => 'Nezobrazovať (archivované)',
+			'main_stream' => 'Zobraziť v prehľade kanálov',
+			'normal' => 'Zobraziť vo svojej kategórii',
+		),
+		'websub' => 'Okamžité oznámenia cez WebSub',
+		'show' => array(
+			'all' => 'Zobraziť všetky kanály',
+			'error' => 'Zobraziť iba kanály s chybou',
+		),
+		'showing' => array(
+			'error' => 'Zobraziť iba kanály s chybou',
+		),
+		'ssl_verify' => 'Overiť bezpečnosť SSL',
+		'stats' => 'Štatistiky',
+		'think_to_add' => 'Mali by ste pridať kanály.',
+		'timeout' => 'Doba platnosti dá v sekundách',
+		'title' => 'Nadpis',
+		'title_add' => 'Pridať kanál RSS',
+		'ttl' => 'Automaticky neaktualizovať častejšie ako',
+		'url' => 'Odkaz kanála',
+		'validator' => 'Skontrolovať platnosť kanála',
+		'website' => 'Odkaz webovej stránky',
+	),
+	'firefox' => array(
+		'documentation' => 'Pridajte RSS kanály do Firefoxu <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">pomocou tohto návodu</a>.',
+		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	//TODO - Translation
+		'title' => 'RSS čítačka vo Firefoxe',
+	),
+	'import_export' => array(
+		'export' => 'Exportovať',
+		'export_opml' => 'Exportovať zoznam kanálov (OPML)',
+		'export_starred' => 'Exportovať vaše obľúbené',
+		'export_labelled' => 'Exportovať vaše označené články',
+		'feed_list' => 'Zoznam článkov %s',
+		'file_to_import' => 'Súbor na import<br />(OPML, JSON alebo ZIP)',
+		'file_to_import_no_zip' => 'Súbor na import<br />(OPML alebo JSON)',
+		'import' => 'Importovať',
+		'starred_list' => 'Zoznam obľúbených článkov',
+		'title' => 'Import / export',
+	),
+	'menu' => array(
+		'bookmark' => 'Odoberať (záložka FreshRSS)',
+		'import_export' => 'Import / export',
+		'subscription_management' => 'Správa odoberaných kanálov',
+		'subscription_tools' => 'Nástroje na odoberanie kanálov',
+	),
+	'title' => array(
+		'_' => 'Správa odoberaných kanálov',
+		'feed_management' => 'Správa RSS kanálov',
+		'subscription_tools' => 'Nástroje na odoberanie kanálov',
+	),
+);
diff --git a/app/i18n/sk/user.php b/app/i18n/sk/user.php
new file mode 100644
index 000000000..3a8343c11
--- /dev/null
+++ b/app/i18n/sk/user.php
@@ -0,0 +1,37 @@
+<?php
+
+return array(
+	'email' => array(
+		'feedback' => array(
+			'invalid' => 'The email address is invalid.', //TODO - Translation
+			'required' => 'The 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
+			'feedback' => array(
+				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //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
+			),
+			'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+			'resend_email' => 'Resend the email', //TODO - Translation
+			'title' => 'Email address validation', //TODO - Translation
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'You must accept the Terms of Service to be able to register.', // TODO - Translation
+		),
+	),
+	'mailer' => array(
+		'email_need_validation' => array(
+			'title' => 'You need to validate your account', //TODO - Translation
+			'welcome' => 'Welcome %s,', //TODO - Translation
+			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+		),
+	),
+);
diff --git a/app/i18n/tr/admin.php b/app/i18n/tr/admin.php
index b1d6671ca..2c7d0fd6d 100644
--- a/app/i18n/tr/admin.php
+++ b/app/i18n/tr/admin.php
@@ -159,6 +159,7 @@ return array(
 	'system' => array(
 		'_' => 'Sistem yapılandırması',
 		'auto-update-url' => 'Otomatik güncelleme sunucu URL',
+		'force_email_validation' => 'Force email addresses 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 6c57d39da..c8ea78efa 100644
--- a/app/i18n/tr/conf.php
+++ b/app/i18n/tr/conf.php
@@ -3,13 +3,21 @@
 return array(
 	'archiving' => array(
 		'_' => 'Arşiv',
-		'advanced' => 'Gelişmiş',
 		'delete_after' => 'Makelelerin tutulacağı süre',
+		'exception' => 'Purge exception',	//TODO - Translation
 		'help' => 'Akış ayarlarında daha çok ayar bulabilirsiniz',
-		'keep_history_by_feed' => 'Akışta en az tutulacak makale sayısı',
+		'keep_favourites' => 'Never delete favourites',	//TODO - Translation
+		'keep_min_by_feed' => 'Akışta en az tutulacak makale sayısı',
+		'keep_labels' => 'Never delete labels',	//TODO - Translation
+		'keep_unreads' => 'Never delete unreads',	//TODO - Translation
+		'maintenance' => 'Maintenance',	//TODO - Translation
 		'optimize' => 'Veritabanı optimize et',
 		'optimize_help' => 'Bu işlem bazen veritabanı boyutunu düşürmeye yardımcı olur',
+		'policy' => 'Purge policy',	//TODO - Translation
+		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	//TODO - Translation
 		'purge_now' => 'Şimdi temizle',
+		'keep_max' => 'Maximum number of articles to keep',	//TODO - Translation
+		'keep_period' => 'Maximum age of articles to keep',	//TODO - Translation
 		'title' => 'Arşiv',
 		'ttl' => 'Şu süreden sık otomatik yenileme yapma',
 	),
@@ -21,6 +29,7 @@ return array(
 			'publication_date' => 'Yayınlama Tarihi',
 			'related_tags' => 'İlgili etiketler',	//TODO - Translation
 			'sharing' => 'Paylaşım',
+			'display_authors' => 'Authors',  //TODO - Translation
 			'top_line' => 'Üst çizgi',
 		),
 		'language' => 'Dil',
@@ -45,6 +54,7 @@ return array(
 			'_' => 'Hesap silme',
 			'warn' => 'Hesabınız ve tüm verileriniz silinecek.',
 		),
+		'email' => 'Email adresleri',
 		'password_api' => 'API Şifresi<br /><small>(ör. mobil uygulamalar için)</small>',
 		'password_form' => 'Şifre<br /><small>(Tarayıcı girişi için)</small>',
 		'password_format' => 'En az 7 karakter',
@@ -133,7 +143,6 @@ return array(
 		'diaspora' => 'Diaspora*',
 		'email' => 'Email',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'more_information' => 'Daha fazla bilgi',
 		'print' => 'Yazdır',
 		'remove' => 'Remove sharing method',	//TODO - Translation
diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php
index a84c39f20..ccc5b9ee6 100644
--- a/app/i18n/tr/gen.php
+++ b/app/i18n/tr/gen.php
@@ -3,6 +3,7 @@
 return array(
 	'action' => array(
 		'actualize' => 'Yenile',
+		'back' => '← Go back', //TODO - Translation
 		'back_to_rss_feeds' => '← RSS akışlarınız için geri gidin',
 		'cancel' => 'İptal',
 		'create' => 'Oluştur',
@@ -22,6 +23,7 @@ return array(
 		'update' => 'Update',	//TODO - Translation
 	),
 	'auth' => array(
+		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.', // TODO - Translation
 		'email' => 'Email adresleri',
 		'keep_logged_in' => '<small>(%s günler)</small> oturumu açık tut',
 		'login' => 'Giriş',
@@ -160,15 +162,22 @@ return array(
 		'nothing_to_load' => 'Başka makale yok',
 		'previous' => 'Önceki',
 	),
+	'period' => array(
+		'days' => 'days',	//TODO - Translation
+		'hours' => 'hours',	//TODO - Translation
+		'months' => 'months',	//TODO - Translation
+		'weeks' => 'weeks',	//TODO - Translation
+		'years' => 'years',	//TODO - Translation
+	),
 	'share' => array(
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
 		'email' => 'Email',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'gnusocial' => 'GNU social',
 		'jdh' => 'Journal du hacker',
 		'Known' => 'Known based sites',
+		'lemmy' => 'Lemmy',
 		'linkedin' => 'LinkedIn',
 		'mastodon' => 'Mastodon',
 		'movim' => 'Movim',
diff --git a/app/i18n/tr/index.php b/app/i18n/tr/index.php
index d6db514dd..e284d78db 100644
--- a/app/i18n/tr/index.php
+++ b/app/i18n/tr/index.php
@@ -7,7 +7,7 @@ return array(
 		'bugs_reports' => 'Hata raporu',
 		'credits' => 'Tanıtım',
 		'credits_content' => 'Bu frameworkü kullanmamasına rağmen FreshRSS bazı tasarım ögelerini <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> dan almıştır. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">İkonlar</a> <a href="https://www.gnome.org/">GNOME projesinden</a> alınmıştır. <em>Open Sans</em> yazı tipi <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a> tarafından oluşturulmuştur. FreshRSS bir PHP framework olan <a href="https://github.com/marienfressinaud/MINZ">Minz</a> i temel alır.',
-		'freshrss_description' => 'FreshRSS <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> veya <a href="http://leed.idleman.fr/">Leed</a> gibi kendi hostunuzda çalışan bir RSS akış toplayıcısıdır. Güçlü ve yapılandırılabilir araçlarıyla basit ve kullanımı kolay bir uygulamadır.',
+		'freshrss_description' => 'FreshRSS <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> veya <a href="https://github.com/LeedRSS/Leed">Leed</a> gibi kendi hostunuzda çalışan bir RSS akış toplayıcısıdır. Güçlü ve yapılandırılabilir araçlarıyla basit ve kullanımı kolay bir uygulamadır.',
 		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">Github sayfası</a>',
 		'license' => 'Lisans',
 		'project_website' => 'Proje sayfası',
@@ -15,6 +15,9 @@ return array(
 		'version' => 'Versiyon',
 		'website' => 'Website',
 	),
+	'tos' => array(
+		'title' => 'Terms of Service', // TODO - Translation
+	),
 	'feed' => array(
 		'add' => 'Akış ekleyebilirsin.',
 		'empty' => 'Gösterilecek makale yok.',
diff --git a/app/i18n/tr/sub.php b/app/i18n/tr/sub.php
index 858d15758..ed2a7ce76 100644
--- a/app/i18n/tr/sub.php
+++ b/app/i18n/tr/sub.php
@@ -13,9 +13,12 @@ return array(
 	'category' => array(
 		'_' => 'Kategori',
 		'add' => 'Kategori ekle',
+		'archiving' => 'Arşiv',
 		'empty' => 'Boş kategori',
 		'information' => 'Bilgi',
 		'new' => 'Yeni kategori',
+		'position' => 'Display position',	//TODO - Translation
+		'position_help' => 'To control category sort order',	//TODO - Translation
 		'title' => 'Başlık',
 	),
 	'feed' => array(
@@ -40,7 +43,7 @@ return array(
 			'help' => 'Write one search filter per line.',	//TODO - Translation
 		),
 		'information' => 'Bilgi',
-		'keep_history' => 'En az tutulacak makale sayısı',
+		'keep_min' => 'En az tutulacak makale sayısı',
 		'moved_category_deleted' => 'Bir kategoriyi silerseniz, içerisindeki akışlar <em>%s</em> içerisine yerleşir.',
 		'mute' => 'mute',	//TODO - Translation
 		'no_selected' => 'Hiçbir akış seçilmedi.',
@@ -72,6 +75,7 @@ return array(
 	),
 	'firefox' => array(
 		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',	//TODO - Translation
+		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	//TODO - Translation
 		'title' => 'Firefox feed reader',	//TODO - Translation
 	),
 	'import_export' => array(
diff --git a/app/i18n/tr/user.php b/app/i18n/tr/user.php
new file mode 100644
index 000000000..3a8343c11
--- /dev/null
+++ b/app/i18n/tr/user.php
@@ -0,0 +1,37 @@
+<?php
+
+return array(
+	'email' => array(
+		'feedback' => array(
+			'invalid' => 'The email address is invalid.', //TODO - Translation
+			'required' => 'The 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
+			'feedback' => array(
+				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //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
+			),
+			'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+			'resend_email' => 'Resend the email', //TODO - Translation
+			'title' => 'Email address validation', //TODO - Translation
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'You must accept the Terms of Service to be able to register.', // TODO - Translation
+		),
+	),
+	'mailer' => array(
+		'email_need_validation' => array(
+			'title' => 'You need to validate your account', //TODO - Translation
+			'welcome' => 'Welcome %s,', //TODO - Translation
+			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+		),
+	),
+);
diff --git a/app/i18n/zh-cn/admin.php b/app/i18n/zh-cn/admin.php
index 74f57b6e8..cdc8449a3 100644
--- a/app/i18n/zh-cn/admin.php
+++ b/app/i18n/zh-cn/admin.php
@@ -159,6 +159,7 @@ return array(
 	'system' => array(
 		'_' => '系统配置',
 		'auto-update-url' => '自动升级服务器 URL',
+		'force_email_validation' => 'Force email addresses validation', //TODO - Translation
 		'instance-name' => '实例名称',
 		'max-categories' => '每用户分类限制',
 		'max-feeds' => '每用户 RSS 源限制',
diff --git a/app/i18n/zh-cn/conf.php b/app/i18n/zh-cn/conf.php
index 216e4590a..a7404bc58 100644
--- a/app/i18n/zh-cn/conf.php
+++ b/app/i18n/zh-cn/conf.php
@@ -3,13 +3,21 @@
 return array(
 	'archiving' => array(
 		'_' => '存档',
-		'advanced' => '高级',
 		'delete_after' => '文章保留',
+		'exception' => 'Purge exception',	//TODO - Translation
 		'help' => '详细选项位于单独的 RSS 源设置',
-		'keep_history_by_feed' => '至少保存的文章数',
+		'keep_favourites' => 'Never delete favourites',	//TODO - Translation
+		'keep_min_by_feed' => '至少保存的文章数',
+		'keep_labels' => 'Never delete labels',	//TODO - Translation
+		'keep_unreads' => 'Never delete unreads',	//TODO - Translation
+		'maintenance' => 'Maintenance',	//TODO - Translation
 		'optimize' => '优化数据库',
 		'optimize_help' => '偶尔执行优化可以减少数据库大小',
+		'policy' => 'Purge policy',	//TODO - Translation
+		'policy_warning' => 'If no purge policy is selected, every article will be kept.',	//TODO - Translation
 		'purge_now' => '立即清除',
+		'keep_max' => 'Maximum number of articles to keep',	//TODO - Translation
+		'keep_period' => 'Maximum age of articles to keep',	//TODO - Translation
 		'title' => '存档',
 		'ttl' => '最小自动更新时间',
 	),
@@ -21,6 +29,7 @@ return array(
 			'publication_date' => '更新日期',
 			'related_tags' => '相关标签',
 			'sharing' => '分享',
+			'display_authors' => 'Authors',  //TODO - Translation
 			'top_line' => '顶栏',
 		),
 		'language' => '语言',
@@ -45,6 +54,7 @@ return array(
 			'_' => '账户删除',
 			'warn' => '你的帐户和所有相关数据都将被删除。',
 		),
+		'email' => 'Email 地址',
 		'password_api' => 'API 密码<br /><small>(例如,用于手机 APP)</small>',
 		'password_form' => '密码<br /><small>(用于 Web-form 登录方式)</small>',
 		'password_format' => '至少 7 个字符',
@@ -133,7 +143,6 @@ return array(
 		'diaspora' => 'Diaspora*',
 		'email' => 'Email',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'more_information' => '更多信息',
 		'print' => '打印',
 		'remove' => '删除分享方式',
diff --git a/app/i18n/zh-cn/gen.php b/app/i18n/zh-cn/gen.php
index 11d4efdb3..31817260e 100644
--- a/app/i18n/zh-cn/gen.php
+++ b/app/i18n/zh-cn/gen.php
@@ -3,6 +3,7 @@
 return array(
 	'action' => array(
 		'actualize' => '获取',
+		'back' => '← Go back', //TODO - Translation
 		'back_to_rss_feeds' => '← 返回',
 		'cancel' => '取消',
 		'create' => '创建',
@@ -22,6 +23,7 @@ return array(
 		'update' => '更新',	//TODO - Translation
 	),
 	'auth' => array(
+		'accept_tos' => 'I accept the <a href="%s">Terms of Service</a>.', // TODO - Translation
 		'email' => 'Email 地址',
 		'keep_logged_in' => '自动登录<small>(%s 天)</small>',
 		'login' => '登录',
@@ -160,15 +162,22 @@ return array(
 		'nothing_to_load' => '没有更多文章了',
 		'previous' => '上一页',
 	),
+	'period' => array(
+		'days' => 'days',	//TODO - Translation
+		'hours' => 'hours',	//TODO - Translation
+		'months' => 'months',	//TODO - Translation
+		'weeks' => 'weeks',	//TODO - Translation
+		'years' => 'years',	//TODO - Translation
+	),
 	'share' => array(
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
 		'email' => 'Email',
 		'facebook' => 'Facebook',
-		'g+' => 'Google+',
 		'gnusocial' => 'GNU social',
 		'jdh' => 'Journal du hacker',
 		'Known' => '基于 Known 的站点',
+		'lemmy' => 'Lemmy',
 		'linkedin' => 'LinkedIn',
 		'mastodon' => 'Mastodon',
 		'movim' => 'Movim',
diff --git a/app/i18n/zh-cn/index.php b/app/i18n/zh-cn/index.php
index 018813c3e..3e448608e 100644
--- a/app/i18n/zh-cn/index.php
+++ b/app/i18n/zh-cn/index.php
@@ -7,7 +7,7 @@ return array(
 		'bugs_reports' => 'Bug 报告',
 		'credits' => '致谢',
 		'credits_content' => '某些设计元素来自于 <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> ，尽管 FreshRSS 并没有使用此框架。<a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">图标</a> 来自于 <a href="https://www.gnome.org/">GNOME 项目</a>。<em>Open Sans</em> 字体出自 <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a> 之手。FreshRSS 基于 PHP 框架 <a href="https://github.com/marienfressinaud/MINZ">Minz</a>。',
-		'freshrss_description' => 'FreshRSS 是一个自托管的 RSS 聚合服务，类似于 <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> 或 <a href="http://leed.idleman.fr/">Leed</a>。 它不仅轻快又易用，而且强大又易于配置。',
+		'freshrss_description' => 'FreshRSS 是一个自托管的 RSS 聚合服务，类似于 <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> 或 <a href="https://github.com/LeedRSS/Leed">Leed</a>。 它不仅轻快又易用，而且强大又易于配置。',
 		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">Github Issues</a>',
 		'license' => '授权',
 		'project_website' => '项目网站',
@@ -15,6 +15,9 @@ return array(
 		'version' => '版本',
 		'website' => '网站',
 	),
+	'tos' => array(
+		'title' => 'Terms of Service', // TODO - Translation
+	),
 	'feed' => array(
 		'add' => '你可以添加一些 RSS 源。',
 		'empty' => '暂时没有文章可显示。',
diff --git a/app/i18n/zh-cn/sub.php b/app/i18n/zh-cn/sub.php
index bf517756b..944d6986f 100644
--- a/app/i18n/zh-cn/sub.php
+++ b/app/i18n/zh-cn/sub.php
@@ -13,9 +13,12 @@ return array(
 	'category' => array(
 		'_' => '分类',
 		'add' => '添加分类',
+		'archiving' => '存档',
 		'empty' => '空分类',
 		'information' => '信息',
 		'new' => '新分类',
+		'position' => 'Display position',	//TODO - Translation
+		'position_help' => 'To control category sort order',	//TODO - Translation
 		'title' => '标题',
 	),
 	'feed' => array(
@@ -40,7 +43,7 @@ return array(
 			'help' => 'Write one search filter per line.',	//TODO - Translation
 		),
 		'information' => '信息',
-		'keep_history' => '至少保存的文章数',
+		'keep_min' => '至少保存的文章数',
 		'moved_category_deleted' => '删除分类时，其中的 RSS 源会自动归类到 <em>%s</em>',
 		'mute' => '暂停',
 		'no_selected' => '未选择 RSS 源。',
@@ -72,6 +75,7 @@ return array(
 	),
 	'firefox' => array(
 		'documentation' => '按照 <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">这里</a> 描述的步骤可将 FreshRSS 添加到 Firefox 阅读器列表',
+		'obsolete_63' => 'From version 63 and onwards, Firefox has removed the ability to add your own subscription services that are not standalone programs.',	//TODO - Translation
 		'title' => 'Firefox RSS 阅读器',
 	),
 	'import_export' => array(
diff --git a/app/i18n/zh-cn/user.php b/app/i18n/zh-cn/user.php
new file mode 100644
index 000000000..3a8343c11
--- /dev/null
+++ b/app/i18n/zh-cn/user.php
@@ -0,0 +1,37 @@
+<?php
+
+return array(
+	'email' => array(
+		'feedback' => array(
+			'invalid' => 'The email address is invalid.', //TODO - Translation
+			'required' => 'The 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
+			'feedback' => array(
+				'email_failed' => 'We couldn’t send you an email because of a misconfiguration of the server.', //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
+			),
+			'need_to' => 'You need to validate your email address before being able to use %s.', //TODO - Translation
+			'resend_email' => 'Resend the email', //TODO - Translation
+			'title' => 'Email address validation', //TODO - Translation
+		),
+	),
+	'tos' => array(
+		'feedback' => array(
+			'invalid' => 'You must accept the Terms of Service to be able to register.', // TODO - Translation
+		),
+	),
+	'mailer' => array(
+		'email_need_validation' => array(
+			'title' => 'You need to validate your account', //TODO - Translation
+			'welcome' => 'Welcome %s,', //TODO - Translation
+			'body' => 'You’ve just registered on %s but you still need to validate your email. For that, just follow the link:', //TODO - Translation
+		),
+	),
+);