fixes conflicts with master

2015-08-10 16:46:27 +02:00
parent 91cdfbc8a1 16183d9909
commit 66e4581a84
30 changed files with 374 additions and 38 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -14,6 +14,14 @@ en:
      language: Site language
    footer:
      copyright: "Ayuntamiento de Madrid, 2015. All rights reserved"
+  admin:
+    dashboard:
+      index:
+        title: Administration
+  moderation:
+    dashboard:
+      index:
+        title: Moderation
  debates:
    index:
      create_debate: Create a debate
@@ -83,3 +91,7 @@ en:
      subject: Someone has commented on your debate
    reply:
      subject: Someone has replied to your comment
+  unauthorized:
+    default: "You are not authorized to access this page."
+    manage:
+      all: "You are not authorized to %{action} %{subject}."