diff --git a/locales/es.json b/locales/es.json
index 63079d9e9..68ff0170c 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -398,51 +398,36 @@
     "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}} vista",
-    "generic_views_count_1": "{{count}} vistas",
-    "generic_views_count_2": "{{count}} vistas",
-    "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 sin ver",
-    "subscriptions_unseen_notifs_count_1": "{{count}} notificaciones sin ver",
-    "subscriptions_unseen_notifs_count_2": "{{count}} notificaciones sin ver",
-    "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}} reproducción",
-    "generic_playlists_count_1": "{{count}} reproducciones",
-    "generic_playlists_count_2": "{{count}} reproducciones",
-    "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_views_count": "{{count}} vista",
+    "generic_views_count_plural": "{{count}} vistas",
+    "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 sin ver",
+    "subscriptions_unseen_notifs_count_plural": "{{count}} notificaciones sin ver",
+    "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}} reproducción",
+    "generic_playlists_count_plural": "{{count}} reproducciones",
+    "generic_videos_count": "{{count}} video",
+    "generic_videos_count_plural": "{{count}} videos",
+    "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 +468,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}} token",
-    "tokens_count_1": "{{count}} tokens",
-    "tokens_count_2": "{{count}} tokens",
+    "tokens_count": "{{count}} token",
+    "tokens_count_plural": "{{count}} tokens",
     "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>",