Lint i18n files (#3841)

Translations had quite a lot of cleaning in late:
* Removed some unused keys
* Added some ignores
* Applied a `cli/manipulate.translation.php -a format`

145 files changed, 287 insertions, 717 deletions

diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index 7881cb3ec..15e4aa3fd 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -109,7 +109,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 		}
 
 		if (!$this->ajax) {
-			Minz_Request::good(_t($is_read ? 'feedback.sub.articles.marked_read' : 'feedback.sub.articles.marked_unread'),
+			Minz_Request::good($is_read ? _t('feedback.sub.articles.marked_read') : _t('feedback.sub.articles.marked_unread'),
 			array(
 				'c' => 'index',
 				'a' => 'index',
diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php
index 2f719dcf1..52ccfb004 100644
--- a/app/i18n/cz/admin.php
+++ b/app/i18n/cz/admin.php
@@ -9,7 +9,6 @@ return array(
 		'http' => 'HTTP (pro pokročilé uživatele s HTTPS)',
 		'none' => 'Žádný (nebezpečné)',
 		'title' => 'Přihlášení',
-		'title_reset' => 'Reset přihlášení',
 		'token' => 'Authentizační token',
 		'token_help' => 'Umožňuje přístup k RSS kanálu článků výchozího uživatele bez přihlášení:',
 		'type' => 'Způsob přihlášení',
@@ -180,11 +179,9 @@ return array(
 	'user' => array(
 		'admin' => 'Administrator',	// TODO - Translation
 		'article_count' => 'Articles',	// TODO - Translation
-		'articles_and_size' => '%s článků (%s)',
 		'back_to_manage' => '← Return to user list',	// TODO - Translation
 		'create' => 'Vytvořit nového uživatele',
 		'database_size' => 'Database size',	// TODO - Translation
-		'delete_users' => 'Delete user',	// TODO - Translation
 		'email' => 'Email address',	// TODO - Translation
 		'enabled' => 'Enabled',	// TODO - Translation
 		'feed_count' => 'Feeds',	// TODO - Translation
@@ -196,11 +193,7 @@ return array(
 		'numbers' => 'Zatím je vytvořeno %d účtů',
 		'password_form' => 'Heslo<br /><small>(pro přihlášení webovým formulářem)</small>',
 		'password_format' => 'Alespoň 7 znaků',
-		'selected' => 'Selected user',	// TODO - Translation
 		'title' => 'Správa uživatelů',
-		'update_users' => 'Update user',	// TODO - Translation
-		'user_list' => 'Seznam uživatelů',
 		'username' => 'Přihlašovací jméno',
-		'users' => 'Uživatelé',
 	),
 );
diff --git a/app/i18n/cz/conf.php b/app/i18n/cz/conf.php
index fa744ef71..01175cfef 100644
--- a/app/i18n/cz/conf.php
+++ b/app/i18n/cz/conf.php
@@ -3,7 +3,6 @@
 return array(
 	'archiving' => array(
 		'_' => 'Archivace',
-		'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_favourites' => 'Never delete favourites',	// TODO - Translation
@@ -25,12 +24,12 @@ return array(
 		'_' => 'Zobrazení',
 		'icon' => array(
 			'bottom_line' => 'Spodní řádek',
-			'summary' => 'Summary', // TODO - Translation
 			'display_authors' => 'Authors',	// TODO - Translation
 			'entry' => 'Ikony článků',
 			'publication_date' => 'Datum vydání',
 			'related_tags' => 'Související tagy',
 			'sharing' => 'Sdílení',
+			'summary' => 'Summary',	// TODO - Translation
 			'top_line' => 'Horní řádek',
 		),
 		'language' => 'Jazyk',
@@ -40,6 +39,13 @@ return array(
 		),
 		'show_nav_buttons' => 'Show the navigation buttons',	// TODO - Translation
 		'theme' => 'Vzhled',
+		'thumbnail' => array(
+			'label' => 'Thumbnail',	// TODO - Translation
+			'landscape' => 'Landscape',	// TODO - Translation
+			'none' => 'None',	// TODO - Translation
+			'portrait' => 'Portrait',	// TODO - Translation
+			'square' => 'Square',	// TODO - Translation
+		),
 		'title' => 'Zobrazení',
 		'width' => array(
 			'content' => 'Šířka obsahu',
@@ -48,13 +54,6 @@ return array(
 			'no_limit' => 'Bez limitu',
 			'thin' => 'Tenká',
 		),
-		'thumbnail' => array(
-			'label' => 'Thumbnail', // TODO - Translation
-			'none' => 'None', // TODO - Translation
-			'portrait' => 'Portrait', // TODO - Translation
-			'square' => 'Square', // TODO - Translation
-			'landscape' => 'Landscape', // TODO - Translation
-		),
 	),
 	'profile' => array(
 		'_' => 'Správa profilu',
@@ -72,7 +71,6 @@ return array(
 	'query' => array(
 		'_' => 'Uživatelské dotazy',
 		'deprecated' => 'Tento dotaz již není platný. Odkazovaná kategorie nebo kanál byly smazány.',
-		'display' => 'Display user query results',	// TODO - Translation
 		'filter' => array(
 			'_' => 'Filtr aplikován:',
 			'categories' => 'Display by category',	// TODO - Translation
@@ -87,14 +85,11 @@ return array(
 		'get_category' => 'Zobrazit "%s" kategorii',
 		'get_favorite' => 'Zobrazit oblíbené články',
 		'get_feed' => 'Zobrazit "%s" článkek',
-		'get_tag' => 'Display "%s" label',	// TODO - Translation
 		'name' => 'Name',	// TODO - Translation
 		'no_filter' => 'Zrušit filtr',
-		'none' => 'Ještě jste nevytvořil žádný uživatelský dotaz.',
 		'number' => 'Dotaz n°%d',
 		'order_asc' => 'Zobrazit nejdříve nejstarší články',
 		'order_desc' => 'Zobrazit nejdříve nejnovější články',
-		'remove' => 'Remove user query',	// TODO - Translation
 		'search' => 'Hledat "%s"',
 		'state_0' => 'Zobrazit všechny články',
 		'state_1' => 'Zobrazit přečtené články',
@@ -165,20 +160,20 @@ return array(
 	'sharing' => array(
 		'_' => 'Sdílení',
 		'add' => 'Add a sharing method',	// TODO - Translation
-		'blogotext' => 'Blogotext',	// TODO - Translation
-		'diaspora' => 'Diaspora*',	// TODO - Translation
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
 		'email' => 'Email',	// TODO - Translation
-		'facebook' => 'Facebook',	// TODO - Translation
+		'facebook' => 'Facebook',
 		'more_information' => 'Více informací',
 		'print' => 'Tisk',
 		'raindrop' => 'Raindrop.io',
 		'remove' => 'Remove sharing method',	// TODO - Translation
-		'shaarli' => 'Shaarli',	// TODO - Translation
+		'shaarli' => 'Shaarli',
 		'share_name' => 'Jméno pro zobrazení',
 		'share_url' => 'Jakou URL použít pro sdílení',
 		'title' => 'Sdílení',
-		'twitter' => 'Twitter',	// TODO - Translation
-		'wallabag' => 'wallabag',	// TODO - Translation
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
 	),
 	'shortcut' => array(
 		'_' => 'Zkratky',
diff --git a/app/i18n/cz/feedback.php b/app/i18n/cz/feedback.php
index c2eefa8de..3b8e4b07c 100644
--- a/app/i18n/cz/feedback.php
+++ b/app/i18n/cz/feedback.php
@@ -15,10 +15,6 @@ return array(
 		),
 	),
 	'auth' => array(
-		'form' => array(
-			'not_set' => 'Nastal problém s konfigurací přihlašovacího systému. Zkuste to prosím později.',
-			'set' => 'Webový formulář je nyní výchozí přihlašovací systém.',
-		),
 		'login' => array(
 			'invalid' => 'Login není platný',
 			'success' => 'Jste přihlášen',
@@ -26,7 +22,6 @@ return array(
 		'logout' => array(
 			'success' => 'Jste odhlášen',
 		),
-		'no_password_set' => 'Heslo administrátora nebylo nastaveno. Tato funkce není k dispozici.',
 	),
 	'conf' => array(
 		'error' => 'Během ukládání nastavení došlo k chybě',
diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index 50800e1f5..df2c1e50f 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -43,10 +43,8 @@ return array(
 			'ask' => 'Vytvořit účet?',
 			'title' => 'Vytvoření účtu',
 		),
-		'reset' => 'Reset přihlášení',
 		'username' => array(
 			'_' => 'Uživatel',
-			'admin' => 'Název administrátorského účtu',
 			'format' => '<small>Maximálně 16 alfanumerických znaků</small>',
 		),
 	),
@@ -185,25 +183,25 @@ return array(
 	),
 	'share' => array(
 		'Known' => 'Known based sites',	// TODO - Translation
-		'blogotext' => 'Blogotext',	// TODO - Translation
+		'blogotext' => 'Blogotext',
 		'clipboard' => 'Clipboard',	// TODO - Translation
-		'diaspora' => 'Diaspora*',	// TODO - Translation
+		'diaspora' => 'Diaspora*',
 		'email' => 'Email',	// TODO - Translation
-		'facebook' => 'Facebook',	// TODO - Translation
-		'gnusocial' => 'GNU social',	// TODO - Translation
-		'jdh' => 'Journal du hacker',	// TODO - Translation
-		'lemmy' => 'Lemmy',	// TODO - Translation
-		'linkedin' => 'LinkedIn',	// TODO - Translation
-		'mastodon' => 'Mastodon',	// TODO - Translation
-		'movim' => 'Movim',	// TODO - Translation
-		'pinboard' => 'Pinboard',	// TODO - Translation
-		'pocket' => 'Pocket',	// TODO - Translation
+		'facebook' => 'Facebook',
+		'gnusocial' => 'GNU social',
+		'jdh' => 'Journal du hacker',
+		'lemmy' => 'Lemmy',
+		'linkedin' => 'LinkedIn',
+		'mastodon' => 'Mastodon',
+		'movim' => 'Movim',
+		'pinboard' => 'Pinboard',
+		'pocket' => 'Pocket',
 		'print' => 'Tisk',
 		'raindrop' => 'Raindrop.io',
-		'shaarli' => 'Shaarli',	// TODO - Translation
-		'twitter' => 'Twitter',	// TODO - Translation
-		'wallabag' => 'wallabag v1',	// TODO - Translation
-		'wallabagv2' => 'wallabag v2',	// TODO - Translation
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag v1',
+		'wallabagv2' => 'wallabag v2',
 	),
 	'short' => array(
 		'attention' => 'Upozornění!',
diff --git a/app/i18n/cz/index.php b/app/i18n/cz/index.php
index 4e691ac2c..fbe65c5ae 100644
--- a/app/i18n/cz/index.php
+++ b/app/i18n/cz/index.php
@@ -3,7 +3,7 @@
 return array(
 	'about' => array(
 		'_' => 'O FreshRSS',
-		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',	// TODO - Translation
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
 		'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>.',
@@ -13,7 +13,6 @@ return array(
 		'project_website' => 'Stránka projektu',
 		'title' => 'O FreshRSS',
 		'version' => 'Verze',
-		'website' => 'Webové stránka',
 	),
 	'feed' => array(
 		'add' => 'Můžete přidat kanály.',
diff --git a/app/i18n/cz/install.php b/app/i18n/cz/install.php
index daca92ca3..9e04aec3b 100644
--- a/app/i18n/cz/install.php
+++ b/app/i18n/cz/install.php
@@ -80,6 +80,7 @@ return array(
 			'nok' => 'Vaše verze PHP je %s, ale FreshRSS vyžaduje alespoň verzi %s.',
 			'ok' => 'Vaše verze PHP je %s a je kompatibilní s FreshRSS.',
 		),
+		'reload' => 'Check again',	// TODO - Translation
 		'tmp' => array(
 			'nok' => 'Zkontrolujte oprávnění adresáře <em>%s</em>. HTTP server musí mít do tohoto adresáře práva zápisu.',
 			'ok' => 'Permissions on the temp directory are good.',	// TODO - Translation
@@ -100,7 +101,6 @@ return array(
 	),
 	'congratulations' => 'Gratulujeme!',
 	'default_user' => 'Jméno výchozího uživatele <small>(maximálně 16 alfanumerických znaků)</small>',
-	'delete_articles_after' => 'Smazat články starší než',
 	'fix_errors_before' => 'Chyby prosím před přechodem na další krok opravte.',
 	'javascript_is_better' => 'Práce s FreshRSS je příjemnější se zapnutým JavaScriptem',
 	'js' => array(
diff --git a/app/i18n/cz/sub.php b/app/i18n/cz/sub.php
index 79e1e517a..62b32883a 100644
--- a/app/i18n/cz/sub.php
+++ b/app/i18n/cz/sub.php
@@ -13,7 +13,6 @@ return array(
 	),
 	'category' => array(
 		'_' => 'Kategorie',
-		'add' => 'Přidat kategorii',
 		'archiving' => 'Archivace',
 		'empty' => 'Vyprázdit kategorii',
 		'information' => 'Informace',
@@ -110,8 +109,6 @@ return array(
 	),
 	'menu' => array(
 		'add' => 'Add a feed or category',	// TODO - Translation
-		'add_feed' => 'Add a feed',	// TODO - Translation
-		'bookmark' => 'Přihlásit (FreshRSS bookmark)',
 		'import_export' => 'Import / export',	// TODO - Translation
 		'label_management' => 'Label management',	// TODO - Translation
 		'subscription_management' => 'Správa subskripcí',
diff --git a/app/i18n/cz/user.php b/app/i18n/cz/user.php
index 7816efcbc..1d93a9f9a 100644
--- a/app/i18n/cz/user.php
+++ b/app/i18n/cz/user.php
@@ -14,7 +14,7 @@ return array(
 				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
 				'error' => 'Email address validation failed.',	// TODO - Translation
 				'ok' => 'This email address has been validated.',	// TODO - Translation
-				'unneccessary' => 'This email address was already validated.',	// TODO - Translation
+				'unnecessary' => 'This email address was already validated.',	// TODO - Translation
 				'wrong_token' => 'This email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
 			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
index e8bc14a1e..609f07fb4 100644
--- a/app/i18n/de/admin.php
+++ b/app/i18n/de/admin.php
@@ -9,7 +9,6 @@ return array(
 		'http' => 'HTTP (HTTPS für erfahrene Benutzer)',
 		'none' => 'Keine (gefährlich)',
 		'title' => 'Authentifizierung',
-		'title_reset' => 'Zurücksetzen der Authentifizierung',
 		'token' => 'Authentifizierungs-Token',
 		'token_help' => 'Erlaubt den Zugriff auf die RSS-Ausgabe des Standardbenutzers ohne Authentifizierung.',
 		'type' => 'Authentifizierungsmethode',
@@ -180,11 +179,9 @@ return array(
 	'user' => array(
 		'admin' => 'Administrator',
 		'article_count' => 'Artikel',
-		'articles_and_size' => '%s Artikel (%s)',
 		'back_to_manage' => '← Zurück zur Benutzerliste',
 		'create' => 'Neuen Benutzer erstellen',
 		'database_size' => 'Datenbankgröße',
-		'delete_users' => 'Lösche Benutzer',
 		'email' => 'E-Mail-Adresse',
 		'enabled' => 'Aktiviert',
 		'feed_count' => 'Feeds',
@@ -196,11 +193,7 @@ return array(
 		'numbers' => 'Es wurden bis jetzt %d Accounts erstellt',
 		'password_form' => 'Passwort<br /><small>(für die Anmeldemethode per Webformular)</small>',
 		'password_format' => 'mindestens 7 Zeichen',
-		'selected' => 'Ausgewählter Benutzer',
 		'title' => 'Benutzer verwalten',
-		'update_users' => 'Aktualisiere Benutzer',
-		'user_list' => 'Liste der Benutzer',
 		'username' => 'Nutzername',
-		'users' => 'Benutzer',
 	),
 );
diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php
index 460506f23..de37a9eea 100644
--- a/app/i18n/de/conf.php
+++ b/app/i18n/de/conf.php
@@ -3,7 +3,6 @@
 return array(
 	'archiving' => array(
 		'_' => 'Archivierung',
-		'delete_after' => 'Entferne Artikel nach',
 		'exception' => 'Archivierungsausnahmen',
 		'help' => 'Weitere Optionen sind in den Einstellungen der individuellen Feeds verfügbar.',
 		'keep_favourites' => 'Lieblingsartikel behalten',
@@ -25,12 +24,12 @@ return array(
 		'_' => 'Anzeige',
 		'icon' => array(
 			'bottom_line' => 'Fußzeile',
-			'summary' => 'Summary', // TODO - Translation
 			'display_authors' => 'Autoren',
 			'entry' => 'Artikel-Symbole',
 			'publication_date' => 'Datum der Veröffentlichung',
 			'related_tags' => 'Verwandte Tags',
 			'sharing' => 'Teilen',
+			'summary' => 'Summary',	// TODO - Translation
 			'top_line' => 'Kopfzeile',
 		),
 		'language' => 'Sprache',
@@ -40,6 +39,13 @@ return array(
 		),
 		'show_nav_buttons' => 'Zeige Navigations-Buttons',
 		'theme' => 'Erscheinungsbild',
+		'thumbnail' => array(
+			'label' => 'Thumbnail',	// TODO - Translation
+			'landscape' => 'Landscape',	// TODO - Translation
+			'none' => 'None',	// TODO - Translation
+			'portrait' => 'Portrait',	// TODO - Translation
+			'square' => 'Square',	// TODO - Translation
+		),
 		'title' => 'Anzeige',
 		'width' => array(
 			'content' => 'Inhaltsbreite',
@@ -48,13 +54,6 @@ return array(
 			'no_limit' => 'Keine Begrenzung',
 			'thin' => 'Klein',
 		),
-		'thumbnail' => array(
-			'label' => 'Thumbnail', // TODO - Translation
-			'none' => 'None', // TODO - Translation
-			'portrait' => 'Portrait', // TODO - Translation
-			'square' => 'Square', // TODO - Translation
-			'landscape' => 'Landscape', // TODO - Translation
-		),
 	),
 	'profile' => array(
 		'_' => 'Profil-Verwaltung',
@@ -72,7 +71,6 @@ return array(
 	'query' => array(
 		'_' => 'Benutzerabfragen',
 		'deprecated' => 'Diese Abfrage ist nicht länger gültig. Die referenzierte Kategorie oder der Feed ist gelöscht worden.',
-		'display' => 'Zeige Abfrage Ergebnisse',
 		'filter' => array(
 			'_' => 'Angewendeter Filter:',
 			'categories' => 'Nach Kategorie filtern',
@@ -87,14 +85,11 @@ return array(
 		'get_category' => 'Kategorie "%s" anzeigen',
 		'get_favorite' => 'Lieblingsartikel anzeigen',
 		'get_feed' => 'Feed "%s" anzeigen',
-		'get_tag' => 'Tag "%s" anzeigen',
 		'name' => 'Name',
 		'no_filter' => 'Kein Filter',
-		'none' => 'Sie haben bisher keine Benutzerabfrage erstellt.',
 		'number' => 'Abfrage Nr. %d',
 		'order_asc' => 'Älteste Artikel zuerst anzeigen',
 		'order_desc' => 'Neueste Artikel zuerst anzeigen',
-		'remove' => 'Lösche Abfrage',
 		'search' => 'Suche nach "%s"',
 		'state_0' => 'Alle Artikel anzeigen',
 		'state_1' => 'Gelesene Artikel anzeigen',
diff --git a/app/i18n/de/feedback.php b/app/i18n/de/feedback.php
index cc5ce3cce..f2abcd107 100644
--- a/app/i18n/de/feedback.php
+++ b/app/i18n/de/feedback.php
@@ -15,10 +15,6 @@ return array(
 		),
 	),
 	'auth' => array(
-		'form' => array(
-			'not_set' => 'Während der Konfiguration des Authentifikationssystems trat ein Fehler auf. Bitte versuchen Sie es später erneut.',
-			'set' => 'Formular ist ab sofort ihr Standard-Authentifikationssystem.',
-		),
 		'login' => array(
 			'invalid' => 'Anmeldung ist ungültig',
 			'success' => 'Sie sind angemeldet',
@@ -26,7 +22,6 @@ return array(
 		'logout' => array(
 			'success' => 'Sie sind abgemeldet',
 		),
-		'no_password_set' => 'Administrator-Passwort ist nicht gesetzt worden. Dieses Feature ist nicht verfügbar.',
 	),
 	'conf' => array(
 		'error' => 'Während der Speicherung der Konfiguration trat ein Fehler auf',
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 79dbb08b7..b1a752b16 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -43,10 +43,8 @@ return array(
 			'ask' => 'Erstelle einen Account?',
 			'title' => 'Accounterstellung',
 		),
-		'reset' => 'Zurücksetzen der Authentifizierung',
 		'username' => array(
 			'_' => 'Nutzername',
-			'admin' => 'Administrator-Nutzername',
 			'format' => '<small>Maximal 16 alphanumerische Zeichen</small>',
 		),
 	),
diff --git a/app/i18n/de/index.php b/app/i18n/de/index.php
index 57dcae562..17f8b773b 100644
--- a/app/i18n/de/index.php
+++ b/app/i18n/de/index.php
@@ -13,7 +13,6 @@ return array(
 		'project_website' => 'Projekt-Website',
 		'title' => 'Über',
 		'version' => 'Version',
-		'website' => 'Website',
 	),
 	'feed' => array(
 		'add' => 'Sie können Feeds hinzufügen.',
diff --git a/app/i18n/de/install.php b/app/i18n/de/install.php
index 9c3299bff..f2764acf1 100644
--- a/app/i18n/de/install.php
+++ b/app/i18n/de/install.php
@@ -80,6 +80,7 @@ return array(
 			'nok' => 'Ihre PHP-Version ist %s aber FreshRSS benötigt mindestens Version %s.',
 			'ok' => 'Ihre PHP-Version ist %s, welche kompatibel mit FreshRSS ist.',
 		),
+		'reload' => 'Nochmal prüfen',
 		'tmp' => array(
 			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>%s</em>. Der HTTP-Server muss Schreibrechte besitzen.',
 			'ok' => 'Die Berechtigungen des Temp Verzeichnisses sind in Ordnung.',
@@ -93,7 +94,6 @@ return array(
 			'nok' => 'Ihnen fehlt die benötigte Bibliothek um XML zu parsen.',
 			'ok' => 'Sie haben die benötigte Bibliothek um XML zu parsen.',
 		),
-		'reload' => 'Nochmal prüfen',
 	),
 	'conf' => array(
 		'_' => 'Allgemeine Konfiguration',
@@ -101,7 +101,6 @@ return array(
 	),
 	'congratulations' => 'Glückwunsch!',
 	'default_user' => 'Benutzername des Standardbenutzers <small>(maximal 16 alphanumerische Zeichen)</small>',
-	'delete_articles_after' => 'Entferne Artikel nach',
 	'fix_errors_before' => 'Bitte den Fehler korrigieren, bevor zum nächsten Schritt gesprungen wird.',
 	'javascript_is_better' => 'FreshRSS ist ansprechender mit aktiviertem JavaScript',
 	'js' => array(
diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php
index ba3abb1b8..b67c1ee24 100644
--- a/app/i18n/de/sub.php
+++ b/app/i18n/de/sub.php
@@ -13,7 +13,6 @@ return array(
 	),
 	'category' => array(
 		'_' => 'Kategorie',
-		'add' => 'Eine Kategorie hinzufügen',
 		'archiving' => 'Archivierung',
 		'empty' => 'Leere Kategorie',
 		'information' => 'Information',
@@ -110,8 +109,6 @@ return array(
 	),
 	'menu' => array(
 		'add' => 'Feed oder Kategorie hinzufügen',
-		'add_feed' => 'Feed hinzufügen',
-		'bookmark' => 'Abonnieren (FreshRSS-Lesezeichen)',
 		'import_export' => 'Importieren / Exportieren',
 		'label_management' => 'Labelverwaltung',
 		'subscription_management' => 'Abonnementverwaltung',
diff --git a/app/i18n/de/user.php b/app/i18n/de/user.php
index 2682e0898..d26c78e72 100644
--- a/app/i18n/de/user.php
+++ b/app/i18n/de/user.php
@@ -14,7 +14,7 @@ return array(
 				'email_sent' => 'Wir haben Ihnen eine E-Mail geschickt.',
 				'error' => 'Die E-Mail Adresse konnte nicht verifiziert werden.',
 				'ok' => 'Die E-Mail-Adresse wurde verifiziert',
-				'unneccessary' => 'Die E-Mail-Adresse wurde bereits verifiziert.',
+				'unnecessary' => 'Die E-Mail-Adresse wurde bereits verifiziert.',
 				'wrong_token' => 'Die E-Mail-Adresse konnte aufgrund eines ungültigen Sicherheitstokens nicht verifiziert werden.',
 			),
 			'need_to' => 'Sie müssen zuerst Ihre E-Mail-Adresse verifizieren, bevor Sie %s nutzen können.',
diff --git a/app/i18n/en-us/admin.php b/app/i18n/en-us/admin.php
index d5b4e7220..2823b0fad 100644
--- a/app/i18n/en-us/admin.php
+++ b/app/i18n/en-us/admin.php
@@ -9,7 +9,6 @@ return array(
 		'http' => 'HTTP (for advanced users with HTTPS)',
 		'none' => 'None (dangerous)',
 		'title' => 'Authentication',
-		'title_reset' => 'Authentication reset',
 		'token' => 'Authentication token',
 		'token_help' => 'Allows access to RSS output of the default user without authentication:',
 		'type' => 'Authentication method',
@@ -180,11 +179,9 @@ return array(
 	'user' => array(
 		'admin' => 'Administrator',
 		'article_count' => 'Articles',
-		'articles_and_size' => '%s articles (%s)',
 		'back_to_manage' => '← Return to user list',
 		'create' => 'Create new user',
 		'database_size' => 'Database size',
-		'delete_users' => 'Delete user',
 		'email' => 'Email address',
 		'enabled' => 'Enabled',
 		'feed_count' => 'Feeds',
@@ -196,11 +193,7 @@ return array(
 		'numbers' => 'There are %d accounts created',
 		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
 		'password_format' => 'At least 7 characters',
-		'selected' => 'Selected user',
 		'title' => 'Manage users',
-		'update_users' => 'Update user',
-		'user_list' => 'List of users',
 		'username' => 'Username',
-		'users' => 'Users',
 	),
 );
diff --git a/app/i18n/en-us/conf.php b/app/i18n/en-us/conf.php
index caea7eff9..c826d1098 100644
--- a/app/i18n/en-us/conf.php
+++ b/app/i18n/en-us/conf.php
@@ -3,7 +3,6 @@
 return array(
 	'archiving' => array(
 		'_' => 'Archiving',
-		'delete_after' => 'Remove articles after',
 		'exception' => 'Purge exception',
 		'help' => 'More options are available in the individual feed\'s settings',
 		'keep_favourites' => 'Never delete favorites',
@@ -25,12 +24,12 @@ return array(
 		'_' => 'Display',
 		'icon' => array(
 			'bottom_line' => 'Bottom line',
-			'summary' => 'Summary',
 			'display_authors' => 'Authors',
 			'entry' => 'Article icons',
 			'publication_date' => 'Date of publication',
 			'related_tags' => 'Article tags',
 			'sharing' => 'Sharing',
+			'summary' => 'Summary',
 			'top_line' => 'Top line',
 		),
 		'language' => 'Language',
@@ -40,6 +39,13 @@ return array(
 		),
 		'show_nav_buttons' => 'Show the navigation buttons',
 		'theme' => 'Theme',
+		'thumbnail' => array(
+			'label' => 'Thumbnail',
+			'landscape' => 'Landscape',
+			'none' => 'None',
+			'portrait' => 'Portrait',
+			'square' => 'Square',
+		),
 		'title' => 'Display',
 		'width' => array(
 			'content' => 'Content width',
@@ -48,13 +54,6 @@ return array(
 			'no_limit' => 'Full Width',
 			'thin' => 'Narrow',
 		),
-		'thumbnail' => array(
-			'label' => 'Thumbnail',
-			'none' => 'None',
-			'portrait' => 'Portrait',
-			'square' => 'Square',
-			'landscape' => 'Landscape',
-		),
 	),
 	'profile' => array(
 		'_' => 'Profile management',
@@ -72,7 +71,6 @@ return array(
 	'query' => array(
 		'_' => 'User queries',
 		'deprecated' => 'This query is no longer valid. The referenced category or feed has been deleted.',
-		'display' => 'Display user query results',
 		'filter' => array(
 			'_' => 'Filter applied:',
 			'categories' => 'Display by category',
@@ -87,14 +85,11 @@ return array(
 		'get_category' => 'Display "%s" category',
 		'get_favorite' => 'Display favorite articles',
 		'get_feed' => 'Display "%s" feed',
-		'get_tag' => 'Display "%s" label',
 		'name' => 'Name',
 		'no_filter' => 'No filter',
-		'none' => 'You haven’t created any user queries yet.',
 		'number' => 'Query n°%d',
 		'order_asc' => 'Display oldest articles first',
 		'order_desc' => 'Display newest articles first',
-		'remove' => 'Remove user query',
 		'search' => 'Search for "%s"',
 		'state_0' => 'Display all articles',
 		'state_1' => 'Display read articles',
diff --git a/app/i18n/en-us/feedback.php b/app/i18n/en-us/feedback.php
index bfe8cd350..99821ddb7 100644
--- a/app/i18n/en-us/feedback.php
+++ b/app/i18n/en-us/feedback.php
@@ -15,10 +15,6 @@ return array(
 		),
 	),
 	'auth' => array(
-		'form' => array(
-			'not_set' => 'A problem occurred during authentication system configuration. Please try again later.',
-			'set' => 'Form is now your default authentication system.',
-		),
 		'login' => array(
 			'invalid' => 'Login is invalid',
 			'success' => 'You are connected',
@@ -26,7 +22,6 @@ return array(
 		'logout' => array(
 			'success' => 'You are disconnected',
 		),
-		'no_password_set' => 'Administrator password hasn’t been set. This feature isn’t available.',
 	),
 	'conf' => array(
 		'error' => 'An error occurred while saving configuration',
diff --git a/app/i18n/en-us/gen.php b/app/i18n/en-us/gen.php
index 51e68cde0..343979b39 100644
--- a/app/i18n/en-us/gen.php
+++ b/app/i18n/en-us/gen.php
@@ -43,10 +43,8 @@ return array(
 			'ask' => 'Create an account?',
 			'title' => 'Account creation',
 		),
-		'reset' => 'Authentication reset',
 		'username' => array(
 			'_' => 'Username',
-			'admin' => 'Administrator username',
 			'format' => '<small>Maximum 16 alphanumeric characters</small>',
 		),
 	),
diff --git a/app/i18n/en-us/index.php b/app/i18n/en-us/index.php
index 114fdd5ab..8448c8d02 100644
--- a/app/i18n/en-us/index.php
+++ b/app/i18n/en-us/index.php
@@ -13,7 +13,6 @@ return array(
 		'project_website' => 'Project website',
 		'title' => 'About',
 		'version' => 'Version',
-		'website' => 'Website',
 	),
 	'feed' => array(
 		'add' => 'Please add some feeds.',
diff --git a/app/i18n/en-us/install.php b/app/i18n/en-us/install.php
index 71356eaf0..efb06ee04 100644
--- a/app/i18n/en-us/install.php
+++ b/app/i18n/en-us/install.php
@@ -80,6 +80,7 @@ return array(
 			'nok' => 'Your PHP version is %s, but FreshRSS requires at least version %s.',
 			'ok' => 'Your PHP version, %s, is compatible with FreshRSS.',
 		),
+		'reload' => 'Check again',
 		'tmp' => array(
 			'nok' => 'Check permissions on the <em>%1$s</em> directory for <em>%2$s</em> user. The HTTP server must have write permissions.',
 			'ok' => 'Permissions on the temp directory are good.',
@@ -93,7 +94,6 @@ return array(
 			'nok' => 'Cannot find the required library to parse XML.',
 			'ok' => 'You have the required library to parse XML.',
 		),
-		'reload' => 'Check again',
 	),
 	'conf' => array(
 		'_' => 'General configuration',
@@ -101,7 +101,6 @@ return array(
 	),
 	'congratulations' => 'Congratulations!',
 	'default_user' => 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
-	'delete_articles_after' => 'Remove articles after',
 	'fix_errors_before' => 'Please fix errors before continuing to the next step.',
 	'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
 	'js' => array(
@@ -112,7 +111,7 @@ return array(
 		'choose' => 'Choose a language for FreshRSS',
 		'defined' => 'Language has been defined.',
 	),
-	'missing_applied_migrations' => 'Something went wrong; you should create an empty file <em>%s</em> manually.',	// TODO - Translation
+	'missing_applied_migrations' => 'Something went wrong; you should create an empty file <em>%s</em> manually.',
 	'ok' => 'The installation process was successful.',
 	'session' => array(
 		'nok' => 'The web server seems to be incorrectly configured for cookies required for PHP sessions!',
diff --git a/app/i18n/en-us/sub.php b/app/i18n/en-us/sub.php
index 02bdaa817..67bb11654 100644
--- a/app/i18n/en-us/sub.php
+++ b/app/i18n/en-us/sub.php
@@ -13,7 +13,6 @@ return array(
 	),
 	'category' => array(
 		'_' => 'Category',
-		'add' => 'Add a category',
 		'archiving' => 'Archiving',
 		'empty' => 'Empty category',
 		'information' => 'Information',
@@ -110,8 +109,6 @@ return array(
 	),
 	'menu' => array(
 		'add' => 'Add a feed or category',
-		'add_feed' => 'Add a feed',
-		'bookmark' => 'Subscribe (FreshRSS bookmark)',
 		'import_export' => 'Import / export',
 		'label_management' => 'Label management',
 		'subscription_management' => 'Subscription management',
diff --git a/app/i18n/en-us/user.php b/app/i18n/en-us/user.php
index 9330a13c6..ea602b072 100644
--- a/app/i18n/en-us/user.php
+++ b/app/i18n/en-us/user.php
@@ -14,7 +14,7 @@ return array(
 				'email_sent' => 'An email has been sent to your address.',
 				'error' => 'Email address validation failed.',
 				'ok' => 'This email address has been validated.',
-				'unneccessary' => 'This email address was already validated.',
+				'unnecessary' => 'This email address was already validated.',
 				'wrong_token' => 'This email address failed to be validated due to a wrong token.',
 			),
 			'need_to' => 'You need to validate your email address before being able to use %s.',
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 5129c3889..6d03110a9 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -9,7 +9,6 @@ return array(
 		'http' => 'HTTP (for advanced users with HTTPS)',
 		'none' => 'None (dangerous)',
 		'title' => 'Authentication',
-		'title_reset' => 'Authentication reset',
 		'token' => 'Authentication token',
 		'token_help' => 'Allows access to RSS output of the default user without authentication:',
 		'type' => 'Authentication method',
@@ -180,11 +179,9 @@ return array(
 	'user' => array(
 		'admin' => 'Administrator',
 		'article_count' => 'Articles',
-		'articles_and_size' => '%s articles (%s)',
 		'back_to_manage' => '← Return to user list',
 		'create' => 'Create new user',
 		'database_size' => 'Database size',
-		'delete_users' => 'Delete user',
 		'email' => 'Email address',
 		'enabled' => 'Enabled',
 		'feed_count' => 'Feeds',
@@ -196,11 +193,7 @@ return array(
 		'numbers' => 'There are %d accounts created',
 		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
 		'password_format' => 'At least 7 characters',
-		'selected' => 'Selected user',
 		'title' => 'Manage users',
-		'update_users' => 'Update user',
-		'user_list' => 'List of users',
 		'username' => 'Username',
-		'users' => 'Users',
 	),
 );
diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index 121ed0177..e6beeb6c1 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -3,7 +3,6 @@
 return array(
 	'archiving' => array(
 		'_' => 'Archiving',
-		'delete_after' => 'Remove articles after',
 		'exception' => 'Purge exception',
 		'help' => 'More options are available in the individual feed\'s settings',
 		'keep_favourites' => 'Never delete favourites',
@@ -25,12 +24,12 @@ return array(
 		'_' => 'Display',
 		'icon' => array(
 			'bottom_line' => 'Bottom line',
-			'summary' => 'Summary',
 			'display_authors' => 'Authors',
 			'entry' => 'Article icons',
 			'publication_date' => 'Date of publication',
 			'related_tags' => 'Article tags',
 			'sharing' => 'Sharing',
+			'summary' => 'Summary',
 			'top_line' => 'Top line',
 		),
 		'language' => 'Language',
@@ -40,6 +39,13 @@ return array(
 		),
 		'show_nav_buttons' => 'Show the navigation buttons',
 		'theme' => 'Theme',
+		'thumbnail' => array(
+			'label' => 'Thumbnail',
+			'landscape' => 'Landscape',
+			'none' => 'None',
+			'portrait' => 'Portrait',
+			'square' => 'Square',
+		),
 		'title' => 'Display',
 		'width' => array(
 			'content' => 'Content width',
@@ -48,13 +54,6 @@ return array(
 			'no_limit' => 'Full Width',
 			'thin' => 'Narrow',
 		),
-		'thumbnail' => array(
-			'label' => 'Thumbnail',
-			'none' => 'None',
-			'portrait' => 'Portrait',
-			'square' => 'Square',
-			'landscape' => 'Landscape',
-		),
 	),
 	'profile' => array(
 		'_' => 'Profile management',
@@ -72,7 +71,6 @@ return array(
 	'query' => array(
 		'_' => 'User queries',
 		'deprecated' => 'This query is no longer valid. The referenced category or feed has been deleted.',
-		'display' => 'Display user query results',
 		'filter' => array(
 			'_' => 'Filter applied:',
 			'categories' => 'Display by category',
@@ -87,14 +85,11 @@ return array(
 		'get_category' => 'Display "%s" category',
 		'get_favorite' => 'Display favourite articles',
 		'get_feed' => 'Display "%s" feed',
-		'get_tag' => 'Display "%s" label',
 		'name' => 'Name',
 		'no_filter' => 'No filter',
-		'none' => 'You haven’t created any user queries yet.',
 		'number' => 'Query n°%d',
 		'order_asc' => 'Display oldest articles first',
 		'order_desc' => 'Display newest articles first',
-		'remove' => 'Remove user query',
 		'search' => 'Search for "%s"',
 		'state_0' => 'Display all articles',
 		'state_1' => 'Display read articles',
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index bfe8cd350..99821ddb7 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -15,10 +15,6 @@ return array(
 		),
 	),
 	'auth' => array(
-		'form' => array(
-			'not_set' => 'A problem occurred during authentication system configuration. Please try again later.',
-			'set' => 'Form is now your default authentication system.',
-		),
 		'login' => array(
 			'invalid' => 'Login is invalid',
 			'success' => 'You are connected',
@@ -26,7 +22,6 @@ return array(
 		'logout' => array(
 			'success' => 'You are disconnected',
 		),
-		'no_password_set' => 'Administrator password hasn’t been set. This feature isn’t available.',
 	),
 	'conf' => array(
 		'error' => 'An error occurred while saving configuration',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 4637d9971..2ea167faf 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -43,10 +43,8 @@ return array(
 			'ask' => 'Create an account?',
 			'title' => 'Account creation',
 		),
-		'reset' => 'Authentication reset',
 		'username' => array(
 			'_' => 'Username',
-			'admin' => 'Administrator username',
 			'format' => '<small>Maximum 16 alphanumeric characters</small>',
 		),
 	),
diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php
index 261d9bf7b..4d989545f 100644
--- a/app/i18n/en/index.php
+++ b/app/i18n/en/index.php
@@ -13,7 +13,6 @@ return array(
 		'project_website' => 'Project website',
 		'title' => 'About',
 		'version' => 'Version',
-		'website' => 'Website',
 	),
 	'feed' => array(
 		'add' => 'Please add some feeds.',
diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
index dd5017550..7cb302af2 100644
--- a/app/i18n/en/install.php
+++ b/app/i18n/en/install.php
@@ -80,6 +80,7 @@ return array(
 			'nok' => 'Your PHP version is %s, but FreshRSS requires at least version %s.',
 			'ok' => 'Your PHP version, %s, is compatible with FreshRSS.',
 		),
+		'reload' => 'Check again',
 		'tmp' => array(
 			'nok' => 'Check permissions on the <em>%1$s</em> directory for <em>%2$s</em> user. The HTTP server must have write permissions.',
 			'ok' => 'Permissions on the temp directory are good.',
@@ -93,7 +94,6 @@ return array(
 			'nok' => 'Cannot find the required library to parse XML.',
 			'ok' => 'You have the required library to parse XML.',
 		),
-		'reload' => 'Check again',
 	),
 	'conf' => array(
 		'_' => 'General configuration',
@@ -101,7 +101,6 @@ return array(
 	),
 	'congratulations' => 'Congratulations!',
 	'default_user' => 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
-	'delete_articles_after' => 'Remove articles after',
 	'fix_errors_before' => 'Please fix errors before continuing to the next step.',
 	'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
 	'js' => array(
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index a3c71cb1f..4dd7bf312 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -13,7 +13,6 @@ return array(
 	),
 	'category' => array(
 		'_' => 'Category',
-		'add' => 'Add a category',
 		'archiving' => 'Archiving',
 		'empty' => 'Empty category',
 		'information' => 'Information',
@@ -110,8 +109,6 @@ return array(
 	),
 	'menu' => array(
 		'add' => 'Add a feed or category',
-		'add_feed' => 'Add a feed',
-		'bookmark' => 'Subscribe (FreshRSS bookmark)',
 		'import_export' => 'Import / export',
 		'label_management' => 'Label management',
 		'subscription_management' => 'Subscription management',
diff --git a/app/i18n/en/user.php b/app/i18n/en/user.php
index 9330a13c6..ea602b072 100644
--- a/app/i18n/en/user.php
+++ b/app/i18n/en/user.php
@@ -14,7 +14,7 @@ return array(
 				'email_sent' => 'An email has been sent to your address.',
 				'error' => 'Email address validation failed.',
 				'ok' => 'This email address has been validated.',
-				'unneccessary' => 'This email address was already validated.',
+				'unnecessary' => 'This email address was already validated.',
 				'wrong_token' => 'This email address failed to be validated due to a wrong token.',
 			),
 			'need_to' => 'You need to validate your email address before being able to use %s.',
diff --git a/app/i18n/es/admin.php b/app/i18n/es/admin.php
index 242f292c5..0c85ba5ce 100755
--- a/app/i18n/es/admin.php
+++ b/app/i18n/es/admin.php
@@ -9,7 +9,6 @@ return array(
 		'http' => 'HTTP (para usuarios avanzados con HTTPS)',
 		'none' => 'Ninguno (peligroso)',
 		'title' => 'Identificación',
-		'title_reset' => 'Reinicio de la identificación',
 		'token' => 'Clave de identificación',
 		'token_help' => 'Permite el acceso a la salida RSS del usuario por defecto sin necesidad de identificación:',
 		'type' => 'Método de identificación',
@@ -180,11 +179,9 @@ return array(
 	'user' => array(
 		'admin' => 'Administrator',	// TODO - Translation
 		'article_count' => 'Articles',	// TODO - Translation
-		'articles_and_size' => '%s articles (%s)',	// TODO - Translation
 		'back_to_manage' => '← Return to user list',	// TODO - Translation
 		'create' => 'Crear nuevo usuario',
 		'database_size' => 'Database size',	// TODO - Translation
-		'delete_users' => 'Delete user',	// TODO - Translation
 		'email' => 'Email address',	// TODO - Translation
 		'enabled' => 'Enabled',	// TODO - Translation
 		'feed_count' => 'Feeds',	// TODO - Translation
@@ -196,11 +193,7 @@ return array(
 		'numbers' => 'Hay %d cuentas creadas',
 		'password_form' => 'Contraseña<br /><small>(para el método de identificación por formulario web)</small>',
 		'password_format' => 'Mínimo de 7 caracteres',
-		'selected' => 'Selected user',	// TODO - Translation
 		'title' => 'Administrar usuarios',
-		'update_users' => 'Update user',	// TODO - Translation
-		'user_list' => 'Lista de usuarios',
 		'username' => 'Nombre de usuario',
-		'users' => 'Usuarios',
 	),
 );
diff --git a/app/i18n/es/conf.php b/app/i18n/es/conf.php
index 1bacd8fba..b05844592 100755
--- a/app/i18n/es/conf.php
+++ b/app/i18n/es/conf.php
@@ -3,7 +3,6 @@
 return array(
 	'archiving' => array(
 		'_' => 'Archivo',
-		'delete_after' => 'Eliminar artículos tras',
 		'exception' => 'Purge exception',	// TODO - Translation
 		'help' => 'Hay más opciones disponibles en los ajustes de la fuente',
 		'keep_favourites' => 'Never delete favourites',	// TODO - Translation
@@ -25,12 +24,12 @@ return array(
 		'_' => 'Visualización',
 		'icon' => array(
 			'bottom_line' => 'Línea inferior',
-			'summary' => 'Summary', // TODO - Translation
 			'display_authors' => 'Authors',	// TODO - Translation
 			'entry' => 'Iconos de artículos',
 			'publication_date' => 'Fecha de publicación',
 			'related_tags' => 'Etiquetas relacionadas',
 			'sharing' => 'Compartir',
+			'summary' => 'Summary',	// TODO - Translation
 			'top_line' => 'Línea superior',
 		),
 		'language' => 'Idioma',
@@ -40,6 +39,13 @@ return array(
 		),
 		'show_nav_buttons' => 'Show the navigation buttons',	// TODO - Translation
 		'theme' => 'Tema',
+		'thumbnail' => array(
+			'label' => 'Thumbnail',	// TODO - Translation
+			'landscape' => 'Landscape',	// TODO - Translation
+			'none' => 'None',	// TODO - Translation
+			'portrait' => 'Portrait',	// TODO - Translation
+			'square' => 'Square',	// TODO - Translation
+		),
 		'title' => 'Visualización',
 		'width' => array(
 			'content' => 'Ancho de contenido',
@@ -48,13 +54,6 @@ return array(
 			'no_limit' => 'Sin límite',
 			'thin' => 'Estrecho',
 		),
-		'thumbnail' => array(
-			'label' => 'Thumbnail', // TODO - Translation
-			'none' => 'None', // TODO - Translation
-			'portrait' => 'Portrait', // TODO - Translation
-			'square' => 'Square', // TODO - Translation
-			'landscape' => 'Landscape', // TODO - Translation
-		),
 	),
 	'profile' => array(
 		'_' => 'Administración de perfiles',
@@ -72,7 +71,6 @@ return array(
 	'query' => array(
 		'_' => 'Consultas de usuario',
 		'deprecated' => 'Esta consulta ya no es válida. La categoría referenciada o fuente ha sido eliminada.',
-		'display' => 'Display user query results',	// TODO - Translation
 		'filter' => array(
 			'_' => 'Filtro aplicado:',
 			'categories' => 'Display by category',	// TODO - Translation
@@ -87,14 +85,11 @@ return array(
 		'get_category' => 'Mostrar la categoría "%s"',
 		'get_favorite' => 'Mostrar artículos favoritos',
 		'get_feed' => 'Mostrar fuente "%s"',
-		'get_tag' => 'Display "%s" label',	// TODO - Translation
 		'name' => 'Name',	// TODO - Translation
 		'no_filter' => 'Sin filtro',
-		'none' => 'Todavía no has creado ninguna consulta de usuario.',
 		'number' => 'Consulta n° %d',
 		'order_asc' => 'Mostrar primero los artículos más antiguos',
 		'order_desc' => 'Mostrar primero los artículos más recientes',
-		'remove' => 'Remove user query',	// TODO - Translation
 		'search' => 'Buscar "%s"',
 		'state_0' => 'Mostrar todos los artículos',
 		'state_1' => 'Mostrar artículos leídos',
@@ -165,20 +160,20 @@ return array(
 	'sharing' => array(
 		'_' => 'Compartir',
 		'add' => 'Add a sharing method',	// TODO - Translation
-		'blogotext' => 'Blogotext',	// TODO - Translation
-		'diaspora' => 'Diaspora*',	// TODO - Translation
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
 		'email' => 'Email',	// TODO - Translation
-		'facebook' => 'Facebook',	// TODO - Translation
+		'facebook' => 'Facebook',
 		'more_information' => 'Más información',
 		'print' => 'Print',	// TODO - Translation
 		'raindrop' => 'Raindrop.io',
 		'remove' => 'Remove sharing method',	// TODO - Translation
-		'shaarli' => 'Shaarli',	// TODO - Translation
+		'shaarli' => 'Shaarli',
 		'share_name' => 'Compartir nombre a mostrar',
 		'share_url' => 'Compatir URL a usar',
 		'title' => 'Compartir',
-		'twitter' => 'Twitter',	// TODO - Translation
-		'wallabag' => 'wallabag',	// TODO - Translation
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
 	),
 	'shortcut' => array(
 		'_' => 'Atajos de teclado',
diff --git a/app/i18n/es/feedback.php b/app/i18n/es/feedback.php
index 395a18151..05c395b65 100755
--- a/app/i18n/es/feedback.php
+++ b/app/i18n/es/feedback.php
@@ -15,10 +15,6 @@ return array(
 		),
 	),
 	'auth' => array(
-		'form' => array(
-			'not_set' => 'Hubo un problema durante la configuración del sistema de idenfificación. Por favor, inténtalo más tarde.',
-			'set' => 'El formulario será desde ahora tu sistema de identificación por defecto.',
-		),
 		'login' => array(
 			'invalid' => 'Identificación incorrecta',
 			'success' => 'Conexión',
@@ -26,7 +22,6 @@ return array(
 		'logout' => array(
 			'success' => 'Desconexión',
 		),
-		'no_password_set' => 'Esta opción no está disponible porque no se ha definido una contraseña de administrador.',
 	),
 	'conf' => array(
 		'error' => 'Hubo un error durante el guardado de la configuración.',
diff --git a/app/i18n/es/gen.php b/app/i18n/es/gen.php
index 728601bb6..8f416cbfb 100755
--- a/app/i18n/es/gen.php
+++ b/app/i18n/es/gen.php
@@ -43,10 +43,8 @@ return array(
 			'ask' => '¿Crear una cuenta?',
 			'title' => 'Creación de cuenta',
 		),
-		'reset' => 'Reinicar identificación',
 		'username' => array(
 			'_' => 'Nombre de usuario',
-			'admin' => 'Nombre de usuario del Administrador',
 			'format' => '<small>Máximo 16 caracteres alfanuméricos</small>',
 		),
 	),
@@ -185,25 +183,25 @@ return array(
 	),
 	'share' => array(
 		'Known' => 'Known based sites',	// TODO - Translation
-		'blogotext' => 'Blogotext',	// TODO - Translation
+		'blogotext' => 'Blogotext',
 		'clipboard' => 'Clipboard',	// TODO - Translation
-		'diaspora' => 'Diaspora*',	// TODO - Translation
+		'diaspora' => 'Diaspora*',
 		'email' => 'Email',	// TODO - Translation
-		'facebook' => 'Facebook',	// TODO - Translation
-		'gnusocial' => 'GNU social',	// TODO - Translation
-		'jdh' => 'Journal du hacker',	// TODO - Translation
-		'lemmy' => 'Lemmy',	// TODO - Translation
-		'linkedin' => 'LinkedIn',	// TODO - Translation
-		'mastodon' => 'Mastodon',	// TODO - Translation
-		'movim' => 'Movim',	// TODO - Translation
-		'pinboard' => 'Pinboard',	// TODO - Translation
-		'pocket' => 'Pocket',	// TODO - Translation
+		'facebook' => 'Facebook',
+		'gnusocial' => 'GNU social',
+		'jdh' => 'Journal du hacker',
+		'lemmy' => 'Lemmy',
+		'linkedin' => 'LinkedIn',
+		'mastodon' => 'Mastodon',
+		'movim' => 'Movim',
+		'pinboard' => 'Pinboard',
+		'pocket' => 'Pocket',
 		'print' => 'Print',	// TODO - Translation
 		'raindrop' => 'Raindrop.io',
-		'shaarli' => 'Shaarli',	// TODO - Translation
-		'twitter' => 'Twitter',	// TODO - Translation
-		'wallabag' => 'wallabag v1',	// TODO - Translation
-		'wallabagv2' => 'wallabag v2',	// TODO - Translation
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag v1',
+		'wallabagv2' => 'wallabag v2',
 	),
 	'short' => array(
 		'attention' => '¡Aviso!',
diff --git a/app/i18n/es/index.php b/app/i18n/es/index.php
index dac4a8b2a..75caf315c 100755
--- a/app/i18n/es/index.php
+++ b/app/i18n/es/index.php
@@ -3,7 +3,7 @@
 return array(
 	'about' => array(
 		'_' => 'Acerca de',
-		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',	// TODO - Translation
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
 		'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>.',
@@ -13,7 +13,6 @@ return array(
 		'project_website' => 'Web del proyecto',
 		'title' => 'Acerca de',
 		'version' => 'Versión',
-		'website' => 'Web',
 	),
 	'feed' => array(
 		'add' => 'Puedes añadir fuentes.',
diff --git a/app/i18n/es/install.php b/app/i18n/es/install.php
index 952edab09..221338d77 100755
--- a/app/i18n/es/install.php
+++ b/app/i18n/es/install.php
@@ -80,6 +80,7 @@ return array(
 			'nok' => 'Dispones de la versión PHP %s, pero FreshRSS necesita de, al menos, la versión %s.',
 			'ok' => 'Dispones de la versión PHP %s, que es compatible con FreshRSS.',
 		),
+		'reload' => 'Revisar otra vez',
 		'tmp' => array(
 			'nok' => 'Revisa los permisos en el directorio <em>%s</em>. El servidor HTTP debe contar con permisos de escritura.',
 			'ok' => 'Permissions on the temp directory are good.',	// TODO - Translation
@@ -93,7 +94,6 @@ return array(
 			'nok' => 'No se ha podido localizar la librería necesaria para procesar XML.',
 			'ok' => 'Dispones de la librería necesaria para procesar XML.',
 		),
-		'reload' => 'Revisar otra vez',
 	),
 	'conf' => array(
 		'_' => 'Configuración general',
@@ -101,7 +101,6 @@ return array(
 	),
 	'congratulations' => '¡Enhorabuena!',
 	'default_user' => 'Nombre de usuario para el usuario por defecto <small>(máximo de 16 caracteres alfanuméricos)</small>',
-	'delete_articles_after' => 'Eliminar los artículos tras',
 	'fix_errors_before' => 'Por favor, soluciona los errores detectados antes de proceder con el siguiente paso.',
 	'javascript_is_better' => 'FreshRSS funciona mejor con JavaScript activado',
 	'js' => array(
diff --git a/app/i18n/es/sub.php b/app/i18n/es/sub.php
index b7deb4c54..3f4ae9d70 100755
--- a/app/i18n/es/sub.php
+++ b/app/i18n/es/sub.php
@@ -13,7 +13,6 @@ return array(
 	),
 	'category' => array(
 		'_' => 'Categoría',
-		'add' => 'Añadir a la categoría',
 		'archiving' => 'Archivo',
 		'empty' => 'Vaciar categoría',
 		'information' => 'Información',
@@ -110,8 +109,6 @@ return array(
 	),
 	'menu' => array(
 		'add' => 'Add a feed or category',	// TODO - Translation
-		'add_feed' => 'Add a feed',	// TODO - Translation
-		'bookmark' => 'Suscribirse (favorito FreshRSS)',
 		'import_export' => 'Importar / exportar',
 		'label_management' => 'Label management',	// TODO - Translation
 		'subscription_management' => 'Administración de suscripciones',
diff --git a/app/i18n/es/user.php b/app/i18n/es/user.php
index 7816efcbc..1d93a9f9a 100644
--- a/app/i18n/es/user.php
+++ b/app/i18n/es/user.php
@@ -14,7 +14,7 @@ return array(
 				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
 				'error' => 'Email address validation failed.',	// TODO - Translation
 				'ok' => 'This email address has been validated.',	// TODO - Translation
-				'unneccessary' => 'This email address was already validated.',	// TODO - Translation
+				'unnecessary' => 'This email address was already validated.',	// TODO - Translation
 				'wrong_token' => 'This email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
 			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index 11163cae6..42de367ab 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -9,7 +9,6 @@ return array(
 		'http' => 'HTTP (pour utilisateurs avancés avec HTTPS)',
 		'none' => 'Aucune (dangereux)',
 		'title' => 'Authentification',
-		'title_reset' => 'Réinitialisation de l’authentification',
 		'token' => 'Jeton d’identification',
 		'token_help' => 'Permet d’accéder à la sortie RSS de l’utilisateur par défaut sans besoin de s’authentifier :',
 		'type' => 'Méthode d’authentification',
@@ -180,11 +179,9 @@ return array(
 	'user' => array(
 		'admin' => 'Administrateur',
 		'article_count' => 'Articles',
-		'articles_and_size' => '%s articles (%s)',
 		'back_to_manage' => '← Revenir à la liste des utilisateurs',
 		'create' => 'Créer un nouvel utilisateur',
 		'database_size' => 'Volumétrie',
-		'delete_users' => 'Supprimer un utilisateur',
 		'email' => 'Adresse email',
 		'enabled' => 'Actif',
 		'feed_count' => 'Flux',
@@ -196,11 +193,7 @@ return array(
 		'numbers' => '%d comptes ont déjà été créés',
 		'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
 		'password_format' => '7 caractères minimum',
-		'selected' => 'Utilisateur sélectionné',
 		'title' => 'Gestion des utilisateurs',
-		'update_users' => 'Mettre à jour un utilisateur',
-		'user_list' => 'Liste des utilisateurs',
 		'username' => 'Nom d’utilisateur',
-		'users' => 'Utilisateurs',
 	),
 );
diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php
index d4a967412..78d8bff1a 100644
--- a/app/i18n/fr/conf.php
+++ b/app/i18n/fr/conf.php
@@ -3,7 +3,6 @@
 return array(
 	'archiving' => array(
 		'_' => 'Archivage',
-		'delete_after' => 'Supprimer les articles après',
 		'exception' => 'Exception de nettoyage',
 		'help' => 'D’autres options sont disponibles dans la configuration individuelle des flux.',
 		'keep_favourites' => 'Ne jamais supprimer les articles favoris',
@@ -25,12 +24,12 @@ return array(
 		'_' => 'Affichage',
 		'icon' => array(
 			'bottom_line' => 'Ligne du bas',
-			'summary' => 'Résumé',
 			'display_authors' => 'Auteurs',
 			'entry' => 'Icônes d’article',
 			'publication_date' => 'Date de publication',
 			'related_tags' => 'Tags de l’article',
 			'sharing' => 'Partage',
+			'summary' => 'Résumé',
 			'top_line' => 'Ligne du haut',
 		),
 		'language' => 'Langue',
@@ -40,6 +39,13 @@ return array(
 		),
 		'show_nav_buttons' => 'Afficher les boutons de navigation',
 		'theme' => 'Thème',
+		'thumbnail' => array(
+			'label' => 'Miniature',
+			'landscape' => 'Paysage',
+			'none' => 'Sans',
+			'portrait' => 'Portrait',
+			'square' => 'Carrée',
+		),
 		'title' => 'Affichage',
 		'width' => array(
 			'content' => 'Largeur du contenu',
@@ -48,13 +54,6 @@ return array(
 			'no_limit' => 'Pas de limite',
 			'thin' => 'Fine',
 		),
-		'thumbnail' => array(
-			'label' => 'Miniature',
-			'none' => 'Sans',
-			'portrait' => 'Portrait',
-			'square' => 'Carrée',
-			'landscape' => 'Paysage',
-		),
 	),
 	'profile' => array(
 		'_' => 'Gestion du profil',
@@ -72,7 +71,6 @@ return array(
 	'query' => array(
 		'_' => 'Filtres utilisateurs',
 		'deprecated' => 'Ce filtre n’est plus valide. La catégorie ou le flux concerné a été supprimé.',
-		'display' => 'Afficher les résultats du filtre',
 		'filter' => array(
 			'_' => 'Filtres appliqués :',
 			'categories' => 'Afficher par catégorie',
@@ -87,14 +85,11 @@ return array(
 		'get_category' => 'Afficher la catégorie "%s"',
 		'get_favorite' => 'Afficher les articles favoris',
 		'get_feed' => 'Afficher le flux "%s"',
-		'get_tag' => 'Afficher l’étiquette "%s"',
 		'name' => 'Nom',
 		'no_filter' => 'Aucun filtre appliqué',
-		'none' => 'Vous n’avez pas encore créé de filtre.',
 		'number' => 'Filtre n°%d',
 		'order_asc' => 'Afficher les articles les plus anciens en premier',
 		'order_desc' => 'Afficher les articles les plus récents en premier',
-		'remove' => 'Supprimer le filtre',
 		'search' => 'Recherche de "%s"',
 		'state_0' => 'Afficher tous les articles',
 		'state_1' => 'Afficher les articles lus',
diff --git a/app/i18n/fr/feedback.php b/app/i18n/fr/feedback.php
index e1fe52e64..fa5c87966 100644
--- a/app/i18n/fr/feedback.php
+++ b/app/i18n/fr/feedback.php
@@ -15,10 +15,6 @@ return array(
 		),
 	),
 	'auth' => array(
-		'form' => array(
-			'not_set' => 'Un problème est survenu lors de la configuration de votre système d’authentification. Veuillez réessayer plus tard.',
-			'set' => 'Le formulaire est désormais votre système d’authentification.',
-		),
 		'login' => array(
 			'invalid' => 'L’identifiant est invalide',
 			'success' => 'Vous êtes désormais connecté',
@@ -26,7 +22,6 @@ return array(
 		'logout' => array(
 			'success' => 'Vous avez été déconnecté',
 		),
-		'no_password_set' => 'Aucun mot de passe administrateur n’a été précisé. Cette fonctionnalité n’est pas disponible.',
 	),
 	'conf' => array(
 		'error' => 'Une erreur est survenue durant la sauvegarde de la configuration',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index e6b3e2826..a6a8c541b 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -43,10 +43,8 @@ return array(
 			'ask' => 'Créer un compte ?',
 			'title' => 'Création de compte',
 		),
-		'reset' => 'Réinitialisation de l’authentification',
 		'username' => array(
 			'_' => 'Nom d’utilisateur',
-			'admin' => 'Nom d’utilisateur administrateur',
 			'format' => '<small>16 caractères alphanumériques maximum</small>',
 		),
 	),
@@ -196,7 +194,7 @@ return array(
 		'linkedin' => 'LinkedIn',
 		'mastodon' => 'Mastodon',
 		'movim' => 'Movim',
-		'pinboard' => 'Pinboard',	// TODO - Translation
+		'pinboard' => 'Pinboard',
 		'pocket' => 'Pocket',
 		'print' => 'Imprimer',
 		'raindrop' => 'Raindrop.io',
diff --git a/app/i18n/fr/index.php b/app/i18n/fr/index.php
index 9f417d575..3a8d1f4cc 100644
--- a/app/i18n/fr/index.php
+++ b/app/i18n/fr/index.php
@@ -13,7 +13,6 @@ return array(
 		'project_website' => 'Site du projet',
 		'title' => 'À propos',
 		'version' => 'Version',
-		'website' => 'Site Internet',
 	),
 	'feed' => array(
 		'add' => 'Vous pouvez ajouter des flux.',
diff --git a/app/i18n/fr/install.php b/app/i18n/fr/install.php
index 48184000a..9fc0c6456 100644
--- a/app/i18n/fr/install.php
+++ b/app/i18n/fr/install.php
@@ -80,6 +80,7 @@ return array(
 			'nok' => 'Votre version de PHP est la %s mais FreshRSS requiert au moins la version %s.',
 			'ok' => 'Votre version de PHP est la %s, qui est compatible avec FreshRSS.',
 		),
+		'reload' => 'Revérifier',
 		'tmp' => array(
 			'nok' => 'Veuillez vérifier les droits de l’utilisateur <em>%2$s</em> sur le répertoire <em>%1$s</em>. Le serveur HTTP doit être capable d’écrire dedans.',
 			'ok' => 'Les droits sur le répertoire temporaire sont bons.',
@@ -93,7 +94,6 @@ return array(
 			'nok' => 'Impossible de trouver une librairie requise pour XML.',
 			'ok' => 'Vouz disposez de la librairie requise pour XML.',
 		),
-		'reload' => 'Revérifier',
 	),
 	'conf' => array(
 		'_' => 'Configuration générale',
@@ -101,7 +101,6 @@ return array(
 	),
 	'congratulations' => 'Félicitations !',
 	'default_user' => 'Nom de l’utilisateur par défaut <small>(16 caractères alphanumériques maximum)</small>',
-	'delete_articles_after' => 'Supprimer les articles après',
 	'fix_errors_before' => 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
 	'javascript_is_better' => 'FreshRSS est plus agréable à utiliser avec JavaScript activé',
 	'js' => array(
diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php
index c9d8200e2..41eb37752 100644
--- a/app/i18n/fr/sub.php
+++ b/app/i18n/fr/sub.php
@@ -4,7 +4,7 @@ return array(
 	'add' => 'L\'ajout de flux et de catégories se fait désormais <a href=\'%s\'>ici</a>. Il est possible d\'y accéder depuis le menu de gauche ou depuis l\'icône ✚ présente sur la page principale.',
 	'api' => array(
 		'documentation' => 'Copier l’URL suivante dans l’outil qui utilisera l’API.',
-		'title' => 'API',	// TODO - Translation
+		'title' => 'API',
 	),
 	'bookmarklet' => array(
 		'documentation' => 'Glisser ce bouton dans la barre des favoris ou cliquer droit dessus et choisir "Enregistrer ce lien". Ensuite, cliquer sur le bouton "S’abonner" sur les pages auxquelles vous voulez vous abonner.',
@@ -13,7 +13,6 @@ return array(
 	),
 	'category' => array(
 		'_' => 'Catégorie',
-		'add' => 'Ajouter une catégorie',
 		'archiving' => 'Archivage',
 		'empty' => 'Catégorie vide',
 		'information' => 'Informations',
@@ -110,8 +109,6 @@ return array(
 	),
 	'menu' => array(
 		'add' => 'Ajouter un flux/une catégorie',
-		'add_feed' => 'Ajouter un flux',
-		'bookmark' => 'S’abonner (bookmark FreshRSS)',
 		'import_export' => 'Importer / exporter',
 		'label_management' => 'Gestion des étiquettes',
 		'subscription_management' => 'Gestion des abonnements',
diff --git a/app/i18n/fr/user.php b/app/i18n/fr/user.php
index 698cfaa6f..dfd132552 100644
--- a/app/i18n/fr/user.php
+++ b/app/i18n/fr/user.php
@@ -14,7 +14,7 @@ return array(
 				'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.',
-				'unneccessary' => 'L’adresse email a déjà é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.',
diff --git a/app/i18n/he/admin.php b/app/i18n/he/admin.php
index 7be2c4dbc..627bb06ce 100644
--- a/app/i18n/he/admin.php
+++ b/app/i18n/he/admin.php
@@ -9,7 +9,6 @@ return array(
 		'http' => 'HTTP (למשתמשים מתקדמים עם HTTPS)',
 		'none' => 'ללא (מסוכן)',
 		'title' => 'Authentication',	// TODO - Translation
-		'title_reset' => 'איפוס אימות',
 		'token' => 'מחרוזת אימות',
 		'token_help' => 'Allows to access RSS output of the default user without authentication:',
 		'type' => 'שיטת אימות',
@@ -180,11 +179,9 @@ return array(
 	'user' => array(
 		'admin' => 'Administrator',	// TODO - Translation
 		'article_count' => 'Articles',	// TODO - Translation
-		'articles_and_size' => '%s articles (%s)',	// TODO - Translation
 		'back_to_manage' => '← Return to user list',	// TODO - Translation
 		'create' => 'יצירת משתמש חדש',
 		'database_size' => 'Database size',	// TODO - Translation
-		'delete_users' => 'Delete user',	// TODO - Translation
 		'email' => 'Email address',	// TODO - Translation
 		'enabled' => 'Enabled',	// TODO - Translation
 		'feed_count' => 'Feeds',	// TODO - Translation
@@ -196,11 +193,7 @@ return array(
 		'numbers' => 'There are %d accounts created',	// TODO - Translation
 		'password_form' => 'סיסמה<br /><small>(לשימוש בטפוס ההרשמה)</small>',
 		'password_format' => 'At least 7 characters',	// TODO - Translation
-		'selected' => 'Selected user',	// TODO - Translation
 		'title' => 'Manage users',	// TODO - Translation
-		'update_users' => 'Update user',	// TODO - Translation
-		'user_list' => 'רשימת משתמשים',
 		'username' => 'שם משתמש',
-		'users' => 'משתמשים',
 	),
 );
diff --git a/app/i18n/he/conf.php b/app/i18n/he/conf.php
index 64f7d7f47..4d3dfb5c1 100644
--- a/app/i18n/he/conf.php
+++ b/app/i18n/he/conf.php
@@ -3,7 +3,6 @@
 return array(
 	'archiving' => array(
 		'_' => 'ארכוב',
-		'delete_after' => 'מחיקת מאמרים לאחר',
 		'exception' => 'Purge exception',	// TODO - Translation
 		'help' => 'אפשרויות נוספות זמינות בזרמים ספציפיים',
 		'keep_favourites' => 'Never delete favourites',	// TODO - Translation
@@ -25,12 +24,12 @@ return array(
 		'_' => 'תצוגה',
 		'icon' => array(
 			'bottom_line' => 'שורה תחתונה',
-			'summary' => 'Summary', // TODO - Translation
 			'display_authors' => 'Authors',	// TODO - Translation
 			'entry' => 'סמלילי מאמרים',
 			'publication_date' => 'תאריך הפרסום',
 			'related_tags' => 'תגיות קשורות',
 			'sharing' => 'שיתוף',
+			'summary' => 'Summary',	// TODO - Translation
 			'top_line' => 'שורה עליונה',
 		),
 		'language' => 'שפה',
@@ -40,6 +39,13 @@ return array(
 		),
 		'show_nav_buttons' => 'Show the navigation buttons',	// TODO - Translation
 		'theme' => 'ערכת נושא',
+		'thumbnail' => array(
+			'label' => 'Thumbnail',	// TODO - Translation
+			'landscape' => 'Landscape',	// TODO - Translation
+			'none' => 'None',	// TODO - Translation
+			'portrait' => 'Portrait',	// TODO - Translation
+			'square' => 'Square',	// TODO - Translation
+		),
 		'title' => 'תצוגה',
 		'width' => array(
 			'content' => 'רוחב התוכן',
@@ -48,13 +54,6 @@ return array(
 			'no_limit' => 'ללא הגבלה',
 			'thin' => 'צר',
 		),
-		'thumbnail' => array(
-			'label' => 'Thumbnail', // TODO - Translation
-			'none' => 'None', // TODO - Translation
-			'portrait' => 'Portrait', // TODO - Translation
-			'square' => 'Square', // TODO - Translation
-			'landscape' => 'Landscape', // TODO - Translation
-		),
 	),
 	'profile' => array(
 		'_' => 'Profile management',	// TODO - Translation
@@ -72,7 +71,6 @@ return array(
 	'query' => array(
 		'_' => 'שאילתות',
 		'deprecated' => 'שאילתה זו אינה בתוקף יותר, הפיד או הקטגוריה לייחוס נמחקו.',
-		'display' => 'Display user query results',	// TODO - Translation
 		'filter' => array(
 			'_' => 'מסננים בשימוש:',
 			'categories' => 'Display by category',	// TODO - Translation
@@ -87,14 +85,11 @@ return array(
 		'get_category' => 'הצגת קטגוריה "%s"',
 		'get_favorite' => 'הצגת מאמרים מועדפים',
 		'get_feed' => 'הצגת הזנה %s',
-		'get_tag' => 'Display "%s" label',	// TODO - Translation
 		'name' => 'Name',	// TODO - Translation
 		'no_filter' => 'ללא סינון',
-		'none' => 'אף שאילתה לא נוצרה עדיין.',
 		'number' => 'שאילתה מספר °%d',
 		'order_asc' => 'הצגת מאמרים ישנים בראש',
 		'order_desc' => 'הצגת מאמרים חדשים בראש',
-		'remove' => 'Remove user query',	// TODO - Translation
 		'search' => 'חיפוש "%s"',
 		'state_0' => 'הצגת כל המאמרים',
 		'state_1' => 'הצגת מאמרים שנקראו',
@@ -165,20 +160,20 @@ return array(
 	'sharing' => array(
 		'_' => 'שיתוף',
 		'add' => 'Add a sharing method',	// TODO - Translation
-		'blogotext' => 'Blogotext',	// TODO - Translation
-		'diaspora' => 'Diaspora*',	// TODO - Translation
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
 		'email' => 'דואר אלקטרוני',
-		'facebook' => 'Facebook',	// TODO - Translation
+		'facebook' => 'Facebook',
 		'more_information' => 'מידע נוסף',
 		'print' => 'הדפסה',
 		'raindrop' => 'Raindrop.io',
 		'remove' => 'Remove sharing method',	// TODO - Translation
-		'shaarli' => 'Shaarli',	// TODO - Translation
+		'shaarli' => 'Shaarli',
 		'share_name' => 'שיתוף שם לתצוגה',
 		'share_url' => 'לשימוש שתפו URL',
 		'title' => 'שיתוף',
-		'twitter' => 'Twitter',	// TODO - Translation
-		'wallabag' => 'wallabag',	// TODO - Translation
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
 	),
 	'shortcut' => array(
 		'_' => 'קיצורי דרך',
diff --git a/app/i18n/he/feedback.php b/app/i18n/he/feedback.php
index 7f8d75efd..276937f40 100644
--- a/app/i18n/he/feedback.php
+++ b/app/i18n/he/feedback.php
@@ -15,10 +15,6 @@ return array(
 		),
 	),
 	'auth' => array(
-		'form' => array(
-			'not_set' => 'אירעה שגיאה במהלך הגדרת מערכת האימיות. אנא נסו שוב מאוחר יותר.',
-			'set' => 'טופס הוא כרגע מערכת האימות כברירת מחדל.',
-		),
 		'login' => array(
 			'invalid' => 'הכניסה לחשבון שגויה',
 			'success' => 'You are connected',	// TODO - Translation
@@ -26,7 +22,6 @@ return array(
 		'logout' => array(
 			'success' => 'You are disconnected',	// TODO - Translation
 		),
-		'no_password_set' => 'לא הוגדרה סיסמת מנהל. תכונה זו אינה זמינה.',
 	),
 	'conf' => array(
 		'error' => 'An error occurred while saving configuration',	// TODO - Translation
diff --git a/app/i18n/he/gen.php b/app/i18n/he/gen.php
index 67c2d4a0d..4d4411341 100644
--- a/app/i18n/he/gen.php
+++ b/app/i18n/he/gen.php
@@ -43,10 +43,8 @@ return array(
 			'ask' => 'Create an account?',	// TODO - Translation
 			'title' => 'Account creation',	// TODO - Translation
 		),
-		'reset' => 'איפוס אימות',
 		'username' => array(
 			'_' => 'שם משתמש',
-			'admin' => 'שם משתמש של המנהל',
 			'format' => '<small>Maximum 16 alphanumeric characters</small>',	// TODO - Translation
 		),
 	),
@@ -185,25 +183,25 @@ return array(
 	),
 	'share' => array(
 		'Known' => 'Known based sites',	// TODO - Translation
-		'blogotext' => 'Blogotext',	// TODO - Translation
+		'blogotext' => 'Blogotext',
 		'clipboard' => 'Clipboard',	// TODO - Translation
-		'diaspora' => 'Diaspora*',	// TODO - Translation
+		'diaspora' => 'Diaspora*',
 		'email' => 'דואר אלקטרוני',
-		'facebook' => 'Facebook',	// TODO - Translation
-		'gnusocial' => 'GNU social',	// TODO - Translation
-		'jdh' => 'Journal du hacker',	// TODO - Translation
-		'lemmy' => 'Lemmy',	// TODO - Translation
-		'linkedin' => 'LinkedIn',	// TODO - Translation
-		'mastodon' => 'Mastodon',	// TODO - Translation
-		'movim' => 'Movim',	// TODO - Translation
-		'pinboard' => 'Pinboard',	// TODO - Translation
-		'pocket' => 'Pocket',	// TODO - Translation
+		'facebook' => 'Facebook',
+		'gnusocial' => 'GNU social',
+		'jdh' => 'Journal du hacker',
+		'lemmy' => 'Lemmy',
+		'linkedin' => 'LinkedIn',
+		'mastodon' => 'Mastodon',
+		'movim' => 'Movim',
+		'pinboard' => 'Pinboard',
+		'pocket' => 'Pocket',
 		'print' => 'הדפסה',
 		'raindrop' => 'Raindrop.io',
-		'shaarli' => 'Shaarli',	// TODO - Translation
-		'twitter' => 'Twitter',	// TODO - Translation
-		'wallabag' => 'wallabag v1',	// TODO - Translation
-		'wallabagv2' => 'wallabag v2',	// TODO - Translation
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag v1',
+		'wallabagv2' => 'wallabag v2',
 	),
 	'short' => array(
 		'attention' => 'זהירות!',
diff --git a/app/i18n/he/index.php b/app/i18n/he/index.php
index 121e689b2..3579344d6 100644
--- a/app/i18n/he/index.php
+++ b/app/i18n/he/index.php
@@ -3,7 +3,7 @@
 return array(
 	'about' => array(
 		'_' => 'אודות',
-		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',	// TODO - Translation
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
 		'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.',
@@ -13,7 +13,6 @@ return array(
 		'project_website' => 'אתר',
 		'title' => 'אודות',
 		'version' => 'גרסה',
-		'website' => 'אתר',
 	),
 	'feed' => array(
 		'add' => 'ניתן להוסיף הזנות חדשות.',
diff --git a/app/i18n/he/install.php b/app/i18n/he/install.php
index 5581c0a4f..f6b989fc6 100644
--- a/app/i18n/he/install.php
+++ b/app/i18n/he/install.php
@@ -80,6 +80,7 @@ return array(
 			'nok' => 'גירסת PHP שלכם היא %s אך FreshRSS דורש לפחות את גירסה %s',
 			'ok' => 'גירסת PHP שלכם היא %s, שתואמת ל FreshRSS',
 		),
+		'reload' => 'בדוק שוב',
 		'tmp' => array(
 			'nok' => 'Check permissions on the <em>%1$s</em> directory for <em>%2$s</em> user. The HTTP server must have write permissions.',	// TODO - Translation
 			'ok' => 'Permissions on the temp directory are good.',	// TODO - Translation
@@ -93,7 +94,6 @@ return array(
 			'nok' => 'Cannot find the required library to parse XML.',	// TODO - Translation
 			'ok' => 'You have the required library to parse XML.',	// TODO - Translation
 		),
-		'reload' => 'בדוק שוב',
 	),
 	'conf' => array(
 		'_' => 'הגדרות כלליות',
@@ -101,7 +101,6 @@ return array(
 	),
 	'congratulations' => 'מזל טוב!',
 	'default_user' => 'שם המשתמש של משתמש ברירת המחדל <small>(לכל היותר 16 תווים אלפאנומריים)</small>',
-	'delete_articles_after' => 'מחיקת מאמרים לאחר',
 	'fix_errors_before' => 'יש לתקן את השגיאות לפני המעבר לשלב הבא.',
 	'javascript_is_better' => 'FreshRSS מעדיף שתאפשרו JavaScript',
 	'js' => array(
diff --git a/app/i18n/he/sub.php b/app/i18n/he/sub.php
index c7c55e8df..2a55d8b7f 100644
--- a/app/i18n/he/sub.php
+++ b/app/i18n/he/sub.php
@@ -13,7 +13,6 @@ return array(
 	),
 	'category' => array(
 		'_' => 'קטגוריה',
-		'add' => 'הוספת קטגוריה',
 		'archiving' => 'ארכוב',
 		'empty' => 'Empty category',	// TODO - Translation
 		'information' => 'מידע',
@@ -110,8 +109,6 @@ return array(
 	),
 	'menu' => array(
 		'add' => 'Add a feed or category',	// TODO - Translation
-		'add_feed' => 'Add a feed',	// TODO - Translation
-		'bookmark' => 'הרשמה (FreshRSS סימניית)',
 		'import_export' => 'יבוא / יצוא ',
 		'label_management' => 'Label management',	// TODO - Translation
 		'subscription_management' => 'ניהול הרשמות',
diff --git a/app/i18n/he/user.php b/app/i18n/he/user.php
index 7816efcbc..1d93a9f9a 100644
--- a/app/i18n/he/user.php
+++ b/app/i18n/he/user.php
@@ -14,7 +14,7 @@ return array(
 				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
 				'error' => 'Email address validation failed.',	// TODO - Translation
 				'ok' => 'This email address has been validated.',	// TODO - Translation
-				'unneccessary' => 'This email address was already validated.',	// TODO - Translation
+				'unnecessary' => 'This email address was already validated.',	// TODO - Translation
 				'wrong_token' => 'This email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
 			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
diff --git a/app/i18n/it/admin.php b/app/i18n/it/admin.php
index 3cfc548f3..146e9032d 100644
--- a/app/i18n/it/admin.php
+++ b/app/i18n/it/admin.php
@@ -9,7 +9,6 @@ return array(
 		'http' => 'HTTP (per gli utenti avanzati con HTTPS)',
 		'none' => 'Nessuno (pericoloso)',
 		'title' => 'Autenticazione',
-		'title_reset' => 'Reset autenticazione',
 		'token' => 'Token di autenticazione',
 		'token_help' => 'Consenti accesso agli RSS dell utente predefinito senza autenticazione:',
 		'type' => 'Metodo di autenticazione',
@@ -180,11 +179,9 @@ return array(
 	'user' => array(
 		'admin' => 'Administrator',	// TODO - Translation
 		'article_count' => 'Articles',	// TODO - Translation
-		'articles_and_size' => '%s articoli (%s)',
 		'back_to_manage' => '← Return to user list',	// TODO - Translation
 		'create' => 'Crea nuovo utente',
 		'database_size' => 'Database size',	// TODO - Translation
-		'delete_users' => 'Delete user',	// TODO - Translation
 		'email' => 'Email address',	// TODO - Translation
 		'enabled' => 'Enabled',	// TODO - Translation
 		'feed_count' => 'Feeds',	// TODO - Translation
@@ -196,11 +193,7 @@ return array(
 		'numbers' => 'Sono presenti %d profili utente',
 		'password_form' => 'Password<br /><small>(per il login classico)</small>',
 		'password_format' => 'Almeno 7 caratteri',
-		'selected' => 'Selected user',	// TODO - Translation
 		'title' => 'Gestione utenti',
-		'update_users' => 'Update user',	// TODO - Translation
-		'user_list' => 'Lista utenti',
 		'username' => 'Nome utente',
-		'users' => 'Utenti',
 	),
 );
diff --git a/app/i18n/it/conf.php b/app/i18n/it/conf.php
index 78bfd743e..d24dda3a1 100644
--- a/app/i18n/it/conf.php
+++ b/app/i18n/it/conf.php
@@ -3,7 +3,6 @@
 return array(
 	'archiving' => array(
 		'_' => 'Archiviazione',
-		'delete_after' => 'Rimuovi articoli dopo',
 		'exception' => 'Purge exception',	// TODO - Translation
 		'help' => 'Altre opzioni sono disponibili nelle impostazioni dei singoli feed',
 		'keep_favourites' => 'Never delete favourites',	// TODO - Translation
@@ -25,12 +24,12 @@ return array(
 		'_' => 'Visualizzazione',
 		'icon' => array(
 			'bottom_line' => 'Barra in fondo',
-			'summary' => 'Summary', // TODO - Translation
 			'display_authors' => 'Authors',	// TODO - Translation
 			'entry' => 'Icone degli articoli',
 			'publication_date' => 'Data di pubblicazione',
 			'related_tags' => 'Tags correlati',
 			'sharing' => 'Condivisione',
+			'summary' => 'Summary',	// TODO - Translation
 			'top_line' => 'Barra in alto',
 		),
 		'language' => 'Lingua',
@@ -40,6 +39,13 @@ return array(
 		),
 		'show_nav_buttons' => 'Show the navigation buttons',	// TODO - Translation
 		'theme' => 'Tema',
+		'thumbnail' => array(
+			'label' => 'Thumbnail',	// TODO - Translation
+			'landscape' => 'Landscape',	// TODO - Translation
+			'none' => 'None',	// TODO - Translation
+			'portrait' => 'Portrait',	// TODO - Translation
+			'square' => 'Square',	// TODO - Translation
+		),
 		'title' => 'Visualizzazione',
 		'width' => array(
 			'content' => 'Larghezza contenuto',
@@ -48,13 +54,6 @@ return array(
 			'no_limit' => 'Nessun limite',
 			'thin' => 'Stretto',
 		),
-		'thumbnail' => array(
-			'label' => 'Thumbnail', // TODO - Translation
-			'none' => 'None', // TODO - Translation
-			'portrait' => 'Portrait', // TODO - Translation
-			'square' => 'Square', // TODO - Translation
-			'landscape' => 'Landscape', // TODO - Translation
-		),
 	),
 	'profile' => array(
 		'_' => 'Gestione profili',
@@ -72,7 +71,6 @@ return array(
 	'query' => array(
 		'_' => 'Ricerche personali',
 		'deprecated' => 'Questa query non è più valida. La categoria o il feed di riferimento non stati cancellati.',
-		'display' => 'Display user query results',	// TODO - Translation
 		'filter' => array(
 			'_' => 'Filtro applicato:',
 			'categories' => 'Display by category',	// TODO - Translation
@@ -87,14 +85,11 @@ return array(
 		'get_category' => 'Mostra la categoria "%s" ',
 		'get_favorite' => 'Mostra articoli preferiti',
 		'get_feed' => 'Mostra feed "%s" ',
-		'get_tag' => 'Display "%s" label',	// TODO - Translation
 		'name' => 'Name',	// TODO - Translation
 		'no_filter' => 'Nessun filtro',
-		'none' => 'Non hai creato nessuna ricerca personale.',
 		'number' => 'Ricerca n°%d',
 		'order_asc' => 'Mostra prima gli articoli più vecchi',
 		'order_desc' => 'Mostra prima gli articoli più nuovi',
-		'remove' => 'Remove user query',	// TODO - Translation
 		'search' => 'Cerca per "%s"',
 		'state_0' => 'Mostra tutti gli articoli',
 		'state_1' => 'Mostra gli articoli letti',
@@ -165,20 +160,20 @@ return array(
 	'sharing' => array(
 		'_' => 'Condivisione',
 		'add' => 'Add a sharing method',	// TODO - Translation
-		'blogotext' => 'Blogotext',	// TODO - Translation
-		'diaspora' => 'Diaspora*',	// TODO - Translation
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
 		'email' => 'Email',	// TODO - Translation
-		'facebook' => 'Facebook',	// TODO - Translation
+		'facebook' => 'Facebook',
 		'more_information' => 'Ulteriori informazioni',
 		'print' => 'Stampa',
 		'raindrop' => 'Raindrop.io',
 		'remove' => 'Remove sharing method',	// TODO - Translation
-		'shaarli' => 'Shaarli',	// TODO - Translation
+		'shaarli' => 'Shaarli',
 		'share_name' => 'Nome condivisione',
 		'share_url' => 'URL condivisione',
 		'title' => 'Condividi',
-		'twitter' => 'Twitter',	// TODO - Translation
-		'wallabag' => 'wallabag',	// TODO - Translation
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
 	),
 	'shortcut' => array(
 		'_' => 'Comandi tastiera',
diff --git a/app/i18n/it/feedback.php b/app/i18n/it/feedback.php
index b466e28bf..08730713a 100644
--- a/app/i18n/it/feedback.php
+++ b/app/i18n/it/feedback.php
@@ -15,10 +15,6 @@ return array(
 		),
 	),
 	'auth' => array(
-		'form' => array(
-			'not_set' => 'Si è verificato un problema alla configurazione del sistema di autenticazione. Per favore riprova più tardi.',
-			'set' => 'Sistema di autenticazione tramite Form impostato come predefinito.',
-		),
 		'login' => array(
 			'invalid' => 'Autenticazione non valida',
 			'success' => 'Autenticazione effettuata',
@@ -26,7 +22,6 @@ return array(
 		'logout' => array(
 			'success' => 'Disconnessione effettuata',
 		),
-		'no_password_set' => 'Password di amministrazione non impostata. Opzione non disponibile.',
 	),
 	'conf' => array(
 		'error' => 'Si è verificato un errore durante il salvataggio della configurazione',
diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index eb4431dd1..0214f517f 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -43,10 +43,8 @@ return array(
 			'ask' => 'Vuoi creare un nuovo profilo?',
 			'title' => 'Creazione profilo',
 		),
-		'reset' => 'Reset autenticazione',
 		'username' => array(
 			'_' => 'Username',	// TODO - Translation
-			'admin' => 'Username amministratore',
 			'format' => '<small>Massimo 16 caratteri alfanumerici</small>',
 		),
 	),
@@ -185,25 +183,25 @@ return array(
 	),
 	'share' => array(
 		'Known' => 'Siti basati su Known',
-		'blogotext' => 'Blogotext',	// TODO - Translation
+		'blogotext' => 'Blogotext',
 		'clipboard' => 'Clipboard',	// TODO - Translation
-		'diaspora' => 'Diaspora*',	// TODO - Translation
+		'diaspora' => 'Diaspora*',
 		'email' => 'Email',	// TODO - Translation
-		'facebook' => 'Facebook',	// TODO - Translation
-		'gnusocial' => 'GNU social',	// TODO - Translation
-		'jdh' => 'Journal du hacker',	// TODO - Translation
-		'lemmy' => 'Lemmy',	// TODO - Translation
-		'linkedin' => 'LinkedIn',	// TODO - Translation
-		'mastodon' => 'Mastodon',	// TODO - Translation
-		'movim' => 'Movim',	// TODO - Translation
-		'pinboard' => 'Pinboard',	// TODO - Translation
-		'pocket' => 'Pocket',	// TODO - Translation
+		'facebook' => 'Facebook',
+		'gnusocial' => 'GNU social',
+		'jdh' => 'Journal du hacker',
+		'lemmy' => 'Lemmy',
+		'linkedin' => 'LinkedIn',
+		'mastodon' => 'Mastodon',
+		'movim' => 'Movim',
+		'pinboard' => 'Pinboard',
+		'pocket' => 'Pocket',
 		'print' => 'Stampa',
 		'raindrop' => 'Raindrop.io',
-		'shaarli' => 'Shaarli',	// TODO - Translation
-		'twitter' => 'Twitter',	// TODO - Translation
-		'wallabag' => 'wallabag v1',	// TODO - Translation
-		'wallabagv2' => 'wallabag v2',	// TODO - Translation
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag v1',
+		'wallabagv2' => 'wallabag v2',
 	),
 	'short' => array(
 		'attention' => 'Attenzione!',
@@ -212,7 +210,7 @@ return array(
 		'by_default' => 'predefinito',
 		'damn' => 'Ops!',
 		'default_category' => 'Senza categoria',
-		'no' => 'No',	// TODO - Translation
+		'no' => 'No',
 		'not_applicable' => 'Non disponibile',
 		'ok' => 'OK!',
 		'or' => 'o',
diff --git a/app/i18n/it/index.php b/app/i18n/it/index.php
index 4418fe5fb..f38ea5811 100644
--- a/app/i18n/it/index.php
+++ b/app/i18n/it/index.php
@@ -3,7 +3,7 @@
 return array(
 	'about' => array(
 		'_' => 'Informazioni',
-		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',	// TODO - Translation
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
 		'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.',
@@ -13,7 +13,6 @@ return array(
 		'project_website' => 'Sito del progetto',
 		'title' => 'Informazioni',
 		'version' => 'Versione',
-		'website' => 'Sito',
 	),
 	'feed' => array(
 		'add' => 'Aggiungi un Feed RSS',
diff --git a/app/i18n/it/install.php b/app/i18n/it/install.php
index 90561981c..3e667251b 100644
--- a/app/i18n/it/install.php
+++ b/app/i18n/it/install.php
@@ -80,6 +80,7 @@ return array(
 			'nok' => 'Versione di PHP %s FreshRSS richiede almeno la versione %s.',
 			'ok' => 'Versione di PHP %s, compatibile con FreshRSS.',
 		),
+		'reload' => 'Controlla di nuovo',
 		'tmp' => array(
 			'nok' => 'Verifica i permessi sulla cartella <em>%s</em>. Il server HTTP deve avere i permessi per scriverci dentro.',
 			'ok' => 'Permissions on the temp directory are good.',	// TODO - Translation
@@ -93,7 +94,6 @@ return array(
 			'nok' => 'You lack the required library to parse XML.',
 			'ok' => 'You have the required library to parse XML.',	// TODO - Translation
 		),
-		'reload' => 'Controlla di nuovo',
 	),
 	'conf' => array(
 		'_' => 'Configurazioni generali',
@@ -101,7 +101,6 @@ return array(
 	),
 	'congratulations' => 'Congratulazione!',
 	'default_user' => 'Username utente predefinito <small>(massimo 16 caratteri alfanumerici)</small>',
-	'delete_articles_after' => 'Rimuovi articoli dopo',
 	'fix_errors_before' => 'Per favore correggi gli errori prima di passare al passaggio successivo.',
 	'javascript_is_better' => 'FreshRSS funziona meglio con JavaScript abilitato',
 	'js' => array(
diff --git a/app/i18n/it/sub.php b/app/i18n/it/sub.php
index 5b2277038..bdb64ed7b 100644
--- a/app/i18n/it/sub.php
+++ b/app/i18n/it/sub.php
@@ -13,7 +13,6 @@ return array(
 	),
 	'category' => array(
 		'_' => 'Categoria',
-		'add' => 'Aggiungi una categoria',
 		'archiving' => 'Archiviazione',
 		'empty' => 'Categoria vuota',
 		'information' => 'Informazioni',
@@ -110,8 +109,6 @@ return array(
 	),
 	'menu' => array(
 		'add' => 'Add a feed or category',	// TODO - Translation
-		'add_feed' => 'Add a feed',	// TODO - Translation
-		'bookmark' => 'Bookmark (trascina nei preferiti)',
 		'import_export' => 'Importa / esporta',
 		'label_management' => 'Label management',	// TODO - Translation
 		'subscription_management' => 'Gestione sottoscrizioni',
diff --git a/app/i18n/it/user.php b/app/i18n/it/user.php
index 7816efcbc..1d93a9f9a 100644
--- a/app/i18n/it/user.php
+++ b/app/i18n/it/user.php
@@ -14,7 +14,7 @@ return array(
 				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
 				'error' => 'Email address validation failed.',	// TODO - Translation
 				'ok' => 'This email address has been validated.',	// TODO - Translation
-				'unneccessary' => 'This email address was already validated.',	// TODO - Translation
+				'unnecessary' => 'This email address was already validated.',	// TODO - Translation
 				'wrong_token' => 'This email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
 			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
diff --git a/app/i18n/ja/admin.php b/app/i18n/ja/admin.php
index b42db71e9..9df54dc82 100644
--- a/app/i18n/ja/admin.php
+++ b/app/i18n/ja/admin.php
@@ -9,7 +9,6 @@ return array(
 		'http' => 'HTTP (上級者向けのHTTPS)',
 		'none' => 'なし (危険)',
 		'title' => '認証',
-		'title_reset' => '認証し直します',
 		'token' => '認証トークン',
 		'token_help' => '標準ユーザーが承認無しで、RSSを出力できることを許可します。:',
 		'type' => '認証メソッド',
@@ -180,11 +179,9 @@ return array(
 	'user' => array(
 		'admin' => '管理者',
 		'article_count' => '記事',
-		'articles_and_size' => '%s 記事 (%s)',
 		'back_to_manage' => '← ユーザーリストに戻る',
 		'create' => '新規ユーザーを作成',
 		'database_size' => 'データベースサイズ',
-		'delete_users' => 'ユーザーを消去',
 		'email' => 'Eメールアドレス',
 		'enabled' => '有効',
 		'feed_count' => 'フィード',
@@ -196,11 +193,7 @@ return array(
 		'numbers' => '%d 人のアカウントが作られました',
 		'password_form' => 'パスワード<br /><small>(Web-formログインメソッド)</small>',
 		'password_format' => '最低限7文字必要です',
-		'selected' => '選択されたユーザー',
 		'title' => '管理するユーザー',
-		'update_users' => '更新されるユーザー',
-		'user_list' => 'ユーザーの人数',
 		'username' => 'ユーザー名',
-		'users' => 'ユーザー',
 	),
 );
diff --git a/app/i18n/ja/conf.php b/app/i18n/ja/conf.php
index 17771ccde..81c85d2a7 100644
--- a/app/i18n/ja/conf.php
+++ b/app/i18n/ja/conf.php
@@ -3,7 +3,6 @@
 return array(
 	'archiving' => array(
 		'_' => 'アーカイブ',
-		'delete_after' => '後で記事を消す',
 		'exception' => '例外を除く',
 		'help' => '個々のフィード設定内で、より多くの設定をしていただけます。',
 		'keep_favourites' => 'お気に入りを消去しない',
@@ -72,7 +71,6 @@ return array(
 	'query' => array(
 		'_' => 'ユーザークエリ',
 		'deprecated' => 'このクエリはもう有効ではありません。参照されているカテゴリあるいはフィードは消去されました。',
-		'display' => 'ユーザークエリの結果を表示する',
 		'filter' => array(
 			'_' => 'フィルターを適用:',
 			'categories' => 'カテゴリごとに表示する',
@@ -87,14 +85,11 @@ return array(
 		'get_category' => '"%s"カテゴリを表示する',
 		'get_favorite' => 'お気に入りの著者を表示する',
 		'get_feed' => '"%s"フィードを表示する',
-		'get_tag' => '"%s"ラベルを表示する',
 		'name' => '名前',
 		'no_filter' => 'フィルターはありません',
-		'none' => 'あなたはクエリをどのユーザーも作成したことがありません。',
 		'number' => 'クエリ n°%d',
 		'order_asc' => '古い著者を最初に表示する',
 		'order_desc' => '新しい著者を最初に表示する',
-		'remove' => 'ユーザークエリを消去する',
 		'search' => '"%s"で検索する',
 		'state_0' => 'すべての記事を表示する',
 		'state_1' => '既読の記事を表示する',
diff --git a/app/i18n/ja/feedback.php b/app/i18n/ja/feedback.php
index 4d1ce7d9f..6d8967b7e 100644
--- a/app/i18n/ja/feedback.php
+++ b/app/i18n/ja/feedback.php
@@ -15,10 +15,6 @@ return array(
 		),
 	),
 	'auth' => array(
-		'form' => array(
-			'not_set' => '認証システムを設定している間、問題が発生しました。もう一度お試しください。',
-			'set' => '認証システムが設定されました。',
-		),
 		'login' => array(
 			'invalid' => 'ログインは無効です。',
 			'success' => 'ログインしました。',
@@ -26,7 +22,6 @@ return array(
 		'logout' => array(
 			'success' => 'ログアウトされました。',
 		),
-		'no_password_set' => '管理者のパスワードはまだ設定されていませんので、この機能は無効になっています。',
 	),
 	'conf' => array(
 		'error' => '設定を保存するとき、エラーが発生しました。',
diff --git a/app/i18n/ja/gen.php b/app/i18n/ja/gen.php
index 25c9f3ddf..3c3a2a1b9 100644
--- a/app/i18n/ja/gen.php
+++ b/app/i18n/ja/gen.php
@@ -43,10 +43,8 @@ return array(
 			'ask' => 'アカウントを作りますか?',
 			'title' => 'アカウント作成',
 		),
-		'reset' => '認証リセット',
 		'username' => array(
 			'_' => 'ユーザー名',
-			'admin' => '管理者のユーザー名',
 			'format' => '<small>最大16文字の英数字</small>',
 		),
 	),
diff --git a/app/i18n/ja/index.php b/app/i18n/ja/index.php
index 4e9864e97..e5627cc12 100644
--- a/app/i18n/ja/index.php
+++ b/app/i18n/ja/index.php
@@ -13,7 +13,6 @@ return array(
 		'project_website' => 'プロジェクトのwebサイト',
 		'title' => 'FreshRSSについて',
 		'version' => 'バージョン',
-		'website' => 'Webサイト',
 	),
 	'feed' => array(
 		'add' => 'フィードを追加してください。',
diff --git a/app/i18n/ja/install.php b/app/i18n/ja/install.php
index 32386b8eb..09a61490f 100644
--- a/app/i18n/ja/install.php
+++ b/app/i18n/ja/install.php
@@ -101,7 +101,6 @@ return array(
 	),
 	'congratulations' => 'おめでとうございます!',
 	'default_user' => 'デフォルトのユーザーのユーザー名 <small>(最大16文字の英数字)</small>',
-	'delete_articles_after' => '後で記事を消す',
 	'fix_errors_before' => 'エラーを次のステップへ移る前に修正してください。',
 	'javascript_is_better' => 'FreshRSS はJavascriptが有効だとより快適にご利用いただけます。',
 	'js' => array(
diff --git a/app/i18n/ja/sub.php b/app/i18n/ja/sub.php
index 1d59e893d..3b0c64619 100644
--- a/app/i18n/ja/sub.php
+++ b/app/i18n/ja/sub.php
@@ -13,7 +13,6 @@ return array(
 	),
 	'category' => array(
 		'_' => 'カテゴリ',
-		'add' => 'カテゴリに追加する',
 		'archiving' => 'アーカイブ',
 		'empty' => 'からのカテゴリ',
 		'information' => 'インフォメーション',
@@ -110,8 +109,6 @@ return array(
 	),
 	'menu' => array(
 		'add' => 'フィード化カテゴリを追加します',
-		'add_feed' => 'フィードの追加',
-		'bookmark' => '購読 (FreshRSS ブックマーク)',
 		'import_export' => 'インポート / エクスポート',
 		'label_management' => 'ラベル管理',
 		'subscription_management' => '購読されたものの管理',
diff --git a/app/i18n/ja/user.php b/app/i18n/ja/user.php
index 6e0521055..a8c86f3ff 100644
--- a/app/i18n/ja/user.php
+++ b/app/i18n/ja/user.php
@@ -14,7 +14,7 @@ return array(
 				'email_sent' => 'Eメールはあなたのメールボックスに送信されました',
 				'error' => 'Eメールアドレスの確認は失敗しました。',
 				'ok' => 'このEメールアドレスは確認されました。',
-				'unneccessary' => 'このEメールアドレスは既に確認済みです。',
+				'unnecessary' => 'このEメールアドレスは既に確認済みです。',
 				'wrong_token' => 'このEメールアドレスのトークンは誤っています。',
 			),
 			'need_to' => '%s を使うためには、Eメールアドレスの認証が必要です。',
diff --git a/app/i18n/kr/admin.php b/app/i18n/kr/admin.php
index ae298158c..c40d1a4bd 100644
--- a/app/i18n/kr/admin.php
+++ b/app/i18n/kr/admin.php
@@ -9,7 +9,6 @@ return array(
 		'http' => 'HTTP (HTTPS를 사용하는 고급 사용자용)',
 		'none' => '사용하지 않음 (위험)',
 		'title' => '인증',
-		'title_reset' => '인증 초기화',
 		'token' => '인증 토큰',
 		'token_help' => '기본 사용자의 RSS에 인증 없이 접근할 수 있도록 합니다:',
 		'type' => '인증',
@@ -180,11 +179,9 @@ return array(
 	'user' => array(
 		'admin' => 'Administrator',	// TODO - Translation
 		'article_count' => 'Articles',	// TODO - Translation
-		'articles_and_size' => '%s 개의 글 (%s)',
 		'back_to_manage' => '← Return to user list',	// TODO - Translation
 		'create' => '새 사용자 생성',
 		'database_size' => 'Database size',	// TODO - Translation
-		'delete_users' => '사용자 삭제',
 		'email' => 'Email address',	// TODO - Translation
 		'enabled' => 'Enabled',	// TODO - Translation
 		'feed_count' => 'Feeds',	// TODO - Translation
@@ -196,11 +193,7 @@ return array(
 		'numbers' => '%d 개의 계정이 생성되었습니다',
 		'password_form' => '암호<br /><small>(웹폼 로그인 방식 사용시)</small>',
 		'password_format' => '7 글자 이상이어야 합니다',
-		'selected' => '선택된 사용자',
 		'title' => '사용자 관리',
-		'update_users' => '사용자 정보 변경',
-		'user_list' => '사용자 목록',
 		'username' => '사용자 이름',
-		'users' => '전체 사용자',
 	),
 );
diff --git a/app/i18n/kr/conf.php b/app/i18n/kr/conf.php
index 597107c6f..4e6623034 100644
--- a/app/i18n/kr/conf.php
+++ b/app/i18n/kr/conf.php
@@ -3,7 +3,6 @@
 return array(
 	'archiving' => array(
 		'_' => '보관',
-		'delete_after' => '다음 기간보다 오래된 글 삭제',
 		'exception' => 'Purge exception',	// TODO - Translation
 		'help' => '더 자세한 옵션은 개별 피드 설정에 있습니다',
 		'keep_favourites' => 'Never delete favourites',	// TODO - Translation
@@ -25,12 +24,12 @@ return array(
 		'_' => '표시',
 		'icon' => array(
 			'bottom_line' => '하단',
-			'summary' => 'Summary', // TODO - Translation
 			'display_authors' => 'Authors',	// TODO - Translation
 			'entry' => '문서 아이콘',
 			'publication_date' => '발행일',
 			'related_tags' => '관련 태그',
 			'sharing' => '공유',
+			'summary' => 'Summary',	// TODO - Translation
 			'top_line' => '상단',
 		),
 		'language' => '언어',
@@ -40,6 +39,13 @@ return array(
 		),
 		'show_nav_buttons' => '내비게이션 버튼 보이기',
 		'theme' => '테마',
+		'thumbnail' => array(
+			'label' => 'Thumbnail',	// TODO - Translation
+			'landscape' => 'Landscape',	// TODO - Translation
+			'none' => 'None',	// TODO - Translation
+			'portrait' => 'Portrait',	// TODO - Translation
+			'square' => 'Square',	// TODO - Translation
+		),
 		'title' => '표시',
 		'width' => array(
 			'content' => '내용 표시 너비',
@@ -48,13 +54,6 @@ return array(
 			'no_limit' => '제한 없음',
 			'thin' => '얇음',
 		),
-		'thumbnail' => array(
-			'label' => 'Thumbnail', // TODO - Translation
-			'none' => 'None', // TODO - Translation
-			'portrait' => 'Portrait', // TODO - Translation
-			'square' => 'Square', // TODO - Translation
-			'landscape' => 'Landscape', // TODO - Translation
-		),
 	),
 	'profile' => array(
 		'_' => '프로필 관리',
@@ -72,7 +71,6 @@ return array(
 	'query' => array(
 		'_' => '사용자 쿼리',
 		'deprecated' => '이 쿼리는 더 이상 유효하지 않습니다. 해당하는 카테고리나 피드가 삭제되었습니다.',
-		'display' => '사용자 쿼리 결과 표시',
 		'filter' => array(
 			'_' => 'Filter applied:',	// TODO - Translation
 			'categories' => 'Display by category',	// TODO - Translation
@@ -87,14 +85,11 @@ return array(
 		'get_category' => '"%s" 카테고리 표시',
 		'get_favorite' => '즐겨찾기에 등록된 글 표시',
 		'get_feed' => '"%s" 피드 표시',
-		'get_tag' => 'Display "%s" label',	// TODO - Translation
 		'name' => 'Name',	// TODO - Translation
 		'no_filter' => '필터가 없습니다',
-		'none' => '아직 사용자 쿼리를 만들지 않았습니다.',
 		'number' => '쿼리 #%d',
 		'order_asc' => '오래된 글 먼저 표시',
 		'order_desc' => '최근 글 먼저 표시',
-		'remove' => '사용자 쿼리 삭제',
 		'search' => '"%s"의 검색 결과',
 		'state_0' => '모든 글 표시',
 		'state_1' => '읽은 글 표시',
diff --git a/app/i18n/kr/feedback.php b/app/i18n/kr/feedback.php
index 6dcf5393c..5bf8496e1 100644
--- a/app/i18n/kr/feedback.php
+++ b/app/i18n/kr/feedback.php
@@ -15,10 +15,6 @@ return array(
 		),
 	),
 	'auth' => array(
-		'form' => array(
-			'not_set' => '인증 시스템을 설정하는 동안 문제가 발생했습니다. 잠시 후 다시 시도하세요.',
-			'set' => '웹폼이 이제 기본 인증 시스템으로 설정되었습니다.',
-		),
 		'login' => array(
 			'invalid' => '유효하지 않은 로그인입니다',
 			'success' => '접속되었습니다',
@@ -26,7 +22,6 @@ return array(
 		'logout' => array(
 			'success' => '접속이 해제되었습니다',
 		),
-		'no_password_set' => '관리자 암호가 설정되지 않았습니다. 이 기능은 사용할 수 없습니다.',
 	),
 	'conf' => array(
 		'error' => '설정을 저장하는 동안 문제가 발생했습니다',
diff --git a/app/i18n/kr/gen.php b/app/i18n/kr/gen.php
index 6e46d5527..9199a2c74 100644
--- a/app/i18n/kr/gen.php
+++ b/app/i18n/kr/gen.php
@@ -43,10 +43,8 @@ return array(
 			'ask' => '새 계정을 만들까요?',
 			'title' => '계정 생성',
 		),
-		'reset' => '인증 초기화',
 		'username' => array(
 			'_' => '사용자 이름',
-			'admin' => '관리자 이름',
 			'format' => '<small>알파벳과 숫자를 포함할 수 있고 최대 16 글자</small>',
 		),
 	),
diff --git a/app/i18n/kr/index.php b/app/i18n/kr/index.php
index 27c6d213f..3d82157e0 100644
--- a/app/i18n/kr/index.php
+++ b/app/i18n/kr/index.php
@@ -13,7 +13,6 @@ return array(
 		'project_website' => '프로젝트 웹사이트',
 		'title' => '정보',
 		'version' => '버전',
-		'website' => '웹사이트',
 	),
 	'feed' => array(
 		'add' => '피드를 추가하세요.',
diff --git a/app/i18n/kr/install.php b/app/i18n/kr/install.php
index 4c308cba7..eb2169b54 100644
--- a/app/i18n/kr/install.php
+++ b/app/i18n/kr/install.php
@@ -80,6 +80,7 @@ return array(
 			'nok' => 'PHP 버전은 %s 이지만, FreshRSS에는 최소 %s의 버전이 필요합니다.',
 			'ok' => 'PHP 버전은 %s 이고, FreshRSS와 호환가능 합니다.',
 		),
+		'reload' => 'Check again',	// TODO - Translation
 		'tmp' => array(
 			'nok' => '<em>%s</em> 디렉토리의 권한을 확인하세요. HTTP 서버가 쓰기 권한을 가지고 있어야 합니다.',
 			'ok' => 'Permissions on the temp directory are good.',	// TODO - Translation
@@ -93,7 +94,6 @@ return array(
 			'nok' => 'XML 해석을 위한 라이브러리르 찾을 수 없습니다.',
 			'ok' => 'XML 해석을 위한 라이브러리가 설치되어 있습니다.',
 		),
-		'reload' => 'Check again', // TODO - Translation
 	),
 	'conf' => array(
 		'_' => '일반 설정',
@@ -101,7 +101,6 @@ return array(
 	),
 	'congratulations' => '축하합니다!',
 	'default_user' => '기본 사용자 이름<small>(알파벳과 숫자를 포함할 수 있고 최대 16 글자)</small>',
-	'delete_articles_after' => '다음 기간보다 오래된 글 삭제',
 	'fix_errors_before' => '다음 단계로 가기 전에 문제를 해결하세요.',
 	'javascript_is_better' => 'FreshRSS는 자바스크립트를 사용할 때 더욱 쾌적하고 강력합니다',
 	'js' => array(
diff --git a/app/i18n/kr/sub.php b/app/i18n/kr/sub.php
index 18c0e3f7a..6f6558c4e 100644
--- a/app/i18n/kr/sub.php
+++ b/app/i18n/kr/sub.php
@@ -13,7 +13,6 @@ return array(
 	),
 	'category' => array(
 		'_' => '카테고리',
-		'add' => '카테고리 추가',
 		'archiving' => '보관',
 		'empty' => '빈 카테고리',
 		'information' => '정보',
@@ -110,8 +109,6 @@ return array(
 	),
 	'menu' => array(
 		'add' => 'Add a feed or category',	// TODO - Translation
-		'add_feed' => 'Add a feed',	// TODO - Translation
-		'bookmark' => '구독하기 (FreshRSS 북마클릿)',
 		'import_export' => '불러오기 / 내보내기',
 		'label_management' => 'Label management',	// TODO - Translation
 		'subscription_management' => '구독 관리',
diff --git a/app/i18n/kr/user.php b/app/i18n/kr/user.php
index 7816efcbc..1d93a9f9a 100644
--- a/app/i18n/kr/user.php
+++ b/app/i18n/kr/user.php
@@ -14,7 +14,7 @@ return array(
 				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
 				'error' => 'Email address validation failed.',	// TODO - Translation
 				'ok' => 'This email address has been validated.',	// TODO - Translation
-				'unneccessary' => 'This email address was already validated.',	// TODO - Translation
+				'unnecessary' => 'This email address was already validated.',	// TODO - Translation
 				'wrong_token' => 'This email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
 			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
diff --git a/app/i18n/nl/admin.php b/app/i18n/nl/admin.php
index 7c21b078d..c6f8458f0 100644
--- a/app/i18n/nl/admin.php
+++ b/app/i18n/nl/admin.php
@@ -9,7 +9,6 @@ return array(
 		'http' => 'HTTP (voor gevorderde gebruikers met HTTPS)',
 		'none' => 'Geen (gevaarlijk)',
 		'title' => 'Authenticatie',
-		'title_reset' => 'Authenticatie terugzetten',
 		'token' => 'Authenticatie teken',
 		'token_help' => 'Sta toegang toe tot de RSS uitvoer van de standaard gebruiker zonder authenticatie:',
 		'type' => 'Authenticatie methode',
@@ -180,11 +179,9 @@ return array(
 	'user' => array(
 		'admin' => 'Beheerder',
 		'article_count' => 'Artikelen',
-		'articles_and_size' => '%s artikelen (%s)',
 		'back_to_manage' => '← Terug naar gebruikerslijst',
 		'create' => 'Creëer nieuwe gebruiker',
 		'database_size' => 'Databasegrootte',
-		'delete_users' => 'Verwijder gebruiker',
 		'email' => 'Emailadres',
 		'enabled' => 'Ingeschakeld',
 		'feed_count' => 'Feeds',
@@ -196,11 +193,7 @@ return array(
 		'numbers' => 'Er zijn %d accounts gemaakt',
 		'password_form' => 'Wachtwoord<br /><small>(voor de Web-formulier loginmethode)</small>',
 		'password_format' => 'Ten minste 7 tekens',
-		'selected' => 'Geselecteerde gebruiker',
 		'title' => 'Beheer gebruikers',
-		'update_users' => 'Gebruiker bijwerken',
-		'user_list' => 'Lijst van gebruikers',
 		'username' => 'Gebruikersnaam',
-		'users' => 'Gebruikers',
 	),
 );
diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.php
index c7b5bf441..1fe4cec44 100644
--- a/app/i18n/nl/conf.php
+++ b/app/i18n/nl/conf.php
@@ -3,7 +3,6 @@
 return array(
 	'archiving' => array(
 		'_' => 'Archivering',
-		'delete_after' => 'Verwijder artikelen na',
 		'exception' => 'Zuiveringsuitzondering',
 		'help' => 'Meer opties zijn beschikbaar in de persoonlijke stroom instellingen',
 		'keep_favourites' => 'Favorieten nooit verwijderen',
@@ -25,12 +24,12 @@ return array(
 		'_' => 'Opmaak',
 		'icon' => array(
 			'bottom_line' => 'Onderaan',
-			'summary' => 'Summary', // TODO - Translation
 			'display_authors' => 'Auteurs',
 			'entry' => 'Artikel pictogrammen',
 			'publication_date' => 'Publicatie datum',
 			'related_tags' => 'Gerelateerde labels',
 			'sharing' => 'Delen',
+			'summary' => 'Summary',	// TODO - Translation
 			'top_line' => 'Bovenaan',
 		),
 		'language' => 'Taal',
@@ -40,6 +39,13 @@ return array(
 		),
 		'show_nav_buttons' => 'Toon navigatieknoppen',
 		'theme' => 'Thema',
+		'thumbnail' => array(
+			'label' => 'Thumbnail',	// TODO - Translation
+			'landscape' => 'Landscape',	// TODO - Translation
+			'none' => 'None',	// TODO - Translation
+			'portrait' => 'Portrait',	// TODO - Translation
+			'square' => 'Square',	// TODO - Translation
+		),
 		'title' => 'Opmaak',
 		'width' => array(
 			'content' => 'Inhoud breedte',
@@ -48,13 +54,6 @@ return array(
 			'no_limit' => 'Geen limiet',
 			'thin' => 'Smal',
 		),
-		'thumbnail' => array(
-			'label' => 'Thumbnail', // TODO - Translation
-			'none' => 'None', // TODO - Translation
-			'portrait' => 'Portrait', // TODO - Translation
-			'square' => 'Square', // TODO - Translation
-			'landscape' => 'Landscape', // TODO - Translation
-		),
 	),
 	'profile' => array(
 		'_' => 'Profielbeheer',
@@ -72,7 +71,6 @@ return array(
 	'query' => array(
 		'_' => 'Gebruikersquery\'s (informatie aanvragen)',
 		'deprecated' => 'Deze query (informatie aanvraag) is niet langer geldig. De bedoelde categorie of feed is al verwijderd.',
-		'display' => 'Queryresultaten weergeven',
 		'filter' => array(
 			'_' => 'Filter toegepast:',
 			'categories' => 'Weergeven op categorie',
@@ -87,14 +85,11 @@ return array(
 		'get_category' => 'Toon "%s" categorie',
 		'get_favorite' => 'Toon favoriete artikelen',
 		'get_feed' => 'Toon "%s" feed',
-		'get_tag' => 'Toon "%s" label',
 		'name' => 'Naam',
 		'no_filter' => 'Geen filter',
-		'none' => 'U hebt nog geen gebruikers query aangemaakt..',
 		'number' => 'Query n°%d',
 		'order_asc' => 'Toon oudste artikelen eerst',
 		'order_desc' => 'Toon nieuwste artikelen eerst',
-		'remove' => 'Gebruikersquery verwijderen',
 		'search' => 'Zoek naar "%s"',
 		'state_0' => 'Toon alle artikelen',
 		'state_1' => 'Toon gelezen artikelen',
diff --git a/app/i18n/nl/feedback.php b/app/i18n/nl/feedback.php
index d1a3f8855..c4dc8bcc3 100644
--- a/app/i18n/nl/feedback.php
+++ b/app/i18n/nl/feedback.php
@@ -15,10 +15,6 @@ return array(
 		),
 	),
 	'auth' => array(
-		'form' => array(
-			'not_set' => 'Er is een probleem opgetreden tijdens de controle van de systeemconfiguratie. Probeer het later nog eens.',
-			'set' => 'Formulier is nu uw standaard authenticatie systeem.',
-		),
 		'login' => array(
 			'invalid' => 'Login is ongeldig',
 			'success' => 'U bent ingelogd',
@@ -26,7 +22,6 @@ return array(
 		'logout' => array(
 			'success' => 'U bent uitgelogd',
 		),
-		'no_password_set' => 'Beheerderswachtwoord is niet ingesteld. Deze mogelijkheid is niet beschikbaar.',
 	),
 	'conf' => array(
 		'error' => 'Er is een fout opgetreden tijdens het opslaan van de configuratie',
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index 9696523bb..9ee704420 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -43,10 +43,8 @@ return array(
 			'ask' => 'Maak een account?',
 			'title' => 'Account maken',
 		),
-		'reset' => 'Authenticatie reset',
 		'username' => array(
 			'_' => 'Gebruikersnaam',
-			'admin' => 'Beheerdersgebruikersnaam',
 			'format' => '<small>Maximaal 16 alfanumerieke tekens</small>',
 		),
 	),
diff --git a/app/i18n/nl/index.php b/app/i18n/nl/index.php
index 6a6f419fb..ee5142957 100644
--- a/app/i18n/nl/index.php
+++ b/app/i18n/nl/index.php
@@ -13,7 +13,6 @@ return array(
 		'project_website' => 'Projectwebsite',
 		'title' => 'Over',
 		'version' => 'Versie',
-		'website' => 'Website',
 	),
 	'feed' => array(
 		'add' => 'U kunt wat feeds toevoegen.',
diff --git a/app/i18n/nl/install.php b/app/i18n/nl/install.php
index 2b72585e4..b774696a7 100644
--- a/app/i18n/nl/install.php
+++ b/app/i18n/nl/install.php
@@ -80,6 +80,7 @@ return array(
 			'nok' => 'Uw PHP versie is %s maar FreshRSS benodigd tenminste versie %s.',
 			'ok' => 'Uw PHP versie is %s, welke compatibel is met FreshRSS.',
 		),
+		'reload' => 'Controleer nog eens',
 		'tmp' => array(
 			'nok' => 'Controleer permissies van de <em>%s</em> map. HTTP server moet rechten hebben om er in te kunnen schrijven.',
 			'ok' => 'Permissies van de temp-map zijn goed.',
@@ -93,7 +94,6 @@ return array(
 			'nok' => 'U mist de benodigde bibliotheek om XML te gebruiken.',
 			'ok' => 'U hebt de benodigde bibliotheek om XML te gebruiken.',
 		),
-		'reload' => 'Controleer nog eens',
 	),
 	'conf' => array(
 		'_' => 'Algemene configuratie',
@@ -101,7 +101,6 @@ return array(
 	),
 	'congratulations' => 'Gefeliciteerd!',
 	'default_user' => 'Gebruikersnaam van de standaardgebruiker <small>(maximaal 16 alfanumerieke tekens)</small>',
-	'delete_articles_after' => 'Verwijder artikelen na',
 	'fix_errors_before' => 'Repareer fouten alvorens U naar de volgende stap gaat.',
 	'javascript_is_better' => 'FreshRSS werkt beter JavaScript ingeschakeld',
 	'js' => array(
diff --git a/app/i18n/nl/sub.php b/app/i18n/nl/sub.php
index bcce5440e..3a774455d 100644
--- a/app/i18n/nl/sub.php
+++ b/app/i18n/nl/sub.php
@@ -13,7 +13,6 @@ return array(
 	),
 	'category' => array(
 		'_' => 'Categorie',
-		'add' => 'Voeg categorie toe',
 		'archiving' => 'Archiveren',
 		'empty' => 'Lege categorie',
 		'information' => 'Informatie',
@@ -110,8 +109,6 @@ return array(
 	),
 	'menu' => array(
 		'add' => 'Feed of categorie toevoegen',
-		'add_feed' => 'Feed toevoegen',
-		'bookmark' => 'Abonneer (FreshRSS bladwijzer)',
 		'import_export' => 'Importeer / exporteer',
 		'label_management' => 'Labelbeheer',
 		'subscription_management' => 'Abonnementenbeheer',
diff --git a/app/i18n/nl/user.php b/app/i18n/nl/user.php
index 59597357c..4b72af789 100644
--- a/app/i18n/nl/user.php
+++ b/app/i18n/nl/user.php
@@ -14,7 +14,7 @@ return array(
 				'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.',
+				'unnecessary' => '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.',
diff --git a/app/i18n/oc/admin.php b/app/i18n/oc/admin.php
index 0c80f5640..71b663847 100644
--- a/app/i18n/oc/admin.php
+++ b/app/i18n/oc/admin.php
@@ -9,7 +9,6 @@ return array(
 		'http' => 'HTTP (per utilizaires avançats amb HTTPS)',
 		'none' => 'Cap (perilhós)',
 		'title' => 'Autentificacion',
-		'title_reset' => 'Reïnicializacion de l’autentificacion',
 		'token' => 'Geton d’autentificacion',
 		'token_help' => 'Permetre l’accès a la sortida RSS de l’utilizaire per defaut sens cap d’autentificacion :',
 		'type' => 'Mòde d’autentification',
@@ -180,11 +179,9 @@ return array(
 	'user' => array(
 		'admin' => 'Administrator',
 		'article_count' => 'Articles',
-		'articles_and_size' => '%s articles (%s)',
 		'back_to_manage' => '← Tornar a la lista dels utilizaires',
 		'create' => 'Crear un nòu utilizaire',
 		'database_size' => 'Talha basa de donadas',
-		'delete_users' => 'Suprimir un utilizaire',
 		'email' => 'Adreça electronica',
 		'enabled' => 'Activat',
 		'feed_count' => 'Flux',
@@ -196,11 +193,7 @@ return array(
 		'numbers' => '%d comptes ja creats',
 		'password_form' => 'Senhal <br /><small>(ex. : per la connexion via formulari)</small>',
 		'password_format' => 'Almens 7 caractèrs',
-		'selected' => 'Utilizaire seleccionat',
 		'title' => 'Gestion dels utilizaires',
-		'update_users' => 'Actualizar un utilizaire',
-		'user_list' => 'Lista dels utilizaires',
 		'username' => 'Nom d’utilizaire',
-		'users' => 'Utilizaires',
 	),
 );
diff --git a/app/i18n/oc/conf.php b/app/i18n/oc/conf.php
index e645a5b68..07a62cddb 100644
--- a/app/i18n/oc/conf.php
+++ b/app/i18n/oc/conf.php
@@ -3,7 +3,6 @@
 return array(
 	'archiving' => array(
 		'_' => 'Archius',
-		'delete_after' => 'Levar los articles aprèp',
 		'exception' => 'Excepcion de purga',
 		'help' => 'Mai d’opcions son disponiblas dins la configuracion individuala dels fluxes',
 		'keep_favourites' => 'Jamai suprimir los favorits',
@@ -25,12 +24,12 @@ return array(
 		'_' => 'Afichatge',
 		'icon' => array(
 			'bottom_line' => 'Linha enbàs',
-			'summary' => 'Summary', // TODO - Translation
 			'display_authors' => 'Autors',
 			'entry' => 'Icònas d’article',
 			'publication_date' => 'Data de publicacion',
 			'related_tags' => 'Etiquetas ligadas',
 			'sharing' => 'Partatge',
+			'summary' => 'Summary',	// TODO - Translation
 			'top_line' => 'Linha amont',
 		),
 		'language' => 'Lenga',
@@ -40,6 +39,13 @@ return array(
 		),
 		'show_nav_buttons' => 'Mostrar los botons de navigacion',
 		'theme' => 'Tèma',
+		'thumbnail' => array(
+			'label' => 'Thumbnail',	// TODO - Translation
+			'landscape' => 'Landscape',	// TODO - Translation
+			'none' => 'None',	// TODO - Translation
+			'portrait' => 'Portrait',	// TODO - Translation
+			'square' => 'Square',	// TODO - Translation
+		),
 		'title' => 'Afichatge',
 		'width' => array(
 			'content' => 'Largor del contengut',
@@ -48,13 +54,6 @@ return array(
 			'no_limit' => 'Cap de limit',
 			'thin' => 'Fina',
 		),
-		'thumbnail' => array(
-			'label' => 'Thumbnail', // TODO - Translation
-			'none' => 'None', // TODO - Translation
-			'portrait' => 'Portrait', // TODO - Translation
-			'square' => 'Square', // TODO - Translation
-			'landscape' => 'Landscape', // TODO - Translation
-		),
 	),
 	'profile' => array(
 		'_' => 'Gestion del perfil',
@@ -72,7 +71,6 @@ return array(
 	'query' => array(
 		'_' => 'Filtres utilizaires',
 		'deprecated' => 'Aqueste filtre es pas valid. La categoria o lo flux concernit es estat suprimit.',
-		'display' => 'Mostrar los resultats del filtre',
 		'filter' => array(
 			'_' => 'Filtres aplicats :',
 			'categories' => 'Afichatge per categoria',
@@ -87,14 +85,11 @@ return array(
 		'get_category' => 'Mostrar la categoria « %s »',
 		'get_favorite' => 'Mostrar los articles favorits',
 		'get_feed' => 'Mostrar lo flux « %s »',
-		'get_tag' => 'Mostrar etiqueta « %s »',
 		'name' => 'Nom',
 		'no_filter' => 'Cap de filtre aplicat',
-		'none' => 'Avètz pas encara creat cap de filtre.',
 		'number' => 'Filtre n°%d',
 		'order_asc' => 'Mostrar los articles mai ancians en primièr',
 		'order_desc' => 'Mostrar los articles mai recents en primièr',
-		'remove' => 'Levar lo filtre utilizaire',
 		'search' => 'Recèrca de « %s »',
 		'state_0' => 'Mostrar totes los articles',
 		'state_1' => 'Mostrar los articles pas legits',
diff --git a/app/i18n/oc/feedback.php b/app/i18n/oc/feedback.php
index 5a90a3e94..8ba4c6269 100644
--- a/app/i18n/oc/feedback.php
+++ b/app/i18n/oc/feedback.php
@@ -15,10 +15,6 @@ return array(
 		),
 	),
 	'auth' => array(
-		'form' => array(
-			'not_set' => 'Un problèma es aparegut pendent la configuracion del sistèma d’autentificacion. Tonatz ensajar ai tard.',
-			'set' => 'Lo sistèma d’autentificacion per defaut es ara lo formulari.',
-		),
 		'login' => array(
 			'invalid' => 'L’identificant es invalid',
 			'success' => 'Sètz connectat',
@@ -26,7 +22,6 @@ return array(
 		'logout' => array(
 			'success' => 'Sètz desconnectat',
 		),
-		'no_password_set' => 'Pas de senhal es pas configurat. Aquesta foncionalitat es pas disponibla.',
 	),
 	'conf' => array(
 		'error' => 'Una error es apareguda pendent la salvagarda de la configuracion',
diff --git a/app/i18n/oc/gen.php b/app/i18n/oc/gen.php
index f5b3d70e5..00a9b9eb7 100644
--- a/app/i18n/oc/gen.php
+++ b/app/i18n/oc/gen.php
@@ -43,10 +43,8 @@ return array(
 			'ask' => 'Crear un compte?',
 			'title' => 'Creacion de compte',
 		),
-		'reset' => 'Reïnicializacion de l’autentificacion',
 		'username' => array(
 			'_' => 'Nom d’utilizaire',
-			'admin' => 'Nom d’utilizaire administrator',
 			'format' => '<small>16 caractèrs alfanumerics maximum</small>',
 		),
 	),
diff --git a/app/i18n/oc/index.php b/app/i18n/oc/index.php
index 72e896785..feed34c09 100644
--- a/app/i18n/oc/index.php
+++ b/app/i18n/oc/index.php
@@ -13,7 +13,6 @@ return array(
 		'project_website' => 'Site del projècte',
 		'title' => 'A prepaus',
 		'version' => 'Version',
-		'website' => 'Site internet',
 	),
 	'feed' => array(
 		'add' => 'Podètz ajustar de fluxes.',
diff --git a/app/i18n/oc/install.php b/app/i18n/oc/install.php
index d7ae46850..1e5dc42f5 100644
--- a/app/i18n/oc/install.php
+++ b/app/i18n/oc/install.php
@@ -80,6 +80,7 @@ return array(
 			'nok' => 'Vòstra version PHP es la %s mas FreshRSS demanda almens la version %s.',
 			'ok' => 'Vòstra version PHP es %s, qu’es compatibla amb FreshRSS.',
 		),
+		'reload' => 'Revérifier',
 		'tmp' => array(
 			'nok' => 'Volgatz verificar los dreches sul repertòri <em>%s</em>. Lo servidor HTTP deu poder escriure dedins.',
 			'ok' => 'Las permissions sul repertòri temporari son bonas.',
@@ -93,7 +94,6 @@ return array(
 			'nok' => 'Impossible de trobar una bibliotèca necessària per XML.',
 			'ok' => 'Avètz la bibliotèca per percórrer los XML.',
 		),
-		'reload' => 'Revérifier',
 	),
 	'conf' => array(
 		'_' => 'Configuracion generala',
@@ -101,7 +101,6 @@ return array(
 	),
 	'congratulations' => 'Òsca !',
 	'default_user' => 'Nom d’utilizaire per defaut <small>16 caractèrs alfanumerics maximum)</small>',
-	'delete_articles_after' => 'Levar los articles aprèp',
 	'fix_errors_before' => 'Mercés de corregir las errors seguentas abans de contunhar.',
 	'javascript_is_better' => 'FreshRSS es mai agradable amb lo JavaScript activat',
 	'js' => array(
diff --git a/app/i18n/oc/sub.php b/app/i18n/oc/sub.php
index 6f1ba8cdf..41ac1a55f 100644
--- a/app/i18n/oc/sub.php
+++ b/app/i18n/oc/sub.php
@@ -13,7 +13,6 @@ return array(
 	),
 	'category' => array(
 		'_' => 'Categoria',
-		'add' => 'Ajustar una categoria',
 		'archiving' => 'Archivar',
 		'empty' => 'Categoria voida',
 		'information' => 'Informacions',
@@ -110,8 +109,6 @@ return array(
 	),
 	'menu' => array(
 		'add' => 'Ajustar un flux o una categoria',
-		'add_feed' => 'Ajustar un flux',
-		'bookmark' => 'Sabonar (marcapagina FreshRSS)',
 		'import_export' => 'Importar / Exportar',
 		'label_management' => 'Gestion de las etiquetas',
 		'subscription_management' => 'Gestion dels abonaments',
diff --git a/app/i18n/oc/user.php b/app/i18n/oc/user.php
index cf618420c..774e482ad 100644
--- a/app/i18n/oc/user.php
+++ b/app/i18n/oc/user.php
@@ -14,7 +14,7 @@ return array(
 				'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.',
+				'unnecessary' => '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.',
diff --git a/app/i18n/pl/admin.php b/app/i18n/pl/admin.php
index a0478f8b4..eb95bfe7b 100644
--- a/app/i18n/pl/admin.php
+++ b/app/i18n/pl/admin.php
@@ -9,7 +9,6 @@ return array(
 		'http' => 'HTTP (dla zaawansowanych użytkowników, z wykorzystaniem HTTPS)',
 		'none' => 'Brak (niebezpieczna)',
 		'title' => 'Uwierzytelnianie',
-		'title_reset' => 'Authentication reset',	// TODO - Translation
 		'token' => 'Token uwierzytelniania',
 		'token_help' => 'Pozwala na dostęp do treści RSS domyślnego użytkownika bez uwierzytelnienia:',
 		'type' => 'Metoda uwierzytelniania',
@@ -180,11 +179,9 @@ return array(
 	'user' => array(
 		'admin' => 'Administrator',
 		'article_count' => 'Liczba wiadomości',
-		'articles_and_size' => '%s articles (%s)',	// TODO - Translation
 		'back_to_manage' => '← Powrót do listy użytkowników',
 		'create' => 'Dodaj nowego użytkownika',
 		'database_size' => 'Rozmiar bazy danych',
-		'delete_users' => 'Delete user',	// TODO - Translation
 		'email' => 'Adres e-mail',
 		'enabled' => 'Aktywne',
 		'feed_count' => 'Kanały',
@@ -196,11 +193,7 @@ return array(
 		'numbers' => 'Liczba aktywnych kont: %d',
 		'password_form' => 'Hasło<br /><small>(dla logowania przez formularz na stronie)</small>',
 		'password_format' => 'Przynajmniej 7 znaków',
-		'selected' => 'Selected user',	// TODO - Translation
 		'title' => 'Zarządzanie użytkownikami',
-		'update_users' => 'Update user',	// TODO - Translation
-		'user_list' => 'List of users',	// TODO - Translation
 		'username' => 'Nazwa użytkownika',
-		'users' => 'Users',	// TODO - Translation
 	),
 );
diff --git a/app/i18n/pl/conf.php b/app/i18n/pl/conf.php
index c6e337320..c50132a17 100644
--- a/app/i18n/pl/conf.php
+++ b/app/i18n/pl/conf.php
@@ -3,7 +3,6 @@
 return array(
 	'archiving' => array(
 		'_' => 'Archiwizacja',
-		'delete_after' => 'Remove articles after',	// TODO - Translation
 		'exception' => 'Wyjątki od oczyszczania',
 		'help' => 'Więcej opcji dostępne jest w ustawieniach konkretnych kanałów',
 		'keep_favourites' => 'Nigdy nie usuwaj ulubionych',
@@ -25,12 +24,12 @@ return array(
 		'_' => 'Wyświetlanie',
 		'icon' => array(
 			'bottom_line' => 'Dolny margines',
-			'summary' => 'Summary', // TODO - Translation
 			'display_authors' => 'Autorzy',
 			'entry' => 'Ikony wiadomości',
 			'publication_date' => 'Data publikacji',
 			'related_tags' => 'Tagi',
 			'sharing' => 'Podaj dalej',
+			'summary' => 'Summary',	// TODO - Translation
 			'top_line' => 'Górny margines',
 		),
 		'language' => 'Język',
@@ -40,6 +39,13 @@ return array(
 		),
 		'show_nav_buttons' => 'Pokaż przyciski nawigacyjne',
 		'theme' => 'Motyw',
+		'thumbnail' => array(
+			'label' => 'Thumbnail',	// TODO - Translation
+			'landscape' => 'Landscape',	// TODO - Translation
+			'none' => 'None',	// TODO - Translation
+			'portrait' => 'Portrait',	// TODO - Translation
+			'square' => 'Square',	// TODO - Translation
+		),
 		'title' => 'Wyświetlanie',
 		'width' => array(
 			'content' => 'Rozmiar treści',
@@ -48,13 +54,6 @@ return array(
 			'no_limit' => 'Pełna szerokość',
 			'thin' => 'Wąska',
 		),
-		'thumbnail' => array(
-			'label' => 'Thumbnail', // TODO - Translation
-			'none' => 'None', // TODO - Translation
-			'portrait' => 'Portrait', // TODO - Translation
-			'square' => 'Square', // TODO - Translation
-			'landscape' => 'Landscape', // TODO - Translation
-		),
 	),
 	'profile' => array(
 		'_' => 'Zarządzanie profilem',
@@ -72,7 +71,6 @@ return array(
 	'query' => array(
 		'_' => 'Zapisane zapytania',
 		'deprecated' => 'To zapytanie nie jest już poprawne. Kategoria lub kanał do którego się odnosi już nie istnieje.',
-		'display' => 'Pokaż wyniki dla tego zapytania',
 		'filter' => array(
 			'_' => 'Zastosowane filtry:',
 			'categories' => 'Display by category',	// TODO - Translation
@@ -87,14 +85,11 @@ return array(
 		'get_category' => 'Wyświetlenie kategorii "%s"',
 		'get_favorite' => 'Wyświetlenie ulubionych wiadomości',
 		'get_feed' => 'Wyświetlenie kanału "%s"',
-		'get_tag' => 'Display "%s" label',	// TODO - Translation
 		'name' => 'Name',	// TODO - Translation
 		'no_filter' => 'Brak filtrów',
-		'none' => 'Nie zapisałeś jeszcze żadnego zapytania.',
 		'number' => 'Zapytanie nr %d',
 		'order_asc' => 'Wyświetl najpierw najstarsze wiadomości',
 		'order_desc' => 'Wyświetl najpierw najnowsze wiadomości',
-		'remove' => 'Usuń zapisane zapytanie',
 		'search' => 'Szukaj "%s"',
 		'state_0' => 'Wyświetl wszystkie wiadomości',
 		'state_1' => 'Wyświetl przeczytane wiadomości',
diff --git a/app/i18n/pl/feedback.php b/app/i18n/pl/feedback.php
index f370987c2..fdddb6517 100644
--- a/app/i18n/pl/feedback.php
+++ b/app/i18n/pl/feedback.php
@@ -15,10 +15,6 @@ return array(
 		),
 	),
 	'auth' => array(
-		'form' => array(
-			'not_set' => 'A problem occurred during authentication system configuration. Please try again later.',	// TODO - Translation
-			'set' => 'Form is now your default authentication system.',	// TODO - Translation
-		),
 		'login' => array(
 			'invalid' => 'Niepoprawne dane logowania',
 			'success' => 'Zalogowałeś się',
@@ -26,7 +22,6 @@ return array(
 		'logout' => array(
 			'success' => 'Zostałeś wylogowany',
 		),
-		'no_password_set' => 'Administrator password hasn’t been set. This feature isn’t available.',	// TODO - Translation
 	),
 	'conf' => array(
 		'error' => 'An error occurred while saving configuration',	// TODO - Translation
diff --git a/app/i18n/pl/gen.php b/app/i18n/pl/gen.php
index 9f479f9f0..4c7f97001 100644
--- a/app/i18n/pl/gen.php
+++ b/app/i18n/pl/gen.php
@@ -43,10 +43,8 @@ return array(
 			'ask' => 'Create an account?',	// TODO - Translation
 			'title' => 'Account creation',	// TODO - Translation
 		),
-		'reset' => 'Authentication reset',	// TODO - Translation
 		'username' => array(
 			'_' => 'Nazwa użytkownika',
-			'admin' => 'Administrator username',	// TODO - Translation
 			'format' => '<small>Maximum 16 alphanumeric characters</small>',	// TODO - Translation
 		),
 	),
diff --git a/app/i18n/pl/index.php b/app/i18n/pl/index.php
index 1442b3251..809ea15f5 100644
--- a/app/i18n/pl/index.php
+++ b/app/i18n/pl/index.php
@@ -13,7 +13,6 @@ return array(
 		'project_website' => 'Strona projektu',
 		'title' => 'O serwisie',
 		'version' => 'Wersja',
-		'website' => 'Strona domowa',
 	),
 	'feed' => array(
 		'add' => 'Dodaj więcej kanałów.',
diff --git a/app/i18n/pl/install.php b/app/i18n/pl/install.php
index 02deb3cbe..746347b54 100644
--- a/app/i18n/pl/install.php
+++ b/app/i18n/pl/install.php
@@ -80,6 +80,7 @@ return array(
 			'nok' => 'Your PHP version is %s, but FreshRSS requires at least version %s.',	// TODO - Translation
 			'ok' => 'Your PHP version, %s, is compatible with FreshRSS.',	// TODO - Translation
 		),
+		'reload' => 'Sprawdź ponownie',
 		'tmp' => array(
 			'nok' => 'Check permissions on the <em>%1$s</em> directory for <em>%2$s</em> user. The HTTP server must have write permissions.',	// TODO - Translation
 			'ok' => 'Permissions on the temp directory are good.',	// TODO - Translation
@@ -93,7 +94,6 @@ return array(
 			'nok' => 'Cannot find the required library to parse XML.',	// TODO - Translation
 			'ok' => 'You have the required library to parse XML.',	// TODO - Translation
 		),
-		'reload' => 'Sprawdź ponownie',
 	),
 	'conf' => array(
 		'_' => 'General configuration',	// TODO - Translation
@@ -101,7 +101,6 @@ return array(
 	),
 	'congratulations' => 'Congratulations!',	// TODO - Translation
 	'default_user' => 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',	// TODO - Translation
-	'delete_articles_after' => 'Remove articles after',	// TODO - Translation
 	'fix_errors_before' => 'Please fix errors before continuing to the next step.',	// TODO - Translation
 	'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',	// TODO - Translation
 	'js' => array(
diff --git a/app/i18n/pl/sub.php b/app/i18n/pl/sub.php
index ff04aa401..1837d964b 100644
--- a/app/i18n/pl/sub.php
+++ b/app/i18n/pl/sub.php
@@ -13,7 +13,6 @@ return array(
 	),
 	'category' => array(
 		'_' => 'Kategoria',
-		'add' => 'Dodaj kategorię',
 		'archiving' => 'Archiwizacja',
 		'empty' => 'Pusta kategoria',
 		'information' => 'Informacje',
@@ -110,8 +109,6 @@ return array(
 	),
 	'menu' => array(
 		'add' => 'Dodaj kanał lub kategorię',
-		'add_feed' => 'Dodaj kanał',
-		'bookmark' => 'Subscribe (FreshRSS bookmark)',	// TODO - Translation
 		'import_export' => 'Import / eksport',
 		'label_management' => 'Zarządzanie etykietami',
 		'subscription_management' => 'Zarządzanie subskrypcjami',
diff --git a/app/i18n/pl/user.php b/app/i18n/pl/user.php
index dfd1b7b73..b4e251360 100644
--- a/app/i18n/pl/user.php
+++ b/app/i18n/pl/user.php
@@ -14,7 +14,7 @@ return array(
 				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
 				'error' => 'Email address validation failed.',	// TODO - Translation
 				'ok' => 'This email address has been validated.',	// TODO - Translation
-				'unneccessary' => 'This email address was already validated.',	// TODO - Translation
+				'unnecessary' => 'This email address was already validated.',	// TODO - Translation
 				'wrong_token' => 'This email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
 			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
diff --git a/app/i18n/pt-br/admin.php b/app/i18n/pt-br/admin.php
index 855b8a577..f3fbeec1f 100644
--- a/app/i18n/pt-br/admin.php
+++ b/app/i18n/pt-br/admin.php
@@ -9,7 +9,6 @@ return array(
 		'http' => 'HTTP (Para usuários avançados com HTTPS)',
 		'none' => 'Nenhum (Perigoso)',
 		'title' => 'Autenticação',
-		'title_reset' => 'Reset autenticação',
 		'token' => 'Token de autenticação ',
 		'token_help' => 'Permitir acesso a saída RSS para o usuário padrão sem autenticação',
 		'type' => 'Método de autenticação',
@@ -180,11 +179,9 @@ return array(
 	'user' => array(
 		'admin' => 'Administrador',
 		'article_count' => 'Artigos',
-		'articles_and_size' => '%s artigos (%s)',
 		'back_to_manage' => '← Voltar para à lista de usuários',
 		'create' => 'Criar novo usuário',
 		'database_size' => 'Tamanho do banco de dados',
-		'delete_users' => 'Deletar usuário',
 		'email' => 'Endereço de email',
 		'enabled' => 'Enabled',	// TODO - Translation
 		'feed_count' => 'Feeds',
@@ -196,11 +193,7 @@ return array(
 		'numbers' => 'Há %d contas criadas',
 		'password_form' => 'Senha<br /><small>(para o login pelo método do formulário)</small>',
 		'password_format' => 'Ao menos 7 caracteres',
-		'selected' => 'Usuário selecionado',
 		'title' => 'Gerenciar usuários',
-		'update_users' => 'Atualizar usuário',
-		'user_list' => 'Lista de usuários',
 		'username' => 'Usuário',
-		'users' => 'Usuários',
 	),
 );
diff --git a/app/i18n/pt-br/conf.php b/app/i18n/pt-br/conf.php
index 3b10f07cd..e5008eb03 100644
--- a/app/i18n/pt-br/conf.php
+++ b/app/i18n/pt-br/conf.php
@@ -3,7 +3,6 @@
 return array(
 	'archiving' => array(
 		'_' => 'Arquivar',
-		'delete_after' => 'Remover artigos depois',
 		'exception' => 'Regras de exceção da limpeza',
 		'help' => 'Mais opções estão disponíveis nas configurações individuais do Feed',
 		'keep_favourites' => 'Nunca deletar os favoritos',
@@ -25,12 +24,12 @@ return array(
 		'_' => 'Exibição',
 		'icon' => array(
 			'bottom_line' => 'Linha inferior',
-			'summary' => 'Summary', // TODO - Translation
 			'display_authors' => 'Autores',
 			'entry' => 'Ícones de artigos',
 			'publication_date' => 'Data da publicação',
 			'related_tags' => 'Tags relacionadas',
 			'sharing' => 'Compartilhar',
+			'summary' => 'Summary',	// TODO - Translation
 			'top_line' => 'Linha superior',
 		),
 		'language' => 'Idioma',
@@ -40,6 +39,13 @@ return array(
 		),
 		'show_nav_buttons' => 'Mostrar botões de navegação',
 		'theme' => 'Tema',
+		'thumbnail' => array(
+			'label' => 'Thumbnail',	// TODO - Translation
+			'landscape' => 'Landscape',	// TODO - Translation
+			'none' => 'None',	// TODO - Translation
+			'portrait' => 'Portrait',	// TODO - Translation
+			'square' => 'Square',	// TODO - Translation
+		),
 		'title' => 'Exibição',
 		'width' => array(
 			'content' => 'Largura do conteúdo',
@@ -48,13 +54,6 @@ return array(
 			'no_limit' => 'Sem limite',
 			'thin' => 'Fino',
 		),
-		'thumbnail' => array(
-			'label' => 'Thumbnail', // TODO - Translation
-			'none' => 'None', // TODO - Translation
-			'portrait' => 'Portrait', // TODO - Translation
-			'square' => 'Square', // TODO - Translation
-			'landscape' => 'Landscape', // TODO - Translation
-		),
 	),
 	'profile' => array(
 		'_' => 'Gerenciamento de perfil',
@@ -72,7 +71,6 @@ return array(
 	'query' => array(
 		'_' => 'Queries do usuário',
 		'deprecated' => 'Esta não é mais válida. A categoria ou feed relacionado foi deletado.',
-		'display' => 'Exibir resultados da query do usuário',
 		'filter' => array(
 			'_' => 'Filtro aplicado:',
 			'categories' => 'Display by category',	// TODO - Translation
@@ -87,14 +85,11 @@ return array(
 		'get_category' => 'Visualizar "%s" categoria',
 		'get_favorite' => 'Visualizar artigos favoritos',
 		'get_feed' => 'Visualizar "%s" feed',
-		'get_tag' => 'Display "%s" label',	// TODO - Translation
 		'name' => 'Name',	// TODO - Translation
 		'no_filter' => 'Sem filtro',
-		'none' => 'Você não criou nenhuma query de usuário ainda.',
 		'number' => 'Query n°%d',
 		'order_asc' => 'Exibir artigos mais antigos primeiro',
 		'order_desc' => 'Exibir artigos mais novos primeiro',
-		'remove' => 'Remover query do usuário',
 		'search' => 'Busca por "%s"',
 		'state_0' => 'Exibir todos os artigos',
 		'state_1' => 'Exibir artigos lidos',
diff --git a/app/i18n/pt-br/feedback.php b/app/i18n/pt-br/feedback.php
index 7f7c4db03..56b5c99d9 100644
--- a/app/i18n/pt-br/feedback.php
+++ b/app/i18n/pt-br/feedback.php
@@ -15,10 +15,6 @@ return array(
 		),
 	),
 	'auth' => array(
-		'form' => array(
-			'not_set' => 'Um problema ocorreu durante o sistema de configuração para autenticação. Por favor tente mais tarde.',
-			'set' => 'Formulário é agora seu sistema de autenticação padrão.',
-		),
 		'login' => array(
 			'invalid' => 'Login está incorreto',
 			'success' => 'Você está conectado',
@@ -26,7 +22,6 @@ return array(
 		'logout' => array(
 			'success' => 'Você está desconectado',
 		),
-		'no_password_set' => 'A senha do administrador não foi definida. Este recurso não está disponível.',
 	),
 	'conf' => array(
 		'error' => 'Um erro ocorreu durante o salvamento das configurações',
diff --git a/app/i18n/pt-br/gen.php b/app/i18n/pt-br/gen.php
index 192c4ad95..9aafd2dbe 100644
--- a/app/i18n/pt-br/gen.php
+++ b/app/i18n/pt-br/gen.php
@@ -43,10 +43,8 @@ return array(
 			'ask' => 'Criar novoa conta?',
 			'title' => 'Criação de conta',
 		),
-		'reset' => 'Reset autenticação',
 		'username' => array(
 			'_' => 'Usuário',
-			'admin' => 'Usuário administrador',
 			'format' => '<small>Máximo 16 caracteres alphanumericos</small>',
 		),
 	),
diff --git a/app/i18n/pt-br/index.php b/app/i18n/pt-br/index.php
index 92ce19a6c..f39018bae 100644
--- a/app/i18n/pt-br/index.php
+++ b/app/i18n/pt-br/index.php
@@ -13,7 +13,6 @@ return array(
 		'project_website' => 'Site do projeto',
 		'title' => 'Sobre',
 		'version' => 'Versão',
-		'website' => 'Site',
 	),
 	'feed' => array(
 		'add' => 'Você pode adicionar alguns feeds.',
diff --git a/app/i18n/pt-br/install.php b/app/i18n/pt-br/install.php
index fc5288bf6..878ca296a 100644
--- a/app/i18n/pt-br/install.php
+++ b/app/i18n/pt-br/install.php
@@ -80,6 +80,7 @@ return array(
 			'nok' => 'Sua versão do PHP é %s mas FreshRSS requer ao menos a versão %s.',
 			'ok' => 'Sua versão do PHP é %s, que é compatível com o FreshRSS.',
 		),
+		'reload' => 'Verifique novamente',
 		'tmp' => array(
 			'nok' => 'Verifiquei as permissões no diretório <em>%s</em>. O servidor HTTP deve ter direitos para escrever dentro desta pasta.',
 			'ok' => 'Permissions on the temp directory are good.',	// TODO - Translation
@@ -93,7 +94,6 @@ return array(
 			'nok' => 'Não foi possível encontrar a biblioteca necessária para parse o XML.',
 			'ok' => 'Você tem a biblioteca necessária para parse o XML.',
 		),
-		'reload' => 'Verifique novamente',
 	),
 	'conf' => array(
 		'_' => 'Configurações gerais',
@@ -101,7 +101,6 @@ return array(
 	),
 	'congratulations' => 'Parabéns!',
 	'default_user' => 'Usuário do usuário padrão <small>(máximo de 16 caracteres alfanuméricos)</small>',
-	'delete_articles_after' => 'Remover artigos depois',
 	'fix_errors_before' => 'Por favor solucione os erros antes de ir para o próximo passo.',
 	'javascript_is_better' => 'O FreshRSS é mais agradável com o JavaScript ativo',
 	'js' => array(
diff --git a/app/i18n/pt-br/sub.php b/app/i18n/pt-br/sub.php
index 0ef4b134d..35f5f8db8 100644
--- a/app/i18n/pt-br/sub.php
+++ b/app/i18n/pt-br/sub.php
@@ -13,7 +13,6 @@ return array(
 	),
 	'category' => array(
 		'_' => 'Categoria',
-		'add' => 'Adicionar uma categoria',
 		'archiving' => 'Arquivar',
 		'empty' => 'Categoria vazia',
 		'information' => 'Informações',
@@ -110,8 +109,6 @@ return array(
 	),
 	'menu' => array(
 		'add' => 'Add a feed or category',	// TODO - Translation
-		'add_feed' => 'Add a feed',	// TODO - Translation
-		'bookmark' => 'Inscreva-se (FreshRSS favoritos)',
 		'import_export' => 'Importar / exportar',
 		'label_management' => 'Label management',	// TODO - Translation
 		'subscription_management' => 'Gerenciamento de inscrições',
diff --git a/app/i18n/pt-br/user.php b/app/i18n/pt-br/user.php
index accbaf4ac..f87e5d64b 100644
--- a/app/i18n/pt-br/user.php
+++ b/app/i18n/pt-br/user.php
@@ -14,7 +14,7 @@ return array(
 				'email_sent' => 'Um email foi enviado para o seu endereço',
 				'error' => 'Falha na verificação do endereço de email',
 				'ok' => 'O endereço de email foi verificado com sucesso.',
-				'unneccessary' => 'Esse endereço de email já foi verificado.',
+				'unnecessary' => 'Esse endereço de email já foi verificado.',
 				'wrong_token' => 'A verificação do endereço de email falhou por causa do token incorreto.',
 			),
 			'need_to' => 'Para poder utilizar o %s, você deve verificar seu endereço de email.',
diff --git a/app/i18n/ru/admin.php b/app/i18n/ru/admin.php
index dd0187695..bea2a797d 100644
--- a/app/i18n/ru/admin.php
+++ b/app/i18n/ru/admin.php
@@ -9,7 +9,6 @@ return array(
 		'http' => 'HTTP (для опытных пользователей с HTTPS)',
 		'none' => 'Без аутентификации (небезопасно)',
 		'title' => 'Аутентификации',
-		'title_reset' => 'Сброс аутентицикации',
 		'token' => 'Токен аутентификации',
 		'token_help' => 'Разрешает доступ к RSS-лентам пользователя по умолчанию без аутентификации:',
 		'type' => 'Способ аутентификации',
@@ -180,11 +179,9 @@ return array(
 	'user' => array(
 		'admin' => 'Администратор',
 		'article_count' => 'Статей',
-		'articles_and_size' => '%s статей (%s)',
 		'back_to_manage' => '← Вернуться к списку пользователей',
 		'create' => 'Создать нового пользователя',
 		'database_size' => 'Размер базы данных',
-		'delete_users' => 'Удалить пользователя',
 		'email' => 'Адрес электронной почты',
 		'enabled' => 'Включён',
 		'feed_count' => 'Лент',
@@ -196,11 +193,7 @@ return array(
 		'numbers' => 'Имеется %d созданных аккаунтов',
 		'password_form' => 'Пароль<br /><small>(для входа через веб-форму)</small>',
 		'password_format' => 'Не менее 7 символов',
-		'selected' => 'Выбранный пользователь',
 		'title' => 'Управление пользователями',
-		'update_users' => 'Изменить пользователя',
-		'user_list' => 'Список пользователей',
 		'username' => 'Имя пользователя',
-		'users' => 'Пользователи',
 	),
 );
diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php
index b4bbd658a..9772c39ed 100644
--- a/app/i18n/ru/conf.php
+++ b/app/i18n/ru/conf.php
@@ -3,7 +3,6 @@
 return array(
 	'archiving' => array(
 		'_' => 'Архивирование',
-		'delete_after' => 'Удалять статьи после',
 		'exception' => 'Исключения при очистке',
 		'help' => 'В индивидуальных настройках лент есть больше опций',
 		'keep_favourites' => 'Никогда не удалять избранное',
@@ -25,12 +24,12 @@ return array(
 		'_' => 'Отображение',
 		'icon' => array(
 			'bottom_line' => 'Нижняя линия',
-			'summary' => 'Summary', // TODO - Translation
 			'display_authors' => 'Авторы',
 			'entry' => 'Иконки статей',
 			'publication_date' => 'Дата публикации',
 			'related_tags' => 'Связанные метки',
 			'sharing' => 'Поделиться',
+			'summary' => 'Summary',	// TODO - Translation
 			'top_line' => 'Верхняя линия',
 		),
 		'language' => 'Язык',
@@ -40,6 +39,13 @@ return array(
 		),
 		'show_nav_buttons' => 'Показать кнопки навигации',
 		'theme' => 'Тема',
+		'thumbnail' => array(
+			'label' => 'Thumbnail',	// TODO - Translation
+			'landscape' => 'Landscape',	// TODO - Translation
+			'none' => 'None',	// TODO - Translation
+			'portrait' => 'Portrait',	// TODO - Translation
+			'square' => 'Square',	// TODO - Translation
+		),
 		'title' => 'Отображение',
 		'width' => array(
 			'content' => 'Ширина содержимого',
@@ -48,13 +54,6 @@ return array(
 			'no_limit' => 'Во всю ширину',
 			'thin' => 'Узкое',
 		),
-		'thumbnail' => array(
-			'label' => 'Thumbnail', // TODO - Translation
-			'none' => 'None', // TODO - Translation
-			'portrait' => 'Portrait', // TODO - Translation
-			'square' => 'Square', // TODO - Translation
-			'landscape' => 'Landscape', // TODO - Translation
-		),
 	),
 	'profile' => array(
 		'_' => 'Настройки профиля',
@@ -72,7 +71,6 @@ return array(
 	'query' => array(
 		'_' => 'Пользовательские запросы',
 		'deprecated' => 'Этот запрос больше не действителен. Связанная категория или лента была удалена.',
-		'display' => 'Показать результаты пользовательского запроса',
 		'filter' => array(
 			'_' => 'Применённые фильтры:',
 			'categories' => 'Отображение по категории',
@@ -87,14 +85,11 @@ return array(
 		'get_category' => 'Показать категорию "%s"',
 		'get_favorite' => 'Показать избранные статьи',
 		'get_feed' => 'Показать ленту "%s"',
-		'get_tag' => 'Показать метку "%s"',
 		'name' => 'Название',
 		'no_filter' => 'Нет фильтров',
-		'none' => 'Вы ещё не создавали пользовательские запросы.',
 		'number' => 'Запрос №%d',
 		'order_asc' => 'Показывать сначала старые статьи',
 		'order_desc' => 'Показывать сначала новые статьи',
-		'remove' => 'Удалить пользовательский запрос',
 		'search' => 'Искать "%s"',
 		'state_0' => 'Показать все статьи',
 		'state_1' => 'Показать прочитанные статьи',
@@ -165,20 +160,20 @@ return array(
 	'sharing' => array(
 		'_' => 'Поделиться',
 		'add' => 'Добавить способ поделиться',
-		'blogotext' => 'Blogotext',	// TODO - Translation
-		'diaspora' => 'Diaspora*',	// TODO - Translation
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
 		'email' => 'Электронная почта',
-		'facebook' => 'Facebook',	// TODO - Translation
+		'facebook' => 'Facebook',
 		'more_information' => 'Больше информации',
 		'print' => 'Распечатать',
 		'raindrop' => 'Raindrop.io',
 		'remove' => 'Удалить способ поделиться',
-		'shaarli' => 'Shaarli',	// TODO - Translation
+		'shaarli' => 'Shaarli',
 		'share_name' => 'Отображаемое имя',
 		'share_url' => 'Используемый URL',
 		'title' => 'Sharing',	// TODO - Translation
-		'twitter' => 'Twitter',	// TODO - Translation
-		'wallabag' => 'wallabag',	// TODO - Translation
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
 	),
 	'shortcut' => array(
 		'_' => 'Горячие клавиши',
diff --git a/app/i18n/ru/feedback.php b/app/i18n/ru/feedback.php
index 0200e1346..dfccba0c8 100644
--- a/app/i18n/ru/feedback.php
+++ b/app/i18n/ru/feedback.php
@@ -15,10 +15,6 @@ return array(
 		),
 	),
 	'auth' => array(
-		'form' => array(
-			'not_set' => 'Во время конфигурации системы аутентификации возникла проблема. Пожалуйста, попробуйте позже.',
-			'set' => 'Форма теперь является вашей системой аутентификации по умолчанию.',
-		),
 		'login' => array(
 			'invalid' => 'Неверный логин',
 			'success' => 'Вы вошли',
@@ -26,7 +22,6 @@ return array(
 		'logout' => array(
 			'success' => 'Вы вышли',
 		),
-		'no_password_set' => 'Не установлен пароль администратора. Эта функция недоступна.',
 	),
 	'conf' => array(
 		'error' => 'Во время сохранения конфигурации возникла ошибка',
diff --git a/app/i18n/ru/gen.php b/app/i18n/ru/gen.php
index 6c4b536b9..31026920c 100644
--- a/app/i18n/ru/gen.php
+++ b/app/i18n/ru/gen.php
@@ -43,10 +43,8 @@ return array(
 			'ask' => 'Создать аккаунт?',
 			'title' => 'Создание аккаунта',
 		),
-		'reset' => 'Сброс аутентификации',
 		'username' => array(
 			'_' => 'Имя пользователя',
-			'admin' => 'Имя пользователя администратора',
 			'format' => '<small>Не более 16 буквенно-цифровых символов</small>',
 		),
 	),
@@ -185,25 +183,25 @@ return array(
 	),
 	'share' => array(
 		'Known' => 'Сайты на Known',
-		'blogotext' => 'Blogotext',	// TODO - Translation
+		'blogotext' => 'Blogotext',
 		'clipboard' => 'Буфер обмена',
-		'diaspora' => 'Diaspora*',	// TODO - Translation
+		'diaspora' => 'Diaspora*',
 		'email' => 'Электронная почта',
-		'facebook' => 'Facebook',	// TODO - Translation
-		'gnusocial' => 'GNU social',	// TODO - Translation
-		'jdh' => 'Journal du hacker',	// TODO - Translation
-		'lemmy' => 'Lemmy',	// TODO - Translation
-		'linkedin' => 'LinkedIn',	// TODO - Translation
-		'mastodon' => 'Mastodon',	// TODO - Translation
-		'movim' => 'Movim',	// TODO - Translation
-		'pinboard' => 'Pinboard',	// TODO - Translation
-		'pocket' => 'Pocket',	// TODO - Translation
+		'facebook' => 'Facebook',
+		'gnusocial' => 'GNU social',
+		'jdh' => 'Journal du hacker',
+		'lemmy' => 'Lemmy',
+		'linkedin' => 'LinkedIn',
+		'mastodon' => 'Mastodon',
+		'movim' => 'Movim',
+		'pinboard' => 'Pinboard',
+		'pocket' => 'Pocket',
 		'print' => 'Распечатать',
 		'raindrop' => 'Raindrop.io',
-		'shaarli' => 'Shaarli',	// TODO - Translation
-		'twitter' => 'Twitter',	// TODO - Translation
-		'wallabag' => 'wallabag v1',	// TODO - Translation
-		'wallabagv2' => 'wallabag v2',	// TODO - Translation
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag v1',
+		'wallabagv2' => 'wallabag v2',
 	),
 	'short' => array(
 		'attention' => 'Предупреждение!',
diff --git a/app/i18n/ru/index.php b/app/i18n/ru/index.php
index df154d671..8544ad65f 100644
--- a/app/i18n/ru/index.php
+++ b/app/i18n/ru/index.php
@@ -3,7 +3,7 @@
 return array(
 	'about' => array(
 		'_' => 'О проекте',
-		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',	// TODO - Translation
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
 		'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> создан <a href="https://fonts.google.com/specimen/Open+Sans">Стивом Мэттесоном</a>. FreshRSS основан на <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, PHP-фреймворке.',
@@ -13,7 +13,6 @@ return array(
 		'project_website' => 'Сайт проекта',
 		'title' => 'О проекте',
 		'version' => 'Версия',
-		'website' => 'Сайт',
 	),
 	'feed' => array(
 		'add' => 'Вы можете добавить ленты.',
diff --git a/app/i18n/ru/install.php b/app/i18n/ru/install.php
index 6570aff96..239ba12e2 100644
--- a/app/i18n/ru/install.php
+++ b/app/i18n/ru/install.php
@@ -80,6 +80,7 @@ return array(
 			'nok' => 'У вас установлен PHP версии %s, но FreshRSS необходима версия не ниже %s.',
 			'ok' => 'У вас установлен PHP версии %s, который совместим с FreshRSS.',
 		),
+		'reload' => 'Проверьте еще раз',
 		'tmp' => array(
 			'nok' => 'Проверьте права доступа к папке <em>%s</em> . Веб-сервер должен иметь право на запись в эту папку.',
 			'ok' => 'Права на папку temp в порядке.',
@@ -93,7 +94,6 @@ return array(
 			'nok' => 'У вас нет необходимой библиотеки для разбора XML.',
 			'ok' => 'У вас установлена необходимая библиотека для разбора XML.',
 		),
-		'reload' => 'Проверьте еще раз',
 	),
 	'conf' => array(
 		'_' => 'Общие настройки',
@@ -101,7 +101,6 @@ return array(
 	),
 	'congratulations' => 'Поздравляем!',
 	'default_user' => 'Имя пользователя по умолчанию <small>(не более 16 буквенно-цифровых символов)</small>',
-	'delete_articles_after' => 'Удалять статьи после',
 	'fix_errors_before' => 'Пожалуйста, исправьте ошибки, прежде чем перейти к следующему шагу.',
 	'javascript_is_better' => 'Пользоваться FreshRSS приятнее с включённым JavaScript',
 	'js' => array(
diff --git a/app/i18n/ru/sub.php b/app/i18n/ru/sub.php
index 2a5b240e8..664247bac 100644
--- a/app/i18n/ru/sub.php
+++ b/app/i18n/ru/sub.php
@@ -13,7 +13,6 @@ return array(
 	),
 	'category' => array(
 		'_' => 'Категория',
-		'add' => 'Добавить категорию',
 		'archiving' => 'Архивирование',
 		'empty' => 'Пустая категория',
 		'information' => 'Информация',
@@ -110,8 +109,6 @@ return array(
 	),
 	'menu' => array(
 		'add' => 'Добавить ленту или категорию',
-		'add_feed' => 'Добавить ленту',
-		'bookmark' => 'Подписаться (закладка FreshRSS)',
 		'import_export' => 'Импорт / экспорт',
 		'label_management' => 'Управление метками',
 		'subscription_management' => 'Управление подписками',
diff --git a/app/i18n/ru/user.php b/app/i18n/ru/user.php
index 69be69de5..efe75762f 100644
--- a/app/i18n/ru/user.php
+++ b/app/i18n/ru/user.php
@@ -14,7 +14,7 @@ return array(
 				'email_sent' => 'Письмо отправлено на ваш адрес электронной почты.',
 				'error' => 'Не удалось подтвердить адрес электронной почты.',
 				'ok' => 'Адрес электронной почты подтверждён.',
-				'unneccessary' => 'Этот адрес электронной почты уже подтверждён.',
+				'unnecessary' => 'Этот адрес электронной почты уже подтверждён.',
 				'wrong_token' => 'Не удалось подтвердить этот адрес электронной почты из-за неверного токена.',
 			),
 			'need_to' => 'Вам необходимо подтвердить адрес электронной почты, прежде чем вы сможете пользоваться %s.',
diff --git a/app/i18n/sk/admin.php b/app/i18n/sk/admin.php
index 9c5ee4bcd..174a654a6 100644
--- a/app/i18n/sk/admin.php
+++ b/app/i18n/sk/admin.php
@@ -9,7 +9,6 @@ return array(
 		'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',
@@ -180,11 +179,9 @@ return array(
 	'user' => array(
 		'admin' => 'Administrator',	// TODO - Translation
 		'article_count' => 'Articles',	// TODO - Translation
-		'articles_and_size' => '%s článkov (%s)',
 		'back_to_manage' => '← Return to user list',	// TODO - Translation
 		'create' => 'Vytvoriť nového používateľa',
 		'database_size' => 'Database size',	// TODO - Translation
-		'delete_users' => 'Zmazať používateľa',
 		'email' => 'Email address',	// TODO - Translation
 		'enabled' => 'Enabled',	// TODO - Translation
 		'feed_count' => 'Feeds',	// TODO - Translation
@@ -196,11 +193,7 @@ return array(
 		'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
index 1bd41da97..e6b7d5b06 100644
--- a/app/i18n/sk/conf.php
+++ b/app/i18n/sk/conf.php
@@ -3,7 +3,6 @@
 return array(
 	'archiving' => array(
 		'_' => 'Archivovanie',
-		'delete_after' => 'Vymazať články po',
 		'exception' => 'Purge exception',	// TODO - Translation
 		'help' => 'Viac možností nájdete v nastaveniach kanála',
 		'keep_favourites' => 'Never delete favourites',	// TODO - Translation
@@ -25,12 +24,12 @@ return array(
 		'_' => 'Zobrazenie',
 		'icon' => array(
 			'bottom_line' => 'Spodný riadok',
-			'summary' => 'Summary', // TODO - Translation
 			'display_authors' => 'Autori',
 			'entry' => 'Ikony článku',
 			'publication_date' => 'Dátum zverejnenia',
 			'related_tags' => 'Značky článku',
 			'sharing' => 'Zdieľanie',
+			'summary' => 'Summary',	// TODO - Translation
 			'top_line' => 'Horný riadok',
 		),
 		'language' => 'Jazyk',
@@ -40,6 +39,13 @@ return array(
 		),
 		'show_nav_buttons' => 'Zobraziť tlačidlá oznámenia',
 		'theme' => 'Vzhľad',
+		'thumbnail' => array(
+			'label' => 'Thumbnail',	// TODO - Translation
+			'landscape' => 'Landscape',	// TODO - Translation
+			'none' => 'None',	// TODO - Translation
+			'portrait' => 'Portrait',	// TODO - Translation
+			'square' => 'Square',	// TODO - Translation
+		),
 		'title' => 'Zobraziť',
 		'width' => array(
 			'content' => 'Šírka obsahu',
@@ -48,13 +54,6 @@ return array(
 			'no_limit' => 'Bez obmedzenia',
 			'thin' => 'Úzka',
 		),
-		'thumbnail' => array(
-			'label' => 'Thumbnail', // TODO - Translation
-			'none' => 'None', // TODO - Translation
-			'portrait' => 'Portrait', // TODO - Translation
-			'square' => 'Square', // TODO - Translation
-			'landscape' => 'Landscape', // TODO - Translation
-		),
 	),
 	'profile' => array(
 		'_' => 'Správca profilu',
@@ -72,7 +71,6 @@ return array(
 	'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' => array(
 			'_' => 'Použitý filter:',
 			'categories' => 'Display by category',	// TODO - Translation
@@ -87,14 +85,11 @@ return array(
 		'get_category' => 'Zobraziť kategóriu "%s"',
 		'get_favorite' => 'Zobraziť obľúbené články',
 		'get_feed' => 'Zobraziť kanál "%s"',
-		'get_tag' => 'Display "%s" label',	// TODO - Translation
 		'name' => 'Name',	// TODO - Translation
 		'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',
diff --git a/app/i18n/sk/feedback.php b/app/i18n/sk/feedback.php
index e14b6b01d..6eeaa929e 100644
--- a/app/i18n/sk/feedback.php
+++ b/app/i18n/sk/feedback.php
@@ -15,10 +15,6 @@ return array(
 		),
 	),
 	'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',
@@ -26,7 +22,6 @@ return array(
 		'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í',
diff --git a/app/i18n/sk/gen.php b/app/i18n/sk/gen.php
index 3882b90fc..664da372d 100644
--- a/app/i18n/sk/gen.php
+++ b/app/i18n/sk/gen.php
@@ -43,10 +43,8 @@ return array(
 			'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>',
 		),
 	),
@@ -192,7 +190,7 @@ return array(
 		'facebook' => 'Facebook',
 		'gnusocial' => 'GNU social',
 		'jdh' => 'Journal du hacker',
-		'lemmy' => 'Lemmy',	// TODO - Translation
+		'lemmy' => 'Lemmy',
 		'linkedin' => 'LinkedIn',
 		'mastodon' => 'Mastodon',
 		'movim' => 'Movim',
diff --git a/app/i18n/sk/index.php b/app/i18n/sk/index.php
index 7993e7c21..05101e335 100644
--- a/app/i18n/sk/index.php
+++ b/app/i18n/sk/index.php
@@ -13,7 +13,6 @@ return array(
 		'project_website' => 'Webová stránka projektu',
 		'title' => 'O FreshRSS',
 		'version' => 'Verzia',
-		'website' => 'Webová stránka',
 	),
 	'feed' => array(
 		'add' => 'Môžete pridať kanály.',
diff --git a/app/i18n/sk/install.php b/app/i18n/sk/install.php
index a026fb146..1667fa528 100644
--- a/app/i18n/sk/install.php
+++ b/app/i18n/sk/install.php
@@ -80,6 +80,7 @@ return 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.',
 		),
+		'reload' => 'Tekrar kontrol et',
 		'tmp' => array(
 			'nok' => 'Skontrolujte oprávnenia prístupu do priečinku <em>%s</em>. HTTP server musí mať právo doň zapisovať.',
 			'ok' => 'Permissions on the temp directory are good.',	// TODO - Translation
@@ -93,7 +94,6 @@ return 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.',
 		),
-		'reload' => 'Tekrar kontrol et',
 	),
 	'conf' => array(
 		'_' => 'Hlavné nastavenia',
@@ -101,7 +101,6 @@ return array(
 	),
 	'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(
diff --git a/app/i18n/sk/sub.php b/app/i18n/sk/sub.php
index 6cf4adbeb..db980c2bb 100644
--- a/app/i18n/sk/sub.php
+++ b/app/i18n/sk/sub.php
@@ -13,7 +13,6 @@ return array(
 	),
 	'category' => array(
 		'_' => 'Kategória',
-		'add' => 'Pridať kategóriu',
 		'archiving' => 'Archiving',	// TODO - Translation
 		'empty' => 'Prázdna kategória',
 		'information' => 'Informácia',
@@ -110,8 +109,6 @@ return array(
 	),
 	'menu' => array(
 		'add' => 'Add a feed or category',	// TODO - Translation
-		'add_feed' => 'Add a feed',	// TODO - Translation
-		'bookmark' => 'Odoberať (záložka FreshRSS)',
 		'import_export' => 'Import / export',
 		'label_management' => 'Label management',	// TODO - Translation
 		'subscription_management' => 'Správa odoberaných kanálov',
diff --git a/app/i18n/sk/user.php b/app/i18n/sk/user.php
index 7816efcbc..1d93a9f9a 100644
--- a/app/i18n/sk/user.php
+++ b/app/i18n/sk/user.php
@@ -14,7 +14,7 @@ return array(
 				'email_sent' => 'An email has been sent to your address.',	// TODO - Translation
 				'error' => 'Email address validation failed.',	// TODO - Translation
 				'ok' => 'This email address has been validated.',	// TODO - Translation
-				'unneccessary' => 'This email address was already validated.',	// TODO - Translation
+				'unnecessary' => 'This email address was already validated.',	// TODO - Translation
 				'wrong_token' => 'This email address failed to be validated due to a wrong token.',	// TODO - Translation
 			),
 			'need_to' => 'You need to validate your email address before being able to use %s.',	// TODO - Translation
diff --git a/app/i18n/tr/admin.php b/app/i18n/tr/admin.php
index 6d06238d2..f8745e5f8 100644
--- a/app/i18n/tr/admin.php
+++ b/app/i18n/tr/admin.php
@@ -9,7 +9,6 @@ return array(
 		'http' => 'HTTP (ileri kullanıcılar için, HTTPS)',
 		'none' => 'Hiçbiri (tehlikeli)',
 		'title' => 'Kimlik doğrulama',
-		'title_reset' => 'Kimlik doğrulama sıfırla',
 		'token' => 'Kimlik doğrulama işareti',
 		'token_help' => 'Kimlik doğrulama olmaksızın öntanımlı kullanıcının RSS çıktısına erişime izin ver:',
 		'type' => 'Kimlik doğrulama yöntemi',
@@ -180,11 +179,9 @@ return array(
 	'user' => array(
 		'admin' => 'Yönetici',
 		'article_count' => 'Makaleler',
-		'articles_and_size' => '%s makale (%s)',
 		'back_to_manage' => '← Kullanıcı listesine geri dön',
 		'create' => 'Yeni kullanıcı oluştur',
 		'database_size' => 'Veritabanı boyutu',
-		'delete_users' => 'Kuallnıcıyı sil',
 		'email' => 'Email adres',
 		'enabled' => 'Aktif',
 		'feed_count' => 'Akış',
@@ -196,11 +193,7 @@ return array(
 		'numbers' => 'Oluşturulmuş %d hesap mevcut',
 		'password_form' => 'Şifre<br /><small>(Tarayıcı girişi için)</small>',
 		'password_format' => 'En az 7 karakter',
-		'selected' => 'Seçili kullanıcı',
 		'title' => 'Kullanıcıları yönet',
-		'update_users' => 'Kullanıcıyı güncelle',
-		'user_list' => 'Kullanıcı listesi',
 		'username' => 'Kullanıcı adı',
-		'users' => 'Kullanıcılar',
 	),
 );
diff --git a/app/i18n/tr/conf.php b/app/i18n/tr/conf.php
index 6d51d4e42..3c7ca101a 100644
--- a/app/i18n/tr/conf.php
+++ b/app/i18n/tr/conf.php
@@ -3,7 +3,6 @@
 return array(
 	'archiving' => array(
 		'_' => 'Arşiv',
-		'delete_after' => 'Makelelerin tutulacağı süre',
 		'exception' => 'Temizlik ifadeleri',
 		'help' => 'Akış ayarlarında daha çok ayar bulabilirsiniz',
 		'keep_favourites' => 'Favorileri asla silme',
@@ -25,12 +24,12 @@ return array(
 		'_' => 'Görünüm',
 		'icon' => array(
 			'bottom_line' => 'Alt çizgi',
-			'summary' => 'Summary', // TODO - Translation
 			'display_authors' => 'Yazarlar',
 			'entry' => 'Makale ikonları',
 			'publication_date' => 'Yayınlama Tarihi',
 			'related_tags' => 'İlgili etiketler',
 			'sharing' => 'Paylaşım',
+			'summary' => 'Summary',	// TODO - Translation
 			'top_line' => 'Üst çizgi',
 		),
 		'language' => 'Dil',
@@ -40,6 +39,13 @@ return array(
 		),
 		'show_nav_buttons' => 'Gezinti düğmelerini göster',
 		'theme' => 'Tema',
+		'thumbnail' => array(
+			'label' => 'Thumbnail',	// TODO - Translation
+			'landscape' => 'Landscape',	// TODO - Translation
+			'none' => 'None',	// TODO - Translation
+			'portrait' => 'Portrait',	// TODO - Translation
+			'square' => 'Square',	// TODO - Translation
+		),
 		'title' => 'Görünüm',
 		'width' => array(
 			'content' => 'İçerik genişliği',
@@ -48,13 +54,6 @@ return array(
 			'no_limit' => 'Sınırsız',
 			'thin' => 'Zayıf',
 		),
-		'thumbnail' => array(
-			'label' => 'Thumbnail', // TODO - Translation
-			'none' => 'None', // TODO - Translation
-			'portrait' => 'Portrait', // TODO - Translation
-			'square' => 'Square', // TODO - Translation
-			'landscape' => 'Landscape', // TODO - Translation
-		),
 	),
 	'profile' => array(
 		'_' => 'Profil yönetimi',
@@ -72,7 +71,6 @@ return array(
 	'query' => array(
 		'_' => 'Kullanıcı sorguları',
 		'deprecated' => 'Bu sorgu artık geçerli değil. İlgili akış veya kategori silinmiş.',
-		'display' => 'Kullanıcı sorgu sonuçlarını göster',
 		'filter' => array(
 			'_' => 'Filtre uygulandı:',
 			'categories' => 'Kategoriye göre göster',
@@ -87,14 +85,11 @@ return array(
 		'get_category' => '"%s" kategorisini göster',
 		'get_favorite' => 'Favori makaleleri göster',
 		'get_feed' => '"%s" akışını göster',
-		'get_tag' => '"%s" etiketini göster',
 		'name' => 'İsim',
 		'no_filter' => 'Filtre yok',
-		'none' => 'Henüz hiç kullanıcı sorgusu oluşturmadınız.',
 		'number' => 'Sorgu n°%d',
 		'order_asc' => 'Önce eski makaleleri göster',
 		'order_desc' => 'Önce yeni makaleleri göster',
-		'remove' => 'Kullanıcı sorgusunu temizle',
 		'search' => '"%s" için arama',
 		'state_0' => 'Tüm makaleleri göster',
 		'state_1' => 'Okunmuş makaleleri göster',
diff --git a/app/i18n/tr/feedback.php b/app/i18n/tr/feedback.php
index 8f0a73fc8..8256a94b2 100644
--- a/app/i18n/tr/feedback.php
+++ b/app/i18n/tr/feedback.php
@@ -15,10 +15,6 @@ return array(
 		),
 	),
 	'auth' => array(
-		'form' => array(
-			'not_set' => 'Sistem yapılandırma kimlik doğrulaması sırasında hata oldu. Lütfen daha sonra tekrar deneyin.',
-			'set' => 'Kimlik doğrulama sistemi tamamnaldı.',
-		),
 		'login' => array(
 			'invalid' => 'Giriş geçersiz',
 			'success' => 'Bağlantı kuruldu',
@@ -26,7 +22,6 @@ return array(
 		'logout' => array(
 			'success' => 'Bağlantı koptu',
 		),
-		'no_password_set' => 'Yönetici şifresi ayarlanmadı. Bu özellik kullanıma uygun değil.',
 	),
 	'conf' => array(
 		'error' => 'Yapılandırma ayarları kaydedilirken hata oluştu',
diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php
index 0665259ac..cd99bf7ba 100644
--- a/app/i18n/tr/gen.php
+++ b/app/i18n/tr/gen.php
@@ -43,10 +43,8 @@ return array(
 			'ask' => 'Yeni bir hesap oluştur',
 			'title' => 'Hesap oluşturma',
 		),
-		'reset' => 'Kimlik doğrulama sıfırla',
 		'username' => array(
 			'_' => 'Kullancı adı',
-			'admin' => 'Yönetici kullanıcı adı',
 			'format' => '<small>En fazla 16 alfanümerik karakter</small>',
 		),
 	),
diff --git a/app/i18n/tr/index.php b/app/i18n/tr/index.php
index 0e9a9325e..eb7052ba2 100644
--- a/app/i18n/tr/index.php
+++ b/app/i18n/tr/index.php
@@ -13,7 +13,6 @@ return array(
 		'project_website' => 'Proje sayfası',
 		'title' => 'Hakkında',
 		'version' => 'Sürüm',
-		'website' => 'İnternet sitesi',
 	),
 	'feed' => array(
 		'add' => 'Akış ekleyebilirsin.',
diff --git a/app/i18n/tr/install.php b/app/i18n/tr/install.php
index 9bd925cd5..218f027b9 100644
--- a/app/i18n/tr/install.php
+++ b/app/i18n/tr/install.php
@@ -80,6 +80,7 @@ return array(
 			'nok' => 'PHP sürümünüz %s fakat FreshRSS için gerekli olan en düşük sürüm %s.',
 			'ok' => 'PHP Sürümünüz %s, FreshRSS ile tam uyumlu.',
 		),
+		'reload' => 'Check again',	// TODO - Translation
 		'tmp' => array(
 			'nok' => '<em>%s</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı.',
 			'ok' => 'Geçici klasör izinleri sorunsuz.',
@@ -100,7 +101,6 @@ return array(
 	),
 	'congratulations' => 'Tebrikler!',
 	'default_user' => 'Öntanımlı kullanıcı adı <small>(en fazla 16 alfanümerik karakter)</small>',
-	'delete_articles_after' => 'Makaleleri şu süre sonunda sil',
 	'fix_errors_before' => 'Lütfen sonraki adıma geçmek için hataları düzeltin.',
 	'javascript_is_better' => 'FreshRSS JavaScript ile daha işlevseldir',
 	'js' => array(
diff --git a/app/i18n/tr/sub.php b/app/i18n/tr/sub.php
index 24e467a97..4c237e186 100644
--- a/app/i18n/tr/sub.php
+++ b/app/i18n/tr/sub.php
@@ -13,7 +13,6 @@ return array(
 	),
 	'category' => array(
 		'_' => 'Kategori',
-		'add' => 'Kategori ekle',
 		'archiving' => 'Arşiv',
 		'empty' => 'Boş kategori',
 		'information' => 'Bilgi',
@@ -110,8 +109,6 @@ return array(
 	),
 	'menu' => array(
 		'add' => 'Kategori veya akış ekle',
-		'add_feed' => 'Akış ekle',
-		'bookmark' => 'Abonelik (FreshRSS yer imleri)',
 		'import_export' => 'İçe / dışa aktar',
 		'label_management' => 'Etiket yönetimi',
 		'subscription_management' => 'Abonelik yönetimi',
diff --git a/app/i18n/tr/user.php b/app/i18n/tr/user.php
index 3ee8ba19e..737a491c1 100644
--- a/app/i18n/tr/user.php
+++ b/app/i18n/tr/user.php
@@ -14,7 +14,7 @@ return array(
 				'email_sent' => 'Email adresinize posta gönderildi.',
 				'error' => 'Email adresi doğrulaması başarısız.',
 				'ok' => 'Bu email adresi doğrulandı.',
-				'unneccessary' => 'Bu email adresi zaten doğrulandı.',
+				'unnecessary' => 'Bu email adresi zaten doğrulandı.',
 				'wrong_token' => 'Email doğrulaması yanlış anahtar sebebi ile başarısız oldu.',
 			),
 			'need_to' => '%s kullanımından önce email doğrulaması yapmalısınız.',
diff --git a/app/i18n/zh-cn/admin.php b/app/i18n/zh-cn/admin.php
index 737c968de..1535a01f2 100644
--- a/app/i18n/zh-cn/admin.php
+++ b/app/i18n/zh-cn/admin.php
@@ -9,7 +9,6 @@ return array(
 		'http' => 'HTTP（面向启用 HTTPS 的高级用户)',
 		'none' => '无认证（危险）',
 		'title' => '认证',
-		'title_reset' => '密码重置',
 		'token' => '认证口令',
 		'token_help' => '用于不经认证访问默认用户的 RSS 输出：',
 		'type' => '认证方式',
@@ -180,11 +179,9 @@ return array(
 	'user' => array(
 		'admin' => '管理员',
 		'article_count' => '文章数',
-		'articles_and_size' => '%s 篇文章（%s)',
 		'back_to_manage' => '← 返回用户列表',
 		'create' => '创建新用户',
 		'database_size' => '数据库大小',
-		'delete_users' => '删除用户',
 		'email' => '邮箱地址',
 		'enabled' => '已启用',
 		'feed_count' => '订阅源数',
@@ -196,11 +193,7 @@ return array(
 		'numbers' => '已有 %d 个用户',
 		'password_form' => '密码<br /><small>（用于网页表单登录方式）</small>',
 		'password_format' => '至少 7 个字符',
-		'selected' => '已选中用户',
 		'title' => '用户管理',
-		'update_users' => '更新用户',
-		'user_list' => '用户列表',
 		'username' => '用户名',
-		'users' => '用户',
 	),
 );
diff --git a/app/i18n/zh-cn/conf.php b/app/i18n/zh-cn/conf.php
index 75df77a45..6c95b1576 100644
--- a/app/i18n/zh-cn/conf.php
+++ b/app/i18n/zh-cn/conf.php
@@ -3,7 +3,6 @@
 return array(
 	'archiving' => array(
 		'_' => '归档',
-		'delete_after' => '文章保留',
 		'exception' => '清理例外策略',
 		'help' => '具体选项位于各订阅源的设置',
 		'keep_favourites' => '不清理已收藏的文章',
@@ -25,12 +24,12 @@ return array(
 		'_' => '显示',
 		'icon' => array(
 			'bottom_line' => '底栏',
-			'summary' => 'Summary', // TODO - Translation
 			'display_authors' => '作者',
 			'entry' => '文章图标',
 			'publication_date' => '更新日期',
 			'related_tags' => '相关标签',
 			'sharing' => '分享',
+			'summary' => 'Summary',	// TODO - Translation
 			'top_line' => '顶栏',
 		),
 		'language' => '语言',
@@ -40,6 +39,13 @@ return array(
 		),
 		'show_nav_buttons' => '显示导航按钮',
 		'theme' => '主题',
+		'thumbnail' => array(
+			'label' => 'Thumbnail',	// TODO - Translation
+			'landscape' => 'Landscape',	// TODO - Translation
+			'none' => 'None',	// TODO - Translation
+			'portrait' => 'Portrait',	// TODO - Translation
+			'square' => 'Square',	// TODO - Translation
+		),
 		'title' => '显示',
 		'width' => array(
 			'content' => '内容宽度',
@@ -48,13 +54,6 @@ return array(
 			'no_limit' => '无限制',
 			'thin' => '窄',
 		),
-		'thumbnail' => array(
-			'label' => 'Thumbnail', // TODO - Translation
-			'none' => 'None', // TODO - Translation
-			'portrait' => 'Portrait', // TODO - Translation
-			'square' => 'Square', // TODO - Translation
-			'landscape' => 'Landscape', // TODO - Translation
-		),
 	),
 	'profile' => array(
 		'_' => '用户管理',
@@ -72,7 +71,6 @@ return array(
 	'query' => array(
 		'_' => '自定义查询',
 		'deprecated' => '此查询不再有效。相关的分类或订阅源已被删除。',
-		'display' => '显示查询结果',
 		'filter' => array(
 			'_' => '生效的过滤器：',
 			'categories' => '按分类显示',
@@ -87,14 +85,11 @@ return array(
 		'get_category' => '显示分类 "%s"',
 		'get_favorite' => '显示收藏文章',
 		'get_feed' => '显示订阅源 "%s"',
-		'get_tag' => '显示标签 "%s"',
 		'name' => '名称',
 		'no_filter' => '无过滤器',
-		'none' => '你未创建任何自定义查询。',
 		'number' => '查询 n°%d',
 		'order_asc' => '由旧至新显示文章',
 		'order_desc' => '由新至旧显示文章',
-		'remove' => '删除查询',
 		'search' => '搜索 "%s"',
 		'state_0' => '显示所有文章',
 		'state_1' => '显示已读文章',
diff --git a/app/i18n/zh-cn/feedback.php b/app/i18n/zh-cn/feedback.php
index 4a4ebdd56..09b824c81 100644
--- a/app/i18n/zh-cn/feedback.php
+++ b/app/i18n/zh-cn/feedback.php
@@ -15,10 +15,6 @@ return array(
 		),
 	),
 	'auth' => array(
-		'form' => array(
-			'not_set' => '配置认证方式时出错，请稍后重试。',
-			'set' => '网页表单是你当前默认的认证方式。',
-		),
 		'login' => array(
 			'invalid' => '用户名或密码无效',
 			'success' => '登录成功',
@@ -26,7 +22,6 @@ return array(
 		'logout' => array(
 			'success' => '登出成功',
 		),
-		'no_password_set' => '管理员密码尚未设置。此特性不可用。',
 	),
 	'conf' => array(
 		'error' => '保存配置时出错',
diff --git a/app/i18n/zh-cn/gen.php b/app/i18n/zh-cn/gen.php
index 936183d01..61c207de1 100644
--- a/app/i18n/zh-cn/gen.php
+++ b/app/i18n/zh-cn/gen.php
@@ -43,10 +43,8 @@ return array(
 			'ask' => '创建新用户？',
 			'title' => '用户创建',
 		),
-		'reset' => '密码重置',
 		'username' => array(
 			'_' => '用户名',
-			'admin' => '管理员用户名',
 			'format' => '<small>最多 16 个数字或字母</small>',
 		),
 	),
diff --git a/app/i18n/zh-cn/index.php b/app/i18n/zh-cn/index.php
index 5be230aa8..f8c15ef2e 100644
--- a/app/i18n/zh-cn/index.php
+++ b/app/i18n/zh-cn/index.php
@@ -13,7 +13,6 @@ return array(
 		'project_website' => '项目网站',
 		'title' => '关于',
 		'version' => '版本',
-		'website' => '网站',
 	),
 	'feed' => array(
 		'add' => '你可以添加一些订阅源。',
diff --git a/app/i18n/zh-cn/install.php b/app/i18n/zh-cn/install.php
index 80cb34421..69bee655b 100644
--- a/app/i18n/zh-cn/install.php
+++ b/app/i18n/zh-cn/install.php
@@ -80,6 +80,7 @@ return array(
 			'nok' => '你的 PHP 版本为 %s，但 FreshRSS 最低需要 %s',
 			'ok' => '你的 PHP 版本为 %s，与 FreshRSS 兼容',
 		),
+		'reload' => '再检查一遍',
 		'tmp' => array(
 			'nok' => '请检查 <em>%s</em> 目录权限。HTTP 服务器必须有其写入权限。',
 			'ok' => '缓存目录权限正常。',
@@ -93,7 +94,6 @@ return array(
 			'nok' => '找不到用于 XML 解析库',
 			'ok' => '已找到 XML 解析库',
 		),
-		'reload' => '再检查一遍',
 	),
 	'conf' => array(
 		'_' => '常规配置',
@@ -101,7 +101,6 @@ return array(
 	),
 	'congratulations' => '恭喜！',
 	'default_user' => '默认用户名 <small>(最多 16 个数字或字母)</small>',
-	'delete_articles_after' => '保留文章',
 	'fix_errors_before' => '请在继续下一步前修复错误',
 	'javascript_is_better' => '启用 JavaScript 会使 FreshRSS 工作得更好',
 	'js' => array(
diff --git a/app/i18n/zh-cn/sub.php b/app/i18n/zh-cn/sub.php
index c44029408..68a1fc5be 100644
--- a/app/i18n/zh-cn/sub.php
+++ b/app/i18n/zh-cn/sub.php
@@ -13,7 +13,6 @@ return array(
 	),
 	'category' => array(
 		'_' => '分类',
-		'add' => '添加分类',
 		'archiving' => '归档',
 		'empty' => '空分类',
 		'information' => '信息',
@@ -110,8 +109,6 @@ return array(
 	),
 	'menu' => array(
 		'add' => '添加订阅源或分类',
-		'add_feed' => '添加订阅源',
-		'bookmark' => '订阅（FreshRSS 书签）',
 		'import_export' => '导入/导出',
 		'label_management' => '标签管理',
 		'subscription_management' => '订阅管理',
diff --git a/app/i18n/zh-cn/user.php b/app/i18n/zh-cn/user.php
index 8dd9bae94..6b2eefe31 100644
--- a/app/i18n/zh-cn/user.php
+++ b/app/i18n/zh-cn/user.php
@@ -14,7 +14,7 @@ return array(
 				'email_sent' => '邮件已发送到您的邮箱中',
 				'error' => '邮箱地址无法通过验证',
 				'ok' => '邮箱地址已成功通过验证',
-				'unneccessary' => '该邮箱地址已被验证',
+				'unnecessary' => '该邮箱地址已被验证',
 				'wrong_token' => '由于令牌错误，邮箱地址无法通过验证。',
 			),
 			'need_to' => '您需要先验证邮箱地址才能使用 %s',