Merge branch 'master' into legislation-module-stable

2016-12-22 16:36:10 +01:00
parent 96d000ae62 76126dd9ee
commit dee971fcc3
6 changed files with 53 additions and 10 deletions
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -190,6 +190,7 @@ es:
      debates: Debates
      external_link_blog: Blog
      external_link_opendata: Datos abiertos
+      external_link_opendata_url: "/opendata"
      external_link_transparency: Transparencia
      external_link_transparency_url: https://transparency.consul
      locale: 'Idioma:'
@@ -496,6 +497,7 @@ es:
      districts_list: "Listado de distritos"
      categories: "Categorías"
    target_blank_html: " (se abre en ventana nueva)"
+    you_are_in: "Estás en"
    unflag: Deshacer denuncia
    outline:
      debates: Debates