Merge pull request #1224 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

1 files changed, 1 insertions, 17 deletions

diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml
index f40e6c361..2fbf0ffd7 100644
--- a/config/locales/activerecord.es.yml
+++ b/config/locales/activerecord.es.yml
@@ -1,17 +1 @@
----
-es:
-  activerecord:
-    attributes:
-      poll:
-        expires_at: Vencimiento
-        options: Opciones
-    errors:
-      models:
-        account:
-          attributes:
-            username:
-              invalid: sólo letras, números y guiones bajos
-        status:
-          attributes:
-            reblog:
-              taken: del estado ya existe
+--- {}