diff --git a/locales/es.json b/locales/es.json
index af82b2a3..09f510a7 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -398,51 +398,37 @@
     "search_filters_features_option_three_sixty": "360°",
     "videoinfo_watch_on_youTube": "Ver en YouTube",
     "preferences_save_player_pos_label": "Guardar posición de reproducción: ",
-    "generic_views_count_0": "{{count}} visualización",
-    "generic_views_count_1": "{{count}} visualizaciones",
-    "generic_views_count_2": "{{count}} visualizaciones",
-    "generic_subscribers_count_0": "{{count}} suscriptor",
-    "generic_subscribers_count_1": "{{count}} suscriptores",
-    "generic_subscribers_count_2": "{{count}} suscriptores",
-    "generic_subscriptions_count_0": "{{count}} suscripción",
-    "generic_subscriptions_count_1": "{{count}} suscripciones",
-    "generic_subscriptions_count_2": "{{count}} suscripciones",
-    "subscriptions_unseen_notifs_count_0": "{{count}} notificación no vista",
-    "subscriptions_unseen_notifs_count_1": "{{count}} notificaciones no vistas",
-    "subscriptions_unseen_notifs_count_2": "{{count}} notificaciones no vistas",
-    "generic_count_days_0": "{{count}} día",
-    "generic_count_days_1": "{{count}} días",
-    "generic_count_days_2": "{{count}} días",
-    "comments_view_x_replies_0": "Ver {{count}} respuesta",
-    "comments_view_x_replies_1": "Ver {{count}} respuestas",
-    "comments_view_x_replies_2": "Ver {{count}} respuestas",
-    "generic_count_weeks_0": "{{count}} semana",
-    "generic_count_weeks_1": "{{count}} semanas",
-    "generic_count_weeks_2": "{{count}} semanas",
-    "generic_playlists_count_0": "{{count}} lista de reproducción",
-    "generic_playlists_count_1": "{{count}} listas de reproducciones",
-    "generic_playlists_count_2": "{{count}} listas de reproducciones",
+    "generic_views_count": "{{count}} visualización",
+    "generic_views_count_plural": "{{count}} visualizaciones",
+    "generic_subscribers_count": "{{count}} suscriptor",
+    "generic_subscribers_count_plural": "{{count}} suscriptores",
+    "generic_subscriptions_count": "{{count}} suscripción",
+    "generic_subscriptions_count_plural": "{{count}} suscripciones",
+    "subscriptions_unseen_notifs_count": "{{count}} notificación no vista",
+    "subscriptions_unseen_notifs_count_plural": "{{count}} notificaciones no vistas",
+    "generic_count_days": "{{count}} día",
+    "generic_count_days_plural": "{{count}} días",
+    "comments_view_x_replies": "Ver {{count}} respuesta",
+    "comments_view_x_replies_plural": "Ver {{count}} respuestas",
+    "generic_count_weeks": "{{count}} semana",
+    "generic_count_weeks_plural": "{{count}} semanas",
+    "generic_playlists_count": "{{count}} lista de reproducción",
+    "generic_playlists_count_plural": "{{count}} listas de reproducción",
     "generic_videos_count_0": "{{count}} video",
     "generic_videos_count_1": "{{count}} videos",
     "generic_videos_count_2": "{{count}} videos",
-    "generic_count_months_0": "{{count}} mes",
-    "generic_count_months_1": "{{count}} meses",
-    "generic_count_months_2": "{{count}} meses",
-    "comments_points_count_0": "{{count}} punto",
-    "comments_points_count_1": "{{count}} puntos",
-    "comments_points_count_2": "{{count}} puntos",
-    "generic_count_years_0": "{{count}} año",
-    "generic_count_years_1": "{{count}} años",
-    "generic_count_years_2": "{{count}} años",
-    "generic_count_hours_0": "{{count}} hora",
-    "generic_count_hours_1": "{{count}} horas",
-    "generic_count_hours_2": "{{count}} horas",
-    "generic_count_minutes_0": "{{count}} minuto",
-    "generic_count_minutes_1": "{{count}} minutos",
-    "generic_count_minutes_2": "{{count}} minutos",
-    "generic_count_seconds_0": "{{count}} segundo",
-    "generic_count_seconds_1": "{{count}} segundos",
-    "generic_count_seconds_2": "{{count}} segundos",
+    "generic_count_months": "{{count}} mes",
+    "generic_count_months_plural": "{{count}} meses",
+    "comments_points_count": "{{count}} punto",
+    "comments_points_count_plural": "{{count}} puntos",
+    "generic_count_years": "{{count}} año",
+    "generic_count_years_plural": "{{count}} años",
+    "generic_count_hours": "{{count}} hora",
+    "generic_count_hours_plural": "{{count}} horas",
+    "generic_count_minutes": "{{count}} minuto",
+    "generic_count_minutes_plural": "{{count}} minutos",
+    "generic_count_seconds": "{{count}} segundo",
+    "generic_count_seconds_plural": "{{count}} segundos",
     "crash_page_before_reporting": "Antes de notificar un error asegúrate de que has:",
     "crash_page_switch_instance": "probado a <a href=\"`x`\">usar otra instancia</a>",
     "crash_page_read_the_faq": "leído las <a href=\"`x`\">Preguntas Frecuentes</a>",
@@ -483,9 +469,8 @@
     "search_filters_duration_option_none": "Cualquier duración",
     "search_filters_features_option_vr180": "VR180",
     "search_filters_apply_button": "Aplicar filtros",
-    "tokens_count_0": "{{count}} ficha",
-    "tokens_count_1": "{{count}} fichas",
-    "tokens_count_2": "{{count}} fichas",
+    "tokens_count": "{{count}} ficha",
+    "tokens_count_plural": "{{count}} fichas",
     "search_message_use_another_instance": " También puede <a href=\"`x`\">buscar en otra instancia</a>.",
     "Popular enabled: ": "¿Habilitar la sección popular? ",
     "error_video_not_in_playlist": "El video que solicitaste no existe en esta lista de reproducción. <a href=\"`x`\">Haz clic aquí para acceder a la página de inicio de la lista de reproducción.</a>",
diff --git a/locales/it.json b/locales/it.json
index 5991304e..0797b387 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -1,13 +1,10 @@
 {
-    "generic_subscribers_count_0": "{{count}} iscritto",
-    "generic_subscribers_count_1": "{{count}} iscritti",
-    "generic_subscribers_count_2": "{{count}} iscritti",
-    "generic_videos_count_0": "{{count}} video",
-    "generic_videos_count_1": "{{count}} video",
-    "generic_videos_count_2": "{{count}} video",
-    "generic_playlists_count_0": "{{count}} playlist",
-    "generic_playlists_count_1": "{{count}} playlist",
-    "generic_playlists_count_2": "{{count}} playlist",
+    "generic_subscribers_count": "{{count}} iscritto",
+    "generic_subscribers_count_plural": "{{count}} iscritti",
+    "generic_videos_count": "{{count}} video",
+    "generic_videos_count_plural": "{{count}} video",
+    "generic_playlists_count": "{{count}} playlist",
+    "generic_playlists_count_plural": "{{count}} playlist",
     "LIVE": "IN DIRETTA",
     "Shared `x` ago": "Condiviso `x` fa",
     "Unsubscribe": "Disiscriviti",
@@ -119,19 +116,16 @@
     "Subscription manager": "Gestione delle iscrizioni",
     "Token manager": "Gestione dei gettoni",
     "Token": "Gettone",
-    "generic_subscriptions_count_0": "{{count}} iscrizione",
-    "generic_subscriptions_count_1": "{{count}} iscrizioni",
-    "generic_subscriptions_count_2": "{{count}} iscrizioni",
-    "tokens_count_0": "{{count}} gettone",
-    "tokens_count_1": "{{count}} gettoni",
-    "tokens_count_2": "{{count}} gettoni",
+    "generic_subscriptions_count": "{{count}} iscrizione",
+    "generic_subscriptions_count_plural": "{{count}} iscrizioni",
+    "tokens_count": "{{count}} gettone",
+    "tokens_count_plural": "{{count}} gettoni",
     "Import/export": "Importa/esporta",
     "unsubscribe": "disiscriviti",
     "revoke": "revoca",
     "Subscriptions": "Iscrizioni",
-    "subscriptions_unseen_notifs_count_0": "{{count}} notifica non visualizzata",
-    "subscriptions_unseen_notifs_count_1": "{{count}} notifiche non visualizzate",
-    "subscriptions_unseen_notifs_count_2": "{{count}} notifiche non visualizzate",
+    "subscriptions_unseen_notifs_count": "{{count}} notifica non visualizzata",
+    "subscriptions_unseen_notifs_count_plural": "{{count}} notifiche non visualizzate",
     "search": "Cerca",
     "Log out": "Esci",
     "Source available here.": "Codice sorgente.",
@@ -160,9 +154,8 @@
     "Whitelisted regions: ": "Regioni in lista bianca: ",
     "Blacklisted regions: ": "Regioni in lista nera: ",
     "Shared `x`": "Condiviso `x`",
-    "generic_views_count_0": "{{count}} visualizzazione",
-    "generic_views_count_1": "{{count}} visualizzazioni",
-    "generic_views_count_2": "{{count}} visualizzazioni",
+    "generic_views_count": "{{count}} visualizzazione",
+    "generic_views_count_plural": "{{count}} visualizzazioni",
     "Premieres in `x`": "In anteprima in `x`",
     "Premieres `x`": "In anteprima `x`",
     "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.": "Ciao, Sembra che tu abbia disattivato JavaScript. Clicca qui per visualizzare i commenti, ma considera che il caricamento potrebbe richiedere più tempo.",
@@ -315,27 +308,20 @@
     "Yiddish": "Yiddish",
     "Yoruba": "Yoruba",
     "Zulu": "Zulu",
-    "generic_count_years_0": "{{count}} anno",
-    "generic_count_years_1": "{{count}} anni",
-    "generic_count_years_2": "{{count}} anni",
-    "generic_count_months_0": "{{count}} mese",
-    "generic_count_months_1": "{{count}} mesi",
-    "generic_count_months_2": "{{count}} mesi",
-    "generic_count_weeks_0": "{{count}} settimana",
-    "generic_count_weeks_1": "{{count}} settimane",
-    "generic_count_weeks_2": "{{count}} settimane",
-    "generic_count_days_0": "{{count}} giorno",
-    "generic_count_days_1": "{{count}} giorni",
-    "generic_count_days_2": "{{count}} giorni",
-    "generic_count_hours_0": "{{count}} ora",
-    "generic_count_hours_1": "{{count}} ore",
-    "generic_count_hours_2": "{{count}} ore",
-    "generic_count_minutes_0": "{{count}} minuto",
-    "generic_count_minutes_1": "{{count}} minuti",
-    "generic_count_minutes_2": "{{count}} minuti",
-    "generic_count_seconds_0": "{{count}} secondo",
-    "generic_count_seconds_1": "{{count}} secondi",
-    "generic_count_seconds_2": "{{count}} secondi",
+    "generic_count_years": "{{count}} anno",
+    "generic_count_years_plural": "{{count}} anni",
+    "generic_count_months": "{{count}} mese",
+    "generic_count_months_plural": "{{count}} mesi",
+    "generic_count_weeks": "{{count}} settimana",
+    "generic_count_weeks_plural": "{{count}} settimane",
+    "generic_count_days": "{{count}} giorno",
+    "generic_count_days_plural": "{{count}} giorni",
+    "generic_count_hours": "{{count}} ora",
+    "generic_count_hours_plural": "{{count}} ore",
+    "generic_count_minutes": "{{count}} minuto",
+    "generic_count_minutes_plural": "{{count}} minuti",
+    "generic_count_seconds": "{{count}} secondo",
+    "generic_count_seconds_plural": "{{count}} secondi",
     "Fallback comments: ": "Commenti alternativi: ",
     "Popular": "Popolare",
     "Search": "Cerca",
@@ -439,12 +425,10 @@
     "search_filters_duration_option_short": "Corto (< 4 minuti)",
     "search_filters_duration_option_long": "Lungo (> 20 minuti)",
     "search_filters_features_option_purchased": "Acquistato",
-    "comments_view_x_replies_0": "Vedi {{count}} risposta",
-    "comments_view_x_replies_1": "Vedi {{count}} risposte",
-    "comments_view_x_replies_2": "Vedi {{count}} risposte",
-    "comments_points_count_0": "{{count}} punto",
-    "comments_points_count_1": "{{count}} punti",
-    "comments_points_count_2": "{{count}} punti",
+    "comments_view_x_replies": "Vedi {{count}} risposta",
+    "comments_view_x_replies_plural": "Vedi {{count}} risposte",
+    "comments_points_count": "{{count}} punto",
+    "comments_points_count_plural": "{{count}} punti",
     "Portuguese (auto-generated)": "Portoghese (generati automaticamente)",
     "crash_page_you_found_a_bug": "Sembra che tu abbia trovato un bug in Invidious!",
     "crash_page_switch_instance": "provato a <a href=\"`x`\">usare un'altra istanza</a>",