diff --git a/Gemfile b/Gemfile
index 5430c9c41..bf657d345 100644
--- a/Gemfile
+++ b/Gemfile
@@ -53,6 +53,7 @@ gem 'pg_search'
 
 gem 'ahoy_matey', '~> 1.2.1'
 gem 'groupdate'   # group temporary data
+gem 'tolk' # Web interface for translations
 
 gem 'browser'
 gem 'turnout'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4756e3aed..fafb13808 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -344,6 +344,7 @@ GEM
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
     ruby-progressbar (1.7.5)
+    safe_yaml (1.0.4)
     sass (3.4.21)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
@@ -397,6 +398,9 @@ GEM
     thread_safe (0.3.5)
     tilt (2.0.2)
     tins (1.6.0)
+    tolk (1.9.3)
+      rails (>= 4.0, < 4.3)
+      safe_yaml (>= 0.8.6)
     turbolinks (2.5.3)
       coffee-rails
     turnout (2.2.1)
@@ -496,6 +500,7 @@ DEPENDENCIES
   social-share-button!
   spring
   spring-commands-rspec
+  tolk
   turbolinks
   turnout
   uglifier (>= 1.3.0)
diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot
index ced98a9b4..7323d578f 100644
Binary files a/app/assets/fonts/icons.eot and b/app/assets/fonts/icons.eot differ
diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg
index d92b9a44a..e272b9550 100644
--- a/app/assets/fonts/icons.svg
+++ b/app/assets/fonts/icons.svg
@@ -42,8 +42,10 @@
 <glyph glyph-name="box" unicode="&#73;" d="M311 274c0 5-2 10-6 13-3 4-7 6-12 6l-74 0c-5 0-9-2-12-6-4-3-6-8-6-13 0-5 2-9 6-13 3-3 7-5 12-5l74 0c5 0 9 2 12 5 4 4 6 8 6 13z m164 55l0-274c0-5-1-9-5-13-4-4-8-5-13-5l-402 0c-5 0-9 1-13 5-4 4-5 8-5 13l0 274c0 5 1 9 5 13 4 4 8 5 13 5l402 0c5 0 9-1 13-5 4-4 5-8 5-13z m19 128l0-73c0-5-2-9-6-13-3-3-8-5-13-5l-438 0c-5 0-10 2-13 5-4 4-6 8-6 13l0 73c0 5 2 9 6 13 3 4 8 5 13 5l438 0c5 0 10-1 13-5 4-4 6-8 6-13z"/>
 <glyph glyph-name="youtube" unicode="&#75;" d="M314 157l0-61c0-12-4-19-11-19-5 0-9 2-13 6l0 86c4 5 8 7 13 7 7 0 11-7 11-19z m97-1l0-13-26 0 0 13c0 13 4 20 13 20 8 0 13-7 13-20z m-276 63l30 0 0 26-89 0 0-26 30 0 0-163 29 0z m82-163l25 0 0 141-25 0 0-108c-6-8-11-12-16-12-4 0-6 2-6 6-1 1-1 4-1 10l0 104-25 0 0-112c0-9 1-16 2-20 2-7 8-11 17-11 9 0 19 6 29 17z m122 42l0 57c0 13 0 23-2 28-3 11-10 16-20 16-10 0-19-5-27-16l0 62-25 0 0-189 25 0 0 14c9-11 17-16 27-16 10 0 17 5 20 16 2 5 2 14 2 28z m97 3l0 4-26 0c0-10 0-16-1-18-1-6-5-10-11-10-9 0-13 7-13 20l0 25 51 0 0 29c0 15-3 26-8 33-7 10-17 15-30 15-13 0-23-5-31-15-5-7-8-18-8-33l0-49c0-15 3-26 9-33 7-10 17-15 31-15 13 0 24 5 30 15 4 5 6 10 6 16 1 1 1 7 1 16z m-174 261l0 60c0 13-4 20-12 20-8 0-12-7-12-20l0-60c0-13 4-20 12-20 8 0 12 7 12 20z m206-215c0-44-3-77-8-100-2-11-8-20-16-28-9-7-18-12-29-13-35-4-88-6-159-6-71 0-124 2-159 6-11 1-20 6-29 13-8 8-14 17-16 28-5 22-8 55-8 100 0 45 3 78 8 100 2 12 8 21 16 29 9 7 18 12 30 13 35 4 87 6 158 6 71 0 124-2 159-6 11-1 20-6 29-13 8-8 14-17 16-29 5-21 8-54 8-100z m-285 365l29 0-35-114 0-77-28 0 0 77c-3 14-9 34-18 61-7 19-13 37-18 53l30 0 20-75z m105-95l0-50c0-16-2-27-8-34-7-10-17-14-30-14-13 0-23 4-30 14-5 7-8 19-8 34l0 50c0 15 3 26 8 33 7 10 17 15 30 15 13 0 23-5 30-15 6-7 8-18 8-33z m96 46l0-142-26 0 0 15c-10-12-20-17-29-17-9 0-15 3-17 10-2 5-3 12-3 22l0 112 26 0 0-105c0-6 1-9 1-10 0-4 2-6 6-6 5 0 10 4 16 12l0 109z"/>
 <glyph glyph-name="letter" unicode="&#76;" d="M475 82l0 220c-6-7-12-13-19-19-51-39-92-72-122-97-10-8-18-14-24-19-6-4-14-9-24-14-11-4-21-7-30-7l0 0c-9 0-19 3-30 7-10 5-18 10-24 14-6 5-14 11-24 19-30 25-71 58-122 97-7 6-13 12-19 19l0-220c0-2 0-4 2-6 2-2 4-3 7-3l420 0c3 0 5 1 7 3 2 2 2 4 2 6z m0 301l0 7c0 0 0 1 0 3 0 3 0 4-1 4 0 0-1 1-1 2-1 2-2 3-3 3-1-1-2-1-4 0l-420 0c-3 0-5-1-7-2-2-2-2-4-2-7 0-32 14-59 42-81 36-29 75-59 114-91 1-1 5-3 10-8 6-5 10-8 13-11 4-2 8-5 13-9 5-3 10-6 14-8 5-1 9-2 13-2l0 0c4 0 8 1 13 2 4 2 9 5 14 8 5 4 9 7 13 9 3 3 7 6 13 11 5 5 9 7 10 8 39 32 78 62 114 91 11 8 20 19 29 33 9 14 13 26 13 38z m37 10l0-311c0-12-4-23-13-32-9-9-20-13-33-13l-420 0c-13 0-24 4-33 13-9 9-13 20-13 32l0 311c0 13 4 23 13 32 9 9 20 14 33 14l420 0c13 0 24-5 33-14 9-9 13-19 13-32z"/>
-<glyph glyph-name="no-notification" unicode="&#120;" d="M261 27c0 3-2 5-5 5-11 0-21 4-29 12-8 8-12 18-12 29 0 3-2 5-5 5-3 0-4-2-4-5 0-14 5-26 14-35 10-10 22-15 36-15 3 0 5 1 5 4z m-154 136l251 217c-8 17-21 31-38 42-17 11-39 17-64 17-18 0-34-3-48-9-15-6-27-14-35-23-9-9-15-19-20-30-4-10-7-20-7-30 0-73-13-134-39-184z m387-53c0-10-4-19-11-26-7-7-16-11-26-11l-128 0c0-20-7-37-21-52-15-14-32-21-52-21-20 0-37 7-52 21-14 14-21 32-21 52l42 37 217 0c-32 35-54 79-65 131l32 28c11-68 40-121 85-159z m24 397l24-27c2-2 3-4 2-7 0-2-1-4-3-6l-534-464c-2-1-5-2-7-2-3 1-5 2-6 4l-24 27c-2 2-3 4-2 7 0 2 1 4 3 6l53 46c-4 6-6 12-6 19 10 8 18 16 26 25 8 9 16 20 25 34 8 14 15 29 21 45 6 16 10 36 14 59 4 23 6 48 6 74 0 29 11 56 33 81 22 25 52 40 88 45-2 4-2 8-2 12 0 7 2 14 8 19 5 5 11 8 19 8 8 0 14-3 19-8 6-5 8-12 8-19 0-4 0-8-2-12 24-3 45-11 63-23 18-12 32-27 42-45l119 104c2 1 5 2 7 2 3-1 5-2 6-4z"/>
-<glyph glyph-name="notification" unicode="&#110;" d="M261 27c0 3-2 5-5 5-11 0-21 4-29 12-8 8-12 18-12 29 0 3-2 5-5 5-3 0-4-2-4-5 0-14 5-26 14-35 10-10 22-15 36-15 3 0 5 1 5 4z m233 83c0-10-4-19-11-26-7-7-16-11-26-11l-128 0c0-20-7-37-21-52-15-14-32-21-52-21-20 0-37 7-52 21-14 15-21 32-21 52l-128 0c-10 0-19 4-26 11-7 7-11 16-11 26 10 8 18 16 26 25 8 9 16 20 25 34 8 14 15 29 21 45 6 16 10 36 14 59 4 23 6 48 6 74 0 29 11 56 33 81 22 25 52 40 88 45-2 4-2 8-2 12 0 7 2 14 8 19 5 5 11 8 19 8 8 0 14-3 19-8 6-5 8-12 8-19 0-4 0-8-2-12 36-5 66-20 88-45 22-25 33-52 33-81 0-26 2-51 6-74 4-23 8-43 14-59 6-16 13-31 21-45 9-14 17-25 25-34 8-9 16-17 26-25z"/>
 <glyph glyph-name="circle" unicode="&#67;" d="M475 256c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
 <glyph glyph-name="circle-o" unicode="&#77;" d="M256 411c-28 0-54-7-78-20-24-14-43-33-57-57-13-24-20-50-20-78 0-28 7-54 20-78 14-24 33-43 57-57 24-13 50-20 78-20 28 0 54 7 78 20 24 14 43 33 57 57 13 24 20 50 20 78 0 28-7 54-20 78-14 24-33 43-57 57-24 13-50 20-78 20z m219-155c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
+<glyph glyph-name="help" unicode="&#78;" d="M256 480c-124 0-224-100-224-224 0-124 100-224 224-224 124 0 224 100 224 224 0 124-100 224-224 224z m20-327c0-18-13-29-31-28-16 0-29 12-28 30 0 18 14 29 30 29 17-1 30-13 29-31z m49 128c-4-6-14-14-25-23l-14-9c-6-5-10-11-12-17-1-4-2-13-2-19 0-1-1-4-5-4-3 0-35 0-39 0-4 0-4 2-4 4 0 16 3 30 10 41 9 15 35 30 35 30 4 3 7 6 10 10 4 6 8 13 8 20 0 8-2 16-8 23-6 7-13 11-25 11-13 0-21-6-26-15-5-8-4-18-4-27l-49 0c0 34 9 56 28 68 12 9 29 13 48 13 24 0 44-5 61-18 17-12 25-29 25-52 0-15-5-27-12-36z"/>
+<glyph glyph-name="budget" unicode="&#83;" d="M33 256l223 0 0 223c-5 1-11 1-16 1-115 0-208-93-208-208 0-5 0-11 1-16z m77-146c38-48 96-78 162-78 115 0 208 93 208 208 0 66-30 124-78 162-31 26-71 42-114 45l0-223-223 0c3-43 19-83 45-114z"/>
+<glyph glyph-name="notification" unicode="&#110;" d="M256 48c23 0 41 19 41 42l-82 0c0-23 18-42 41-42z m135 125l0 114c0 64-45 118-104 131l0 15c0 17-13 31-31 31-18 0-31-14-31-31l0-15c-59-13-104-67-104-131l0-114-41-42 0-21 352 0 0 21z"/>
+<glyph glyph-name="no-notification" unicode="&#120;" d="M257 392c7 0 24-5 24-5 46-10 78-52 78-100l0-127 9-10 8-8-240 0 8 8 9 10 0 127c0 48 33 90 78 100 0 0 18 5 24 5m1 72c-18 0-31-14-31-31l0-15c-59-13-104-67-104-131l0-114-41-42 0-21 352 0 0 21-41 42 0 114c0 64-45 118-104 131l0 15c0 17-13 31-31 31z m41-374l-82 0c0-23 18-42 41-42 23 0 41 19 41 42z"/>
 </font></defs></svg>
diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf
index f3486cf96..4db54078d 100644
Binary files a/app/assets/fonts/icons.ttf and b/app/assets/fonts/icons.ttf differ
diff --git a/app/assets/fonts/icons.woff b/app/assets/fonts/icons.woff
index 9045aa563..33d2d4dee 100644
Binary files a/app/assets/fonts/icons.woff and b/app/assets/fonts/icons.woff differ
diff --git a/app/assets/images/featured_debates.jpg b/app/assets/images/featured_debates.jpg
deleted file mode 100644
index f1daa4c6e..000000000
Binary files a/app/assets/images/featured_debates.jpg and /dev/null differ
diff --git a/app/assets/images/featured_proposals.jpg b/app/assets/images/featured_proposals.jpg
deleted file mode 100644
index 303c21747..000000000
Binary files a/app/assets/images/featured_proposals.jpg and /dev/null differ
diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index 5d3418748..470885665 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -70,10 +70,6 @@ body.admin {
   .admin-content {
     margin-top: rem-calc(24);
 
-    .filters h2 {
-      margin-top: 0;
-    }
-
     .proposal-new, .proposal-edit {
       padding-top: 0;
     }
diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss
index 46e24e4cf..b13b09f46 100644
--- a/app/assets/stylesheets/icons.scss
+++ b/app/assets/stylesheets/icons.scss
@@ -142,15 +142,21 @@
 .icon-letter:before {
   content: "\4c";
 }
-.icon-no-notification:before {
-  content: "\78";
-}
-.icon-notification:before {
-  content: "\6e";
-}
 .icon-circle:before {
   content: "\43";
 }
 .icon-circle-o:before {
   content: "\4d";
 }
+.icon-help:before {
+  content: "\4e";
+}
+.icon-budget:before {
+  content: "\53";
+}
+.icon-notification:before {
+  content: "\6e";
+}
+.icon-no-notification:before {
+  content: "\78";
+}
diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 8c279ff78..d7cf4d4d1 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -8,7 +8,7 @@
 // 06. Forms
 // 07. Alerts
 // 08. User account
-// 09. Filters & search
+// 09. Search
 // 10. Official levels
 // 11. Pagination
 // 12. Tables
@@ -639,11 +639,7 @@ footer {
   background-repeat: no-repeat;
   background-size: cover;
 
-  @media (min-width: $small-breakpoint) {
-    padding-top: $line-height*2;
-  }
-
-  h1 {
+  h1:not(.logo) {
     @include logo;
 
     a {
@@ -661,25 +657,18 @@ footer {
 }
 
 .auth {
-  min-height: $line-height*20;
 
   .back, .icon-angle-left {
     @include back;
   }
 
-  p, a {
-    font-family: $font-sans;
+  p, a, .checkbox {
     font-size: $small-font-size;
   }
 
   .panel {
     background: white;
     border: 0;
-
-    h1 {
-      font-size: rem-calc(30);
-      font-weight: bolder;
-    }
   }
 }
 
@@ -1028,60 +1017,9 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar {
   }
 }
 
-// 09. Filters & search
+// 09. Search
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
-.filters, .search-results {
-
-  h2 {
-    display: inline-block;
-    font-size: rem-calc(24);
-    margin: $line-height/2 0;
-
-    @media (min-width: $small-breakpoint) {
-      margin: $line-height 0;
-    }
-  }
-
-  select {
-    background-color: #DEE0E2;
-    height: auto;
-    margin-bottom: $line-height;
-    min-width: $line-height*7.5;
-    outline: 0;
-    padding: $line-height/2;
-    width: auto;
-
-    @media (min-width: $small-breakpoint) {
-      margin: 0 0 $line-height $line-height/2;
-    }
-
-    optgroup {
-      font-size: $small-font-size;
-    }
-
-    option {
-
-      &:after {
-        content: "a";
-        font-family: "icons";
-      }
-    }
-  }
-
-  .debates-order {
-    text-align: left;
-
-    @media (min-width: $small-breakpoint) {
-      text-align: right;
-    }
-
-    select {
-      margin-left: 0;
-    }
-  }
-}
-
 .search-form {
 
   h3 {
diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
index cfad21920..87aed579d 100644
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -272,7 +272,9 @@
 // 02. New participation
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
-.debate-new, .debate-edit, .proposal-new, .proposal-edit,  {
+.debate-new, .debate-edit,
+.proposal-new, .proposal-edit,
+.spending-proposal-new, .spending-proposal-edit  {
   padding-top: $line-height;
 
   .back {
@@ -293,6 +295,13 @@
     opacity: .5;
   }
 
+  .icon-budget {
+    color: $budget;
+    font-size: rem-calc(50);
+    line-height: $line-height;
+    opacity: .5;
+  }
+
   .recommendations {
     list-style-type: none;
     margin-left: 0;
@@ -789,8 +798,12 @@
 // 05. Featured
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
-.featured-debates-container {
-  background: $votes-bg;
+.featured-debates, .featured-proposals {
+  padding: $line-height/2 0;
+
+  @media (min-width: $small-breakpoint) {
+    margin-top: $line-height !important;
+  }
 
   @media (min-width: $medium-breakpoint) {
     margin-left: 0 !important;
@@ -798,134 +811,40 @@
   }
 
   h2 {
-    color: white;
-  }
-
-  .debates-list {
-    margin-bottom: 0;
-  }
-}
-
-.featured-proposals-container {
-  background: #FED900;
-
-  @media (min-width: $medium-breakpoint) {
-    margin-left: 0 !important;
-    margin-right: rem-calc(-15) !important;
-  }
-
-  h2 {
-    color: $text;
-
-    @media (min-width: $medium-breakpoint) {
-      margin-bottom: rem-calc(27);
-    }
-  }
-}
-
-.featured-debates-container, .featured-proposals-container {
-  margin: $line-height 0 !important;
-
-  h2 {
-    font-size: rem-calc(24);
-    margin: rem-calc(12) 0 0;
-    position: relative;
+    font-size: $small-font-size;
+    line-height: $line-height;
     text-transform: uppercase;
+  }
 
-    .icon-proposals {
-      font-size: rem-calc(20);
-      position: absolute;
-      right: -26px;
-      top: -5px;
+  h3 {
+    margin-bottom: 0;
+
+    a {
+      color: $text;
+      font-size: $h3-font-size;
     }
   }
 
-  .debates-list {
-
-    @media (min-width: $medium-breakpoint) {
-      border-left: 1px solid $votes-border;
-    }
-
-    &:after {
-
-      @media (min-width: $medium-breakpoint) {
-        content: none;
-      }
-    }
+  a, .info {
+    color: lighten($text, 15%);
+    font-size: $small-font-size;
   }
 
-  .proposals-list {
-
-    @media (min-width: $medium-breakpoint) {
-      border-left: 1px solid #D2B400;
-    }
-
-    &:after {
-      border-color: #C9AF00 transparent transparent transparent;
-
-      @media (min-width: $medium-breakpoint) {
-        content: " ";
-      }
-    }
-  }
-
-  .debates-list, .proposals-list {
-    margin: rem-calc(6) 0;
-
-    &:after {
-      content: none;
-      position: absolute;
-      display: block;
-      border-style: solid;
-      bottom: rem-calc(-20);
-      border-left-width: 0;
-      border-right-color: transparent;
-      right: rem-calc(1);
-      border-width: rem-calc(14) rem-calc(14) 0 0;
-    }
-  }
 }
 
-.debate-featured, .proposal-featured {
-  margin-bottom: 0;
-  margin-top: 0;
-  padding-left: 0;
+.featured-debates {
+  background: $highlight;
+}
 
-  .panel {
-    background: none;
-    border: 0;
-    margin-bottom: 0;
-    padding: 0 rem-calc(12);
-
-    h3 {
-      font-weight: bold;
-      margin: rem-calc(8) 0 0 0;
-      min-height: auto;
-
-      a {
-        clear: both;
-        display: block;
-        font-size: rem-calc(14);
-        line-height: $line-height;
-      }
-    }
-  }
-
-  .progress {
-    display: none !important;
-  }
-
-  .content {
-    overflow: hidden;
-  }
+.featured-proposals {
+  background: $featured;
 
   .supports {
     @include supports;
     background: none;
     border: 0;
-    padding: 0;
-    padding-left: rem-calc(13);
-    margin-right: rem-calc(-26);
+    padding-bottom: 0;
+    padding-top: 0;
 
     &:after {
       content: none;
@@ -935,8 +854,12 @@
       display: none;
     }
 
+    .button-support {
+      margin-top: 0;
+    }
+
     .not-logged, .organizations-votes {
-      background: #FED900;
+      background: $featured;
       color: $warning-color;
       font-size: $small-font-size;
       line-height: rem-calc(24);
@@ -949,14 +872,12 @@
     }
 
     .anonymous-votes {
-      background: #FED900;
-      padding: 0;
-      padding-top: rem-calc(6);
+      background: $featured;
 
       p {
-        font-size: rem-calc(12);
-        line-height: rem-calc(20);
-        margin: 0;
+        color: $text;
+        font-size: $small-font-size;
+        line-height: $line-height;
       }
     }
 
@@ -967,10 +888,6 @@
       text-align: center;
     }
 
-    .button-support {
-      margin-top: rem-calc(4);
-    }
-
     .supported {
       margin-top: 0;
     }
@@ -981,60 +898,12 @@
       .social-share-button-facebook,
       .social-share-button-google_plus {
         height: rem-calc(33);
-      }
 
-      .social-share-button-twitter:before,
-      .social-share-button-facebook:before,
-      .social-share-button-google_plus:before {
-        font-size: rem-calc(18);
-        line-height: rem-calc(33);
+        &:before {
+          font-size: rem-calc(18);
+          line-height: rem-calc(33);
+        }
       }
     }
   }
 }
-
-.debate-featured {
-  background: $votes-bg;
-  margin-bottom: rem-calc(12) !important;
-
-  .panel h3 a {
-    color: #0D3F54;
-    font-size: $h3-font-size;
-    margin: 0;
-  }
-
-  .info, .info a {
-    color: white !important;
-    font-family: $font-sans;
-    font-size: $small-font-size;
-  }
-
-  .content {
-    height: auto;
-  }
-}
-
-.proposal-featured {
-  background: #FED900;
-
-  .panel h3 a {
-    color: $text;
-    font-size: $base-font-size;
-  }
-
-  .info {
-    color: #806C00 !important;
-    font-size: $small-font-size;
-  }
-
-  .content {
-    height: rem-calc(60);
-  }
-}
-.advanced-search-title{
-  cursor:pointer; cursor: hand
-}
-
-.blue{
-  color: $brand;
-}
diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss
index 6a61ec72c..eeae89a61 100644
--- a/app/assets/stylesheets/variables.scss
+++ b/app/assets/stylesheets/variables.scss
@@ -73,7 +73,10 @@ $check:             #46DB91;
 $proposals:         #FFA42D;
 $proposals-border:  #CC8425;
 
+$budget:            #454372;
+
 $highlight:         #E7F2FC;
+$featured:          #FED900;
 
 $footer-bg:         #DEE0E2;
 $footer-color:      #171819;
diff --git a/app/controllers/concerns/commentable_actions.rb b/app/controllers/concerns/commentable_actions.rb
index b4b3c06df..cb023cdf4 100644
--- a/app/controllers/concerns/commentable_actions.rb
+++ b/app/controllers/concerns/commentable_actions.rb
@@ -66,7 +66,7 @@ module CommentableActions
     end
 
     def tag_cloud
-      resource_model.tag_counts.order("#{resource_name.pluralize}_count": :desc, name: :asc).limit(20)
+      resource_model.last_week.tag_counts.order("#{resource_name.pluralize}_count": :desc, name: :asc).limit(5)
     end
 
     def load_featured_tags
diff --git a/app/models/debate.rb b/app/models/debate.rb
index db11e4b7c..d65779b7a 100644
--- a/app/models/debate.rb
+++ b/app/models/debate.rb
@@ -35,7 +35,7 @@ class Debate < ActiveRecord::Base
   scope :sort_by_random,           -> { reorder("RANDOM()") }
   scope :sort_by_relevance,        -> { all }
   scope :sort_by_flags,            -> { order(flags_count: :desc, updated_at: :desc) }
-
+  scope :last_week,            -> { where("created_at >= ?", 7.days.ago)}
   # Ahoy setup
   visitable # Ahoy will automatically assign visit_id on create
 
diff --git a/app/models/proposal.rb b/app/models/proposal.rb
index 5c28d9bd4..c7b406be9 100644
--- a/app/models/proposal.rb
+++ b/app/models/proposal.rb
@@ -41,7 +41,8 @@ class Proposal < ActiveRecord::Base
   scope :sort_by_random,           -> { reorder("RANDOM()") }
   scope :sort_by_relevance ,       -> { all }
   scope :sort_by_flags,            -> { order(flags_count: :desc, updated_at: :desc) }
-
+  scope :last_week,            -> { where("created_at >= ?", 7.days.ago)}
+  
   pg_search_scope :pg_search, {
     against: {
       title:       'A',
diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index b27a8a73b..b075755da 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -34,7 +34,7 @@
 
     <li <%= "class=active" if controller_name == "spending_proposals" %>>
       <%= link_to admin_spending_proposals_path do %>
-        <i class="icon-proposals"></i>
+        <i class="icon-budget"></i>
         <%= t("admin.menu.spending_proposals") %>
       <% end %>
     </li>
diff --git a/app/views/debates/_featured_debates_static.html.erb b/app/views/debates/_featured_debates_static.html.erb
index 8fc48a7bc..8f7d0b68d 100644
--- a/app/views/debates/_featured_debates_static.html.erb
+++ b/app/views/debates/_featured_debates_static.html.erb
@@ -1,41 +1,17 @@
-<div id="featured-debates" class="row featured-debates-container">
-  <div class="small-12 medium-3 column">
-    <h2>
-      <%= t("debates.index.featured_debates_html") %>
-    </h2>
-    <span class="show-for-medium-up">
-      <%= image_tag("featured_debates.jpg", size: "210x135") %>
-    </span>
+<div id="featured-debates" class="row featured-debates">
+
+  <div class="small-12 column">
+    <h2><%= t("debates.index.featured_debates") %></h2>
   </div>
-  <div class="small-12 medium-9 column debates-list">
-
-    <div class="debate-featured small-12 column">
-      <div class="panel">
-        <div class="content small-12 left">
-          <h3>
-          <%= link_to "#Túpreguntas: Manuela Carmena, Alcaldesa de Madrid.", "https://decide.madrid.es/debates/4320" %></h3>
-          <div class="info">
-            <span class="author">
-              <%= link_to "Manuela Carmena ", "https://decide.madrid.es/users/21452"%>
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div class="debate-featured small-12 column">
-      <div class="panel">
-        <div class="content small-12 left">
-          <h3>
-          <%= link_to "¿Y si cualquiera pudiera entrevistar a Manuela Carmena o a los otros concejales?", "https://decide.madrid.es/debates/4299" %></h3>
-          <div class="info">
-            <span class="author">
-              <%= link_to "ParticipaciónYTransparenciaAytoMadrid", "https://decide.madrid.es/users/52055"%>
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
 
+  <div class="small-12 medium-6 column">
+    <h3><%= link_to "#Túpreguntas: Manuela Carmena, Alcaldesa de Madrid.", "https://decide.madrid.es/debates/4320" %></h3>
+    <%= link_to "Manuela Carmena ", "https://decide.madrid.es/users/21452"%>
   </div>
+
+  <div class="small-12 medium-6 column">
+    <h3><%= link_to "¿Y si pudieras entrevistar a Manuela Carmena o a los otros concejales?", "https://decide.madrid.es/debates/4299" %></h3>
+    <%= link_to "ParticipaciónYTransparenciaAytoMadrid", "https://decide.madrid.es/users/52055"%>
+  </div>
+
 </div>
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index 10644632c..231b06b7b 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -9,41 +9,39 @@
   <div class="wrap row">
     <div id="debates" class="debates-list small-12 medium-9 column">
 
-      <div class="filters">
-        <div class="small-12 medium-7 left">
-          <% if @search_terms || @advanced_search_terms %>
-            <h2 class="margin-top">
-              <%= page_entries_info @debates %>
-              <% if !@advanced_search_terms %>
-                <%= t("debates.index.search_results", count: @debates.size, search_term: @search_terms) %>
-              <% end %>
-            </h2>
-          <% elsif @tag_filter %>
-            <h2 class="margin-top">
-              <%= page_entries_info @debates %>
-              <%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %>
-            </h2>
-          <% end %>
-        </div>
-
-        <% unless @tag_filter || @search_terms %>
-          <%= render "featured_debates_static" %>
+      <div class="small-12 medium-7 left">
+        <% if @search_terms || @advanced_search_terms %>
+          <h2 class="margin-top">
+            <%= page_entries_info @debates %>
+            <% if !@advanced_search_terms %>
+              <%= t("debates.index.search_results", count: @debates.size, search_term: @search_terms) %>
+            <% end %>
+          </h2>
+        <% elsif @tag_filter %>
+          <h2 class="margin-top">
+            <%= page_entries_info @debates %>
+            <%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %>
+          </h2>
         <% end %>
-
-        <%= render 'shared/order_links', i18n_namespace: "debates.index" %>
-
-        <div class="small-12 medium-12 advanced-search row">
-          <%= render "shared/advanced_search",
-                     search_path: debates_path(page: 1) %>
-        </div>
-
-        <div class="show-for-small-only">
-          <%= link_to t("debates.index.start_debate"), new_debate_path, class: 'button radius expand' %>
-        </div>
-
-        <%= render @debates %>
-        <%= paginate @debates %>
       </div>
+
+      <% unless @tag_filter || @search_terms %>
+        <%= render "featured_debates_static" %>
+      <% end %>
+
+      <div class="small-12 medium-12 advanced-search row">
+        <%= render "shared/advanced_search",
+                   search_path: debates_path(page: 1) %>
+      </div>
+
+      <%= render 'shared/order_links', i18n_namespace: "debates.index" %>
+
+      <div class="show-for-small-only">
+        <%= link_to t("debates.index.start_debate"), new_debate_path, class: 'button radius expand' %>
+      </div>
+
+      <%= render @debates %>
+      <%= paginate @debates %>
     </div>
 
     <div class="small-12 medium-3 column">
diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb
index 3593cf4c3..0a6f0ecc6 100644
--- a/app/views/layouts/devise.html.erb
+++ b/app/views/layouts/devise.html.erb
@@ -13,9 +13,9 @@
   </head>
 
   <body class="auth-page">
-    <div class="wrapper">
+    <div class="wrapper margin-top">
       <div class="row">
-        <div class="small-12 medium-8 large-5 column small-centered">
+        <div class="small-12 medium-8 large-5 column small-centered margin-top">
           <h1>
             <%= link_to root_path do %>
               <%= image_tag('header_logo_madrid.png', class: 'show-for-medium-up left', size: '96x96', alt: t("layouts.header.logo")) %>
diff --git a/app/views/proposals/_featured_proposal.html.erb b/app/views/proposals/_featured_proposal.html.erb
index f67a46721..623932c38 100644
--- a/app/views/proposals/_featured_proposal.html.erb
+++ b/app/views/proposals/_featured_proposal.html.erb
@@ -1,22 +1,18 @@
-<div id="<%= dom_id(proposal) %>" class="proposal-featured small-12 column">
-  <div class="panel">
-    <div class="content small-12 medium-9 left">
-      <h3><%= link_to proposal.title, proposal %></h3>
-      <div class="info">
-        <span class="author">
-          <% if proposal.author.hidden? || proposal.author.erased? %>
-            <%= t("proposals.show.author_deleted") %>
-          <% else %>
-            <%= proposal.author.name %>
-          <% end %>
-        </span>
-        <span>&nbsp;&bull;&nbsp;</span>
-        <%= t("proposals.proposal.supports", count: proposal.total_votes) %>
-      </div>
-    </div>
-
-    <div id="<%= dom_id(proposal) %>_votes" class="small-12 medium-3 left">
-      <%= render 'featured_votes', proposal: proposal %>
+<div id="<%= dom_id(proposal) %>" class="proposal-featured clear">
+  <div class="small-12 medium-9 column">
+    <h3><%= link_to proposal.title, proposal %></h3>
+    <div class="info">
+      <% if proposal.author.hidden? || proposal.author.erased? %>
+        <%= t("proposals.show.author_deleted") %>
+      <% else %>
+        <%= proposal.author.name %>
+      <% end %>
+      &nbsp;&bull;&nbsp;
+      <strong><%= t("proposals.proposal.supports", count: proposal.total_votes) %></strong>
     </div>
   </div>
+
+  <div id="<%= dom_id(proposal) %>_votes" class="small-12 medium-3 column">
+    <%= render 'featured_votes', proposal: proposal %>
+  </div>
 </div>
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb
index 6fc379be6..eb9c31884 100644
--- a/app/views/proposals/index.html.erb
+++ b/app/views/proposals/index.html.erb
@@ -9,59 +9,48 @@
   <div class="wrap row">
     <div id="proposals" class="proposals-list small-12 medium-9 column">
 
-      <div class="filters">
-        <div class="small-12 medium-7 left">
-          <% if @search_terms || @advanced_search_terms %>
-            <h2 class="margin-top">
-              <%= page_entries_info @proposals %>
-              <% if !@advanced_search_terms %>
-                <%= t("proposals.index.search_results", count: @proposals.size, search_term: @search_terms) %>
-              <% end %>
-            </h2>
-          <% elsif @tag_filter %>
-            <h2 class="margin-top">
-              <%= page_entries_info @proposals %>
-              <%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %>
+      <div class="small-12 medium-7 left">
+        <% if @search_terms || @advanced_search_terms %>
+          <h2 class="margin-top">
+            <%= page_entries_info @proposals %>
+            <% if !@advanced_search_terms %>
+              <%= t("proposals.index.search_results", count: @proposals.size, search_term: @search_terms) %>
+            <% end %>
+          </h2>
+        <% elsif @tag_filter %>
+          <h2 class="margin-top">
+            <%= page_entries_info @proposals %>
+            <%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %>
+        </h2>
+        <% end %>
+      </div>
+
+      <% if @featured_proposals.present? %>
+        <div id="featured-proposals" class="row featured-proposals">
+          <div class="small-12 column">
+            <h2>
+              <%= t("proposals.index.featured_proposals") %>
             </h2>
+          </div>
+          <% @featured_proposals.each do |featured_proposal| %>
+            <%= render "featured_proposal", proposal: featured_proposal %>
           <% end %>
         </div>
+      <% end %>
 
-        <div class="show-for-small-only">
-          <%= link_to t("proposals.index.start_proposal"), new_proposal_path, class: 'button radius expand' %>
-        </div>
+      <%= render 'shared/order_links', i18n_namespace: "proposals.index" %>
 
-        <% if @featured_proposals.present? %>
-          <div id="featured-proposals" class="row featured-proposals-container">
-            <div class="small-12 medium-3 column">
-              <h2>
-                <%= t("proposals.index.featured_proposals_html") %>
-              </h2>
-              <span class="show-for-medium-up">
-                <%= image_tag("featured_proposals.jpg", size: "210x135") %>
-              </span>
-            </div>
-            <div class="small-12 medium-9 column proposals-list">
-              <% @featured_proposals.each do |featured_proposal| %>
-                <%= render "featured_proposal", proposal: featured_proposal %>
-              <% end %>
-            </div>
-          </div>
-        <% end %>
-
-        <%= render 'shared/order_links', i18n_namespace: "proposals.index" %>
-
-        <div class="small-12 medium-12 advanced-search row">
-          <%= render "shared/advanced_search",
-                     search_path: proposals_path(page: 1)%>
-        </div>
-
-        <div class="show-for-small-only">
-          <%= link_to t("proposals.index.start_proposal"), new_proposal_path, class: 'button radius expand' %>
-        </div>
-
-        <%= render partial: 'proposals/proposal', collection: @proposals %>
-        <%= paginate @proposals %>
+      <div class="small-12 medium-12 advanced-search row">
+        <%= render "shared/advanced_search",
+                   search_path: proposals_path(page: 1)%>
       </div>
+
+      <div class="show-for-small-only">
+        <%= link_to t("proposals.index.start_proposal"), new_proposal_path, class: 'button radius expand' %>
+      </div>
+
+      <%= render partial: 'proposals/proposal', collection: @proposals %>
+      <%= paginate @proposals %>
     </div>
 
     <div class="small-12 medium-3 column">
diff --git a/app/views/spending_proposals/index.html.erb b/app/views/spending_proposals/index.html.erb
index 0bf276894..301ae2442 100644
--- a/app/views/spending_proposals/index.html.erb
+++ b/app/views/spending_proposals/index.html.erb
@@ -4,7 +4,7 @@
     <div class="more-information text small-12 medium-8 column">
       <h1><%= t('spending_proposals.index.title') %></h1>
 
-      <p><%= t('spending_proposals.index.text') %></p>
+      <p><%= t('spending_proposals.index.text_html') %></p>
 
       <% if can? :create, SpendingProposal %>
         <%= link_to t('spending_proposals.index.create_link'), new_spending_proposal_path, class: 'button radius' %>
diff --git a/app/views/spending_proposals/new.html.erb b/app/views/spending_proposals/new.html.erb
index c761487ff..6909f67aa 100644
--- a/app/views/spending_proposals/new.html.erb
+++ b/app/views/spending_proposals/new.html.erb
@@ -1,4 +1,4 @@
-<div class="spending-proposal-new row">
+<div class="spending-proposal-new row margin-top">
 
   <div class="small-12 medium-9 column">
     <%= link_to spending_proposals_path, class: "left back" do %>
@@ -15,7 +15,7 @@
   </div>
 
   <div class="small-12 medium-3 column">
-    <i class="icon-spending-proposals right"></i>
+    <i class="icon-budget right"></i>
     <h2><%= t("spending_proposals.new.recommendations_title") %></h2>
     <ul class="recommendations">
       <li><%= t("spending_proposals.new.recommendation_one") %></li>
diff --git a/app/views/welcome/highlights.html.erb b/app/views/welcome/highlights.html.erb
index f0b4e446e..66d335448 100644
--- a/app/views/welcome/highlights.html.erb
+++ b/app/views/welcome/highlights.html.erb
@@ -4,19 +4,16 @@
     <div class="wrap row">
       <div id="activities" class="debates-list small-12 medium-9 column">
 
-        <div class="filters">
-
-          <div class="small-12 medium-7 left">
-              <h1 class="inline-block"><%= t('welcome.highlights') %></h1>
-              &nbsp;&nbsp;
-              <h2 class="margin-top">
-                <%= t('welcome.signed_in_home_title') %>
-              </h2>
-          </div>
-
-          <%= render @list %>
-          <%= paginate @paginator %>
+        <div class="small-12 medium-7 left">
+            <h1 class="inline-block"><%= t('welcome.highlights') %></h1>
+            &nbsp;&nbsp;
+            <h2 class="margin-top">
+              <%= t('welcome.signed_in_home_title') %>
+            </h2>
         </div>
+
+        <%= render @list %>
+        <%= paginate @paginator %>
       </div>
 
       <div class="small-12 medium-3 column">
diff --git a/config/initializers/tolk.rb b/config/initializers/tolk.rb
new file mode 100644
index 000000000..2284aa921
--- /dev/null
+++ b/config/initializers/tolk.rb
@@ -0,0 +1,25 @@
+# encoding: utf-8
+
+# Tolk config file. Generated on January 14, 2016 12:09
+# See github.com/tolk/tolk for more informations
+
+Tolk.config do |config|
+
+  # If you need to add a mapping do it like this :
+  # May we suggest you use http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
+  # config.mapping['en-AU']   = 'English (Australia)'
+  # config.mapping['es-MX']   = 'Spanish (Mexico)'
+  # config.mapping['fr-ES']   = 'Frañol !'
+  # config.mapping['is']      = 'Icelandic'
+  # config.mapping['vi']      = 'Vietnamese'
+
+  # Master source of strings to be translated
+  config.primary_locale_name = 'en'
+end
+
+Tolk::ApplicationController.authenticator = proc {
+  authenticate_or_request_with_http_basic do |username, password|
+    username == Rails.application.secrets.translate_username &&
+      password == Rails.application.secrets.translate_password
+  end
+}
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index 5ace18663..de329a39e 100755
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -1,193 +1,194 @@
+---
 en:
   admin:
-    settings:
-      index:
-        title: "General settings"
-        update_setting: "Update"
-      flash:
-        updated: "Value updated"
-    dashboard:
-      index:
-        title: "Administration"
-    menu:
-      settings: "General settings"
-      debate_topics: "Debate topics"
-      hidden_proposals: "Hidden proposals"
-      hidden_debates: "Hidden debates"
-      hidden_comments: "Hidden comments"
-      hidden_users: "Hidden users"
-      spending_proposals: "Spending proposals"
-      incomplete_verifications: "Incomplete verifications"
-      organizations: "Organisations"
-      officials: "Officials"
-      moderators: "Moderators"
-      stats: "Statistics"
-      activity: "Moderator activity"
-    shared:
-      user_search:
-        placeholder: "Search user by name or email'"
-        button: "Search"
-      proposal_search:
-        placeholder: "Search proposals by title, description or question"
-        button: "Search"
-    organizations:
-      index:
-        title: "Organisations"
-        search_placeholder: "Name, email or phone number"
-        search: "Search"
-        verify: "Verify"
-        reject: "Reject"
-        verified: "Verified"
-        rejected: "Rejected"
-        filter: "Filter"
-        filters:
-          all: "All"
-          pending: "Pending"
-          verified: "Verified"
-          rejected: "Rejected"
-        hidden_count:
-          one: "There is also one organisation with no users or with a hidden user"
-          other: "There are %{count} organisations with no users or with a hidden user"
-      search:
-        title: "Search Organisations"
     actions:
-      hide: "Hide"
-      hide_author: "Hide author"
-      restore: "Restore"
-      confirm: "Are you sure?"
-      confirm_hide: "Confirm"
-    tags:
-      index:
-        title: "Debate topics"
-        add_tag: "Add a new debate topic"
-      mark_as_featured: "Propose topic upon creating debate"
-      name:
-        placeholder: "Type the name of the topic"
-      create: "Create Topic"
-      update: "Update Topic"
-      destroy: "Destroy Topic"
+      confirm: Are you sure?
+      confirm_hide: Confirm
+      hide: Hide
+      hide_author: Hide author
+      restore: Restore
+    activity:
+      show:
+        action: Action
+        actions:
+          block: Blocked
+          hide: Hidden
+          restore: Restored
+        by: Moderated by
+        filter: Show
+        filters:
+          all: All
+          on_comments: Comments
+          on_debates: Debates
+          on_proposals: Proposals
+          on_users: Users
+        title: Moderator activity
+        type: Type
     comments:
       index:
-        title: "Hidden comments"
-        hidden_proposal: "Hidden proposal"
-        hidden_debate: "Hidden debate"
-        filter: "Filter"
+        filter: Filter
         filters:
-          all: "All"
-          with_confirmed_hide: "Confirmed"
-          without_confirmed_hide: "Pending"
+          all: All
+          with_confirmed_hide: Confirmed
+          without_confirmed_hide: Pending
+        hidden_debate: Hidden debate
+        hidden_proposal: Hidden proposal
+        title: Hidden comments
+    dashboard:
+      index:
+        title: Administration
     debates:
       index:
-        title: "Hidden debates"
-        filter: "Filter"
+        filter: Filter
         filters:
-          all: "All"
-          with_confirmed_hide: "Confirmed"
-          without_confirmed_hide: "Pending"
+          all: All
+          with_confirmed_hide: Confirmed
+          without_confirmed_hide: Pending
+        title: Hidden debates
+    menu:
+      activity: Moderator activity
+      debate_topics: Debate topics
+      hidden_comments: Hidden comments
+      hidden_debates: Hidden debates
+      hidden_proposals: Hidden proposals
+      hidden_users: Hidden users
+      incomplete_verifications: Incomplete verifications
+      moderators: Moderators
+      officials: Officials
+      organizations: Organisations
+      settings: General settings
+      spending_proposals: Spending proposals
+      stats: Statistics
+    moderators:
+      index:
+        title: Moderators
+      moderator:
+        add: Add
+        delete: Delete
+      search:
+        email_placeholder: Search user by email
+        search: Search
+        user_not_found: User not found
+    officials:
+      edit:
+        back: Back
+        destroy: Remove 'Official' status
+        title: 'Officials: Edit user'
+      flash:
+        official_destroyed: 'Details saved: the user is no longer an official'
+        official_updated: Details of official saved
+      index:
+        title: Officials
+      level_0: Not official
+      level_1: Level 1
+      level_2: Level 2
+      level_3: Level 3
+      level_4: Level 4
+      level_5: Level 5
+      search:
+        edit_official: Edit official
+        make_official: Make official
+        title: 'Official positions: User search'
+    organizations:
+      index:
+        filter: Filter
+        filters:
+          all: All
+          pending: Pending
+          rejected: Rejected
+          verified: Verified
+        hidden_count:
+          one: There is also one organisation with no users or with a hidden user
+          other: There are %{count} organisations with no users or with a hidden user
+        reject: Reject
+        rejected: Rejected
+        search: Search
+        search_placeholder: Name, email or phone number
+        title: Organisations
+        verified: Verified
+        verify: Verify
+      search:
+        title: Search Organisations
     proposals:
       index:
-        title: "Hidden proposals"
-        filter: "Filter"
+        filter: Filter
         filters:
-          all: "All"
-          with_confirmed_hide: "Confirmed"
-          without_confirmed_hide: "Pending"
+          all: All
+          with_confirmed_hide: Confirmed
+          without_confirmed_hide: Pending
+        title: Hidden proposals
+    settings:
+      flash:
+        updated: Value updated
+      index:
+        title: General settings
+        update_setting: Update
+    shared:
+      proposal_search:
+        button: Search
+        placeholder: Search proposals by title, description or question
+      user_search:
+        button: Search
+        placeholder: Search user by name or email'
     spending_proposals:
       actions:
         accept: Accept
         reject: Reject
       index:
-        title: "Spending proposals for participatory budgeting"
-        filter: "Filter"
+        filter: Filter
         filters:
-          unresolved: "Unresolved"
-          accepted: "Accepted"
-          rejected: "Rejected"
+          accepted: Accepted
+          rejected: Rejected
+          unresolved: Unresolved
+        title: Spending proposals for participatory budgeting
       show:
-        geozone: "Scope"
-        by: "Sent by"
-    users:
-      index:
-        title: "Hidden users"
-        filter: "Filter"
-        filters:
-          all: "All"
-          with_confirmed_hide: "Confirmed"
-          without_confirmed_hide: "Pending"
-      show:
-        title: "Activity of user %{user}"
-        back: "Back"
-        email: "Email:"
-        registered_at: "Registered at:"
-        hidden_at: "Hidden at:"
-    verifications:
-      index:
-        title: "Incomplete verifications"
-        phone_not_given: "Phone not given"
-        sms_code_not_confirmed: "Has not confirmed the sms code"
-    officials:
-      level_0: "Not official"
-      level_1: "Level 1"
-      level_2: "Level 2"
-      level_3: "Level 3"
-      level_4: "Level 4"
-      level_5: "Level 5"
-      index:
-        title: "Officials"
-      search:
-        title: "Official positions: User search"
-        edit_official: "Edit official"
-        make_official: "Make official"
-      edit:
-        title: "Officials: Edit user"
-        destroy: "Remove 'Official' status"
-        back: "Back"
-      flash:
-        official_updated: "Details of official saved"
-        official_destroyed: "Details saved: the user is no longer an official"
-    moderators:
-      index:
-        title: "Moderators"
-      search:
-        email_placeholder: "Search user by email"
-        search: "Search"
-        user_not_found: "User not found"
-      moderator:
-        delete: "Delete"
-        add: "Add"
-    activity:
-      show:
-        title: "Moderator activity"
-        action: "Action"
-        by: "Moderated by"
-        type: "Type"
-        filter: "Show"
-        filters:
-          all: "All"
-          on_proposals: "Proposals"
-          on_debates: "Debates"
-          on_comments: "Comments"
-          on_users: "Users"
-        actions:
-          hide: "Hidden"
-          restore: "Restored"
-          block: "Blocked"
+        by: Sent by
+        geozone: Scope
     stats:
       show:
-        stats_title: "Stats"
-        visits_title: "Visits"
-        combined_title: "Combined"
+        combined_title: Combined
+        stats_title: Stats
         summary:
-          visits: "Visits"
-          debates: "Debates"
-          proposals: "Proposals"
-          comments: "Comments"
-          debate_votes: "Debate votes"
-          proposal_votes: "Proposal votes"
-          comment_votes: "Comment votes"
-          votes: "Total votes"
-          user_level_three: "Level three users"
-          user_level_two: "Level two users"
-          unverified_users: "Unverified users"
-          verified_users: "Verified users"
-          users: "Total users"
\ No newline at end of file
+          comment_votes: Comment votes
+          comments: Comments
+          debate_votes: Debate votes
+          debates: Debates
+          proposal_votes: Proposal votes
+          proposals: Proposals
+          unverified_users: Unverified users
+          user_level_three: Level three users
+          user_level_two: Level two users
+          users: Total users
+          verified_users: Verified users
+          visits: Visits
+          votes: Total votes
+        visits_title: Visits
+    tags:
+      create: Create Topic
+      destroy: Destroy Topic
+      index:
+        add_tag: Add a new debate topic
+        title: Debate topics
+      mark_as_featured: Propose topic upon creating debate
+      name:
+        placeholder: Type the name of the topic
+      update: Update Topic
+    users:
+      index:
+        filter: Filter
+        filters:
+          all: All
+          with_confirmed_hide: Confirmed
+          without_confirmed_hide: Pending
+        title: Hidden users
+      show:
+        back: Back
+        email: 'Email:'
+        hidden_at: 'Hidden at:'
+        registered_at: 'Registered at:'
+        title: Activity of user %{user}
+    verifications:
+      index:
+        phone_not_given: Phone not given
+        sms_code_not_confirmed: Has not confirmed the sms code
+        title: Incomplete verifications
diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml
index f82dd477c..ff056cb83 100644
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -1,193 +1,194 @@
+---
 es:
   admin:
-    settings:
-      index:
-        title: "Configuración global"
-        update_setting: "Actualizar"
-      flash:
-        updated: "Valor actualizado"
-    dashboard:
-      index:
-        title: "Administración"
-    menu:
-      settings: "Configuración global"
-      debate_topics: "Temas de debate"
-      hidden_proposals: "Propuestas ocultas"
-      hidden_debates: "Debates ocultos"
-      hidden_comments: "Comentarios ocultos"
-      hidden_users: "Usuarios bloqueados"
-      spending_proposals: "Propuestas de gasto"
-      incomplete_verifications: "Verificaciones incompletas"
-      organizations: "Organizaciones"
-      officials: "Cargos públicos"
-      moderators: "Moderadores"
-      stats: "Estadísticas"
-      activity: "Actividad de moderadores"
-    shared:
-      user_search:
-        placeholder: "Buscar usuario por nombre o email"
-        button: "Buscar"
-      proposal_search:
-        placeholder: "Buscar propuestas por título, descripción o pregunta"
-        button: "Buscar"
-    organizations:
-      index:
-        title: "Organizaciones"
-        search_placeholder: "Nombre, email o teléfono"
-        search: "Buscar"
-        verify: "Verificar"
-        reject: "Rechazar"
-        verified: "Verificada"
-        rejected: "Rechazada"
-        filter: "Filtro"
-        filters:
-          all: "Todas"
-          pending: "Pendientes"
-          verified: "Verificadas"
-          rejected: "Rechazadas"
-        hidden_count:
-          one: "Hay además una organización sin usuario o con el usuario bloqueado"
-          other: "Hay %{count} organizaciones sin usuario o con el usuario bloqueado"
-      search:
-        title: "Buscar Organizaciones"
     actions:
-      hide: "Ocultar"
-      hide_author: "Bloquear al autor"
-      restore: "Volver a mostrar"
       confirm: "¿Estás seguro?"
-      confirm_hide: "Confirmar"
-    tags:
-      index:
-        title: "Temas de debate"
-        add_tag: "Añade un nuevo tema de debate"
-      mark_as_featured: "Proponer tema al crear debate"
-      name:
-        placeholder: "Escribe el nombre del tema"
-      create: "Crear Tema"
-      update: "Actualizar Tema"
-      destroy: "Eliminar Tema"
+      confirm_hide: Confirmar
+      hide: Ocultar
+      hide_author: Bloquear al autor
+      restore: Volver a mostrar
+    activity:
+      show:
+        action: Acción
+        actions:
+          block: Bloqueado
+          hide: Ocultado
+          restore: Restaurado
+        by: Moderado por
+        filter: Mostrar
+        filters:
+          all: Todo
+          on_comments: Comentarios
+          on_debates: Debates
+          on_proposals: Propuestas
+          on_users: Usuarios
+        title: Actividad de los Moderadores
+        type: Tipo
     comments:
       index:
-        title: "Comentarios ocultos"
-        hidden_proposal: "Propuesta oculta"
-        hidden_debate: "Debate oculto"
-        filter: "Filtro"
+        filter: Filtro
         filters:
-          all: "Todos"
-          with_confirmed_hide: "Confirmados"
-          without_confirmed_hide: "Pendientes"
+          all: Todos
+          with_confirmed_hide: Confirmados
+          without_confirmed_hide: Pendientes
+        hidden_debate: Debate oculto
+        hidden_proposal: Propuesta oculta
+        title: Comentarios ocultos
+    dashboard:
+      index:
+        title: Administración
     debates:
       index:
-        title: "Debates ocultos"
-        filter: "Filtro"
+        filter: Filtro
         filters:
-          all: "Todos"
-          with_confirmed_hide: "Confirmados"
-          without_confirmed_hide: "Pendientes"
+          all: Todos
+          with_confirmed_hide: Confirmados
+          without_confirmed_hide: Pendientes
+        title: Debates ocultos
+    menu:
+      activity: Actividad de moderadores
+      debate_topics: Temas de debate
+      hidden_comments: Comentarios ocultos
+      hidden_debates: Debates ocultos
+      hidden_proposals: Propuestas ocultas
+      hidden_users: Usuarios bloqueados
+      incomplete_verifications: Verificaciones incompletas
+      moderators: Moderadores
+      officials: Cargos públicos
+      organizations: Organizaciones
+      settings: Configuración global
+      spending_proposals: Propuestas de gasto
+      stats: Estadísticas
+    moderators:
+      index:
+        title: Moderadores
+      moderator:
+        add: Añadir
+        delete: Borrar
+      search:
+        email_placeholder: Buscar usuario por email
+        search: Buscar
+        user_not_found: Usuario no encontrado
+    officials:
+      edit:
+        back: Volver
+        destroy: Eliminar condición de 'Cargo Público'
+        title: 'Cargos Públicos: Editar usuario'
+      flash:
+        official_destroyed: 'Datos guardados: el usuario ya no es cargo público'
+        official_updated: Datos del cargo público guardados
+      index:
+        title: Cargos Públicos
+      level_0: No es cargo público
+      level_1: Nivel 1
+      level_2: Nivel 2
+      level_3: Nivel 3
+      level_4: Nivel 4
+      level_5: Nivel 5
+      search:
+        edit_official: Editar cargo público
+        make_official: Convertir en cargo público
+        title: 'Cargos Públicos: Búsqueda de usuarios'
+    organizations:
+      index:
+        filter: Filtro
+        filters:
+          all: Todas
+          pending: Pendientes
+          rejected: Rechazadas
+          verified: Verificadas
+        hidden_count:
+          one: Hay además una organización sin usuario o con el usuario bloqueado
+          other: Hay %{count} organizaciones sin usuario o con el usuario bloqueado
+        reject: Rechazar
+        rejected: Rechazada
+        search: Buscar
+        search_placeholder: Nombre, email o teléfono
+        title: Organizaciones
+        verified: Verificada
+        verify: Verificar
+      search:
+        title: Buscar Organizaciones
     proposals:
       index:
-        title: "Propuestas ocultos"
-        filter: "Filtro"
+        filter: Filtro
         filters:
-          all: "Todas"
-          with_confirmed_hide: "Confirmadas"
-          without_confirmed_hide: "Pendientes"
+          all: Todas
+          with_confirmed_hide: Confirmadas
+          without_confirmed_hide: Pendientes
+        title: Propuestas ocultos
+    settings:
+      flash:
+        updated: Valor actualizado
+      index:
+        title: Configuración global
+        update_setting: Actualizar
+    shared:
+      proposal_search:
+        button: Buscar
+        placeholder: Buscar propuestas por título, descripción o pregunta
+      user_search:
+        button: Buscar
+        placeholder: Buscar usuario por nombre o email
     spending_proposals:
       actions:
         accept: Aceptar
         reject: Rechazar
       index:
-        title: "Propuestas de gasto para presupuestos participativos"
-        filter: "Filtro"
+        filter: Filtro
         filters:
-          unresolved: "Sin resolver"
-          accepted: "Aceptadas"
-          rejected: "Rechazadas"
+          accepted: Aceptadas
+          rejected: Rechazadas
+          unresolved: Sin resolver
+        title: Propuestas de gasto para presupuestos participativos
       show:
+        by: Enviada por
         geozone: "Ámbito"
-        by: "Enviada por"
-    users:
-      index:
-        title: "Usuarios bloqueados"
-        filter: "Filtro"
-        filters:
-          all: "Todos"
-          with_confirmed_hide: "Confirmados"
-          without_confirmed_hide: "Pendientes"
-      show:
-        title: "Actividad del usuario %{user}"
-        back: "Volver"
-        email: "Email:"
-        registered_at: "Fecha de alta:"
-        hidden_at: "Bloqueado:"
-    verifications:
-      index:
-        title: "Verificaciones incompletas"
-        phone_not_given: "No ha dado su teléfono"
-        sms_code_not_confirmed: "No ha introducido su código de seguridad"
-    officials:
-      level_0: "No es cargo público"
-      level_1: "Nivel 1"
-      level_2: "Nivel 2"
-      level_3: "Nivel 3"
-      level_4: "Nivel 4"
-      level_5: "Nivel 5"
-      index:
-        title: "Cargos Públicos"
-      search:
-        title: "Cargos Públicos: Búsqueda de usuarios"
-        edit_official: "Editar cargo público"
-        make_official: "Convertir en cargo público"
-      edit:
-        title: "Cargos Públicos: Editar usuario"
-        destroy: "Eliminar condición de 'Cargo Público'"
-        back: "Volver"
-      flash:
-        official_updated: "Datos del cargo público guardados"
-        official_destroyed: "Datos guardados: el usuario ya no es cargo público"
-    moderators:
-      index:
-        title: "Moderadores"
-      search:
-        email_placeholder: "Buscar usuario por email"
-        search: "Buscar"
-        user_not_found: "Usuario no encontrado"
-      moderator:
-        delete: "Borrar"
-        add: "Añadir"
-    activity:
-      show:
-        title: "Actividad de los Moderadores"
-        action: "Acción"
-        by: "Moderado por"
-        type: "Tipo"
-        filter: "Mostrar"
-        filters:
-          all: "Todo"
-          on_proposals: "Propuestas"
-          on_debates: "Debates"
-          on_comments: "Comentarios"
-          on_users: "Usuarios"
-        actions:
-          hide: "Ocultado"
-          restore: "Restaurado"
-          block: "Bloqueado"
     stats:
       show:
-        stats_title: "Estadísticas"
-        visits_title: "Visitas"
-        combined_title: "Combinado"
+        combined_title: Combinado
+        stats_title: Estadísticas
         summary:
-          visits: "Visitas"
-          debates: "Debates"
-          proposals: "Propuestas"
-          comments: "Comentarios"
-          debate_votes: "Votos en debates"
-          proposal_votes: "Votos en propuestas"
-          comment_votes: "Votos en comentarios"
-          votes: "Votos"
-          user_level_three: "Usuarios de nivel tres"
-          user_level_two: "Usuarios de nivel dos"
-          unverified_users: "Usuarios sin verificar"
-          verified_users: "Usuarios verificados"
-          users: "Usuarios"
+          comment_votes: Votos en comentarios
+          comments: Comentarios
+          debate_votes: Votos en debates
+          debates: Debates
+          proposal_votes: Votos en propuestas
+          proposals: Propuestas
+          unverified_users: Usuarios sin verificar
+          user_level_three: Usuarios de nivel tres
+          user_level_two: Usuarios de nivel dos
+          users: Usuarios
+          verified_users: Usuarios verificados
+          visits: Visitas
+          votes: Votos
+        visits_title: Visitas
+    tags:
+      create: Crear Tema
+      destroy: Eliminar Tema
+      index:
+        add_tag: Añade un nuevo tema de debate
+        title: Temas de debate
+      mark_as_featured: Proponer tema al crear debate
+      name:
+        placeholder: Escribe el nombre del tema
+      update: Actualizar Tema
+    users:
+      index:
+        filter: Filtro
+        filters:
+          all: Todos
+          with_confirmed_hide: Confirmados
+          without_confirmed_hide: Pendientes
+        title: Usuarios bloqueados
+      show:
+        back: Volver
+        email: 'Email:'
+        hidden_at: 'Bloqueado:'
+        registered_at: 'Fecha de alta:'
+        title: Actividad del usuario %{user}
+    verifications:
+      index:
+        phone_not_given: No ha dado su teléfono
+        sms_code_not_confirmed: No ha introducido su código de seguridad
+        title: Verificaciones incompletas
diff --git a/config/locales/devise_views.en.yml b/config/locales/devise_views.en.yml
index 508cfd820..62cc1a2a7 100755
--- a/config/locales/devise_views.en.yml
+++ b/config/locales/devise_views.en.yml
@@ -1,125 +1,126 @@
+---
 en:
   devise_views:
     confirmations:
       new:
-        title: "Re-send confirmation instructions"
-        email_label: "Email"
-        submit: "Re-send instructions"
+        email_label: Email
+        submit: Re-send instructions
+        title: Re-send confirmation instructions
       show:
-        title: "Confirm my account"
-        instructions_html: "Confirming the account with email %{email}"
-        please_set_password: "Please choose your new pasword (it will allow you to login with the email above)"
-        new_password_label: "New access password"
-        new_password_confirmation_label: "Repeat access password"
-        submit: "Confirm"
+        instructions_html: Confirming the account with email %{email}
+        new_password_confirmation_label: Repeat access password
+        new_password_label: New access password
+        please_set_password: Please choose your new pasword (it will allow you to login with the email above)
+        submit: Confirm
+        title: Confirm my account
     mailer:
       confirmation_instructions:
-        title: "Welcome to the Open Government Portal of the Madrid City Council"
-        welcome: "Welcome"
-        text: "You can confirm your email account at the following link:"
-        confirm_link: "Confirm my account"
+        confirm_link: Confirm my account
+        text: 'You can confirm your email account at the following link:'
+        title: Welcome to the Open Government Portal of the Madrid City Council
+        welcome: Welcome
       reset_password_instructions:
-        hello: "Hello"
-        title: "Change your password"
-        text: "We have received a request to change your password. You can do this at the following link:"
-        change_link: "Change my password"
-        ignore_text: "If you did not request a password change, you can ignore this email."
-        info_text: "Your password will not be changed unless you access the link and edit it."
+        change_link: Change my password
+        hello: Hello
+        ignore_text: If you did not request a password change, you can ignore this email.
+        info_text: Your password will not be changed unless you access the link and edit it.
+        text: 'We have received a request to change your password. You can do this at the following link:'
+        title: Change your password
       unlock_instructions:
-        hello: "Hello"
-        title: "Your account has been locked"
-        info_text: "Your account has been blocked due to an excessive number of failed sign-in attempts."
-        instructions_text: "Please click on this link to unlock your account:"
-        unlock_link: "Unlock my account"
+        hello: Hello
+        info_text: Your account has been blocked due to an excessive number of failed sign-in attempts.
+        instructions_text: 'Please click on this link to unlock your account:'
+        title: Your account has been locked
+        unlock_link: Unlock my account
     menu:
       login_items:
-        logout: "Sign out"
-        signup: "Register"
-        login: "Sign in"
-    passwords:
-      edit:
-        title: "Change your password"
-        password_label: "New password"
-        password_confirmation_label: "Confirm new password"
-        change_submit: "Change my password"
-      new:
-        title: "Forgotten password?"
-        email_label: "Email"
-        send_submit: "Send instructions"
-    users:
-      registrations:
-        edit:
-          edit: "Edit"
-          email_label: "Email"
-          waiting_for: "Awaiting confirmation of:"
-          leave_blank: "Leave blank if you do not wish to modify"
-          password_label: "New password"
-          password_confirmation_label: "Confirm new password"
-          current_password_label: "Current password"
-          need_current: "We need your current password to confirm the changes"
-          update_submit: "Update"
-          back_link: "Back"
-        new:
-          title: "Register"
-          username_label: "Username"
-          username_note: "Name that appears next to your posts"
-          email_label: "Email"
-          password_label: "Password"
-          password_confirmation_label: "Confirm password"
-          submit: "Register"
-          organization_signup: "Do you represent an organisation or collective? %{signup_link}"
-          organization_signup_link: "Sign up here"
-          terms: "By registering you accept the %{terms}"
-          terms_link: "terms and conditions of use"
-        success:
-          title: "Modify your email"
-          thank_you_html: "Thank you for registering for the website. You must now <b>confirm your email address</b>."
-          instructions_1_html: "Please <b>check your email</b> - we have sent you a <b>link to confirm your account</b>."
-          instructions_2_html: "Once confirmed, you may begin participation."
-          back_to_index: "I understand; go back to main page"
-        delete_form:
-          title: "Erase account"
-          info: "This action can not be undone. Please make sure this is what you want."
-          info_reason: "If you want, leave us a reason (optional)"
-          erase_reason_label: "Reason"
-          submit: "Erase my account"
+        login: Sign in
+        logout: Sign out
+        signup: Register
     organizations:
       registrations:
         new:
-          title: "Register as an organisation or collective"
-          organization_name_label: "Name of organisation"
-          responsible_name_label: "Full name of the person responsible for the collective"
-          responsible_name_note: "This would be the person representing the association/collective in whose name the proposals are presented"
-          email_label: "Email"
-          password_label: "Password"
-          phone_number_label: "Phone number"
-          password_confirmation_label: "Confirm password"
-          submit: "Register"
+          email_label: Email
+          organization_name_label: Name of organisation
+          password_confirmation_label: Confirm password
+          password_label: Password
+          phone_number_label: Phone number
+          responsible_name_label: Full name of the person responsible for the collective
+          responsible_name_note: This would be the person representing the association/collective in whose name the proposals are presented
+          submit: Register
+          title: Register as an organisation or collective
         success:
-          title: "Registration of organisation / collective"
-          thank_you_html: "Thank you for registering your collective on the website. It is now <b>pending verification</b>."
+          back_to_index: I understand; go back to main page
           instructions_1_html: "<b>We will contact you soon</b> to verify that you do in fact represent this collective."
-          instructions_2_html: "While your <b>email is reviewed</b>, we have sent you a <b>link to confirm your account</b>."
-          instructions_3_html: "Once confirmed, you may begin to participate as an unverified collective."
-          back_to_index: "I understand; go back to main page"
+          instructions_2_html: While your <b>email is reviewed</b>, we have sent you a <b>link to confirm your account</b>.
+          instructions_3_html: Once confirmed, you may begin to participate as an unverified collective.
+          thank_you_html: Thank you for registering your collective on the website. It is now <b>pending verification</b>.
+          title: Registration of organisation / collective
+    passwords:
+      edit:
+        change_submit: Change my password
+        password_confirmation_label: Confirm new password
+        password_label: New password
+        title: Change your password
+      new:
+        email_label: Email
+        send_submit: Send instructions
+        title: Forgotten password?
     sessions:
       new:
-        title: "Sign in"
-        email_label: "Email"
-        password_label: "Password"
-        remember_me: "Remember me"
-        submit: "Enter"
-    unlocks:
-      new:
-        title: "Re-sent unlocking instructions"
-        email_label: "Email"
-        submit: "Re-send unlocking instructions"
+        email_label: Email
+        password_label: Password
+        remember_me: Remember me
+        submit: Enter
+        title: Sign in
     shared:
       links:
-        login: "Enter"
-        signup: "Don't have an account? %{signup_link}"
-        signup_link: "Sign up"
-        signin_with_provider: "Sign in with %{provider}"
-        new_password: "Forgotten your password?"
-        new_confirmation: "Haven't received instructions to activate your account?"
-        new_unlock: "Haven't received unlocking instructions?"
+        login: Enter
+        new_confirmation: Haven't received instructions to activate your account?
+        new_password: Forgotten your password?
+        new_unlock: Haven't received unlocking instructions?
+        signin_with_provider: Sign in with %{provider}
+        signup: Don't have an account? %{signup_link}
+        signup_link: Sign up
+    unlocks:
+      new:
+        email_label: Email
+        submit: Re-send unlocking instructions
+        title: Re-sent unlocking instructions
+    users:
+      registrations:
+        delete_form:
+          erase_reason_label: Reason
+          info: This action can not be undone. Please make sure this is what you want.
+          info_reason: If you want, leave us a reason (optional)
+          submit: Erase my account
+          title: Erase account
+        edit:
+          back_link: Back
+          current_password_label: Current password
+          edit: Edit
+          email_label: Email
+          leave_blank: Leave blank if you do not wish to modify
+          need_current: We need your current password to confirm the changes
+          password_confirmation_label: Confirm new password
+          password_label: New password
+          update_submit: Update
+          waiting_for: 'Awaiting confirmation of:'
+        new:
+          email_label: Email
+          organization_signup: Do you represent an organisation or collective? %{signup_link}
+          organization_signup_link: Sign up here
+          password_confirmation_label: Confirm password
+          password_label: Password
+          submit: Register
+          terms: By registering you accept the %{terms}
+          terms_link: terms and conditions of use
+          title: Register
+          username_label: Username
+          username_note: Name that appears next to your posts
+        success:
+          back_to_index: I understand; go back to main page
+          instructions_1_html: Please <b>check your email</b> - we have sent you a <b>link to confirm your account</b>.
+          instructions_2_html: Once confirmed, you may begin participation.
+          thank_you_html: Thank you for registering for the website. You must now <b>confirm your email address</b>.
+          title: Modify your email
diff --git a/config/locales/devise_views.es.yml b/config/locales/devise_views.es.yml
index 83aea1d48..a5df0e4dc 100644
--- a/config/locales/devise_views.es.yml
+++ b/config/locales/devise_views.es.yml
@@ -1,125 +1,126 @@
+---
 es:
   devise_views:
     confirmations:
       new:
-        title: "Reenviar instrucciones de confirmación"
-        email_label: "Email"
-        submit: "Reenviar instrucciones"
+        email_label: Email
+        submit: Reenviar instrucciones
+        title: Reenviar instrucciones de confirmación
       show:
-        title: "Confirmar mi cuenta"
-        instructions_html: "Vamos a proceder a confirmar la cuenta con el email <b>%{email}</b>"
-        please_set_password: "Por favor introduce una nueva clave de acceso para su cuenta (te permitirá hacer login con el email de más arriba)"
-        new_password_label: "Nueva clave de acceso"
-        new_password_confirmation_label: "Repite la clave de nuevo"
-        submit: "Confirmar"
+        instructions_html: Vamos a proceder a confirmar la cuenta con el email <b>%{email}</b>
+        new_password_confirmation_label: Repite la clave de nuevo
+        new_password_label: Nueva clave de acceso
+        please_set_password: Por favor introduce una nueva clave de acceso para su cuenta (te permitirá hacer login con el email de más arriba)
+        submit: Confirmar
+        title: Confirmar mi cuenta
     mailer:
       confirmation_instructions:
-        title: "Te damos la bienvenida al Portal de Gobierno Abierto del Ayuntamiento de Madrid"
-        welcome: "Bienvenido/a"
-        text: "Puedes confirmar tu cuenta de correo electrónico en el siguiente enlace:"
-        confirm_link: "Confirmar mi cuenta"
+        confirm_link: Confirmar mi cuenta
+        text: 'Puedes confirmar tu cuenta de correo electrónico en el siguiente enlace:'
+        title: Te damos la bienvenida al Portal de Gobierno Abierto del Ayuntamiento de Madrid
+        welcome: Bienvenido/a
       reset_password_instructions:
-        hello: "Hola"
-        title: "Cambia tu contraseña"
-        text: "Se ha solicitado cambiar tu contraseña, puedes hacerlo en el siguiente enlace:"
-        change_link: "Cambiar mi contraseña"
-        ignore_text: "Si tú no lo has solicitado, puedes ignorar este email."
-        info_text: "Tu contraseña no cambiará hasta que no accedas al enlace y la modifiques."
+        change_link: Cambiar mi contraseña
+        hello: Hola
+        ignore_text: Si tú no lo has solicitado, puedes ignorar este email.
+        info_text: Tu contraseña no cambiará hasta que no accedas al enlace y la modifiques.
+        text: 'Se ha solicitado cambiar tu contraseña, puedes hacerlo en el siguiente enlace:'
+        title: Cambia tu contraseña
       unlock_instructions:
-        hello: "Hola"
-        title: "Tu cuenta ha sido bloqueada"
-        info_text: "Tu cuenta ha sido bloqueada debido a un excesivo número de intentos fallidos de alta."
-        instructions_text: "Sigue el siguiente enlace para desbloquear tu cuenta:"
-        unlock_link: "Desbloquear mi cuenta"
+        hello: Hola
+        info_text: Tu cuenta ha sido bloqueada debido a un excesivo número de intentos fallidos de alta.
+        instructions_text: 'Sigue el siguiente enlace para desbloquear tu cuenta:'
+        title: Tu cuenta ha sido bloqueada
+        unlock_link: Desbloquear mi cuenta
     menu:
       login_items:
-        logout: "Salir"
-        signup: "Registrarse"
-        login: "Entrar"
-    passwords:
-      edit:
-        title: "Cambia tu contraseña"
-        password_label: "Contraseña nueva"
-        password_confirmation_label: "Confirmar contraseña nueva"
-        change_submit: "Cambiar mi contraseña"
-      new:
-        title: "¿Has olvidado tu contraseña?"
-        email_label: "Email"
-        send_submit: "Recibir instrucciones"
-    users:
-      registrations:
-        edit:
-          edit: "Editar"
-          email_label: "Email"
-          waiting_for: "Esperando confirmación de:"
-          leave_blank: "Dejar en blanco si no deseas cambiarla"
-          password_label: "Contraseña nueva"
-          password_confirmation_label: "Confirmar contraseña nueva"
-          current_password_label: "Contraseña actual"
-          need_current: "Necesitamos tu contraseña actual para confirmar los cambios"
-          update_submit: "Actualizar"
-          back_link: "Atrás"
-        new:
-          title: "Registrarse"
-          username_label: "Nombre de usuario"
-          username_note: "Nombre que aparecerá en tus publicaciones"
-          email_label: "Email"
-          password_label: "Contraseña"
-          password_confirmation_label: "Confirmar contraseña"
-          submit: "Registrarse"
-          organization_signup: "¿Representas a una organización / colectivo? %{signup_link}"
-          organization_signup_link: "Regístrate aquí"
-          terms: "Al registrarte aceptas las %{terms}"
-          terms_link: "condiciones de uso"
-        success:
-          title: "Revisa tu correo"
-          thank_you_html: "Gracias por registrarte en la web. Ahora debes <b>confirmar tu correo</b>."
-          instructions_1_html: "Por favor <b>revisa tu correo electrónico</b> - te hemos enviado un <b>enlace para confirmar tu cuenta</b>."
-          instructions_2_html: "Una vez confirmado, podrás empezar a participar."
-          back_to_index: "Entendido, volver a la página principal"
-        delete_form:
-          title: "Darme de baja"
-          info: "Esta acción no se puede deshacer. Una vez que des de baja tu cuenta, no podrás volver a hacer login con ella."
-          info_reason: "Si quieres, escribe el motivo por el que te das de baja (opcional)."
-          erase_reason_label: "Razón de la baja"
-          submit: "Borrar mi cuenta"
+        login: Entrar
+        logout: Salir
+        signup: Registrarse
     organizations:
       registrations:
         new:
-          title: "Registrarse como organización / colectivo"
-          organization_name_label: "Nombre de la organización"
-          responsible_name_label: "Nombre y apellidos de la persona responsable del colectivo"
-          responsible_name_note: "Será la persona representante de la asociación/colectivo en cuyo nombre se presenten las propuestas"
-          email_label: "Email"
-          password_label: "Contraseña"
-          phone_number_label: "Teléfono"
-          password_confirmation_label: "Confirmar contraseña"
-          submit: "Registrarse"
+          email_label: Email
+          organization_name_label: Nombre de la organización
+          password_confirmation_label: Confirmar contraseña
+          password_label: Contraseña
+          phone_number_label: Teléfono
+          responsible_name_label: Nombre y apellidos de la persona responsable del colectivo
+          responsible_name_note: Será la persona representante de la asociación/colectivo en cuyo nombre se presenten las propuestas
+          submit: Registrarse
+          title: Registrarse como organización / colectivo
         success:
-          title: "Registro de organización / colectivo"
-          thank_you_html: "Gracias por registrar tu colectivo en la web. Ahora está <b>pendiente de verificación</b>."
-          instructions_1_html: "En breve <b>nos pondremos en contacto contigo</b> para verificar que realmente representas a este colectivo."
-          instructions_2_html: "Mientras <b>revisa tu correo electrónico</b>, te hemos enviado un <b>enlace para confirmar tu cuenta</b>."
-          instructions_3_html: "Una vez confirmado, podrás empezar a participar como colectivo no verificado."
-          back_to_index: "Entendido, volver a la página principal"
+          back_to_index: Entendido, volver a la página principal
+          instructions_1_html: En breve <b>nos pondremos en contacto contigo</b> para verificar que realmente representas a este colectivo.
+          instructions_2_html: Mientras <b>revisa tu correo electrónico</b>, te hemos enviado un <b>enlace para confirmar tu cuenta</b>.
+          instructions_3_html: Una vez confirmado, podrás empezar a participar como colectivo no verificado.
+          thank_you_html: Gracias por registrar tu colectivo en la web. Ahora está <b>pendiente de verificación</b>.
+          title: Registro de organización / colectivo
+    passwords:
+      edit:
+        change_submit: Cambiar mi contraseña
+        password_confirmation_label: Confirmar contraseña nueva
+        password_label: Contraseña nueva
+        title: Cambia tu contraseña
+      new:
+        email_label: Email
+        send_submit: Recibir instrucciones
+        title: "¿Has olvidado tu contraseña?"
     sessions:
       new:
-        title: "Entrar"
-        email_label: "Email"
-        password_label: "Contraseña"
-        remember_me: "Recordarme"
-        submit: "Entrar"
-    unlocks:
-      new:
-        title: "Reenviar instrucciones para desbloquear"
-        email_label: "Email"
-        submit: "Reenviar instrucciones para desbloquear"
+        email_label: Email
+        password_label: Contraseña
+        remember_me: Recordarme
+        submit: Entrar
+        title: Entrar
     shared:
       links:
-        login: "Entrar"
-        signup: "¿No tienes una cuenta? %{signup_link}"
-        signup_link: "Regístrate"
-        signin_with_provider: "Entrar con %{provider}"
-        new_password: "¿Olvidaste tu contraseña?"
+        login: Entrar
         new_confirmation: "¿No has recibido instrucciones para confirmar tu cuenta?"
+        new_password: "¿Olvidaste tu contraseña?"
         new_unlock: "¿No has recibido instrucciones para desbloquear?"
+        signin_with_provider: Entrar con %{provider}
+        signup: "¿No tienes una cuenta? %{signup_link}"
+        signup_link: Regístrate
+    unlocks:
+      new:
+        email_label: Email
+        submit: Reenviar instrucciones para desbloquear
+        title: Reenviar instrucciones para desbloquear
+    users:
+      registrations:
+        delete_form:
+          erase_reason_label: Razón de la baja
+          info: Esta acción no se puede deshacer. Una vez que des de baja tu cuenta, no podrás volver a hacer login con ella.
+          info_reason: Si quieres, escribe el motivo por el que te das de baja (opcional).
+          submit: Borrar mi cuenta
+          title: Darme de baja
+        edit:
+          back_link: Atrás
+          current_password_label: Contraseña actual
+          edit: Editar
+          email_label: Email
+          leave_blank: Dejar en blanco si no deseas cambiarla
+          need_current: Necesitamos tu contraseña actual para confirmar los cambios
+          password_confirmation_label: Confirmar contraseña nueva
+          password_label: Contraseña nueva
+          update_submit: Actualizar
+          waiting_for: 'Esperando confirmación de:'
+        new:
+          email_label: Email
+          organization_signup: "¿Representas a una organización / colectivo? %{signup_link}"
+          organization_signup_link: Regístrate aquí
+          password_confirmation_label: Confirmar contraseña
+          password_label: Contraseña
+          submit: Registrarse
+          terms: Al registrarte aceptas las %{terms}
+          terms_link: condiciones de uso
+          title: Registrarse
+          username_label: Nombre de usuario
+          username_note: Nombre que aparecerá en tus publicaciones
+        success:
+          back_to_index: Entendido, volver a la página principal
+          instructions_1_html: Por favor <b>revisa tu correo electrónico</b> - te hemos enviado un <b>enlace para confirmar tu cuenta</b>.
+          instructions_2_html: Una vez confirmado, podrás empezar a participar.
+          thank_you_html: Gracias por registrarte en la web. Ahora debes <b>confirmar tu correo</b>.
+          title: Revisa tu correo
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1ca0978ef..2bbafdc1d 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,466 +1,463 @@
+---
 en:
-  locale: "English"
-  errors:
-    messages:
-      user_not_found: "User not found"
-  layouts:
-    header:
-      logo: "Madrid"
-      external_link_transparency: "Transparency"
-      external_link_transparency_url: "https://transparencia.madrid.es"
-      external_link_opendata: "Open data"
-      external_link_opendata_url: "http://datos.madrid.es"
-      external_link_blog: "Blog"
-      external_link_blog_url: "/blog"
-      open_gov: "Open government"
-      open: "open"
-      participation_html: "Madrid Decide"
-      open_data: "Open data"
-      open_city_title: "Love the city, and it will become a city you love."
-      open_city_slogan_html:
-        "There are cities that are governed directly by their inhabitants, who <b>discuss</b> the topics they are concerned about, <b>propose</b> ideas to improve
-        their lives and <b>decide</b> among themselves which ones will be carried out. Madrid is already one of these cities."
-      see_all: "See proposals"
-      my_activity_link: "My activity"
-      my_account_link: "My account"
-      locale: "Language:"
-      administration: "Administration"
-      moderation: "Moderation"
-      more_information: "More information"
-      debates: "Debates"
-      proposals: "Proposals"
-      spending_proposals: "Spending proposals"
-      new_notifications:
-        one: "You have a new notification"
-        other: "You have %{count} new notifications"
-      no_notifications: "You don't have new notifications"
-    footer:
-      description: "This portal uses the %{consul} which is %{open_source}. From Madrid out into the world."
-      open_source: "open-source software"
-      open_source_url: "http://www.gnu.org/licenses/agpl-3.0.html"
-      consul: "Consul application"
-      consul_url: "https://github.com/consul/consul"
-      copyright: "Ayuntamiento de Madrid, %{year}"
-      participation_title: "Participation"
-      participation_text: "Decide how to shape the Madrid you want to live in."
-      transparency_title: "Transparency"
-      transparency_url: "https://transparencia.madrid.es"
-      transparency_text: "Find out anything about the Madrid City Council."
-      open_data_title: "Open data"
-      open_data_text: "Every detail about the City Council is yours to access."
-      contact_us: "For technical assistance enters"
-      faq: "technical assistance"
-      privacy: "Privacy Policy"
-      conditions: "Terms and conditions of use"
-      more_info: "More information"
-      accessibility: "Accessibility"
-    application:
-      ie_title: "This website is not optimised for your browser"
-      ie:
-        "We have detected that you are browsing with Internet Explorer.
-        For an enhanced experience, we recommend using %{chrome} or %{firefox}."
-      chrome: "Google Chrome"
-      firefox: "Firefox"
-  social:
-    twitter: "Twitter"
-    facebook: "Facebook"
-    blog: "Blog"
-    youtube: "YouTube"
-  form:
-    error: "error"
-    errors: "errors"
-    not_saved: "prevented this %{resource} from being saved:"
-    accept_terms: "I agree to the %{policy} and the %{conditions}"
-    policy: "Privacy Policy"
-    conditions: "Terms and conditions of use"
-    user: "Account"
-    debate: "Debate"
-    proposal: "Proposal"
-    spending_proposal: "Spending proposal"
-    verification::sms: "Telephone"
-    verification::letter: "the verification"
-  application:
-    close: "Close"
-    menu: "Menu"
-  debates:
-    index:
-      title: "Debates"
-      featured_debates_html: "Featured<br>debates"
-      start_debate: "Start a debate"
-      select_order: "Order by"
-      orders:
-        confidence_score: "highest rated"
-        hot_score: "most active"
-        created_at: "newest"
-        most_commented: "most commented"
-        relevance: "relevance"
-      filter_topic:
-        one: " with topic '%{topic}'"
-        other: " with topic '%{topic}'"
-      search_form:
-        title: "Search"
-        button: "Search"
-        placeholder: "Search debates..."
-      search_results:
-        one: " containing the term '%{search_term}'"
-        other: " containing the term '%{search_term}'"
-    debate:
-      debate: "Debate"
-      comments:
-        zero: "No comments"
-        one: "1 comment"
-        other: "%{count} comments"
-      votes:
-        zero: "No votes"
-        one: "1 vote"
-        other: "%{count} votes"
-    form:
-      debate_title: "Debate title"
-      debate_text: "Initial debate text"
-      tags_label: "Topics"
-      tags_instructions: "Tag this debate. You can choose from our suggestions or enter your own."
-      tags_placeholder: "Enter the tags you would like to use, separated by commas (',')"
-    show:
-      back_link: "Go back"
-      author_deleted: "User deleted"
-      comments_title: "Comments"
-      comments:
-        zero: "No comments"
-        one: "1 comment"
-        other: "%{count} comments"
-      login_to_comment: "You must %{signin} or %{signup} to leave a comment."
-      edit_debate_link: "Edit"
-      share: "Share"
-      flag: "This debate has been flagged as inappropriate by several users."
-    edit:
-      editing: "Edit debate"
-      show_link: "View debate"
-      back_link: "Go back"
-      form:
-        submit_button: "Save changes"
-    new:
-      start_new: "Start a debate"
-      info: "If you want to make a proposal, this is the wrong section, enter %{info_link}."
-      info_link: "create new proposal"
-      more_info: "More information"
-      back_link: "Go back"
-      recommendations_title: "Recommendations for creating a debate"
-      recommendation_one: "Do not use capital letters for the debate title or for whole sentences. On the internet, this is considered shouting. And nobody likes being shouted at."
-      recommendation_two: "Any debate or comment suggesting illegal action will be deleted, as well as those intending to sabotage the debate spaces. Anything else is allowed."
-      recommendation_three: "Ruthless criticism is very welcome. This is a space for reflection. But we recommend that you stick to elegance and intelligence. The world is a better place with these virtues in it."
-      recommendation_four: "Enjoy this space and the voices that fill it. It belongs to you too."
-      form:
-        submit_button: "Start a debate"
-    create:
-      form:
-        submit_button: "Start a debate"
-    update:
-      form:
-        submit_button: "Save changes"
-  proposals:
-    index:
-      title: "Proposals"
-      featured_proposals_html: "Featured<br>proposals"
-      start_proposal: "Create a proposal"
-      select_order_long: "You are viewing proposals according to:"
-      select_order: "Order by"
-      orders:
-        confidence_score: "highest rated"
-        hot_score: "most active"
-        created_at: "newest"
-        most_commented: "most commented"
-        relevance: "relevance"
-      filter_topic:
-        one: " with topic '%{topic}'"
-        other: " with topic '%{topic}'"
-      search_form:
-        title: "Search"
-        button: "Search"
-        placeholder: "Search proposals..."
-      search_results:
-        one: " containing the term '%{search_term}'"
-        other: " containing the term '%{search_term}'"
-    proposal:
-      proposal: "Proposal"
-      support: "Support"
-      support_title: "Support this proposal"
-      comments:
-        zero: "No comments"
-        one: "1 comment"
-        other: "%{count} comments"
-      supports:
-        zero: "No supports"
-        one: "1 support"
-        other: "%{count} supports"
-      supports_necessary: "%{number} supports needed"
-      reason_for_supports_necessary: "2% of Census"
-      total_percent: "100%"
-      already_supported: "You have already supported this proposal. Share it!"
-    form:
-      proposal_title: "Proposal title"
-      proposal_question: "Proposal question"
-      proposal_question_example_html: "Must be summarised in one question with a Yes or No answer. <em>E.g. 'Do you agree with the pedestrianisation of Calle Mayor?'</em>"
-      proposal_summary: "Proposal summary"
-      proposal_summary_note: "(maximum 200 characters)"
-      proposal_text: "Proposal text"
-      proposal_external_url: "Link to additional documentation"
-      proposal_video_url: "Link to external video"
-      proposal_video_url_note: "You may add a link to YouTube or Vimeo"
-      proposal_responsible_name: "Full name of the person submitting the proposal"
-      proposal_responsible_name_note: "(individually or as representative of a collective; will not be displayed publically)"
-      tags_label: "Tags"
-      tags_instructions: "Tag this proposal. You can choose from our tags or add your own."
-      tags_placeholder: "Enter the tags you would like to use, separated by commas (',')"
-    show:
-      back_link: "Go back"
-      author_deleted: "User deleted"
-      code: "Proposal code:"
-      comments_title: "Comments"
-      comments:
-        zero: "No comments"
-        one: "1 comment"
-        other: "%{count} comments"
-      login_to_comment: "You must %{signin} or %{signup} to leave a comment."
-      edit_proposal_link: "Edit"
-      share: "Share"
-      flag: "This proposal has been flagged as inappropriate by several users."
-    edit:
-      editing: "Edit proposal"
-      show_link: "View proposal"
-      back_link: "Go back"
-      form:
-        submit_button: "Save changes"
-    new:
-      start_new: "Create new proposal"
-      more_info: "How do citizen proposals work?"
-      back_link: "Go back"
-      recommendations_title: "Recommendations for creating a proposal"
-      recommendation_one: "Do not use capital letters for the proposal title or for whole sentences. On the internet, this is considered shouting. And nobody likes being shouted at."
-      recommendation_two: "Any proposal or comment suggesting illegal action will be deleted, as well as those intending to sabotage the debate spaces. Anything else is allowed."
-      recommendation_three: "Enjoy this space and the voices that fill it. It belongs to you too."
-      form:
-        submit_button: "Create proposal"
-    create:
-      form:
-        submit_button: "Create proposal"
-    update:
-      form:
-        submit_button: "Save changes"
-  spending_proposals:
-    index:
-      title: "Participatory budgeting"
-      text: "Here you can send spending proposals to be considered in the frame of the annual participatory budgeting."
-      create_link: "Create spending proposal"
-      verified_only: "Only verified users can create spending proposals, %{verify_account}."
-      verify_account: "verify your account"
-    new:
-      back_link: Back
-      start_new: "Create spending proposal"
-      more_info: "How do participatory budgeting works?"
-      recommendations_title: "Recommendations for creating a spending proposal"
-      recommendation_one: "It's mandatory that the proposal makes reference to a budgetable action."
-      recommendation_two: "Any proposal or comment suggesting illegal action will be deleted."
-      recommendation_three: "Try to go into details when describing your spending proposal so the reviewing team undertands your points."
-    form:
-      title: "Spending proposal title"
-      description: "Description"
-      external_url: "Link to additional documentation"
-      geozone: "Scope of operation"
-      submit_buttons:
-        new: Create
-        create: Create
-  geozones:
-    none: "All city"
-  comments:
-    show:
-      return_to_commentable: "Go back to "
-    select_order: "Sort by"
-    orders:
-      most_voted: "Most voted"
-      newest: "Newest first"
-      oldest: "Oldest first"
-    form:
-      leave_comment: "Leave your comment"
-      comment_as_moderator: "Comment as moderator"
-      comment_as_admin: "Comment as admin"
-    comment:
-      author: "Author"
-      moderator: "Moderator"
-      admin: "Administrator"
-      deleted: "This comment has been deleted"
-      user_deleted: "User deleted"
-      responses:
-        zero: "No responses"
-        one: "1 response"
-        other: "%{count} responses"
-      votes:
-        zero: "No votes"
-        one: "1 vote"
-        other: "%{count} votes"
-  comments_helper:
-    comment_link: "Comment"
-    comment_button: "Publish comment"
-    reply_link: "Reply"
-    reply_button: "Publish reply"
-  votes:
-    agree: "I agree"
-    disagree: "I disagree"
-    supports: "Supports"
-    unauthenticated: "You must %{signin} or %{signup} to continue."
-    signin: "Sign in"
-    signup: "Sign up"
-    anonymous: "Too many anonymous votes to admit vote %{verify_account}."
-    verified_only: "Only verified users can vote on proposals; %{verify_account}."
-    verify_account: "verify your account"
-    organizations: "Organisations are not permitted to vote"
   account:
     show:
-      title: "My account"
-      save_changes_submit: "Save changes"
-      change_credentials_link: "Change my credentials"
-      public_activity_label: "Keep my list of activities public"
-      email_on_comment_label: "Notify me by email when someone comments on my proposals or debates"
-      email_on_comment_reply_label: "Notify me by email when someone replies to my comments"
-      subscription_to_website_newsletter_label: "Receive by email website relevant information"
-      erase_account_link: "Erase my account"
-      personal: "Personal details"
-      username_label: "Username"
-      phone_number_label: "Phone number"
-      organization_name_label: "Name of organisation"
-      organization_responsible_name_placeholder: "Representative of the organisation/collective"
-      notifications: "Notifications"
-      finish_verification: "Complete verification"
-      verified_account: "Account verified"
-      verify_my_account: "Verify my account"
-      user_permission_title: "Participation"
-      user_permission_info: "With your account you can..."
-      user_permission_debates: "Participate on debates"
-      user_permission_proposal: "Create new proposals"
-      user_permission_support_proposal: "Support proposals"
-      user_permission_votes: "Participate on final voting"
-      user_permission_verify: "To perform all the actions verify your account."
+      change_credentials_link: Change my credentials
+      email_on_comment_label: Notify me by email when someone comments on my proposals or debates
+      email_on_comment_reply_label: Notify me by email when someone replies to my comments
+      erase_account_link: Erase my account
+      finish_verification: Complete verification
+      notifications: Notifications
+      organization_name_label: Name of organisation
+      organization_responsible_name_placeholder: Representative of the organisation/collective
+      personal: Personal details
+      phone_number_label: Phone number
+      public_activity_label: Keep my list of activities public
+      save_changes_submit: Save changes
+      subscription_to_website_newsletter_label: Receive by email website relevant information
+      title: My account
+      user_permission_debates: Participate on debates
+      user_permission_info: With your account you can...
+      user_permission_proposal: Create new proposals
+      user_permission_support_proposal: Support proposals
+      user_permission_title: Participation
+      user_permission_verify: To perform all the actions verify your account.
       user_permission_verify_info: "* Only for users on Madrid City Census."
+      user_permission_votes: Participate on final voting
+      username_label: Username
+      verified_account: Account verified
+      verify_my_account: Verify my account
+  application:
+    close: Close
+    menu: Menu
+  comments:
+    comment:
+      admin: Administrator
+      author: Author
+      deleted: This comment has been deleted
+      moderator: Moderator
+      responses:
+        one: 1 response
+        other: "%{count} responses"
+        zero: No responses
+      user_deleted: User deleted
+      votes:
+        one: 1 vote
+        other: "%{count} votes"
+        zero: No votes
+    form:
+      comment_as_admin: Comment as admin
+      comment_as_moderator: Comment as moderator
+      leave_comment: Leave your comment
+    orders:
+      most_voted: Most voted
+      newest: Newest first
+      oldest: Oldest first
+    select_order: Sort by
+    show:
+      return_to_commentable: 'Go back to '
+  comments_helper:
+    comment_button: Publish comment
+    comment_link: Comment
+    reply_button: Publish reply
+    reply_link: Reply
+  debates:
+    create:
+      form:
+        submit_button: Start a debate
+    debate:
+      comments:
+        one: 1 comment
+        other: "%{count} comments"
+        zero: No comments
+      debate: Debate
+      votes:
+        one: 1 vote
+        other: "%{count} votes"
+        zero: No votes
+    edit:
+      back_link: Go back
+      editing: Edit debate
+      form:
+        submit_button: Save changes
+      show_link: View debate
+    form:
+      debate_text: Initial debate text
+      debate_title: Debate title
+      tags_instructions: Tag this debate. You can choose from our suggestions or enter your own.
+      tags_label: Topics
+      tags_placeholder: Enter the tags you would like to use, separated by commas (',')
+    index:
+      featured_debates: Featured
+      filter_topic:
+        one: " with topic '%{topic}'"
+        other: " with topic '%{topic}'"
+      orders:
+        confidence_score: highest rated
+        created_at: newest
+        hot_score: most active
+        most_commented: most commented
+        relevance: relevance
+      search_form:
+        button: Search
+        placeholder: Search debates...
+        title: Search
+      search_results:
+        one: " containing the term '%{search_term}'"
+        other: " containing the term '%{search_term}'"
+      select_order: Order by
+      start_debate: Start a debate
+      title: Debates
+    new:
+      back_link: Go back
+      form:
+        submit_button: Start a debate
+      info: If you want to make a proposal, this is the wrong section, enter %{info_link}.
+      info_link: create new proposal
+      more_info: More information
+      recommendation_four: Enjoy this space and the voices that fill it. It belongs to you too.
+      recommendation_one: Do not use capital letters for the debate title or for whole sentences. On the internet, this is considered shouting. And nobody likes being shouted at.
+      recommendation_three: Ruthless criticism is very welcome. This is a space for reflection. But we recommend that you stick to elegance and intelligence. The world is a better place with these virtues in it.
+      recommendation_two: Any debate or comment suggesting illegal action will be deleted, as well as those intending to sabotage the debate spaces. Anything else is allowed.
+      recommendations_title: Recommendations for creating a debate
+      start_new: Start a debate
+    show:
+      author_deleted: User deleted
+      back_link: Go back
+      comments:
+        one: 1 comment
+        other: "%{count} comments"
+        zero: No comments
+      comments_title: Comments
+      edit_debate_link: Edit
+      flag: This debate has been flagged as inappropriate by several users.
+      login_to_comment: You must %{signin} or %{signup} to leave a comment.
+      share: Share
+    update:
+      form:
+        submit_button: Save changes
+  errors:
+    messages:
+      user_not_found: User not found
+  form:
+    accept_terms: I agree to the %{policy} and the %{conditions}
+    conditions: Terms and conditions of use
+    debate: Debate
+    error: error
+    errors: errors
+    not_saved: 'prevented this %{resource} from being saved:'
+    policy: Privacy Policy
+    proposal: Proposal
+    spending_proposal: Spending proposal
+    user: Account
+    verification::letter: the verification
+    verification::sms: Telephone
+  geozones:
+    none: All city
+  layouts:
+    application:
+      chrome: Google Chrome
+      firefox: Firefox
+      ie: We have detected that you are browsing with Internet Explorer. For an enhanced experience, we recommend using %{chrome} or %{firefox}.
+      ie_title: This website is not optimised for your browser
+    footer:
+      accessibility: Accessibility
+      conditions: Terms and conditions of use
+      consul: Consul application
+      consul_url: https://github.com/consul/consul
+      contact_us: For technical assistance enters
+      copyright: Ayuntamiento de Madrid, %{year}
+      description: This portal uses the %{consul} which is %{open_source}. From Madrid out into the world.
+      faq: technical assistance
+      more_info: More information
+      open_data_text: Every detail about the City Council is yours to access.
+      open_data_title: Open data
+      open_source: open-source software
+      open_source_url: http://www.gnu.org/licenses/agpl-3.0.html
+      participation_text: Decide how to shape the Madrid you want to live in.
+      participation_title: Participation
+      privacy: Privacy Policy
+      transparency_text: Find out anything about the Madrid City Council.
+      transparency_title: Transparency
+      transparency_url: https://transparencia.madrid.es
+    header:
+      administration: Administration
+      debates: Debates
+      external_link_blog: Blog
+      external_link_blog_url: "/blog"
+      external_link_opendata: Open data
+      external_link_opendata_url: http://datos.madrid.es
+      external_link_transparency: Transparency
+      external_link_transparency_url: https://transparencia.madrid.es
+      locale: 'Language:'
+      logo: Madrid
+      moderation: Moderation
+      more_information: More information
+      my_account_link: My account
+      my_activity_link: My activity
+      new_notifications:
+        one: You have a new notification
+        other: You have %{count} new notifications
+      no_notifications: You don't have new notifications
+      open: open
+      open_city_slogan_html: There are cities that are governed directly by their inhabitants, who <b>discuss</b> the topics they are concerned about, <b>propose</b> ideas to improve their lives and <b>decide</b> among themselves which ones will be carried out. Madrid is already one of these cities.
+      open_city_title: Love the city, and it will become a city you love.
+      open_data: Open data
+      open_gov: Open government
+      participation_html: Madrid Decide
+      proposals: Proposals
+      see_all: See proposals
+      spending_proposals: Spending proposals
+  legislation:
+    help:
+      alt: Select the text you want to comment and press the button with the pencil.
+      text: To comment this document you must %{sign_in} or %{sign_up}. Then select the text you want to comment and press the button with the pencil.
+      text_sign_in: login
+      text_sign_up: sign up
+      title: How I can comment this document?
+  locale: English
   notifications:
     index:
-      title: "Notifications"
-      mark_all_as_read: "Mark all as read"
-      empty_notifications: "You don't have new notifications."
       comments_on:
-        one: "Someone commented on"
-        other: "There are %{count} new comments on"
+        one: Someone commented on
+        other: There are %{count} new comments on
+      empty_notifications: You don't have new notifications.
+      mark_all_as_read: Mark all as read
       replies_to:
-        one: "Someone replied to your comment on"
-        other: "There are %{count} new replies to your comment on"
-  simple_captcha:
-    placeholder: "Enter the text from the image"
-    label: "Enter the text from the image in the box below"
-    refresh_button_text: "Refresh"
-    message:
-      user: "the secret code does not match the image"
-      debate: "the secret code does not match the image"
-      proposal: "the secret code does not match the image"
-      spendingproposal: "the secret code does not match the image"
+        one: Someone replied to your comment on
+        other: There are %{count} new replies to your comment on
+      title: Notifications
+  omniauth:
+    facebook:
+      sign_in: Sign in with Facebook
+      sign_up: Sign up with Facebook
+    finish_signup:
+      title: Add your email address
+    google_oauth2:
+      sign_in: Sign in with Google
+      sign_up: Sign up with Google
+    twitter:
+      sign_in: Sign in with Twitter
+      sign_up: Sign up with Twitter
+  proposals:
+    create:
+      form:
+        submit_button: Create proposal
+    edit:
+      back_link: Go back
+      editing: Edit proposal
+      form:
+        submit_button: Save changes
+      show_link: View proposal
+    form:
+      proposal_external_url: Link to additional documentation
+      proposal_question: Proposal question
+      proposal_question_example_html: Must be summarised in one question with a Yes or No answer. <em>E.g. 'Do you agree with the pedestrianisation of Calle Mayor?'</em>
+      proposal_responsible_name: Full name of the person submitting the proposal
+      proposal_responsible_name_note: "(individually or as representative of a collective; will not be displayed publically)"
+      proposal_summary: Proposal summary
+      proposal_summary_note: "(maximum 200 characters)"
+      proposal_text: Proposal text
+      proposal_title: Proposal title
+      proposal_video_url: Link to external video
+      proposal_video_url_note: You may add a link to YouTube or Vimeo
+      tags_instructions: Tag this proposal. You can choose from our tags or add your own.
+      tags_label: Tags
+      tags_placeholder: Enter the tags you would like to use, separated by commas (',')
+    index:
+      featured_proposals: Featured
+      filter_topic:
+        one: " with topic '%{topic}'"
+        other: " with topic '%{topic}'"
+      orders:
+        confidence_score: highest rated
+        created_at: newest
+        hot_score: most active
+        most_commented: most commented
+        relevance: relevance
+      search_form:
+        button: Search
+        placeholder: Search proposals...
+        title: Search
+      search_results:
+        one: " containing the term '%{search_term}'"
+        other: " containing the term '%{search_term}'"
+      select_order: Order by
+      select_order_long: 'You are viewing proposals according to:'
+      start_proposal: Create a proposal
+      title: Proposals
+    new:
+      back_link: Go back
+      form:
+        submit_button: Create proposal
+      more_info: How do citizen proposals work?
+      recommendation_one: Do not use capital letters for the proposal title or for whole sentences. On the internet, this is considered shouting. And nobody likes being shouted at.
+      recommendation_three: Enjoy this space and the voices that fill it. It belongs to you too.
+      recommendation_two: Any proposal or comment suggesting illegal action will be deleted, as well as those intending to sabotage the debate spaces. Anything else is allowed.
+      recommendations_title: Recommendations for creating a proposal
+      start_new: Create new proposal
+    proposal:
+      already_supported: You have already supported this proposal. Share it!
+      comments:
+        one: 1 comment
+        other: "%{count} comments"
+        zero: No comments
+      proposal: Proposal
+      reason_for_supports_necessary: 2% of Census
+      support: Support
+      support_title: Support this proposal
+      supports:
+        one: 1 support
+        other: "%{count} supports"
+        zero: No supports
+      supports_necessary: "%{number} supports needed"
+      total_percent: 100%
+    show:
+      author_deleted: User deleted
+      back_link: Go back
+      code: 'Proposal code:'
+      comments:
+        one: 1 comment
+        other: "%{count} comments"
+        zero: No comments
+      comments_title: Comments
+      edit_proposal_link: Edit
+      flag: This proposal has been flagged as inappropriate by several users.
+      login_to_comment: You must %{signin} or %{signup} to leave a comment.
+      share: Share
+    update:
+      form:
+        submit_button: Save changes
   shared:
-    author_info:
-      author_deleted: "User deleted"
-    tags_cloud:
-      tags: "Trending"
-    print:
-      print_button: "Print this info"
-    flag: "Flag as inappropriate"
-    unflag: "Unflag"
-    collective: "Collective"
-    check: "Select"
-    check_all: "All"
-    check_none: "None"
     advanced_search:
-      title: 'Advanced search'
-      general: 'With the text'
-      general_placeholder: 'Write the text'
       author_type: 'By author category'
       author_type_blank: 'Select a category'
-      date_range_blank: 'Choose a date'
       author_type_1: 'Public employee'
       author_type_2: 'Municipal Organization'
       author_type_3: 'General director'
       author_type_4: 'City councillor'
       author_type_5: 'Mayoress'
       date: 'By date'
+      date_range_blank: 'Choose a date'
       date_1: 'Last 24 hours'
       date_2: 'Last week'
       date_3: 'Last month'
       date_4: 'Last year'
       date_5: 'Customized'
       from: 'From'
-      to: 'To'
+      general: 'With the text'
+      general_placeholder: 'Write the text'
       search: 'Filter'
+      title: 'Advanced search'
+      to: 'To'
+    author_info:
+      author_deleted: User deleted
+    check: Select
+    check_all: All
+    check_none: None
+    collective: Collective
+    flag: Flag as inappropriate
+    print:
+      print_button: Print this info
+    tags_cloud:
+      tags: Trending
+    unflag: Unflag
+  simple_captcha:
+    label: Enter the text from the image in the box below
+    message:
+      debate: the secret code does not match the image
+      proposal: the secret code does not match the image
+      spendingproposal: the secret code does not match the image
+      user: the secret code does not match the image
+    placeholder: Enter the text from the image
+    refresh_button_text: Refresh
+  social:
+    blog: Blog
+    facebook: Facebook
+    twitter: Twitter
+    youtube: YouTube
+  spending_proposals:
+    form:
+      description: Description
+      external_url: Link to additional documentation
+      geozone: Scope of operation
+      submit_buttons:
+        create: Create
+        new: Create
+      title: Spending proposal title
+    index:
+      create_link: Create spending proposal
+      text_html: Here you can send spending proposals to be considered in the frame of the annual participatory budgeting.
+      title: Participatory budgeting
+      verified_only: Only verified users can create spending proposals, %{verify_account}.
+      verify_account: verify your account
+    new:
+      back_link: Back
+      more_info: How do participatory budgeting works?
+      recommendation_one: It's mandatory that the proposal makes reference to a budgetable action.
+      recommendation_three: Try to go into details when describing your spending proposal so the reviewing team undertands your points.
+      recommendation_two: Any proposal or comment suggesting illegal action will be deleted.
+      recommendations_title: How to create a spending proposal
+      start_new: Create spending proposal
+  unauthorized:
+    default: You do not have permission to access this page.
+    manage:
+      all: You do not have permission to carry out the action '%{action}' on %{subject}.
   users:
     show:
+      deleted: Deleted
+      deleted_debate: This debate has been deleted
+      deleted_proposal: This proposal has been deleted
       filters:
-        proposals:
-          one: "1 Proposal"
-          other: "%{count} Proposals"
-        debates:
-          one: "1 Debate"
-          other: "%{count} Debates"
         comments:
-          one: "1 Comment"
+          one: 1 Comment
           other: "%{count} Comments"
-      no_activity: "User has no public activity"
-      private_activity: "This user decided to keep the activity list private"
-      deleted: "Deleted"
-      deleted_debate: "This debate has been deleted"
-      deleted_proposal: "This proposal has been deleted"
-  unauthorized:
-    default: "You do not have permission to access this page."
-    manage:
-      all: "You do not have permission to carry out the action '%{action}' on %{subject}."
+        debates:
+          one: 1 Debate
+          other: "%{count} Debates"
+        proposals:
+          one: 1 Proposal
+          other: "%{count} Proposals"
+      no_activity: User has no public activity
+      private_activity: This user decided to keep the activity list private
+  votes:
+    agree: I agree
+    anonymous: Too many anonymous votes to admit vote %{verify_account}.
+    disagree: I disagree
+    organizations: Organisations are not permitted to vote
+    signin: Sign in
+    signup: Sign up
+    supports: Supports
+    unauthenticated: You must %{signin} or %{signup} to continue.
+    verified_only: Only verified users can vote on proposals; %{verify_account}.
+    verify_account: verify your account
   welcome:
-    highlights: "Highlights: "
-    signed_in_home_title: "Recent activity"
     debates:
-      title: "Debates"
-      description: "For meeting, discussing and sharing the things that matter to us in our city."
-      alt: "Icon debates"
-    proposal:
-      title: "You propose"
-      description: "Open space for citizen proposals about the kind of city we want to live in."
-      alt: "Icon propose"
+      alt: Icon debates
+      description: For meeting, discussing and sharing the things that matter to us in our city.
+      title: Debates
     decide:
-      title: "You decide"
-      description: "The public decides if it accepts or rejects the most supported proposals."
-      alt: "Icon decide"
+      alt: Icon decide
+      description: The public decides if it accepts or rejects the most supported proposals.
+      title: You decide
     do:
-      title: "It gets done"
-      description: "If the proposal is accepted by the majority, the City Council accepts it as its own and it gets done."
-      alt: "Icon it gets done"
+      alt: Icon it gets done
+      description: If the proposal is accepted by the majority, the City Council accepts it as its own and it gets done.
+      title: It gets done
+    highlights: 'Highlights: '
+    proposal:
+      alt: Icon propose
+      description: Open space for citizen proposals about the kind of city we want to live in.
+      title: You propose
+    signed_in_home_title: Recent activity
     welcome:
-      title: "Participate"
-      go_to_index: "See proposals and debates"
-      user_permission_info: "With your account you can..."
-      user_permission_debates: "Participate on debates"
-      user_permission_proposal: "Create new proposals"
-      user_permission_support_proposal: "Support proposals*"
-      user_permission_votes: "Participate on final voting"
-      user_permission_verify: "To perform all the actions %{verify}."
-      user_permission_verify_url: "verify your account"
+      go_to_index: See proposals and debates
+      title: Participate
+      user_permission_debates: Participate on debates
+      user_permission_info: With your account you can...
+      user_permission_proposal: Create new proposals
+      user_permission_support_proposal: Support proposals*
+      user_permission_verify: To perform all the actions %{verify}.
       user_permission_verify_info: "* Only for users on Madrid Census."
-  omniauth:
-    finish_signup:
-      title: "Add your email address"
-    twitter:
-      sign_in: "Sign in with Twitter"
-      sign_up: "Sign up with Twitter"
-    facebook:
-      sign_in: "Sign in with Facebook"
-      sign_up: "Sign up with Facebook"
-    google_oauth2:
-      sign_in: "Sign in with Google"
-      sign_up: "Sign up with Google"
-  legislation:
-    help:
-      title: "How I can comment this document?"
-      text: "To comment this document you must %{sign_in} or %{sign_up}. Then select the text you want to comment and press the button with the pencil."
-      text_sign_in: "login"
-      text_sign_up: "sign up"
-      alt: "Select the text you want to comment and press the button with the pencil."
+      user_permission_verify_url: verify your account
+      user_permission_votes: Participate on final voting
diff --git a/config/locales/es.yml b/config/locales/es.yml
index cf1ef7302..71c9d30f1 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1,466 +1,463 @@
+---
 es:
-  locale: "Español"
-  errors:
-    messages:
-      user_not_found: "No se encontró el usuario"
-  layouts:
-    header:
-      logo: "Madrid"
-      external_link_transparency: "Transparencia"
-      external_link_transparency_url: "https://transparencia.madrid.es"
-      external_link_opendata: "Datos abiertos"
-      external_link_opendata_url: "http://datos.madrid.es"
-      external_link_blog: "Blog"
-      external_link_blog_url: "/blog"
-      open_gov: "Gobierno %{open}"
-      open: "abierto"
-      participation_html: "Madrid Decide"
-      open_data: "Datos abiertos"
-      open_city_title: "La ciudad que quieres será la ciudad que quieras."
-      open_city_slogan_html:
-        "Existen ciudades gobernadas directamente por sus habitantes, que <b>debaten</b> sobre temas que les preocupan, <b>proponen</b> ideas para mejorar
-        sus vidas y <b>deciden</b> entre todas y todos las que se llevan a cabo. Madrid ya es una de ellas."
-      see_all: "Ver propuestas"
-      my_activity_link: "Mi actividad"
-      my_account_link: "Mi cuenta"
-      locale: "Idioma:"
-      administration: "Administrar"
-      moderation: "Moderar"
-      more_information: "Más información"
-      debates: "Debates"
-      proposals: "Propuestas"
-      spending_proposals: "Presupuestos ciudadanos"
-      new_notifications:
-        one: "Tienes una nueva notificación"
-        other: "Tienes %{count} notificaciones nuevas"
-      no_notifications: "No tienes notificaciones nuevas"
-    footer:
-      description: "Este portal usa la %{consul} que es %{open_source}. De Madrid, para el mundo entero."
-      open_source: "software libre"
-      open_source_url: "http://www.gnu.org/licenses/agpl-3.0.html"
-      consul: "aplicación Consul"
-      consul_url: "https://github.com/consul/consul"
-      copyright: "Ayuntamiento de Madrid, %{year}"
-      participation_title: "Participación"
-      participation_text: "Decide cómo debe ser la ciudad de Madrid que quieres."
-      transparency_title: "Transparencia"
-      transparency_url: "https://transparencia.madrid.es"
-      transparency_text: "Obtén cualquier información sobre el Ayuntamiento de Madrid."
-      open_data_title: "Datos Abiertos"
-      open_data_text: "Todos los datos del Ayuntamiento son tuyos."
-      contact_us: "Para asistencia técnica entra en"
-      faq: "Asistencia técnica"
-      privacy: "Política de privacidad"
-      conditions: "Condiciones de uso"
-      more_info: "Más información"
-      accessibility: "Accesibilidad"
-    application:
-      ie_title: "Esta web no está optimizada para tu navegador"
-      ie:
-        "Hemos detectado que estás navegando desde Internet Explorer.
-        Para una mejor experiencia te recomendamos utilizar %{chrome} o %{firefox}."
-      chrome: "Google Chrome"
-      firefox: "Firefox"
-  social:
-    twitter: "Twitter"
-    facebook: "Facebook"
-    blog: "Blog"
-    youtube: "YouTube"
-  form:
-    error: "error"
-    errors: "errores"
-    not_saved: "impidieron guardar %{resource}:"
-    accept_terms: "Acepto la %{policy} y las %{conditions}"
-    policy: "Política de privacidad"
-    conditions: "Condiciones de uso"
-    user: "la cuenta"
-    debate: "el debate"
-    proposal: "la propuesta"
-    spending_proposal: "la propuesta de gasto"
-    verification::sms: "el teléfono"
-    verification::letter: "la verificación"
-  application:
-    close: "Cerrar"
-    menu: "Menú"
-  debates:
-    index:
-      title: "Debates"
-      featured_debates_html: "Debates<br>destacados"
-      start_debate: "Empieza un debate"
-      select_order: "Ordenar por"
-      orders:
-        confidence_score: "Mejor valorados"
-        hot_score: "Más activos hoy"
-        created_at: "Nuevos"
-        most_commented: "Más comentados"
-        relevance: "Más relevantes"
-      filter_topic:
-        one: " con el tema '%{topic}'"
-        other: " con el tema '%{topic}'"
-      search_form:
-        title: "Buscar"
-        button: "Buscar"
-        placeholder: "Buscar debates..."
-      search_results:
-        one: " que contiene '%{search_term}'"
-        other: " que contienen '%{search_term}'"
-    debate:
-      debate: "Debate"
-      comments:
-        zero: "Sin comentarios"
-        one: "1 Comentario"
-        other: "%{count} Comentarios"
-      votes:
-        zero: "Sin votos"
-        one: "1 voto"
-        other: "%{count} votos"
-    form:
-      debate_title: "Título del debate"
-      debate_text: "Texto inicial del debate"
-      tags_label: "Temas"
-      tags_instructions: "Etiqueta este debate. Puedes elegir entre nuestras propuestas o introducir las que desees."
-      tags_placeholder: "Escribe las etiquetas que desees separadas por coma (',')"
-    show:
-      back_link: "Volver"
-      author_deleted: "Usuario eliminado"
-      comments_title: "Comentarios"
-      comments:
-        zero: "Sin comentarios"
-        one: "1 Comentario"
-        other: "%{count} Comentarios"
-      login_to_comment: "Necesitas %{signin} o %{signup} para comentar."
-      edit_debate_link: "Editar debate"
-      share: "Compartir"
-      flag: "Este debate ha sido marcado como inapropiado por varios usuarios."
-    edit:
-      editing: "Editar debate"
-      show_link: "Ver debate"
-      back_link: "Volver"
-      form:
-        submit_button: "Guardar cambios"
-    new:
-      start_new: "Empezar un debate"
-      info: "Si lo que quieres es hacer una propuesta, esta es la sección incorrecta, entra en %{info_link}."
-      info_link: "crear nueva propuesta"
-      more_info: "Más información"
-      back_link: "Volver"
-      recommendations_title: "Recomendaciones para crear un debate"
-      recommendation_one: "No escribas el título del debate o frases enteras en mayúsculas. En internet eso se considera gritar. Y a nadie le gusta que le griten."
-      recommendation_two: "Cualquier debate o comentario que implique una acción ilegal será eliminado, también los que tengan la intención de sabotear los espacios de debate, todo lo demás está permitido."
-      recommendation_three: "Las críticas despiadadas son muy bienvenidas. Este es un espacio de pensamiento. Pero te recomendamos conservar la elegancia y la inteligencia. El mundo es mejor con ellas presentes."
-      recommendation_four: "Disfruta de este espacio, de las voces que lo llenan, también es tuyo."
-      form:
-        submit_button: "Empieza un debate"
-    create:
-      form:
-        submit_button: "Empieza un debate"
-    update:
-      form:
-        submit_button: "Guardar cambios"
-  proposals:
-    index:
-      title: "Propuestas ciudadanas"
-      featured_proposals_html: "Propuestas<br>destacadas"
-      start_proposal: "Crea una propuesta"
-      select_order_long: "Estas viendo las propuestas"
-      select_order: "Ordenar por"
-      orders:
-        confidence_score: "Más apoyadas"
-        hot_score: "Más activas hoy"
-        created_at: "Nuevas"
-        most_commented: "Más comentadas"
-        relevance: "Más relevantes"
-      filter_topic:
-        one: " con el tema '%{topic}'"
-        other: " con el tema '%{topic}'"
-      search_form:
-        title: "Buscar"
-        button: "Buscar"
-        placeholder: "Buscar propuestas..."
-      search_results:
-        one: " que contiene '%{search_term}'"
-        other: " que contienen '%{search_term}'"
-    proposal:
-      proposal: "Propuesta"
-      support: "Apoyar"
-      support_title: "Apoyar esta propuesta"
-      comments:
-        zero: "Sin comentarios"
-        one: "1 Comentario"
-        other: "%{count} Comentarios"
-      supports:
-        zero: "Sin apoyos"
-        one: "1 apoyo"
-        other: "%{count} apoyos"
-      supports_necessary: "%{number} apoyos necesarios"
-      reason_for_supports_necessary: "2% del Censo"
-      total_percent: "100%"
-      already_supported: "¡Ya has apoyado esta propuesta, compártela!"
-    form:
-      proposal_title: "Título de la propuesta"
-      proposal_question: "Pregunta de la propuesta"
-      proposal_question_example_html: "Debe ser resumida en una pregunta cuya respuesta sea Sí o No. <em>Ej. '¿Está usted de acuerdo en peatonalizar la calle Mayor?'</em>"
-      proposal_summary: "Resumen de la propuesta"
-      proposal_summary_note: "(máximo 200 caracteres)"
-      proposal_text: "Texto desarrollado de la propuesta"
-      proposal_external_url: "Enlace a documentación adicional"
-      proposal_video_url: "Enlace a vídeo externo"
-      proposal_video_url_note: "Puedes añadir un enlace a YouTube o Vimeo"
-      proposal_responsible_name: "Nombre y apellidos de la persona que hace esta propuesta"
-      proposal_responsible_name_note: "(individualmente o como representante de un colectivo; no se mostrará públicamente)"
-      tags_label: "Temas"
-      tags_instructions: "Etiqueta esta propuesta. Puedes elegir entre nuestras sugerencias o introducir las que desees."
-      tags_placeholder: "Escribe las etiquetas que desees separadas por una coma (',')"
-    show:
-      back_link: "Volver"
-      author_deleted: "Usuario eliminado"
-      code: "Código de la propuesta:"
-      comments_title: "Comentarios"
-      comments:
-        zero: "Sin comentarios"
-        one: "1 Comentario"
-        other: "%{count} Comentarios"
-      login_to_comment: "Necesitas %{signin} o %{signup} para comentar."
-      edit_proposal_link: "Editar propuesta"
-      share: "Compartir"
-      flag: "Esta propuesta ha sido marcada como inapropiada por varios usuarios."
-    edit:
-      editing: "Editar propuesta"
-      show_link: "Ver propuesta"
-      back_link: "Volver"
-      form:
-        submit_button: "Guardar cambios"
-    new:
-      start_new: "Crear una propuesta"
-      more_info: "¿Cómo funcionan las propuestas ciudadanas?"
-      back_link: "Volver"
-      recommendations_title: "Recomendaciones para crear una propuesta"
-      recommendation_one: "No escribas el título de la propuesta o frases enteras en mayúsculas. En internet eso se considera gritar. Y a nadie le gusta que le griten."
-      recommendation_two: "Cualquier propuesta o comentario que implique una acción ilegal será eliminada, también las que tengan la intención de sabotear los espacios de propuesta, todo lo demás está permitido."
-      recommendation_three: "Disfruta de este espacio, de las voces que lo llenan, también es tuyo."
-      form:
-        submit_button: "Crear propuesta"
-    create:
-      form:
-        submit_button: "Crear propuesta"
-    update:
-      form:
-        submit_button: "Guardar cambios"
-  spending_proposals:
-    index:
-      title: "Presupuestos participativos"
-      text: "Desde esta sección podrás sugerir propuestas de gasto que irán asociadas a las partidas de presupuestos ciudadanos. El requisito principal es que sean propuestas presupuestables."
-      create_link: "Enviar propuesta de gasto"
-      verified_only: "Sólo los usuarios verificados pueden crear propuestas de gasto, %{verify_account}."
-      verify_account: "verifica tu cuenta"
-    new:
-      back_link: Volver
-      start_new: "Crear una propuesta de gasto"
-      more_info: "¿Cómo funcionan los presupuestos participativos?"
-      recommendations_title: "Recomendaciones para crear una propuesta de gasto"
-      recommendation_one: "Es fundamental que haga referencia a una actuación presupuestable."
-      recommendation_two: "Cualquier propuesta o comentario que implique acciones ilegales será eliminada."
-      recommendation_three: "Intenta detallar lo máximo posible la propuesta para que el equipo de gobierno encargado de estudiarla tenga las menor dudas posibles."
-    form:
-      title: "Título de la propuesta de gasto"
-      description: "Descripción detallada"
-      external_url: "Enlace a documentación adicional"
-      geozone: "Ámbito de actuación"
-      submit_buttons:
-        new: Crear
-        create: Crear
-  geozones:
-    none: "Toda la ciudad"
-  comments:
-    show:
-      return_to_commentable: "Volver a "
-    select_order: "Ordenar por"
-    orders:
-      most_voted: "Más votados"
-      newest: "Más nuevos primero"
-      oldest: "Más antiguos primero"
-    form:
-      leave_comment: "Deja tu comentario"
-      comment_as_moderator: "Comentar como moderador"
-      comment_as_admin: "Comentar como administrador"
-    comment:
-      author: "Autor"
-      moderator: "Moderador"
-      admin: "Administrador"
-      deleted: "Este comentario ha sido eliminado"
-      user_deleted: "Usuario eliminado"
-      responses:
-        zero: "Sin respuestas"
-        one: "1 Respuesta"
-        other: "%{count} Respuestas"
-      votes:
-        zero: "Sin votos"
-        one: "1 voto"
-        other: "%{count} votos"
-  comments_helper:
-    comment_link: "Comentar"
-    comment_button: "Publicar comentario"
-    reply_link: "Responder"
-    reply_button: "Publicar respuesta"
-  votes:
-    agree: "Estoy de acuerdo"
-    disagree: "No estoy de acuerdo"
-    supports: "Apoyos"
-    unauthenticated: "Necesitas %{signin} o %{signup} para continuar."
-    signin: "iniciar sesión"
-    signup: "registrarte"
-    anonymous: "Demasiados votos anónimos, para poder votar %{verify_account}."
-    verified_only: "Las propuestas sólo pueden ser votadas por usuarios verificados, %{verify_account}."
-    verify_account: "verifica tu cuenta"
-    organizations: "Las organizaciones no pueden votar"
   account:
     show:
-      title: "Mi cuenta"
-      save_changes_submit: "Guardar cambios"
-      change_credentials_link: "Cambiar mis datos de acceso"
-      public_activity_label: "Mostrar públicamente mi lista de actividades"
-      email_on_comment_label: "Recibir un email cuando alguien comenta en mis propuestas o debates"
-      email_on_comment_reply_label: "Recibir un email cuando alguien contesta a mis comentarios"
-      subscription_to_website_newsletter_label: "Recibir emails con información interesante sobre la web"
-      erase_account_link: "Darme de baja"
-      personal: "Datos personales"
-      username_label: "Nombre de usuario"
-      phone_number_label: "Teléfono"
-      organization_name_label: "Nombre de la organización"
-      organization_responsible_name_placeholder: "Representante de la asociación/colectivo"
-      notifications: "Notificaciones"
-      finish_verification: "Finalizar verificación"
-      verified_account: "Cuenta verificada"
-      verify_my_account: "Verificar mi cuenta"
-      user_permission_title: "Participación"
-      user_permission_info: "Con tu cuenta ya puedes..."
-      user_permission_debates: "Participar en debates"
-      user_permission_proposal: "Crear nuevas propuestas"
-      user_permission_support_proposal: "Apoyar propuestas*"
-      user_permission_votes: "Participar en las votaciones finales*"
-      user_permission_verify: "Para poder realizar todas las acciones verifica tu cuenta."
+      change_credentials_link: Cambiar mis datos de acceso
+      email_on_comment_label: Recibir un email cuando alguien comenta en mis propuestas o debates
+      email_on_comment_reply_label: Recibir un email cuando alguien contesta a mis comentarios
+      erase_account_link: Darme de baja
+      finish_verification: Finalizar verificación
+      notifications: Notificaciones
+      organization_name_label: Nombre de la organización
+      organization_responsible_name_placeholder: Representante de la asociación/colectivo
+      personal: Datos personales
+      phone_number_label: Teléfono
+      public_activity_label: Mostrar públicamente mi lista de actividades
+      save_changes_submit: Guardar cambios
+      subscription_to_website_newsletter_label: Recibir emails con información interesante sobre la web
+      title: Mi cuenta
+      user_permission_debates: Participar en debates
+      user_permission_info: Con tu cuenta ya puedes...
+      user_permission_proposal: Crear nuevas propuestas
+      user_permission_support_proposal: Apoyar propuestas*
+      user_permission_title: Participación
+      user_permission_verify: Para poder realizar todas las acciones verifica tu cuenta.
       user_permission_verify_info: "* Sólo usuarios empadronados en el municipio de Madrid."
+      user_permission_votes: Participar en las votaciones finales*
+      username_label: Nombre de usuario
+      verified_account: Cuenta verificada
+      verify_my_account: Verificar mi cuenta
+  application:
+    close: Cerrar
+    menu: Menú
+  comments:
+    comment:
+      admin: Administrador
+      author: Autor
+      deleted: Este comentario ha sido eliminado
+      moderator: Moderador
+      responses:
+        one: 1 Respuesta
+        other: "%{count} Respuestas"
+        zero: Sin respuestas
+      user_deleted: Usuario eliminado
+      votes:
+        one: 1 voto
+        other: "%{count} votos"
+        zero: Sin votos
+    form:
+      comment_as_admin: Comentar como administrador
+      comment_as_moderator: Comentar como moderador
+      leave_comment: Deja tu comentario
+    orders:
+      most_voted: Más votados
+      newest: Más nuevos primero
+      oldest: Más antiguos primero
+    select_order: Ordenar por
+    show:
+      return_to_commentable: 'Volver a '
+  comments_helper:
+    comment_button: Publicar comentario
+    comment_link: Comentar
+    reply_button: Publicar respuesta
+    reply_link: Responder
+  debates:
+    create:
+      form:
+        submit_button: Empieza un debate
+    debate:
+      comments:
+        one: 1 Comentario
+        other: "%{count} Comentarios"
+        zero: Sin comentarios
+      debate: Debate
+      votes:
+        one: 1 voto
+        other: "%{count} votos"
+        zero: Sin votos
+    edit:
+      back_link: Volver
+      editing: Editar debate
+      form:
+        submit_button: Guardar cambios
+      show_link: Ver debate
+    form:
+      debate_text: Texto inicial del debate
+      debate_title: Título del debate
+      tags_instructions: Etiqueta este debate. Puedes elegir entre nuestras propuestas o introducir las que desees.
+      tags_label: Temas
+      tags_placeholder: Escribe las etiquetas que desees separadas por coma (',')
+    index:
+      featured_debates: Destacados
+      filter_topic:
+        one: " con el tema '%{topic}'"
+        other: " con el tema '%{topic}'"
+      orders:
+        confidence_score: Mejor valorados
+        created_at: Nuevos
+        hot_score: Más activos hoy
+        most_commented: Más comentados
+        relevance: Más relevantes
+      search_form:
+        button: Buscar
+        placeholder: Buscar debates...
+        title: Buscar
+      search_results:
+        one: " que contiene '%{search_term}'"
+        other: " que contienen '%{search_term}'"
+      select_order: Ordenar por
+      start_debate: Empieza un debate
+      title: Debates
+    new:
+      back_link: Volver
+      form:
+        submit_button: Empieza un debate
+      info: Si lo que quieres es hacer una propuesta, esta es la sección incorrecta, entra en %{info_link}.
+      info_link: crear nueva propuesta
+      more_info: Más información
+      recommendation_four: Disfruta de este espacio, de las voces que lo llenan, también es tuyo.
+      recommendation_one: No escribas el título del debate o frases enteras en mayúsculas. En internet eso se considera gritar. Y a nadie le gusta que le griten.
+      recommendation_three: Las críticas despiadadas son muy bienvenidas. Este es un espacio de pensamiento. Pero te recomendamos conservar la elegancia y la inteligencia. El mundo es mejor con ellas presentes.
+      recommendation_two: Cualquier debate o comentario que implique una acción ilegal será eliminado, también los que tengan la intención de sabotear los espacios de debate, todo lo demás está permitido.
+      recommendations_title: Recomendaciones para crear un debate
+      start_new: Empezar un debate
+    show:
+      author_deleted: Usuario eliminado
+      back_link: Volver
+      comments:
+        one: 1 Comentario
+        other: "%{count} Comentarios"
+        zero: Sin comentarios
+      comments_title: Comentarios
+      edit_debate_link: Editar debate
+      flag: Este debate ha sido marcado como inapropiado por varios usuarios.
+      login_to_comment: Necesitas %{signin} o %{signup} para comentar.
+      share: Compartir
+    update:
+      form:
+        submit_button: Guardar cambios
+  errors:
+    messages:
+      user_not_found: No se encontró el usuario
+  form:
+    accept_terms: Acepto la %{policy} y las %{conditions}
+    conditions: Condiciones de uso
+    debate: el debate
+    error: error
+    errors: errores
+    not_saved: 'impidieron guardar %{resource}:'
+    policy: Política de privacidad
+    proposal: la propuesta
+    spending_proposal: la propuesta de gasto
+    user: la cuenta
+    verification::letter: la verificación
+    verification::sms: el teléfono
+  geozones:
+    none: Toda la ciudad
+  layouts:
+    application:
+      chrome: Google Chrome
+      firefox: Firefox
+      ie: Hemos detectado que estás navegando desde Internet Explorer. Para una mejor experiencia te recomendamos utilizar %{chrome} o %{firefox}.
+      ie_title: Esta web no está optimizada para tu navegador
+    footer:
+      accessibility: Accesibilidad
+      conditions: Condiciones de uso
+      consul: aplicación Consul
+      consul_url: https://github.com/consul/consul
+      contact_us: Para asistencia técnica entra en
+      copyright: Ayuntamiento de Madrid, %{year}
+      description: Este portal usa la %{consul} que es %{open_source}. De Madrid, para el mundo entero.
+      faq: Asistencia técnica
+      more_info: Más información
+      open_data_text: Todos los datos del Ayuntamiento son tuyos.
+      open_data_title: Datos Abiertos
+      open_source: software libre
+      open_source_url: http://www.gnu.org/licenses/agpl-3.0.html
+      participation_text: Decide cómo debe ser la ciudad de Madrid que quieres.
+      participation_title: Participación
+      privacy: Política de privacidad
+      transparency_text: Obtén cualquier información sobre el Ayuntamiento de Madrid.
+      transparency_title: Transparencia
+      transparency_url: https://transparencia.madrid.es
+    header:
+      administration: Administrar
+      debates: Debates
+      external_link_blog: Blog
+      external_link_blog_url: "/blog"
+      external_link_opendata: Datos abiertos
+      external_link_opendata_url: http://datos.madrid.es
+      external_link_transparency: Transparencia
+      external_link_transparency_url: https://transparencia.madrid.es
+      locale: 'Idioma:'
+      logo: Madrid
+      moderation: Moderar
+      more_information: Más información
+      my_account_link: Mi cuenta
+      my_activity_link: Mi actividad
+      new_notifications:
+        one: Tienes una nueva notificación
+        other: Tienes %{count} notificaciones nuevas
+      no_notifications: No tienes notificaciones nuevas
+      open: abierto
+      open_city_slogan_html: Existen ciudades gobernadas directamente por sus habitantes, que <b>debaten</b> sobre temas que les preocupan, <b>proponen</b> ideas para mejorar sus vidas y <b>deciden</b> entre todas y todos las que se llevan a cabo. Madrid ya es una de ellas.
+      open_city_title: La ciudad que quieres será la ciudad que quieras.
+      open_data: Datos abiertos
+      open_gov: Gobierno %{open}
+      participation_html: Madrid Decide
+      proposals: Propuestas
+      see_all: Ver propuestas
+      spending_proposals: Presupuestos ciudadanos
+  legislation:
+    help:
+      alt: Selecciona el texto que quieres comentar y pulsa en el botón con el lápiz.
+      text: Para comentar este documento debes %{sign_in} o %{sign_up}. Después selecciona el texto que quieres comentar y pulsa en el botón con el lápiz.
+      text_sign_in: iniciar sesión
+      text_sign_up: registrarte
+      title: "¿Cómo puedo comentar este documento?"
+  locale: Español
   notifications:
     index:
-      title: "Notificaciones"
-      mark_all_as_read: "Marcar todas como leídas"
-      empty_notifications: "No tienes notificaciones nuevas."
       comments_on:
-        one: "Hay un nuevo comentario en"
-        other: "Hay %{count} comentarios nuevos en"
+        one: Hay un nuevo comentario en
+        other: Hay %{count} comentarios nuevos en
+      empty_notifications: No tienes notificaciones nuevas.
+      mark_all_as_read: Marcar todas como leídas
       replies_to:
-        one: "Hay una respuesta nueva a tu comentario en"
-        other: "Hay %{count} nuevas respuestas a tu comentario en"
-  simple_captcha:
-    placeholder: "Introduce el texto de la imagen"
-    label: "Introduce el texto de la imagen en la siguiente caja"
-    refresh_button_text: "Refrescar"
-    message:
-      user: "el código secreto no coincide con la imagen"
-      debate: "el código secreto no coincide con la imagen"
-      proposal: "el código secreto no coincide con la imagen"
-      spendingproposal: "el código secreto no coincide con la imagen"
-  shared:
-    author_info:
+        one: Hay una respuesta nueva a tu comentario en
+        other: Hay %{count} nuevas respuestas a tu comentario en
+      title: Notificaciones
+  omniauth:
+    facebook:
+      sign_in: Entra con Facebook
+      sign_up: Regístrate con Facebook
+    finish_signup:
+      title: Añade tu email
+    google_oauth2:
+      sign_in: Entra con Google
+      sign_up: Regístrate con Google
+    twitter:
+      sign_in: Entra con Twitter
+      sign_up: Regístrate con Twitter
+  proposals:
+    create:
+      form:
+        submit_button: Crear propuesta
+    edit:
+      back_link: Volver
+      editing: Editar propuesta
+      form:
+        submit_button: Guardar cambios
+      show_link: Ver propuesta
+    form:
+      proposal_external_url: Enlace a documentación adicional
+      proposal_question: Pregunta de la propuesta
+      proposal_question_example_html: Debe ser resumida en una pregunta cuya respuesta sea Sí o No. <em>Ej. '¿Está usted de acuerdo en peatonalizar la calle Mayor?'</em>
+      proposal_responsible_name: Nombre y apellidos de la persona que hace esta propuesta
+      proposal_responsible_name_note: "(individualmente o como representante de un colectivo; no se mostrará públicamente)"
+      proposal_summary: Resumen de la propuesta
+      proposal_summary_note: "(máximo 200 caracteres)"
+      proposal_text: Texto desarrollado de la propuesta
+      proposal_title: Título de la propuesta
+      proposal_video_url: Enlace a vídeo externo
+      proposal_video_url_note: Puedes añadir un enlace a YouTube o Vimeo
+      tags_instructions: Etiqueta esta propuesta. Puedes elegir entre nuestras sugerencias o introducir las que desees.
+      tags_label: Temas
+      tags_placeholder: Escribe las etiquetas que desees separadas por una coma (',')
+    index:
+      featured_proposals: Destacadas
+      filter_topic:
+        one: " con el tema '%{topic}'"
+        other: " con el tema '%{topic}'"
+      orders:
+        confidence_score: Más apoyadas
+        created_at: Nuevas
+        hot_score: Más activas hoy
+        most_commented: Más comentadas
+        relevance: Más relevantes
+      search_form:
+        button: Buscar
+        placeholder: Buscar propuestas...
+        title: Buscar
+      search_results:
+        one: " que contiene '%{search_term}'"
+        other: " que contienen '%{search_term}'"
+      select_order: Ordenar por
+      select_order_long: Estas viendo las propuestas
+      start_proposal: Crea una propuesta
+      title: Propuestas ciudadanas
+    new:
+      back_link: Volver
+      form:
+        submit_button: Crear propuesta
+      more_info: "¿Cómo funcionan las propuestas ciudadanas?"
+      recommendation_one: No escribas el título de la propuesta o frases enteras en mayúsculas. En internet eso se considera gritar. Y a nadie le gusta que le griten.
+      recommendation_three: Disfruta de este espacio, de las voces que lo llenan, también es tuyo.
+      recommendation_two: Cualquier propuesta o comentario que implique una acción ilegal será eliminada, también las que tengan la intención de sabotear los espacios de propuesta, todo lo demás está permitido.
+      recommendations_title: Recomendaciones para crear una propuesta
+      start_new: Crear una propuesta
+    proposal:
+      already_supported: "¡Ya has apoyado esta propuesta, compártela!"
+      comments:
+        one: 1 Comentario
+        other: "%{count} Comentarios"
+        zero: Sin comentarios
+      proposal: Propuesta
+      reason_for_supports_necessary: 2% del Censo
+      support: Apoyar
+      support_title: Apoyar esta propuesta
+      supports:
+        one: 1 apoyo
+        other: "%{count} apoyos"
+        zero: Sin apoyos
+      supports_necessary: "%{number} apoyos necesarios"
+      total_percent: 100%
+    show:
       author_deleted: Usuario eliminado
-    tags_cloud:
-      tags: "Tendencias"
-    print:
-      print_button: "Imprimir esta información"
-    flag: "Denunciar como inapropiado"
-    unflag: "Deshacer denuncia"
-    collective: "Colectivo"
-    check: "Seleccionar"
-    check_all: "Todos"
-    check_none: "Ninguno"
+      back_link: Volver
+      code: 'Código de la propuesta:'
+      comments:
+        one: 1 Comentario
+        other: "%{count} Comentarios"
+        zero: Sin comentarios
+      comments_title: Comentarios
+      edit_proposal_link: Editar propuesta
+      flag: Esta propuesta ha sido marcada como inapropiada por varios usuarios.
+      login_to_comment: Necesitas %{signin} o %{signup} para comentar.
+      share: Compartir
+    update:
+      form:
+        submit_button: Guardar cambios
+  shared:
     advanced_search:
-      title: 'Búsqueda avanzada'
-      general: 'Con el texto'
-      general_placeholder: 'Escribe el texto'
       author_type: 'Por categoría de autor'
       author_type_blank: 'Elige una categoría'
-      date_range_blank: 'Elige una fecha'
       author_type_1: 'Empleado público'
       author_type_2: 'Organización Municipal'
       author_type_3: 'Director general'
       author_type_4: 'Concejal'
       author_type_5: 'Alcaldesa'
       date: 'Por fecha'
+      date_range_blank: 'Elige una fecha'
       date_1: 'Últimas 24 horas'
       date_2: 'Última semana'
       date_3: 'Último mes'
       date_4: 'Último año'
       date_5: 'Personalizada'
       from: 'Desde'
-      to: 'Hasta'
+      general: 'Con el texto'
+      general_placeholder: 'Escribe el texto'
       search: 'Filtrar'
+      title: 'Búsqueda avanzada'
+      to: 'Hasta'
+    author_info:
+      author_deleted: Usuario eliminado
+    check: Seleccionar
+    check_all: Todos
+    check_none: Ninguno
+    collective: Colectivo
+    flag: Denunciar como inapropiado
+    print:
+      print_button: Imprimir esta información
+    tags_cloud:
+      tags: Tendencias
+    unflag: Deshacer denuncia
+  simple_captcha:
+    label: Introduce el texto de la imagen en la siguiente caja
+    message:
+      debate: el código secreto no coincide con la imagen
+      proposal: el código secreto no coincide con la imagen
+      spendingproposal: el código secreto no coincide con la imagen
+      user: el código secreto no coincide con la imagen
+    placeholder: Introduce el texto de la imagen
+    refresh_button_text: Refrescar
+  social:
+    blog: Blog
+    facebook: Facebook
+    twitter: Twitter
+    youtube: YouTube
+  spending_proposals:
+    form:
+      description: Descripción detallada
+      external_url: Enlace a documentación adicional
+      geozone: "Ámbito de actuación"
+      submit_buttons:
+        create: Crear
+        new: Crear
+      title: Título de la propuesta de gasto
+    index:
+      create_link: Enviar propuesta de gasto
+      text_html: Desde esta sección podrás sugerir propuestas de gasto que irán asociadas a las partidas de presupuestos ciudadanos.<br>El requisito principal es que sean propuestas presupuestables.
+      title: Presupuestos participativos
+      verified_only: Sólo los usuarios verificados pueden crear propuestas de gasto, %{verify_account}.
+      verify_account: verifica tu cuenta
+    new:
+      back_link: Volver
+      more_info: "¿Cómo funcionan los presupuestos participativos?"
+      recommendation_one: Es fundamental que haga referencia a una actuación presupuestable.
+      recommendation_three: Intenta detallar lo máximo posible la propuesta para que el equipo de gobierno encargado de estudiarla tenga las menor dudas posibles.
+      recommendation_two: Cualquier propuesta o comentario que implique acciones ilegales será eliminada.
+      recommendations_title: Cómo crear una propuesta de gasto
+      start_new: Crear una propuesta de gasto
+  unauthorized:
+    default: No tienes permiso para acceder a esta página.
+    manage:
+      all: No tienes permiso para realizar la acción '%{action}' sobre %{subject}.
   users:
     show:
+      deleted: Eliminado
+      deleted_debate: Este debate ha sido eliminado
+      deleted_proposal: Este propuesta ha sido eliminada
       filters:
-        proposals:
-          one: "1 Propuesta"
-          other: "%{count} Propuestas"
-        debates:
-          one: "1 Debate"
-          other: "%{count} Debates"
         comments:
-          one: "1 Comentario"
+          one: 1 Comentario
           other: "%{count} Comentarios"
-      no_activity: "Usuario sin actividad pública"
-      private_activity: "Este usuario ha decidido mantener en privado su lista de actividades"
-      deleted: "Eliminado"
-      deleted_debate: "Este debate ha sido eliminado"
-      deleted_proposal: "Este propuesta ha sido eliminada"
-  unauthorized:
-    default: "No tienes permiso para acceder a esta página."
-    manage:
-      all: "No tienes permiso para realizar la acción '%{action}' sobre %{subject}."
+        debates:
+          one: 1 Debate
+          other: "%{count} Debates"
+        proposals:
+          one: 1 Propuesta
+          other: "%{count} Propuestas"
+      no_activity: Usuario sin actividad pública
+      private_activity: Este usuario ha decidido mantener en privado su lista de actividades
+  votes:
+    agree: Estoy de acuerdo
+    anonymous: Demasiados votos anónimos, para poder votar %{verify_account}.
+    disagree: No estoy de acuerdo
+    organizations: Las organizaciones no pueden votar
+    signin: iniciar sesión
+    signup: registrarte
+    supports: Apoyos
+    unauthenticated: Necesitas %{signin} o %{signup} para continuar.
+    verified_only: Las propuestas sólo pueden ser votadas por usuarios verificados, %{verify_account}.
+    verify_account: verifica tu cuenta
   welcome:
-    highlights: "Portada: "
-    signed_in_home_title: "Actividad reciente"
     debates:
-      title: "Debates"
-      description: "Encontrarnos, debatir y compartir lo que nos parece importante en nuestra ciudad."
-      alt: "Icono debates"
-    proposal:
-      title: "Propones"
-      description: "Espacio abierto para propuestas ciudadanas sobre el tipo de ciudad en el que queremos vivir."
-      alt: "Icono propones"
+      alt: Icono debates
+      description: Encontrarnos, debatir y compartir lo que nos parece importante en nuestra ciudad.
+      title: Debates
     decide:
-      title: "Decides"
-      description: "La ciudadanía decide si acepta o rechaza las propuestas más apoyadas."
-      alt: "Icono decides"
+      alt: Icono decides
+      description: La ciudadanía decide si acepta o rechaza las propuestas más apoyadas.
+      title: Decides
     do:
-      title: "Se hace"
-      description: "Si la propuesta es aceptada mayoritariamente, el Ayuntamiento la asume como propia y se hace."
-      alt: "Icono se hace"
+      alt: Icono se hace
+      description: Si la propuesta es aceptada mayoritariamente, el Ayuntamiento la asume como propia y se hace.
+      title: Se hace
+    highlights: 'Portada: '
+    proposal:
+      alt: Icono propones
+      description: Espacio abierto para propuestas ciudadanas sobre el tipo de ciudad en el que queremos vivir.
+      title: Propones
+    signed_in_home_title: Actividad reciente
     welcome:
-      title: "Empieza a participar"
-      go_to_index: "Ver propuestas"
-      user_permission_info: "Con tu cuenta ya puedes..."
-      user_permission_debates: "Participar en debates"
-      user_permission_proposal: "Crear nuevas propuestas"
-      user_permission_support_proposal: "Apoyar propuestas*"
-      user_permission_votes: "Participar en las votaciones finales*"
-      user_permission_verify: "Para poder realizar todas las acciones %{verify}."
-      user_permission_verify_url: "verifica tu cuenta"
+      go_to_index: Ver propuestas
+      title: Empieza a participar
+      user_permission_debates: Participar en debates
+      user_permission_info: Con tu cuenta ya puedes...
+      user_permission_proposal: Crear nuevas propuestas
+      user_permission_support_proposal: Apoyar propuestas*
+      user_permission_verify: Para poder realizar todas las acciones %{verify}.
       user_permission_verify_info: "* Sólo usuarios empadronados en el municipio de Madrid."
-  omniauth:
-    finish_signup:
-      title: "Añade tu email"
-    twitter:
-      sign_in: "Entra con Twitter"
-      sign_up: "Regístrate con Twitter"
-    facebook:
-      sign_in: "Entra con Facebook"
-      sign_up: "Regístrate con Facebook"
-    google_oauth2:
-      sign_in: "Entra con Google"
-      sign_up: "Regístrate con Google"
-  legislation:
-    help:
-      title: "¿Cómo puedo comentar este documento?"
-      text: "Para comentar este documento debes %{sign_in} o %{sign_up}. Después selecciona el texto que quieres comentar y pulsa en el botón con el lápiz."
-      text_sign_in: "iniciar sesión"
-      text_sign_up: "registrarte"
-      alt: "Selecciona el texto que quieres comentar y pulsa en el botón con el lápiz."
+      user_permission_verify_url: verifica tu cuenta
+      user_permission_votes: Participar en las votaciones finales*
diff --git a/config/locales/kaminari.en.yml b/config/locales/kaminari.en.yml
index b357b1688..3e1fb89dc 100755
--- a/config/locales/kaminari.en.yml
+++ b/config/locales/kaminari.en.yml
@@ -1,21 +1,22 @@
+---
 en:
-  views:
-    pagination:
-      first: "&laquo; First"
-      last: "Last &raquo;"
-      previous: "&lsaquo; Previous"
-      next: "Next &rsaquo;"
-      truncate: "&hellip;"
   helpers:
     page_entries_info:
       entry:
-        zero: "Entries"
-        one: "Entry"
-        other: "Entries"
+        one: Entry
+        other: Entries
+        zero: Entries
+      more_pages:
+        display_entries: Displaying <b>%{first}&nbsp;-&nbsp;%{last}</b> of <b>%{total}</b> %{entry_name}
       one_page:
         display_entries:
+          one: There is <b>1</b> %{entry_name}
+          other: There are <b> %{count}</b> %{entry_name}
           zero: "%{entry_name} cannot be found"
-          one: "There is <b>1</b> %{entry_name}"
-          other: "There are <b> %{count}</b> %{entry_name}"
-      more_pages:
-        display_entries: "Displaying <b>%{first}&nbsp;-&nbsp;%{last}</b> of <b>%{total}</b> %{entry_name}"
+  views:
+    pagination:
+      first: "&laquo; First"
+      last: Last &raquo;
+      next: Next &rsaquo;
+      previous: "&lsaquo; Previous"
+      truncate: "&hellip;"
diff --git a/config/locales/kaminari.es.yml b/config/locales/kaminari.es.yml
index ab3f8b71f..a9887aad0 100644
--- a/config/locales/kaminari.es.yml
+++ b/config/locales/kaminari.es.yml
@@ -1,21 +1,22 @@
+---
 es:
+  helpers:
+    page_entries_info:
+      entry:
+        one: entrada
+        other: entradas
+        zero: entradas
+      more_pages:
+        display_entries: Mostrando <b>%{first}&nbsp;-&nbsp;%{last}</b> de un total de <b>%{total}</b> %{entry_name}
+      one_page:
+        display_entries:
+          one: Hay <b>1</b> %{entry_name}
+          other: Hay <b> %{count}</b> %{entry_name}
+          zero: No se han encontrado %{entry_name}
   views:
     pagination:
       first: "&laquo; Primera"
       last: "Última &raquo;"
+      next: Siguiente &rsaquo;
       previous: "&lsaquo; Anterior"
-      next: "Siguiente &rsaquo;"
       truncate: "&hellip;"
-  helpers:
-    page_entries_info:
-      entry:
-        zero: "entradas"
-        one: "entrada"
-        other: "entradas"
-      one_page:
-        display_entries:
-          zero: "No se han encontrado %{entry_name}"
-          one: "Hay <b>1</b> %{entry_name}"
-          other: "Hay <b> %{count}</b> %{entry_name}"
-      more_pages:
-        display_entries: "Mostrando <b>%{first}&nbsp;-&nbsp;%{last}</b> de un total de <b>%{total}</b> %{entry_name}"
diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml
index 2b4a24ff3..8e337b42e 100755
--- a/config/locales/mailers.en.yml
+++ b/config/locales/mailers.en.yml
@@ -1,21 +1,22 @@
+---
 en:
   mailers:
-    config:
-      manage_email_subscriptions: "To stop receiving these emails change your settings in"
     comment:
-      subject: "Someone has commented on your %{commentable}"
-      hi: "Hi"
-      title: "New comment"
-      new_comment_by_html: "There is a new comment from <b>%{commenter}</b>"
-    reply:
-      subject: "Someone has responded to your comment"
-      hi: "Hi"
-      title: "New response to your comment"
-      new_reply_by_html: "There is a new response from <b>%{commenter}</b> to your comment on"
+      hi: Hi
+      new_comment_by_html: There is a new comment from <b>%{commenter}</b>
+      subject: Someone has commented on your %{commentable}
+      title: New comment
+    config:
+      manage_email_subscriptions: To stop receiving these emails change your settings in
     email_verification:
-      subject: "Confirm your email"
-      title:  "Confirm your account using the following link"
-      instructions_html: "To complete the verification of your user account in the Open Government Portal of the Madrid City Council, you must click %{verification_link}."
-      click_here_to_verify: "this link"
-      instructions_2_html: "This email will verify your account with <b>%{document_type} %{document_number}</b>. If these don't belong to you, please don't click on the previous link and ignore this email."
-      thanks: "Thank you very much."
+      click_here_to_verify: this link
+      instructions_2_html: This email will verify your account with <b>%{document_type} %{document_number}</b>. If these don't belong to you, please don't click on the previous link and ignore this email.
+      instructions_html: To complete the verification of your user account in the Open Government Portal of the Madrid City Council, you must click %{verification_link}.
+      subject: Confirm your email
+      thanks: Thank you very much.
+      title: Confirm your account using the following link
+    reply:
+      hi: Hi
+      new_reply_by_html: There is a new response from <b>%{commenter}</b> to your comment on
+      subject: Someone has responded to your comment
+      title: New response to your comment
diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml
index 6bc4e3309..fb0e7b2fb 100644
--- a/config/locales/mailers.es.yml
+++ b/config/locales/mailers.es.yml
@@ -1,21 +1,22 @@
+---
 es:
   mailers:
-    config:
-      manage_email_subscriptions: "Puedes dejar de recibir estos emails cambiando tu configuración en"
     comment:
-      subject: "Alguien ha comentado en tu %{commentable}"
-      hi: "Hola"
-      title: "Nuevo comentario"
-      new_comment_by_html: "Hay un nuevo comentario de <b>%{commenter}</b> en"
-    reply:
-      subject: "Alguien ha respondido a tu comentario"
-      hi: "Hola"
-      title: "Nueva respuesta a tu comentario"
-      new_reply_by_html: "Hay una nueva respuesta de <b>%{commenter}</b> a tu comentario en"
+      hi: Hola
+      new_comment_by_html: Hay un nuevo comentario de <b>%{commenter}</b> en
+      subject: Alguien ha comentado en tu %{commentable}
+      title: Nuevo comentario
+    config:
+      manage_email_subscriptions: Puedes dejar de recibir estos emails cambiando tu configuración en
     email_verification:
-      subject: "Verifica tu email"
-      title:  "Verifica tu cuenta con el siguiente enlace"
-      instructions_html: "Para terminar de verificar tu cuenta de usuario en el Portal de Gobierno Abierto del Ayuntamiento de Madrid, necesitamos que pulses %{verification_link}."
-      click_here_to_verify: "en este enlace"
-      instructions_2_html: "Este email es para verificar tu cuenta con <b>%{document_type} %{document_number}</b>. Si esos no son tus datos, por favor no pulses el enlace anterior e ignora este email."
-      thanks: "Muchas gracias."
+      click_here_to_verify: en este enlace
+      instructions_2_html: Este email es para verificar tu cuenta con <b>%{document_type} %{document_number}</b>. Si esos no son tus datos, por favor no pulses el enlace anterior e ignora este email.
+      instructions_html: Para terminar de verificar tu cuenta de usuario en el Portal de Gobierno Abierto del Ayuntamiento de Madrid, necesitamos que pulses %{verification_link}.
+      subject: Verifica tu email
+      thanks: Muchas gracias.
+      title: Verifica tu cuenta con el siguiente enlace
+    reply:
+      hi: Hola
+      new_reply_by_html: Hay una nueva respuesta de <b>%{commenter}</b> a tu comentario en
+      subject: Alguien ha respondido a tu comentario
+      title: Nueva respuesta a tu comentario
diff --git a/config/locales/management.en.yml b/config/locales/management.en.yml
index da94e3c79..7ea1dc876 100644
--- a/config/locales/management.en.yml
+++ b/config/locales/management.en.yml
@@ -1,71 +1,69 @@
+---
 en:
   management:
-    print_info: "Print this info"
-    username_label: "Username"
-    email_label: "Email"
-    check: "Check"
-    document_number: "Document number"
-    document_type_label: "Document type"
-    menu:
-      title: "Management"
-      users: "Users"
-      create_proposal: "Create proposal"
-      support_proposals: "Support proposals"
-      print_proposals: "Print proposals"
+    account_info:
+      change_user: Change user
+      document_number_label: 'Document number:'
+      document_type_label: 'Document type:'
+      email_label: 'Email:'
+      identified_label: 'Identified as:'
+      username_label: 'Username:'
+    check: Check
     dashboard:
       index:
-        title: "Management"
-    account_info:
-      identified_label: "Identified as:"
-      username_label: "Username:"
-      email_label: "Email:"
-      document_number_label: "Document number:"
-      document_type_label: "Document type:"
-      change_user: "Change user"
-    sessions:
-      signed_out: "Signed out successfully."
-      signed_out_managed_user: "User session signed out successfully."
-    proposals:
-      create_proposal: "Create proposal"
-      print:
-       print_button: "Print"
-      alert:
-        unverified_user: "User is not verified"
-    permissions:
-      debates: "Engage in debates"
-      create_proposals: "Create proposals"
-      support_proposals: "Support proposals"
-      vote_proposals: "Vote proposals"
+        title: Management
+    document_number: Document number
+    document_type_label: Document type
     document_verifications:
-      title: "User management"
-      please_check_account_data: "Please check that the account data above are correct."
-      already_verified: "This user account is already verified."
-      in_census_has_following_permissions: "This user can participate in the website with the following permissions:"
-      not_in_census: "This document is not registered in Madrid."
-      under_age: "You must be over 16 to verify your account."
-      not_in_census_info: "Citizens not in the Census can participate in the website with the following permissions:"
-      has_no_account_html: "In order to create an account, go to %{link} and click in <b>'Register'</b> in the upper-left part of the screen."
-      verify: "Verify"
+      already_verified: This user account is already verified.
+      has_no_account_html: In order to create an account, go to %{link} and click in <b>'Register'</b> in the upper-left part of the screen.
+      in_census_has_following_permissions: 'This user can participate in the website with the following permissions:'
+      not_in_census: This document is not registered in Madrid.
+      not_in_census_info: 'Citizens not in the Census can participate in the website with the following permissions:'
+      please_check_account_data: Please check that the account data above are correct.
+      title: User management
+      under_age: You must be over 16 to verify your account.
+      verify: Verify
+    email_label: Email
     email_verifications:
-      document_found_in_census: "This document was found in the census, but it has no user account associated to it."
-      choose_options: "Please choose one of the following options:"
-      if_existing_account: "If the person has already a user account created in the website,"
-      introduce_email: "Please introduce the email used on the account:"
-      email_placeholder: "Write the email this person used to create his or her account"
-      send_email: "Send verification email"
-      email_sent_instructions: "In order to completely verify this user, it is necessary that the user clicks on a link which we have sent to the email address above. This step is needed in order to confirm that the address belongs to him."
-      if_no_existing_account: "If this person has not created an account yet"
-      document_mismatch: "This email belongs to a user which already has an associated id: %{document_number}(%{document_type})"
-      already_verified: "This user account is already verified."
-    users:
-      create_user: "Create a new account"
-      create_user_info: "We will create an account with the following data:"
-      create_user_submit: "Create user"
-      create_user_success_html:
-        "We have sent an email to the email address <b>%{email}</b> in order to verify that it belongs to this user.
-        It contains a link they have to click. Then they will have to set their access password before being able
-        to log in to the website"
+      already_verified: This user account is already verified.
+      choose_options: 'Please choose one of the following options:'
+      document_found_in_census: This document was found in the census, but it has no user account associated to it.
+      document_mismatch: 'This email belongs to a user which already has an associated id: %{document_number}(%{document_type})'
+      email_placeholder: Write the email this person used to create his or her account
+      email_sent_instructions: In order to completely verify this user, it is necessary that the user clicks on a link which we have sent to the email address above. This step is needed in order to confirm that the address belongs to him.
+      if_existing_account: If the person has already a user account created in the website,
+      if_no_existing_account: If this person has not created an account yet
+      introduce_email: 'Please introduce the email used on the account:'
+      send_email: Send verification email
+    menu:
+      create_proposal: Create proposal
+      print_proposals: Print proposals
+      support_proposals: Support proposals
+      title: Management
+      users: Users
+    permissions:
+      create_proposals: Create proposals
+      debates: Engage in debates
+      support_proposals: Support proposals
+      vote_proposals: Vote proposals
     print:
-      proposals_title: "Proposals:"
-      info: "Create yor proposal on http://decide.madrid.es"
-      note: "The proposals more supported will be voted. If are accepted by a majority, the city Council shall be carried out."
\ No newline at end of file
+      info: Create yor proposal on http://decide.madrid.es
+      note: The proposals more supported will be voted. If are accepted by a majority, the city Council shall be carried out.
+      proposals_title: 'Proposals:'
+    print_info: Print this info
+    proposals:
+      alert:
+        unverified_user: User is not verified
+      create_proposal: Create proposal
+      print:
+        print_button: Print
+    sessions:
+      signed_out: Signed out successfully.
+      signed_out_managed_user: User session signed out successfully.
+    username_label: Username
+    users:
+      create_user: Create a new account
+      create_user_info: 'We will create an account with the following data:'
+      create_user_submit: Create user
+      create_user_success_html: We have sent an email to the email address <b>%{email}</b> in order to verify that it belongs to this user. It contains a link they have to click. Then they will have to set their access password before being able to log in to the website
diff --git a/config/locales/management.es.yml b/config/locales/management.es.yml
index bedc1252d..c219b68f4 100644
--- a/config/locales/management.es.yml
+++ b/config/locales/management.es.yml
@@ -1,71 +1,69 @@
+---
 es:
   management:
-    print_info: "Imprimir esta información"
-    username_label: "Nombre de usuario"
-    email_label: "Email"
-    check: "Comprobar"
-    document_number: "Número de documento"
-    document_type_label: "Tipo de documento"
-    menu:
-      title: "Gestión"
-      users: "Usuarios"
-      create_proposal: "Crear propuesta"
-      support_proposals: "Apoyar propuestas"
-      print_proposals: "Imprimir propuestas"
+    account_info:
+      change_user: Cambiar usuario
+      document_number_label: 'Número de documento:'
+      document_type_label: 'Tipo de documento:'
+      email_label: 'Email:'
+      identified_label: 'Identificado como:'
+      username_label: 'Usuario:'
+    check: Comprobar
     dashboard:
       index:
-       title: "Gestión"
-    account_info:
-      identified_label: "Identificado como:"
-      username_label: "Usuario:"
-      email_label: "Email:"
-      document_number_label: "Número de documento:"
-      document_type_label: "Tipo de documento:"
-      change_user: "Cambiar usuario"
-    sessions:
-      signed_out: "Has cerrado la sesión correctamente."
-      signed_out_managed_user: "Se ha cerrado correctamente la sesión del usuario."
-    proposals:
-      create_proposal: "Crear propuesta"
-      print:
-       print_button: "Imprimir"
-      alert:
-        unverified_user: "Este usuario no está verificado"
-    permissions:
-      debates: "Participar en debates"
-      create_proposals: "Crear nuevas propuestas"
-      support_proposals: "Apoyar propuestas"
-      vote_proposals: "Participar en las votaciones finales"
+        title: Gestión
+    document_number: Número de documento
+    document_type_label: Tipo de documento
     document_verifications:
-      title: "Gestión de usuarios"
-      please_check_account_data: "Compruebe que los datos anteriores son correctos para proceder a verificar la cuenta completamente."
-      already_verified: "Esta cuenta de usuario ya está verificada."
-      in_census_has_following_permissions: "Este usuario puede participar en el Portal de Gobierno Abierto del Ayuntamiento de Madrid con las siguientes posibilidades:"
-      not_in_census: "Este documento no está registrado en el Padrón Municipal de Madrid."
-      under_age: "Debes ser mayor de 16 años para verificar tu cuenta."
-      not_in_census_info: "Las personas no empadronadas en Madrid pueden participar en el Portal de Gobierno Abierto del Ayuntamiento de Madrid con las siguientes posibilidades:"
-      has_no_account_html: "Para crear un usuario entre en %{link} y haga clic en la opción <b>'Registrarse'</b> en la parte superior derecha de la pantalla."
-      verify: "Verificar usuario"
+      already_verified: Esta cuenta de usuario ya está verificada.
+      has_no_account_html: Para crear un usuario entre en %{link} y haga clic en la opción <b>'Registrarse'</b> en la parte superior derecha de la pantalla.
+      in_census_has_following_permissions: 'Este usuario puede participar en el Portal de Gobierno Abierto del Ayuntamiento de Madrid con las siguientes posibilidades:'
+      not_in_census: Este documento no está registrado en el Padrón Municipal de Madrid.
+      not_in_census_info: 'Las personas no empadronadas en Madrid pueden participar en el Portal de Gobierno Abierto del Ayuntamiento de Madrid con las siguientes posibilidades:'
+      please_check_account_data: Compruebe que los datos anteriores son correctos para proceder a verificar la cuenta completamente.
+      title: Gestión de usuarios
+      under_age: Debes ser mayor de 16 años para verificar tu cuenta.
+      verify: Verificar usuario
+    email_label: Email
     email_verifications:
-      document_found_in_census: "Este documento está en el registro del padrón municipal, pero todavía no tiene una cuenta de usuario asociada."
-      choose_options: "Elige una de las opciones siguientes:"
-      if_existing_account: "Si la persona ya ha creado una cuenta de usuario en la web"
-      introduce_email: "Introduce el email con el que creó la cuenta:"
-      email_placeholder: "Introduce el email de registro"
-      send_email: "Enviar email de verificación"
-      if_no_existing_account: "Si la persona todavía no ha creado una cuenta de usuario en la web"
-      email_sent_instructions: "Para terminar de verificar esta cuenta es necesario que haga clic en el enlace que le hemos enviado a la dirección de correo que figura arriba. Este paso es necesario para confirmar que dicha cuenta de usuario es suya."
-      document_mismatch: "Ese email corresponde a un usuario que ya tiene asociado el documento %{document_number}(%{document_type})"
-      already_verified: "Esta cuenta de usuario ya está verificada."
-    users:
-      create_user: "Crear nueva cuenta de usuario"
-      create_user_info: "Procedemos a crear un usuario con la siguiente información:"
-      create_user_submit: "Crear usuario"
-      create_user_success_html:
-        "Hemos enviado un correo electrónico a <b>%{email}</b> para verificar que es suya.
-        El correo enviado contiene un link que el usuario deberá pulsar. Entonces podrá seleccionar
-        una clave de acceso, y entrar en la web de participación."
+      already_verified: Esta cuenta de usuario ya está verificada.
+      choose_options: 'Elige una de las opciones siguientes:'
+      document_found_in_census: Este documento está en el registro del padrón municipal, pero todavía no tiene una cuenta de usuario asociada.
+      document_mismatch: Ese email corresponde a un usuario que ya tiene asociado el documento %{document_number}(%{document_type})
+      email_placeholder: Introduce el email de registro
+      email_sent_instructions: Para terminar de verificar esta cuenta es necesario que haga clic en el enlace que le hemos enviado a la dirección de correo que figura arriba. Este paso es necesario para confirmar que dicha cuenta de usuario es suya.
+      if_existing_account: Si la persona ya ha creado una cuenta de usuario en la web
+      if_no_existing_account: Si la persona todavía no ha creado una cuenta de usuario en la web
+      introduce_email: 'Introduce el email con el que creó la cuenta:'
+      send_email: Enviar email de verificación
+    menu:
+      create_proposal: Crear propuesta
+      print_proposals: Imprimir propuestas
+      support_proposals: Apoyar propuestas
+      title: Gestión
+      users: Usuarios
+    permissions:
+      create_proposals: Crear nuevas propuestas
+      debates: Participar en debates
+      support_proposals: Apoyar propuestas
+      vote_proposals: Participar en las votaciones finales
     print:
-      proposals_title: "Propuestas:"
-      info: "Haz tu propuesta en http://decide.madrid.es"
-      note: "Las propuestas más apoyadas serán llevadas a votación. Y si las acepta una mayoría, el Ayuntamiento las llevará a cabo."
\ No newline at end of file
+      info: Haz tu propuesta en http://decide.madrid.es
+      note: Las propuestas más apoyadas serán llevadas a votación. Y si las acepta una mayoría, el Ayuntamiento las llevará a cabo.
+      proposals_title: 'Propuestas:'
+    print_info: Imprimir esta información
+    proposals:
+      alert:
+        unverified_user: Este usuario no está verificado
+      create_proposal: Crear propuesta
+      print:
+        print_button: Imprimir
+    sessions:
+      signed_out: Has cerrado la sesión correctamente.
+      signed_out_managed_user: Se ha cerrado correctamente la sesión del usuario.
+    username_label: Nombre de usuario
+    users:
+      create_user: Crear nueva cuenta de usuario
+      create_user_info: 'Procedemos a crear un usuario con la siguiente información:'
+      create_user_submit: Crear usuario
+      create_user_success_html: Hemos enviado un correo electrónico a <b>%{email}</b> para verificar que es suya. El correo enviado contiene un link que el usuario deberá pulsar. Entonces podrá seleccionar una clave de acceso, y entrar en la web de participación.
diff --git a/config/locales/moderation.en.yml b/config/locales/moderation.en.yml
index 5c85ebf69..6304e8d62 100755
--- a/config/locales/moderation.en.yml
+++ b/config/locales/moderation.en.yml
@@ -1,75 +1,76 @@
+---
 en:
   moderation:
-    menu:
-      proposals: "Proposals"
-      flagged_debates: "Debates"
-      flagged_comments: "Comments"
-      users: "Block users"
-    dashboard:
-      index:
-        title: "Moderation"
     comments:
       index:
-        hide_comments: "Hide comments"
-        block_authors: "Block authors"
-        ignore_flags: "Mark as viewed"
-        title: "Comments"
-        headers:
-          comment: "Comment"
-          moderate: "Moderate"
-        filter: "Filter"
+        block_authors: Block authors
+        confirm: Are you sure?
+        filter: Filter
         filters:
-          all: "All"
-          pending_flag_review: "Pending"
-          with_ignored_flag: "Marked as viewed"
-        order: "Order"
+          all: All
+          pending_flag_review: Pending
+          with_ignored_flag: Marked as viewed
+        headers:
+          comment: Comment
+          moderate: Moderate
+        hide_comments: Hide comments
+        ignore_flags: Mark as viewed
+        order: Order
         orders:
-          newest: "Newest"
-          flags: "Most flagged"
-        confirm: "Are you sure?"
+          flags: Most flagged
+          newest: Newest
+        title: Comments
+    dashboard:
+      index:
+        title: Moderation
     debates:
       index:
-        hide_debates: "Hide debates"
-        block_authors: "Block authors"
-        ignore_flags: "Mark as viewed"
-        title: "Debates"
-        headers:
-          debate: "Debate"
-          moderate: "Moderate"
-        filter: "Filter"
+        block_authors: Block authors
+        confirm: Are you sure?
+        filter: Filter
         filters:
-          all: "All"
-          pending_flag_review: "Pending"
-          with_ignored_flag: "Marked as viewed"
-        order: "Order"
+          all: All
+          pending_flag_review: Pending
+          with_ignored_flag: Marked as viewed
+        headers:
+          debate: Debate
+          moderate: Moderate
+        hide_debates: Hide debates
+        ignore_flags: Mark as viewed
+        order: Order
         orders:
-          created_at: "Newest"
-          flags: "Most flagged"
-        confirm: "Are you sure?"
+          created_at: Newest
+          flags: Most flagged
+        title: Debates
+    menu:
+      flagged_comments: Comments
+      flagged_debates: Debates
+      proposals: Proposals
+      users: Block users
     proposals:
       index:
-        hide_proposals: "Hide proposals"
-        block_authors: "Block authors"
-        ignore_flags: "Mark as viewed"
-        title: "Proposals"
-        headers:
-          proposal: "Proposal"
-          moderate: "Moderate"
-        filter: "Filter"
+        block_authors: Block authors
+        confirm: Are you sure?
+        filter: Filter
         filters:
-          all: "All"
-          pending_flag_review: "Pending review"
-          with_ignored_flag: "Mark as viewed"
-        order: "Order by"
+          all: All
+          pending_flag_review: Pending review
+          with_ignored_flag: Mark as viewed
+        headers:
+          moderate: Moderate
+          proposal: Proposal
+        hide_proposals: Hide proposals
+        ignore_flags: Mark as viewed
+        order: Order by
         orders:
-          created_at: "Most recent"
-          flags: "Most flagged"
-        confirm: "Are you sure?"
+          created_at: Most recent
+          flags: Most flagged
+        title: Proposals
     users:
-      notice_hide: "User blocked. All of this user's debates and comments have been hidden."
       index:
-        title: "Block users"
-        search_placeholder: "email or name of user"
-        search: "Search"
-        hide: "Block"
-        hidden: "Blocked"
+        hidden: Blocked
+        hide: Block
+        search: Search
+        search_placeholder: email or name of user
+        title: Block users
+      notice_hide: User blocked. All of this user's debates and comments have been hidden.
diff --git a/config/locales/moderation.es.yml b/config/locales/moderation.es.yml
index d99a48877..2d7c3aea5 100644
--- a/config/locales/moderation.es.yml
+++ b/config/locales/moderation.es.yml
@@ -1,75 +1,76 @@
+---
 es:
   moderation:
-    menu:
-      proposals: "Propuestas"
-      flagged_debates: "Debates"
-      flagged_comments: "Comentarios"
-      users: "Bloquear usuarios"
-    dashboard:
-      index:
-        title: "Moderación"
     comments:
       index:
-        hide_comments: "Ocultar comentarios"
-        block_authors: "Bloquear autores"
-        ignore_flags: "Marcar como revisados"
-        title: "Comentarios"
-        headers:
-          comment: "Comentario"
-          moderate: "Moderar"
-        filter: "Filtrar"
-        filters:
-          all: "Todos"
-          pending_flag_review: "Pendientes"
-          with_ignored_flag: "Marcados como revisados"
-        order: "Orden"
-        orders:
-          newest: "Más nuevos"
-          flags: "Más denunciados"
+        block_authors: Bloquear autores
         confirm: "¿Estás seguro?"
+        filter: Filtrar
+        filters:
+          all: Todos
+          pending_flag_review: Pendientes
+          with_ignored_flag: Marcados como revisados
+        headers:
+          comment: Comentario
+          moderate: Moderar
+        hide_comments: Ocultar comentarios
+        ignore_flags: Marcar como revisados
+        order: Orden
+        orders:
+          flags: Más denunciados
+          newest: Más nuevos
+        title: Comentarios
+    dashboard:
+      index:
+        title: Moderación
     debates:
       index:
-        hide_debates: "Ocultar debates"
-        block_authors: "Bloquear autores"
-        ignore_flags: "Marcar como revisados"
-        title: "Debates"
-        headers:
-          debate: "Debate"
-          moderate: "Moderar"
-        filter: "Filtrar"
-        filters:
-          all: "Todos"
-          pending_flag_review: "Pendientes"
-          with_ignored_flag: "Marcados como revisados"
-        order: "Orden"
-        orders:
-          created_at: "Más nuevos"
-          flags: "Más denunciados"
+        block_authors: Bloquear autores
         confirm: "¿Estás seguro?"
+        filter: Filtrar
+        filters:
+          all: Todos
+          pending_flag_review: Pendientes
+          with_ignored_flag: Marcados como revisados
+        headers:
+          debate: Debate
+          moderate: Moderar
+        hide_debates: Ocultar debates
+        ignore_flags: Marcar como revisados
+        order: Orden
+        orders:
+          created_at: Más nuevos
+          flags: Más denunciados
+        title: Debates
+    menu:
+      flagged_comments: Comentarios
+      flagged_debates: Debates
+      proposals: Propuestas
+      users: Bloquear usuarios
     proposals:
       index:
-        hide_proposals: "Ocultar Propuestas"
-        block_authors: "Bloquear autores"
-        ignore_flags: "Marcar como revisadas"
-        title: "Propuestas"
-        headers:
-          proposal: "Propuesta"
-          moderate: "Moderar"
-        filter: "Filtro"
-        filters:
-          all: "Todas"
-          pending_flag_review: "Pendientes de revisión"
-          with_ignored_flag: "Marcadas como revisadas"
-        order: "Ordenar por"
-        orders:
-          created_at: "Más recientes"
-          flags: "Más denunciadas"
+        block_authors: Bloquear autores
         confirm: "¿Estás seguro?"
+        filter: Filtro
+        filters:
+          all: Todas
+          pending_flag_review: Pendientes de revisión
+          with_ignored_flag: Marcadas como revisadas
+        headers:
+          moderate: Moderar
+          proposal: Propuesta
+        hide_proposals: Ocultar Propuestas
+        ignore_flags: Marcar como revisadas
+        order: Ordenar por
+        orders:
+          created_at: Más recientes
+          flags: Más denunciadas
+        title: Propuestas
     users:
-      notice_hide: "Usuario bloqueado. Se han ocultado todos sus debates y comentarios."
       index:
-        title: "Bloquear usuarios"
-        search_placeholder: "email o nombre de usuario"
-        search: "Buscar"
-        hide: "Bloquear"
-        hidden: "Bloqueado"
+        hidden: Bloqueado
+        hide: Bloquear
+        search: Buscar
+        search_placeholder: email o nombre de usuario
+        title: Bloquear usuarios
+      notice_hide: Usuario bloqueado. Se han ocultado todos sus debates y comentarios.
diff --git a/config/locales/pages.en.yml b/config/locales/pages.en.yml
index f34e7250a..6b329e80d 100755
--- a/config/locales/pages.en.yml
+++ b/config/locales/pages.en.yml
@@ -1,101 +1,81 @@
+---
 en:
   pages:
-    titles:
-      more_information: "More information"
-      privacy: "Privacy Policy"
-      opendata: "Open Data"
-      conditions: "Terms of use"
-      accessibility: "Accessibility"
-    conditions:
-      "Terms and conditions of use"
-    privacy:
-      "Privacy Policy"
-    general_terms:
-      "Terms and Conditions"
-    census_terms:
-      "To confirm the account, you must be 16 or older and be registered as resident in Madrid, having provided the information requested previously, which the Directorate-General of Civil Participation will verify against the files 'Municipal Census of Inhabitants', for which the Directorate-General for Statistics is responsible, and the 'Citizen Support Services', for which the Directorate-General for Quality and Citizen Services is responsible.
-      By accepting the verification process, you also consent to the verification of this information, as well as the contact methods featuring in said files.
-      The data provided will be acquired and processed by the Directorate-General for Civil Participation in the file 'Management of Participatory Activities' mentioned previously in the terms and conditions of use for the Portal."
-    while_unfinished_html: 'While we finish, we encourage you to visit the <a href="/blog" target="_blank">Citizen Participation Area, Transparency and Open Government blog</a> to know about our progress and news; or the <a href="/">Citizen Participation section</a> where you can decide which is the city you want.'
-    opendata:
-      title: "Open Data"
-      slogan_html: "We are working on the new Madrid City Council Open Data Portal, meanwhile you can visit the actual Open Data Portal:"
-      go_old: "Go to Open Data Portal"
-    verify:
-      title: "Verify your account"
-      info: "For verufy your account introduce your access data:"
-      info_code: "Now introduce the code you received in letter:"
-      email: "Email"
-      password: "Password"
-      code: "Code you received in letter"
-      submit: "Verify my account"
+    census_terms: To confirm the account, you must be 16 or older and be registered as resident in Madrid, having provided the information requested previously, which the Directorate-General of Civil Participation will verify against the files 'Municipal Census of Inhabitants', for which the Directorate-General for Statistics is responsible, and the 'Citizen Support Services', for which the Directorate-General for Quality and Citizen Services is responsible. By accepting the verification process, you also consent to the verification of this information, as well as the contact methods featuring in said files. The data provided will be acquired and processed by the Directorate-General for Civil Participation in the file 'Management of Participatory Activities' mentioned previously in the terms and conditions of use for the Portal.
+    conditions: Terms and conditions of use
+    general_terms: Terms and Conditions
     more_information:
-      titles:
-        how_it_works: "How does this Open Government Portal work?"
-        how_to_use: "Use it in your local government"
-        participation: "Madrid Participation and Transparency y Transparencia - coming news"
-        proposals_info: "How does citizen proposals work?"
-        spending_proposals_info: "How does participatory budgeting work?"
-        participation_world: "Direct citizen participation in the world"
-        participation_facts: "Facts about citizen participation and direct democracy"
-        faq: "Solution to tecnical problemas (FAQ)"
-        signature_sheet: "Signature sheet"
       description:
-        how_it_works: "Find out all you can do with this web site"
-        how_to_use: "Use it freely or help us to improve it, it is free software"
-        participation: "Citizen participation, transparency and open government"
-        proposals_info: "Create your own proposals"
-        spending_proposals_info: "Create your own spending proposals"
-        participation_world: "Systems of citizen participation that exist in the world"
-        participation_facts: "To lose your fear"
-        faq: "Frecuently asked question about tecnical problems"
-        signature_sheet: "Sheet collecting signatures for support"
+        faq: Frecuently asked question about tecnical problems
+        how_it_works: Find out all you can do with this web site
+        how_to_use: Use it freely or help us to improve it, it is free software
+        participation: Citizen participation, transparency and open government
+        participation_facts: To lose your fear
+        participation_world: Systems of citizen participation that exist in the world
+        proposals_info: Create your own proposals
+        signature_sheet: Sheet collecting signatures for support
+        spending_proposals_info: Create your own spending proposals
       how_it_works:
-        i: "Participation"
-        i1: "Debates area"
-        i2: "Proposals area"
-        text:  "The new Open Government Portal is divided in three parts: Participation, Transparency and Open Data (you can see the links in the upper right-hand part).
+        i: Participation
+        i1: Debates area
+        i2: Proposals area
+        text: |-
+          The new Open Government Portal is divided in three parts: Participation, Transparency and Open Data (you can see the links in the upper right-hand part).
+          >**I. Participation:** In this part we can decide which city we want (using citizen proposals, debate areas, participatory budgets , collaborative legislation, and many others we will implement).
+          **II. Transparency:** In this part information about how Madrid is managed will be published every day: name, position, salary, contracts, agenda,... of the persons in charge. It is also the place where exercise your right to access information, having the chance to request any information about Madrid City Council easily and rapidly.
+          **III. Open data:** In this part the city council databases are posted, so that anyone can use information directly, without having to ask. It can also be requested the publication of more databases.
 
-                >**I. Participation:** In this part we can decide which city we want (using citizen proposals, debate areas, participatory budgets , collaborative legislation, and many others we will implement).
+          We have opened the new Participation portal and we will open the new Transparency and Open Data seccion shortly (meanwhile the links to existing sites are kept).
+          ## <a id='i'></a> I. Participation
+          The participation section will have different ways to participate: citizen proposals, debate areas, participatory budgets , collaborative legislation, and many others. You can currently visit the debate area and the citizen proposals will be ready very soon.
+          ## <a id='i1'></a>I.I. Debates area
+          In the debates area everyone can open a discussion thread about any topic, creating an independent space where people could debate about the proposed topic. In this way, in this digital space there will be hundreds of different debate spaces which citizens could see, joining the ones they find more interesting.
 
-                **II. Transparency:** In this part information about how Madrid is managed will be published every day: name, position, salary, contracts, agenda,... of the persons in charge. It is also the place where exercise your right to access information, having the chance to request any information about Madrid City Council easily and rapidly.
+          Both threads and comments could be valued by anyone, so the citizenship, and not someone in its name, will decide which are the most important issues in every moment. These will be showed in the main page of the space, being able to access also the rest of issues in following pages, or using others order criteria (the most commented, the newst, the most controversial, etc.).
 
-                **III. Open data:** In this part the city council databases are posted, so that anyone can use information directly, without having to ask. It can also be requested the publication of more databases.
+          Every city council employee has its own user, which will be designated as such, allowing them to participate in debates at the same level than the rest of citizens. That will allow creating direct communication spaces between them, avoiding the problems that implies the measured communication, and following clear approach of the new Madrid City Council by virtue of which the city council works for the citizenship.
+          ## <a id='i2'></a> I.I. Proposals area
+          In the proposals area everyone can propose an initiative with the intention of collecting support enough for the idea being consulting to the whole citizenship with binding effect.
 
+          The proposals can be supported by every citizen registered in Madrid that has verified their account in the participation platform. In this way, the citizenship, and not someone in its name, will decide which are the proposals that are worthwhile to carry out.
 
-                We have opened the new Participation portal and we will open the new Transparency and Open Data seccion shortly (meanwhile the links to existing sites are kept).
-
-                ## <a id='i'></a> I. Participation
-
-                The participation section will have different ways to participate: citizen proposals, debate areas, participatory budgets , collaborative legislation, and many others. You can currently visit the debate area and the citizen proposals will be ready very soon.
-
-                ## <a id='i1'></a>I.I. Debates area
-
-                In the debates area everyone can open a discussion thread about any topic, creating an independent space where people could debate about the proposed topic. In this way, in this digital space there will be hundreds of different debate spaces which citizens could see, joining the ones they find more interesting.
-
-
-                Both threads and comments could be valued by anyone, so the citizenship, and not someone in its name, will decide which are the most important issues in every moment. These will be showed in the main page of the space, being able to access also the rest of issues in following pages, or using others order criteria (the most commented, the newst, the most controversial, etc.).
-
-
-                Every city council employee has its own user, which will be designated as such, allowing them to participate in debates at the same level than the rest of citizens. That will allow creating direct communication spaces between them, avoiding the problems that implies the measured communication, and following clear approach of the new Madrid City Council by virtue of which the city council works for the citizenship.
-
-                ## <a id='i2'></a> I.I. Proposals area
-
-                In the proposals area everyone can propose an initiative with the intention of collecting support enough for the idea being consulting to the whole citizenship with binding effect.
-
-
-                The proposals can be supported by every citizen registered in Madrid that has verified their account in the participation platform. In this way, the citizenship, and not someone in its name, will decide which are the proposals that are worthwhile to carry out.
-
-
-                One that the proposal has achive support of 2% Madrid census (arround 53000 people), it will be studied by a city council group and to move beyond the popular referendum phase, in which Madrid citizenship will vote if it is carried out or not. The maximum period to obtain support enough is 12 months."
+          One that the proposal has achive support of 2% Madrid census (arround 53000 people), it will be studied by a city council group and to move beyond the popular referendum phase, in which Madrid citizenship will vote if it is carried out or not. The maximum period to obtain support enough is 12 months.
       how_to_use:
-        text:  "Use it in your local government or help us to improve it, it is free software.
+        text: |-
+          Use it in your local government or help us to improve it, it is free software.
 
+          This Open Government Portal use the [Consul app](https://github.com/ayuntamientomadrid 'consul github') that is free software, with [licence AGPLv3](http://www.gnu.org/licenses/agpl-3.0.html 'AGPLv3 gnu' ), that means in simple words that anyone can use the code freely, copy it, see it in detail, modify it and redistribute it to the word with the modifications he wants (allowing others to do the same). Because we think culture is better and richer when it is released.
 
-                This Open Government Portal use the [Consul app](https://github.com/ayuntamientomadrid 'consul github') that is free software, with [licence AGPLv3](http://www.gnu.org/licenses/agpl-3.0.html 'AGPLv3 gnu' ), that means in simple words that anyone can use the code freely, copy it, see it in detail, modify it and redistribute it to the word with the modifications he wants (allowing others to do the same). Because we think culture is better and richer when it is released.
+          Not only can you use freely this portal in yout local government, but you also will be helped by Madrid city council as much as possible to do it, so if you are interested write us: <a href='mailto:ag.gobiernoabierto@madrid.es'>ag.gobiernoabierto@madrid.es</a>
 
-
-                Not only can you use freely this portal in yout local government, but you also will be helped by Madrid city council as much as possible to do it, so if you are interested write us: <a href='mailto:ag.gobiernoabierto@madrid.es'>ag.gobiernoabierto@madrid.es</a>
-
-
-                If you are a programmer, you can see the code and help us to improve it at [Consul app](https://github.com/ayuntamientomadrid 'consul github ' )."
+          If you are a programmer, you can see the code and help us to improve it at [Consul app](https://github.com/ayuntamientomadrid 'consul github ' ).
+      titles:
+        faq: Solution to tecnical problemas (FAQ)
+        how_it_works: How does this Open Government Portal work?
+        how_to_use: Use it in your local government
+        participation: Madrid Participation and Transparency y Transparencia - coming news
+        participation_facts: Facts about citizen participation and direct democracy
+        participation_world: Direct citizen participation in the world
+        proposals_info: How does citizen proposals work?
+        signature_sheet: Signature sheet
+        spending_proposals_info: How does participatory budgeting work?
+    opendata:
+      go_old: Go to Open Data Portal
+      slogan_html: 'We are working on the new Madrid City Council Open Data Portal, meanwhile you can visit the actual Open Data Portal:'
+      title: Open Data
+    privacy: Privacy Policy
+    titles:
+      accessibility: Accessibility
+      conditions: Terms of use
+      more_information: More information
+      opendata: Open Data
+      privacy: Privacy Policy
+    verify:
+      code: Code you received in letter
+      email: Email
+      info: 'For verufy your account introduce your access data:'
+      info_code: 'Now introduce the code you received in letter:'
+      password: Password
+      submit: Verify my account
+      title: Verify your account
+    while_unfinished_html: While we finish, we encourage you to visit the <a href="/blog" target="_blank">Citizen Participation Area, Transparency and Open Government blog</a> to know about our progress and news; or the <a href="/">Citizen Participation section</a> where you can decide which is the city you want.
diff --git a/config/locales/pages.es.yml b/config/locales/pages.es.yml
index 77a996ba5..92eb505c2 100644
--- a/config/locales/pages.es.yml
+++ b/config/locales/pages.es.yml
@@ -1,101 +1,81 @@
+---
 es:
   pages:
-    titles:
-      more_information: "Más información"
-      privacy: "Política de Privacidad"
-      opendata: "Datos abiertos"
-      conditions: "Condiciones de uso"
-      accessibility: "Accesibilidad"
-    conditions:
-      "Condiciones de uso"
-    privacy:
-      "Política de Privacidad"
-    general_terms:
-      "Términos y Condiciones"
-    census_terms:
-      "Para verificar la cuenta hay que tener 16 años o más y estar empadronado en Madrid aportando los datos indicados anteriormente, los cuales serán contrastados por la Dirección General de Participación Ciudadana con los ficheros 'Padrón Municipal de Habitantes' cuyo responsable es la Dirección General de Estadística y 'Servicios Atención al Ciudadano' cuyo responsable es la Dirección General de Calidad y Atención al Ciudadano.
-      Aceptando el proceso de verificación acepta dar su consentimiento para contrastar dicha información, así como medios de contacto que figuren en dichos ficheros.
-      Los datos aportados serán incorporados y tratados por la Dirección General de Participación Ciudadana en el fichero 'Gestión de Procesos Participativos' indicado anteriormente en las condiciones de uso del portal."
-    while_unfinished_html: 'Mientras acabamos el nuevo portal, te invitamos a visitar el <a href="/blog" target="_blank">blog del Área de Participación Ciudadana, Transparencia y Gobierno Abierto</a> para conocer nuestros avances y novedades; o la <a href="/">sección de Participación Ciudadana</a> donde poder decidir qué ciudad es la que quieres.'
-    opendata:
-      title: "Datos abiertos"
-      slogan_html: "Estamos trabajando en el nuevo Portal de Datos Abiertos del Ayuntamiento de Madrid, por ahora puedes visitar el portal que existía hasta ahora:"
-      go_old: "Ir al Portal de Datos Abiertos"
-    verify:
-      title: "Verifica tu cuenta"
-      info: "Para verificar tu cuenta introduce los datos con los que te registraste:"
-      info_code: "Ahora introduce el código que has recibido en tu carta:"
-      email: "Email"
-      password: "Contraseña"
-      code: "Código que has recibido en tu carta"
-      submit: "Verificar mi cuenta"
+    census_terms: Para verificar la cuenta hay que tener 16 años o más y estar empadronado en Madrid aportando los datos indicados anteriormente, los cuales serán contrastados por la Dirección General de Participación Ciudadana con los ficheros 'Padrón Municipal de Habitantes' cuyo responsable es la Dirección General de Estadística y 'Servicios Atención al Ciudadano' cuyo responsable es la Dirección General de Calidad y Atención al Ciudadano. Aceptando el proceso de verificación acepta dar su consentimiento para contrastar dicha información, así como medios de contacto que figuren en dichos ficheros. Los datos aportados serán incorporados y tratados por la Dirección General de Participación Ciudadana en el fichero 'Gestión de Procesos Participativos' indicado anteriormente en las condiciones de uso del portal.
+    conditions: Condiciones de uso
+    general_terms: Términos y Condiciones
     more_information:
-      titles:
-        how_it_works: "¿Cómo funciona este Portal de Gobierno Abierto?"
-        how_to_use: "Utilízalo en tu municipio"
-        participation: "Participación y Transparencia en Madrid - Próximas novedades"
-        proposals_info: "¿Cómo funcionan las propuestas ciudadanas?"
-        spending_proposals_info: "¿Cómo funcionan los presupuestos participativos?"
-        participation_world: "Participación ciudadana directa en el mundo"
-        participation_facts: "Hechos sobre participación ciudadana y democracia directa"
-        faq: "Soluciones a problemas técnicos (FAQ)"
-        signature_sheet: "Hojas de firmas"
       description:
-        how_it_works: "Descubre todo lo que puedes hacer en esta web"
-        how_to_use: "Utilízalo libremente o ayúdanos a mejorarlo, es software libre"
-        participation: "Participación Ciudadana, Transparencia y Gobierno Abierto"
-        proposals_info: "Crea tus propias propuestas"
-        spending_proposals_info: "Envía tus propuestas de gasto"
-        participation_world: "Sistemas de participación ciudadana que ya existen en el mundo"
-        participation_facts: "Para perderle el miedo"
-        faq: "Preguntas frecuentes sobre problemas técnicos"
-        signature_sheet: "Hojas de firmas para recoger apoyos"
+        faq: Preguntas frecuentes sobre problemas técnicos
+        how_it_works: Descubre todo lo que puedes hacer en esta web
+        how_to_use: Utilízalo libremente o ayúdanos a mejorarlo, es software libre
+        participation: Participación Ciudadana, Transparencia y Gobierno Abierto
+        participation_facts: Para perderle el miedo
+        participation_world: Sistemas de participación ciudadana que ya existen en el mundo
+        proposals_info: Crea tus propias propuestas
+        signature_sheet: Hojas de firmas para recoger apoyos
+        spending_proposals_info: Envía tus propuestas de gasto
       how_it_works:
-        i: "Participación"
-        i1: "Espacio de debate"
-        i2: "Espacio de propuestas"
-        text:  "El nuevo Portal de Gobierno Abierto está dividido en tres partes: Participación, Transparencia y Datos Abiertos (verás los enlaces en la parte superior derecha).
+        i: Participación
+        i1: Espacio de debate
+        i2: Espacio de propuestas
+        text: |-
+          El nuevo Portal de Gobierno Abierto está dividido en tres partes: Participación, Transparencia y Datos Abiertos (verás los enlaces en la parte superior derecha).
+          >**I. Participación:** Donde poder decidir qué ciudad queremos tener (a través de propuestas ciudadanas, espacios de debate, presupuestos participativos, legislación colaborativa, y muchos otros procesos que iremos implementando).
+          **II. Transparencia:** En este espacio se publicarán todos los datos relativos a quién y cómo se gestiona Madrid (nombres de los responsables, cargos, sueldos, planes de gobierno, contratos, agendas de los responsables...). Además es el espacio donde ejercer el derecho de acceso a la información, pudiendo solicitar cualquier información sobre el Ayuntamiento de Madrid de manera fácil y rápida.
+          **III. Datos Abiertos:** En este espacio se cuelgan las bases de datos que tiene el Ayuntamiento, para que cualquiera pueda usar toda la información directamente, sin necesidad ni siquiera de preguntar. También se puede solicitar la publicación de más bases de datos.
 
-                >**I. Participación:** Donde poder decidir qué ciudad queremos tener (a través de propuestas ciudadanas, espacios de debate, presupuestos participativos, legislación colaborativa, y muchos otros procesos que iremos implementando).
+          Inauguramos el nuevo portal con la nueva sección de Participación, y en breve añadiremos las nuevas secciones de Transparencia y Datos Abiertos (así que mantenemos por el momento los enlaces a las páginas al respecto que ya existían).
+          ## <a id='i'></a> I. Participación
+          El apartado de participación comprenderá diferentes mecanismos de participación: propuestas ciudadanas, espacios de debate, presupuestos participativos, legislación colaborativa, entre muchos otros. Por el momento presentamos el espacio de debate, y muy pronto las propuestas ciudadanas.
+          ## <a id='i1'></a>I.I. Espacio de debate
+          En este espacio, cualquier persona puede abrir un hilo de discusión sobre cualquier tema, creando un espacio independiente donde la gente podrá debatir sobre el tema propuesto. De esta manera, en este espacio digital convivirán cada día cientos de espacios de debate distintos entre los que la ciudadanía podrá pasearse, sumándose a los que más les interese.
 
-                **II. Transparencia:** En este espacio se publicarán todos los datos relativos a quién y cómo se gestiona Madrid (nombres de los responsables, cargos, sueldos, planes de gobierno, contratos, agendas de los responsables...). Además es el espacio donde ejercer el derecho de acceso a la información, pudiendo solicitar cualquier información sobre el Ayuntamiento de Madrid de manera fácil y rápida.
+          Tanto los hilos, como los comentarios podrán ser valorados por cualquiera, de tal manera que será la propia ciudadanía, y nadie en su nombre, la que decida cuáles son los temas más importantes en cada momento. Estos serán presentados en la portada del espacio, pudiendo por supuesto accederse a todos los demás temas en páginas posteriores, o usando otros criterios de ordenación (los temas con más comentarios, los más nuevos, los más controvertidos, etc.).
 
-                **III. Datos Abiertos:** En este espacio se cuelgan las bases de datos que tiene el Ayuntamiento, para que cualquiera pueda usar toda la información directamente, sin necesidad ni siquiera de preguntar. También se puede solicitar la publicación de más bases de datos.
+          Cada uno de los trabajadores del Ayuntamiento tiene un usuario propio, que será resaltado como tal, permitiendo que participen en los debates al mismo nivel que todos los demás ciudadanos. Esto permitirá crear espacios de comunicación directos entre unos y otros, evitando los inconvenientes que implica la comunicación medidada, y respondiendo a un planteamiento claro por parte del nuevo gobierno de Madrid por el cual el Ayuntamiento trabaja para la ciudadanía, y ante ella debe responder.
+          ## <a id='i2'></a> I.I. Espacio de propuestas
+          En este espacio, cualquier persona puede proponer una iniciativa con la intención de recabar los suficientes apoyos como para que la idea pase a ser consultada a toda la ciudadanía con caracter vinculante.
 
+          Las propuestas pueden ser apoyadas por ciudadanos empadronados en Madrid que hayan verificado su cuenta en la plataforma de participación, de tal manera que será la propia ciudadanía, y nadie en su nombre, la que decida cuáles son las propuestas que merecen la pena ser llevadas a cabo.
 
-                Inauguramos el nuevo portal con la nueva sección de Participación, y en breve añadiremos las nuevas secciones de Transparencia y Datos Abiertos (así que mantenemos por el momento los enlaces a las páginas al respecto que ya existían).
-
-                ## <a id='i'></a> I. Participación
-
-                El apartado de participación comprenderá diferentes mecanismos de participación: propuestas ciudadanas, espacios de debate, presupuestos participativos, legislación colaborativa, entre muchos otros. Por el momento presentamos el espacio de debate, y muy pronto las propuestas ciudadanas.
-
-                ## <a id='i1'></a>I.I. Espacio de debate
-
-                En este espacio, cualquier persona puede abrir un hilo de discusión sobre cualquier tema, creando un espacio independiente donde la gente podrá debatir sobre el tema propuesto. De esta manera, en este espacio digital convivirán cada día cientos de espacios de debate distintos entre los que la ciudadanía podrá pasearse, sumándose a los que más les interese.
-
-
-                Tanto los hilos, como los comentarios podrán ser valorados por cualquiera, de tal manera que será la propia ciudadanía, y nadie en su nombre, la que decida cuáles son los temas más importantes en cada momento. Estos serán presentados en la portada del espacio, pudiendo por supuesto accederse a todos los demás temas en páginas posteriores, o usando otros criterios de ordenación (los temas con más comentarios, los más nuevos, los más controvertidos, etc.).
-
-
-                Cada uno de los trabajadores del Ayuntamiento tiene un usuario propio, que será resaltado como tal, permitiendo que participen en los debates al mismo nivel que todos los demás ciudadanos. Esto permitirá crear espacios de comunicación directos entre unos y otros, evitando los inconvenientes que implica la comunicación medidada, y respondiendo a un planteamiento claro por parte del nuevo gobierno de Madrid por el cual el Ayuntamiento trabaja para la ciudadanía, y ante ella debe responder.
-
-                ## <a id='i2'></a> I.I. Espacio de propuestas
-
-                En este espacio, cualquier persona puede proponer una iniciativa con la intención de recabar los suficientes apoyos como para que la idea pase a ser consultada a toda la ciudadanía con caracter vinculante.
-
-
-                Las propuestas pueden ser apoyadas por ciudadanos empadronados en Madrid que hayan verificado su cuenta en la plataforma de participación, de tal manera que será la propia ciudadanía, y nadie en su nombre, la que decida cuáles son las propuestas que merecen la pena ser llevadas a cabo.
-
-
-                Una vez que una propuesta alcance una cantidad de apoyos equivalente al 2% del censo de Madrid (unos 53000), automaticamente pasa a ser estudiada por un grupo de trabajo del Ayuntamiento y pasará a la siguiente fase de consulta popular, en la que la ciudadanía de Madrid votará si se lleva a cabo o no. El plazo máximo para recabar los apoyos necesarios será de 12 meses."
+          Una vez que una propuesta alcance una cantidad de apoyos equivalente al 2% del censo de Madrid (unos 53000), automaticamente pasa a ser estudiada por un grupo de trabajo del Ayuntamiento y pasará a la siguiente fase de consulta popular, en la que la ciudadanía de Madrid votará si se lleva a cabo o no. El plazo máximo para recabar los apoyos necesarios será de 12 meses.
       how_to_use:
-        text:  "Utilízalo en tu municipio libremente o ayúdanos a mejorarlo, es software libre.
+        text: |-
+          Utilízalo en tu municipio libremente o ayúdanos a mejorarlo, es software libre.
 
+          Este Portal de Gobierno Abierto usa la [aplicación Consul](https://github.com/ayuntamientomadrid 'github consul' ) que es software libre, con [licencia AGPLv3](http://www.gnu.org/licenses/agpl-3.0.html 'AGPLv3 gnu' ), esto significa en palabras sencillas, que cualquiera puede libremente usar el código, copiarlo, verlo en detalle, modificarlo, y redistribuirlo al mundo con las modificaciones que quiera (manteniendo el que otros puedan a su vez hacer lo mismo). Porque creemos que la cultura es mejor y más rica cuando se libera.
 
-                Este Portal de Gobierno Abierto usa la [aplicación Consul](https://github.com/ayuntamientomadrid 'github consul' ) que es software libre, con [licencia AGPLv3](http://www.gnu.org/licenses/agpl-3.0.html 'AGPLv3 gnu' ), esto significa en palabras sencillas, que cualquiera puede libremente usar el código, copiarlo, verlo en detalle, modificarlo, y redistribuirlo al mundo con las modificaciones que quiera (manteniendo el que otros puedan a su vez hacer lo mismo). Porque creemos que la cultura es mejor y más rica cuando se libera.
+          No sólo puedes utilizar libremente este portal en tu municipio, sino que desde el Ayuntamiento de Madrid vamos a ayudarte todo lo posible a que lo hagas, así que si estás interesado, escríbenos a <a href='mailto:ag.gobiernoabierto@madrid.es'>ag.gobiernoabierto@madrid.es</a>
 
-
-                No sólo puedes utilizar libremente este portal en tu municipio, sino que desde el Ayuntamiento de Madrid vamos a ayudarte todo lo posible a que lo hagas, así que si estás interesado, escríbenos a <a href='mailto:ag.gobiernoabierto@madrid.es'>ag.gobiernoabierto@madrid.es</a>
-
-
-                Si eres programador, puedes ver el código y ayudarnos a mejorarlo en [aplicación Consul](https://github.com/ayuntamientomadrid 'github consul' )."
+          Si eres programador, puedes ver el código y ayudarnos a mejorarlo en [aplicación Consul](https://github.com/ayuntamientomadrid 'github consul' ).
+      titles:
+        faq: Soluciones a problemas técnicos (FAQ)
+        how_it_works: "¿Cómo funciona este Portal de Gobierno Abierto?"
+        how_to_use: Utilízalo en tu municipio
+        participation: Participación y Transparencia en Madrid - Próximas novedades
+        participation_facts: Hechos sobre participación ciudadana y democracia directa
+        participation_world: Participación ciudadana directa en el mundo
+        proposals_info: "¿Cómo funcionan las propuestas ciudadanas?"
+        signature_sheet: Hojas de firmas
+        spending_proposals_info: "¿Cómo funcionan los presupuestos participativos?"
+    opendata:
+      go_old: Ir al Portal de Datos Abiertos
+      slogan_html: 'Estamos trabajando en el nuevo Portal de Datos Abiertos del Ayuntamiento de Madrid, por ahora puedes visitar el portal que existía hasta ahora:'
+      title: Datos abiertos
+    privacy: Política de Privacidad
+    titles:
+      accessibility: Accesibilidad
+      conditions: Condiciones de uso
+      more_information: Más información
+      opendata: Datos abiertos
+      privacy: Política de Privacidad
+    verify:
+      code: Código que has recibido en tu carta
+      email: Email
+      info: 'Para verificar tu cuenta introduce los datos con los que te registraste:'
+      info_code: 'Ahora introduce el código que has recibido en tu carta:'
+      password: Contraseña
+      submit: Verificar mi cuenta
+      title: Verifica tu cuenta
+    while_unfinished_html: Mientras acabamos el nuevo portal, te invitamos a visitar el <a href="/blog" target="_blank">blog del Área de Participación Ciudadana, Transparencia y Gobierno Abierto</a> para conocer nuestros avances y novedades; o la <a href="/">sección de Participación Ciudadana</a> donde poder decidir qué ciudad es la que quieres.
diff --git a/config/locales/responders.en.yml b/config/locales/responders.en.yml
index 1f0010f6f..93796c311 100755
--- a/config/locales/responders.en.yml
+++ b/config/locales/responders.en.yml
@@ -1,12 +1,10 @@
+---
 en:
   flash:
     actions:
       create:
         notice: "%{resource_name} created successfully."
+      save_changes:
+        notice: Changes saved
       update:
         notice: "%{resource_name} updated successfully."
-      # destroy:
-        # notice: "%{resource_name} destroyed successfully."
-        # alert: "%{resource_name} could not be destroyed."
-      save_changes:
-        notice: "Changes saved"
diff --git a/config/locales/responders.es.yml b/config/locales/responders.es.yml
index 6b64f5728..92fd57027 100644
--- a/config/locales/responders.es.yml
+++ b/config/locales/responders.es.yml
@@ -1,12 +1,10 @@
+---
 es:
   flash:
     actions:
       create:
         notice: "%{resource_name} creado correctamente."
+      save_changes:
+        notice: Cambios guardados
       update:
         notice: "%{resource_name} actualizado correctamente."
-      # destroy:
-        # notice: "%{resource_name} borrado correctamente."
-        # alert: "%{resource_name} no ha podido ser borrado."
-      save_changes:
-        notice: "Cambios guardados"
diff --git a/config/locales/verification.en.yml b/config/locales/verification.en.yml
index 97208ec37..822baa411 100755
--- a/config/locales/verification.en.yml
+++ b/config/locales/verification.en.yml
@@ -1,108 +1,109 @@
+---
 en:
   verification:
-    back: "Return to my account"
-    step_1: "Residence"
-    step_2: "Confirmation code"
-    step_3: "Final verification"
     alert:
-      lock: "You have reached the maximum number of attempts. Please try again later."
-    user_permission_info: "Verifing your information you'll be able to..."
-    user_permission_debates: "Participate on debates"
-    user_permission_proposal: "Create new proposals"
-    user_permission_support_proposal: "Support proposals*"
-    user_permission_votes: "Participate on final voting*"
-    residence:
-      new:
-        title: "Verify residence"
-        document_type_label: "Document type"
-        document_type:
-          spanish_id: "DNI"
-          passport: "Passport"
-          residence_card: "Residence card"
-        document_number: "Document number"
-        date_of_birth: "Date of birth"
-        postal_code: "Postcode"
-        postal_code_note: "To verify your account you must be on Madrid city Census"
-        accept_terms_text: "I accept %{terms_url} of the Census"
-        terms: "the terms and conditions of access"
-        verify_residence: "Verify residence"
-        form_errors: "prevented the verification of your residence"
-        error_verifying_census: "The Madrid Census was unable to verify your information. Please confirm that your census details are correct by calling 010 (or 915298210) or visit any of %{offices}."
-        error_verifying_census_offices: "26 Office of Citizen"
-        error_not_allowed_age: "You must be at least 16 years old"
-        error_not_allowed_postal_code: "In order to be verified, you must be registered in the municipality of Madrid."
+      lock: You have reached the maximum number of attempts. Please try again later.
+    back: Return to my account
+    email:
       create:
+        alert:
+          failure: There was a problem with sending an email to your account
         flash:
-          success: "Residence verified"
+          success: 'We have sent a confirmation email to your account: %{email}'
+      show:
+        alert:
+          failure: Verification code incorrect
+        flash:
+          success: You are a verified user
+    letter:
       alert:
-        unconfirmed_residency: "You have not yet confirmed your residency"
-    sms:
-      new:
-        title: "Send confirmation code"
-        phone: "Enter your mobile phone number to receive the code"
-        phone_note: "We only user your phone for send to you a code, we never contact to you."
-        submit_button: "Send"
+        unconfirmed_code: You have not yet entered the confirmation code
       create:
         flash:
-          success: "Enter the confirmation code sent to you by text message"
+          offices: Citizen Support Offices
+          offices_url: http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD
+          success_html: Thank you for requesting your <b>maximum security code (only required for the final votes)</b>. In a few days we will send it to the address featuring in the data we have on file. Please remember that, if you prefer, you can collect your code from any of the %{offices}.
       edit:
-        title: "Security code confirmation"
-        confirmation_code: "Enter the code you received on your mobile"
-        resend_sms_text: "Didn't get a text with your confirmation code?"
-        resend_sms_link: "Click here to send it again"
-        submit_button: "Send"
+        see_all: See proposals
+        title: Letter requested
+      errors:
+        incorrect_code: Verification code incorrect
+      new:
+        explanation: 'For participate on final voting you can:'
+        go_to_index: See proposals
+        office: Verify in any %{office}
+        offices: Citizen Support Offices
+        offices_url: http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD
+        send_letter: Send me a letter with the code
+        title: Congratulations!
+        user_permission_info: With your account you can...
       update:
-        error: "Incorrect confirmation code"
+        flash:
+          success: Code correct. Your account is now verified
+    redirect_notices:
+      already_verified: Your account is already verified
+      email_already_sent: We have already sent an email with a confirmation link. If you cannot locate the email, you can request a reissue here
+    residence:
+      alert:
+        unconfirmed_residency: You have not yet confirmed your residency
+      create:
+        flash:
+          success: Residence verified
+      new:
+        accept_terms_text: I accept %{terms_url} of the Census
+        date_of_birth: Date of birth
+        document_number: Document number
+        document_type:
+          passport: Passport
+          residence_card: Residence card
+          spanish_id: DNI
+        document_type_label: Document type
+        error_not_allowed_age: You must be at least 16 years old
+        error_not_allowed_postal_code: In order to be verified, you must be registered in the municipality of Madrid.
+        error_verifying_census: The Madrid Census was unable to verify your information. Please confirm that your census details are correct by calling 010 (or 915298210) or visit any of %{offices}.
+        error_verifying_census_offices: 26 Office of Citizen
+        form_errors: prevented the verification of your residence
+        postal_code: Postcode
+        postal_code_note: To verify your account you must be on Madrid city Census
+        terms: the terms and conditions of access
+        title: Verify residence
+        verify_residence: Verify residence
+    sms:
+      create:
+        flash:
+          success: Enter the confirmation code sent to you by text message
+      edit:
+        confirmation_code: Enter the code you received on your mobile
+        resend_sms_link: Click here to send it again
+        resend_sms_text: Didn't get a text with your confirmation code?
+        submit_button: Send
+        title: Security code confirmation
+      new:
+        phone: Enter your mobile phone number to receive the code
+        phone_note: We only user your phone for send to you a code, we never contact to you.
+        submit_button: Send
+        title: Send confirmation code
+      update:
+        error: Incorrect confirmation code
         flash:
           level_three:
-            success: "Code correct. Your account is now verified"
+            success: Code correct. Your account is now verified
           level_two:
-            success: "Code correct"
-    email:
-      show:
-        flash:
-          success: "You are a verified user"
-        alert:
-          failure: "Verification code incorrect"
-      create:
-        flash:
-          success: "We have sent a confirmation email to your account: %{email}"
-        alert:
-          failure: "There was a problem with sending an email to your account"
-    letter:
-      new:
-        title: "Congratulations!"
-        user_permission_info: "With your account you can..."
-        explanation: "For participate on final voting you can:"
-        office: "Verify in any %{office}"
-        offices: "Citizen Support Offices"
-        offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
-        send_letter: "Send me a letter with the code"
-        go_to_index: "See proposals"
-      create:
-        flash:
-          success_html: "Thank you for requesting your <b>maximum security code (only required for the final votes)</b>. In a few days we will send it to the address featuring in the data we have on file. Please remember that, if you prefer, you can collect your code from any of the %{offices}."
-          offices: "Citizen Support Offices"
-          offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
-      edit:
-        title: "Letter requested"
-        see_all: "See proposals"
-      update:
-        flash:
-          success: "Code correct. Your account is now verified"
-      alert:
-        unconfirmed_code: "You have not yet entered the confirmation code"
-      errors:
-        incorrect_code: "Verification code incorrect"
+            success: Code correct
+    step_1: Residence
+    step_2: Confirmation code
+    step_3: Final verification
+    user_permission_debates: Participate on debates
+    user_permission_info: Verifing your information you'll be able to...
+    user_permission_proposal: Create new proposals
+    user_permission_support_proposal: Support proposals*
+    user_permission_votes: Participate on final voting*
     verified_user:
-      show:
-        title: "Available information"
-        explanation: "We currently hold the following details on the Register; please select a method for your confirmation code to be sent."
-        email_title: "Emails"
-        phone_title: "Phone numbers"
-        use_another_phone: "Use other phone"
       form:
-        submit_button: "Send code"
-    redirect_notices:
-      email_already_sent: "We have already sent an email with a confirmation link. If you cannot locate the email, you can request a reissue here"
-      already_verified: "Your account is already verified"
+        submit_button: Send code
+      show:
+        email_title: Emails
+        explanation: We currently hold the following details on the Register; please select a method for your confirmation code to be sent.
+        phone_title: Phone numbers
+        title: Available information
+        use_another_phone: Use other phone
diff --git a/config/locales/verification.es.yml b/config/locales/verification.es.yml
index dd294c5fc..ba4692f32 100644
--- a/config/locales/verification.es.yml
+++ b/config/locales/verification.es.yml
@@ -1,108 +1,109 @@
+---
 es:
   verification:
-    back: "Volver a mi cuenta"
-    step_1: "Residencia"
-    step_2: "SMS de confirmación"
-    step_3: "Verificación final"
     alert:
-      lock: "Has llegado al máximo número de intentos. Por favor intentalo de nuevo más tarde."
-    user_permission_info: "Al verificar tus datos podrás..."
-    user_permission_debates: "Participar en debates"
-    user_permission_proposal: "Crear nuevas propuestas"
-    user_permission_support_proposal: "Apoyar propuestas"
-    user_permission_votes: "Participar en las votaciones finales"
-    residence:
-      new:
-        title: "Verificar residencia"
-        document_type_label: "Tipo de documento"
-        document_type:
-          spanish_id: "DNI"
-          passport: "Pasaporte"
-          residence_card: "Tarjeta de residencia"
-        document_number: "Número de documento"
-        date_of_birth: "Fecha de nacimiento"
-        postal_code: "Código postal"
-        postal_code_note: "Para verificar tus datos debes estar empadronado en el municipio de Madrid"
-        accept_terms_text: "Acepto %{terms_url} al Padrón"
-        terms: "los términos de acceso"
-        verify_residence: "Verificar residencia"
-        form_errors: "evitaron verificar tu residencia"
-        error_verifying_census: "El Padrón de Madrid no pudo verificar tu información. Por favor, confirma que tus datos de empadronamiento sean correctos llamando al 010 (o a su versión gratuita 915298210) o visita cualquiera de las %{offices}."
-        error_verifying_census_offices: "26 Oficinas de Atención al Ciudadano"
-        error_not_allowed_age: "Hay que tener al menos 16 años"
-        error_not_allowed_postal_code: "Para verificarte debes estar empadronado en el municipio de Madrid."
+      lock: Has llegado al máximo número de intentos. Por favor intentalo de nuevo más tarde.
+    back: Volver a mi cuenta
+    email:
       create:
+        alert:
+          failure: Hubo un problema enviándote un email a tu cuenta
         flash:
-          success: "Residencia verificada"
+          success: 'Te hemos enviado un email de confirmación a tu cuenta: %{email}'
+      show:
+        alert:
+          failure: Código de verificación incorrecto
+        flash:
+          success: Eres un usuario verificado
+    letter:
       alert:
-        unconfirmed_residency: "Aún no has verificado tu residencia"
-    sms:
-      new:
-        title: "SMS de confirmación"
-        phone: "Introduce tu teléfono móvil para recibir el código"
-        phone_note: "Sólo usaremos tu teléfono para enviarte un código, nunca te contactaremos."
-        submit_button: "Enviar"
+        unconfirmed_code: Todavía no has introducido el código de confirmación
       create:
         flash:
-          success: "Introduce el código de confirmación que te hemos enviado por mensaje de texto"
+          offices: Oficinas de Atención al Ciudadano
+          offices_url: http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD
+          success_html: Antes de las votaciones recibirás una carta con las instrucciones para verificar tu cuenta.<br> Recuerda que puedes ahorrar el envío verificándote presencialmente en cualquiera de las %{offices}.
       edit:
-        title: "SMS de confirmación"
-        confirmation_code: "Introduce el código que has recibido en tu móvil"
-        resend_sms_text: "¿No has recibido un mensaje de texto con tu código de confirmación?"
-        resend_sms_link: "Solicitar un nuevo código"
-        submit_button: "Enviar"
+        see_all: Ver propuestas
+        title: Carta solicitada
+      errors:
+        incorrect_code: Código de verificación incorrecto
+      new:
+        explanation: 'Para participar en las votaciones finales puedes:'
+        go_to_index: Ver propuestas
+        office: Verificarte presencialmente en cualquier %{office}
+        offices: Oficina de Atención al Ciudadano
+        offices_url: http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD
+        send_letter: Solicitar una carta por correo postal
+        title: "¡Felicidades!"
+        user_permission_info: Con tu cuenta ya puedes...
       update:
-        error: "Código de confirmación incorrecto"
+        flash:
+          success: Tu cuenta ya está verificada
+    redirect_notices:
+      already_verified: Tu cuenta ya está verificada
+      email_already_sent: Ya te enviamos un email con un enlace de confirmación, si no lo encuentras puedes solicitar aquí que te lo reenviemos
+    residence:
+      alert:
+        unconfirmed_residency: Aún no has verificado tu residencia
+      create:
+        flash:
+          success: Residencia verificada
+      new:
+        accept_terms_text: Acepto %{terms_url} al Padrón
+        date_of_birth: Fecha de nacimiento
+        document_number: Número de documento
+        document_type:
+          passport: Pasaporte
+          residence_card: Tarjeta de residencia
+          spanish_id: DNI
+        document_type_label: Tipo de documento
+        error_not_allowed_age: Hay que tener al menos 16 años
+        error_not_allowed_postal_code: Para verificarte debes estar empadronado en el municipio de Madrid.
+        error_verifying_census: El Padrón de Madrid no pudo verificar tu información. Por favor, confirma que tus datos de empadronamiento sean correctos llamando al 010 (o a su versión gratuita 915298210) o visita cualquiera de las %{offices}.
+        error_verifying_census_offices: 26 Oficinas de Atención al Ciudadano
+        form_errors: evitaron verificar tu residencia
+        postal_code: Código postal
+        postal_code_note: Para verificar tus datos debes estar empadronado en el municipio de Madrid
+        terms: los términos de acceso
+        title: Verificar residencia
+        verify_residence: Verificar residencia
+    sms:
+      create:
+        flash:
+          success: Introduce el código de confirmación que te hemos enviado por mensaje de texto
+      edit:
+        confirmation_code: Introduce el código que has recibido en tu móvil
+        resend_sms_link: Solicitar un nuevo código
+        resend_sms_text: "¿No has recibido un mensaje de texto con tu código de confirmación?"
+        submit_button: Enviar
+        title: SMS de confirmación
+      new:
+        phone: Introduce tu teléfono móvil para recibir el código
+        phone_note: Sólo usaremos tu teléfono para enviarte un código, nunca te contactaremos.
+        submit_button: Enviar
+        title: SMS de confirmación
+      update:
+        error: Código de confirmación incorrecto
         flash:
           level_three:
-            success: "Código correcto. Tu cuenta ya está verificada"
+            success: Código correcto. Tu cuenta ya está verificada
           level_two:
-            success: "Código correcto"
-    email:
-      show:
-        flash:
-          success: "Eres un usuario verificado"
-        alert:
-          failure: "Código de verificación incorrecto"
-      create:
-        flash:
-          success: "Te hemos enviado un email de confirmación a tu cuenta: %{email}"
-        alert:
-          failure: "Hubo un problema enviándote un email a tu cuenta"
-    letter:
-      new:
-        title: "¡Felicidades!"
-        user_permission_info: "Con tu cuenta ya puedes..."
-        explanation: "Para participar en las votaciones finales puedes:"
-        office: "Verificarte presencialmente en cualquier %{office}"
-        offices: "Oficina de Atención al Ciudadano"
-        offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
-        send_letter: "Solicitar una carta por correo postal"
-        go_to_index: "Ver propuestas"
-      create:
-        flash:
-          success_html: "Antes de las votaciones recibirás una carta con las instrucciones para verificar tu cuenta.<br> Recuerda que puedes ahorrar el envío verificándote presencialmente en cualquiera de las %{offices}."
-          offices: "Oficinas de Atención al Ciudadano"
-          offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
-      edit:
-        title: "Carta solicitada"
-        see_all: "Ver propuestas"
-      update:
-        flash:
-          success: "Tu cuenta ya está verificada"
-      alert:
-        unconfirmed_code: "Todavía no has introducido el código de confirmación"
-      errors:
-        incorrect_code: "Código de verificación incorrecto"
+            success: Código correcto
+    step_1: Residencia
+    step_2: SMS de confirmación
+    step_3: Verificación final
+    user_permission_debates: Participar en debates
+    user_permission_info: Al verificar tus datos podrás...
+    user_permission_proposal: Crear nuevas propuestas
+    user_permission_support_proposal: Apoyar propuestas
+    user_permission_votes: Participar en las votaciones finales
     verified_user:
-      show:
-        title: "Información disponible"
-        explanation: "Actualmente disponemos de los siguientes datos en el Padrón, selecciona donde quieres que enviemos el código de confirmación."
-        email_title: "Emails"
-        phone_title: "Teléfonos"
-        use_another_phone: "Utilizar otro teléfono"
       form:
-        submit_button: "Enviar código"
-    redirect_notices:
-      email_already_sent: "Ya te enviamos un email con un enlace de confirmación, si no lo encuentras puedes solicitar aquí que te lo reenviemos"
-      already_verified: "Tu cuenta ya está verificada"
+        submit_button: Enviar código
+      show:
+        email_title: Emails
+        explanation: Actualmente disponemos de los siguientes datos en el Padrón, selecciona donde quieres que enviemos el código de confirmación.
+        phone_title: Teléfonos
+        title: Información disponible
+        use_another_phone: Utilizar otro teléfono
diff --git a/config/routes.rb b/config/routes.rb
index d10ffefd7..d0fa9f576 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -280,6 +280,8 @@ Rails.application.routes.draw do
     mount LetterOpenerWeb::Engine, at: "/letter_opener"
   end
 
+  mount Tolk::Engine => '/translate', :as => 'tolk'
+
   # static pages
 
   get '/blog' => redirect("http://diario.madrid.es/participa/")
diff --git a/config/secrets.yml.example b/config/secrets.yml.example
index 450f0b09f..6e67e57c8 100644
--- a/config/secrets.yml.example
+++ b/config/secrets.yml.example
@@ -33,9 +33,12 @@ production: &production
   google_oauth2_key: ""
   google_oauth2_secret: ""
 
+  translate_username: ""
+  translate_password:  ""
+
   rollbar_server_token: ""
   server_name: ""
 
 preproduction:
   server_name: ""
-  <<: *production
\ No newline at end of file
+  <<: *production
diff --git a/db/migrate/20160114110933_create_tolk_tables.rb b/db/migrate/20160114110933_create_tolk_tables.rb
new file mode 100644
index 000000000..160000ab0
--- /dev/null
+++ b/db/migrate/20160114110933_create_tolk_tables.rb
@@ -0,0 +1,38 @@
+class CreateTolkTables < ActiveRecord::Migration
+  def self.up
+    create_table :tolk_locales do |t|
+      t.string   :name
+      t.datetime :created_at
+      t.datetime :updated_at
+    end
+
+    add_index :tolk_locales, :name, :unique => true
+
+    create_table :tolk_phrases do |t|
+      t.text     :key
+      t.datetime :created_at
+      t.datetime :updated_at
+    end
+
+    create_table :tolk_translations do |t|
+      t.integer  :phrase_id
+      t.integer  :locale_id
+      t.text     :text
+      t.text     :previous_text
+      t.boolean  :primary_updated, :default => false
+      t.datetime :created_at
+      t.datetime :updated_at
+    end
+
+    add_index :tolk_translations, [:phrase_id, :locale_id], :unique => true
+  end
+
+  def self.down
+    remove_index :tolk_translations, :column => [:phrase_id, :locale_id]
+    remove_index :tolk_locales, :column => :name
+
+    drop_table :tolk_translations
+    drop_table :tolk_phrases
+    drop_table :tolk_locales
+  end
+end
\ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index 7bc4652d9..2924fed64 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160108133501) do
+ActiveRecord::Schema.define(version: 20160114110933) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -323,6 +323,32 @@ ActiveRecord::Schema.define(version: 20160108133501) do
   add_index "tags", ["proposals_count"], name: "index_tags_on_proposals_count", using: :btree
   add_index "tags", ["spending_proposals_count"], name: "index_tags_on_spending_proposals_count", using: :btree
 
+  create_table "tolk_locales", force: :cascade do |t|
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "tolk_locales", ["name"], name: "index_tolk_locales_on_name", unique: true, using: :btree
+
+  create_table "tolk_phrases", force: :cascade do |t|
+    t.text     "key"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "tolk_translations", force: :cascade do |t|
+    t.integer  "phrase_id"
+    t.integer  "locale_id"
+    t.text     "text"
+    t.text     "previous_text"
+    t.boolean  "primary_updated", default: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "tolk_translations", ["phrase_id", "locale_id"], name: "index_tolk_translations_on_phrase_id_and_locale_id", unique: true, using: :btree
+
   create_table "users", force: :cascade do |t|
     t.string   "email",                                default: ""
     t.string   "encrypted_password",                   default: "",    null: false
diff --git a/spec/models/debate_spec.rb b/spec/models/debate_spec.rb
index 527968700..894a726b6 100644
--- a/spec/models/debate_spec.rb
+++ b/spec/models/debate_spec.rb
@@ -681,7 +681,18 @@ describe Debate do
       end
 
     end
+  end
 
+  describe "#last_week" do
+    it "should return debates created this week" do
+      debate = create(:debate)
+      expect(Debate.last_week.all).to include (debate)
+    end
+
+    it "should not show debates created more than a week ago" do
+      debate = create(:debate, created_at: 8.days.ago)
+      expect(Debate.last_week.all).to_not include (debate)
+    end
   end
 
 end
diff --git a/spec/models/proposal_spec.rb b/spec/models/proposal_spec.rb
index 058446341..0030d451c 100644
--- a/spec/models/proposal_spec.rb
+++ b/spec/models/proposal_spec.rb
@@ -619,7 +619,18 @@ describe Proposal do
       end
 
     end
+  end
 
+  describe "#last_week" do
+    it "should return proposals created this week" do
+      proposal = create(:proposal)
+      expect(Proposal.last_week.all).to include (proposal)
+    end
+
+    it "should not show proposals created more than a week ago" do
+      proposal = create(:proposal, created_at: 8.days.ago)
+      expect(Proposal.last_week.all).to_not include (proposal)
+    end
   end
 
 end