merges master and fixes conflicts

2015-08-17 17:38:34 +02:00
parent 1ffc342079 4a8825cf11
commit 9e1581656a
51 changed files with 579 additions and 60 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -15,6 +15,10 @@ en:
      language: Site language
      administration: Administration
      moderation: Moderation
+      welcome: Welcome
+      news: News
+      debates: Debates
+      initiatives: Initiatives
    footer:
      copyright: "Ayuntamiento de Madrid, 2015. All rights reserved"
  form:
@@ -38,6 +42,7 @@ en:
        one: 1 vote
        other: "%{count} votes"
    comment:
+      deleted: This comment has been deleted
      responses:
        zero: No Responses
        one: 1 Response