diff --git a/i18n/es.json b/i18n/es.json
index 158619d6..e80fc2d9 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -29,76 +29,76 @@
     "Discussion": "Discusión",
     "Toggle navigation": "Cambiar navegación",
     "%d seconds": [
-        "%d second (singular)",
-        "%d seconds (1st plural)",
+        "%d segundo",
+        "%d segundos",
         "%d seconds (2nd plural)",
         "%d seconds (3rd plural)"
     ],
     "%d minutes": [
-        "%d minute (singular)",
-        "%d minutes (1st plural)",
+        "%d minuto",
+        "%d minutos",
         "%d minutes (2nd plural)",
         "%d minutes (3rd plural)"
     ],
     "%d hours": [
-        "%d hour (singular)",
-        "%d hours (1st plural)",
+        "%d hora",
+        "%d horas",
         "%d hours (2nd plural)",
         "%d hours (3rd plural)"
     ],
     "%d days": [
-        "%d day (singular)",
-        "%d days (1st plural)",
+        "%d día",
+        "%d días",
         "%d days (2nd plural)",
         "%d days (3rd plural)"
     ],
     "%d weeks": [
-        "%d week (singular)",
-        "%d weeks (1st plural)",
+        "%d semana",
+        "%d semanas",
         "%d weeks (2nd plural)",
         "%d weeks (3rd plural)"
     ],
     "%d months": [
-        "%d month (singular)",
-        "%d months (1st plural)",
+        "%d mes",
+        "%d meses",
         "%d months (2nd plural)",
         "%d months (3rd plural)"
     ],
     "%d years": [
-        "%d year (singular)",
-        "%d years (1st plural)",
+        "%d año",
+        "%d años",
         "%d years (2nd plural)",
         "%d years (3rd plural)"
     ],
     "Never": "Nunca",
     "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Nota: Este es un servicio de prueba. Los datos pueden ser eliminados en cualquier momento. Morirán gatitos si abusas de este servicio.",
     "This document will expire in %d seconds.": [
-        "This document will expire in %d second. (singular)",
-        "This document will expire in %d seconds (1st plural)",
+        "Este documento caducará en un segundo.",
+        "Este documento caducará en %d segundos.",
         "This document will expire in %d seconds (2nd plural)",
         "This document will expire in %d seconds (3rd plural)"
     ],
     "This document will expire in %d minutes.": [
-        "This document will expire in %d minute. (singular)",
-        "This document will expire in %d minutes (1st plural)",
+        "Este documento caducará en un minuto.",
+        "Este documento caducará en %d minutos.",
         "This document will expire in %d minutes (2nd plural)",
         "This document will expire in %d minutes (3rd plural)"
     ],
     "This document will expire in %d hours.": [
-        "This document will expire in %d hour. (singular)",
-        "This document will expire in %d hours (1st plural)",
+        "Este documento caducará en una hora.",
+        "Este documento caducará en %d horas.",
         "This document will expire in %d hours (2nd plural)",
         "This document will expire in %d hours (3rd plural)"
     ],
     "This document will expire in %d days.": [
-        "This document will expire in %d day. (singular)",
-        "This document will expire in %d days (1st plural)",
+        "Este documento caducará en un día.",
+        "Este documento caducará en %d días.",
         "This document will expire in %d days (2nd plural)",
         "This document will expire in %d days (3rd plural)"
     ],
     "This document will expire in %d months.": [
-        "This document will expire in %d month. (singular)",
-        "This document will expire in %d months (1st plural)",
+        "Este documento caducará en un mes.",
+        "Este documento caducará en %d meses.",
         "This document will expire in %d months (2nd plural)",
         "This document will expire in %d months (3rd plural)"
     ],