Change confusing naming for label (#3446)

Before, labels were referred to as tag which was confusing since
tags are content generated (retrieved from the feed) and label
are user generated.
Now, labels are properly named in their management page.

See #3444

21 files changed, 85 insertions, 81 deletions

diff --git a/app/i18n/cz/sub.php b/app/i18n/cz/sub.php
index eb1fa7607..c0926ebba 100644
--- a/app/i18n/cz/sub.php
+++ b/app/i18n/cz/sub.php
@@ -110,9 +110,9 @@ return array(
 		'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í',
 		'subscription_tools' => 'Subscription tools',	// TODO - Translation
-		'tag_management' => 'Tag management',	// TODO - Translation
 	),
 	'tag' => array(
 		'name' => 'Name',	// TODO - Translation
@@ -124,10 +124,10 @@ return array(
 		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
-		'add_tag' => 'Add a tag',	// TODO - Translation
-		'delete_tag' => 'Delete a tag',	// TODO - Translation
+		'add_label' => 'Add a label',	// TODO - Translation
+		'delete_label' => 'Delete a label',	// TODO - Translation
 		'feed_management' => 'Správa RSS kanálů',
-		'rename_tag' => 'Rename a tag',	// TODO - Translation
+		'rename_label' => 'Rename a label',	// TODO - Translation
 		'subscription_tools' => 'Subscription tools',	// TODO - Translation
 	),
 );
diff --git a/app/i18n/de/index.php b/app/i18n/de/index.php
index 945d8a72c..57dcae562 100644
--- a/app/i18n/de/index.php
+++ b/app/i18n/de/index.php
@@ -53,7 +53,7 @@ return array(
 		'starred' => 'Nur Favoriten zeigen',
 		'stats' => 'Statistiken',
 		'subscription' => 'Abonnementverwaltung',
-		'tags' => 'Meine Tags',
+		'tags' => 'Meine Labels',
 		'unread' => 'Nur ungelesene zeigen',
 	),
 	'share' => 'Teilen',
diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php
index 0adc6de2a..99373d2c5 100644
--- a/app/i18n/de/sub.php
+++ b/app/i18n/de/sub.php
@@ -110,9 +110,9 @@ return array(
 		'add_feed' => 'Feed hinzufügen',
 		'bookmark' => 'Abonnieren (FreshRSS-Lesezeichen)',
 		'import_export' => 'Importieren / Exportieren',
+		'label_management' => 'Labelverwaltung',
 		'subscription_management' => 'Abonnementverwaltung',
 		'subscription_tools' => 'Abonnement-Tools',
-		'tag_management' => 'Tag-Verwaltung',
 	),
 	'tag' => array(
 		'name' => 'Name',
@@ -124,10 +124,10 @@ return array(
 		'add' => 'Feed oder Kategorie hinzufügen',
 		'add_category' => 'Kategorie hinzufügen',
 		'add_feed' => 'Feed hinzufügen',
-		'add_tag' => 'Tag hinzufügen',
-		'delete_tag' => 'Tag löschen',
+		'add_label' => 'Label hinzufügen',
+		'delete_label' => 'Label löschen',
 		'feed_management' => 'Verwaltung der RSS-Feeds',
-		'rename_tag' => 'Tag umbenennen',
+		'rename_label' => 'Label umbenennen',
 		'subscription_tools' => 'Abonnement-Tools',
 	),
 );
diff --git a/app/i18n/en-us/sub.php b/app/i18n/en-us/sub.php
index c8912adff..644da1c62 100644
--- a/app/i18n/en-us/sub.php
+++ b/app/i18n/en-us/sub.php
@@ -33,8 +33,8 @@ return array(
 			'username' => 'HTTP username',
 		),
 		'clear_cache' => 'Always clear cache',
-		'css_cookie' => 'Use Cookies when fetching the article content',	// TODO - Translation
-		'css_cookie_help' => 'Example: <kbd>foo=bar; gdpr_consent=true; cookie=value</kbd>',	// TODO - Translation
+		'css_cookie' => 'Use Cookies when fetching the article content',
+		'css_cookie_help' => 'Example: <kbd>foo=bar; gdpr_consent=true; cookie=value</kbd>',
 		'css_help' => 'Retrieves truncated RSS feeds (caution, requires more time!)',
 		'css_path' => 'Article CSS selector on original website',
 		'description' => 'Description',
@@ -63,8 +63,8 @@ return array(
 			'main_stream' => 'Show in main stream',
 			'normal' => 'Show in its category',
 		),
-		'proxy' => 'Set a proxy for fetching this feed',	// TODO - Translation
-		'proxy_help' => 'Select a protocol (e.g: SOCKS5) and enter the proxy address (e.g: <kbd>127.0.0.1:1080</kbd>)',	// TODO - Translation
+		'proxy' => 'Set a proxy for fetching this feed',
+		'proxy_help' => 'Select a protocol (e.g: SOCKS5) and enter the proxy address (e.g: <kbd>127.0.0.1:1080</kbd>)',
 		'selector_preview' => array(
 			'show_raw' => 'Show source code',
 			'show_rendered' => 'Show content',
@@ -110,9 +110,9 @@ return array(
 		'add_feed' => 'Add a feed',
 		'bookmark' => 'Subscribe (FreshRSS bookmark)',
 		'import_export' => 'Import / export',
+		'label_management' => 'Label management',
 		'subscription_management' => 'Subscription management',
 		'subscription_tools' => 'Subscription tools',
-		'tag_management' => 'Tag management',
 	),
 	'tag' => array(
 		'name' => 'Name',
@@ -124,10 +124,10 @@ return array(
 		'add' => 'Add a feed or category',
 		'add_category' => 'Add a category',
 		'add_feed' => 'Add a feed',
-		'add_tag' => 'Add a tag',
-		'delete_tag' => 'Delete a tag',
+		'add_label' => 'Add a label',
+		'delete_label' => 'Delete a label',
 		'feed_management' => 'RSS feeds management',
-		'rename_tag' => 'Rename a tag',
+		'rename_label' => 'Rename a label',
 		'subscription_tools' => 'Subscription tools',
 	),
 );
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index 92e88e7a1..590ad0a63 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -110,9 +110,9 @@ return array(
 		'add_feed' => 'Add a feed',
 		'bookmark' => 'Subscribe (FreshRSS bookmark)',
 		'import_export' => 'Import / export',
+		'label_management' => 'Label management',
 		'subscription_management' => 'Subscription management',
 		'subscription_tools' => 'Subscription tools',
-		'tag_management' => 'Tag management',
 	),
 	'tag' => array(
 		'name' => 'Name',
@@ -124,10 +124,10 @@ return array(
 		'add' => 'Add a feed or category',
 		'add_category' => 'Add a category',
 		'add_feed' => 'Add a feed',
-		'add_tag' => 'Add a tag',
-		'delete_tag' => 'Delete a tag',
+		'add_label' => 'Add a label',
+		'delete_label' => 'Delete a label',
 		'feed_management' => 'RSS feeds management',
-		'rename_tag' => 'Rename a tag',
+		'rename_label' => 'Rename a label',
 		'subscription_tools' => 'Subscription tools',
 	),
 );
diff --git a/app/i18n/es/sub.php b/app/i18n/es/sub.php
index 2612e5929..e89e70184 100755
--- a/app/i18n/es/sub.php
+++ b/app/i18n/es/sub.php
@@ -110,9 +110,9 @@ return array(
 		'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',
 		'subscription_tools' => 'Subscription tools',	// TODO - Translation
-		'tag_management' => 'Tag management',	// TODO - Translation
 	),
 	'tag' => array(
 		'name' => 'Name',	// TODO - Translation
@@ -124,10 +124,10 @@ return array(
 		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
-		'add_tag' => 'Add a tag',	// TODO - Translation
-		'delete_tag' => 'Delete a tag',	// TODO - Translation
+		'add_label' => 'Add a label',	// TODO - Translation
+		'delete_label' => 'Delete a label',	// TODO - Translation
 		'feed_management' => 'Administración de fuentes RSS',
-		'rename_tag' => 'Rename a tag',	// TODO - Translation
+		'rename_label' => 'Rename a label',	// TODO - Translation
 		'subscription_tools' => 'Subscription tools',	// TODO - Translation
 	),
 );
diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php
index dfb64fb32..18d35ed54 100644
--- a/app/i18n/fr/sub.php
+++ b/app/i18n/fr/sub.php
@@ -110,9 +110,9 @@ return array(
 		'add_feed' => 'Ajouter un flux',
 		'bookmark' => 'S’abonner (bookmark FreshRSS)',
 		'import_export' => 'Importer / exporter',
+		'label_management' => 'Gestion des étiquettes',
 		'subscription_management' => 'Gestion des abonnements',
 		'subscription_tools' => 'Outils d’abonnement',
-		'tag_management' => 'Gestion des étiquettes',
 	),
 	'tag' => array(
 		'name' => 'Nom',
@@ -124,10 +124,10 @@ return array(
 		'add' => 'Ajouter un flux/une catégorie',
 		'add_category' => 'Ajouter une catégorie',
 		'add_feed' => 'Ajouter un flux',
-		'add_tag' => 'Ajouter une étiquette',
-		'delete_tag' => 'Supprimer une étiquette',
+		'add_label' => 'Ajouter une étiquette',
+		'delete_label' => 'Supprimer une étiquette',
 		'feed_management' => 'Gestion des flux RSS',
-		'rename_tag' => 'Renommer une étiquette',
+		'rename_label' => 'Renommer une étiquette',
 		'subscription_tools' => 'Outils d’abonnement',
 	),
 );
diff --git a/app/i18n/he/sub.php b/app/i18n/he/sub.php
index 9893a89f8..33c511a11 100644
--- a/app/i18n/he/sub.php
+++ b/app/i18n/he/sub.php
@@ -110,9 +110,9 @@ return array(
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'bookmark' => 'הרשמה (FreshRSS סימניית)',
 		'import_export' => 'יבוא / יצוא ',
+		'label_management' => 'Label management',	// TODO - Translation
 		'subscription_management' => 'ניהול הרשמות',
 		'subscription_tools' => 'Subscription tools',	// TODO - Translation
-		'tag_management' => 'Tag management',	// TODO - Translation
 	),
 	'tag' => array(
 		'name' => 'Name',	// TODO - Translation
@@ -124,10 +124,10 @@ return array(
 		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
-		'add_tag' => 'Add a tag',	// TODO - Translation
-		'delete_tag' => 'Delete a tag',	// TODO - Translation
+		'add_label' => 'Add a label',	// TODO - Translation
+		'delete_label' => 'Delete a label',	// TODO - Translation
 		'feed_management' => 'ניהול הזנות RSS',
-		'rename_tag' => 'Rename a tag',	// TODO - Translation
+		'rename_label' => 'Rename a label',	// TODO - Translation
 		'subscription_tools' => 'Subscription tools',	// TODO - Translation
 	),
 );
diff --git a/app/i18n/it/sub.php b/app/i18n/it/sub.php
index ad1303b22..c22c912e6 100644
--- a/app/i18n/it/sub.php
+++ b/app/i18n/it/sub.php
@@ -110,9 +110,9 @@ return array(
 		'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',
 		'subscription_tools' => 'Subscription tools',	// TODO - Translation
-		'tag_management' => 'Tag management',	// TODO - Translation
 	),
 	'tag' => array(
 		'name' => 'Name',	// TODO - Translation
@@ -124,10 +124,10 @@ return array(
 		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
-		'add_tag' => 'Add a tag',	// TODO - Translation
-		'delete_tag' => 'Delete a tag',	// TODO - Translation
+		'add_label' => 'Add a label',	// TODO - Translation
+		'delete_label' => 'Delete a label',	// TODO - Translation
 		'feed_management' => 'Gestione RSS feeds',
-		'rename_tag' => 'Rename a tag',	// TODO - Translation
+		'rename_label' => 'Rename a label',	// TODO - Translation
 		'subscription_tools' => 'Subscription tools',	// TODO - Translation
 	),
 );
diff --git a/app/i18n/kr/sub.php b/app/i18n/kr/sub.php
index 73ca3ff2f..4a6023630 100644
--- a/app/i18n/kr/sub.php
+++ b/app/i18n/kr/sub.php
@@ -110,9 +110,9 @@ return array(
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'bookmark' => '구독하기 (FreshRSS 북마클릿)',
 		'import_export' => '불러오기 / 내보내기',
+		'label_management' => 'Label management',	// TODO - Translation
 		'subscription_management' => '구독 관리',
 		'subscription_tools' => '구독 도구',
-		'tag_management' => 'Tag management',	// TODO - Translation
 	),
 	'tag' => array(
 		'name' => 'Name',	// TODO - Translation
@@ -124,10 +124,10 @@ return array(
 		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
-		'add_tag' => 'Add a tag',	// TODO - Translation
-		'delete_tag' => 'Delete a tag',	// TODO - Translation
+		'add_label' => 'Add a label',	// TODO - Translation
+		'delete_label' => 'Delete a label',	// TODO - Translation
 		'feed_management' => 'RSS 피드 관리',
-		'rename_tag' => 'Rename a tag',	// TODO - Translation
+		'rename_label' => 'Rename a label',	// TODO - Translation
 		'subscription_tools' => '구독 도구',
 	),
 );
diff --git a/app/i18n/nl/sub.php b/app/i18n/nl/sub.php
index 5ab275db4..88ee4c98b 100644
--- a/app/i18n/nl/sub.php
+++ b/app/i18n/nl/sub.php
@@ -110,9 +110,9 @@ return array(
 		'add_feed' => 'Feed toevoegen',
 		'bookmark' => 'Abonneer (FreshRSS bladwijzer)',
 		'import_export' => 'Importeer / exporteer',
+		'label_management' => 'Label management',	// TODO - Translation
 		'subscription_management' => 'Abonnementenbeheer',
 		'subscription_tools' => 'Hulpmiddelen voor abonnementen',
-		'tag_management' => 'Tag management',	// TODO - Translation
 	),
 	'tag' => array(
 		'name' => 'Name',	// TODO - Translation
@@ -124,10 +124,10 @@ return array(
 		'add' => 'Feed of categorie toevoegen',
 		'add_category' => 'Categorie toevoegen',
 		'add_feed' => 'Feed toevoegen',
-		'add_tag' => 'Add a tag',	// TODO - Translation
-		'delete_tag' => 'Delete a tag',	// TODO - Translation
+		'add_label' => 'Add a label',	// TODO - Translation
+		'delete_label' => 'Delete a label',	// TODO - Translation
 		'feed_management' => 'RSS-feedbeheer',
-		'rename_tag' => 'Rename a tag',	// TODO - Translation
+		'rename_label' => 'Rename a label',	// TODO - Translation
 		'subscription_tools' => 'Hulpmiddelen voor abonnementen',
 	),
 );
diff --git a/app/i18n/oc/sub.php b/app/i18n/oc/sub.php
index afd43d592..39cf09a7e 100644
--- a/app/i18n/oc/sub.php
+++ b/app/i18n/oc/sub.php
@@ -110,9 +110,9 @@ return array(
 		'add_feed' => 'Ajustar un flux',
 		'bookmark' => 'Sabonar (marcapagina FreshRSS)',
 		'import_export' => 'Importar / Exportar',
+		'label_management' => 'Gestion de las etiquetas',
 		'subscription_management' => 'Gestion dels abonaments',
 		'subscription_tools' => 'Aisinas d’abonament',
-		'tag_management' => 'Gestion de las etiquetas',
 	),
 	'tag' => array(
 		'name' => 'Nom',
@@ -124,10 +124,10 @@ return array(
 		'add' => 'Apondon de flux o categoria',
 		'add_category' => 'Ajustar una categoria',
 		'add_feed' => 'Ajustar un flux',
-		'add_tag' => 'Ajustar una etiqueta',
-		'delete_tag' => 'Suprimir una etiqueta',
+		'add_label' => 'Ajustar una etiqueta',
+		'delete_label' => 'Suprimir una etiqueta',
 		'feed_management' => 'Gestion dels fluxes RSS',
-		'rename_tag' => 'Rennomenar una etiqueta',
+		'rename_label' => 'Rennomenar una etiqueta',
 		'subscription_tools' => 'Aisinas d’abonament',
 	),
 );
diff --git a/app/i18n/pl/sub.php b/app/i18n/pl/sub.php
index 4817f990c..b6dab5203 100644
--- a/app/i18n/pl/sub.php
+++ b/app/i18n/pl/sub.php
@@ -110,9 +110,9 @@ return array(
 		'add_feed' => 'Dodaj kanał',
 		'bookmark' => 'Subscribe (FreshRSS bookmark)',	// TODO - Translation
 		'import_export' => 'Import / eksport',
+		'label_management' => 'Zarządzanie etykietami',
 		'subscription_management' => 'Zarządzanie subskrypcjami',
 		'subscription_tools' => 'Narzędzia subskrypcji',
-		'tag_management' => 'Zarządzanie etykietami',
 	),
 	'tag' => array(
 		'name' => 'Nazwa',
@@ -124,10 +124,10 @@ return array(
 		'add' => 'Dodaj kanał lub kategorię',
 		'add_category' => 'Dodaj kategorię',
 		'add_feed' => 'Dodaj kanał',
-		'add_tag' => 'Dodaj etykietę',
-		'delete_tag' => 'Usuń etykietę',
+		'add_label' => 'Dodaj etykietę',
+		'delete_label' => 'Usuń etykietę',
 		'feed_management' => 'RSS feeds management',	// TODO - Translation
-		'rename_tag' => 'Zmień nazwę etykiety',
+		'rename_label' => 'Zmień nazwę etykiety',
 		'subscription_tools' => 'Narzędzia subskrypcji',
 	),
 );
diff --git a/app/i18n/pt-br/sub.php b/app/i18n/pt-br/sub.php
index a7686da63..25fef4a94 100644
--- a/app/i18n/pt-br/sub.php
+++ b/app/i18n/pt-br/sub.php
@@ -110,9 +110,9 @@ return array(
 		'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',
 		'subscription_tools' => 'Ferramentas de inscrição',
-		'tag_management' => 'Tag management',	// TODO - Translation
 	),
 	'tag' => array(
 		'name' => 'Name',	// TODO - Translation
@@ -124,10 +124,10 @@ return array(
 		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
-		'add_tag' => 'Add a tag',	// TODO - Translation
-		'delete_tag' => 'Delete a tag',	// TODO - Translation
+		'add_label' => 'Add a label',	// TODO - Translation
+		'delete_label' => 'Delete a label',	// TODO - Translation
 		'feed_management' => 'Gerenciamento dos RSS feeds',
-		'rename_tag' => 'Rename a tag',	// TODO - Translation
+		'rename_label' => 'Rename a label',	// TODO - Translation
 		'subscription_tools' => 'Ferramentas de inscrição',
 	),
 );
diff --git a/app/i18n/ru/sub.php b/app/i18n/ru/sub.php
index f5dc251c3..8f4a8f0ca 100644
--- a/app/i18n/ru/sub.php
+++ b/app/i18n/ru/sub.php
@@ -110,9 +110,9 @@ return array(
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'bookmark' => 'Subscribe (FreshRSS bookmark)',	// TODO - Translation
 		'import_export' => 'Import / export',	// TODO - Translation
+		'label_management' => 'Label management',	// TODO - Translation
 		'subscription_management' => 'Subscription management',	// TODO - Translation
 		'subscription_tools' => 'Subscription tools',	// TODO - Translation
-		'tag_management' => 'Tag management',	// TODO - Translation
 	),
 	'tag' => array(
 		'name' => 'Name',	// TODO - Translation
@@ -124,10 +124,10 @@ return array(
 		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
-		'add_tag' => 'Add a tag',	// TODO - Translation
-		'delete_tag' => 'Delete a tag',	// TODO - Translation
+		'add_label' => 'Add a label',	// TODO - Translation
+		'delete_label' => 'Delete a label',	// TODO - Translation
 		'feed_management' => 'RSS feeds management',	// TODO - Translation
-		'rename_tag' => 'Rename a tag',	// TODO - Translation
+		'rename_label' => 'Rename a label',	// TODO - Translation
 		'subscription_tools' => 'Subscription tools',	// TODO - Translation
 	),
 );
diff --git a/app/i18n/sk/sub.php b/app/i18n/sk/sub.php
index 973220547..5c97ef174 100644
--- a/app/i18n/sk/sub.php
+++ b/app/i18n/sk/sub.php
@@ -110,9 +110,9 @@ return array(
 		'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',
 		'subscription_tools' => 'Nástroje na odoberanie kanálov',
-		'tag_management' => 'Tag management',	// TODO - Translation
 	),
 	'tag' => array(
 		'name' => 'Name',	// TODO - Translation
@@ -124,10 +124,10 @@ return array(
 		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
-		'add_tag' => 'Add a tag',	// TODO - Translation
-		'delete_tag' => 'Delete a tag',	// TODO - Translation
+		'add_label' => 'Add a label',	// TODO - Translation
+		'delete_label' => 'Delete a label',	// TODO - Translation
 		'feed_management' => 'Správa RSS kanálov',
-		'rename_tag' => 'Rename a tag',	// TODO - Translation
+		'rename_label' => 'Rename a label',	// TODO - Translation
 		'subscription_tools' => 'Nástroje na odoberanie kanálov',
 	),
 );
diff --git a/app/i18n/tr/sub.php b/app/i18n/tr/sub.php
index 0507cad9f..5f07de552 100644
--- a/app/i18n/tr/sub.php
+++ b/app/i18n/tr/sub.php
@@ -110,9 +110,9 @@ return array(
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'bookmark' => 'Abonelik (FreshRSS yer imleri)',
 		'import_export' => 'İçe / dışa aktar',
+		'label_management' => 'Label management',	// TODO - Translation
 		'subscription_management' => 'Abonelik yönetimi',
 		'subscription_tools' => 'Subscription tools',	// TODO - Translation
-		'tag_management' => 'Tag management',	// TODO - Translation
 	),
 	'tag' => array(
 		'name' => 'Name',	// TODO - Translation
@@ -124,10 +124,10 @@ return array(
 		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
-		'add_tag' => 'Add a tag',	// TODO - Translation
-		'delete_tag' => 'Delete a tag',	// TODO - Translation
+		'add_label' => 'Add a label',	// TODO - Translation
+		'delete_label' => 'Delete a label',	// TODO - Translation
 		'feed_management' => 'RSS akış yönetimi',
-		'rename_tag' => 'Rename a tag',	// TODO - Translation
+		'rename_label' => 'Rename a label',	// TODO - Translation
 		'subscription_tools' => 'Subscription tools',	// TODO - Translation
 	),
 );
diff --git a/app/i18n/zh-cn/sub.php b/app/i18n/zh-cn/sub.php
index 1593a77ae..0fdc9cbca 100644
--- a/app/i18n/zh-cn/sub.php
+++ b/app/i18n/zh-cn/sub.php
@@ -110,9 +110,9 @@ return array(
 		'add_feed' => 'Add a feed',	// TODO - Translation
 		'bookmark' => '订阅（FreshRSS 书签）',
 		'import_export' => '导入/导出',
+		'label_management' => 'Label management',	// TODO - Translation
 		'subscription_management' => '订阅管理',
 		'subscription_tools' => '订阅工具',
-		'tag_management' => 'Tag management',	// TODO - Translation
 	),
 	'tag' => array(
 		'name' => 'Name',	// TODO - Translation
@@ -124,10 +124,10 @@ return array(
 		'add' => 'Add a feed or category',	// TODO - Translation
 		'add_category' => 'Add a category',	// TODO - Translation
 		'add_feed' => 'Add a feed',	// TODO - Translation
-		'add_tag' => 'Add a tag',	// TODO - Translation
-		'delete_tag' => 'Delete a tag',	// TODO - Translation
+		'add_label' => 'Add a label',	// TODO - Translation
+		'delete_label' => 'Delete a label',	// TODO - Translation
 		'feed_management' => '订阅源管理',
-		'rename_tag' => 'Rename a tag',	// TODO - Translation
+		'rename_label' => 'Rename a label',	// TODO - Translation
 		'subscription_tools' => '订阅工具',
 	),
 );
diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml
index 15357a7d3..c4be8f2c0 100644
--- a/app/layout/aside_subscription.phtml
+++ b/app/layout/aside_subscription.phtml
@@ -10,7 +10,7 @@
 	</li>
 
 	<li class="item<?= Minz_Request::controllerName() === 'tag' ? ' active' : '' ?>">
-		<a href="<?= _url('tag', 'index') ?>"><?= _t('sub.menu.tag_management') ?></a>
+		<a href="<?= _url('tag', 'index') ?>"><?= _t('sub.menu.label_management') ?></a>
 	</li>
 
 	<li class="item<?= Minz_Request::controllerName() === 'importExport' ? ' active' : '' ?>">
diff --git a/app/views/tag/index.phtml b/app/views/tag/index.phtml
index 3287506f7..ce58b5ad9 100644
--- a/app/views/tag/index.phtml
+++ b/app/views/tag/index.phtml
@@ -3,7 +3,7 @@
 <div class="post">
 	<a href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a>
 
-	<h2><?= _t('sub.title.add_tag') ?></h2>
+	<h2><?= _t('sub.title.add_label') ?></h2>
 		<form id="add_tag" method="post" action="<?= _url('tag', 'add') ?>" autocomplete="off">
 		<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
 		<div class="form-group">
@@ -20,7 +20,7 @@
 		</div>
 	</form>
 
-	<h2><?= _t('sub.title.rename_tag') ?></h2>
+	<h2><?= _t('sub.title.rename_label') ?></h2>
 	<form id="rename_tag" method="post" action="<?= _url('tag', 'rename') ?>" autocomplete="off">
 		<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
 		<div class="form-group">
@@ -47,7 +47,7 @@
 		</div>
 	</form>
 
-	<h2><?= _t('sub.title.delete_tag') ?></h2>
+	<h2><?= _t('sub.title.delete_label') ?></h2>
 	<form id="delete_tag" method="post" action="<?= _url('tag', 'delete') ?>" autocomplete="off">
 		<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
 		<div class="form-group">
diff --git a/cli/i18n/ignore/en-us.php b/cli/i18n/ignore/en-us.php
index 722226d53..889d90e8c 100644
--- a/cli/i18n/ignore/en-us.php
+++ b/cli/i18n/ignore/en-us.php
@@ -712,6 +712,8 @@ return array(
 	'sub.feed.auth.password',
 	'sub.feed.auth.username',
 	'sub.feed.clear_cache',
+	'sub.feed.css_cookie',
+	'sub.feed.css_cookie_help',
 	'sub.feed.css_help',
 	'sub.feed.css_path',
 	'sub.feed.description',
@@ -734,6 +736,8 @@ return array(
 	'sub.feed.priority.archived',
 	'sub.feed.priority.main_stream',
 	'sub.feed.priority.normal',
+	'sub.feed.proxy',
+	'sub.feed.proxy_help',
 	'sub.feed.selector_preview.show_raw',
 	'sub.feed.selector_preview.show_rendered',
 	'sub.feed.show.all',
@@ -764,9 +768,9 @@ return array(
 	'sub.menu.add_feed',
 	'sub.menu.bookmark',
 	'sub.menu.import_export',
+	'sub.menu.label_management',
 	'sub.menu.subscription_management',
 	'sub.menu.subscription_tools',
-	'sub.menu.tag_management',
 	'sub.tag.name',
 	'sub.tag.new_name',
 	'sub.tag.old_name',
@@ -774,10 +778,10 @@ return array(
 	'sub.title.add',
 	'sub.title.add_category',
 	'sub.title.add_feed',
-	'sub.title.add_tag',
-	'sub.title.delete_tag',
+	'sub.title.add_label',
+	'sub.title.delete_label',
 	'sub.title.feed_management',
-	'sub.title.rename_tag',
+	'sub.title.rename_label',
 	'sub.title.subscription_tools',
 	'user.email.feedback.invalid',
 	'user.email.feedback.required',