fixes conflicts with master

2015-10-14 15:48:55 +02:00
parent 68b866171b 77bacdc3ec
commit e08ed41e98
63 changed files with 1394 additions and 1677 deletions
--- a/config/locales/activerecord.es.yml
+++ b/config/locales/activerecord.es.yml
@@ -62,3 +62,13 @@ es:
      organization:
        name: Nombre de organización
        responsible_name: Persona responsable del colectivo
+    errors:
+      models:
+        debate:
+          attributes:
+            tag_list:
+              less_than_or_equal_to: los temas deben ser menor o igual que %{count}
+        proposal:
+          attributes:
+            tag_list:
+              less_than_or_equal_to: los temas deben ser menor o igual que %{count}