From 1a5bb05fa8cd1b607f6c898ad8a2e6d5b9167362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= <ivan@pokecode.net>
Date: Tue, 21 Oct 2025 10:39:54 +0200
Subject: [PATCH 001/131] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 6cc62f36552c2ab27d76df75d5d339320f85d9a7
Merge: 31e09c73d3 82c93ce522
Author: Ivan Vergés <ivan@pokecode.net>
Date:   Tue Oct 21 10:37:46 2025 +0200

    Merge branch 'develop' into feature/elections-census-check-before-start

commit 31e09c73d35ee1721e1899f547d454278f96b6f6
Author: Anna Topalidi <t.opalidisanna@gmail.com>
Date:   Tue Oct 21 07:10:47 2025 +0200

    fix linter

commit 85f1a257e9254824dc83ff1edd4253774be43f25
Author: Anna Topalidi <t.opalidisanna@gmail.com>
Date:   Mon Oct 20 22:08:55 2025 +0200

    Allow users to check if they can vote before the election starts

commit e503bec945ba658533a6cfa9fed5f7f605cc5efd
Author: Anna Topalidi <t.opalidisanna@gmail.com>
Date:   Fri Oct 10 15:36:16 2025 +0200

    xhange controller, add tests

commit 408a17494d15b41fd9783e7634b7a9485edf6184
Author: Anna Topalidi <t.opalidisanna@gmail.com>
Date:   Fri Oct 10 14:52:00 2025 +0200

    change text

commit a1ed69073915df3416c8307e65ba9772283ebe8e
Author: Anna Topalidi <t.opalidisanna@gmail.com>
Date:   Fri Oct 10 13:55:51 2025 +0200

    change test

commit 242f0a66dccbcea940bde10b70f5b58859d7fccd
Author: Anna Topalidi <t.opalidisanna@gmail.com>
Date:   Fri Oct 10 13:33:59 2025 +0200

    add check before start
---
 .../decidim/elections/uses_census_access.rb   |  39 ++++
 .../decidim/elections/uses_votes_booth.rb     |  28 +--
 .../elections/admin/elections_controller.rb   |  11 +
 .../elections/census_checks_controller.rb     |  58 +++++
 .../packs/entrypoints/decidim_elections.js    |   1 +
 .../entrypoints/decidim_elections_admin.js    |   1 +
 .../elections/admin/census_check_toggle.js    |  44 ++++
 .../elections/census_check_visibility.js      |  52 +++++
 .../decidim/elections/permissions.rb          |  13 ++
 .../decidim/elections/election_presenter.rb   |   4 +-
 .../admin/dashboard/_status.html.erb          |  12 +
 .../elections/census_checks/show.html.erb     |   8 +
 .../elections/_election_aside.html.erb        |   8 +
 decidim-elections/config/locales/en.yml       |   8 +
 ...re_start_to_decidim_elections_elections.rb |   7 +
 .../lib/decidim/elections/admin_engine.rb     |   1 +
 .../lib/decidim/elections/engine.rb           |   1 +
 .../admin/elections_controller_spec.rb        |  28 +++
 .../census_checks_controller_spec.rb          |  90 ++++++++
 .../decidim/elections/permissions_spec.rb     |  58 +++++
 .../user_checks_election_census_spec.rb       | 217 ++++++++++++++++++
 21 files changed, 663 insertions(+), 26 deletions(-)
 create mode 100644 decidim-elections/app/controllers/concerns/decidim/elections/uses_census_access.rb
 create mode 100644 decidim-elections/app/controllers/decidim/elections/census_checks_controller.rb
 create mode 100644 decidim-elections/app/packs/src/decidim/elections/admin/census_check_toggle.js
 create mode 100644 decidim-elections/app/packs/src/decidim/elections/census_check_visibility.js
 create mode 100644 decidim-elections/app/views/decidim/elections/census_checks/show.html.erb
 create mode 100644 decidim-elections/db/migrate/20251020130630_add_allow_census_check_before_start_to_decidim_elections_elections.rb
 create mode 100644 decidim-elections/spec/controllers/decidim/elections/census_checks_controller_spec.rb
 create mode 100644 decidim-elections/spec/system/user_checks_election_census_spec.rb

diff --git a/decidim-elections/app/controllers/concerns/decidim/elections/uses_census_access.rb b/decidim-elections/app/controllers/concerns/decidim/elections/uses_census_access.rb
new file mode 100644
index 0000000000000..0335cab4bd94e
--- /dev/null
+++ b/decidim-elections/app/controllers/concerns/decidim/elections/uses_census_access.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Elections
+    module UsesCensusAccess
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :exit_path, :election, :session_authenticated?, :session_attributes, :voter_uid
+      end
+
+      private
+
+      def election
+        @election ||= Election.where(component: current_component).published.find(params[:election_id])
+      end
+
+      def session_authenticated?
+        @session_authenticated ||= election.census.valid_user?(election, session_attributes, current_user:)
+      end
+
+      def voter_uid
+        @voter_uid ||= election.census.voter_uid(election, session_attributes, current_user:)
+      end
+
+      def session_attributes
+        session[:session_attributes] ||= {}
+      end
+
+      def exit_path
+        @exit_path ||= if allowed_to?(:read, :election, election:)
+                         election_path(election)
+                       else
+                         elections_path
+                       end
+      end
+    end
+  end
+end
diff --git a/decidim-elections/app/controllers/concerns/decidim/elections/uses_votes_booth.rb b/decidim-elections/app/controllers/concerns/decidim/elections/uses_votes_booth.rb
index a32e161d4aab6..08cf7b7c030c8 100644
--- a/decidim-elections/app/controllers/concerns/decidim/elections/uses_votes_booth.rb
+++ b/decidim-elections/app/controllers/concerns/decidim/elections/uses_votes_booth.rb
@@ -7,8 +7,10 @@ module UsesVotesBooth
       extend ActiveSupport::Concern
 
       included do
+        include UsesCensusAccess
+
         layout "decidim/election_booth"
-        helper_method :exit_path, :election, :questions, :question, :response_chosen?, :votes_buffer
+        helper_method :questions, :question, :response_chosen?, :votes_buffer
 
         before_action except: [:new, :create, :receipt] do
           next if session_authenticated?
@@ -58,10 +60,6 @@ def receipt
 
       private
 
-      def election
-        @election ||= Election.where(component: current_component).published.find(params[:election_id])
-      end
-
       def questions
         @questions ||= election.questions
       end
@@ -70,22 +68,10 @@ def question
         @question ||= questions.find_by(id: params[:id]) || questions.first
       end
 
-      def session_authenticated?
-        @session_authenticated ||= election.census.valid_user?(election, session_attributes, current_user:)
-      end
-
-      def voter_uid
-        @voter_uid ||= election.census.voter_uid(election, session_attributes, current_user:)
-      end
-
       def votes_buffer
         session[:votes_buffer] ||= {}
       end
 
-      def session_attributes
-        session[:session_attributes] ||= {}
-      end
-
       def response_chosen?(response_option)
         response_ids = if votes_buffer.has_key?(question.id.to_s)
                          votes_buffer[question.id.to_s]
@@ -102,14 +88,6 @@ def previous_responses
           [question.id.to_s, question.votes.where(voter_uid: voter_uid).pluck(:response_option_id).map(&:to_s)]
         end
       end
-
-      def exit_path
-        @exit_path ||= if allowed_to?(:read, :election, election:)
-                         election_path(election)
-                       else
-                         elections_path
-                       end
-      end
     end
   end
 end
diff --git a/decidim-elections/app/controllers/decidim/elections/admin/elections_controller.rb b/decidim-elections/app/controllers/decidim/elections/admin/elections_controller.rb
index 7140b9ee0b4de..056fbd6656f4b 100644
--- a/decidim-elections/app/controllers/decidim/elections/admin/elections_controller.rb
+++ b/decidim-elections/app/controllers/decidim/elections/admin/elections_controller.rb
@@ -122,6 +122,17 @@ def update_status
           redirect_to dashboard_election_path(election)
         end
 
+        def toggle_census_check
+          enforce_permission_to :update, :election, election: election
+
+          value = ActiveModel::Type::Boolean.new.cast(params[:allow_census_check_before_start])
+          election.update!(allow_census_check_before_start: value)
+
+          render json: { success: true, allow_census_check_before_start: election.allow_census_check_before_start }
+        rescue StandardError => e
+          render json: { success: false, error: e.message }, status: :unprocessable_entity
+        end
+
         private
 
         def per_question_waiting?
diff --git a/decidim-elections/app/controllers/decidim/elections/census_checks_controller.rb b/decidim-elections/app/controllers/decidim/elections/census_checks_controller.rb
new file mode 100644
index 0000000000000..b239ebb0338d5
--- /dev/null
+++ b/decidim-elections/app/controllers/decidim/elections/census_checks_controller.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Elections
+    # Allows participants to verify they belong to an election census before voting starts.
+    class CensusChecksController < Decidim::Elections::ApplicationController
+      include UsesCensusAccess
+
+      layout "decidim/election_booth"
+
+      before_action :redirect_if_authenticated, only: :new
+      before_action :ensure_session_authenticated!, only: :show
+
+      def new
+        enforce_permission_to(:create, :census_check, election:)
+
+        @form = election.census.form_instance({}, election:, current_user:)
+        render "decidim/elections/votes/new"
+      end
+
+      def create
+        enforce_permission_to(:create, :census_check, election:)
+
+        @form = election.census.form_instance(params, election:, current_user:)
+        if @form.valid?
+          session[:session_attributes] = @form.attributes
+          redirect_to election_census_check_path(election)
+        else
+          flash[:alert] = @form.errors.full_messages.join("<br>").presence || t("failed", scope: "decidim.elections.votes.check_census")
+          redirect_to new_election_census_check_path(election)
+        end
+      end
+
+      def show
+        enforce_permission_to(:read, :census_check, election:)
+      end
+
+      private
+
+      # Allows admins to access unpublished elections for preview.
+      def election
+        @election ||= Election.where(component: current_component)
+                              .then { |scope| current_user&.admin? ? scope : scope.published }
+                              .find(params[:election_id])
+      end
+
+      def redirect_if_authenticated
+        redirect_to election_census_check_path(election) if session_authenticated?
+      end
+
+      def ensure_session_authenticated!
+        return if session_authenticated?
+
+        redirect_to new_election_census_check_path(election), alert: t("decidim.elections.votes.check_census.failed")
+      end
+    end
+  end
+end
diff --git a/decidim-elections/app/packs/entrypoints/decidim_elections.js b/decidim-elections/app/packs/entrypoints/decidim_elections.js
index 19a5a196bd98d..36be7ef26208b 100644
--- a/decidim-elections/app/packs/entrypoints/decidim_elections.js
+++ b/decidim-elections/app/packs/entrypoints/decidim_elections.js
@@ -1,5 +1,6 @@
 import "src/decidim/elections/waiting_room.js"
 import "src/decidim/elections/live_results_update.js";
+import "src/decidim/elections/census_check_visibility.js";
 
 // Images
 require.context("../images", true)
diff --git a/decidim-elections/app/packs/entrypoints/decidim_elections_admin.js b/decidim-elections/app/packs/entrypoints/decidim_elections_admin.js
index 83f30c0f041a3..25a24b3f44c61 100644
--- a/decidim-elections/app/packs/entrypoints/decidim_elections_admin.js
+++ b/decidim-elections/app/packs/entrypoints/decidim_elections_admin.js
@@ -1,6 +1,7 @@
 // JS
 import "src/decidim/elections/admin/election_form.js";
 import "src/decidim/elections/admin/census_form.js";
+import "src/decidim/elections/admin/census_check_toggle.js";
 import "src/decidim/elections/live_results_update.js";
 
 // CSS
diff --git a/decidim-elections/app/packs/src/decidim/elections/admin/census_check_toggle.js b/decidim-elections/app/packs/src/decidim/elections/admin/census_check_toggle.js
new file mode 100644
index 0000000000000..e1a497a3a076b
--- /dev/null
+++ b/decidim-elections/app/packs/src/decidim/elections/admin/census_check_toggle.js
@@ -0,0 +1,44 @@
+document.addEventListener("turbo:load", () => {
+  const checkbox = document.querySelector(".census-check-toggle");
+
+  if (!checkbox) {
+    return;
+  }
+
+  checkbox.addEventListener("change", () => {
+    const url = checkbox.dataset.url;
+    const checked = checkbox.checked;
+    const csrfToken = document.querySelector("meta[name='csrf-token']");
+
+    if (!csrfToken) {
+      console.error("CSRF token not found. Please refresh the page.");
+      checkbox.checked = !checked;
+      return;
+    }
+
+    fetch(url, {
+      method: "PATCH",
+      headers: {
+        "Content-Type": "application/json",
+        "X-CSRF-Token": csrfToken.content
+      },
+      body: JSON.stringify({
+        // eslint-disable-next-line camelcase
+        allow_census_check_before_start: checked
+      })
+    }).then((response) => {
+      if (!response.ok) {
+        throw new Error(`HTTP error! status: ${response.status}`);
+      }
+      return response.json();
+    }).then((data) => {
+      if (!data.success) {
+        checkbox.checked = !checked;
+        console.error(`Error updating setting: ${data.error || "Unknown error"}`);
+      }
+    }).catch((error) => {
+      checkbox.checked = !checked;
+      console.error(`Error updating setting: ${error.message}`);
+    });
+  });
+});
diff --git a/decidim-elections/app/packs/src/decidim/elections/census_check_visibility.js b/decidim-elections/app/packs/src/decidim/elections/census_check_visibility.js
new file mode 100644
index 0000000000000..af4d02e7e2f7d
--- /dev/null
+++ b/decidim-elections/app/packs/src/decidim/elections/census_check_visibility.js
@@ -0,0 +1,52 @@
+document.addEventListener("DOMContentLoaded", () => {
+  const censusCheckButton = document.querySelector("[data-census-check-button]");
+
+  if (!censusCheckButton) {
+    return;
+  }
+
+  const url = censusCheckButton.dataset.censusCheckUrl;
+
+  if (!url) {
+    return;
+  }
+
+  const explanation = document.querySelector("[data-census-check-explanation]");
+
+  const toggleVisibility = (show) => {
+    censusCheckButton.classList.toggle("hidden", !show);
+    if (explanation) {
+      explanation.classList.toggle("hidden", !show);
+    }
+  };
+
+  const updateVisibility = async () => {
+    try {
+      const response = await fetch(url, {
+        method: "GET",
+        headers: {
+          "Accept": "application/json",
+          "Content-Type": "application/json",
+          "X-Requested-With": "XMLHttpRequest"
+        }
+      });
+
+      if (!response.ok) {
+        return;
+      }
+
+      const data = await response.json();
+      const shouldShow = data.allow_census_check_before_start && data.census_ready && data.scheduled;
+
+      toggleVisibility(shouldShow);
+
+      if (data.scheduled) {
+        setTimeout(updateVisibility, 4000);
+      }
+    } catch (error) {
+      setTimeout(updateVisibility, 4000);
+    }
+  };
+
+  updateVisibility();
+});
diff --git a/decidim-elections/app/permissions/decidim/elections/permissions.rb b/decidim-elections/app/permissions/decidim/elections/permissions.rb
index 8c5dbf5b254ec..45a57fb70dbf0 100644
--- a/decidim-elections/app/permissions/decidim/elections/permissions.rb
+++ b/decidim-elections/app/permissions/decidim/elections/permissions.rb
@@ -10,6 +10,7 @@ def permissions
 
         allowed_election_action?
         allowed_vote_action?
+        allowed_census_check_action?
 
         permission_action
       end
@@ -37,6 +38,18 @@ def allowed_vote_action?
           allow! if election.present? && election.published? && election.ongoing?
         end
       end
+
+      def allowed_census_check_action?
+        return unless permission_action.subject == :census_check
+
+        case permission_action.action
+        when :create, :read
+          return unless election.present? && election.census_ready?
+
+          allow! if !election.published? && user&.admin?
+          allow! if election.scheduled? && election.allow_census_check_before_start
+        end
+      end
     end
   end
 end
diff --git a/decidim-elections/app/presenters/decidim/elections/election_presenter.rb b/decidim-elections/app/presenters/decidim/elections/election_presenter.rb
index 74296697aeb09..dc3357a69c2ad 100644
--- a/decidim-elections/app/presenters/decidim/elections/election_presenter.rb
+++ b/decidim-elections/app/presenters/decidim/elections/election_presenter.rb
@@ -24,17 +24,19 @@ def title(html_escape: false, all_locales: false)
       end
 
       # A JSON representation of the election, including its questions and response options.
-      # Suitable for rendering results in real time.
       # Unless `admin: true` is passed, only results for questions with published results are included.
       def to_json(admin: false)
         {
           id: election.id,
           ongoing: election.ongoing?,
+          scheduled: election.scheduled?,
           status: election.status,
           start_date: election.start_at&.iso8601,
           end_date: election.end_at.iso8601,
           title: election.translated_attribute(title),
           description: election.translated_attribute(description),
+          allow_census_check_before_start: election.allow_census_check_before_start,
+          census_ready: election.census_ready?,
           questions: questions.map do |question|
             {
               id: question.id,
diff --git a/decidim-elections/app/views/decidim/elections/admin/dashboard/_status.html.erb b/decidim-elections/app/views/decidim/elections/admin/dashboard/_status.html.erb
index cc8813675720f..64aa1815ad2fc 100644
--- a/decidim-elections/app/views/decidim/elections/admin/dashboard/_status.html.erb
+++ b/decidim-elections/app/views/decidim/elections/admin/dashboard/_status.html.erb
@@ -16,6 +16,18 @@
         <%= election_status_with_label(election) %>
         <span class="label"><%= t("decidim.elections.admin.dashboard.status.results_availability.#{election.results_availability}") %></span>
       </div>
+      <% if election.scheduled? %>
+        <div class="mt-4">
+          <label class="flex items-center cursor-pointer">
+            <%= check_box_tag "allow_census_check_before_start",
+                              "1",
+                              election.allow_census_check_before_start,
+                              class: "census-check-toggle",
+                              data: { url: Decidim::EngineRouter.admin_proxy(election.component).toggle_census_check_election_path(election) } %>
+            <span class="ml-2"><%= t("decidim.elections.admin.dashboard.status.allow_census_check_before_start") %></span>
+          </label>
+        </div>
+      <% end %>
     </div>
   </div>
 </div>
diff --git a/decidim-elections/app/views/decidim/elections/census_checks/show.html.erb b/decidim-elections/app/views/decidim/elections/census_checks/show.html.erb
new file mode 100644
index 0000000000000..7bdeb45e33781
--- /dev/null
+++ b/decidim-elections/app/views/decidim/elections/census_checks/show.html.erb
@@ -0,0 +1,8 @@
+<div class="vote-submitted">
+  <div>
+    <div class="text-center text-[10rem]"><%= icon "check-line", class: "inline-block fill-success" %></div>
+    <h2 class="h2 text-center mb-6"><%= t(".title") %></h2>
+    <p class="text-center"><%= t(".description") %></p>
+  </div>
+  <%= link_to t(".exit_button"), exit_path, class: "button button__secondary button__lg w-full mt-12" %>
+</div>
diff --git a/decidim-elections/app/views/decidim/elections/elections/_election_aside.html.erb b/decidim-elections/app/views/decidim/elections/elections/_election_aside.html.erb
index 4a52da5ed04d8..0826ccd0bb05c 100644
--- a/decidim-elections/app/views/decidim/elections/elections/_election_aside.html.erb
+++ b/decidim-elections/app/views/decidim/elections/elections/_election_aside.html.erb
@@ -8,6 +8,14 @@
           <span><%= t("decidim.elections.elections.show.voted") %></span>
         </div>
       <% end %>
+    <% elsif allowed_to? :create, :census_check, election: election %>
+      <%= link_to t("decidim.elections.elections.show.check_census_button"),
+                  new_election_census_check_path(election),
+                  class: "button button__lg button__secondary #{"hidden" if election.published? && !election.allow_census_check_before_start}",
+                  data: election.published? ? { census_check_button: true, census_check_url: election_path(election, format: :json) } : {} %>
+      <div class="mt-6 <%= "hidden" if election.published? && !election.allow_census_check_before_start %>" data-census-check-explanation="<%= election.published? %>">
+        <span><%= t("decidim.elections.elections.show.check_census_explanation") %></span>
+      </div>
     <% end %>
   </div>
 </section>
diff --git a/decidim-elections/config/locales/en.yml b/decidim-elections/config/locales/en.yml
index 3f7911e476482..acd6569788199 100644
--- a/decidim-elections/config/locales/en.yml
+++ b/decidim-elections/config/locales/en.yml
@@ -96,6 +96,7 @@ en:
             start_question_button: Enable voting
             title: Results
           status:
+            allow_census_check_before_start: Allow users to check if they can vote before the election starts
             census: 'Census:'
             results_availability:
               after_end: Results available after the election ends
@@ -182,6 +183,11 @@ en:
           update: "%{user_name} updated the %{resource_name} election in %{space_name}"
         question:
           update: "%{user_name} updated the questions of the %{resource_name} election"
+      census_checks:
+        show:
+          description: This means that, once the election starts, you can vote in it.
+          exit_button: Exit the census check
+          title: You have been successfully verified
       censuses:
         census_ready_html: The census data is uploaded and prepared for its use in the <b>%{election_title}</b> election.
         census_size_html:
@@ -249,6 +255,8 @@ en:
           title: Election questions
         show:
           active_voting_until: 'Active voting until: %{end_date}'
+          check_census_button: Check if I can vote
+          check_census_explanation: This election has not started yet, but you can check if you are included in the census.
           vote_button: Vote
           voted: You have already voted. You can vote again, only your last vote will be counted.
           votes_count:
diff --git a/decidim-elections/db/migrate/20251020130630_add_allow_census_check_before_start_to_decidim_elections_elections.rb b/decidim-elections/db/migrate/20251020130630_add_allow_census_check_before_start_to_decidim_elections_elections.rb
new file mode 100644
index 0000000000000..354a9dba62227
--- /dev/null
+++ b/decidim-elections/db/migrate/20251020130630_add_allow_census_check_before_start_to_decidim_elections_elections.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddAllowCensusCheckBeforeStartToDecidimElectionsElections < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_elections_elections, :allow_census_check_before_start, :boolean, default: false, null: false
+  end
+end
diff --git a/decidim-elections/lib/decidim/elections/admin_engine.rb b/decidim-elections/lib/decidim/elections/admin_engine.rb
index b1d5797ada30a..88db5ed2f3074 100644
--- a/decidim-elections/lib/decidim/elections/admin_engine.rb
+++ b/decidim-elections/lib/decidim/elections/admin_engine.rb
@@ -19,6 +19,7 @@ class AdminEngine < ::Rails::Engine
             patch :soft_delete
             patch :restore
             put :update_status
+            patch :toggle_census_check
 
             get "edit_questions", to: "questions#edit_questions"
             put "update_questions", to: "questions#update"
diff --git a/decidim-elections/lib/decidim/elections/engine.rb b/decidim-elections/lib/decidim/elections/engine.rb
index ad033d4e19790..8cdd378cdb1ac 100644
--- a/decidim-elections/lib/decidim/elections/engine.rb
+++ b/decidim-elections/lib/decidim/elections/engine.rb
@@ -7,6 +7,7 @@ class Engine < ::Rails::Engine
 
       routes do
         resources :elections, except: [:destroy] do
+          resource :census_check, only: [:new, :create, :show], controller: :census_checks
           resources :votes, except: [:edit, :destroy] do
             collection do
               get :confirm
diff --git a/decidim-elections/spec/controllers/decidim/elections/admin/elections_controller_spec.rb b/decidim-elections/spec/controllers/decidim/elections/admin/elections_controller_spec.rb
index 5606374585bee..f8fd2f3ed1dec 100644
--- a/decidim-elections/spec/controllers/decidim/elections/admin/elections_controller_spec.rb
+++ b/decidim-elections/spec/controllers/decidim/elections/admin/elections_controller_spec.rb
@@ -174,6 +174,34 @@ def dashboard_path(election)
           end
         end
 
+        describe "PATCH #toggle_census_check" do
+          it "updates the setting and returns JSON" do
+            expect(election.allow_census_check_before_start).to be(false)
+
+            patch :toggle_census_check, params: { id: election.id, allow_census_check_before_start: true }, format: :json
+
+            expect(response).to have_http_status(:ok)
+            expect(JSON.parse(response.body)).to include(
+              "success" => true,
+              "allow_census_check_before_start" => true
+            )
+            expect(election.reload.allow_census_check_before_start).to be(true)
+          end
+
+          it "returns error on invalid update" do
+            allow(controller).to receive(:election).and_return(election)
+            allow(election).to receive(:update!).and_raise(StandardError, "Database error")
+
+            patch :toggle_census_check, params: { id: election.id, allow_census_check_before_start: true }, format: :json
+
+            expect(response).to have_http_status(:unprocessable_entity)
+            expect(JSON.parse(response.body)).to include(
+              "success" => false,
+              "error" => "Database error"
+            )
+          end
+        end
+
         it_behaves_like "a soft-deletable resource",
                         resource_name: :election,
                         resource_path: :elections_path,
diff --git a/decidim-elections/spec/controllers/decidim/elections/census_checks_controller_spec.rb b/decidim-elections/spec/controllers/decidim/elections/census_checks_controller_spec.rb
new file mode 100644
index 0000000000000..531918bf2bda7
--- /dev/null
+++ b/decidim-elections/spec/controllers/decidim/elections/census_checks_controller_spec.rb
@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Elections
+    describe CensusChecksController do
+      let(:component) { create(:elections_component) }
+      let(:organization) { component.organization }
+      let(:election) { create(:election, :published, :scheduled, :with_token_csv_census, component:, allow_census_check_before_start: true) }
+      let(:params) { { component_id: component.id, election_id: election.id } }
+      let(:main_proxy) { Decidim::EngineRouter.main_proxy(component) }
+      let(:new_census_check_path) { main_proxy.new_election_census_check_path(election) }
+      let(:census_check_path) { main_proxy.election_census_check_path(election) }
+      let(:election_path) { main_proxy.election_path(election) }
+      let(:voter_data) { election.voters.first.data }
+
+      before do
+        request.env["decidim.current_organization"] = organization
+        request.env["decidim.current_participatory_space"] = component.participatory_space
+        request.env["decidim.current_component"] = component
+        allow(controller).to receive(:current_participatory_space).and_return(component.participatory_space)
+        allow(controller).to receive(:current_component).and_return(component)
+        allow(controller).to receive(:election_census_check_path).and_return(census_check_path)
+        allow(controller).to receive(:new_election_census_check_path).and_return(new_census_check_path)
+        allow(controller).to receive(:election_path).and_return(election_path)
+      end
+
+      describe "GET new" do
+        it "renders the census check form" do
+          get :new, params: params
+
+          expect(response).to have_http_status(:ok)
+          expect(assigns(:form)).to be_present
+        end
+
+        context "when already authenticated" do
+          before do
+            session[:session_attributes] = voter_data.slice("email", "token")
+          end
+
+          it "redirects to the success page" do
+            get :new, params: params
+
+            expect(response).to redirect_to(census_check_path)
+          end
+        end
+      end
+
+      describe "POST create" do
+        it "stores the session attributes and redirects to the success page" do
+          post :create, params: params.merge(token_csv: voter_data.slice("email", "token"))
+
+          expect(session[:session_attributes]).to include(voter_data.slice("email", "token").stringify_keys)
+          expect(response).to redirect_to(census_check_path)
+        end
+
+        it "displays the form when the data is invalid" do
+          post :create, params: params.merge(token_csv: { email: "wrong@example.com", token: "invalid" })
+
+          expect(session[:session_attributes]).to be_blank
+          expect(response).to redirect_to(new_census_check_path)
+          expect(flash[:alert]).to eq(I18n.t("decidim.elections.censuses.token_csv_form.invalid"))
+        end
+      end
+
+      describe "GET show" do
+        it "redirects to the form when the session is not authenticated" do
+          get :show, params: params
+
+          expect(response).to redirect_to(new_census_check_path)
+          expect(flash[:alert]).to eq(I18n.t("decidim.elections.votes.check_census.failed"))
+        end
+
+        context "when the session is authenticated" do
+          before do
+            session[:session_attributes] = voter_data.slice("email", "token")
+          end
+
+          it "renders the success page" do
+            get :show, params: params
+
+            expect(response).to have_http_status(:ok)
+            expect(subject).to render_template(:show)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-elections/spec/permissions/decidim/elections/permissions_spec.rb b/decidim-elections/spec/permissions/decidim/elections/permissions_spec.rb
index 37affd1278d5c..32e72adb9c425 100644
--- a/decidim-elections/spec/permissions/decidim/elections/permissions_spec.rb
+++ b/decidim-elections/spec/permissions/decidim/elections/permissions_spec.rb
@@ -72,4 +72,62 @@
       it { is_expected.to be true }
     end
   end
+
+  context "when creating or reading a census_check" do
+    let(:action) do
+      { scope: :public, action: :create, subject: :census_check }
+    end
+
+    it_behaves_like "permission is not set"
+
+    context "when election is not published" do
+      let(:election) { create(:election, :scheduled, :with_token_csv_census, component:) }
+
+      it_behaves_like "permission is not set"
+
+      context "when user is admin" do
+        let(:user) { create(:user, :admin, organization: component.organization) }
+
+        it { is_expected.to be true }
+      end
+    end
+
+    context "when election is published and scheduled" do
+      let(:election) { create(:election, :published, :scheduled, :with_token_csv_census, component:) }
+
+      context "when allow_census_check_before_start is false" do
+        before do
+          election.update!(allow_census_check_before_start: false)
+        end
+
+        it_behaves_like "permission is not set"
+      end
+
+      context "when allow_census_check_before_start is true" do
+        before do
+          election.update!(allow_census_check_before_start: true)
+        end
+
+        it { is_expected.to be true }
+      end
+    end
+
+    context "when election is published but census is not ready" do
+      let(:election) { create(:election, :published, :scheduled, component:, allow_census_check_before_start: true) }
+
+      it_behaves_like "permission is not set"
+    end
+
+    context "when reading census_check" do
+      let(:action) do
+        { scope: :public, action: :read, subject: :census_check }
+      end
+
+      context "when election is scheduled with census ready and checkbox enabled" do
+        let(:election) { create(:election, :published, :scheduled, :with_token_csv_census, component:, allow_census_check_before_start: true) }
+
+        it { is_expected.to be true }
+      end
+    end
+  end
 end
diff --git a/decidim-elections/spec/system/user_checks_election_census_spec.rb b/decidim-elections/spec/system/user_checks_election_census_spec.rb
new file mode 100644
index 0000000000000..26590a7f40c26
--- /dev/null
+++ b/decidim-elections/spec/system/user_checks_election_census_spec.rb
@@ -0,0 +1,217 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Election census check" do
+  let(:component) { create(:elections_component) }
+  let(:organization) { component.organization }
+
+  before do
+    switch_to_host(organization.host)
+  end
+
+  context "when the election is scheduled" do
+    let(:election_path) { Decidim::EngineRouter.main_proxy(component).election_path(election) }
+    let(:new_census_check_path) { Decidim::EngineRouter.main_proxy(component).new_election_census_check_path(election) }
+    let(:census_check_path) { Decidim::EngineRouter.main_proxy(component).election_census_check_path(election) }
+    let(:voter_data) { election.voters.first.data }
+
+    context "when allow_census_check_before_start is enabled" do
+      let!(:election) { create(:election, :published, :scheduled, :with_token_csv_census, component:, allow_census_check_before_start: true) }
+
+      context "when user is a guest" do
+        it "displays the census check button" do
+          visit election_path
+
+          expect(page).to have_link("Check if I can vote")
+        end
+
+        it "allows the user to validate they are in the census" do
+          visit election_path
+
+          click_link "Check if I can vote"
+
+          expect(page).to have_current_path(new_census_check_path)
+
+          fill_in "Email", with: voter_data["email"]
+          fill_in "Token", with: voter_data["token"]
+          click_button "Access"
+
+          expect(page).to have_current_path(census_check_path)
+          expect(page).to have_content("You have been successfully verified")
+          expect(page).to have_content("This means that, once the election starts, you can vote in it.")
+
+          click_link "Exit the census check"
+
+          expect(page).to have_current_path(election_path)
+        end
+      end
+
+      context "when user is logged in" do
+        let(:user) { create(:user, :confirmed, organization:) }
+
+        before do
+          login_as user, scope: :user
+        end
+
+        it "displays the census check button" do
+          visit election_path
+
+          expect(page).to have_link("Check if I can vote")
+        end
+      end
+
+      context "when user is an admin" do
+        let(:admin) { create(:user, :admin, :confirmed, organization:) }
+
+        before do
+          login_as admin, scope: :user
+        end
+
+        it "displays the census check button" do
+          visit election_path
+
+          expect(page).to have_link("Check if I can vote")
+        end
+      end
+    end
+
+    context "when allow_census_check_before_start is disabled" do
+      let!(:election) { create(:election, :published, :scheduled, :with_token_csv_census, component:, allow_census_check_before_start: false) }
+
+      context "when user is a guest" do
+        it "does not display the census check button" do
+          visit election_path
+
+          expect(page).to have_no_link("Check if I can vote")
+        end
+      end
+
+      context "when user is logged in" do
+        let(:user) { create(:user, :confirmed, organization:) }
+
+        before do
+          login_as user, scope: :user
+        end
+
+        it "does not display the census check button" do
+          visit election_path
+
+          expect(page).to have_no_link("Check if I can vote")
+        end
+      end
+
+      context "when user is an admin" do
+        let(:admin) { create(:user, :admin, :confirmed, organization:) }
+
+        before do
+          login_as admin, scope: :user
+        end
+
+        it "does not display the census check button" do
+          visit election_path
+
+          expect(page).to have_no_link("Check if I can vote")
+        end
+      end
+    end
+  end
+
+  context "when the election is not published" do
+    let!(:election) { create(:election, :scheduled, :with_token_csv_census, component:) }
+    let(:election_path) { Decidim::EngineRouter.main_proxy(component).election_path(election) }
+    let(:new_census_check_path) { Decidim::EngineRouter.main_proxy(component).new_election_census_check_path(election) }
+    let(:census_check_path) { Decidim::EngineRouter.main_proxy(component).election_census_check_path(election) }
+    let(:voter_data) { election.voters.first.data }
+    let(:admin) { create(:user, :admin, :confirmed, organization:) }
+
+    before do
+      login_as admin, scope: :user
+    end
+
+    it "displays the census check button for admin preview" do
+      visit election_path
+
+      expect(page).to have_link("Check if I can vote")
+    end
+
+    it "allows the admin to preview the census check" do
+      visit election_path
+
+      click_link "Check if I can vote"
+
+      expect(page).to have_current_path(new_census_check_path)
+
+      fill_in "Email", with: voter_data["email"]
+      fill_in "Token", with: voter_data["token"]
+      click_button "Access"
+
+      expect(page).to have_current_path(census_check_path)
+      expect(page).to have_content("You have been successfully verified")
+    end
+  end
+
+  context "when the election uses the internal users census" do
+    let(:authorization_handlers) { { "dummy_authorization_handler" => { "options" => { "allowed_postal_codes" => "08002" } } } }
+    let(:election) { create(:election, :published, :scheduled, component:, census_manifest: "internal_users", census_settings: { "authorization_handlers" => authorization_handlers }, allow_census_check_before_start: true) }
+    let(:election_path) { Decidim::EngineRouter.main_proxy(component).election_path(election) }
+    let(:new_census_check_path) { Decidim::EngineRouter.main_proxy(component).new_election_census_check_path(election) }
+    let(:census_check_path) { Decidim::EngineRouter.main_proxy(component).election_census_check_path(election) }
+
+    context "with an authorized participant" do
+      let(:user) { create(:user, :confirmed, organization:) }
+
+      before do
+        create(:authorization, user:, name: "dummy_authorization_handler", metadata: { "postal_code" => "08002" })
+        login_as user, scope: :user
+      end
+
+      it "confirms they will be able to vote" do
+        visit election_path
+
+        click_link "Check if I can vote"
+
+        expect(page).to have_current_path(census_check_path)
+        expect(page).to have_content("You have been successfully verified")
+        expect(page).to have_content("This means that, once the election starts, you can vote in it.")
+
+        click_link "Exit the census check"
+
+        expect(page).to have_current_path(election_path)
+      end
+    end
+
+    context "with a participant without the required authorizations" do
+      let(:user) { create(:user, :confirmed, organization:) }
+
+      before do
+        login_as user, scope: :user
+      end
+
+      it "blocks the access" do
+        visit election_path
+
+        click_link "Check if I can vote"
+
+        expect(page).to have_current_path(new_census_check_path)
+        expect(page).to have_content("Verify your identity")
+
+        click_button "Access"
+
+        expect(page).to have_current_path(new_census_check_path)
+        expect(page).to have_content("You are not authorized to vote in this election.")
+      end
+    end
+  end
+
+  context "when the election is ongoing" do
+    let!(:election) { create(:election, :published, :ongoing, :with_token_csv_census, component:) }
+    let(:election_path) { Decidim::EngineRouter.main_proxy(component).election_path(election) }
+
+    it "does not display the census check button" do
+      visit election_path
+
+      expect(page).to have_no_link("Check if I can vote")
+    end
+  end
+end

From 8fb0b246cbdbceb835b46dd47aa9e5570690f1e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= <ivan@pokecode.net>
Date: Tue, 21 Oct 2025 10:41:08 +0200
Subject: [PATCH 002/131] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 0ddc2b4df70d72348aefab4d1ed2d5f4778228a3
Merge: ad11ec8a55 82c93ce522
Author: Ivan Vergés <ivan@pokecode.net>
Date:   Tue Oct 21 10:40:41 2025 +0200

    Merge branch 'develop' into feature/elections-display-question-description

commit ad11ec8a556cf2f099c4bf213c53cf76628989c4
Author: Anna Topalidi <t.opalidisanna@gmail.com>
Date:   Tue Oct 21 09:43:20 2025 +0200

    fix title

commit 0136d42fb323d3d6a41da57dec341d68a762fcd1
Author: Anna Topalidi <t.opalidisanna@gmail.com>
Date:   Tue Oct 21 08:56:39 2025 +0200

    fix tests

commit 2523af2704702ef8f9999303a8ddd0ee501f9ed4
Author: Anna Topalidi <t.opalidisanna@gmail.com>
Date:   Mon Oct 20 14:44:11 2025 +0200

    fix question_description

commit 8dfe2c17a0543300c99a4b67cc477362a7e0f2e1
Author: Anna Topalidi <t.opalidisanna@gmail.com>
Date:   Thu Oct 9 11:51:33 2025 +0200

    display question description
---
 .../decidim/elections/application_helper.rb   | 12 +++++
 .../decidim/elections/elections.scss          |  4 ++
 .../per_question_votes/show.html.erb          |  5 +-
 .../decidim/elections/votes/show.html.erb     |  5 +-
 .../test/per_question_vote_examples.rb        |  9 ++++
 .../decidim/elections/test/vote_examples.rb   |  2 +
 .../elections/application_helper_spec.rb      | 50 +++++++++++++++++++
 7 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 decidim-elections/spec/helpers/decidim/elections/application_helper_spec.rb

diff --git a/decidim-elections/app/helpers/decidim/elections/application_helper.rb b/decidim-elections/app/helpers/decidim/elections/application_helper.rb
index e24fdb0038b31..fb76d007ffb3c 100644
--- a/decidim-elections/app/helpers/decidim/elections/application_helper.rb
+++ b/decidim-elections/app/helpers/decidim/elections/application_helper.rb
@@ -43,6 +43,18 @@ def question_title(question, tag = :h3, **options)
         end
       end
 
+      def render_question_description(question)
+        description = translated_attribute(question.description)
+        return if description.blank?
+
+        sanitized = decidim_sanitize_admin(description)
+        if rich_text_editor_in_public_views?
+          Decidim::ContentProcessor.render_without_format(sanitized).html_safe
+        else
+          Decidim::ContentProcessor.render(sanitized, "div")
+        end
+      end
+
       def selected_response_option_id(question)
         session.dig(:votes_buffer, question.id.to_s, "response_option_id")&.to_i
       end
diff --git a/decidim-elections/app/packs/stylesheets/decidim/elections/elections.scss b/decidim-elections/app/packs/stylesheets/decidim/elections/elections.scss
index 37b99f1f7c7fc..fdd7bd51af2e5 100644
--- a/decidim-elections/app/packs/stylesheets/decidim/elections/elections.scss
+++ b/decidim-elections/app/packs/stylesheets/decidim/elections/elections.scss
@@ -89,3 +89,7 @@
     }
   }
 }
+
+.vote_booth-question_title {
+  @apply h3 mb-4;
+}
diff --git a/decidim-elections/app/views/decidim/elections/per_question_votes/show.html.erb b/decidim-elections/app/views/decidim/elections/per_question_votes/show.html.erb
index 41b72cae71ce4..0d7078b270212 100644
--- a/decidim-elections/app/views/decidim/elections/per_question_votes/show.html.erb
+++ b/decidim-elections/app/views/decidim/elections/per_question_votes/show.html.erb
@@ -1,5 +1,8 @@
 <%= form_with url: url_for(action: :show, id: question), method: :patch, local: true do %>
-  <%= question_title(question, :h1, class: "h4 mb-8") %>
+  <%= question_title(question, :h1, class: "vote_booth-question_title") %>
+  <div class="editor-content">
+    <%= render_question_description(question) %>
+  </div>
 
   <div class="question__response-options mt-4 flex flex-col gap-4">
     <% question.response_options.each do |option| %>
diff --git a/decidim-elections/app/views/decidim/elections/votes/show.html.erb b/decidim-elections/app/views/decidim/elections/votes/show.html.erb
index 86a5a4d675333..b76cde2df6248 100644
--- a/decidim-elections/app/views/decidim/elections/votes/show.html.erb
+++ b/decidim-elections/app/views/decidim/elections/votes/show.html.erb
@@ -1,5 +1,8 @@
 <%= form_with url: url_for(action: :show, id: question), method: :patch, local: true do %>
-  <%= question_title(question, :h1, class: "h4 mb-8") %>
+  <%= question_title(question, :h1, class: "vote_booth-question_title") %>
+  <div class="editor-content">
+    <%= render_question_description(question) %>
+  </div>
 
   <div class="question__response-options mt-4 flex flex-col gap-4">
     <% question.response_options.each do |option| %>
diff --git a/decidim-elections/lib/decidim/elections/test/per_question_vote_examples.rb b/decidim-elections/lib/decidim/elections/test/per_question_vote_examples.rb
index 5d19a71228aa0..4972a1da1469c 100644
--- a/decidim-elections/lib/decidim/elections/test/per_question_vote_examples.rb
+++ b/decidim-elections/lib/decidim/elections/test/per_question_vote_examples.rb
@@ -10,6 +10,7 @@
     click_on "Access"
     expect(page).to have_current_path(election_vote_path(question1))
     expect(page).to have_content(translated_attribute(question1.body))
+    expect(page).to have_content(strip_tags(translated_attribute(question1.description)))
     choose translated_attribute(question1.response_options.first.body)
     click_on "Cast vote"
     expect(page).to have_content("Your vote has been successfully cast.")
@@ -18,6 +19,7 @@
     # wait for javascript to update the page
     sleep 2
     expect(page).to have_current_path(election_vote_path(question2))
+    expect(page).to have_content(strip_tags(translated_attribute(question2.description)))
     click_on "Cast vote"
     expect(page).to have_content("There was a problem casting your vote.")
     check translated_attribute(question2.response_options.first.body)
@@ -52,6 +54,7 @@
     expect(page).to have_content(translated_attribute(question1.body))
     expect(page).to have_content(translated_attribute(question2.body))
     click_on "Vote"
+    expect(page).to have_content(strip_tags(translated_attribute(question1.description)))
     choose translated_attribute(question1.response_options.first.body)
     click_on "Cast vote"
     expect(page).to have_current_path(waiting_election_votes_path)
@@ -61,6 +64,7 @@
     # wait for javascript to update the page
     sleep 2
     expect(page).to have_current_path(election_vote_path(question2))
+    expect(page).to have_content(strip_tags(translated_attribute(question2.description)))
     check translated_attribute(question2.response_options.first.body)
     click_on "Cast vote"
     expect(page).to have_current_path(receipt_election_votes_path)
@@ -101,6 +105,7 @@
     # wait for javascript to update the page
     sleep 2
     expect(page).to have_current_path(election_vote_path(question2))
+    expect(page).to have_content(strip_tags(translated_attribute(question2.description)))
     check translated_attribute(question2.response_options.first.body)
     click_on "Cast vote"
     expect(page).to have_current_path(receipt_election_votes_path)
@@ -137,6 +142,7 @@
     expect(page).to have_content(translated_attribute(question2.body))
     expect(page).to have_content(translated_attribute(question3.body))
     click_on "Vote"
+    expect(page).to have_content(strip_tags(translated_attribute(question1.description)))
     choose translated_attribute(question1.response_options.first.body)
     click_on "Cast vote"
     check translated_attribute(question2.response_options.first.body)
@@ -144,10 +150,12 @@
     expect(page).to have_current_path(waiting_election_votes_path)
     click_on "Edit your vote"
     expect(page).to have_current_path(election_vote_path(question1))
+    expect(page).to have_content(strip_tags(translated_attribute(question1.description)))
     expect(find("input[value='#{question1.response_options.first.id}']")).to be_checked
     choose translated_attribute(question1.response_options.second.body)
     click_on "Cast vote"
     expect(page).to have_current_path(election_vote_path(question2))
+    expect(page).to have_content(strip_tags(translated_attribute(question2.description)))
     expect(find("input[value='#{question2.response_options.first.id}']")).to be_checked
     expect(find("input[value='#{question2.response_options.second.id}']")).not_to be_checked
     check translated_attribute(question2.response_options.second.body)
@@ -156,6 +164,7 @@
     question1.update!(published_results_at: Time.current)
     click_on "Edit your vote"
     expect(page).to have_current_path(election_vote_path(question2))
+    expect(page).to have_content(strip_tags(translated_attribute(question2.description)))
     question2.update!(published_results_at: Time.current)
     click_on "Cast vote"
     expect(page).to have_current_path(waiting_election_votes_path)
diff --git a/decidim-elections/lib/decidim/elections/test/vote_examples.rb b/decidim-elections/lib/decidim/elections/test/vote_examples.rb
index db2711b830587..6c7f5326444a1 100644
--- a/decidim-elections/lib/decidim/elections/test/vote_examples.rb
+++ b/decidim-elections/lib/decidim/elections/test/vote_examples.rb
@@ -22,10 +22,12 @@
 def fill_in_votes
   expect(page).to have_current_path(election_vote_path(election.questions.first))
   expect(page).to have_content(translated_attribute(election.questions.first.body))
+  expect(page).to have_content(strip_tags(translated_attribute(election.questions.first.description)))
   choose translated_attribute(election.questions.first.response_options.first.body)
   click_on "Next"
   expect(page).to have_current_path(election_vote_path(election.questions.second))
   expect(page).to have_content(translated_attribute(election.questions.second.body))
+  expect(page).to have_content(strip_tags(translated_attribute(election.questions.second.description)))
   check translated_attribute(election.questions.second.response_options.first.body)
   check translated_attribute(election.questions.second.response_options.second.body)
   click_on "Next"
diff --git a/decidim-elections/spec/helpers/decidim/elections/application_helper_spec.rb b/decidim-elections/spec/helpers/decidim/elections/application_helper_spec.rb
new file mode 100644
index 0000000000000..50e226cef44d1
--- /dev/null
+++ b/decidim-elections/spec/helpers/decidim/elections/application_helper_spec.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Elections
+    describe ApplicationHelper do
+      let(:organization) { create(:organization) }
+
+      before do
+        allow(helper).to receive(:current_organization).and_return(organization)
+        allow(helper).to receive(:rich_text_editor_in_public_views?).and_return(true)
+      end
+
+      describe "#question_description" do
+        subject(:rendered_description) { helper.render_question_description(question) }
+
+        context "when the description is blank" do
+          let(:question) { build(:election_question, description: { "en" => "" }) }
+
+          it { is_expected.to be_nil }
+        end
+
+        context "when the description has plain text" do
+          let(:question) { create(:election_question, description: { "en" => "More info" }) }
+
+          it { is_expected.to eq("More info") }
+        end
+
+        context "when the description includes markup" do
+          let(:question) { build(:election_question, description: { "en" => "<strong>Intro</strong>" }) }
+
+          it "keeps the allowed tags" do
+            expect(rendered_description).to eq("<strong>Intro</strong>")
+          end
+        end
+
+        context "when the description includes images" do
+          let(:question) { build(:election_question, description: { "en" => '<p>Check this image:</p><img src="image.jpg" alt="Example">' }) }
+
+          it "keeps the image tags" do
+            expect(rendered_description).to include("<img")
+            expect(rendered_description).to include('src="image.jpg"')
+            expect(rendered_description).to include('alt="Example"')
+          end
+        end
+      end
+    end
+  end
+end

From 58815f1a7e615a5ece7577405bc655e7b9e5be9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= <ivan@pokecode.net>
Date: Tue, 21 Oct 2025 12:32:40 +0200
Subject: [PATCH 003/131] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 328e89ce35525d8d3efdbff7a82d01ea24c578f8
Merge: a0d1ea9e44 8fb3f9237a
Author: Ivan Vergés <ivan@pokecode.net>
Date:   Tue Oct 21 12:32:05 2025 +0200

    Merge branch 'develop' into feature/elections-max-choices-limit

commit 8fb3f9237a422b994cb6e03eea87c3b53896c7ee
Author: Alexandru Emil Lupu <contact@alecslupu.ro>
Date:   Tue Oct 21 12:52:21 2025 +0300

    Fix ActiveRecord::AssociationTypeMismatch error in AddDemocraticQualityStaticPage (#15399)

commit 3f8a04f093060e589ba6ceeb28bdc92cae1715d1
Author: Alexandru Emil Lupu <contact@alecslupu.ro>
Date:   Tue Oct 21 11:35:30 2025 +0300

    Fix expiring Cloud Storage tokens (#15005)

    * Fix expiring Cloud Storage tokens

    * Fix spellcheck issues

    * 📝 qlty fmt

    * Add public env variable

    * Revert qlty.toml

    * Revert toml

    * Apply suggestions from code review

    Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

    * Fix liniting issues

    * Trigger pipeline

    ---------

    Co-authored-by: qltysh[bot] <168846912+qltysh[bot]@users.noreply.github.com>
    Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

commit a0d1ea9e44fe66ef5430372a158c2a7bf89eb5aa
Merge: e1952f9fd2 e34bce9194
Author: Anna Topalidi <t.opalidisanna@gmail.com>
Date:   Thu Oct 9 10:11:13 2025 +0200

    Merge branch 'develop' into feature/elections-max-choices-limit

commit e1952f9fd2746a233f6793d818882590223c8513
Author: Anna Topalidi <t.opalidisanna@gmail.com>
Date:   Thu Oct 9 09:54:36 2025 +0200

    fix test

commit 85e53d286682d13fd2513b908b6660e59705d508
Author: Anna Topalidi <t.opalidisanna@gmail.com>
Date:   Wed Oct 8 17:20:28 2025 +0200

    fix test

commit abe20bcd76dd609be33808058d4edc368b42b567
Author: Anna Topalidi <t.opalidisanna@gmail.com>
Date:   Wed Oct 8 16:19:11 2025 +0200

    fix linter

commit cf069372f974a4e6e9e06ae8a7047f4ea3afac5e
Author: Anna Topalidi <t.opalidisanna@gmail.com>
Date:   Tue Oct 7 15:24:39 2025 +0200

    add max choices limit
---
 .github/actions/spelling/expect.txt           |  1 +
 .../elections/admin/update_questions.rb       |  1 +
 .../decidim/elections/votes_controller.rb     |  8 +++
 .../decidim/elections/admin/question_form.rb  |  6 ++
 .../decidim/elections/application_helper.rb   |  6 +-
 .../app/models/decidim/elections/question.rb  |  1 +
 .../packs/entrypoints/decidim_elections.js    |  1 +
 .../packs/src/decidim/elections/elections.js  | 32 +++++++++
 .../admin/questions/_question.html.erb        | 11 +++
 .../decidim/elections/votes/show.html.erb     |  8 ++-
 decidim-elections/config/locales/en.yml       |  5 ++
 ..._choices_to_decidim_elections_questions.rb |  7 ++
 .../lib/decidim/elections/test/factories.rb   | 10 ++-
 .../elections/admin/update_questions_spec.rb  | 61 +++++++++++++++++
 .../elections/votes_controller_spec.rb        | 50 ++++++++++++++
 .../elections/admin/question_form_spec.rb     | 66 ++++++++++++++++++
 .../models/decidim/elections/question_spec.rb | 25 +++++++
 .../admin_manages_election_questions_spec.rb  | 68 +++++++++++++++++++
 .../spec/system/election_results_spec.rb      |  8 +--
 .../system/user_votes_in_an_election_spec.rb  | 60 +++++++++++++++-
 ..._votes_in_an_per_question_election_spec.rb |  8 +--
 .../generators/app_templates/storage.yml      |  3 +
 ...eate_democratic_quality_indicators_page.rb |  6 +-
 ...0052_add_democratic_quality_static_page.rb |  2 +-
 .../decidim/participatory_processes/engine.rb |  2 +-
 .../decidim/participatory_processes/seeds.rb  |  2 +-
 ...democratic_quality_indicators_page_spec.rb | 10 +--
 .../pages/environment_variables.adoc          | 15 ++++
 28 files changed, 456 insertions(+), 27 deletions(-)
 create mode 100644 decidim-elections/app/packs/src/decidim/elections/elections.js
 create mode 100644 decidim-elections/db/migrate/20251007113417_add_max_choices_to_decidim_elections_questions.rb

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index 7d3411b72759e..d2c63e2ecb545 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -33,6 +33,7 @@ amagat
 amd
 amendables
 AMR
+Amz
 andreslucena
 ANOT
 antora
diff --git a/decidim-elections/app/commands/decidim/elections/admin/update_questions.rb b/decidim-elections/app/commands/decidim/elections/admin/update_questions.rb
index 895cc764a3ba9..c379e669d260b 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/update_questions.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/update_questions.rb
@@ -47,6 +47,7 @@ def update_question(question_form, index)
             body: question_form.body,
             description: question_form.description,
             question_type: question_form.question_type,
+            max_choices: question_form.max_choices,
             position: index
           )
 
diff --git a/decidim-elections/app/controllers/decidim/elections/votes_controller.rb b/decidim-elections/app/controllers/decidim/elections/votes_controller.rb
index 41311510db060..51576fab8eb57 100644
--- a/decidim-elections/app/controllers/decidim/elections/votes_controller.rb
+++ b/decidim-elections/app/controllers/decidim/elections/votes_controller.rb
@@ -20,6 +20,14 @@ def show
       def update
         enforce_permission_to(:create, :vote, election:)
 
+        response_ids = Array(params.dig(:response, question.id.to_s)).compact
+
+        if question.max_choices.present? && response_ids.size > question.max_choices
+          flash.now[:alert] = t("votes.question.max_choices_exceeded", scope: "decidim.elections", max: question.max_choices)
+          render :show
+          return
+        end
+
         votes_buffer[question.id.to_s] = params.dig(:response, question.id.to_s)
         redirect_to next_vote_step_path
       end
diff --git a/decidim-elections/app/forms/decidim/elections/admin/question_form.rb b/decidim-elections/app/forms/decidim/elections/admin/question_form.rb
index 29579d7c3b02e..cb50cf84e9b02 100644
--- a/decidim-elections/app/forms/decidim/elections/admin/question_form.rb
+++ b/decidim-elections/app/forms/decidim/elections/admin/question_form.rb
@@ -10,6 +10,7 @@ class QuestionForm < Decidim::Form
 
         attribute :question_type, String, default: "multiple_option"
         attribute :response_options, Array[Decidim::Elections::Admin::ResponseOptionForm]
+        attribute :max_choices, Integer
         attribute :deleted, Boolean, default: false
 
         translatable_attribute :body, String
@@ -18,6 +19,7 @@ class QuestionForm < Decidim::Form
         validates :body, translatable_presence: true
         validates :question_type, inclusion: { in: Decidim::Elections::Question.question_types }, if: :editable?
         validates :response_options, presence: true, if: :editable?
+        validates :max_choices, numericality: { only_integer: true, greater_than: 1, less_than_or_equal_to: ->(form) { form.number_of_options } }, allow_blank: true
 
         def election
           @election ||= context[:election]
@@ -32,6 +34,10 @@ def to_param
         def editable?
           @editable ||= id.blank? || Decidim::Elections::Question.exists?(id:)
         end
+
+        def number_of_options
+          response_options.size
+        end
       end
     end
   end
diff --git a/decidim-elections/app/helpers/decidim/elections/application_helper.rb b/decidim-elections/app/helpers/decidim/elections/application_helper.rb
index fb76d007ffb3c..ff228932fdf04 100644
--- a/decidim-elections/app/helpers/decidim/elections/application_helper.rb
+++ b/decidim-elections/app/helpers/decidim/elections/application_helper.rb
@@ -39,7 +39,11 @@ def component_name
 
       def question_title(question, tag = :h3, **options)
         content_tag(tag, **options) do
-          translated_attribute(question.body)
+          title = translated_attribute(question.body)
+          if question.max_choices.present? && question.question_type == "multiple_option"
+            title += " (#{t("decidim.elections.votes.question.max_choices", count: question.max_choices)})"
+          end
+          title.html_safe
         end
       end
 
diff --git a/decidim-elections/app/models/decidim/elections/question.rb b/decidim-elections/app/models/decidim/elections/question.rb
index d0ba336682ee0..6bfee4dd38532 100644
--- a/decidim-elections/app/models/decidim/elections/question.rb
+++ b/decidim-elections/app/models/decidim/elections/question.rb
@@ -28,6 +28,7 @@ def self.question_types
       end
 
       def max_votable_options
+        return max_choices if max_choices.present? && question_type == "multiple_option"
         return response_options.size if question_type == "multiple_option"
 
         1
diff --git a/decidim-elections/app/packs/entrypoints/decidim_elections.js b/decidim-elections/app/packs/entrypoints/decidim_elections.js
index 36be7ef26208b..bd596b1dff83e 100644
--- a/decidim-elections/app/packs/entrypoints/decidim_elections.js
+++ b/decidim-elections/app/packs/entrypoints/decidim_elections.js
@@ -1,3 +1,4 @@
+import "src/decidim/elections/elections.js"
 import "src/decidim/elections/waiting_room.js"
 import "src/decidim/elections/live_results_update.js";
 import "src/decidim/elections/census_check_visibility.js";
diff --git a/decidim-elections/app/packs/src/decidim/elections/elections.js b/decidim-elections/app/packs/src/decidim/elections/elections.js
new file mode 100644
index 0000000000000..50fd9d555f724
--- /dev/null
+++ b/decidim-elections/app/packs/src/decidim/elections/elections.js
@@ -0,0 +1,32 @@
+document.addEventListener("turbo:load", () => {
+  const responseContainers = document.querySelectorAll(".response[data-max-choices]");
+  if (!responseContainers.length) {
+    return;
+  }
+
+  responseContainers.forEach((container) => {
+    const maxChoices = parseInt(container.dataset.maxChoices, 10);
+    if (!maxChoices) {
+      return;
+    }
+
+    const checkboxes = container.querySelectorAll("input[type=checkbox]");
+    const alertElement = container.querySelector(".max-choices-alert");
+
+    const checkLimit = () => {
+      const checkedCount = container.querySelectorAll("input[type=checkbox]:checked").length;
+
+      if (checkedCount > maxChoices) {
+        alertElement.style.display = "block";
+      } else {
+        alertElement.style.display = "none";
+      }
+    };
+
+    checkboxes.forEach((checkbox) => {
+      checkbox.addEventListener("change", checkLimit);
+    });
+
+    checkLimit();
+  });
+});
diff --git a/decidim-elections/app/views/decidim/elections/admin/questions/_question.html.erb b/decidim-elections/app/views/decidim/elections/admin/questions/_question.html.erb
index 0f433985f112d..e62bde9f60047 100644
--- a/decidim-elections/app/views/decidim/elections/admin/questions/_question.html.erb
+++ b/decidim-elections/app/views/decidim/elections/admin/questions/_question.html.erb
@@ -102,6 +102,17 @@
           </div>
         <% end %>
       </div>
+
+      <div class="row column questionnaire-question-max-choices">
+        <%=
+          form.select(
+            :max_choices,
+            (2..question.number_of_options),
+            { include_blank: t("any", scope: "decidim.forms.admin.questionnaires.question") },
+            disabled: !editable
+          )
+        %>
+      </div>
     </div>
   </div>
 </div>
diff --git a/decidim-elections/app/views/decidim/elections/votes/show.html.erb b/decidim-elections/app/views/decidim/elections/votes/show.html.erb
index b76cde2df6248..9463d769b0c96 100644
--- a/decidim-elections/app/views/decidim/elections/votes/show.html.erb
+++ b/decidim-elections/app/views/decidim/elections/votes/show.html.erb
@@ -4,12 +4,16 @@
     <%= render_question_description(question) %>
   </div>
 
-  <div class="question__response-options mt-4 flex flex-col gap-4">
+  <div class="question__response-options mt-4 flex flex-col gap-4 response" data-max-choices="<%= question.max_choices if question.max_choices.presence %>">
     <% question.response_options.each do |option| %>
-      <label class="rounded-lg border border-gray p-4">
+      <label class="rounded-lg border border-gray p-4 js-check-box-collection">
         <%= render "decidim/elections/votes/responses/#{question.question_type}", option: %>
       </label>
     <% end %>
+
+    <% if question.max_choices.presence %>
+      <small class="form-error max-choices-alert" style="display:none;"><%= t("max_choices_alert", scope: "decidim.elections.votes.question") %></small>
+    <% end %>
   </div>
 
   <div class="vote-navigation flex justify-between mt-8">
diff --git a/decidim-elections/config/locales/en.yml b/decidim-elections/config/locales/en.yml
index acd6569788199..fb5e3b05d5bd4 100644
--- a/decidim-elections/config/locales/en.yml
+++ b/decidim-elections/config/locales/en.yml
@@ -2,6 +2,8 @@
 en:
   activemodel:
     attributes:
+      elections_question:
+        max_choices: Maximum number of choices
       token_csv:
         file: File
         remove_all: Remove all current census data
@@ -311,6 +313,9 @@ en:
         question:
           back: Back
           cast_vote: Cast vote
+          max_choices: 'Max choices: %{count}'
+          max_choices_alert: You have selected too many options. Please deselect some to continue.
+          max_choices_exceeded: You cannot select more than %{max} options. Please go back and adjust your selection.
           next: Next
         receipt:
           description: Yo can vote again at any time while the voting period is open. Your previous vote will be overwritten by the new one.
diff --git a/decidim-elections/db/migrate/20251007113417_add_max_choices_to_decidim_elections_questions.rb b/decidim-elections/db/migrate/20251007113417_add_max_choices_to_decidim_elections_questions.rb
new file mode 100644
index 0000000000000..4e2d8aadcac24
--- /dev/null
+++ b/decidim-elections/db/migrate/20251007113417_add_max_choices_to_decidim_elections_questions.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddMaxChoicesToDecidimElectionsQuestions < ActiveRecord::Migration[7.2]
+  def change
+    add_column :decidim_elections_questions, :max_choices, :integer
+  end
+end
diff --git a/decidim-elections/lib/decidim/elections/test/factories.rb b/decidim-elections/lib/decidim/elections/test/factories.rb
index 50ae7c6bd5cac..c50e57fc0fe00 100644
--- a/decidim-elections/lib/decidim/elections/test/factories.rb
+++ b/decidim-elections/lib/decidim/elections/test/factories.rb
@@ -69,8 +69,8 @@
     end
 
     trait :with_questions do
-      after :create do |election, _evaluator|
-        create_list(:election_question, 2, :with_response_options, :voting_enabled, election:)
+      after :create do |election, evaluator|
+        create_list(:election_question, 2, :with_response_options, :voting_enabled, election:, skip_injection: evaluator.skip_injection)
       end
     end
 
@@ -95,8 +95,12 @@
   end
 
   factory :election_question, class: "Decidim::Elections::Question" do
+    transient do
+      skip_injection { false }
+    end
+
     association :election
-    body { generate_localized_title(:question_body) }
+    body { generate_localized_title(:question_body, skip_injection:) }
     description { generate_localized_description(:question_description) }
     question_type { "multiple_option" }
     sequence(:position) { |n| n }
diff --git a/decidim-elections/spec/commands/decidim/elections/admin/update_questions_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/update_questions_spec.rb
index 4d0d6369ec37b..b1d35796b0490 100644
--- a/decidim-elections/spec/commands/decidim/elections/admin/update_questions_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/admin/update_questions_spec.rb
@@ -190,6 +190,67 @@ module Admin
           end
         end
 
+        context "when updating max_choices" do
+          let(:update_max_choices_params) do
+            {
+              "questions" => [
+                {
+                  "id" => first_question.id,
+                  "body" => first_question.body,
+                  "description" => first_question.description,
+                  "question_type" => "multiple_option",
+                  "max_choices" => 2,
+                  "response_options" => [
+                    { "id" => first_question_first_option.id, "body" => first_question_first_option.body },
+                    { "id" => first_question_second_option.id, "body" => first_question_second_option.body }
+                  ]
+                }
+              ]
+            }
+          end
+
+          let(:form) { Decidim::Elections::Admin::QuestionsForm.from_params(update_max_choices_params).with_context(context_params) }
+          let(:command) { described_class.new(form, election) }
+
+          it "updates max_choices field" do
+            command.call
+            updated = election.reload.questions.find_by(id: first_question.id)
+            expect(updated.max_choices).to eq(2)
+          end
+        end
+
+        context "when adding a new question with max_choices" do
+          let(:add_with_max_choices_params) do
+            {
+              "questions" => [
+                {
+                  "body" => { en: "Q with max choices" },
+                  "description" => { en: "Description" },
+                  "question_type" => "multiple_option",
+                  "max_choices" => 3,
+                  "response_options" => [
+                    { "body" => { en: "Option 1" } },
+                    { "body" => { en: "Option 2" } },
+                    { "body" => { en: "Option 3" } },
+                    { "body" => { en: "Option 4" } }
+                  ]
+                }
+              ]
+            }
+          end
+
+          let(:form) { Decidim::Elections::Admin::QuestionsForm.from_params(add_with_max_choices_params).with_context(context_params) }
+          let(:command) { described_class.new(form, election) }
+
+          it "creates a new question with max_choices" do
+            expect { command.call }
+              .to change { election.reload.questions.count }.by(1)
+            new_question = election.reload.questions.last
+            expect(new_question.max_choices).to eq(3)
+            expect(new_question.response_options.size).to eq(4)
+          end
+        end
+
         context "when updating, deleting, and adding at once" do
           let(:combo_params) do
             {
diff --git a/decidim-elections/spec/controllers/decidim/elections/votes_controller_spec.rb b/decidim-elections/spec/controllers/decidim/elections/votes_controller_spec.rb
index e340e150c9e3c..7cab91d3c4936 100644
--- a/decidim-elections/spec/controllers/decidim/elections/votes_controller_spec.rb
+++ b/decidim-elections/spec/controllers/decidim/elections/votes_controller_spec.rb
@@ -96,6 +96,56 @@ module Elections
             expect(session[:votes_buffer]).to eq({ question.id.to_s => nil, second_question.id.to_s => nil })
             expect(response).to redirect_to(confirm_election_votes_path)
           end
+
+          context "when question has max_choices limit" do
+            let!(:question_with_limit) do
+              create(:election_question, :voting_enabled, election:, question_type: "multiple_option", max_choices: 2)
+            end
+            let!(:option1) { create(:election_response_option, question: question_with_limit) }
+            let!(:option2) { create(:election_response_option, question: question_with_limit) }
+            let!(:option3) { create(:election_response_option, question: question_with_limit) }
+
+            it "rejects vote when exceeding max_choices" do
+              patch :update, params: params.merge(
+                id: question_with_limit.id,
+                response: {
+                  question_with_limit.id.to_s => [option1.id, option2.id, option3.id]
+                }
+              )
+
+              expect(response).to have_http_status(:ok)
+              expect(flash[:alert]).to match(/cannot select more than 2/)
+              expect(subject).to render_template(:show)
+            end
+
+            it "accepts vote when within max_choices limit" do
+              session[:votes_buffer] = { question.id.to_s => nil, second_question.id.to_s => nil }
+
+              patch :update, params: params.merge(
+                id: question_with_limit.id,
+                response: {
+                  question_with_limit.id.to_s => [option1.id, option2.id]
+                }
+              )
+
+              expect(session[:votes_buffer][question_with_limit.id.to_s]).to eq([option1.id.to_s, option2.id.to_s])
+              expect(response).to redirect_to(confirm_election_votes_path)
+            end
+
+            it "accepts vote with less than max_choices" do
+              session[:votes_buffer] = { question.id.to_s => nil, second_question.id.to_s => nil }
+
+              patch :update, params: params.merge(
+                id: question_with_limit.id,
+                response: {
+                  question_with_limit.id.to_s => [option1.id]
+                }
+              )
+
+              expect(session[:votes_buffer][question_with_limit.id.to_s]).to eq([option1.id.to_s])
+              expect(response).to redirect_to(confirm_election_votes_path)
+            end
+          end
         end
       end
 
diff --git a/decidim-elections/spec/forms/decidim/elections/admin/question_form_spec.rb b/decidim-elections/spec/forms/decidim/elections/admin/question_form_spec.rb
index f5a0349884b82..75e3f42235347 100644
--- a/decidim-elections/spec/forms/decidim/elections/admin/question_form_spec.rb
+++ b/decidim-elections/spec/forms/decidim/elections/admin/question_form_spec.rb
@@ -55,6 +55,72 @@ module Admin
           it { is_expected.not_to be_valid }
         end
 
+        describe "max_choices validation" do
+          let(:attributes) do
+            {
+              body_en: body_en,
+              description_en: description_en,
+              question_type: question_type,
+              response_options: response_options,
+              max_choices: max_choices
+            }
+          end
+
+          context "when max_choices is valid" do
+            let(:max_choices) { 2 }
+
+            it { is_expected.to be_valid }
+          end
+
+          context "when max_choices is greater than number of options" do
+            let(:max_choices) { 10 }
+
+            it { is_expected.not_to be_valid }
+
+            it "adds an error on max_choices" do
+              subject.valid?
+              expect(subject.errors[:max_choices]).not_to be_empty
+            end
+          end
+
+          context "when max_choices is 1" do
+            let(:max_choices) { 1 }
+
+            it { is_expected.not_to be_valid }
+
+            it "adds an error on max_choices" do
+              subject.valid?
+              expect(subject.errors[:max_choices]).not_to be_empty
+            end
+          end
+
+          context "when max_choices is nil" do
+            let(:max_choices) { nil }
+
+            it { is_expected.to be_valid }
+          end
+
+          context "when max_choices is blank string" do
+            let(:max_choices) { "" }
+
+            it { is_expected.to be_valid }
+          end
+        end
+
+        describe "#number_of_options" do
+          it "returns the count of response options" do
+            expect(subject.number_of_options).to eq(2)
+          end
+
+          context "when there are no response options" do
+            let(:response_options) { {} }
+
+            it "returns 0" do
+              expect(subject.number_of_options).to eq(0)
+            end
+          end
+        end
+
         it_behaves_like "form to param", default_id: "questionnaire-question-id"
       end
     end
diff --git a/decidim-elections/spec/models/decidim/elections/question_spec.rb b/decidim-elections/spec/models/decidim/elections/question_spec.rb
index 3f33d9493f9e4..fad27465bc732 100644
--- a/decidim-elections/spec/models/decidim/elections/question_spec.rb
+++ b/decidim-elections/spec/models/decidim/elections/question_spec.rb
@@ -155,6 +155,22 @@ module Elections
           it "returns the count of response options" do
             expect(subject.max_votable_options).to eq(2)
           end
+
+          context "when max_choices is set" do
+            let(:question) { create(:election_question, :with_response_options, question_type: "multiple_option", max_choices: 1) }
+
+            it "returns the max_choices value" do
+              expect(subject.max_votable_options).to eq(1)
+            end
+          end
+
+          context "when max_choices is nil" do
+            let(:question) { create(:election_question, :with_response_options, question_type: "multiple_option", max_choices: nil) }
+
+            it "returns the count of response options" do
+              expect(subject.max_votable_options).to eq(2)
+            end
+          end
         end
       end
 
@@ -182,6 +198,15 @@ module Elections
             expect(question.safe_responses(response_ids)).to be_empty
           end
         end
+
+        context "when max_choices is set" do
+          let(:question) { create(:election_question, :with_response_options, question_type: "multiple_option", max_choices: 1) }
+
+          it "returns only max_choices number of responses" do
+            response_ids = question.response_options.pluck(:id)
+            expect(question.safe_responses(response_ids).count).to eq(1)
+          end
+        end
       end
 
       describe "#sibling_questions" do
diff --git a/decidim-elections/spec/system/admin/admin_manages_election_questions_spec.rb b/decidim-elections/spec/system/admin/admin_manages_election_questions_spec.rb
index 43ccd8a39fd7c..f7c034dc61bfe 100644
--- a/decidim-elections/spec/system/admin/admin_manages_election_questions_spec.rb
+++ b/decidim-elections/spec/system/admin/admin_manages_election_questions_spec.rb
@@ -128,6 +128,74 @@
     end
   end
 
+  context "when admin user sets max_choices for multiple_option question" do
+    it "creates a question with max_choices" do
+      visit questions_edit_path
+
+      click_on "Add question"
+      expand_all_questions
+
+      within "form.edit_questions" do
+        within page.all(".questionnaire-question").first do
+          fill_in find_nested_form_field_locator("body_en"), with: "Select up to 2 options"
+          select "Multiple option", from: "Type"
+
+          3.times { click_on "Add response option" }
+
+          page.all(".questionnaire-question-response-option").each_with_index do |option, idx|
+            within option do
+              fill_in find_nested_form_field_locator("body_en"), with: "Option #{idx + 1}"
+            end
+          end
+
+          select "2", from: "Maximum number of choices"
+        end
+      end
+
+      click_on "Save and continue"
+
+      expect(page).to have_admin_callout("successfully")
+
+      visit questions_edit_path
+      expand_all_questions
+
+      expect(page).to have_css("input[value='Select up to 2 options']")
+      expect(election.questions.last.max_choices).to eq(2)
+    end
+
+    it "updates max_choices on existing question" do
+      question = create(:election_question, :with_response_options,
+                        election:,
+                        question_type: "multiple_option",
+                        max_choices: nil)
+
+      visit questions_edit_path
+      find("#questionnaire_question_#{question.id}-button").click
+
+      within "#accordion-questionnaire_question_#{question.id}-field" do
+        select "2", from: "Maximum number of choices"
+      end
+
+      click_on "Save and continue"
+
+      expect(page).to have_admin_callout("successfully")
+      expect(question.reload.max_choices).to eq(2)
+    end
+
+    it "shows 'Any' option for max_choices when unset" do
+      question = create(:election_question, :with_response_options,
+                        election:,
+                        question_type: "multiple_option")
+
+      visit questions_edit_path
+      find("#questionnaire_question_#{question.id}-button").click
+
+      within "#accordion-questionnaire_question_#{question.id}-field" do
+        expect(page).to have_select("Maximum number of choices", selected: "Any")
+      end
+    end
+  end
+
   private
 
   def find_nested_form_field_locator(attribute, visible: :visible)
diff --git a/decidim-elections/spec/system/election_results_spec.rb b/decidim-elections/spec/system/election_results_spec.rb
index a5c9adb11fb4f..0653401acf4d2 100644
--- a/decidim-elections/spec/system/election_results_spec.rb
+++ b/decidim-elections/spec/system/election_results_spec.rb
@@ -4,7 +4,7 @@
 require "decidim/elections/test/vote_examples"
 
 describe "Dashboard" do
-  let(:election) { create(:election, :published, :ongoing, :real_time, :with_internal_users_census, :with_questions) }
+  let(:election) { create(:election, :published, :ongoing, :real_time, :with_internal_users_census, :with_questions, skip_injection: true) }
   let(:question1) { election.questions.first }
   let(:question2) { election.questions.second }
   let(:option11) { question1.response_options.first }
@@ -70,8 +70,8 @@ def expect_vote_count(question, option, count)
 
   context "when the election is per question" do
     let(:election) { create(:election, :published, :ongoing, :per_question, :with_internal_users_census) }
-    let!(:question1) { create(:election_question, :with_response_options, :voting_enabled, election:) }
-    let!(:question2) { create(:election_question, :with_response_options, election:) }
+    let!(:question1) { create(:election_question, :with_response_options, :voting_enabled, election:, skip_injection: true) }
+    let!(:question2) { create(:election_question, :with_response_options, election:, skip_injection: true) }
     let(:option11) { question1.response_options.first }
     let(:option12) { question1.response_options.second }
     let(:option21) { question2.response_options.first }
@@ -84,7 +84,7 @@ def expect_vote_count(question, option, count)
     end
 
     context "when all questions are enabled" do
-      let!(:question2) { create(:election_question, :with_response_options, :voting_enabled, election:) }
+      let!(:question2) { create(:election_question, :with_response_options, :voting_enabled, election:, skip_injection: true) }
 
       it_behaves_like "shows questions in an election"
     end
diff --git a/decidim-elections/spec/system/user_votes_in_an_election_spec.rb b/decidim-elections/spec/system/user_votes_in_an_election_spec.rb
index bed6fc96a6fb4..99890f16189ca 100644
--- a/decidim-elections/spec/system/user_votes_in_an_election_spec.rb
+++ b/decidim-elections/spec/system/user_votes_in_an_election_spec.rb
@@ -6,8 +6,8 @@
 describe "Dashboard" do
   let(:user) { create(:user, :confirmed, organization:) }
   let!(:election) { create(:election, :published, :ongoing, :with_internal_users_census, census_settings:) }
-  let!(:question1) { create(:election_question, :with_response_options, election:, question_type: "single_option") }
-  let!(:question2) { create(:election_question, :with_response_options, election:, question_type: "multiple_option") }
+  let!(:question1) { create(:election_question, :with_response_options, skip_injection: true, election:, question_type: "single_option") }
+  let!(:question2) { create(:election_question, :with_response_options, skip_injection: true, election:, question_type: "multiple_option") }
   let(:organization) { election.organization }
   let(:census_settings) do
     {
@@ -103,6 +103,62 @@ def election_vote_path(question)
     end
   end
 
+  context "when question has max_choices limit", :js do
+    let(:election_with_limit) { create(:election, :published, :ongoing, :with_internal_users_census, component: election.component) }
+    let!(:question_with_limit) { create(:election_question, election: election_with_limit, question_type: "multiple_option", max_choices: 2, body: { en: "Choose your options" }) }
+    let!(:option1) { create(:election_response_option, question: question_with_limit, body: { en: "Option 1" }) }
+    let!(:option2) { create(:election_response_option, question: question_with_limit, body: { en: "Option 2" }) }
+    let!(:option3) { create(:election_response_option, question: question_with_limit, body: { en: "Option 3" }) }
+    let(:new_election_with_limit_vote_path) { Decidim::EngineRouter.main_proxy(election.component).new_election_vote_path(election_id: election_with_limit.id) }
+
+    before do
+      login_as user, scope: :user
+      visit new_election_with_limit_vote_path
+    end
+
+    it "shows max_choices in question title" do
+      expect(page).to have_content("Choose your options (Max choices: 2)")
+    end
+
+    it "shows alert when selecting more than max_choices" do
+      check "Option 1"
+      check "Option 2"
+      check "Option 3"
+
+      expect(page).to have_css(".max-choices-alert", visible: :visible)
+    end
+
+    it "hides alert when deselecting options" do
+      check "Option 1"
+      check "Option 2"
+      check "Option 3"
+
+      expect(page).to have_css(".max-choices-alert", visible: :visible)
+
+      uncheck "Option 3"
+
+      expect(page).to have_css(".max-choices-alert", visible: :hidden)
+    end
+
+    it "shows server-side validation error when exceeding limit" do
+      check "Option 1"
+      check "Option 2"
+      check "Option 3"
+
+      click_on "Next"
+
+      expect(page).to have_content("You cannot select more than 2 options")
+    end
+
+    context "when question is single_option" do
+      let!(:single_question) { create(:election_question, election: election_with_limit, question_type: "single_option", body: { en: "Choose one option" }) }
+
+      it "does not show max_choices for single_option questions" do
+        expect(page).to have_no_content("Choose one option (Max choices:")
+      end
+    end
+  end
+
   context "when the election is per_question" do
     let(:election) { create(:election, :published, :ongoing, :with_internal_users_census, :per_question) }
 
diff --git a/decidim-elections/spec/system/user_votes_in_an_per_question_election_spec.rb b/decidim-elections/spec/system/user_votes_in_an_per_question_election_spec.rb
index 87f3717b88796..7be60f6e774b7 100644
--- a/decidim-elections/spec/system/user_votes_in_an_per_question_election_spec.rb
+++ b/decidim-elections/spec/system/user_votes_in_an_per_question_election_spec.rb
@@ -21,8 +21,8 @@
   let(:receipt_election_votes_path) { Decidim::EngineRouter.main_proxy(election.component).receipt_election_per_question_votes_path(election_id: election.id) }
   let(:confirm_election_votes_path) { Decidim::EngineRouter.main_proxy(election.component).confirm_election_per_question_votes_path(election_id: election.id) }
   let(:new_election_normal_vote_path) { Decidim::EngineRouter.main_proxy(election.component).new_election_vote_path(election_id: election.id) }
-  let!(:question1) { create(:election_question, :with_response_options, :voting_enabled, question_type: "single_option", election:, position: 1) }
-  let!(:question2) { create(:election_question, :with_response_options, election:, position: 2) }
+  let!(:question1) { create(:election_question, :with_response_options, :voting_enabled, skip_injection: true, question_type: "single_option", election:, position: 1) }
+  let!(:question2) { create(:election_question, :with_response_options, election:, skip_injection: true, position: 2) }
   let(:voter_uid) { user.to_global_id.to_s }
 
   def election_vote_path(question)
@@ -62,8 +62,8 @@ def election_vote_path(question)
   end
 
   context "when navigating through already voted questions" do
-    let!(:question2) { create(:election_question, :with_response_options, :voting_enabled, election:, position: 2) }
-    let!(:question3) { create(:election_question, :with_response_options, election:, position: 3) }
+    let!(:question2) { create(:election_question, :with_response_options, :voting_enabled, election:, skip_injection: true, position: 2) }
+    let!(:question3) { create(:election_question, :with_response_options, election:, skip_injection: true, position: 3) }
 
     before do
       login_as user, scope: :user
diff --git a/decidim-generators/lib/decidim/generators/app_templates/storage.yml b/decidim-generators/lib/decidim/generators/app_templates/storage.yml
index 2e48424431db5..e8a54fcbe971e 100644
--- a/decidim-generators/lib/decidim/generators/app_templates/storage.yml
+++ b/decidim-generators/lib/decidim/generators/app_templates/storage.yml
@@ -8,6 +8,7 @@ local:
 
 s3:
   service: S3
+  public: <%= Decidim::Env.new("AWS_PUBLIC", "true").to_boolean_string %>
   access_key_id: <%= Decidim::Env.new("AWS_ACCESS_KEY_ID").to_s %>
   secret_access_key: <%= Decidim::Env.new("AWS_SECRET_ACCESS_KEY").to_s %>
   bucket: <%= Decidim::Env.new("AWS_BUCKET").to_s %>
@@ -16,6 +17,7 @@ s3:
 
 azure:
   service: AzureStorage
+  public: <%= Decidim::Env.new("AZURE_PUBLIC", "true").to_boolean_string %>
   storage_account_name: <%= Decidim::Env.new("AZURE_STORAGE_ACCOUNT_NAME").to_s %>
   storage_access_key: <%= Decidim::Env.new("AZURE_STORAGE_ACCESS_KEY").to_s %>
   container: <%= Decidim::Env.new("AZURE_CONTAINER").to_s %>
@@ -24,6 +26,7 @@ gcs:
   service: GCS
   project: <%= Decidim::Env.new("GCS_PROJECT").to_s %>
   bucket: <%= Decidim::Env.new("GCS_BUCKET").to_s %>
+  public: <%= Decidim::Env.new("GCS_PUBLIC", "true").to_boolean_string %>
   credentials:
     type: <%= Decidim::Env.new("GCS_TYPE", "service_account").to_s %>
     project_id: <%= Decidim::Env.new("GCS_PROJECT_ID").to_s %>
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/create_democratic_quality_indicators_page.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/create_democratic_quality_indicators_page.rb
index dd313fd825e85..96b525ce86066 100644
--- a/decidim-participatory_processes/app/commands/decidim/participatory_processes/create_democratic_quality_indicators_page.rb
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/create_democratic_quality_indicators_page.rb
@@ -5,9 +5,9 @@ module ParticipatoryProcesses
     class CreateDemocraticQualityIndicatorsPage < Decidim::Command
       # Public: Initializes the command.
       #
-      # @param organization [Decidim::Organization] a Decidim::Organization instance
-      def initialize(organization)
-        @organization = organization
+      # @param organization_id [Integer] an id to fetch a Decidim::Organization instance
+      def initialize(organization_id)
+        @organization = Decidim::Organization.find(organization_id)
       end
 
       # Executes the command that creates the required static page or returns it if it already exists.
diff --git a/decidim-participatory_processes/db/migrate/20250403110052_add_democratic_quality_static_page.rb b/decidim-participatory_processes/db/migrate/20250403110052_add_democratic_quality_static_page.rb
index 0b2e35ebe528a..3ca9c1db4eb87 100644
--- a/decidim-participatory_processes/db/migrate/20250403110052_add_democratic_quality_static_page.rb
+++ b/decidim-participatory_processes/db/migrate/20250403110052_add_democratic_quality_static_page.rb
@@ -11,7 +11,7 @@ class StaticPage < ApplicationRecord
 
   def up
     Organization.find_each do |organization|
-      Decidim::ParticipatoryProcesses::CreateDemocraticQualityIndicatorsPage.call(organization)
+      Decidim::ParticipatoryProcesses::CreateDemocraticQualityIndicatorsPage.call(organization.id)
     end
   end
 end
diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/engine.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/engine.rb
index 9bfedac36b266..261257caf7112 100644
--- a/decidim-participatory_processes/lib/decidim/participatory_processes/engine.rb
+++ b/decidim-participatory_processes/lib/decidim/participatory_processes/engine.rb
@@ -110,7 +110,7 @@ class Engine < ::Rails::Engine
       initializer "decidim_participatory_processes.static_pages" do
         config.to_prepare do
           Decidim::EventsManager.subscribe("decidim.system.create_organization:after") do |_event_name, data|
-            Decidim::ParticipatoryProcesses::CreateDemocraticQualityIndicatorsPage.call(data[:organization])
+            Decidim::ParticipatoryProcesses::CreateDemocraticQualityIndicatorsPage.call(data[:organization].id)
           end
         end
       end
diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/seeds.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/seeds.rb
index 803e998b2efaf..7ecad9baa7773 100644
--- a/decidim-participatory_processes/lib/decidim/participatory_processes/seeds.rb
+++ b/decidim-participatory_processes/lib/decidim/participatory_processes/seeds.rb
@@ -7,7 +7,7 @@ module Decidim
   module ParticipatoryProcesses
     class Seeds < Decidim::Seeds
       def call
-        Decidim::ParticipatoryProcesses::CreateDemocraticQualityIndicatorsPage.call(organization)
+        Decidim::ParticipatoryProcesses::CreateDemocraticQualityIndicatorsPage.call(organization.id)
 
         create_content_block!
 
diff --git a/decidim-participatory_processes/spec/commands/decidim/participatory_processes/create_democratic_quality_indicators_page_spec.rb b/decidim-participatory_processes/spec/commands/decidim/participatory_processes/create_democratic_quality_indicators_page_spec.rb
index ce61a32cf8dd7..2af7f8b091606 100644
--- a/decidim-participatory_processes/spec/commands/decidim/participatory_processes/create_democratic_quality_indicators_page_spec.rb
+++ b/decidim-participatory_processes/spec/commands/decidim/participatory_processes/create_democratic_quality_indicators_page_spec.rb
@@ -5,7 +5,7 @@
 module Decidim
   module ParticipatoryProcesses
     describe CreateDemocraticQualityIndicatorsPage do
-      subject { described_class.new(organization1) }
+      subject { described_class.new(organization1.id) }
       let!(:organization1) { create(:organization, create_static_pages: false) }
       let!(:organization2) { create(:organization, create_static_pages: false) }
 
@@ -14,15 +14,15 @@ module ParticipatoryProcesses
       end
 
       it "creates the indicators page for all the organizations" do
-        described_class.new(organization1).call
-        described_class.new(organization2).call
+        described_class.new(organization1.id).call
+        described_class.new(organization2.id).call
 
         expect(organization1.static_pages.count).to eq(1)
         expect(organization2.static_pages.count).to eq(1)
       end
 
       it "sets the content with translatable title" do
-        described_class.new(organization1).call
+        described_class.new(organization1.id).call
 
         organization1.static_pages.each do |page|
           expect(page.title["en"]).to include(I18n.t("title", scope: "decidim.participatory_processes.static_pages.democratic_quality_indicators"))
@@ -32,7 +32,7 @@ module ParticipatoryProcesses
       it "sets the content with each locale" do
         allow(Decidim).to receive(:available_locales).and_return [:en, :ca]
 
-        described_class.new(organization1).call
+        described_class.new(organization1.id).call
         organization1.static_pages.each do |page|
           expect(page.title["en"]).not_to be_nil
           expect(page.title["ca"]).not_to be_nil
diff --git a/docs/modules/configure/pages/environment_variables.adoc b/docs/modules/configure/pages/environment_variables.adoc
index bfedfb04f152f..bf796cdf8d132 100644
--- a/docs/modules/configure/pages/environment_variables.adoc
+++ b/docs/modules/configure/pages/environment_variables.adoc
@@ -170,6 +170,11 @@ Also, be sure to add the line `gem "aws-sdk-s3", require: false` in your Gemfile
 |
 |No
 
+|*AWS_PUBLIC*
+|Whether the AWS assets to be public or not. Default is true, which means that no credential strings would be attached to your AWS stored assets, making it easier for components to be cached. If you set this to `false` you may have cache issues (like changing an image and not seeing the change immediately).
+|true
+|No
+
 |*AZURE_STORAGE_ACCESS_KEY*
 |If STORAGE_PROVIDER is set to `azure`, define here your AZURE ACCESS KEY with permissions to access the container for the application. Needs to be encoded in Base64.
 
@@ -187,6 +192,11 @@ Also, be sure to add the line `gem "azure-storage-blob", require: false` in your
 |
 |No
 
+|*AZURE_PUBLIC*
+|Whether the Azure assets to be public or not. Default is true, which means that no credential strings would be attached to your Azure stored assets, making it easier for components to be cached. If you set this to `false` you may have cache issues (like changing an image and not seeing the change immediately).
+|true
+|No
+
 |*GCS_PROJECT*
 |If STORAGE_PROVIDER is set to `gcs`, define here your GOOGLE CLOUD PROJECT with permissions to access the bucket for the application.
 
@@ -251,6 +261,11 @@ Also, be sure to add the line `gem "google-cloud-storage", "~> 1.11", require: f
 |
 |No
 
+|*GCS_PUBLIC*
+|Whether the Google Cloud Service assets to be public or not. Default is true, which means that no credential strings would be attached to your CGS stored assets, making it easier for components to be cached. If you set this to `false` you may have cache issues (like changing an image and not seeing the change immediately).
+|true
+|No
+
 |===
 
 Next variables are additional services such as geolocation, etherpad and other simple integrations.

From b02a2d718c39d32f7696d23b345c35fb0c2d7ac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= <ivan@pokecode.net>
Date: Thu, 12 Mar 2026 11:02:53 +0100
Subject: [PATCH 004/131] fix images & blobs

---
 .../decidim/content_parsers/blob_parser.rb    |  6 ++--
 .../content_renderers/blob_renderer.rb        |  4 +--
 .../decidim/blob_parser_spec.rb               | 15 ++++++++--
 .../decidim/blob_renderer_spec.rb             | 30 +++++++++++++++----
 4 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/decidim-core/lib/decidim/content_parsers/blob_parser.rb b/decidim-core/lib/decidim/content_parsers/blob_parser.rb
index 7b101c64e04b4..6f60c72582ec9 100644
--- a/decidim-core/lib/decidim/content_parsers/blob_parser.rb
+++ b/decidim-core/lib/decidim/content_parsers/blob_parser.rb
@@ -34,8 +34,8 @@ class BlobParser < BaseParser
           # Group 6: Variation key for representations
           /(?<variation_part>[\w.=-]+)
         )?
-        # Group 7: Filename
-        /([\w.=-]+)
+        # Group 7: Filename (supports apostrophes inside names but not as HTML quote delimiters)
+        /((?:[^\s/"<>']|'(?=[^\s/"<>']))+)
       }x
 
       def rewrite
@@ -55,7 +55,7 @@ def replace_blobs(text)
           blob =
             if type_part == "disk"
               # Disk service URL
-              decoded = ActiveStorage.verifier.verified(key_part, purpose: :blob_key).with_indifferent_access
+              decoded = ActiveStorage.verifier.verified(key_part, purpose: :blob_key)&.with_indifferent_access
               ActiveStorage::Blob.find_by(key: decoded[:key]) if decoded
             else
               # Representation or blob
diff --git a/decidim-core/lib/decidim/content_renderers/blob_renderer.rb b/decidim-core/lib/decidim/content_renderers/blob_renderer.rb
index f29a933fc95dc..2a46c6621a5d2 100644
--- a/decidim-core/lib/decidim/content_renderers/blob_renderer.rb
+++ b/decidim-core/lib/decidim/content_renderers/blob_renderer.rb
@@ -18,8 +18,8 @@ module ContentRenderers
     #
     # @see BaseRenderer Examples of how to use a content renderer
     class BlobRenderer < BaseRenderer
-      # Matches a global id representing a Decidim::User
-      GLOBAL_ID_REGEX = %r{(gid://[\w-]+/ActiveStorage::Blob/\d+)(/([\w=-]+))?}
+      # Matches a global id representing an ActiveStorage::Blob (optionally with a variant key)
+      GLOBAL_ID_REGEX = %r{(gid://[\w-]+/ActiveStorage::Blob/\d+)(/([\w=-]+))?(?:[^\s"'<>]*)}
 
       # Replaces found Global IDs matching an existing blob with a URL to
       # that blob. The Global IDs representing an invalid ActiveStorage::Blob
diff --git a/decidim-core/spec/content_parsers/decidim/blob_parser_spec.rb b/decidim-core/spec/content_parsers/decidim/blob_parser_spec.rb
index 67ed5112d460b..ab57d35c70453 100644
--- a/decidim-core/spec/content_parsers/decidim/blob_parser_spec.rb
+++ b/decidim-core/spec/content_parsers/decidim/blob_parser_spec.rb
@@ -30,6 +30,8 @@ module Decidim
     let(:document_blob_proxy_path) { routes.rails_service_blob_proxy_path(document_blob.signed_id, document_blob.filename, only_path: true) }
     let(:document_blob_proxy_url) { routes.rails_service_blob_proxy_url(document_blob.signed_id, document_blob.filename, host: asset_host) }
     let(:document_blob_disk_url) { document_blob.url }
+    let(:document_blob_redirect_url) { routes.rails_blob_redirect_url(document_blob, host: asset_host) }
+    let(:missing_blob_url) { document_blob_disk_url.gsub("/disk/", "/disk/i-do-not-exist") }
 
     let(:content) do
       <<~HTML.squish
@@ -43,7 +45,7 @@ module Decidim
         <p>#{document_blob_url}</p>
         <p>#{document_blob_proxy_path}</p>
         <p>#{document_blob_proxy_url}</p>
-        <p>#{document_blob_disk_url}</p>
+        <p>#{missing_blob_url}</p>
       HTML
     end
     let(:parsed_content) do
@@ -58,7 +60,7 @@ module Decidim
         <p>#{document_blob.to_global_id}</p>
         <p>#{document_blob.to_global_id}</p>
         <p>#{document_blob.to_global_id}</p>
-        <p>#{document_blob.to_global_id}</p>
+        <p>#{missing_blob_url}</p>
       HTML
     end
 
@@ -73,6 +75,15 @@ module Decidim
         expect(subject).to eq(parsed_content)
       end
 
+      context "when the image has strange characters in the filename" do
+        let(:image_blob) { create(:blob, :image, filename: "strange fílename @#$%<>\"'.jpg") }
+        let(:document_blob) { create(:blob, :document, filename: "strange fílename @#$%()\\|.pdf") }
+
+        it "rewrites the URLs correctly" do
+          expect(subject).to eq(parsed_content)
+        end
+      end
+
       context "when content is preceded by a link with an URL" do
         let(:parser) { described_class.new(content_with_url, context) }
         let(:content_with_url) do
diff --git a/decidim-core/spec/content_renderers/decidim/blob_renderer_spec.rb b/decidim-core/spec/content_renderers/decidim/blob_renderer_spec.rb
index ac983f3ba179b..cc98ec12b4b00 100644
--- a/decidim-core/spec/content_renderers/decidim/blob_renderer_spec.rb
+++ b/decidim-core/spec/content_renderers/decidim/blob_renderer_spec.rb
@@ -22,15 +22,18 @@ module Decidim
     let(:image_representation_path) { routes.rails_representation_path(image_variant, only_path: true) }
     let(:image_variant_processed_representation_path) { routes.rails_representation_path(image_variant_processed, only_path: true) }
     let(:image_blob_url) { routes.rails_disk_service_url(image_blob.signed_id, image_blob.filename, host: asset_host) }
-    let(:document_blob_url) { routes.rails_disk_service_url(document_blob.signed_id, image_blob.filename, host: asset_host) }
+    let(:document_blob_url) { routes.rails_disk_service_url(document_blob.signed_id, document_blob.filename, host: asset_host) }
+    let(:invalid_blob_url) { image_blob.to_global_id.to_s.gsub("Blob/", "Blob/123") }
+    let(:suffix) { "" }
 
     let(:content) do
       <<~HTML.squish
-        <p><img src="#{image_blob.to_global_id}/#{image_variant_encoded}" alt="Representation image"></p>
-        <p><img src="#{image_blob.to_global_id}/#{image_variant_processed_encoded}" alt="Representation image processed"></p>
-        <p><img src='#{image_blob.to_global_id}' alt="Blob image"></p>
-        <p><a href='#{document_blob.to_global_id}'>Link to document</a></p>
-        <p class="document-url">#{document_blob.to_global_id}</p>
+        <p><img src="#{image_blob.to_global_id}/#{image_variant_encoded}#{suffix}" alt="Representation image"></p>
+        <p><img src="#{image_blob.to_global_id}/#{image_variant_processed_encoded}#{suffix}" alt="Representation image processed"></p>
+        <p><img src='#{image_blob.to_global_id}#{suffix}' alt="Blob image"></p>
+        <p><a href='#{document_blob.to_global_id}#{suffix}'>Link to document</a></p>
+        <p class="document-url">#{document_blob.to_global_id}#{suffix}</p>
+        <p><img src="#{invalid_blob_url}" alt="Invalid blob"></p>
       HTML
     end
 
@@ -50,6 +53,9 @@ module Decidim
           expect(doc.at("img[alt='Blob image']").attr(:src)).to be_blob_url(image_blob)
           expect(doc.at("a").attr(:href)).to be_blob_url(document_blob)
           expect(doc.at("p.document-url").inner_html).to be_blob_url(document_blob)
+          # Note, the invalid blob URL is replaced with an empty string,
+          # This might change in the future if we decide to keep the invalid URL instead of removing it
+          expect(doc.at("img[alt='Invalid blob']").attr(:src)).to be_blank
         end
       end
 
@@ -60,6 +66,18 @@ module Decidim
 
         it_behaves_like "correctly rendered blob URLs"
       end
+
+      context "when there is a query string after the gid" do
+        let(:suffix) { "?some=strange&suffix=after" }
+
+        it_behaves_like "correctly rendered blob URLs"
+      end
+
+      context "when there is some strange suffix after the gid" do
+        let(:suffix) { "%something" }
+
+        it_behaves_like "correctly rendered blob URLs"
+      end
     end
   end
 end

From 59ada45ba17ddbe360805e5f4ab7b2eb24faa357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= <ivan@pokecode.net>
Date: Fri, 13 Mar 2026 10:47:23 +0100
Subject: [PATCH 005/131] fix attachment updates

---
 .../app/cells/decidim/upload_modal/files.erb  |  6 ++-
 .../app/cells/decidim/upload_modal_cell.rb    | 11 +++-
 .../decidim/multiple_attachments_methods.rb   | 23 ++++++--
 .../decidim/proposals/admin/proposal_form.rb  | 52 ++++++++++++++++++-
 .../system/admin/admin_edits_proposal_spec.rb | 27 ++++++++++
 5 files changed, 113 insertions(+), 6 deletions(-)

diff --git a/decidim-core/app/cells/decidim/upload_modal/files.erb b/decidim-core/app/cells/decidim/upload_modal/files.erb
index 651da3aacd0b2..594e8dd7717e2 100644
--- a/decidim-core/app/cells/decidim/upload_modal/files.erb
+++ b/decidim-core/app/cells/decidim/upload_modal/files.erb
@@ -42,7 +42,11 @@
             <% end %>
           <% end %>
           <% if attachment_blob.present? %>
-            <%= form.hidden_field attribute, value: attachment_blob.signed_id, id: "hidden_#{attribute}_#{attachment_blob.id}" %>
+            <% if is_persisted_attachment %>
+              <%= form.hidden_field attribute, value: attachment.id, id: "hidden_#{attribute}_#{attachment.id}" %>
+            <% else %>
+              <%= form.hidden_field attribute, value: attachment_blob.signed_id, id: "hidden_#{attribute}_#{attachment_blob.id}" %>
+            <% end %>
           <% end %>
         </div>
       <% end %>
diff --git a/decidim-core/app/cells/decidim/upload_modal_cell.rb b/decidim-core/app/cells/decidim/upload_modal_cell.rb
index 055d4d1df8081..03a9af51e1578 100644
--- a/decidim-core/app/cells/decidim/upload_modal_cell.rb
+++ b/decidim-core/app/cells/decidim/upload_modal_cell.rb
@@ -128,7 +128,16 @@ def attachments
       @attachments = begin
         attachments = options[:attachments] || form.object.send(attribute)
         attachments = Array(attachments).compact_blank
-        attachments.map { |attachment| attachment.is_a?(String) ? ActiveStorage::Blob.find_signed(attachment) : attachment }
+        attachments.map do |attachment|
+          case attachment
+          when String
+            ActiveStorage::Blob.find_signed(attachment)
+          when Integer
+            Decidim::Attachment.find_by(id: attachment)
+          else
+            attachment
+          end
+        end.compact
       end
     end
 
diff --git a/decidim-core/app/commands/decidim/multiple_attachments_methods.rb b/decidim-core/app/commands/decidim/multiple_attachments_methods.rb
index 1dfe2e4c40949..248d604e0d7e3 100644
--- a/decidim-core/app/commands/decidim/multiple_attachments_methods.rb
+++ b/decidim-core/app/commands/decidim/multiple_attachments_methods.rb
@@ -41,8 +41,9 @@ def attachments_invalid?
 
     def create_attachments(first_weight: 0)
       weight = first_weight
-      # Add the weights first to the old document
-      @form.documents.each do |document|
+      # Add the weights first to the old documents
+      document_ids = keep_ids
+      Decidim::Attachment.where(id: document_ids).each do |document|
         document.update!(weight:)
         weight += 1
       end
@@ -59,7 +60,7 @@ def document_cleanup!(include_all_attachments: false)
       documents = include_all_attachments ? documents_attached_to.attachments.with_attached_file : documents_attached_to.documents
 
       documents.each do |document|
-        document.destroy! if @form.documents.map(&:id).exclude? document.id
+        document.destroy! unless keep_ids.include?(document.id)
       end
 
       documents_attached_to.reload
@@ -98,5 +99,21 @@ def content_type_for(attachment)
     def blob(signed_id)
       ActiveStorage::Blob.find_signed(signed_id)
     end
+
+    def keep_ids
+      documents_array = Array(@form.documents)
+      documents_array.map do |doc|
+        case doc
+        when Decidim::Attachment
+          doc.id
+        when Integer
+          doc
+        when String
+          doc.match?(/\A\d+\z/) ? doc.to_i : nil
+        when Hash
+          (doc[:id] || doc["id"]).to_i
+        end
+      end.compact
+    end
   end
 end
diff --git a/decidim-proposals/app/forms/decidim/proposals/admin/proposal_form.rb b/decidim-proposals/app/forms/decidim/proposals/admin/proposal_form.rb
index 35fbfaaaf589a..f4d392a9d53f6 100644
--- a/decidim-proposals/app/forms/decidim/proposals/admin/proposal_form.rb
+++ b/decidim-proposals/app/forms/decidim/proposals/admin/proposal_form.rb
@@ -27,12 +27,62 @@ def map_model(model)
 
           self.title = presenter.title(all_locales: title.is_a?(Hash))
           self.body = presenter.editor_body(all_locales: body.is_a?(Hash))
-          self.documents = model.attachments
+          self.documents = model.attachments.ids
+          self.add_documents = model.attachments.map { |att| { id: att.id, title: att.title } }
+        end
+
+        def documents=(value)
+          case value
+          when String
+            super(parse_string_documents(value))
+          when Integer
+            super([value])
+          else
+            super
+          end
+        end
+
+        def documents
+          result = super
+
+          if should_use_add_documents?(result)
+            extract_ids_from_add_documents
+          else
+            result.is_a?(Array) ? result : []
+          end
         end
 
         def notify_missing_attachment_if_errored
           errors.add(:add_documents, :needs_to_be_reattached) if errors.any? && add_documents.present?
         end
+
+        private
+
+        def should_use_add_documents?(result)
+          (result.blank? || result.is_a?(String)) && add_documents.present?
+        end
+
+        def extract_ids_from_add_documents
+          add_documents
+            .select { |doc| doc.is_a?(Hash) && (doc[:id].present? || doc["id"].present?) }
+            .map { |doc| (doc[:id] || doc["id"]).to_i }
+        end
+
+        def parse_string_documents(value)
+          return [] if value.blank?
+
+          parse_document_ids(value)
+        end
+
+        def parse_document_ids(value)
+          ids = begin
+            Array(JSON.parse(value))
+          rescue JSON::ParserError
+            value.split(",").map(&:strip)
+          end
+
+          ids.map(&:to_i).reject(&:zero?)
+        end
       end
     end
   end
diff --git a/decidim-proposals/spec/system/admin/admin_edits_proposal_spec.rb b/decidim-proposals/spec/system/admin/admin_edits_proposal_spec.rb
index 0560038a3c702..7a3f7a2a10d9c 100644
--- a/decidim-proposals/spec/system/admin/admin_edits_proposal_spec.rb
+++ b/decidim-proposals/spec/system/admin/admin_edits_proposal_spec.rb
@@ -162,6 +162,33 @@
 
         expect(page).to have_no_content("city.jpeg")
       end
+
+      it "can edit a proposal with an attachment" do
+        visit_component_admin
+        within "tr[data-id='#{proposal.id}']" do
+          find("button[data-controller='dropdown']").click
+          click_on "Edit proposal"
+        end
+
+        expect(page).to have_content("Update proposal")
+        expect(page).to have_field("proposal_title_en")
+        expect(page.html).to include(document.file.blob.filename.to_s)
+
+        fill_in_i18n :proposal_title, "#proposal-title-tabs", en: "Updated proposal title with attachments"
+        click_on "Update"
+
+        expect(page).to have_content("Proposal successfully updated.")
+
+        visit_component_admin
+        within "tr[data-id='#{proposal.id}']" do
+          find("button[data-controller='dropdown']").click
+          click_on "Edit proposal"
+        end
+
+        expect(page).to have_field("proposal_title_en", with: "Updated proposal title with attachments")
+        click_on "Edit attachments"
+        expect(page).to have_content(document.file.blob.filename.to_s)
+      end
     end
   end
 

From 92a329aaa3ab0dc06f3cae8219b0d2d9f8999045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= <ivan@pokecode.net>
Date: Fri, 13 Mar 2026 10:49:34 +0100
Subject: [PATCH 006/131] prevent infinite loops

---
 .../find_and_update_descendants_job.rb        |  7 +++--
 .../jobs/decidim/update_search_indexes_job.rb |  4 +--
 decidim-core/lib/decidim/searchable.rb        |  8 ++---
 .../find_and_update_descendants_job_spec.rb   |  8 +++++
 decidim-core/spec/lib/searchable_spec.rb      |  4 +--
 decidim-meetings/spec/models/meeting_spec.rb  | 30 +++++++++++++++++++
 6 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/decidim-core/app/jobs/decidim/find_and_update_descendants_job.rb b/decidim-core/app/jobs/decidim/find_and_update_descendants_job.rb
index 21d3cbc635ab8..c8b0637a2bb62 100644
--- a/decidim-core/app/jobs/decidim/find_and_update_descendants_job.rb
+++ b/decidim-core/app/jobs/decidim/find_and_update_descendants_job.rb
@@ -4,8 +4,11 @@ module Decidim
   # Update search indexes for each descendants of a given element
   class FindAndUpdateDescendantsJob < ApplicationJob
     queue_as :default
+    MAX_DEPTH = 5
+
+    def perform(element, current_depth = 0)
+      return if current_depth >= MAX_DEPTH
 
-    def perform(element)
       descendants_collector = components_for(element)
       descendants_collector << element.comments.to_a if element.respond_to?(:comments)
 
@@ -14,7 +17,7 @@ def perform(element)
       descendants_collector.each do |descendants|
         next if descendants.blank?
 
-        Decidim::UpdateSearchIndexesJob.perform_later(descendants)
+        Decidim::UpdateSearchIndexesJob.perform_later(descendants, current_depth + 1)
       end
     end
 
diff --git a/decidim-core/app/jobs/decidim/update_search_indexes_job.rb b/decidim-core/app/jobs/decidim/update_search_indexes_job.rb
index 5c8904ccc3706..575096e8f3bb6 100644
--- a/decidim-core/app/jobs/decidim/update_search_indexes_job.rb
+++ b/decidim-core/app/jobs/decidim/update_search_indexes_job.rb
@@ -4,8 +4,8 @@ module Decidim
   class UpdateSearchIndexesJob < ApplicationJob
     queue_as :default
 
-    def perform(elements)
-      elements.each { |element| element.try(:try_update_index_for_search_resource) }
+    def perform(elements, current_depth = 0)
+      elements.each { |element| element.try(:try_update_index_for_search_resource, current_depth) }
     end
   end
 end
diff --git a/decidim-core/lib/decidim/searchable.rb b/decidim-core/lib/decidim/searchable.rb
index 4f93222f8c5a8..9ad46b191f57d 100644
--- a/decidim-core/lib/decidim/searchable.rb
+++ b/decidim-core/lib/decidim/searchable.rb
@@ -101,7 +101,7 @@ def add_to_index_as_search_resource
 
       # Public: after_update callback to update index information of the model.
       #
-      def try_update_index_for_search_resource
+      def try_update_index_for_search_resource(current_depth = 0)
         return unless self.class.searchable_resource?(self)
 
         org = self.class.search_resource_fields_mapper.retrieve_organization(self)
@@ -124,13 +124,13 @@ def try_update_index_for_search_resource
           searchables_in_org.destroy_all
         end
 
-        find_and_update_descendants
+        find_and_update_descendants(current_depth)
       end
 
       private
 
-      def find_and_update_descendants
-        Decidim::FindAndUpdateDescendantsJob.perform_later(self)
+      def find_and_update_descendants(current_depth = 0)
+        Decidim::FindAndUpdateDescendantsJob.perform_later(self, current_depth)
       end
 
       def contents_to_searchable_resource_attributes(fields, locale)
diff --git a/decidim-core/spec/jobs/decidim/find_and_update_descendants_job_spec.rb b/decidim-core/spec/jobs/decidim/find_and_update_descendants_job_spec.rb
index 21181a90fb265..65a3d2c03af17 100644
--- a/decidim-core/spec/jobs/decidim/find_and_update_descendants_job_spec.rb
+++ b/decidim-core/spec/jobs/decidim/find_and_update_descendants_job_spec.rb
@@ -39,6 +39,14 @@
       end.to have_enqueued_job(Decidim::UpdateSearchIndexesJob).exactly(:twice)
     end
 
+    context "when recursion reaches max depth" do
+      it "does not update search indexes" do
+        expect do
+          Decidim::FindAndUpdateDescendantsJob.perform_now(participatory_process, described_class::MAX_DEPTH)
+        end.not_to have_enqueued_job(Decidim::UpdateSearchIndexesJob)
+      end
+    end
+
     context "when participatory process has no descendants" do
       let(:proposal_component) { nil }
       let(:post_component) { nil }
diff --git a/decidim-core/spec/lib/searchable_spec.rb b/decidim-core/spec/lib/searchable_spec.rb
index fa824b2f6b134..988dd21d5744b 100644
--- a/decidim-core/spec/lib/searchable_spec.rb
+++ b/decidim-core/spec/lib/searchable_spec.rb
@@ -70,7 +70,7 @@ module Decidim
 
       context "when searchable does not have component" do
         it "enqueues the job when participatory process is updated" do
-          expect(Decidim::FindAndUpdateDescendantsJob).to receive(:perform_later).with(participatory_process)
+          expect(Decidim::FindAndUpdateDescendantsJob).to receive(:perform_later).with(participatory_process, 0)
 
           participatory_process.update!(published_at: nil)
         end
@@ -81,7 +81,7 @@ module Decidim
         let!(:resource) { create(:proposal, :official, component: proposal_component) }
 
         it "enqueues the job when participatory process is updated" do
-          expect(Decidim::FindAndUpdateDescendantsJob).to receive(:perform_later).with(participatory_process)
+          expect(Decidim::FindAndUpdateDescendantsJob).to receive(:perform_later).with(participatory_process, 0)
 
           participatory_process.update!(published_at: nil)
         end
diff --git a/decidim-meetings/spec/models/meeting_spec.rb b/decidim-meetings/spec/models/meeting_spec.rb
index c1ded521a2f03..9e5bc811f39bc 100644
--- a/decidim-meetings/spec/models/meeting_spec.rb
+++ b/decidim-meetings/spec/models/meeting_spec.rb
@@ -478,5 +478,35 @@ module Decidim::Meetings
         end
       end
     end
+
+    describe "search index updates with linked meetings" do
+      let(:organization) { create(:organization, available_locales: [:en]) }
+      let(:space_a) { create(:participatory_process, organization:) }
+      let(:space_b) { create(:participatory_process, organization:) }
+      let(:component_a) { create(:meeting_component, participatory_space: space_a) }
+      let(:component_b) { create(:meeting_component, participatory_space: space_b) }
+      let!(:meeting_a) { create(:meeting, :published, component: component_a, title: { en: "Meeting A" }) }
+      let!(:meeting_b) { create(:meeting, :published, component: component_b, title: { en: "Meeting B" }) }
+
+      before do
+        create(:meeting_link, meeting: meeting_a, component: component_b)
+        create(:meeting_link, meeting: meeting_b, component: component_a)
+      end
+
+      it "does not enqueue descendants indexing indefinitely" do
+        clear_enqueued_jobs
+        clear_performed_jobs
+
+        perform_enqueued_jobs(only: [Decidim::FindAndUpdateDescendantsJob, Decidim::UpdateSearchIndexesJob]) do
+          meeting_a.update!(title: { en: "Updated meeting A" })
+        end
+
+        find_jobs = performed_jobs.count { |job| job[:job] == Decidim::FindAndUpdateDescendantsJob }
+        update_jobs = performed_jobs.count { |job| job[:job] == Decidim::UpdateSearchIndexesJob }
+
+        expect(find_jobs).to be <= Decidim::FindAndUpdateDescendantsJob::MAX_DEPTH + 1
+        expect(update_jobs).to be <= Decidim::FindAndUpdateDescendantsJob::MAX_DEPTH
+      end
+    end
   end
 end

From 2b233ef928893fde1fbe994f119085a98ea17a4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= <ivan@pokecode.net>
Date: Fri, 13 Mar 2026 10:55:38 +0100
Subject: [PATCH 007/131] ensure absolute URLs in emails

---
 .../decidim/blogs/create_post_event_spec.rb   | 28 ++++++++
 .../app/helpers/decidim/newsletters_helper.rb | 25 +-------
 .../app/helpers/decidim/sanitize_helper.rb    | 26 ++++++++
 .../app/mailers/decidim/application_mailer.rb |  5 +-
 .../event_received.html.erb                   |  6 +-
 .../decidim/newsletters_helper_spec.rb        | 22 +------
 .../helpers/decidim/sanitize_helper_spec.rb   | 64 +++++++++++++++++++
 7 files changed, 131 insertions(+), 45 deletions(-)

diff --git a/decidim-blogs/spec/events/decidim/blogs/create_post_event_spec.rb b/decidim-blogs/spec/events/decidim/blogs/create_post_event_spec.rb
index 4f4f9d40f03ae..0a7b376bbe7e3 100644
--- a/decidim-blogs/spec/events/decidim/blogs/create_post_event_spec.rb
+++ b/decidim-blogs/spec/events/decidim/blogs/create_post_event_spec.rb
@@ -21,4 +21,32 @@
       expect(subject.resource_text).to eq translated(resource.body)
     end
   end
+
+  describe "email rendering with images" do
+    let(:body_with_image) do
+      {
+        en: '<p>Check: <img src="/rails/active_storage/blobs/redirect/12345.JPG" alt="image" /></p>',
+        ca: '<p>Mira: <img src="/rails/active_storage/blobs/redirect/12345.JPG" alt="image" /></p>',
+        es: '<p>Mira: <img src="/rails/active_storage/blobs/redirect/12345.JPG" alt="image" /></p>'
+      }
+    end
+    let(:resource) { create(:post, title: generate_localized_title(:blog_title), body: body_with_image) }
+    let(:organization) { resource.component.organization }
+
+    it "includes transformed image URLs in notification email body" do
+      mail = Decidim::NotificationMailer.event_received(
+        event_name,
+        "Decidim::Blogs::CreatePostEvent",
+        resource,
+        user,
+        :follower,
+        {}
+      )
+
+      root_url = Decidim::EngineRouter.new("decidim", {}).root_url(host: organization.host)[0..-2]
+      expected_img = %(<img src="#{root_url}/rails/active_storage/blobs/redirect/12345.JPG" alt="image" />)
+
+      expect(mail.body.encoded).to include(expected_img)
+    end
+  end
 end
diff --git a/decidim-core/app/helpers/decidim/newsletters_helper.rb b/decidim-core/app/helpers/decidim/newsletters_helper.rb
index 8f28c48c8038f..f750c5eb4e77d 100644
--- a/decidim-core/app/helpers/decidim/newsletters_helper.rb
+++ b/decidim-core/app/helpers/decidim/newsletters_helper.rb
@@ -3,6 +3,8 @@
 module Decidim
   # Helper that provides methods to render links with utm codes, and replaced name
   module NewslettersHelper
+    include Decidim::SanitizeHelper
+
     # If the newsletter body there are some links and the Decidim.track_newsletter_links = true
     # it will be replaced with the utm_codes method described below.
     # for example transform "https://es.lipsum.com/" to "https://es.lipsum.com/?utm_source=localhost&utm_campaign=newsletter_11"
@@ -19,7 +21,7 @@ def parse_interpolations(content, user = nil, id = nil)
 
       content = interpret_name(content, user)
       content = track_newsletter_links(content, id, host)
-      transform_image_urls(content, host)
+      decidim_transform_image_urls(content, host)
     end
 
     # this method is used to generate the root link on mail with the utm_codes
@@ -67,27 +69,6 @@ def interpret_name(content, user)
       content.gsub("%{name}", user.name)
     end
 
-    # Find each img HTML tag with relative path in src attribute
-    # For each URL, prepends the decidim.root_url
-    #   If host is not defined it returns full content
-    #
-    # @param content [String] - the string to convert
-    # @param host [String] - the Decidim::Organization host to replace
-    #
-    # @return [String] - the content converted
-    #
-    def transform_image_urls(content, host)
-      return content if host.blank?
-
-      content.scan(/src\s*=\s*"([^"]*)"/).each do |src|
-        root_url = decidim.root_url(host:)[0..-2]
-        src_replaced = "#{root_url}#{src.first}"
-        content = content.gsub(/src\s*=\s*"([^"]*#{src.first})"/, %(src="#{src_replaced}"))
-      end
-
-      content
-    end
-
     # Add tracking query params to each links
     #
     # @param content [String] - the string to convert
diff --git a/decidim-core/app/helpers/decidim/sanitize_helper.rb b/decidim-core/app/helpers/decidim/sanitize_helper.rb
index 4da95d82b675b..d19487fda38d5 100644
--- a/decidim-core/app/helpers/decidim/sanitize_helper.rb
+++ b/decidim-core/app/helpers/decidim/sanitize_helper.rb
@@ -139,5 +139,31 @@ def render_sanitized_content(resource, method, presenter_class: nil)
 
       decidim_sanitize_editor(content)
     end
+
+    # Transforms relative image URLs in HTML content to absolute URLs using the provided host.
+    # This is used in emails (newsletters and notifications) to ensure images display correctly
+    # in email clients.
+    #
+    # @param content [String] - HTML content with img tags
+    # @param host [String] - the Decidim::Organization host to use for the root URL
+    #
+    # @return [String] - the content with transformed image URLs
+    def decidim_transform_image_urls(content, host)
+      return content if host.blank? || content.blank?
+
+      root_url = Decidim::EngineRouter.new("decidim", {}).root_url(host:).chomp("/")
+
+      content.gsub(/src\s*=\s*(['"])([^'"]*)\1/) do
+        quote = Regexp.last_match(1)
+        src_value = Regexp.last_match(2)
+
+        if src_value.blank? || src_value.start_with?("http://", "https://", "data:", "//", "cid:")
+          %(src=#{quote}#{src_value}#{quote})
+        else
+          normalized_src = src_value.start_with?("/") ? src_value : "/#{src_value}"
+          %(src=#{quote}#{root_url}#{normalized_src}#{quote})
+        end
+      end
+    end
   end
 end
diff --git a/decidim-core/app/mailers/decidim/application_mailer.rb b/decidim-core/app/mailers/decidim/application_mailer.rb
index c7efba313f1a7..d726cf43263e7 100644
--- a/decidim-core/app/mailers/decidim/application_mailer.rb
+++ b/decidim-core/app/mailers/decidim/application_mailer.rb
@@ -8,7 +8,10 @@ class ApplicationMailer < ActionMailer::Base
     include MultitenantAssetHost
     include Decidim::SanitizeHelper
     include Decidim::OrganizationHelper
-    helper_method :organization_name, :decidim_escape_translated, :decidim_sanitize_translated, :translated_attribute, :decidim_sanitize, :decidim_sanitize_newsletter
+
+    helper Decidim::SanitizeHelper
+    helper_method :organization_name, :current_locale, :decidim_escape_translated, :decidim_sanitize_translated, :translated_attribute, :decidim_sanitize,
+                  :decidim_sanitize_newsletter
 
     after_action :set_smtp
     after_action :set_from
diff --git a/decidim-core/app/views/decidim/notification_mailer/event_received.html.erb b/decidim-core/app/views/decidim/notification_mailer/event_received.html.erb
index ff9711f0a157e..5c84104b212a5 100644
--- a/decidim-core/app/views/decidim/notification_mailer/event_received.html.erb
+++ b/decidim-core/app/views/decidim/notification_mailer/event_received.html.erb
@@ -15,7 +15,7 @@
 
   <blockquote>
     <p>
-      <%= @event_instance.safe_resource_text %>
+      <%= decidim_transform_image_urls(@event_instance.safe_resource_text, @organization.host).html_safe %>
     </p>
   </blockquote>
 <% end %>
@@ -28,7 +28,7 @@
   <p style="font-weight: bold"><%= t(".translated_text") %></p>
   <blockquote>
     <p>
-      <%= @event_instance.safe_resource_translated_text %>
+      <%= decidim_transform_image_urls(@event_instance.safe_resource_translated_text, @organization.host).html_safe %>
     </p>
   </blockquote>
 <% end %>
@@ -40,7 +40,7 @@
         <table>
           <tr>
             <td>
-              <%= link_to @event_instance.button_text, @event_instance.button_url, target: :blank %>
+              <%= link_to decidim_sanitize(@event_instance.button_text, strip_tags: true), @event_instance.button_url, target: :blank %>
             </td>
           </tr>
         </table>
diff --git a/decidim-core/spec/helpers/decidim/newsletters_helper_spec.rb b/decidim-core/spec/helpers/decidim/newsletters_helper_spec.rb
index 2e07dd2833b11..e7a7343a62b4d 100644
--- a/decidim-core/spec/helpers/decidim/newsletters_helper_spec.rb
+++ b/decidim-core/spec/helpers/decidim/newsletters_helper_spec.rb
@@ -31,8 +31,9 @@ module Decidim
       end
 
       it "transforms image URLs with the host" do
-        expect(subject).to include('<img src="http://localhost/rails/active_storage/blobs/redirect/12345.JPG"')
-        expect(subject).to include('<img src="http://localhost/rails/active_storage/blobs/redirect/56789.JPG"')
+        root_url = Decidim::EngineRouter.new("decidim", {}).root_url(host: organization.host)[0..-2]
+        expect(subject).to include(%(<img src="#{root_url}/rails/active_storage/blobs/redirect/12345.JPG"))
+        expect(subject).to include(%(<img src="#{root_url}/rails/active_storage/blobs/redirect/56789.JPG"))
       end
 
       context "when track_newsletter_links is false" do
@@ -99,22 +100,5 @@ module Decidim
         it { is_expected.to include("<p>Hello, </p>") }
       end
     end
-
-    describe "#transform_image_urls" do
-      subject { helper.send(:transform_image_urls, text, organization.host) }
-
-      it "transforms image URLs with the host" do
-        expect(subject).to include('<img src="http://localhost/rails/active_storage/blobs/redirect/12345.JPG"')
-        expect(subject).to include('<img src="http://localhost/rails/active_storage/blobs/redirect/56789.JPG"')
-      end
-
-      context "when host is not present" do
-        subject { helper.send(:transform_image_urls, text, nil) }
-
-        it "returns the full content" do
-          expect(subject).to eq text
-        end
-      end
-    end
   end
 end
diff --git a/decidim-core/spec/helpers/decidim/sanitize_helper_spec.rb b/decidim-core/spec/helpers/decidim/sanitize_helper_spec.rb
index 3ef51dfdeae7e..3b46697853a77 100644
--- a/decidim-core/spec/helpers/decidim/sanitize_helper_spec.rb
+++ b/decidim-core/spec/helpers/decidim/sanitize_helper_spec.rb
@@ -104,6 +104,70 @@ module Decidim
           expect(helper.decidim_sanitize('<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUA..." onerror="alert(\'XSS\')">', strip_tags: false)).not_to include("onerror")
         end
       end
+
+      context "when decidim_transform_image_urls is invoked" do
+        let(:host) { "example.org" }
+
+        let(:user_input) do
+          %{(<p>Hello, %{name}</p>
+          <a href="https://meta.decidim.org">Link</a>
+          <img src="/rails/active_storage/blobs/redirect/12345.JPG" alt="image" />
+          <a href="https://meta.decidim.org/">Link</a>
+          <img src="/rails/active_storage/blobs/redirect/56789.JPG" alt="second image" />)}
+        end
+
+        subject { helper.send(:decidim_transform_image_urls, user_input, host) }
+
+        it "transforms image URLs with the host" do
+          root_url = Decidim::EngineRouter.new("decidim", {}).root_url(host:)[0..-2]
+          expect(subject).to include(%(<img src="#{root_url}/rails/active_storage/blobs/redirect/12345.JPG"))
+          expect(subject).to include(%(<img src="#{root_url}/rails/active_storage/blobs/redirect/56789.JPG"))
+        end
+
+        context "when a relative src matches the suffix of an absolute URL" do
+          let(:user_input) do
+            %(<img src="/image.jpg" alt="relative" /><img src="https://example.com/image.jpg" alt="absolute" />)
+          end
+
+          it "transforms only the relative URL" do
+            root_url = Decidim::EngineRouter.new("decidim", {}).root_url(host:)[0..-2]
+
+            expect(subject).to include(%(<img src="#{root_url}/image.jpg" alt="relative" />))
+            expect(subject).to include(%(<img src="https://example.com/image.jpg" alt="absolute" />))
+          end
+        end
+
+        context "when src uses data/protocol-relative/cid URLs" do
+          let(:user_input) do
+            %(<img src="data:image/png;base64,AAAA" alt="data" />
+<img src="//cdn.example.org/image.jpg" alt="protocol-relative" />
+<img src="cid:logo@example.org" alt="cid" />)
+          end
+
+          it "keeps them unchanged" do
+            expect(subject).to include(%(src="data:image/png;base64,AAAA"))
+            expect(subject).to include(%(src="//cdn.example.org/image.jpg"))
+            expect(subject).to include(%(src="cid:logo@example.org"))
+          end
+        end
+
+        context "when src attribute is single-quoted" do
+          let(:user_input) { "<img src='/image.jpg' alt='relative' />" }
+
+          it "transforms the URL preserving single quotes" do
+            root_url = Decidim::EngineRouter.new("decidim", {}).root_url(host:).chomp("/")
+            expect(subject).to include(%(<img src='#{root_url}/image.jpg' alt='relative' />))
+          end
+        end
+
+        context "when host is not present" do
+          subject { helper.send(:decidim_transform_image_urls, user_input, nil) }
+
+          it "returns the full content" do
+            expect(subject).to eq user_input
+          end
+        end
+      end
     end
   end
 end

From b4bd20a77876e807fa5a26ac19d49394131e97c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= <ivan@pokecode.net>
Date: Mon, 16 Mar 2026 19:42:36 +0100
Subject: [PATCH 008/131] show images in questions

---
 .../app/views/decidim/elections/elections/_questions.html.erb   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/decidim-elections/app/views/decidim/elections/elections/_questions.html.erb b/decidim-elections/app/views/decidim/elections/elections/_questions.html.erb
index 9cbd2fea2b1fa..bfdf74daf862c 100644
--- a/decidim-elections/app/views/decidim/elections/elections/_questions.html.erb
+++ b/decidim-elections/app/views/decidim/elections/elections/_questions.html.erb
@@ -12,7 +12,7 @@
       </button>
     </div>
     <div id="panel-question-<%= question.id %>" class="card-accordion-section" aria-hidden="true">
-      <div class="mb-4"><%= decidim_sanitize translated_attribute(question.description) %></div>
+      <div class="mb-4"><%= render_question_description(question) %></div>
 
         <% question.response_options.each do |answer| %>
           <h4><%= translated_attribute answer.body %></h4>

From e21e01f13c2df82fea3d4daa9f6ad879b633de49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= <ivan@pokecode.net>
Date: Fri, 20 Mar 2026 11:17:54 +0100
Subject: [PATCH 009/131] fix election spec

---
 Gemfile.lock                                  | 413 +++++++++---------
 ..._votes_in_an_per_question_election_spec.rb |   4 +-
 2 files changed, 219 insertions(+), 198 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 510520184c169..a21b055eb9d13 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -210,69 +210,71 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actioncable (7.2.3)
+      actionpack (= 7.2.3)
+      activesupport (= 7.2.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionmailbox (7.2.3)
+      actionpack (= 7.2.3)
+      activejob (= 7.2.3)
+      activerecord (= 7.2.3)
+      activestorage (= 7.2.3)
+      activesupport (= 7.2.3)
       mail (>= 2.8.0)
-    actionmailer (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      actionview (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionmailer (7.2.3)
+      actionpack (= 7.2.3)
+      actionview (= 7.2.3)
+      activejob (= 7.2.3)
+      activesupport (= 7.2.3)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.2.2)
-      actionview (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionpack (7.2.3)
+      actionview (= 7.2.3)
+      activesupport (= 7.2.3)
+      cgi
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4, < 3.2)
+      rack (>= 2.2.4, < 3.3)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actiontext (7.2.3)
+      actionpack (= 7.2.3)
+      activerecord (= 7.2.3)
+      activestorage (= 7.2.3)
+      activesupport (= 7.2.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionview (7.2.3)
+      activesupport (= 7.2.3)
       builder (~> 3.1)
+      cgi
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
     active_link_to (1.0.5)
       actionpack
       addressable
-    activejob (7.2.2.2)
-      activesupport (= 7.2.2.2)
+    activejob (7.2.3)
+      activesupport (= 7.2.3)
       globalid (>= 0.3.6)
-    activemodel (7.2.2.2)
-      activesupport (= 7.2.2.2)
-    activerecord (7.2.2.2)
-      activemodel (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    activemodel (7.2.3)
+      activesupport (= 7.2.3)
+    activerecord (7.2.3)
+      activemodel (= 7.2.3)
+      activesupport (= 7.2.3)
       timeout (>= 0.4.0)
-    activestorage (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    activestorage (7.2.3)
+      actionpack (= 7.2.3)
+      activejob (= 7.2.3)
+      activerecord (= 7.2.3)
+      activesupport (= 7.2.3)
       marcel (~> 1.0)
-    activesupport (7.2.2.2)
+    activesupport (7.2.3)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -284,28 +286,28 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    acts_as_list (1.2.4)
+    acts_as_list (1.2.6)
       activerecord (>= 6.1)
       activesupport (>= 6.1)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.8.9)
+      public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     base64 (0.3.0)
-    batch-loader (2.0.5)
-    bcrypt (3.1.20)
-    benchmark (0.4.1)
-    better_html (2.1.1)
-      actionview (>= 6.0)
-      activesupport (>= 6.0)
+    batch-loader (2.0.6)
+    bcrypt (3.1.22)
+    benchmark (0.5.0)
+    better_html (2.2.0)
+      actionview (>= 7.0)
+      activesupport (>= 7.0)
       ast (~> 2.0)
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (3.2.2)
+    bigdecimal (4.0.1)
     bindex (0.8.1)
-    bootsnap (1.18.6)
+    bootsnap (1.23.0)
       msgpack (~> 1.2)
-    brakeman (7.0.2)
+    brakeman (7.1.2)
       racc
     browser (6.2.0)
     builder (3.3.0)
@@ -333,6 +335,7 @@ GEM
     cells-rails (0.1.6)
       actionpack (>= 5.0)
       cells (>= 4.1.6, < 5.0.0)
+    cgi (0.5.1)
     charlock_holmes (0.7.9)
     chartkick (5.1.5)
     childprocess (5.1.0)
@@ -342,20 +345,20 @@ GEM
       fast-stemmer (~> 1.0)
       matrix (~> 0.4)
     cmdparse (3.0.7)
-    commonmarker (0.23.11)
-    concurrent-ruby (1.3.5)
+    commonmarker (0.23.12)
+    concurrent-ruby (1.3.6)
     connection_pool (2.5.5)
-    crack (1.0.0)
+    crack (1.0.1)
       bigdecimal
       rexml
     crass (1.0.6)
-    css_parser (1.21.1)
+    css_parser (2.0.0)
       addressable
     csv (3.3.5)
     data_migrate (11.3.1)
       activerecord (>= 6.1)
       railties (>= 6.1)
-    date (3.4.1)
+    date (3.5.1)
     date_validator (0.12.0)
       activemodel (>= 3)
       activesupport (>= 3)
@@ -368,8 +371,9 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise-i18n (1.12.1)
+    devise-i18n (1.15.0)
       devise (>= 4.9.0)
+      rails-i18n
     devise-jwt (0.12.1)
       devise (~> 4.0)
       warden-jwt_auth (~> 0.10)
@@ -382,7 +386,7 @@ GEM
       nokogiri (>= 1.18.2)
       rubyzip (~> 2.3.0)
     docile (1.4.1)
-    doorkeeper (5.8.2)
+    doorkeeper (5.9.0)
       railties (>= 5)
     doorkeeper-i18n (4.0.1)
     drb (2.2.3)
@@ -392,11 +396,11 @@ GEM
     dry-configurable (1.3.0)
       dry-core (~> 1.1)
       zeitwerk (~> 2.6)
-    dry-core (1.1.0)
+    dry-core (1.2.0)
       concurrent-ruby (~> 1.0)
       logger
       zeitwerk (~> 2.6)
-    erb (5.0.2)
+    erb (6.0.2)
     erb_lint (0.8.0)
       activesupport
       better_html (>= 2.0.1)
@@ -408,26 +412,26 @@ GEM
       temple
     erubi (1.13.1)
     escape_utils (1.3.0)
-    excon (1.2.8)
+    excon (1.4.1)
       logger
     extended-markdown-filter (0.7.0)
       html-pipeline (~> 2.9)
-    factory_bot (6.5.4)
+    factory_bot (6.5.6)
       activesupport (>= 6.1.0)
-    factory_bot_rails (6.4.4)
+    factory_bot_rails (6.5.1)
       factory_bot (~> 6.5)
-      railties (>= 5.0.0)
-    faker (3.5.3)
+      railties (>= 6.1.0)
+    faker (3.6.1)
       i18n (>= 1.8.11, < 2)
-    faraday (2.13.4)
+    faraday (2.14.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.1)
-      net-http (>= 0.5.0)
+    faraday-net_http (3.4.2)
+      net-http (~> 0.5)
     fast-stemmer (1.0.2)
-    ffi (1.17.2-arm64-darwin)
-    ffi (1.17.2-x86_64-linux-gnu)
+    ffi (1.17.3-arm64-darwin)
+    ffi (1.17.3-x86_64-linux-gnu)
     fiber-storage (1.0.1)
     file_validators (3.0.0)
       activemodel (>= 3.2)
@@ -437,27 +441,28 @@ GEM
       excon (~> 1.0)
       formatador (>= 0.2, < 2.0)
       mime-types
-    fog-local (0.8.0)
+    fog-local (0.9.0)
       fog-core (>= 1.27, < 3.0)
-    formatador (1.1.1)
+    formatador (1.2.3)
+      reline
     gemoji (3.0.1)
-    geocoder (1.8.5)
+    geocoder (1.8.6)
       base64 (>= 0.1.0)
       csv (>= 3.0.0)
     geom2d (0.4.1)
-    globalid (1.2.1)
+    globalid (1.3.0)
       activesupport (>= 6.1)
-    google-protobuf (4.29.3-arm64-darwin)
+    google-protobuf (4.34.0-arm64-darwin)
       bigdecimal
-      rake (>= 13)
-    google-protobuf (4.29.3-x86_64-linux)
+      rake (~> 13.3)
+    google-protobuf (4.34.0-x86_64-linux-gnu)
       bigdecimal
-      rake (>= 13)
+      rake (~> 13.3)
     graphql (2.4.17)
       base64
       fiber-storage
       logger
-    graphql-docs (5.1.0)
+    graphql-docs (5.2.0)
       commonmarker (~> 0.23, >= 0.23.6)
       escape_utils (~> 1.2)
       extended-markdown-filter (~> 0.4)
@@ -467,8 +472,9 @@ GEM
       logger (~> 1.6)
       ostruct (~> 0.6)
       sass-embedded (~> 1.58)
-    hashdiff (1.1.2)
-    hashie (5.0.0)
+    hashdiff (1.2.1)
+    hashie (5.1.0)
+      logger
     hexapdf (1.1.1)
       cmdparse (~> 3.0, >= 3.0.3)
       geom2d (~> 0.4, >= 0.4.1)
@@ -479,36 +485,40 @@ GEM
     html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
-    htmlentities (4.3.4)
-    i18n (1.14.7)
+    htmlentities (4.4.2)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.15)
+    i18n-tasks (1.1.2)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       erubi
-      highline (>= 2.0.0)
+      highline (>= 3.0.0)
       i18n
       parser (>= 3.2.2.1)
+      prism
       rails-i18n
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.8, >= 1.8.1)
       terminal-table (>= 1.5.1)
-    icalendar (2.10.3)
+    icalendar (2.12.1)
+      base64
       ice_cube (~> 0.16)
+      logger
       ostruct
     ice_cube (0.17.0)
-    image_processing (1.13.0)
-      mini_magick (>= 4.9.5, < 5)
+    image_processing (1.14.0)
+      mini_magick (>= 4.9.5, < 6)
       ruby-vips (>= 2.0.17, < 3)
     invisible_captcha (0.13.0)
       rails (>= 3.2.0)
-    io-console (0.8.1)
-    irb (1.15.2)
+    io-console (0.8.2)
+    irb (1.17.0)
       pp (>= 0.6.0)
+      prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.13.1)
-    jwt (2.10.2)
+    json (2.19.2)
+    jwt (3.1.2)
       base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -523,9 +533,10 @@ GEM
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
     language_server-protocol (3.17.0.5)
-    launchy (3.0.1)
+    launchy (3.1.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
+      logger (~> 1.6)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
     letter_opener_web (2.0.0)
@@ -534,33 +545,37 @@ GEM
       railties (>= 5.2)
       rexml
     lint_roller (1.1.0)
-    listen (3.9.0)
+    listen (3.10.0)
+      logger
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    loofah (2.24.1)
+    loofah (2.25.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mail (2.8.1)
+    mail (2.9.0)
+      logger
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.4)
+    marcel (1.1.0)
     matrix (0.4.3)
-    mime-types (3.6.0)
+    mime-types (3.7.0)
       logger
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2025.0722)
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2026.0317)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    minitest (5.25.5)
+    minitest (6.0.2)
+      drb (~> 2.0)
+      prism (~> 1.5)
     msgpack (1.8.0)
-    multi_xml (0.7.2)
-      bigdecimal (~> 3.1)
-    net-http (0.6.0)
-      uri
-    net-imap (0.5.10)
+    multi_xml (0.8.1)
+      bigdecimal (>= 3.1, < 5)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
+    net-imap (0.6.3)
       date
       net-protocol
     net-pop (0.1.2)
@@ -569,32 +584,34 @@ GEM
       timeout
     net-smtp (0.5.1)
       net-protocol
-    nio4r (2.7.4)
-    nokogiri (1.18.9-arm64-darwin)
+    nio4r (2.7.5)
+    nokogiri (1.19.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.9-x86_64-linux-gnu)
+    nokogiri (1.19.2-x86_64-linux-gnu)
       racc (~> 1.4)
-    oauth (1.1.0)
-      oauth-tty (~> 1.0, >= 1.0.1)
+    oauth (1.1.3)
+      base64 (~> 0.1)
+      oauth-tty (~> 1.0, >= 1.0.6)
       snaky_hash (~> 2.0)
-      version_gem (~> 1.1)
-    oauth-tty (1.0.5)
-      version_gem (~> 1.1, >= 1.1.1)
-    oauth2 (2.0.12)
+      version_gem (~> 1.1, >= 1.1.9)
+    oauth-tty (1.0.6)
+      version_gem (~> 1.1, >= 1.1.9)
+    oauth2 (2.0.18)
       faraday (>= 0.17.3, < 4.0)
       jwt (>= 1.0, < 4.0)
       logger (~> 1.2)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0, >= 2.0.3)
-      version_gem (>= 1.1.8, < 3)
-    omniauth (2.1.3)
+      version_gem (~> 1.1, >= 1.1.9)
+    omniauth (2.1.4)
       hashie (>= 3.4.6)
+      logger
       rack (>= 2.2.3)
       rack-protection
     omniauth-facebook (5.0.0)
       omniauth-oauth2 (~> 1.2)
-    omniauth-google-oauth2 (1.2.1)
+    omniauth-google-oauth2 (1.2.2)
       jwt (>= 2.9.2)
       oauth2 (~> 2.0)
       omniauth (~> 2.0)
@@ -603,8 +620,8 @@ GEM
       oauth
       omniauth (>= 1.0, < 3)
       rack (>= 1.6.2, < 4)
-    omniauth-oauth2 (1.8.0)
-      oauth2 (>= 1.4, < 3)
+    omniauth-oauth2 (1.9.0)
+      oauth2 (>= 2.0.2, < 3)
       omniauth (~> 2.0)
     omniauth-rails_csrf_protection (1.0.2)
       actionpack (>= 4.2)
@@ -612,28 +629,28 @@ GEM
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    openssl (3.3.0)
+    openssl (4.0.1)
     orm_adapter (0.5.0)
     ostruct (0.6.3)
-    package_json (0.1.0)
+    package_json (0.2.0)
     paper_trail (16.0.0)
       activerecord (>= 6.1)
       request_store (~> 1.4)
     parallel (1.27.0)
-    parallel_tests (4.9.0)
+    parallel_tests (4.10.1)
       parallel
     paranoia (3.0.1)
       activerecord (>= 6, < 8.1)
-    parser (3.3.9.0)
+    parser (3.3.10.2)
       ast (~> 2.4.1)
       racc
     pg (1.5.9)
     pg_search (2.3.7)
       activerecord (>= 6.1)
       activesupport (>= 6.1)
-    pp (0.6.2)
+    pp (0.6.3)
       prettyprint
-    premailer (1.27.0)
+    premailer (1.29.0)
       addressable
       css_parser (>= 1.19.0)
       htmlentities (>= 4.0.0)
@@ -642,16 +659,16 @@ GEM
       net-smtp
       premailer (~> 1.7, >= 1.7.9)
     prettyprint (0.2.0)
-    prism (1.4.0)
-    psych (5.2.6)
+    prism (1.9.0)
+    psych (5.3.1)
       date
       stringio
-    public_suffix (6.0.2)
-    puma (6.5.0)
+    public_suffix (7.0.5)
+    puma (6.6.1)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (2.2.17)
-    rack-attack (6.7.0)
+    rack (2.2.22)
+    rack-attack (6.8.0)
       rack (>= 1.0, < 4)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
@@ -667,20 +684,20 @@ GEM
     rackup (1.0.1)
       rack (< 3)
       webrick
-    rails (7.2.2.2)
-      actioncable (= 7.2.2.2)
-      actionmailbox (= 7.2.2.2)
-      actionmailer (= 7.2.2.2)
-      actionpack (= 7.2.2.2)
-      actiontext (= 7.2.2.2)
-      actionview (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activemodel (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    rails (7.2.3)
+      actioncable (= 7.2.3)
+      actionmailbox (= 7.2.3)
+      actionmailer (= 7.2.3)
+      actionpack (= 7.2.3)
+      actiontext (= 7.2.3)
+      actionview (= 7.2.3)
+      activejob (= 7.2.3)
+      activemodel (= 7.2.3)
+      activerecord (= 7.2.3)
+      activestorage (= 7.2.3)
+      activesupport (= 7.2.3)
       bundler (>= 1.15.0)
-      railties (= 7.2.2.2)
+      railties (= 7.2.3)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -689,22 +706,24 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
+    rails-html-sanitizer (1.7.0)
+      loofah (~> 2.25)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails-i18n (7.0.10)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    railties (7.2.3)
+      actionpack (= 7.2.3)
+      activesupport (= 7.2.3)
+      cgi
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.3.0)
+    rake (13.3.1)
     ransack (4.2.1)
       activerecord (>= 6.1.5)
       activesupport (>= 6.1.5)
@@ -712,32 +731,33 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdoc (6.14.2)
+    rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
+      tsort
     redcarpet (3.6.1)
     redis (4.8.1)
-    regexp_parser (2.10.0)
-    reline (0.6.2)
+    regexp_parser (2.11.3)
+    reline (0.6.3)
       io-console (~> 0.5)
     request_store (1.7.0)
       rack (>= 1.4)
-    responders (3.1.1)
-      actionpack (>= 5.2)
-      railties (>= 5.2)
-    rexml (3.4.1)
+    responders (3.2.0)
+      actionpack (>= 7.0)
+      railties (>= 7.0)
+    rexml (3.4.4)
     rqrcode (2.2.0)
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
     rqrcode_core (1.2.0)
-    rspec (3.13.1)
+    rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
     rspec-cells (0.3.10)
       cells (>= 4.0.0, < 6.0.0)
       rspec-rails (>= 3.0.0)
-    rspec-core (3.13.5)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -745,7 +765,7 @@ GEM
     rspec-html-matchers (0.10.0)
       nokogiri (~> 1)
       rspec (>= 3.0.0.a)
-    rspec-mocks (3.13.5)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-rails (6.1.5)
@@ -758,7 +778,7 @@ GEM
       rspec-support (~> 3.13)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.13.4)
+    rspec-support (3.13.7)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
     rubocop (1.78.0)
@@ -772,9 +792,9 @@ GEM
       rubocop-ast (>= 1.45.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.1)
+    rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
+      prism (~> 1.7)
     rubocop-capybara (2.22.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
@@ -785,20 +805,20 @@ GEM
       faker (>= 2.12.0)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-graphql (1.5.6)
+    rubocop-graphql (1.6.0)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1, < 2)
-    rubocop-performance (1.25.0)
+    rubocop-performance (1.26.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
     rubocop-rails (2.32.0)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.44.0, < 2.0)
-    rubocop-rspec (3.6.0)
+    rubocop-rspec (3.7.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
     rubocop-rspec_rails (2.31.0)
@@ -809,25 +829,25 @@ GEM
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
     ruby-progressbar (1.13.0)
-    ruby-vips (2.2.4)
+    ruby-vips (2.3.0)
       ffi (~> 1.12)
       logger
     rubyXL (3.4.33)
       nokogiri (>= 1.10.8)
       rubyzip (>= 1.3.0)
     rubyzip (2.3.2)
-    sass-embedded (1.83.4-arm64-darwin)
-      google-protobuf (~> 4.29)
-    sass-embedded (1.83.4-x86_64-linux-gnu)
-      google-protobuf (~> 4.29)
+    sass-embedded (1.98.0-arm64-darwin)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.98.0-x86_64-linux-gnu)
+      google-protobuf (~> 4.31)
     securerandom (0.4.1)
-    selenium-webdriver (4.27.0)
+    selenium-webdriver (4.41.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
+      rubyzip (>= 1.2.2, < 4.0)
       websocket (~> 1.0)
-    semantic_range (3.1.0)
+    semantic_range (3.1.1)
     shakapacker (8.3.0)
       activesupport (>= 5.2)
       package_json
@@ -847,32 +867,33 @@ GEM
     snaky_hash (2.0.3)
       hashie (>= 0.1.0, < 6)
       version_gem (>= 1.1.8, < 3)
-    spring (4.2.1)
+    spring (4.4.2)
     spring-watcher-listen (2.1.0)
       listen (>= 2.7, < 4.0)
       spring (>= 4)
-    stringio (3.1.7)
-    strscan (3.1.5)
+    stringio (3.2.0)
+    strscan (3.1.7)
     temple (0.10.4)
     terminal-table (4.0.0)
       unicode-display_width (>= 1.1.1, < 4)
-    thor (1.4.0)
-    tilt (2.5.0)
-    timeout (0.4.3)
+    thor (1.5.0)
+    tilt (2.7.0)
+    timeout (0.6.1)
     trailblazer-option (0.1.2)
+    tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
-    uniform_notifier (1.17.0)
-    uri (1.0.3)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
+    uniform_notifier (1.18.0)
+    uri (1.1.1)
     useragent (0.16.11)
-    valid_email2 (7.0.13)
+    valid_email2 (7.0.15)
       activemodel (>= 6.0)
       mail (~> 2.5)
-    version_gem (1.1.8)
+    version_gem (1.1.9)
     w3c_rspec_validators (0.3.0)
       rails
       rspec
@@ -883,24 +904,24 @@ GEM
       rexml (~> 3.2)
     warden (1.2.9)
       rack (>= 2.0.9)
-    warden-jwt_auth (0.11.0)
+    warden-jwt_auth (0.12.0)
       dry-auto_inject (>= 0.8, < 2)
       dry-configurable (>= 0.13, < 2)
-      jwt (~> 2.1)
+      jwt (>= 2.1, < 4)
       warden (~> 1.2)
     web-console (4.2.1)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    web-push (3.0.1)
-      jwt (~> 2.0)
-      openssl (~> 3.0)
-    webmock (3.24.0)
+    web-push (3.1.0)
+      jwt (~> 3.0)
+      openssl (>= 3.0)
+    webmock (3.26.2)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.9.1)
+    webrick (1.9.2)
     websocket (1.2.11)
     websocket-driver (0.8.0)
       base64
@@ -910,7 +931,7 @@ GEM
     wisper-rspec (1.1.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.7.3)
+    zeitwerk (2.7.5)
 
 PLATFORMS
   arm64-darwin-23
diff --git a/decidim-elections/spec/system/user_votes_in_an_per_question_election_spec.rb b/decidim-elections/spec/system/user_votes_in_an_per_question_election_spec.rb
index d1a561b04ff6f..a54419ca5a15b 100644
--- a/decidim-elections/spec/system/user_votes_in_an_per_question_election_spec.rb
+++ b/decidim-elections/spec/system/user_votes_in_an_per_question_election_spec.rb
@@ -74,8 +74,8 @@ def election_vote_path(question)
   end
 
   context "when editing votes from receipt page" do
-    let!(:question1) { create(:election_question, :with_response_options, :voting_enabled, question_type: "single_option", election:, position: 1) }
-    let!(:question2) { create(:election_question, :with_response_options, :voting_enabled, election:, position: 2) }
+    let!(:question1) { create(:election_question, :with_response_options, :voting_enabled, skip_injection: true, question_type: "single_option", election:, position: 1) }
+    let!(:question2) { create(:election_question, :with_response_options, :voting_enabled, skip_injection: true, election:, position: 2) }
 
     before do
       login_as user, scope: :user

From 32b857ff3d011f2ede0739f7ea8427541267066b Mon Sep 17 00:00:00 2001
From: Tom Greenwood <101816158+greenwoodt@users.noreply.github.com>
Date: Mon, 16 Mar 2026 11:13:08 +0100
Subject: [PATCH 010/131] Show only component specific states in proposal to
 proposal import (#16159)

* JS import configured to select states based on component

* Route configured for collection on proposal import new

* Imported js entry point of import_proposals.

* Configured a new iteration from select on the component origin within the form

* Created component_states method within the import controller

* Updated some lint issues with the JS script

* Updated import controller to retrieve the origin_id instead of component id

* Moved the proposals_merge resource route.

* Added attribute to select states based on the selected component

* Added selectedStates which parses the selected states based on the component

* Removed validate :valid_states because pluck token wasn't reterving states on its own componet not from that selected

* Fixed the tercary operator on the selected states checkbox

* Aligned the method call on the new form to fix lint error

* not answered missing from the component states maped to be selected from the componet

* Extracted the enforce_permissions method to component_states to parse users who dont have permissions to run the import actions

* clean up of unused methods within the proposal import form

* Updated object that retrieves the states via the proposal_import

* Escaped the html by interpolating the state.token and state.title within the script to encode all handles

* reverted private method of valid_states checking the proposal state and plucking the not_answered state server side validation

* System spec added to check for dynamically added states from origin component

* Updated spec to account for custom states to be detected in drop down

* refactored the proposal import change to import from a stimulus controller

* modified the new page to call the data attribute of the dynamic states

* update to controller based on lint errors

* refactored to use the mordern way of stimulus of calling the controller and an absolute path

* jS docs added to the controller fetching the states dynamically
---
 .../decidim/editor/extensions/image/index.js  |  60 +++++--
 .../editor/extensions/image/node_view.js      |  10 +-
 .../editor/extensions/link/bubble_menu.js     |  40 ++++-
 .../decidim/editor/extensions/link/index.js   |  57 +++++--
 .../test/extensions/image_links.test.js       | 161 ++++++++++++++++++
 .../packs/stylesheets/decidim/_rich_text.scss |  17 ++
 .../app/packs/stylesheets/decidim/editor.scss |  10 ++
 decidim-core/spec/system/editor_spec.rb       | 138 +++++++++++++++
 8 files changed, 463 insertions(+), 30 deletions(-)
 create mode 100644 decidim-core/app/packs/src/decidim/editor/test/extensions/image_links.test.js

diff --git a/decidim-core/app/packs/src/decidim/editor/extensions/image/index.js b/decidim-core/app/packs/src/decidim/editor/extensions/image/index.js
index 5df5399c3821b..0393c2eca5482 100644
--- a/decidim-core/app/packs/src/decidim/editor/extensions/image/index.js
+++ b/decidim-core/app/packs/src/decidim/editor/extensions/image/index.js
@@ -80,7 +80,9 @@ export default Image.extend({
   addAttributes() {
     return {
       ...this.parent?.(),
-      width: { default: null }
+      width: { default: null },
+      href: { default: null },
+      target: { default: null }
     };
   },
 
@@ -92,13 +94,16 @@ export default Image.extend({
       ...this.parent?.(),
       imageDialog: () => async ({ dispatch }) => {
         if (dispatch) {
-          let { src, alt, width } = this.editor.getAttributes("image");
+          let { src, alt, width, href, target } = this.editor.getAttributes("image");
 
           this.editor.commands.toggleDialog(true);
-          const dialogState = await uploadDialog.toggle({ src, alt }, {
-            inputLabel: i18n.altLabel,
-            uploadHandler: async (file) => uploadImage(file, this.options.uploadImagesPath)
-          });
+          const dialogState = await uploadDialog.toggle(
+            { src, alt },
+            {
+              inputLabel: i18n.altLabel,
+              uploadHandler: async (file) => uploadImage(file, this.options.uploadImagesPath)
+            }
+          );
           this.editor.commands.toggleDialog(false);
 
           if (dialogState !== "save") {
@@ -113,8 +118,7 @@ export default Image.extend({
 
           src = uploadDialog.getValue("src");
           alt = uploadDialog.getValue("alt");
-
-          return this.editor.chain().setImage({ src, alt, width }).focus(null, { scrollIntoView: false }).run();
+          return this.editor.chain().setImage({ src, alt, width, href, target }).focus(null, { scrollIntoView: false }).run();
         }
 
         return true;
@@ -127,18 +131,52 @@ export default Image.extend({
   },
 
   parseHTML() {
-    return [{ tag: "div[data-image] img[src]:not([src^='data:'])" }];
+    return [
+      {
+        tag: "div[data-image] img[src]:not([src^='data:'])",
+        getAttrs: (dom) => {
+          // Check if the image's parent div is wrapped in a link
+          const imageDiv = dom.closest("div[data-image]");
+          const link = imageDiv?.parentElement;
+          if (link && link.tagName === "A" && link.hasAttribute("href")) {
+            const attrs = { href: link.getAttribute("href") };
+            if (link.hasAttribute("target")) {
+              attrs.target = link.getAttribute("target");
+            }
+            return attrs;
+          }
+          return {};
+        }
+      }
+    ];
   },
 
   renderHTML({ HTMLAttributes }) {
-    return [
+    const { href, target, ...imgAttributes } = HTMLAttributes;
+    const imageContent = [
       "div",
       { "class": "editor-content-image", "data-image": "" },
       [
         "img",
-        mergeAttributes(this.options.HTMLAttributes, HTMLAttributes)
+        mergeAttributes(this.options.HTMLAttributes, imgAttributes)
       ]
     ];
+
+    if (href) {
+      const anchorAttributes = { href };
+      const anchorTarget = target;
+      if (anchorTarget) {
+        anchorAttributes.target = anchorTarget;
+        anchorAttributes.rel = "noopener noreferrer";
+      }
+      return [
+        "a",
+        anchorAttributes,
+        imageContent
+      ];
+    }
+
+    return imageContent;
   },
 
   addProseMirrorPlugins() {
diff --git a/decidim-core/app/packs/src/decidim/editor/extensions/image/node_view.js b/decidim-core/app/packs/src/decidim/editor/extensions/image/node_view.js
index 72e0d3f7d6e7d..ee7976f9fe2f0 100644
--- a/decidim-core/app/packs/src/decidim/editor/extensions/image/node_view.js
+++ b/decidim-core/app/packs/src/decidim/editor/extensions/image/node_view.js
@@ -62,7 +62,9 @@ export default (self) => {
     const img = contentDOM.querySelector("img");
     let activeResizeControl = null,
         currentHeight = null,
+        currentHref = node.attrs.href,
         currentSrc = node.attrs.src,
+        currentTarget = node.attrs.target,
         currentWidth = null,
         naturalHeight = img.naturalHeight,
         naturalWidth = img.naturalWidth,
@@ -185,7 +187,13 @@ export default (self) => {
           return false;
         }
 
-        const { alt, src, title, width } = updatedNode.attrs;
+        const { alt, src, title, width, href, target } = updatedNode.attrs;
+
+        // If the href or target changed, we need to recreate the node because the
+        // structure changes (wrapped in <a> vs not wrapped)
+        if (href !== currentHref || target !== currentTarget) {
+          return false;
+        }
 
         // We set the value through an attribute change here because otherwise
         // we would trigger a mutation in the DOM which causes the update method
diff --git a/decidim-core/app/packs/src/decidim/editor/extensions/link/bubble_menu.js b/decidim-core/app/packs/src/decidim/editor/extensions/link/bubble_menu.js
index 62fe10d836070..e096c606c2c26 100644
--- a/decidim-core/app/packs/src/decidim/editor/extensions/link/bubble_menu.js
+++ b/decidim-core/app/packs/src/decidim/editor/extensions/link/bubble_menu.js
@@ -1,25 +1,53 @@
-import { PluginKey } from "prosemirror-state";
+import { NodeSelection, PluginKey } from "prosemirror-state";
 
 import { getDictionary } from "src/decidim/refactor/moved/i18n";
 import BubbleMenu from "src/decidim/editor/common/bubble_menu";
 
 class LinkBubbleMenu extends BubbleMenu {
-  shouldDisplay() {
-    return this.editor.isActive("link");
+  shouldDisplay(view) {
+    if (this.editor.isActive("link")) {
+      return true;
+    }
+
+    const selection = view.state.selection;
+    return this.isImage(selection) && Boolean(selection.node.attrs.href);
   }
 
-  display() {
-    const { href } = this.editor.getAttributes("link");
-    this.element.querySelector("[data-linkbubble-value]").textContent = href;
+  display(view) {
+    if (this.editor.isActive("link")) {
+      const { href } = this.editor.getAttributes("link");
+      this.updateHref(href);
+      return;
+    }
+
+    const selection = view.state.selection;
+    if (this.isImage(selection)) {
+      this.bubble.style.zIndex = "10";
+      this.updateHref(selection.node.attrs.href);
+    }
   }
 
   handleAction(action) {
     if (action === "remove") {
+      const { selection } = this.editor.state;
+      if (this.isImage(selection)) {
+        this.editor.chain().focus(null, { scrollIntoView: false }).updateAttributes("image", { href: null, target: null }).run();
+        return;
+      }
+
       this.editor.chain().focus(null, { scrollIntoView: false }).unsetLink().run();
     } else {
       this.editor.commands.linkDialog();
     }
   }
+
+  updateHref(href) {
+    this.element.querySelector("[data-linkbubble-value]").textContent = href;
+  }
+
+  isImage(selection) {
+    return selection instanceof NodeSelection && selection.node.type.name === "image";
+  }
 }
 
 const createElement = () => {
diff --git a/decidim-core/app/packs/src/decidim/editor/extensions/link/index.js b/decidim-core/app/packs/src/decidim/editor/extensions/link/index.js
index 6e46e9df576f4..25c14a83461bf 100644
--- a/decidim-core/app/packs/src/decidim/editor/extensions/link/index.js
+++ b/decidim-core/app/packs/src/decidim/editor/extensions/link/index.js
@@ -1,5 +1,5 @@
 import Link from "@tiptap/extension-link";
-import { Plugin } from "prosemirror-state";
+import { Plugin, NodeSelection } from "prosemirror-state";
 
 import { getDictionary } from "src/decidim/refactor/moved/i18n";
 import InputDialog from "src/decidim/editor/common/input_dialog";
@@ -40,31 +40,55 @@ export default Link.extend({
       ...this.parent?.(),
 
       toggleLinkBubble: () => ({ dispatch }) => {
+        const { selection } = this.editor.state;
+        const isImageSelection = selection instanceof NodeSelection && selection.node.type.name === "image";
+        const imageHasLink = isImageSelection && Boolean(selection.node.attrs.href);
+
         if (dispatch) {
-          if (this.editor.isActive("link")) {
-            this.storage.bubbleMenu.show();
+          if (this.editor.isActive("link") || (isImageSelection && imageHasLink)) {
+            this.storage.bubbleMenu.handleSelectionChange(this.editor.view);
             return true;
           }
 
           this.storage.bubbleMenu.hide();
           return false;
         }
+
+        if (isImageSelection) {
+          return imageHasLink;
+        }
+
         return this.editor.isActive("link");
       },
 
       linkDialog: () => async ({ dispatch, commands }) => {
         if (dispatch) {
-          // If the cursor is within the link but the link is not selected, the
-          // link would not be correctly updated. Also if only a part of the
-          // link is selected, the link would be split to separate links, only
-          // the current selection getting the updated link URL.
-          commands.extendMarkRange("link");
+          const { state } = this.editor;
+          const { selection } = state;
+          const isImageSelection = selection instanceof NodeSelection && selection.node.type.name === "image";
+          const nodeType = (() => {
+            if (isImageSelection) {
+              return "image";
+            }
+            return "link";
+          })();
+
+          if (!isImageSelection) {
+            // If the cursor is within the link but the link is not selected, the
+            // link would not be correctly updated. Also if only a part of the
+            // link is selected, the link would be split to separate links, only
+            // the current selection getting the updated link URL.
+            commands.extendMarkRange("link");
+          }
 
           this.storage.bubbleMenu.hide();
 
           const { allowTargetControl } = this.options;
 
-          let { href, target } = this.editor.getAttributes("link");
+          let href = null;
+          let target = null;
+
+          ({ href, target } = this.editor.getAttributes(nodeType));
 
           const inputs = { href: { type: "text", label: i18n.hrefLabel } };
           if (allowTargetControl) {
@@ -88,16 +112,25 @@ export default Link.extend({
             target = null;
           }
 
+          const buildChain = () => this.editor.chain().focus(null, { scrollIntoView: false });
+
           if (dialogState !== "save") {
-            this.editor.chain().focus(null, { scrollIntoView: false }).toggleLinkBubble().run();
+            buildChain().toggleLinkBubble().run();
             return false;
           }
 
           if (!href || href.trim().length < 1) {
-            return this.editor.chain().focus(null, { scrollIntoView: false }).unsetLink().run();
+            if (isImageSelection) {
+              return buildChain().updateAttributes("image", { href: null, target: null }).run();
+            }
+            return buildChain().unsetLink().run();
+          }
+
+          if (isImageSelection) {
+            return buildChain().updateAttributes("image", { href: href, target }).toggleLinkBubble().run();
           }
 
-          return this.editor.chain().focus(null, { scrollIntoView: false }).setLink({ href, target }).toggleLinkBubble().run();
+          return buildChain().setLink({ href: href, target }).toggleLinkBubble().run();
         }
 
         return true;
diff --git a/decidim-core/app/packs/src/decidim/editor/test/extensions/image_links.test.js b/decidim-core/app/packs/src/decidim/editor/test/extensions/image_links.test.js
new file mode 100644
index 0000000000000..ab42afaff82a5
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/editor/test/extensions/image_links.test.js
@@ -0,0 +1,161 @@
+/* global jest, global */
+
+import { createBasicEditor, updateContent, sleep } from "src/decidim/editor/test/helpers";
+
+import Dialog from "src/decidim/editor/extensions/dialog";
+import Image from "src/decidim/editor/extensions/image";
+import uploadTemplates from "src/decidim/editor/test/fixtures/upload_templates";
+
+class DummyDialog {
+  constructor(element) { this.element = element; }
+
+  open() { this.element.dataset.dialogOpen = true; }
+
+  close() { this.element.dataset.dialogOpen = null; }
+}
+
+// Not implemented in Jest
+global.Touch = class Touch {
+  constructor(options) {
+    this.pageX = options.pageX;
+    this.pageY = options.pageY;
+  }
+}
+
+describe("Image (links)", () => {
+  let editor = null;
+  let editorElement = null;
+  let uploadDialogElement = null;
+
+  beforeEach(() => {
+    document.body.innerHTML = "";
+
+    const dialogWrapper = document.createElement("div");
+    dialogWrapper.innerHTML = uploadTemplates.redesign;
+    uploadDialogElement = dialogWrapper.firstElementChild;
+    uploadDialogElement.dataset.dialog = "testDialog";
+    uploadDialogElement.dialog = new DummyDialog(uploadDialogElement);
+    window.Decidim.currentDialogs = { testDialog: uploadDialogElement.dialog };
+    document.body.append(uploadDialogElement);
+
+    editor = createBasicEditor({
+      extensions: [Dialog, Image.configure({ uploadDialogSelector: "#upload_dialog", uploadImagesPath: "/editor_images", contentTypes: ["image/png"] })]
+    });
+    editorElement = editor.view.dom;
+
+    const csrf = document.createElement("meta");
+    csrf.setAttribute("name", "csrf-token");
+    csrf.setAttribute("content", "abcdef0123456789");
+    document.head.append(csrf);
+
+    global.fetch = jest.fn(() => Promise.resolve({ ok: true, json: () => Promise.resolve({ url: "/path/to/image.jpg" }) }));
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it("allows setting an image with href and target attributes", async () => {
+    editorElement.focus();
+    editor.commands.setImage({ src: "/path/to/image.jpg", alt: "Test image", href: "https://example.com", target: "_blank" });
+    await sleep(0);
+
+    expect(editor.getHTML()).toMatchHtml(`
+      <a href="https://example.com" target="_blank" rel="noopener noreferrer">
+        <div class="editor-content-image" data-image="">
+          <img src="/path/to/image.jpg" alt="Test image">
+        </div>
+      </a>
+    `);
+  });
+
+  it("allows setting an image with href but no target", async () => {
+    editorElement.focus();
+    editor.commands.setImage({ src: "/path/to/image.jpg", alt: "Test image", href: "https://example.com" });
+    await sleep(0);
+
+    expect(editor.getHTML()).toMatchHtml(`
+      <a href="https://example.com">
+        <div class="editor-content-image" data-image="">
+          <img src="/path/to/image.jpg" alt="Test image">
+        </div>
+      </a>
+    `);
+  });
+
+  it("parses existing HTML with linked images", async () => {
+    editorElement.focus();
+    await updateContent(editorElement,
+      '<a href="https://example.com" target="_blank"><div class="editor-content-image" data-image=""><img src="/path/to/image.jpg" alt="Test image"></div></a>',
+      editor
+    );
+
+    expect(editor.getHTML()).toMatchHtml(`
+      <a href="https://example.com" target="_blank" rel="noopener noreferrer">
+        <div class="editor-content-image" data-image="">
+          <img src="/path/to/image.jpg" alt="Test image">
+        </div>
+      </a>
+    `);
+  });
+
+  it("parses existing HTML with linked images without target", async () => {
+    editorElement.focus();
+    await updateContent(editorElement,
+      '<a href="https://example.com"><div class="editor-content-image" data-image=""><img src="/path/to/image.jpg" alt="Test image"></div></a>',
+      editor
+    );
+
+    expect(editor.getHTML()).toMatchHtml(`
+      <a href="https://example.com">
+        <div class="editor-content-image" data-image="">
+          <img src="/path/to/image.jpg" alt="Test image">
+        </div>
+      </a>
+    `);
+  });
+
+  it("allows updating image link attributes", async () => {
+    editorElement.focus();
+    editor.commands.setImage({ src: "/path/to/image.jpg", alt: "Test image", href: "https://example.com", target: "_blank" });
+    await sleep(0);
+
+    editor.commands.setImage({ src: "/path/to/image.jpg", alt: "Test image", href: "https://docs.example.com" });
+    await sleep(0);
+
+    expect(editor.getHTML()).toMatchHtml(`
+      <a href="https://docs.example.com">
+        <div class="editor-content-image" data-image="">
+          <img src="/path/to/image.jpg" alt="Test image">
+        </div>
+      </a>
+    `);
+  });
+
+  it("allows removing link from image", async () => {
+    editorElement.focus();
+    editor.commands.setImage({ src: "/path/to/image.jpg", alt: "Test image", href: "https://example.com", target: "_blank" });
+    await sleep(0);
+
+    editor.commands.setImage({ src: "/path/to/image.jpg", alt: "Test image", href: null, target: null });
+    await sleep(0);
+
+    expect(editor.getHTML()).toMatchHtml(`
+      <div class="editor-content-image" data-image="">
+        <img src="/path/to/image.jpg" alt="Test image">
+      </div>
+    `);
+  });
+
+  it("renders images without links correctly", async () => {
+    editorElement.focus();
+    editor.commands.setImage({ src: "/path/to/image.jpg", alt: "Test image" });
+    await sleep(0);
+
+    expect(editor.getHTML()).toMatchHtml(`
+      <div class="editor-content-image" data-image="">
+        <img src="/path/to/image.jpg" alt="Test image">
+      </div>
+    `);
+  });
+});
diff --git a/decidim-core/app/packs/stylesheets/decidim/_rich_text.scss b/decidim-core/app/packs/stylesheets/decidim/_rich_text.scss
index 9e6a1f276c3cb..9a0ec85f2406b 100644
--- a/decidim-core/app/packs/stylesheets/decidim/_rich_text.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/_rich_text.scss
@@ -106,4 +106,21 @@
   .editor-indent-10 {
     @apply ml-40;
   }
+
+  // Style for external link icon inside linked images
+  .editor-content-image + [data-external-link="true"] {
+    @apply block relative;
+
+    margin: -1.5rem 0 1em auto;
+    width: fit-content;
+
+    svg {
+      @apply w-4 h-4;
+    }
+  }
+
+  // Make sure the anchor with image is positioned for proper icon placement
+  a:has(.editor-content-image) {
+    @apply block relative;
+  }
 }
diff --git a/decidim-core/app/packs/stylesheets/decidim/editor.scss b/decidim-core/app/packs/stylesheets/decidim/editor.scss
index 0dc7c4c8f24ea..9bd3cfb21797f 100644
--- a/decidim-core/app/packs/stylesheets/decidim/editor.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/editor.scss
@@ -130,6 +130,16 @@
         [data-image-resizer-wrapper] {
           @apply relative inline-block;
 
+          [data-image-resizer-control],
+          [data-image-resizer-dimensions] {
+            z-index: 1;
+          }
+
+          > a {
+            position: relative;
+            z-index: 0;
+          }
+
           [data-image-resizer-control] {
             @apply absolute hidden w-2.5 h-2.5 rounded-none border border-solid border-[#000] bg-[#fff] opacity-80;
           }
diff --git a/decidim-core/spec/system/editor_spec.rb b/decidim-core/spec/system/editor_spec.rb
index 82d0b3ba3b7c6..30f051f1cd86d 100644
--- a/decidim-core/spec/system/editor_spec.rb
+++ b/decidim-core/spec/system/editor_spec.rb
@@ -541,6 +541,144 @@ def protect_against_forgery?
         HTML
       )
     end
+
+    it "allows adding a link to an image" do
+      click_toggle("image")
+      within "[data-dialog][aria-hidden='false']" do
+        add_file("city.jpeg", "[data-dropzone]", "drop")
+        fill_in "Alternative text for the image", with: "City landscape"
+
+        within "[data-dialog-actions]" do
+          find("button[data-dropzone-save]").click
+        end
+      end
+      expect(Decidim::EditorImage.count).to be(1)
+
+      src = Decidim::EditorImage.last.attached_uploader(:file).path
+
+      # Select the image and add a link
+      within prosemirror_selector do
+        find("img").click
+      end
+
+      click_toggle("link")
+      within "[data-dialog][aria-hidden='false']" do
+        fill_in "Link URL", with: "https://example.com"
+        select "New tab", from: "Target"
+        find("button[data-action='save']").click
+      end
+      sleep 0.5
+
+      expect_value(
+        <<~HTML
+          <p>Hello, world!</p>
+          <a href="https://example.com" target="_blank" rel="noopener noreferrer">
+            <div class="editor-content-image" data-image="">
+              <img src="#{src}" alt="City landscape">
+            </div>
+          </a>
+        HTML
+      )
+    end
+
+    it "allows editing an image link" do
+      click_toggle("image")
+      within "[data-dialog][aria-hidden='false']" do
+        add_file("city.jpeg", "[data-dropzone]", "drop")
+        fill_in "Alternative text for the image", with: "City landscape"
+
+        within "[data-dialog-actions]" do
+          find("button[data-dropzone-save]").click
+        end
+      end
+      expect(Decidim::EditorImage.count).to be(1)
+
+      src = Decidim::EditorImage.last.attached_uploader(:file).path
+
+      # Select the image and add a link
+      within prosemirror_selector do
+        find("img").click
+      end
+
+      click_toggle("link")
+      within "[data-dialog][aria-hidden='false']" do
+        fill_in "Link URL", with: "https://example.com"
+        select "New tab", from: "Target"
+        find("button[data-action='save']").click
+      end
+      sleep 0.5
+
+      # Edit the link
+      within prosemirror_selector do
+        find("img").click
+      end
+
+      click_toggle("link")
+      within "[data-dialog][aria-hidden='false']" do
+        expect(page).to have_field("Link URL", with: "https://example.com")
+        fill_in "Link URL", with: "https://docs.example.com"
+        select "Default (same tab)", from: "Target"
+        find("button[data-action='save']").click
+      end
+      sleep 0.5
+
+      expect_value(
+        <<~HTML
+          <p>Hello, world!</p>
+          <a href="https://docs.example.com">
+            <div class="editor-content-image" data-image="">
+              <img src="#{src}" alt="City landscape">
+            </div>
+          </a>
+        HTML
+      )
+    end
+
+    it "allows removing a link from an image" do
+      click_toggle("image")
+      within "[data-dialog][aria-hidden='false']" do
+        add_file("city.jpeg", "[data-dropzone]", "drop")
+        fill_in "Alternative text for the image", with: "City landscape"
+
+        within "[data-dialog-actions]" do
+          find("button[data-dropzone-save]").click
+        end
+      end
+      expect(Decidim::EditorImage.count).to be(1)
+
+      src = Decidim::EditorImage.last.attached_uploader(:file).path
+
+      # Select the image and add a link
+      within prosemirror_selector do
+        find("img").click
+      end
+
+      click_toggle("link")
+      within "[data-dialog][aria-hidden='false']" do
+        fill_in "Link URL", with: "https://example.com"
+        select "New tab", from: "Target"
+        find("button[data-action='save']").click
+      end
+      sleep 0.5
+
+      # Remove the link using the bubble menu
+      within prosemirror_selector do
+        find("img").click
+      end
+
+      within ".editor [data-bubble-menu] [data-linkbubble]" do
+        click_on "Remove"
+      end
+
+      expect_value(
+        <<~HTML
+          <p>Hello, world!</p>
+          <div class="editor-content-image" data-image="">
+            <img src="#{src}" alt="City landscape">
+          </div>
+        HTML
+      )
+    end
   end
 
   context "with keyboard" do

From aa184479471f4fa1ef7eccd8e8dfe9b75985f8e8 Mon Sep 17 00:00:00 2001
From: Elvia Benedith <116598037+ElviaBth@users.noreply.github.com>
Date: Mon, 11 May 2026 17:01:52 +0200
Subject: [PATCH 011/131] Add export button (#103)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add export button

* add serializer

* add specs

* fix sql & export data

---------

Co-authored-by: Ivan Vergés <ivan@pokecode.net>
---
 .../admin/documents/edit.html.erb             |  1 +
 .../config/locales/en.yml                     |  2 +
 .../lib/decidim/collaborative_texts.rb        |  1 +
 .../decidim/collaborative_texts/component.rb  | 13 +++-
 .../suggestion_serializer.rb                  | 42 ++++++++++++
 .../suggestion_serializer_spec.rb             | 64 +++++++++++++++++++
 .../system/admin/admin_edits_document_spec.rb |  9 +++
 7 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100644 decidim-collaborative_texts/lib/decidim/collaborative_texts/suggestion_serializer.rb
 create mode 100644 decidim-collaborative_texts/spec/lib/decidim/collaborative_texts/suggestion_serializer_spec.rb

diff --git a/decidim-collaborative_texts/app/views/decidim/collaborative_texts/admin/documents/edit.html.erb b/decidim-collaborative_texts/app/views/decidim/collaborative_texts/admin/documents/edit.html.erb
index 04632db024c4a..62d496b29fe67 100644
--- a/decidim-collaborative_texts/app/views/decidim/collaborative_texts/admin/documents/edit.html.erb
+++ b/decidim-collaborative_texts/app/views/decidim/collaborative_texts/admin/documents/edit.html.erb
@@ -2,6 +2,7 @@
 <div class="item_show__header">
   <h1 class="item_show__header-title">
     <%= t(".title") %>
+    <%= export_dropdown(current_component, @document.id) %>
   </h1>
 </div>
 <div class="item__edit item__edit-1col">
diff --git a/decidim-collaborative_texts/config/locales/en.yml b/decidim-collaborative_texts/config/locales/en.yml
index b74f98097e0dd..3837b34971725 100644
--- a/decidim-collaborative_texts/config/locales/en.yml
+++ b/decidim-collaborative_texts/config/locales/en.yml
@@ -79,6 +79,8 @@ en:
           update_settings:
             invalid: There was a problem updating the document.
             success: Document successfully updated.
+        exports:
+          document_suggestions: Suggestions
         index:
           published: Published
           unpublished: Unpublished
diff --git a/decidim-collaborative_texts/lib/decidim/collaborative_texts.rb b/decidim-collaborative_texts/lib/decidim/collaborative_texts.rb
index 845fbc9b6a35c..7c506d95718f6 100644
--- a/decidim-collaborative_texts/lib/decidim/collaborative_texts.rb
+++ b/decidim-collaborative_texts/lib/decidim/collaborative_texts.rb
@@ -9,5 +9,6 @@
 module Decidim
   # Base module for the collaborative_texts engine.
   module CollaborativeTexts
+    autoload :SuggestionSerializer, "decidim/collaborative_texts/suggestion_serializer"
   end
 end
diff --git a/decidim-collaborative_texts/lib/decidim/collaborative_texts/component.rb b/decidim-collaborative_texts/lib/decidim/collaborative_texts/component.rb
index 1cea77b1e15c4..e40eeba6a20bf 100644
--- a/decidim-collaborative_texts/lib/decidim/collaborative_texts/component.rb
+++ b/decidim-collaborative_texts/lib/decidim/collaborative_texts/component.rb
@@ -56,7 +56,18 @@
     resource.searchable = true
   end
 
-  # component.exports ...
+  component.exports :document_suggestions do |exports|
+    exports.collection do |component, _user, resource_id|
+      documents_constraint = { decidim_component_id: component.id }
+      documents_constraint[:id] = resource_id if resource_id.present?
+      Decidim::CollaborativeTexts::Suggestion
+        .joins(:document)
+        .where(decidim_collaborative_texts_documents: documents_constraint)
+        .includes(:document_version, document: [:component])
+    end
+
+    exports.serializer Decidim::CollaborativeTexts::SuggestionSerializer
+  end
 
   component.seeds do |participatory_space|
     require "decidim/collaborative_texts/seeds"
diff --git a/decidim-collaborative_texts/lib/decidim/collaborative_texts/suggestion_serializer.rb b/decidim-collaborative_texts/lib/decidim/collaborative_texts/suggestion_serializer.rb
new file mode 100644
index 0000000000000..393147dc87e3e
--- /dev/null
+++ b/decidim-collaborative_texts/lib/decidim/collaborative_texts/suggestion_serializer.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Decidim
+  module CollaborativeTexts
+    class SuggestionSerializer < Decidim::Exporters::Serializer
+      include Decidim::ApplicationHelper
+      include Decidim::TranslationsHelper
+
+      def serialize
+        {
+          id: resource.id,
+          document_id: resource.document.id,
+          document_title: resource.document.title,
+          original_text: resource.changeset["original"]&.join("\n")&.strip,
+          replacement_text: resource.changeset["replace"]&.join("\n")&.strip,
+          first_node: resource.changeset["firstNode"],
+          last_node: resource.changeset["lastNode"],
+          author: author_fields,
+          status: resource.status,
+          created_at: resource.created_at,
+          updated_at: resource.updated_at
+        }
+      end
+
+      private
+
+      def author_fields
+        return {} unless resource.author
+
+        {
+          id: resource.author.id,
+          name: author_name(resource.author),
+          email: resource.author.try(:email)
+        }
+      end
+
+      def author_name(author)
+        translated_attribute(author.name)
+      end
+    end
+  end
+end
diff --git a/decidim-collaborative_texts/spec/lib/decidim/collaborative_texts/suggestion_serializer_spec.rb b/decidim-collaborative_texts/spec/lib/decidim/collaborative_texts/suggestion_serializer_spec.rb
new file mode 100644
index 0000000000000..904f4bf5d00ae
--- /dev/null
+++ b/decidim-collaborative_texts/spec/lib/decidim/collaborative_texts/suggestion_serializer_spec.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module CollaborativeTexts
+    describe SuggestionSerializer do
+      subject { described_class.new(suggestion) }
+
+      let(:suggestion) { create(:collaborative_text_suggestion) }
+      let(:serialized) { subject.serialize }
+
+      describe "#serialize" do
+        it "serializes the id" do
+          expect(serialized).to include(id: suggestion.id)
+        end
+
+        it "serializes the document id" do
+          expect(serialized).to include(document_id: suggestion.document.id)
+        end
+
+        it "serializes the status" do
+          expect(serialized).to include(status: suggestion.status)
+        end
+
+        it "serializes the original text" do
+          expect(serialized[:original_text]).to eq(
+            suggestion.changeset["original"]&.join(" ")&.strip
+          )
+        end
+
+        it "serializes the replacement text" do
+          expect(serialized[:replacement_text]).to eq(
+            suggestion.changeset["replace"]&.join(" ")&.strip
+          )
+        end
+
+        describe "author" do
+          let(:component) { create(:collaborative_text_component) }
+          let(:document) { create(:collaborative_text_document, component:) }
+          let(:version) { create(:collaborative_text_version, document:) }
+          let(:author) { create(:user, :confirmed, name: "Jane Doe", organization: component.organization) }
+          let(:suggestion) { create(:collaborative_text_suggestion, document_version: version, author:) }
+
+          it "serializes the author name" do
+            expect(serialized[:author]).to include(name: "Jane Doe")
+          end
+
+          it "serializes the author email" do
+            expect(serialized[:author]).to include(email: author.email)
+          end
+        end
+
+        it "serializes created_at" do
+          expect(serialized).to include(created_at: suggestion.created_at)
+        end
+
+        it "serializes updated_at" do
+          expect(serialized).to include(updated_at: suggestion.updated_at)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-collaborative_texts/spec/system/admin/admin_edits_document_spec.rb b/decidim-collaborative_texts/spec/system/admin/admin_edits_document_spec.rb
index f89a4725bba4d..91461e9490784 100644
--- a/decidim-collaborative_texts/spec/system/admin/admin_edits_document_spec.rb
+++ b/decidim-collaborative_texts/spec/system/admin/admin_edits_document_spec.rb
@@ -88,6 +88,15 @@
       expect(document.body).not_to eq("<p>body edited</p>")
     end
 
+    it "shows the export dropdown button" do
+      within("tr", text: "This is my document new title") do
+        find("button[data-controller='dropdown']").click
+        click_on "Edit"
+      end
+
+      expect(page).to have_button(I18n.t("decidim.admin.actions.export_all"))
+    end
+
     it "can discard suggestions by creating a new version" do
       expect(document.current_version.suggestions.count).to eq(1)
       within("tr", text: "This is my document new title") do

From beaafd37c9bef605e7ca83f79a1ce37e150be8e8 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Tue, 12 May 2026 07:46:40 +0200
Subject: [PATCH 012/131] New Crowdin updates (#16769)

* New translations en.yml (Catalan)

[ci skip]

* New translations en.yml (Swedish)

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Swedish)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (Swedish)

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]
---
 decidim-accountability/config/locales/sv.yml             | 2 +-
 decidim-admin/config/locales/ca-IT.yml                   | 4 ++--
 decidim-budgets/config/locales/sv.yml                    | 4 ++--
 decidim-conferences/config/locales/fr-CA.yml             | 3 +++
 decidim-core/config/locales/ca.yml                       | 2 +-
 decidim-forms/config/locales/ca-IT.yml                   | 4 ++--
 decidim-meetings/config/locales/fr-CA.yml                | 1 +
 decidim-participatory_processes/config/locales/fr-CA.yml | 4 ++++
 decidim-proposals/config/locales/sv.yml                  | 6 +++---
 decidim-system/config/locales/ca-IT.yml                  | 4 ++--
 10 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/decidim-accountability/config/locales/sv.yml b/decidim-accountability/config/locales/sv.yml
index ef0fbdbcd9c73..82d78ed152b51 100644
--- a/decidim-accountability/config/locales/sv.yml
+++ b/decidim-accountability/config/locales/sv.yml
@@ -33,7 +33,7 @@ sv:
             budget_text: Resultatet %{link} har tagits med
             meetings_ids: 'Diskuterades på det här mötet: %{link}'
             project_ids: 'Lades till i det här projektet: %{link}'
-            proposal_ids: 'Lades till i det här förslaget: %{link}'
+            proposal_ids: 'Förslaget som röstades fram: %{link}'
             text: 'Lades till i det här resultatet: %{link}'
       decidim/accountability/result:
         one: Resultat
diff --git a/decidim-admin/config/locales/ca-IT.yml b/decidim-admin/config/locales/ca-IT.yml
index 839449804779c..bf534489a38c7 100644
--- a/decidim-admin/config/locales/ca-IT.yml
+++ b/decidim-admin/config/locales/ca-IT.yml
@@ -222,7 +222,7 @@ ca-IT:
           alert: 'Necessari: revisa les nostres condicions del servei d''administració'
           callout: Si us plau, dedica un moment a revisar les condicions del servei d'administració. En cas contrari, no podràs administrar la plataforma.
           cta: Revisar-les ara.
-        title: Termes i condicions d'ús para administradores
+        title: Termes i condicions d'ús per a administradores
       area_types:
         create:
           error: S'ha produït un error en crear un tipus d'àrea nova.
@@ -882,7 +882,7 @@ ca-IT:
           title: Edita organització
           update: Actualitzar
         form:
-          admin_terms_of_service: Termes i condicions d'ús para administradores
+          admin_terms_of_service: Termes i condicions d'ús per a administradores
           basic_configuration: Configuració bàsica
           colors:
             choose_color: Triar un color primari
diff --git a/decidim-budgets/config/locales/sv.yml b/decidim-budgets/config/locales/sv.yml
index ff729959319e5..7db806c7d778a 100644
--- a/decidim-budgets/config/locales/sv.yml
+++ b/decidim-budgets/config/locales/sv.yml
@@ -233,8 +233,8 @@ sv:
             one: Visa röst
             other: Visa röster
           votes_count:
-            one: Din röst på %{budget_name} har redan registrerats.
-            other: Dina %{count} röster för %{budget_name} har redan registrerats.
+            one: Din röst på %{budget_name} har registrerats.
+            other: Dina %{count} röster för %{budget_name} har registrerats.
       order_pdf:
         text: Du har röstat på följande projekt i %{space_name}
         title: Din röst har tagits emot.
diff --git a/decidim-conferences/config/locales/fr-CA.yml b/decidim-conferences/config/locales/fr-CA.yml
index b91de1e2889ec..9c5ecd91f0a1b 100644
--- a/decidim-conferences/config/locales/fr-CA.yml
+++ b/decidim-conferences/config/locales/fr-CA.yml
@@ -121,8 +121,11 @@ fr-CA:
           success: Conférencier supprimé avec succès pour cette conférence.
         edit:
           update: Mettre à jour
+        index:
+          conference_speakers_title: Conférenciers
         new:
           create: Créer
+          title: Nouveau conférencier
         publish:
           invalid: Il y a eu un problème lors de la publication de cet intervenant.
           success: L'intervenant de la conférence a été publié avec succès.
diff --git a/decidim-core/config/locales/ca.yml b/decidim-core/config/locales/ca.yml
index 9f68678b5d9c8..ca259a1ae3db4 100644
--- a/decidim-core/config/locales/ca.yml
+++ b/decidim-core/config/locales/ca.yml
@@ -1348,7 +1348,7 @@ ca:
       name: Sense connexió
       show:
         message_1: Sembla que no tens connexió a Internet.
-        message_2: Si us plau, torna-ho a provar més tard.
+        message_2: Si us plau, torneu-ho a provar més tard.
         retry: Torna-ho a provar
     onboarding_action_message:
       click_link: Fes clic aquí
diff --git a/decidim-forms/config/locales/ca-IT.yml b/decidim-forms/config/locales/ca-IT.yml
index 005f67db43306..d821faf067d44 100644
--- a/decidim-forms/config/locales/ca-IT.yml
+++ b/decidim-forms/config/locales/ca-IT.yml
@@ -188,10 +188,10 @@ ca-IT:
           of_total_steps: de %{total_steps}
           questionnaire_closed:
             body: El formulari està tancat i no es pot respondre.
-            title: S'ha tancat el formulari
+            title: Formulari tancat
           questionnaire_for_private_users:
             body: El formulari només està disponible per a participants privades
-            title: S'ha tancat el formulari
+            title: Formulari tancat
           questionnaire_js_disabled:
             body: Algunes de les característiques d'aquest formulari es deshabilitaran. Per millorar la teva experiència, si us plau, habilita JavaScript al teu navegador.
             title: JavaScript està desactivat
diff --git a/decidim-meetings/config/locales/fr-CA.yml b/decidim-meetings/config/locales/fr-CA.yml
index 5ab1cc96ac7e6..8f2aff5aeb3f3 100644
--- a/decidim-meetings/config/locales/fr-CA.yml
+++ b/decidim-meetings/config/locales/fr-CA.yml
@@ -146,6 +146,7 @@ fr-CA:
           success: Cette rencontre a été dupliquée avec succès.
         new:
           copy: Copier
+          title: Dupliquer une rencontre
       tooltips:
         cannot_close_meetings: Impossible de fermer cette réunion car elle a été créée par un participant
         cannot_duplicate_meetings: Impossible de dupliquer cette réunion car elle a été créée par un participant
diff --git a/decidim-participatory_processes/config/locales/fr-CA.yml b/decidim-participatory_processes/config/locales/fr-CA.yml
index 1ef9f04c52db7..a8a1e5f9ec5ea 100644
--- a/decidim-participatory_processes/config/locales/fr-CA.yml
+++ b/decidim-participatory_processes/config/locales/fr-CA.yml
@@ -231,9 +231,13 @@ fr-CA:
         destroy:
           success: Utilisateur supprimé avec succès de cette concertation.
         edit:
+          title: Mettre à jour l'administrateur du processus participatif
           update: Mettre à jour
+        index:
+          process_admins_title: Administrateurs du processus participatif
         new:
           create: Créer
+          title: Nouvel administrateur du processus participatif
         update:
           error: Une erreur s'est produite lors de la mise à jour d'un utilisateur pour cette concertation.
           success: L'utilisateur a été mis à jour avec succès pour cette concertation.
diff --git a/decidim-proposals/config/locales/sv.yml b/decidim-proposals/config/locales/sv.yml
index 8cd582b8663aa..16164224a8cc5 100644
--- a/decidim-proposals/config/locales/sv.yml
+++ b/decidim-proposals/config/locales/sv.yml
@@ -201,7 +201,7 @@ sv:
             minimum_votes_per_user: Minsta antal röster per deltagare
             new_proposal_body_template: Innehållsmall för nytt förslag
             new_proposal_body_template_help: Du kan ange den förifyllda texten för nya förslag
-            new_proposal_help_text: Hjälptext om nya förslag
+            new_proposal_help_text: Hjälptext till nya förslag
             no_taxonomy_filters_found: Inga filter för kategorier hittades.
             official_proposals_enabled: Aktivera officiella förslag
             participatory_texts_enabled: Aktivera kollaborativa texter
@@ -1017,13 +1017,13 @@ sv:
           can_accumulate_votes_beyond_threshold:
             description: Förslag kan få fler än gränsen på %{limit} röster
           minimum_votes_per_user:
-            description: Du behöver rösta på %{votes} till förslag för att din röst ska räknas.
+            description: Du behöver rösta på %{votes} förslag för att din röst ska räknas.
           proposal_limit:
             description: Du kan skapa upp till %{limit} förslag.
           success: Din röst har tagits emot
           threshold_per_proposal:
             description: Förslag behöver få minst %{limit} röster för att gå vidare.
-          title: Regler för omröstning
+          title: Rösta så här
           vote_limit:
             description: Du kan stödja upp till %{limit} förslag.
             votes: Saknar %{number} röster
diff --git a/decidim-system/config/locales/ca-IT.yml b/decidim-system/config/locales/ca-IT.yml
index 0b2729e523ad1..9c0cae5d987cc 100644
--- a/decidim-system/config/locales/ca-IT.yml
+++ b/decidim-system/config/locales/ca-IT.yml
@@ -3,7 +3,7 @@ ca-IT:
   activemodel:
     attributes:
       oauth_application:
-        name: Nom de l'aplicació OAuth
+        name: Nom de l'aplicació
         organization_logo: Logo de l'organització (quadrat)
         organization_name: Organització
         organization_url: URL de l'organització
@@ -299,7 +299,7 @@ ca-IT:
           organization_admin_email_hint: T'enviarem un correu electrònic a aquesta adreça perquè puguis confirmar-la i configurar la teva contrasenya.
           reference_prefix_hint: El prefix de la referència s'utilitza per identificar de forma única els recursos del conjunt de l'organització.
           secondary_hosts_hint: Introdueix cada un d'ells en una nova línia.
-          short_name_hint: Nom curt que es farà servir per a l'Aplicació Web Progressiva (PWA). Ha de tenir un màxim de 12 caràcters.
+          short_name_hint: Nom curt que es farà servir per a l'Aplicació Web Progressiva. Ha de tenir un màxim de 12 caràcters.
           title: Nova organització
         omniauth_settings:
           decidim:

From 03d80881ac459127f0e11999c8a733cf78e78736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?=
 <andreslucena@users.noreply.github.com>
Date: Tue, 12 May 2026 08:47:03 +0200
Subject: [PATCH 013/131] Bump to v0.31.5 version (#16767)

---
 .decidim-version                              |   2 +-
 CHANGELOG.md                                  |  42 ++++
 Gemfile.lock                                  | 198 +++++++++---------
 .../lib/decidim/accountability/version.rb     |   2 +-
 decidim-admin/lib/decidim/admin/version.rb    |   2 +-
 decidim-ai/lib/decidim/ai/version.rb          |   2 +-
 decidim-api/lib/decidim/api/version.rb        |   2 +-
 .../lib/decidim/assemblies/version.rb         |   2 +-
 decidim-blogs/lib/decidim/blogs/version.rb    |   2 +-
 .../lib/decidim/budgets/version.rb            |   2 +-
 .../decidim/collaborative_texts/version.rb    |   2 +-
 .../lib/decidim/comments/version.rb           |   2 +-
 .../lib/decidim/conferences/version.rb        |   2 +-
 decidim-core/lib/decidim/core/version.rb      |   2 +-
 .../lib/decidim/debates/version.rb            |   2 +-
 .../lib/decidim/demographics/version.rb       |   2 +-
 decidim-design/lib/decidim/design/version.rb  |   2 +-
 decidim-dev/lib/decidim/dev/version.rb        |   2 +-
 .../lib/decidim/elections/version.rb          |   2 +-
 decidim-forms/lib/decidim/forms/version.rb    |   2 +-
 decidim-generators/Gemfile.lock               | 198 +++++++++---------
 .../component_templates/Gemfile.erb           |   4 +-
 .../lib/decidim/generators/version.rb         |   2 +-
 .../lib/decidim/initiatives/version.rb        |   2 +-
 .../lib/decidim/meetings/version.rb           |   2 +-
 decidim-pages/lib/decidim/pages/version.rb    |   2 +-
 .../participatory_processes/version.rb        |   2 +-
 .../lib/decidim/proposals/version.rb          |   2 +-
 .../lib/decidim/sortitions/version.rb         |   2 +-
 .../lib/decidim/surveys/version.rb            |   2 +-
 decidim-system/lib/decidim/system/version.rb  |   2 +-
 .../lib/decidim/templates/version.rb          |   2 +-
 .../lib/decidim/verifications/version.rb      |   2 +-
 lib/decidim/version.rb                        |   2 +-
 package-lock.json                             |  14 +-
 packages/browserslist-config/package.json     |   2 +-
 packages/core/package.json                    |   2 +-
 packages/dev/package.json                     |   2 +-
 packages/eslint-config/package.json           |   2 +-
 packages/prettier-config/package.json         |   2 +-
 packages/stylelint-config/package.json        |   2 +-
 packages/webpacker/package.json               |   2 +-
 42 files changed, 286 insertions(+), 244 deletions(-)

diff --git a/.decidim-version b/.decidim-version
index ad2b8d01c6f7c..2b0d003c65c87 100644
--- a/.decidim-version
+++ b/.decidim-version
@@ -1 +1 @@
-0.31.4
\ No newline at end of file
+0.31.5
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac9291add22e0..86447cc4874d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,47 @@
 # Changelog
 
+## [0.31.5](https://github.com/decidim/decidim/tree/0.31.5)
+
+### Added
+
+Nothing.
+
+### Changed
+
+Nothing.
+
+### Fixed
+
+- **decidim-system**: Backport 'Fix one word hostnames for development' to v0.31 [\#16684](https://github.com/decidim/decidim/pull/16684)
+- **decidim-core**: Backport 'Fix flaky spec on `category.erb`' to v0.31 [\#16707](https://github.com/decidim/decidim/pull/16707)
+- **decidim-verifications**: Backport 'Enforce permission check on admins' CSV census' to v0.31 [\#16692](https://github.com/decidim/decidim/pull/16692)
+- **decidim-verifications**: Backport 'Fix multitenant access bug on ID documents verification' to v0.31 [\#16694](https://github.com/decidim/decidim/pull/16694)
+- **decidim-demographics**, **decidim-elections**, **decidim-forms**, **decidim-meetings**, **decidim-surveys**: Backport 'Improve permissions checks in demographics' questionnaire' to v0.31 [\#16682](https://github.com/decidim/decidim/pull/16682)
+- **decidim-admin**, **decidim-conferences**, **decidim-meetings**: Backport 'Refactor autocomplete to use the GraphQL API endpoint' to v0.31 [\#16705](https://github.com/decidim/decidim/pull/16705)
+- **decidim-core**: Backport 'Fix push notifications configuration and registration' to v0.31 [\#16711](https://github.com/decidim/decidim/pull/16711)
+- **decidim-core**: Backport 'Sanitize "static page" content blocks and HTML content block' to v0.31 [\#16715](https://github.com/decidim/decidim/pull/16715)
+- Backport 'Pin workbox-webpack-plugin to v7.3' to v0.31 [\#16745](https://github.com/decidim/decidim/pull/16745)
+- **decidim-generators**: Backport 'Fix spec for full app generator spec' to v0.31 [\#16749](https://github.com/decidim/decidim/pull/16749)
+- **decidim-api**: Backport 'Prevent using JWT against other organizations' to v0.31 [\#16723](https://github.com/decidim/decidim/pull/16723)
+- **decidim-core**: Backport 'Check that the endpoint is supported on Web Push notifications' to v0.31 [\#16747](https://github.com/decidim/decidim/pull/16747)
+- **decidim-assemblies**, **decidim-core**, **decidim-participatory processes**, **decidim-verifications**: Backport 'Introduce PrivateDownload logic for some downloads' to v0.31 [\#16751](https://github.com/decidim/decidim/pull/16751)
+- Fix spellchecker in `release/0.31-stable` [\#16709](https://github.com/decidim/decidim/pull/16709)
+- **decidim-verifications**: Backport 'Enforce permission check on admins' CSV census records' to v0.31 [\#16758](https://github.com/decidim/decidim/pull/16758)
+- **decidim-api**: Backport 'Fix organization access check for logged in API user' to v0.31 [\#16760](https://github.com/decidim/decidim/pull/16760)
+
+### Removed
+
+Nothing.
+
+### Developer improvements
+
+Nothing.
+
+### Internal
+
+- Clean-up the releases notes after v0.31.4 publication [\#16647](https://github.com/decidim/decidim/pull/16647)
+- Backport 'Pin workbox-webpack-plugin to v7.3' to v0.31 [\#16745](https://github.com/decidim/decidim/pull/16745)
+
 ## [0.31.4](https://github.com/decidim/decidim/tree/0.31.4)
 
 ### Added
diff --git a/Gemfile.lock b/Gemfile.lock
index ffc2c02b88804..a14c190b624d0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,62 +1,62 @@
 PATH
   remote: .
   specs:
-    decidim (0.31.4)
-      decidim-accountability (= 0.31.4)
-      decidim-admin (= 0.31.4)
-      decidim-api (= 0.31.4)
-      decidim-assemblies (= 0.31.4)
-      decidim-blogs (= 0.31.4)
-      decidim-budgets (= 0.31.4)
-      decidim-comments (= 0.31.4)
-      decidim-core (= 0.31.4)
-      decidim-debates (= 0.31.4)
-      decidim-forms (= 0.31.4)
-      decidim-generators (= 0.31.4)
-      decidim-meetings (= 0.31.4)
-      decidim-pages (= 0.31.4)
-      decidim-participatory_processes (= 0.31.4)
-      decidim-proposals (= 0.31.4)
-      decidim-sortitions (= 0.31.4)
-      decidim-surveys (= 0.31.4)
-      decidim-system (= 0.31.4)
-      decidim-verifications (= 0.31.4)
-    decidim-accountability (0.31.4)
-      decidim-comments (= 0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-admin (0.31.4)
+    decidim (0.31.5)
+      decidim-accountability (= 0.31.5)
+      decidim-admin (= 0.31.5)
+      decidim-api (= 0.31.5)
+      decidim-assemblies (= 0.31.5)
+      decidim-blogs (= 0.31.5)
+      decidim-budgets (= 0.31.5)
+      decidim-comments (= 0.31.5)
+      decidim-core (= 0.31.5)
+      decidim-debates (= 0.31.5)
+      decidim-forms (= 0.31.5)
+      decidim-generators (= 0.31.5)
+      decidim-meetings (= 0.31.5)
+      decidim-pages (= 0.31.5)
+      decidim-participatory_processes (= 0.31.5)
+      decidim-proposals (= 0.31.5)
+      decidim-sortitions (= 0.31.5)
+      decidim-surveys (= 0.31.5)
+      decidim-system (= 0.31.5)
+      decidim-verifications (= 0.31.5)
+    decidim-accountability (0.31.5)
+      decidim-comments (= 0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-admin (0.31.5)
       active_link_to (~> 1.0)
-      decidim-core (= 0.31.4)
+      decidim-core (= 0.31.5)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0, >= 2.0.9)
-    decidim-ai (0.31.4)
+    decidim-ai (0.31.5)
       classifier-reborn (~> 2.3.0)
-      decidim-core (= 0.31.4)
-    decidim-api (0.31.4)
-      decidim-core (= 0.31.4)
+      decidim-core (= 0.31.5)
+    decidim-api (0.31.5)
+      decidim-core (= 0.31.5)
       devise-jwt (~> 0.12.1)
       graphql (~> 2.4.0, >= 2.4.17)
       graphql-docs (~> 5.0)
       rack-cors (~> 1.0)
-    decidim-assemblies (0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-blogs (0.31.4)
-      decidim-admin (= 0.31.4)
-      decidim-comments (= 0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-budgets (0.31.4)
-      decidim-comments (= 0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-collaborative_texts (0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-comments (0.31.4)
-      decidim-core (= 0.31.4)
+    decidim-assemblies (0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-blogs (0.31.5)
+      decidim-admin (= 0.31.5)
+      decidim-comments (= 0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-budgets (0.31.5)
+      decidim-comments (= 0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-collaborative_texts (0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-comments (0.31.5)
+      decidim-core (= 0.31.5)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-conferences (0.31.4)
-      decidim-core (= 0.31.4)
-      decidim-meetings (= 0.31.4)
-    decidim-core (0.31.4)
+    decidim-conferences (0.31.5)
+      decidim-core (= 0.31.5)
+      decidim-meetings (= 0.31.5)
+    decidim-core (0.31.5)
       active_link_to (~> 1.0)
       acts_as_list (~> 1.0)
       batch-loader (~> 2.0)
@@ -111,24 +111,24 @@ PATH
       valid_email2 (~> 7.0)
       web-push (~> 3.0)
       wisper (~> 3.0)
-    decidim-debates (0.31.4)
-      decidim-comments (= 0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-demographics (0.31.4)
-      decidim-core (= 0.31.4)
-      decidim-forms (= 0.31.4)
-    decidim-design (0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-dev (0.31.4)
+    decidim-debates (0.31.5)
+      decidim-comments (= 0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-demographics (0.31.5)
+      decidim-core (= 0.31.5)
+      decidim-forms (= 0.31.5)
+    decidim-design (0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-dev (0.31.5)
       bullet (~> 8.0.0)
       byebug (~> 11.0)
       capybara (~> 3.39)
-      decidim-admin (= 0.31.4)
-      decidim-api (= 0.31.4)
-      decidim-comments (= 0.31.4)
-      decidim-core (= 0.31.4)
-      decidim-generators (= 0.31.4)
-      decidim-verifications (= 0.31.4)
+      decidim-admin (= 0.31.5)
+      decidim-api (= 0.31.5)
+      decidim-comments (= 0.31.5)
+      decidim-core (= 0.31.5)
+      decidim-generators (= 0.31.5)
+      decidim-verifications (= 0.31.5)
       erb_lint (~> 0.8.0)
       factory_bot_rails (~> 6.2)
       faker (~> 3.2)
@@ -161,51 +161,51 @@ PATH
       w3c_rspec_validators (~> 0.3.0)
       webmock (~> 3.18)
       wisper-rspec (~> 1.0)
-    decidim-elections (0.31.4)
-      decidim-admin (= 0.31.4)
-      decidim-core (= 0.31.4)
-      decidim-forms (= 0.31.4)
-    decidim-forms (0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-generators (0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-initiatives (0.31.4)
-      decidim-admin (= 0.31.4)
-      decidim-comments (= 0.31.4)
-      decidim-core (= 0.31.4)
-      decidim-verifications (= 0.31.4)
-    decidim-meetings (0.31.4)
-      decidim-core (= 0.31.4)
-      decidim-forms (= 0.31.4)
+    decidim-elections (0.31.5)
+      decidim-admin (= 0.31.5)
+      decidim-core (= 0.31.5)
+      decidim-forms (= 0.31.5)
+    decidim-forms (0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-generators (0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-initiatives (0.31.5)
+      decidim-admin (= 0.31.5)
+      decidim-comments (= 0.31.5)
+      decidim-core (= 0.31.5)
+      decidim-verifications (= 0.31.5)
+    decidim-meetings (0.31.5)
+      decidim-core (= 0.31.5)
+      decidim-forms (= 0.31.5)
       icalendar (~> 2.5)
-    decidim-pages (0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-participatory_processes (0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-proposals (0.31.4)
-      decidim-comments (= 0.31.4)
-      decidim-core (= 0.31.4)
+    decidim-pages (0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-participatory_processes (0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-proposals (0.31.5)
+      decidim-comments (= 0.31.5)
+      decidim-core (= 0.31.5)
       doc2text (~> 0.4.0, >= 0.4.8)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-sortitions (0.31.4)
-      decidim-admin (= 0.31.4)
-      decidim-comments (= 0.31.4)
-      decidim-core (= 0.31.4)
-      decidim-proposals (= 0.31.4)
-    decidim-surveys (0.31.4)
-      decidim-core (= 0.31.4)
-      decidim-forms (= 0.31.4)
-    decidim-system (0.31.4)
+    decidim-sortitions (0.31.5)
+      decidim-admin (= 0.31.5)
+      decidim-comments (= 0.31.5)
+      decidim-core (= 0.31.5)
+      decidim-proposals (= 0.31.5)
+    decidim-surveys (0.31.5)
+      decidim-core (= 0.31.5)
+      decidim-forms (= 0.31.5)
+    decidim-system (0.31.5)
       active_link_to (~> 1.0)
-      decidim-core (= 0.31.4)
+      decidim-core (= 0.31.5)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0, >= 2.0.9)
-    decidim-templates (0.31.4)
-      decidim-core (= 0.31.4)
-      decidim-forms (= 0.31.4)
-    decidim-verifications (0.31.4)
-      decidim-core (= 0.31.4)
+    decidim-templates (0.31.5)
+      decidim-core (= 0.31.5)
+      decidim-forms (= 0.31.5)
+    decidim-verifications (0.31.5)
+      decidim-core (= 0.31.5)
 
 GEM
   remote: https://rubygems.org/
diff --git a/decidim-accountability/lib/decidim/accountability/version.rb b/decidim-accountability/lib/decidim/accountability/version.rb
index 27c55e8079ab1..397ed0c0e0ab7 100644
--- a/decidim-accountability/lib/decidim/accountability/version.rb
+++ b/decidim-accountability/lib/decidim/accountability/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-accountability version.
   module Accountability
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-admin/lib/decidim/admin/version.rb b/decidim-admin/lib/decidim/admin/version.rb
index 3ea55a3e18291..05284ecfd052b 100644
--- a/decidim-admin/lib/decidim/admin/version.rb
+++ b/decidim-admin/lib/decidim/admin/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-admin version.
   module Admin
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-ai/lib/decidim/ai/version.rb b/decidim-ai/lib/decidim/ai/version.rb
index 4d3212226e744..fd4d9250b86cd 100644
--- a/decidim-ai/lib/decidim/ai/version.rb
+++ b/decidim-ai/lib/decidim/ai/version.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Ai
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-api/lib/decidim/api/version.rb b/decidim-api/lib/decidim/api/version.rb
index b4eb28489d7ab..8256e3d5549f1 100644
--- a/decidim-api/lib/decidim/api/version.rb
+++ b/decidim-api/lib/decidim/api/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-api version.
   module Api
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-assemblies/lib/decidim/assemblies/version.rb b/decidim-assemblies/lib/decidim/assemblies/version.rb
index a583a51f1ac23..e49bef4da0b3b 100644
--- a/decidim-assemblies/lib/decidim/assemblies/version.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-assemblies version.
   module Assemblies
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-blogs/lib/decidim/blogs/version.rb b/decidim-blogs/lib/decidim/blogs/version.rb
index d046905a15cf3..d68e2baab951d 100644
--- a/decidim-blogs/lib/decidim/blogs/version.rb
+++ b/decidim-blogs/lib/decidim/blogs/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-pages version.
   module Blogs
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-budgets/lib/decidim/budgets/version.rb b/decidim-budgets/lib/decidim/budgets/version.rb
index f442f7caab540..3825076381c14 100644
--- a/decidim-budgets/lib/decidim/budgets/version.rb
+++ b/decidim-budgets/lib/decidim/budgets/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-budgets version.
   module Budgets
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-collaborative_texts/lib/decidim/collaborative_texts/version.rb b/decidim-collaborative_texts/lib/decidim/collaborative_texts/version.rb
index f5fc505f80b48..ac613b4b33f67 100644
--- a/decidim-collaborative_texts/lib/decidim/collaborative_texts/version.rb
+++ b/decidim-collaborative_texts/lib/decidim/collaborative_texts/version.rb
@@ -3,7 +3,7 @@
 module Decidim
   module CollaborativeTexts
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-comments/lib/decidim/comments/version.rb b/decidim-comments/lib/decidim/comments/version.rb
index 471472f070ffd..209e4f320c722 100644
--- a/decidim-comments/lib/decidim/comments/version.rb
+++ b/decidim-comments/lib/decidim/comments/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-comments version.
   module Comments
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-conferences/lib/decidim/conferences/version.rb b/decidim-conferences/lib/decidim/conferences/version.rb
index 0757dec2c9c0a..ce06329833124 100644
--- a/decidim-conferences/lib/decidim/conferences/version.rb
+++ b/decidim-conferences/lib/decidim/conferences/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-conferences version.
   module Conferences
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-core/lib/decidim/core/version.rb b/decidim-core/lib/decidim/core/version.rb
index ab313bb18f531..3df1f88d46d37 100644
--- a/decidim-core/lib/decidim/core/version.rb
+++ b/decidim-core/lib/decidim/core/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-debates/lib/decidim/debates/version.rb b/decidim-debates/lib/decidim/debates/version.rb
index 3b18cff22df9b..c1c55cb07b683 100644
--- a/decidim-debates/lib/decidim/debates/version.rb
+++ b/decidim-debates/lib/decidim/debates/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-debates version.
   module Debates
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-demographics/lib/decidim/demographics/version.rb b/decidim-demographics/lib/decidim/demographics/version.rb
index d52151bc681aa..1783d7873711e 100644
--- a/decidim-demographics/lib/decidim/demographics/version.rb
+++ b/decidim-demographics/lib/decidim/demographics/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-demographics version.
   module Demographics
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-design/lib/decidim/design/version.rb b/decidim-design/lib/decidim/design/version.rb
index 059035f6ed438..fdf8ef697d075 100644
--- a/decidim-design/lib/decidim/design/version.rb
+++ b/decidim-design/lib/decidim/design/version.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Design
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-dev/lib/decidim/dev/version.rb b/decidim-dev/lib/decidim/dev/version.rb
index 125919336e858..f095cae9754d8 100644
--- a/decidim-dev/lib/decidim/dev/version.rb
+++ b/decidim-dev/lib/decidim/dev/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-dev version.
   module Dev
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-elections/lib/decidim/elections/version.rb b/decidim-elections/lib/decidim/elections/version.rb
index 784175cc4af25..6e70faddd4be1 100644
--- a/decidim-elections/lib/decidim/elections/version.rb
+++ b/decidim-elections/lib/decidim/elections/version.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Elections
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-forms/lib/decidim/forms/version.rb b/decidim-forms/lib/decidim/forms/version.rb
index 2195c3b71606a..4be89252dff11 100644
--- a/decidim-forms/lib/decidim/forms/version.rb
+++ b/decidim-forms/lib/decidim/forms/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-forms version.
   module Forms
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-generators/Gemfile.lock b/decidim-generators/Gemfile.lock
index 00d5991e469b5..73566a7745715 100644
--- a/decidim-generators/Gemfile.lock
+++ b/decidim-generators/Gemfile.lock
@@ -1,62 +1,62 @@
 PATH
   remote: ..
   specs:
-    decidim (0.31.4)
-      decidim-accountability (= 0.31.4)
-      decidim-admin (= 0.31.4)
-      decidim-api (= 0.31.4)
-      decidim-assemblies (= 0.31.4)
-      decidim-blogs (= 0.31.4)
-      decidim-budgets (= 0.31.4)
-      decidim-comments (= 0.31.4)
-      decidim-core (= 0.31.4)
-      decidim-debates (= 0.31.4)
-      decidim-forms (= 0.31.4)
-      decidim-generators (= 0.31.4)
-      decidim-meetings (= 0.31.4)
-      decidim-pages (= 0.31.4)
-      decidim-participatory_processes (= 0.31.4)
-      decidim-proposals (= 0.31.4)
-      decidim-sortitions (= 0.31.4)
-      decidim-surveys (= 0.31.4)
-      decidim-system (= 0.31.4)
-      decidim-verifications (= 0.31.4)
-    decidim-accountability (0.31.4)
-      decidim-comments (= 0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-admin (0.31.4)
+    decidim (0.31.5)
+      decidim-accountability (= 0.31.5)
+      decidim-admin (= 0.31.5)
+      decidim-api (= 0.31.5)
+      decidim-assemblies (= 0.31.5)
+      decidim-blogs (= 0.31.5)
+      decidim-budgets (= 0.31.5)
+      decidim-comments (= 0.31.5)
+      decidim-core (= 0.31.5)
+      decidim-debates (= 0.31.5)
+      decidim-forms (= 0.31.5)
+      decidim-generators (= 0.31.5)
+      decidim-meetings (= 0.31.5)
+      decidim-pages (= 0.31.5)
+      decidim-participatory_processes (= 0.31.5)
+      decidim-proposals (= 0.31.5)
+      decidim-sortitions (= 0.31.5)
+      decidim-surveys (= 0.31.5)
+      decidim-system (= 0.31.5)
+      decidim-verifications (= 0.31.5)
+    decidim-accountability (0.31.5)
+      decidim-comments (= 0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-admin (0.31.5)
       active_link_to (~> 1.0)
-      decidim-core (= 0.31.4)
+      decidim-core (= 0.31.5)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0, >= 2.0.9)
-    decidim-ai (0.31.4)
+    decidim-ai (0.31.5)
       classifier-reborn (~> 2.3.0)
-      decidim-core (= 0.31.4)
-    decidim-api (0.31.4)
-      decidim-core (= 0.31.4)
+      decidim-core (= 0.31.5)
+    decidim-api (0.31.5)
+      decidim-core (= 0.31.5)
       devise-jwt (~> 0.12.1)
       graphql (~> 2.4.0, >= 2.4.17)
       graphql-docs (~> 5.0)
       rack-cors (~> 1.0)
-    decidim-assemblies (0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-blogs (0.31.4)
-      decidim-admin (= 0.31.4)
-      decidim-comments (= 0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-budgets (0.31.4)
-      decidim-comments (= 0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-collaborative_texts (0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-comments (0.31.4)
-      decidim-core (= 0.31.4)
+    decidim-assemblies (0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-blogs (0.31.5)
+      decidim-admin (= 0.31.5)
+      decidim-comments (= 0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-budgets (0.31.5)
+      decidim-comments (= 0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-collaborative_texts (0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-comments (0.31.5)
+      decidim-core (= 0.31.5)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-conferences (0.31.4)
-      decidim-core (= 0.31.4)
-      decidim-meetings (= 0.31.4)
-    decidim-core (0.31.4)
+    decidim-conferences (0.31.5)
+      decidim-core (= 0.31.5)
+      decidim-meetings (= 0.31.5)
+    decidim-core (0.31.5)
       active_link_to (~> 1.0)
       acts_as_list (~> 1.0)
       batch-loader (~> 2.0)
@@ -111,24 +111,24 @@ PATH
       valid_email2 (~> 7.0)
       web-push (~> 3.0)
       wisper (~> 3.0)
-    decidim-debates (0.31.4)
-      decidim-comments (= 0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-demographics (0.31.4)
-      decidim-core (= 0.31.4)
-      decidim-forms (= 0.31.4)
-    decidim-design (0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-dev (0.31.4)
+    decidim-debates (0.31.5)
+      decidim-comments (= 0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-demographics (0.31.5)
+      decidim-core (= 0.31.5)
+      decidim-forms (= 0.31.5)
+    decidim-design (0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-dev (0.31.5)
       bullet (~> 8.0.0)
       byebug (~> 11.0)
       capybara (~> 3.39)
-      decidim-admin (= 0.31.4)
-      decidim-api (= 0.31.4)
-      decidim-comments (= 0.31.4)
-      decidim-core (= 0.31.4)
-      decidim-generators (= 0.31.4)
-      decidim-verifications (= 0.31.4)
+      decidim-admin (= 0.31.5)
+      decidim-api (= 0.31.5)
+      decidim-comments (= 0.31.5)
+      decidim-core (= 0.31.5)
+      decidim-generators (= 0.31.5)
+      decidim-verifications (= 0.31.5)
       erb_lint (~> 0.8.0)
       factory_bot_rails (~> 6.2)
       faker (~> 3.2)
@@ -161,51 +161,51 @@ PATH
       w3c_rspec_validators (~> 0.3.0)
       webmock (~> 3.18)
       wisper-rspec (~> 1.0)
-    decidim-elections (0.31.4)
-      decidim-admin (= 0.31.4)
-      decidim-core (= 0.31.4)
-      decidim-forms (= 0.31.4)
-    decidim-forms (0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-generators (0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-initiatives (0.31.4)
-      decidim-admin (= 0.31.4)
-      decidim-comments (= 0.31.4)
-      decidim-core (= 0.31.4)
-      decidim-verifications (= 0.31.4)
-    decidim-meetings (0.31.4)
-      decidim-core (= 0.31.4)
-      decidim-forms (= 0.31.4)
+    decidim-elections (0.31.5)
+      decidim-admin (= 0.31.5)
+      decidim-core (= 0.31.5)
+      decidim-forms (= 0.31.5)
+    decidim-forms (0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-generators (0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-initiatives (0.31.5)
+      decidim-admin (= 0.31.5)
+      decidim-comments (= 0.31.5)
+      decidim-core (= 0.31.5)
+      decidim-verifications (= 0.31.5)
+    decidim-meetings (0.31.5)
+      decidim-core (= 0.31.5)
+      decidim-forms (= 0.31.5)
       icalendar (~> 2.5)
-    decidim-pages (0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-participatory_processes (0.31.4)
-      decidim-core (= 0.31.4)
-    decidim-proposals (0.31.4)
-      decidim-comments (= 0.31.4)
-      decidim-core (= 0.31.4)
+    decidim-pages (0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-participatory_processes (0.31.5)
+      decidim-core (= 0.31.5)
+    decidim-proposals (0.31.5)
+      decidim-comments (= 0.31.5)
+      decidim-core (= 0.31.5)
       doc2text (~> 0.4.0, >= 0.4.8)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-sortitions (0.31.4)
-      decidim-admin (= 0.31.4)
-      decidim-comments (= 0.31.4)
-      decidim-core (= 0.31.4)
-      decidim-proposals (= 0.31.4)
-    decidim-surveys (0.31.4)
-      decidim-core (= 0.31.4)
-      decidim-forms (= 0.31.4)
-    decidim-system (0.31.4)
+    decidim-sortitions (0.31.5)
+      decidim-admin (= 0.31.5)
+      decidim-comments (= 0.31.5)
+      decidim-core (= 0.31.5)
+      decidim-proposals (= 0.31.5)
+    decidim-surveys (0.31.5)
+      decidim-core (= 0.31.5)
+      decidim-forms (= 0.31.5)
+    decidim-system (0.31.5)
       active_link_to (~> 1.0)
-      decidim-core (= 0.31.4)
+      decidim-core (= 0.31.5)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0, >= 2.0.9)
-    decidim-templates (0.31.4)
-      decidim-core (= 0.31.4)
-      decidim-forms (= 0.31.4)
-    decidim-verifications (0.31.4)
-      decidim-core (= 0.31.4)
+    decidim-templates (0.31.5)
+      decidim-core (= 0.31.5)
+      decidim-forms (= 0.31.5)
+    decidim-verifications (0.31.5)
+      decidim-core (= 0.31.5)
 
 GEM
   remote: https://rubygems.org/
diff --git a/decidim-generators/lib/decidim/generators/component_templates/Gemfile.erb b/decidim-generators/lib/decidim/generators/component_templates/Gemfile.erb
index 7a664463115f9..aa2f1d70fb926 100644
--- a/decidim-generators/lib/decidim/generators/component_templates/Gemfile.erb
+++ b/decidim-generators/lib/decidim/generators/component_templates/Gemfile.erb
@@ -5,7 +5,7 @@ source "https://rubygems.org"
 
 ruby RUBY_VERSION
 
-gem "decidim", "~> 0.31.4"
+gem "decidim", "~> 0.31.5"
 gem "decidim-<%= component_name %>", path: "."
 
 gem "puma", ">= 6.3.1"
@@ -14,7 +14,7 @@ gem "bootsnap", "~> 1.4"
 group :development, :test do
   gem "byebug", "~> 11.0", platform: :mri
 
-  gem "decidim-dev", "~> 0.31.4"
+  gem "decidim-dev", "~> 0.31.5"
 end
 
 group :development do
diff --git a/decidim-generators/lib/decidim/generators/version.rb b/decidim-generators/lib/decidim/generators/version.rb
index f2dff1c7f1b8b..264d9fb140a8d 100644
--- a/decidim-generators/lib/decidim/generators/version.rb
+++ b/decidim-generators/lib/decidim/generators/version.rb
@@ -4,7 +4,7 @@
 module Decidim
   module Generators
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-initiatives/lib/decidim/initiatives/version.rb b/decidim-initiatives/lib/decidim/initiatives/version.rb
index 51b7eb6952ed7..808894d3d0b83 100644
--- a/decidim-initiatives/lib/decidim/initiatives/version.rb
+++ b/decidim-initiatives/lib/decidim/initiatives/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-initiatives version.
   module Initiatives
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-meetings/lib/decidim/meetings/version.rb b/decidim-meetings/lib/decidim/meetings/version.rb
index 5ab4aa4cc1390..12147d6c40fdb 100644
--- a/decidim-meetings/lib/decidim/meetings/version.rb
+++ b/decidim-meetings/lib/decidim/meetings/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Meetings
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-pages/lib/decidim/pages/version.rb b/decidim-pages/lib/decidim/pages/version.rb
index afabdcc0dbe3f..a6b36e502aa3c 100644
--- a/decidim-pages/lib/decidim/pages/version.rb
+++ b/decidim-pages/lib/decidim/pages/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-pages version.
   module Pages
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/version.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/version.rb
index 6021942f05c14..899bd8dbb3fe8 100644
--- a/decidim-participatory_processes/lib/decidim/participatory_processes/version.rb
+++ b/decidim-participatory_processes/lib/decidim/participatory_processes/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-participatory_processes version.
   module ParticipatoryProcesses
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-proposals/lib/decidim/proposals/version.rb b/decidim-proposals/lib/decidim/proposals/version.rb
index 8fe8c371eac1c..b7992c1d82dab 100644
--- a/decidim-proposals/lib/decidim/proposals/version.rb
+++ b/decidim-proposals/lib/decidim/proposals/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-sortitions/lib/decidim/sortitions/version.rb b/decidim-sortitions/lib/decidim/sortitions/version.rb
index 8a43b333ea8c8..9f804479a2c9a 100644
--- a/decidim-sortitions/lib/decidim/sortitions/version.rb
+++ b/decidim-sortitions/lib/decidim/sortitions/version.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Sortitions
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-surveys/lib/decidim/surveys/version.rb b/decidim-surveys/lib/decidim/surveys/version.rb
index 390d2f51ac5d4..5bedacf257a87 100644
--- a/decidim-surveys/lib/decidim/surveys/version.rb
+++ b/decidim-surveys/lib/decidim/surveys/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-surveys version.
   module Surveys
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-system/lib/decidim/system/version.rb b/decidim-system/lib/decidim/system/version.rb
index 124203f36b9ed..2fbdfef26f6fd 100644
--- a/decidim-system/lib/decidim/system/version.rb
+++ b/decidim-system/lib/decidim/system/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-system version.
   module System
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-templates/lib/decidim/templates/version.rb b/decidim-templates/lib/decidim/templates/version.rb
index 512ef5903f106..6936d1d8a9e87 100644
--- a/decidim-templates/lib/decidim/templates/version.rb
+++ b/decidim-templates/lib/decidim/templates/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-templates version.
   module Templates
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/decidim-verifications/lib/decidim/verifications/version.rb b/decidim-verifications/lib/decidim/verifications/version.rb
index 53d67cebacb15..d85a6275c8bf5 100644
--- a/decidim-verifications/lib/decidim/verifications/version.rb
+++ b/decidim-verifications/lib/decidim/verifications/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-verifications version.
   module Verifications
     def self.version
-      "0.31.4"
+      "0.31.5"
     end
   end
 end
diff --git a/lib/decidim/version.rb b/lib/decidim/version.rb
index f2cea92dc6435..178c9431500d9 100644
--- a/lib/decidim/version.rb
+++ b/lib/decidim/version.rb
@@ -3,6 +3,6 @@
 # This holds the decidim version and the faker version it uses.
 module Decidim
   def self.version
-    "0.31.4"
+    "0.31.5"
   end
 end
diff --git a/package-lock.json b/package-lock.json
index 58a1211675ec2..0f823f06124e7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20984,12 +20984,12 @@
     },
     "packages/browserslist-config": {
       "name": "@decidim/browserslist-config",
-      "version": "0.31.4",
+      "version": "0.31.5",
       "license": "AGPL-3.0-or-later"
     },
     "packages/core": {
       "name": "@decidim/core",
-      "version": "0.31.4",
+      "version": "0.31.5",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "@emoji-mart/data": "^1.1.2",
@@ -21066,7 +21066,7 @@
     },
     "packages/dev": {
       "name": "@decidim/dev",
-      "version": "0.31.4",
+      "version": "0.31.5",
       "dev": true,
       "license": "AGPL-3.0-or-later",
       "dependencies": {
@@ -21077,7 +21077,7 @@
     },
     "packages/eslint-config": {
       "name": "@decidim/eslint-config",
-      "version": "0.31.4",
+      "version": "0.31.5",
       "dev": true,
       "license": "AGPL-3.0-or-later",
       "peerDependencies": {
@@ -21095,7 +21095,7 @@
     },
     "packages/prettier-config": {
       "name": "@decidim/prettier-config",
-      "version": "0.31.4",
+      "version": "0.31.5",
       "dev": true,
       "license": "AGPL-3.0-or-later",
       "peerDependencies": {
@@ -21104,7 +21104,7 @@
     },
     "packages/stylelint-config": {
       "name": "@decidim/stylelint-config",
-      "version": "0.31.4",
+      "version": "0.31.5",
       "dev": true,
       "license": "AGPL-3.0-or-later",
       "peerDependencies": {
@@ -21114,7 +21114,7 @@
     },
     "packages/webpacker": {
       "name": "@decidim/webpacker",
-      "version": "0.31.4",
+      "version": "0.31.5",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "@hotwired/stimulus": "^3.2.2",
diff --git a/packages/browserslist-config/package.json b/packages/browserslist-config/package.json
index b4c3cfa23d0ca..1f73ec7561476 100644
--- a/packages/browserslist-config/package.json
+++ b/packages/browserslist-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/browserslist-config",
   "description": "The Browserslist configuration for Decidim",
-  "version": "0.31.4",
+  "version": "0.31.5",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/core/package.json b/packages/core/package.json
index 320b76e107eff..54f7fe14766b8 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/core",
   "description": "The core dependencies for Decidim",
-  "version": "0.31.4",
+  "version": "0.31.5",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/dev/package.json b/packages/dev/package.json
index 2751ddeab4404..0c3ee08f0bf65 100644
--- a/packages/dev/package.json
+++ b/packages/dev/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/dev",
   "description": "The dev dependencies for Decidim",
-  "version": "0.31.4",
+  "version": "0.31.5",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
index d06c6e284bad6..f2707133e217d 100644
--- a/packages/eslint-config/package.json
+++ b/packages/eslint-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/eslint-config",
   "description": "The eslint configuration for Decidim",
-  "version": "0.31.4",
+  "version": "0.31.5",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json
index 6c9236e3557f1..a170d14799953 100644
--- a/packages/prettier-config/package.json
+++ b/packages/prettier-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/prettier-config",
   "description": "The prettier configuration for Decidim",
-  "version": "0.31.4",
+  "version": "0.31.5",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/stylelint-config/package.json b/packages/stylelint-config/package.json
index ce9998b979e9c..4ed5b19171dfa 100644
--- a/packages/stylelint-config/package.json
+++ b/packages/stylelint-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/stylelint-config",
   "description": "The stylelint configuration for Decidim",
-  "version": "0.31.4",
+  "version": "0.31.5",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/webpacker/package.json b/packages/webpacker/package.json
index ceb509c6689fb..08e28be479fd9 100644
--- a/packages/webpacker/package.json
+++ b/packages/webpacker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/webpacker",
   "description": "The webpacker dependencies for Decidim",
-  "version": "0.31.4",
+  "version": "0.31.5",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",

From c9077140d9eb6dddd764138aede9fdb601755ba4 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Tue, 12 May 2026 17:03:13 +0200
Subject: [PATCH 014/131] Backport 'Fix spacing in content block settings
 forms' to v0.31 (#16780)

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
---
 .../static_page/section_settings_form/show.erb              | 4 +++-
 .../static_page/summary_settings_form/show.erb              | 4 +++-
 .../static_page/two_pane_section_settings_form/show.erb     | 6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/decidim-core/app/cells/decidim/content_blocks/static_page/section_settings_form/show.erb b/decidim-core/app/cells/decidim/content_blocks/static_page/section_settings_form/show.erb
index ac27d57bcae47..7abe6a09ffd73 100644
--- a/decidim-core/app/cells/decidim/content_blocks/static_page/section_settings_form/show.erb
+++ b/decidim-core/app/cells/decidim/content_blocks/static_page/section_settings_form/show.erb
@@ -1,3 +1,5 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.translated :editor, :content, label: %>
+  <div class="row column">
+    <%= settings_fields.translated :editor, :content, label: %>
+  </div>
 <% end %>
diff --git a/decidim-core/app/cells/decidim/content_blocks/static_page/summary_settings_form/show.erb b/decidim-core/app/cells/decidim/content_blocks/static_page/summary_settings_form/show.erb
index 56da1bba50a83..ad4ce22227733 100644
--- a/decidim-core/app/cells/decidim/content_blocks/static_page/summary_settings_form/show.erb
+++ b/decidim-core/app/cells/decidim/content_blocks/static_page/summary_settings_form/show.erb
@@ -1,3 +1,5 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.translated :editor, :summary, label: %>
+  <div class="row column">
+    <%= settings_fields.translated :editor, :summary, label: %>
+  </div>
 <% end %>
diff --git a/decidim-core/app/cells/decidim/content_blocks/static_page/two_pane_section_settings_form/show.erb b/decidim-core/app/cells/decidim/content_blocks/static_page/two_pane_section_settings_form/show.erb
index 06b9adf32e15c..1f9c9e88cb41f 100644
--- a/decidim-core/app/cells/decidim/content_blocks/static_page/two_pane_section_settings_form/show.erb
+++ b/decidim-core/app/cells/decidim/content_blocks/static_page/two_pane_section_settings_form/show.erb
@@ -1,4 +1,6 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.translated :editor, :left_column, label: label_left_column %>
-  <%= settings_fields.translated :editor, :right_column, label: label_right_column %>
+  <div class="row column">
+    <%= settings_fields.translated :editor, :left_column, label: label_left_column %>
+    <%= settings_fields.translated :editor, :right_column, label: label_right_column %>
+  </div>
 <% end %>

From c1dc367da7dcb5ae98d006f424c8b0c3f04dcc81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= <ivan@pokecode.net>
Date: Wed, 13 May 2026 12:31:11 +0200
Subject: [PATCH 015/131] fix election edit

---
 .../decidim/elections/admin/election_form.rb  |  2 +-
 .../elections/admin/election_form_spec.rb     | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/decidim-elections/app/forms/decidim/elections/admin/election_form.rb b/decidim-elections/app/forms/decidim/elections/admin/election_form.rb
index f8d6e12a195c7..1a4972fb8a490 100644
--- a/decidim-elections/app/forms/decidim/elections/admin/election_form.rb
+++ b/decidim-elections/app/forms/decidim/elections/admin/election_form.rb
@@ -25,7 +25,7 @@ class ElectionForm < Decidim::Form
         validates :title, translatable_presence: true
         validates :results_availability, inclusion: { in: Decidim::Elections::Election::RESULTS_AVAILABILITY_OPTIONS }
         validates :start_at, date: { before: :end_at }, unless: :manual_start?
-        validates :start_at, date: { after: proc { Time.current } }, if: :scheduled_election?
+        validates :start_at, date: { after: proc { Time.current } }, if: ->(f) { f.election&.scheduled? && f.start_at.present? }
         validates :manual_start, acceptance: true, if: :per_question_not_started?
         validates :end_at, presence: true
         validates :end_at, date: { after: :start_at }, if: ->(f) { f.start_at.present? && f.end_at.present? }
diff --git a/decidim-elections/spec/forms/decidim/elections/admin/election_form_spec.rb b/decidim-elections/spec/forms/decidim/elections/admin/election_form_spec.rb
index b0fd5459b85ae..e805c8d322bfe 100644
--- a/decidim-elections/spec/forms/decidim/elections/admin/election_form_spec.rb
+++ b/decidim-elections/spec/forms/decidim/elections/admin/election_form_spec.rb
@@ -194,6 +194,34 @@ module Decidim::Elections
         it { is_expected.to be_valid }
       end
 
+      context "when editing a published election configured for manual start" do
+        let(:election) { create(:election, :published, component:, start_at: nil, end_at: 4.days.from_now) }
+        let(:manual_start) { true }
+        let(:start_at) { nil }
+
+        context "and end_at is valid (in the future)" do
+          let(:end_at) { 2.days.from_now }
+
+          it { is_expected.to be_valid }
+
+          it "does not validate start_at when it is nil" do
+            expect(subject.valid?).to be true
+            expect(subject.errors[:start_at]).to be_empty
+          end
+        end
+
+        context "and end_at is set in the past" do
+          let(:end_at) { 1.day.ago }
+
+          it { is_expected.not_to be_valid }
+
+          it "still validates end_at to prevent moving the election into a finished state" do
+            subject.valid?
+            expect(subject.errors[:end_at]).not_to be_empty
+          end
+        end
+      end
+
       context "when election is not published" do
         let(:election) { create(:election, component:, start_at: 3.days.from_now, end_at: 4.days.from_now) }
 

From 989b6a0f3920efa1c20e59fc69e8fa39f5125f43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= <ivan@pokecode.net>
Date: Wed, 13 May 2026 14:39:27 +0200
Subject: [PATCH 016/131] fix locale setup in devise controllers

---
 .github/actions/spelling/expect.txt           |  3 +++
 .../concerns/decidim/devise_controllers.rb    |  8 +++++++
 decidim-core/spec/system/locales_spec.rb      | 23 ++++++++++++++++++-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index c14bc9e1abe17..9061e165d318d 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -94,6 +94,7 @@ Brakus
 breadcrumb
 browserstack
 bugfixing
+busques
 byebug
 bytesize
 cacatua
@@ -406,6 +407,7 @@ infob
 informables
 Inici
 iniciar
+iniciat
 inodes
 inputdialog
 inputname
@@ -879,6 +881,7 @@ trashable
 traslatable
 trgm
 trobada
+trobat
 tsearch
 turbolinks
 Twilio
diff --git a/decidim-core/app/controllers/concerns/decidim/devise_controllers.rb b/decidim-core/app/controllers/concerns/decidim/devise_controllers.rb
index f0510877242b8..311d6f8beb66e 100644
--- a/decidim-core/app/controllers/concerns/decidim/devise_controllers.rb
+++ b/decidim-core/app/controllers/concerns/decidim/devise_controllers.rb
@@ -41,6 +41,10 @@ module DeviseControllers
 
       layout "layouts/decidim/application"
 
+      # Ensure locale is set before Devise's own prepended callbacks and reset
+      # after the request finishes.
+      prepend_around_action :set_current_locale
+
       # Saves the location before loading each page so we can return to the
       # right page.
       before_action :store_current_location
@@ -58,6 +62,10 @@ def store_current_location
 
         store_location_for(:user, redirect_url)
       end
+
+      def set_current_locale(&)
+        I18n.with_locale(session[:user_locale], &)
+      end
     end
   end
 end
diff --git a/decidim-core/spec/system/locales_spec.rb b/decidim-core/spec/system/locales_spec.rb
index 8f907070cedb4..dd7d203fcf144 100644
--- a/decidim-core/spec/system/locales_spec.rb
+++ b/decidim-core/spec/system/locales_spec.rb
@@ -69,16 +69,37 @@
       let(:user) { create(:user, :confirmed, locale: "ca", organization:) }
 
       before do
+        allow(Rails.application).to \
+          receive(:env_config).with(no_args).and_wrap_original do |m, *|
+          m.call.merge(
+            "action_dispatch.show_exceptions" => true,
+            "action_dispatch.show_detailed_exceptions" => false
+          )
+        end
+
         login_as user, scope: :user
 
         # Prevent flaky spec, where sometimes the language is not changed before the visit
         sleep 2
-        visit decidim.root_path
       end
 
       it "uses the user's locale" do
+        visit decidim.root_path
+
         expect(page).to have_content("Inici")
       end
+
+      it "displays not found messages with the right locale" do
+        visit decidim_admin.root_path
+
+        expect(page).to have_content("No s'ha trobat la pàgina que busques")
+      end
+
+      it "displays devise messages with the right locale" do
+        visit decidim.new_user_session_path(locale: "ca")
+
+        expect(page).to have_content("Ja has iniciat la sessió.")
+      end
     end
   end
 end

From 5e684f638fbceb61919e6b87776f3e5460913dbf Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Fri, 15 May 2026 06:57:49 +0200
Subject: [PATCH 017/131] Backport 'Execute authorization revocation in the
 background' to v0.31 (#16806)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Move authorization revocation to background jobs

* Update info

* Eager-load authorization transfers in revocation jobs

* Update eager loading

* Rename job, improve message and add yardoc

* Change comments to YARD format

Co-authored-by: Alejandro Rueda López <alejandro.rueda@nazaries.com>
---
 .../revoke_all_authorizations.rb              |  15 +-
 .../revoke_authorizations_by_condition.rb     |  46 +++++
 .../revoke_by_condition_authorizations.rb     |  68 -------
 .../admin/verifications_controller.rb         |   2 +-
 .../revoke_all_authorizations_job.rb          |  30 ++++
 .../revoke_authorizations_by_condition_job.rb |  44 +++++
 decidim-verifications/config/locales/en.yml   |   2 +-
 .../revoke_all_authorizations_spec.rb         |  87 +--------
 ...revoke_authorizations_by_condition_spec.rb |  80 +++++++++
 .../revoke_all_authorizations_job_spec.rb     |  89 +++++++++
 ...e_authorizations_by_condition_job_spec.rb} | 170 ++++--------------
 .../spec/system/revocation_auths_spec.rb      |   4 +-
 12 files changed, 339 insertions(+), 298 deletions(-)
 create mode 100644 decidim-verifications/app/commands/decidim/verifications/revoke_authorizations_by_condition.rb
 delete mode 100644 decidim-verifications/app/commands/decidim/verifications/revoke_by_condition_authorizations.rb
 create mode 100644 decidim-verifications/app/jobs/decidim/verifications/revoke_all_authorizations_job.rb
 create mode 100644 decidim-verifications/app/jobs/decidim/verifications/revoke_authorizations_by_condition_job.rb
 create mode 100644 decidim-verifications/spec/commands/decidim/verifications/revoke_authorizations_by_condition_spec.rb
 create mode 100644 decidim-verifications/spec/jobs/decidim/verifications/revoke_all_authorizations_job_spec.rb
 rename decidim-verifications/spec/{commands/decidim/verifications/revoke_by_condition_authorizations_spec.rb => jobs/decidim/verifications/revoke_authorizations_by_condition_job_spec.rb} (57%)

diff --git a/decidim-verifications/app/commands/decidim/verifications/revoke_all_authorizations.rb b/decidim-verifications/app/commands/decidim/verifications/revoke_all_authorizations.rb
index 8b5351a7e73a7..b2472c34c7be0 100644
--- a/decidim-verifications/app/commands/decidim/verifications/revoke_all_authorizations.rb
+++ b/decidim-verifications/app/commands/decidim/verifications/revoke_all_authorizations.rb
@@ -22,20 +22,7 @@ def initialize(organization, current_user)
       def call
         return broadcast(:invalid) unless @organization
 
-        auths = Decidim::Verifications::Authorizations.new(
-          organization:,
-          granted: true
-        ).query
-
-        auths.find_each do |auth|
-          Decidim.traceability.perform_action!(
-            :destroy,
-            auth,
-            current_user
-          ) do
-            auth.destroy
-          end
-        end
+        RevokeAllAuthorizationsJob.perform_later(organization, current_user)
 
         broadcast(:ok)
       end
diff --git a/decidim-verifications/app/commands/decidim/verifications/revoke_authorizations_by_condition.rb b/decidim-verifications/app/commands/decidim/verifications/revoke_authorizations_by_condition.rb
new file mode 100644
index 0000000000000..2d4ce7e0ce36a
--- /dev/null
+++ b/decidim-verifications/app/commands/decidim/verifications/revoke_authorizations_by_condition.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Verifications
+    # A command to revoke authorizations with filter
+    class RevokeAuthorizationsByCondition < Decidim::Command
+      delegate :current_user, to: :form
+      # Initializes the command.
+      #
+      # @param organization [Decidim::Organization] The organization where authorizations will be revoked
+      # @param form [Decidim::Verifications::RevocationsBeforeDateForm] A form object with the verification data to confirm it
+      def initialize(organization, form)
+        @organization = organization
+        @form = form
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid.
+      # - :invalid if the handler was not valid and we could not proceed.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) unless @organization
+        return broadcast(:invalid) unless @form.valid?
+
+        if @form.before_date.present?
+          RevokeAuthorizationsByConditionJob.perform_later(
+            organization,
+            current_user,
+            @form.before_date,
+            @form.impersonated_only?
+          )
+
+          broadcast(:ok)
+        else
+          broadcast(:invalid)
+        end
+      end
+
+      private
+
+      attr_reader :organization, :form
+    end
+  end
+end
diff --git a/decidim-verifications/app/commands/decidim/verifications/revoke_by_condition_authorizations.rb b/decidim-verifications/app/commands/decidim/verifications/revoke_by_condition_authorizations.rb
deleted file mode 100644
index 38c46d9abe7bf..0000000000000
--- a/decidim-verifications/app/commands/decidim/verifications/revoke_by_condition_authorizations.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Verifications
-    # A command to revoke authorizations with filter
-    class RevokeByConditionAuthorizations < Decidim::Command
-      delegate :current_user, to: :form
-      # Public: Initializes the command.
-      #
-      # organization - Organization object.
-      # current_user - The current user.
-      # form - A form object with the verification data to confirm it.
-      def initialize(organization, form)
-        @organization = organization
-        @form = form
-      end
-
-      # Executes the command. Broadcasts these events:
-      #
-      # - :ok when everything is valid.
-      # - :invalid if the handler was not valid and we could not proceed.
-      #
-      # Returns nothing.
-      def call
-        return broadcast(:invalid) unless @organization
-        return broadcast(:invalid) unless @form.valid?
-
-        # Check before date
-        if @form.before_date.present?
-          authorizations_to_revoke = if @form.impersonated_only?
-                                       Decidim::Verifications::AuthorizationsBeforeDate.new(
-                                         organization:,
-                                         date: @form.before_date,
-                                         granted: true,
-                                         impersonated_only: @form.impersonated_only
-                                       )
-                                     else
-                                       Decidim::Verifications::AuthorizationsBeforeDate.new(
-                                         organization:,
-                                         date: @form.before_date,
-                                         granted: true
-                                       )
-                                     end
-
-          auths = authorizations_to_revoke.query
-          auths.find_each do |auth|
-            Decidim.traceability.perform_action!(
-              :destroy,
-              auth,
-              current_user
-            ) do
-              auth.destroy
-            end
-          end
-
-          broadcast(:ok)
-
-        else
-          broadcast(:invalid)
-        end
-      end
-
-      private
-
-      attr_reader :organization, :form
-    end
-  end
-end
diff --git a/decidim-verifications/app/controllers/decidim/verifications/admin/verifications_controller.rb b/decidim-verifications/app/controllers/decidim/verifications/admin/verifications_controller.rb
index 10ee5a0b30740..076f204c9c1ae 100644
--- a/decidim-verifications/app/controllers/decidim/verifications/admin/verifications_controller.rb
+++ b/decidim-verifications/app/controllers/decidim/verifications/admin/verifications_controller.rb
@@ -9,7 +9,7 @@ def destroy_before_date
           return unless params.has_key?(:revocations_before_date)
 
           form = RevocationsBeforeDateForm.from_params(params[:revocations_before_date])
-          RevokeByConditionAuthorizations.call(current_organization, form) do
+          RevokeAuthorizationsByCondition.call(current_organization, form) do
             on(:ok) do
               flash[:notice] = t("authorization_revocation.destroy_ok", scope: "decidim.admin.menu")
               redirect_to decidim_admin.authorization_workflows_url
diff --git a/decidim-verifications/app/jobs/decidim/verifications/revoke_all_authorizations_job.rb b/decidim-verifications/app/jobs/decidim/verifications/revoke_all_authorizations_job.rb
new file mode 100644
index 0000000000000..034af6a69aca8
--- /dev/null
+++ b/decidim-verifications/app/jobs/decidim/verifications/revoke_all_authorizations_job.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Verifications
+    class RevokeAllAuthorizationsJob < Decidim::ApplicationJob
+      queue_as :default
+
+      # Revokes every granted authorization for the given organization.
+      #
+      # @param organization [Decidim::Organization] The organization whose authorizations will be revoked
+      # @param current_user [Decidim::User] the current user.
+      def perform(organization, current_user)
+        auths = Decidim::Verifications::Authorizations.new(
+          organization:,
+          granted: true
+        ).query.includes(transfers: :records)
+
+        auths.find_each do |auth|
+          Decidim.traceability.perform_action!(
+            :destroy,
+            auth,
+            current_user
+          ) do
+            auth.destroy
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-verifications/app/jobs/decidim/verifications/revoke_authorizations_by_condition_job.rb b/decidim-verifications/app/jobs/decidim/verifications/revoke_authorizations_by_condition_job.rb
new file mode 100644
index 0000000000000..5922fc3ad0555
--- /dev/null
+++ b/decidim-verifications/app/jobs/decidim/verifications/revoke_authorizations_by_condition_job.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Verifications
+    class RevokeAuthorizationsByConditionJob < Decidim::ApplicationJob
+      queue_as :default
+
+      # Revokes the organization's granted authorizations created before
+      # the given date, optionally limited to impersonated users only.
+      #
+      # @param organization [Decidim::Organization] The organization whose authorizations will be revoked
+      # @param current_user [Decidim::User] the current user.
+      # @param before_date [Date] Only authorizations created before this date are revoked
+      # @param impersonated_only [Boolean] When true, only impersonated users' authorizations are revoked
+      def perform(organization, current_user, before_date, impersonated_only)
+        authorizations_to_revoke = if impersonated_only
+                                     Decidim::Verifications::AuthorizationsBeforeDate.new(
+                                       organization:,
+                                       date: before_date,
+                                       granted: true,
+                                       impersonated_only:
+                                     )
+                                   else
+                                     Decidim::Verifications::AuthorizationsBeforeDate.new(
+                                       organization:,
+                                       date: before_date,
+                                       granted: true
+                                     )
+                                   end
+
+        auths = authorizations_to_revoke.query.includes(transfers: :records)
+        auths.find_each do |auth|
+          Decidim.traceability.perform_action!(
+            :destroy,
+            auth,
+            current_user
+          ) do
+            auth.destroy
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-verifications/config/locales/en.yml b/decidim-verifications/config/locales/en.yml
index 5a27a57321689..222b4f319deef 100644
--- a/decidim-verifications/config/locales/en.yml
+++ b/decidim-verifications/config/locales/en.yml
@@ -49,7 +49,7 @@ en:
             confirm: Revoke before date authorizations cannot be undone. Are you sure you want to continue?
             confirm_all: Revoke all the authorizations cannot be undone. Are you sure you want to continue?
           destroy_nok: There was a problem while revoking authorizations.
-          destroy_ok: All matched authorizations have been revocated successfully.
+          destroy_ok: Revocation of authorizations is in progress. This may take a few minutes to complete.
           info: There are a total of %{count} verified participants.
           no_data: No verified participants.
           title: Authorizations revocation
diff --git a/decidim-verifications/spec/commands/decidim/verifications/revoke_all_authorizations_spec.rb b/decidim-verifications/spec/commands/decidim/verifications/revoke_all_authorizations_spec.rb
index 47fb825f5b262..bed1d8b43973f 100644
--- a/decidim-verifications/spec/commands/decidim/verifications/revoke_all_authorizations_spec.rb
+++ b/decidim-verifications/spec/commands/decidim/verifications/revoke_all_authorizations_spec.rb
@@ -7,40 +7,7 @@ module Decidim::Verifications
     subject { described_class.new(organization, current_user) }
 
     let(:organization) { create(:organization) }
-    let(:now) { Time.zone.now }
-    let(:prev_week) { Time.zone.today.prev_week }
-    let(:all_authorizations) do
-      Decidim::Verifications::Authorizations.new(
-        organization:
-      ).query
-    end
-    let(:granted_authorizations) do
-      Decidim::Verifications::Authorizations.new(
-        organization:,
-        granted: true
-      ).query
-    end
-    let(:no_granted_authorizations) do
-      Decidim::Verifications::Authorizations.new(
-        organization:,
-        granted: false
-      ).query
-    end
     let!(:current_user) { create(:user, :admin, :confirmed, organization:) }
-    let!(:user0) { create(:user, :admin, :confirmed, organization:) }
-    let!(:user1) { create(:user, :admin, :confirmed, organization:) }
-    let!(:user2) { create(:user, :admin, :confirmed, organization:) }
-    let!(:user3) { create(:user, :admin, :confirmed, organization:) }
-    let!(:user4) { create(:user, :admin, :confirmed, organization:) }
-    let!(:user5) { create(:user, :admin, :confirmed, organization:, managed: true) }
-
-    # With 6 authorizations, 3 granted, 2 pending, only 1 granted & managed
-    let!(:authorization1) { create(:authorization, created_at: prev_week, granted_at: prev_week, name: Faker::Name.name, user: user0) }
-    let!(:authorization2) { create(:authorization, created_at: prev_week, granted_at: prev_week, name: Faker::Name.name, user: user1) }
-    let!(:authorization3) { create(:authorization, created_at: prev_week, granted_at: prev_week, name: Faker::Name.name, user: user2) }
-    let!(:authorization4) { create(:authorization, created_at: prev_week, granted_at: nil, name: Faker::Name.name, user: user3) }
-    let!(:authorization5) { create(:authorization, created_at: prev_week, granted_at: nil, name: Faker::Name.name, user: user4) }
-    let!(:authorization6) { create(:authorization, created_at: prev_week, granted_at: prev_week, name: Faker::Name.name, user: user5) }
 
     describe "When creating a revoke all authorizations command" do
       context "with organization not set" do
@@ -49,61 +16,19 @@ module Decidim::Verifications
         it "is not valid" do
           expect { subject.call }.to broadcast(:invalid)
         end
-      end
-    end
-
-    describe "With 4 granted auths and 2 ungranted auths" do
-      context "when destroy all granted auths" do
-        it "does not destroy any ungranted auth" do
-          expect do
-            subject.call
-          end.not_to change(no_granted_authorizations, :count)
-        end
 
-        it "destroy all granted auths" do
-          expect do
-            subject.call
-          end.to change(granted_authorizations, :count).from(4).to(0)
+        it "does not enqueue a job" do
+          expect { subject.call }.not_to have_enqueued_job(RevokeAllAuthorizationsJob)
         end
+      end
 
+      context "with valid organization" do
         it "broadcasts ok" do
           expect { subject.call }.to broadcast(:ok)
         end
 
-        it "traces the action", versioning: true do
-          granted_authorizations.find_each do |auth|
-            expect(Decidim.traceability)
-              .to receive(:perform_action!)
-              .with(:destroy, auth, current_user)
-              .and_call_original
-          end
-          expect { subject.call }.to change(Decidim::ActionLog, :count)
-          action_log = Decidim::ActionLog.last
-          expect(action_log.version).to be_present
-        end
-
-        context "with authorization transfers attached to some of the authorizations" do
-          let!(:authorization_transfer1) { create(:authorization_transfer, organization:, authorization: authorization1) }
-          let!(:authorization_transfer2) { create(:authorization_transfer, organization:, authorization: authorization1) }
-          let!(:authorization_transfer3) { create(:authorization_transfer, organization:, authorization: authorization2) }
-
-          before do
-            create_list(:authorization_transfer_record, 2, transfer: authorization_transfer1)
-            create_list(:authorization_transfer_record, 2, transfer: authorization_transfer2)
-            create(:authorization_transfer_record, transfer: authorization_transfer3)
-          end
-
-          it "destroy all granted auths" do
-            expect do
-              subject.call
-            end.to change(granted_authorizations, :count).from(4).to(0)
-          end
-
-          it "destroy all authorization transfers" do
-            expect do
-              subject.call
-            end.to change(Decidim::AuthorizationTransfer, :count).from(3).to(0)
-          end
+        it "enqueues a RevokeAllAuthorizationsJob" do
+          expect { subject.call }.to have_enqueued_job(RevokeAllAuthorizationsJob).with(organization, current_user)
         end
       end
     end
diff --git a/decidim-verifications/spec/commands/decidim/verifications/revoke_authorizations_by_condition_spec.rb b/decidim-verifications/spec/commands/decidim/verifications/revoke_authorizations_by_condition_spec.rb
new file mode 100644
index 0000000000000..be088ac40f709
--- /dev/null
+++ b/decidim-verifications/spec/commands/decidim/verifications/revoke_authorizations_by_condition_spec.rb
@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::Verifications
+  describe RevokeAuthorizationsByCondition do
+    subject { described_class.new(organization, form) }
+
+    let(:params) do
+      {
+        impersonated_only:,
+        before_date:
+      }
+    end
+
+    let(:form) do
+      Decidim::Verifications::Admin::RevocationsBeforeDateForm
+        .from_params(params)
+        .with_context(current_user:)
+    end
+
+    let(:prev_week) { Time.zone.today.prev_week }
+    let(:organization) { create(:organization) }
+    let(:impersonated_only) { true }
+    let(:before_date) { prev_week }
+    let(:current_user) { create(:user, :admin, :confirmed, organization:) }
+
+    describe "when creating a revoke by condition authorizations command" do
+      context "with organization not set neither current_user but impersonated_only & before_date" do
+        let(:organization) { nil }
+        let(:current_user) { nil }
+
+        it "is not valid" do
+          expect { subject.call }.to broadcast(:invalid)
+        end
+      end
+
+      context "with organization set but no impersonated_only neither before_date" do
+        let(:impersonated_only) { nil }
+        let(:before_date) { nil }
+
+        it "is not valid" do
+          expect { subject.call }.to broadcast(:invalid)
+        end
+      end
+
+      context "with organization & impersonated_only set but no before_date" do
+        let(:before_date) { nil }
+
+        it "is not valid" do
+          expect { subject.call }.to broadcast(:invalid)
+        end
+      end
+
+      context "with organization & before_date but no impersonated_only" do
+        let(:impersonated_only) { nil }
+
+        it "broadcasts ok" do
+          expect { subject.call }.to broadcast(:ok)
+        end
+
+        it "enqueues a RevokeAuthorizationsByConditionJob" do
+          expect { subject.call }.to have_enqueued_job(RevokeAuthorizationsByConditionJob)
+            .with(organization, current_user, before_date, nil)
+        end
+      end
+
+      context "with all valid params" do
+        it "broadcasts ok" do
+          expect { subject.call }.to broadcast(:ok)
+        end
+
+        it "enqueues a RevokeAuthorizationsByConditionJob with impersonated_only" do
+          expect { subject.call }.to have_enqueued_job(RevokeAuthorizationsByConditionJob)
+            .with(organization, current_user, before_date, true)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-verifications/spec/jobs/decidim/verifications/revoke_all_authorizations_job_spec.rb b/decidim-verifications/spec/jobs/decidim/verifications/revoke_all_authorizations_job_spec.rb
new file mode 100644
index 0000000000000..134563a3a38d3
--- /dev/null
+++ b/decidim-verifications/spec/jobs/decidim/verifications/revoke_all_authorizations_job_spec.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::Verifications
+  describe RevokeAllAuthorizationsJob do
+    subject { described_class }
+
+    let(:organization) { create(:organization) }
+    let(:prev_week) { Time.zone.today.prev_week }
+    let(:granted_authorizations) do
+      Decidim::Verifications::Authorizations.new(
+        organization:,
+        granted: true
+      ).query
+    end
+    let(:no_granted_authorizations) do
+      Decidim::Verifications::Authorizations.new(
+        organization:,
+        granted: false
+      ).query
+    end
+    let!(:current_user) { create(:user, :admin, :confirmed, organization:) }
+    let!(:user0) { create(:user, :admin, :confirmed, organization:) }
+    let!(:user1) { create(:user, :admin, :confirmed, organization:) }
+    let!(:user2) { create(:user, :admin, :confirmed, organization:) }
+    let!(:user3) { create(:user, :admin, :confirmed, organization:) }
+    let!(:user4) { create(:user, :admin, :confirmed, organization:) }
+    let!(:user5) { create(:user, :admin, :confirmed, organization:, managed: true) }
+
+    # With 6 authorizations, 4 granted, 2 pending, only 1 granted & managed
+    let!(:authorization1) { create(:authorization, created_at: prev_week, granted_at: prev_week, name: Faker::Name.name, user: user0) }
+    let!(:authorization2) { create(:authorization, created_at: prev_week, granted_at: prev_week, name: Faker::Name.name, user: user1) }
+    let!(:authorization3) { create(:authorization, created_at: prev_week, granted_at: prev_week, name: Faker::Name.name, user: user2) }
+    let!(:authorization4) { create(:authorization, created_at: prev_week, granted_at: nil, name: Faker::Name.name, user: user3) }
+    let!(:authorization5) { create(:authorization, created_at: prev_week, granted_at: nil, name: Faker::Name.name, user: user4) }
+    let!(:authorization6) { create(:authorization, created_at: prev_week, granted_at: prev_week, name: Faker::Name.name, user: user5) }
+
+    describe "With 4 granted auths and 2 ungranted auths" do
+      it "does not destroy any ungranted auth" do
+        expect do
+          subject.perform_now(organization, current_user)
+        end.not_to change(no_granted_authorizations, :count)
+      end
+
+      it "destroys all granted auths" do
+        expect do
+          subject.perform_now(organization, current_user)
+        end.to change(granted_authorizations, :count).from(4).to(0)
+      end
+
+      it "traces the action", versioning: true do
+        granted_authorizations.find_each do |auth|
+          expect(Decidim.traceability)
+            .to receive(:perform_action!)
+            .with(:destroy, auth, current_user)
+            .and_call_original
+        end
+        expect { subject.perform_now(organization, current_user) }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.version).to be_present
+      end
+
+      context "with authorization transfers attached to some of the authorizations" do
+        let!(:authorization_transfer1) { create(:authorization_transfer, organization:, authorization: authorization1) }
+        let!(:authorization_transfer2) { create(:authorization_transfer, organization:, authorization: authorization1) }
+        let!(:authorization_transfer3) { create(:authorization_transfer, organization:, authorization: authorization2) }
+
+        before do
+          create_list(:authorization_transfer_record, 2, transfer: authorization_transfer1)
+          create_list(:authorization_transfer_record, 2, transfer: authorization_transfer2)
+          create(:authorization_transfer_record, transfer: authorization_transfer3)
+        end
+
+        it "destroys all granted auths" do
+          expect do
+            subject.perform_now(organization, current_user)
+          end.to change(granted_authorizations, :count).from(4).to(0)
+        end
+
+        it "destroys all authorization transfers" do
+          expect do
+            subject.perform_now(organization, current_user)
+          end.to change(Decidim::AuthorizationTransfer, :count).from(3).to(0)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-verifications/spec/commands/decidim/verifications/revoke_by_condition_authorizations_spec.rb b/decidim-verifications/spec/jobs/decidim/verifications/revoke_authorizations_by_condition_job_spec.rb
similarity index 57%
rename from decidim-verifications/spec/commands/decidim/verifications/revoke_by_condition_authorizations_spec.rb
rename to decidim-verifications/spec/jobs/decidim/verifications/revoke_authorizations_by_condition_job_spec.rb
index caee085d64740..a7e2b7cd47845 100644
--- a/decidim-verifications/spec/commands/decidim/verifications/revoke_by_condition_authorizations_spec.rb
+++ b/decidim-verifications/spec/jobs/decidim/verifications/revoke_authorizations_by_condition_job_spec.rb
@@ -3,30 +3,14 @@
 require "spec_helper"
 
 module Decidim::Verifications
-  describe RevokeByConditionAuthorizations do
-    subject { described_class.new(organization, form) }
+  describe RevokeAuthorizationsByConditionJob do
+    subject { described_class }
 
-    let(:params) do
-      {
-        impersonated_only:,
-        before_date:
-      }
-    end
-
-    let(:form) do
-      Decidim::Verifications::Admin::RevocationsBeforeDateForm
-        .from_params(params)
-        .with_context(current_user:)
-    end
-
-    let(:authorization) { create(:authorization, id: 9234) }
+    let(:organization) { create(:organization) }
     let(:now) { Time.zone.now }
     let(:prev_week) { Time.zone.today.prev_week }
     let(:prev_month) { Time.zone.today.prev_month }
     let(:prev_year) { Time.zone.today.prev_year }
-    let(:organization) { create(:organization) }
-    let(:impersonated_only) { true }
-    let(:before_date) { prev_week }
     let(:all_authorizations) do
       Decidim::Verifications::Authorizations.new(
         organization:
@@ -60,43 +44,7 @@ module Decidim::Verifications
     let(:user4) { create(:user, :admin, :confirmed, organization:) }
     let(:user5) { create(:user, :admin, :confirmed, organization:, managed: true) }
 
-    describe "when creating a revoke all authorizations command" do
-      context "with organization not set neither current_user but impersonated_only & before_date" do
-        let(:organization) { nil }
-        let(:current_user) { nil }
-
-        it "is not valid" do
-          expect { subject.call }.to broadcast(:invalid)
-        end
-      end
-
-      context "with organization set but no impersonated_only neither before_date" do
-        let(:impersonated_only) { nil }
-        let(:before_date) { nil }
-
-        it "is not valid" do
-          expect { subject.call }.to broadcast(:invalid)
-        end
-      end
-
-      context "with organization & impersonated_only set but no before_date" do
-        let(:before_date) { nil }
-
-        it "is not valid" do
-          expect { subject.call }.to broadcast(:invalid)
-        end
-      end
-
-      context "with organization & before_date but no impersonated_only" do
-        let(:impersonated_only) { nil }
-
-        it "is valid" do
-          expect { subject.call }.to broadcast(:ok)
-        end
-      end
-    end
-
-    describe "with 4 organization's granted auths (only 1 impersonated) and 2 ungranted auths created a month ago." do
+    describe "with 4 organization's granted auths (only 1 impersonated) and 2 ungranted auths created a month ago" do
       let!(:authorization1) { create(:authorization, created_at: prev_month, granted_at: prev_month, name: Faker::Name.name, user: user0) }
       let!(:authorization2) { create(:authorization, created_at: prev_month, granted_at: prev_month, name: Faker::Name.name, user: user1) }
       let!(:authorization3) { create(:authorization, created_at: prev_month, granted_at: prev_month, name: Faker::Name.name, user: user2) }
@@ -104,52 +52,31 @@ module Decidim::Verifications
       let!(:authorization5) { create(:authorization, created_at: prev_month, granted_at: nil, name: Faker::Name.name, user: user4) }
       let!(:authorization6) { create(:authorization, created_at: prev_month, granted_at: prev_month, name: Faker::Name.name, user: user5) }
 
-      context "when no before date. When destroy impersonated_only auths" do
-        let(:before_date) { nil }
-
-        it "is not valid" do
-          expect { subject.call }.to broadcast(:invalid)
-        end
-      end
-
-      context "when no before date. When destroy all auths" do
-        let(:before_date) { nil }
-        let(:impersonated_only) { nil }
-
-        it "is not valid" do
-          expect { subject.call }.to broadcast(:invalid)
-        end
-      end
-
-      context "when before date, week ago. When destroy impersonated_only auths" do
+      context "when before date is a week ago and impersonated_only" do
         it "does not destroy any ungranted auth" do
           expect do
-            subject.call
+            subject.perform_now(organization, current_user, prev_week, true)
           end.not_to change(no_granted_authorizations, :count)
         end
 
-        it "destroy granted auths. 4 granted (only 1 impersonated) to 3" do
+        it "destroys granted auths. 4 granted (only 1 impersonated) to 3" do
           expect do
-            subject.call
+            subject.perform_now(organization, current_user, prev_week, true)
           end.to change(granted_authorizations, :count).from(4).to(3)
         end
 
-        it "destroy all impersonated_only auths. 1 to 0" do
+        it "destroys all impersonated_only auths. 1 to 0" do
           expect do
-            subject.call
+            subject.perform_now(organization, current_user, prev_week, true)
           end.to change(impersonated_authorizations, :count).from(1).to(0)
         end
 
         it "total auths are fewer than before. 6 to 5" do
           expect do
-            subject.call
+            subject.perform_now(organization, current_user, prev_week, true)
           end.to change(all_authorizations, :count).from(6).to(5)
         end
 
-        it "broadcasts ok" do
-          expect { subject.call }.to broadcast(:ok)
-        end
-
         it "traces the action", versioning: true do
           impersonated_authorizations.find_each do |auth|
             expect(Decidim.traceability)
@@ -157,63 +84,51 @@ module Decidim::Verifications
               .with(:destroy, auth, current_user)
               .and_call_original
           end
-          expect { subject.call }.to change(Decidim::ActionLog, :count)
+          expect { subject.perform_now(organization, current_user, prev_week, true) }.to change(Decidim::ActionLog, :count)
           action_log = Decidim::ActionLog.last
           expect(action_log.version).to be_present
         end
       end
 
-      context "when before date, year ago. When destroy impersonated_only auths" do
-        let(:before_date) { prev_year }
-
-        it "does not destroy any ungranted auth. None" do
+      context "when before date is a year ago and impersonated_only" do
+        it "does not destroy any ungranted auth" do
           expect do
-            subject.call
+            subject.perform_now(organization, current_user, prev_year, true)
           end.not_to change(no_granted_authorizations, :count)
         end
 
-        it "destroy all impersonated_only auths before_date only. None" do
+        it "does not destroy any granted auths" do
           expect do
-            subject.call
+            subject.perform_now(organization, current_user, prev_year, true)
           end.not_to change(granted_authorizations, :count)
         end
 
-        it "total auths are the same than before. 6" do
+        it "total auths are the same. 6" do
           expect do
-            subject.call
+            subject.perform_now(organization, current_user, prev_year, true)
           end.not_to change(all_authorizations, :count)
         end
-
-        it "broadcasts ok" do
-          expect { subject.call }.to broadcast(:ok)
-        end
       end
 
-      context "when before date, week ago. When destroy all auths" do
-        let(:impersonated_only) { nil }
-
-        it "destroy all ungranted auth. None" do
+      context "when before date is a week ago and not impersonated_only" do
+        it "does not destroy any ungranted auth" do
           expect do
-            subject.call
+            subject.perform_now(organization, current_user, prev_week, false)
           end.not_to change(no_granted_authorizations, :count)
         end
 
-        it "destroy all granted auths before_date only. 4 to 0" do
+        it "destroys all granted auths before date. 4 to 0" do
           expect do
-            subject.call
+            subject.perform_now(organization, current_user, prev_week, false)
           end.to change(granted_authorizations, :count).from(4).to(0)
         end
 
         it "total auths are fewer than before. 6 to 2" do
           expect do
-            subject.call
+            subject.perform_now(organization, current_user, prev_week, false)
           end.to change(all_authorizations, :count).from(6).to(2)
         end
 
-        it "broadcasts ok" do
-          expect { subject.call }.to broadcast(:ok)
-        end
-
         it "traces the action", versioning: true do
           granted_authorizations.find_each do |auth|
             expect(Decidim.traceability)
@@ -221,7 +136,7 @@ module Decidim::Verifications
               .with(:destroy, auth, current_user)
               .and_call_original
           end
-          expect { subject.call }.to change(Decidim::ActionLog, :count)
+          expect { subject.perform_now(organization, current_user, prev_week, false) }.to change(Decidim::ActionLog, :count)
           action_log = Decidim::ActionLog.last
           expect(action_log.version).to be_present
         end
@@ -237,51 +152,44 @@ module Decidim::Verifications
             create(:authorization_transfer_record, transfer: authorization_transfer3)
           end
 
-          it "destroy all granted auths" do
+          it "destroys all granted auths" do
             expect do
-              subject.call
+              subject.perform_now(organization, current_user, prev_week, false)
             end.to change(granted_authorizations, :count).from(4).to(0)
           end
 
-          it "destroy all authorization transfers" do
+          it "destroys all authorization transfers" do
             expect do
-              subject.call
+              subject.perform_now(organization, current_user, prev_week, false)
             end.to change(Decidim::AuthorizationTransfer, :count).from(3).to(0)
           end
         end
       end
 
-      context "when before date, year ago. When destroy all auths" do
-        let(:before_date) { prev_year }
-        let(:impersonated_only) { nil }
-
-        it "destroy all ungranted auth before date. None" do
+      context "when before date is a year ago and not impersonated_only" do
+        it "does not destroy any ungranted auth" do
           expect do
-            subject.call
+            subject.perform_now(organization, current_user, prev_year, false)
           end.not_to change(no_granted_authorizations, :count)
         end
 
-        it "destroy all granted auths before_date only. None" do
+        it "does not destroy any granted auths" do
           expect do
-            subject.call
+            subject.perform_now(organization, current_user, prev_year, false)
           end.not_to change(granted_authorizations, :count)
         end
 
-        it "destroy impersonated_only auths before_date only. None" do
+        it "does not destroy any impersonated auths" do
           expect do
-            subject.call
+            subject.perform_now(organization, current_user, prev_year, false)
           end.not_to change(impersonated_authorizations, :count)
         end
 
-        it "total auths are the same than before. 6" do
+        it "total auths are the same. 6" do
           expect do
-            subject.call
+            subject.perform_now(organization, current_user, prev_year, false)
           end.not_to change(all_authorizations, :count)
         end
-
-        it "broadcasts ok" do
-          expect { subject.call }.to broadcast(:ok)
-        end
       end
     end
   end
diff --git a/decidim-verifications/spec/system/revocation_auths_spec.rb b/decidim-verifications/spec/system/revocation_auths_spec.rb
index 7528b795b04d0..3eca55bb76ab2 100644
--- a/decidim-verifications/spec/system/revocation_auths_spec.rb
+++ b/decidim-verifications/spec/system/revocation_auths_spec.rb
@@ -148,7 +148,7 @@
   end
 
   context "when clicking revoke all authorizations option with admin user" do
-    it "shows an informative message to the user with all authorizations revoked ok" do
+    it "shows an informative message to the user that revocation has started in the background" do
       accept_confirm do
         click_on(t("decidim.admin.menu.authorization_revocation.button"))
       end
@@ -158,7 +158,7 @@
   end
 
   context "when clicking revoke before date authorizations option with admin user" do
-    it "shows an informative message to the user with before date authorizations revoked ok" do
+    it "shows an informative message to the user that revocation has started in the background" do
       accept_confirm do
         click_on(t("decidim.admin.menu.authorization_revocation.button_before"))
       end

From 0e4b06aecca0fddd6a688b28b02c464753604071 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Fri, 15 May 2026 07:11:54 +0200
Subject: [PATCH 018/131] Backport 'Fix browser freeze when editing filters
 with many taxonomy items' to v0.31 (#16804)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix freeze in form validation with large checkbox groups

* Include test

* Lint, increase eslint max-lines

Co-authored-by: Alejandro Rueda López <alejandro.rueda@nazaries.com>
---
 .../form_validator/form_validator.js          | 12 +++++-----
 .../form_validator/form_validator.test.js     | 24 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/decidim-core/app/packs/src/decidim/controllers/form_validator/form_validator.js b/decidim-core/app/packs/src/decidim/controllers/form_validator/form_validator.js
index 98c1f1e623bb0..8543438a24cc0 100644
--- a/decidim-core/app/packs/src/decidim/controllers/form_validator/form_validator.js
+++ b/decidim-core/app/packs/src/decidim/controllers/form_validator/form_validator.js
@@ -419,13 +419,13 @@ class FormValidator {
       return true;
     }
 
-    checkboxGroup.forEach((checkboxElement) => {
-      if (isValid) {
-        this.removeInputErrorClasses(checkboxElement);
-      } else {
+    if (isValid) {
+      this.removeCheckboxGroupErrorClasses(groupName);
+    } else {
+      checkboxGroup.forEach((checkboxElement) => {
         this.addInputErrorClasses(checkboxElement, ["required"]);
-      }
-    });
+      });
+    }
 
     return isValid;
   }
diff --git a/decidim-core/app/packs/src/decidim/controllers/form_validator/form_validator.test.js b/decidim-core/app/packs/src/decidim/controllers/form_validator/form_validator.test.js
index b200f7c283c54..95a20f8594393 100644
--- a/decidim-core/app/packs/src/decidim/controllers/form_validator/form_validator.test.js
+++ b/decidim-core/app/packs/src/decidim/controllers/form_validator/form_validator.test.js
@@ -1,4 +1,4 @@
-/* eslint max-lines: ["error", 690] */
+/* eslint max-lines: ["error", 712] */
 /* global jest */
 /**
  * @jest-environment jsdom
@@ -253,6 +253,28 @@ describe("FormValidator", () => {
       const isValidTwo = validatorInstance.validateCheckboxGroup("multiCheckboxes");
       expect(isValidTwo).toBe(true);
     });
+
+    it("should remove error classes once for the group, not per checkbox", () => {
+      formElement.innerHTML = `
+        <fieldset>
+          <input type="checkbox" id="cb-1" name="largeGroup" value="1" required>
+          <input type="checkbox" id="cb-2" name="largeGroup" value="2" required>
+          <input type="checkbox" id="cb-3" name="largeGroup" value="3" required>
+        </fieldset>
+        <button type="submit">Submit</button>
+      `;
+      validatorInstance = new FormValidator(formElement);
+      formElement.querySelector("#cb-1").checked = true;
+
+      const removeGroupSpy = jest.spyOn(validatorInstance, "removeCheckboxGroupErrorClasses");
+      const removeInputSpy = jest.spyOn(validatorInstance, "removeInputErrorClasses");
+
+      const isValid = validatorInstance.validateCheckboxGroup("largeGroup");
+
+      expect(isValid).toBe(true);
+      expect(removeGroupSpy).toHaveBeenCalledTimes(1);
+      expect(removeInputSpy).not.toHaveBeenCalled();
+    });
   });
 
   describe("Custom Validators", () => {

From 534f343272f8488aa3cf0287e9583f2ab705cdaf Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Fri, 15 May 2026 07:57:53 +0200
Subject: [PATCH 019/131] Backport 'Fix flaky admin manages newsletters specs'
 to v0.31 (#16815)

Co-authored-by: Antti Hukkanen <antti.hukkanen@mainiotech.fi>
---
 .../system/admin_manages_newsletters_spec.rb   | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/decidim-admin/spec/system/admin_manages_newsletters_spec.rb b/decidim-admin/spec/system/admin_manages_newsletters_spec.rb
index 04520b06392c1..59e11b74830ee 100644
--- a/decidim-admin/spec/system/admin_manages_newsletters_spec.rb
+++ b/decidim-admin/spec/system/admin_manages_newsletters_spec.rb
@@ -257,7 +257,14 @@ def select_verification_type(types)
 
           within(".newsletter_deliver") do
             choose("Send to verified users")
-            select_verification_type(verification_type_first.name) # Одна авторизация передается как строка
+          end
+
+          within "#recipients_count" do
+            expect(page).to have_content(0)
+          end
+
+          within(".newsletter_deliver") do
+            select_verification_type(verification_type_first.name) # One authorization is passed as a string
           end
 
           within "#recipients_count" do
@@ -293,7 +300,14 @@ def select_verification_type(types)
 
           within(".newsletter_deliver") do
             choose("Send to verified users")
-            select_verification_type([verification_type_first.name, verification_type_last.name]) # Несколько авторизаций передаются как массив
+          end
+
+          within "#recipients_count" do
+            expect(page).to have_content(0)
+          end
+
+          within(".newsletter_deliver") do
+            select_verification_type([verification_type_first.name, verification_type_last.name]) # Multiple authorizations are passed as an array
           end
 
           within "#recipients_count" do

From bcbd8aa9c3558492138bf21d9c309dbc85695e9a Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Fri, 15 May 2026 08:21:56 +0200
Subject: [PATCH 020/131] Backport 'Fix modify responses on survey' to v0.31
 (#16809)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
Co-authored-by: stephanierousset <61418966+Stef-Rousset@users.noreply.github.com>
---
 .../forms/decidim/forms/questionnaire_form.rb |  2 +-
 decidim-surveys/spec/system/survey_spec.rb    | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/decidim-forms/app/forms/decidim/forms/questionnaire_form.rb b/decidim-forms/app/forms/decidim/forms/questionnaire_form.rb
index 5832dce44011a..f8c40ed500ed1 100644
--- a/decidim-forms/app/forms/decidim/forms/questionnaire_form.rb
+++ b/decidim-forms/app/forms/decidim/forms/questionnaire_form.rb
@@ -30,7 +30,7 @@ def map_model(model)
 
       def add_responses!(questionnaire:, session_token:, ip_hash:)
         self.responses = questionnaire.questions.map do |question|
-          ResponseForm.from_model(Decidim::Forms::Response.where(question:, user: current_user, session_token:, ip_hash:).first_or_initialize)
+          ResponseForm.from_model(Decidim::Forms::Response.where(question:, user: current_user, session_token:, ip_hash:).first_or_initialize).with_context(context)
         end
       end
 
diff --git a/decidim-surveys/spec/system/survey_spec.rb b/decidim-surveys/spec/system/survey_spec.rb
index a4e2f14d90a61..c21b7c055e376 100644
--- a/decidim-surveys/spec/system/survey_spec.rb
+++ b/decidim-surveys/spec/system/survey_spec.rb
@@ -198,6 +198,42 @@
         it_behaves_like "has embedded video in description", :question_description
       end
     end
+
+    context "when the survey allows to edit responses, and question has display conditions" do
+      let!(:question_two) do
+        create(:questionnaire_question,
+               questionnaire:,
+               question_type: "short_response",
+               position: 1,
+               options: [])
+      end
+      let!(:display_condition) do
+        create(:display_condition,
+               condition_type: "not_responded",
+               question: question_two,
+               condition_question: question)
+      end
+
+      before do
+        survey.update!(
+          allow_responses: true,
+          allow_editing_responses: true
+        )
+        login_as user, scope: :user
+        visit_component
+        click_on translated_attribute(questionnaire.title)
+        fill_in "questionnaire_responses_0", with: "test"
+        check "questionnaire_tos_agreement"
+        click_on "Submit"
+        expect(page).to have_css(".flash", text: "Survey successfully responded.")
+      end
+
+      it "allows to edit the responses" do
+        click_on "Edit your responses"
+        expect(page).to have_content(translated_attribute(survey.title))
+        expect(page).to have_content(translated_attribute(question.body))
+      end
+    end
   end
 
   context "when survey has a custom announcement" do

From 5b4231ce66b02c38ff7bc6cc1ee60313736ffd44 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Tue, 19 May 2026 10:33:42 +0200
Subject: [PATCH 021/131] Backport 'Add default order to UserEntityList API
 function' to v0.31 (#16839)

Co-authored-by: Antti Hukkanen <antti.hukkanen@mainiotech.fi>
---
 decidim-core/lib/decidim/api/functions/user_entity_list.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/decidim-core/lib/decidim/api/functions/user_entity_list.rb b/decidim-core/lib/decidim/api/functions/user_entity_list.rb
index b125206d8a502..48e1d89994a66 100644
--- a/decidim-core/lib/decidim/api/functions/user_entity_list.rb
+++ b/decidim-core/lib/decidim/api/functions/user_entity_list.rb
@@ -11,6 +11,7 @@ module Core
     #
     class UserEntityList
       include NeedsApiFilterAndOrder
+      include NeedsApiDefaultOrder
 
       def initialize
         @model_class = Decidim::UserBaseEntity
@@ -24,6 +25,7 @@ def call(_obj, args, ctx)
                  .includes(avatar_attachment: :blob)
         add_filter_keys(args[:filter])
         add_order_keys(args[:order].to_h)
+        add_default_order
         @query
       end
     end

From 35589e3a8918d9524405ce6585f4e93281a4f918 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Wed, 20 May 2026 11:06:45 +0200
Subject: [PATCH 022/131] Backport 'Fix image upload HTML validation errors' to
 v0.31 (#16849)

* Fix image upload validation errors

* Apply AI review recommendations

Co-authored-by: Antti Hukkanen <antti.hukkanen@mainiotech.fi>
---
 .../src/decidim/direct_uploads/upload_field.js |  8 ++++----
 .../src/decidim/direct_uploads/upload_modal.js | 18 +++++++++++-------
 .../app/packs/src/decidim/utilities/text.js    | 12 ++++++------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/decidim-core/app/packs/src/decidim/direct_uploads/upload_field.js b/decidim-core/app/packs/src/decidim/direct_uploads/upload_field.js
index 8f4fd49f81b4d..a4c960371aac4 100644
--- a/decidim-core/app/packs/src/decidim/direct_uploads/upload_field.js
+++ b/decidim-core/app/packs/src/decidim/direct_uploads/upload_field.js
@@ -1,5 +1,5 @@
 import UploadModal from "src/decidim/direct_uploads/upload_modal";
-import { escapeHtml, escapeQuotes } from "src/decidim/utilities/text";
+import { escapeHtml } from "src/decidim/utilities/text";
 
 const updateModalTitle = (modal) => {
   if (modal.uploadItems.children.length === 0) {
@@ -67,7 +67,7 @@ const updateActiveUploads = (modal) => {
       const titleField = isMultiple
         ? `${modal.options.resourceName}[${modal.options.addAttribute}][${ix}][title]`
         : `${modal.options.resourceName}[${modal.options.addAttribute}][title]`
-      hidden += `<input type="hidden" name="${titleField}" value="${escapeQuotes(titleValue)}" />`
+      hidden += `<input type="hidden" name="${titleField}" value="${escapeHtml(titleValue)}" />`
 
       title = titleValue
     }
@@ -77,8 +77,8 @@ const updateActiveUploads = (modal) => {
       : `data-hidden-field="${file.hiddenField}"`
 
     const template = `
-      <div ${attachmentIdOrHiddenField} data-filename="${escapeQuotes(file.name)}" data-title="${escapeQuotes(title)}">
-        ${(/image/).test(file.type) && "<div><img src=\"data:,\" role=\"presentation\" /></div>" || ""}
+      <div ${attachmentIdOrHiddenField} data-filename="${escapeHtml(file.name)}" data-title="${escapeHtml(title)}">
+        ${(/image/).test(file.type) && "<div><img src=\"data:,\" alt=\"\" /></div>" || ""}
         <p>${escapeHtml(title)}</p>
         ${hidden}
       </div>
diff --git a/decidim-core/app/packs/src/decidim/direct_uploads/upload_modal.js b/decidim-core/app/packs/src/decidim/direct_uploads/upload_modal.js
index 7b537a1e434a3..eab5f467a2049 100644
--- a/decidim-core/app/packs/src/decidim/direct_uploads/upload_modal.js
+++ b/decidim-core/app/packs/src/decidim/direct_uploads/upload_modal.js
@@ -1,6 +1,6 @@
 import { Uploader } from "src/decidim/direct_uploads/uploader";
 import icon from "src/decidim/refactor/moved/icon";
-import { escapeHtml, escapeQuotes } from "src/decidim/utilities/text";
+import { escapeHtml } from "src/decidim/utilities/text";
 
 const STATUS = {
   VALIDATED: "validated",
@@ -170,7 +170,7 @@ export default class UploadModal {
 
   createUploadItem(file, errors, opts = {}) {
     const okTemplate = `
-      <img src="data:,", role="presentation" />
+      <img src="data:," alt="" />
       <span class="upload-modal__span">${escapeHtml(file.name)}</span>
     `
 
@@ -183,16 +183,17 @@ export default class UploadModal {
       </div>
     `
 
+    const titleInputId = `upload-title-${this.getOrdinalNumber()}`
     const titleTemplate = `
-      <img src="data:," role="presentation" />
+      <img src="data:," alt="" />
       <div>
         <div>
           <label>${this.locales.filename}</label>
           <span class="upload-modal__span">${escapeHtml(file.name)}</span>
         </div>
         <div>
-          <label for="${file.name}">${this.locales.title}</label>
-          <input class="sm" type="text" value="${escapeQuotes(opts.title || file.name)}" id="${file.name}" />
+          <label for="${titleInputId}">${this.locales.title}</label>
+          <input class="sm" type="text" value="${escapeHtml(opts.title || file.name)}" id="${titleInputId}" />
         </div>
       </div>
     `
@@ -216,7 +217,7 @@ export default class UploadModal {
       ? `data-attachment-id="${opts.attachmentId}"`
       : ""
     const fullTemplate = `
-      <li ${attachmentId} data-filename="${escapeQuotes(file.name)}" data-state="${state}">
+      <li ${attachmentId} data-filename="${escapeHtml(file.name)}" data-state="${state}">
         <div data-template="${template}">
           ${content.trim()}
           <button>${this.locales.remove}</button>
@@ -252,7 +253,10 @@ export default class UploadModal {
   }
 
   setProgressBar(name, value) {
-    this.uploadItems.querySelector(`[data-filename="${escapeQuotes(name)}"] progress`).value = value
+    const item = Array.from(this.uploadItems.querySelectorAll("[data-filename]")).find((el) => el.dataset.filename === name);
+    if (item) {
+      item.querySelector("progress").value = value;
+    }
   }
 
   updateAddAttachmentsButton() {
diff --git a/decidim-core/app/packs/src/decidim/utilities/text.js b/decidim-core/app/packs/src/decidim/utilities/text.js
index 2f3a712db218d..017a2f0ec7bbe 100644
--- a/decidim-core/app/packs/src/decidim/utilities/text.js
+++ b/decidim-core/app/packs/src/decidim/utilities/text.js
@@ -1,17 +1,17 @@
-export const escapeHtml = (text) => {
+const escapeQuotes = (text) => {
   if (!text) {
     return "";
   }
 
-  const el = document.createElement("div");
-  el.appendChild(document.createTextNode(text));
-  return el.innerHTML;
+  return text.replace(/"/g, "&quot;");
 }
 
-export const escapeQuotes = (text) => {
+export const escapeHtml = (text) => {
   if (!text) {
     return "";
   }
 
-  return text.replace(/"/g, "&quot;");
+  const el = document.createElement("div");
+  el.appendChild(document.createTextNode(text));
+  return escapeQuotes(el.innerHTML);
 }

From 9e03e7a234b1fe7850fc03a1311c17164b9d99dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= <ivan@pokecode.net>
Date: Thu, 21 May 2026 10:14:50 +0200
Subject: [PATCH 023/131] fix counters

---
 .../lib/decidim/accountability/component.rb   |  2 +-
 .../decidim/accountability/component_spec.rb  | 27 ++++++++++++++
 decidim-blogs/lib/decidim/blogs/component.rb  |  2 +-
 .../spec/lib/decidim/blogs/component_spec.rb  | 27 ++++++++++++++
 .../lib/decidim/budgets/component_spec.rb     | 35 +++++++++++++++++++
 .../lib/decidim/comments/engine.rb            | 11 ------
 .../app/presenters/decidim/stats_presenter.rb |  2 +-
 .../decidim/stats_presenter_spec.rb           | 12 +++++++
 .../lib/decidim/debates/component.rb          |  2 +-
 .../lib/decidim/debates/component_spec.rb     | 27 ++++++++++++++
 10 files changed, 132 insertions(+), 15 deletions(-)
 create mode 100644 decidim-budgets/spec/lib/decidim/budgets/component_spec.rb

diff --git a/decidim-accountability/lib/decidim/accountability/component.rb b/decidim-accountability/lib/decidim/accountability/component.rb
index 027802b101c59..3c48d9b8be5d9 100644
--- a/decidim-accountability/lib/decidim/accountability/component.rb
+++ b/decidim-accountability/lib/decidim/accountability/component.rb
@@ -51,7 +51,7 @@
                           icon_name: "chat-1-line",
                           tooltip_key: "comments_count",
                           tag: :comments do |components, _start_at, _end_at|
-    Decidim::Accountability::Result.where(component: components).count
+    Decidim::Accountability::Result.where(component: components).sum(:comments_count)
   end
 
   component.settings(:step) do |settings|
diff --git a/decidim-accountability/spec/lib/decidim/accountability/component_spec.rb b/decidim-accountability/spec/lib/decidim/accountability/component_spec.rb
index bde48b30bc2d3..53b2e8c39869e 100644
--- a/decidim-accountability/spec/lib/decidim/accountability/component_spec.rb
+++ b/decidim-accountability/spec/lib/decidim/accountability/component_spec.rb
@@ -7,6 +7,33 @@
   let(:organization) { component.organization }
   let!(:current_user) { create(:user, :confirmed, :admin, organization:) }
 
+  describe "stats" do
+    subject { current_stat[1][:data] }
+
+    let(:raw_stats) do
+      Decidim.component_manifests.map do |component_manifest|
+        component_manifest.stats.filter(name: stats_name).with_context(component).flat_map { |name, data| [component_manifest.name, name, data] }
+      end
+    end
+
+    let(:stats) { raw_stats.select { |stat| stat[0] == :accountability } }
+    let!(:result) { create(:result, component:) }
+    let(:current_stat) { stats.find { |stat| stat[1][:name] == stats_name } }
+
+    describe "comments_count" do
+      let(:stats_name) { :comments_count }
+
+      before do
+        create_list(:comment, 3, commentable: result)
+      end
+
+      it "counts the comments" do
+        expect(Decidim::Comments::Comment.count).to eq 3
+        expect(subject).to eq 3
+      end
+    end
+  end
+
   describe "on edit", type: :system do
     let(:edit_component_path) do
       Decidim::EngineRouter.admin_proxy(component.participatory_space).edit_component_path(component.id)
diff --git a/decidim-blogs/lib/decidim/blogs/component.rb b/decidim-blogs/lib/decidim/blogs/component.rb
index 00933118550ad..d13946c6e923f 100644
--- a/decidim-blogs/lib/decidim/blogs/component.rb
+++ b/decidim-blogs/lib/decidim/blogs/component.rb
@@ -38,7 +38,7 @@
                           icon_name: "chat-1-line",
                           tooltip_key: "comments_count",
                           tag: :comments do |components, _start_at, _end_at|
-    Decidim::Blogs::Post.where(component: components).count
+    Decidim::Blogs::Post.where(component: components).sum(:comments_count)
   end
 
   component.actions = %w(create update destroy)
diff --git a/decidim-blogs/spec/lib/decidim/blogs/component_spec.rb b/decidim-blogs/spec/lib/decidim/blogs/component_spec.rb
index 18084ca658c93..7c9055bd470a4 100644
--- a/decidim-blogs/spec/lib/decidim/blogs/component_spec.rb
+++ b/decidim-blogs/spec/lib/decidim/blogs/component_spec.rb
@@ -7,6 +7,33 @@
   let(:organization) { component.organization }
   let!(:current_user) { create(:user, :confirmed, :admin, organization:) }
 
+  describe "stats" do
+    subject { current_stat[1][:data] }
+
+    let(:raw_stats) do
+      Decidim.component_manifests.map do |component_manifest|
+        component_manifest.stats.filter(name: stats_name).with_context(component).flat_map { |name, data| [component_manifest.name, name, data] }
+      end
+    end
+
+    let(:stats) { raw_stats.select { |stat| stat[0] == :blogs } }
+    let!(:post) { create(:post, component:) }
+    let(:current_stat) { stats.find { |stat| stat[1][:name] == stats_name } }
+
+    describe "comments_count" do
+      let(:stats_name) { :comments_count }
+
+      before do
+        create_list(:comment, 3, commentable: post)
+      end
+
+      it "counts the comments" do
+        expect(Decidim::Comments::Comment.count).to eq 3
+        expect(subject).to eq 3
+      end
+    end
+  end
+
   describe "on edit", type: :system do
     let(:edit_component_path) do
       Decidim::EngineRouter.admin_proxy(component.participatory_space).edit_component_path(component.id)
diff --git a/decidim-budgets/spec/lib/decidim/budgets/component_spec.rb b/decidim-budgets/spec/lib/decidim/budgets/component_spec.rb
new file mode 100644
index 0000000000000..b2dad701694c8
--- /dev/null
+++ b/decidim-budgets/spec/lib/decidim/budgets/component_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Budgets component" do # rubocop:disable RSpec/DescribeClass
+  let!(:component) { create(:budgets_component) }
+
+  describe "stats" do
+    subject { current_stat[1][:data] }
+
+    let(:raw_stats) do
+      Decidim.component_manifests.map do |component_manifest|
+        component_manifest.stats.filter(name: stats_name).with_context(component).flat_map { |name, data| [component_manifest.name, name, data] }
+      end
+    end
+
+    let(:stats) { raw_stats.select { |stat| stat[0] == :budgets } }
+    let!(:budget) { create(:budget, component:) }
+    let!(:project) { create(:project, budget:) }
+    let(:current_stat) { stats.find { |stat| stat[1][:name] == stats_name } }
+
+    describe "comments_count" do
+      let(:stats_name) { :comments_count }
+
+      before do
+        create_list(:comment, 3, commentable: project)
+      end
+
+      it "counts the comments" do
+        expect(Decidim::Comments::Comment.count).to eq 3
+        expect(subject).to eq 3
+      end
+    end
+  end
+end
diff --git a/decidim-comments/lib/decidim/comments/engine.rb b/decidim-comments/lib/decidim/comments/engine.rb
index 19ffe5ee7a258..9dc0165676ef0 100644
--- a/decidim-comments/lib/decidim/comments/engine.rb
+++ b/decidim-comments/lib/decidim/comments/engine.rb
@@ -34,17 +34,6 @@ class Engine < ::Rails::Engine
         Decidim::Api::MutationType.include MutationExtensions
       end
 
-      initializer "decidim_comments.stats" do
-        Decidim.stats.register :comments_count,
-                               priority: StatsRegistry::HIGH_PRIORITY,
-                               icon_name: "chat-1-line",
-                               tooltip_key: "comments_count" do |organization|
-          Decidim.component_manifests.sum do |component|
-            component.stats.filter(tag: :comments).with_context(organization.published_components).map { |_name, value| value }.compact_blank.sum
-          end
-        end
-      end
-
       initializer "decidim_comments.register_icons" do
         common_parameters = { category: "action", engine: :comments }
 
diff --git a/decidim-core/app/presenters/decidim/stats_presenter.rb b/decidim-core/app/presenters/decidim/stats_presenter.rb
index 51694f8e95963..549c83b8f8e46 100644
--- a/decidim-core/app/presenters/decidim/stats_presenter.rb
+++ b/decidim-core/app/presenters/decidim/stats_presenter.rb
@@ -15,7 +15,7 @@ def collection(priority: StatsRegistry::MEDIUM_PRIORITY)
             hash[name][:data][idx] += value
           end
         else
-          hash[name] = stat
+          hash[name] = stat.merge(data: stat[:data].dup)
         end
       end.values
     end
diff --git a/decidim-core/spec/presenters/decidim/stats_presenter_spec.rb b/decidim-core/spec/presenters/decidim/stats_presenter_spec.rb
index 00e560398595a..4e2da2346c148 100644
--- a/decidim-core/spec/presenters/decidim/stats_presenter_spec.rb
+++ b/decidim-core/spec/presenters/decidim/stats_presenter_spec.rb
@@ -40,6 +40,18 @@
 
       expect(result).to contain_exactly({ name: "stat_1", data: [16, 3] })
     end
+
+    it "returns the same data when called several times" do
+      allow(presenter).to receive(:all_stats).with(priority:).and_return([
+                                                                           { name: "stat_1", data: [12, 3] },
+                                                                           { name: "stat_1", data: [4] }
+                                                                         ])
+
+      presenter.collection(priority:)
+      result = presenter.collection(priority:)
+
+      expect(result).to contain_exactly({ name: "stat_1", data: [16, 3] })
+    end
   end
 
   describe "#all_stats" do
diff --git a/decidim-debates/lib/decidim/debates/component.rb b/decidim-debates/lib/decidim/debates/component.rb
index 76a678da5f0eb..46a54df349a46 100644
--- a/decidim-debates/lib/decidim/debates/component.rb
+++ b/decidim-debates/lib/decidim/debates/component.rb
@@ -66,7 +66,7 @@
                           icon_name: "chat-1-line",
                           tooltip_key: "comments_count",
                           tag: :comments do |components, _start_at, _end_at|
-    Decidim::Debates::Debate.where(component: components).not_hidden.count
+    Decidim::Debates::Debate.where(component: components).not_hidden.sum(:comments_count)
   end
 
   component.register_stat :likes_count, priority: Decidim::StatsRegistry::LOW_PRIORITY do |components, _start_at, _end_at|
diff --git a/decidim-debates/spec/lib/decidim/debates/component_spec.rb b/decidim-debates/spec/lib/decidim/debates/component_spec.rb
index 7820f2d50f75d..d304aee2855ca 100644
--- a/decidim-debates/spec/lib/decidim/debates/component_spec.rb
+++ b/decidim-debates/spec/lib/decidim/debates/component_spec.rb
@@ -7,6 +7,33 @@
   let(:organization) { component.organization }
   let!(:current_user) { create(:user, :confirmed, :admin, organization:) }
 
+  describe "stats" do
+    subject { current_stat[1][:data] }
+
+    let(:raw_stats) do
+      Decidim.component_manifests.map do |component_manifest|
+        component_manifest.stats.filter(name: stats_name).with_context(component).flat_map { |name, data| [component_manifest.name, name, data] }
+      end
+    end
+
+    let(:stats) { raw_stats.select { |stat| stat[0] == :debates } }
+    let!(:debate) { create(:debate, component:) }
+    let(:current_stat) { stats.find { |stat| stat[1][:name] == stats_name } }
+
+    describe "comments_count" do
+      let(:stats_name) { :comments_count }
+
+      before do
+        create_list(:comment, 3, commentable: debate)
+      end
+
+      it "counts the comments" do
+        expect(Decidim::Comments::Comment.count).to eq 3
+        expect(subject).to eq 3
+      end
+    end
+  end
+
   describe "on edit", type: :system do
     let(:edit_component_path) do
       Decidim::EngineRouter.admin_proxy(component.participatory_space).edit_component_path(component.id)

From 9c4de09d1f4c77a4ae51235706898597fd2132bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= <ivan@pokecode.net>
Date: Thu, 21 May 2026 10:22:22 +0200
Subject: [PATCH 024/131] fix system

---
 .../app/commands/decidim/system/update_organization.rb          | 1 +
 .../app/controllers/decidim/system/organizations_controller.rb  | 2 +-
 .../spec/commands/decidim/system/update_organization_spec.rb    | 1 +
 decidim-system/spec/system/organizations_spec.rb                | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/decidim-system/app/commands/decidim/system/update_organization.rb b/decidim-system/app/commands/decidim/system/update_organization.rb
index c84fbee17c23c..be1cea80a453f 100644
--- a/decidim-system/app/commands/decidim/system/update_organization.rb
+++ b/decidim-system/app/commands/decidim/system/update_organization.rb
@@ -45,6 +45,7 @@ def organization
 
       def save_organization
         organization.name = form.name
+        organization.short_name = form.short_name
         organization.host = form.host
         organization.secondary_hosts = form.clean_secondary_hosts
         organization.force_users_to_authenticate_before_access_organization = form.force_users_to_authenticate_before_access_organization
diff --git a/decidim-system/app/controllers/decidim/system/organizations_controller.rb b/decidim-system/app/controllers/decidim/system/organizations_controller.rb
index 4aa65546820e6..b42df297ff8a8 100644
--- a/decidim-system/app/controllers/decidim/system/organizations_controller.rb
+++ b/decidim-system/app/controllers/decidim/system/organizations_controller.rb
@@ -82,7 +82,7 @@ def default_params
           host: request.host,
           organization_admin_name: current_admin.email.split("@")[0],
           organization_admin_email: current_admin.email,
-          available_locales: Decidim.available_locales.map(&:to_s),
+          available_locales: [Decidim.default_locale.to_s],
           default_locale: Decidim.default_locale,
           users_registration_mode: "enabled"
         }
diff --git a/decidim-system/spec/commands/decidim/system/update_organization_spec.rb b/decidim-system/spec/commands/decidim/system/update_organization_spec.rb
index 29fd5487b6376..84f181bd35385 100644
--- a/decidim-system/spec/commands/decidim/system/update_organization_spec.rb
+++ b/decidim-system/spec/commands/decidim/system/update_organization_spec.rb
@@ -58,6 +58,7 @@ module System
             organization = Organization.last
 
             expect(translated(organization.name)).to eq("Gotham City")
+            expect(translated(organization.short_name)).to eq("GothamCity")
             expect(organization.host).to eq("decide.example.org")
             expect(organization.secondary_hosts).to contain_exactly("foo.example.org", "bar.example.org")
             expect(organization.users_registration_mode).to eq("existing")
diff --git a/decidim-system/spec/system/organizations_spec.rb b/decidim-system/spec/system/organizations_spec.rb
index a393fae94ae6f..53b35de9a4d76 100644
--- a/decidim-system/spec/system/organizations_spec.rb
+++ b/decidim-system/spec/system/organizations_spec.rb
@@ -33,7 +33,7 @@
         expect(find(:xpath, "//input[@id='organization_organization_admin_name']").value).to eq(admin.email.split("@")[0])
         expect(find(:xpath, "//input[@id='organization_organization_admin_email']").value).to eq(admin.email)
         within "table" do
-          expect(all("input[type=checkbox]")).to all(be_checked)
+          expect(find(:xpath, "//input[@id='organization_available_locales_#{Decidim.default_locale}']")).to be_checked
           expect(find(:xpath, "//input[@name='organization[default_locale]']", match: :first)).to be_checked
         end
         expect(find(:xpath, "//input[@name='organization[users_registration_mode]']", match: :first).value).to eq("enabled")

From 516faead4035c01d7185c75234a160e8b950055d Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Thu, 21 May 2026 15:39:03 +0200
Subject: [PATCH 025/131] Backport 'Display description richtext in elections
 questions' body' to v0.31 (#16866)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* show proper richtext in election questions

* fix helper

* fix test

* do not render div if no description

---------

Co-authored-by: Ivan Vergés <ivan@pokecode.net>
Co-authored-by: Anna Topalidi <t.opalidisanna@gmail.com>
---
 .../app/helpers/decidim/elections/application_helper.rb    | 7 +------
 .../views/decidim/elections/elections/_questions.html.erb  | 5 ++++-
 .../helpers/decidim/elections/application_helper_spec.rb   | 5 ++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/decidim-elections/app/helpers/decidim/elections/application_helper.rb b/decidim-elections/app/helpers/decidim/elections/application_helper.rb
index fb76d007ffb3c..78f84da9bdc3d 100644
--- a/decidim-elections/app/helpers/decidim/elections/application_helper.rb
+++ b/decidim-elections/app/helpers/decidim/elections/application_helper.rb
@@ -47,12 +47,7 @@ def render_question_description(question)
         description = translated_attribute(question.description)
         return if description.blank?
 
-        sanitized = decidim_sanitize_admin(description)
-        if rich_text_editor_in_public_views?
-          Decidim::ContentProcessor.render_without_format(sanitized).html_safe
-        else
-          Decidim::ContentProcessor.render(sanitized, "div")
-        end
+        decidim_sanitize_editor_admin(description)
       end
 
       def selected_response_option_id(question)
diff --git a/decidim-elections/app/views/decidim/elections/elections/_questions.html.erb b/decidim-elections/app/views/decidim/elections/elections/_questions.html.erb
index 9cbd2fea2b1fa..9624af4cdbdd3 100644
--- a/decidim-elections/app/views/decidim/elections/elections/_questions.html.erb
+++ b/decidim-elections/app/views/decidim/elections/elections/_questions.html.erb
@@ -12,7 +12,10 @@
       </button>
     </div>
     <div id="panel-question-<%= question.id %>" class="card-accordion-section" aria-hidden="true">
-      <div class="mb-4"><%= decidim_sanitize translated_attribute(question.description) %></div>
+       <% description = render_question_description(question) %>
+       <% if description.present? %>
+         <div class="editor-content"><%= description %></div>
+       <% end %>
 
         <% question.response_options.each do |answer| %>
           <h4><%= translated_attribute answer.body %></h4>
diff --git a/decidim-elections/spec/helpers/decidim/elections/application_helper_spec.rb b/decidim-elections/spec/helpers/decidim/elections/application_helper_spec.rb
index 50e226cef44d1..3ee81cb3cd9b6 100644
--- a/decidim-elections/spec/helpers/decidim/elections/application_helper_spec.rb
+++ b/decidim-elections/spec/helpers/decidim/elections/application_helper_spec.rb
@@ -9,7 +9,6 @@ module Elections
 
       before do
         allow(helper).to receive(:current_organization).and_return(organization)
-        allow(helper).to receive(:rich_text_editor_in_public_views?).and_return(true)
       end
 
       describe "#question_description" do
@@ -24,14 +23,14 @@ module Elections
         context "when the description has plain text" do
           let(:question) { create(:election_question, description: { "en" => "More info" }) }
 
-          it { is_expected.to eq("More info") }
+          it { is_expected.to eq('<div class="rich-text-display">More info</div>') }
         end
 
         context "when the description includes markup" do
           let(:question) { build(:election_question, description: { "en" => "<strong>Intro</strong>" }) }
 
           it "keeps the allowed tags" do
-            expect(rendered_description).to eq("<strong>Intro</strong>")
+            expect(rendered_description).to eq('<div class="rich-text-display"><strong>Intro</strong></div>')
           end
         end
 

From 918258f491a0d3c68c19e7170fdabd9e714bceb4 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Thu, 21 May 2026 21:28:06 +0200
Subject: [PATCH 026/131] Backport 'Fix floating help with the access modes
 alert on mobile' to v0.31 (#16871)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 decidim-core/app/packs/stylesheets/decidim/_floating_help.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/decidim-core/app/packs/stylesheets/decidim/_floating_help.scss b/decidim-core/app/packs/stylesheets/decidim/_floating_help.scss
index 49258af4204c4..d159d4dc17fe4 100644
--- a/decidim-core/app/packs/stylesheets/decidim/_floating_help.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/_floating_help.scss
@@ -1,5 +1,5 @@
 [data-floating-help] {
-  @apply absolute z-10 top-5 md:top-10 right-0 [&_button]:bg-background [&_button]:px-2 [&_button]:rounded-r-none [&_svg]:text-gray [&_svg]:fill-current;
+  @apply absolute z-10 top-20 md:top-10 right-0 [&_button]:bg-background [&_button]:px-2 [&_button]:rounded-r-none [&_svg]:text-gray [&_svg]:fill-current;
 
   &:hover {
     @apply [&_svg]:text-white [&_button]:text-white [&_button]:bg-secondary [&_button]:no-underline;

From a7182d94fd5f476b5b1d397c4391f24ebd0c1651 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Fri, 22 May 2026 00:26:14 +0200
Subject: [PATCH 027/131] Backport 'Fix `ActiveStorage::FileNotFoundError` in
 specs' to v0.31 (#16863)

Co-authored-by: Antti Hukkanen <antti.hukkanen@mainiotech.fi>
---
 .../spec/commands/duplicate_assembly_spec.rb  |  5 +--
 .../admin/admin_imports_assembly_spec.rb      |  6 ++--
 .../admin/imports_controller_spec.rb          |  5 +--
 .../basic_only_text_cell_spec.rb              |  5 +--
 .../spec/models/decidim/content_block_spec.rb | 10 ++----
 decidim-dev/lib/decidim/dev.rb                | 33 ++++++++++++++++++-
 .../duplicate_participatory_process_spec.rb   |  5 +--
 .../admin/imports_controller_spec.rb          |  5 +--
 ...admin_import_participatory_process_spec.rb |  6 ++--
 .../system/create_oauth_application_spec.rb   |  5 +--
 10 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/decidim-assemblies/spec/commands/duplicate_assembly_spec.rb b/decidim-assemblies/spec/commands/duplicate_assembly_spec.rb
index 9a87e8ff56bce..4471a331ce395 100644
--- a/decidim-assemblies/spec/commands/duplicate_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/duplicate_assembly_spec.rb
@@ -102,10 +102,7 @@ module Decidim::Assemblies
     context "when duplicate_landing_page_blocks exists" do
       let(:duplicate_landing_page_blocks) { true }
       let(:original_image) do
-        Rack::Test::UploadedFile.new(
-          Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
-          "image/jpeg"
-        )
+        Decidim::Dev.test_file("city.jpeg", "image/jpeg")
       end
 
       before do
diff --git a/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb b/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
index fd67e9382fb93..3cb42099a3b57 100644
--- a/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
@@ -103,7 +103,7 @@
       end
     end
     let(:uploaded_file) do
-      Rack::Test::UploadedFile.new(json_file.path, "application/json")
+      Decidim::Dev.uploaded_file(json_file.path, "application/json")
     end
 
     before do
@@ -264,7 +264,7 @@
       end
     end
     let(:uploaded_file) do
-      Rack::Test::UploadedFile.new(json_file.path, "application/json")
+      Decidim::Dev.uploaded_file(json_file.path, "application/json")
     end
     let(:hero_image_url) { "http://example.com/#{"a" * 5000}.jpg" }
     let(:banner_image_url) { "http://example.com/#{"b" * 5000}.jpg" }
@@ -321,7 +321,7 @@
       end
     end
     let(:uploaded_file) do
-      Rack::Test::UploadedFile.new(json_file.path, "application/json")
+      Decidim::Dev.uploaded_file(json_file.path, "application/json")
     end
 
     before do
diff --git a/decidim-conferences/spec/controllers/admin/imports_controller_spec.rb b/decidim-conferences/spec/controllers/admin/imports_controller_spec.rb
index 2ec0c6a719fcd..f9aba84439f69 100644
--- a/decidim-conferences/spec/controllers/admin/imports_controller_spec.rb
+++ b/decidim-conferences/spec/controllers/admin/imports_controller_spec.rb
@@ -13,10 +13,7 @@ module Admin
           let(:extra_params) { { conference_slug: participatory_space.slug } }
 
           let(:file) do
-            Rack::Test::UploadedFile.new(
-              Decidim::Dev.test_file("import_proposals.csv", "text/csv"),
-              "text/csv"
-            )
+            Decidim::Dev.test_file("import_proposals.csv", "text/csv")
           end
         end
       end
diff --git a/decidim-core/spec/cells/decidim/newsletter_templates/basic_only_text_cell_spec.rb b/decidim-core/spec/cells/decidim/newsletter_templates/basic_only_text_cell_spec.rb
index 1db8cafa6e924..491ac0c2860a1 100644
--- a/decidim-core/spec/cells/decidim/newsletter_templates/basic_only_text_cell_spec.rb
+++ b/decidim-core/spec/cells/decidim/newsletter_templates/basic_only_text_cell_spec.rb
@@ -30,10 +30,7 @@
 
   context "when the organization has a logo set" do
     let(:logo) do
-      Rack::Test::UploadedFile.new(
-        Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
-        "image/jpeg"
-      )
+      Decidim::Dev.test_file("city.jpeg", "image/jpeg")
     end
 
     before do
diff --git a/decidim-core/spec/models/decidim/content_block_spec.rb b/decidim-core/spec/models/decidim/content_block_spec.rb
index 8e3ee29f677a9..407bafbbe848d 100644
--- a/decidim-core/spec/models/decidim/content_block_spec.rb
+++ b/decidim-core/spec/models/decidim/content_block_spec.rb
@@ -31,10 +31,7 @@ module Decidim
 
       context "when the related attachment exists" do
         let(:original_image) do
-          Rack::Test::UploadedFile.new(
-            Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
-            "image/jpeg"
-          )
+          Decidim::Dev.test_file("city.jpeg", "image/jpeg")
         end
 
         before do
@@ -52,10 +49,7 @@ module Decidim
 
       context "when the image is larger in size than the organization allows" do
         let(:original_image) do
-          Rack::Test::UploadedFile.new(
-            Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
-            "image/jpeg"
-          )
+          Decidim::Dev.test_file("city.jpeg", "image/jpeg")
         end
 
         before do
diff --git a/decidim-dev/lib/decidim/dev.rb b/decidim-dev/lib/decidim/dev.rb
index 3da87466c2f06..d540e1827c7bf 100644
--- a/decidim-dev/lib/decidim/dev.rb
+++ b/decidim-dev/lib/decidim/dev.rb
@@ -34,7 +34,38 @@ def self.asset(name)
 
     # Public: Returns a file for testing, just like file fields expect it
     def self.test_file(filename, content_type)
-      Rack::Test::UploadedFile.new(asset(filename), content_type)
+      uploaded_file(asset(filename), content_type)
+    end
+
+    # Public: Creates a safe uploaded file for tests.
+    #
+    # Creating instances of Rack::Test::UploadedFile directly from file paths
+    # may lead to 0-byte files created in the storage under specific
+    # configurations/kernels and specifically with Docker containers. This
+    # method creates a safe uploaded file that does not have this problem.
+    #
+    # See:
+    # https://github.com/rails/rails/issues/41991
+    # https://github.com/docker/for-mac/issues/5570
+    # https://github.com/docker/for-linux/issues/1015
+    #
+    # @param path [String] The path to the original file
+    # @param content_type [String] The MIME type for the file
+    # @param binary [Boolean] Boolean indicating whether the uploaded file's
+    #   tempfile should be in binary mode
+    # @return [Rack::Test::UploadedFile] A new uploaded test file instance
+    def self.uploaded_file(path, content_type, binary: false)
+      original_filename = File.basename(path)
+      extension = File.extname(original_filename)
+
+      tempfile = Tempfile.open([File.basename(original_filename, extension), extension])
+      tempfile.binmode if binary
+      tempfile.write(binary ? File.binread(path) : File.read(path))
+      tempfile.rewind
+
+      Rack::Test::UploadedFile.new(tempfile, content_type, binary, original_filename:)
+    ensure
+      tempfile&.close!
     end
 
     # Public: add rake tasks
diff --git a/decidim-participatory_processes/spec/commands/duplicate_participatory_process_spec.rb b/decidim-participatory_processes/spec/commands/duplicate_participatory_process_spec.rb
index 16a0042b8071b..a8279f2fcf147 100644
--- a/decidim-participatory_processes/spec/commands/duplicate_participatory_process_spec.rb
+++ b/decidim-participatory_processes/spec/commands/duplicate_participatory_process_spec.rb
@@ -124,10 +124,7 @@ module Decidim::ParticipatoryProcesses
     context "when duplicate_landing_page_blocks exists" do
       let(:duplicate_landing_page_blocks) { true }
       let(:original_image) do
-        Rack::Test::UploadedFile.new(
-          Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
-          "image/jpeg"
-        )
+        Decidim::Dev.test_file("city.jpeg", "image/jpeg")
       end
 
       before do
diff --git a/decidim-participatory_processes/spec/controllers/admin/imports_controller_spec.rb b/decidim-participatory_processes/spec/controllers/admin/imports_controller_spec.rb
index 3fabc7282c04d..61e779d37bf2f 100644
--- a/decidim-participatory_processes/spec/controllers/admin/imports_controller_spec.rb
+++ b/decidim-participatory_processes/spec/controllers/admin/imports_controller_spec.rb
@@ -13,10 +13,7 @@ module Admin
           let(:extra_params) { { participatory_process_slug: participatory_space.slug } }
 
           let(:file) do
-            Rack::Test::UploadedFile.new(
-              Decidim::Dev.test_file("import_proposals.csv", "text/csv"),
-              "text/csv"
-            )
+            Decidim::Dev.test_file("import_proposals.csv", "text/csv")
           end
         end
       end
diff --git a/decidim-participatory_processes/spec/system/admin/admin_import_participatory_process_spec.rb b/decidim-participatory_processes/spec/system/admin/admin_import_participatory_process_spec.rb
index c63d8026c477f..a83777c84b2fc 100644
--- a/decidim-participatory_processes/spec/system/admin/admin_import_participatory_process_spec.rb
+++ b/decidim-participatory_processes/spec/system/admin/admin_import_participatory_process_spec.rb
@@ -105,7 +105,7 @@
       end
     end
     let(:uploaded_file) do
-      Rack::Test::UploadedFile.new(json_file.path, "application/json")
+      Decidim::Dev.uploaded_file(json_file.path, "application/json")
     end
 
     before do
@@ -158,7 +158,7 @@
       end
     end
     let(:uploaded_file) do
-      Rack::Test::UploadedFile.new(json_file.path, "application/json")
+      Decidim::Dev.uploaded_file(json_file.path, "application/json")
     end
 
     before do
@@ -211,7 +211,7 @@
       end
     end
     let(:uploaded_file) do
-      Rack::Test::UploadedFile.new(json_file.path, "application/json")
+      Decidim::Dev.uploaded_file(json_file.path, "application/json")
     end
 
     before do
diff --git a/decidim-system/spec/commands/decidim/system/create_oauth_application_spec.rb b/decidim-system/spec/commands/decidim/system/create_oauth_application_spec.rb
index 325f06d9ca3bd..1d039ace5b54c 100644
--- a/decidim-system/spec/commands/decidim/system/create_oauth_application_spec.rb
+++ b/decidim-system/spec/commands/decidim/system/create_oauth_application_spec.rb
@@ -21,10 +21,7 @@ module Decidim::System
       }
     end
     let(:file) do
-      Rack::Test::UploadedFile.new(
-        Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
-        "image/jpeg"
-      )
+      Decidim::Dev.test_file("city.jpeg", "image/jpeg")
     end
     let(:context) do
       {

From 3ce38bbc9b7748335e01ab0176b806904235e9c8 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Fri, 22 May 2026 02:14:04 +0200
Subject: [PATCH 028/131] Backport 'Vote button shows budget projects when user
 is logged out' to v0.31 (#16870)

Co-authored-by: Lucas Carrias <lucascarrias@outlook.com>
---
 .../decidim/budgets/budget_list_item_cell.rb   | 18 ++++++++++++------
 .../spec/system/explore_budgets_spec.rb        |  5 ++---
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/decidim-budgets/app/cells/decidim/budgets/budget_list_item_cell.rb b/decidim-budgets/app/cells/decidim/budgets/budget_list_item_cell.rb
index 88736ea77789a..53497fc761b4b 100644
--- a/decidim-budgets/app/cells/decidim/budgets/budget_list_item_cell.rb
+++ b/decidim-budgets/app/cells/decidim/budgets/budget_list_item_cell.rb
@@ -47,12 +47,18 @@ def status
       # If not (i.e. voting is disabled or finished), then link to the resource itself
       def link_to_resource_or_vote(css_class)
         if voting_open?
-          action_authorized_link_to "vote",
-                                    budget_projects_path(budget, start_voting: true),
-                                    resource: budget,
-                                    data: { "redirect-url": budget_projects_path(budget) },
-                                    class: css_class do
-            yield
+          if current_user
+            action_authorized_link_to :vote,
+                                      budget_projects_path(budget, start_voting: true),
+                                      resource: budget,
+                                      class: css_class,
+                                      data: { "redirect-url": budget_projects_path(budget) } do
+              yield
+            end
+          else
+            link_to budget_projects_path(budget, start_voting: true), class: css_class do
+              yield
+            end
           end
         else
           link_to resource_path, class: css_class do
diff --git a/decidim-budgets/spec/system/explore_budgets_spec.rb b/decidim-budgets/spec/system/explore_budgets_spec.rb
index 2b392fb32516a..14536712933d0 100644
--- a/decidim-budgets/spec/system/explore_budgets_spec.rb
+++ b/decidim-budgets/spec/system/explore_budgets_spec.rb
@@ -107,9 +107,8 @@
         end
 
         context "and the voting is open" do
-          it "links to the authorization modal" do
-            expect(item).to have_link(translated(budget.title), href: budget_path(budget))
-            expect(item).to have_css("a[data-dialog-open='loginModal']")
+          it "links the vote CTA to the budget projects" do
+            expect(item).to have_css(".budget__card__highlight-vote[href='#{budget_projects_path(budget)}']")
           end
         end
 

From dc694c900d63f788fd451e5588ef45ff1c18670f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?=
 <andreslucena@users.noreply.github.com>
Date: Fri, 22 May 2026 09:17:32 +0200
Subject: [PATCH 029/131] Backport 'Fix blank state select import on budgets &
 proposal component' to v0.31 (#16874)

Co-authored-by: Tom Greenwood <101816158+greenwoodt@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 .../admin/project_import_proposals_form.rb    |  13 ++
 .../admin/import_proposals_to_budgets_spec.rb |  12 ++
 .../project_import_proposals_form_spec.rb     |  44 ++++++
 .../import_proposals_to_projects_spec.rb      |  16 +++
 .../proposals/admin/proposals_import_form.rb  |   1 -
 .../proposals/admin/import_proposals_job.rb   |   4 +-
 .../admin/proposals_import_form_spec.rb       |  46 +++++-
 ...t_proposals_from_another_component_spec.rb | 133 ++++++++++++++++++
 8 files changed, 266 insertions(+), 3 deletions(-)
 create mode 100644 decidim-proposals/spec/system/admin/import_proposals_from_another_component_spec.rb

diff --git a/decidim-budgets/app/forms/decidim/budgets/admin/project_import_proposals_form.rb b/decidim-budgets/app/forms/decidim/budgets/admin/project_import_proposals_form.rb
index 98275bb6f532a..2f91dd060e60b 100644
--- a/decidim-budgets/app/forms/decidim/budgets/admin/project_import_proposals_form.rb
+++ b/decidim-budgets/app/forms/decidim/budgets/admin/project_import_proposals_form.rb
@@ -14,6 +14,7 @@ class ProjectImportProposalsForm < Decidim::Form
 
         validates :origin_component_id, :origin_component, :current_component, presence: true
         validates :default_budget, presence: true, numericality: { greater_than: 0 }
+        validate :valid_states
 
         def states
           super.compact_blank
@@ -36,6 +37,18 @@ def origin_components_collection
         def budget
           @budget ||= context[:budget]
         end
+
+        private
+
+        def valid_states
+          return unless origin_component
+          return if states.empty?
+
+          valid_tokens = Decidim::Proposals::ProposalState.where(component: origin_component).pluck(:token) + ["not_answered"]
+          return if states.all? { |state| valid_tokens.include?(state) }
+
+          errors.add(:states, :invalid)
+        end
       end
     end
   end
diff --git a/decidim-budgets/spec/commands/decidim/budgets/admin/import_proposals_to_budgets_spec.rb b/decidim-budgets/spec/commands/decidim/budgets/admin/import_proposals_to_budgets_spec.rb
index 777160ec5ffe9..71927799f89ca 100644
--- a/decidim-budgets/spec/commands/decidim/budgets/admin/import_proposals_to_budgets_spec.rb
+++ b/decidim-budgets/spec/commands/decidim/budgets/admin/import_proposals_to_budgets_spec.rb
@@ -88,6 +88,18 @@ module Admin
               end
             end
 
+            context "when there are no states" do
+              let(:internal_states) { [] }
+
+              it "broadcasts ok" do
+                expect { command.call }.to broadcast(:ok)
+              end
+
+              it "imports all proposals" do
+                expect { command.call }.to change { Project.where(budget:).count }.by(3)
+              end
+            end
+
             context "when a proposal was already imported" do
               let(:second_proposal) { create(:proposal, :accepted, component: proposal.component) }
 
diff --git a/decidim-budgets/spec/forms/decidim/budgets/admin/project_import_proposals_form_spec.rb b/decidim-budgets/spec/forms/decidim/budgets/admin/project_import_proposals_form_spec.rb
index 18a581be82b8d..790f5262228a7 100644
--- a/decidim-budgets/spec/forms/decidim/budgets/admin/project_import_proposals_form_spec.rb
+++ b/decidim-budgets/spec/forms/decidim/budgets/admin/project_import_proposals_form_spec.rb
@@ -68,6 +68,50 @@ module Admin
             expect(form.origin_components.length).to eq(1)
           end
         end
+
+        describe "valid_states validation" do
+          context "when all selected states are valid" do
+            let(:states) { %w(accepted rejected) }
+
+            it { is_expected.to be_valid }
+          end
+
+          context "when including the special not_answered state" do
+            let(:states) { %w(accepted not_answered) }
+
+            it { is_expected.to be_valid }
+          end
+
+          context "when only not_answered is selected" do
+            let(:states) { %w(not_answered) }
+
+            it { is_expected.to be_valid }
+          end
+
+          context "when some states are invalid" do
+            let(:states) { %w(accepted invalid_state) }
+
+            it { is_expected.to be_invalid }
+
+            it "adds an error to the states attribute" do
+              form.valid?
+              expect(form.errors[:states]).to be_present
+            end
+          end
+
+          context "when all states are invalid" do
+            let(:states) { %w(nonexistent_state another_invalid) }
+
+            it { is_expected.to be_invalid }
+          end
+
+          context "when there is no origin component" do
+            let(:origin_component) { nil }
+            let(:states) { %w(invalid_state) }
+
+            it { is_expected.to be_invalid }
+          end
+        end
       end
     end
   end
diff --git a/decidim-budgets/spec/system/import_proposals_to_projects_spec.rb b/decidim-budgets/spec/system/import_proposals_to_projects_spec.rb
index 1372101c966ae..d75ca331a09f9 100644
--- a/decidim-budgets/spec/system/import_proposals_to_projects_spec.rb
+++ b/decidim-budgets/spec/system/import_proposals_to_projects_spec.rb
@@ -115,5 +115,21 @@
         expect(Decidim::Budgets::Project.where(budget:).count).to eq(2)
       end
     end
+
+    context "when no states are selected" do
+      let!(:proposals) { create_list(:proposal, 3, :published, component: origin_component) }
+
+      it "imports all proposals" do
+        within ".import_proposals" do
+          select origin_component.name["en"], from: "Origin component"
+          fill_in "Default budget", with: 1000
+        end
+
+        click_on "Import proposals to projects"
+
+        expect(page).to have_content("3 proposals successfully imported")
+        expect(Decidim::Budgets::Project.where(budget:).count).to eq(3)
+      end
+    end
   end
 end
diff --git a/decidim-proposals/app/forms/decidim/proposals/admin/proposals_import_form.rb b/decidim-proposals/app/forms/decidim/proposals/admin/proposals_import_form.rb
index 0ac67faa087e6..c85c08864a7e9 100644
--- a/decidim-proposals/app/forms/decidim/proposals/admin/proposals_import_form.rb
+++ b/decidim-proposals/app/forms/decidim/proposals/admin/proposals_import_form.rb
@@ -15,7 +15,6 @@ class ProposalsImportForm < Decidim::Form
         attribute :states, Array[String]
 
         validates :origin_component_id, :origin_component, :current_component, presence: true
-        validates :states, presence: true
         validate :valid_states
 
         def states
diff --git a/decidim-proposals/app/jobs/decidim/proposals/admin/import_proposals_job.rb b/decidim-proposals/app/jobs/decidim/proposals/admin/import_proposals_job.rb
index 86f77863123bf..bfdaedcadec65 100644
--- a/decidim-proposals/app/jobs/decidim/proposals/admin/import_proposals_job.rb
+++ b/decidim-proposals/app/jobs/decidim/proposals/admin/import_proposals_job.rb
@@ -32,7 +32,9 @@ def perform(form)
         def proposals
           proposals = Decidim::Proposals::Proposal.not_hidden.not_withdrawn.where(component: origin_component)
 
-          if @form["states"].include?("not_answered")
+          if @form["states"].blank?
+            proposals
+          elsif @form["states"].include?("not_answered")
             proposals.not_answered.or(proposals.where(id: proposals.only_status(@form["states"]).pluck(:id)))
           else
             proposals.only_status(@form["states"])
diff --git a/decidim-proposals/spec/forms/decidim/proposals/admin/proposals_import_form_spec.rb b/decidim-proposals/spec/forms/decidim/proposals/admin/proposals_import_form_spec.rb
index d26f8dd19bfdb..a48193e7a0cdd 100644
--- a/decidim-proposals/spec/forms/decidim/proposals/admin/proposals_import_form_spec.rb
+++ b/decidim-proposals/spec/forms/decidim/proposals/admin/proposals_import_form_spec.rb
@@ -40,7 +40,7 @@ module Admin
         context "when there are no states" do
           let(:states) { [] }
 
-          it { is_expected.to be_invalid }
+          it { is_expected.to be_valid }
         end
 
         context "when there is no target component" do
@@ -81,6 +81,50 @@ module Admin
             expect(form.origin_components.length).to eq(1)
           end
         end
+
+        describe "valid_states validation" do
+          context "when all selected states are valid" do
+            let(:states) { %w(accepted rejected) }
+
+            it { is_expected.to be_valid }
+          end
+
+          context "when including the special not_answered state" do
+            let(:states) { %w(accepted not_answered) }
+
+            it { is_expected.to be_valid }
+          end
+
+          context "when only not_answered is selected" do
+            let(:states) { %w(not_answered) }
+
+            it { is_expected.to be_valid }
+          end
+
+          context "when some states are invalid" do
+            let(:states) { %w(accepted invalid_state) }
+
+            it { is_expected.to be_invalid }
+
+            it "adds an error to the states attribute" do
+              form.valid?
+              expect(form.errors[:states]).to be_present
+            end
+          end
+
+          context "when all states are invalid" do
+            let(:states) { %w(nonexistent_state another_invalid) }
+
+            it { is_expected.to be_invalid }
+          end
+
+          context "when there is no origin component" do
+            let(:origin_component) { nil }
+            let(:states) { %w(invalid_state) }
+
+            it { is_expected.to be_invalid }
+          end
+        end
       end
     end
   end
diff --git a/decidim-proposals/spec/system/admin/import_proposals_from_another_component_spec.rb b/decidim-proposals/spec/system/admin/import_proposals_from_another_component_spec.rb
new file mode 100644
index 0000000000000..df38ae69b2fe3
--- /dev/null
+++ b/decidim-proposals/spec/system/admin/import_proposals_from_another_component_spec.rb
@@ -0,0 +1,133 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Import proposals from another component" do
+  let(:component) { create(:proposal_component) }
+  let(:participatory_space) { component.participatory_space }
+  let!(:origin_component) { create(:proposal_component, participatory_space:) }
+  let(:organization) { component.organization }
+
+  let(:manifest_name) { "proposals" }
+  let(:user) { create(:user, organization:) }
+
+  include_context "when managing a component as an admin" do
+    let!(:component) { create(:proposal_component, participatory_space:) }
+  end
+
+  before do
+    click_on "Import"
+    click_on "Import proposals from another component"
+  end
+
+  it "does not show state checkboxes before a component is selected" do
+    expect(page).to have_no_css("#states-container input[type='checkbox']")
+  end
+
+  it "dynamically loads state checkboxes after selecting an origin component" do
+    within ".import_proposals" do
+      select origin_component.name["en"], from: "Origin component"
+    end
+
+    within "#states-container" do
+      expect(page).to have_unchecked_field("Accepted")
+      expect(page).to have_unchecked_field("Rejected")
+      expect(page).to have_unchecked_field("Evaluating")
+      expect(page).to have_unchecked_field("Not answered")
+    end
+  end
+
+  it "hides state checkboxes when the component selection is cleared" do
+    within ".import_proposals" do
+      select origin_component.name["en"], from: "Origin component"
+    end
+
+    expect(page).to have_css("#states-container input[type='checkbox']")
+
+    within ".import_proposals" do
+      select "Please select a component", from: "Origin component"
+    end
+
+    expect(page).to have_no_css("#states-container input[type='checkbox']")
+  end
+
+  context "when importing proposals filtered by state" do
+    let!(:accepted_proposals) { create_list(:proposal, 2, :accepted, component: origin_component) }
+    let!(:rejected_proposals) { create_list(:proposal, 1, :rejected, component: origin_component) }
+
+    it "only imports proposals matching the selected state" do
+      within ".import_proposals" do
+        select origin_component.name["en"], from: "Origin component"
+        check "Accepted"
+      end
+
+      click_on "Import proposals"
+
+      expect(page).to have_content("The import process has started. We will let you know once it has finished.")
+      perform_enqueued_jobs
+      visit current_path
+
+      expect(Decidim::Proposals::Proposal.where(component:).count).to eq(2)
+    end
+  end
+
+  context "with a custom state on the origin component" do
+    let(:custom_title) { { "en" => "Under review" } }
+    let!(:custom_state) do
+      create(:proposal_state, component: origin_component, token: "under_review", title: custom_title)
+    end
+
+    it "shows the custom state alongside the default ones" do
+      within ".import_proposals" do
+        select origin_component.name["en"], from: "Origin component"
+      end
+
+      within "#states-container" do
+        expect(page).to have_unchecked_field("Under review")
+        expect(page).to have_unchecked_field("Accepted")
+        expect(page).to have_unchecked_field("Not answered")
+      end
+    end
+
+    context "when importing proposals with the custom state" do
+      let!(:custom_state_on_target) do
+        create(:proposal_state, component:, token: "under_review", title: custom_title)
+      end
+      let!(:custom_proposals) { create_list(:proposal, 2, component: origin_component, state: "under_review") }
+      let!(:accepted_proposals) { create_list(:proposal, 1, :accepted, component: origin_component) }
+
+      it "only imports proposals in the custom state" do
+        within ".import_proposals" do
+          select origin_component.name["en"], from: "Origin component"
+          check "Under review"
+        end
+
+        click_on "Import proposals"
+
+        expect(page).to have_content("The import process has started. We will let you know once it has finished.")
+        perform_enqueued_jobs
+        visit current_path
+
+        expect(Decidim::Proposals::Proposal.where(component:).count).to eq(2)
+      end
+    end
+
+    context "when no states are selected" do
+      let!(:proposals) { create_list(:proposal, 3, component: origin_component) }
+
+      it "imports all proposals" do
+        within ".import_proposals" do
+          select origin_component.name["en"], from: "Origin component"
+        end
+
+        click_on "Import proposals"
+
+        expect(page).to have_content("The import process has started. We will let you know once it has finished.")
+        perform_enqueued_jobs
+        visit current_path
+
+        expect(Decidim::Proposals::Proposal.where(component:).count).to eq(3)
+      end
+    end
+  end
+end

From 45f99eb77cead858209b55ef61d83eada14591e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?=
 <andreslucena@users.noreply.github.com>
Date: Fri, 22 May 2026 11:43:29 +0200
Subject: [PATCH 030/131] Add devcontainer configuration and scripts for v0.31
 (#16743)

---
 .devcontainer/Dockerfile            |  15 ++-
 .devcontainer/compose.yaml          |  40 +++++++
 .devcontainer/devcontainer.json     |  53 +++++----
 .devcontainer/docker-compose.yml    |  27 -----
 .github/actions/spelling/expect.txt |   4 +
 .gitignore                          |   1 +
 bin/devcontainer                    | 175 ++++++++++++++++++++++++++++
 bin/setup                           |  95 +++++++++++++++
 8 files changed, 357 insertions(+), 53 deletions(-)
 create mode 100644 .devcontainer/compose.yaml
 delete mode 100644 .devcontainer/docker-compose.yml
 create mode 100755 bin/devcontainer
 create mode 100755 bin/setup

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index bde812b3c811a..9712972405086 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,8 +1,11 @@
-FROM decidim/decidim:0.22.0-dev
+ARG RUBY_VERSION=3.3.4
+FROM ghcr.io/rails/devcontainer/images/ruby:$RUBY_VERSION
 
-RUN apt-get update && apt-get install -y \
-  vim
+RUN wget -q -O /tmp/google-chrome-key.pub https://dl-ssl.google.com/linux/linux_signing_key.pub \
+    && sudo gpg --dearmor -o /usr/share/keyrings/google-chrome-keyring.gpg /tmp/google-chrome-key.pub \
+    && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/google-chrome-keyring.gpg] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google-chrome.list \
+    && sudo apt-get update \
+    && sudo apt-get install -y google-chrome-stable libicu-dev \
+    && sudo rm -rf /var/lib/apt/lists/* /tmp/google-chrome-key.pub
 
-ENV EDITOR=vim
-
-RUN sh -c "$(wget -O- https://github.com/deluan/zsh-in-docker/releases/download/v1.1.1/zsh-in-docker.sh)"
+ENV BINDING="0.0.0.0"
diff --git a/.devcontainer/compose.yaml b/.devcontainer/compose.yaml
new file mode 100644
index 0000000000000..d3c19801cafbd
--- /dev/null
+++ b/.devcontainer/compose.yaml
@@ -0,0 +1,40 @@
+name: "decidim"
+
+services:
+  rails-app:
+    build:
+      context: ..
+      dockerfile: .devcontainer/Dockerfile
+    volumes:
+    - ../:/workspaces/decidim:cached
+    ports:
+      - "${DEVCONTAINER_APP_PORT:-3000}:3000"
+    env_file:
+      - path: ../.env
+        required: false
+    command: sleep infinity
+    depends_on:
+      - redis
+      - postgres
+
+  redis:
+    image: redis:7.2
+    restart: unless-stopped
+    volumes:
+    - redis-data:/data
+
+  postgres:
+    image: postgres:16.1
+    restart: unless-stopped
+    networks:
+      - default
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+
+volumes:
+  redis-data:
+  postgres-data:
+
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 4544c22e09232..cf25a3b547aa2 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,21 +1,34 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/ruby-rails
 {
-	"name": "Ruby on Rails",
-	"workspaceFolder": "/workspace",
-	"service": "rails",
-	"dockerComposeFile": [
-		"docker-compose.yml"
-	],
-	"settings": {
-		"terminal.integrated.shell.linux": "/bin/zsh"
-	},
-	"extensions": [
-		"rebornix.Ruby",
-		"wingrunr21.vscode-ruby",
-		"misogi.ruby-rubocop"
-	],
-	"forwardPorts": [
-		3000
-	],
-}
\ No newline at end of file
+  "name": "decidim",
+  "dockerComposeFile": "compose.yaml",
+  "service": "rails-app",
+  "workspaceFolder": "/workspaces/decidim",
+  "features": {
+    "ghcr.io/devcontainers/features/github-cli:1": {},
+    // Do not use bundler cache, to not generate conflicts with develop bundler cache
+    // "ghcr.io/rails/devcontainer/features/bundler-cache:1.0.1": {},
+    "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
+      "moby": false
+    },
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": "22.14.0"
+    },
+    "ghcr.io/rails/devcontainer/features/activestorage": {},
+    "ghcr.io/rails/devcontainer/features/postgres-client": {}
+  },
+  "containerEnv": {
+    "REDIS_URL": "redis://redis:6379/1",
+    "DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE_URL": "redis://redis:6379/2",
+    "DECIDIM_SPAM_DETECTION_BACKEND_USER_REDIS_URL": "redis://redis:6379/3",
+    "DATABASE_HOST": "postgres",
+    "DATABASE_USERNAME": "postgres",
+    "DATABASE_PASSWORD": "postgres"
+  },
+  "appPort": ["3000:3000"],
+  "forwardPorts": [
+    3000,
+    5432,
+    6379
+  ],
+  "postCreateCommand": "bin/setup --skip-server"
+}
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
deleted file mode 100644
index d2ad07c963e28..0000000000000
--- a/.devcontainer/docker-compose.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-version: "3"
-
-services:
-  rails:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    depends_on:
-      - db
-    command: /bin/sh -c "while sleep 1000; do :; done"
-    environment:
-      DATABASE_HOST: db
-      DATABASE_USERNAME: postgres
-      DATABASE_PASSWORD: postgres
-  db:
-    image: postgres:9.6
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
-      PGDATA: /var/lib/postgresql/data/pgdata
-    restart: always
-    volumes:
-      - db:/var/lib/postgresql/data
-
-volumes:
-  db:
\ No newline at end of file
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index c14bc9e1abe17..db9e6cc6f8d46 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -133,6 +133,7 @@ coauthorabledummy
 cobertura
 codecov
 codefor
+codespace
 CODEOWNERS
 codeql
 coditramuntana
@@ -217,6 +218,7 @@ doesnot
 doggotrainer
 Dokku
 Dota
+dotfiles
 douban
 downvoted
 downvotes
@@ -527,6 +529,7 @@ minuscat
 misogi
 mlat
 mlon
+moby
 Mobi
 modals
 modernizrrc
@@ -653,6 +656,7 @@ pgp
 PGVERSION
 Phargo
 phoe
+pids
 pinterest
 Placeholdit
 plantuml
diff --git a/.gitignore b/.gitignore
index c3bd03e19df05..cc1d4ed7569ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ decidim-packs
 packages/**/package-lock.json
 
 temporary_changelog.md
+.devcontainer/devcontainer.local.*
diff --git a/bin/devcontainer b/bin/devcontainer
new file mode 100755
index 0000000000000..6c975c41f5a7d
--- /dev/null
+++ b/bin/devcontainer
@@ -0,0 +1,175 @@
+#!/usr/bin/env bash
+
+# Configuration
+CONTAINER_NAME="decidim-rails-app"
+SCRIPT_NAME=$(basename "$0")
+CONTAINERS_TO_STOP=("decidim-rails-app-1" "decidim-selenium-1" "decidim-postgres-1" "decidim-redis-1")
+DEVCONTAINER_DIR=".devcontainer"
+DEVCONTAINER_JSON="$DEVCONTAINER_DIR/devcontainer.json"
+DEVCONTAINER_LOCAL_JSON="$DEVCONTAINER_DIR/devcontainer.local.json"
+DEVCONTAINER_BACKUP_JSON="$DEVCONTAINER_DIR/devcontainer.json.backup"
+
+# Function to use local config if it exists
+#
+# This allows having a file with local instructions for your personal developer environment at
+# .devcontainer/devcontainer.local.json
+# So, for instance, you can have
+#
+# ```json
+# {
+#   "postCreateCommand": ".devcontainer/devcontainer.local.postCreateCommand.bash"
+# }
+# ```
+#
+# And there you can add your own packages, dotfiles, etc. Do not forget to also call `bin/setup`
+# at the end of your script.
+#
+use_local_config() {
+    if [ -f "$DEVCONTAINER_LOCAL_JSON" ]; then
+        # Check if jq is available
+        if command -v jq &> /dev/null; then
+            echo "Merging devcontainer.local.json with devcontainer.json..." >&2
+
+            # Backup original
+            cp "$DEVCONTAINER_JSON" "$DEVCONTAINER_BACKUP_JSON"
+
+            # Merge configs: base config with local overrides
+            # jq -s '.[0] * .[1]' merges two objects, with the second overriding the first
+            if jq -s '.[0] * .[1]' "$DEVCONTAINER_BACKUP_JSON" "$DEVCONTAINER_LOCAL_JSON" > "$DEVCONTAINER_JSON"; then
+                return 0
+            else
+                echo "Error: Failed to merge JSON configs. Restoring backup..." >&2
+                mv "$DEVCONTAINER_BACKUP_JSON" "$DEVCONTAINER_JSON"
+                return 1
+            fi
+        else
+            echo "Warning: jq not found. Install jq to use devcontainer.local.json." >&2
+            return 1
+        fi
+    fi
+    return 1
+}
+
+# Function to restore original devcontainer config
+restore_devcontainer_config() {
+    if [ -f "$DEVCONTAINER_BACKUP_JSON" ]; then
+        mv "$DEVCONTAINER_BACKUP_JSON" "$DEVCONTAINER_JSON"
+    fi
+}
+
+# Check if devcontainer CLI is installed
+if ! command -v devcontainer &> /dev/null; then
+    echo "devcontainer CLI not found. Installing..."
+    npm install -g @devcontainers/cli
+
+    # Check if installation was successful
+    if ! command -v devcontainer &> /dev/null; then
+        echo "Error: Failed to install devcontainer CLI"
+        exit 1
+    fi
+    echo "devcontainer CLI installed successfully"
+fi
+
+# Handle commands that don't need container ID first
+case "$1" in
+    up)
+        use_local_config
+        devcontainer up --workspace-folder=.
+        status=$?
+        restore_devcontainer_config
+        exit "$status"
+        ;;
+    down)
+        echo "Stopping containers..."
+        for container in "${CONTAINERS_TO_STOP[@]}"; do
+            if docker ps -a --format "{{.Names}}" | grep -q "^${container}$"; then
+                echo "Stopping $container..."
+                docker stop "$container"
+            else
+                echo "Container $container not found, skipping..."
+            fi
+        done
+        restore_devcontainer_config
+        exit 0
+        ;;
+    rebuild)
+        echo "Removing development_app directory..."
+        rm -rf development_app/
+        use_local_config
+        devcontainer up --workspace-folder=. --remove-existing-container
+        status=$?
+        restore_devcontainer_config
+        exit "$status"
+        ;;
+    rm)
+        echo "Removing all containers and cleaning up..."
+        for container in "${CONTAINERS_TO_STOP[@]}"; do
+            if docker ps -a --format "{{.Names}}" | grep -q "^${container}$"; then
+                echo "Removing $container..."
+                docker rm -f "$container"
+            else
+                echo "Container $container not found, skipping..."
+            fi
+        done
+        echo "Cleaning up development_app directory..."
+        rm -rf development_app/
+        restore_devcontainer_config
+        echo "Cleanup complete!"
+        exit 0
+        ;;
+    ps)
+        echo "Checking container status..."
+        echo ""
+        found_any=false
+        for container in "${CONTAINERS_TO_STOP[@]}"; do
+            if docker ps -a --format "{{.Names}}" | grep -q "^${container}$"; then
+                found_any=true
+                status=$(docker ps -a --format "{{.Names}}\t{{.Status}}" | grep "^${container}\s" | cut -f2)
+                echo "  $container: $status"
+            fi
+        done
+        if [ "$found_any" = false ]; then
+            echo "  No containers found"
+        fi
+        exit 0
+        ;;
+    ""| help | --help | -h)
+        echo "Usage: $SCRIPT_NAME <command>"
+        echo ""
+        echo "Container Management:"
+        echo "  up              - Start the devcontainer"
+        echo "  down            - Stop all containers"
+        echo "  rebuild         - Rebuild the devcontainer"
+        echo "  rm              - Remove all containers and clean up"
+        echo "  ps              - Check container status"
+        echo ""
+        echo "Execute Commands:"
+        echo "  $SCRIPT_NAME <command>                                        Execute any command in the container"
+        echo ""
+        echo "Examples:"
+        echo "  $SCRIPT_NAME dev                                             - Run bin/dev"
+        echo "  $SCRIPT_NAME rails console                                   - Run bin/rails console"
+        echo "  $SCRIPT_NAME bundle install                                  - Run bin/bundle install"
+        echo "  $SCRIPT_NAME bundle exec rake test_app                       - Generates the test_app"
+        echo "  $SCRIPT_NAME rspec decidim-budgets/spec/models/order_spec.rb - Runs the specs for the budgets' order model"
+        exit 0
+        ;;
+esac
+
+# Get the container ID for decidim-rails-app
+container_id=$(docker ps --filter "name=$CONTAINER_NAME" --format "{{.ID}}" | head -n 1)
+
+# Check if container was found
+if [ -z "$container_id" ]; then
+    echo "Error: $CONTAINER_NAME container not found. Start it with '$SCRIPT_NAME up'"
+    exit 1
+fi
+
+# Check if the command exists in ./bin directory
+if [ -f "./bin/$1" ] && [ -x "./bin/$1" ]; then
+    # If it's a script in bin/, prepend bin/ to the path
+    devcontainer exec --container-id "$container_id" --workspace-folder=. "bin/$@"
+else
+    # Otherwise execute the command as-is
+    devcontainer exec --container-id "$container_id" --workspace-folder=. "$@"
+fi
diff --git a/bin/setup b/bin/setup
new file mode 100755
index 0000000000000..e472a0a696a9e
--- /dev/null
+++ b/bin/setup
@@ -0,0 +1,95 @@
+#!/usr/bin/env ruby
+require "fileutils"
+require "json"
+
+APP_ROOT = File.expand_path("..", __dir__)
+APP_NAME = "decidim-development-app"
+
+def system!(env = {}, *args)
+  if args.empty?
+    # env is actually the command
+    system(env, exception: true)
+  else
+    system(env, *args, exception: true)
+  end
+end
+
+class CodespacesConfig
+  ENV_FILE = "/workspaces/.codespaces/shared/environment-variables.json"
+  APP_CONFIG = "development_app/config/application.rb"
+
+  def self.running?
+    File.exist?(ENV_FILE)
+  end
+
+  def initialize
+    @hostname = nil
+  end
+
+  def hostname
+    @hostname ||= fetch_hostname
+  end
+
+  def env_vars
+    hostname ? { "DECIDIM_HOST" => hostname } : {}
+  end
+
+  def configure_application!
+    return unless hostname
+    return unless File.exist?(APP_CONFIG)
+
+    config_content = File.read(APP_CONFIG)
+    return if config_content.match?(/^\s+config\.hosts/)
+
+    updated_content = config_content.sub(
+      /(config\.load_defaults\s+[\d.]+\s*\n)/,
+      "\\1    config.hosts << \"#{hostname}\"\n"
+    )
+
+    File.write(APP_CONFIG, updated_content)
+    puts "\n== Configured Codespaces host: #{hostname} =="
+  end
+
+  private
+
+  def fetch_hostname
+    return nil unless File.exist?(ENV_FILE)
+
+    env_data = JSON.parse(File.read(ENV_FILE))
+    codespace_name = env_data["CODESPACE_NAME"]
+    return nil unless codespace_name
+
+    "#{codespace_name}-3000.app.github.dev"
+  end
+end
+
+FileUtils.chdir APP_ROOT do
+  # This script is a way to set up or update your development environment automatically.
+  # This script is idempotent, so that you can run it at any time and get an expectable outcome.
+  # Add necessary setup steps to this file.
+
+  puts "== Installing dependencies =="
+  system! "gem install bundler --conservative"
+  system("bundle check") || system!("bundle install")
+  system("npm install")
+
+  puts "\n== Preparing decidim development app =="
+  if CodespacesConfig.running?
+    codespaces = CodespacesConfig.new
+    system!(codespaces.env_vars, "bundle exec rake development_app") unless Dir.exist?("development_app")
+    codespaces.configure_application!
+  else
+    system!("bundle exec rake development_app") unless Dir.exist?("development_app")
+  end
+
+  puts "\n== Preparing database =="
+  system("bin/rails db:create")
+
+  if File.exist?("development_app/tmp/pids/server.pid")
+    puts "\n== Removing the leftover pid file =="
+    system("rm development_app/tmp/pids/server.pid")
+  end
+
+  puts "\n== Starting application server =="
+  system! "bin/dev"
+end

From c6bbae2258aef31c90f22927c0facbd6c6cfc61b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?=
 <andreslucena@users.noreply.github.com>
Date: Sat, 23 May 2026 02:44:53 +0200
Subject: [PATCH 031/131] Backport 'Fix role menu/presentation on action
 buttons' to v0.31 (#16878)

---
 .../decidim/blogs/posts/_menu_actions.html.erb   |  7 ++++---
 .../_suggestions_box_item_template.html.erb      |  6 +++---
 .../decidim/amendable/amend_button_card/show.erb |  4 ++--
 .../cells/decidim/resource_types_filter/show.erb |  4 ++--
 .../presenters/decidim/menu_item_presenter.rb    | 12 +++++++++---
 .../app/views/decidim/pages/index.html.erb       |  2 +-
 .../decidim/shared/_resource_actions.html.erb    |  8 ++++----
 .../decidim/menu_item_presenter_spec.rb          |  7 ++++---
 .../debates/debates/_debate_actions.html.erb     | 16 ++++++++--------
 .../meetings/meetings/_meeting_actions.html.erb  | 11 ++++++-----
 .../proposals/_proposal_actions.html.erb         |  8 ++++----
 11 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/decidim-blogs/app/views/decidim/blogs/posts/_menu_actions.html.erb b/decidim-blogs/app/views/decidim/blogs/posts/_menu_actions.html.erb
index 2b69e819c2484..a2fb9bcf8e67c 100644
--- a/decidim-blogs/app/views/decidim/blogs/posts/_menu_actions.html.erb
+++ b/decidim-blogs/app/views/decidim/blogs/posts/_menu_actions.html.erb
@@ -1,7 +1,7 @@
 
 <% if allowed_to?(:update, :blogpost, blogpost: post) %>
-  <li role="menuitem" class="dropdown__item">
-    <%= link_to edit_post_path(post), class: "dropdown__button" do %>
+  <li role="presentation" class="dropdown__item">
+    <%= link_to edit_post_path(post), class: "dropdown__button", role: "menuitem" do %>
       <span><%= t("button_edit", scope: "decidim.blogs.posts.menu_actions") %></span>
       <%= icon "pencil-line" %>
     <% end %>
@@ -9,10 +9,11 @@
 <% end %>
 
 <% if allowed_to?(:destroy, :blogpost, blogpost: post) %>
-  <li role="menuitem" class="dropdown__item">
+  <li role="presentation" class="dropdown__item">
     <%= link_to post_path(post),
                 method: :delete,
                 class: "dropdown__button",
+                role: "menuitem",
                 data: { confirm: t("button_destroy_confirm", scope: "decidim.blogs.posts.menu_actions") } do %>
       <span><%= t("button_destroy", scope: "decidim.blogs.posts.menu_actions") %></span>
       <%= icon "delete-bin-line" %>
diff --git a/decidim-collaborative_texts/app/views/decidim/collaborative_texts/documents/_suggestions_box_item_template.html.erb b/decidim-collaborative_texts/app/views/decidim/collaborative_texts/documents/_suggestions_box_item_template.html.erb
index 5e61d5e4d65dd..511e9ea79c768 100644
--- a/decidim-collaborative_texts/app/views/decidim/collaborative_texts/documents/_suggestions_box_item_template.html.erb
+++ b/decidim-collaborative_texts/app/views/decidim/collaborative_texts/documents/_suggestions_box_item_template.html.erb
@@ -15,12 +15,12 @@
 
     <div class="collaborative-texts-suggestions-box-header-menu" id="dropdown-menu-{{ID}}" role="menu" aria-labelledby="dropdown-trigger-{{ID}}" tabindex="-1" aria-hidden="true">
       <ul class="dropdown dropdown__bottom divide-y divide-gray-3 pt-1 pb-0" role="menu">
-        <li role="menuitem" class="dropdown__item">
-          <button class="button-apply dropdown__button">
+        <li role="presentation" class="dropdown__item">
+          <button class="button-apply dropdown__button" role="menuitem">
             <%= icon "checkbox-circle-line" %>
             <%= t("decidim.collaborative_texts.document.apply") %>
           </button>
-          <button class="button-restore dropdown__button">
+          <button class="button-restore dropdown__button" role="menuitem">
             <%= icon "arrow-go-back-line" %>
             <%= t("decidim.collaborative_texts.document.restore") %>
           </button>
diff --git a/decidim-core/app/cells/decidim/amendable/amend_button_card/show.erb b/decidim-core/app/cells/decidim/amendable/amend_button_card/show.erb
index eb6623e304b56..7eb077db92fe1 100644
--- a/decidim-core/app/cells/decidim/amendable/amend_button_card/show.erb
+++ b/decidim-core/app/cells/decidim/amendable/amend_button_card/show.erb
@@ -1,5 +1,5 @@
-<li role="menuitem" class="dropdown__item">
-  <%= action_authorized_link_to :amend, new_amend_path, resource: model, data: { "redirect_url" => new_amend_path }, id: "amend-button", class: "dropdown__button" do %>
+<li role="presentation" class="dropdown__item">
+  <%= action_authorized_link_to :amend, new_amend_path, resource: model, data: { "redirect_url" => new_amend_path }, id: "amend-button", class: "dropdown__button", role: "menuitem" do %>
     <span><%= t("button", scope: "decidim.amendments.amendable", model_name: nil) %></span>
     <%= icon "pencil-line" %>
   <% end %>
diff --git a/decidim-core/app/cells/decidim/resource_types_filter/show.erb b/decidim-core/app/cells/decidim/resource_types_filter/show.erb
index fdc85aa53ab35..9e6bd226132e4 100644
--- a/decidim-core/app/cells/decidim/resource_types_filter/show.erb
+++ b/decidim-core/app/cells/decidim/resource_types_filter/show.erb
@@ -10,8 +10,8 @@
   </button>
   <ul id="dropdown-menu-resource">
     <% resource_types.each do |resource_type| %>
-      <li role="menuitem">
-        <%= link_to filter_url(resource_type[0]), class: "filter#{" is-active" if filter_param == resource_type[0]}" do %>
+      <li role="presentation">
+        <%= link_to filter_url(resource_type[0]), class: "filter#{" is-active" if filter_param == resource_type[0]}", role: "menuitem" do %>
           <span class="sr-only"><%= resource_type[1] %></span>
           <%= text_with_resource_icon(*resource_type) %>
         <% end %>
diff --git a/decidim-core/app/presenters/decidim/menu_item_presenter.rb b/decidim-core/app/presenters/decidim/menu_item_presenter.rb
index f1a04952df05e..20f045871478a 100644
--- a/decidim-core/app/presenters/decidim/menu_item_presenter.rb
+++ b/decidim-core/app/presenters/decidim/menu_item_presenter.rb
@@ -29,9 +29,9 @@ def initialize(menu_item, view, options = {})
     delegate :content_tag, :safe_join, :link_to, :active_link_to_class, :is_active_link?, :icon, to: :@view
 
     def render
-      content_tag :li, role: menuitem_role, class: link_wrapper_classes do
+      content_tag :li, role: wrapper_role, class: link_wrapper_classes do
         output = if url == "#"
-                   [content_tag(:span, composed_label, class: "sidebar-menu__item-disabled")]
+                   [content_tag(:span, composed_label, class: "sidebar-menu__item-disabled", role: menuitem_role)]
                  else
                    [link_to(composed_label, url, link_options)]
                  end
@@ -52,7 +52,7 @@ def link_options
         { aria: { current: "page" } }
       else
         {}
-      end.merge({ class: link_classes })
+      end.merge({ class: link_classes, role: menuitem_role })
     end
 
     def composed_label
@@ -75,6 +75,12 @@ def menuitem_role
       @options.role || :menuitem
     end
 
+    def wrapper_role
+      return if menuitem_role.blank?
+
+      :presentation
+    end
+
     def active_class
       active_link_to_class(
         url,
diff --git a/decidim-core/app/views/decidim/pages/index.html.erb b/decidim-core/app/views/decidim/pages/index.html.erb
index a802af7044953..287eb00956118 100644
--- a/decidim-core/app/views/decidim/pages/index.html.erb
+++ b/decidim-core/app/views/decidim/pages/index.html.erb
@@ -42,7 +42,7 @@ edit_link(
                 <div id="accordion-panel-<%= ix %>" class="page__accordion-panel" aria-hidden="true">
                   <ul role="menu">
                     <% topic.pages.each do |page| %>
-                      <li role="menuitem"><%= link_to translated_attribute(page.title), page_path(page), class: "text-secondary" %></li>
+                      <li role="presentation"><%= link_to translated_attribute(page.title), page_path(page), class: "text-secondary", role: "menuitem" %></li>
                     <% end %>
                   </ul>
                 </div>
diff --git a/decidim-core/app/views/decidim/shared/_resource_actions.html.erb b/decidim-core/app/views/decidim/shared/_resource_actions.html.erb
index f0e233670b5cd..d9c49e265fa88 100644
--- a/decidim-core/app/views/decidim/shared/_resource_actions.html.erb
+++ b/decidim-core/app/views/decidim/shared/_resource_actions.html.erb
@@ -12,12 +12,12 @@
     <ul class="dropdown dropdown__bottom divide-y divide-gray-3" role="menu">
       <%= yield %>
       <% unless defined?(skip_report) && skip_report %>
-        <li role="menuitem" class="dropdown__item">
-          <%= cell "decidim/report_button", resource, button_classes: "dropdown__button" %>
+        <li role="presentation" class="dropdown__item">
+          <%= cell "decidim/report_button", resource, button_classes: "dropdown__button", html_options: { role: "menuitem" } %>
         </li>
       <% end %>
-      <li role="menuitem" class="dropdown__item">
-        <%= cell "decidim/follow_button", resource, large: false, button_classes: "dropdown__button" %>
+      <li role="presentation" class="dropdown__item">
+        <%= cell "decidim/follow_button", resource, large: false, button_classes: "dropdown__button", html_options: { role: "menuitem" } %>
       </li>
     </ul>
   </div>
diff --git a/decidim-core/spec/presenters/decidim/menu_item_presenter_spec.rb b/decidim-core/spec/presenters/decidim/menu_item_presenter_spec.rb
index 715c77aed8af3..8ac5c39cd8f0d 100644
--- a/decidim-core/spec/presenters/decidim/menu_item_presenter_spec.rb
+++ b/decidim-core/spec/presenters/decidim/menu_item_presenter_spec.rb
@@ -16,8 +16,9 @@ module Decidim
       expect(subject.render).to have_link("Foo", href: "/boo")
     end
 
-    it "adds the menuitem role by default" do
-      expect(subject.render).to have_css("li[role='menuitem']")
+    it "adds the menuitem role to the interactive element by default" do
+      expect(subject.render).to have_css("li[role='presentation']")
+      expect(subject.render).to have_css("a[role='menuitem']")
     end
 
     it "does not add the aria-current attribute for non-active page" do
@@ -51,7 +52,7 @@ module Decidim
 
       it "adds a span instead of a link" do
         expect(subject.render).to have_no_link("Foo", href: "#")
-        expect(subject.render).to have_css("span.sidebar-menu__item-disabled")
+        expect(subject.render).to have_css("li[role='presentation'] span.sidebar-menu__item-disabled[role='menuitem']")
       end
     end
   end
diff --git a/decidim-debates/app/views/decidim/debates/debates/_debate_actions.html.erb b/decidim-debates/app/views/decidim/debates/debates/_debate_actions.html.erb
index 4d23f3f4c0e6e..7d2cd67c7e152 100644
--- a/decidim-debates/app/views/decidim/debates/debates/_debate_actions.html.erb
+++ b/decidim-debates/app/views/decidim/debates/debates/_debate_actions.html.erb
@@ -1,14 +1,14 @@
 
 <% if allowed_to?(:edit, :debate, debate: debate) %>
-  <li role="menuitem" class="dropdown__item">
-    <%= link_to edit_debate_path(debate), class: "dropdown__button" do %>
+  <li role="presentation" class="dropdown__item">
+    <%= link_to edit_debate_path(debate), class: "dropdown__button", role: "menuitem" do %>
       <span><%= t("edit_debate", scope: "decidim.debates.debates.show") %></span>
       <%= icon "pencil-line" %>
     <% end %>
   </li>
 <% elsif admin_allowed_to?(:update, :debate, debate: debate) %>
-  <li role="menuitem" class="dropdown__item">
-    <%= link_to resource_locator(debate).edit, class: "dropdown__button" do %>
+  <li role="presentation" class="dropdown__item">
+    <%= link_to resource_locator(debate).edit, class: "dropdown__button", role: "menuitem" do %>
       <span><%= t("edit_debate", scope: "decidim.debates.debates.show") %></span>
       <%= icon "pencil-line" %>
     <% end %>
@@ -17,15 +17,15 @@
 
 <% close_debate_action_text = (debate.closed? ? "decidim.debates.debates.show.edit_conclusions" : "decidim.debates.debates.show.close_debate" ) %>
 <% if allowed_to?(:close, :debate, debate: debate) %>
-  <li role="menuitem" class="dropdown__item">
-    <button type="button" data-dialog-open="close-debate" title="<%= t(close_debate_action_text) %>" aria-controls="closeDebateModal" aria-haspopup="dialog" tabindex="0" class="dropdown__button">
+  <li role="presentation" class="dropdown__item">
+    <button type="button" data-dialog-open="close-debate" title="<%= t(close_debate_action_text) %>" aria-controls="closeDebateModal" aria-haspopup="dialog" tabindex="0" class="dropdown__button" role="menuitem">
       <span><%= t(close_debate_action_text) %></span>
       <%= icon "lock-line" %>
     </button>
   </li>
 <% elsif admin_allowed_to?(:close, :debate, debate: debate) %>
-  <li role="menuitem" class="dropdown__item">
-    <%= link_to Decidim::EngineRouter.admin_proxy(debate.component).edit_debate_debate_close_path(debate_id: debate.id, id: debate.id), class: "dropdown__button" do %>
+  <li role="presentation" class="dropdown__item">
+    <%= link_to Decidim::EngineRouter.admin_proxy(debate.component).edit_debate_debate_close_path(debate_id: debate.id, id: debate.id), class: "dropdown__button", role: "menuitem" do %>
       <span><%= t(close_debate_action_text) %></span>
       <%= icon "lock-line" %>
     <% end %>
diff --git a/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_actions.html.erb b/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_actions.html.erb
index 1d25c89d11aff..2df843b7e361a 100644
--- a/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_actions.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_actions.html.erb
@@ -1,6 +1,6 @@
 <% if allowed_to?(:update, :meeting, meeting: meeting) %>
-  <li class="dropdown__item" role="menuitem">
-    <%= link_to edit_meeting_path(meeting), class: "dropdown__button"  do %>
+  <li class="dropdown__item" role="presentation">
+    <%= link_to edit_meeting_path(meeting), class: "dropdown__button", role: "menuitem"  do %>
       <span><%= t("edit_meeting", scope: "decidim.meetings.meetings.meeting") %></span>
       <%= icon "pencil-line" %>
     <% end %>
@@ -9,8 +9,8 @@
 
 <% if allowed_to?(:close, :meeting, meeting: meeting) %>
   <% caption = meeting.closed? ? t("edit_close_meeting", scope: "decidim.meetings.meetings.meeting") : t("close_meeting", scope: "decidim.meetings.meetings.meeting") %>
-  <li class="dropdown__item" role="menuitem">
-    <%= link_to edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id), class: "dropdown__button"  do %>
+  <li class="dropdown__item" role="presentation">
+    <%= link_to edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id), class: "dropdown__button", role: "menuitem"  do %>
       <span><%= caption %></span>
       <%= icon "lock-line" %>
     <% end %>
@@ -18,12 +18,13 @@
 <% end %>
 
 <% if meeting.withdrawable_by?(current_user) %>
-  <li class="dropdown__item" role="menuitem">
+  <li class="dropdown__item" role="presentation">
     <%= action_authorized_link_to(
           :withdraw,
           withdraw_meeting_path(meeting),
           method: :put,
           class: "dropdown__button" ,
+          role: "menuitem",
           title: t("withdraw_btn_hint", scope: "decidim.meetings.meetings.show"),
           data: { confirm: t("withdraw_confirmation_html", scope: "decidim.meetings.meetings.show") }
         ) do %>
diff --git a/decidim-proposals/app/views/decidim/proposals/proposals/_proposal_actions.html.erb b/decidim-proposals/app/views/decidim/proposals/proposals/_proposal_actions.html.erb
index 3543b00ba20b3..8955a6e98fcad 100644
--- a/decidim-proposals/app/views/decidim/proposals/proposals/_proposal_actions.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/proposals/_proposal_actions.html.erb
@@ -1,6 +1,6 @@
 <% if @proposal.amendable? && allowed_to?(:edit, :proposal, proposal: @proposal) %>
-  <li role="menuitem" class="dropdown__item">
-    <%= link_to edit_proposal_path(@proposal), class: "dropdown__button" do %>
+  <li role="presentation" class="dropdown__item">
+    <%= link_to edit_proposal_path(@proposal), class: "dropdown__button", role: "menuitem" do %>
       <span><%= t("edit_proposal", scope: "decidim.proposals.proposals.show") %></span>
       <%= icon "pencil-line" %>
     <% end %>
@@ -10,8 +10,8 @@
 <% end %>
 
 <% if @proposal.withdrawable_by?(current_user) %>
-  <li role="menuitem" class="dropdown__item">
-    <%= action_authorized_link_to :withdraw, withdraw_proposal_path(@proposal), resource: @proposal, method: :put, class: "dropdown__button", title: t("withdraw_btn_hint", scope: "decidim.proposals.proposals.show" ), data: { confirm: t("withdraw_confirmation_html", scope: "decidim.proposals.proposals.show" ) } do %>
+  <li role="presentation" class="dropdown__item">
+    <%= action_authorized_link_to :withdraw, withdraw_proposal_path(@proposal), resource: @proposal, method: :put, class: "dropdown__button", role: "menuitem", title: t("withdraw_btn_hint", scope: "decidim.proposals.proposals.show" ), data: { confirm: t("withdraw_confirmation_html", scope: "decidim.proposals.proposals.show" ) } do %>
       <span><%= t("withdraw_proposal", scope: "decidim.proposals.proposals.show") %></span>
       <%= icon "arrow-go-back-line" %>
     <% end %>

From 5a64aae19add145108b7f190393da4439d062c8b Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Sat, 23 May 2026 03:59:22 +0200
Subject: [PATCH 032/131] Backport 'Fix Toggle Stimulus controller usage' to
 v0.31 (#16868)

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../shared/_availability_fields.html.erb      |  2 +-
 decidim-core/app/packs/src/decidim/index.js   |  2 +
 .../questionnaires/_questionnaire.html.erb    |  2 +-
 .../admin/meetings/_reminders.html.erb        |  2 +-
 .../questionnaire_templates/_preview.html.erb |  2 +-
 ...in_manages_questionnaire_templates_spec.rb | 80 ++++++++++++++++++-
 6 files changed, 83 insertions(+), 7 deletions(-)

diff --git a/decidim-comments/app/views/decidim/comments/admin/shared/_availability_fields.html.erb b/decidim-comments/app/views/decidim/comments/admin/shared/_availability_fields.html.erb
index 31dafdefbdfe4..e93e865f0d303 100644
--- a/decidim-comments/app/views/decidim/comments/admin/shared/_availability_fields.html.erb
+++ b/decidim-comments/app/views/decidim/comments/admin/shared/_availability_fields.html.erb
@@ -2,7 +2,7 @@
   <%= form.check_box :comments_enabled, label: t(".enabled"), data: { controller: :toggle, "toggle-toggle-value": "customize_comments_times-div" } %>
 </div>
 
-<div id="customize_comments_times-div" data-toggler=".hide" class="row column <%= @form.comments_enabled ? nil : "hide" %>">
+<div id="customize_comments_times-div" class="row column <%= @form.comments_enabled ? nil : "hide" %>">
   <div class="mb-4">
     <%= form.datetime_field :comments_start_time, label: t(".start_time") %>
   </div>
diff --git a/decidim-core/app/packs/src/decidim/index.js b/decidim-core/app/packs/src/decidim/index.js
index 249e15daed5b3..a646eaa358f95 100644
--- a/decidim-core/app/packs/src/decidim/index.js
+++ b/decidim-core/app/packs/src/decidim/index.js
@@ -156,6 +156,8 @@ document.addEventListener("turbo:load", () => {
     deprecationMessage(container, '.callout[role="alert"]', '.flash[role="alert"]'));
   document.querySelectorAll(".js-back-to-list").forEach((container) =>
     deprecationMessage(container, ".js-back-to-list", "NEEDS TO BE REMOVED"));
+  document.querySelectorAll("[data-toggler]").forEach((container) =>
+    deprecationMessage(container, "[data-toggler]", "Use the Stimulus toggle controller with hidden targets"));
 })
 
 // REDESIGN_PENDING: deprecated
diff --git a/decidim-forms/app/views/decidim/forms/questionnaires/_questionnaire.html.erb b/decidim-forms/app/views/decidim/forms/questionnaires/_questionnaire.html.erb
index aae37dde3aeda..363d3c4eba4d4 100644
--- a/decidim-forms/app/views/decidim/forms/questionnaires/_questionnaire.html.erb
+++ b/decidim-forms/app/views/decidim/forms/questionnaires/_questionnaire.html.erb
@@ -18,7 +18,7 @@
   <%= invisible_captcha %>
   <% response_idx = 0 %>
   <% @form.responses_by_step.each_with_index do |step_responses, step_index| %>
-    <div id="step-<%= step_index %>" class="response-questionnaire__step" <%= "hidden" if !step_index.zero? %>>
+    <div id="step-<%= step_index %>" class="response-questionnaire__step" <%= "hidden" if step_index.positive? %>>
 
       <% if @form.total_steps > 1 %>
         <p class="response-questionnaire__step-counter">
diff --git a/decidim-meetings/app/views/decidim/meetings/admin/meetings/_reminders.html.erb b/decidim-meetings/app/views/decidim/meetings/admin/meetings/_reminders.html.erb
index af57493bb30e3..3f353cb4c22fd 100644
--- a/decidim-meetings/app/views/decidim/meetings/admin/meetings/_reminders.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/admin/meetings/_reminders.html.erb
@@ -10,7 +10,7 @@
       <div class="row column">
         <%= form.check_box :reminder_enabled, label: t(".reminder_enabled"), data: { controller: :toggle, "toggle-toggle-value": "customize_reminder_times" } %>
       </div>
-      <div id="customize_reminder_times" data-toggler=".hide" class="row column <%= @form.reminder_enabled ? nil : "hide" %>">
+      <div id="customize_reminder_times" class="row column <%= @form.reminder_enabled ? nil : "hide" %>">
         <%= form.number_field :send_reminders_before_hours, label: t(".send_reminder"), help_text: t(".send_reminder_help_text"), min: 1, step: 1, class: "mb-2" %>
         <%= form.translated :text_area, :reminder_message_custom_content, label: t(".reminder_message"), help_text: t(".reminder_message_help_text") %>
       </div>
diff --git a/decidim-templates/app/views/decidim/templates/admin/questionnaire_templates/_preview.html.erb b/decidim-templates/app/views/decidim/templates/admin/questionnaire_templates/_preview.html.erb
index 01d7b98807a2d..5efb4a44c752b 100644
--- a/decidim-templates/app/views/decidim/templates/admin/questionnaire_templates/_preview.html.erb
+++ b/decidim-templates/app/views/decidim/templates/admin/questionnaire_templates/_preview.html.erb
@@ -11,7 +11,7 @@
     <% response_idx = 0 %>
     <% cleaned_response_idx = 0 %>
     <% @preview_form.responses_by_step.each_with_index do |step_responses, step_index| %>
-      <div id="step-<%= step_index %>" class="<%= step_index.zero? ? "questionnaire-step" : "questionnaire-step hide" %>" data-toggler=".hide">
+      <div id="step-<%= step_index %>" class="questionnaire-step" <%= "hidden" if step_index.positive? %>>
         <div class="form__wrapper">
           <% if @preview_form.total_steps > 1 %>
             <h4>
diff --git a/decidim-templates/spec/system/admin/admin_manages_questionnaire_templates_spec.rb b/decidim-templates/spec/system/admin/admin_manages_questionnaire_templates_spec.rb
index d3ab871b51dc9..0482904aca33a 100644
--- a/decidim-templates/spec/system/admin/admin_manages_questionnaire_templates_spec.rb
+++ b/decidim-templates/spec/system/admin/admin_manages_questionnaire_templates_spec.rb
@@ -294,11 +294,9 @@
     let!(:questions) { create_list(:questionnaire_question, 3, questionnaire: template.templatable) }
     let(:questionnaire) { template.templatable }
 
-    before do
+    it "shows the template preview" do
       visit decidim_admin_templates.edit_questionnaire_template_path(template)
-    end
 
-    it "shows the template preview" do
       within ".questionnaire-template-preview" do
         expect(page).to have_i18n_content(questionnaire.title)
         expect(page).to have_i18n_content(questionnaire.questions.first.body)
@@ -306,6 +304,82 @@
         expect(page).to have_css("button[type=submit][disabled]")
       end
     end
+
+    context "when the questionnaire has 2 steps" do
+      let!(:questions) { [] }
+      let!(:question) { create(:questionnaire_question, questionnaire: template.templatable) }
+      let!(:separator) { create(:questionnaire_question, :separator, questionnaire: template.templatable) }
+      let!(:second_question) { create(:questionnaire_question, questionnaire: template.templatable) }
+
+      it "shows the template preview" do
+        visit decidim_admin_templates.edit_questionnaire_template_path(template)
+
+        expect(page).to have_i18n_content(question.body)
+        expect(page).not_to have_i18n_content(second_question.body)
+        expect(page).to have_content("Step 1 of 2")
+
+        within "#step-0" do
+          expect(page).to have_button("Continue")
+          click_on "Continue"
+        end
+
+        expect(page).to have_content("Step 2 of 2")
+        expect(page).not_to have_i18n_content(question.body)
+        expect(page).to have_i18n_content(second_question.body)
+      end
+    end
+
+    context "when the questionnaire has 3 steps" do
+      let!(:questions) { [] }
+      let!(:question) { create(:questionnaire_question, questionnaire: template.templatable) }
+      let!(:separator) { create(:questionnaire_question, :separator, questionnaire: template.templatable) }
+      let!(:second_question) { create(:questionnaire_question, questionnaire: template.templatable) }
+      let!(:second_separator) { create(:questionnaire_question, :separator, questionnaire: template.templatable) }
+      let!(:third_question) { create(:questionnaire_question, questionnaire: template.templatable) }
+
+      it "shows the template preview" do
+        visit decidim_admin_templates.edit_questionnaire_template_path(template)
+
+        expect(page).to have_i18n_content(question.body)
+        expect(page).not_to have_i18n_content(second_question.body)
+        expect(page).not_to have_i18n_content(third_question.body)
+        expect(page).to have_content("Step 1 of 3")
+
+        within "#step-0" do
+          expect(page).to have_button("Continue")
+          click_on "Continue"
+        end
+
+        expect(page).to have_content("Step 2 of 3")
+        expect(page).not_to have_i18n_content(question.body)
+        expect(page).to have_i18n_content(second_question.body)
+        expect(page).not_to have_i18n_content(third_question.body)
+
+        within "#step-1" do
+          expect(page).to have_button("Back")
+          expect(page).to have_button("Continue")
+          click_on "Back"
+        end
+
+        expect(page).to have_i18n_content(question.body)
+        expect(page).not_to have_i18n_content(second_question.body)
+        expect(page).not_to have_i18n_content(third_question.body)
+        expect(page).to have_content("Step 1 of 3")
+
+        within "#step-0" do
+          click_on "Continue"
+        end
+
+        within "#step-1" do
+          click_on "Continue"
+        end
+
+        expect(page).to have_content("Step 3 of 3")
+        expect(page).not_to have_i18n_content(question.body)
+        expect(page).not_to have_i18n_content(second_question.body)
+        expect(page).to have_i18n_content(third_question.body)
+      end
+    end
   end
 
   private

From 059648c4a02848c72c7d76b2e00f45e18bca57cd Mon Sep 17 00:00:00 2001
From: David <david@pokecode.net>
Date: Tue, 26 May 2026 16:02:08 +0200
Subject: [PATCH 033/131] apply patch of #16907 (#104)

---
 .../app/serializers/decidim/assemblies/assembly_importer.rb   | 4 ++--
 .../participatory_processes/participatory_process_importer.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb b/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
index 8f7d7ebb4b2a0..385b7b1065eef 100644
--- a/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
+++ b/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
@@ -109,8 +109,8 @@ def import_folders_and_attachments(attachments)
           end
         end
 
-        unless attachments["attachment_collections"].empty?
-          attachments["attachment_collections"].map do |collection|
+        unless attachments["attachment_collections"].blank?
+          attachments["attachment_collections"]&.map do |collection|
             Decidim.traceability.perform_action!("create", AttachmentCollection, @user) do
               create_attachment_collection(collection)
             end
diff --git a/decidim-participatory_processes/app/serializers/decidim/participatory_processes/participatory_process_importer.rb b/decidim-participatory_processes/app/serializers/decidim/participatory_processes/participatory_process_importer.rb
index 51953740c7143..49c68bc7b8aa8 100644
--- a/decidim-participatory_processes/app/serializers/decidim/participatory_processes/participatory_process_importer.rb
+++ b/decidim-participatory_processes/app/serializers/decidim/participatory_processes/participatory_process_importer.rb
@@ -131,8 +131,8 @@ def import_folders_and_attachments(attachments)
           end
         end
 
-        unless attachments["attachment_collections"].empty?
-          attachments["attachment_collections"].map do |collection|
+        unless attachments["attachment_collections"].blank?
+          attachments["attachment_collections"]&.map do |collection|
             Decidim.traceability.perform_action!("create", AttachmentCollection, @user) do
               create_attachment_collection(collection)
             end

From a336d839dce78c3322fae83ce6158c7ad072d926 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Tue, 26 May 2026 21:13:29 +0200
Subject: [PATCH 034/131] Backport 'Check for existing user in "block user"
 form' to v0.31 (#16901)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Handled missing user for block action

* Small improvement

* Fixed linter issue

* Apply suggestions from code review



* Running linters

* Apply revieview recommendations

* Fix spec

---------

Co-authored-by: andra-panaite <135139066+andra-panaite@users.noreply.github.com>
Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 .../decidim/admin/block_user_controller.rb    |  2 ++
 decidim-admin/config/locales/en.yml           |  1 +
 .../controllers/block_user_controller_spec.rb | 22 +++++++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/decidim-admin/app/controllers/decidim/admin/block_user_controller.rb b/decidim-admin/app/controllers/decidim/admin/block_user_controller.rb
index 4cc2cf264069e..ccb88a7acb4e6 100644
--- a/decidim-admin/app/controllers/decidim/admin/block_user_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/block_user_controller.rb
@@ -10,6 +10,8 @@ class BlockUserController < Decidim::Admin::ApplicationController
       def new
         enforce_permission_to :block, :admin_user
 
+        return redirect_to(officializations_path, alert: I18n.t("officializations.block.no_user", scope: "decidim.admin")) unless user
+
         @form = form(BlockUserForm).from_model(user)
         @form.hide = params[:hide] || false
       end
diff --git a/decidim-admin/config/locales/en.yml b/decidim-admin/config/locales/en.yml
index 059a4789e88a3..46bb738276cef 100644
--- a/decidim-admin/config/locales/en.yml
+++ b/decidim-admin/config/locales/en.yml
@@ -834,6 +834,7 @@ en:
       officializations:
         block:
           error: There was a problem blocking the participant.
+          no_user: No user found
           success: Participant successfully blocked.
         bulk_action:
           block:
diff --git a/decidim-admin/spec/controllers/block_user_controller_spec.rb b/decidim-admin/spec/controllers/block_user_controller_spec.rb
index c4c7e3ebec5cb..7315471891700 100644
--- a/decidim-admin/spec/controllers/block_user_controller_spec.rb
+++ b/decidim-admin/spec/controllers/block_user_controller_spec.rb
@@ -61,6 +61,28 @@ module Admin
         end
       end
 
+      describe "new" do
+        context "when user is found" do
+          let!(:user) { create(:user, :confirmed, organization:) }
+
+          it "renders new template" do
+            get :new, params: { user_id: user.id }
+
+            expect(subject).to render_template(:new)
+          end
+        end
+
+        context "when user is not found" do
+          it "sets flash alert message and redirects back" do
+            get :new, params: { user_id: 999_999_999 }
+
+            expect(flash[:alert]).to be_present
+            expect(flash[:alert]).to eq("No user found")
+            expect(response).to redirect_to(officializations_path)
+          end
+        end
+      end
+
       describe "block" do
         shared_examples "blocking a user" do
           context "when having a user" do

From 952aba909fc01155ac1fa5f8b2948407b2b63f16 Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Wed, 27 May 2026 08:27:55 +0300
Subject: [PATCH 035/131] Backport 'Check for existing user in "show email"
 form' to v0.31 (#16905)

* Check for existing user in "show email" form

* Handled non-existing user case for show_email

* Run linter

* Fixed linter issue

* Small refactor

* Removed blank line

* Apply review recommendation

* Added success case in test file

---------

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Apply suggestion from @alecslupu

---------

Co-authored-by: andra-panaite <135139066+andra-panaite@users.noreply.github.com>
---
 .../officializations/show_email.html.erb      |  8 +++-
 decidim-admin/config/locales/en.yml           |  2 +
 .../officializations_controller_spec.rb       | 40 +++++++++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 decidim-admin/spec/controllers/officializations_controller_spec.rb

diff --git a/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb b/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb
index 680203b3487fb..d3f61d3371463 100644
--- a/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb
+++ b/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb
@@ -1 +1,7 @@
-<%= link_to user.email, "mailto:#{user.email}" %>
+<% if user.present? %>
+  <%= link_to user.email, "mailto:#{user.email}" %>
+<% else %>
+  <div class="flash alert my-0">
+    <%= t(".no_user") %>
+  </div>
+<% end %>
diff --git a/decidim-admin/config/locales/en.yml b/decidim-admin/config/locales/en.yml
index 46bb738276cef..8db31fc8bef15 100644
--- a/decidim-admin/config/locales/en.yml
+++ b/decidim-admin/config/locales/en.yml
@@ -868,6 +868,8 @@ en:
           badge: Officialization badge
           officialize: Officialize
           title: Officialize participant "%{name}"
+        show_email:
+          no_user: No user found
         show_email_modal:
           description: If you need to contact a participant directly, you can click on the Show button to see their email address. This action will be logged.
           email_address: Email address
diff --git a/decidim-admin/spec/controllers/officializations_controller_spec.rb b/decidim-admin/spec/controllers/officializations_controller_spec.rb
new file mode 100644
index 0000000000000..6252de80aecc5
--- /dev/null
+++ b/decidim-admin/spec/controllers/officializations_controller_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Admin
+    describe OfficializationsController do
+      routes { Decidim::Admin::Engine.routes }
+      render_views
+
+      let(:organization) { create(:organization) }
+      let(:current_user) { create(:user, :admin, :confirmed, organization:) }
+
+      before do
+        request.env["decidim.current_organization"] = organization
+        sign_in current_user, scope: :user
+      end
+
+      describe "show_email" do
+        context "when user is not found" do
+          it "sets a not found message" do
+            get :show_email, params: { user_id: 999_999_999 }
+
+            expect(response.body).to have_content("No user found")
+          end
+        end
+
+        context "when user is found" do
+          let!(:user) { create(:user, :confirmed, organization:) }
+
+          it "renders show_email template" do
+            get :show_email, params: { user_id: user.id }
+            expect(subject).to render_template(:show_email)
+            expect(response.body).to have_content(user.email)
+          end
+        end
+      end
+    end
+  end
+end

From d890b3333b3e13fba58bf6c7004eb3dff004e6d6 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Wed, 27 May 2026 21:22:22 +0200
Subject: [PATCH 036/131] Backport 'Parametrize accessibility validator
 version' to v0.31 (#16915)

* Parametrize Validator version

* Add default value

* Use vars. instead of env

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
---
 .github/workflows/test_app.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test_app.yml b/.github/workflows/test_app.yml
index e2634f0edb61e..f9a292fafe840 100644
--- a/.github/workflows/test_app.yml
+++ b/.github/workflows/test_app.yml
@@ -54,7 +54,7 @@ jobs:
       PARALLEL_TEST_PROCESSORS: 3
     services:
       validator:
-        image: ghcr.io/validator/validator:latest
+        image: ${{ vars.ACTION_ACCESSIBILITY_VALIDATOR_VERSION || 'ghcr.io/validator/validator:latest' }}
         ports: ["8888:8888"]
       postgres:
         image: postgres:14

From c784a6787a358048febbe4e307419310636b4cd9 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Wed, 27 May 2026 23:02:28 +0200
Subject: [PATCH 037/131] Backport 'Fix the pages component duplicate/copy hook
 name' to v0.31 (#16921)

* Fix the pages component duplicate/copy hook name

* Add specs

* Fix AI nitpick

Co-authored-by: Antti Hukkanen <antti.hukkanen@mainiotech.fi>
---
 decidim-pages/lib/decidim/pages/component.rb  |  2 +-
 decidim-pages/spec/factories.rb               |  1 +
 .../spec/lib/decidim/pages/component_spec.rb  | 71 +++++++++++++++++++
 3 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 decidim-pages/spec/lib/decidim/pages/component_spec.rb

diff --git a/decidim-pages/lib/decidim/pages/component.rb b/decidim-pages/lib/decidim/pages/component.rb
index 83dce7bdb8dec..18991754c0b12 100644
--- a/decidim-pages/lib/decidim/pages/component.rb
+++ b/decidim-pages/lib/decidim/pages/component.rb
@@ -24,7 +24,7 @@
     end
   end
 
-  component.on(:copy) do |context|
+  component.on(:duplicate) do |context|
     Decidim::Pages::CopyPage.call(context) do
       on(:invalid) { raise "Cannot duplicate page" }
     end
diff --git a/decidim-pages/spec/factories.rb b/decidim-pages/spec/factories.rb
index c9297c89d4afa..741932cd14d82 100644
--- a/decidim-pages/spec/factories.rb
+++ b/decidim-pages/spec/factories.rb
@@ -4,3 +4,4 @@
 require "decidim/core/test/factories"
 require "decidim/participatory_processes/test/factories"
 require "decidim/pages/test/factories"
+require "decidim/conferences/test/factories"
diff --git a/decidim-pages/spec/lib/decidim/pages/component_spec.rb b/decidim-pages/spec/lib/decidim/pages/component_spec.rb
new file mode 100644
index 0000000000000..16e63992259b6
--- /dev/null
+++ b/decidim-pages/spec/lib/decidim/pages/component_spec.rb
@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Pages component" do # rubocop:disable RSpec/DescribeClass
+  let(:organization) { create(:organization) }
+  let(:current_user) { create(:user, :admin, :confirmed, organization:) }
+  let(:form_context) do
+    {
+      current_organization: organization,
+      current_user:
+    }
+  end
+
+  shared_examples "participatory space component duplication" do
+    let(:original_component) { create(:page_component, participatory_space:) }
+    let!(:original_page) { create(:page, component: original_component) }
+
+    it "copies the page" do
+      expect { subject }.to change { Decidim::Pages::Page.where(body: original_page.body).count }.by(1)
+    end
+  end
+
+  context "with assembly" do
+    subject { Decidim::Assemblies::Admin::DuplicateAssembly.call(form, participatory_space, current_user) }
+
+    let(:form) do
+      Decidim::Assemblies::Admin::AssemblyDuplicateForm.from_params(
+        title: { en: "Copied assembly" },
+        slug: "copied-assembly",
+        duplicate_components: true,
+        duplicate_landing_page_blocks: false
+      ).with_context(form_context)
+    end
+    let(:participatory_space) { create(:assembly, organization:) }
+
+    it_behaves_like "participatory space component duplication"
+  end
+
+  context "with conference" do
+    subject { Decidim::Conferences::Admin::DuplicateConference.call(form, participatory_space) }
+
+    let(:form) do
+      Decidim::Conferences::Admin::ConferenceDuplicateForm.from_params(
+        title: { en: "Copied conference" },
+        slug: "copied-conference",
+        duplicate_components: true
+      ).with_context(form_context)
+    end
+    let(:participatory_space) { create(:conference, organization:) }
+
+    it_behaves_like "participatory space component duplication"
+  end
+
+  context "with process" do
+    subject { Decidim::ParticipatoryProcesses::Admin::DuplicateParticipatoryProcess.call(form, participatory_space) }
+
+    let(:form) do
+      Decidim::ParticipatoryProcesses::Admin::ParticipatoryProcessDuplicateForm.from_params(
+        title: { en: "Copied process" },
+        slug: "copied-process",
+        duplicate_steps: false,
+        duplicate_components: true,
+        duplicate_landing_page_blocks: false
+      ).with_context(form_context)
+    end
+    let(:participatory_space) { create(:participatory_process, organization:) }
+
+    it_behaves_like "participatory space component duplication"
+  end
+end

From 43fa3be6813908b491f9e462af74f879cbe4912e Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Thu, 28 May 2026 11:44:19 +0200
Subject: [PATCH 038/131] Backport 'Fix blogs `:comments_count` stat returning
 post count' to v0.31 (#16923)

Co-authored-by: Masayoshi Takahashi <takahashim@users.noreply.github.com>
---
 decidim-blogs/lib/decidim/blogs/component.rb  |  2 +-
 .../spec/lib/decidim/blogs/component_spec.rb  | 42 +++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/decidim-blogs/lib/decidim/blogs/component.rb b/decidim-blogs/lib/decidim/blogs/component.rb
index 00933118550ad..d13946c6e923f 100644
--- a/decidim-blogs/lib/decidim/blogs/component.rb
+++ b/decidim-blogs/lib/decidim/blogs/component.rb
@@ -38,7 +38,7 @@
                           icon_name: "chat-1-line",
                           tooltip_key: "comments_count",
                           tag: :comments do |components, _start_at, _end_at|
-    Decidim::Blogs::Post.where(component: components).count
+    Decidim::Blogs::Post.where(component: components).sum(:comments_count)
   end
 
   component.actions = %w(create update destroy)
diff --git a/decidim-blogs/spec/lib/decidim/blogs/component_spec.rb b/decidim-blogs/spec/lib/decidim/blogs/component_spec.rb
index 18084ca658c93..7727124eb1597 100644
--- a/decidim-blogs/spec/lib/decidim/blogs/component_spec.rb
+++ b/decidim-blogs/spec/lib/decidim/blogs/component_spec.rb
@@ -7,6 +7,48 @@
   let(:organization) { component.organization }
   let!(:current_user) { create(:user, :confirmed, :admin, organization:) }
 
+  describe "stats" do
+    subject { current_stat[1][:data] }
+
+    let(:raw_stats) do
+      Decidim.component_manifests.map do |component_manifest|
+        component_manifest.stats.filter(name: stats_name).with_context(component).flat_map { |name, data| [component_manifest.name, name, data] }
+      end
+    end
+
+    let(:stats) do
+      raw_stats.select { |stat| stat[0] == :blogs }
+    end
+
+    let!(:post) { create(:post, component:) }
+    let!(:another_post) { create(:post, component:) }
+
+    let(:current_stat) { stats.find { |stat| stat[1][:name] == stats_name } }
+
+    describe "posts_count" do
+      let(:stats_name) { :posts_count }
+
+      it "counts posts in the component" do
+        expect(Decidim::Blogs::Post.where(component:).count).to eq 2
+        expect(subject).to eq 2
+      end
+    end
+
+    describe "comments_count" do
+      let(:stats_name) { :comments_count }
+
+      before do
+        create_list(:comment, 3, commentable: post)
+        create_list(:comment, 5, commentable: another_post)
+      end
+
+      it "counts the comments across all posts in the component" do
+        expect(Decidim::Comments::Comment.count).to eq 8
+        expect(subject).to eq 8
+      end
+    end
+  end
+
   describe "on edit", type: :system do
     let(:edit_component_path) do
       Decidim::EngineRouter.admin_proxy(component.participatory_space).edit_component_path(component.id)

From 02201f4065a7bc574f2da4627c5c29d8d4f25e00 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Thu, 28 May 2026 16:19:25 +0200
Subject: [PATCH 039/131] Backport 'Drop the "Duplicate landing page content
 blocks" from Duplicate Spaces forms' to v0.31 (#16939)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove "Duplicate landing page content blocks" checkbox from Duplicate Assembly form

* Remove "Duplicate landing page content blocks" checkbox from Duplicate Process form

* Remove leftover from Pages spec

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 .../assemblies/admin/duplicate_assembly.rb    |  2 +-
 .../admin/assembly_duplicate_form.rb          |  1 -
 .../admin/assembly_duplicates/_form.html.erb  |  3 -
 .../spec/commands/duplicate_assembly_spec.rb  | 63 +++++++++----------
 .../spec/lib/decidim/pages/component_spec.rb  |  6 +-
 .../admin/duplicate_participatory_process.rb  |  2 +-
 .../participatory_process_duplicate_form.rb   |  1 -
 .../_form.html.erb                            |  3 -
 .../duplicate_participatory_process_spec.rb   | 61 +++++++++---------
 9 files changed, 61 insertions(+), 81 deletions(-)

diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb
index 6da6c274bf219..bc8226bdf9ec0 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb
@@ -29,8 +29,8 @@ def call
             Assembly.transaction do
               duplicate_assembly
               duplicate_assembly_attachments
+              duplicate_landing_page_blocks
               duplicate_assembly_components if @form.duplicate_components?
-              duplicate_landing_page_blocks if @form.duplicate_landing_page_blocks?
             end
           end
 
diff --git a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_duplicate_form.rb b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_duplicate_form.rb
index c8aa7bebdb895..51bdd9fe61e2e 100644
--- a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_duplicate_form.rb
+++ b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_duplicate_form.rb
@@ -15,7 +15,6 @@ class AssemblyDuplicateForm < Form
 
         attribute :slug, String
         attribute :duplicate_components, Boolean
-        attribute :duplicate_landing_page_blocks, Boolean
 
         validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
         validates :title, translatable_presence: true
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/_form.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/_form.html.erb
index 6161e772c0b57..108590233c071 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/_form.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/_form.html.erb
@@ -17,9 +17,6 @@
             <div class="columns">
               <%= form.check_box :duplicate_components %>
             </div>
-            <div class="columns">
-              <%= form.check_box :duplicate_landing_page_blocks %>
-            </div>
           </div>
         </div>
       </div>
diff --git a/decidim-assemblies/spec/commands/duplicate_assembly_spec.rb b/decidim-assemblies/spec/commands/duplicate_assembly_spec.rb
index 4471a331ce395..c85041d242d91 100644
--- a/decidim-assemblies/spec/commands/duplicate_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/duplicate_assembly_spec.rb
@@ -19,14 +19,12 @@ module Decidim::Assemblies
         invalid?: invalid,
         title: { en: "title" },
         slug: "duplicated-slug",
-        duplicate_components?: duplicate_components,
-        duplicate_landing_page_blocks?: duplicate_landing_page_blocks
+        duplicate_components?: duplicate_components
       )
     end
 
     let(:invalid) { false }
     let(:duplicate_components) { false }
-    let(:duplicate_landing_page_blocks) { false }
 
     context "when the form is not valid" do
       let(:invalid) { true }
@@ -75,6 +73,34 @@ module Decidim::Assemblies
         expect(action_log.action).to eq("duplicate")
         expect(action_log.version).to be_present
       end
+
+      describe "landing page content blocks" do
+        let(:content_block_original_image) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
+
+        before do
+          content_block.images_container.background_image.purge
+          content_block.images_container.background_image = content_block_original_image
+          content_block.save
+          content_block.reload
+        end
+
+        it "duplicates the content_block with its attachments" do
+          expect { subject.call }.to change(Decidim::ContentBlock, :count).by(1)
+
+          old_block = Decidim::ContentBlock.unscoped.first
+          new_block = Decidim::ContentBlock.unscoped.last
+          last_assembly = Decidim::Assembly.last
+
+          expect(new_block.scope_name).to eq(old_block.scope_name)
+          expect(new_block.manifest_name).to eq(old_block.manifest_name)
+          # published_at is set in content_block factory
+          expect(new_block.published_at).not_to be_nil
+          expect(new_block.scoped_resource_id).to eq(last_assembly.id)
+          expect(new_block.attachments.length).to eq(1)
+          expect(new_block.attachments.first.name).to eq("background_image")
+          expect(new_block.images_container.attached_uploader(:background_image).url).not_to be_nil
+        end
+      end
     end
 
     context "when duplicate_components exists" do
@@ -99,37 +125,6 @@ module Decidim::Assemblies
       end
     end
 
-    context "when duplicate_landing_page_blocks exists" do
-      let(:duplicate_landing_page_blocks) { true }
-      let(:original_image) do
-        Decidim::Dev.test_file("city.jpeg", "image/jpeg")
-      end
-
-      before do
-        content_block.images_container.background_image.purge
-        content_block.images_container.background_image = original_image
-        content_block.save
-        content_block.reload
-      end
-
-      it "duplicates an assembly and the content_block with its attachments" do
-        expect { subject.call }.to change(Decidim::ContentBlock, :count).by(1)
-
-        old_block = Decidim::ContentBlock.unscoped.first
-        new_block = Decidim::ContentBlock.unscoped.last
-        last_assembly = Decidim::Assembly.last
-
-        expect(new_block.scope_name).to eq(old_block.scope_name)
-        expect(new_block.manifest_name).to eq(old_block.manifest_name)
-        # published_at is set in content_block factory
-        expect(new_block.published_at).not_to be_nil
-        expect(new_block.scoped_resource_id).to eq(last_assembly.id)
-        expect(new_block.attachments.length).to eq(1)
-        expect(new_block.attachments.first.name).to eq("background_image")
-        expect(new_block.images_container.attached_uploader(:background_image).url).not_to be_nil
-      end
-    end
-
     context "when duplicating a child assembly" do
       context "when the form is not valid" do
         let(:invalid) { true }
diff --git a/decidim-pages/spec/lib/decidim/pages/component_spec.rb b/decidim-pages/spec/lib/decidim/pages/component_spec.rb
index 16e63992259b6..f1652b6e51a3f 100644
--- a/decidim-pages/spec/lib/decidim/pages/component_spec.rb
+++ b/decidim-pages/spec/lib/decidim/pages/component_spec.rb
@@ -28,8 +28,7 @@
       Decidim::Assemblies::Admin::AssemblyDuplicateForm.from_params(
         title: { en: "Copied assembly" },
         slug: "copied-assembly",
-        duplicate_components: true,
-        duplicate_landing_page_blocks: false
+        duplicate_components: true
       ).with_context(form_context)
     end
     let(:participatory_space) { create(:assembly, organization:) }
@@ -60,8 +59,7 @@
         title: { en: "Copied process" },
         slug: "copied-process",
         duplicate_steps: false,
-        duplicate_components: true,
-        duplicate_landing_page_blocks: false
+        duplicate_components: true
       ).with_context(form_context)
     end
     let(:participatory_space) { create(:participatory_process, organization:) }
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/duplicate_participatory_process.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/duplicate_participatory_process.rb
index 720046991b85a..86d3a120809cf 100644
--- a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/duplicate_participatory_process.rb
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/duplicate_participatory_process.rb
@@ -29,9 +29,9 @@ def call
             ParticipatoryProcess.transaction do
               duplicate_participatory_process
               duplicate_participatory_process_attachments
+              duplicate_landing_page_blocks
               duplicate_participatory_process_steps if @form.duplicate_steps?
               duplicate_participatory_process_components if @form.duplicate_components?
-              duplicate_landing_page_blocks if @form.duplicate_landing_page_blocks?
             end
           end
 
diff --git a/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_duplicate_form.rb b/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_duplicate_form.rb
index 87123c29e2db5..a97a7e44c1c5c 100644
--- a/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_duplicate_form.rb
+++ b/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_duplicate_form.rb
@@ -16,7 +16,6 @@ class ParticipatoryProcessDuplicateForm < Form
         attribute :slug, String
         attribute :duplicate_steps, Boolean
         attribute :duplicate_components, Boolean
-        attribute :duplicate_landing_page_blocks, Boolean
 
         validates :slug, presence: true, format: { with: Decidim::ParticipatoryProcess.slug_format }
         validates :title, translatable_presence: true
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_duplicates/_form.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_duplicates/_form.html.erb
index 54a341fb1dd4e..ef9a66d1f5308 100644
--- a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_duplicates/_form.html.erb
+++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_duplicates/_form.html.erb
@@ -22,9 +22,6 @@
                 <%= form.check_box :duplicate_components %>
               </div>
 
-              <div class="columns">
-                <%= form.check_box :duplicate_landing_page_blocks %>
-              </div>
             </div>
           </div>
         </div>
diff --git a/decidim-participatory_processes/spec/commands/duplicate_participatory_process_spec.rb b/decidim-participatory_processes/spec/commands/duplicate_participatory_process_spec.rb
index a8279f2fcf147..68421ecebc310 100644
--- a/decidim-participatory_processes/spec/commands/duplicate_participatory_process_spec.rb
+++ b/decidim-participatory_processes/spec/commands/duplicate_participatory_process_spec.rb
@@ -22,7 +22,6 @@ module Decidim::ParticipatoryProcesses
         slug: "copied-slug",
         duplicate_steps?: duplicate_steps,
         duplicate_components?: duplicate_components,
-        duplicate_landing_page_blocks?: duplicate_landing_page_blocks,
         current_user:
       )
     end
@@ -30,7 +29,6 @@ module Decidim::ParticipatoryProcesses
     let(:invalid) { false }
     let(:duplicate_steps) { false }
     let(:duplicate_components) { false }
-    let(:duplicate_landing_page_blocks) { false }
 
     context "when the form is not valid" do
       let(:invalid) { true }
@@ -80,6 +78,34 @@ module Decidim::ParticipatoryProcesses
         expect(action_log.action).to eq("duplicate")
         expect(action_log.version).to be_present
       end
+
+      describe "landing page content blocks" do
+        let(:original_image) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
+
+        before do
+          content_block.images_container.background_image.purge
+          content_block.images_container.background_image = original_image
+          content_block.save
+          content_block.reload
+        end
+
+        it "duplicates a participatory_process and the content_block with its attachments" do
+          expect { subject.call }.to change(Decidim::ContentBlock, :count).by(1)
+
+          old_block = Decidim::ContentBlock.unscoped.first
+          new_block = Decidim::ContentBlock.unscoped.last
+          last_process = Decidim::ParticipatoryProcess.last
+
+          expect(new_block.scope_name).to eq(old_block.scope_name)
+          expect(new_block.manifest_name).to eq(old_block.manifest_name)
+          # published_at is set in content_block factory
+          expect(new_block.published_at).not_to be_nil
+          expect(new_block.scoped_resource_id).to eq(last_process.id)
+          expect(new_block.attachments.length).to eq(1)
+          expect(new_block.attachments.first.name).to eq("background_image")
+          expect(new_block.images_container.attached_uploader(:background_image).url).not_to be_nil
+        end
+      end
     end
 
     context "when duplicate_steps exists" do
@@ -120,36 +146,5 @@ module Decidim::ParticipatoryProcesses
         expect(last_component.step_settings.values).not_to eq(component.step_settings.values)
       end
     end
-
-    context "when duplicate_landing_page_blocks exists" do
-      let(:duplicate_landing_page_blocks) { true }
-      let(:original_image) do
-        Decidim::Dev.test_file("city.jpeg", "image/jpeg")
-      end
-
-      before do
-        content_block.images_container.background_image.purge
-        content_block.images_container.background_image = original_image
-        content_block.save
-        content_block.reload
-      end
-
-      it "duplicates a participatory_process and the content_block with its attachments" do
-        expect { subject.call }.to change(Decidim::ContentBlock, :count).by(1)
-
-        old_block = Decidim::ContentBlock.unscoped.first
-        new_block = Decidim::ContentBlock.unscoped.last
-        last_process = Decidim::ParticipatoryProcess.last
-
-        expect(new_block.scope_name).to eq(old_block.scope_name)
-        expect(new_block.manifest_name).to eq(old_block.manifest_name)
-        # published_at is set in content_block factory
-        expect(new_block.published_at).not_to be_nil
-        expect(new_block.scoped_resource_id).to eq(last_process.id)
-        expect(new_block.attachments.length).to eq(1)
-        expect(new_block.attachments.first.name).to eq("background_image")
-        expect(new_block.images_container.attached_uploader(:background_image).url).not_to be_nil
-      end
-    end
   end
 end

From 3353f6293910ae0056f6e1c01586ad71338dbd84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= <ivan@pokecode.net>
Date: Thu, 28 May 2026 19:10:05 +0200
Subject: [PATCH 040/131] add translations

---
 decidim-accountability/config/locales/eu.yml  |   2 +-
 decidim-accountability/config/locales/ru.yml  | 234 ++++++++++++++++++
 decidim-admin/config/locales/ca-IT.yml        |   3 +
 decidim-admin/config/locales/ca.yml           |   3 +
 decidim-admin/config/locales/de.yml           |   4 +
 decidim-admin/config/locales/es-MX.yml        |   3 +
 decidim-admin/config/locales/es-PY.yml        |   3 +
 decidim-admin/config/locales/es.yml           |   3 +
 decidim-admin/config/locales/eu.yml           |   3 +
 decidim-admin/config/locales/fi-plain.yml     |   1 +
 decidim-admin/config/locales/fi.yml           |   1 +
 decidim-admin/config/locales/fr-CA.yml        |   3 +
 decidim-admin/config/locales/fr.yml           |   3 +
 decidim-admin/config/locales/it.yml           |   1 +
 decidim-admin/config/locales/pt-BR.yml        |  10 +-
 decidim-assemblies/config/locales/ca.yml      |   2 +-
 decidim-assemblies/config/locales/pt-BR.yml   |   2 +-
 decidim-blogs/config/locales/fr.yml           |  11 +
 decidim-conferences/config/locales/eu.yml     |   6 +-
 decidim-core/config/locales/ar.yml            |   3 -
 decidim-core/config/locales/bg.yml            |   4 -
 decidim-core/config/locales/cs.yml            |   4 -
 decidim-core/config/locales/de.yml            |   5 +-
 decidim-core/config/locales/el.yml            |   3 -
 decidim-core/config/locales/eu.yml            |  78 +++---
 decidim-core/config/locales/fi-plain.yml      |   4 -
 decidim-core/config/locales/fi.yml            |   3 +-
 decidim-core/config/locales/gl.yml            |   3 -
 decidim-core/config/locales/hu.yml            |   3 -
 decidim-core/config/locales/id-ID.yml         |   3 -
 decidim-core/config/locales/it.yml            |   2 +-
 decidim-core/config/locales/ja.yml            |   4 -
 decidim-core/config/locales/lb.yml            |   3 -
 decidim-core/config/locales/lt.yml            |   3 -
 decidim-core/config/locales/lv.yml            |   3 -
 decidim-core/config/locales/nl.yml            |   3 -
 decidim-core/config/locales/no.yml            |   3 -
 decidim-core/config/locales/pl.yml            |   4 -
 decidim-core/config/locales/pt-BR.yml         |   4 -
 decidim-core/config/locales/pt.yml            |   3 -
 decidim-core/config/locales/ro-RO.yml         |   4 -
 decidim-core/config/locales/sk.yml            |   4 -
 decidim-core/config/locales/sv.yml            |   4 +-
 decidim-core/config/locales/tr-TR.yml         |   4 -
 decidim-core/config/locales/zh-CN.yml         |   3 -
 decidim-core/config/locales/zh-TW.yml         |   3 -
 decidim-debates/config/locales/eu.yml         |  16 +-
 decidim-dev/config/locales/eu.yml             |   2 +-
 decidim-elections/config/locales/eu.yml       |   2 +-
 decidim-forms/config/locales/eu.yml           |   2 +-
 decidim-initiatives/config/locales/eu.yml     |  32 +--
 decidim-meetings/config/locales/eu.yml        |  22 +-
 decidim-pages/config/locales/eu.yml           |   4 +-
 .../config/locales/ca.yml                     |   4 +-
 .../config/locales/eu.yml                     |  22 +-
 decidim-proposals/config/locales/eu.yml       |  34 +--
 decidim-system/config/locales/eu.yml          |   2 +-
 decidim-verifications/config/locales/bg.yml   |   1 -
 .../config/locales/ca-IT.yml                  |   2 +-
 decidim-verifications/config/locales/ca.yml   |   2 +-
 decidim-verifications/config/locales/cs.yml   |   1 -
 decidim-verifications/config/locales/de.yml   |   1 -
 .../config/locales/es-MX.yml                  |   2 +-
 .../config/locales/es-PY.yml                  |   2 +-
 decidim-verifications/config/locales/es.yml   |   2 +-
 decidim-verifications/config/locales/eu.yml   |   8 +-
 .../config/locales/fi-plain.yml               |   1 -
 decidim-verifications/config/locales/fi.yml   |   2 +-
 .../config/locales/fr-CA.yml                  |   2 +-
 decidim-verifications/config/locales/fr.yml   |   2 +-
 decidim-verifications/config/locales/gl.yml   |   1 -
 decidim-verifications/config/locales/hu.yml   |   1 -
 decidim-verifications/config/locales/it.yml   |   1 -
 decidim-verifications/config/locales/ja.yml   |   1 -
 decidim-verifications/config/locales/lt.yml   |   1 -
 decidim-verifications/config/locales/nl.yml   |   1 -
 decidim-verifications/config/locales/no.yml   |   1 -
 decidim-verifications/config/locales/pl.yml   |   1 -
 .../config/locales/pt-BR.yml                  |   1 -
 decidim-verifications/config/locales/pt.yml   |   1 -
 .../config/locales/ro-RO.yml                  |   1 -
 decidim-verifications/config/locales/sk.yml   |   1 -
 decidim-verifications/config/locales/sv.yml   |   1 -
 .../config/locales/zh-TW.yml                  |   1 -
 84 files changed, 415 insertions(+), 234 deletions(-)

diff --git a/decidim-accountability/config/locales/eu.yml b/decidim-accountability/config/locales/eu.yml
index df63c4cc353b3..87c826829e46a 100644
--- a/decidim-accountability/config/locales/eu.yml
+++ b/decidim-accountability/config/locales/eu.yml
@@ -9,7 +9,7 @@ eu:
       result:
         decidim_accountability_status_id: Egoera
         decidim_category_id: Kategoria
-        decidim_scope_id: Eremua
+        decidim_scope_id: Esparrua
         description: Deskribapena
         end_date: Bukaera-data
         progress: Aurrerapena
diff --git a/decidim-accountability/config/locales/ru.yml b/decidim-accountability/config/locales/ru.yml
index 9839843ac6003..4cf6f66843a86 100644
--- a/decidim-accountability/config/locales/ru.yml
+++ b/decidim-accountability/config/locales/ru.yml
@@ -2,6 +2,10 @@
 ru:
   activemodel:
     attributes:
+      milestone:
+        description: Описание
+        entry_date: Дата
+        title: Название
       result:
         decidim_accountability_status_id: Состояние
         decidim_category_id: Категория
@@ -10,6 +14,7 @@ ru:
         end_date: Дата окончания
         progress: Продвижение
         start_date: Дата начала
+        subresults: Подрезультаты
         title: Заголовок
         updated_at: 'Обновлено:'
       status:
@@ -22,6 +27,14 @@ ru:
       decidim/accountability/result_progress_updated_event: Прогресс результатов обновлен
   activerecord:
     models:
+      decidim:
+        accountability:
+          result:
+            budget_text: Этот результат %{link} был включен
+            meetings_ids: 'Что обсуждалось на этой встрече: %{link}'
+            project_ids: 'Что было включено в этот проект: %{link}'
+            proposal_ids: 'Что было включено в это предложение: %{link}'
+            text: 'Что было включено в этот результат: %{link}'
       decidim/accountability/result:
         one: Итог
         few: Итога
@@ -30,35 +43,144 @@ ru:
   decidim:
     accountability:
       actions:
+        add_milestone: Добавить этап
+        add_result: Добавить результат
+        confirm_delete_result: Вы уверены, что хотите удалить этот результат?
         confirm_destroy: Вы действительно хотите удалить %{name}?
+        deleted_results_info: Удаленные результаты могут быть восстановлены из корзины.
         destroy: Удалить
         edit: Редактировать
+        import: Импорт результатов из другого компонента
+        import_csv: Импорт результатов из CSV файла
+        new_milestone: Новый этап
+        new_result: Новый результат
+        new_status: Новый статус
         preview: Предварительный просмотр
         title: Действия
+        view_deleted_results: Просмотр удаленных результатов
       admin:
         exports:
+          result_comments: Комментарии
           results: Итоги
         import_components:
+          create:
+            invalid: Возникла проблема при импорте результатов. Пожалуйста, тщательно следуйте инструкциям и убедитесь, что вы выбрали проекты для реализации.
+          filters:
+            proposal_state: Статус предложения
+            select_state: Выберите статус
           form:
+            create: Импорт
             no_components:
+            origin_component_id: Исходный компонент
+            select_component: Выберите компонент
+          new:
+            title: Импорт резуотатов из другого компонента
+        import_results:
+          new:
+            download_export: Скачать Экспорт в CSV формате
+            import: Импорт
+            info: |
+              <p>Мы рекомендуем выполнить следующие шаги:</p>
+              <ol>
+              <li><a href='%{link_new_status}' target='_blank'>Создайте Статусы для Результатов</a>, которые вы хотите добавить</li>
+              <li><a href='%{link_new_result}' target='_blank'>Создайте вручную хотя бы один Результат</a> через эту панель Администратора перед использованием Импорта, чтобы лучше понять формат и что потребуется заполнить.</li>
+              <li>%{link_export_csv}</li>
+              <li>Внесите изменения локально. Вы можете изменять только следующие столбцы CSV (остальные будут проигнорированы):</li>
+              <ul>
+              <li><b>taxonomies/ids:</b> идентификаторы таксономий (если более одного — разделите запятой)</li>
+              <li><b>parent/id:</b> идентификатор родительского элемента (для связанных Результатов). Необязательно</li>
+              <li><b>title/en:</b> заголовок на английском языке. Зависит от языковой конфигурации вашей платформы.</li>
+              <li><b>description/en:</b> описание на английском языке. Зависит от языковой конфигурации вашей платформы.</li>
+              <li><b>start_date:</b> дата начала выполнения результата (формат YYYY-MM-DD)</li>
+              <li><b>end_date:</b> дата окончания выполнения результата (формат YYYY-MM-DD)</li>
+              <li><b>status/id:</b> идентификатор Статуса для данного результата</li>
+              <li><b>progress:</b> процент выполнения (от 0 до 100)</li>
+              <li><b>proposals_ids:</b> внутренний идентификатор связанных предложений (разделённых запятой). Автоматически преобразуется в <span class='attribute-name'>proposal_url</span></li>
+              </ul>
+              </li>
+              </ol>
+            title: Импорт результатов из CSV файла
+        imports:
+          create:
+            invalid: При попытке импорта этого результата произошла ошибка.
+            success: Начался импорт файла. В ближайшие минуты вы получите письмо с результатом импорта.
+        milestones:
+          create:
+            invalid: При попытке добавить этот этап произошла ошибка.
+            success: Этап успешно создан.
+          destroy:
+            success: Этап успешно удален.
+          edit:
+            title: Редактировать этап
+            update: Обновить этап
+          index:
+            title: Этапы
+          new:
+            create: Создать этап
+            title: Новый этап
+          update:
+            invalid: При попытке обновить этот этап произошла ошибка.
+            success: Этап успешно обнавлен.
         models:
           result:
             name: Итог
           status:
             name: Состояние
         results:
+          bulk_actions:
+            dates_form:
+              change_dates: Изменить дату
+              end_date: Дата окончания
+              start_date: Дата начала
+            dropdown:
+              actions: Действия
+              change_dates: Изменить даты
+              change_status: Изменить статус
+              change_taxonomies: Изменить таксономии
+            status_form:
+              change_status: Изменить статус
+              status: Статус
+            submit_buttons:
+              cancel: Отменить
+            taxonomies_form:
+              change_taxonomies: Изменить таксономии
+          create:
+            invalid: При создании этого результата возникла проблема.
+            success: Результат успешно создан.
           edit:
             title: Редактировать итог
             update: Обновить итог
           index:
+            selected: Выбранные
             title: Итоги
+          manage_trash:
+            title: Удаленные результаты
           new:
             create: Создать итог
             title: Добавить итог
+          update:
+            invalid: При обновлении этого результата возникла проблема.
+            success: Результат успешно обновлен.
+          update_dates:
+            invalid: При обновлении дат результатов возникла проблема
+            success: Даты результатов успешно обновлены
+          update_status:
+            invalid: При обновлении статуса результатов возникла проблема
+            success: Статус результатов успешно обновлен
+          update_taxonomies:
+            invalid: Не удалось обновить таксономии %{taxonomies} для результатов %{results}
+            select_a_result: Выберите результат
+            select_a_taxonomy: Выберите таксономию
+            success: Успешно обновлены таксономии %{taxonomies} для результатов %{results}
         shared:
           subnav:
             statuses: Состояния
         statuses:
+          create:
+            invalid: Возникла проблема при создании этого статуса.
+            success: Статус успешно создан.
+          destroy:
+            success: Статус успешно удален.
           edit:
             title: Редактировать состояние
             update: Обновить состояние
@@ -67,21 +189,62 @@ ru:
           new:
             create: Создать состояние
             title: Добавить состояние
+          update:
+            invalid: При обновлении статуса возникла проблема.
+            success: Статус успешно обновлен.
       admin_log:
+        milestones:
+          create: "%{user_name} создал этап %{resource_name}"
+          delete: "%{user_name} удалил этап %{resource_name}"
+          update: "%{user_name} обновил этап %{resource_name}"
         result:
           create: "%{user_name} создал итог %{resource_name} в %{space_name}"
           delete: "%{user_name} удалил итог %{resource_name} в %{space_name}"
+          restore: "%{user_name} восстановил результат %{resource_name} в %{space_name}"
+          soft_delete: "%{user_name} переместил результат %{resource_name} в корзину %{space_name}"
           update: "%{user_name} обновил итог %{resource_name} в %{space_name}"
+        status:
+          create: "%{user_name} создал статус %{resource_name}"
+          delete: "%{user_name} удалил статус %{resource_name}"
+          update: "%{user_name} обновил статус %{resource_name}"
         value_types:
           parent_presenter:
             not_found: 'Родительский объект не найден в базе данных (ID: %{id})'
+      content_blocks:
+        highlighted_results:
+          results: Результаты
+      creation:
+        text: Этот результат был создан
+      import_mailer:
+        import:
+          errors: Ошибки
+          errors_present: Произошла ошибка при импорте результатов.
+          row_number: Строка
+          subject: Успешный импорт результатов
+          success: Успешный импорт результатов. Вы можете просмотреть результаты в интерфейсе администрирования.
+      import_projects_mailer:
+        import:
+          subject: Успешный импорт проектов
+          success: Проекты успешно импортированны в результаты в компоненте %{component_name}. Вы можете просмотреть результаты в интерфейсе администрирования.
+      import_proposals_mailer:
+        import:
+          subject: Успешный импорт предложений
+          success: Предложения успешно импортированны в результаты в компоненте %{component_name}. Вы можете просмотреть результаты в интерфейсе администрирования.
+      last_activity:
+        new_result: 'Новый результат:'
       models:
+        milestone:
+          fields:
+            entry_date: Дата
+            title: Название
         result:
           fields:
+            created_at: Создано
             end_date: Дата окончания
             progress: Продвижение
             start_date: Дата начала
             status: Состояние
+            taxonomies: Таксономии
             title: Заголовок
         status:
           fields:
@@ -98,21 +261,51 @@ ru:
             other: "%{count} итога"
         home_header:
           global_status: Состояние общего исполнения
+        milestones:
+          title: Этапы
+        no_results: Нет проектов
+        root_taxonomies:
+          title: 'Отображать по:'
         search:
           search: Поиск действий
         show:
           stats:
             back_to_resource: Вернуться к итогу
+    admin:
+      filters:
+        results:
+          status_id_eq:
+            label: Статус
+          taxonomies_part_of_contains:
+            label: Таксономия
+      tooltips:
+        deleted_results_info: Невозможно удалить этот результат
     components:
       accountability:
+        actions:
+          comment: Комментарий
         name: Отчетность
         settings:
           global:
+            clear_all: Очистить все
             comments_enabled: Комментарии включены
+            comments_max_length: Максимальная длина комментариев (оставьте 0 для значения по умолчанию)
+            default_taxonomy: Таксономия по умолчанию
+            default_taxonomy_help: Выберите, какую таксономию вы хотите показать по умолчанию. Если таксономия не выбрана, результаты будут показаны в виде списка.
+            define_taxonomy_filters: Пожалуйста, определите фильтры для этого партисипативного пространства перед использованием этой настройки.
             display_progress_enabled: Показывать ход выполнения
+            geocoding_enabled: Карты включены
             intro: Вступление
+            no_taxonomy_filters_found: Фильтры таксономии не найдены.
+            taxonomy_filters: Выберите фильтры для компонента
+            taxonomy_filters_add: Добавить фильтр
           step:
             comments_blocked: Комментарии отключены
+          visualization: Визуализация
+    download_your_data:
+      show:
+        result_comments: Экспорт комментариев результатов
+        results: Экспорт результатов
     events:
       accountability:
         proposal_linked:
@@ -123,9 +316,50 @@ ru:
         result_progress_updated:
           email_intro: 'Результат "%{resource_title}", который включает предложение "%{proposal_title}", теперь завершено на %{progress}%. Вы можете увидеть его на этой странице:'
           email_outro: Вы получили это уведомление, потому что вы следите за "%{proposal_title}", и это предложение включено в результат "%{resource_title}". Вы можете прекратить получение уведомлений, перейдя по предыдущей ссылке.
+          email_subject: Обновление прогресса %{resource_title}
           notification_title: Результат <a href="%{resource_path}">%{resource_title}</a>, который включает предложение <a href="%{proposal_path}">%{proposal_title}</a>, теперь %{progress}% завершен.
+    open_data:
+      help:
+        result_comments:
+          alignment: Если этот комментарий был за, против или нейтральный
+          author: Имя участника, который написал этот комментарий
+          body: Сам комментарий
+          commentable_id: Уникальный идентификатор комментария
+          commentable_type: Тип комментируемого элемента (результат, предложение и т.д.)
+          created_at: Дата создания комментария
+          depth: Позиция комментария в цепочке обсуждения (прямой ответ или ответ на ответ)
+          id: Идентификатор этого комментария
+          locale: Язык, при котором участник оставлял этот комментарий
+          root_commentable_url: URL ресурса, который связан с этим комментарием
+        results:
+          address: Адрес результата (если есть)
+          children_count: Количество результатов дочернего процесса
+          comments_count: Количество комментариев к этому результату
+          component: Компонент, к которому относится результат
+          created_at: Дата создания результата
+          description: Описание результата
+          end_date: Дата окончания выполнения результата
+          id: Уникальный идентификатор результата
+          latitude: Географическая широта результата в случае, если он имеет физическое расположение
+          longitude: Географическая долгота результата в случае, если он имеет физическое местоположение
+          parent: Родительский результат (если есть) результата
+          progress: Процент выполнения результата
+          proposal_urls: URL-адреса предложений, которые включены в этот результат
+          reference: Уникальная ссылка на результат
+          start_date: Дата начала выполнения результата
+          status: Текущий статус этого результата
+          taxonomies: Таксономии результата
+          title: Заголовок результата
+          updated_at: Последняя дата обновления результата
+          url: URL-адрес, где можно найти этот результат
+    participatory_spaces:
+      highlighted_results:
+        see_all: Посмотреть все результаты
     resource_links:
       included_projects:
         result_project: Проекты, включенные в эти итоги
       included_proposals:
         result_proposal: Предложения, включенные в этот итог
+    statistics:
+      results_count: Результаты
+      results_count_tooltip: Количество решений или итогов, выработанных в рамках данного пространства.
diff --git a/decidim-admin/config/locales/ca-IT.yml b/decidim-admin/config/locales/ca-IT.yml
index bf534489a38c7..f3577c084bae6 100644
--- a/decidim-admin/config/locales/ca-IT.yml
+++ b/decidim-admin/config/locales/ca-IT.yml
@@ -834,6 +834,7 @@ ca-IT:
       officializations:
         block:
           error: Hi ha hagut un problema en bloquejar a la participant.
+          no_user: No s'ha trobat cap usuària
           success: Participant bloquejada correctament.
         bulk_action:
           block:
@@ -867,6 +868,8 @@ ca-IT:
           badge: Ensenya d'oficialització
           officialize: Oficialitza
           title: Oficialitza la participant "%{name}"
+        show_email:
+          no_user: No s'ha trobat cap usuària
         show_email_modal:
           description: Si necessites contactar a una participant directament pots clicar al botó Mostra per veure la seva adreça de correu electrònic. Aquesta acció es registrarà.
           email_address: Adreça de correu electrònic
diff --git a/decidim-admin/config/locales/ca.yml b/decidim-admin/config/locales/ca.yml
index e9ebf35df3721..5c354fc8178fa 100644
--- a/decidim-admin/config/locales/ca.yml
+++ b/decidim-admin/config/locales/ca.yml
@@ -834,6 +834,7 @@ ca:
       officializations:
         block:
           error: Hi ha hagut un problema en bloquejar a la participant.
+          no_user: No s'ha trobat cap usuària
           success: Participant bloquejada correctament.
         bulk_action:
           block:
@@ -867,6 +868,8 @@ ca:
           badge: Ensenya d'oficialització
           officialize: Oficialitza
           title: Oficialitza la participant "%{name}"
+        show_email:
+          no_user: No s'ha trobat cap usuària
         show_email_modal:
           description: Si necessites contactar a una participant directament pots clicar al botó Mostra per veure la seva adreça de correu electrònic. Aquesta acció es registrarà.
           email_address: Adreça de correu electrònic
diff --git a/decidim-admin/config/locales/de.yml b/decidim-admin/config/locales/de.yml
index 2fa35648d4709..46ad33e39db86 100644
--- a/decidim-admin/config/locales/de.yml
+++ b/decidim-admin/config/locales/de.yml
@@ -265,6 +265,8 @@ de:
         edit:
           title: Ordner bearbeiten
           update: Aktualisieren
+        index:
+          attachment_collections_title: Ordner für Anhänge
         new:
           create: Erstellen
           title: Neuer Ordner
@@ -280,6 +282,8 @@ de:
         edit:
           title: Anhang bearbeiten
           update: Aktualisieren
+        index:
+          attachments_title: Anhänge
         new:
           create: Anhang erstellen
           title: Neuer Anhang
diff --git a/decidim-admin/config/locales/es-MX.yml b/decidim-admin/config/locales/es-MX.yml
index 1d7631b81ffa7..a2eed7818cb20 100644
--- a/decidim-admin/config/locales/es-MX.yml
+++ b/decidim-admin/config/locales/es-MX.yml
@@ -834,6 +834,7 @@ es-MX:
       officializations:
         block:
           error: Se ha producido un error al bloquear a la participante.
+          no_user: No se ha encontrado ninguna usuaria
           success: Participante bloqueada correctamente.
         bulk_action:
           block:
@@ -867,6 +868,8 @@ es-MX:
           badge: Insignia de oficialización
           officialize: Oficializar
           title: Oficializar el usuario "%{name}"
+        show_email:
+          no_user: No se ha encontrado ninguna usuaria
         show_email_modal:
           description: Si necesitas contactar directamente con una participante, puedes hacer clic en el botón Mostrar para ver la dirección de correo electrónico. Esta acción se registrará.
           email_address: Dirección de correo electrónico
diff --git a/decidim-admin/config/locales/es-PY.yml b/decidim-admin/config/locales/es-PY.yml
index 5effe61d7725c..5aee3b0742303 100644
--- a/decidim-admin/config/locales/es-PY.yml
+++ b/decidim-admin/config/locales/es-PY.yml
@@ -834,6 +834,7 @@ es-PY:
       officializations:
         block:
           error: Se ha producido un error al bloquear a la participante.
+          no_user: No se ha encontrado ninguna usuaria
           success: Participante bloqueada correctamente.
         bulk_action:
           block:
@@ -867,6 +868,8 @@ es-PY:
           badge: Insignia de oficialización
           officialize: Oficializar
           title: Oficializar el usuario "%{name}"
+        show_email:
+          no_user: No se ha encontrado ninguna usuaria
         show_email_modal:
           description: Si necesitas contactar directamente con una participante, puedes hacer clic en el botón Mostrar para ver la dirección de correo electrónico. Esta acción se registrará.
           email_address: Dirección de correo electrónico
diff --git a/decidim-admin/config/locales/es.yml b/decidim-admin/config/locales/es.yml
index 8046cc4b3fd12..4fa874adf9ebd 100644
--- a/decidim-admin/config/locales/es.yml
+++ b/decidim-admin/config/locales/es.yml
@@ -834,6 +834,7 @@ es:
       officializations:
         block:
           error: Se ha producido un error al bloquear a la participante.
+          no_user: No se ha encontrado ninguna usuaria
           success: Participante bloqueada correctamente.
         bulk_action:
           block:
@@ -867,6 +868,8 @@ es:
           badge: Insignia de oficialización
           officialize: Oficializar
           title: Oficializar participante "%{name}"
+        show_email:
+          no_user: No se ha encontrado ninguna usuaria
         show_email_modal:
           description: Si necesitas contactar directamente con una participante, puedes hacer clic en el botón Mostrar para ver la dirección de correo electrónico. Esta acción se registrará.
           email_address: Dirección de correo electrónico
diff --git a/decidim-admin/config/locales/eu.yml b/decidim-admin/config/locales/eu.yml
index bf7142d47f10f..4f84e89bce22c 100644
--- a/decidim-admin/config/locales/eu.yml
+++ b/decidim-admin/config/locales/eu.yml
@@ -834,6 +834,7 @@ eu:
       officializations:
         block:
           error: Arazo bat izan da parte-hartzailea blokeatzean.
+          no_user: Ez da parte-hartzailerik aurkitu 
           success: Parte-hartzailea zuzen blokeatua.
         bulk_action:
           block:
@@ -867,6 +868,8 @@ eu:
           badge: Ofizializazio-garaikurra
           officialize: Ofizializatzen du
           title: Parte-hartzaile ofiziala "%{name}"
+        show_email:
+          no_user: Ez da parte-hartzailerik aurkitu
         show_email_modal:
           description: Parte-hartzaile batekin zuzenean harremanetan jarri behar baduzu, Erakutsi botoian klik egin dezakezu helbide elektronikoa ikusteko. Ekintza hori erregistratu egingo da.
           email_address: Korreo elektronikoaren helbidea
diff --git a/decidim-admin/config/locales/fi-plain.yml b/decidim-admin/config/locales/fi-plain.yml
index 90d3123dda046..e50812f739c85 100644
--- a/decidim-admin/config/locales/fi-plain.yml
+++ b/decidim-admin/config/locales/fi-plain.yml
@@ -834,6 +834,7 @@ fi-pl:
       officializations:
         block:
           error: Osallistujan estäminen epäonnistui.
+          no_user: Käyttäjää ei löytynyt
           success: Osallistujan estäminen onnistui.
         bulk_action:
           block:
diff --git a/decidim-admin/config/locales/fi.yml b/decidim-admin/config/locales/fi.yml
index 21393a0f18cc4..04dc4cf70f690 100644
--- a/decidim-admin/config/locales/fi.yml
+++ b/decidim-admin/config/locales/fi.yml
@@ -834,6 +834,7 @@ fi:
       officializations:
         block:
           error: Osallistujan estäminen epäonnistui.
+          no_user: Käyttäjää ei löytynyt
           success: Osallistujan estäminen onnistui.
         bulk_action:
           block:
diff --git a/decidim-admin/config/locales/fr-CA.yml b/decidim-admin/config/locales/fr-CA.yml
index fe03a836a6221..7e545bfbdb822 100644
--- a/decidim-admin/config/locales/fr-CA.yml
+++ b/decidim-admin/config/locales/fr-CA.yml
@@ -831,6 +831,7 @@ fr-CA:
       officializations:
         block:
           error: Une erreur s'est produite lors du blocage du participant.
+          no_user: Aucun utilisateur trouvé
           success: Participant bloqué avec succès.
         bulk_action:
           block:
@@ -864,6 +865,8 @@ fr-CA:
           badge: Badge de validation
           officialize: Valider
           title: Valider l'utilisateur "%{name}"
+        show_email:
+          no_user: Aucun utilisateur trouvé
         show_email_modal:
           description: Si vous avez besoin de contacter directement un participant, vous pouvez cliquer sur le bouton Afficher pour voir leur adresse mèl. Cette action sera enregistrée.
           email_address: Adresse e-mail
diff --git a/decidim-admin/config/locales/fr.yml b/decidim-admin/config/locales/fr.yml
index 915e458484c8b..02b9272bcbea9 100644
--- a/decidim-admin/config/locales/fr.yml
+++ b/decidim-admin/config/locales/fr.yml
@@ -831,6 +831,7 @@ fr:
       officializations:
         block:
           error: Une erreur s'est produite lors du blocage du participant.
+          no_user: Aucun utilisateur trouvé
           success: Participant bloqué avec succès.
         bulk_action:
           block:
@@ -864,6 +865,8 @@ fr:
           badge: Badge de validation
           officialize: Valider
           title: Valider l'utilisateur "%{name}"
+        show_email:
+          no_user: Aucun utilisateur trouvé
         show_email_modal:
           description: Si vous avez besoin de contacter directement un participant, vous pouvez cliquer sur le bouton Afficher pour voir son adresse mail. Cette action sera enregistrée.
           email_address: Adresse e-mail
diff --git a/decidim-admin/config/locales/it.yml b/decidim-admin/config/locales/it.yml
index a0efb0792f687..c95dcea091094 100644
--- a/decidim-admin/config/locales/it.yml
+++ b/decidim-admin/config/locales/it.yml
@@ -184,6 +184,7 @@ it:
           Se cambi idea, puoi ripristinarlo più tardi.
         export: Esporta
         export_all: Esporta tutto
+        export_selection: Esporta selezione
         import: Importazione
         newsletter:
           new: Nuova newsletter
diff --git a/decidim-admin/config/locales/pt-BR.yml b/decidim-admin/config/locales/pt-BR.yml
index e7c8d92c8da2e..a1b647315e49b 100644
--- a/decidim-admin/config/locales/pt-BR.yml
+++ b/decidim-admin/config/locales/pt-BR.yml
@@ -58,7 +58,7 @@ pt-BR:
         force_users_to_authenticate_before_access_organization: Forçar usuários a autenticar antes de acessar organização
         from: Endereço de e-mail do remetente
         github_handler: Manipulador GitHub
-        header_snippets: Snippets de cabeçalho
+        header_snippets: Trecho de cabeçalho
         highlight_alternative_color: Destaque, alternativa
         highlight_color: Destaque
         host: Host
@@ -86,7 +86,7 @@ pt-BR:
         tertiary_color: Terciário
         time_zone: Fuso Horário
         tos_version: Versão dos termos de serviço
-        twitter_handler: X handler
+        twitter_handler: Manipulador do X
         users_registration_mode: Modo de registro de usuários
         warning_color: Aviso
         welcome_notification_body: Corpo de notificação de boas-vindas
@@ -119,16 +119,16 @@ pt-BR:
         slug: Texto curto de URL
         title: Título
         topic_id: Tópico
-        weight: Posição do pedido
+        weight: Ordem de posição
       static_page_topic:
         description: Descrição
         name: Nome do tópico
         show_in_footer: Mostrar no rodapé
         title: Título
-        weight: Posição do pedido
+        weight: Ordem de posição
       taxonomy:
         item_name: Nome do item
-        parent_id: Parente
+        parent_id: Pai
       user_group_csv_verification:
         file: Arquivo
     errors:
diff --git a/decidim-assemblies/config/locales/ca.yml b/decidim-assemblies/config/locales/ca.yml
index bbc73b72d9f51..f182e6ebe965b 100644
--- a/decidim-assemblies/config/locales/ca.yml
+++ b/decidim-assemblies/config/locales/ca.yml
@@ -172,7 +172,7 @@ ca:
           attachments: Adjunts
           components: Components
           info: Quant a aquesta assemblea
-          landing_page: Disposició de la pàgina de destinació
+          landing_page: Disposició de la pàgina d'inici
           moderations: Moderacions
           private_users: Membres
           see_assembly: Veure l'assemblea
diff --git a/decidim-assemblies/config/locales/pt-BR.yml b/decidim-assemblies/config/locales/pt-BR.yml
index 992425eb50b18..20b215b5cea64 100644
--- a/decidim-assemblies/config/locales/pt-BR.yml
+++ b/decidim-assemblies/config/locales/pt-BR.yml
@@ -3,7 +3,7 @@ pt-BR:
   activemodel:
     attributes:
       assembly:
-        announcement: Avisos
+        announcement: Anúncios
         area_id: Área
         assembly_type: Tipo de assembleia
         assembly_type_other: Outro tipo de assambleia
diff --git a/decidim-blogs/config/locales/fr.yml b/decidim-blogs/config/locales/fr.yml
index c64afa4ab62af..05c5405f41085 100644
--- a/decidim-blogs/config/locales/fr.yml
+++ b/decidim-blogs/config/locales/fr.yml
@@ -106,6 +106,7 @@ fr:
           comment: Commenter
           create: Créer
           destroy: Supprimer
+          like: Soutenir
           update: Mettre à jour
         name: Actualités
         settings:
@@ -122,6 +123,8 @@ fr:
           step:
             announcement: Annonce
             comments_blocked: Commentaires désactivés
+            likes_blocked: Soutiens bloqués
+            likes_enabled: Soutiens activés
     events:
       blogs:
         post_created:
@@ -136,14 +139,22 @@ fr:
           author: Le nom du participant qui a fait ce commentaire
           body: Le commentaire lui-même
           commentable_id: L'identifiant unique du commentaire
+          commentable_type: Le type de l'élément commenté (s'il s'agit d'un résultat, d'une proposition, etc.)
           created_at: La date de création de ce commentaire
+          depth: L'endroit où ce commentaire se trouve dans l'arborescence des commentaires (si c'est une réponse ou une réponse à une réponse)
           id: L'id de ce commentaire
+          locale: La langue que le participant a utilisé en créant ce commentaire
+          root_commentable_url: L'URL de la ressource liée à ce commentaire
         posts:
+          author: Les informations de l'auteur
           body: Le corps de l'article
           comments_count: Le nombre de commentaires sur cet article
           component: Le composant auquel appartient l'article
           created_at: La date de création de cet article
+          follows_count: Le nombre de personnes qui suivent cet article
           id: L'identifiant unique de cet article
+          likes_count: Le nombre de soutiens à cet article
+          participatory_space: 'À quel espace (ex : Concertation ou Assemblée) appartient cet article'
           published_at: La date à laquelle cet article a été publié
           title: Le titre de l'article
           updated_at: La dernière date de mise à jour de cet article
diff --git a/decidim-conferences/config/locales/eu.yml b/decidim-conferences/config/locales/eu.yml
index 15d9278f78ef5..d9185c7dd4a63 100644
--- a/decidim-conferences/config/locales/eu.yml
+++ b/decidim-conferences/config/locales/eu.yml
@@ -233,7 +233,7 @@ eu:
             actions: Ekintzak
             affiliation: Afiliazioa
             full_name: Izen osoa
-            position: Ardura
+            position: Kokapena
           name: Hizlaria
         conference_user_role:
           fields:
@@ -597,7 +597,7 @@ eu:
           notification_title: <a href="%{resource_path}">%{resource_title}</a> jardunaldiak erregistroak gaitu ditu.
         role_assigned:
           email_intro: '%{role} rola esleitu zaizu <a href="%{resource_title}"> jardunaldian.'
-          email_outro: Jakinarazpen hau jaso duzu %{role} rola esleitu dizutelako "%{resource_title}" hitzaldian.
+          email_outro: Jakinarazpen hau jaso duzu %{role} rola esleitu dizutelako "%{resource_title}" jardunaldian.
           email_subject: '%{role} rola esleitu zaizu <a href="%{resource_title}"> batzarrean.'
           notification_title: '%{role} rola esleitu zaizu <a href="%{resource_url}">%{resource_title}</a> batzarrean.'
         upcoming_conference:
@@ -667,7 +667,7 @@ eu:
           promoted_conferences: Sustatutako jardunaldiak
         order_by_conferences:
           conferences:
-            one: "Jardunaldi %{count}"
+            one: "%{count} jardunaldi"
             other: "%{count} jardunaldi"
       conferences_nav:
         conference_partners_menu_item: Kideak
diff --git a/decidim-core/config/locales/ar.yml b/decidim-core/config/locales/ar.yml
index a1ec957a2ee98..59a646074cd34 100644
--- a/decidim-core/config/locales/ar.yml
+++ b/decidim-core/config/locales/ar.yml
@@ -293,9 +293,6 @@ ar:
       update_draft:
         error: حدثت هناك مشكلة أثناء تحديث مسودة التعديل.
         success: تم تحديث مسودة التعديل بنجاح.
-      wizard_step_form:
-        steps:
-          '1': إنشاء التعديل الخاص بك
     anonymous_user: مجهول
     application:
       document:
diff --git a/decidim-core/config/locales/bg.yml b/decidim-core/config/locales/bg.yml
index 591ae88b89734..0dc473f799e1b 100644
--- a/decidim-core/config/locales/bg.yml
+++ b/decidim-core/config/locales/bg.yml
@@ -337,10 +337,6 @@ bg:
         success: Черновата на поправка е успешно обновена.
       withdraw:
         success: Изменението беше оттеглено успешно.
-      wizard_step_form:
-        steps:
-          '1': Създайте Ваша поправка
-          '2': Публикувайте своето изменение
     anonymous_user: Анонимен
     application:
       document:
diff --git a/decidim-core/config/locales/cs.yml b/decidim-core/config/locales/cs.yml
index 5699c037e5492..f1e57a4a9eb46 100644
--- a/decidim-core/config/locales/cs.yml
+++ b/decidim-core/config/locales/cs.yml
@@ -447,10 +447,6 @@ cs:
       withdraw:
         error: Při stahování pozměňovacího návrhu došlo k chybě.
         success: Pozměňovací návrh byl úspěšně stažen.
-      wizard_step_form:
-        steps:
-          '1': Vytvořte svůj pozměňovací návrh
-          '2': Publikovat svůj pozměňovací návrh
     anonymous_user: Anonymní
     application:
       document:
diff --git a/decidim-core/config/locales/de.yml b/decidim-core/config/locales/de.yml
index d2eb134f1be87..845497a028d02 100644
--- a/decidim-core/config/locales/de.yml
+++ b/decidim-core/config/locales/de.yml
@@ -421,10 +421,6 @@ de:
       withdraw:
         error: Beim Zurückziehen der Änderung ist ein Problem aufgetreten.
         success: Die Änderung wurde erfolgreich zurückgezogen.
-      wizard_step_form:
-        steps:
-          '1': Erstellen Sie Ihre Änderung
-          '2': Änderung veröffentlichen
     anonymous_user: Anonym
     application:
       document:
@@ -808,6 +804,7 @@ de:
           invitation_sent_at: Datum und Uhrzeit, an dem die Einladung versendet wurde
           invitations_count: Die Anzahl der an diesen Benutzer gesendeten Einladungen
           invited_by: Der Benutzer, der diesen Benutzer eingeladen hat
+          last_sign_in_at: Datum und Uhrzeit des letzten Logins
           locale: Die Plattformsprache, die dieser Benutzer ausgewählt hat
           managed: Ob dieser Benutzer von einem anderen Benutzer verwaltet wird
           name: Der Name des Benutzers
diff --git a/decidim-core/config/locales/el.yml b/decidim-core/config/locales/el.yml
index d78a2a7dd0e9c..612a4b93c8304 100644
--- a/decidim-core/config/locales/el.yml
+++ b/decidim-core/config/locales/el.yml
@@ -261,9 +261,6 @@ el:
       update_draft:
         error: Υπήρξε ένα πρόβλημα κατά την ενημέρωση του πρόχειρου τροποποίησης.
         success: Το πρόχειρο τροποποίησης ενημερώθηκε επιτυχώς.
-      wizard_step_form:
-        steps:
-          '1': Δημιουργήστε την τροποποίησή σας
     anonymous_user: Ανώνυμη
     application:
       document:
diff --git a/decidim-core/config/locales/eu.yml b/decidim-core/config/locales/eu.yml
index c5055ac8de421..9b698da0c4c36 100644
--- a/decidim-core/config/locales/eu.yml
+++ b/decidim-core/config/locales/eu.yml
@@ -209,7 +209,7 @@ eu:
         cancel_error: Ezin izan da ezeztatu helbide elektronikoaren aldaketa.
         cancel_successfully: Posta elektronikoaren aldaketa zuzen ezeztatua.
         resend_error: Ezin izan da birbidali berresteko helbide elektronikoa.
-        resend_successfully: 'Berresteko posta elektronikoa zuzen birbidalia hona: %{unconfirmed_email}.'
+        resend_successfully: Correo de confirmación reenviado con éxito a %{unconfirmed_email}.
         send_again: Bidali berriro
         title: Posta elektronikoaren aldaketak egiaztatzea
       show:
@@ -224,13 +224,13 @@ eu:
       time_ago: "duela %{time}"
     admin:
       actions:
-        cancel: Ezeztatu
+        cancel: Utzi
       password_change:
         alert: Aurrera jarraitu ahal izateko pasahitza aldatu behar duzu.
         notification: Administratzaile rola duten parte-hartzaileek pasahitza aldatu behar dute %{days} egunik behin.
     admin_log:
       area:
-        create: "%{user_name} parte-hartzaileak%{resource_name} arloa sortu du"
+        create: "%{user_name} parte-hartzaileak %{resource_name} arloa sortu du"
         delete: "%{user_name} parte-hartzaileak %{resource_name} arloa ezabatu da"
         update: "%{user_name} parte-hartzaileak %{resource_name} arloa eguneratu du"
       area_type:
@@ -421,7 +421,7 @@ eu:
         success: Zuzenketa zuzen kendu da.
       wizard_step_form:
         steps:
-          '1': Sortu zure zuzenketa
+          '1': Zure zuzenketa egin
           '2': Zure zuzenketa argitaratu
     anonymous_user: Anonimoa
     application:
@@ -479,7 +479,7 @@ eu:
       expires_at: '%{timestamp} iraungitzen da'
       foo_authorization:
         fields:
-          bar: Bar
+          bar: Barra
           foo: Foo
         name: Foo baimena
       granted_at: Onartua %{timestamp}
@@ -513,7 +513,7 @@ eu:
           explanation: Sentitzen dugu, baina ezin diozu heldu ekintza honi, zure baimen-datuetako batzuk ez datozelako bat.
           invalid_field: "%{field} datu-eremuaren balioa %{value} ez da baliozkoa."
           ok: Ados
-          title: Ez dago baimenduta
+          title: Ez zaude baimenduta
         unconfirmed:
           confirmation_instructions: 'Berrespen-argibideak jaso ez badituzu, berriro eska ditzakezu:'
           explanation_html: Ekintza hau burutzeko baimena behar da, egiten zure email berretsi behar duzula aurretik behar duzu <strong>%{email}</strong>.
@@ -864,7 +864,7 @@ eu:
         try_later: Mesedez, geroago saiatu berriro. Erroreak jarraitzen badu, mesedez, kopiatu ondoko informazio hau eta bidali plataformaren mantentzaileei partekatu nahi duzun bestelako informazioarekin batera.
         unknown: Ezezaguna
         url: URL
-        user: Parte-hartzailearen ID
+        user: Parte-hartzailearen ID-a
       not_found:
         back_home: Itzuli hasierara
         content_doesnt_exist: Helbide hau okerra da edo ezabatua izan da.
@@ -878,7 +878,7 @@ eu:
             email_subject: Onartu da %{emendation_author_nickname} ren %{amendable_title} zuzenketa
             notification_title: '<a href="%{emendation_author_path}">%{emendation_author_nickname} egileak sortutako </a><a href="% emendation_path}">zuzenketa onartu da honetarako: <a href="%{amendable_path}">%{amendable_title}</a>.'
           follower:
-            email_intro: '%{amendable_title} rako zuzenketa bat onartu da. Orrialde honetan ikus dezakezue:'
+            email_intro: 'Zuzenketa bat onartu honetarako %{amendable_title}. Orrialde honetatik ikus dezakezu:'
             email_outro: Jakinarazpen hau jaso duzu %{amendable_title} jarraitzen duzulako. Aurreko estekan sartu jakinarazpenak jasotzeari utzi nahi badiozu.
             email_subject: '%{emendation_author_nickname} ren aldaketa onartuta honetarako: %{amendable_title}'
             notification_title: '<a href="%{emendation_author_path}">%{emendation_author_nickname}</a> k sortutako <a href="%{emendation_path}"></a> zuzenketa onartu da honetarako: <a href="%{amendable_path}">%{amendable_title}</a>.'
@@ -902,7 +902,7 @@ eu:
           follower:
             email_intro: '%{amendable_title} rako zuzenketa %{amendable_type} berri gisa argitaratu da. Orrialde honetan ikusi dezakezu:'
             email_outro: Jakinarazpen hau jaso duzu %{amendable_title} jarraitzen duzulako. Aurreko esteka jarraituz jakinarazpenak jasotzeari uztea erabaki dezakezu.
-            email_subject: Batetik zuzenketa %{emendation_author_nickname} izan berri gisa argitaratuko %{amendable_type}
+            email_subject: 'Hemendik: %{emendation_author_nickname} zuzenketa bat argitaratu da %{amendable_type} berri gisa'
             notification_title: <a href="%{emendation_path}"> k ukatu du </a> zuzenketa honetarako <a href="%{amendable_path}">%{amendable_title}</a> argitaratu du %{amendable_type} berri gisa honek <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
         amendment_rejected:
           affected_user:
@@ -930,7 +930,7 @@ eu:
         component_published:
           email_intro: '%{resource_title} osagaia aktibatu da %{participatory_space_title} espazioan. Orrialde honetan ikus dezakezu:'
           email_outro: Jakinarazpena jaso duzu %{participatory_space_title} jarraituz gero. Aurreko esteka jarraituz jakinarazpenak jasotzeari uztea erabaki dezakezu.
-          email_subject: '%{participatory_space_title} eguneratze bat'
+          email_subject: 'Eguneraketa bat honetarako: %{participatory_space_title}'
           notification_title: '%{resource_title} osagaia aktibo dago iadanik <a href="%{resource_path}">%{participatory_space_title}</a> espaziorako'
       email_event:
         email_greeting: Kaixo, %{user_name},
@@ -957,7 +957,7 @@ eu:
           email_intro: |-
             Zure %{resource_type} ez da ikusgai egongo.<br>
             Hori gertatu da zuk erantzun duzun proposamena, bilera, eztabaida edo iruzkina moderatu egin delako. Berriro erabilgarri jartzen bada, zure iruzkina automatikoki leheneratuko da.
-          email_outro: Jakinarazpen hau jaso duzu eragindako %{resource_type}-ren egilea zarelako.
+          email_outro: Jakinarazpen hau jaso duzu %{resource_type} ekimenaren egilea zarelako.
           email_subject: Zure %{resource_type} ez da dagoeneko ikusten
           notification_title: |-
             Zure %{resource_type} ez da ikusgai egongo.<br>
@@ -1004,7 +1004,7 @@ eu:
         dummy_resource: Balizko baliabideak
         meeting: Topaketa-zerrenda
         project: Proiektuak
-        proposal: Proposamenak
+        proposal: Proposamen
         result: Emaitzak
     fingerprint:
       check: Egiaztatu hatz-marka
@@ -1094,7 +1094,7 @@ eu:
           conditions:
           - Beste pertsona batzuei aktibo eta jarraitzen zaien ziurgabetasuna beste pertsona batzuek segituko dute.
           description: Bereizgarria jarraitzaile kopuru jakin batera iristen zarenean ematen da. %{organization_name} sare soziala eta politikoa da, zure web-orria plataforman beste pertsona batzuekin komunikatzeko ehuna egiten du.
-          description_another: Parte-hartzaile honek %{score} jarraitzaile ditu.
+          description_another: Erabiltzaile honek %{score} jarraitzaile ditu.
           description_own: "%{score} parte-hartzailek jarraitzen zaituzte."
           name: Jarraitzaileak
           next_level_in: Lortu %{score} parte-hartzaile gehiago jarraitzeko hurrengo mailara iristeko!
@@ -1150,7 +1150,7 @@ eu:
     log:
       base_presenter:
         create: "%{user_name} parte-hartzaileak %{resource_name} sortu du"
-        create_with_space: "%{user_name} sortu %{resource_name} en %{space_name}"
+        create_with_space: "%{user_name} parte-hartzaileak %{resource_name} emaitza sortu du %{space_name} espazioan"
         delete: "%{user_name} parte-hartzaileak %{resource_name} ezabatu du"
         delete_with_space: "%{user_name} parte-hartzaileak %{resource_name} ezabatu du %{space_name} espazioan"
         publish: "%{user_name} parte-hartzaileak %{resource_name} argitaratu du"
@@ -1158,11 +1158,11 @@ eu:
         unknown_action: "%{user_name} parte-hartzaileak ekintza batzuk egin ditu %{resource_name} ean"
         unknown_action_with_space: "%{user_name} parte-hartzaileak ekintza batzuk egin ditu %{resource_name} ean %{space_name} espazioan"
         unpublish_with_space: "%{user_name} parte-hartzaileak %{resource_name} despargitaratu du %{space_name} espaziotik"
-        update: "%{user_name} k %{resource_name} eguneratu du"
+        update: "%{user_name} parte-hartzaileak %{resource_name} eguneratu du"
         update_filters: "%{user_name} parte-hartzaileak %{resource_name} iragazkia eguneratu du"
         update_filters_with_space: "%{user_name} parte-hartzaileak %{resource_name} ren iragazkiak eguneratu ditu %{space_name} espazioan"
-        update_permissions_with_space: "%{user_name} k %{resource_name} ren baimenak eguneratu ditu %{space_name} espazioan"
-        update_with_space: "%{user_name} parte-hartzaileak eguneratu du %{resource_name} hemen %{space_name}"
+        update_permissions_with_space: "%{user_name} parte-hartzaileak %{resource_name} ren baimenak eguneratu ditu %{space_name} espazioan"
+        update_with_space: "%{user_name} parte-hartzileak eguneratu du %{resource_name} hemen %{space_name}"
       value_types:
         area_presenter:
           not_found: 'Arloa ez da (ID: %{id}) datu-basean aurkitu'
@@ -1193,12 +1193,12 @@ eu:
         new_conversation:
           greeting: Kaixo, %{recipient}!
           intro: "%{sender} bidaltzaileak beste elkarrizketa bat hasi du zurekin. Egin klik hemen ikusteko:"
-          outro: Ongi etorri plataformara!
+          outro: Gozatu plataforma!
           subject: "%{sender} bidaltzaileak elkarrizketa bat hasi du zurekin"
         new_message:
           greeting: Kaixo, %{recipient}!
           intro: "%{sender} bidaltzaileak elkarrizketan mezu berriak argitaratu ditu. Egin klik hemen ikusteko:"
-          outro: Ongi etorri plataformara!
+          outro: Gozatu plataforma!
           subject: '%{sender} bidaltzailearen mezu berriak dituzu'
       conversations:
         add_conversation_users:
@@ -1307,7 +1307,7 @@ eu:
         daily: Jakinarazpenen eguneroko laburpena
         real_time: Denbora erreala
         weekly: Jakinarazpenen asteko laburpena
-      hello: Kaixo %{name},
+      hello: Kaixo, %{name}
       intro:
         daily: 'Hona hemen aktibitatean oinarritutako azken egunetako jakinarazpenak:'
         real_time: 'Jarraitzen ari zaren jarduerari buruzko jakinarazpena da hau:'
@@ -1473,11 +1473,11 @@ eu:
           how_to_participate: Nola har dezaket parte prozesu batean?
           meetings: Bilerak
           meetings_explanation: Jakin non eta noiz har dezakezun parte bilera publikoetan.
-          more_info: Argibide gehiago honi buruz %{resource_name}
+          more_info: Informazio gehiago %{resource_name} prozesuari buruz
           proposals: Proposamenak
           proposals_explanation: Egin proposamenak, babestu lehendik daudenak, eta sustatu ikusi nahi dituzun aldaketak.
         footer_sub_hero:
-          footer_sub_hero_body_html: Eraiki dezagun gizarte irekiago, gardenago eta kolaboratiboagoa <br /> Lotu, hartu parte eta erabaki.
+          footer_sub_hero_body_html: Eraiki dezagun gizarte irekiagoa, gardenagoa eta kolaboratiboagoa <br /> Lotu, hartu parte eta erabaki.
           footer_sub_hero_headline: Ongi etorri %{organization} erakundearen partaidetzarako plataformara.
           register: Kontu bat sortu
         hero:
@@ -1500,7 +1500,7 @@ eu:
           success: Bikain! Onartu dituzu zerbitzuaren baldintzak.
         form:
           agreement: Ados nago baldintza hauekin
-          legend: Zerbitzuaren baldintzak onartzen ditut
+          legend: Onartu zerbitzuaren baldintzak
         refuse:
           modal_body: Onartzen ez baduzu, ezin izango duzu plataforman parte hartu, <a href="%{download_your_data_path}">zure datuak deskargatu ahal dituzu</a> eta/edo <a href="%{delete_path}">zure kontua ezabatu</a>.
           modal_btn_continue: Onartu baldintzak eta jarraitu
@@ -1585,10 +1585,10 @@ eu:
         details: Xehetasunak
         hello: Kaixo, %{name},
         id: ID
-        participatory_space: Partaidetza-espazioa
+        participatory_space: Espazio parte-hartzailea
         reason: Arrazoia
         report_html: <p>Hurrengo <a href="%{url}"> edukia </a> salatua izan da.</p>
-        see_report: Txostena ikusi
+        see_report: Ikusi txostena
         subject: Eduki bat salatua izan da
     reports:
       create:
@@ -1626,7 +1626,7 @@ eu:
       filters_small_view:
         filter: Iragazi
         filter_and_search: Iragazi eta bilatu
-        filter_by: Iragazi arabera
+        filter_by: Iragazi honen arabera
       results:
         view_all: Ikusi dena (%{count})
     security:
@@ -1655,10 +1655,10 @@ eu:
         description: Eduki hau desegokia da?
         does_not_belong: Bertan badago legez kontrako jardunik, suizidio-mehatxurik, informazio pertsonalik edo beste zernahi, zure ustez %{organization_name}-ri ez dagokionik.
         hide: Ezkutatu
-        hide_content: Edukia ezkutatu
+        hide_content: Ezkutatu edukia
         offensive: Bertan badago arrazakeriarik, sexismorik, irainik, eraso pertsonalik, heriotza-mehatxurik, suizidio-eskaerarik edo beste edozein eratako gorroto-diskurtsorik.
         reason: Arrazoia
-        report: Salatu
+        report: Txostena
         spam: Clickbait, publizitatea, iruzurrak edo script bot-ak ditu.
         title: Salatu eduki desegokia
       flag_user_modal:
@@ -1701,7 +1701,7 @@ eu:
       comments_count: Iruzkinak
       comments_count_tooltip: Espazio honetan dauden iruzkin guztiak.
       followers_count: Jarraitzaileak
-      followers_count_tooltip: Zenbat parte-hartzaileek jarraitzen duten espazio honen parteren bat eguneratuta egoteko.
+      followers_count_tooltip: Zenbat parte-hartzailek jarraitzen duten espazio honen parteren bat eguneratuta egoteko.
       headline: Estatistikak
       likes_count: Likeak
       no_stats: Oraindik ez dago estatistikarik.
@@ -1739,7 +1739,7 @@ eu:
       notify_deprecation_to_owner:
         body_1: '%{organization_name} (e) n duzun taldearen profilari buruzko eguneraketa garrantzitsu baten berri ematera gatozkizu.'
         body_2: 'Zurea bezalako erakundeen esperientzia sinplifikatzeko gure ahaleginen zati gisa, orain arte ezagutzen dugun "Erabiltzaile Taldeak" funtzioa zaharkituta geratuko da. Taldearen profila: <strong>%{name}</strong>, ohiko parte-hartzailearen profil bihurtu da.'
-        body_3: Zure kontuan sartzen jarraitzeko eta sarbidea partekatzeko, pasahitz bat ezartzea behar dugu. Behin ezarrita, saioa hasteko kredentzialak (posta elektronikoa eta pasahitza) edozeinekin parteka ditzakezu.
+        body_3: Zure kontuan sartzen jarraitzeko eta sarbidea partekatzeko, pasahitz bat ezarri behar dizugu. Behin ezarrita, saioa hasteko kredentzialak (posta elektronikoa eta pasahitza) edonorekin parteka ditzakezu.
         greeting: '%{name}, agurgarria:'
         instructions_1: 'Egin klik beheko estekan zure pasahitza ezartzeko:'
         instructions_2: 'Partekatu saioa hasteko kredentzialak (posta elektronikoa: %{email} eta pasahitz berria) zure lankideekin.'
@@ -1789,7 +1789,7 @@ eu:
         version_index: '%{total} en %{index} bertsioa'
     welcome_notification:
       default_body: <p>Kaixo {{name}}, eskerrik asko {{organization}}-era lotzeagatik eta ongi etorria!</p><ul><li>Hemen zer egin dezakezun ideia azkar bat nahi baduzu, begiratu <a href="{{help_url}}">Laguntza</a> atalean.</li><li>Behin irakurri ondoren, zure lehen garaikurra jasoko duzu. Hemen da <a href="{{badges_url}}">garaikur guztien zerrenda</a> zuk lor ditzakezunak {{organization}} ean parte hartuz.</li><li> Azkenik, lotu beste pertsona batzuei eta partekatu haiekin inplikatzearen eta {{organization}} ean parte hartzearen esperientzia. Egin proposamenak, iruzkinak, eztabaidak, pentsatu nola lagundu denon onerako, eman argudioak konbentzitzeko, entzun eta irakurri zeure burua konbentzitzeko, adierazi zure ideiak modu zehatzean, erantzun pazientziaz eta erabakiz, defendatu zure ideiak eta mantendu burua zabalik, beste pertsona batzuen ideietan lankidetzan aritzeko.</li></ul>
-      default_subject: Thanks for joining {{organization}}!
+      default_subject: Eskerrik asko {{organization}} erakundearekin bat egiteagatik!
     wizard_step_form:
       wizard_aside:
         back: Atzera
@@ -1800,7 +1800,7 @@ eu:
     confirmations:
       confirmed: Zure helbide elektronikoa ondo egiaztatu da.
       new:
-        resend_confirmation_instructions: Berrespen-jarraibideak birbidali
+        resend_confirmation_instructions: Birbidali berrespen-jarraibideak
       send_instructions: Jarraibideak azaltzen dituen mezu elektroniko bat jasoko duzu, zure helbide elektronikoa berretsi ahal izateko minutu gutxi barru.
       send_paranoid_instructions: Zure helbide elektronikoa gure datu-basean badago, mezu elektroniko bat jasoko duzu zure helbide elektronikoa minutu gutxi barru baieztatzeko jarraibideekin.
     failure:
@@ -1839,17 +1839,17 @@ eu:
       email_changed:
         greeting: Kaixo %{recipient}!
         message: 'Zuregana jotzen dugu jakinarazteko zure posta elektronikoa aldatu dela honengatik: %{email}.'
-        subject: Helnbide elektronikoa aldatu da
+        subject: Helbide elektronikoa aldatu da
       invitation_instructions:
         accept: Gonbita onartu
         accept_until: 'Gonbidapen hau data honetan iraungiko da: %{due_date}.'
-        decline: Deuseztatu gonbita
+        decline: Baztertu gonbidapena
         hello: Kaixo, %{email},
         ignore: |-
           Gonbidapena onartu nahi ez baduzu, mesedez, ez egin kasurik mezu elektroniko honi. Zure kontua ez da sortuko, goiko estekara sartu eta zure erabiltzaile-izena eta pasahitza ezarri arte.
         invited_you_as_admin: "%{invited_by} admnisitrariak %{application} administratzaile gisa gonbidatu zaitu. Beheko estekan onartu dezakezu."
         invited_you_as_private_user: "%{invited_by} parte-hartzaileak egonbidatu zaitu %{application} ko erabiltzaile pribatu gisa. Beheko estekan onartu dezakezu."
-        someone_invited_you: Norbaitek %{application} gonbidatu zaitu. Beheko estekan onar dezakezu.
+        someone_invited_you: Norbaitek %{application} aplikaziora gonbidatu zaitu. Beheko estekan onar dezakezu.
         someone_invited_you_as_admin: Norbaitek %{application} administratzaile gisa gonbidatu zaitu, beheko estekan onar dezakezu.
         someone_invited_you_as_private_user: Norbaitek %{application} ko parte-hartzaile pribatu gisa gonbidatu zaitu, beheko estekan onar dezakezu.
         subject: Gonbidapenaren argibideak
@@ -1867,14 +1867,14 @@ eu:
         subject: Pasahitza aldatu da
       reset_password_instructions:
         action: Nire pasahitza aldatu
-        greeting: Kaixo %{recipient}!
+        greeting: Kaixo, %{recipient}!
         instruction: Norbaitek esteka bat eskatu du zure pasahitza aldatzeko, eta beheko estekaren bidez egin dezakezu.
         instruction_2: Ez baduzu hori eskatu, ez egin kasurik mezu honi.
         instruction_3: Zure pasahitza ez da aldatuko aurreko estekara sartu eta beste bat sortu arte.
         subject: Berrezarri pasahitzaren argibideak
       unlock_instructions:
         action: Nire kontua desbloqueatu
-        greeting: Kaixo %{recipient}!
+        greeting: Kaixo, %{recipient}!
         instruction: 'Egin klik beheko estekan zure kontua desblokeatzeko:'
         message: Zure kontua blokeatu egin da saiakeretan izandako gehiegizko saio porrokatuengatik.
         subject: Desblokeatu argibideak
@@ -1926,7 +1926,7 @@ eu:
         sign_up: Sortu kontu bat
       minimum_password_length:
         one: "(karaktere bat gutxienez)"
-        other: "(Gutxienez%{count} karaktere)"
+        other: "(%{count} karaktere gutxienez)"
     unlocks:
       new:
         resend_unlock_instructions: Birbidali desblokeatzeko argibideak
@@ -2128,7 +2128,7 @@ eu:
         social_media: Sare Sozialak
         terms_of_service: Zerbitzuaren baldintzak
       header:
-        back: Itzuli
+        back: Atzera
         close: Itxi
         confirm_close_ephemeral_session: Nabigatzeari uzten badiozu, zure behin-behineko saioa itxita egongo da. Hala ere, zure aurrerapen eta jarduera guztiak salbatuko dira. Jarduera amaitu baduzu, egin klik Ok botoian.
         confirm_title_close_ephemeral_session: Orri honetatik irten baino lehen…
diff --git a/decidim-core/config/locales/fi-plain.yml b/decidim-core/config/locales/fi-plain.yml
index 3bb7c814c11ca..62d14ca7584b8 100644
--- a/decidim-core/config/locales/fi-plain.yml
+++ b/decidim-core/config/locales/fi-plain.yml
@@ -421,10 +421,6 @@ fi-pl:
       withdraw:
         error: Muutoksen peruminen epäonnistui.
         success: Muutos on peruutettu.
-      wizard_step_form:
-        steps:
-          '1': Luo muutos
-          '2': Julkaise muutoksesi
     anonymous_user: Anonyymi
     application:
       document:
diff --git a/decidim-core/config/locales/fi.yml b/decidim-core/config/locales/fi.yml
index 9b3c73e9760a2..29264d8834e64 100644
--- a/decidim-core/config/locales/fi.yml
+++ b/decidim-core/config/locales/fi.yml
@@ -424,7 +424,7 @@ fi:
       wizard_step_form:
         steps:
           '1': Luo muutos
-          '2': Julkaise muutoksesi
+          '2': Julkaise muutos
     anonymous_user: Anonyymi
     application:
       document:
@@ -1340,6 +1340,7 @@ fi:
         own_activity: Oma toiminta, kuten omia ehdotuksia koskevat kommentit tai maininnat
         push_notifications: Push-ilmoitukset
         push_notifications_reminder: Mikäli haluat vastaanottaa push-ilmoituksia alustalta, sinun on sallittava ne ensin selaimesi asetuksista tälle sivustolle.
+        push_notifications_unsupported_browser: Selaimesi ei ole tuettu.
         receive_notifications_about: Haluan saada ilmoituksia
         update_notifications_settings: Tallenna muutokset
       update:
diff --git a/decidim-core/config/locales/gl.yml b/decidim-core/config/locales/gl.yml
index c98b3d51bf898..53b973e249d63 100644
--- a/decidim-core/config/locales/gl.yml
+++ b/decidim-core/config/locales/gl.yml
@@ -161,9 +161,6 @@ gl:
         back: De volta
         heading: Revisa a modificación
         send: Aceptar a emenda
-      wizard_step_form:
-        steps:
-          '1': Crea a túa emenda
     anonymous_user: Anónimo
     application:
       documents:
diff --git a/decidim-core/config/locales/hu.yml b/decidim-core/config/locales/hu.yml
index d3521ffde7333..e13ad8e7a3444 100644
--- a/decidim-core/config/locales/hu.yml
+++ b/decidim-core/config/locales/hu.yml
@@ -299,9 +299,6 @@ hu:
         success: A módosító javaslat sikeresen frissítve.
       withdraw:
         success: A módosítás visszavonása sikeres.
-      wizard_step_form:
-        steps:
-          '1': Készítse el a módosítását
     anonymous_user: Névtelen
     application:
       document:
diff --git a/decidim-core/config/locales/id-ID.yml b/decidim-core/config/locales/id-ID.yml
index ba8da56c66106..752167635d9b9 100644
--- a/decidim-core/config/locales/id-ID.yml
+++ b/decidim-core/config/locales/id-ID.yml
@@ -148,9 +148,6 @@ id:
         back: Kembali
         heading: Tinjau amandemennya
         send: Terima amandemen
-      wizard_step_form:
-        steps:
-          '1': Buat amandemen Anda
     anonymous_user: Anonim
     application:
       documents:
diff --git a/decidim-core/config/locales/it.yml b/decidim-core/config/locales/it.yml
index ccdb24783bb89..e93c6ab0ecc88 100644
--- a/decidim-core/config/locales/it.yml
+++ b/decidim-core/config/locales/it.yml
@@ -328,7 +328,7 @@ it:
         success: Bozza emendamento aggiornata correttamente.
       wizard_step_form:
         steps:
-          '1': Crea il tuo emendamento
+          '2': Pubblica la tua rettifica
     anonymous_user: Anonimo
     application:
       document:
diff --git a/decidim-core/config/locales/ja.yml b/decidim-core/config/locales/ja.yml
index 63ecb18a8b58f..65b76290c96a3 100644
--- a/decidim-core/config/locales/ja.yml
+++ b/decidim-core/config/locales/ja.yml
@@ -407,10 +407,6 @@ ja:
       withdraw:
         error: 修正案の取り消し中に問題がありました。
         success: 修正を撤回しました。
-      wizard_step_form:
-        steps:
-          '1': 修正を作成する
-          '2': 修正を公開
     anonymous_user: 匿名です
     application:
       document:
diff --git a/decidim-core/config/locales/lb.yml b/decidim-core/config/locales/lb.yml
index 55630a591892a..b9843012b7bde 100644
--- a/decidim-core/config/locales/lb.yml
+++ b/decidim-core/config/locales/lb.yml
@@ -202,9 +202,6 @@ lb:
       update_draft:
         error: Et gouf e Problem beim Aktualiséieren vum Ännerungsvirschlag.
         success: Ännerungsvirschlag gouf aktualiséiert.
-      wizard_step_form:
-        steps:
-          '1': Erstell deng Ännerung
     anonymous_user: Anonym
     application:
       document:
diff --git a/decidim-core/config/locales/lt.yml b/decidim-core/config/locales/lt.yml
index a5a2f905cefbb..230dc0948dcb6 100644
--- a/decidim-core/config/locales/lt.yml
+++ b/decidim-core/config/locales/lt.yml
@@ -351,9 +351,6 @@ lt:
         success: Pataisos juodraštis sėkmingai atnaujintas.
       withdraw:
         success: Pataisa sėkmingai atsiimta.
-      wizard_step_form:
-        steps:
-          '1': Sukurkite savo pataisą
     anonymous_user: Anonimas
     application:
       document:
diff --git a/decidim-core/config/locales/lv.yml b/decidim-core/config/locales/lv.yml
index 97ecf79ef74d8..ca535e01f6ee6 100644
--- a/decidim-core/config/locales/lv.yml
+++ b/decidim-core/config/locales/lv.yml
@@ -182,9 +182,6 @@ lv:
       update_draft:
         error: Grozījuma melnraksta atjaunināšanas laikā radās kļūda.
         success: Grozījuma melnraksts ir veiksmīgi atjaunināts.
-      wizard_step_form:
-        steps:
-          '1': Izveidot savu grozījumu
     anonymous_user: Anonīms
     application:
       document:
diff --git a/decidim-core/config/locales/nl.yml b/decidim-core/config/locales/nl.yml
index 01229d95a14ee..8a3794ad74285 100644
--- a/decidim-core/config/locales/nl.yml
+++ b/decidim-core/config/locales/nl.yml
@@ -206,9 +206,6 @@ nl:
       update_draft:
         error: Er is een fout opgetreden bij het bijwerken van dit amendement.
         success: Amendement ontwerp is succesvol bijgewerkt.
-      wizard_step_form:
-        steps:
-          '1': Maak uw amendement
     anonymous_user: Anoniem
     application:
       document:
diff --git a/decidim-core/config/locales/no.yml b/decidim-core/config/locales/no.yml
index ba800cfc92924..de5305e2ded1e 100644
--- a/decidim-core/config/locales/no.yml
+++ b/decidim-core/config/locales/no.yml
@@ -209,9 +209,6 @@
       update_draft:
         error: Det oppsto et problem med å oppdatere endrings utkastet.
         success: Endrings utkastet ble oppdatert.
-      wizard_step_form:
-        steps:
-          '1': Opprett endringen din
     anonymous_user: Anonym
     application:
       document:
diff --git a/decidim-core/config/locales/pl.yml b/decidim-core/config/locales/pl.yml
index fdfea07045047..692bdbc0a96a4 100644
--- a/decidim-core/config/locales/pl.yml
+++ b/decidim-core/config/locales/pl.yml
@@ -320,10 +320,6 @@ pl:
         success: Szkic poprawki został pomyślnie zaktualizowany.
       withdraw:
         success: Poprawka została pomyślnie wycofana.
-      wizard_step_form:
-        steps:
-          '1': Utwórz poprawkę
-          '2': Opublikuj poprawkę
     anonymous_user: Anonim
     application:
       document:
diff --git a/decidim-core/config/locales/pt-BR.yml b/decidim-core/config/locales/pt-BR.yml
index 4bbb5f8f687e6..75237e2b64fe0 100644
--- a/decidim-core/config/locales/pt-BR.yml
+++ b/decidim-core/config/locales/pt-BR.yml
@@ -421,10 +421,6 @@ pt-BR:
       withdraw:
         error: Houve um problema ao retirar a emenda.
         success: A emenda foi retirada com sucesso.
-      wizard_step_form:
-        steps:
-          '1': Crie sua emenda
-          '2': Publique sua emenda
     anonymous_user: Anônimo
     application:
       document:
diff --git a/decidim-core/config/locales/pt.yml b/decidim-core/config/locales/pt.yml
index ce76be57481d4..ea1e8bc34157b 100644
--- a/decidim-core/config/locales/pt.yml
+++ b/decidim-core/config/locales/pt.yml
@@ -202,9 +202,6 @@ pt:
       update_draft:
         error: Ocorreu um problema ao atualizar o rascunho da modificação.
         success: Rascunho da modificação atualizado corretamente.
-      wizard_step_form:
-        steps:
-          '1': Criar a sua modificação
     anonymous_user: Anônimo
     application:
       document:
diff --git a/decidim-core/config/locales/ro-RO.yml b/decidim-core/config/locales/ro-RO.yml
index 78b1c43cb9dcc..e711f69131533 100644
--- a/decidim-core/config/locales/ro-RO.yml
+++ b/decidim-core/config/locales/ro-RO.yml
@@ -432,10 +432,6 @@ ro:
       withdraw:
         error: A apărut o eroare la retragerea amendamentului.
         success: Amendamentul a fost retras cu succes.
-      wizard_step_form:
-        steps:
-          '1': Creeați un amendament
-          '2': Publicați amendamentul
     anonymous_user: Anonim
     application:
       document:
diff --git a/decidim-core/config/locales/sk.yml b/decidim-core/config/locales/sk.yml
index ad83c442864f8..335b0ab9b5a6d 100644
--- a/decidim-core/config/locales/sk.yml
+++ b/decidim-core/config/locales/sk.yml
@@ -446,10 +446,6 @@ sk:
       withdraw:
         error: Pri sťahovaní pozmeňujúceho návrhu sa vyskytol problém.
         success: Pozmeňujúci návrh bol úspešne stiahnutý.
-      wizard_step_form:
-        steps:
-          '1': Vytvorte svoj pozmeňovací návrh
-          '2': Zverejnite svoj pozmeňujúci návrh
     anonymous_user: Anonymné
     application:
       document:
diff --git a/decidim-core/config/locales/sv.yml b/decidim-core/config/locales/sv.yml
index 5a3ca695355da..dcc8bf58b635b 100644
--- a/decidim-core/config/locales/sv.yml
+++ b/decidim-core/config/locales/sv.yml
@@ -422,8 +422,8 @@ sv:
         success: Ändringsförslaget har dragits tillbaka.
       wizard_step_form:
         steps:
-          '1': Skapa ändringsförslag
-          '2': Publicera ditt ändringsförslag
+          '1': Skapa din korrigering
+          '2': Publicera din korrigering
     anonymous_user: Anonym
     application:
       document:
diff --git a/decidim-core/config/locales/tr-TR.yml b/decidim-core/config/locales/tr-TR.yml
index a984ce59b047f..c85beb1aa8ff4 100644
--- a/decidim-core/config/locales/tr-TR.yml
+++ b/decidim-core/config/locales/tr-TR.yml
@@ -202,10 +202,6 @@ tr:
       update_draft:
         error: Değişiklik taslağı güncellenirken bir hata oluştu.
         success: Değişiklik taslağı başarıyla güncellendi.
-      wizard_step_form:
-        steps:
-          '1': Değişikliğinizi oluşturun
-          '2': Değişikliğinizi yayınlayın
     anonymous_user: Anonim
     application:
       document:
diff --git a/decidim-core/config/locales/zh-CN.yml b/decidim-core/config/locales/zh-CN.yml
index 79969e3b9578f..dd0e8d0c5ca33 100644
--- a/decidim-core/config/locales/zh-CN.yml
+++ b/decidim-core/config/locales/zh-CN.yml
@@ -176,9 +176,6 @@ zh-CN:
       update_draft:
         error: 更新修正草案时遇到问题。
         success: 修正草稿已成功更新。
-      wizard_step_form:
-        steps:
-          '1': 创建您的修改
     anonymous_user: 匿名的
     application:
       document:
diff --git a/decidim-core/config/locales/zh-TW.yml b/decidim-core/config/locales/zh-TW.yml
index 8507c4ca6e6d1..cf9040d0c1c36 100644
--- a/decidim-core/config/locales/zh-TW.yml
+++ b/decidim-core/config/locales/zh-TW.yml
@@ -293,9 +293,6 @@ zh-TW:
         success: 修正案草稿成功更新。
       withdraw:
         success: 修正案已成功撤回.
-      wizard_step_form:
-        steps:
-          '1': 創建您的修正案
     anonymous_user: 匿名
     application:
       document:
diff --git a/decidim-debates/config/locales/eu.yml b/decidim-debates/config/locales/eu.yml
index a0be6f43cb71a..09541480c9437 100644
--- a/decidim-debates/config/locales/eu.yml
+++ b/decidim-debates/config/locales/eu.yml
@@ -9,7 +9,7 @@ eu:
         end_time: Bukaera-data
         information_updates: Informazioaren eguneratzeak
         instructions: Parte hartzeko argibideak
-        start_time: Hasi da
+        start_time: Hasiera-data
         title: Izenburua
     models:
       decidim/debates/close_debate_event: Eztabaida itxita
@@ -95,7 +95,7 @@ eu:
             title: Beste eztabaida bat
           update:
             invalid: Arazo bat egon da eztabaida hau eguneratzean.
-            success: Debate arrakastaz eguneratu da.
+            success: Eztabaida zuzen eguneratu da.
         exports:
           debate_comments: Iruzkinak
           debates: Eztabaidak
@@ -126,7 +126,7 @@ eu:
             other: "%{count} eztabaida"
         create:
           invalid: Arazo bat egon da eztabaida sortzean.
-          success: Debate sortu da behar bezala.
+          success: Eztabaida zuzen eguneratu da.
         debates:
           empty: Oraindik ez dago eztabaidarik.
           empty_filters: Ez dago irizpide hau duen eztabaidarik.
@@ -138,7 +138,7 @@ eu:
           activity: Nire jarduera
           all: Guztiak
           category: Kategoria
-          category_prompt: Kategoria bat aukeratu
+          category_prompt: Hautatu kategoria bat
           commented: Iruzkina eginda
           my_debates: Nire eztabaidak
           official: Ofiziala
@@ -176,15 +176,15 @@ eu:
           success: Eztabaida zuzen eguneratu da.
       last_activity:
         debate_updated: 'Eztabaida eguneratu da:'
-        new_debate: 'Eztabaida berria:'
+        new_debate: 'Beste eztabaida bat:'
       models:
         debate:
           fields:
             end: Amaiera
-            end_time: Amaiera data
-            official_debate: Ofizial eztabaida
+            end_time: Amaiera-data
+            official_debate: Eztabaida ofiziala
             start: Hasi
-            start_time: Hasiera data
+            start_time: Hasiera-data
             taxonomies: Taxonomiak
             title: Izenburua
     download_your_data:
diff --git a/decidim-dev/config/locales/eu.yml b/decidim-dev/config/locales/eu.yml
index ef8bd9c965904..6e50998ec4675 100644
--- a/decidim-dev/config/locales/eu.yml
+++ b/decidim-dev/config/locales/eu.yml
@@ -59,7 +59,7 @@ eu:
           name: Probak
           next_level_in: Sortu %{score} proba gehiago hurrengo mailara iristeko!
           unearned_another: Parte-hartzaile honek oraindik ez du inkestarik sortu.
-          unearned_own: Oraindik ez duzu probak sortu.
+          unearned_own: Oraindik ez duzu probarik sortu.
     resource_links:
       test_link:
         dummy_resource_dummy: ' Honekin lotutako proba'
diff --git a/decidim-elections/config/locales/eu.yml b/decidim-elections/config/locales/eu.yml
index 175fd7ecc63af..4caab5a1c619a 100644
--- a/decidim-elections/config/locales/eu.yml
+++ b/decidim-elections/config/locales/eu.yml
@@ -42,7 +42,7 @@ eu:
         new: Beste hauteskunde bat
         preview: Aurrebistaratu
         title: Ekintzak
-        view: Hauteskundeak ikusi
+        view: Ikusi hauteskundeak
         view_deleted_elections: Ikusi ezabatutako hauteskundeak
       admin:
         census:
diff --git a/decidim-forms/config/locales/eu.yml b/decidim-forms/config/locales/eu.yml
index afc94eaa0324e..42f749111033e 100644
--- a/decidim-forms/config/locales/eu.yml
+++ b/decidim-forms/config/locales/eu.yml
@@ -140,7 +140,7 @@ eu:
             remove: Kendu
             separator: Bereizlea
           title_and_description:
-            collapse: Tolestu
+            collapse: Kolapsoa
             description: Deskribapena
             expand: Zabaldu
             remove: Kendu
diff --git a/decidim-initiatives/config/locales/eu.yml b/decidim-initiatives/config/locales/eu.yml
index 148bdb4864c94..77700ee6a8409 100644
--- a/decidim-initiatives/config/locales/eu.yml
+++ b/decidim-initiatives/config/locales/eu.yml
@@ -38,7 +38,7 @@ eu:
         extra_fields_legal_information: Datu pertsonalen bilketari buruzko informazio juridikoa
         minimum_committee_members: Batzorde kideen gutxienekoa
         online_signature_enabled: Sinadura elektronikoa gaituta
-        only_global_scope_enabled: Eremu globaleko ekimenak soilik sortzeko aukera ematea
+        only_global_scope_enabled: Baimendu soilik esparru globaleko ekimenak sortzea
         promoting_committee_enabled: Gaitu batzorde sustatzailea
         signature_type: Sinadura mota
         title: Izenburua
@@ -141,18 +141,18 @@ eu:
         initiatives_votes:
           fields:
             date_and_time: Data eta ordua
-            date_of_birth: Jaioteguna
+            date_of_birth: Jaiotze-data
             document_number: Dokumentuaren zenbakia
             hash: Hash
-            initiative_end_date: Amaiera data
+            initiative_end_date: Amaiera-data
             initiative_id: Ekimenaren ID-a
             initiative_scope: Eremua
             initiative_signatures_count: Sinadura kopurua
-            initiative_start_date: Hasiera data
+            initiative_start_date: Hasiera-data
             initiative_title: Ekimenaren izenburua
-            name_and_surname: Izena eta abizena
+            name_and_surname: Izen-abizenak
             nickname: Ezizena
-            postal_code: Posta kodea
+            postal_code: Posta-kodea
             signature_count: Sinaduren zenbaketa
             timestamp: Denbora-marka
       taxonomy_filters:
@@ -228,9 +228,9 @@ eu:
           info_initiative:
             created_at: Noiz sortua
             description: Deskribapena
-            initiative_votes_count: Babesen zenbaketa
+            initiative_votes_count: Botoen zenbaketa
             initiatives: Ekimenak
-            state: Estatu
+            state: Egoera
         committee_requests:
           index:
             approve: Onartu
@@ -261,11 +261,11 @@ eu:
             accept: Onartu ekimena
             confirm: Ziur zaude?
             confirm_send_to_technical_validation: Ziur zaude?
-            discard: Ekimena baztertu
+            discard: Kendu ekimena
             export_pdf_signatures: Esportatu sinaduren PDF fitxetagia
             export_votes: Esportatu sinadurak
             reject: Ekimena ukatu
-            send_to_technical_validation: Baliozkotze teknikorako bidali
+            send_to_technical_validation: Bidali balidazio teknikora
             success: Ekimena baliozkotze teknikora bidali da.
             update: Eguneratu
           form:
@@ -361,7 +361,7 @@ eu:
           all: Guztiak
           answered: Erantzunda
           closed: Itxita
-          open: Open
+          open: Irekita
           rejected: Ez ditu lortu beharrezko sinadurak
         filter_type_values:
           all: Guztiak
@@ -399,7 +399,7 @@ eu:
           go_to_initiatives: Ekimenetara joan
           publish_helper_text_html: "Gogoan izan zure ekimena argitaratzeko teknikoki baliozkotu behar dela, administratzaile batek berrikus dezan.\n"
         previous_form:
-          back: Back
+          back: Atzera
         promotal_committee:
           individual_help_text: Zure ekimena sortu da, eta zirriborro gisa gorde da. Orain jendea gehitu behar zaio batzorde sustatzaileari.
           invite_link_title: Jendea gonbidatzeko esteka
@@ -409,7 +409,7 @@ eu:
         return_to_initiatives_button:
           return_initiatives_html: Oraingoz, joan eta <a href="%{initiatives_path}">itzuli ekimenetara</a>
         select_initiative_type:
-          back: Back
+          back: Atzera
           choose_html: <strong>%{title}</strong>bat sortu nahi dut
           consult_existing_initiatives: Lehendik dauden ekimenak konsultatu
           continue: Jarraitu
@@ -492,7 +492,7 @@ eu:
           invalid_authorization: Ekintzari ekiteko emandako datuak ez dira bateragarriak zure baimenekin edo baimen berri bat lortu behar duzu.
           invalid_data: Zure nortasuna egiaztatzeko emandako datu pertsonal batzuk ez dira baliozkoak.
         finish:
-          back_to_initiative: Ekimenera itzuli
+          back_to_initiative: Itzuli ekimenera
           title: Ekimena sinatu duzu
         sms_phone_number:
           confirmed_data: Zure datuak baieztatu dituzu.
@@ -549,7 +549,7 @@ eu:
           most_commented: Iruzkin gehien dutenak
           most_voted: Sinadura gehien dutenak
           random: Random
-          recent: Berrienetatik zaharrenetara
+          recent: Azkenak
           recently_published: Oraintsu argitaratutakoa
         pending_initiatives:
           description: Ekimen horiek oraindik ez dira publikoak. Berrikus itzazue, mesedez, eta balioztatze teknikorako aurkez itzazue, argitara eman daitezen.
@@ -598,7 +598,7 @@ eu:
           votes_blocked: Sinadura desgaituta dago
         votes_count:
           count:
-            one: SIGNATURE
+            one: Sinadura
             other: Sinadurak
       initiatives_mailer:
         creation_subject: Zure '%{title}'ekimena sortu egin da
diff --git a/decidim-meetings/config/locales/eu.yml b/decidim-meetings/config/locales/eu.yml
index 09a20b15f2642..3565556a43af7 100644
--- a/decidim-meetings/config/locales/eu.yml
+++ b/decidim-meetings/config/locales/eu.yml
@@ -18,7 +18,7 @@ eu:
         decidim_category_id: Kategoria
         decidim_scope_id: Eremua
         description: Deskribapena
-        end_time: Bukaera ordua
+        end_time: Amaiera-ordua
         id: ID
         iframe_access_level: Iframe sarbide-maila
         iframe_embed_type: Txertatutako iframe mota
@@ -36,7 +36,7 @@ eu:
         registration_url: Izena ematearen URLa
         registrations_enabled: Izen-emateak gaituta
         reserved_slots: Erreserbatuta dauden plazak
-        start_time: Hasiera ordua
+        start_time: Hasiera-ordua
         title: Titulua
         transparent: Gardena
         type_of_meeting: Mota
@@ -102,7 +102,7 @@ eu:
         accepted_at_not_null:
           label: Onartua
           values:
-            'false': Ez onartuta
+            'false': Ez onartua
             'true': Onartua
         meetings:
           closed_at_present:
@@ -221,7 +221,7 @@ eu:
             email_subject: '"%{resource_title}" topaketa itxi egin da'
             notification_title: <a href="%{resource_path}">%{resource_title}</a> topaketa itxi egin da.
         meeting_created:
-          button_text: Eman izena topaketan
+          button_text: Eman izena bileran
           email_intro: '"%{resource_title}" topaketa jarraitzen duzun "%{participatory_space_title}" espazioan gehitu da.'
           email_outro: Jakinarazpen hau jaso duzu "%{participatory_space_title}" prozesua jarraitzen ari zarelako. Aureko estekan utzi ahal diozu jarraitzeari.
           email_subject: 'Beste topaketa bat gehituta honi: %{participatory_space_title}'
@@ -306,13 +306,13 @@ eu:
             add_agenda_item_child: Gai-zerrendan azpi-gai bat gehitu
             agenda_item: Gai zerrendaren gaia
             agenda_item_children: Gai zerrenda azpi gaiak
-            down: Behera
-            remove: Kendu
+            down: Jaitsi
+            remove: Ezabatu
             up: Gora
           agenda_item_child:
             agenda_item_child: Gai zerrenda azpi-gaia
             down: Behera
-            remove: Kendu
+            remove: Ezabatu
             up: Gora
           create:
             invalid: Arazo bat egon da gai-zerrenda hau sortzean.
@@ -503,7 +503,7 @@ eu:
         copy_calendar_url: Kopiatu
         copy_calendar_url_clarification: Kopiatu URL egutegia arbelera
         copy_calendar_url_copied: Kopiatuta!
-        copy_calendar_url_description: Argitaratutako batzar guztiak zure egutegi-aplikazioan edo hornitzailean ikus ditzakezu. Kopiatu eta itsatsi URL hau "Egutegi berria gehitu URL batetik" aukera erabiliz
+        copy_calendar_url_description: Argitaratutako batzar guztiak zure egutegi-aplikazioan edo hornitzailean ikus ditzakezu. Kopiatu eta itsatsi URL hau "Gehitu egutegi berria URL batetik" aukera erabiliz.
         copy_calendar_url_explanation: Mesedez, kontuan izan aukeratutako topaketa multzo bat esportatzen ari zarela eta iragazkiak aktibatuta daudela. Denak esportatu nahi badituzu, lehenengo kendu irakazkiak.
         copy_calendar_url_message: URL hau zuzen kopiatu da zure arbelean.
         export_calendar: Egutegia esportatu
@@ -593,7 +593,7 @@ eu:
             online: On-line
         form:
           address_help: 'Helbidea: Geocoderrek erabilia kokapena aurkitzeko'
-          available_slots_help: Déjalo a 0 si tienes espacio ilimitado disponible
+          available_slots_help: Uzti 0an erabiltzeko espazio mugatua baduzu
           disclaimer: 'Erantzukizun-deskargua: Kanpoko inskripzio-sistema bat erabiliz, onartzen duzu %{organization} ko antolatzaileak ez direla kanpo-zerbitzuko parte-hartzaileek emandako datuen erantzule.'
           iframe_embed_type_html: 'Zerbitzu gutxi batzuek baino ez dute uzten topaketan edo zuzeneko gertakarietan txertatzen honako domeinu hauetatik:%{domains}'
           location_help: 'Kokapena: mezua parte-hartzaileei zuzendua biltzeko lekua adieraziz'
@@ -613,7 +613,7 @@ eu:
           close_meeting: Itxi
           edit_close_meeting: Editatu topaketaren txostena
           edit_meeting: Editatu
-          join_meeting: Izena eman
+          join_meeting: Izena eman topaketan
           reply_poll: Erantzun inkesta
           view_poll: Ikusi inkesta
         meetings:
@@ -629,7 +629,7 @@ eu:
         show:
           attendees: Bertaratuen kopurua
           contributions: Ekarpen-kopurua
-          join: Izena eman
+          join: Eman izena
           join_waitlist: Sartu itxarote-zerrendan
           leave: Baliogabetu zure izen-ematea
           leave_confirmation: Ziur zaude topaketa honetarako zure izen-ematea indargabetu nahi duzula?
diff --git a/decidim-pages/config/locales/eu.yml b/decidim-pages/config/locales/eu.yml
index bdb6f47a97a28..0e8ff3fd8cf10 100644
--- a/decidim-pages/config/locales/eu.yml
+++ b/decidim-pages/config/locales/eu.yml
@@ -3,7 +3,7 @@ eu:
   activerecord:
     models:
       decidim/pages/page:
-        one: Orrialde
+        one: Orrialdea
         other: Orrialdeak
   decidim:
     admin_log:
@@ -32,7 +32,7 @@ eu:
       admin:
         models:
           components:
-            body: Testua
+            body: Gorputza
         pages:
           edit:
             save: Eguneratu
diff --git a/decidim-participatory_processes/config/locales/ca.yml b/decidim-participatory_processes/config/locales/ca.yml
index 9f7285006d0ae..a6f2a13458a43 100644
--- a/decidim-participatory_processes/config/locales/ca.yml
+++ b/decidim-participatory_processes/config/locales/ca.yml
@@ -109,7 +109,7 @@ ca:
         participatory_process_groups: Grups de processos
         participatory_process_groups_submenu:
           info: Quant a aquest grup de processos
-          landing_page: Disposició de la pàgina de destinació
+          landing_page: Disposició de la pàgina d'inici
         participatory_processes: Processos
         participatory_processes_submenu:
           attachment_collections: Carpetes
@@ -117,7 +117,7 @@ ca:
           attachments: Adjunts
           components: Components
           info: Quant a aquest procés
-          landing_page: Disposició de la pàgina de destinació
+          landing_page: Disposició de la pàgina d'inici
           moderations: Moderacions
           private_users: Membres
           process_admins: Administradores del procés
diff --git a/decidim-participatory_processes/config/locales/eu.yml b/decidim-participatory_processes/config/locales/eu.yml
index 5bb351acf3040..ade3e1f881eee 100644
--- a/decidim-participatory_processes/config/locales/eu.yml
+++ b/decidim-participatory_processes/config/locales/eu.yml
@@ -33,7 +33,7 @@ eu:
         slug: URL laburra
         start_date: Hasiera-data
         subtitle: Azpititulua
-        target: Nork parte hartzen duen
+        target: Nork hartzen du parte
         title: Izenburua
         weight: Ordena
       participatory_process_group:
@@ -80,7 +80,7 @@ eu:
         one: Partaidetza-prozesuaren taldea
         other: Partaidetza-prozesuen taldeak
       decidim/participatory_process_step:
-        one: Step
+        one: Urratsa
         other: Faseak
   decidim:
     admin:
@@ -88,7 +88,7 @@ eu:
         activate: Aktibatu
         confirm_delete_process: Ziur zaude prozesu hau ezabatu nahi duzula? Iritziz aldatzen baduzu, geroago berreskuratu ahal izango duzu.
         confirm_destroy: Berretsi ezabatu
-        destroy: ezabatu
+        destroy: Ezabatu
         duplicate: Bikoiztu
         edit: Editatu
         import_process: Inportatu
@@ -99,9 +99,9 @@ eu:
         preview: Aurreikusi
         publish: Argitaratu
         resend_invitation: Birbidali gonbita
-        see_process: Ikusi prozesuak
+        see_process: Prozesua ikusi
         unpublish: Despublikatu
-        view_deleted_processes: Ikusi ezabatutako prozesuak
+        view_deleted_processes: Ezabatutako prozesuak ikusi
       filters:
         decidim_participatory_process_group_id_eq:
           label: Prozesu-taldeen arabera
@@ -121,7 +121,7 @@ eu:
           moderations: Moderazioak
           private_users: Kideak
           process_admins: Prozesuaren parte-hartzaileak
-          steps: Prozesuaren faseak
+          steps: Urratsak
       models:
         participatory_process:
           fields:
@@ -218,7 +218,7 @@ eu:
           title: Editatu prozesu parte-hartzailearen fasea
           update: Eguneratu
         index:
-          steps_title: Prozesuaren faseak
+          steps_title: Urratsak
         new:
           create: Sortu
           title: Prozesu parte-hartzailearen beste fase bat
@@ -383,8 +383,8 @@ eu:
         extra_data:
           developer_group: Honek sustatuta
           name: Metadatuak
-          participatory_scope: Erabakitzen dena
-          participatory_structure: Erabakitzeko era
+          participatory_scope: Zer erabakitzen den
+          participatory_structure: Nola erabakitzen den
           target: Nork hartzen du parte
         html:
           name: HTML blokea
@@ -400,7 +400,7 @@ eu:
           active: Partaidetza-prozesu aktiboak
           name: Partaidetza-prozesuak
         stats:
-          name: Jarduera
+          name: Estatistikak
         title:
           meta_scope: Eremua
           participatory_processes:
@@ -561,7 +561,7 @@ eu:
               citizen_influence: Herritarren eragina
               citizen_influence_tooltip: Parte-hartzaileen eragina erabakiak hartzean neurtzen du.
               inclusiveness: Inklusibotasuna
-              inclusiveness_tooltip: Interesatu desberdinek bidezko ordezkaritza duten ebaluatzen du.
+              inclusiveness_tooltip: Hainbat alderdi interesatuk ordezkaritza nahikoa duten ebaluatzen du.
               informativeness: Informatiboa
               informativeness_tooltip: Prozesuaren barruan emandako argitasun- eta informazio-maila neurtzen du.
             name: Autoebaluazioaren metrikak
diff --git a/decidim-proposals/config/locales/eu.yml b/decidim-proposals/config/locales/eu.yml
index da502c0d20194..d3ac0892a2a72 100644
--- a/decidim-proposals/config/locales/eu.yml
+++ b/decidim-proposals/config/locales/eu.yml
@@ -19,7 +19,7 @@ eu:
         address: Helbidea
         answer: Erantzuna
         answered_at: '-k erantzuna'
-        body: Testua
+        body: Gorputza
         decidim_proposals_proposal_state_id: Egoera
         decidim_scope_id: Eremua
         has_address: Helbidea du
@@ -53,7 +53,7 @@ eu:
         file: Fitxategia
       proposals_import:
         import_proposals: Proposamenak inportatu
-        keep_answers: Egoera-orriak eta erantzunak mantendu
+        keep_answers: Mantendu egoera eta erantzunak
         keep_authors: Mantendu jatorrizko egileak
     errors:
       models:
@@ -394,7 +394,7 @@ eu:
           description: Garaikur hau proposamen berriekin aktiboki parte hartzen duzunean eta horiek onartzen direnean ematen da 
           description_another: Parte-hartzaile honek %{score} proposamen onartu ditu.
           description_own: Zure %{score} proposamen onartu dira.
-          name: Onartutako proposamenak
+          name: Proposamen onartuak
           next_level_in: Lortu %{score} proposamen gehiago onartuak izatea hurrengo mailara igotzeko!
           unearned_another: Parte-hartzaile honek ez du oraindik lortu bere proposamen bat ere onartua izatea.
           unearned_own: Oraindik ez duzu onartutako proposamenik.
@@ -452,7 +452,7 @@ eu:
           id: Proposamenaren identifikatzaile bakarra
           is_amend: Proposamen honek beste proposamen bat dakarren
           latitude: Proposamenaren latitudea, baldin eta kokagune fisikoa badu
-          likes: Proposamen honek duen atxikimendu ("like") kopurua
+          likes: Proposamen honek duen atxikimendu kopurua
           longitude: Proposamenaren luzera, baldin eta kokagune fisikoa badu
           meeting_urls: Proposamen hau aurkeztu edo eztabaidatu zen bileretako URLak
           original_proposal: Hasierako proposamenaren erreferentzia, zuzenketa bat bada
@@ -484,7 +484,7 @@ eu:
         import: Inportatu proposamenak beste osagai batetik
         mark_as_coauthor: Markatu egilekide gisa
         mark_as_coauthor_confirm: Ziur zaude parte-hartzaile hau egilekide gisa markatu nahi duzula? Parte-hartzaileak jakinarazpena jasoko du gonbidapena onartzeko edo baztertzeko.
-        new: Proposamen berria
+        new: Beste proposamen bat
         new_proposal_state: Beste egoera bat
         participatory_texts: Testu parte-hartzaileak
         show: Ikusi proposamena
@@ -637,7 +637,7 @@ eu:
             assign_to_evaluator_button: Esleitu
             cancel: Utzi
             change_taxonomies: Aldatu taxonomiak
-            merge: Beste batean fusionatu
+            merge: Bat egin berri batekin
             merge_button: Sortu
             no_templates_available: Ez dago txantiloirik eskuragarri
             publish: Argitaratu
@@ -663,13 +663,13 @@ eu:
           show:
             amendments_count: Zuzenketa kopurua
             assigned_evaluators: Ebaluatzaileak esleituta
-            body: Testua
+            body: Gorputza
             comments_count: Iruzkin kopurua
             documents: Dokumentuak
             evaluators: Ebaluatzaileak
             likes: Likeak
             likes_count: Like kopurua
-            link: Ikusi proposamena
+            link: Proposamena ikusi
             n_more_likes:
               one: eta 1 gehiago
               other: eta %{count} gehiago
@@ -715,11 +715,11 @@ eu:
           answer: "%{user_name} parte-hartzaileak %{resource_name} %{space_name} espazioko proposamenari erantzun dio"
           create: "%{user_name} parte-hartzaileak sortu zuen %{resource_name} proposamena %{space_name} esparruko %{merged_count} proposamenen bat egitetik"
           publish_answer: "%{user_name} parte-hartzaileak argitaratu du %{resource_name} proposamenaren erantzuna %{space_name} espazioan"
-          restore: "%{user_name} parte-hartzailea berreskuratu du %{resource_name} proposamena %{space_name} espazioan"
-          soft_delete: "%{user_name} parte-hartzailea eraman du %{resource_name} proposamena %{space_name} espaziora"
+          restore: "%{user_name} parte-hartzaileak berreskuratu du %{resource_name} osagaia %{space_name} espazioan"
+          soft_delete: "%{user_name} parte-hartzaileak berreskuratu du %{resource_name} proposamena %{space_name} espazioan"
           update: "%{user_name} parte-hartzaileak %{resource_name} proposamena eguneratu du %{space_name} espazioan"
         proposal_note:
-          create: "%{user_name} k %{resource_name} proposamenari buruzko ohar pribatu bat utzi du %{space_name} espazioan"
+          create: "%{user_name} parte-hartzaileak %{resource_name} proposamenari buruzko ohar pribatu bat utzi du %{space_name} espazioan"
       answers:
         accepted: Onartuta
         evaluating: Ebaluatzen
@@ -729,7 +729,7 @@ eu:
       application_helper:
         filter_origin_values:
           all: Guztiak
-          meetings: Bilerak
+          meetings: Topaketak
           official: Ofiziala
           participants: Parte-hartzaileak
         filter_state_values:
@@ -796,7 +796,7 @@ eu:
           label: 'Zirriborroak honela ordenatu:'
           most_contributed: Bozka gehien jaso duena
           random: Ausazko ordena
-          recent: Berrienetatik zaharrenetara
+          recent: Azkenak
         requests:
           accepted_request:
             error: Ezin izan da kolaboratzaile gisa onartu, saiatu berriro geroago.
@@ -929,7 +929,7 @@ eu:
           my_proposals: Nire proposamenak
           origin: Jatorria
           related_to: Honekin lotuta
-          scope: Eremua
+          scope: Esparrua
           search: Bilatu
           state: Egoera
           taxonomy_filters: Iragazkiak
@@ -957,7 +957,7 @@ eu:
           most_liked: Like gehien
           most_voted: Gehien babestutakoak
           random: Ausazko ordena
-          recent: Berrienetatik zaharrenetara
+          recent: Azkenak
           with_more_authors: Egile gehiagorekin
         participatory_texts:
           view_index:
@@ -1017,7 +1017,7 @@ eu:
           can_accumulate_votes_beyond_threshold:
             description: Proposamen bakoitzak %{limit} babes baino gehiago jaso dezake
           minimum_votes_per_user:
-            description: Gutxienez %{votes} babes banatu behar duzu proposamen ezberdinen artean zure euskarriak kontuan har daitezen.
+            description: Gutxienez %{votes} babes banatu behar duzu proposamen ezberdinen artean zure hautuak kontuan har daitezen.
           proposal_limit:
             description: Proposamen(ak) sortu ditzakezu.
           success: Zure babesak ongi onartu dira
@@ -1055,7 +1055,7 @@ eu:
           title: Bertsioak
       withdraw:
         errors:
-          has_votes: Proposamen hau ezin da kendu dagoeneko babesak dituelako.
+          has_votes: Proposamen hau ezin da kendu dagoeneko botoak dituelako.
     resource_links:
       copied_from_component:
         proposal_proposal: Lotutako proposamenak
diff --git a/decidim-system/config/locales/eu.yml b/decidim-system/config/locales/eu.yml
index 9272b687696e6..14efa86cdbad7 100644
--- a/decidim-system/config/locales/eu.yml
+++ b/decidim-system/config/locales/eu.yml
@@ -164,7 +164,7 @@ eu:
             save_and_invite: Sortu antolatzailea eta gonbidatu administratzailea
           fields:
             content_security_policy: Edukien segurtasun-politika
-            created_at: Tan sortua
+            created_at: Noiz sortua
             file_upload_settings: Fitxategiak igotzearen doikuntzak
             name: Izena
             omniauth_settings: Omniauth doikuntzak
diff --git a/decidim-verifications/config/locales/bg.yml b/decidim-verifications/config/locales/bg.yml
index 891b0dd686343..c6ac36f62e2d4 100644
--- a/decidim-verifications/config/locales/bg.yml
+++ b/decidim-verifications/config/locales/bg.yml
@@ -44,7 +44,6 @@ bg:
           destroy:
             confirm: Отмяната на разрешенията преди определена дата, не може да бъде възстановено. Сигурни ли сте, че искате да продължите?
             confirm_all: Отмяната на всички разрешения, не може да бъде възстановено. Сигурни ли сте, че искате да продължите?
-          destroy_ok: Всички съвпадащи оторизации бяха отменени успешно.
           info: Има общо %{count} потвърдени участници.
           no_data: Няма потвърдени участници.
           title: Оторизации за отмяна
diff --git a/decidim-verifications/config/locales/ca-IT.yml b/decidim-verifications/config/locales/ca-IT.yml
index 3fb932e4ed573..d701f1707184d 100644
--- a/decidim-verifications/config/locales/ca-IT.yml
+++ b/decidim-verifications/config/locales/ca-IT.yml
@@ -49,7 +49,7 @@ ca-IT:
             confirm: La revocació d'autoritzacions anteriors a aquesta data no es pot desfer. Segur que vols continuar?
             confirm_all: La revocació de totes les autoritzacions no es pot desfer. Segur que vols continuar?
           destroy_nok: S'ha produït un error en revocar les autoritzacions.
-          destroy_ok: Totes les autoritzacions coincidents s'han revocat correctament.
+          destroy_ok: S'estan revocant les autoritzacions. Aquest procés pot trigar uns minuts a completar-se.
           info: Hi ha un total de %{count} participants verificades.
           no_data: No hi ha participants verificades.
           title: Revocació d'autoritzacions
diff --git a/decidim-verifications/config/locales/ca.yml b/decidim-verifications/config/locales/ca.yml
index 8130a3faed1aa..b31c02acca65e 100644
--- a/decidim-verifications/config/locales/ca.yml
+++ b/decidim-verifications/config/locales/ca.yml
@@ -49,7 +49,7 @@ ca:
             confirm: La revocació d'autoritzacions anteriors a aquesta data no es pot desfer. Segur que vols continuar?
             confirm_all: La revocació de totes les autoritzacions no es pot desfer. Segur que vols continuar?
           destroy_nok: S'ha produït un error en revocar les autoritzacions.
-          destroy_ok: Totes les autoritzacions coincidents s'han revocat correctament.
+          destroy_ok: S'estan revocant les autoritzacions. Aquest procés pot trigar uns minuts a completar-se.
           info: Hi ha un total de %{count} participants verificades.
           no_data: No hi ha participants verificades.
           title: Revocació d'autoritzacions
diff --git a/decidim-verifications/config/locales/cs.yml b/decidim-verifications/config/locales/cs.yml
index ece71bc110ddf..98ad0c12ec7d8 100644
--- a/decidim-verifications/config/locales/cs.yml
+++ b/decidim-verifications/config/locales/cs.yml
@@ -49,7 +49,6 @@ cs:
             confirm: Zrušení před datem autorizace nelze vrátit zpět. Jste si jisti, že chcete pokračovat?
             confirm_all: Zrušení všech autorizací nelze vrátit zpět. Jste si jisti, že chcete pokračovat?
           destroy_nok: Při odebírání autorizací došlo k chybě.
-          destroy_ok: Všechny odpovídající autorizace byly úspěšně zrušeny.
           info: Celkem je %{count} ověřených účastníků.
           no_data: Žádní ověření účastníci.
           title: Zrušení autorizace
diff --git a/decidim-verifications/config/locales/de.yml b/decidim-verifications/config/locales/de.yml
index fac1fbfd70804..890eaf764b61a 100644
--- a/decidim-verifications/config/locales/de.yml
+++ b/decidim-verifications/config/locales/de.yml
@@ -49,7 +49,6 @@ de:
             confirm: Das Entziehen aller Berechtigungen vor einem Datum kann nicht rückgängig gemacht werden. Sind Sie sicher, dass Sie fortfahren möchten?
             confirm_all: Das Entziehen aller Berechtigungen nicht rückgängig gemacht werden. Sind Sie sicher, dass Sie fortfahren möchten?
           destroy_nok: Beim Entziehen der Berechtigungen ist ein Fehler aufgetreten.
-          destroy_ok: Alle übereinstimmenden Berechtigungen wurden erfolgreich entzogen.
           info: Es gibt insgesamt %{count} verifizierte Teilnehmer.
           no_data: Keine verifizierten Teilnehmer.
           title: Berechtigungen widerrufen
diff --git a/decidim-verifications/config/locales/es-MX.yml b/decidim-verifications/config/locales/es-MX.yml
index 6b52cd12a29b2..d65b10ef5fd5e 100644
--- a/decidim-verifications/config/locales/es-MX.yml
+++ b/decidim-verifications/config/locales/es-MX.yml
@@ -49,7 +49,7 @@ es-MX:
             confirm: La revocación de las autorizaciones anteriores a esta fecha no se puede deshacer. ¿Seguro que quieres continuar?
             confirm_all: La revocación de todas las autorizaciones no se puede deshacer. ¿Seguro que quieres continuar?
           destroy_nok: Se ha producido un error al revocar las autorizaciones.
-          destroy_ok: Todas las autorizaciones coincidentes han sido revocadas con éxito.
+          destroy_ok: La revocación de las autorizaciones está en curso. Esto puede tardar unos minutos en completarse.
           info: Hay un total de %{count} participantes verificadas.
           no_data: No hay participantes verificadas.
           title: Revocación de autorizaciones
diff --git a/decidim-verifications/config/locales/es-PY.yml b/decidim-verifications/config/locales/es-PY.yml
index 8c737fb3baa7a..39d76c20f543f 100644
--- a/decidim-verifications/config/locales/es-PY.yml
+++ b/decidim-verifications/config/locales/es-PY.yml
@@ -49,7 +49,7 @@ es-PY:
             confirm: La revocación de las autorizaciones anteriores a esta fecha no se puede deshacer. ¿Seguro que quieres continuar?
             confirm_all: La revocación de todas las autorizaciones no se puede deshacer. ¿Seguro que quieres continuar?
           destroy_nok: Se ha producido un error al revocar las autorizaciones.
-          destroy_ok: Todas las autorizaciones coincidentes han sido revocadas con éxito.
+          destroy_ok: La revocación de las autorizaciones está en curso. Esto puede tardar unos minutos en completarse.
           info: Hay un total de %{count} participantes verificadas.
           no_data: No hay participantes verificadas.
           title: Revocación de autorizaciones
diff --git a/decidim-verifications/config/locales/es.yml b/decidim-verifications/config/locales/es.yml
index 1664e22e27fab..8bf8e0fb08de9 100644
--- a/decidim-verifications/config/locales/es.yml
+++ b/decidim-verifications/config/locales/es.yml
@@ -49,7 +49,7 @@ es:
             confirm: La revocación de las autorizaciones anteriores a esta fecha no se puede deshacer. ¿Seguro que quieres continuar?
             confirm_all: La revocación de todas las autorizaciones no se puede deshacer. ¿Seguro que quieres continuar?
           destroy_nok: Se ha producido un error al revocar las autorizaciones.
-          destroy_ok: Todas las autorizaciones coincidentes han sido revocadas con éxito.
+          destroy_ok: La revocación de las autorizaciones está en curso. Esto puede tardar unos minutos en completarse.
           info: Hay un total de %{count} participantes verificadas.
           no_data: No hay participantes verificadas.
           title: Revocación de autorizaciones
diff --git a/decidim-verifications/config/locales/eu.yml b/decidim-verifications/config/locales/eu.yml
index 5785a8e107181..1b1f418aec19f 100644
--- a/decidim-verifications/config/locales/eu.yml
+++ b/decidim-verifications/config/locales/eu.yml
@@ -18,7 +18,7 @@ eu:
         document_type: Dokumentu mota
       id_document_upload:
         document_number: Dokumentuaren zenbakia (letraz)
-        document_type: Dokumentuaren mota
+        document_type: Dokumentu mota
         user: Parte-hartzaileak
         verification_attachment: Zure dokumentuaren eskaneatutako kopia
       mobile_phone:
@@ -49,7 +49,7 @@ eu:
             confirm: Data horren aurreko baimenak baliogabetzea ezin da desegin. Ziur zaude jarraitu nahi duzula?
             confirm_all: Baimen guztiak baliogabetzea ezin da desegin. Ziur zaude jarraitu nahi duzula?
           destroy_nok: Arazo bat izn da baimenak ezeztatzean.
-          destroy_ok: Bat datozen baimen guztiak zuzen ezeztatu dira.
+          destroy_ok: Baimenak ezeztatzen ari dira. Minutu batzuk beharko ditugu hau bukatzeko.
           info: Guztira %{count} parte-hartzaile egiaztatuta daude.
           no_data: Ez dago parte-hartzaile egiaztaturik.
           title: Baimenak ezeztatzea
@@ -193,7 +193,7 @@ eu:
               example: |
                 john.doe@example.org
                 jane.doe@example.org
-              info: 'CSV formatudun fitxategia izan behar da zutabe bakarra duena honako helbide elektroniko honekin:'
+              info: 'CSV formatudun artxiboa izan behar da zutabe bakarra duena honako helbide elektroniko honekin:'
               submit: Igo fitxategia
               title: Inportatu errolda-datuak
               upload_new_census: Igo beste errolda bat
@@ -246,7 +246,7 @@ eu:
           config:
             edit:
               title: Nortasun agirien konfigurazioa
-              update: eguneratzearen
+              update: Eguneratu
             update:
               error: Arazo bat egon da konfigurazioa eguneratzean.
               success: Ezarpena zuzen eguneratua.
diff --git a/decidim-verifications/config/locales/fi-plain.yml b/decidim-verifications/config/locales/fi-plain.yml
index 7cf1cb8ed58a5..c021d7415bb74 100644
--- a/decidim-verifications/config/locales/fi-plain.yml
+++ b/decidim-verifications/config/locales/fi-plain.yml
@@ -49,7 +49,6 @@ fi-pl:
             confirm: Ennen valittua päivämäärää tehtyjen vahvistustietojen tuhoamista ei voi peruuttaa. Haluatko varmasti jatkaa?
             confirm_all: Vahvistusten tuhoamista ei voi peruuttaa. Haluatko varmasti jatkaa?
           destroy_nok: Vahvistusten kumoaminen epäonnistui.
-          destroy_ok: Kaikki hakua vastanneiden tunnistautumiset on peruutettu onnistuneesti.
           info: Yhteensä %{count} varmennettua osallistujaa.
           no_data: Ei vahvistettuja osallistujia.
           title: Tunnistautumisten peruuttaminen
diff --git a/decidim-verifications/config/locales/fi.yml b/decidim-verifications/config/locales/fi.yml
index 410895229d0f3..799e56c870d78 100644
--- a/decidim-verifications/config/locales/fi.yml
+++ b/decidim-verifications/config/locales/fi.yml
@@ -49,7 +49,7 @@ fi:
             confirm: Ennen valittua päivämäärää tehtyjen vahvistustietojen kumoamista ei voi perua. Haluatko varmasti jatkaa?
             confirm_all: Vahvistusten kumoamista ei voi perua. Haluatko varmasti jatkaa?
           destroy_nok: Vahvistusten kumoaminen epäonnistui.
-          destroy_ok: Kaikkien hakua vastanneiden tunnistautumisten kumoaminen onnistui.
+          destroy_ok: Tunnistautumisten kumoaminen on käynnissä. Tämän valmistuminen voi kestää useamman minuutin ajan.
           info: Yhteensä %{count} vahvistettua osallistujaa.
           no_data: Ei vahvistettuja osallistujia.
           title: Tunnistautumisten kumoaminen
diff --git a/decidim-verifications/config/locales/fr-CA.yml b/decidim-verifications/config/locales/fr-CA.yml
index bbd1c465b190f..dc0b0828e2749 100644
--- a/decidim-verifications/config/locales/fr-CA.yml
+++ b/decidim-verifications/config/locales/fr-CA.yml
@@ -49,7 +49,7 @@ fr-CA:
             confirm: Révoquer avant la date d'autorisation ne peut pas être annulée. Êtes-vous sûr de vouloir continuer ?
             confirm_all: La révocation des autorisations ne peut être annulée. Êtes-vous sur de vouloir continuer?
           destroy_nok: Une erreur s'est produite lors de la révocation des autorisations.
-          destroy_ok: Toutes les autorisations correspondantes ont été annulées avec succès.
+          destroy_ok: La révocation des autorisations est en cours. Cela peut prendre quelques minutes.
           info: Il y a un total de %{count} participants vérifiés.
           no_data: Aucun participant vérifié.
           title: Révocation des autorisations
diff --git a/decidim-verifications/config/locales/fr.yml b/decidim-verifications/config/locales/fr.yml
index 88fbf98eb925c..7939db98679df 100644
--- a/decidim-verifications/config/locales/fr.yml
+++ b/decidim-verifications/config/locales/fr.yml
@@ -49,7 +49,7 @@ fr:
             confirm: Révoquer avant la date d'autorisation ne peut pas être annulée. Êtes-vous sûr de vouloir continuer ?
             confirm_all: La révocation des autorisations ne peut être annulée. Êtes-vous sur de vouloir continuer?
           destroy_nok: Une erreur s'est produite lors de la révocation des autorisations.
-          destroy_ok: Toutes les autorisations correspondantes ont été révoquées avec succès.
+          destroy_ok: La révocation des autorisations est en cours. Cela peut prendre quelques minutes.
           info: Il y a un total de %{count} participants vérifiés.
           no_data: Aucun participant vérifié.
           title: Révocation des autorisations
diff --git a/decidim-verifications/config/locales/gl.yml b/decidim-verifications/config/locales/gl.yml
index 9d78a7f5d6583..2c4ebb3ac36b3 100644
--- a/decidim-verifications/config/locales/gl.yml
+++ b/decidim-verifications/config/locales/gl.yml
@@ -31,7 +31,6 @@ gl:
           before_date_info: Útil se o proceso ten comezado e queres rexeitar os permisos do proceso anterior.
           button: Rexeitar todo
           button_before: Rexeitar antes da data
-          destroy_ok: Todas as autorizacións coincidentes foron revogadas con éxito.
           info: Hai un total de %{count} participantes verificados.
           title: Revogación de autorización
         authorization_workflows: Autorizacións
diff --git a/decidim-verifications/config/locales/hu.yml b/decidim-verifications/config/locales/hu.yml
index 0ad39882a66fe..92a76bc6179ba 100644
--- a/decidim-verifications/config/locales/hu.yml
+++ b/decidim-verifications/config/locales/hu.yml
@@ -40,7 +40,6 @@ hu:
           destroy:
             confirm: A dátum előtti engedélyek visszavonása nem vonható vissza. Biztos, hogy folytatni szeretné?
             confirm_all: Az összes jogosultság visszavonása nem vonható vissza. Biztos, hogy folytatni szeretné?
-          destroy_ok: Az összes egyező engedélyt sikeresen visszavonták.
           info: Összesen %{count} ellenőrzött résztvevő.
           no_data: Nincsenek ellenőrzött résztvevők.
           title: Engedélyezés és visszavonás
diff --git a/decidim-verifications/config/locales/it.yml b/decidim-verifications/config/locales/it.yml
index e2b6e372f9e4f..4841b06759737 100644
--- a/decidim-verifications/config/locales/it.yml
+++ b/decidim-verifications/config/locales/it.yml
@@ -31,7 +31,6 @@ it:
           before_date_info: Utile se il processo è già iniziato e si desidera revocare i permessi del processo precedente.
           button: Revoca tutto
           button_before: Revoca prima della data
-          destroy_ok: Tutte le autorizzazioni corrispondenti sono state revocate correttamente.
           info: Ci sono un totale di %{count} partecipanti verificati.
           title: Revoca delle autorizzazioni
         authorization_workflows: Autorizzazioni
diff --git a/decidim-verifications/config/locales/ja.yml b/decidim-verifications/config/locales/ja.yml
index abcf41439a8eb..3d2b711f84f6a 100644
--- a/decidim-verifications/config/locales/ja.yml
+++ b/decidim-verifications/config/locales/ja.yml
@@ -49,7 +49,6 @@ ja:
             confirm: 指定日以前の認証の取り消しはやり直すことができません。続行してもよろしいですか？
             confirm_all: すべての権限を取り消すと、元に戻すことができません。本当に続行しますか？
           destroy_nok: 認証の取り消し中に問題が発生しました。
-          destroy_ok: すべての一致した認証が正常に取り消されました。
           info: '%{count} 人の確認済み参加者がいます。'
           no_data: 検証済みの参加者はいません。
           title: 認証の取り消し方法
diff --git a/decidim-verifications/config/locales/lt.yml b/decidim-verifications/config/locales/lt.yml
index 1c50758f53894..52b6577a56fd2 100644
--- a/decidim-verifications/config/locales/lt.yml
+++ b/decidim-verifications/config/locales/lt.yml
@@ -44,7 +44,6 @@ lt:
           destroy:
             confirm: Atšaukus leidimus iki datos, veiksmo nebus galima anuliuoti. Ar tikrai norite tęsti?
             confirm_all: Atšaukus visus leidimus, veiksmo nebus galima anuliuoti. Ar tikrai norite tęsti?
-          destroy_ok: Visi sutampantys leidimai atšaukti.
           info: Bendras patvirtintų dalyvių skaičius – %{count}.
           no_data: Patvirtintų dalyvių nėra.
           title: Įgaliojimų atėmimas
diff --git a/decidim-verifications/config/locales/nl.yml b/decidim-verifications/config/locales/nl.yml
index cb252c04ebfb2..d0151646d760d 100644
--- a/decidim-verifications/config/locales/nl.yml
+++ b/decidim-verifications/config/locales/nl.yml
@@ -31,7 +31,6 @@ nl:
           before_date_info: Nuttig als het proces al is begonnen en u de machtigingen van het vorige proces wilt intrekken.
           button: Alles intrekken
           button_before: Intrekken voor datum
-          destroy_ok: Alle overeenkomstige autorisaties zijn ingetrokken.
           info: Er zijn een totaal van %{count} geverifieerde deelnemers.
           title: Autorisaties intrekken
         authorization_workflows: Authorisaties
diff --git a/decidim-verifications/config/locales/no.yml b/decidim-verifications/config/locales/no.yml
index 926858d517bce..fb806fecc2871 100644
--- a/decidim-verifications/config/locales/no.yml
+++ b/decidim-verifications/config/locales/no.yml
@@ -31,7 +31,6 @@
           before_date_info: Nyttig hvis prosessen allerede har begynt og du vil tilbakekalle tillatelsene for den forrige prosessen.
           button: Opphev alle
           button_before: Tilbakekall før dato
-          destroy_ok: Alle matchede autorisasjoner er nå tilbakekallet.
           info: Det er totalt %{count} bekreftede deltakere.
           title: Tilbakekall av autorisasjoner
         authorization_workflows: Autorisasjoner
diff --git a/decidim-verifications/config/locales/pl.yml b/decidim-verifications/config/locales/pl.yml
index 2e05166d7bb0f..587f6bd6c5c28 100644
--- a/decidim-verifications/config/locales/pl.yml
+++ b/decidim-verifications/config/locales/pl.yml
@@ -44,7 +44,6 @@ pl:
           destroy:
             confirm: Unieważnienie przed autoryzacjami dat nie może zostać cofnięte. Czy na pewno chcesz kontynuować?
             confirm_all: Unieważnienie wszystkich autoryzacji nie może zostać cofnięte. Czy na pewno chcesz kontynuować?
-          destroy_ok: Pomyślnie wycofano wszystkie autoryzacje spełniające kryteria.
           info: 'Całkowita liczba zweryfikowanych użytkowników: %{count}.'
           no_data: Brak zweryfikowanych uczestników.
           title: Wycofanie autoryzacji
diff --git a/decidim-verifications/config/locales/pt-BR.yml b/decidim-verifications/config/locales/pt-BR.yml
index 1e4e9a3c13076..6c190be46d482 100644
--- a/decidim-verifications/config/locales/pt-BR.yml
+++ b/decidim-verifications/config/locales/pt-BR.yml
@@ -49,7 +49,6 @@ pt-BR:
             confirm: Revogar antes da data as autorizações não podem ser desfeitas. Tem certeza que deseja continuar?
             confirm_all: Revogar todas as autorizações não podem ser desfeito. Tem certeza que deseja continuar?
           destroy_nok: Ocorreu um problema ao revogar as autorizações.
-          destroy_ok: Todas as autorizações correspondentes foram revogadas com sucesso.
           info: Há um total de %{count} participantes verificados.
           no_data: Nenhum participante verificado.
           title: Revogação de Autorizações
diff --git a/decidim-verifications/config/locales/pt.yml b/decidim-verifications/config/locales/pt.yml
index d5313c6884030..077cc5471ba48 100644
--- a/decidim-verifications/config/locales/pt.yml
+++ b/decidim-verifications/config/locales/pt.yml
@@ -31,7 +31,6 @@ pt:
           before_date_info: Útil caso o processo já tenha sido iniciado e pretenda revogar as permissões do processo anterior.
           button: Revogar tudo
           button_before: Revogar antes de data
-          destroy_ok: Todas as autorizações correspondentes foram revogadas com êxito.
           info: Existe um total de %{count} participantes verificados.
           title: Revogação de autorizações
         authorization_workflows: Autorizações
diff --git a/decidim-verifications/config/locales/ro-RO.yml b/decidim-verifications/config/locales/ro-RO.yml
index edc3fbd381b30..b2562fae4e89c 100644
--- a/decidim-verifications/config/locales/ro-RO.yml
+++ b/decidim-verifications/config/locales/ro-RO.yml
@@ -37,7 +37,6 @@ ro:
           before_date_info: Este util dacă procesul a început deja și dorești să revoci drepturile procesului anterior.
           button: Revocați toate autorizările
           button_before: Revocați toate autorizările înainte de data
-          destroy_ok: Toate autorizațiile corelate au fost revocate.
           info: Există un total de %{count} participanți verificați.
           title: Revocarea autorizațiilor
         authorization_workflows: Autorizări
diff --git a/decidim-verifications/config/locales/sk.yml b/decidim-verifications/config/locales/sk.yml
index 0886f7eb7e8b8..44888291965ce 100644
--- a/decidim-verifications/config/locales/sk.yml
+++ b/decidim-verifications/config/locales/sk.yml
@@ -49,7 +49,6 @@ sk:
             confirm: Zrušenie autorizácií pred dátumom nie je možné vrátiť späť. Naozaj chcete pokračovať?
             confirm_all: Zrušenie všetkých autorizácií nie je možné vrátiť späť. Naozaj chcete pokračovať?
           destroy_nok: Pri rušení autorizácií sa vyskytol problém.
-          destroy_ok: Všetky zhodné autorizácie boli úspešne zrušené.
           info: Je tu celkovo %{count} overených účastníkov.
           no_data: Žiadni overení účastníci.
           title: Zrušenie autorizácií
diff --git a/decidim-verifications/config/locales/sv.yml b/decidim-verifications/config/locales/sv.yml
index bcece4242b6af..e73cfc3b528a8 100644
--- a/decidim-verifications/config/locales/sv.yml
+++ b/decidim-verifications/config/locales/sv.yml
@@ -49,7 +49,6 @@ sv:
             confirm: Återkallande av auktorisering före datum kan inte ångras. Vill du fortsätta?
             confirm_all: Återkallande av auktorisering kan inte ångras. Vill du fortsätta?
           destroy_nok: Det gick inte att återkalla auktoriseringen.
-          destroy_ok: Alla matchade auktoriseringar har återkallats.
           info: Det finns totalt %{count} verifierade deltagare.
           no_data: Inga verifierade deltagare.
           title: Återkallande av auktoriseringar
diff --git a/decidim-verifications/config/locales/zh-TW.yml b/decidim-verifications/config/locales/zh-TW.yml
index 5f14d740999a3..fbb29af4adde6 100644
--- a/decidim-verifications/config/locales/zh-TW.yml
+++ b/decidim-verifications/config/locales/zh-TW.yml
@@ -40,7 +40,6 @@ zh-TW:
           destroy:
             confirm: 撤銷在指定日期之前的授權無法撤消。您確定要繼續嗎？
             confirm_all: 撤銷所有授權後無法還原，確定要繼續嗎？
-          destroy_ok: 所有匹配的授權已成功撤銷。
           info: 總共有 %{count} 名已驗證的參與者。
           no_data: 沒有經過驗證的參與者.
           title: 授權撤銷

From 24e5e932d3a75c8207e2a27756c33a07ff47c38a Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Thu, 28 May 2026 21:59:53 +0200
Subject: [PATCH 041/131] Backport 'Fix comments count in statistics' to v0.31
 (#16945)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Anna Topalidi <60363870+antopalidi@users.noreply.github.com>
Co-authored-by: Ivan Vergés <ivan@pokecode.net>
---
 .../lib/decidim/accountability/component.rb   |  2 +-
 .../decidim/accountability/component_spec.rb  | 27 ++++++++++++++
 .../lib/decidim/budgets/component_spec.rb     | 35 +++++++++++++++++++
 .../lib/decidim/comments/engine.rb            | 11 ------
 .../app/presenters/decidim/stats_presenter.rb |  2 +-
 .../decidim/stats_presenter_spec.rb           | 12 +++++++
 .../lib/decidim/debates/component.rb          |  2 +-
 .../lib/decidim/debates/component_spec.rb     | 27 ++++++++++++++
 8 files changed, 104 insertions(+), 14 deletions(-)
 create mode 100644 decidim-budgets/spec/lib/decidim/budgets/component_spec.rb

diff --git a/decidim-accountability/lib/decidim/accountability/component.rb b/decidim-accountability/lib/decidim/accountability/component.rb
index 027802b101c59..3c48d9b8be5d9 100644
--- a/decidim-accountability/lib/decidim/accountability/component.rb
+++ b/decidim-accountability/lib/decidim/accountability/component.rb
@@ -51,7 +51,7 @@
                           icon_name: "chat-1-line",
                           tooltip_key: "comments_count",
                           tag: :comments do |components, _start_at, _end_at|
-    Decidim::Accountability::Result.where(component: components).count
+    Decidim::Accountability::Result.where(component: components).sum(:comments_count)
   end
 
   component.settings(:step) do |settings|
diff --git a/decidim-accountability/spec/lib/decidim/accountability/component_spec.rb b/decidim-accountability/spec/lib/decidim/accountability/component_spec.rb
index bde48b30bc2d3..53b2e8c39869e 100644
--- a/decidim-accountability/spec/lib/decidim/accountability/component_spec.rb
+++ b/decidim-accountability/spec/lib/decidim/accountability/component_spec.rb
@@ -7,6 +7,33 @@
   let(:organization) { component.organization }
   let!(:current_user) { create(:user, :confirmed, :admin, organization:) }
 
+  describe "stats" do
+    subject { current_stat[1][:data] }
+
+    let(:raw_stats) do
+      Decidim.component_manifests.map do |component_manifest|
+        component_manifest.stats.filter(name: stats_name).with_context(component).flat_map { |name, data| [component_manifest.name, name, data] }
+      end
+    end
+
+    let(:stats) { raw_stats.select { |stat| stat[0] == :accountability } }
+    let!(:result) { create(:result, component:) }
+    let(:current_stat) { stats.find { |stat| stat[1][:name] == stats_name } }
+
+    describe "comments_count" do
+      let(:stats_name) { :comments_count }
+
+      before do
+        create_list(:comment, 3, commentable: result)
+      end
+
+      it "counts the comments" do
+        expect(Decidim::Comments::Comment.count).to eq 3
+        expect(subject).to eq 3
+      end
+    end
+  end
+
   describe "on edit", type: :system do
     let(:edit_component_path) do
       Decidim::EngineRouter.admin_proxy(component.participatory_space).edit_component_path(component.id)
diff --git a/decidim-budgets/spec/lib/decidim/budgets/component_spec.rb b/decidim-budgets/spec/lib/decidim/budgets/component_spec.rb
new file mode 100644
index 0000000000000..b2dad701694c8
--- /dev/null
+++ b/decidim-budgets/spec/lib/decidim/budgets/component_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Budgets component" do # rubocop:disable RSpec/DescribeClass
+  let!(:component) { create(:budgets_component) }
+
+  describe "stats" do
+    subject { current_stat[1][:data] }
+
+    let(:raw_stats) do
+      Decidim.component_manifests.map do |component_manifest|
+        component_manifest.stats.filter(name: stats_name).with_context(component).flat_map { |name, data| [component_manifest.name, name, data] }
+      end
+    end
+
+    let(:stats) { raw_stats.select { |stat| stat[0] == :budgets } }
+    let!(:budget) { create(:budget, component:) }
+    let!(:project) { create(:project, budget:) }
+    let(:current_stat) { stats.find { |stat| stat[1][:name] == stats_name } }
+
+    describe "comments_count" do
+      let(:stats_name) { :comments_count }
+
+      before do
+        create_list(:comment, 3, commentable: project)
+      end
+
+      it "counts the comments" do
+        expect(Decidim::Comments::Comment.count).to eq 3
+        expect(subject).to eq 3
+      end
+    end
+  end
+end
diff --git a/decidim-comments/lib/decidim/comments/engine.rb b/decidim-comments/lib/decidim/comments/engine.rb
index 19ffe5ee7a258..9dc0165676ef0 100644
--- a/decidim-comments/lib/decidim/comments/engine.rb
+++ b/decidim-comments/lib/decidim/comments/engine.rb
@@ -34,17 +34,6 @@ class Engine < ::Rails::Engine
         Decidim::Api::MutationType.include MutationExtensions
       end
 
-      initializer "decidim_comments.stats" do
-        Decidim.stats.register :comments_count,
-                               priority: StatsRegistry::HIGH_PRIORITY,
-                               icon_name: "chat-1-line",
-                               tooltip_key: "comments_count" do |organization|
-          Decidim.component_manifests.sum do |component|
-            component.stats.filter(tag: :comments).with_context(organization.published_components).map { |_name, value| value }.compact_blank.sum
-          end
-        end
-      end
-
       initializer "decidim_comments.register_icons" do
         common_parameters = { category: "action", engine: :comments }
 
diff --git a/decidim-core/app/presenters/decidim/stats_presenter.rb b/decidim-core/app/presenters/decidim/stats_presenter.rb
index 51694f8e95963..549c83b8f8e46 100644
--- a/decidim-core/app/presenters/decidim/stats_presenter.rb
+++ b/decidim-core/app/presenters/decidim/stats_presenter.rb
@@ -15,7 +15,7 @@ def collection(priority: StatsRegistry::MEDIUM_PRIORITY)
             hash[name][:data][idx] += value
           end
         else
-          hash[name] = stat
+          hash[name] = stat.merge(data: stat[:data].dup)
         end
       end.values
     end
diff --git a/decidim-core/spec/presenters/decidim/stats_presenter_spec.rb b/decidim-core/spec/presenters/decidim/stats_presenter_spec.rb
index 00e560398595a..4e2da2346c148 100644
--- a/decidim-core/spec/presenters/decidim/stats_presenter_spec.rb
+++ b/decidim-core/spec/presenters/decidim/stats_presenter_spec.rb
@@ -40,6 +40,18 @@
 
       expect(result).to contain_exactly({ name: "stat_1", data: [16, 3] })
     end
+
+    it "returns the same data when called several times" do
+      allow(presenter).to receive(:all_stats).with(priority:).and_return([
+                                                                           { name: "stat_1", data: [12, 3] },
+                                                                           { name: "stat_1", data: [4] }
+                                                                         ])
+
+      presenter.collection(priority:)
+      result = presenter.collection(priority:)
+
+      expect(result).to contain_exactly({ name: "stat_1", data: [16, 3] })
+    end
   end
 
   describe "#all_stats" do
diff --git a/decidim-debates/lib/decidim/debates/component.rb b/decidim-debates/lib/decidim/debates/component.rb
index 76a678da5f0eb..46a54df349a46 100644
--- a/decidim-debates/lib/decidim/debates/component.rb
+++ b/decidim-debates/lib/decidim/debates/component.rb
@@ -66,7 +66,7 @@
                           icon_name: "chat-1-line",
                           tooltip_key: "comments_count",
                           tag: :comments do |components, _start_at, _end_at|
-    Decidim::Debates::Debate.where(component: components).not_hidden.count
+    Decidim::Debates::Debate.where(component: components).not_hidden.sum(:comments_count)
   end
 
   component.register_stat :likes_count, priority: Decidim::StatsRegistry::LOW_PRIORITY do |components, _start_at, _end_at|
diff --git a/decidim-debates/spec/lib/decidim/debates/component_spec.rb b/decidim-debates/spec/lib/decidim/debates/component_spec.rb
index 7820f2d50f75d..d304aee2855ca 100644
--- a/decidim-debates/spec/lib/decidim/debates/component_spec.rb
+++ b/decidim-debates/spec/lib/decidim/debates/component_spec.rb
@@ -7,6 +7,33 @@
   let(:organization) { component.organization }
   let!(:current_user) { create(:user, :confirmed, :admin, organization:) }
 
+  describe "stats" do
+    subject { current_stat[1][:data] }
+
+    let(:raw_stats) do
+      Decidim.component_manifests.map do |component_manifest|
+        component_manifest.stats.filter(name: stats_name).with_context(component).flat_map { |name, data| [component_manifest.name, name, data] }
+      end
+    end
+
+    let(:stats) { raw_stats.select { |stat| stat[0] == :debates } }
+    let!(:debate) { create(:debate, component:) }
+    let(:current_stat) { stats.find { |stat| stat[1][:name] == stats_name } }
+
+    describe "comments_count" do
+      let(:stats_name) { :comments_count }
+
+      before do
+        create_list(:comment, 3, commentable: debate)
+      end
+
+      it "counts the comments" do
+        expect(Decidim::Comments::Comment.count).to eq 3
+        expect(subject).to eq 3
+      end
+    end
+  end
+
   describe "on edit", type: :system do
     let(:edit_component_path) do
       Decidim::EngineRouter.admin_proxy(component.participatory_space).edit_component_path(component.id)

From 0bc59684f0206131dbb20e4322bf40c8f6b89d2a Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Fri, 29 May 2026 08:10:51 +0200
Subject: [PATCH 042/131] Backport 'Open the actions' disabled button tooltip
 to the left' to v0.31 (#16950)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 .../admin/results/_actions.html.erb            |  2 +-
 .../attachment_collections/index.html.erb      |  2 +-
 .../decidim/admin/components/_actions.html.erb |  2 +-
 .../admin/moderations/_moderation-tr.html.erb  |  2 +-
 .../admin/taxonomy_filters/_table.html.erb     |  4 ++--
 .../admin/assemblies/_assembly_row.html.erb    |  2 +-
 .../blogs/admin/posts/_actions.html.erb        |  2 +-
 .../budgets/admin/projects/_actions.html.erb   |  2 +-
 .../admin/documents/_actions.html.erb          |  2 +-
 .../admin/conferences/_actions.html.erb        |  2 +-
 .../debates/admin/debates/_actions.html.erb    |  2 +-
 .../admin/elections/_actions.html.erb          |  4 ++--
 .../admin/initiatives/index.html.erb           |  2 +-
 .../admin/meetings/_meeting_actions.html.erb   | 18 +++++++++---------
 .../registrations_attendees/index.html.erb     |  2 +-
 .../_process_row.html.erb                      |  2 +-
 .../admin/proposal_states/index.html.erb       |  2 +-
 .../admin/proposals/_actions.html.erb          |  4 ++--
 .../pending_authorizations/index.html.erb      |  2 +-
 19 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/decidim-accountability/app/views/decidim/accountability/admin/results/_actions.html.erb b/decidim-accountability/app/views/decidim/accountability/admin/results/_actions.html.erb
index bad8b55d00b02..b88cfa90e3497 100644
--- a/decidim-accountability/app/views/decidim/accountability/admin/results/_actions.html.erb
+++ b/decidim-accountability/app/views/decidim/accountability/admin/results/_actions.html.erb
@@ -88,7 +88,7 @@
       <% else %>
         <li class="dropdown__item">
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.deleted_results_info", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.deleted_results_info", scope: "decidim.admin"), class: :left do %>
               <%= icon "delete-bin-line", class: "text-gray" %>
               <span>
                 <%= t("actions.soft_delete", scope: "decidim.admin") %>
diff --git a/decidim-admin/app/views/decidim/admin/attachment_collections/index.html.erb b/decidim-admin/app/views/decidim/admin/attachment_collections/index.html.erb
index 8a759b079324e..bae1c8c885b68 100644
--- a/decidim-admin/app/views/decidim/admin/attachment_collections/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/attachment_collections/index.html.erb
@@ -51,7 +51,7 @@
                           <% end %>
                         <% else %>
                           <div class="dropdown__button-disabled">
-                            <%= with_tooltip t("tooltips.deleted_attachment_collections_info", scope: "decidim.admin") do %>
+                            <%= with_tooltip t("tooltips.deleted_attachment_collections_info", scope: "decidim.admin"), class: :left do %>
                               <%= icon "delete-bin-line", class: "text-gray" %>
                               <span>
                                 <%= t("actions.destroy", scope: "decidim.admin") %>
diff --git a/decidim-admin/app/views/decidim/admin/components/_actions.html.erb b/decidim-admin/app/views/decidim/admin/components/_actions.html.erb
index 63a3d72406675..417cf95974436 100644
--- a/decidim-admin/app/views/decidim/admin/components/_actions.html.erb
+++ b/decidim-admin/app/views/decidim/admin/components/_actions.html.erb
@@ -98,7 +98,7 @@
           <hr>
           <li class="dropdown__item">
             <div class="dropdown__button-disabled">
-              <%= with_tooltip t("tooltips.deleted_component_info", scope: "decidim.admin") do %>
+              <%= with_tooltip t("tooltips.deleted_component_info", scope: "decidim.admin"), class: :left do %>
                 <%= icon "delete-bin-line", class: "text-gray" %>
                 <span>
                   <%= t("actions.soft_delete", scope: "decidim.admin") %>
diff --git a/decidim-admin/app/views/decidim/admin/moderations/_moderation-tr.html.erb b/decidim-admin/app/views/decidim/admin/moderations/_moderation-tr.html.erb
index 8bfef9a49e5d6..8dafc065f0bb2 100644
--- a/decidim-admin/app/views/decidim/admin/moderations/_moderation-tr.html.erb
+++ b/decidim-admin/app/views/decidim/admin/moderations/_moderation-tr.html.erb
@@ -89,7 +89,7 @@
           <li class="dropdown__item">
             <% if moderation.reportable.respond_to?(:commentable) && moderation.reportable.commentable.try(:hidden?) %>
               <div class="dropdown__button-disabled">
-                <%= with_tooltip(t("actions.parent_hidden", scope: "decidim.moderations"), title: t("actions.parent_hidden", scope: "decidim.moderations")) do %>
+                <%= with_tooltip(t("actions.parent_hidden", scope: "decidim.moderations"), title: t("actions.parent_hidden", scope: "decidim.moderations"), class: :left) do %>
                   <%= icon "eye-line", class: "text-gray" %>
                   <span><%= t("actions.unhide", scope: "decidim.moderations") %></span>
                 <% end %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters/_table.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters/_table.html.erb
index fe42412e5c2d7..6483a8d2e6aaa 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters/_table.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters/_table.html.erb
@@ -36,7 +36,7 @@
                   </li>
                 <% else %>
                   <div class="dropdown__button-disabled">
-                    <%= with_tooltip t("tooltips.cannot_edit_taxonomy_filter", scope: "decidim.admin") do %>
+                    <%= with_tooltip t("tooltips.cannot_edit_taxonomy_filter", scope: "decidim.admin"), class: :left do %>
                       <%= icon "pencil-line", class: "text-gray" %>
                       <%= t(".edit") %>
                     <% end %>
@@ -54,7 +54,7 @@
                   </li>
                 <% else %>
                   <div class="dropdown__button-disabled">
-                    <%= with_tooltip t("tooltips.cannot_destroy_taxonomy_filter", scope: "decidim.admin") do %>
+                    <%= with_tooltip t("tooltips.cannot_destroy_taxonomy_filter", scope: "decidim.admin"), class: :left do %>
                       <%= icon "delete-bin-line", class: "text-gray" %>
                       <%= t(".destroy") %>
                     <% end %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_assembly_row.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_assembly_row.html.erb
index 98821596c13c4..87d38f9d5abf2 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_assembly_row.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_assembly_row.html.erb
@@ -146,7 +146,7 @@
             <% if assembly.published? %>
               <li class="dropdown__item">
                 <div class="dropdown__button-disabled">
-                  <%= with_tooltip t("tooltips.deleted_assemblies_info", scope: "decidim.admin") do %>
+                  <%= with_tooltip t("tooltips.deleted_assemblies_info", scope: "decidim.admin"), class: :left do %>
                     <%= icon "delete-bin-line", class: "text-gray" %>
                     <span>
                       <%= t("actions.soft_delete", scope: "decidim.admin") %>
diff --git a/decidim-blogs/app/views/decidim/blogs/admin/posts/_actions.html.erb b/decidim-blogs/app/views/decidim/blogs/admin/posts/_actions.html.erb
index 0c00f55a17991..e4fbfea809cf5 100644
--- a/decidim-blogs/app/views/decidim/blogs/admin/posts/_actions.html.erb
+++ b/decidim-blogs/app/views/decidim/blogs/admin/posts/_actions.html.erb
@@ -70,7 +70,7 @@
 
         <li class="dropdown__item">
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.deleted_posts_info", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.deleted_posts_info", scope: "decidim.admin"), class: :left do %>
               <%= icon "delete-bin-line", class: "text-gray" %>
               <span>
                 <%= t("actions.soft_delete", scope: "decidim.admin") %>
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/_actions.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/_actions.html.erb
index b6e17cd8c282e..864fcdb550e6f 100644
--- a/decidim-budgets/app/views/decidim/budgets/admin/projects/_actions.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/_actions.html.erb
@@ -57,7 +57,7 @@
           <% end %>
         <% else %>
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.deleted_projects_info", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.deleted_projects_info", scope: "decidim.admin"), class: :left do %>
               <%= icon "delete-bin-line", class: "text-gray" %>
               <span>
                 <%= t("actions.soft_delete", scope: "decidim.admin") %>
diff --git a/decidim-collaborative_texts/app/views/decidim/collaborative_texts/admin/documents/_actions.html.erb b/decidim-collaborative_texts/app/views/decidim/collaborative_texts/admin/documents/_actions.html.erb
index d3cb99a05d783..c4636b334c464 100644
--- a/decidim-collaborative_texts/app/views/decidim/collaborative_texts/admin/documents/_actions.html.erb
+++ b/decidim-collaborative_texts/app/views/decidim/collaborative_texts/admin/documents/_actions.html.erb
@@ -68,7 +68,7 @@
           <% end %>
         <% else %>
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.deleted_collaborative_texts_info", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.deleted_collaborative_texts_info", scope: "decidim.admin"), class: :left do %>
               <%= icon "delete-bin-line", class: "text-gray" %>
               <span>
                 <%= t("actions.soft_delete", scope: "decidim.admin") %>
diff --git a/decidim-conferences/app/views/decidim/conferences/admin/conferences/_actions.html.erb b/decidim-conferences/app/views/decidim/conferences/admin/conferences/_actions.html.erb
index 6f582175f0e97..ea922d3ffd4f9 100644
--- a/decidim-conferences/app/views/decidim/conferences/admin/conferences/_actions.html.erb
+++ b/decidim-conferences/app/views/decidim/conferences/admin/conferences/_actions.html.erb
@@ -88,7 +88,7 @@
         <% if conference.published? %>
           <li class="dropdown__item">
             <div class="dropdown__button-disabled">
-              <%= with_tooltip t("tooltips.deleted_conferences_info", scope: "decidim.admin") do %>
+              <%= with_tooltip t("tooltips.deleted_conferences_info", scope: "decidim.admin"), class: :left do %>
                 <%= icon "delete-bin-line", class: "text-gray" %>
                 <span>
                   <%= t("decidim.admin.actions.soft_delete") %>
diff --git a/decidim-debates/app/views/decidim/debates/admin/debates/_actions.html.erb b/decidim-debates/app/views/decidim/debates/admin/debates/_actions.html.erb
index 70b00401c561e..d37c4cf71efec 100644
--- a/decidim-debates/app/views/decidim/debates/admin/debates/_actions.html.erb
+++ b/decidim-debates/app/views/decidim/debates/admin/debates/_actions.html.erb
@@ -57,7 +57,7 @@
           <% end %>
         <% else %>
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.deleted_debates_info", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.deleted_debates_info", scope: "decidim.admin"), class: :left do %>
               <%= icon "delete-bin-line", class: "text-gray" %>
               <span>
                 <%= t("actions.soft_delete", scope: "decidim.admin") %>
diff --git a/decidim-elections/app/views/decidim/elections/admin/elections/_actions.html.erb b/decidim-elections/app/views/decidim/elections/admin/elections/_actions.html.erb
index ae4abd9fc5840..58c5ac7514db5 100644
--- a/decidim-elections/app/views/decidim/elections/admin/elections/_actions.html.erb
+++ b/decidim-elections/app/views/decidim/elections/admin/elections/_actions.html.erb
@@ -42,7 +42,7 @@
       <% else %>
         <li class="dropdown__item">
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.edit_elections_info", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.edit_elections_info", scope: "decidim.admin"), class: :left do %>
               <%= icon "pencil-line", class: "text-gray" %>
               <span>
                 <%= t("actions.edit", scope: "decidim.elections") %>
@@ -77,7 +77,7 @@
       <% else %>
         <li class="dropdown__item">
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.deleted_elections_info", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.deleted_elections_info", scope: "decidim.admin"), class: :left do %>
               <%= icon "delete-bin-line", class: "text-gray" %>
               <span>
                 <%= t("actions.soft_delete", scope: "decidim.admin") %>
diff --git a/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/index.html.erb b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/index.html.erb
index b01f0578c2d49..61b38f6c97933 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/index.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/index.html.erb
@@ -74,7 +74,7 @@
                   <% else %>
                     <li class="dropdown__item">
                       <div class="dropdown__button-disabled">
-                        <%= with_tooltip(t("actions.cannot_answer", scope: "decidim.admin")) do %>
+                        <%= with_tooltip(t("actions.cannot_answer", scope: "decidim.admin"), class: :left) do %>
                           <%= icon "chat-1-line", class: "text-gray" %>
                           <span><%= t("actions.answer", scope: "decidim.initiatives") %></span>
                         <% end %>
diff --git a/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meeting_actions.html.erb b/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meeting_actions.html.erb
index 2e5cce72c1991..217af5f6dd898 100644
--- a/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meeting_actions.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meeting_actions.html.erb
@@ -20,7 +20,7 @@
           <% end %>
         <% else %>
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.cannot_edit_meetings", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.cannot_edit_meetings", scope: "decidim.admin"), class: :left do %>
               <%= icon "pencil-line", class: "text-gray" %>
               <span><%= t("actions.edit", scope: "decidim.meetings") %></span>
             <% end %>
@@ -38,7 +38,7 @@
           <% end %>
         <% else %>
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.cannot_duplicate_meetings", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.cannot_duplicate_meetings", scope: "decidim.admin"), class: :left do %>
               <%= icon "file-copy-line", class: "text-gray" %>
               <span><%= t("actions.duplicate", scope: "decidim.admin") %></span>
             <% end %>
@@ -56,7 +56,7 @@
           <% end %>
         <% else %>
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.cannot_manage_attachments_meetings", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.cannot_manage_attachments_meetings", scope: "decidim.admin"), class: :left do %>
               <%= icon "attachment-line", class: "text-gray" %>
               <span><%= t("actions.attachments", scope: "decidim.admin") %></span>
             <% end %>
@@ -72,7 +72,7 @@
           <% end %>
         <% else %>
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.cannot_manage_attachments_meetings", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.cannot_manage_attachments_meetings", scope: "decidim.admin"), class: :left do %>
               <%= icon "folder-line", class: "text-gray" %>
               <span><%= t("actions.attachment_collections", scope: "decidim.admin") %></span>
             <% end %>
@@ -90,7 +90,7 @@
           <% end %>
         <% else %>
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.cannot_manage_registrations_meetings", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.cannot_manage_registrations_meetings", scope: "decidim.admin"), class: :left do %>
               <%= icon "group-line", class: "text-gray" %>
               <span><%= t("actions.registrations", scope: "decidim.meetings") %></span>
             <% end %>
@@ -106,7 +106,7 @@
           <% end %>
         <% else %>
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.cannot_manage_agenda_meetings", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.cannot_manage_agenda_meetings", scope: "decidim.admin"), class: :left do %>
               <%= icon "calendar-line", class: "text-gray" %>
               <span><%= t("actions.agenda", scope: "decidim.meetings") %></span>
             <% end %>
@@ -122,7 +122,7 @@
           <% end %>
         <% else %>
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.cannot_manage_poll_meetings", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.cannot_manage_poll_meetings", scope: "decidim.admin"), class: :left do %>
               <%= icon "list-check", class: "text-gray" %>
               <span><%= t("actions.manage_poll", scope: "decidim.meetings") %></span>
             <% end %>
@@ -138,7 +138,7 @@
           <% end %>
         <% else %>
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.cannot_close_meetings", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.cannot_close_meetings", scope: "decidim.admin"), class: :left do %>
               <%= icon "lock-line", class: "text-gray" %>
               <span><%= t("actions.close", scope: "decidim.meetings") %></span>
             <% end %>
@@ -189,7 +189,7 @@
           <% end %>
         <% else %>
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.deleted_meetings_info", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.deleted_meetings_info", scope: "decidim.admin"), class: :left do %>
               <%= icon "delete-bin-line", class: "text-gray" %>
               <span><%= t("actions.soft_delete", scope: "decidim.admin") %></span>
             <% end %>
diff --git a/decidim-meetings/app/views/decidim/meetings/admin/registrations_attendees/index.html.erb b/decidim-meetings/app/views/decidim/meetings/admin/registrations_attendees/index.html.erb
index b8684aa640292..24c6605b0a06e 100644
--- a/decidim-meetings/app/views/decidim/meetings/admin/registrations_attendees/index.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/admin/registrations_attendees/index.html.erb
@@ -98,7 +98,7 @@
                         <li class="dropdown__item">
                           <% if presenter.validated? %>
                             <div class="dropdown__button-disabled">
-                              <%= with_tooltip t("tooltips.cannot_mark_attendee", scope: "decidim.admin") do %>
+                              <%= with_tooltip t("tooltips.cannot_mark_attendee", scope: "decidim.admin"), class: :left do %>
                                 <%= icon "user-follow-line", class: "text-gray" %>
                                 <span>
                                   <%= t("actions.mark_as_attendee", scope: "decidim.meetings") %>
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_processes/_process_row.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_processes/_process_row.html.erb
index dfc9a7db29cc7..ce25234236a88 100644
--- a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_processes/_process_row.html.erb
+++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_processes/_process_row.html.erb
@@ -130,7 +130,7 @@
             <% if process.published? %>
               <li class="dropdown__item">
                 <div class="dropdown__button-disabled">
-                  <%= with_tooltip t("tooltips.deleted_processes_info", scope: "decidim.admin") do %>
+                  <%= with_tooltip t("tooltips.deleted_processes_info", scope: "decidim.admin"), class: :left do %>
                     <%= icon "delete-bin-line", class: "text-gray" %>
                     <span>
                       <%= t("actions.soft_delete", scope: "decidim.admin") %>
diff --git a/decidim-proposals/app/views/decidim/proposals/admin/proposal_states/index.html.erb b/decidim-proposals/app/views/decidim/proposals/admin/proposal_states/index.html.erb
index d3237f090e23c..896ac30c045bd 100644
--- a/decidim-proposals/app/views/decidim/proposals/admin/proposal_states/index.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/admin/proposal_states/index.html.erb
@@ -58,7 +58,7 @@
                   <% else %>
                     <li class="dropdown__item">
                       <div class="dropdown__button-disabled">
-                        <%= with_tooltip t("tooltips.deleted_proposal_states_info", scope: "decidim.admin") do %>
+                        <%= with_tooltip t("tooltips.deleted_proposal_states_info", scope: "decidim.admin"), class: :left do %>
                           <%= icon "delete-bin-line", class: "text-gray" %>
                           <span>
                             <%= t("actions.destroy", scope: "decidim.proposals") %>
diff --git a/decidim-proposals/app/views/decidim/proposals/admin/proposals/_actions.html.erb b/decidim-proposals/app/views/decidim/proposals/admin/proposals/_actions.html.erb
index 4a60f6b03ce42..259be6b9c19af 100644
--- a/decidim-proposals/app/views/decidim/proposals/admin/proposals/_actions.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/admin/proposals/_actions.html.erb
@@ -22,7 +22,7 @@
       <% else %>
         <li class="dropdown__item">
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.cannot_edit_proposal_info", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.cannot_edit_proposal_info", scope: "decidim.admin"), class: :left do %>
               <%= icon "pencil-line", class: "text-gray" %>
               <span>
                 <%= t("actions.edit_proposal", scope: "decidim.proposals") %>
@@ -73,7 +73,7 @@
           <% end %>
         <% else %>
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.deleted_proposals_info", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.deleted_proposals_info", scope: "decidim.admin"), class: :left do %>
               <%= icon "pencil-line", class: "text-gray" %>
               <span>
                 <%= t("actions.edit_proposal", scope: "decidim.proposals") %>
diff --git a/decidim-verifications/app/views/decidim/verifications/postal_letter/admin/pending_authorizations/index.html.erb b/decidim-verifications/app/views/decidim/verifications/postal_letter/admin/pending_authorizations/index.html.erb
index 40423b2966b95..87c40d23fc6fd 100644
--- a/decidim-verifications/app/views/decidim/verifications/postal_letter/admin/pending_authorizations/index.html.erb
+++ b/decidim-verifications/app/views/decidim/verifications/postal_letter/admin/pending_authorizations/index.html.erb
@@ -44,7 +44,7 @@
                   <li class="dropdown__item">
                     <% if authorization.letter_sent? %>
                       <div class="dropdown__button-disabled">
-                        <%= with_tooltip t(".already_sent") do %>
+                        <%= with_tooltip t(".already_sent"), class: :left do %>
                           <%= icon "checkbox-circle-line", class: "text-gray" %>
                           <span>
                             <%= t(".mark_as_sent") %>

From b47042f08625aca0b6b75c09dd5f01475e2fe64f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= <ivan@pokecode.net>
Date: Fri, 29 May 2026 12:32:09 +0200
Subject: [PATCH 043/131] add missing translations

---
 decidim-elections/config/locales/ca.yml | 39 +++++++++++++------
 decidim-elections/config/locales/es.yml | 51 ++++++++++++++++---------
 2 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/decidim-elections/config/locales/ca.yml b/decidim-elections/config/locales/ca.yml
index ea253c0ea784a..8fc7fedaa9735 100644
--- a/decidim-elections/config/locales/ca.yml
+++ b/decidim-elections/config/locales/ca.yml
@@ -2,6 +2,8 @@
 ca:
   activemodel:
     attributes:
+      elections_question:
+        max_choices: Nombre màxim d'opcions
       token_csv:
         file: Arxiu
         remove_all: Eliminar totes les dades del cens actual
@@ -101,6 +103,7 @@ ca:
             start_question_button: Activar la votació
             title: Resultats
           status:
+            allow_census_check_before_start: Permetre que les usuàries comprovin si poden votar abans que comenci l'elecció
             census: 'Cens:'
             results_availability:
               after_end: Resultats disponibles després de la finalització de les eleccions
@@ -179,14 +182,19 @@ ca:
           unknown: Estat desconegut
       admin_log:
         election:
-          create: "%{user_name} ha creat l'elecció \"%{resource_name}\" a %{space_name}"
-          publish: "%{user_name} ha publicat l'elecció \"%{resource_name}\" a %{space_name}"
-          restore: "%{user_name} ha restaurat l'elecció \"%{resource_name}\" a %{space_name}"
-          soft_delete: "%{user_name} ha mogut l'elecció \"%{resource_name}\" de %{space_name} a la paperera"
-          unpublish: "%{user_name} ha despublicat l'elecció \"%{resource_name}\" a %{space_name}"
-          update: "%{user_name} ha actualitzat l'elecció \"%{resource_name}\" a %{space_name}"
+          create: '%{user_name} ha creat l''elecció "%{resource_name}" a %{space_name}'
+          publish: '%{user_name} ha publicat l''elecció "%{resource_name}" a %{space_name}'
+          restore: '%{user_name} ha restaurat l''elecció "%{resource_name}" a %{space_name}'
+          soft_delete: '%{user_name} ha mogut l''elecció "%{resource_name}" de %{space_name} a la paperera'
+          unpublish: '%{user_name} ha despublicat l''elecció "%{resource_name}" a %{space_name}'
+          update: '%{user_name} ha actualitzat l''elecció "%{resource_name}" a %{space_name}'
         question:
-          update: "%{user_name} va actualitzar les preguntes de l'elecció \"%{resource_name}\""
+          update: '%{user_name} va actualitzar les preguntes de l''elecció "%{resource_name}"'
+      census_checks:
+        show:
+          description: Això vol dir que, un cop comenci l'elecció, hi podràs votar.
+          exit_button: Sortir de la comprovació del cens
+          title: T'has verificat correctament
       censuses:
         census_ready_html: S'han carregat les dades censals i estan a punt per utilitzar-les a l'elecció "<b>%{election_title}</b>".
         census_size_html:
@@ -195,8 +203,9 @@ ca:
         internal_users:
           already_have_an_account?: Ja tens un compte?
           are_you_new?: Encara no ets participant?
-          info_html: |
-            Pots restringir la participació en l'elecció a les participants que tinguin una autorització. <br>Tingues en compte que les participants obtenir l'autorització seleccionada per poder votar. Si deixes totes les caselles de verificació buides, qualsevol persona registrada podrà votar.
+          info_html: 'Pots restringir la participació en l''elecció a les participants que tinguin una autorització. <br>Tingues en compte que les participants obtenir l''autorització seleccionada per poder votar. Si deixes totes les caselles de verificació buides, qualsevol persona registrada podrà votar.
+
+            '
           internal_type_title: Autoritzacions addicionals necessàries per votar (opcional)
           label: Participants registrades (dinàmic)
           sign_in_description: Inicia la teva sessió per a votar en aquestes eleccions
@@ -212,8 +221,9 @@ ca:
             email;token
             user@example.org;123456
             user2@example.org;ABCXYZ
-          info_html: |
-            Ha de ser un arxiu en format CSV amb només dues columnes, una amb l'adreça de correu electrònic i una altra amb el valor de l'autenticador (token). Els camps han d'estar separats amb punt i coma (;).
+          info_html: 'Ha de ser un arxiu en format CSV amb només dues columnes, una amb l''adreça de correu electrònic i una altra amb el valor de l''autenticador (token). Els camps han d''estar separats amb punt i coma (;).
+
+            '
           label: Participants no registrats amb autentificador/token (fixat)
           remove_before_upload: Si vols pujar un nou cens, primer has d'eliminar el que ja existeix.
           upload_file: Puja arxiu
@@ -249,13 +259,15 @@ ca:
           title: Preguntes de l'elecció
         show:
           active_voting_until: 'Votació activa fins: %{end_date}'
+          check_census_button: Comprovar si puc votar
+          check_census_explanation: Aquesta elecció encara no ha començat, però pots comprovar si estàs inclosa al cens.
           edit_vote_button: Edita el vot
           vote_button: Votar
           voted: Ja has votat. Pots tornar a votar, això esborrarà el teu vot anterior i, només es comptabilitzarà la teva última votació.
           votes_count:
             one: 1 vot
             other: "%{count} vots"
-          voting_began: 'La votació es va iniciar el %{start_date}'
+          voting_began: La votació es va iniciar el %{start_date}
         vote_results:
           subtitle:
             after_end: Les eleccions han finalitzat. Ara pot veure'n els resultats.
@@ -308,6 +320,9 @@ ca:
         question:
           back: Tornar
           cast_vote: Enviar el vot
+          max_choices: 'Màxim d''opcions: %{count}'
+          max_choices_alert: Has seleccionat massa opcions. Si us plau, desselecciona'n algunes per continuar.
+          max_choices_exceeded: No pots seleccionar més de %{max} opcions. Torna enrere i ajusta la selecció.
           next: Següent
         receipt:
           description: Pots tornar a votar en qualsevol moment mentre el període de votació estigui obert. El teu vot anterior serà substituït pel nou.
diff --git a/decidim-elections/config/locales/es.yml b/decidim-elections/config/locales/es.yml
index e4f4064882c2a..d6a036ec22b3d 100644
--- a/decidim-elections/config/locales/es.yml
+++ b/decidim-elections/config/locales/es.yml
@@ -2,6 +2,8 @@
 es:
   activemodel:
     attributes:
+      elections_question:
+        max_choices: Número máximo de opciones
       token_csv:
         file: Archivo
         remove_all: Eliminar todos los datos del censo actual
@@ -35,8 +37,8 @@ es:
             announcement: Aviso
     elections:
       actions:
-        confirm_delete_election: '¿Seguro que quieres eliminar esta elección?'
-        confirm_unpublish_election: '¿Seguro que quieres eliminar esta elección?'
+        confirm_delete_election: "¿Seguro que quieres eliminar esta elección?"
+        confirm_unpublish_election: "¿Seguro que quieres eliminar esta elección?"
         deleted_election_info: Las elecciones eliminadas no se muestran en la lista. Puedes verlas haciendo clic en el botón "Ver las elecciones eliminadas" que encontrarás más abajo.
         edit: Editar la elección
         new: Nueva elección
@@ -76,7 +78,7 @@ es:
               results: Disponibilidad de los resultados
               title: Título
             title: Principal
-          publish_confirm: '¿Seguro que quieres publicar esta elección?'
+          publish_confirm: "¿Seguro que quieres publicar esta elección?"
           questions:
             labels:
               answers: Respuestas
@@ -101,6 +103,7 @@ es:
             start_question_button: Activar la votación
             title: Resultados
           status:
+            allow_census_check_before_start: Permitir que las usuarias comprueben si pueden votar antes de que empiece la elección
             census: 'Censo:'
             results_availability:
               after_end: Resultados disponibles tras la finalización de las elecciones
@@ -154,7 +157,7 @@ es:
         questions:
           edit_questions:
             new_question: Nueva pregunta
-            remove_question_confirm: '¿Está seguro de que desea eliminar esta pregunta?'
+            remove_question_confirm: "¿Está seguro de que desea eliminar esta pregunta?"
             title: Preguntas
           form:
             errors:
@@ -179,24 +182,30 @@ es:
           unknown: Estado desconocido
       admin_log:
         election:
-          create: "%{user_name} ha creado la elección \"%{resource_name}\" en %{space_name}"
-          publish: "%{user_name} publicó la elección \"%{resource_name}\" en %{space_name}"
-          restore: "%{user_name} restauró la elección \"%{resource_name}\" en %{space_name}"
-          soft_delete: "%{user_name} ha movido la elección \"%{resource_name}\" de %{space_name} a la papelera"
-          unpublish: "%{user_name} despublicó la elección \"%{resource_name}\" en %{space_name}"
-          update: "%{user_name} ha actualizado la elección \"%{resource_name}\" de %{space_name}"
+          create: '%{user_name} ha creado la elección "%{resource_name}" en %{space_name}'
+          publish: '%{user_name} publicó la elección "%{resource_name}" en %{space_name}'
+          restore: '%{user_name} restauró la elección "%{resource_name}" en %{space_name}'
+          soft_delete: '%{user_name} ha movido la elección "%{resource_name}" de %{space_name} a la papelera'
+          unpublish: '%{user_name} despublicó la elección "%{resource_name}" en %{space_name}'
+          update: '%{user_name} ha actualizado la elección "%{resource_name}" de %{space_name}'
         question:
-          update: "%{user_name} actualizó las preguntas de la elección \"%{resource_name}\""
+          update: '%{user_name} actualizó las preguntas de la elección "%{resource_name}"'
+      census_checks:
+        show:
+          description: Esto significa que, una vez que empiece la elección, podrás votar en ella.
+          exit_button: Salir de la comprobación del censo
+          title: Te has verificado correctamente
       censuses:
         census_ready_html: Se han cargado los datos censales y están listos para su uso en la elección "<b>%{election_title}</b>".
         census_size_html:
           one: Actualmente hay <strong>1</strong> persona con derecho a voto en estas elecciones (esto podría cambiar en un censo dinámico).
           other: Actualmente hay <strong>%{count}</strong> personas con derecho a voto en estas elecciones (esto podría cambiar en un censo dinámico).
         internal_users:
-          already_have_an_account?: '¿Ya tienes una cuenta?'
-          are_you_new?: '¿Aún no eres participante?'
-          info_html: |
-            Puedes restringir la participación en la elección a las participantes que tengan una autorización. <br>Ten en cuenta que las participantes obtener la autorización seleccionada para poder votar. Si dejas todas las casillas de verificación vacías, cualquier persona registrada podrá votar.
+          already_have_an_account?: "¿Ya tienes una cuenta?"
+          are_you_new?: "¿Aún no eres participante?"
+          info_html: 'Puedes restringir la participación en la elección a las participantes que tengan una autorización. <br>Ten en cuenta que las participantes obtener la autorización seleccionada para poder votar. Si dejas todas las casillas de verificación vacías, cualquier persona registrada podrá votar.
+
+            '
           internal_type_title: Autorizaciones adicionales requeridas para votar (opcional)
           label: Participantes registradas (dinámico)
           sign_in_description: Inicia tu sesión para votar en estas elecciones
@@ -212,8 +221,9 @@ es:
             email;token
             user@example.org;123456
             user2@example.org;ABCXYZ
-          info_html: |
-            Debe ser un archivo en formato CSV con solo dos columnas, una con la dirección de correo electrónico y otra con el valor del autentificador (token). Los campos deben estar separados con punto y coma (;).
+          info_html: 'Debe ser un archivo en formato CSV con solo dos columnas, una con la dirección de correo electrónico y otra con el valor del autentificador (token). Los campos deben estar separados con punto y coma (;).
+
+            '
           label: Participantes no registrados con autentificador/token (fijado)
           remove_before_upload: Si quieres subir un nuevo censo, primero tienes que eliminar el que ya existe.
           upload_file: Subir un archivo
@@ -249,13 +259,15 @@ es:
           title: Preguntas de la elección
         show:
           active_voting_until: 'Votación activa hasta: %{end_date}'
+          check_census_button: Comprobar si puedo votar
+          check_census_explanation: Esta elección todavía no ha empezado, pero puedes comprobar si estás incluida en el censo.
           edit_vote_button: Editar el voto
           vote_button: Votar
           voted: Ya has votado. Puedes votar de nuevo, esto borrará tu voto anterior y, solo se contará tu última votación.
           votes_count:
             one: 1 voto
             other: "%{count} votos"
-          voting_began: 'La votación empezó el %{start_date}'
+          voting_began: La votación empezó el %{start_date}
         vote_results:
           subtitle:
             after_end: Las elecciones han terminado. Ahora puedes ver los resultados.
@@ -308,6 +320,9 @@ es:
         question:
           back: Volver
           cast_vote: Enviar el voto
+          max_choices: 'Máximo de opciones: %{count}'
+          max_choices_alert: Has seleccionado demasiadas opciones. Por favor, desmarca algunas para continuar.
+          max_choices_exceeded: No puedes seleccionar más de %{max} opciones. Vuelve atrás y ajusta tu selección.
           next: Siguiente
         receipt:
           description: Puedes votar de nuevo en cualquier momento mientras el período de votación esté abierto. Tu voto anterior será sustituido por el nuevo.

From 53547c930bc0011917c96fa533a18b82f407066f Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Fri, 29 May 2026 15:27:37 +0200
Subject: [PATCH 044/131] Backport 'Fix unconditionally service workers
 inclusion in development' to v0.31 (#16956)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix URLs for service workers cache

* Remove unecessary unconditional import of service worker JS file

Mind that the conditional check if SW should be added is happening at
decidim-core/app/views/layouts/decidim/_decidim_javascript.html.erb

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 decidim-core/app/packs/src/decidim/index.js | 1 -
 decidim-core/app/packs/src/decidim/sw/sw.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/decidim-core/app/packs/src/decidim/index.js b/decidim-core/app/packs/src/decidim/index.js
index a646eaa358f95..f17c377dd4550 100644
--- a/decidim-core/app/packs/src/decidim/index.js
+++ b/decidim-core/app/packs/src/decidim/index.js
@@ -34,7 +34,6 @@ import "src/decidim/security/selfxss_warning"
 import "src/decidim/session_timeouter"
 import "src/decidim/results_listing"
 import "src/decidim/data_consent"
-import "src/decidim/sw"
 import "src/decidim/attachments"
 import "src/decidim/dropdown_menu"
 import "src/decidim/callout"
diff --git a/decidim-core/app/packs/src/decidim/sw/sw.js b/decidim-core/app/packs/src/decidim/sw/sw.js
index 5b882769918d8..bdc45da3b3b2f 100644
--- a/decidim-core/app/packs/src/decidim/sw/sw.js
+++ b/decidim-core/app/packs/src/decidim/sw/sw.js
@@ -53,7 +53,7 @@ self.addEventListener("notificationclick", (event) => {
 // avoid caching admin or users paths
 registerRoute(
   ({ url }) =>
-    ["/admin/", "/users/"].some((path) => url.pathname.startsWith(path)),
+    ["admin", "users"].some((pathSegment) => url.pathname.split("/").includes(pathSegment)),
   new NetworkOnly()
 );
 

From 11151e622767cbd2e812b22b823fcd355471b039 Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Sun, 31 May 2026 08:15:14 +0300
Subject: [PATCH 045/131] Backport 'Fix add missing landmark roles for
 accessibility' to v0.31 (#16963)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: add appropriate roles on header and footer

* fix: add role main in admin and system

* fix: add missing role main in decidim-core views

* fix: add missing role main in decidim-conferences views

* fix: add missing role main in initiatives and processes views

* fix: add missign role main in views

* fix: remove unrelated code

* fix: add missing role banner in views

* fix: remove duplicated role banner

* refactor: update roles after coderabbit analysis

* Remove unecessary role="banner" attributes



* Revert "fix: remove unrelated code"

This reverts commit a3b9b3fc141c03f53c14247fd7fa956442027f89.

---------

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
Co-authored-by: stephanie rousset <strabon@club-internet.fr>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 .../app/views/layouts/decidim/admin/_application.html.erb     | 2 +-
 .../app/views/decidim/assemblies/assemblies/show.html.erb     | 2 +-
 .../decidim/conferences/conference_program/show.html.erb      | 2 +-
 .../decidim/conferences/conference_speakers/index.html.erb    | 2 +-
 .../app/views/decidim/conferences/conferences/show.html.erb   | 2 +-
 .../app/views/decidim/conferences/media/index.html.erb        | 2 +-
 .../decidim/conferences/registration_types/index.html.erb     | 2 +-
 .../app/views/decidim/gamification/badges/index.html.erb      | 2 +-
 decidim-core/app/views/decidim/homepage/show.html.erb         | 2 +-
 decidim-core/app/views/decidim/last_activities/index.html.erb | 2 +-
 .../app/views/decidim/newsletters/unsubscribe.html.erb        | 2 +-
 decidim-core/app/views/decidim/offline/show.html.erb          | 2 +-
 decidim-core/app/views/decidim/profiles/show.html.erb         | 2 +-
 decidim-core/app/views/decidim/user_activities/index.html.erb | 2 +-
 decidim-core/app/views/layouts/decidim/_wrapper.html.erb      | 4 ++--
 .../app/views/layouts/decidim/shared/_layout_center.html.erb  | 2 +-
 .../app/views/layouts/decidim/shared/_layout_item.html.erb    | 2 +-
 .../app/views/layouts/decidim/shared/_layout_two_col.html.erb | 2 +-
 .../app/views/layouts/decidim/design/_layout.html.erb         | 2 +-
 .../app/views/layouts/decidim/election_booth.html.erb         | 4 ++--
 .../app/views/layouts/decidim/initiative.html.erb             | 4 ++--
 .../app/views/layouts/decidim/initiative_head.html.erb        | 2 +-
 .../app/views/decidim/meetings/layouts/live_event.html.erb    | 4 ++--
 .../participatory_process_groups/show.html.erb                | 2 +-
 .../participatory_processes/show.html.erb                     | 2 +-
 .../app/views/layouts/decidim/system/application.html.erb     | 2 +-
 26 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/decidim-admin/app/views/layouts/decidim/admin/_application.html.erb b/decidim-admin/app/views/layouts/decidim/admin/_application.html.erb
index a0f8cd6c93cac..425c8e9492ad0 100644
--- a/decidim-admin/app/views/layouts/decidim/admin/_application.html.erb
+++ b/decidim-admin/app/views/layouts/decidim/admin/_application.html.erb
@@ -11,7 +11,7 @@
   </head>
   <body>
 
-    <main class="main">
+    <main class="main" role="main">
       <div class="layout-wrapper">
         <div class="block md:hidden col-start-1 col-end-2">
           <%= render partial: "layouts/decidim/admin/title_bar_responsive" %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb b/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb
index 457034315d251..5873e609de339 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb
@@ -15,7 +15,7 @@ edit_link(
 
 <%= render partial: "layouts/decidim/header/follow_space_menu_bar_button", locals: { participatory_space: current_participatory_space } %>
 
-<main>
+<main role="main">
   <% if current_participatory_space.private_space? %>
     <section class="participatory-space__block-reference alert">
       <%= t("private_space", scope: "decidim.assemblies.show") %>
diff --git a/decidim-conferences/app/views/decidim/conferences/conference_program/show.html.erb b/decidim-conferences/app/views/decidim/conferences/conference_program/show.html.erb
index 591a3e0391e9f..75d593f13e176 100644
--- a/decidim-conferences/app/views/decidim/conferences/conference_program/show.html.erb
+++ b/decidim-conferences/app/views/decidim/conferences/conference_program/show.html.erb
@@ -14,7 +14,7 @@ end
 %>
 
 <%# NOTE: this page does not use a regular layout %>
-<main class="container">
+<main class="container" role="main">
   <h1 class="title-decorator my-12">
     <span class="not-sr-only"><%= t(".program") %></span>
     <span class="sr-only"><%= t(".program") %> (<%= translated_attribute current_participatory_space.title %>)</span>
diff --git a/decidim-conferences/app/views/decidim/conferences/conference_speakers/index.html.erb b/decidim-conferences/app/views/decidim/conferences/conference_speakers/index.html.erb
index 77c855563a3ae..bfb883f5dcb37 100644
--- a/decidim-conferences/app/views/decidim/conferences/conference_speakers/index.html.erb
+++ b/decidim-conferences/app/views/decidim/conferences/conference_speakers/index.html.erb
@@ -14,7 +14,7 @@ edit_link(
 %>
 
 <%# NOTE: this page does not use a regular layout %>
-<main class="container">
+<main class="container" role="main">
 
   <section id="conference_speakers-grid">
     <h1 class="title-decorator my-12">
diff --git a/decidim-conferences/app/views/decidim/conferences/conferences/show.html.erb b/decidim-conferences/app/views/decidim/conferences/conferences/show.html.erb
index 9fb927673017c..983b5a27dcacc 100644
--- a/decidim-conferences/app/views/decidim/conferences/conferences/show.html.erb
+++ b/decidim-conferences/app/views/decidim/conferences/conferences/show.html.erb
@@ -20,7 +20,7 @@ edit_link(
     include the hero inside the two-column layout.
     Therefore is mandatory to pass the "main_enabled: false" flag
     to the layout_two_col for disabling the original main. %>
-<main>
+<main role="main">
 
   <%= content_for :aside do %>
     <div class="conference__nav-container">
diff --git a/decidim-conferences/app/views/decidim/conferences/media/index.html.erb b/decidim-conferences/app/views/decidim/conferences/media/index.html.erb
index 6baad67eb1192..2ea7fb5b7260f 100644
--- a/decidim-conferences/app/views/decidim/conferences/media/index.html.erb
+++ b/decidim-conferences/app/views/decidim/conferences/media/index.html.erb
@@ -13,7 +13,7 @@ edit_link(
 %>
 
 <%# NOTE: this page does not use a regular layout %>
-<main class="container">
+<main class="container" role="main">
   <h1 class="title-decorator my-12">
     <span class="not-sr-only"><%= t("media", scope: "layouts.decidim.conferences_nav") %></span>
     <span class="sr-only"><%= t("media", scope: "layouts.decidim.conferences_nav") %> (<%= translated_attribute current_participatory_space.title %>)</span>
diff --git a/decidim-conferences/app/views/decidim/conferences/registration_types/index.html.erb b/decidim-conferences/app/views/decidim/conferences/registration_types/index.html.erb
index f785a76fa3064..a66b12a1eb043 100644
--- a/decidim-conferences/app/views/decidim/conferences/registration_types/index.html.erb
+++ b/decidim-conferences/app/views/decidim/conferences/registration_types/index.html.erb
@@ -16,7 +16,7 @@ edit_link(
 <%= append_stylesheet_pack_tag "decidim_conferences" %>
 
 <%# NOTE: this page does not use a regular layout %>
-<main class="container">
+<main class="container" role="main">
 
   <section>
     <h1 class="title-decorator my-12">
diff --git a/decidim-core/app/views/decidim/gamification/badges/index.html.erb b/decidim-core/app/views/decidim/gamification/badges/index.html.erb
index 83ddf160e27de..d5726ec31aee3 100644
--- a/decidim-core/app/views/decidim/gamification/badges/index.html.erb
+++ b/decidim-core/app/views/decidim/gamification/badges/index.html.erb
@@ -3,7 +3,7 @@
   description: t(".page_description")
 ) %>
 
-<main class="layout-1col cols-10">
+<main class="layout-1col cols-10" role="main">
 
   <header class="text-center py-10">
     <h1 class="title-decorator inline-block text-left mb-12">
diff --git a/decidim-core/app/views/decidim/homepage/show.html.erb b/decidim-core/app/views/decidim/homepage/show.html.erb
index b326b82b035e4..552c50ba0ff13 100644
--- a/decidim-core/app/views/decidim/homepage/show.html.erb
+++ b/decidim-core/app/views/decidim/homepage/show.html.erb
@@ -7,7 +7,7 @@
   )
 %>
 
-<main class="home">
+<main class="home" role="main">
   <% Decidim::ContentBlock.published.for_scope(:homepage, organization: current_organization).each do |content_block| %>
     <% next unless content_block.manifest %>
 
diff --git a/decidim-core/app/views/decidim/last_activities/index.html.erb b/decidim-core/app/views/decidim/last_activities/index.html.erb
index 64da709dca19f..1b59639ff85ac 100644
--- a/decidim-core/app/views/decidim/last_activities/index.html.erb
+++ b/decidim-core/app/views/decidim/last_activities/index.html.erb
@@ -1,7 +1,7 @@
 <% add_decidim_page_title(t("last_activity", scope: "decidim.last_activities.index")) %>
 
 <%# NOTE: this page does not use a regular layout %>
-<main class="container">
+<main class="container" role="main">
   <h1 class="title-decorator my-12"><%= t("last_activity", scope: "decidim.last_activities.index") %></h1>
 
   <div class="profile__activity pb-16">
diff --git a/decidim-core/app/views/decidim/newsletters/unsubscribe.html.erb b/decidim-core/app/views/decidim/newsletters/unsubscribe.html.erb
index d0ac5c0587d57..5588cb6c5c7fd 100644
--- a/decidim-core/app/views/decidim/newsletters/unsubscribe.html.erb
+++ b/decidim-core/app/views/decidim/newsletters/unsubscribe.html.erb
@@ -1,4 +1,4 @@
-<main class="layout-1col cols-6">
+<main class="layout-1col cols-6" role="main">
   <div class="text-center py-12">
     <h1 class="h1 decorator inline-block text-left"><%= t ".unsubscribe" %></h1>
   </div>
diff --git a/decidim-core/app/views/decidim/offline/show.html.erb b/decidim-core/app/views/decidim/offline/show.html.erb
index 02063ccdac4d4..33f81474f072d 100644
--- a/decidim-core/app/views/decidim/offline/show.html.erb
+++ b/decidim-core/app/views/decidim/offline/show.html.erb
@@ -1,6 +1,6 @@
 <% add_decidim_page_title(t("decidim.offline.name")) %>
 
-<main id="offline-fallback-html" class="text-center my-8">
+<main id="offline-fallback-html" class="text-center my-8" role="main">
   <div class="flex justify-center">
     <svg xmlns="http://www.w3.org/2000/svg" width="5rem" height="r5em" viewBox="0 0 25 25">
       <path
diff --git a/decidim-core/app/views/decidim/profiles/show.html.erb b/decidim-core/app/views/decidim/profiles/show.html.erb
index 0e7ea020ac249..73d8fb7443c04 100644
--- a/decidim-core/app/views/decidim/profiles/show.html.erb
+++ b/decidim-core/app/views/decidim/profiles/show.html.erb
@@ -6,6 +6,6 @@
 <% end %>
 
 <%# NOTE: this page does not use a regular layout %>
-<main>
+<main role="main">
   <%= cell "decidim/profile", profile_holder, context: { content_cell: @content_cell } %>
 </main>
diff --git a/decidim-core/app/views/decidim/user_activities/index.html.erb b/decidim-core/app/views/decidim/user_activities/index.html.erb
index d78ca09f1fbc9..3e276f0f4b077 100644
--- a/decidim-core/app/views/decidim/user_activities/index.html.erb
+++ b/decidim-core/app/views/decidim/user_activities/index.html.erb
@@ -6,7 +6,7 @@
 <% end %>
 
 <%# NOTE: this page does not use a regular layout %>
-<main>
+<main role="main">
   <%= cell "decidim/profile", user, context: {
         content_cell: "decidim/user_activity",
         activities:,
diff --git a/decidim-core/app/views/layouts/decidim/_wrapper.html.erb b/decidim-core/app/views/layouts/decidim/_wrapper.html.erb
index 067a78c7d2c30..821171a6dda1e 100644
--- a/decidim-core/app/views/layouts/decidim/_wrapper.html.erb
+++ b/decidim-core/app/views/layouts/decidim/_wrapper.html.erb
@@ -11,7 +11,7 @@ end
 %>
 
 <div class="layout-container">
-  <header <%= "class=with-admin-bar" if current_user && allowed_to?(:read, :admin_dashboard) %>>
+  <header <%= "class=with-admin-bar" if current_user && allowed_to?(:read, :admin_dashboard) %> role="banner">
     <div id="sticky-header-container" data-controller="sticky-header">
       <%= render partial: "layouts/decidim/impersonation_warning" %>
       <%= render partial: "layouts/decidim/omnipresent_banner" %>
@@ -37,7 +37,7 @@ end
     <%= yield %>
   </div>
 
-  <footer>
+  <footer role="contentinfo">
     <% if current_user&.ephemeral? || content_for?(:focus_mode) %>
       <%= render partial: "layouts/decidim/footer/focus_mode_main" %>
     <% else %>
diff --git a/decidim-core/app/views/layouts/decidim/shared/_layout_center.html.erb b/decidim-core/app/views/layouts/decidim/shared/_layout_center.html.erb
index c053bcc1d4826..cac79a026e06c 100644
--- a/decidim-core/app/views/layouts/decidim/shared/_layout_center.html.erb
+++ b/decidim-core/app/views/layouts/decidim/shared/_layout_center.html.erb
@@ -10,6 +10,6 @@ css_class = case columns
             end
 %>
 
-<%= content_tag main_tag, class: "layout-1col #{css_class}" do %>
+<%= content_tag main_tag, class: "layout-1col #{css_class}", role: (main_enabled ? "main" : nil)  do %>
   <%= yield %>
 <% end %>
diff --git a/decidim-core/app/views/layouts/decidim/shared/_layout_item.html.erb b/decidim-core/app/views/layouts/decidim/shared/_layout_item.html.erb
index 5a245970dd03f..340293823d7f0 100644
--- a/decidim-core/app/views/layouts/decidim/shared/_layout_item.html.erb
+++ b/decidim-core/app/views/layouts/decidim/shared/_layout_item.html.erb
@@ -2,7 +2,7 @@
   <%= yield :item_header %>
 </div>
 <div class="<%= layout_item_classes %>">
-  <main class="layout-item__main">
+  <main class="layout-item__main" role="main">
     <% if params[:included_in] %>
       <%= render partial: "layouts/decidim/shared/linked_resource" %>
     <% end %>
diff --git a/decidim-core/app/views/layouts/decidim/shared/_layout_two_col.html.erb b/decidim-core/app/views/layouts/decidim/shared/_layout_two_col.html.erb
index f8c1fd11b687c..ad4c819c8a06f 100644
--- a/decidim-core/app/views/layouts/decidim/shared/_layout_two_col.html.erb
+++ b/decidim-core/app/views/layouts/decidim/shared/_layout_two_col.html.erb
@@ -7,7 +7,7 @@
     <%= yield :aside %>
   </aside>
   <% main_tag = main_enabled ? :main : :div %>
-  <%= content_tag main_tag, class: "layout-2col__main" do %>
+  <%= content_tag main_tag, class: "layout-2col__main", role: (main_enabled ? "main" : nil) do %>
     <%= content_for :flash_messages %>
     <%= yield %>
   <% end %>
diff --git a/decidim-design/app/views/layouts/decidim/design/_layout.html.erb b/decidim-design/app/views/layouts/decidim/design/_layout.html.erb
index 739dd8982c9ee..d7c1470777e1f 100644
--- a/decidim-design/app/views/layouts/decidim/design/_layout.html.erb
+++ b/decidim-design/app/views/layouts/decidim/design/_layout.html.erb
@@ -53,7 +53,7 @@
     </ul>
   </aside>
 
-  <main id="content">
+  <main id="content" role="main">
     <% if content_for?(:heading) %>
       <section class="design__heading__section">
         <h1 class="design__heading__5xl">
diff --git a/decidim-elections/app/views/layouts/decidim/election_booth.html.erb b/decidim-elections/app/views/layouts/decidim/election_booth.html.erb
index d2758a4c79248..96eff8c954680 100644
--- a/decidim-elections/app/views/layouts/decidim/election_booth.html.erb
+++ b/decidim-elections/app/views/layouts/decidim/election_booth.html.erb
@@ -12,7 +12,7 @@
   </head>
   <body class="text-black text-md form-defaults<%= yield (:body_class) %>">
   <div class="layout-container">
-    <header>
+    <header role="banner">
       <div id="elections-header-container">
         <%= render partial: "layouts/decidim/election_votes_header" %>
       </div>
@@ -22,7 +22,7 @@
         <%= display_flash_messages %>
       </div>
     <% end %>
-    <main class="layout-1col cols-6">
+    <main class="layout-1col cols-6" role="main">
       <div class="py-8 space-y-8 lg:py-12 lg:space-y-12">
         <%= yield %>
       </div>
diff --git a/decidim-initiatives/app/views/layouts/decidim/initiative.html.erb b/decidim-initiatives/app/views/layouts/decidim/initiative.html.erb
index a49d60de5d8a2..0b91e6d4076e2 100644
--- a/decidim-initiatives/app/views/layouts/decidim/initiative.html.erb
+++ b/decidim-initiatives/app/views/layouts/decidim/initiative.html.erb
@@ -4,8 +4,8 @@
 <% provide :meta_image_url, current_participatory_space.type.attached_uploader(:banner_image).url %>
 
 <%= render "layouts/decidim/application" do %>
-  <%= render layout: "layouts/decidim/shared/layout_center" do %>
-    <main>
+  <%= render layout: "layouts/decidim/shared/layout_center", locals: { main_enabled: false } do %>
+    <main role="main">
       <%= yield %>
     </main>
     <% if content_for? :expanded %>
diff --git a/decidim-initiatives/app/views/layouts/decidim/initiative_head.html.erb b/decidim-initiatives/app/views/layouts/decidim/initiative_head.html.erb
index 2a644271e7670..354804f0cb77c 100644
--- a/decidim-initiatives/app/views/layouts/decidim/initiative_head.html.erb
+++ b/decidim-initiatives/app/views/layouts/decidim/initiative_head.html.erb
@@ -8,7 +8,7 @@
 <%= render "layouts/decidim/application" do %>
   <%= render partial: "decidim/initiatives/initiatives/initiative_hero" %>
   <%= render layout:"layouts/decidim/shared/layout_two_col", locals: { reverse: true, main_enabled: false } do %>
-    <main>
+    <main role="main">
       <%= yield %>
     </main>
   <% end %>
diff --git a/decidim-meetings/app/views/decidim/meetings/layouts/live_event.html.erb b/decidim-meetings/app/views/decidim/meetings/layouts/live_event.html.erb
index 100c2b79a9f64..726e665d975ce 100644
--- a/decidim-meetings/app/views/decidim/meetings/layouts/live_event.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/layouts/live_event.html.erb
@@ -13,7 +13,7 @@
   <body class="meeting-polls__body">
     <%= render partial: "layouts/decidim/timeout_modal" %>
 
-    <header class="meeting-polls__header">
+    <header class="meeting-polls__header" role="banner">
       <div>
         <strong class="text-secondary"><%= current_organization_name %></strong> / <strong><%= present(meeting).title(html_escape: true) %></strong>
       </div>
@@ -30,7 +30,7 @@
       </div>
     </header>
 
-    <main class="meeting-polls__main">
+    <main class="meeting-polls__main" role="main">
       <%= yield %>
     </main>
 
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_groups/show.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_groups/show.html.erb
index ca88b316b304b..8400ce665de75 100644
--- a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_groups/show.html.erb
+++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_groups/show.html.erb
@@ -12,7 +12,7 @@
   )
 %>
 
-<main class="participatory-space__container">
+<main class="participatory-space__container" role="main">
   <% active_content_blocks.each do |content_block| %>
     <% next unless content_block.manifest %>
     <%= cell content_block.manifest.cell, content_block %>
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb
index dad070c7c6594..39b4b4e0b4868 100644
--- a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb
+++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb
@@ -16,7 +16,7 @@
 
 <%= render partial: "layouts/decidim/header/follow_space_menu_bar_button", locals: { participatory_space: current_participatory_space } %>
 
-<main>
+<main role="main">
   <%# NOTE: this elements goes outside of the .participatory-space__container block %>
   <% if current_participatory_space.private_space? %>
     <section class="participatory-space__block-reference alert">
diff --git a/decidim-system/app/views/layouts/decidim/system/application.html.erb b/decidim-system/app/views/layouts/decidim/system/application.html.erb
index f88472e1f287b..a9cc9cfb07aba 100644
--- a/decidim-system/app/views/layouts/decidim/system/application.html.erb
+++ b/decidim-system/app/views/layouts/decidim/system/application.html.erb
@@ -11,7 +11,7 @@
     <%= render partial: "layouts/decidim/system/sidebar" %>
   </aside>
 
-  <main class="grow">
+  <main class="grow" role="main">
     <div class="flex md:hidden items-center gap-2 bg-primary p-4 text-white font-bold text-lg">
       <button id="aside-trigger" class="flex-none md:hidden" data-controller="dropdown" data-target="aside-system" data-disabled-md="true">
         <%= icon "menu-line", class: "w-6 h-6 text-white fill-current" %>

From 7a9fa035a48f07bf98eb04ec9954df1bfd974d9c Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Sun, 31 May 2026 08:19:44 +0300
Subject: [PATCH 046/131] Backport 'Show number of votes in transparent space'
 to v0.31 (#16975)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Show number of votes in transparent space

* Show number of votes in transparent space

* Update decidim-proposals/spec/system/transparent_space_proposal_spec.rb

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Change from .is_transparent? to .try(:transparent?)

* Lint

* Update decidim-proposals/spec/system/transparent_space_proposal_spec.rb

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

* Refactor in a new cell

* Update decidim-proposals/spec/system/transparent_space_proposal_spec.rb

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

* Fix failing specs

* Fix additional specs

---------

Co-authored-by: Fran Bolívar (FBO) <francisco.bolivar@nazaries.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 .../decidim/proposals/proposal_vote/show.erb  | 17 +---
 .../participatory_texts.erb}                  | 34 +++----
 .../proposals/proposal_votes_count/show.erb   | 12 +++
 .../proposals/proposal_votes_count_cell.rb    | 81 ++++++++++++++++
 .../update_buttons_and_counters.js.erb        |  2 +-
 .../proposals/_proposal_aside.html.erb        |  2 +-
 .../proposals/proposals/_votes_count.html.erb | 16 ----
 .../proposal_votes_count_cell_spec.rb         | 95 +++++++++++++++++++
 .../system/private_space_proposal_spec.rb     | 22 -----
 .../system/transparent_space_proposal_spec.rb | 94 ++++++++++++++++++
 10 files changed, 302 insertions(+), 73 deletions(-)
 rename decidim-proposals/app/{views/decidim/proposals/proposals/participatory_texts/_proposal_votes_count.html.erb => cells/decidim/proposals/proposal_votes_count/participatory_texts.erb} (53%)
 create mode 100644 decidim-proposals/app/cells/decidim/proposals/proposal_votes_count/show.erb
 create mode 100644 decidim-proposals/app/cells/decidim/proposals/proposal_votes_count_cell.rb
 delete mode 100644 decidim-proposals/app/views/decidim/proposals/proposals/_votes_count.html.erb
 create mode 100644 decidim-proposals/spec/cells/decidim/proposals/proposal_votes_count_cell_spec.rb
 create mode 100644 decidim-proposals/spec/system/transparent_space_proposal_spec.rb

diff --git a/decidim-proposals/app/cells/decidim/proposals/proposal_vote/show.erb b/decidim-proposals/app/cells/decidim/proposals/proposal_vote/show.erb
index d3a2517793c0e..370e768520c81 100644
--- a/decidim-proposals/app/cells/decidim/proposals/proposal_vote/show.erb
+++ b/decidim-proposals/app/cells/decidim/proposals/proposal_vote/show.erb
@@ -1,19 +1,4 @@
-<% if !current_settings.votes_hidden? && (current_component.participatory_space.can_participate?(current_user) || current_user&.admin?) %>
-  <% if component_settings.participatory_texts_enabled? && from_proposals_list %>
-    <%= render partial: "decidim/proposals/proposals/participatory_texts/proposal_votes_count", locals: { proposal: resource, from_proposals_list: true } %>
-  <% else %>
-    <% progress ||= resource.proposal_votes_count || 0 %>
-    <% total ||= resource.maximum_votes || 0 %>
-    <%= cell(
-          "decidim/progress_bar",
-          progress,
-          total:,
-          units_name: "decidim.proposals.proposals.votes_count.count",
-          element_id: "proposal-#{resource.id}-votes-count",
-          class: total.positive? ? "card__proposals-votes-limited" : "card__proposals-votes-unlimited"
-        ) %>
-  <% end %>
-<% end %>
+<%= cell("decidim/proposals/proposal_votes_count", resource, from_proposals_list:) %>
 
 <% button_classes = "button button__sm button__secondary w-full" %>
 
diff --git a/decidim-proposals/app/views/decidim/proposals/proposals/participatory_texts/_proposal_votes_count.html.erb b/decidim-proposals/app/cells/decidim/proposals/proposal_votes_count/participatory_texts.erb
similarity index 53%
rename from decidim-proposals/app/views/decidim/proposals/proposals/participatory_texts/_proposal_votes_count.html.erb
rename to decidim-proposals/app/cells/decidim/proposals/proposal_votes_count/participatory_texts.erb
index f75517808564b..396570c6ccdd5 100644
--- a/decidim-proposals/app/views/decidim/proposals/proposals/participatory_texts/_proposal_votes_count.html.erb
+++ b/decidim-proposals/app/cells/decidim/proposals/proposal_votes_count/participatory_texts.erb
@@ -1,38 +1,38 @@
-<% if proposal.rejected? %>
+<% if resource.rejected? %>
   <div></div>
 <% else %>
   <% if !current_user %>
     <% if current_settings.votes_blocked? %>
-      <button type="button" name="button" class="column button button--sc disabled" disabled id="proposal-<%= proposal.id %>-votes-count">
-        <%= proposal.proposal_votes_count || 0 %>
+      <button type="button" name="button" class="column button button--sc disabled" disabled id="<%= element_id %>">
+        <%= resource.proposal_votes_count || 0 %>
       </button>
     <% else %>
-      <button type="button" name="button" class="column button button--sc" id="proposal-<%= proposal.id %>-votes-count">
-        <%= proposal.proposal_votes_count || 0 %>
+      <button type="button" name="button" class="column button button--sc" id="<%= element_id %>">
+        <%= resource.proposal_votes_count || 0 %>
       </button>
     <% end %>
   <% else %>
-    <% if proposal_voted_by_user?(proposal) %>
-      <button type="button" name="button" class="column button success button--sc" id="proposal-<%= proposal.id %>-votes-count">
-        <%= proposal.proposal_votes_count || 0 %>
+    <% if proposal_voted_by_user?(resource) %>
+      <button type="button" name="button" class="column button success button--sc" id="<%= element_id %>">
+        <%= resource.proposal_votes_count || 0 %>
       </button>
     <% else %>
-      <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
-        <button type="button" name="button" class="column button button--sc disabled" disabled id="proposal-<%= proposal.id %>-votes-count">
-          <%= proposal.proposal_votes_count || 0 %>
+      <% if resource.maximum_votes_reached? && !resource.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
+        <button type="button" name="button" class="column button button--sc disabled" disabled id="<%= element_id %>">
+          <%= resource.proposal_votes_count || 0 %>
         </button>
       <% else %>
         <% if vote_limit_enabled? && remaining_votes_count_for_user == 0 %>
-          <button type="button" name="button" class="column button button--sc" disabled id="proposal-<%= proposal.id %>-votes-count">
-            <%= proposal.proposal_votes_count || 0 %>
+          <button type="button" name="button" class="column button button--sc" disabled id="<%= element_id %>">
+            <%= resource.proposal_votes_count || 0 %>
           </button>
         <% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
-          <button type="button" name="button" class="column button button--sc disabled" disabled id="proposal-<%= proposal.id %>-votes-count">
-            <%= proposal.proposal_votes_count || 0 %>
+          <button type="button" name="button" class="column button button--sc disabled" disabled id="<%= element_id %>">
+            <%= resource.proposal_votes_count || 0 %>
           </button>
         <% else %>
-          <button type="button" name="button" class="column button button--sc" id="proposal-<%= proposal.id %>-votes-count">
-            <%= proposal.proposal_votes_count || 0 %>
+          <button type="button" name="button" class="column button button--sc" id="<%= element_id %>">
+            <%= resource.proposal_votes_count || 0 %>
           </button>
         <% end %>
       <% end %>
diff --git a/decidim-proposals/app/cells/decidim/proposals/proposal_votes_count/show.erb b/decidim-proposals/app/cells/decidim/proposals/proposal_votes_count/show.erb
new file mode 100644
index 0000000000000..4a959192377a8
--- /dev/null
+++ b/decidim-proposals/app/cells/decidim/proposals/proposal_votes_count/show.erb
@@ -0,0 +1,12 @@
+<% if participatory_texts_variant? %>
+  <%= render :participatory_texts %>
+<% else %>
+  <%= cell(
+        "decidim/progress_bar",
+        progress,
+        total:,
+        units_name: "decidim.proposals.proposals.votes_count.count",
+        element_id:,
+        class: progress_bar_class
+      ) %>
+<% end %>
diff --git a/decidim-proposals/app/cells/decidim/proposals/proposal_votes_count_cell.rb b/decidim-proposals/app/cells/decidim/proposals/proposal_votes_count_cell.rb
new file mode 100644
index 0000000000000..04a50496dcc06
--- /dev/null
+++ b/decidim-proposals/app/cells/decidim/proposals/proposal_votes_count_cell.rb
@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # Renders the votes count (progress bar or participatory texts variant)
+    # for a given proposal
+    class ProposalVotesCountCell < Decidim::ViewModel
+      include Cell::ViewModel::Partial
+      include Decidim::Proposals::ProposalVotesHelper
+
+      alias resource model
+
+      def show
+        return unless can_see_votes?
+
+        render
+      end
+
+      private
+
+      def can_see_votes?
+        return false if component.current_settings.votes_hidden?
+
+        space_member? || admin? || transparent_space?
+      end
+
+      def space_member?
+        participatory_space.can_participate?(current_user)
+      end
+
+      def admin?
+        current_user&.admin?
+      end
+
+      def transparent_space?
+        participatory_space.try(:is_transparent?)
+      end
+
+      def participatory_texts_variant?
+        component.settings.participatory_texts_enabled? && from_proposals_list?
+      end
+
+      def component
+        resource.component
+      end
+      alias current_component component
+
+      def participatory_space
+        component.participatory_space
+      end
+
+      def current_settings
+        component.current_settings
+      end
+
+      def component_settings
+        component.settings
+      end
+
+      def from_proposals_list?
+        options[:from_proposals_list]
+      end
+
+      def progress
+        resource.proposal_votes_count || 0
+      end
+
+      def total
+        resource.maximum_votes || 0
+      end
+
+      def progress_bar_class
+        total.positive? ? "card__proposals-votes-limited" : "card__proposals-votes-unlimited"
+      end
+
+      def element_id
+        "proposal-#{resource.id}-votes-count"
+      end
+    end
+  end
+end
diff --git a/decidim-proposals/app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb b/decidim-proposals/app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb
index c363a6d95cbb8..0493123fe2025 100644
--- a/decidim-proposals/app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb
+++ b/decidim-proposals/app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb
@@ -3,7 +3,7 @@
     var $proposalVotesCount = $('#proposal-<%= proposal.id %>-votes-count');
 
     if($proposalVotesCount[0]) {
-      morphdom($proposalVotesCount[0], '<%= j(render partial: "decidim/proposals/proposals/votes_count", locals: { proposal:, from_proposals_list: @from_proposals_list }).strip.html_safe %>');
+      morphdom($proposalVotesCount[0], '<%= j(cell("decidim/proposals/proposal_votes_count", proposal, from_proposals_list: @from_proposals_list).to_s).strip.html_safe %>');
     }
 
     var $proposalVoteButton = $('#proposal-<%= proposal.id %>-vote-button');
diff --git a/decidim-proposals/app/views/decidim/proposals/proposals/_proposal_aside.html.erb b/decidim-proposals/app/views/decidim/proposals/proposals/_proposal_aside.html.erb
index 93bfc2b63b011..5d2560bceec16 100644
--- a/decidim-proposals/app/views/decidim/proposals/proposals/_proposal_aside.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/proposals/_proposal_aside.html.erb
@@ -2,7 +2,7 @@
   <section class="layout-aside__section">
     <div class="proposal__aside-vote layout-aside__ctas-buttons" data-controller="sticky-buttons">
       <%= render partial: "vote_button", locals: { proposal: @proposal, from_proposals_list: false } unless @proposal.withdrawn? %>
-      <%= render partial: "votes_count", locals: { proposal: @proposal, from_proposals_list: false } %>
+      <%= cell("decidim/proposals/proposal_votes_count", @proposal, from_proposals_list: false) %>
     </div>
   </section>
 <% end %>
diff --git a/decidim-proposals/app/views/decidim/proposals/proposals/_votes_count.html.erb b/decidim-proposals/app/views/decidim/proposals/proposals/_votes_count.html.erb
deleted file mode 100644
index fde49c5ff07b8..0000000000000
--- a/decidim-proposals/app/views/decidim/proposals/proposals/_votes_count.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% if !current_settings.votes_hidden? && (current_component.participatory_space.can_participate?(current_user) || current_user&.admin?) %>
-  <% if component_settings.participatory_texts_enabled? && from_proposals_list %>
-    <%= render partial: "decidim/proposals/proposals/participatory_texts/proposal_votes_count", locals: { proposal:, from_proposals_list: true } %>
-  <% else %>
-    <% progress ||= proposal.proposal_votes_count || 0 %>
-    <% total ||= proposal.maximum_votes || 0 %>
-    <%= cell(
-      "decidim/progress_bar",
-      progress,
-      total:,
-      units_name: "decidim.proposals.proposals.votes_count.count",
-      element_id: "proposal-#{proposal.id}-votes-count",
-      class: total.positive? ? "card__proposals-votes-limited" : "card__proposals-votes-unlimited"
-    ) %>
-  <% end %>
-<% end %>
diff --git a/decidim-proposals/spec/cells/decidim/proposals/proposal_votes_count_cell_spec.rb b/decidim-proposals/spec/cells/decidim/proposals/proposal_votes_count_cell_spec.rb
new file mode 100644
index 0000000000000..40327d705f314
--- /dev/null
+++ b/decidim-proposals/spec/cells/decidim/proposals/proposal_votes_count_cell_spec.rb
@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::Proposals
+  describe ProposalVotesCountCell, type: :cell do
+    controller Decidim::Proposals::ProposalsController
+
+    subject(:cell_html) { my_cell.call }
+
+    let(:my_cell) { cell("decidim/proposals/proposal_votes_count", proposal, from_proposals_list:) }
+    let(:from_proposals_list) { false }
+    let(:organization) { create(:organization) }
+    let(:participatory_space) { create(:assembly, :public, organization:) }
+    let(:component) { create(:proposal_component, participatory_space:) }
+    let!(:proposal) { create(:proposal, component:) }
+    let(:user) { create(:user, organization:) }
+
+    before do
+      allow(controller).to receive(:current_user).and_return(user)
+    end
+
+    describe "show" do
+      let(:votes_count_selector) { "#proposal-#{proposal.id}-votes-count" }
+
+      context "when votes are hidden" do
+        before do
+          component.update!(default_step_settings: { votes_hidden: true, votes_enabled: true })
+        end
+
+        it "renders nothing" do
+          expect(subject).to have_no_css(votes_count_selector)
+        end
+      end
+
+      context "when the user can participate in the space" do
+        it "renders the progress bar" do
+          expect(subject).to have_css(votes_count_selector)
+        end
+      end
+
+      context "when the user is an admin" do
+        let(:user) { create(:user, :admin, :confirmed, organization:) }
+        let(:participatory_space) { create(:assembly, :private, organization:) }
+
+        it "renders the progress bar" do
+          expect(subject).to have_css(votes_count_selector)
+        end
+      end
+
+      context "when the space is a transparent assembly" do
+        let(:participatory_space) { create(:assembly, :transparent, organization:) }
+
+        it "renders the progress bar" do
+          expect(subject).to have_css(votes_count_selector)
+        end
+      end
+
+      context "when the space is private and the user is not a member" do
+        let(:participatory_space) { create(:assembly, :private, :opaque, organization:) }
+
+        it "renders nothing" do
+          expect(subject).to have_no_css(votes_count_selector)
+        end
+      end
+
+      context "when there is no current user" do
+        let(:user) { nil }
+        let(:participatory_space) { create(:assembly, :private, :opaque, organization:) }
+
+        it "renders nothing" do
+          expect(subject).to have_no_css(votes_count_selector)
+        end
+
+        context "and the space is transparent" do
+          let(:participatory_space) { create(:assembly, :transparent, organization:) }
+
+          it "renders the progress bar" do
+            expect(subject).to have_css(votes_count_selector)
+          end
+        end
+      end
+
+      context "when participatory texts are enabled and rendered from the proposals list" do
+        let(:from_proposals_list) { true }
+        let(:component) { create(:proposal_component, :with_participatory_texts_enabled, participatory_space:) }
+
+        it "renders the participatory texts variant" do
+          expect(subject).to have_css(votes_count_selector)
+          expect(subject).to have_no_css(".card__proposals-votes-limited, .card__proposals-votes-unlimited")
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-proposals/spec/system/private_space_proposal_spec.rb b/decidim-proposals/spec/system/private_space_proposal_spec.rb
index 7391c759fc311..fd46e50dcf45e 100644
--- a/decidim-proposals/spec/system/private_space_proposal_spec.rb
+++ b/decidim-proposals/spec/system/private_space_proposal_spec.rb
@@ -33,28 +33,6 @@ def visit_component
           expect(page).to have_no_link("New proposal")
         end
       end
-
-      context "when the component has votes enabled and the proposal has votes" do
-        let!(:proposal) { create(:proposal, :official, :with_votes, component:) }
-
-        before do
-          component.default_step_settings = component.default_step_settings.to_h.merge({ votes_enabled: true })
-          component.save!
-        end
-
-        context "when accessing the proposal page" do
-          let(:target_path) { Decidim::ResourceLocatorPresenter.new(proposal).path }
-
-          before do
-            visit target_path
-          end
-
-          it "can access the page but cannot see the votes" do
-            expect(page).to have_content(proposal.title["en"])
-            expect(page).to have_no_content("Votes")
-          end
-        end
-      end
     end
 
     context "when the user is logged in" do
diff --git a/decidim-proposals/spec/system/transparent_space_proposal_spec.rb b/decidim-proposals/spec/system/transparent_space_proposal_spec.rb
new file mode 100644
index 0000000000000..2b8de3562826d
--- /dev/null
+++ b/decidim-proposals/spec/system/transparent_space_proposal_spec.rb
@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Transparent Space Proposal" do
+  let!(:organization) { create(:organization) }
+  let(:user) { create(:user, :confirmed, organization:) }
+  let!(:other_user) { create(:user, :confirmed, organization:) }
+  let!(:member) { create(:assembly_private_user, user: other_user, privatable_to: participatory_space) }
+
+  let!(:participatory_space) { create(:assembly, :published, :private, :transparent, organization:) }
+  let!(:component) { create(:proposal_component, participatory_space:) }
+
+  before do
+    switch_to_host(organization.host)
+    component.update!(default_step_settings: { creation_enabled: true })
+  end
+
+  def visit_component
+    page.visit main_component_path(component)
+  end
+
+  context "when the user is not logged in" do
+    it "allows creating a proposal" do
+      visit_component
+
+      within "aside" do
+        expect(page).to have_no_link("New proposal")
+      end
+    end
+
+    context "when the component has votes enabled and the proposal has votes" do
+      let!(:proposal) { create(:proposal, :official, :with_votes, component:) }
+
+      before do
+        component.default_step_settings = component.default_step_settings.to_h.merge({ votes_enabled: true })
+        component.save!
+      end
+
+      context "when accessing the proposal page" do
+        let(:target_path) { Decidim::ResourceLocatorPresenter.new(proposal).path }
+
+        before do
+          visit target_path
+        end
+
+        it "can access the page and see the votes" do
+          expect(page).to have_content(proposal.title["en"])
+          expect(page).to have_content("Votes")
+        end
+      end
+
+      context "when accessing the proposal list page" do
+        before do
+          visit_component
+        end
+
+        it "can see the votes" do
+          expect(page).to have_content("Votes")
+        end
+      end
+    end
+  end
+
+  context "when the user is logged in" do
+    context "and is member space" do
+      before do
+        login_as other_user, scope: :user
+      end
+
+      it "allows creating a proposal" do
+        visit_component
+
+        within "aside" do
+          expect(page).to have_link("New proposal")
+        end
+      end
+    end
+
+    context "and is not member space" do
+      before do
+        login_as user, scope: :user
+      end
+
+      it "does not allow creating a proposal" do
+        visit_component
+
+        within "aside" do
+          expect(page).to have_no_link("New proposal")
+        end
+      end
+    end
+  end
+end

From c4e31e531db0297514ada3d4671d43dcac7f5657 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Mon, 1 Jun 2026 20:31:11 +0200
Subject: [PATCH 047/131] Backport 'Fix exception when user is already invited
 in meetings' to v0.31 (#16987)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix exception when user is already invited in meetings

* Fix exception when user is already invited

* Alternate fix

* Fix spec description

* Apply suggestions from code review

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

---------

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

* Fix specs

* Fix failing specs

---------

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 .../meetings/admin/invites_controller.rb      |  1 +
 .../admin_filters_meeting_invites_spec.rb     | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/decidim-meetings/app/controllers/decidim/meetings/admin/invites_controller.rb b/decidim-meetings/app/controllers/decidim/meetings/admin/invites_controller.rb
index ea55f8e813bf0..d7576c04923fa 100644
--- a/decidim-meetings/app/controllers/decidim/meetings/admin/invites_controller.rb
+++ b/decidim-meetings/app/controllers/decidim/meetings/admin/invites_controller.rb
@@ -20,6 +20,7 @@ def index
         def create
           enforce_permission_to(:invite_attendee, :meeting, meeting:)
 
+          @invites = filtered_collection
           @form = form(MeetingRegistrationInviteForm).from_params(params)
 
           InviteUserToJoinMeeting.call(@form, meeting, current_user) do
diff --git a/decidim-meetings/spec/system/admin/admin_filters_meeting_invites_spec.rb b/decidim-meetings/spec/system/admin/admin_filters_meeting_invites_spec.rb
index 80b1561178494..01f5126e414a4 100644
--- a/decidim-meetings/spec/system/admin/admin_filters_meeting_invites_spec.rb
+++ b/decidim-meetings/spec/system/admin/admin_filters_meeting_invites_spec.rb
@@ -44,4 +44,30 @@
   it_behaves_like "paginating a collection" do
     let!(:collection) { create_list(:invite, 50, meeting:) }
   end
+
+  context "when user exists in database" do
+    let(:meeting) { create(:meeting, :with_registrations_enabled) }
+
+    it "successfully handles the error" do
+      fill_in :meeting_registration_invite_name, with: user1.name
+      fill_in :meeting_registration_invite_email, with: user1.email
+      click_on "Invite"
+
+      expect(page).to have_content("There was a problem inviting the participant to join the meeting.")
+    end
+  end
+
+  context "when user does not exist in database" do
+    let(:meeting) { create(:meeting, :with_registrations_enabled) }
+
+    it "successfully handles the invite" do
+      invited = build(:user, organization:)
+
+      fill_in :meeting_registration_invite_name, with: invited.name
+      fill_in :meeting_registration_invite_email, with: invited.email
+      click_on "Invite"
+
+      expect(page).to have_content("Participant successfully invited to join the meeting.")
+    end
+  end
 end

From a28bf6479c40cdffe0467ae07805418bdfd5e0e5 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Tue, 2 Jun 2026 00:34:36 +0200
Subject: [PATCH 048/131] Backport 'Prevent start date validation on manual
 start when editing published elections' to v0.31 (#16998)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* prevent start date validation on manual start when editing published elections

* address review

Co-authored-by: Ivan Vergés <ivan@pokecode.net>
---
 .../decidim/elections/admin/election_form.rb  |  2 +-
 .../elections/admin/election_form_spec.rb     | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/decidim-elections/app/forms/decidim/elections/admin/election_form.rb b/decidim-elections/app/forms/decidim/elections/admin/election_form.rb
index f8d6e12a195c7..1a4972fb8a490 100644
--- a/decidim-elections/app/forms/decidim/elections/admin/election_form.rb
+++ b/decidim-elections/app/forms/decidim/elections/admin/election_form.rb
@@ -25,7 +25,7 @@ class ElectionForm < Decidim::Form
         validates :title, translatable_presence: true
         validates :results_availability, inclusion: { in: Decidim::Elections::Election::RESULTS_AVAILABILITY_OPTIONS }
         validates :start_at, date: { before: :end_at }, unless: :manual_start?
-        validates :start_at, date: { after: proc { Time.current } }, if: :scheduled_election?
+        validates :start_at, date: { after: proc { Time.current } }, if: ->(f) { f.election&.scheduled? && f.start_at.present? }
         validates :manual_start, acceptance: true, if: :per_question_not_started?
         validates :end_at, presence: true
         validates :end_at, date: { after: :start_at }, if: ->(f) { f.start_at.present? && f.end_at.present? }
diff --git a/decidim-elections/spec/forms/decidim/elections/admin/election_form_spec.rb b/decidim-elections/spec/forms/decidim/elections/admin/election_form_spec.rb
index b0fd5459b85ae..e805c8d322bfe 100644
--- a/decidim-elections/spec/forms/decidim/elections/admin/election_form_spec.rb
+++ b/decidim-elections/spec/forms/decidim/elections/admin/election_form_spec.rb
@@ -194,6 +194,34 @@ module Decidim::Elections
         it { is_expected.to be_valid }
       end
 
+      context "when editing a published election configured for manual start" do
+        let(:election) { create(:election, :published, component:, start_at: nil, end_at: 4.days.from_now) }
+        let(:manual_start) { true }
+        let(:start_at) { nil }
+
+        context "and end_at is valid (in the future)" do
+          let(:end_at) { 2.days.from_now }
+
+          it { is_expected.to be_valid }
+
+          it "does not validate start_at when it is nil" do
+            expect(subject.valid?).to be true
+            expect(subject.errors[:start_at]).to be_empty
+          end
+        end
+
+        context "and end_at is set in the past" do
+          let(:end_at) { 1.day.ago }
+
+          it { is_expected.not_to be_valid }
+
+          it "still validates end_at to prevent moving the election into a finished state" do
+            subject.valid?
+            expect(subject.errors[:end_at]).not_to be_empty
+          end
+        end
+      end
+
       context "when election is not published" do
         let(:election) { create(:election, component:, start_at: 3.days.from_now, end_at: 4.days.from_now) }
 

From d18c4aae869a1bf81c4aeafb2dabcc6a821954dd Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Tue, 2 Jun 2026 00:50:04 +0200
Subject: [PATCH 049/131] Backport 'Fix content renderers with DOM-aware
 replacement to respect HTML context' to v0.31 (#16996)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor renderers to take into account html context

* refactor blob/resource renderers

* spelling

* address review

* address review

* end statement

* remove comment

Co-authored-by: Ivan Vergés <ivan@pokecode.net>
---
 .../content_renderers/base_renderer.rb        | 112 ++++++++++++++++++
 .../content_renderers/blob_renderer.rb        |  11 +-
 .../mention_resource_renderer.rb              |  16 ++-
 .../content_renderers/resource_renderer.rb    |  23 ++--
 .../content_renderers/user_renderer.rb        |  20 ++--
 .../decidim/base_renderer_spec.rb             |  98 +++++++++++++++
 .../decidim/blob_renderer_spec.rb             |  60 ++++++++++
 .../decidim/mention_resource_renderer_spec.rb |  88 ++++++++++++++
 .../decidim/resource_renderer_spec.rb         |  78 ++++++++++++
 .../decidim/user_renderer_spec.rb             |  26 ++++
 10 files changed, 503 insertions(+), 29 deletions(-)
 create mode 100644 decidim-core/spec/content_renderers/decidim/base_renderer_spec.rb
 create mode 100644 decidim-core/spec/content_renderers/decidim/mention_resource_renderer_spec.rb
 create mode 100644 decidim-core/spec/content_renderers/decidim/resource_renderer_spec.rb

diff --git a/decidim-core/lib/decidim/content_renderers/base_renderer.rb b/decidim-core/lib/decidim/content_renderers/base_renderer.rb
index 00df3ff4f8d16..0616aacc06aee 100644
--- a/decidim-core/lib/decidim/content_renderers/base_renderer.rb
+++ b/decidim-core/lib/decidim/content_renderers/base_renderer.rb
@@ -12,6 +12,16 @@ module ContentRenderers
     class BaseRenderer
       include Decidim::ContentProcessor::Common
 
+      ReplacementContext = Struct.new(:placement, :node_name, :attribute_name, :ancestor_names, keyword_init: true) do
+        def text?
+          placement == :text
+        end
+
+        def attribute?
+          placement == :attribute
+        end
+      end
+
       # @return [String] the content to be formatted
       attr_reader :content
 
@@ -34,6 +44,108 @@ def initialize(content)
       def render(_options = nil)
         content
       end
+
+      protected
+
+      def replace_pattern_by_context(text, pattern, skip_ancestor_tags: %w(code pre script style), on_missing: "")
+        return text unless text.respond_to?(:gsub)
+
+        skip_ancestor_tags = Array(skip_ancestor_tags).map(&:to_s)
+
+        has_match = pattern.is_a?(String) ? text.include?(pattern) : pattern.match?(text)
+        return text unless has_match
+
+        fragment = html_fragment(text)
+        attr_modified = replace_pattern_in_attributes(fragment, pattern, skip_ancestor_tags:, on_missing:) do |match, context|
+          yield(match, context)
+        end
+        text_modified = replace_pattern_in_text_nodes(fragment, pattern, skip_ancestor_tags:, on_missing:) do |match, context|
+          yield(match, context)
+        end
+
+        return text unless attr_modified || text_modified
+
+        fragment.to_s
+      end
+
+      private
+
+      def replace_pattern_in_attributes(fragment, pattern, skip_ancestor_tags:, on_missing:)
+        modified = false
+        fragment.xpath(".//*").each do |node|
+          next if skip_replacement_for_node?(node, skip_ancestor_tags)
+
+          node.attribute_nodes.each do |attribute|
+            replaced_value = attribute.value.gsub(pattern) do |match|
+              replace_match(match, replacement_context(node, placement: :attribute, attribute_name: attribute.name), on_missing:) do |resolved_match, context|
+                yield(resolved_match, context)
+              end
+            end
+            unless replaced_value == attribute.value
+              attribute.value = replaced_value
+              modified = true
+            end
+          end
+        end
+        modified
+      end
+
+      def replace_pattern_in_text_nodes(fragment, pattern, skip_ancestor_tags:, on_missing:)
+        modified = false
+        fragment.xpath(".//text()").each do |node|
+          parent = node.parent
+          next if skip_replacement_for_node?(parent, skip_ancestor_tags)
+
+          original_text = node.text
+          has_node_match = pattern.is_a?(String) ? original_text.include?(pattern) : pattern.match?(original_text)
+          next unless has_node_match
+
+          doc = node.document
+          context = replacement_context(parent, placement: :text)
+          last_pos = 0
+
+          original_text.scan(pattern) do
+            m = Regexp.last_match
+            node.add_previous_sibling(Nokogiri::XML::Text.new(original_text[last_pos...m.begin(0)], doc)) if m.begin(0) > last_pos
+
+            replacement = replace_match(m[0], context, on_missing:) do |resolved_match, ctx|
+              yield(resolved_match, ctx)
+            end
+
+            Loofah.fragment(replacement.to_s).children.to_a.each do |child|
+              node.add_previous_sibling(child)
+            end
+
+            last_pos = m.end(0)
+          end
+
+          node.add_previous_sibling(Nokogiri::XML::Text.new(original_text[last_pos..], doc)) if last_pos < original_text.length
+          node.remove
+          modified = true
+        end
+        modified
+      end
+
+      def replace_match(match, context, on_missing:)
+        yield(match, context)
+      rescue ActiveRecord::RecordNotFound
+        on_missing.respond_to?(:call) ? on_missing.call(match, context) : on_missing
+      end
+
+      def replacement_context(node, placement:, attribute_name: nil)
+        ReplacementContext.new(
+          placement:,
+          node_name: node&.name,
+          attribute_name:,
+          ancestor_names: node ? node.ancestors.map(&:name) : []
+        )
+      end
+
+      def skip_replacement_for_node?(node, skip_ancestor_tags)
+        return false unless node
+
+        ([node.name] + node.ancestors.map(&:name)).any? { |name| skip_ancestor_tags.include?(name) }
+      end
     end
   end
 end
diff --git a/decidim-core/lib/decidim/content_renderers/blob_renderer.rb b/decidim-core/lib/decidim/content_renderers/blob_renderer.rb
index 2a46c6621a5d2..76ea83d3b7fce 100644
--- a/decidim-core/lib/decidim/content_renderers/blob_renderer.rb
+++ b/decidim-core/lib/decidim/content_renderers/blob_renderer.rb
@@ -33,11 +33,10 @@ def render(_options = nil)
       protected
 
       def replace_pattern(text, pattern)
-        return text unless text.respond_to?(:gsub)
-
-        text.gsub(pattern) do
-          blob_gid = Regexp.last_match(1)
-          variation_key = Regexp.last_match(3)
+        replace_pattern_by_context(text, pattern) do |match, _context|
+          match_data = match.match(GLOBAL_ID_REGEX)
+          blob_gid = match_data[1]
+          variation_key = match_data[3]
 
           blob = GlobalID::Locator.locate(blob_gid)
           if variation_key
@@ -50,8 +49,6 @@ def replace_pattern(text, pattern)
           else
             blob_url(blob)
           end
-        rescue ActiveRecord::RecordNotFound => _e
-          ""
         end
       end
 
diff --git a/decidim-core/lib/decidim/content_renderers/mention_resource_renderer.rb b/decidim-core/lib/decidim/content_renderers/mention_resource_renderer.rb
index 9748c7dc9c032..f90278c72570f 100644
--- a/decidim-core/lib/decidim/content_renderers/mention_resource_renderer.rb
+++ b/decidim-core/lib/decidim/content_renderers/mention_resource_renderer.rb
@@ -27,17 +27,15 @@ def render(editor: false, **_)
       protected
 
       def replace_pattern(text, pattern, editor:)
-        return text unless text.respond_to?(:gsub)
-
-        text.gsub(pattern) do |resource_gid|
+        replace_pattern_by_context(text, pattern) do |resource_gid, context|
           resource = GlobalID::Locator.locate(resource_gid)
-          if editor
+          if context.attribute?
+            render_resource_url(resource, editor:)
+          elsif editor
             render_editor(resource_gid, resource)
           else
             render_resource_link(resource)
           end
-        rescue ActiveRecord::RecordNotFound => _e
-          ""
         end
       end
 
@@ -50,6 +48,12 @@ def render_resource_link(resource)
         link_to mention_title(resource), resource_path(resource)
       end
 
+      def render_resource_url(resource, editor:)
+        return resource_path(resource) if editor
+
+        Decidim::ResourceLocatorPresenter.new(resource).url
+      end
+
       def mention_title(resource)
         title = presenter_for(resource).title
 
diff --git a/decidim-core/lib/decidim/content_renderers/resource_renderer.rb b/decidim-core/lib/decidim/content_renderers/resource_renderer.rb
index 19631b42c9b15..acebb0a420425 100644
--- a/decidim-core/lib/decidim/content_renderers/resource_renderer.rb
+++ b/decidim-core/lib/decidim/content_renderers/resource_renderer.rb
@@ -11,17 +11,26 @@ class ResourceRenderer < BaseRenderer
       #
       # @return [String] the content ready to display (contains HTML)
       def render(_options = nil)
-        return content unless content.respond_to?(:gsub)
-
-        content.gsub(regex) do |resource_gid|
+        replace_pattern_by_context(content, regex, on_missing: proc { |match, _| "~#{match.split("/").last}" }) do |resource_gid, context|
           resource = GlobalID::Locator.locate(resource_gid)
-          resource.presenter.display_mention
-        rescue ActiveRecord::RecordNotFound
-          resource_id = resource_gid.split("/").last
-          "~#{resource_id}"
+
+          if context.attribute?
+            resource_attribute_value(resource)
+          else
+            resource.presenter.display_mention
+          end
         end
       end
 
+      protected
+
+      def resource_attribute_value(resource)
+        presenter = resource.presenter
+        return presenter.profile_path if presenter.respond_to?(:profile_path)
+
+        Decidim::ResourceLocatorPresenter.new(resource).path
+      end
+
       def regex
         raise "Not implemented"
       end
diff --git a/decidim-core/lib/decidim/content_renderers/user_renderer.rb b/decidim-core/lib/decidim/content_renderers/user_renderer.rb
index 7886d92c4dd9f..23a1b23b25a47 100644
--- a/decidim-core/lib/decidim/content_renderers/user_renderer.rb
+++ b/decidim-core/lib/decidim/content_renderers/user_renderer.rb
@@ -24,17 +24,15 @@ def render(editor: false, **_)
       protected
 
       def replace_pattern(text, pattern, editor:)
-        return text unless text.respond_to?(:gsub)
-
-        text.gsub(pattern) do |mentionable_gid|
-          mentionable = GlobalID::Locator.locate(mentionable_gid)
-          if editor
-            render_editor(mentionable)
+        replace_pattern_by_context(text, pattern) do |user_gid, context|
+          user = GlobalID::Locator.locate(user_gid)
+          if context.attribute?
+            render_profile_path(user)
+          elsif editor
+            render_editor(user)
           else
-            render_text(mentionable)
+            render_text(user)
           end
-        rescue ActiveRecord::RecordNotFound => _e
-          ""
         end
       end
 
@@ -55,6 +53,10 @@ def render_text(user, editor: false)
           presenter_for(user).display_mention
         end
       end
+
+      def render_profile_path(user)
+        presenter_for(user).profile_path
+      end
     end
   end
 end
diff --git a/decidim-core/spec/content_renderers/decidim/base_renderer_spec.rb b/decidim-core/spec/content_renderers/decidim/base_renderer_spec.rb
new file mode 100644
index 0000000000000..ac60f9e514cb8
--- /dev/null
+++ b/decidim-core/spec/content_renderers/decidim/base_renderer_spec.rb
@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe ContentRenderers::BaseRenderer do
+    let(:renderer_class) do
+      Class.new(described_class) do
+        def render(skip_ancestor_tags: %w(code pre script style), on_missing: "", raise_on_match: false)
+          replace_pattern_by_context(content, /TOKEN/, skip_ancestor_tags:, on_missing:) do |_match, context|
+            raise ActiveRecord::RecordNotFound if raise_on_match
+
+            context.attribute? ? "ATTR" : "<strong>TEXT</strong>"
+          end
+        end
+      end
+    end
+
+    let(:renderer) { renderer_class.new(content) }
+
+    describe "#replace_pattern_by_context" do
+      context "with default skip_ancestor_tags" do
+        let(:content) do
+          <<~HTML.squish
+            <p>TOKEN</p>
+            <a href="TOKEN">link</a>
+            <code data-reference="TOKEN"><span data-reference="TOKEN">TOKEN</span></code>
+            <pre>TOKEN</pre>
+            <script>var token = "TOKEN";</script>
+            <style>.sample{content:"TOKEN";}</style>
+          HTML
+        end
+
+        it "replaces in text and attributes outside skipped tags" do
+          rendered = Loofah.fragment(renderer.render)
+
+          expect(rendered.at_css("p > strong").text).to eq("TEXT")
+          expect(rendered.at_css("a")["href"]).to eq("ATTR")
+        end
+
+        it "does not replace inside skipped ancestor tags" do
+          rendered = Loofah.fragment(renderer.render)
+
+          expect(rendered.at_css("code").text).to eq("TOKEN")
+          expect(rendered.at_css("code")["data-reference"]).to eq("TOKEN")
+          expect(rendered.at_css("code span").text).to eq("TOKEN")
+          expect(rendered.at_css("code span")["data-reference"]).to eq("TOKEN")
+          expect(rendered.at_css("pre").text).to eq("TOKEN")
+          expect(rendered.at_css("script").text).to include("TOKEN")
+          expect(rendered.at_css("style").text).to include("TOKEN")
+        end
+      end
+
+      context "with custom skip_ancestor_tags" do
+        let(:content) do
+          <<~HTML.squish
+            <blockquote>TOKEN</blockquote>
+            <code>TOKEN</code>
+          HTML
+        end
+
+        it "respects the custom skipped tag list" do
+          rendered = Loofah.fragment(renderer.render(skip_ancestor_tags: %w(blockquote)))
+
+          expect(rendered.at_css("blockquote").text).to eq("TOKEN")
+          expect(rendered.at_css("code > strong").text).to eq("TEXT")
+        end
+      end
+
+      context "when text node contains escaped HTML alongside a token" do
+        let(:content) { "<p>&lt;script&gt;alert(1)&lt;/script&gt; TOKEN</p>" }
+
+        it "keeps escaped html as plain text and does not promote it to live markup" do
+          rendered = Loofah.fragment(renderer.render)
+          p_node = rendered.at_css("p")
+
+          expect(p_node.at_css("script")).to be_nil
+          expect(p_node.text).to include("<script>alert(1)</script>")
+          expect(p_node.at_css("strong").text).to eq("TEXT")
+        end
+      end
+
+      context "when replacement raises RecordNotFound" do
+        let(:content) { "<p>TOKEN</p>" }
+
+        it "uses static on_missing fallback" do
+          expect(renderer.render(raise_on_match: true, on_missing: "MISSING")).to eq("<p>MISSING</p>")
+        end
+
+        it "uses callable on_missing fallback" do
+          on_missing = ->(match, _context) { "missing:#{match.downcase}" }
+
+          expect(renderer.render(raise_on_match: true, on_missing:)).to eq("<p>missing:token</p>")
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/content_renderers/decidim/blob_renderer_spec.rb b/decidim-core/spec/content_renderers/decidim/blob_renderer_spec.rb
index cc98ec12b4b00..5784a1420f17e 100644
--- a/decidim-core/spec/content_renderers/decidim/blob_renderer_spec.rb
+++ b/decidim-core/spec/content_renderers/decidim/blob_renderer_spec.rb
@@ -67,6 +67,66 @@ module Decidim
         it_behaves_like "correctly rendered blob URLs"
       end
 
+      context "when blob GID is inside a code tag" do
+        let(:content) do
+          <<~HTML.squish
+            <p><code>#{image_blob.to_global_id}</code></p>
+          HTML
+        end
+
+        it "does not replace blob GID inside code tags" do
+          rendered = Loofah.fragment(subject)
+          code = rendered.at_css("code")
+
+          expect(code.text).to eq(image_blob.to_global_id.to_s)
+        end
+      end
+
+      context "when blob GID is inside a pre tag" do
+        let(:content) do
+          <<~HTML.squish
+            <pre>Image URL: #{image_blob.to_global_id}</pre>
+          HTML
+        end
+
+        it "does not replace blob GID inside pre tags" do
+          rendered = Loofah.fragment(subject)
+          pre = rendered.at_css("pre")
+
+          expect(pre.text).to include(image_blob.to_global_id.to_s)
+        end
+      end
+
+      context "when blob GID is inside a script tag" do
+        let(:content) do
+          <<~HTML.squish
+            <script>var blobId = "#{image_blob.to_global_id}";</script>
+          HTML
+        end
+
+        it "does not replace blob GID inside script tags" do
+          rendered = Loofah.fragment(subject)
+          script = rendered.at_css("script")
+
+          expect(script.text).to include(image_blob.to_global_id.to_s)
+        end
+      end
+
+      context "when blob GID is inside a style tag" do
+        let(:content) do
+          <<~HTML.squish
+            <style>.bg { background: url('#{image_blob.to_global_id}'); }</style>
+          HTML
+        end
+
+        it "does not replace blob GID inside style tags" do
+          rendered = Loofah.fragment(subject)
+          style = rendered.at_css("style")
+
+          expect(style.text).to include(image_blob.to_global_id.to_s)
+        end
+      end
+
       context "when there is a query string after the gid" do
         let(:suffix) { "?some=strange&suffix=after" }
 
diff --git a/decidim-core/spec/content_renderers/decidim/mention_resource_renderer_spec.rb b/decidim-core/spec/content_renderers/decidim/mention_resource_renderer_spec.rb
new file mode 100644
index 0000000000000..9f021fcd81cc3
--- /dev/null
+++ b/decidim-core/spec/content_renderers/decidim/mention_resource_renderer_spec.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe ContentRenderers::MentionResourceRenderer do
+    let(:renderer) { described_class.new(content) }
+    let(:current_host) { proposal.organization.host }
+    let(:proposal) { create(:proposal) }
+    let(:presenter) { Decidim::ResourceLocatorPresenter.new(proposal) }
+    let(:proposal_path) { presenter.path }
+    let(:proposal_url) { presenter.url }
+    let(:title) { proposal.presenter.title }
+    let(:avatar_url) { proposal.creator.author.presenter.avatar_url(:thumb) }
+    let(:content) do
+      <<~HTML.squish
+        <p>#{proposal.to_global_id}</p>
+      HTML
+    end
+
+    before do
+      ActiveStorage::Current.url_options = { host: current_host } if current_host
+    end
+
+    describe "#render" do
+      subject { renderer.render }
+
+      it "transforms GIDs to links with mentions tags" do
+        fragment = Loofah.fragment(subject)
+        link = fragment.at_css("p > a")
+
+        expect(link["href"]).to eq(proposal_path)
+        expect(link.at_css(".editor-mention img")["src"]).to eq(avatar_url)
+        expect(link.at_css(".editor-mention span").inner_html).to eq(title)
+      end
+
+      context "when using URLs in the editor" do
+        let(:content) do
+          <<~HTML.squish
+            <p>#{proposal_url}</p>
+          HTML
+        end
+
+        it "does nothing" do
+          expect(subject).to match(%(<p>#{proposal_url}</p>))
+        end
+      end
+
+      context "when GID is inside an anchor tag" do
+        let(:content) do
+          <<~HTML.squish
+            <p><a href="#{proposal.to_global_id}">Link to GID</a></p>
+          HTML
+        end
+
+        it "transforms GIDs inside anchor tags to URLs" do
+          expect(subject).to match(%(<p><a href="#{proposal_url}">Link to GID</a></p>))
+        end
+      end
+
+      context "when GID is inside an anchor tag in editor mode" do
+        subject { renderer.render(editor: true) }
+
+        let(:content) do
+          <<~HTML.squish
+            <p><a href="#{proposal.to_global_id}">Link to GID</a></p>
+          HTML
+        end
+
+        it "transforms GIDs inside anchor tags to paths" do
+          expect(subject).to match(%(<p><a href="#{proposal_path}">Link to GID</a></p>))
+        end
+      end
+
+      context "when URLs are inside anchor tags" do
+        let(:content) do
+          <<~HTML.squish
+            <p><a href="#{proposal_url}">Link to proposal</a></p>
+          HTML
+        end
+
+        it "does not transform GIDs inside anchor tags with different href attributes" do
+          expect(subject).to match(%(<p><a href="#{proposal_url}">Link to proposal</a></p>))
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/content_renderers/decidim/resource_renderer_spec.rb b/decidim-core/spec/content_renderers/decidim/resource_renderer_spec.rb
new file mode 100644
index 0000000000000..0d153b1b0c647
--- /dev/null
+++ b/decidim-core/spec/content_renderers/decidim/resource_renderer_spec.rb
@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe ContentRenderers::ResourceRenderer do
+    let(:renderer_class) do
+      Class.new(described_class) do
+        def regex
+          %r{gid://[\w-]+/Decidim::User/\d+}
+        end
+      end
+    end
+
+    let(:user) { create(:user) }
+    let(:renderer) { renderer_class.new(content) }
+    let(:profile_path) { Decidim::UserPresenter.new(user).profile_path }
+
+    describe "#render" do
+      context "when content has a valid resource GID" do
+        let(:content) { "User mentioned: #{user.to_global_id}" }
+
+        it "renders the resource mention" do
+          rendered = renderer.render
+          expect(rendered).to include(user.nickname)
+        end
+      end
+
+      context "when resource GID is inside a code tag" do
+        let(:content) do
+          "<code>#{user.to_global_id}</code>"
+        end
+
+        it "does not replace resource GID inside code tags" do
+          rendered = Loofah.fragment(renderer.render)
+          code = rendered.at_css("code")
+
+          expect(code.text).to eq(user.to_global_id.to_s)
+        end
+      end
+
+      context "when resource GID is inside a pre tag" do
+        let(:content) do
+          "<pre>#{user.to_global_id}</pre>"
+        end
+
+        it "does not replace resource GID inside pre tags" do
+          rendered = Loofah.fragment(renderer.render)
+          pre = rendered.at_css("pre")
+
+          expect(pre.text).to eq(user.to_global_id.to_s)
+        end
+      end
+
+      context "when resource GID is inside an anchor href" do
+        let(:content) do
+          "<a href=\"#{user.to_global_id}\">User link</a>"
+        end
+
+        it "converts resource GID in href to profile path" do
+          rendered = Loofah.fragment(renderer.render)
+          link = rendered.at_css("a")
+
+          expect(link["href"]).to eq(profile_path)
+        end
+      end
+
+      context "when resource GID is invalid" do
+        let(:content) { "Invalid user: gid://app/Decidim::User/999999" }
+
+        it "replaces with tilde notation" do
+          rendered = renderer.render
+          expect(rendered).to include("~999999")
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/content_renderers/decidim/user_renderer_spec.rb b/decidim-core/spec/content_renderers/decidim/user_renderer_spec.rb
index 42f52088282b3..33672df92248e 100644
--- a/decidim-core/spec/content_renderers/decidim/user_renderer_spec.rb
+++ b/decidim-core/spec/content_renderers/decidim/user_renderer_spec.rb
@@ -70,5 +70,31 @@ module Decidim
         )
       end
     end
+
+    context "when user GID is inside an anchor tag" do
+      let(:content) { "<a href=\"#{user.to_global_id}\">Link to user</a>" }
+      let(:profile_path) { Decidim::UserPresenter.new(user).profile_path }
+
+      it "transforms user GID in href to profile path" do
+        fragment = Loofah.fragment(renderer.render)
+        link = fragment.at_css("a")
+
+        expect(link["href"]).to eq(profile_path)
+        expect(link.text).to eq("Link to user")
+      end
+    end
+
+    context "when user GID is inside an anchor tag in editor mode" do
+      let(:content) { "<a href=\"#{user.to_global_id}\">Link to user</a>" }
+      let(:profile_path) { Decidim::UserPresenter.new(user).profile_path }
+
+      it "transforms user GID in href to profile path in editor mode" do
+        fragment = Loofah.fragment(renderer.render(editor: true))
+        link = fragment.at_css("a")
+
+        expect(link["href"]).to eq(profile_path)
+        expect(link.text).to eq("Link to user")
+      end
+    end
   end
 end

From 28f7582cc7ac43d8893267138d15326883e906c5 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Tue, 2 Jun 2026 06:38:04 +0200
Subject: [PATCH 050/131] New Crowdin updates (#16784)

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Italian)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Slovak)

[ci skip]

* New translations en.yml (Italian)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Romanian)

[ci skip]

* New translations en.yml (Arabic)

[ci skip]

* New translations en.yml (Bulgarian)

[ci skip]

* New translations en.yml (German)

[ci skip]

* New translations en.yml (Greek)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Hungarian)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Lithuanian)

[ci skip]

* New translations en.yml (Dutch)

[ci skip]

* New translations en.yml (Norwegian)

[ci skip]

* New translations en.yml (Polish)

[ci skip]

* New translations en.yml (Portuguese)

[ci skip]

* New translations en.yml (Swedish)

[ci skip]

* New translations en.yml (Turkish)

[ci skip]

* New translations en.yml (Chinese Simplified)

[ci skip]

* New translations en.yml (Chinese Traditional)

[ci skip]

* New translations en.yml (Galician)

[ci skip]

* New translations en.yml (Indonesian)

[ci skip]

* New translations en.yml (Latvian)

[ci skip]

* New translations en.yml (Luxembourgish)

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Russian with many plural form)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Slovak)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Romanian)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (Spanish)

[ci skip]

* New translations en.yml (Bulgarian)

[ci skip]

* New translations en.yml (Catalan)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (German)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Hungarian)

[ci skip]

* New translations en.yml (Italian)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Lithuanian)

[ci skip]

* New translations en.yml (Dutch)

[ci skip]

* New translations en.yml (Norwegian)

[ci skip]

* New translations en.yml (Polish)

[ci skip]

* New translations en.yml (Portuguese)

[ci skip]

* New translations en.yml (Swedish)

[ci skip]

* New translations en.yml (Chinese Traditional)

[ci skip]

* New translations en.yml (Galician)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Catalan)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Catalan)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (German)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (Spanish)

[ci skip]

* New translations en.yml (Catalan)

[ci skip]

* New translations en.yml (German)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Swedish)

[ci skip]
---
 decidim-accountability/config/locales/eu.yml  |   2 +-
 decidim-accountability/config/locales/ru.yml  | 234 ++++++++++++++++++
 decidim-admin/config/locales/ca-IT.yml        |   3 +
 decidim-admin/config/locales/ca.yml           |   3 +
 decidim-admin/config/locales/cs.yml           |   3 +
 decidim-admin/config/locales/de.yml           |   4 +
 decidim-admin/config/locales/es-MX.yml        |   3 +
 decidim-admin/config/locales/es-PY.yml        |   3 +
 decidim-admin/config/locales/es.yml           |   3 +
 decidim-admin/config/locales/eu.yml           |   3 +
 decidim-admin/config/locales/fi-plain.yml     |   1 +
 decidim-admin/config/locales/fi.yml           |   3 +
 decidim-admin/config/locales/fr-CA.yml        |   3 +
 decidim-admin/config/locales/fr.yml           |   3 +
 decidim-admin/config/locales/it.yml           |   1 +
 decidim-admin/config/locales/pt-BR.yml        |  10 +-
 decidim-admin/config/locales/sv.yml           |   1 +
 decidim-assemblies/config/locales/ca.yml      |   2 +-
 decidim-assemblies/config/locales/pt-BR.yml   |   2 +-
 decidim-blogs/config/locales/fr.yml           |  11 +
 decidim-conferences/config/locales/eu.yml     |   6 +-
 decidim-core/config/locales/ar.yml            |   3 -
 decidim-core/config/locales/bg.yml            |   4 -
 decidim-core/config/locales/cs.yml            |   5 +-
 decidim-core/config/locales/de.yml            |   5 +-
 decidim-core/config/locales/el.yml            |   3 -
 decidim-core/config/locales/eu.yml            |  78 +++---
 decidim-core/config/locales/fi-plain.yml      |   3 +-
 decidim-core/config/locales/fi.yml            |   3 +-
 decidim-core/config/locales/gl.yml            |   3 -
 decidim-core/config/locales/hu.yml            |   3 -
 decidim-core/config/locales/id-ID.yml         |   3 -
 decidim-core/config/locales/it.yml            |   2 +-
 decidim-core/config/locales/ja.yml            |   4 -
 decidim-core/config/locales/lb.yml            |   3 -
 decidim-core/config/locales/lt.yml            |   3 -
 decidim-core/config/locales/lv.yml            |   3 -
 decidim-core/config/locales/nl.yml            |   3 -
 decidim-core/config/locales/no.yml            |   3 -
 decidim-core/config/locales/pl.yml            |   4 -
 decidim-core/config/locales/pt-BR.yml         |   4 -
 decidim-core/config/locales/pt.yml            |   3 -
 decidim-core/config/locales/ro-RO.yml         |   4 -
 decidim-core/config/locales/sk.yml            |   4 -
 decidim-core/config/locales/sv.yml            |   4 +-
 decidim-core/config/locales/tr-TR.yml         |   4 -
 decidim-core/config/locales/zh-CN.yml         |   3 -
 decidim-core/config/locales/zh-TW.yml         |   3 -
 decidim-debates/config/locales/eu.yml         |  16 +-
 decidim-dev/config/locales/eu.yml             |   2 +-
 decidim-elections/config/locales/cs.yml       |   9 +
 decidim-elections/config/locales/eu.yml       |   2 +-
 decidim-forms/config/locales/eu.yml           |   2 +-
 decidim-initiatives/config/locales/eu.yml     |  32 +--
 decidim-meetings/config/locales/eu.yml        |  22 +-
 decidim-pages/config/locales/eu.yml           |   4 +-
 .../config/locales/ca.yml                     |   4 +-
 .../config/locales/eu.yml                     |  22 +-
 decidim-proposals/config/locales/eu.yml       |  34 +--
 decidim-system/config/locales/eu.yml          |   2 +-
 decidim-verifications/config/locales/bg.yml   |   1 -
 .../config/locales/ca-IT.yml                  |   2 +-
 decidim-verifications/config/locales/ca.yml   |   2 +-
 decidim-verifications/config/locales/cs.yml   |   1 -
 decidim-verifications/config/locales/de.yml   |   1 -
 .../config/locales/es-MX.yml                  |   2 +-
 .../config/locales/es-PY.yml                  |   2 +-
 decidim-verifications/config/locales/es.yml   |   2 +-
 decidim-verifications/config/locales/eu.yml   |   6 +-
 .../config/locales/fi-plain.yml               |   1 -
 decidim-verifications/config/locales/fi.yml   |   2 +-
 .../config/locales/fr-CA.yml                  |   2 +-
 decidim-verifications/config/locales/fr.yml   |   2 +-
 decidim-verifications/config/locales/gl.yml   |   1 -
 decidim-verifications/config/locales/hu.yml   |   1 -
 decidim-verifications/config/locales/it.yml   |   1 -
 decidim-verifications/config/locales/ja.yml   |   1 -
 decidim-verifications/config/locales/lt.yml   |   1 -
 decidim-verifications/config/locales/nl.yml   |   1 -
 decidim-verifications/config/locales/no.yml   |   1 -
 decidim-verifications/config/locales/pl.yml   |   1 -
 .../config/locales/pt-BR.yml                  |   1 -
 decidim-verifications/config/locales/pt.yml   |   1 -
 .../config/locales/ro-RO.yml                  |   1 -
 decidim-verifications/config/locales/sk.yml   |   1 -
 decidim-verifications/config/locales/sv.yml   |   1 -
 .../config/locales/zh-TW.yml                  |   1 -
 87 files changed, 432 insertions(+), 230 deletions(-)

diff --git a/decidim-accountability/config/locales/eu.yml b/decidim-accountability/config/locales/eu.yml
index df63c4cc353b3..87c826829e46a 100644
--- a/decidim-accountability/config/locales/eu.yml
+++ b/decidim-accountability/config/locales/eu.yml
@@ -9,7 +9,7 @@ eu:
       result:
         decidim_accountability_status_id: Egoera
         decidim_category_id: Kategoria
-        decidim_scope_id: Eremua
+        decidim_scope_id: Esparrua
         description: Deskribapena
         end_date: Bukaera-data
         progress: Aurrerapena
diff --git a/decidim-accountability/config/locales/ru.yml b/decidim-accountability/config/locales/ru.yml
index 9839843ac6003..4cf6f66843a86 100644
--- a/decidim-accountability/config/locales/ru.yml
+++ b/decidim-accountability/config/locales/ru.yml
@@ -2,6 +2,10 @@
 ru:
   activemodel:
     attributes:
+      milestone:
+        description: Описание
+        entry_date: Дата
+        title: Название
       result:
         decidim_accountability_status_id: Состояние
         decidim_category_id: Категория
@@ -10,6 +14,7 @@ ru:
         end_date: Дата окончания
         progress: Продвижение
         start_date: Дата начала
+        subresults: Подрезультаты
         title: Заголовок
         updated_at: 'Обновлено:'
       status:
@@ -22,6 +27,14 @@ ru:
       decidim/accountability/result_progress_updated_event: Прогресс результатов обновлен
   activerecord:
     models:
+      decidim:
+        accountability:
+          result:
+            budget_text: Этот результат %{link} был включен
+            meetings_ids: 'Что обсуждалось на этой встрече: %{link}'
+            project_ids: 'Что было включено в этот проект: %{link}'
+            proposal_ids: 'Что было включено в это предложение: %{link}'
+            text: 'Что было включено в этот результат: %{link}'
       decidim/accountability/result:
         one: Итог
         few: Итога
@@ -30,35 +43,144 @@ ru:
   decidim:
     accountability:
       actions:
+        add_milestone: Добавить этап
+        add_result: Добавить результат
+        confirm_delete_result: Вы уверены, что хотите удалить этот результат?
         confirm_destroy: Вы действительно хотите удалить %{name}?
+        deleted_results_info: Удаленные результаты могут быть восстановлены из корзины.
         destroy: Удалить
         edit: Редактировать
+        import: Импорт результатов из другого компонента
+        import_csv: Импорт результатов из CSV файла
+        new_milestone: Новый этап
+        new_result: Новый результат
+        new_status: Новый статус
         preview: Предварительный просмотр
         title: Действия
+        view_deleted_results: Просмотр удаленных результатов
       admin:
         exports:
+          result_comments: Комментарии
           results: Итоги
         import_components:
+          create:
+            invalid: Возникла проблема при импорте результатов. Пожалуйста, тщательно следуйте инструкциям и убедитесь, что вы выбрали проекты для реализации.
+          filters:
+            proposal_state: Статус предложения
+            select_state: Выберите статус
           form:
+            create: Импорт
             no_components:
+            origin_component_id: Исходный компонент
+            select_component: Выберите компонент
+          new:
+            title: Импорт резуотатов из другого компонента
+        import_results:
+          new:
+            download_export: Скачать Экспорт в CSV формате
+            import: Импорт
+            info: |
+              <p>Мы рекомендуем выполнить следующие шаги:</p>
+              <ol>
+              <li><a href='%{link_new_status}' target='_blank'>Создайте Статусы для Результатов</a>, которые вы хотите добавить</li>
+              <li><a href='%{link_new_result}' target='_blank'>Создайте вручную хотя бы один Результат</a> через эту панель Администратора перед использованием Импорта, чтобы лучше понять формат и что потребуется заполнить.</li>
+              <li>%{link_export_csv}</li>
+              <li>Внесите изменения локально. Вы можете изменять только следующие столбцы CSV (остальные будут проигнорированы):</li>
+              <ul>
+              <li><b>taxonomies/ids:</b> идентификаторы таксономий (если более одного — разделите запятой)</li>
+              <li><b>parent/id:</b> идентификатор родительского элемента (для связанных Результатов). Необязательно</li>
+              <li><b>title/en:</b> заголовок на английском языке. Зависит от языковой конфигурации вашей платформы.</li>
+              <li><b>description/en:</b> описание на английском языке. Зависит от языковой конфигурации вашей платформы.</li>
+              <li><b>start_date:</b> дата начала выполнения результата (формат YYYY-MM-DD)</li>
+              <li><b>end_date:</b> дата окончания выполнения результата (формат YYYY-MM-DD)</li>
+              <li><b>status/id:</b> идентификатор Статуса для данного результата</li>
+              <li><b>progress:</b> процент выполнения (от 0 до 100)</li>
+              <li><b>proposals_ids:</b> внутренний идентификатор связанных предложений (разделённых запятой). Автоматически преобразуется в <span class='attribute-name'>proposal_url</span></li>
+              </ul>
+              </li>
+              </ol>
+            title: Импорт результатов из CSV файла
+        imports:
+          create:
+            invalid: При попытке импорта этого результата произошла ошибка.
+            success: Начался импорт файла. В ближайшие минуты вы получите письмо с результатом импорта.
+        milestones:
+          create:
+            invalid: При попытке добавить этот этап произошла ошибка.
+            success: Этап успешно создан.
+          destroy:
+            success: Этап успешно удален.
+          edit:
+            title: Редактировать этап
+            update: Обновить этап
+          index:
+            title: Этапы
+          new:
+            create: Создать этап
+            title: Новый этап
+          update:
+            invalid: При попытке обновить этот этап произошла ошибка.
+            success: Этап успешно обнавлен.
         models:
           result:
             name: Итог
           status:
             name: Состояние
         results:
+          bulk_actions:
+            dates_form:
+              change_dates: Изменить дату
+              end_date: Дата окончания
+              start_date: Дата начала
+            dropdown:
+              actions: Действия
+              change_dates: Изменить даты
+              change_status: Изменить статус
+              change_taxonomies: Изменить таксономии
+            status_form:
+              change_status: Изменить статус
+              status: Статус
+            submit_buttons:
+              cancel: Отменить
+            taxonomies_form:
+              change_taxonomies: Изменить таксономии
+          create:
+            invalid: При создании этого результата возникла проблема.
+            success: Результат успешно создан.
           edit:
             title: Редактировать итог
             update: Обновить итог
           index:
+            selected: Выбранные
             title: Итоги
+          manage_trash:
+            title: Удаленные результаты
           new:
             create: Создать итог
             title: Добавить итог
+          update:
+            invalid: При обновлении этого результата возникла проблема.
+            success: Результат успешно обновлен.
+          update_dates:
+            invalid: При обновлении дат результатов возникла проблема
+            success: Даты результатов успешно обновлены
+          update_status:
+            invalid: При обновлении статуса результатов возникла проблема
+            success: Статус результатов успешно обновлен
+          update_taxonomies:
+            invalid: Не удалось обновить таксономии %{taxonomies} для результатов %{results}
+            select_a_result: Выберите результат
+            select_a_taxonomy: Выберите таксономию
+            success: Успешно обновлены таксономии %{taxonomies} для результатов %{results}
         shared:
           subnav:
             statuses: Состояния
         statuses:
+          create:
+            invalid: Возникла проблема при создании этого статуса.
+            success: Статус успешно создан.
+          destroy:
+            success: Статус успешно удален.
           edit:
             title: Редактировать состояние
             update: Обновить состояние
@@ -67,21 +189,62 @@ ru:
           new:
             create: Создать состояние
             title: Добавить состояние
+          update:
+            invalid: При обновлении статуса возникла проблема.
+            success: Статус успешно обновлен.
       admin_log:
+        milestones:
+          create: "%{user_name} создал этап %{resource_name}"
+          delete: "%{user_name} удалил этап %{resource_name}"
+          update: "%{user_name} обновил этап %{resource_name}"
         result:
           create: "%{user_name} создал итог %{resource_name} в %{space_name}"
           delete: "%{user_name} удалил итог %{resource_name} в %{space_name}"
+          restore: "%{user_name} восстановил результат %{resource_name} в %{space_name}"
+          soft_delete: "%{user_name} переместил результат %{resource_name} в корзину %{space_name}"
           update: "%{user_name} обновил итог %{resource_name} в %{space_name}"
+        status:
+          create: "%{user_name} создал статус %{resource_name}"
+          delete: "%{user_name} удалил статус %{resource_name}"
+          update: "%{user_name} обновил статус %{resource_name}"
         value_types:
           parent_presenter:
             not_found: 'Родительский объект не найден в базе данных (ID: %{id})'
+      content_blocks:
+        highlighted_results:
+          results: Результаты
+      creation:
+        text: Этот результат был создан
+      import_mailer:
+        import:
+          errors: Ошибки
+          errors_present: Произошла ошибка при импорте результатов.
+          row_number: Строка
+          subject: Успешный импорт результатов
+          success: Успешный импорт результатов. Вы можете просмотреть результаты в интерфейсе администрирования.
+      import_projects_mailer:
+        import:
+          subject: Успешный импорт проектов
+          success: Проекты успешно импортированны в результаты в компоненте %{component_name}. Вы можете просмотреть результаты в интерфейсе администрирования.
+      import_proposals_mailer:
+        import:
+          subject: Успешный импорт предложений
+          success: Предложения успешно импортированны в результаты в компоненте %{component_name}. Вы можете просмотреть результаты в интерфейсе администрирования.
+      last_activity:
+        new_result: 'Новый результат:'
       models:
+        milestone:
+          fields:
+            entry_date: Дата
+            title: Название
         result:
           fields:
+            created_at: Создано
             end_date: Дата окончания
             progress: Продвижение
             start_date: Дата начала
             status: Состояние
+            taxonomies: Таксономии
             title: Заголовок
         status:
           fields:
@@ -98,21 +261,51 @@ ru:
             other: "%{count} итога"
         home_header:
           global_status: Состояние общего исполнения
+        milestones:
+          title: Этапы
+        no_results: Нет проектов
+        root_taxonomies:
+          title: 'Отображать по:'
         search:
           search: Поиск действий
         show:
           stats:
             back_to_resource: Вернуться к итогу
+    admin:
+      filters:
+        results:
+          status_id_eq:
+            label: Статус
+          taxonomies_part_of_contains:
+            label: Таксономия
+      tooltips:
+        deleted_results_info: Невозможно удалить этот результат
     components:
       accountability:
+        actions:
+          comment: Комментарий
         name: Отчетность
         settings:
           global:
+            clear_all: Очистить все
             comments_enabled: Комментарии включены
+            comments_max_length: Максимальная длина комментариев (оставьте 0 для значения по умолчанию)
+            default_taxonomy: Таксономия по умолчанию
+            default_taxonomy_help: Выберите, какую таксономию вы хотите показать по умолчанию. Если таксономия не выбрана, результаты будут показаны в виде списка.
+            define_taxonomy_filters: Пожалуйста, определите фильтры для этого партисипативного пространства перед использованием этой настройки.
             display_progress_enabled: Показывать ход выполнения
+            geocoding_enabled: Карты включены
             intro: Вступление
+            no_taxonomy_filters_found: Фильтры таксономии не найдены.
+            taxonomy_filters: Выберите фильтры для компонента
+            taxonomy_filters_add: Добавить фильтр
           step:
             comments_blocked: Комментарии отключены
+          visualization: Визуализация
+    download_your_data:
+      show:
+        result_comments: Экспорт комментариев результатов
+        results: Экспорт результатов
     events:
       accountability:
         proposal_linked:
@@ -123,9 +316,50 @@ ru:
         result_progress_updated:
           email_intro: 'Результат "%{resource_title}", который включает предложение "%{proposal_title}", теперь завершено на %{progress}%. Вы можете увидеть его на этой странице:'
           email_outro: Вы получили это уведомление, потому что вы следите за "%{proposal_title}", и это предложение включено в результат "%{resource_title}". Вы можете прекратить получение уведомлений, перейдя по предыдущей ссылке.
+          email_subject: Обновление прогресса %{resource_title}
           notification_title: Результат <a href="%{resource_path}">%{resource_title}</a>, который включает предложение <a href="%{proposal_path}">%{proposal_title}</a>, теперь %{progress}% завершен.
+    open_data:
+      help:
+        result_comments:
+          alignment: Если этот комментарий был за, против или нейтральный
+          author: Имя участника, который написал этот комментарий
+          body: Сам комментарий
+          commentable_id: Уникальный идентификатор комментария
+          commentable_type: Тип комментируемого элемента (результат, предложение и т.д.)
+          created_at: Дата создания комментария
+          depth: Позиция комментария в цепочке обсуждения (прямой ответ или ответ на ответ)
+          id: Идентификатор этого комментария
+          locale: Язык, при котором участник оставлял этот комментарий
+          root_commentable_url: URL ресурса, который связан с этим комментарием
+        results:
+          address: Адрес результата (если есть)
+          children_count: Количество результатов дочернего процесса
+          comments_count: Количество комментариев к этому результату
+          component: Компонент, к которому относится результат
+          created_at: Дата создания результата
+          description: Описание результата
+          end_date: Дата окончания выполнения результата
+          id: Уникальный идентификатор результата
+          latitude: Географическая широта результата в случае, если он имеет физическое расположение
+          longitude: Географическая долгота результата в случае, если он имеет физическое местоположение
+          parent: Родительский результат (если есть) результата
+          progress: Процент выполнения результата
+          proposal_urls: URL-адреса предложений, которые включены в этот результат
+          reference: Уникальная ссылка на результат
+          start_date: Дата начала выполнения результата
+          status: Текущий статус этого результата
+          taxonomies: Таксономии результата
+          title: Заголовок результата
+          updated_at: Последняя дата обновления результата
+          url: URL-адрес, где можно найти этот результат
+    participatory_spaces:
+      highlighted_results:
+        see_all: Посмотреть все результаты
     resource_links:
       included_projects:
         result_project: Проекты, включенные в эти итоги
       included_proposals:
         result_proposal: Предложения, включенные в этот итог
+    statistics:
+      results_count: Результаты
+      results_count_tooltip: Количество решений или итогов, выработанных в рамках данного пространства.
diff --git a/decidim-admin/config/locales/ca-IT.yml b/decidim-admin/config/locales/ca-IT.yml
index bf534489a38c7..f3577c084bae6 100644
--- a/decidim-admin/config/locales/ca-IT.yml
+++ b/decidim-admin/config/locales/ca-IT.yml
@@ -834,6 +834,7 @@ ca-IT:
       officializations:
         block:
           error: Hi ha hagut un problema en bloquejar a la participant.
+          no_user: No s'ha trobat cap usuària
           success: Participant bloquejada correctament.
         bulk_action:
           block:
@@ -867,6 +868,8 @@ ca-IT:
           badge: Ensenya d'oficialització
           officialize: Oficialitza
           title: Oficialitza la participant "%{name}"
+        show_email:
+          no_user: No s'ha trobat cap usuària
         show_email_modal:
           description: Si necessites contactar a una participant directament pots clicar al botó Mostra per veure la seva adreça de correu electrònic. Aquesta acció es registrarà.
           email_address: Adreça de correu electrònic
diff --git a/decidim-admin/config/locales/ca.yml b/decidim-admin/config/locales/ca.yml
index e9ebf35df3721..5c354fc8178fa 100644
--- a/decidim-admin/config/locales/ca.yml
+++ b/decidim-admin/config/locales/ca.yml
@@ -834,6 +834,7 @@ ca:
       officializations:
         block:
           error: Hi ha hagut un problema en bloquejar a la participant.
+          no_user: No s'ha trobat cap usuària
           success: Participant bloquejada correctament.
         bulk_action:
           block:
@@ -867,6 +868,8 @@ ca:
           badge: Ensenya d'oficialització
           officialize: Oficialitza
           title: Oficialitza la participant "%{name}"
+        show_email:
+          no_user: No s'ha trobat cap usuària
         show_email_modal:
           description: Si necessites contactar a una participant directament pots clicar al botó Mostra per veure la seva adreça de correu electrònic. Aquesta acció es registrarà.
           email_address: Adreça de correu electrònic
diff --git a/decidim-admin/config/locales/cs.yml b/decidim-admin/config/locales/cs.yml
index 936e7e1a29cb1..5ebf706b260b1 100644
--- a/decidim-admin/config/locales/cs.yml
+++ b/decidim-admin/config/locales/cs.yml
@@ -842,6 +842,7 @@ cs:
       officializations:
         block:
           error: Při blokování účastníka došlo k chybě.
+          no_user: Nebyl nalezen žádný uživatel
           success: Účastník byl úspěšně zablokován.
         bulk_action:
           block:
@@ -875,6 +876,8 @@ cs:
           badge: Odznak ověření
           officialize: Ověřit
           title: Oficializovat účastníka "%{name}"
+        show_email:
+          no_user: Nebyl nalezen žádný uživatel
         show_email_modal:
           description: Pokud potřebujete kontaktovat účastníka, můžete kliknout na tlačítko Zobrazit pro zobrazení e-mailové adresy. Tato akce bude zaznamenána.
           email_address: E-mailová adresa
diff --git a/decidim-admin/config/locales/de.yml b/decidim-admin/config/locales/de.yml
index 2fa35648d4709..46ad33e39db86 100644
--- a/decidim-admin/config/locales/de.yml
+++ b/decidim-admin/config/locales/de.yml
@@ -265,6 +265,8 @@ de:
         edit:
           title: Ordner bearbeiten
           update: Aktualisieren
+        index:
+          attachment_collections_title: Ordner für Anhänge
         new:
           create: Erstellen
           title: Neuer Ordner
@@ -280,6 +282,8 @@ de:
         edit:
           title: Anhang bearbeiten
           update: Aktualisieren
+        index:
+          attachments_title: Anhänge
         new:
           create: Anhang erstellen
           title: Neuer Anhang
diff --git a/decidim-admin/config/locales/es-MX.yml b/decidim-admin/config/locales/es-MX.yml
index 1d7631b81ffa7..a2eed7818cb20 100644
--- a/decidim-admin/config/locales/es-MX.yml
+++ b/decidim-admin/config/locales/es-MX.yml
@@ -834,6 +834,7 @@ es-MX:
       officializations:
         block:
           error: Se ha producido un error al bloquear a la participante.
+          no_user: No se ha encontrado ninguna usuaria
           success: Participante bloqueada correctamente.
         bulk_action:
           block:
@@ -867,6 +868,8 @@ es-MX:
           badge: Insignia de oficialización
           officialize: Oficializar
           title: Oficializar el usuario "%{name}"
+        show_email:
+          no_user: No se ha encontrado ninguna usuaria
         show_email_modal:
           description: Si necesitas contactar directamente con una participante, puedes hacer clic en el botón Mostrar para ver la dirección de correo electrónico. Esta acción se registrará.
           email_address: Dirección de correo electrónico
diff --git a/decidim-admin/config/locales/es-PY.yml b/decidim-admin/config/locales/es-PY.yml
index 5effe61d7725c..5aee3b0742303 100644
--- a/decidim-admin/config/locales/es-PY.yml
+++ b/decidim-admin/config/locales/es-PY.yml
@@ -834,6 +834,7 @@ es-PY:
       officializations:
         block:
           error: Se ha producido un error al bloquear a la participante.
+          no_user: No se ha encontrado ninguna usuaria
           success: Participante bloqueada correctamente.
         bulk_action:
           block:
@@ -867,6 +868,8 @@ es-PY:
           badge: Insignia de oficialización
           officialize: Oficializar
           title: Oficializar el usuario "%{name}"
+        show_email:
+          no_user: No se ha encontrado ninguna usuaria
         show_email_modal:
           description: Si necesitas contactar directamente con una participante, puedes hacer clic en el botón Mostrar para ver la dirección de correo electrónico. Esta acción se registrará.
           email_address: Dirección de correo electrónico
diff --git a/decidim-admin/config/locales/es.yml b/decidim-admin/config/locales/es.yml
index 8046cc4b3fd12..4fa874adf9ebd 100644
--- a/decidim-admin/config/locales/es.yml
+++ b/decidim-admin/config/locales/es.yml
@@ -834,6 +834,7 @@ es:
       officializations:
         block:
           error: Se ha producido un error al bloquear a la participante.
+          no_user: No se ha encontrado ninguna usuaria
           success: Participante bloqueada correctamente.
         bulk_action:
           block:
@@ -867,6 +868,8 @@ es:
           badge: Insignia de oficialización
           officialize: Oficializar
           title: Oficializar participante "%{name}"
+        show_email:
+          no_user: No se ha encontrado ninguna usuaria
         show_email_modal:
           description: Si necesitas contactar directamente con una participante, puedes hacer clic en el botón Mostrar para ver la dirección de correo electrónico. Esta acción se registrará.
           email_address: Dirección de correo electrónico
diff --git a/decidim-admin/config/locales/eu.yml b/decidim-admin/config/locales/eu.yml
index bf7142d47f10f..4f84e89bce22c 100644
--- a/decidim-admin/config/locales/eu.yml
+++ b/decidim-admin/config/locales/eu.yml
@@ -834,6 +834,7 @@ eu:
       officializations:
         block:
           error: Arazo bat izan da parte-hartzailea blokeatzean.
+          no_user: Ez da parte-hartzailerik aurkitu 
           success: Parte-hartzailea zuzen blokeatua.
         bulk_action:
           block:
@@ -867,6 +868,8 @@ eu:
           badge: Ofizializazio-garaikurra
           officialize: Ofizializatzen du
           title: Parte-hartzaile ofiziala "%{name}"
+        show_email:
+          no_user: Ez da parte-hartzailerik aurkitu
         show_email_modal:
           description: Parte-hartzaile batekin zuzenean harremanetan jarri behar baduzu, Erakutsi botoian klik egin dezakezu helbide elektronikoa ikusteko. Ekintza hori erregistratu egingo da.
           email_address: Korreo elektronikoaren helbidea
diff --git a/decidim-admin/config/locales/fi-plain.yml b/decidim-admin/config/locales/fi-plain.yml
index 90d3123dda046..e50812f739c85 100644
--- a/decidim-admin/config/locales/fi-plain.yml
+++ b/decidim-admin/config/locales/fi-plain.yml
@@ -834,6 +834,7 @@ fi-pl:
       officializations:
         block:
           error: Osallistujan estäminen epäonnistui.
+          no_user: Käyttäjää ei löytynyt
           success: Osallistujan estäminen onnistui.
         bulk_action:
           block:
diff --git a/decidim-admin/config/locales/fi.yml b/decidim-admin/config/locales/fi.yml
index 21393a0f18cc4..ad4a551eb69b7 100644
--- a/decidim-admin/config/locales/fi.yml
+++ b/decidim-admin/config/locales/fi.yml
@@ -834,6 +834,7 @@ fi:
       officializations:
         block:
           error: Osallistujan estäminen epäonnistui.
+          no_user: Käyttäjää ei löytynyt
           success: Osallistujan estäminen onnistui.
         bulk_action:
           block:
@@ -867,6 +868,8 @@ fi:
           badge: Virallistamismerkki
           officialize: Virallista
           title: Virallista käyttäjä "%{name}"
+        show_email:
+          no_user: Käyttäjää ei löytynyt
         show_email_modal:
           description: Jos haluat ottaa suoraan yhteyttä osallistujaan, voit klikata Näytä-painiketta nähdäksesi hänen sähköpostiosoitteensa. Tästä toiminnosta jää jälki lokiin.
           email_address: Sähköpostiosoite
diff --git a/decidim-admin/config/locales/fr-CA.yml b/decidim-admin/config/locales/fr-CA.yml
index fe03a836a6221..7e545bfbdb822 100644
--- a/decidim-admin/config/locales/fr-CA.yml
+++ b/decidim-admin/config/locales/fr-CA.yml
@@ -831,6 +831,7 @@ fr-CA:
       officializations:
         block:
           error: Une erreur s'est produite lors du blocage du participant.
+          no_user: Aucun utilisateur trouvé
           success: Participant bloqué avec succès.
         bulk_action:
           block:
@@ -864,6 +865,8 @@ fr-CA:
           badge: Badge de validation
           officialize: Valider
           title: Valider l'utilisateur "%{name}"
+        show_email:
+          no_user: Aucun utilisateur trouvé
         show_email_modal:
           description: Si vous avez besoin de contacter directement un participant, vous pouvez cliquer sur le bouton Afficher pour voir leur adresse mèl. Cette action sera enregistrée.
           email_address: Adresse e-mail
diff --git a/decidim-admin/config/locales/fr.yml b/decidim-admin/config/locales/fr.yml
index 915e458484c8b..02b9272bcbea9 100644
--- a/decidim-admin/config/locales/fr.yml
+++ b/decidim-admin/config/locales/fr.yml
@@ -831,6 +831,7 @@ fr:
       officializations:
         block:
           error: Une erreur s'est produite lors du blocage du participant.
+          no_user: Aucun utilisateur trouvé
           success: Participant bloqué avec succès.
         bulk_action:
           block:
@@ -864,6 +865,8 @@ fr:
           badge: Badge de validation
           officialize: Valider
           title: Valider l'utilisateur "%{name}"
+        show_email:
+          no_user: Aucun utilisateur trouvé
         show_email_modal:
           description: Si vous avez besoin de contacter directement un participant, vous pouvez cliquer sur le bouton Afficher pour voir son adresse mail. Cette action sera enregistrée.
           email_address: Adresse e-mail
diff --git a/decidim-admin/config/locales/it.yml b/decidim-admin/config/locales/it.yml
index a0efb0792f687..c95dcea091094 100644
--- a/decidim-admin/config/locales/it.yml
+++ b/decidim-admin/config/locales/it.yml
@@ -184,6 +184,7 @@ it:
           Se cambi idea, puoi ripristinarlo più tardi.
         export: Esporta
         export_all: Esporta tutto
+        export_selection: Esporta selezione
         import: Importazione
         newsletter:
           new: Nuova newsletter
diff --git a/decidim-admin/config/locales/pt-BR.yml b/decidim-admin/config/locales/pt-BR.yml
index e7c8d92c8da2e..a1b647315e49b 100644
--- a/decidim-admin/config/locales/pt-BR.yml
+++ b/decidim-admin/config/locales/pt-BR.yml
@@ -58,7 +58,7 @@ pt-BR:
         force_users_to_authenticate_before_access_organization: Forçar usuários a autenticar antes de acessar organização
         from: Endereço de e-mail do remetente
         github_handler: Manipulador GitHub
-        header_snippets: Snippets de cabeçalho
+        header_snippets: Trecho de cabeçalho
         highlight_alternative_color: Destaque, alternativa
         highlight_color: Destaque
         host: Host
@@ -86,7 +86,7 @@ pt-BR:
         tertiary_color: Terciário
         time_zone: Fuso Horário
         tos_version: Versão dos termos de serviço
-        twitter_handler: X handler
+        twitter_handler: Manipulador do X
         users_registration_mode: Modo de registro de usuários
         warning_color: Aviso
         welcome_notification_body: Corpo de notificação de boas-vindas
@@ -119,16 +119,16 @@ pt-BR:
         slug: Texto curto de URL
         title: Título
         topic_id: Tópico
-        weight: Posição do pedido
+        weight: Ordem de posição
       static_page_topic:
         description: Descrição
         name: Nome do tópico
         show_in_footer: Mostrar no rodapé
         title: Título
-        weight: Posição do pedido
+        weight: Ordem de posição
       taxonomy:
         item_name: Nome do item
-        parent_id: Parente
+        parent_id: Pai
       user_group_csv_verification:
         file: Arquivo
     errors:
diff --git a/decidim-admin/config/locales/sv.yml b/decidim-admin/config/locales/sv.yml
index 055741708b3e0..37973ae837d09 100644
--- a/decidim-admin/config/locales/sv.yml
+++ b/decidim-admin/config/locales/sv.yml
@@ -827,6 +827,7 @@ sv:
       officializations:
         block:
           error: Det gick inte att blockera deltagaren.
+          no_user: Ingen användare hittad
           success: Deltagaren har blockerats.
         bulk_action:
           block:
diff --git a/decidim-assemblies/config/locales/ca.yml b/decidim-assemblies/config/locales/ca.yml
index bbc73b72d9f51..f182e6ebe965b 100644
--- a/decidim-assemblies/config/locales/ca.yml
+++ b/decidim-assemblies/config/locales/ca.yml
@@ -172,7 +172,7 @@ ca:
           attachments: Adjunts
           components: Components
           info: Quant a aquesta assemblea
-          landing_page: Disposició de la pàgina de destinació
+          landing_page: Disposició de la pàgina d'inici
           moderations: Moderacions
           private_users: Membres
           see_assembly: Veure l'assemblea
diff --git a/decidim-assemblies/config/locales/pt-BR.yml b/decidim-assemblies/config/locales/pt-BR.yml
index 992425eb50b18..20b215b5cea64 100644
--- a/decidim-assemblies/config/locales/pt-BR.yml
+++ b/decidim-assemblies/config/locales/pt-BR.yml
@@ -3,7 +3,7 @@ pt-BR:
   activemodel:
     attributes:
       assembly:
-        announcement: Avisos
+        announcement: Anúncios
         area_id: Área
         assembly_type: Tipo de assembleia
         assembly_type_other: Outro tipo de assambleia
diff --git a/decidim-blogs/config/locales/fr.yml b/decidim-blogs/config/locales/fr.yml
index c64afa4ab62af..05c5405f41085 100644
--- a/decidim-blogs/config/locales/fr.yml
+++ b/decidim-blogs/config/locales/fr.yml
@@ -106,6 +106,7 @@ fr:
           comment: Commenter
           create: Créer
           destroy: Supprimer
+          like: Soutenir
           update: Mettre à jour
         name: Actualités
         settings:
@@ -122,6 +123,8 @@ fr:
           step:
             announcement: Annonce
             comments_blocked: Commentaires désactivés
+            likes_blocked: Soutiens bloqués
+            likes_enabled: Soutiens activés
     events:
       blogs:
         post_created:
@@ -136,14 +139,22 @@ fr:
           author: Le nom du participant qui a fait ce commentaire
           body: Le commentaire lui-même
           commentable_id: L'identifiant unique du commentaire
+          commentable_type: Le type de l'élément commenté (s'il s'agit d'un résultat, d'une proposition, etc.)
           created_at: La date de création de ce commentaire
+          depth: L'endroit où ce commentaire se trouve dans l'arborescence des commentaires (si c'est une réponse ou une réponse à une réponse)
           id: L'id de ce commentaire
+          locale: La langue que le participant a utilisé en créant ce commentaire
+          root_commentable_url: L'URL de la ressource liée à ce commentaire
         posts:
+          author: Les informations de l'auteur
           body: Le corps de l'article
           comments_count: Le nombre de commentaires sur cet article
           component: Le composant auquel appartient l'article
           created_at: La date de création de cet article
+          follows_count: Le nombre de personnes qui suivent cet article
           id: L'identifiant unique de cet article
+          likes_count: Le nombre de soutiens à cet article
+          participatory_space: 'À quel espace (ex : Concertation ou Assemblée) appartient cet article'
           published_at: La date à laquelle cet article a été publié
           title: Le titre de l'article
           updated_at: La dernière date de mise à jour de cet article
diff --git a/decidim-conferences/config/locales/eu.yml b/decidim-conferences/config/locales/eu.yml
index 15d9278f78ef5..d9185c7dd4a63 100644
--- a/decidim-conferences/config/locales/eu.yml
+++ b/decidim-conferences/config/locales/eu.yml
@@ -233,7 +233,7 @@ eu:
             actions: Ekintzak
             affiliation: Afiliazioa
             full_name: Izen osoa
-            position: Ardura
+            position: Kokapena
           name: Hizlaria
         conference_user_role:
           fields:
@@ -597,7 +597,7 @@ eu:
           notification_title: <a href="%{resource_path}">%{resource_title}</a> jardunaldiak erregistroak gaitu ditu.
         role_assigned:
           email_intro: '%{role} rola esleitu zaizu <a href="%{resource_title}"> jardunaldian.'
-          email_outro: Jakinarazpen hau jaso duzu %{role} rola esleitu dizutelako "%{resource_title}" hitzaldian.
+          email_outro: Jakinarazpen hau jaso duzu %{role} rola esleitu dizutelako "%{resource_title}" jardunaldian.
           email_subject: '%{role} rola esleitu zaizu <a href="%{resource_title}"> batzarrean.'
           notification_title: '%{role} rola esleitu zaizu <a href="%{resource_url}">%{resource_title}</a> batzarrean.'
         upcoming_conference:
@@ -667,7 +667,7 @@ eu:
           promoted_conferences: Sustatutako jardunaldiak
         order_by_conferences:
           conferences:
-            one: "Jardunaldi %{count}"
+            one: "%{count} jardunaldi"
             other: "%{count} jardunaldi"
       conferences_nav:
         conference_partners_menu_item: Kideak
diff --git a/decidim-core/config/locales/ar.yml b/decidim-core/config/locales/ar.yml
index a1ec957a2ee98..59a646074cd34 100644
--- a/decidim-core/config/locales/ar.yml
+++ b/decidim-core/config/locales/ar.yml
@@ -293,9 +293,6 @@ ar:
       update_draft:
         error: حدثت هناك مشكلة أثناء تحديث مسودة التعديل.
         success: تم تحديث مسودة التعديل بنجاح.
-      wizard_step_form:
-        steps:
-          '1': إنشاء التعديل الخاص بك
     anonymous_user: مجهول
     application:
       document:
diff --git a/decidim-core/config/locales/bg.yml b/decidim-core/config/locales/bg.yml
index 591ae88b89734..0dc473f799e1b 100644
--- a/decidim-core/config/locales/bg.yml
+++ b/decidim-core/config/locales/bg.yml
@@ -337,10 +337,6 @@ bg:
         success: Черновата на поправка е успешно обновена.
       withdraw:
         success: Изменението беше оттеглено успешно.
-      wizard_step_form:
-        steps:
-          '1': Създайте Ваша поправка
-          '2': Публикувайте своето изменение
     anonymous_user: Анонимен
     application:
       document:
diff --git a/decidim-core/config/locales/cs.yml b/decidim-core/config/locales/cs.yml
index 5699c037e5492..07d1c8ba2d62d 100644
--- a/decidim-core/config/locales/cs.yml
+++ b/decidim-core/config/locales/cs.yml
@@ -447,10 +447,6 @@ cs:
       withdraw:
         error: Při stahování pozměňovacího návrhu došlo k chybě.
         success: Pozměňovací návrh byl úspěšně stažen.
-      wizard_step_form:
-        steps:
-          '1': Vytvořte svůj pozměňovací návrh
-          '2': Publikovat svůj pozměňovací návrh
     anonymous_user: Anonymní
     application:
       document:
@@ -1849,6 +1845,7 @@ cs:
         submit_button: Odeslat pozvánku
       no_invitations_remaining: Žádné zbývající pozvánky
       send_instructions: Pozvánka byla odeslána na %{email}.
+      updated_not_active: Pozvánka úspěšně přijata.
     mailer:
       confirmation_instructions:
         action: Potvrďte svůj účet
diff --git a/decidim-core/config/locales/de.yml b/decidim-core/config/locales/de.yml
index d2eb134f1be87..845497a028d02 100644
--- a/decidim-core/config/locales/de.yml
+++ b/decidim-core/config/locales/de.yml
@@ -421,10 +421,6 @@ de:
       withdraw:
         error: Beim Zurückziehen der Änderung ist ein Problem aufgetreten.
         success: Die Änderung wurde erfolgreich zurückgezogen.
-      wizard_step_form:
-        steps:
-          '1': Erstellen Sie Ihre Änderung
-          '2': Änderung veröffentlichen
     anonymous_user: Anonym
     application:
       document:
@@ -808,6 +804,7 @@ de:
           invitation_sent_at: Datum und Uhrzeit, an dem die Einladung versendet wurde
           invitations_count: Die Anzahl der an diesen Benutzer gesendeten Einladungen
           invited_by: Der Benutzer, der diesen Benutzer eingeladen hat
+          last_sign_in_at: Datum und Uhrzeit des letzten Logins
           locale: Die Plattformsprache, die dieser Benutzer ausgewählt hat
           managed: Ob dieser Benutzer von einem anderen Benutzer verwaltet wird
           name: Der Name des Benutzers
diff --git a/decidim-core/config/locales/el.yml b/decidim-core/config/locales/el.yml
index d78a2a7dd0e9c..612a4b93c8304 100644
--- a/decidim-core/config/locales/el.yml
+++ b/decidim-core/config/locales/el.yml
@@ -261,9 +261,6 @@ el:
       update_draft:
         error: Υπήρξε ένα πρόβλημα κατά την ενημέρωση του πρόχειρου τροποποίησης.
         success: Το πρόχειρο τροποποίησης ενημερώθηκε επιτυχώς.
-      wizard_step_form:
-        steps:
-          '1': Δημιουργήστε την τροποποίησή σας
     anonymous_user: Ανώνυμη
     application:
       document:
diff --git a/decidim-core/config/locales/eu.yml b/decidim-core/config/locales/eu.yml
index c5055ac8de421..9b698da0c4c36 100644
--- a/decidim-core/config/locales/eu.yml
+++ b/decidim-core/config/locales/eu.yml
@@ -209,7 +209,7 @@ eu:
         cancel_error: Ezin izan da ezeztatu helbide elektronikoaren aldaketa.
         cancel_successfully: Posta elektronikoaren aldaketa zuzen ezeztatua.
         resend_error: Ezin izan da birbidali berresteko helbide elektronikoa.
-        resend_successfully: 'Berresteko posta elektronikoa zuzen birbidalia hona: %{unconfirmed_email}.'
+        resend_successfully: Correo de confirmación reenviado con éxito a %{unconfirmed_email}.
         send_again: Bidali berriro
         title: Posta elektronikoaren aldaketak egiaztatzea
       show:
@@ -224,13 +224,13 @@ eu:
       time_ago: "duela %{time}"
     admin:
       actions:
-        cancel: Ezeztatu
+        cancel: Utzi
       password_change:
         alert: Aurrera jarraitu ahal izateko pasahitza aldatu behar duzu.
         notification: Administratzaile rola duten parte-hartzaileek pasahitza aldatu behar dute %{days} egunik behin.
     admin_log:
       area:
-        create: "%{user_name} parte-hartzaileak%{resource_name} arloa sortu du"
+        create: "%{user_name} parte-hartzaileak %{resource_name} arloa sortu du"
         delete: "%{user_name} parte-hartzaileak %{resource_name} arloa ezabatu da"
         update: "%{user_name} parte-hartzaileak %{resource_name} arloa eguneratu du"
       area_type:
@@ -421,7 +421,7 @@ eu:
         success: Zuzenketa zuzen kendu da.
       wizard_step_form:
         steps:
-          '1': Sortu zure zuzenketa
+          '1': Zure zuzenketa egin
           '2': Zure zuzenketa argitaratu
     anonymous_user: Anonimoa
     application:
@@ -479,7 +479,7 @@ eu:
       expires_at: '%{timestamp} iraungitzen da'
       foo_authorization:
         fields:
-          bar: Bar
+          bar: Barra
           foo: Foo
         name: Foo baimena
       granted_at: Onartua %{timestamp}
@@ -513,7 +513,7 @@ eu:
           explanation: Sentitzen dugu, baina ezin diozu heldu ekintza honi, zure baimen-datuetako batzuk ez datozelako bat.
           invalid_field: "%{field} datu-eremuaren balioa %{value} ez da baliozkoa."
           ok: Ados
-          title: Ez dago baimenduta
+          title: Ez zaude baimenduta
         unconfirmed:
           confirmation_instructions: 'Berrespen-argibideak jaso ez badituzu, berriro eska ditzakezu:'
           explanation_html: Ekintza hau burutzeko baimena behar da, egiten zure email berretsi behar duzula aurretik behar duzu <strong>%{email}</strong>.
@@ -864,7 +864,7 @@ eu:
         try_later: Mesedez, geroago saiatu berriro. Erroreak jarraitzen badu, mesedez, kopiatu ondoko informazio hau eta bidali plataformaren mantentzaileei partekatu nahi duzun bestelako informazioarekin batera.
         unknown: Ezezaguna
         url: URL
-        user: Parte-hartzailearen ID
+        user: Parte-hartzailearen ID-a
       not_found:
         back_home: Itzuli hasierara
         content_doesnt_exist: Helbide hau okerra da edo ezabatua izan da.
@@ -878,7 +878,7 @@ eu:
             email_subject: Onartu da %{emendation_author_nickname} ren %{amendable_title} zuzenketa
             notification_title: '<a href="%{emendation_author_path}">%{emendation_author_nickname} egileak sortutako </a><a href="% emendation_path}">zuzenketa onartu da honetarako: <a href="%{amendable_path}">%{amendable_title}</a>.'
           follower:
-            email_intro: '%{amendable_title} rako zuzenketa bat onartu da. Orrialde honetan ikus dezakezue:'
+            email_intro: 'Zuzenketa bat onartu honetarako %{amendable_title}. Orrialde honetatik ikus dezakezu:'
             email_outro: Jakinarazpen hau jaso duzu %{amendable_title} jarraitzen duzulako. Aurreko estekan sartu jakinarazpenak jasotzeari utzi nahi badiozu.
             email_subject: '%{emendation_author_nickname} ren aldaketa onartuta honetarako: %{amendable_title}'
             notification_title: '<a href="%{emendation_author_path}">%{emendation_author_nickname}</a> k sortutako <a href="%{emendation_path}"></a> zuzenketa onartu da honetarako: <a href="%{amendable_path}">%{amendable_title}</a>.'
@@ -902,7 +902,7 @@ eu:
           follower:
             email_intro: '%{amendable_title} rako zuzenketa %{amendable_type} berri gisa argitaratu da. Orrialde honetan ikusi dezakezu:'
             email_outro: Jakinarazpen hau jaso duzu %{amendable_title} jarraitzen duzulako. Aurreko esteka jarraituz jakinarazpenak jasotzeari uztea erabaki dezakezu.
-            email_subject: Batetik zuzenketa %{emendation_author_nickname} izan berri gisa argitaratuko %{amendable_type}
+            email_subject: 'Hemendik: %{emendation_author_nickname} zuzenketa bat argitaratu da %{amendable_type} berri gisa'
             notification_title: <a href="%{emendation_path}"> k ukatu du </a> zuzenketa honetarako <a href="%{amendable_path}">%{amendable_title}</a> argitaratu du %{amendable_type} berri gisa honek <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
         amendment_rejected:
           affected_user:
@@ -930,7 +930,7 @@ eu:
         component_published:
           email_intro: '%{resource_title} osagaia aktibatu da %{participatory_space_title} espazioan. Orrialde honetan ikus dezakezu:'
           email_outro: Jakinarazpena jaso duzu %{participatory_space_title} jarraituz gero. Aurreko esteka jarraituz jakinarazpenak jasotzeari uztea erabaki dezakezu.
-          email_subject: '%{participatory_space_title} eguneratze bat'
+          email_subject: 'Eguneraketa bat honetarako: %{participatory_space_title}'
           notification_title: '%{resource_title} osagaia aktibo dago iadanik <a href="%{resource_path}">%{participatory_space_title}</a> espaziorako'
       email_event:
         email_greeting: Kaixo, %{user_name},
@@ -957,7 +957,7 @@ eu:
           email_intro: |-
             Zure %{resource_type} ez da ikusgai egongo.<br>
             Hori gertatu da zuk erantzun duzun proposamena, bilera, eztabaida edo iruzkina moderatu egin delako. Berriro erabilgarri jartzen bada, zure iruzkina automatikoki leheneratuko da.
-          email_outro: Jakinarazpen hau jaso duzu eragindako %{resource_type}-ren egilea zarelako.
+          email_outro: Jakinarazpen hau jaso duzu %{resource_type} ekimenaren egilea zarelako.
           email_subject: Zure %{resource_type} ez da dagoeneko ikusten
           notification_title: |-
             Zure %{resource_type} ez da ikusgai egongo.<br>
@@ -1004,7 +1004,7 @@ eu:
         dummy_resource: Balizko baliabideak
         meeting: Topaketa-zerrenda
         project: Proiektuak
-        proposal: Proposamenak
+        proposal: Proposamen
         result: Emaitzak
     fingerprint:
       check: Egiaztatu hatz-marka
@@ -1094,7 +1094,7 @@ eu:
           conditions:
           - Beste pertsona batzuei aktibo eta jarraitzen zaien ziurgabetasuna beste pertsona batzuek segituko dute.
           description: Bereizgarria jarraitzaile kopuru jakin batera iristen zarenean ematen da. %{organization_name} sare soziala eta politikoa da, zure web-orria plataforman beste pertsona batzuekin komunikatzeko ehuna egiten du.
-          description_another: Parte-hartzaile honek %{score} jarraitzaile ditu.
+          description_another: Erabiltzaile honek %{score} jarraitzaile ditu.
           description_own: "%{score} parte-hartzailek jarraitzen zaituzte."
           name: Jarraitzaileak
           next_level_in: Lortu %{score} parte-hartzaile gehiago jarraitzeko hurrengo mailara iristeko!
@@ -1150,7 +1150,7 @@ eu:
     log:
       base_presenter:
         create: "%{user_name} parte-hartzaileak %{resource_name} sortu du"
-        create_with_space: "%{user_name} sortu %{resource_name} en %{space_name}"
+        create_with_space: "%{user_name} parte-hartzaileak %{resource_name} emaitza sortu du %{space_name} espazioan"
         delete: "%{user_name} parte-hartzaileak %{resource_name} ezabatu du"
         delete_with_space: "%{user_name} parte-hartzaileak %{resource_name} ezabatu du %{space_name} espazioan"
         publish: "%{user_name} parte-hartzaileak %{resource_name} argitaratu du"
@@ -1158,11 +1158,11 @@ eu:
         unknown_action: "%{user_name} parte-hartzaileak ekintza batzuk egin ditu %{resource_name} ean"
         unknown_action_with_space: "%{user_name} parte-hartzaileak ekintza batzuk egin ditu %{resource_name} ean %{space_name} espazioan"
         unpublish_with_space: "%{user_name} parte-hartzaileak %{resource_name} despargitaratu du %{space_name} espaziotik"
-        update: "%{user_name} k %{resource_name} eguneratu du"
+        update: "%{user_name} parte-hartzaileak %{resource_name} eguneratu du"
         update_filters: "%{user_name} parte-hartzaileak %{resource_name} iragazkia eguneratu du"
         update_filters_with_space: "%{user_name} parte-hartzaileak %{resource_name} ren iragazkiak eguneratu ditu %{space_name} espazioan"
-        update_permissions_with_space: "%{user_name} k %{resource_name} ren baimenak eguneratu ditu %{space_name} espazioan"
-        update_with_space: "%{user_name} parte-hartzaileak eguneratu du %{resource_name} hemen %{space_name}"
+        update_permissions_with_space: "%{user_name} parte-hartzaileak %{resource_name} ren baimenak eguneratu ditu %{space_name} espazioan"
+        update_with_space: "%{user_name} parte-hartzileak eguneratu du %{resource_name} hemen %{space_name}"
       value_types:
         area_presenter:
           not_found: 'Arloa ez da (ID: %{id}) datu-basean aurkitu'
@@ -1193,12 +1193,12 @@ eu:
         new_conversation:
           greeting: Kaixo, %{recipient}!
           intro: "%{sender} bidaltzaileak beste elkarrizketa bat hasi du zurekin. Egin klik hemen ikusteko:"
-          outro: Ongi etorri plataformara!
+          outro: Gozatu plataforma!
           subject: "%{sender} bidaltzaileak elkarrizketa bat hasi du zurekin"
         new_message:
           greeting: Kaixo, %{recipient}!
           intro: "%{sender} bidaltzaileak elkarrizketan mezu berriak argitaratu ditu. Egin klik hemen ikusteko:"
-          outro: Ongi etorri plataformara!
+          outro: Gozatu plataforma!
           subject: '%{sender} bidaltzailearen mezu berriak dituzu'
       conversations:
         add_conversation_users:
@@ -1307,7 +1307,7 @@ eu:
         daily: Jakinarazpenen eguneroko laburpena
         real_time: Denbora erreala
         weekly: Jakinarazpenen asteko laburpena
-      hello: Kaixo %{name},
+      hello: Kaixo, %{name}
       intro:
         daily: 'Hona hemen aktibitatean oinarritutako azken egunetako jakinarazpenak:'
         real_time: 'Jarraitzen ari zaren jarduerari buruzko jakinarazpena da hau:'
@@ -1473,11 +1473,11 @@ eu:
           how_to_participate: Nola har dezaket parte prozesu batean?
           meetings: Bilerak
           meetings_explanation: Jakin non eta noiz har dezakezun parte bilera publikoetan.
-          more_info: Argibide gehiago honi buruz %{resource_name}
+          more_info: Informazio gehiago %{resource_name} prozesuari buruz
           proposals: Proposamenak
           proposals_explanation: Egin proposamenak, babestu lehendik daudenak, eta sustatu ikusi nahi dituzun aldaketak.
         footer_sub_hero:
-          footer_sub_hero_body_html: Eraiki dezagun gizarte irekiago, gardenago eta kolaboratiboagoa <br /> Lotu, hartu parte eta erabaki.
+          footer_sub_hero_body_html: Eraiki dezagun gizarte irekiagoa, gardenagoa eta kolaboratiboagoa <br /> Lotu, hartu parte eta erabaki.
           footer_sub_hero_headline: Ongi etorri %{organization} erakundearen partaidetzarako plataformara.
           register: Kontu bat sortu
         hero:
@@ -1500,7 +1500,7 @@ eu:
           success: Bikain! Onartu dituzu zerbitzuaren baldintzak.
         form:
           agreement: Ados nago baldintza hauekin
-          legend: Zerbitzuaren baldintzak onartzen ditut
+          legend: Onartu zerbitzuaren baldintzak
         refuse:
           modal_body: Onartzen ez baduzu, ezin izango duzu plataforman parte hartu, <a href="%{download_your_data_path}">zure datuak deskargatu ahal dituzu</a> eta/edo <a href="%{delete_path}">zure kontua ezabatu</a>.
           modal_btn_continue: Onartu baldintzak eta jarraitu
@@ -1585,10 +1585,10 @@ eu:
         details: Xehetasunak
         hello: Kaixo, %{name},
         id: ID
-        participatory_space: Partaidetza-espazioa
+        participatory_space: Espazio parte-hartzailea
         reason: Arrazoia
         report_html: <p>Hurrengo <a href="%{url}"> edukia </a> salatua izan da.</p>
-        see_report: Txostena ikusi
+        see_report: Ikusi txostena
         subject: Eduki bat salatua izan da
     reports:
       create:
@@ -1626,7 +1626,7 @@ eu:
       filters_small_view:
         filter: Iragazi
         filter_and_search: Iragazi eta bilatu
-        filter_by: Iragazi arabera
+        filter_by: Iragazi honen arabera
       results:
         view_all: Ikusi dena (%{count})
     security:
@@ -1655,10 +1655,10 @@ eu:
         description: Eduki hau desegokia da?
         does_not_belong: Bertan badago legez kontrako jardunik, suizidio-mehatxurik, informazio pertsonalik edo beste zernahi, zure ustez %{organization_name}-ri ez dagokionik.
         hide: Ezkutatu
-        hide_content: Edukia ezkutatu
+        hide_content: Ezkutatu edukia
         offensive: Bertan badago arrazakeriarik, sexismorik, irainik, eraso pertsonalik, heriotza-mehatxurik, suizidio-eskaerarik edo beste edozein eratako gorroto-diskurtsorik.
         reason: Arrazoia
-        report: Salatu
+        report: Txostena
         spam: Clickbait, publizitatea, iruzurrak edo script bot-ak ditu.
         title: Salatu eduki desegokia
       flag_user_modal:
@@ -1701,7 +1701,7 @@ eu:
       comments_count: Iruzkinak
       comments_count_tooltip: Espazio honetan dauden iruzkin guztiak.
       followers_count: Jarraitzaileak
-      followers_count_tooltip: Zenbat parte-hartzaileek jarraitzen duten espazio honen parteren bat eguneratuta egoteko.
+      followers_count_tooltip: Zenbat parte-hartzailek jarraitzen duten espazio honen parteren bat eguneratuta egoteko.
       headline: Estatistikak
       likes_count: Likeak
       no_stats: Oraindik ez dago estatistikarik.
@@ -1739,7 +1739,7 @@ eu:
       notify_deprecation_to_owner:
         body_1: '%{organization_name} (e) n duzun taldearen profilari buruzko eguneraketa garrantzitsu baten berri ematera gatozkizu.'
         body_2: 'Zurea bezalako erakundeen esperientzia sinplifikatzeko gure ahaleginen zati gisa, orain arte ezagutzen dugun "Erabiltzaile Taldeak" funtzioa zaharkituta geratuko da. Taldearen profila: <strong>%{name}</strong>, ohiko parte-hartzailearen profil bihurtu da.'
-        body_3: Zure kontuan sartzen jarraitzeko eta sarbidea partekatzeko, pasahitz bat ezartzea behar dugu. Behin ezarrita, saioa hasteko kredentzialak (posta elektronikoa eta pasahitza) edozeinekin parteka ditzakezu.
+        body_3: Zure kontuan sartzen jarraitzeko eta sarbidea partekatzeko, pasahitz bat ezarri behar dizugu. Behin ezarrita, saioa hasteko kredentzialak (posta elektronikoa eta pasahitza) edonorekin parteka ditzakezu.
         greeting: '%{name}, agurgarria:'
         instructions_1: 'Egin klik beheko estekan zure pasahitza ezartzeko:'
         instructions_2: 'Partekatu saioa hasteko kredentzialak (posta elektronikoa: %{email} eta pasahitz berria) zure lankideekin.'
@@ -1789,7 +1789,7 @@ eu:
         version_index: '%{total} en %{index} bertsioa'
     welcome_notification:
       default_body: <p>Kaixo {{name}}, eskerrik asko {{organization}}-era lotzeagatik eta ongi etorria!</p><ul><li>Hemen zer egin dezakezun ideia azkar bat nahi baduzu, begiratu <a href="{{help_url}}">Laguntza</a> atalean.</li><li>Behin irakurri ondoren, zure lehen garaikurra jasoko duzu. Hemen da <a href="{{badges_url}}">garaikur guztien zerrenda</a> zuk lor ditzakezunak {{organization}} ean parte hartuz.</li><li> Azkenik, lotu beste pertsona batzuei eta partekatu haiekin inplikatzearen eta {{organization}} ean parte hartzearen esperientzia. Egin proposamenak, iruzkinak, eztabaidak, pentsatu nola lagundu denon onerako, eman argudioak konbentzitzeko, entzun eta irakurri zeure burua konbentzitzeko, adierazi zure ideiak modu zehatzean, erantzun pazientziaz eta erabakiz, defendatu zure ideiak eta mantendu burua zabalik, beste pertsona batzuen ideietan lankidetzan aritzeko.</li></ul>
-      default_subject: Thanks for joining {{organization}}!
+      default_subject: Eskerrik asko {{organization}} erakundearekin bat egiteagatik!
     wizard_step_form:
       wizard_aside:
         back: Atzera
@@ -1800,7 +1800,7 @@ eu:
     confirmations:
       confirmed: Zure helbide elektronikoa ondo egiaztatu da.
       new:
-        resend_confirmation_instructions: Berrespen-jarraibideak birbidali
+        resend_confirmation_instructions: Birbidali berrespen-jarraibideak
       send_instructions: Jarraibideak azaltzen dituen mezu elektroniko bat jasoko duzu, zure helbide elektronikoa berretsi ahal izateko minutu gutxi barru.
       send_paranoid_instructions: Zure helbide elektronikoa gure datu-basean badago, mezu elektroniko bat jasoko duzu zure helbide elektronikoa minutu gutxi barru baieztatzeko jarraibideekin.
     failure:
@@ -1839,17 +1839,17 @@ eu:
       email_changed:
         greeting: Kaixo %{recipient}!
         message: 'Zuregana jotzen dugu jakinarazteko zure posta elektronikoa aldatu dela honengatik: %{email}.'
-        subject: Helnbide elektronikoa aldatu da
+        subject: Helbide elektronikoa aldatu da
       invitation_instructions:
         accept: Gonbita onartu
         accept_until: 'Gonbidapen hau data honetan iraungiko da: %{due_date}.'
-        decline: Deuseztatu gonbita
+        decline: Baztertu gonbidapena
         hello: Kaixo, %{email},
         ignore: |-
           Gonbidapena onartu nahi ez baduzu, mesedez, ez egin kasurik mezu elektroniko honi. Zure kontua ez da sortuko, goiko estekara sartu eta zure erabiltzaile-izena eta pasahitza ezarri arte.
         invited_you_as_admin: "%{invited_by} admnisitrariak %{application} administratzaile gisa gonbidatu zaitu. Beheko estekan onartu dezakezu."
         invited_you_as_private_user: "%{invited_by} parte-hartzaileak egonbidatu zaitu %{application} ko erabiltzaile pribatu gisa. Beheko estekan onartu dezakezu."
-        someone_invited_you: Norbaitek %{application} gonbidatu zaitu. Beheko estekan onar dezakezu.
+        someone_invited_you: Norbaitek %{application} aplikaziora gonbidatu zaitu. Beheko estekan onar dezakezu.
         someone_invited_you_as_admin: Norbaitek %{application} administratzaile gisa gonbidatu zaitu, beheko estekan onar dezakezu.
         someone_invited_you_as_private_user: Norbaitek %{application} ko parte-hartzaile pribatu gisa gonbidatu zaitu, beheko estekan onar dezakezu.
         subject: Gonbidapenaren argibideak
@@ -1867,14 +1867,14 @@ eu:
         subject: Pasahitza aldatu da
       reset_password_instructions:
         action: Nire pasahitza aldatu
-        greeting: Kaixo %{recipient}!
+        greeting: Kaixo, %{recipient}!
         instruction: Norbaitek esteka bat eskatu du zure pasahitza aldatzeko, eta beheko estekaren bidez egin dezakezu.
         instruction_2: Ez baduzu hori eskatu, ez egin kasurik mezu honi.
         instruction_3: Zure pasahitza ez da aldatuko aurreko estekara sartu eta beste bat sortu arte.
         subject: Berrezarri pasahitzaren argibideak
       unlock_instructions:
         action: Nire kontua desbloqueatu
-        greeting: Kaixo %{recipient}!
+        greeting: Kaixo, %{recipient}!
         instruction: 'Egin klik beheko estekan zure kontua desblokeatzeko:'
         message: Zure kontua blokeatu egin da saiakeretan izandako gehiegizko saio porrokatuengatik.
         subject: Desblokeatu argibideak
@@ -1926,7 +1926,7 @@ eu:
         sign_up: Sortu kontu bat
       minimum_password_length:
         one: "(karaktere bat gutxienez)"
-        other: "(Gutxienez%{count} karaktere)"
+        other: "(%{count} karaktere gutxienez)"
     unlocks:
       new:
         resend_unlock_instructions: Birbidali desblokeatzeko argibideak
@@ -2128,7 +2128,7 @@ eu:
         social_media: Sare Sozialak
         terms_of_service: Zerbitzuaren baldintzak
       header:
-        back: Itzuli
+        back: Atzera
         close: Itxi
         confirm_close_ephemeral_session: Nabigatzeari uzten badiozu, zure behin-behineko saioa itxita egongo da. Hala ere, zure aurrerapen eta jarduera guztiak salbatuko dira. Jarduera amaitu baduzu, egin klik Ok botoian.
         confirm_title_close_ephemeral_session: Orri honetatik irten baino lehen…
diff --git a/decidim-core/config/locales/fi-plain.yml b/decidim-core/config/locales/fi-plain.yml
index 3bb7c814c11ca..4f3e9c9d84044 100644
--- a/decidim-core/config/locales/fi-plain.yml
+++ b/decidim-core/config/locales/fi-plain.yml
@@ -424,7 +424,7 @@ fi-pl:
       wizard_step_form:
         steps:
           '1': Luo muutos
-          '2': Julkaise muutoksesi
+          '2': Julkaise muutos
     anonymous_user: Anonyymi
     application:
       document:
@@ -1340,6 +1340,7 @@ fi-pl:
         own_activity: Oma toiminta, kuten omia ehdotuksia koskevat kommentit tai maininnat
         push_notifications: Push-ilmoitukset
         push_notifications_reminder: Mikäli haluat vastaanottaa push-ilmoituksia alustalta, sinun on sallittava ne ensin selaimesi asetuksista tälle sivustolle.
+        push_notifications_unsupported_browser: Selaimesi ei ole tuettu.
         receive_notifications_about: Haluan saada ilmoituksia
         update_notifications_settings: Tallenna muutokset
       update:
diff --git a/decidim-core/config/locales/fi.yml b/decidim-core/config/locales/fi.yml
index 9b3c73e9760a2..29264d8834e64 100644
--- a/decidim-core/config/locales/fi.yml
+++ b/decidim-core/config/locales/fi.yml
@@ -424,7 +424,7 @@ fi:
       wizard_step_form:
         steps:
           '1': Luo muutos
-          '2': Julkaise muutoksesi
+          '2': Julkaise muutos
     anonymous_user: Anonyymi
     application:
       document:
@@ -1340,6 +1340,7 @@ fi:
         own_activity: Oma toiminta, kuten omia ehdotuksia koskevat kommentit tai maininnat
         push_notifications: Push-ilmoitukset
         push_notifications_reminder: Mikäli haluat vastaanottaa push-ilmoituksia alustalta, sinun on sallittava ne ensin selaimesi asetuksista tälle sivustolle.
+        push_notifications_unsupported_browser: Selaimesi ei ole tuettu.
         receive_notifications_about: Haluan saada ilmoituksia
         update_notifications_settings: Tallenna muutokset
       update:
diff --git a/decidim-core/config/locales/gl.yml b/decidim-core/config/locales/gl.yml
index c98b3d51bf898..53b973e249d63 100644
--- a/decidim-core/config/locales/gl.yml
+++ b/decidim-core/config/locales/gl.yml
@@ -161,9 +161,6 @@ gl:
         back: De volta
         heading: Revisa a modificación
         send: Aceptar a emenda
-      wizard_step_form:
-        steps:
-          '1': Crea a túa emenda
     anonymous_user: Anónimo
     application:
       documents:
diff --git a/decidim-core/config/locales/hu.yml b/decidim-core/config/locales/hu.yml
index d3521ffde7333..e13ad8e7a3444 100644
--- a/decidim-core/config/locales/hu.yml
+++ b/decidim-core/config/locales/hu.yml
@@ -299,9 +299,6 @@ hu:
         success: A módosító javaslat sikeresen frissítve.
       withdraw:
         success: A módosítás visszavonása sikeres.
-      wizard_step_form:
-        steps:
-          '1': Készítse el a módosítását
     anonymous_user: Névtelen
     application:
       document:
diff --git a/decidim-core/config/locales/id-ID.yml b/decidim-core/config/locales/id-ID.yml
index ba8da56c66106..752167635d9b9 100644
--- a/decidim-core/config/locales/id-ID.yml
+++ b/decidim-core/config/locales/id-ID.yml
@@ -148,9 +148,6 @@ id:
         back: Kembali
         heading: Tinjau amandemennya
         send: Terima amandemen
-      wizard_step_form:
-        steps:
-          '1': Buat amandemen Anda
     anonymous_user: Anonim
     application:
       documents:
diff --git a/decidim-core/config/locales/it.yml b/decidim-core/config/locales/it.yml
index ccdb24783bb89..e93c6ab0ecc88 100644
--- a/decidim-core/config/locales/it.yml
+++ b/decidim-core/config/locales/it.yml
@@ -328,7 +328,7 @@ it:
         success: Bozza emendamento aggiornata correttamente.
       wizard_step_form:
         steps:
-          '1': Crea il tuo emendamento
+          '2': Pubblica la tua rettifica
     anonymous_user: Anonimo
     application:
       document:
diff --git a/decidim-core/config/locales/ja.yml b/decidim-core/config/locales/ja.yml
index 63ecb18a8b58f..65b76290c96a3 100644
--- a/decidim-core/config/locales/ja.yml
+++ b/decidim-core/config/locales/ja.yml
@@ -407,10 +407,6 @@ ja:
       withdraw:
         error: 修正案の取り消し中に問題がありました。
         success: 修正を撤回しました。
-      wizard_step_form:
-        steps:
-          '1': 修正を作成する
-          '2': 修正を公開
     anonymous_user: 匿名です
     application:
       document:
diff --git a/decidim-core/config/locales/lb.yml b/decidim-core/config/locales/lb.yml
index 55630a591892a..b9843012b7bde 100644
--- a/decidim-core/config/locales/lb.yml
+++ b/decidim-core/config/locales/lb.yml
@@ -202,9 +202,6 @@ lb:
       update_draft:
         error: Et gouf e Problem beim Aktualiséieren vum Ännerungsvirschlag.
         success: Ännerungsvirschlag gouf aktualiséiert.
-      wizard_step_form:
-        steps:
-          '1': Erstell deng Ännerung
     anonymous_user: Anonym
     application:
       document:
diff --git a/decidim-core/config/locales/lt.yml b/decidim-core/config/locales/lt.yml
index a5a2f905cefbb..230dc0948dcb6 100644
--- a/decidim-core/config/locales/lt.yml
+++ b/decidim-core/config/locales/lt.yml
@@ -351,9 +351,6 @@ lt:
         success: Pataisos juodraštis sėkmingai atnaujintas.
       withdraw:
         success: Pataisa sėkmingai atsiimta.
-      wizard_step_form:
-        steps:
-          '1': Sukurkite savo pataisą
     anonymous_user: Anonimas
     application:
       document:
diff --git a/decidim-core/config/locales/lv.yml b/decidim-core/config/locales/lv.yml
index 97ecf79ef74d8..ca535e01f6ee6 100644
--- a/decidim-core/config/locales/lv.yml
+++ b/decidim-core/config/locales/lv.yml
@@ -182,9 +182,6 @@ lv:
       update_draft:
         error: Grozījuma melnraksta atjaunināšanas laikā radās kļūda.
         success: Grozījuma melnraksts ir veiksmīgi atjaunināts.
-      wizard_step_form:
-        steps:
-          '1': Izveidot savu grozījumu
     anonymous_user: Anonīms
     application:
       document:
diff --git a/decidim-core/config/locales/nl.yml b/decidim-core/config/locales/nl.yml
index 01229d95a14ee..8a3794ad74285 100644
--- a/decidim-core/config/locales/nl.yml
+++ b/decidim-core/config/locales/nl.yml
@@ -206,9 +206,6 @@ nl:
       update_draft:
         error: Er is een fout opgetreden bij het bijwerken van dit amendement.
         success: Amendement ontwerp is succesvol bijgewerkt.
-      wizard_step_form:
-        steps:
-          '1': Maak uw amendement
     anonymous_user: Anoniem
     application:
       document:
diff --git a/decidim-core/config/locales/no.yml b/decidim-core/config/locales/no.yml
index ba800cfc92924..de5305e2ded1e 100644
--- a/decidim-core/config/locales/no.yml
+++ b/decidim-core/config/locales/no.yml
@@ -209,9 +209,6 @@
       update_draft:
         error: Det oppsto et problem med å oppdatere endrings utkastet.
         success: Endrings utkastet ble oppdatert.
-      wizard_step_form:
-        steps:
-          '1': Opprett endringen din
     anonymous_user: Anonym
     application:
       document:
diff --git a/decidim-core/config/locales/pl.yml b/decidim-core/config/locales/pl.yml
index fdfea07045047..692bdbc0a96a4 100644
--- a/decidim-core/config/locales/pl.yml
+++ b/decidim-core/config/locales/pl.yml
@@ -320,10 +320,6 @@ pl:
         success: Szkic poprawki został pomyślnie zaktualizowany.
       withdraw:
         success: Poprawka została pomyślnie wycofana.
-      wizard_step_form:
-        steps:
-          '1': Utwórz poprawkę
-          '2': Opublikuj poprawkę
     anonymous_user: Anonim
     application:
       document:
diff --git a/decidim-core/config/locales/pt-BR.yml b/decidim-core/config/locales/pt-BR.yml
index 4bbb5f8f687e6..75237e2b64fe0 100644
--- a/decidim-core/config/locales/pt-BR.yml
+++ b/decidim-core/config/locales/pt-BR.yml
@@ -421,10 +421,6 @@ pt-BR:
       withdraw:
         error: Houve um problema ao retirar a emenda.
         success: A emenda foi retirada com sucesso.
-      wizard_step_form:
-        steps:
-          '1': Crie sua emenda
-          '2': Publique sua emenda
     anonymous_user: Anônimo
     application:
       document:
diff --git a/decidim-core/config/locales/pt.yml b/decidim-core/config/locales/pt.yml
index ce76be57481d4..ea1e8bc34157b 100644
--- a/decidim-core/config/locales/pt.yml
+++ b/decidim-core/config/locales/pt.yml
@@ -202,9 +202,6 @@ pt:
       update_draft:
         error: Ocorreu um problema ao atualizar o rascunho da modificação.
         success: Rascunho da modificação atualizado corretamente.
-      wizard_step_form:
-        steps:
-          '1': Criar a sua modificação
     anonymous_user: Anônimo
     application:
       document:
diff --git a/decidim-core/config/locales/ro-RO.yml b/decidim-core/config/locales/ro-RO.yml
index 78b1c43cb9dcc..e711f69131533 100644
--- a/decidim-core/config/locales/ro-RO.yml
+++ b/decidim-core/config/locales/ro-RO.yml
@@ -432,10 +432,6 @@ ro:
       withdraw:
         error: A apărut o eroare la retragerea amendamentului.
         success: Amendamentul a fost retras cu succes.
-      wizard_step_form:
-        steps:
-          '1': Creeați un amendament
-          '2': Publicați amendamentul
     anonymous_user: Anonim
     application:
       document:
diff --git a/decidim-core/config/locales/sk.yml b/decidim-core/config/locales/sk.yml
index ad83c442864f8..335b0ab9b5a6d 100644
--- a/decidim-core/config/locales/sk.yml
+++ b/decidim-core/config/locales/sk.yml
@@ -446,10 +446,6 @@ sk:
       withdraw:
         error: Pri sťahovaní pozmeňujúceho návrhu sa vyskytol problém.
         success: Pozmeňujúci návrh bol úspešne stiahnutý.
-      wizard_step_form:
-        steps:
-          '1': Vytvorte svoj pozmeňovací návrh
-          '2': Zverejnite svoj pozmeňujúci návrh
     anonymous_user: Anonymné
     application:
       document:
diff --git a/decidim-core/config/locales/sv.yml b/decidim-core/config/locales/sv.yml
index 5a3ca695355da..dcc8bf58b635b 100644
--- a/decidim-core/config/locales/sv.yml
+++ b/decidim-core/config/locales/sv.yml
@@ -422,8 +422,8 @@ sv:
         success: Ändringsförslaget har dragits tillbaka.
       wizard_step_form:
         steps:
-          '1': Skapa ändringsförslag
-          '2': Publicera ditt ändringsförslag
+          '1': Skapa din korrigering
+          '2': Publicera din korrigering
     anonymous_user: Anonym
     application:
       document:
diff --git a/decidim-core/config/locales/tr-TR.yml b/decidim-core/config/locales/tr-TR.yml
index a984ce59b047f..c85beb1aa8ff4 100644
--- a/decidim-core/config/locales/tr-TR.yml
+++ b/decidim-core/config/locales/tr-TR.yml
@@ -202,10 +202,6 @@ tr:
       update_draft:
         error: Değişiklik taslağı güncellenirken bir hata oluştu.
         success: Değişiklik taslağı başarıyla güncellendi.
-      wizard_step_form:
-        steps:
-          '1': Değişikliğinizi oluşturun
-          '2': Değişikliğinizi yayınlayın
     anonymous_user: Anonim
     application:
       document:
diff --git a/decidim-core/config/locales/zh-CN.yml b/decidim-core/config/locales/zh-CN.yml
index 79969e3b9578f..dd0e8d0c5ca33 100644
--- a/decidim-core/config/locales/zh-CN.yml
+++ b/decidim-core/config/locales/zh-CN.yml
@@ -176,9 +176,6 @@ zh-CN:
       update_draft:
         error: 更新修正草案时遇到问题。
         success: 修正草稿已成功更新。
-      wizard_step_form:
-        steps:
-          '1': 创建您的修改
     anonymous_user: 匿名的
     application:
       document:
diff --git a/decidim-core/config/locales/zh-TW.yml b/decidim-core/config/locales/zh-TW.yml
index 8507c4ca6e6d1..cf9040d0c1c36 100644
--- a/decidim-core/config/locales/zh-TW.yml
+++ b/decidim-core/config/locales/zh-TW.yml
@@ -293,9 +293,6 @@ zh-TW:
         success: 修正案草稿成功更新。
       withdraw:
         success: 修正案已成功撤回.
-      wizard_step_form:
-        steps:
-          '1': 創建您的修正案
     anonymous_user: 匿名
     application:
       document:
diff --git a/decidim-debates/config/locales/eu.yml b/decidim-debates/config/locales/eu.yml
index a0be6f43cb71a..09541480c9437 100644
--- a/decidim-debates/config/locales/eu.yml
+++ b/decidim-debates/config/locales/eu.yml
@@ -9,7 +9,7 @@ eu:
         end_time: Bukaera-data
         information_updates: Informazioaren eguneratzeak
         instructions: Parte hartzeko argibideak
-        start_time: Hasi da
+        start_time: Hasiera-data
         title: Izenburua
     models:
       decidim/debates/close_debate_event: Eztabaida itxita
@@ -95,7 +95,7 @@ eu:
             title: Beste eztabaida bat
           update:
             invalid: Arazo bat egon da eztabaida hau eguneratzean.
-            success: Debate arrakastaz eguneratu da.
+            success: Eztabaida zuzen eguneratu da.
         exports:
           debate_comments: Iruzkinak
           debates: Eztabaidak
@@ -126,7 +126,7 @@ eu:
             other: "%{count} eztabaida"
         create:
           invalid: Arazo bat egon da eztabaida sortzean.
-          success: Debate sortu da behar bezala.
+          success: Eztabaida zuzen eguneratu da.
         debates:
           empty: Oraindik ez dago eztabaidarik.
           empty_filters: Ez dago irizpide hau duen eztabaidarik.
@@ -138,7 +138,7 @@ eu:
           activity: Nire jarduera
           all: Guztiak
           category: Kategoria
-          category_prompt: Kategoria bat aukeratu
+          category_prompt: Hautatu kategoria bat
           commented: Iruzkina eginda
           my_debates: Nire eztabaidak
           official: Ofiziala
@@ -176,15 +176,15 @@ eu:
           success: Eztabaida zuzen eguneratu da.
       last_activity:
         debate_updated: 'Eztabaida eguneratu da:'
-        new_debate: 'Eztabaida berria:'
+        new_debate: 'Beste eztabaida bat:'
       models:
         debate:
           fields:
             end: Amaiera
-            end_time: Amaiera data
-            official_debate: Ofizial eztabaida
+            end_time: Amaiera-data
+            official_debate: Eztabaida ofiziala
             start: Hasi
-            start_time: Hasiera data
+            start_time: Hasiera-data
             taxonomies: Taxonomiak
             title: Izenburua
     download_your_data:
diff --git a/decidim-dev/config/locales/eu.yml b/decidim-dev/config/locales/eu.yml
index ef8bd9c965904..6e50998ec4675 100644
--- a/decidim-dev/config/locales/eu.yml
+++ b/decidim-dev/config/locales/eu.yml
@@ -59,7 +59,7 @@ eu:
           name: Probak
           next_level_in: Sortu %{score} proba gehiago hurrengo mailara iristeko!
           unearned_another: Parte-hartzaile honek oraindik ez du inkestarik sortu.
-          unearned_own: Oraindik ez duzu probak sortu.
+          unearned_own: Oraindik ez duzu probarik sortu.
     resource_links:
       test_link:
         dummy_resource_dummy: ' Honekin lotutako proba'
diff --git a/decidim-elections/config/locales/cs.yml b/decidim-elections/config/locales/cs.yml
index 10b75288c1d82..374abeaa44d1a 100644
--- a/decidim-elections/config/locales/cs.yml
+++ b/decidim-elections/config/locales/cs.yml
@@ -142,9 +142,18 @@ cs:
             form_description: Otázka musí mít alespoň dvě odpovědi, aby mohla jít k dalšímu kroku.
           update:
             invalid: Při aktualizaci otázek došlo k chybě.
+            success: Otázky byly úspěšně aktualizovány.
         statuses:
+          enable_voting:
+            invalid: Při povolování hlasování došlo k chybě.
+            success: Hlasování bylo úspěšně aktivováno.
+          end:
+            invalid: Vyskytl se problém s ukončením voleb.
           publish_results:
             invalid: Při publikování výsledků došlo k chybě.
+            success: Výsledky byly úspěšně zveřejněny.
+          start:
+            invalid: Vyskytl se problém při zahájení voleb.
           unknown: Neznámý stav
       admin_log:
         election:
diff --git a/decidim-elections/config/locales/eu.yml b/decidim-elections/config/locales/eu.yml
index 175fd7ecc63af..4caab5a1c619a 100644
--- a/decidim-elections/config/locales/eu.yml
+++ b/decidim-elections/config/locales/eu.yml
@@ -42,7 +42,7 @@ eu:
         new: Beste hauteskunde bat
         preview: Aurrebistaratu
         title: Ekintzak
-        view: Hauteskundeak ikusi
+        view: Ikusi hauteskundeak
         view_deleted_elections: Ikusi ezabatutako hauteskundeak
       admin:
         census:
diff --git a/decidim-forms/config/locales/eu.yml b/decidim-forms/config/locales/eu.yml
index afc94eaa0324e..42f749111033e 100644
--- a/decidim-forms/config/locales/eu.yml
+++ b/decidim-forms/config/locales/eu.yml
@@ -140,7 +140,7 @@ eu:
             remove: Kendu
             separator: Bereizlea
           title_and_description:
-            collapse: Tolestu
+            collapse: Kolapsoa
             description: Deskribapena
             expand: Zabaldu
             remove: Kendu
diff --git a/decidim-initiatives/config/locales/eu.yml b/decidim-initiatives/config/locales/eu.yml
index 148bdb4864c94..77700ee6a8409 100644
--- a/decidim-initiatives/config/locales/eu.yml
+++ b/decidim-initiatives/config/locales/eu.yml
@@ -38,7 +38,7 @@ eu:
         extra_fields_legal_information: Datu pertsonalen bilketari buruzko informazio juridikoa
         minimum_committee_members: Batzorde kideen gutxienekoa
         online_signature_enabled: Sinadura elektronikoa gaituta
-        only_global_scope_enabled: Eremu globaleko ekimenak soilik sortzeko aukera ematea
+        only_global_scope_enabled: Baimendu soilik esparru globaleko ekimenak sortzea
         promoting_committee_enabled: Gaitu batzorde sustatzailea
         signature_type: Sinadura mota
         title: Izenburua
@@ -141,18 +141,18 @@ eu:
         initiatives_votes:
           fields:
             date_and_time: Data eta ordua
-            date_of_birth: Jaioteguna
+            date_of_birth: Jaiotze-data
             document_number: Dokumentuaren zenbakia
             hash: Hash
-            initiative_end_date: Amaiera data
+            initiative_end_date: Amaiera-data
             initiative_id: Ekimenaren ID-a
             initiative_scope: Eremua
             initiative_signatures_count: Sinadura kopurua
-            initiative_start_date: Hasiera data
+            initiative_start_date: Hasiera-data
             initiative_title: Ekimenaren izenburua
-            name_and_surname: Izena eta abizena
+            name_and_surname: Izen-abizenak
             nickname: Ezizena
-            postal_code: Posta kodea
+            postal_code: Posta-kodea
             signature_count: Sinaduren zenbaketa
             timestamp: Denbora-marka
       taxonomy_filters:
@@ -228,9 +228,9 @@ eu:
           info_initiative:
             created_at: Noiz sortua
             description: Deskribapena
-            initiative_votes_count: Babesen zenbaketa
+            initiative_votes_count: Botoen zenbaketa
             initiatives: Ekimenak
-            state: Estatu
+            state: Egoera
         committee_requests:
           index:
             approve: Onartu
@@ -261,11 +261,11 @@ eu:
             accept: Onartu ekimena
             confirm: Ziur zaude?
             confirm_send_to_technical_validation: Ziur zaude?
-            discard: Ekimena baztertu
+            discard: Kendu ekimena
             export_pdf_signatures: Esportatu sinaduren PDF fitxetagia
             export_votes: Esportatu sinadurak
             reject: Ekimena ukatu
-            send_to_technical_validation: Baliozkotze teknikorako bidali
+            send_to_technical_validation: Bidali balidazio teknikora
             success: Ekimena baliozkotze teknikora bidali da.
             update: Eguneratu
           form:
@@ -361,7 +361,7 @@ eu:
           all: Guztiak
           answered: Erantzunda
           closed: Itxita
-          open: Open
+          open: Irekita
           rejected: Ez ditu lortu beharrezko sinadurak
         filter_type_values:
           all: Guztiak
@@ -399,7 +399,7 @@ eu:
           go_to_initiatives: Ekimenetara joan
           publish_helper_text_html: "Gogoan izan zure ekimena argitaratzeko teknikoki baliozkotu behar dela, administratzaile batek berrikus dezan.\n"
         previous_form:
-          back: Back
+          back: Atzera
         promotal_committee:
           individual_help_text: Zure ekimena sortu da, eta zirriborro gisa gorde da. Orain jendea gehitu behar zaio batzorde sustatzaileari.
           invite_link_title: Jendea gonbidatzeko esteka
@@ -409,7 +409,7 @@ eu:
         return_to_initiatives_button:
           return_initiatives_html: Oraingoz, joan eta <a href="%{initiatives_path}">itzuli ekimenetara</a>
         select_initiative_type:
-          back: Back
+          back: Atzera
           choose_html: <strong>%{title}</strong>bat sortu nahi dut
           consult_existing_initiatives: Lehendik dauden ekimenak konsultatu
           continue: Jarraitu
@@ -492,7 +492,7 @@ eu:
           invalid_authorization: Ekintzari ekiteko emandako datuak ez dira bateragarriak zure baimenekin edo baimen berri bat lortu behar duzu.
           invalid_data: Zure nortasuna egiaztatzeko emandako datu pertsonal batzuk ez dira baliozkoak.
         finish:
-          back_to_initiative: Ekimenera itzuli
+          back_to_initiative: Itzuli ekimenera
           title: Ekimena sinatu duzu
         sms_phone_number:
           confirmed_data: Zure datuak baieztatu dituzu.
@@ -549,7 +549,7 @@ eu:
           most_commented: Iruzkin gehien dutenak
           most_voted: Sinadura gehien dutenak
           random: Random
-          recent: Berrienetatik zaharrenetara
+          recent: Azkenak
           recently_published: Oraintsu argitaratutakoa
         pending_initiatives:
           description: Ekimen horiek oraindik ez dira publikoak. Berrikus itzazue, mesedez, eta balioztatze teknikorako aurkez itzazue, argitara eman daitezen.
@@ -598,7 +598,7 @@ eu:
           votes_blocked: Sinadura desgaituta dago
         votes_count:
           count:
-            one: SIGNATURE
+            one: Sinadura
             other: Sinadurak
       initiatives_mailer:
         creation_subject: Zure '%{title}'ekimena sortu egin da
diff --git a/decidim-meetings/config/locales/eu.yml b/decidim-meetings/config/locales/eu.yml
index 09a20b15f2642..3565556a43af7 100644
--- a/decidim-meetings/config/locales/eu.yml
+++ b/decidim-meetings/config/locales/eu.yml
@@ -18,7 +18,7 @@ eu:
         decidim_category_id: Kategoria
         decidim_scope_id: Eremua
         description: Deskribapena
-        end_time: Bukaera ordua
+        end_time: Amaiera-ordua
         id: ID
         iframe_access_level: Iframe sarbide-maila
         iframe_embed_type: Txertatutako iframe mota
@@ -36,7 +36,7 @@ eu:
         registration_url: Izena ematearen URLa
         registrations_enabled: Izen-emateak gaituta
         reserved_slots: Erreserbatuta dauden plazak
-        start_time: Hasiera ordua
+        start_time: Hasiera-ordua
         title: Titulua
         transparent: Gardena
         type_of_meeting: Mota
@@ -102,7 +102,7 @@ eu:
         accepted_at_not_null:
           label: Onartua
           values:
-            'false': Ez onartuta
+            'false': Ez onartua
             'true': Onartua
         meetings:
           closed_at_present:
@@ -221,7 +221,7 @@ eu:
             email_subject: '"%{resource_title}" topaketa itxi egin da'
             notification_title: <a href="%{resource_path}">%{resource_title}</a> topaketa itxi egin da.
         meeting_created:
-          button_text: Eman izena topaketan
+          button_text: Eman izena bileran
           email_intro: '"%{resource_title}" topaketa jarraitzen duzun "%{participatory_space_title}" espazioan gehitu da.'
           email_outro: Jakinarazpen hau jaso duzu "%{participatory_space_title}" prozesua jarraitzen ari zarelako. Aureko estekan utzi ahal diozu jarraitzeari.
           email_subject: 'Beste topaketa bat gehituta honi: %{participatory_space_title}'
@@ -306,13 +306,13 @@ eu:
             add_agenda_item_child: Gai-zerrendan azpi-gai bat gehitu
             agenda_item: Gai zerrendaren gaia
             agenda_item_children: Gai zerrenda azpi gaiak
-            down: Behera
-            remove: Kendu
+            down: Jaitsi
+            remove: Ezabatu
             up: Gora
           agenda_item_child:
             agenda_item_child: Gai zerrenda azpi-gaia
             down: Behera
-            remove: Kendu
+            remove: Ezabatu
             up: Gora
           create:
             invalid: Arazo bat egon da gai-zerrenda hau sortzean.
@@ -503,7 +503,7 @@ eu:
         copy_calendar_url: Kopiatu
         copy_calendar_url_clarification: Kopiatu URL egutegia arbelera
         copy_calendar_url_copied: Kopiatuta!
-        copy_calendar_url_description: Argitaratutako batzar guztiak zure egutegi-aplikazioan edo hornitzailean ikus ditzakezu. Kopiatu eta itsatsi URL hau "Egutegi berria gehitu URL batetik" aukera erabiliz
+        copy_calendar_url_description: Argitaratutako batzar guztiak zure egutegi-aplikazioan edo hornitzailean ikus ditzakezu. Kopiatu eta itsatsi URL hau "Gehitu egutegi berria URL batetik" aukera erabiliz.
         copy_calendar_url_explanation: Mesedez, kontuan izan aukeratutako topaketa multzo bat esportatzen ari zarela eta iragazkiak aktibatuta daudela. Denak esportatu nahi badituzu, lehenengo kendu irakazkiak.
         copy_calendar_url_message: URL hau zuzen kopiatu da zure arbelean.
         export_calendar: Egutegia esportatu
@@ -593,7 +593,7 @@ eu:
             online: On-line
         form:
           address_help: 'Helbidea: Geocoderrek erabilia kokapena aurkitzeko'
-          available_slots_help: Déjalo a 0 si tienes espacio ilimitado disponible
+          available_slots_help: Uzti 0an erabiltzeko espazio mugatua baduzu
           disclaimer: 'Erantzukizun-deskargua: Kanpoko inskripzio-sistema bat erabiliz, onartzen duzu %{organization} ko antolatzaileak ez direla kanpo-zerbitzuko parte-hartzaileek emandako datuen erantzule.'
           iframe_embed_type_html: 'Zerbitzu gutxi batzuek baino ez dute uzten topaketan edo zuzeneko gertakarietan txertatzen honako domeinu hauetatik:%{domains}'
           location_help: 'Kokapena: mezua parte-hartzaileei zuzendua biltzeko lekua adieraziz'
@@ -613,7 +613,7 @@ eu:
           close_meeting: Itxi
           edit_close_meeting: Editatu topaketaren txostena
           edit_meeting: Editatu
-          join_meeting: Izena eman
+          join_meeting: Izena eman topaketan
           reply_poll: Erantzun inkesta
           view_poll: Ikusi inkesta
         meetings:
@@ -629,7 +629,7 @@ eu:
         show:
           attendees: Bertaratuen kopurua
           contributions: Ekarpen-kopurua
-          join: Izena eman
+          join: Eman izena
           join_waitlist: Sartu itxarote-zerrendan
           leave: Baliogabetu zure izen-ematea
           leave_confirmation: Ziur zaude topaketa honetarako zure izen-ematea indargabetu nahi duzula?
diff --git a/decidim-pages/config/locales/eu.yml b/decidim-pages/config/locales/eu.yml
index bdb6f47a97a28..0e8ff3fd8cf10 100644
--- a/decidim-pages/config/locales/eu.yml
+++ b/decidim-pages/config/locales/eu.yml
@@ -3,7 +3,7 @@ eu:
   activerecord:
     models:
       decidim/pages/page:
-        one: Orrialde
+        one: Orrialdea
         other: Orrialdeak
   decidim:
     admin_log:
@@ -32,7 +32,7 @@ eu:
       admin:
         models:
           components:
-            body: Testua
+            body: Gorputza
         pages:
           edit:
             save: Eguneratu
diff --git a/decidim-participatory_processes/config/locales/ca.yml b/decidim-participatory_processes/config/locales/ca.yml
index 9f7285006d0ae..a6f2a13458a43 100644
--- a/decidim-participatory_processes/config/locales/ca.yml
+++ b/decidim-participatory_processes/config/locales/ca.yml
@@ -109,7 +109,7 @@ ca:
         participatory_process_groups: Grups de processos
         participatory_process_groups_submenu:
           info: Quant a aquest grup de processos
-          landing_page: Disposició de la pàgina de destinació
+          landing_page: Disposició de la pàgina d'inici
         participatory_processes: Processos
         participatory_processes_submenu:
           attachment_collections: Carpetes
@@ -117,7 +117,7 @@ ca:
           attachments: Adjunts
           components: Components
           info: Quant a aquest procés
-          landing_page: Disposició de la pàgina de destinació
+          landing_page: Disposició de la pàgina d'inici
           moderations: Moderacions
           private_users: Membres
           process_admins: Administradores del procés
diff --git a/decidim-participatory_processes/config/locales/eu.yml b/decidim-participatory_processes/config/locales/eu.yml
index 5bb351acf3040..ade3e1f881eee 100644
--- a/decidim-participatory_processes/config/locales/eu.yml
+++ b/decidim-participatory_processes/config/locales/eu.yml
@@ -33,7 +33,7 @@ eu:
         slug: URL laburra
         start_date: Hasiera-data
         subtitle: Azpititulua
-        target: Nork parte hartzen duen
+        target: Nork hartzen du parte
         title: Izenburua
         weight: Ordena
       participatory_process_group:
@@ -80,7 +80,7 @@ eu:
         one: Partaidetza-prozesuaren taldea
         other: Partaidetza-prozesuen taldeak
       decidim/participatory_process_step:
-        one: Step
+        one: Urratsa
         other: Faseak
   decidim:
     admin:
@@ -88,7 +88,7 @@ eu:
         activate: Aktibatu
         confirm_delete_process: Ziur zaude prozesu hau ezabatu nahi duzula? Iritziz aldatzen baduzu, geroago berreskuratu ahal izango duzu.
         confirm_destroy: Berretsi ezabatu
-        destroy: ezabatu
+        destroy: Ezabatu
         duplicate: Bikoiztu
         edit: Editatu
         import_process: Inportatu
@@ -99,9 +99,9 @@ eu:
         preview: Aurreikusi
         publish: Argitaratu
         resend_invitation: Birbidali gonbita
-        see_process: Ikusi prozesuak
+        see_process: Prozesua ikusi
         unpublish: Despublikatu
-        view_deleted_processes: Ikusi ezabatutako prozesuak
+        view_deleted_processes: Ezabatutako prozesuak ikusi
       filters:
         decidim_participatory_process_group_id_eq:
           label: Prozesu-taldeen arabera
@@ -121,7 +121,7 @@ eu:
           moderations: Moderazioak
           private_users: Kideak
           process_admins: Prozesuaren parte-hartzaileak
-          steps: Prozesuaren faseak
+          steps: Urratsak
       models:
         participatory_process:
           fields:
@@ -218,7 +218,7 @@ eu:
           title: Editatu prozesu parte-hartzailearen fasea
           update: Eguneratu
         index:
-          steps_title: Prozesuaren faseak
+          steps_title: Urratsak
         new:
           create: Sortu
           title: Prozesu parte-hartzailearen beste fase bat
@@ -383,8 +383,8 @@ eu:
         extra_data:
           developer_group: Honek sustatuta
           name: Metadatuak
-          participatory_scope: Erabakitzen dena
-          participatory_structure: Erabakitzeko era
+          participatory_scope: Zer erabakitzen den
+          participatory_structure: Nola erabakitzen den
           target: Nork hartzen du parte
         html:
           name: HTML blokea
@@ -400,7 +400,7 @@ eu:
           active: Partaidetza-prozesu aktiboak
           name: Partaidetza-prozesuak
         stats:
-          name: Jarduera
+          name: Estatistikak
         title:
           meta_scope: Eremua
           participatory_processes:
@@ -561,7 +561,7 @@ eu:
               citizen_influence: Herritarren eragina
               citizen_influence_tooltip: Parte-hartzaileen eragina erabakiak hartzean neurtzen du.
               inclusiveness: Inklusibotasuna
-              inclusiveness_tooltip: Interesatu desberdinek bidezko ordezkaritza duten ebaluatzen du.
+              inclusiveness_tooltip: Hainbat alderdi interesatuk ordezkaritza nahikoa duten ebaluatzen du.
               informativeness: Informatiboa
               informativeness_tooltip: Prozesuaren barruan emandako argitasun- eta informazio-maila neurtzen du.
             name: Autoebaluazioaren metrikak
diff --git a/decidim-proposals/config/locales/eu.yml b/decidim-proposals/config/locales/eu.yml
index da502c0d20194..d3ac0892a2a72 100644
--- a/decidim-proposals/config/locales/eu.yml
+++ b/decidim-proposals/config/locales/eu.yml
@@ -19,7 +19,7 @@ eu:
         address: Helbidea
         answer: Erantzuna
         answered_at: '-k erantzuna'
-        body: Testua
+        body: Gorputza
         decidim_proposals_proposal_state_id: Egoera
         decidim_scope_id: Eremua
         has_address: Helbidea du
@@ -53,7 +53,7 @@ eu:
         file: Fitxategia
       proposals_import:
         import_proposals: Proposamenak inportatu
-        keep_answers: Egoera-orriak eta erantzunak mantendu
+        keep_answers: Mantendu egoera eta erantzunak
         keep_authors: Mantendu jatorrizko egileak
     errors:
       models:
@@ -394,7 +394,7 @@ eu:
           description: Garaikur hau proposamen berriekin aktiboki parte hartzen duzunean eta horiek onartzen direnean ematen da 
           description_another: Parte-hartzaile honek %{score} proposamen onartu ditu.
           description_own: Zure %{score} proposamen onartu dira.
-          name: Onartutako proposamenak
+          name: Proposamen onartuak
           next_level_in: Lortu %{score} proposamen gehiago onartuak izatea hurrengo mailara igotzeko!
           unearned_another: Parte-hartzaile honek ez du oraindik lortu bere proposamen bat ere onartua izatea.
           unearned_own: Oraindik ez duzu onartutako proposamenik.
@@ -452,7 +452,7 @@ eu:
           id: Proposamenaren identifikatzaile bakarra
           is_amend: Proposamen honek beste proposamen bat dakarren
           latitude: Proposamenaren latitudea, baldin eta kokagune fisikoa badu
-          likes: Proposamen honek duen atxikimendu ("like") kopurua
+          likes: Proposamen honek duen atxikimendu kopurua
           longitude: Proposamenaren luzera, baldin eta kokagune fisikoa badu
           meeting_urls: Proposamen hau aurkeztu edo eztabaidatu zen bileretako URLak
           original_proposal: Hasierako proposamenaren erreferentzia, zuzenketa bat bada
@@ -484,7 +484,7 @@ eu:
         import: Inportatu proposamenak beste osagai batetik
         mark_as_coauthor: Markatu egilekide gisa
         mark_as_coauthor_confirm: Ziur zaude parte-hartzaile hau egilekide gisa markatu nahi duzula? Parte-hartzaileak jakinarazpena jasoko du gonbidapena onartzeko edo baztertzeko.
-        new: Proposamen berria
+        new: Beste proposamen bat
         new_proposal_state: Beste egoera bat
         participatory_texts: Testu parte-hartzaileak
         show: Ikusi proposamena
@@ -637,7 +637,7 @@ eu:
             assign_to_evaluator_button: Esleitu
             cancel: Utzi
             change_taxonomies: Aldatu taxonomiak
-            merge: Beste batean fusionatu
+            merge: Bat egin berri batekin
             merge_button: Sortu
             no_templates_available: Ez dago txantiloirik eskuragarri
             publish: Argitaratu
@@ -663,13 +663,13 @@ eu:
           show:
             amendments_count: Zuzenketa kopurua
             assigned_evaluators: Ebaluatzaileak esleituta
-            body: Testua
+            body: Gorputza
             comments_count: Iruzkin kopurua
             documents: Dokumentuak
             evaluators: Ebaluatzaileak
             likes: Likeak
             likes_count: Like kopurua
-            link: Ikusi proposamena
+            link: Proposamena ikusi
             n_more_likes:
               one: eta 1 gehiago
               other: eta %{count} gehiago
@@ -715,11 +715,11 @@ eu:
           answer: "%{user_name} parte-hartzaileak %{resource_name} %{space_name} espazioko proposamenari erantzun dio"
           create: "%{user_name} parte-hartzaileak sortu zuen %{resource_name} proposamena %{space_name} esparruko %{merged_count} proposamenen bat egitetik"
           publish_answer: "%{user_name} parte-hartzaileak argitaratu du %{resource_name} proposamenaren erantzuna %{space_name} espazioan"
-          restore: "%{user_name} parte-hartzailea berreskuratu du %{resource_name} proposamena %{space_name} espazioan"
-          soft_delete: "%{user_name} parte-hartzailea eraman du %{resource_name} proposamena %{space_name} espaziora"
+          restore: "%{user_name} parte-hartzaileak berreskuratu du %{resource_name} osagaia %{space_name} espazioan"
+          soft_delete: "%{user_name} parte-hartzaileak berreskuratu du %{resource_name} proposamena %{space_name} espazioan"
           update: "%{user_name} parte-hartzaileak %{resource_name} proposamena eguneratu du %{space_name} espazioan"
         proposal_note:
-          create: "%{user_name} k %{resource_name} proposamenari buruzko ohar pribatu bat utzi du %{space_name} espazioan"
+          create: "%{user_name} parte-hartzaileak %{resource_name} proposamenari buruzko ohar pribatu bat utzi du %{space_name} espazioan"
       answers:
         accepted: Onartuta
         evaluating: Ebaluatzen
@@ -729,7 +729,7 @@ eu:
       application_helper:
         filter_origin_values:
           all: Guztiak
-          meetings: Bilerak
+          meetings: Topaketak
           official: Ofiziala
           participants: Parte-hartzaileak
         filter_state_values:
@@ -796,7 +796,7 @@ eu:
           label: 'Zirriborroak honela ordenatu:'
           most_contributed: Bozka gehien jaso duena
           random: Ausazko ordena
-          recent: Berrienetatik zaharrenetara
+          recent: Azkenak
         requests:
           accepted_request:
             error: Ezin izan da kolaboratzaile gisa onartu, saiatu berriro geroago.
@@ -929,7 +929,7 @@ eu:
           my_proposals: Nire proposamenak
           origin: Jatorria
           related_to: Honekin lotuta
-          scope: Eremua
+          scope: Esparrua
           search: Bilatu
           state: Egoera
           taxonomy_filters: Iragazkiak
@@ -957,7 +957,7 @@ eu:
           most_liked: Like gehien
           most_voted: Gehien babestutakoak
           random: Ausazko ordena
-          recent: Berrienetatik zaharrenetara
+          recent: Azkenak
           with_more_authors: Egile gehiagorekin
         participatory_texts:
           view_index:
@@ -1017,7 +1017,7 @@ eu:
           can_accumulate_votes_beyond_threshold:
             description: Proposamen bakoitzak %{limit} babes baino gehiago jaso dezake
           minimum_votes_per_user:
-            description: Gutxienez %{votes} babes banatu behar duzu proposamen ezberdinen artean zure euskarriak kontuan har daitezen.
+            description: Gutxienez %{votes} babes banatu behar duzu proposamen ezberdinen artean zure hautuak kontuan har daitezen.
           proposal_limit:
             description: Proposamen(ak) sortu ditzakezu.
           success: Zure babesak ongi onartu dira
@@ -1055,7 +1055,7 @@ eu:
           title: Bertsioak
       withdraw:
         errors:
-          has_votes: Proposamen hau ezin da kendu dagoeneko babesak dituelako.
+          has_votes: Proposamen hau ezin da kendu dagoeneko botoak dituelako.
     resource_links:
       copied_from_component:
         proposal_proposal: Lotutako proposamenak
diff --git a/decidim-system/config/locales/eu.yml b/decidim-system/config/locales/eu.yml
index 9272b687696e6..14efa86cdbad7 100644
--- a/decidim-system/config/locales/eu.yml
+++ b/decidim-system/config/locales/eu.yml
@@ -164,7 +164,7 @@ eu:
             save_and_invite: Sortu antolatzailea eta gonbidatu administratzailea
           fields:
             content_security_policy: Edukien segurtasun-politika
-            created_at: Tan sortua
+            created_at: Noiz sortua
             file_upload_settings: Fitxategiak igotzearen doikuntzak
             name: Izena
             omniauth_settings: Omniauth doikuntzak
diff --git a/decidim-verifications/config/locales/bg.yml b/decidim-verifications/config/locales/bg.yml
index 891b0dd686343..c6ac36f62e2d4 100644
--- a/decidim-verifications/config/locales/bg.yml
+++ b/decidim-verifications/config/locales/bg.yml
@@ -44,7 +44,6 @@ bg:
           destroy:
             confirm: Отмяната на разрешенията преди определена дата, не може да бъде възстановено. Сигурни ли сте, че искате да продължите?
             confirm_all: Отмяната на всички разрешения, не може да бъде възстановено. Сигурни ли сте, че искате да продължите?
-          destroy_ok: Всички съвпадащи оторизации бяха отменени успешно.
           info: Има общо %{count} потвърдени участници.
           no_data: Няма потвърдени участници.
           title: Оторизации за отмяна
diff --git a/decidim-verifications/config/locales/ca-IT.yml b/decidim-verifications/config/locales/ca-IT.yml
index 3fb932e4ed573..d701f1707184d 100644
--- a/decidim-verifications/config/locales/ca-IT.yml
+++ b/decidim-verifications/config/locales/ca-IT.yml
@@ -49,7 +49,7 @@ ca-IT:
             confirm: La revocació d'autoritzacions anteriors a aquesta data no es pot desfer. Segur que vols continuar?
             confirm_all: La revocació de totes les autoritzacions no es pot desfer. Segur que vols continuar?
           destroy_nok: S'ha produït un error en revocar les autoritzacions.
-          destroy_ok: Totes les autoritzacions coincidents s'han revocat correctament.
+          destroy_ok: S'estan revocant les autoritzacions. Aquest procés pot trigar uns minuts a completar-se.
           info: Hi ha un total de %{count} participants verificades.
           no_data: No hi ha participants verificades.
           title: Revocació d'autoritzacions
diff --git a/decidim-verifications/config/locales/ca.yml b/decidim-verifications/config/locales/ca.yml
index 8130a3faed1aa..b31c02acca65e 100644
--- a/decidim-verifications/config/locales/ca.yml
+++ b/decidim-verifications/config/locales/ca.yml
@@ -49,7 +49,7 @@ ca:
             confirm: La revocació d'autoritzacions anteriors a aquesta data no es pot desfer. Segur que vols continuar?
             confirm_all: La revocació de totes les autoritzacions no es pot desfer. Segur que vols continuar?
           destroy_nok: S'ha produït un error en revocar les autoritzacions.
-          destroy_ok: Totes les autoritzacions coincidents s'han revocat correctament.
+          destroy_ok: S'estan revocant les autoritzacions. Aquest procés pot trigar uns minuts a completar-se.
           info: Hi ha un total de %{count} participants verificades.
           no_data: No hi ha participants verificades.
           title: Revocació d'autoritzacions
diff --git a/decidim-verifications/config/locales/cs.yml b/decidim-verifications/config/locales/cs.yml
index ece71bc110ddf..98ad0c12ec7d8 100644
--- a/decidim-verifications/config/locales/cs.yml
+++ b/decidim-verifications/config/locales/cs.yml
@@ -49,7 +49,6 @@ cs:
             confirm: Zrušení před datem autorizace nelze vrátit zpět. Jste si jisti, že chcete pokračovat?
             confirm_all: Zrušení všech autorizací nelze vrátit zpět. Jste si jisti, že chcete pokračovat?
           destroy_nok: Při odebírání autorizací došlo k chybě.
-          destroy_ok: Všechny odpovídající autorizace byly úspěšně zrušeny.
           info: Celkem je %{count} ověřených účastníků.
           no_data: Žádní ověření účastníci.
           title: Zrušení autorizace
diff --git a/decidim-verifications/config/locales/de.yml b/decidim-verifications/config/locales/de.yml
index fac1fbfd70804..890eaf764b61a 100644
--- a/decidim-verifications/config/locales/de.yml
+++ b/decidim-verifications/config/locales/de.yml
@@ -49,7 +49,6 @@ de:
             confirm: Das Entziehen aller Berechtigungen vor einem Datum kann nicht rückgängig gemacht werden. Sind Sie sicher, dass Sie fortfahren möchten?
             confirm_all: Das Entziehen aller Berechtigungen nicht rückgängig gemacht werden. Sind Sie sicher, dass Sie fortfahren möchten?
           destroy_nok: Beim Entziehen der Berechtigungen ist ein Fehler aufgetreten.
-          destroy_ok: Alle übereinstimmenden Berechtigungen wurden erfolgreich entzogen.
           info: Es gibt insgesamt %{count} verifizierte Teilnehmer.
           no_data: Keine verifizierten Teilnehmer.
           title: Berechtigungen widerrufen
diff --git a/decidim-verifications/config/locales/es-MX.yml b/decidim-verifications/config/locales/es-MX.yml
index 6b52cd12a29b2..d65b10ef5fd5e 100644
--- a/decidim-verifications/config/locales/es-MX.yml
+++ b/decidim-verifications/config/locales/es-MX.yml
@@ -49,7 +49,7 @@ es-MX:
             confirm: La revocación de las autorizaciones anteriores a esta fecha no se puede deshacer. ¿Seguro que quieres continuar?
             confirm_all: La revocación de todas las autorizaciones no se puede deshacer. ¿Seguro que quieres continuar?
           destroy_nok: Se ha producido un error al revocar las autorizaciones.
-          destroy_ok: Todas las autorizaciones coincidentes han sido revocadas con éxito.
+          destroy_ok: La revocación de las autorizaciones está en curso. Esto puede tardar unos minutos en completarse.
           info: Hay un total de %{count} participantes verificadas.
           no_data: No hay participantes verificadas.
           title: Revocación de autorizaciones
diff --git a/decidim-verifications/config/locales/es-PY.yml b/decidim-verifications/config/locales/es-PY.yml
index 8c737fb3baa7a..39d76c20f543f 100644
--- a/decidim-verifications/config/locales/es-PY.yml
+++ b/decidim-verifications/config/locales/es-PY.yml
@@ -49,7 +49,7 @@ es-PY:
             confirm: La revocación de las autorizaciones anteriores a esta fecha no se puede deshacer. ¿Seguro que quieres continuar?
             confirm_all: La revocación de todas las autorizaciones no se puede deshacer. ¿Seguro que quieres continuar?
           destroy_nok: Se ha producido un error al revocar las autorizaciones.
-          destroy_ok: Todas las autorizaciones coincidentes han sido revocadas con éxito.
+          destroy_ok: La revocación de las autorizaciones está en curso. Esto puede tardar unos minutos en completarse.
           info: Hay un total de %{count} participantes verificadas.
           no_data: No hay participantes verificadas.
           title: Revocación de autorizaciones
diff --git a/decidim-verifications/config/locales/es.yml b/decidim-verifications/config/locales/es.yml
index 1664e22e27fab..8bf8e0fb08de9 100644
--- a/decidim-verifications/config/locales/es.yml
+++ b/decidim-verifications/config/locales/es.yml
@@ -49,7 +49,7 @@ es:
             confirm: La revocación de las autorizaciones anteriores a esta fecha no se puede deshacer. ¿Seguro que quieres continuar?
             confirm_all: La revocación de todas las autorizaciones no se puede deshacer. ¿Seguro que quieres continuar?
           destroy_nok: Se ha producido un error al revocar las autorizaciones.
-          destroy_ok: Todas las autorizaciones coincidentes han sido revocadas con éxito.
+          destroy_ok: La revocación de las autorizaciones está en curso. Esto puede tardar unos minutos en completarse.
           info: Hay un total de %{count} participantes verificadas.
           no_data: No hay participantes verificadas.
           title: Revocación de autorizaciones
diff --git a/decidim-verifications/config/locales/eu.yml b/decidim-verifications/config/locales/eu.yml
index 5785a8e107181..0dd6a432633e0 100644
--- a/decidim-verifications/config/locales/eu.yml
+++ b/decidim-verifications/config/locales/eu.yml
@@ -18,7 +18,7 @@ eu:
         document_type: Dokumentu mota
       id_document_upload:
         document_number: Dokumentuaren zenbakia (letraz)
-        document_type: Dokumentuaren mota
+        document_type: Dokumentu mota
         user: Parte-hartzaileak
         verification_attachment: Zure dokumentuaren eskaneatutako kopia
       mobile_phone:
@@ -49,7 +49,7 @@ eu:
             confirm: Data horren aurreko baimenak baliogabetzea ezin da desegin. Ziur zaude jarraitu nahi duzula?
             confirm_all: Baimen guztiak baliogabetzea ezin da desegin. Ziur zaude jarraitu nahi duzula?
           destroy_nok: Arazo bat izn da baimenak ezeztatzean.
-          destroy_ok: Bat datozen baimen guztiak zuzen ezeztatu dira.
+          destroy_ok: Baimenak ezeztatzen ari dira. Minutu batzuk beharko ditugu hau bukatzeko.
           info: Guztira %{count} parte-hartzaile egiaztatuta daude.
           no_data: Ez dago parte-hartzaile egiaztaturik.
           title: Baimenak ezeztatzea
@@ -246,7 +246,7 @@ eu:
           config:
             edit:
               title: Nortasun agirien konfigurazioa
-              update: eguneratzearen
+              update: Eguneratu
             update:
               error: Arazo bat egon da konfigurazioa eguneratzean.
               success: Ezarpena zuzen eguneratua.
diff --git a/decidim-verifications/config/locales/fi-plain.yml b/decidim-verifications/config/locales/fi-plain.yml
index 7cf1cb8ed58a5..c021d7415bb74 100644
--- a/decidim-verifications/config/locales/fi-plain.yml
+++ b/decidim-verifications/config/locales/fi-plain.yml
@@ -49,7 +49,6 @@ fi-pl:
             confirm: Ennen valittua päivämäärää tehtyjen vahvistustietojen tuhoamista ei voi peruuttaa. Haluatko varmasti jatkaa?
             confirm_all: Vahvistusten tuhoamista ei voi peruuttaa. Haluatko varmasti jatkaa?
           destroy_nok: Vahvistusten kumoaminen epäonnistui.
-          destroy_ok: Kaikki hakua vastanneiden tunnistautumiset on peruutettu onnistuneesti.
           info: Yhteensä %{count} varmennettua osallistujaa.
           no_data: Ei vahvistettuja osallistujia.
           title: Tunnistautumisten peruuttaminen
diff --git a/decidim-verifications/config/locales/fi.yml b/decidim-verifications/config/locales/fi.yml
index 410895229d0f3..799e56c870d78 100644
--- a/decidim-verifications/config/locales/fi.yml
+++ b/decidim-verifications/config/locales/fi.yml
@@ -49,7 +49,7 @@ fi:
             confirm: Ennen valittua päivämäärää tehtyjen vahvistustietojen kumoamista ei voi perua. Haluatko varmasti jatkaa?
             confirm_all: Vahvistusten kumoamista ei voi perua. Haluatko varmasti jatkaa?
           destroy_nok: Vahvistusten kumoaminen epäonnistui.
-          destroy_ok: Kaikkien hakua vastanneiden tunnistautumisten kumoaminen onnistui.
+          destroy_ok: Tunnistautumisten kumoaminen on käynnissä. Tämän valmistuminen voi kestää useamman minuutin ajan.
           info: Yhteensä %{count} vahvistettua osallistujaa.
           no_data: Ei vahvistettuja osallistujia.
           title: Tunnistautumisten kumoaminen
diff --git a/decidim-verifications/config/locales/fr-CA.yml b/decidim-verifications/config/locales/fr-CA.yml
index bbd1c465b190f..dc0b0828e2749 100644
--- a/decidim-verifications/config/locales/fr-CA.yml
+++ b/decidim-verifications/config/locales/fr-CA.yml
@@ -49,7 +49,7 @@ fr-CA:
             confirm: Révoquer avant la date d'autorisation ne peut pas être annulée. Êtes-vous sûr de vouloir continuer ?
             confirm_all: La révocation des autorisations ne peut être annulée. Êtes-vous sur de vouloir continuer?
           destroy_nok: Une erreur s'est produite lors de la révocation des autorisations.
-          destroy_ok: Toutes les autorisations correspondantes ont été annulées avec succès.
+          destroy_ok: La révocation des autorisations est en cours. Cela peut prendre quelques minutes.
           info: Il y a un total de %{count} participants vérifiés.
           no_data: Aucun participant vérifié.
           title: Révocation des autorisations
diff --git a/decidim-verifications/config/locales/fr.yml b/decidim-verifications/config/locales/fr.yml
index 88fbf98eb925c..7939db98679df 100644
--- a/decidim-verifications/config/locales/fr.yml
+++ b/decidim-verifications/config/locales/fr.yml
@@ -49,7 +49,7 @@ fr:
             confirm: Révoquer avant la date d'autorisation ne peut pas être annulée. Êtes-vous sûr de vouloir continuer ?
             confirm_all: La révocation des autorisations ne peut être annulée. Êtes-vous sur de vouloir continuer?
           destroy_nok: Une erreur s'est produite lors de la révocation des autorisations.
-          destroy_ok: Toutes les autorisations correspondantes ont été révoquées avec succès.
+          destroy_ok: La révocation des autorisations est en cours. Cela peut prendre quelques minutes.
           info: Il y a un total de %{count} participants vérifiés.
           no_data: Aucun participant vérifié.
           title: Révocation des autorisations
diff --git a/decidim-verifications/config/locales/gl.yml b/decidim-verifications/config/locales/gl.yml
index 9d78a7f5d6583..2c4ebb3ac36b3 100644
--- a/decidim-verifications/config/locales/gl.yml
+++ b/decidim-verifications/config/locales/gl.yml
@@ -31,7 +31,6 @@ gl:
           before_date_info: Útil se o proceso ten comezado e queres rexeitar os permisos do proceso anterior.
           button: Rexeitar todo
           button_before: Rexeitar antes da data
-          destroy_ok: Todas as autorizacións coincidentes foron revogadas con éxito.
           info: Hai un total de %{count} participantes verificados.
           title: Revogación de autorización
         authorization_workflows: Autorizacións
diff --git a/decidim-verifications/config/locales/hu.yml b/decidim-verifications/config/locales/hu.yml
index 0ad39882a66fe..92a76bc6179ba 100644
--- a/decidim-verifications/config/locales/hu.yml
+++ b/decidim-verifications/config/locales/hu.yml
@@ -40,7 +40,6 @@ hu:
           destroy:
             confirm: A dátum előtti engedélyek visszavonása nem vonható vissza. Biztos, hogy folytatni szeretné?
             confirm_all: Az összes jogosultság visszavonása nem vonható vissza. Biztos, hogy folytatni szeretné?
-          destroy_ok: Az összes egyező engedélyt sikeresen visszavonták.
           info: Összesen %{count} ellenőrzött résztvevő.
           no_data: Nincsenek ellenőrzött résztvevők.
           title: Engedélyezés és visszavonás
diff --git a/decidim-verifications/config/locales/it.yml b/decidim-verifications/config/locales/it.yml
index e2b6e372f9e4f..4841b06759737 100644
--- a/decidim-verifications/config/locales/it.yml
+++ b/decidim-verifications/config/locales/it.yml
@@ -31,7 +31,6 @@ it:
           before_date_info: Utile se il processo è già iniziato e si desidera revocare i permessi del processo precedente.
           button: Revoca tutto
           button_before: Revoca prima della data
-          destroy_ok: Tutte le autorizzazioni corrispondenti sono state revocate correttamente.
           info: Ci sono un totale di %{count} partecipanti verificati.
           title: Revoca delle autorizzazioni
         authorization_workflows: Autorizzazioni
diff --git a/decidim-verifications/config/locales/ja.yml b/decidim-verifications/config/locales/ja.yml
index abcf41439a8eb..3d2b711f84f6a 100644
--- a/decidim-verifications/config/locales/ja.yml
+++ b/decidim-verifications/config/locales/ja.yml
@@ -49,7 +49,6 @@ ja:
             confirm: 指定日以前の認証の取り消しはやり直すことができません。続行してもよろしいですか？
             confirm_all: すべての権限を取り消すと、元に戻すことができません。本当に続行しますか？
           destroy_nok: 認証の取り消し中に問題が発生しました。
-          destroy_ok: すべての一致した認証が正常に取り消されました。
           info: '%{count} 人の確認済み参加者がいます。'
           no_data: 検証済みの参加者はいません。
           title: 認証の取り消し方法
diff --git a/decidim-verifications/config/locales/lt.yml b/decidim-verifications/config/locales/lt.yml
index 1c50758f53894..52b6577a56fd2 100644
--- a/decidim-verifications/config/locales/lt.yml
+++ b/decidim-verifications/config/locales/lt.yml
@@ -44,7 +44,6 @@ lt:
           destroy:
             confirm: Atšaukus leidimus iki datos, veiksmo nebus galima anuliuoti. Ar tikrai norite tęsti?
             confirm_all: Atšaukus visus leidimus, veiksmo nebus galima anuliuoti. Ar tikrai norite tęsti?
-          destroy_ok: Visi sutampantys leidimai atšaukti.
           info: Bendras patvirtintų dalyvių skaičius – %{count}.
           no_data: Patvirtintų dalyvių nėra.
           title: Įgaliojimų atėmimas
diff --git a/decidim-verifications/config/locales/nl.yml b/decidim-verifications/config/locales/nl.yml
index cb252c04ebfb2..d0151646d760d 100644
--- a/decidim-verifications/config/locales/nl.yml
+++ b/decidim-verifications/config/locales/nl.yml
@@ -31,7 +31,6 @@ nl:
           before_date_info: Nuttig als het proces al is begonnen en u de machtigingen van het vorige proces wilt intrekken.
           button: Alles intrekken
           button_before: Intrekken voor datum
-          destroy_ok: Alle overeenkomstige autorisaties zijn ingetrokken.
           info: Er zijn een totaal van %{count} geverifieerde deelnemers.
           title: Autorisaties intrekken
         authorization_workflows: Authorisaties
diff --git a/decidim-verifications/config/locales/no.yml b/decidim-verifications/config/locales/no.yml
index 926858d517bce..fb806fecc2871 100644
--- a/decidim-verifications/config/locales/no.yml
+++ b/decidim-verifications/config/locales/no.yml
@@ -31,7 +31,6 @@
           before_date_info: Nyttig hvis prosessen allerede har begynt og du vil tilbakekalle tillatelsene for den forrige prosessen.
           button: Opphev alle
           button_before: Tilbakekall før dato
-          destroy_ok: Alle matchede autorisasjoner er nå tilbakekallet.
           info: Det er totalt %{count} bekreftede deltakere.
           title: Tilbakekall av autorisasjoner
         authorization_workflows: Autorisasjoner
diff --git a/decidim-verifications/config/locales/pl.yml b/decidim-verifications/config/locales/pl.yml
index 2e05166d7bb0f..587f6bd6c5c28 100644
--- a/decidim-verifications/config/locales/pl.yml
+++ b/decidim-verifications/config/locales/pl.yml
@@ -44,7 +44,6 @@ pl:
           destroy:
             confirm: Unieważnienie przed autoryzacjami dat nie może zostać cofnięte. Czy na pewno chcesz kontynuować?
             confirm_all: Unieważnienie wszystkich autoryzacji nie może zostać cofnięte. Czy na pewno chcesz kontynuować?
-          destroy_ok: Pomyślnie wycofano wszystkie autoryzacje spełniające kryteria.
           info: 'Całkowita liczba zweryfikowanych użytkowników: %{count}.'
           no_data: Brak zweryfikowanych uczestników.
           title: Wycofanie autoryzacji
diff --git a/decidim-verifications/config/locales/pt-BR.yml b/decidim-verifications/config/locales/pt-BR.yml
index 1e4e9a3c13076..6c190be46d482 100644
--- a/decidim-verifications/config/locales/pt-BR.yml
+++ b/decidim-verifications/config/locales/pt-BR.yml
@@ -49,7 +49,6 @@ pt-BR:
             confirm: Revogar antes da data as autorizações não podem ser desfeitas. Tem certeza que deseja continuar?
             confirm_all: Revogar todas as autorizações não podem ser desfeito. Tem certeza que deseja continuar?
           destroy_nok: Ocorreu um problema ao revogar as autorizações.
-          destroy_ok: Todas as autorizações correspondentes foram revogadas com sucesso.
           info: Há um total de %{count} participantes verificados.
           no_data: Nenhum participante verificado.
           title: Revogação de Autorizações
diff --git a/decidim-verifications/config/locales/pt.yml b/decidim-verifications/config/locales/pt.yml
index d5313c6884030..077cc5471ba48 100644
--- a/decidim-verifications/config/locales/pt.yml
+++ b/decidim-verifications/config/locales/pt.yml
@@ -31,7 +31,6 @@ pt:
           before_date_info: Útil caso o processo já tenha sido iniciado e pretenda revogar as permissões do processo anterior.
           button: Revogar tudo
           button_before: Revogar antes de data
-          destroy_ok: Todas as autorizações correspondentes foram revogadas com êxito.
           info: Existe um total de %{count} participantes verificados.
           title: Revogação de autorizações
         authorization_workflows: Autorizações
diff --git a/decidim-verifications/config/locales/ro-RO.yml b/decidim-verifications/config/locales/ro-RO.yml
index edc3fbd381b30..b2562fae4e89c 100644
--- a/decidim-verifications/config/locales/ro-RO.yml
+++ b/decidim-verifications/config/locales/ro-RO.yml
@@ -37,7 +37,6 @@ ro:
           before_date_info: Este util dacă procesul a început deja și dorești să revoci drepturile procesului anterior.
           button: Revocați toate autorizările
           button_before: Revocați toate autorizările înainte de data
-          destroy_ok: Toate autorizațiile corelate au fost revocate.
           info: Există un total de %{count} participanți verificați.
           title: Revocarea autorizațiilor
         authorization_workflows: Autorizări
diff --git a/decidim-verifications/config/locales/sk.yml b/decidim-verifications/config/locales/sk.yml
index 0886f7eb7e8b8..44888291965ce 100644
--- a/decidim-verifications/config/locales/sk.yml
+++ b/decidim-verifications/config/locales/sk.yml
@@ -49,7 +49,6 @@ sk:
             confirm: Zrušenie autorizácií pred dátumom nie je možné vrátiť späť. Naozaj chcete pokračovať?
             confirm_all: Zrušenie všetkých autorizácií nie je možné vrátiť späť. Naozaj chcete pokračovať?
           destroy_nok: Pri rušení autorizácií sa vyskytol problém.
-          destroy_ok: Všetky zhodné autorizácie boli úspešne zrušené.
           info: Je tu celkovo %{count} overených účastníkov.
           no_data: Žiadni overení účastníci.
           title: Zrušenie autorizácií
diff --git a/decidim-verifications/config/locales/sv.yml b/decidim-verifications/config/locales/sv.yml
index bcece4242b6af..e73cfc3b528a8 100644
--- a/decidim-verifications/config/locales/sv.yml
+++ b/decidim-verifications/config/locales/sv.yml
@@ -49,7 +49,6 @@ sv:
             confirm: Återkallande av auktorisering före datum kan inte ångras. Vill du fortsätta?
             confirm_all: Återkallande av auktorisering kan inte ångras. Vill du fortsätta?
           destroy_nok: Det gick inte att återkalla auktoriseringen.
-          destroy_ok: Alla matchade auktoriseringar har återkallats.
           info: Det finns totalt %{count} verifierade deltagare.
           no_data: Inga verifierade deltagare.
           title: Återkallande av auktoriseringar
diff --git a/decidim-verifications/config/locales/zh-TW.yml b/decidim-verifications/config/locales/zh-TW.yml
index 5f14d740999a3..fbb29af4adde6 100644
--- a/decidim-verifications/config/locales/zh-TW.yml
+++ b/decidim-verifications/config/locales/zh-TW.yml
@@ -40,7 +40,6 @@ zh-TW:
           destroy:
             confirm: 撤銷在指定日期之前的授權無法撤消。您確定要繼續嗎？
             confirm_all: 撤銷所有授權後無法還原，確定要繼續嗎？
-          destroy_ok: 所有匹配的授權已成功撤銷。
           info: 總共有 %{count} 名已驗證的參與者。
           no_data: 沒有經過驗證的參與者.
           title: 授權撤銷

From 94ccd466ce80363fbc52b2cf2ef2a67cc7162596 Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Tue, 2 Jun 2026 12:41:28 +0300
Subject: [PATCH 051/131] Backport 'Fix column sorting in admin tables' to
 v0.31 (#16979)

* Fix column sorting in admin tables

* fix sortings, add tests

* Fix duplicated meetings in admin list when ordering by taxonomies

* Fix sorting users by moderation report count

* fix minings

* Fix failing specs

---------

Co-authored-by: Anna Topalidi <60363870+antopalidi@users.noreply.github.com>
---
 .../admin_manages_officializations_spec.rb    | 69 ++++++++++++++++
 decidim-core/app/models/decidim/moderation.rb |  2 +-
 .../participatory_space_private_user.rb       |  2 +-
 .../app/models/decidim/user_base_entity.rb    | 19 ++++-
 .../app/models/decidim/user_moderation.rb     |  2 +-
 .../spec/models/decidim/moderation_spec.rb    |  6 ++
 .../participatory_space_private_user_spec.rb  |  8 ++
 .../models/decidim/user_base_entity_spec.rb   | 42 ++++++++++
 .../models/decidim/user_moderation_spec.rb    | 10 +++
 .../app/models/decidim/meetings/meeting.rb    |  8 +-
 .../admin/meetings/_meetings-thead.html.erb   |  2 +-
 decidim-meetings/spec/models/meeting_spec.rb  | 20 +++++
 .../spec/system/admin/filter_meetings_spec.rb | 78 +++++++++++++++++++
 .../app/models/decidim/proposals/proposal.rb  |  8 +-
 .../models/decidim/proposals/proposal_spec.rb | 14 ++++
 .../system/admin/filter_proposals_spec.rb     | 29 +++++++
 16 files changed, 311 insertions(+), 8 deletions(-)

diff --git a/decidim-admin/spec/system/admin_manages_officializations_spec.rb b/decidim-admin/spec/system/admin_manages_officializations_spec.rb
index ffd7d08504417..3340f84e3cffd 100644
--- a/decidim-admin/spec/system/admin_manages_officializations_spec.rb
+++ b/decidim-admin/spec/system/admin_manages_officializations_spec.rb
@@ -48,6 +48,75 @@
     it_behaves_like "paginating a collection"
   end
 
+  describe "sorting participants by creation date" do
+    let!(:newest_user) { create(:user, :confirmed, name: "Newest user", organization:, created_at: 1.day.from_now) }
+    let!(:old_user) { create(:user, :confirmed, name: "Old user", organization:, created_at: 3.weeks.ago) }
+    let!(:recent_user) { create(:user, :confirmed, name: "Recent user", organization:, created_at: 1.week.ago) }
+
+    before do
+      within_admin_sidebar_menu { click_on "Participants" }
+    end
+
+    it "sorts by created_at descending when 'Created at' is clicked" do
+      within "table thead" do
+        click_on "Created At"
+      end
+
+      names = page.all("table tbody tr td:first-child").map(&:text)
+      expect(names.index("Newest user")).to be < names.index("Recent user")
+      expect(names.index("Recent user")).to be < names.index("Old user")
+    end
+
+    it "sorts by created_at ascending when clicked again" do
+      within "table thead" do
+        click_on "Created At"
+        click_on "Created At"
+      end
+
+      names = page.all("table tbody tr td:first-child").map(&:text)
+      expect(names.index("Old user")).to be < names.index("Recent user")
+      expect(names.index("Recent user")).to be < names.index("Newest user")
+    end
+  end
+
+  describe "sorting participants by report count" do
+    let!(:user_mid) { create(:user, :confirmed, name: "Mid reports", organization:) }
+    let!(:user_no_moderation) { create(:user, :confirmed, name: "No moderation", organization:) }
+    let!(:user_zero) { create(:user, :confirmed, name: "Zero reports", organization:) }
+    let!(:user_high) { create(:user, :confirmed, name: "High reports", organization:) }
+
+    before do
+      create(:user_moderation, user: user_mid, report_count: 1)
+      create(:user_moderation, user: user_zero, report_count: 0)
+      create(:user_moderation, user: user_high, report_count: 10)
+      within_admin_sidebar_menu { click_on "Participants" }
+    end
+
+    it "sorts by report count descending when 'Reports' is clicked" do
+      within "table thead" do
+        click_on "Reports"
+      end
+
+      names = page.all("table tbody tr td:first-child").map(&:text)
+      expect(names.index("High reports")).to be < names.index("Mid reports")
+      expect(names.index("Mid reports")).to be < names.index("Zero reports")
+      expect(names.index("Mid reports")).to be < names.index("No moderation")
+    end
+
+    it "treats users without a moderation row as zero reports" do
+      visit "#{current_path}?q%5Bs%5D=user_moderation_report_count+asc"
+
+      names = page.all("table tbody tr td:first-child").map(&:text)
+      no_moderation_idx = names.index("No moderation")
+      zero_idx = names.index("Zero reports")
+      mid_idx = names.index("Mid reports")
+      high_idx = names.index("High reports")
+
+      expect([no_moderation_idx, zero_idx].max).to be < mid_idx
+      expect(mid_idx).to be < high_idx
+    end
+  end
+
   describe "blocked users" do
     let!(:user) { create(:user, :blocked, organization:) }
 
diff --git a/decidim-core/app/models/decidim/moderation.rb b/decidim-core/app/models/decidim/moderation.rb
index 04f40dfc2c8aa..6991632d482b9 100644
--- a/decidim-core/app/models/decidim/moderation.rb
+++ b/decidim-core/app/models/decidim/moderation.rb
@@ -32,7 +32,7 @@ def self.log_presenter_class_for(_log)
     end
 
     def self.ransackable_attributes(_auth_object = nil)
-      %w(reported_id_string reported_content created_at)
+      %w(reported_id_string reported_content created_at report_count)
     end
 
     def self.ransackable_associations(_auth_object = nil)
diff --git a/decidim-core/app/models/decidim/participatory_space_private_user.rb b/decidim-core/app/models/decidim/participatory_space_private_user.rb
index cd8676f037dd2..fc4f617ed9d02 100644
--- a/decidim-core/app/models/decidim/participatory_space_private_user.rb
+++ b/decidim-core/app/models/decidim/participatory_space_private_user.rb
@@ -39,7 +39,7 @@ def self.log_presenter_class_for(_log)
     def self.ransackable_attributes(auth_object = nil)
       return [] unless auth_object&.admin?
 
-      %w(name nickname email invitation_accepted_at last_sign_in_at invitation_sent_at role)
+      %w(name nickname email invitation_accepted_at last_sign_in_at invitation_sent_at role published)
     end
 
     def self.ransackable_associations(_auth_object = nil)
diff --git a/decidim-core/app/models/decidim/user_base_entity.rb b/decidim-core/app/models/decidim/user_base_entity.rb
index 4532c4dfde91b..51895d16225ef 100644
--- a/decidim-core/app/models/decidim/user_base_entity.rb
+++ b/decidim-core/app/models/decidim/user_base_entity.rb
@@ -69,12 +69,27 @@ def followings_blocked?
       Decidim::UserBaseEntity.joins(:follows).where(decidim_follows: { user: self }).blocked.exists?
     end
 
+    ransacker :role do
+      Arel.sql(%{CASE WHEN "decidim_users"."admin" = true THEN 'admin' ELSE cast("decidim_users"."roles" as text) END})
+    end
+
+    ransacker :user_moderation_report_count do
+      query = <<~SQL.squish
+        (
+            SELECT COALESCE(MAX(decidim_user_moderations.report_count), 0)
+            FROM decidim_user_moderations
+            WHERE decidim_user_moderations.decidim_user_id = decidim_users.id
+        )
+      SQL
+      Arel.sql(query)
+    end
+
     def self.ransackable_attributes(auth_object = nil)
-      base = %w(name email nickname last_sign_in_at)
+      base = %w(name email nickname last_sign_in_at created_at)
 
       return base unless auth_object&.admin?
 
-      base + %w(invitation_sent_at invitation_accepted_at officialized_at)
+      base + %w(invitation_sent_at invitation_accepted_at officialized_at role user_moderation_report_count)
     end
 
     def self.ransackable_associations(_auth_object = nil)
diff --git a/decidim-core/app/models/decidim/user_moderation.rb b/decidim-core/app/models/decidim/user_moderation.rb
index 3245174f489de..4df36da104b14 100644
--- a/decidim-core/app/models/decidim/user_moderation.rb
+++ b/decidim-core/app/models/decidim/user_moderation.rb
@@ -19,7 +19,7 @@ def self.log_presenter_class_for(_log)
     end
 
     def self.ransackable_attributes(_auth_object = nil)
-      []
+      %w(created_at report_count)
     end
 
     def self.ransackable_associations(_auth_object = nil)
diff --git a/decidim-core/spec/models/decidim/moderation_spec.rb b/decidim-core/spec/models/decidim/moderation_spec.rb
index 63a5555bdce3e..8e23223ce17c9 100644
--- a/decidim-core/spec/models/decidim/moderation_spec.rb
+++ b/decidim-core/spec/models/decidim/moderation_spec.rb
@@ -15,5 +15,11 @@ module Decidim
       expect(described_class.log_presenter_class_for(:foo))
         .to eq Decidim::AdminLog::ModerationPresenter
     end
+
+    describe ".ransackable_attributes" do
+      it "allows sorting by report_count" do
+        expect(described_class.ransackable_attributes).to include("report_count")
+      end
+    end
   end
 end
diff --git a/decidim-core/spec/models/decidim/participatory_space_private_user_spec.rb b/decidim-core/spec/models/decidim/participatory_space_private_user_spec.rb
index e570af135e9df..4a5a365b903a9 100644
--- a/decidim-core/spec/models/decidim/participatory_space_private_user_spec.rb
+++ b/decidim-core/spec/models/decidim/participatory_space_private_user_spec.rb
@@ -33,5 +33,13 @@ module Decidim
 
       it { is_expected.not_to be_valid }
     end
+
+    describe ".ransackable_attributes" do
+      let(:admin) { build(:user, :admin, :confirmed) }
+
+      it "allows admins to sort by published" do
+        expect(described_class.ransackable_attributes(admin)).to include("published")
+      end
+    end
   end
 end
diff --git a/decidim-core/spec/models/decidim/user_base_entity_spec.rb b/decidim-core/spec/models/decidim/user_base_entity_spec.rb
index e3860f91acf18..fffeb45d91d79 100644
--- a/decidim-core/spec/models/decidim/user_base_entity_spec.rb
+++ b/decidim-core/spec/models/decidim/user_base_entity_spec.rb
@@ -81,5 +81,47 @@ module Decidim
         end
       end
     end
+
+    describe ".ransackable_attributes" do
+      let(:admin) { build(:user, :admin, :confirmed, organization:) }
+
+      context "when auth_object is an admin" do
+        it "allows sorting/filtering by created_at" do
+          expect(described_class.ransackable_attributes(admin)).to include("created_at")
+        end
+
+        it "allows sorting by role" do
+          expect(described_class.ransackable_attributes(admin)).to include("role")
+        end
+
+        it "allows sorting by user_moderation_report_count" do
+          expect(described_class.ransackable_attributes(admin)).to include("user_moderation_report_count")
+        end
+      end
+
+      context "when auth_object is a regular user" do
+        it "allows sorting/filtering by created_at" do
+          expect(described_class.ransackable_attributes(user)).to include("created_at")
+        end
+      end
+    end
+
+    describe "sorting by report count" do
+      subject(:sorter) { described_class.where(organization:).ransack({ s: "user_moderation_report_count asc" }, auth_object: admin) }
+
+      let(:admin) { build(:user, :admin, :confirmed, organization:) }
+      let!(:without_moderation) { create(:user, :confirmed, organization:) }
+      let!(:with_few_reports) { create(:user, :confirmed, organization:) }
+      let!(:with_many_reports) { create(:user, :confirmed, organization:) }
+
+      before do
+        create(:user_moderation, user: with_few_reports, report_count: 3)
+        create(:user_moderation, user: with_many_reports, report_count: 9)
+      end
+
+      it "sorts users treating a missing moderation as zero reports" do
+        expect(sorter.result.map(&:id)).to eq([without_moderation.id, with_few_reports.id, with_many_reports.id])
+      end
+    end
   end
 end
diff --git a/decidim-core/spec/models/decidim/user_moderation_spec.rb b/decidim-core/spec/models/decidim/user_moderation_spec.rb
index 89323f05e5d48..1472ab99f5a9b 100644
--- a/decidim-core/spec/models/decidim/user_moderation_spec.rb
+++ b/decidim-core/spec/models/decidim/user_moderation_spec.rb
@@ -15,5 +15,15 @@ module Decidim
       expect(described_class.log_presenter_class_for(:foo))
         .to eq Decidim::AdminLog::UserModerationPresenter
     end
+
+    describe ".ransackable_attributes" do
+      it "allows sorting by created_at" do
+        expect(described_class.ransackable_attributes).to include("created_at")
+      end
+
+      it "allows sorting by report_count" do
+        expect(described_class.ransackable_attributes).to include("report_count")
+      end
+    end
   end
 end
diff --git a/decidim-meetings/app/models/decidim/meetings/meeting.rb b/decidim-meetings/app/models/decidim/meetings/meeting.rb
index 6f730bd95ba7b..c59a5cb68121b 100644
--- a/decidim-meetings/app/models/decidim/meetings/meeting.rb
+++ b/decidim-meetings/app/models/decidim/meetings/meeting.rb
@@ -377,6 +377,12 @@ def self.sort_by_translated_title_desc
         Arel.sql("(start_time > NOW())")
       end
 
+      ransacker :closed do
+        Arel.sql("(closed_at IS NOT NULL)")
+      end
+
+      ransacker_i18n :translated_title, :title
+
       def self.ransackable_scopes(_auth_object = nil)
         [:with_any_type, :with_any_date, :with_any_space, :with_any_origin, :with_any_taxonomies, :with_any_global_category]
       end
@@ -386,7 +392,7 @@ def self.ransackable_attributes(auth_object = nil)
 
         return base unless auth_object&.admin?
 
-        base + %w(is_upcoming closed_at)
+        base + %w(is_upcoming closed_at closed start_time end_time translated_title)
       end
 
       def self.ransackable_associations(_auth_object = nil)
diff --git a/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meetings-thead.html.erb b/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meetings-thead.html.erb
index eb7eb20d0a364..00e435f6af61e 100644
--- a/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meetings-thead.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meetings-thead.html.erb
@@ -19,7 +19,7 @@
     <th><%= t("models.meeting.fields.map", scope: "decidim.meetings") %></th>
   <% end %>
   <th>
-    <%= sort_link(query, :scope_name, t("models.meeting.fields.taxonomies", scope: "decidim.meetings") ) %>
+    <%= sort_link(query, :taxonomies_name, t("models.meeting.fields.taxonomies", scope: "decidim.meetings") ) %>
   </th>
   <th>
     <%= t("models.meeting.fields.published", scope: "decidim.meetings") %>
diff --git a/decidim-meetings/spec/models/meeting_spec.rb b/decidim-meetings/spec/models/meeting_spec.rb
index 9e5bc811f39bc..ff89bc666030e 100644
--- a/decidim-meetings/spec/models/meeting_spec.rb
+++ b/decidim-meetings/spec/models/meeting_spec.rb
@@ -508,5 +508,25 @@ module Decidim::Meetings
         expect(update_jobs).to be <= Decidim::FindAndUpdateDescendantsJob::MAX_DEPTH
       end
     end
+
+    describe ".ransackable_attributes" do
+      let(:admin) { build(:user, :admin, :confirmed) }
+
+      it "allows admins to sort by start_time" do
+        expect(described_class.ransackable_attributes(admin)).to include("start_time")
+      end
+
+      it "allows admins to sort by end_time" do
+        expect(described_class.ransackable_attributes(admin)).to include("end_time")
+      end
+
+      it "allows admins to sort by closed" do
+        expect(described_class.ransackable_attributes(admin)).to include("closed")
+      end
+
+      it "allows admins to sort by translated_title" do
+        expect(described_class.ransackable_attributes(admin)).to include("translated_title")
+      end
+    end
   end
 end
diff --git a/decidim-meetings/spec/system/admin/filter_meetings_spec.rb b/decidim-meetings/spec/system/admin/filter_meetings_spec.rb
index 23fe788e57505..b1be2b569bcfc 100644
--- a/decidim-meetings/spec/system/admin/filter_meetings_spec.rb
+++ b/decidim-meetings/spec/system/admin/filter_meetings_spec.rb
@@ -123,6 +123,84 @@ def meeting_without_type(type)
     end
   end
 
+  context "when sorting by closed" do
+    let!(:open_a) { create(:meeting, component:, title: { en: "Open A" }) }
+    let!(:closed_b) { create(:meeting, :closed, component:, title: { en: "Closed B" }) }
+    let!(:open_c) { create(:meeting, component:, title: { en: "Open C" }) }
+    let!(:closed_d) { create(:meeting, :closed, component:, title: { en: "Closed D" }) }
+
+    before { visit_component_admin }
+
+    it "groups closed meetings first when 'Closed' is clicked" do
+      within "table thead" do
+        click_on "Closed"
+      end
+
+      titles = page.all("table tbody tr td:nth-child(2)").map(&:text)
+      closed_indices = [closed_b, closed_d].map { |m| titles.find_index { |t| t.include?(translated(m.title)) } }
+      open_indices = [open_a, open_c].map { |m| titles.find_index { |t| t.include?(translated(m.title)) } }
+      expect(closed_indices.max).to be < open_indices.min
+    end
+  end
+
+  context "when sorting by taxonomies" do
+    let(:root_taxonomy) { create(:taxonomy, organization:, name: { "en" => "Root" }) }
+    let!(:taxonomy_alpha) { create(:taxonomy, parent: root_taxonomy, organization:, name: { "en" => "Alpha topic" }) }
+    let!(:taxonomy_beta) { create(:taxonomy, parent: root_taxonomy, organization:, name: { "en" => "Beta topic" }) }
+    let!(:taxonomy_gamma) { create(:taxonomy, parent: root_taxonomy, organization:, name: { "en" => "Gamma topic" }) }
+    let(:taxonomy_filter) { create(:taxonomy_filter, root_taxonomy:, participatory_space_manifests: [participatory_space.manifest.name]) }
+    let!(:filter_item_alpha) { create(:taxonomy_filter_item, taxonomy_filter:, taxonomy_item: taxonomy_alpha) }
+    let!(:filter_item_beta) { create(:taxonomy_filter_item, taxonomy_filter:, taxonomy_item: taxonomy_beta) }
+    let!(:filter_item_gamma) { create(:taxonomy_filter_item, taxonomy_filter:, taxonomy_item: taxonomy_gamma) }
+    let!(:meeting_beta) { create(:meeting, component:, title: { en: "Has beta" }, taxonomies: [taxonomy_beta]) }
+    let!(:meeting_alpha) { create(:meeting, component:, title: { en: "Has alpha" }, taxonomies: [taxonomy_alpha]) }
+    let!(:meeting_gamma) { create(:meeting, component:, title: { en: "Has gamma" }, taxonomies: [taxonomy_gamma]) }
+
+    before do
+      component.update!(settings: { taxonomy_filters: [taxonomy_filter.id] })
+      visit_component_admin
+    end
+
+    it "sorts by taxonomy name ascending when 'Taxonomies' is clicked" do
+      within "table thead" do
+        click_on "Taxonomies"
+      end
+
+      titles = page.all("table tbody tr td:nth-child(2)").map(&:text)
+      expect(titles.find_index { |t| t.include?("Has alpha") }).to be < titles.find_index { |t| t.include?("Has beta") }
+      expect(titles.find_index { |t| t.include?("Has beta") }).to be < titles.find_index { |t| t.include?("Has gamma") }
+    end
+  end
+
+  context "when sorting by title" do
+    let!(:beta_meeting) { create(:meeting, component:, title: { en: "Beta meeting" }) }
+    let!(:alpha_meeting) { create(:meeting, component:, title: { en: "Alpha meeting" }) }
+    let!(:gamma_meeting) { create(:meeting, component:, title: { en: "Gamma meeting" }) }
+
+    before { visit_component_admin }
+
+    it "sorts by title descending when 'Title' is clicked" do
+      within "table thead" do
+        click_on "Title"
+      end
+
+      titles = page.all("table tbody tr td:nth-child(2)").map(&:text)
+      expect(titles.index("Gamma meeting")).to be < titles.index("Beta meeting")
+      expect(titles.index("Beta meeting")).to be < titles.index("Alpha meeting")
+    end
+
+    it "sorts by title ascending when 'Title' is clicked twice" do
+      within "table thead" do
+        click_on "Title"
+        click_on "Title"
+      end
+
+      titles = page.all("table tbody tr td:nth-child(2)").map(&:text)
+      expect(titles.index("Alpha meeting")).to be < titles.index("Beta meeting")
+      expect(titles.index("Beta meeting")).to be < titles.index("Gamma meeting")
+    end
+  end
+
   it_behaves_like "paginating a collection" do
     let!(:collection) { create_list(:meeting, 50, component:) }
   end
diff --git a/decidim-proposals/app/models/decidim/proposals/proposal.rb b/decidim-proposals/app/models/decidim/proposals/proposal.rb
index 0cde9e470227d..20886dea5aea2 100644
--- a/decidim-proposals/app/models/decidim/proposals/proposal.rb
+++ b/decidim-proposals/app/models/decidim/proposals/proposal.rb
@@ -397,8 +397,14 @@ def self.ransackable_scopes(_auth_object = nil)
       # Create the :search_text ransacker alias for searching from both of these.
       ransacker_i18n_multi :search_text, [:title, :body]
 
+      ransacker_i18n :translated_title, :title
+
       def self.ransackable_attributes(_auth_object = nil)
-        %w(id_string search_text title body is_emendation comments_count proposal_votes_count published_at proposal_notes_count)
+        %w(
+          id_string search_text title translated_title body is_emendation
+          comments_count proposal_votes_count published_at proposal_notes_count
+          state_published evaluation_assignments_count
+        )
       end
 
       def self.ransackable_associations(_auth_object = nil)
diff --git a/decidim-proposals/spec/models/decidim/proposals/proposal_spec.rb b/decidim-proposals/spec/models/decidim/proposals/proposal_spec.rb
index d4e22f129a70e..a2337cd04bb49 100644
--- a/decidim-proposals/spec/models/decidim/proposals/proposal_spec.rb
+++ b/decidim-proposals/spec/models/decidim/proposals/proposal_spec.rb
@@ -347,6 +347,20 @@ module Proposals
           end
         end
       end
+
+      describe ".ransackable_attributes" do
+        it "allows sorting by state_published" do
+          expect(described_class.ransackable_attributes).to include("state_published")
+        end
+
+        it "allows sorting by evaluation_assignments_count" do
+          expect(described_class.ransackable_attributes).to include("evaluation_assignments_count")
+        end
+
+        it "allows sorting by translated_title" do
+          expect(described_class.ransackable_attributes).to include("translated_title")
+        end
+      end
     end
   end
 end
diff --git a/decidim-proposals/spec/system/admin/filter_proposals_spec.rb b/decidim-proposals/spec/system/admin/filter_proposals_spec.rb
index 2f8769208f937..e26b35eafafaa 100644
--- a/decidim-proposals/spec/system/admin/filter_proposals_spec.rb
+++ b/decidim-proposals/spec/system/admin/filter_proposals_spec.rb
@@ -233,6 +233,35 @@ def proposal_without_state(token)
     end
   end
 
+  context "when sorting by title" do
+    let!(:beta_proposal) { create(:proposal, component:, title: { en: "Beta proposal" }) }
+    let!(:alpha_proposal) { create(:proposal, component:, title: { en: "Alpha proposal" }) }
+    let!(:gamma_proposal) { create(:proposal, component:, title: { en: "Gamma proposal" }) }
+
+    before { visit_component_admin }
+
+    it "sorts by title ascending when 'Title' is clicked" do
+      within "table thead" do
+        click_on "Title"
+      end
+
+      titles = page.all("table tbody tr td:nth-child(2)").map(&:text)
+      expect(titles.find_index { |t| t.include?("Alpha proposal") }).to be < titles.find_index { |t| t.include?("Beta proposal") }
+      expect(titles.find_index { |t| t.include?("Beta proposal") }).to be < titles.find_index { |t| t.include?("Gamma proposal") }
+    end
+
+    it "sorts by title descending when 'Title' is clicked twice" do
+      within "table thead" do
+        click_on "Title"
+        click_on "Title"
+      end
+
+      titles = page.all("table tbody tr td:nth-child(2)").map(&:text)
+      expect(titles.find_index { |t| t.include?("Gamma proposal") }).to be < titles.find_index { |t| t.include?("Beta proposal") }
+      expect(titles.find_index { |t| t.include?("Beta proposal") }).to be < titles.find_index { |t| t.include?("Alpha proposal") }
+    end
+  end
+
   it_behaves_like "paginating a collection" do
     let!(:collection) { create_list(:proposal, 50, component:) }
   end

From 14834754e6276f571d6ef9c9d250f3dd8aaa2bc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= <ivan@pokecode.net>
Date: Tue, 2 Jun 2026 11:57:05 +0200
Subject: [PATCH 052/131] Fix Oauth forgetting data on registration

---
 .../decidim/create_omniauth_registration.rb   |  13 +-
 .../omniauth_registrations_controller.rb      |  96 ++++++++++++---
 .../decidim/omniauth_registration_form.rb     |   1 +
 .../omniauth_registrations/new.html.erb       |   4 +-
 .../new_tos_fields.html.erb                   |   4 +-
 .../create_omniauth_registration_spec.rb      |  32 +++++
 .../omniauth_registrations_controller_spec.rb | 112 ++++++++++++++++++
 7 files changed, 236 insertions(+), 26 deletions(-)

diff --git a/decidim-core/app/commands/decidim/create_omniauth_registration.rb b/decidim-core/app/commands/decidim/create_omniauth_registration.rb
index 67317657c44ec..38f4f870c0126 100644
--- a/decidim-core/app/commands/decidim/create_omniauth_registration.rb
+++ b/decidim-core/app/commands/decidim/create_omniauth_registration.rb
@@ -29,6 +29,7 @@ def call
           return broadcast(:ok, @user)
         end
         return broadcast(:invalid) if form.invalid?
+        return broadcast(:add_tos_errors) if requires_tos_acceptance?
 
         transaction do
           create_or_find_user
@@ -37,8 +38,6 @@ def call
         trigger_omniauth_event
 
         broadcast(:ok, @user)
-      rescue NeedTosAcceptance
-        broadcast(:add_tos_errors, @user)
       rescue ActiveRecord::RecordInvalid => e
         broadcast(:error, e.record)
       end
@@ -75,7 +74,6 @@ def create_or_find_user
         attach_avatar(form.avatar_url) if form.avatar_url.present?
         @user.tos_agreement = form.tos_agreement
         @user.accepted_tos_version = Time.current
-        raise NeedTosAcceptance if @user.tos_agreement.blank?
 
         @user.skip_confirmation! if verified_email
         @user.save!
@@ -83,6 +81,12 @@ def create_or_find_user
       end
     end
 
+    def requires_tos_acceptance?
+      return false if form.tos_agreement.present?
+
+      verified_email.blank? || User.find_by(email: verified_email, organization:).blank?
+    end
+
     def attach_avatar(avatar_url)
       url = URI.parse(avatar_url)
       filename = File.basename(url.path)
@@ -148,9 +152,6 @@ def trigger_omniauth_event(event_name = "decidim.user.omniauth_registration")
     end
   end
 
-  class NeedTosAcceptance < StandardError
-  end
-
   class InvalidOauthSignature < StandardError
   end
 end
diff --git a/decidim-core/app/controllers/decidim/devise/omniauth_registrations_controller.rb b/decidim-core/app/controllers/decidim/devise/omniauth_registrations_controller.rb
index 8edb523f35611..b42d1181ee6fa 100644
--- a/decidim-core/app/controllers/decidim/devise/omniauth_registrations_controller.rb
+++ b/decidim-core/app/controllers/decidim/devise/omniauth_registrations_controller.rb
@@ -14,13 +14,15 @@ def new
       end
 
       def create
-        form_params = user_params_from_oauth_hash || params[:user]
+        return handle_missing_oauth_data! if pending_oauth_data.blank?
 
-        @form = form(OmniauthRegistrationForm).from_params(form_params)
-        @form.email ||= verified_email
+        form_params = form_params_from_pending_oauth
 
+        @form = form(OmniauthRegistrationForm).from_params(form_params)
         CreateOmniauthRegistration.call(@form, verified_email) do
           on(:ok) do |user|
+            clear_pending_oauth_data!
+
             if user.active_for_authentication?
               sign_in_and_redirect user, event: :authentication
               set_flash_message :notice, :success, kind: @form.provider.capitalize
@@ -39,7 +41,6 @@ def create
 
           on(:add_tos_errors) do
             set_flash_message :alert, :add_tos_errors if @form.valid_tos?
-            session[:verified_email] = verified_email
             render :new_tos_fields
           end
 
@@ -61,28 +62,90 @@ def action_missing(action_name)
 
       private
 
+      def form_params_from_pending_oauth
+        submitted_params = params.fetch(:user, {}).permit(:name, :nickname, :email, :tos_agreement, :newsletter).to_h.symbolize_keys
+        oauth_params = pending_oauth_form_params
+
+        oauth_params.merge(
+          submitted_params
+        )
+      end
+
       def oauth_data
         @oauth_data ||= oauth_hash.slice(:provider, :uid, :info)
       end
 
-      # Private: Create form params from omniauth hash
-      # Since we are using trusted omniauth data we are generating a valid signature.
-      def user_params_from_oauth_hash
-        return nil if oauth_data.empty?
+      # Private: Create trusted form params from oauth data stored server-side.
+      # Since we are using trusted oauth data we are generating a valid signature.
+      def pending_oauth_form_params
+        return {} if pending_oauth_data.blank?
 
         {
+          provider: pending_oauth_data[:provider],
+          uid: pending_oauth_data[:uid],
+          email: pending_oauth_data[:verified_email],
+          name: pending_oauth_data[:name],
+          nickname: pending_oauth_data[:nickname],
+          oauth_signature: OmniauthRegistrationForm.create_signature(pending_oauth_data[:provider], pending_oauth_data[:uid]),
+          avatar_url: pending_oauth_data[:avatar_url],
+          raw_data: pending_oauth_data[:raw_data],
+          pending_oauth_token:
+        }
+      end
+
+      def verified_email
+        @verified_email ||= pending_oauth_data&.dig(:verified_email)
+      end
+
+      def pending_oauth_data
+        @pending_oauth_data ||= if oauth_hash.present?
+                                  store_pending_oauth_data!
+                                else
+                                  restore_pending_oauth_data
+                                end
+      end
+
+      def pending_oauth_token
+        @pending_oauth_token ||= params.dig(:user, :pending_oauth_token).presence || session.dig(:omniauth_registration, :token)
+      end
+
+      def store_pending_oauth_data!
+        data = {
           provider: oauth_data[:provider],
           uid: oauth_data[:uid],
-          name: oauth_data[:info][:name],
-          nickname: oauth_data[:info][:nickname],
-          oauth_signature: OmniauthRegistrationForm.create_signature(oauth_data[:provider], oauth_data[:uid]),
-          avatar_url: oauth_data[:info][:image],
+          name: oauth_data.dig(:info, :name),
+          nickname: oauth_data.dig(:info, :nickname),
+          avatar_url: oauth_data.dig(:info, :image),
+          verified_email: oauth_data.dig(:info, :email).presence,
           raw_data: oauth_hash
         }
+
+        session[:omniauth_registration] = {
+          token: SecureRandom.hex(16),
+          data:
+        }
+
+        @pending_oauth_token = session[:omniauth_registration][:token]
+        data
       end
 
-      def verified_email
-        @verified_email ||= oauth_data.dig(:info, :email).presence || session[:verified_email]
+      def restore_pending_oauth_data
+        token = params.dig(:user, :pending_oauth_token)
+        return {} if token.blank?
+
+        state = session[:omniauth_registration]&.with_indifferent_access
+        return {} if state.blank?
+
+        stored_token = state[:token].to_s
+        return {} unless stored_token.bytesize == token.to_s.bytesize
+        return {} unless ActiveSupport::SecurityUtils.secure_compare(stored_token, token.to_s)
+
+        @pending_oauth_token = stored_token
+        state[:data] || {}
+      end
+
+      def clear_pending_oauth_data!
+        session.delete(:omniauth_registration)
       end
 
       def oauth_hash
@@ -91,6 +154,11 @@ def oauth_hash
 
         raw_hash.deep_symbolize_keys
       end
+
+      def handle_missing_oauth_data!
+        flash[:alert] = t("devise.failure.timeout")
+        redirect_back_or_to(decidim.root_path)
+      end
     end
   end
 end
diff --git a/decidim-core/app/forms/decidim/omniauth_registration_form.rb b/decidim-core/app/forms/decidim/omniauth_registration_form.rb
index 345177a76785c..0f344cc22d074 100644
--- a/decidim-core/app/forms/decidim/omniauth_registration_form.rb
+++ b/decidim-core/app/forms/decidim/omniauth_registration_form.rb
@@ -15,6 +15,7 @@ class OmniauthRegistrationForm < Form
     attribute :oauth_signature, String
     attribute :avatar_url, String
     attribute :raw_data, Hash
+    attribute :pending_oauth_token, String
 
     validates :email, presence: true
     validates :name, presence: true
diff --git a/decidim-core/app/views/decidim/devise/omniauth_registrations/new.html.erb b/decidim-core/app/views/decidim/devise/omniauth_registrations/new.html.erb
index 574d9067c4829..e500ff44a9896 100644
--- a/decidim-core/app/views/decidim/devise/omniauth_registrations/new.html.erb
+++ b/decidim-core/app/views/decidim/devise/omniauth_registrations/new.html.erb
@@ -24,9 +24,7 @@
 
       <%= render partial: "decidim/devise/shared/tos_fields", locals: { form: f, user: :user } %>
 
-      <%= f.hidden_field :uid %>
-      <%= f.hidden_field :provider %>
-      <%= f.hidden_field :oauth_signature %>
+      <%= f.hidden_field :pending_oauth_token %>
     </div>
 
     <div class="form__wrapper-block">
diff --git a/decidim-core/app/views/decidim/devise/omniauth_registrations/new_tos_fields.html.erb b/decidim-core/app/views/decidim/devise/omniauth_registrations/new_tos_fields.html.erb
index 822f6c18b5bbb..665489ab74ef0 100644
--- a/decidim-core/app/views/decidim/devise/omniauth_registrations/new_tos_fields.html.erb
+++ b/decidim-core/app/views/decidim/devise/omniauth_registrations/new_tos_fields.html.erb
@@ -12,9 +12,7 @@
 
       <%= render partial: "decidim/devise/shared/tos_fields", locals: { form: f, user: :user } %>
 
-      <%= f.hidden_field :uid %>
-      <%= f.hidden_field :provider %>
-      <%= f.hidden_field :oauth_signature %>
+      <%= f.hidden_field :pending_oauth_token %>
     </div>
 
     <div class="form__wrapper-block">
diff --git a/decidim-core/spec/commands/decidim/create_omniauth_registration_spec.rb b/decidim-core/spec/commands/decidim/create_omniauth_registration_spec.rb
index ce77b11b49c15..ec4c49a9e2b3d 100644
--- a/decidim-core/spec/commands/decidim/create_omniauth_registration_spec.rb
+++ b/decidim-core/spec/commands/decidim/create_omniauth_registration_spec.rb
@@ -107,6 +107,38 @@ module Comments
           end
         end
 
+        context "when tos agreement is missing for a new user" do
+          let(:tos_agreement) { nil }
+
+          it "broadcasts add_tos_errors" do
+            expect { command.call }.to broadcast(:add_tos_errors)
+          end
+
+          it "does not create a new user" do
+            expect do
+              command.call
+            end.not_to change(User, :count)
+          end
+        end
+
+        context "when tos agreement is missing for an existing verified user" do
+          let(:tos_agreement) { nil }
+
+          before do
+            create(:user, email:, organization:)
+          end
+
+          it "broadcasts ok" do
+            expect { command.call }.to broadcast(:ok)
+          end
+
+          it "does not create a new user" do
+            expect do
+              command.call
+            end.not_to change(User, :count)
+          end
+        end
+
         context "when the form is valid" do
           it "broadcasts ok" do
             expect { command.call }.to broadcast(:ok)
diff --git a/decidim-core/spec/controllers/omniauth_registrations_controller_spec.rb b/decidim-core/spec/controllers/omniauth_registrations_controller_spec.rb
index 85f29b090d128..a58cc615cc962 100644
--- a/decidim-core/spec/controllers/omniauth_registrations_controller_spec.rb
+++ b/decidim-core/spec/controllers/omniauth_registrations_controller_spec.rb
@@ -219,6 +219,118 @@ module Decidim
           end
         end
       end
+
+      context "when ToS is missing and user retries without omniauth.auth" do
+        let!(:user) { create(:user, organization:, email: "other@example.org") }
+        let(:raw_data) do
+          {
+            "provider" => provider,
+            "uid" => uid,
+            "info" => {
+              "name" => "Facebook User",
+              "nickname" => "facebook_user",
+              "email" => email
+            },
+            "extra" => {
+              "raw_info" => {
+                "id" => uid,
+                "name" => "Facebook User"
+              }
+            }
+          }
+        end
+
+        before do
+          request.env["omniauth.auth"] = raw_data
+        end
+
+        it "preserves oauth data in pending state and creates the account on retry" do
+          expect do
+            post :create, params: { locale: I18n.locale, user: { tos_agreement: nil } }
+          end.not_to change(User, :count)
+
+          expect(response).to render_template(:new_tos_fields)
+
+          token = session.dig(:omniauth_registration, :token)
+          expect(token).to be_present
+          expect(session.dig(:omniauth_registration, :data, :raw_data)).to eq(raw_data.deep_symbolize_keys)
+
+          request.env["omniauth.auth"] = nil
+          allow(ActiveSupport::Notifications).to receive(:publish).and_call_original
+
+          expect do
+            post :create, params: { locale: I18n.locale, user: { pending_oauth_token: token, tos_agreement: "1" } }
+          end.to change(User, :count).by(1)
+
+          expect(controller).to be_user_signed_in
+          expect(User.find_by(email:)).to be_present
+          expect(ActiveSupport::Notifications).to have_received(:publish).with(
+            "decidim.user.omniauth_registration",
+            hash_including(
+              provider:,
+              uid:,
+              email:,
+              raw_data: raw_data.deep_symbolize_keys
+            )
+          )
+        end
+      end
+
+      context "when oauth data is missing and there is no pending state" do
+        before do
+          request.env["omniauth.auth"] = nil
+        end
+
+        it "redirects to root with a timeout alert" do
+          expect do
+            post :create, params: { locale: I18n.locale }
+          end.not_to raise_error
+
+          expect(controller).not_to be_user_signed_in
+          expect(controller).to redirect_to(root_path)
+          expect(flash[:alert]).to eq(I18n.t("devise.failure.timeout"))
+        end
+      end
+
+      context "when pending oauth state session keys are strings" do
+        let(:pending_token) { SecureRandom.hex(16) }
+        let(:pending_raw_data) do
+          {
+            provider:,
+            uid:,
+            info: {
+              name: "Facebook User",
+              nickname: "facebook_user",
+              email:
+            }
+          }
+        end
+
+        before do
+          request.env["omniauth.auth"] = nil
+          session[:omniauth_registration] = {
+            "token" => pending_token,
+            "data" => {
+              "provider" => provider,
+              "uid" => uid,
+              "name" => "Facebook User",
+              "nickname" => "facebook_user",
+              "avatar_url" => nil,
+              "verified_email" => email,
+              "raw_data" => pending_raw_data
+            }
+          }
+        end
+
+        it "restores the pending state and signs in" do
+          expect do
+            post :create, params: { locale: I18n.locale, user: { pending_oauth_token: pending_token, tos_agreement: "1" } }
+          end.to change(Identity, :count).by(1)
+
+          expect(controller).to be_user_signed_in
+          expect(User.find_by(email:)).to be_present
+        end
+      end
     end
   end
 end

From 193f40a8201c6f7af4de71497cb6a057a07e4349 Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Tue, 2 Jun 2026 22:39:34 +0300
Subject: [PATCH 053/131] Backport 'Fix locale setup in devise controllers' to
 v0.31 (#16973)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix locale setup in devise controllers

* fix locale setup in devise controllers

* add words

* use around action

* Apply suggestions from code review

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Ivan Vergés <ivan@pokecode.net>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 .github/actions/spelling/expect.txt           |  4 ++++
 .../concerns/decidim/devise_controllers.rb    | 10 +++++++++
 decidim-core/spec/system/locales_spec.rb      | 22 ++++++++++++++++++-
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index db9e6cc6f8d46..1a1733c921422 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -94,6 +94,8 @@ Brakus
 breadcrumb
 browserstack
 bugfixing
+busques
+Butlletins
 byebug
 bytesize
 cacatua
@@ -408,6 +410,7 @@ infob
 informables
 Inici
 iniciar
+iniciat
 inodes
 inputdialog
 inputname
@@ -883,6 +886,7 @@ trashable
 traslatable
 trgm
 trobada
+trobat
 tsearch
 turbolinks
 Twilio
diff --git a/decidim-core/app/controllers/concerns/decidim/devise_controllers.rb b/decidim-core/app/controllers/concerns/decidim/devise_controllers.rb
index f0510877242b8..609b418d7f220 100644
--- a/decidim-core/app/controllers/concerns/decidim/devise_controllers.rb
+++ b/decidim-core/app/controllers/concerns/decidim/devise_controllers.rb
@@ -41,6 +41,10 @@ module DeviseControllers
 
       layout "layouts/decidim/application"
 
+      # Ensure locale is set before Devise's own prepended callbacks and reset
+      # after the request finishes.
+      prepend_around_action :set_current_locale
+
       # Saves the location before loading each page so we can return to the
       # right page.
       before_action :store_current_location
@@ -58,6 +62,12 @@ def store_current_location
 
         store_location_for(:user, redirect_url)
       end
+
+      def set_current_locale(&)
+        locale = detect_locale
+        locale = default_locale unless available_locales.include?(locale)
+        I18n.with_locale(locale, &)
+      end
     end
   end
 end
diff --git a/decidim-core/spec/system/locales_spec.rb b/decidim-core/spec/system/locales_spec.rb
index 8f907070cedb4..6d3ba5355bad2 100644
--- a/decidim-core/spec/system/locales_spec.rb
+++ b/decidim-core/spec/system/locales_spec.rb
@@ -69,16 +69,36 @@
       let(:user) { create(:user, :confirmed, locale: "ca", organization:) }
 
       before do
+        allow(Rails.application).to \
+          receive(:env_config).with(no_args).and_wrap_original do |m, *|
+          m.call.merge(
+            "action_dispatch.show_exceptions" => true,
+            "action_dispatch.show_detailed_exceptions" => false
+          )
+        end
+
         login_as user, scope: :user
 
         # Prevent flaky spec, where sometimes the language is not changed before the visit
         sleep 2
-        visit decidim.root_path
       end
 
       it "uses the user's locale" do
+        visit decidim.root_path
         expect(page).to have_content("Inici")
       end
+
+      it "displays not found messages with the right locale" do
+        visit decidim_admin.root_path
+
+        expect(page).to have_content("No s'ha trobat la pàgina que busques")
+      end
+
+      it "displays devise messages with the right locale" do
+        visit decidim.new_user_session_path(locale: "ca")
+
+        expect(page).to have_content("Ja has iniciat la sessió.")
+      end
     end
   end
 end

From f480af231a4ca362aad1f7a1ff09cf6763a12549 Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Tue, 2 Jun 2026 22:42:58 +0300
Subject: [PATCH 054/131] Backport 'Fix eslint plugin import usage' to v0.31
 (#16967)

* Fix eslint plugin import usage

* Fix eslint plugin import usage

* Fix imports

* Change config strategy

* Run npm install

* add sortitions to modules path
---
 .eslintrc.json                                | 44 ++++++++++++++++++-
 .../decidim_proposals_geocoding.js            |  2 -
 package-lock.json                             |  7 +++
 packages/core/package.json                    |  1 +
 packages/eslint-config/index.js               | 14 ++++--
 5 files changed, 62 insertions(+), 6 deletions(-)
 delete mode 100644 decidim-proposals/app/packs/entrypoints/decidim_proposals_geocoding.js

diff --git a/.eslintrc.json b/.eslintrc.json
index 08de8c7f32172..143dcb4eec859 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,3 +1,45 @@
 {
-  "extends": "@decidim"
+  "extends": "@decidim",
+  "settings": {
+    "react": {
+      "version": "detect"
+    },
+    "import/resolver": {
+      "node": {
+        "extensions": [".js"],
+        "moduleDirectory": [
+          "decidim-accountability/app/packs/",
+          "decidim-admin/app/packs/",
+          "decidim-ai/app/packs/",
+          "decidim-api/app/packs/",
+          "decidim-assemblies/app/packs/",
+          "decidim-blogs/app/packs/",
+          "decidim-budgets/app/packs/",
+          "decidim-collaborative_texts/app/packs/",
+          "decidim-comments/app/packs/",
+          "decidim-conferences/app/packs/",
+          "decidim-core/app/packs/",
+          "decidim-debates/app/packs/",
+          "decidim-demographics/app/packs/",
+          "decidim-design/app/packs/",
+          "decidim-dev/app/packs/",
+          "decidim-elections/app/packs/",
+          "decidim-forms/app/packs/",
+          "decidim-initiatives/app/packs/",
+          "decidim-meetings/app/packs/",
+          "decidim-pages/app/packs/",
+          "decidim-participatory_processes/app/packs/",
+          "decidim-proposals/app/packs/",
+          "decidim-surveys/app/packs/",
+	  "decidim-sortitions/app/packs/",
+          "decidim-system/app/packs/",
+          "decidim-templates/app/packs/",
+          "decidim-verifications/app/packs/",
+          "packages/core/node_modules/",
+          "packages/webpacker/node_modules/",
+          "node_modules/"
+        ]
+      }
+    }
+  }
 }
diff --git a/decidim-proposals/app/packs/entrypoints/decidim_proposals_geocoding.js b/decidim-proposals/app/packs/entrypoints/decidim_proposals_geocoding.js
deleted file mode 100644
index 83cc46a21230e..0000000000000
--- a/decidim-proposals/app/packs/entrypoints/decidim_proposals_geocoding.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import "src/decidim/proposals/reverse_geocoding.js"
-import "stylesheets/decidim/proposals/geocoding_addons.scss";
diff --git a/package-lock.json b/package-lock.json
index 0f823f06124e7..f351072dc3aca 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17325,6 +17325,12 @@
         "node": ">=4"
       }
     },
+    "node_modules/regenerator-runtime": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+      "license": "MIT"
+    },
     "node_modules/regenerator-transform": {
       "version": "0.15.2",
       "license": "MIT",
@@ -21051,6 +21057,7 @@
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-i18nify": "^6.1.2",
+        "regenerator-runtime": "^0.14.1",
         "select": "^1.1.2",
         "svg4everybody": "2.1.9",
         "tom-select": "2.2.2",
diff --git a/packages/core/package.json b/packages/core/package.json
index 54f7fe14766b8..450e5b4f921e5 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -55,6 +55,7 @@
     "foundation-sites": "^6.7.0",
     "graphiql": "^3.0.10",
     "graphql-ws": "^5.16.2",
+    "regenerator-runtime": "^0.14.1",
     "html5sortable": "0.10.0",
     "identity-obj-proxy": "^3.0.0",
     "jquery": "^3.2.1",
diff --git a/packages/eslint-config/index.js b/packages/eslint-config/index.js
index 0224b22b9635b..f7289f4ab6193 100644
--- a/packages/eslint-config/index.js
+++ b/packages/eslint-config/index.js
@@ -5,15 +5,23 @@ module.exports = {
     es6: true,
     es2021: true
   },
-  extends: ["eslint:recommended", "plugin:react/recommended", "prettier"],
+  extends: [
+    "eslint:recommended",
+    "plugin:import/recommended",
+    "plugin:react/recommended",
+    "prettier"
+  ],
   parserOptions: {
     ecmaFeatures: {
       experimentalObjectRestSpread: true,
       jsx: true
     },
-    sourceType: "module"
+    sourceType: "module",
+    ecmaVersion: "latest"
   },
-  plugins: ["react",
+  plugins: [
+    "react",
+    "import",
     "no-relative-import-paths"
   ],
   globals: {

From af3a2a7ef1f8ca0c7ab2683efd341f94087335fc Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Wed, 3 Jun 2026 15:29:27 +0300
Subject: [PATCH 055/131] Backport 'Fix double-escaping on mobile menu
 navigation links' to v0.31 (#17008)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 .../_menu_breadcrumb_mobile_tablet.html.erb   |  2 +-
 decidim-core/spec/system/menu_spec.rb         | 34 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_mobile_tablet.html.erb b/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_mobile_tablet.html.erb
index 92b45c4260b11..e9897e204ee3e 100644
--- a/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_mobile_tablet.html.erb
+++ b/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_mobile_tablet.html.erb
@@ -2,7 +2,7 @@
 <div class="menu-bar__breadcrumb-mobile__dropdown-trigger">
   <span class="inline-block w-full overflow-hidden text-ellipsis align-middle">
     <% breadcrumb_items.last(2).each_with_index do |item, idx| %>
-      <% item_label = decidim_escape_translated(item[:label]) %>
+      <% item_label = translated_attribute(item[:label]) %>
       <% if idx.positive? %>
         <span>/</span>
       <% end %>
diff --git a/decidim-core/spec/system/menu_spec.rb b/decidim-core/spec/system/menu_spec.rb
index bb2f5adefb240..af023fd079f35 100644
--- a/decidim-core/spec/system/menu_spec.rb
+++ b/decidim-core/spec/system/menu_spec.rb
@@ -70,6 +70,40 @@
     end
   end
 
+  describe "when there are special characters (', &) in the nav links" do
+    let(:component_name) { "People's Budget & Ideas" }
+    let(:participatory_space) { create(:participatory_process, organization:) }
+    let(:proposal_component) { create(:proposal_component, name: { en: component_name }, participatory_space:) }
+    let(:proposal) { create(:proposal, component: proposal_component) }
+    let(:proposal_path) { Decidim::ResourceLocatorPresenter.new(proposal).path }
+
+    context "when it is a desktop device" do
+      it "renders the component name correctly" do
+        visit proposal_path
+        within ".menu-bar__breadcrumb-desktop" do
+          expect(page).to have_content(component_name)
+          expect(page).to have_no_content("&#39;")
+          expect(page).to have_no_content("&amp;#39;")
+        end
+      end
+    end
+
+    context "when it is a mobile device" do
+      before do
+        driven_by(:iphone)
+      end
+
+      it "renders the component name correctly" do
+        visit proposal_path
+        within ".menu-bar__breadcrumb-mobile" do
+          expect(page).to have_content(component_name)
+          expect(page).to have_no_content("&#39;")
+          expect(page).to have_no_content("&amp;#39;")
+        end
+      end
+    end
+  end
+
   describe "header message in desktop" do
     let(:participatory_space) { create(:participatory_process, organization:) }
     let(:component) { create(:proposal_component, participatory_space:) }

From cd5adbe8c9bf9b75d9a257b2f410abd943798f19 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Wed, 3 Jun 2026 20:36:17 +0200
Subject: [PATCH 056/131] Backport 'Make import of assemblies/processes
 attachments more robust' to v0.31 (#17015)

* make import of assemblies/processes attachments more robust

* test creation of attachment collections

* fix rubocop

* change unless for if

Co-authored-by: David <david@pokecode.net>
---
 .../decidim/assemblies/assembly_importer.rb   |   4 +-
 .../assemblies/assembly_importer_spec.rb      | 103 ++++++++++++++++++
 .../participatory_process_importer.rb         |   4 +-
 .../participatory_process_importer_spec.rb    | 103 ++++++++++++++++++
 4 files changed, 210 insertions(+), 4 deletions(-)

diff --git a/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb b/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
index 8f7d7ebb4b2a0..b05f03f108278 100644
--- a/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
+++ b/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
@@ -109,8 +109,8 @@ def import_folders_and_attachments(attachments)
           end
         end
 
-        unless attachments["attachment_collections"].empty?
-          attachments["attachment_collections"].map do |collection|
+        if attachments["attachment_collections"].present?
+          attachments["attachment_collections"]&.map do |collection|
             Decidim.traceability.perform_action!("create", AttachmentCollection, @user) do
               create_attachment_collection(collection)
             end
diff --git a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb
index dcc537f968bbe..8f65b7102e6cf 100644
--- a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb
+++ b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb
@@ -419,6 +419,109 @@ module Decidim::Assemblies
               .not_to change(Decidim::Attachment, :count)
           end
         end
+
+        context "when attachment collection is not defined" do
+          let(:attachments_data) do
+            {
+              "files" => [
+                {
+                  "title" => { "en" => "Test File" },
+                  "description" => { "en" => "Test Description" },
+                  "weight" => 1,
+                  "remote_file_url" => remote_file_url
+                }
+              ]
+            }
+          end
+
+          before do
+            stub_request(:head, remote_file_url)
+              .to_return(status: 200, headers: { "Content-Type" => "application/pdf" })
+            stub_request(:get, remote_file_url)
+              .to_return(status: 200, body: File.read(Decidim::Dev.asset("Exampledocument.pdf")))
+          end
+
+          it "does not create any attachments collections" do
+            expect { importer.import_folders_and_attachments(attachments_data) }
+              .not_to change(Decidim::AttachmentCollection, :count)
+          end
+        end
+
+        context "when attachment collection is nil" do
+          let(:attachments_data) do
+            {
+              "files" => [
+                {
+                  "title" => { "en" => "Test File" },
+                  "description" => { "en" => "Test Description" },
+                  "weight" => 1,
+                  "remote_file_url" => remote_file_url
+                }
+              ],
+              "attachment_collections" => nil
+            }
+          end
+
+          before do
+            stub_request(:head, remote_file_url)
+              .to_return(status: 200, headers: { "Content-Type" => "application/pdf" })
+            stub_request(:get, remote_file_url)
+              .to_return(status: 200, body: File.read(Decidim::Dev.asset("Exampledocument.pdf")))
+          end
+
+          it "does not create any attachments collections" do
+            expect { importer.import_folders_and_attachments(attachments_data) }
+              .not_to change(Decidim::AttachmentCollection, :count)
+          end
+        end
+
+        context "when attachment collection is defined" do
+          let(:attachment_data) do
+            {
+              "files" => [
+                {
+                  "title" => { "en" => "Test File" },
+                  "description" => { "en" => "Test Description" },
+                  "weight" => 1,
+                  "remote_file_url" => remote_file_url,
+                  "attachment_collections" => {
+                    "name" => {
+                      "en" => "Collection name"
+                    },
+                    "weight" => 0,
+                    "description" => {
+                      "en" => "Collection description"
+                    }
+                  }
+                }
+              ],
+              "attachment_collections" => [
+                {
+                  "name" => {
+                    "en" => "Collection name"
+                  },
+                  "weight" => 0,
+                  "description" => {
+                    "en" => "Collection description"
+                  }
+                }
+              ]
+            }
+          end
+
+          before do
+            stub_request(:head, remote_file_url)
+              .to_return(status: 200, headers: { "Content-Type" => "application/pdf" })
+            stub_request(:get, remote_file_url)
+              .to_return(status: 200, body: File.read(Decidim::Dev.asset("Exampledocument.pdf")))
+          end
+
+          it "creates the attachment and the collection" do
+            expect { importer.import_folders_and_attachments(attachment_data) }
+              .to change(Decidim::Attachment, :count).by(1)
+              .and change(Decidim::AttachmentCollection, :count).by(1)
+          end
+        end
       end
     end
   end
diff --git a/decidim-participatory_processes/app/serializers/decidim/participatory_processes/participatory_process_importer.rb b/decidim-participatory_processes/app/serializers/decidim/participatory_processes/participatory_process_importer.rb
index 51953740c7143..35f11bbc41e89 100644
--- a/decidim-participatory_processes/app/serializers/decidim/participatory_processes/participatory_process_importer.rb
+++ b/decidim-participatory_processes/app/serializers/decidim/participatory_processes/participatory_process_importer.rb
@@ -131,8 +131,8 @@ def import_folders_and_attachments(attachments)
           end
         end
 
-        unless attachments["attachment_collections"].empty?
-          attachments["attachment_collections"].map do |collection|
+        if attachments["attachment_collections"].present?
+          attachments["attachment_collections"]&.map do |collection|
             Decidim.traceability.perform_action!("create", AttachmentCollection, @user) do
               create_attachment_collection(collection)
             end
diff --git a/decidim-participatory_processes/spec/serializers/decidim/participatory_processes/participatory_process_importer_spec.rb b/decidim-participatory_processes/spec/serializers/decidim/participatory_processes/participatory_process_importer_spec.rb
index 44fe9f6cc2533..1bb3ae94cf74d 100644
--- a/decidim-participatory_processes/spec/serializers/decidim/participatory_processes/participatory_process_importer_spec.rb
+++ b/decidim-participatory_processes/spec/serializers/decidim/participatory_processes/participatory_process_importer_spec.rb
@@ -497,6 +497,109 @@ module Decidim::ParticipatoryProcesses
               .not_to change(Decidim::Attachment, :count)
           end
         end
+
+        context "when the attachment collection is not defined" do
+          let(:attachments_data) do
+            {
+              "files" => [
+                {
+                  "title" => { "en" => "Test File" },
+                  "description" => { "en" => "Test Description" },
+                  "weight" => 1,
+                  "remote_file_url" => remote_file_url
+                }
+              ]
+            }
+          end
+
+          before do
+            stub_request(:head, remote_file_url)
+              .to_return(status: 200, headers: { "Content-Type" => "application/pdf" })
+            stub_request(:get, remote_file_url)
+              .to_return(status: 200, body: File.read(Decidim::Dev.asset("Exampledocument.pdf")))
+          end
+
+          it "does not create any attachments collections" do
+            expect { importer.import_folders_and_attachments(attachments_data) }
+              .not_to change(Decidim::AttachmentCollection, :count)
+          end
+        end
+
+        context "when the attachment collection is nil" do
+          let(:attachments_data) do
+            {
+              "files" => [
+                {
+                  "title" => { "en" => "Test File" },
+                  "description" => { "en" => "Test Description" },
+                  "weight" => 1,
+                  "remote_file_url" => remote_file_url
+                }
+              ],
+              "attachment_collections" => nil
+            }
+          end
+
+          before do
+            stub_request(:head, remote_file_url)
+              .to_return(status: 200, headers: { "Content-Type" => "application/pdf" })
+            stub_request(:get, remote_file_url)
+              .to_return(status: 200, body: File.read(Decidim::Dev.asset("Exampledocument.pdf")))
+          end
+
+          it "does not create any attachments collections" do
+            expect { importer.import_folders_and_attachments(attachments_data) }
+              .not_to change(Decidim::AttachmentCollection, :count)
+          end
+        end
+
+        context "when attachment collection is defined" do
+          let(:attachment_data) do
+            {
+              "files" => [
+                {
+                  "title" => { "en" => "Test File" },
+                  "description" => { "en" => "Test Description" },
+                  "weight" => 1,
+                  "remote_file_url" => remote_file_url,
+                  "attachment_collections" => {
+                    "name" => {
+                      "en" => "Collection name"
+                    },
+                    "weight" => 0,
+                    "description" => {
+                      "en" => "Collection description"
+                    }
+                  }
+                }
+              ],
+              "attachment_collections" => [
+                {
+                  "name" => {
+                    "en" => "Collection name"
+                  },
+                  "weight" => 0,
+                  "description" => {
+                    "en" => "Collection description"
+                  }
+                }
+              ]
+            }
+          end
+
+          before do
+            stub_request(:head, remote_file_url)
+              .to_return(status: 200, headers: { "Content-Type" => "application/pdf" })
+            stub_request(:get, remote_file_url)
+              .to_return(status: 200, body: File.read(Decidim::Dev.asset("Exampledocument.pdf")))
+          end
+
+          it "creates the attachment and the collection" do
+            expect { importer.import_folders_and_attachments(attachment_data) }
+              .to change(Decidim::Attachment, :count).by(1)
+              .and change(Decidim::AttachmentCollection, :count).by(1)
+          end
+        end
       end
     end
   end

From acc750420a408edbe984f2fa1e428d1d50d223e3 Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Thu, 4 Jun 2026 07:54:14 +0300
Subject: [PATCH 057/131] Backport 'Fix unique constraint in space commands
 caused by deleted spaces' to v0.31 (#17006)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix unique constraint in space commands caused by deleted spaces

* Fix Duplicate space command to include deleted spaces

* Format specs

* Fix create and update the spaces

* Fix import forms

* Apply suggestions from code review

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

* Align with latest develop branch

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

* Fix failing specs

* Fix aditional specs

* Fix aditional specs

* Fix import

* apply copilot recommendation

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 .../admin/assembly_duplicate_form.rb          |  2 +-
 .../decidim/assemblies/admin/assembly_form.rb |  1 +
 .../assemblies/admin/assembly_import_form.rb  |  2 +-
 .../spec/commands/create_assembly_spec.rb     | 32 +++++++++++--
 .../assemblies/admin/import_assembly_spec.rb  | 46 +++++++++++++++---
 .../spec/commands/duplicate_assembly_spec.rb  | 20 ++++++++
 .../spec/commands/update_assembly_spec.rb     | 13 +++++
 .../admin/conference_duplicate_form.rb        |  2 +-
 .../conferences/admin/conference_form.rb      |  2 +-
 .../lib/decidim/conferences/test/factories.rb |  4 ++
 .../spec/commands/create_conference_spec.rb   | 37 +++++++++++---
 .../commands/duplicate_conference_spec.rb     | 21 ++++++++
 .../spec/commands/update_conference_spec.rb   | 13 +++++
 .../participatory_process_duplicate_form.rb   |  2 +-
 .../admin/participatory_process_form.rb       |  1 +
 .../participatory_process_import_form.rb      |  2 +-
 .../create_participatory_process_spec.rb      | 39 +++++++++++----
 .../import_participatory_process_spec.rb      | 48 ++++++++++++++++---
 .../duplicate_participatory_process_spec.rb   | 26 +++++++++-
 .../update_participatory_process_spec.rb      | 13 +++++
 20 files changed, 286 insertions(+), 40 deletions(-)

diff --git a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_duplicate_form.rb b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_duplicate_form.rb
index 51bdd9fe61e2e..220312fd3b264 100644
--- a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_duplicate_form.rb
+++ b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_duplicate_form.rb
@@ -23,7 +23,7 @@ class AssemblyDuplicateForm < Form
         private
 
         def slug_uniqueness
-          return unless OrganizationAssemblies.new(current_organization).query.where(slug:).where.not(id:).any?
+          return unless OrganizationAssemblies.new(current_organization).query.with_deleted.where(slug:).where.not(id:).any?
 
           errors.add(:slug, :taken)
         end
diff --git a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
index 654693398d58d..fbb7201e9b483 100644
--- a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
+++ b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
@@ -119,6 +119,7 @@ def organization_assemblies
 
         def slug_uniqueness
           return unless organization_assemblies
+                        .with_deleted
                         .where(slug:)
                         .where.not(id: context[:assembly_id])
                         .any?
diff --git a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_import_form.rb b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_import_form.rb
index 3e7aebabedcc4..ba117a89f2056 100644
--- a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_import_form.rb
+++ b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_import_form.rb
@@ -74,7 +74,7 @@ def i18n_valid_mime_types_text
         private
 
         def slug_uniqueness
-          return unless OrganizationAssemblies.new(current_organization).query.where(slug:).where.not(id:).any?
+          return unless OrganizationAssemblies.new(current_organization).query.with_deleted.where(slug:).where.not(id:).any?
 
           errors.add(:slug, :taken)
         end
diff --git a/decidim-assemblies/spec/commands/create_assembly_spec.rb b/decidim-assemblies/spec/commands/create_assembly_spec.rb
index c9a899f4d67bd..8b5244852bd4b 100644
--- a/decidim-assemblies/spec/commands/create_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/create_assembly_spec.rb
@@ -23,11 +23,8 @@ module Decidim::Assemblies
       2.times.map { build(:taxonomization, taxonomy: create(:taxonomy, :with_parent, organization:), taxonomizable: nil) }
     end
 
-    let(:form) do
-      instance_double(
-        Admin::AssemblyForm,
-        current_user:,
-        invalid?: invalid,
+    let(:attributes) do
+      {
         title: { en: "title" },
         subtitle: { en: "subtitle" },
         weight: 1,
@@ -67,6 +64,15 @@ module Decidim::Assemblies
         youtube_handler: "lorem",
         github_handler: "lorem",
         announcement: { en: "announcement_lorem" }
+      }
+    end
+
+    let(:form) do
+      instance_double(
+        Admin::AssemblyForm,
+        **attributes,
+        current_user:,
+        invalid?: invalid
       )
     end
     let(:invalid) { false }
@@ -79,6 +85,22 @@ module Decidim::Assemblies
       end
     end
 
+    context "when there is a trashed space with the same slug" do
+      let!(:trashed_space) { create(:assembly, :trashed, slug: "slug", organization:) }
+      let(:form) do
+        Admin::AssemblyForm.from_params(attributes)
+                           .with_context({
+                                           current_user:,
+                                           current_organization: organization
+                                         })
+      end
+
+      it "broadcasts invalid" do
+        expect { subject.call }.to broadcast(:invalid)
+        expect(form.errors[:slug]).not_to be_empty
+      end
+    end
+
     context "when the assembly is not persisted" do
       let(:hero_image) do
         ActiveStorage::Blob.create_and_upload!(
diff --git a/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb b/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
index e12aba9a3f132..c6f07cafd2c6a 100644
--- a/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
@@ -15,18 +15,28 @@ module Decidim::Assemblies::Admin
       instance_double(File,
                       blank?: false)
     end
+
+    let(:attributes) do
+      {
+        title: { en: "title" },
+        slug: "imported-slug",
+        import_steps: import_steps,
+        import_attachments: import_attachments,
+        import_components: import_components,
+        document: form_doc,
+        document_text: document_file,
+        document_type:
+      }
+    end
+    let(:current_user) { user }
     let(:form) do
       instance_double(
         AssemblyImportForm,
-        title: { en: "title" },
-        slug: "imported-slug",
+        **attributes,
         import_steps?: import_steps,
         import_attachments?: import_attachments,
         import_components?: import_components,
-        document: form_doc,
-        document_text: document_file,
-        document_type:,
-        current_user: create(:user, organization:),
+        current_user:,
         current_organization: organization,
         invalid?: invalid
       )
@@ -101,6 +111,30 @@ def stub_calls_to_external_files
       end
     end
 
+    context "when there is a trashed space with the same slug" do
+      let!(:trashed_space) { create(:assembly, :trashed, slug: "imported-slug", organization:) }
+      let(:form_doc) do
+        ActiveStorage::Blob.create_and_upload!(
+          io: File.open(Decidim::Dev.asset(document_name)),
+          filename: document_name,
+          content_type: document_type
+        )
+      end
+
+      let(:form) do
+        AssemblyImportForm.from_params(attributes)
+                          .with_context({
+                                          current_user:,
+                                          current_organization: organization
+                                        })
+      end
+
+      it "broadcasts invalid" do
+        expect { subject.call }.to broadcast(:invalid)
+        expect(form.errors[:slug]).not_to be_empty
+      end
+    end
+
     describe "when the form is valid" do
       let(:valid) { true }
 
diff --git a/decidim-assemblies/spec/commands/duplicate_assembly_spec.rb b/decidim-assemblies/spec/commands/duplicate_assembly_spec.rb
index c85041d242d91..4963352ed6925 100644
--- a/decidim-assemblies/spec/commands/duplicate_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/duplicate_assembly_spec.rb
@@ -34,6 +34,26 @@ module Decidim::Assemblies
       end
     end
 
+    context "when there is a trashed space with the same slug" do
+      let!(:trashed_space) { create(:assembly, :trashed, :public, slug: "duplicated-slug", organization:) }
+      let(:form) do
+        Admin::AssemblyDuplicateForm.from_params({
+                                                   title: { en: "title" },
+                                                   slug: "duplicated-slug",
+                                                   duplicate_components: duplicate_components
+                                                 })
+                                    .with_context({
+                                                    current_user: user,
+                                                    current_organization: organization
+                                                  })
+      end
+
+      it "broadcasts invalid" do
+        expect { subject.call }.to broadcast(:invalid)
+        expect(form.errors[:slug]).not_to be_empty
+      end
+    end
+
     context "when everything is ok" do
       it "duplicates an assembly" do
         expect { subject.call }.to change(Decidim::Assembly, :count).by(1)
diff --git a/decidim-assemblies/spec/commands/update_assembly_spec.rb b/decidim-assemblies/spec/commands/update_assembly_spec.rb
index 49fcc02c8fa49..9c7821e813e55 100644
--- a/decidim-assemblies/spec/commands/update_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/update_assembly_spec.rb
@@ -103,6 +103,19 @@ module Decidim::Assemblies
         end
       end
 
+      context "when there is a trashed space with the same slug" do
+        let!(:trashed_space) { create(:assembly, :trashed, slug: "slug", organization:) }
+
+        let(:form) do
+          Admin::AssemblyForm.from_params(params.deep_merge(assembly: { slug: "slug" })).with_context(context)
+        end
+
+        it "broadcasts invalid" do
+          expect { command.call }.to broadcast(:invalid)
+          expect(form.errors[:slug]).not_to be_empty
+        end
+      end
+
       context "when the uploaded hero image has too large dimensions" do
         let(:attachment_params) do
           {
diff --git a/decidim-conferences/app/forms/decidim/conferences/admin/conference_duplicate_form.rb b/decidim-conferences/app/forms/decidim/conferences/admin/conference_duplicate_form.rb
index 9ed61b5790805..ec41dccabba9c 100644
--- a/decidim-conferences/app/forms/decidim/conferences/admin/conference_duplicate_form.rb
+++ b/decidim-conferences/app/forms/decidim/conferences/admin/conference_duplicate_form.rb
@@ -23,7 +23,7 @@ class ConferenceDuplicateForm < Form
         private
 
         def slug_uniqueness
-          return unless OrganizationConferences.new(current_organization).query.where(slug:).where.not(id:).any?
+          return unless OrganizationConferences.new(current_organization).query.with_deleted.where(slug:).where.not(id:).any?
 
           errors.add(:slug, :taken)
         end
diff --git a/decidim-conferences/app/forms/decidim/conferences/admin/conference_form.rb b/decidim-conferences/app/forms/decidim/conferences/admin/conference_form.rb
index 3595389a31d2a..6a1b4fdd30bc0 100644
--- a/decidim-conferences/app/forms/decidim/conferences/admin/conference_form.rb
+++ b/decidim-conferences/app/forms/decidim/conferences/admin/conference_form.rb
@@ -90,7 +90,7 @@ def available_slots_greater_than_or_equal_to_registrations_count
         end
 
         def slug_uniqueness
-          return unless OrganizationConferences.new(current_organization).query.where(slug:).where.not(id: context[:conference_id]).any?
+          return unless OrganizationConferences.new(current_organization).query.where(slug:).with_deleted.where.not(id: context[:conference_id]).any?
 
           errors.add(:slug, :taken)
         end
diff --git a/decidim-conferences/lib/decidim/conferences/test/factories.rb b/decidim-conferences/lib/decidim/conferences/test/factories.rb
index db7213137a588..3277d06e34fe6 100644
--- a/decidim-conferences/lib/decidim/conferences/test/factories.rb
+++ b/decidim-conferences/lib/decidim/conferences/test/factories.rb
@@ -44,6 +44,10 @@
       published_at { Time.current }
     end
 
+    trait :trashed do
+      deleted_at { Time.current }
+    end
+
     trait :diploma do
       main_logo { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
       signature { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
diff --git a/decidim-conferences/spec/commands/create_conference_spec.rb b/decidim-conferences/spec/commands/create_conference_spec.rb
index cc6e1979e2b12..fdb67137d1f98 100644
--- a/decidim-conferences/spec/commands/create_conference_spec.rb
+++ b/decidim-conferences/spec/commands/create_conference_spec.rb
@@ -31,11 +31,8 @@ module Decidim::Conferences
     let(:related_processes_ids) { [participatory_processes.map(&:id)] }
     let(:related_assemblies_ids) { [assemblies.map(&:id)] }
 
-    let(:form) do
-      instance_double(
-        Admin::ConferenceForm,
-        current_user:,
-        invalid?: invalid,
+    let(:attributes) do
+      {
         title: { en: "title" },
         slogan: { en: "slogan" },
         weight: 1,
@@ -46,8 +43,6 @@ module Decidim::Conferences
         promoted: nil,
         description: { en: "description" },
         short_description: { en: "short_description" },
-        current_organization: organization,
-        organization:,
         taxonomizations:,
         errors:,
         show_statistics: false,
@@ -59,6 +54,17 @@ module Decidim::Conferences
         registration_terms: { en: "registrations terms" },
         participatory_processes_ids: related_processes_ids,
         assemblies_ids: related_assemblies_ids
+      }
+    end
+
+    let(:form) do
+      instance_double(
+        Admin::ConferenceForm,
+        **attributes,
+        current_user:,
+        organization:,
+        current_organization: organization,
+        invalid?: invalid
       )
     end
     let(:invalid) { false }
@@ -71,6 +77,23 @@ module Decidim::Conferences
       end
     end
 
+    context "when there is a trashed space with the same slug" do
+      let!(:trashed_space) { create(:conference, :trashed, slug: "slug", organization:) }
+
+      let(:form) do
+        Admin::ConferenceForm.from_params(attributes)
+                             .with_context({
+                                             current_user:,
+                                             current_organization: organization
+                                           })
+      end
+
+      it "broadcasts invalid" do
+        expect { subject.call }.to broadcast(:invalid)
+        expect(form.errors[:slug]).not_to be_empty
+      end
+    end
+
     context "when the conference is not persisted" do
       let(:hero_image) do
         ActiveStorage::Blob.create_and_upload!(
diff --git a/decidim-conferences/spec/commands/duplicate_conference_spec.rb b/decidim-conferences/spec/commands/duplicate_conference_spec.rb
index 940c0c2afeb78..1c922a1b341e7 100644
--- a/decidim-conferences/spec/commands/duplicate_conference_spec.rb
+++ b/decidim-conferences/spec/commands/duplicate_conference_spec.rb
@@ -34,6 +34,27 @@ module Decidim::Conferences
       end
     end
 
+    context "when there is a trashed space with the same slug" do
+      let!(:trashed_space) { create(:conference, :trashed, slug: "duplicated-slug", organization:) }
+
+      let(:form) do
+        Admin::ConferenceDuplicateForm.from_params({
+                                                     title: { en: "title" },
+                                                     slug: "duplicated-slug",
+                                                     duplicate_components: duplicate_components
+                                                   })
+                                      .with_context({
+                                                      current_user:,
+                                                      current_organization: organization
+                                                    })
+      end
+
+      it "broadcasts invalid" do
+        expect { subject.call }.to broadcast(:invalid)
+        expect(form.errors[:slug]).not_to be_empty
+      end
+    end
+
     context "when everything is ok" do
       it "duplicates a conference" do
         expect { subject.call }.to change(Decidim::Conference, :count).by(1)
diff --git a/decidim-conferences/spec/commands/update_conference_spec.rb b/decidim-conferences/spec/commands/update_conference_spec.rb
index 851749725adef..d98217bbb99b1 100644
--- a/decidim-conferences/spec/commands/update_conference_spec.rb
+++ b/decidim-conferences/spec/commands/update_conference_spec.rb
@@ -95,6 +95,19 @@ module Decidim::Conferences
         end
       end
 
+      context "when there is a trashed space with the same slug" do
+        let!(:trashed_space) { create(:conference, :trashed, slug: "slug", organization:) }
+
+        let(:form) do
+          Admin::ConferenceForm.from_params(params.deep_merge(conference: { slug: "slug" })).with_context(context)
+        end
+
+        it "broadcasts invalid" do
+          expect { command.call }.to broadcast(:invalid)
+          expect(form.errors[:slug]).not_to be_empty
+        end
+      end
+
       describe "when the conference is not valid" do
         before do
           allow(form).to receive(:invalid?).and_return(false)
diff --git a/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_duplicate_form.rb b/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_duplicate_form.rb
index a97a7e44c1c5c..5f270c03ed138 100644
--- a/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_duplicate_form.rb
+++ b/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_duplicate_form.rb
@@ -24,7 +24,7 @@ class ParticipatoryProcessDuplicateForm < Form
         private
 
         def slug_uniqueness
-          return unless OrganizationParticipatoryProcesses.new(current_organization).query.where(slug:).where.not(id:).any?
+          return unless OrganizationParticipatoryProcesses.new(current_organization).query.with_deleted.where(slug:).where.not(id:).any?
 
           errors.add(:slug, :taken)
         end
diff --git a/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_form.rb b/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_form.rb
index 47a2ad106aaae..3601e002131c7 100644
--- a/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_form.rb
+++ b/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_form.rb
@@ -84,6 +84,7 @@ def organization_participatory_processes
         def slug_uniqueness
           return unless organization_participatory_processes
                         .where(slug:)
+                        .with_deleted
                         .where.not(id: context[:process_id])
                         .any?
 
diff --git a/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_import_form.rb b/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_import_form.rb
index 14ecebaa1b919..ee06a8e1c8093 100644
--- a/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_import_form.rb
+++ b/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_import_form.rb
@@ -73,7 +73,7 @@ def i18n_valid_mime_types_text
         private
 
         def slug_uniqueness
-          return unless OrganizationParticipatoryProcesses.new(current_organization).query.where(slug:).where.not(id:).any?
+          return unless OrganizationParticipatoryProcesses.new(current_organization).query.with_deleted.where(slug:).where.not(id:).any?
 
           errors.add(:slug, :taken)
         end
diff --git a/decidim-participatory_processes/spec/commands/create_participatory_process_spec.rb b/decidim-participatory_processes/spec/commands/create_participatory_process_spec.rb
index a33c6fb1a33a4..6e42aa1434682 100644
--- a/decidim-participatory_processes/spec/commands/create_participatory_process_spec.rb
+++ b/decidim-participatory_processes/spec/commands/create_participatory_process_spec.rb
@@ -17,14 +17,12 @@ module Decidim::ParticipatoryProcesses
       2.times.map { build(:taxonomization, taxonomy: create(:taxonomy, :with_parent, organization:), taxonomizable: nil) }
     end
 
-    let(:form) do
-      instance_double(
-        Admin::ParticipatoryProcessForm,
-        invalid?: invalid,
+    let(:attributes) do
+      {
         title: { en: "title" },
         subtitle: { en: "subtitle" },
-        weight:,
         slug: "slug",
+        weight:,
         meta_scope: { en: "meta scope" },
         hero_image:,
         promoted: nil,
@@ -37,15 +35,23 @@ module Decidim::ParticipatoryProcesses
         end_date: nil,
         description: { en: "description" },
         short_description: { en: "short_description" },
-        current_user:,
-        current_organization: organization,
-        organization:,
         private_space: false,
         taxonomizations:,
         errors:,
         related_process_ids:,
         participatory_process_group:,
         announcement: { en: "message" }
+      }
+    end
+
+    let(:form) do
+      instance_double(
+        Admin::ParticipatoryProcessForm,
+        **attributes,
+        invalid?: invalid,
+        current_user:,
+        current_organization: organization,
+        organization:
       )
     end
     let(:invalid) { false }
@@ -58,6 +64,23 @@ module Decidim::ParticipatoryProcesses
       end
     end
 
+    context "when there is a trashed space with the same slug" do
+      let!(:trashed_space) { create(:participatory_process, :trashed, slug: "slug", organization:) }
+
+      let(:form) do
+        Admin::ParticipatoryProcessForm.from_params(attributes)
+                                       .with_context({
+                                                       current_user:,
+                                                       current_organization: organization
+                                                     })
+      end
+
+      it "broadcasts invalid" do
+        expect { subject.call }.to broadcast(:invalid)
+        expect(form.errors[:slug]).not_to be_empty
+      end
+    end
+
     context "when the process is not persisted" do
       let(:hero_image) do
         ActiveStorage::Blob.create_and_upload!(
diff --git a/decidim-participatory_processes/spec/commands/decidim/participatory_processes/admin/import_participatory_process_spec.rb b/decidim-participatory_processes/spec/commands/decidim/participatory_processes/admin/import_participatory_process_spec.rb
index fd0055973126c..60d10262b35f4 100644
--- a/decidim-participatory_processes/spec/commands/decidim/participatory_processes/admin/import_participatory_process_spec.rb
+++ b/decidim-participatory_processes/spec/commands/decidim/participatory_processes/admin/import_participatory_process_spec.rb
@@ -14,18 +14,30 @@ module Decidim::ParticipatoryProcesses
       instance_double(File,
                       blank?: false)
     end
+
+    let(:attributes) do
+      {
+        title: { en: "title" },
+        slug: "imported-slug",
+        import_steps: import_steps,
+        import_attachments: import_attachments,
+        import_components: import_components,
+        document: form_doc,
+        document_text: document_file,
+        document_type:
+      }
+    end
+
+    let(:current_user) { create(:user, organization:) }
+
     let(:form) do
       instance_double(
         Admin::ParticipatoryProcessImportForm,
-        title: { en: "title" },
-        slug: "imported-slug",
+        **attributes,
         import_steps?: import_steps,
         import_attachments?: import_attachments,
         import_components?: import_components,
-        document: form_doc,
-        document_text: document_file,
-        document_type:,
-        current_user: create(:user, organization:),
+        current_user:,
         current_organization: organization,
         invalid?: invalid
       )
@@ -104,6 +116,30 @@ def stub_calls_to_external_files
       end
     end
 
+    context "when there is a trashed space with the same slug" do
+      let!(:trashed_space) { create(:participatory_process, :trashed, slug: "imported-slug", organization:) }
+      let(:form_doc) do
+        ActiveStorage::Blob.create_and_upload!(
+          io: File.open(Decidim::Dev.asset(document_name)),
+          filename: document_name,
+          content_type: document_type
+        )
+      end
+
+      let(:form) do
+        Admin::ParticipatoryProcessImportForm.from_params(attributes)
+                                             .with_context({
+                                                             current_user:,
+                                                             current_organization: organization
+                                                           })
+      end
+
+      it "broadcasts invalid" do
+        expect { subject.call }.to broadcast(:invalid)
+        expect(form.errors[:slug]).not_to be_empty
+      end
+    end
+
     describe "when the form is valid" do
       let(:valid) { true }
 
diff --git a/decidim-participatory_processes/spec/commands/duplicate_participatory_process_spec.rb b/decidim-participatory_processes/spec/commands/duplicate_participatory_process_spec.rb
index 68421ecebc310..ca77e13e2b229 100644
--- a/decidim-participatory_processes/spec/commands/duplicate_participatory_process_spec.rb
+++ b/decidim-participatory_processes/spec/commands/duplicate_participatory_process_spec.rb
@@ -19,7 +19,7 @@ module Decidim::ParticipatoryProcesses
         Admin::ParticipatoryProcessDuplicateForm,
         invalid?: invalid,
         title: { en: "title" },
-        slug: "copied-slug",
+        slug: "duplicated-slug",
         duplicate_steps?: duplicate_steps,
         duplicate_components?: duplicate_components,
         current_user:
@@ -38,6 +38,28 @@ module Decidim::ParticipatoryProcesses
       end
     end
 
+    context "when there is a trashed space with the same slug" do
+      let!(:trashed_space) { create(:participatory_process, :trashed, slug: "duplicated-slug", organization:) }
+
+      let(:form) do
+        Admin::ParticipatoryProcessDuplicateForm.from_params({
+                                                               title: { en: "title" },
+                                                               slug: "duplicated-slug",
+                                                               duplicate_steps?: duplicate_steps,
+                                                               duplicate_components:
+                                                             })
+                                                .with_context({
+                                                                current_user:,
+                                                                current_organization: organization
+                                                              })
+      end
+
+      it "broadcasts invalid" do
+        expect { subject.call }.to broadcast(:invalid)
+        expect(form.errors[:slug]).not_to be_empty
+      end
+    end
+
     context "when everything is ok" do
       it "duplicates a participatory process" do
         expect { subject.call }.to change(Decidim::ParticipatoryProcess, :count).by(1)
@@ -45,7 +67,7 @@ module Decidim::ParticipatoryProcesses
         old_participatory_process = Decidim::ParticipatoryProcess.first
         new_participatory_process = Decidim::ParticipatoryProcess.last
 
-        expect(new_participatory_process.slug).to eq("copied-slug")
+        expect(new_participatory_process.slug).to eq("duplicated-slug")
         expect(new_participatory_process.title["en"]).to eq("title")
         expect(new_participatory_process).not_to be_published
         expect(new_participatory_process.organization).to eq(old_participatory_process.organization)
diff --git a/decidim-participatory_processes/spec/commands/update_participatory_process_spec.rb b/decidim-participatory_processes/spec/commands/update_participatory_process_spec.rb
index 2e28997ba6053..1a7e42c52025a 100644
--- a/decidim-participatory_processes/spec/commands/update_participatory_process_spec.rb
+++ b/decidim-participatory_processes/spec/commands/update_participatory_process_spec.rb
@@ -72,6 +72,19 @@ module Decidim::ParticipatoryProcesses
         end
       end
 
+      context "when there is a trashed space with the same slug" do
+        let!(:trashed_space) { create(:participatory_process, :trashed, slug: "slug", organization:) }
+
+        let(:form) do
+          Admin::ParticipatoryProcessForm.from_params(params.deep_merge(participatory_process: { slug: "slug" })).with_context(context)
+        end
+
+        it "broadcasts invalid" do
+          expect { command.call }.to broadcast(:invalid)
+          expect(form.errors[:slug]).not_to be_empty
+        end
+      end
+
       describe "when the participatory process is not valid" do
         before do
           allow(form).to receive(:invalid?).and_return(false)

From 9e3bebaf6239787cba9d4d24220f19c5e691fa3d Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Fri, 5 Jun 2026 11:34:58 +0300
Subject: [PATCH 058/131] Backport 'Replace tribute javascript with resource
 mention UI' to v0.31 (#17021)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Replace tribute javascript with resource mention UI

Prompt:

"""
Replace the TributeJS current usage with the "@tiptap/extension-mention"
that is being used for Resource Mentions features.
This should also work for cases where this is being called on contexts
that doesn't have any TipTap editor (for instance, on the Comments
form).
The design should us the same compact suggestion style as TipTap
mention/resource mentions for having a consistent behavior/UI across
contexts.
"""

Assisted-By: GPT-5.3-Codex (OpenCode)
<andreslucena+ai@users.noreply.github.com>

* Fix the display of the UI

Prompt:

"""
Fix the display of the autocomplete menu so it displays as the resource
mention feature. The options should be shown next to the character that
starts this feature ("@" character).
"""

Assisted-By: GPT-5.3-Codex (OpenCode)
<andreslucena+ai@users.noreply.github.com>

* Add avatar

Prompt:

"""
Add the avatar of the participant next to its name in the options menu
"""

Assisted-By: GPT-5.3-Codex (OpenCode)
<andreslucena+ai@users.noreply.github.com>

* Replace tribute word usage in examples

* Fix eslint offenses (automatically)

* Add esilnt ignore rule

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 .../decidim/admin/application.scss            |    2 +-
 .../comments/comments.component.test.js       |    3 +-
 .../packs/src/decidim/comments/comments.js    |    2 +-
 .../app/packs/stylesheets/comments.scss       |    2 +-
 .../decidim/controllers/mention/controller.js |  436 ++--
 .../mention/input_mentions.test.js            |  577 ++---
 decidim-core/app/packs/src/decidim/index.js   |    3 +-
 .../app/packs/src/decidim/vendor/tribute.js   | 1890 -----------------
 .../decidim/_editor_suggestions.scss          |   49 +
 .../packs/stylesheets/decidim/_tribute.scss   |   36 -
 .../app/packs/stylesheets/decidim/editor.scss |   35 +-
 .../test/shared_examples/comments_examples.rb |   12 +-
 12 files changed, 478 insertions(+), 2569 deletions(-)
 delete mode 100644 decidim-core/app/packs/src/decidim/vendor/tribute.js
 create mode 100644 decidim-core/app/packs/stylesheets/decidim/_editor_suggestions.scss
 delete mode 100644 decidim-core/app/packs/stylesheets/decidim/_tribute.scss

diff --git a/decidim-admin/app/packs/stylesheets/decidim/admin/application.scss b/decidim-admin/app/packs/stylesheets/decidim/admin/application.scss
index 359d6224a1deb..99924a3cac2d6 100755
--- a/decidim-admin/app/packs/stylesheets/decidim/admin/application.scss
+++ b/decidim-admin/app/packs/stylesheets/decidim/admin/application.scss
@@ -24,7 +24,7 @@
 @use "stylesheets/decidim/admin/datepicker";
 @use "stylesheets/decidim/admin/minimap";
 @use "stylesheets/decidim/admin/proposal_status";
-@use "stylesheets/decidim/tribute";
+@use "stylesheets/decidim/editor_suggestions";
 
 :root {
   --primary: #e02d2d;
diff --git a/decidim-comments/app/packs/src/decidim/comments/comments.component.test.js b/decidim-comments/app/packs/src/decidim/comments/comments.component.test.js
index fb78065410eb5..b84a794632828 100644
--- a/decidim-comments/app/packs/src/decidim/comments/comments.component.test.js
+++ b/decidim-comments/app/packs/src/decidim/comments/comments.component.test.js
@@ -115,8 +115,7 @@ describe("CommentsComponent", () => {
             data-input-emoji="true"
             name="comment[body]"
             aria-describedby="add-comment-${modelName}-${modelId}-remaining-characters_sr"
-            data-input-emoji-initialized="true"
-            data-tribute="true">
+            data-input-emoji-initialized="true">
           </textarea>
           <span class="emoji__trigger">
             <button class="emoji__button" type="button" aria-label="Add emoji">
diff --git a/decidim-comments/app/packs/src/decidim/comments/comments.js b/decidim-comments/app/packs/src/decidim/comments/comments.js
index 5cf68438bdc7f..f6e3f4f11e265 100644
--- a/decidim-comments/app/packs/src/decidim/comments/comments.js
+++ b/decidim-comments/app/packs/src/decidim/comments/comments.js
@@ -99,5 +99,5 @@ const commentsInitializer = () => {
   window.addEventListener("resize", handleResize);
 };
 
-// If no jQuery is used the Tribute feature used in comments to autocomplete mentions stops working
+// Keep this on turbo load so comments are mounted after each visit
 document.addEventListener("turbo:load", commentsInitializer);
diff --git a/decidim-comments/app/packs/stylesheets/comments.scss b/decidim-comments/app/packs/stylesheets/comments.scss
index e04fff05c3888..f2c1b9162c774 100644
--- a/decidim-comments/app/packs/stylesheets/comments.scss
+++ b/decidim-comments/app/packs/stylesheets/comments.scss
@@ -1,4 +1,4 @@
-@use "stylesheets/decidim/tribute";
+@use "stylesheets/decidim/editor_suggestions";
 
 .comments {
   &__container {
diff --git a/decidim-core/app/packs/src/decidim/controllers/mention/controller.js b/decidim-core/app/packs/src/decidim/controllers/mention/controller.js
index 43c651a281c9c..566f9c6e65f9c 100644
--- a/decidim-core/app/packs/src/decidim/controllers/mention/controller.js
+++ b/decidim-core/app/packs/src/decidim/controllers/mention/controller.js
@@ -1,5 +1,6 @@
+/* eslint max-lines: ["error", 400] */
+
 import { Controller } from "@hotwired/stimulus"
-import Tribute from "src/decidim/vendor/tribute";
 
 export default class extends Controller {
   connect() {
@@ -9,7 +10,12 @@ export default class extends Controller {
       menuItemLimit: 5
     };
 
-    this.tribute = null;
+    this.suggestion = null;
+    this.suggestions = [];
+    this.selectedIndex = -1;
+    this.isActive = false;
+    this.currentMentionStart = null;
+    this.requestId = 0;
     this.isInitialized = false;
 
     // Prevent initialization inside editor components
@@ -17,100 +23,62 @@ export default class extends Controller {
       return;
     }
 
-    if (this.element.hasAttribute("data-tribute")) {
-      this.element.removeAttribute("data-tribute");
-    }
-
-    this.createTribute();
+    this.createSuggestionContainer();
     this.setupEventListeners();
     this.isInitialized = true;
   }
 
   disconnect() {
-    if (this.tribute) {
-      this.tribute.detach(this.element);
+    if (this.suggestion) {
+      this.suggestion.remove();
     }
 
     this.element.removeEventListener("focusin", this.handleFocusIn);
     this.element.removeEventListener("focusout", this.handleFocusOut);
     this.element.removeEventListener("input", this.handleInput);
+    this.element.removeEventListener("keydown", this.handleKeyDown);
+    document.removeEventListener("click", this.handleDocumentClick);
 
-    this.tribute = null;
+    this.suggestion = null;
+    this.suggestions = [];
     this.isInitialized = false;
   }
 
-  /**
-   * Create and configure the Tribute instance
-   * @returns {void}
-   * @private
-   */
-  createTribute() {
-    const noMatchTemplate = this.options.noDataFoundMessage
-      ? () => `<li>${this.options.noDataFoundMessage}</li>`
-      : null;
-
-    this.tribute = new Tribute({
-      trigger: "@",
-      values: this.debounce((text, callback) => {
-        this.performRemoteSearch(text, callback);
-      }, this.options.debounceDelay),
-      positionMenu: true,
-      menuContainer: null,
-      allowSpaces: true,
-      menuItemLimit: this.options.menuItemLimit,
-      fillAttr: "nickname",
-      selectClass: "highlight",
-      noMatchTemplate: noMatchTemplate,
-      lookup: (item) => item.nickname + item.name,
-      selectTemplate: (item) => {
-        if (typeof item === "undefined") {
-          return null;
-        }
-        return item.original.nickname;
-      },
-      menuItemTemplate: (item) => {
-        return `
-          <img src="${item.original.avatarUrl}" alt="author-avatar">
-          <strong>${item.original.nickname}</strong>
-          <small>${item.original.name}</small>
-        `;
-      }
-    });
+  createSuggestionContainer() {
+    this.suggestion = document.createElement("div");
+    this.suggestion.classList.add("editor-suggestions", "hidden", "hide");
+    document.body.append(this.suggestion);
+    this.suggestion.addEventListener("mousedown", (event) => event.preventDefault());
 
-    this.tribute.attach(this.element);
+    this.performRemoteSearch = this.debounce(this.performRemoteSearch.bind(this), this.options.debounceDelay);
   }
 
-  /**
-   * Set up event listeners for the element
-   * @returns {void}
-   * @private
-   */
   setupEventListeners() {
-    // Handle focus events to set menu container
-    this.element.addEventListener("focusin", this.handleFocusIn.bind(this));
-    this.element.addEventListener("focusout", this.handleFocusOut.bind(this));
-    this.element.addEventListener("input", this.handleInput.bind(this));
-  }
-
-  /**
-   * Handle focus in event
-   * @param {Event} event - The focus in event
-   * @returns {void}
-   * @private
-   */
-  handleFocusIn(event) {
-    if (this.tribute) {
-      this.tribute.menuContainer = event.target.parentNode;
-    }
-  }
-
-  /**
-   * Handle focus out event
-   * @param {Event} event - The focus out event
-   * @returns {void}
-   * @private
-   */
+    this.handleFocusIn = this.handleFocusIn.bind(this);
+    this.handleFocusOut = this.handleFocusOut.bind(this);
+    this.handleInput = this.handleInput.bind(this);
+    this.handleKeyDown = this.handleKeyDown.bind(this);
+    this.handleDocumentClick = this.handleDocumentClick.bind(this);
+
+    this.element.addEventListener("focusin", this.handleFocusIn);
+    this.element.addEventListener("focusout", this.handleFocusOut);
+    this.element.addEventListener("input", this.handleInput);
+    this.element.addEventListener("keydown", this.handleKeyDown);
+    document.addEventListener("click", this.handleDocumentClick);
+  }
+
+  handleFocusIn() {
+    if (this.element.parentNode) {
+      this.element.parentNode.classList.add("is-active");
+    }
+  }
+
   handleFocusOut(event) {
+    if (this.suggestion && this.suggestion.contains(event.relatedTarget)) {
+      return;
+    }
+
+    this.hideSuggestions();
     const parent = event.target.parentNode;
 
     if (parent && parent.classList.contains("is-active")) {
@@ -118,63 +86,99 @@ export default class extends Controller {
     }
   }
 
-  /**
-   * Handle input event
-   * @param {Event} event - The input event
-   * @returns {void}
-   * @private
-   */
-  handleInput(event) {
-    const parent = event.target.parentNode;
+  handleInput() {
+    const trigger = this.mentionTriggerAtCursor();
+    if (!trigger) {
+      this.hideSuggestions();
+      return;
+    }
+
+    this.currentMentionStart = trigger.start;
+    this.performRemoteSearch(trigger.query);
+  }
 
-    if (!parent) {
+  handleKeyDown(event) {
+    if (!this.isActive) {
       return;
     }
 
-    if (this.tribute && this.tribute.isActive) {
-      // Move the tribute container to the correct parent
-      const tributeContainer = document.querySelector(".tribute-container");
-      if (tributeContainer) {
-        parent.appendChild(tributeContainer);
-      }
+    if (event.key === "Escape") {
+      event.preventDefault();
+      this.hideSuggestions();
+    } else if (event.key === "ArrowDown") {
+      event.preventDefault();
+      this.updateSelectedIndex(1);
+      this.renderSuggestions();
+    } else if (event.key === "ArrowUp") {
+      event.preventDefault();
+      this.updateSelectedIndex(-1);
+      this.renderSuggestions();
+    } else if (event.key === "Enter") {
+      event.preventDefault();
+      this.selectSuggestion(this.selectedIndex);
+    }
+  }
 
-      parent.classList.add("is-active");
-    } else {
-      parent.classList.remove("is-active");
+  handleDocumentClick(event) {
+    if (this.element === event.target || this.element.contains(event.target) || this.suggestion?.contains(event.target)) {
+      return;
+    }
+
+    this.hideSuggestions();
+  }
+
+  mentionTriggerAtCursor() {
+    const value = this.element.value || "";
+    const caretPosition = this.element.selectionStart;
+
+    if (typeof caretPosition !== "number") {
+      return null;
+    }
+
+    const textBeforeCursor = value.slice(0, caretPosition);
+    const mentionMatch = textBeforeCursor.match(/(?:^|\s)@([\w.-]{2,})$/);
+    if (!mentionMatch) {
+      return null;
     }
+
+    return {
+      query: mentionMatch[1],
+      start: caretPosition - mentionMatch[1].length - 1
+    };
   }
 
-  /**
-   * Perform remote search for users
-   * @param {string} text - The search text
-   * @param {Function} callback - The callback function to call with results
-   * @returns {void}
-   * @private
-   */
-  performRemoteSearch(text, callback) {
+  performRemoteSearch(text) {
+    const currentRequestId = this.requestId + 1;
+    this.requestId = currentRequestId;
+
     const query = `{users(filter:{wildcard:"${text}"}){nickname,name,avatarUrl,__typename}}`;
     const apiPath = window.Decidim.config.get("api_path");
 
     this.makeRequest(apiPath, { query }).
       then((response) => {
+        if (this.requestId !== currentRequestId) {
+          return;
+        }
+
         const data = response.data.users || [];
-        callback(data);
+        const sortedData = data.sort((first, second) => first.nickname.localeCompare(second.nickname));
+        this.suggestions = sortedData.slice(0, this.options.menuItemLimit);
+        this.selectedIndex = this.suggestions.length > 0
+          ? 0
+          : -1;
+        this.renderSuggestions({ showNoResults: true });
       }).
       catch(() => {
-        callback([]);
-      }).
-      finally(() => {
-        this.adjustTributeContainer();
+        if (this.requestId !== currentRequestId) {
+          return;
+        }
+
+        this.suggestions = [];
+        this.selectedIndex = -1;
+        this.renderSuggestions({ showNoResults: true });
       });
   }
 
-  /**
-   * Make an HTTP POST request
-   * @param {string} url - The request URL
-   * @param {Object} data - The request data
-   * @returns {Promise} The request promise
-   * @private
-   */
   makeRequest(url, data) {
     return fetch(url, {
       method: "POST",
@@ -191,35 +195,191 @@ export default class extends Controller {
     });
   }
 
-  /**
-   * Adjust the tribute container positioning and styling
-   * @returns {void}
-   * @private
-   */
-  adjustTributeContainer() {
-    if (!this.tribute || !this.tribute.current || !this.tribute.current.element) {
+  renderSuggestions({ showNoResults = false } = {}) {
+    if (!this.suggestion) {
+      return;
+    }
+
+    this.suggestion.innerHTML = "";
+
+    if (this.suggestions.length < 1) {
+      this.isActive = false;
+
+      if (showNoResults && this.options.noDataFoundMessage) {
+        const noResultsItem = document.createElement("button");
+        noResultsItem.type = "button";
+        noResultsItem.disabled = true;
+        noResultsItem.classList.add("editor-suggestions-item", "editor-suggestions-item-disabled");
+        noResultsItem.textContent = this.options.noDataFoundMessage;
+        this.suggestion.append(noResultsItem);
+        this.positionSuggestionMenu();
+        this.suggestion.classList.remove("hidden", "hide");
+      } else {
+        this.suggestion.classList.add("hidden", "hide");
+      }
+
       return;
     }
 
-    const parent = this.tribute.current.element.parentNode;
-    if (parent) {
-      parent.classList.add("is-active");
+    this.suggestions.forEach((item, index) => {
+      const suggestionItem = document.createElement("button");
+      suggestionItem.type = "button";
+      suggestionItem.classList.add("editor-suggestions-item");
+      suggestionItem.dataset.index = index;
+
+      if (item.avatarUrl) {
+        const avatar = document.createElement("img");
+        avatar.classList.add("editor-suggestions-item-avatar");
+        avatar.src = item.avatarUrl;
+        avatar.alt = item.name || item.nickname;
+        suggestionItem.append(avatar);
+      }
+
+      const label = document.createElement("span");
+      label.classList.add("editor-suggestions-item-label");
+      label.textContent = `${item.nickname} (${item.name})`;
+      suggestionItem.append(label);
 
-      const tributeContainer = parent.querySelector(".tribute-container");
-      if (tributeContainer) {
-        // Remove inline styles for absolute positioning
-        tributeContainer.removeAttribute("style");
+      if (index === this.selectedIndex) {
+        suggestionItem.dataset.selected = "true";
       }
+
+      suggestionItem.addEventListener("click", (event) => {
+        event.preventDefault();
+        this.selectSuggestion(index);
+      });
+
+      this.suggestion.append(suggestionItem);
+    });
+
+    this.positionSuggestionMenu();
+    this.isActive = true;
+    this.suggestion.classList.remove("hidden", "hide");
+  }
+
+  positionSuggestionMenu() {
+    if (!this.suggestion || this.currentMentionStart === null) {
+      return;
     }
+
+    const coordinates = this.coordinatesForTextIndex(this.currentMentionStart);
+    if (!coordinates) {
+      return;
+    }
+
+    Object.assign(this.suggestion.style, {
+      position: "absolute",
+      top: `${coordinates.top}px`,
+      left: `${coordinates.left}px`
+    });
+  }
+
+  coordinatesForTextIndex(index) {
+    const element = this.element;
+    const styles = window.getComputedStyle(element);
+    const elementRect = element.getBoundingClientRect();
+    const borderTopWidth = parseFloat(styles.borderTopWidth) || 0;
+    const borderLeftWidth = parseFloat(styles.borderLeftWidth) || 0;
+    const lineHeight = parseFloat(styles.lineHeight) || 16;
+
+    const mirror = document.createElement("div");
+    const mirrorStyles = [
+      "fontFamily",
+      "fontSize",
+      "fontWeight",
+      "fontStyle",
+      "letterSpacing",
+      "textTransform",
+      "wordSpacing",
+      "textIndent",
+      "boxSizing",
+      "width",
+      "paddingTop",
+      "paddingRight",
+      "paddingBottom",
+      "paddingLeft",
+      "borderTopWidth",
+      "borderRightWidth",
+      "borderBottomWidth",
+      "borderLeftWidth",
+      "borderStyle",
+      "lineHeight"
+    ];
+
+    mirrorStyles.forEach((property) => {
+      mirror.style[property] = styles[property];
+    });
+
+    mirror.style.position = "absolute";
+    mirror.style.visibility = "hidden";
+    mirror.style.whiteSpace = element.nodeName === "TEXTAREA"
+      ? "pre-wrap"
+      : "pre";
+    mirror.style.overflowWrap = "break-word";
+    mirror.style.top = "0";
+    mirror.style.left = "-9999px";
+
+    const before = document.createTextNode((element.value || "").slice(0, index));
+    const marker = document.createElement("span");
+    marker.textContent = "@";
+
+    mirror.append(before);
+    mirror.append(marker);
+    document.body.append(mirror);
+
+    const top = elementRect.top + window.scrollY + marker.offsetTop - element.scrollTop + borderTopWidth + lineHeight;
+    const left = elementRect.left + window.scrollX + marker.offsetLeft - element.scrollLeft + borderLeftWidth;
+
+    mirror.remove();
+
+    return { top, left };
+  }
+
+  updateSelectedIndex(direction) {
+    if (this.suggestions.length < 1) {
+      this.selectedIndex = -1;
+      return;
+    }
+
+    const maxIndex = this.suggestions.length - 1;
+    const nextIndex = this.selectedIndex + direction;
+
+    this.selectedIndex = Math.max(0, Math.min(nextIndex, maxIndex));
+  }
+
+  selectSuggestion(index) {
+    const selectedItem = this.suggestions[index];
+    if (!selectedItem || this.currentMentionStart === null) {
+      return;
+    }
+
+    const cursorPosition = this.element.selectionStart;
+    const value = this.element.value || "";
+    const mentionValue = `${selectedItem.nickname} `;
+    const newValue = `${value.slice(0, this.currentMentionStart)}${mentionValue}${value.slice(cursorPosition)}`;
+
+    this.element.value = newValue;
+
+    const newPosition = this.currentMentionStart + mentionValue.length;
+    this.element.setSelectionRange(newPosition, newPosition);
+
+    this.element.dispatchEvent(new Event("input", { bubbles: true }));
+    this.hideSuggestions();
+  }
+
+  hideSuggestions() {
+    if (!this.suggestion) {
+      return;
+    }
+
+    this.isActive = false;
+    this.currentMentionStart = null;
+    this.selectedIndex = -1;
+    this.suggestions = [];
+    this.suggestion.classList.add("hidden", "hide");
+    this.suggestion.innerHTML = "";
   }
 
-  /**
-   * Create a debounced version of a function
-   * @param {Function} callback - The function to debounce
-   * @param {number} wait - The debounce delay in milliseconds
-   * @returns {Function} The debounced function
-   * @private
-   */
   debounce(callback, wait) {
     let timeout = null;
     return (...args) => {
@@ -233,10 +393,6 @@ export default class extends Controller {
     };
   }
 
-  /**
-   * Check if the component is initialized
-   * @returns {boolean} True if initialized, false otherwise
-   */
   get initialized() {
     return this.isInitialized;
   }
diff --git a/decidim-core/app/packs/src/decidim/controllers/mention/input_mentions.test.js b/decidim-core/app/packs/src/decidim/controllers/mention/input_mentions.test.js
index b44fafc0aff0c..f3ef5c82477ad 100644
--- a/decidim-core/app/packs/src/decidim/controllers/mention/input_mentions.test.js
+++ b/decidim-core/app/packs/src/decidim/controllers/mention/input_mentions.test.js
@@ -1,82 +1,47 @@
-/* eslint max-lines: ["error", 650] */
 /* global global, jest */
 /**
  * @jest-environment jsdom
  */
 
-// Mock the Tribute library first
-const mockTribute = {
-  attach: jest.fn(),
-  detach: jest.fn(),
-  isActive: false,
-  current: null,
-  menu: null,
-  range: {
-    getDocument: () => document
-  },
-  menuContainer: null
-};
-
-// Create the constructor mock
-jest.mock("src/decidim/vendor/tribute", () => {
-  return jest.fn().mockImplementation(() => mockTribute);
-});
-
 import { Application } from "@hotwired/stimulus"
 import MentionController from "src/decidim/controllers/mention/controller";
-import Tribute from "src/decidim/vendor/tribute";
 
-// Get access to mock methods (pure JavaScript approach)
-const TributeMock = Tribute;
-
-// Mock global fetch
 global.fetch = jest.fn();
 
-// Mock window.Decidim
 global.window.Decidim = {
   config: {
     get: jest.fn()
   }
 };
 
-describe("MentionsComponent", () => {
-  let mockElement = null;
+describe("MentionController", () => {
   let application = null;
+  let mockElement = null;
   let controller = null;
 
   beforeEach(() => {
-    // Set up Stimulus application
     application = Application.start();
     application.register("mention", MentionController);
-
-    // Reset all mocks
     jest.clearAllMocks();
-    mockTribute.attach.mockClear();
-    mockTribute.detach.mockClear();
-    TributeMock.mockClear();
 
-    // Create DOM elements for testing
     document.body.innerHTML = `
       <div class="mention-container">
         <input data-noresults="No users found" data-controller="mention" />
-        <div class="tribute-container"></div>
       </div>
     `;
 
     mockElement = document.querySelector("[data-controller='mention']");
 
-    // Setup window.Decidim mock
     window.Decidim.config.get.mockReturnValue("http://localhost:3000/api");
 
-    // Setup fetch mock
     fetch.mockResolvedValue({
       ok: true,
       json: () => Promise.resolve({
         data: {
           users: [
             {
-              nickname: "testuser",
-              name: "Test User",
+              nickname: "@doe_john",
+              name: "John Doe",
               avatarUrl: "http://example.com/avatar.jpg",
               __typename: "User"
             }
@@ -84,479 +49,177 @@ describe("MentionsComponent", () => {
         }
       })
     });
-    return new Promise((resolve) => {
-      setTimeout(() => {
-        controller = application.getControllerForElementAndIdentifier(mockElement, "mention");
-        resolve();
-      }, 0);
-    });
   });
 
   afterEach(() => {
-    controller.disconnect();
+    controller?.disconnect();
     document.body.innerHTML = "";
+    application.stop();
     jest.restoreAllMocks();
   });
 
-  describe("constructor", () => {
-    it("creates instance with default options", () => {
-      expect(controller.element).toBe(mockElement);
-      expect(controller.options.noDataFoundMessage).toBe("No users found");
-      expect(controller.options.debounceDelay).toBe(250);
-      expect(controller.options.menuItemLimit).toBe(5);
-    });
-
-    it("initializes component when not inside editor", () => {
-      expect(controller.initialized).toBe(true);
-      expect(TributeMock).toHaveBeenCalled();
-      expect(mockTribute.attach).toHaveBeenCalledWith(mockElement);
-    });
-
-    it("does not initialize when inside editor", () => {
-      const editorContainer = document.createElement("div");
-      editorContainer.classList.add("editor");
-      const editorElement = document.createElement("input");
-      editorElement.setAttribute("data-controller", "mention");
-      editorContainer.appendChild(editorElement);
-      document.body.appendChild(editorContainer);
-
-      // Wait for the controller to be connected
-      return new Promise((resolve) => {
-        setTimeout(() => {
-          controller = application.getControllerForElementAndIdentifier(editorElement, "mention");
-
-          expect(controller.initialized).toBe(false);
-          // Since TributeMock should not be called, we can check that tribute is null
-          expect(controller.tribute).toBeNull();
-
-          resolve();
-        }, 0);
-      });
-    });
-  });
-
-  describe("Tribute configuration", () => {
-    it("configures Tribute with correct options", () => {
-      const tributeConfig = TributeMock.mock.calls[0][0];
-
-      expect(tributeConfig.trigger).toBe("@");
-      expect(tributeConfig.positionMenu).toBe(true);
-      expect(tributeConfig.allowSpaces).toBe(true);
-      expect(tributeConfig.menuItemLimit).toBe(5);
-      expect(tributeConfig.fillAttr).toBe("nickname");
-      expect(tributeConfig.selectClass).toBe("highlight");
-    });
-
-    it("configures lookup function correctly", () => {
-      const tributeConfig = TributeMock.mock.calls[0][0];
-      const mockItem = { nickname: "testuser", name: "Test User" };
-
-      expect(tributeConfig.lookup(mockItem)).toBe("testuserTest User");
-    });
-
-    it("configures selectTemplate function correctly", () => {
-      const tributeConfig = TributeMock.mock.calls[0][0];
-      const mockItem = { original: { nickname: "testuser" } };
-
-      expect(tributeConfig.selectTemplate(mockItem)).toBe("testuser");
-      // eslint-disable-next-line no-undefined
-      expect(tributeConfig.selectTemplate(undefined)).toBeNull();
+  const connectController = () => {
+    return new Promise((resolve) => {
+      setTimeout(() => {
+        controller = application.getControllerForElementAndIdentifier(mockElement, "mention");
+        resolve();
+      }, 0);
     });
+  };
 
-    it("configures menuItemTemplate function correctly", () => {
-      const tributeConfig = TributeMock.mock.calls[0][0];
-      const mockItem = {
-        original: {
-          nickname: "testuser",
-          name: "Test User",
-          avatarUrl: "http://example.com/avatar.jpg"
-        }
-      };
-
-      const template = tributeConfig.menuItemTemplate(mockItem);
-      expect(template).toContain('img src="http://example.com/avatar.jpg"');
-      expect(template).toContain("<strong>testuser</strong>");
-      expect(template).toContain("<small>Test User</small>");
-    });
+  const waitForDebounce = () => {
+    return new Promise((resolve) => setTimeout(resolve, 300));
+  };
 
-    it("configures noMatchTemplate when no data found message exists", () => {
-      const tributeConfig = TributeMock.mock.calls[0][0];
+  it("initializes when not inside editor", async () => {
+    await connectController();
 
-      expect(tributeConfig.noMatchTemplate()).toBe("<li>No users found</li>");
-    });
-
-    it("configures null noMatchTemplate when no message provided", () => {
-      const elementWithoutMessage = document.createElement("input");
-      elementWithoutMessage.setAttribute("data-controller", "mention");
-      document.body.appendChild(elementWithoutMessage);
-
-      return new Promise((resolve) => {
-        setTimeout(() => {
-          controller = application.getControllerForElementAndIdentifier(elementWithoutMessage, "mention");
-
-          // Check that the tribute was created and the second call (index [1]) has the expected config
-          const tributeConfig = TributeMock.mock.calls[1][0];
-          expect(tributeConfig.noMatchTemplate).toEqual(expect.any(Function));
-
-          // Clean up
-          controller.disconnect();
-          elementWithoutMessage.remove();
-          resolve();
-        }, 0);
-      });
-    });
+    expect(controller.initialized).toBe(true);
+    expect(document.querySelector(".editor-suggestions")).toBeInstanceOf(HTMLDivElement);
   });
 
-  describe("event handling", () => {
-    it("handles focusin event", () => {
-      const event = new Event("focusin");
-      Reflect.defineProperty(event, "target", {
-        value: mockElement,
-        enumerable: true
-      });
-
-      mockElement.dispatchEvent(event);
-
-      expect(mockTribute.menuContainer).toBe(mockElement.parentNode);
-    });
-
-    it("handles focusout event when parent has is-active class", () => {
-      mockElement.parentNode.classList.add("is-active");
-
-      const event = new Event("focusout");
-      Reflect.defineProperty(event, "target", {
-        value: mockElement,
-        enumerable: true
-      });
-
-      mockElement.dispatchEvent(event);
-
-      expect(mockElement.parentNode.classList.contains("is-active")).toBe(false);
-    });
-
-    it("handles focusout event when parent does not exist", () => {
-      const isolatedElement = document.createElement("input");
-      isolatedElement.setAttribute("data-controller", "mention");
-      document.body.appendChild(isolatedElement);
-
-      return new Promise((resolve) => {
-        setTimeout(() => {
-          const isolatedController = application.getControllerForElementAndIdentifier(isolatedElement, "mention");
-
-          const event = new Event("focusout");
-          Reflect.defineProperty(event, "target", {
-            value: isolatedElement,
-            enumerable: true
-          });
-
-          // Test that dispatching the focusout event does not throw when parent is null
-          expect(() => isolatedElement.dispatchEvent(event)).not.toThrow();
-
-          // Clean up
-          isolatedController.disconnect();
-          isolatedElement.remove();
-          resolve();
-        }, 0);
-      });
-    });
-
-    it("handles input event when tribute is active", () => {
-      mockTribute.isActive = true;
-
-      const event = new Event("input");
-      Reflect.defineProperty(event, "target", {
-        value: mockElement,
-        enumerable: true
-      });
-
-      mockElement.dispatchEvent(event);
-
-      expect(mockElement.parentNode.classList.contains("is-active")).toBe(true);
-    });
-
-    it("handles input event when tribute is not active", () => {
-      mockTribute.isActive = false;
-      mockElement.parentNode.classList.add("is-active");
-
-      const event = new Event("input");
-      Reflect.defineProperty(event, "target", {
-        value: mockElement,
-        enumerable: true
-      });
+  it("does not initialize when inside editor", async () => {
+    const editorContainer = document.createElement("div");
+    editorContainer.classList.add("editor");
+    const editorElement = document.createElement("input");
+    editorElement.setAttribute("data-controller", "mention");
+    editorContainer.appendChild(editorElement);
+    document.body.appendChild(editorContainer);
 
-      mockElement.dispatchEvent(event);
+    await new Promise((resolve) => setTimeout(resolve, 0));
 
-      expect(mockElement.parentNode.classList.contains("is-active")).toBe(false);
-    });
-
-    it("handles input event when parent does not exist", () => {
-      const isolatedElement = document.createElement("input");
-      isolatedElement.setAttribute("data-controller", "mention");
-      document.body.appendChild(isolatedElement);
-
-      return new Promise((resolve) => {
-        setTimeout(() => {
-          const isolatedController = application.getControllerForElementAndIdentifier(isolatedElement, "mention");
-
-          const event = new Event("input");
-          Reflect.defineProperty(event, "target", {
-            value: isolatedElement,
-            enumerable: true
-          });
-
-          // Test that dispatching the input event does not throw when parent is null
-          expect(() => isolatedElement.dispatchEvent(event)).not.toThrow();
-
-          // Clean up
-          isolatedController.disconnect();
-          isolatedElement.remove();
-          resolve();
-        }, 0);
-      });
-    });
+    const editorController = application.getControllerForElementAndIdentifier(editorElement, "mention");
+    expect(editorController.initialized).toBe(false);
+    expect(editorController.suggestion).toBeNull();
   });
 
-  describe("remote search", () => {
-    it("performs remote search successfully", async () => {
-      const tributeConfig = TributeMock.mock.calls[0][0];
-      const mockCallback = jest.fn();
-
-      // Execute the values function (which is debounced)
-      await new Promise((resolve) => {
-        tributeConfig.values("test", mockCallback);
-        // Wait for debounce
-        setTimeout(resolve, 300);
-      });
-
-      expect(fetch).toHaveBeenCalledWith(
-        "http://localhost:3000/api",
-        expect.objectContaining({
-          method: "POST",
-          headers: expect.objectContaining({
-            "Content-Type": "application/json"
-          }),
-          body: JSON.stringify({
-            query: '{users(filter:{wildcard:"test"}){nickname,name,avatarUrl,__typename}}'
-          })
-        })
-      );
-
-      expect(mockCallback).toHaveBeenCalledWith([
-        {
-          nickname: "testuser",
-          name: "Test User",
-          avatarUrl: "http://example.com/avatar.jpg",
-          __typename: "User"
-        }
-      ]);
-    });
+  it("shows suggestions for valid mention query", async () => {
+    await connectController();
 
-    it("handles remote search failure", async () => {
-      fetch.mockRejectedValueOnce(new Error("Network error"));
+    mockElement.value = "Hello @do";
+    mockElement.setSelectionRange(mockElement.value.length, mockElement.value.length);
+    mockElement.dispatchEvent(new Event("input", { bubbles: true }));
 
-      const tributeConfig = TributeMock.mock.calls[0][0];
-      const mockCallback = jest.fn();
+    await waitForDebounce();
 
-      await new Promise((resolve) => {
-        tributeConfig.values("test", mockCallback);
-        // Wait for debounce
-        setTimeout(resolve, 300);
-      });
+    const suggestions = document.querySelector(".editor-suggestions");
+    const items = suggestions.querySelectorAll(".editor-suggestions-item");
 
-      expect(mockCallback).toHaveBeenCalledWith([]);
-    });
-
-    it("handles empty search results", async () => {
-      fetch.mockResolvedValueOnce({
-        ok: true,
-        json: () => Promise.resolve({ data: {} })
-      });
-
-      const tributeConfig = TributeMock.mock.calls[0][0];
-      const mockCallback = jest.fn();
-
-      await new Promise((resolve) => {
-        tributeConfig.values("test", mockCallback);
-        // Wait for debounce
-        setTimeout(resolve, 300);
-      });
-
-      expect(mockCallback).toHaveBeenCalledWith([]);
-    });
+    expect(items.length).toBe(1);
+    expect(items[0].querySelector(".editor-suggestions-item-avatar")).toBeInstanceOf(HTMLImageElement);
+    expect(items[0].querySelector(".editor-suggestions-item-label").textContent).toBe("@doe_john (John Doe)");
+    expect(suggestions.classList.contains("hidden")).toBe(false);
+  });
 
-    it("handles non-ok response", async () => {
-      fetch.mockResolvedValueOnce({
-        ok: false,
-        status: 500
-      });
+  it("does not show suggestions when fewer than two mention characters", async () => {
+    await connectController();
 
-      const tributeConfig = TributeMock.mock.calls[0][0];
-      const mockCallback = jest.fn();
+    mockElement.value = "Hello @d";
+    mockElement.setSelectionRange(mockElement.value.length, mockElement.value.length);
+    mockElement.dispatchEvent(new Event("input", { bubbles: true }));
 
-      await new Promise((resolve) => {
-        tributeConfig.values("test", mockCallback);
-        // Wait for debounce
-        setTimeout(resolve, 300);
-      });
+    await waitForDebounce();
 
-      expect(mockCallback).toHaveBeenCalledWith([]);
-    });
+    const suggestions = document.querySelector(".editor-suggestions");
+    expect(suggestions.classList.contains("hidden")).toBe(true);
   });
 
-  describe("destroy", () => {
-    it("cleans up resources properly", () => {
-      controller.disconnect();
+  it("inserts selected mention on click", async () => {
+    await connectController();
 
-      expect(mockTribute.detach).toHaveBeenCalledWith(mockElement);
-      expect(controller.tribute).toBeNull();
-      expect(controller.initialized).toBe(false);
-    });
+    mockElement.value = "Hello @do";
+    mockElement.setSelectionRange(mockElement.value.length, mockElement.value.length);
+    mockElement.dispatchEvent(new Event("input", { bubbles: true }));
 
-    it("handles missing tribute gracefully", () => {
-      controller.tribute = null;
+    await waitForDebounce();
 
-      expect(() => controller.disconnect()).not.toThrow();
-    });
+    const suggestionItem = document.querySelector(".editor-suggestions-item");
+    suggestionItem.click();
 
-    it("handles missing element gracefully", () => {
-      expect(() => controller.disconnect()).not.toThrow();
-    });
+    expect(mockElement.value).toBe("Hello @doe_john ");
+    expect(document.querySelector(".editor-suggestions").classList.contains("hidden")).toBe(true);
   });
 
-  describe("debounce functionality", () => {
-    beforeEach(() => {
-      jest.useFakeTimers();
-    });
+  it("supports keyboard navigation and enter selection", async () => {
+    await connectController();
 
-    afterEach(() => {
-      jest.useRealTimers();
+    fetch.mockResolvedValueOnce({
+      ok: true,
+      json: () => Promise.resolve({
+        data: {
+          users: [
+            { nickname: "@alpha", name: "Alpha", avatarUrl: "", __typename: "User" },
+            { nickname: "@bravo", name: "Bravo", avatarUrl: "", __typename: "User" }
+          ]
+        }
+      })
     });
 
-    it("debounces function calls", () => {
-      const mockCallback = jest.fn();
-      const debouncedFunction = controller.debounce(mockCallback, 100);
-
-      debouncedFunction("arg1");
-      debouncedFunction("arg2");
-      debouncedFunction("arg3");
+    mockElement.value = "Hello @ab";
+    mockElement.setSelectionRange(mockElement.value.length, mockElement.value.length);
+    mockElement.dispatchEvent(new Event("input", { bubbles: true }));
+    await waitForDebounce();
 
-      expect(mockCallback).not.toHaveBeenCalled();
+    mockElement.dispatchEvent(new KeyboardEvent("keydown", { key: "ArrowDown", bubbles: true }));
+    mockElement.dispatchEvent(new KeyboardEvent("keydown", { key: "Enter", bubbles: true }));
 
-      jest.advanceTimersByTime(100);
-
-      expect(mockCallback).toHaveBeenCalledTimes(1);
-      expect(mockCallback).toHaveBeenCalledWith("arg3");
-    });
-
-    it("cancels previous timeout on new call", () => {
-      const mockCallback = jest.fn();
-      const debouncedFunction = controller.debounce(mockCallback, 100);
+    expect(mockElement.value).toBe("Hello @bravo ");
+  });
 
-      debouncedFunction("arg1");
-      jest.advanceTimersByTime(50);
-      debouncedFunction("arg2");
-      jest.advanceTimersByTime(50);
+  it("positions suggestions near the mention trigger character", async () => {
+    await connectController();
 
-      expect(mockCallback).not.toHaveBeenCalled();
+    mockElement.value = "A long text before @do";
+    mockElement.setSelectionRange(mockElement.value.length, mockElement.value.length);
+    mockElement.dispatchEvent(new Event("input", { bubbles: true }));
+    await waitForDebounce();
 
-      jest.advanceTimersByTime(50);
+    const suggestions = document.querySelector(".editor-suggestions");
 
-      expect(mockCallback).toHaveBeenCalledTimes(1);
-      expect(mockCallback).toHaveBeenCalledWith("arg2");
-    });
+    expect(suggestions.style.position).toBe("absolute");
+    expect(suggestions.style.top).toMatch(/\d+px/);
+    expect(suggestions.style.left).toMatch(/\d+px/);
   });
 
-  describe("tribute container adjustment", () => {
-    it("adjusts tribute container when tribute is active", () => {
-      const mockParent = document.createElement("div");
-      const mockTributeContainer = document.createElement("div");
-      mockTributeContainer.classList.add("tribute-container");
-      mockTributeContainer.setAttribute("style", "position: absolute; top: 10px;");
-      mockParent.appendChild(mockTributeContainer);
-
-      mockTribute.current = { element: { parentNode: mockParent } };
+  it("shows no results message when API returns empty list", async () => {
+    await connectController();
 
-      controller.adjustTributeContainer();
-
-      expect(mockParent.classList.contains("is-active")).toBe(true);
-      expect(mockTributeContainer.getAttribute("style")).toBeNull();
+    fetch.mockResolvedValueOnce({
+      ok: true,
+      json: () => Promise.resolve({ data: { users: [] } })
     });
 
-    it("handles missing tribute current element", () => {
-      mockTribute.current = null;
+    mockElement.value = "Hello @zz";
+    mockElement.setSelectionRange(mockElement.value.length, mockElement.value.length);
+    mockElement.dispatchEvent(new Event("input", { bubbles: true }));
+    await waitForDebounce();
 
-      expect(() => controller.adjustTributeContainer()).not.toThrow();
-    });
+    const noResultsItem = document.querySelector(".editor-suggestions-item");
+    expect(noResultsItem).toBeInstanceOf(HTMLButtonElement);
+    expect(noResultsItem.textContent).toBe("No users found");
+    expect(noResultsItem.disabled).toBe(true);
+  });
 
-    it("handles missing parent element", () => {
-      mockTribute.current = { element: { parentNode: null } };
+  it("hides suggestions on escape", async () => {
+    await connectController();
 
-      expect(() => controller.adjustTributeContainer()).not.toThrow();
-    });
-  });
+    mockElement.value = "Hello @do";
+    mockElement.setSelectionRange(mockElement.value.length, mockElement.value.length);
+    mockElement.dispatchEvent(new Event("input", { bubbles: true }));
+    await waitForDebounce();
 
-  describe("CSRF token handling", () => {
-    it("includes CSRF token in requests when available", async () => {
-      const mockToken = "test-csrf-token";
-      const metaElement = document.createElement("meta");
-      metaElement.name = "csrf-token";
-      metaElement.content = mockToken;
-      document.head.appendChild(metaElement);
-
-      const tributeConfig = TributeMock.mock.calls[0][0];
-      const mockCallback = jest.fn();
-
-      await new Promise((resolve) => {
-        tributeConfig.values("test", mockCallback);
-        setTimeout(resolve, 300);
-      });
-
-      expect(fetch).toHaveBeenCalledWith(
-        expect.any(String),
-        expect.objectContaining({
-          headers: expect.objectContaining({
-            "X-CSRF-Token": mockToken
-          })
-        })
-      );
-    });
+    mockElement.dispatchEvent(new KeyboardEvent("keydown", { key: "Escape", bubbles: true }));
 
-    it("handles missing CSRF token gracefully", async () => {
-      const tributeConfig = TributeMock.mock.calls[0][0];
-      const mockCallback = jest.fn();
-
-      await new Promise((resolve) => {
-        tributeConfig.values("test", mockCallback);
-        setTimeout(resolve, 300);
-      });
-
-      expect(fetch).toHaveBeenCalledWith(
-        expect.any(String),
-        expect.objectContaining({
-          body: '{"query":"{users(filter:{wildcard:\\"test\\"}){nickname,name,avatarUrl,__typename}}"}',
-          method: "POST",
-          headers: expect.objectContaining({
-            "Content-Type": "application/json",
-            "X-CSRF-Token": expect.any(String)
-          })
-        })
-      );
-    });
+    const suggestions = document.querySelector(".editor-suggestions");
+    expect(suggestions.classList.contains("hidden")).toBe(true);
   });
 
-  describe("external integration", () => {
-    it("handles attach-mentions-element event with no element", () => {
-      const attachEvent = new CustomEvent("attach-mentions-element", {
-        detail: {}
-      });
-
-      expect(() => document.dispatchEvent(attachEvent)).not.toThrow();
-    });
+  it("cleans up on disconnect", async () => {
+    await connectController();
 
-    it("handles attach-mentions-element event with no detail", () => {
-      const attachEvent = new CustomEvent("attach-mentions-element");
+    controller.disconnect();
 
-      expect(() => document.dispatchEvent(attachEvent)).not.toThrow();
-    });
+    expect(controller.suggestion).toBeNull();
+    expect(controller.initialized).toBe(false);
   });
 });
diff --git a/decidim-core/app/packs/src/decidim/index.js b/decidim-core/app/packs/src/decidim/index.js
index f17c377dd4550..e7c9bc1bf37b6 100644
--- a/decidim-core/app/packs/src/decidim/index.js
+++ b/decidim-core/app/packs/src/decidim/index.js
@@ -237,8 +237,7 @@ const initializer = (element = document) => {
   document.dispatchEvent(new CustomEvent("decidim:loaded", { detail: { element } }));
 }
 
-// If no jQuery is used the Tribute feature used in comments to autocomplete
-// mentions stops working
+// Keep this under jQuery ready to support components initialized on legacy templates
 $(() => initializer());
 
 // Run initializer action over the new DOM elements
diff --git a/decidim-core/app/packs/src/decidim/vendor/tribute.js b/decidim-core/app/packs/src/decidim/vendor/tribute.js
deleted file mode 100644
index f11d2f676b3f7..0000000000000
--- a/decidim-core/app/packs/src/decidim/vendor/tribute.js
+++ /dev/null
@@ -1,1890 +0,0 @@
-/* eslint-disable */
-
-/*
-  Modified file from the original tribute.js
-  Adding inside click event the conditional if the li element has no disabled-tribute-element class name. if true, then it must continue with normal behaviour.
-*/
-(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.Tribute = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-require("./utils");
-
-var _TributeEvents = _interopRequireDefault(require("./TributeEvents"));
-
-var _TributeMenuEvents = _interopRequireDefault(require("./TributeMenuEvents"));
-
-var _TributeRange = _interopRequireDefault(require("./TributeRange"));
-
-var _TributeSearch = _interopRequireDefault(require("./TributeSearch"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
-
-function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-var Tribute =
-/*#__PURE__*/
-function () {
-  function Tribute(_ref) {
-    var _this = this;
-
-    var _ref$values = _ref.values,
-        values = _ref$values === void 0 ? null : _ref$values,
-        _ref$iframe = _ref.iframe,
-        iframe = _ref$iframe === void 0 ? null : _ref$iframe,
-        _ref$selectClass = _ref.selectClass,
-        selectClass = _ref$selectClass === void 0 ? 'highlight' : _ref$selectClass,
-        _ref$trigger = _ref.trigger,
-        trigger = _ref$trigger === void 0 ? '@' : _ref$trigger,
-        _ref$autocompleteMode = _ref.autocompleteMode,
-        autocompleteMode = _ref$autocompleteMode === void 0 ? false : _ref$autocompleteMode,
-        _ref$selectTemplate = _ref.selectTemplate,
-        selectTemplate = _ref$selectTemplate === void 0 ? null : _ref$selectTemplate,
-        _ref$menuItemTemplate = _ref.menuItemTemplate,
-        menuItemTemplate = _ref$menuItemTemplate === void 0 ? null : _ref$menuItemTemplate,
-        _ref$lookup = _ref.lookup,
-        lookup = _ref$lookup === void 0 ? 'key' : _ref$lookup,
-        _ref$fillAttr = _ref.fillAttr,
-        fillAttr = _ref$fillAttr === void 0 ? 'value' : _ref$fillAttr,
-        _ref$collection = _ref.collection,
-        collection = _ref$collection === void 0 ? null : _ref$collection,
-        _ref$menuContainer = _ref.menuContainer,
-        menuContainer = _ref$menuContainer === void 0 ? null : _ref$menuContainer,
-        _ref$noMatchTemplate = _ref.noMatchTemplate,
-        noMatchTemplate = _ref$noMatchTemplate === void 0 ? null : _ref$noMatchTemplate,
-        _ref$requireLeadingSp = _ref.requireLeadingSpace,
-        requireLeadingSpace = _ref$requireLeadingSp === void 0 ? true : _ref$requireLeadingSp,
-        _ref$allowSpaces = _ref.allowSpaces,
-        allowSpaces = _ref$allowSpaces === void 0 ? false : _ref$allowSpaces,
-        _ref$replaceTextSuffi = _ref.replaceTextSuffix,
-        replaceTextSuffix = _ref$replaceTextSuffi === void 0 ? null : _ref$replaceTextSuffi,
-        _ref$positionMenu = _ref.positionMenu,
-        positionMenu = _ref$positionMenu === void 0 ? true : _ref$positionMenu,
-        _ref$spaceSelectsMatc = _ref.spaceSelectsMatch,
-        spaceSelectsMatch = _ref$spaceSelectsMatc === void 0 ? false : _ref$spaceSelectsMatc,
-        _ref$searchOpts = _ref.searchOpts,
-        searchOpts = _ref$searchOpts === void 0 ? {} : _ref$searchOpts,
-        _ref$menuItemLimit = _ref.menuItemLimit,
-        menuItemLimit = _ref$menuItemLimit === void 0 ? null : _ref$menuItemLimit;
-
-    _classCallCheck(this, Tribute);
-
-    this.autocompleteMode = autocompleteMode;
-    this.menuSelected = 0;
-    this.current = {};
-    this.inputEvent = false;
-    this.isActive = false;
-    this.menuContainer = menuContainer;
-    this.allowSpaces = allowSpaces;
-    this.replaceTextSuffix = replaceTextSuffix;
-    this.positionMenu = positionMenu;
-    this.hasTrailingSpace = false;
-    this.spaceSelectsMatch = spaceSelectsMatch;
-
-    if (this.autocompleteMode) {
-      trigger = '';
-      allowSpaces = false;
-    }
-
-    if (values) {
-      this.collection = [{
-        // symbol that starts the lookup
-        trigger: trigger,
-        // is it wrapped in an iframe
-        iframe: iframe,
-        // class applied to selected item
-        selectClass: selectClass,
-        // function called on select that retuns the content to insert
-        selectTemplate: (selectTemplate || Tribute.defaultSelectTemplate).bind(this),
-        // function called that returns content for an item
-        menuItemTemplate: (menuItemTemplate || Tribute.defaultMenuItemTemplate).bind(this),
-        // function called when menu is empty, disables hiding of menu.
-        noMatchTemplate: function (t) {
-          if (typeof t === 'function') {
-            return t.bind(_this);
-          }
-
-          return noMatchTemplate || function () {
-            return '';
-          }.bind(_this);
-        }(noMatchTemplate),
-        // column to search against in the object
-        lookup: lookup,
-        // column that contains the content to insert by default
-        fillAttr: fillAttr,
-        // array of objects or a function returning an array of objects
-        values: values,
-        requireLeadingSpace: requireLeadingSpace,
-        searchOpts: searchOpts,
-        menuItemLimit: menuItemLimit
-      }];
-    } else if (collection) {
-      if (this.autocompleteMode) console.warn('Tribute in autocomplete mode does not work for collections');
-      this.collection = collection.map(function (item) {
-        return {
-          trigger: item.trigger || trigger,
-          iframe: item.iframe || iframe,
-          selectClass: item.selectClass || selectClass,
-          selectTemplate: (item.selectTemplate || Tribute.defaultSelectTemplate).bind(_this),
-          menuItemTemplate: (item.menuItemTemplate || Tribute.defaultMenuItemTemplate).bind(_this),
-          // function called when menu is empty, disables hiding of menu.
-          noMatchTemplate: function (t) {
-            if (typeof t === 'function') {
-              return t.bind(_this);
-            }
-
-            return null;
-          }(noMatchTemplate),
-          lookup: item.lookup || lookup,
-          fillAttr: item.fillAttr || fillAttr,
-          values: item.values,
-          requireLeadingSpace: item.requireLeadingSpace,
-          searchOpts: item.searchOpts || searchOpts,
-          menuItemLimit: item.menuItemLimit || menuItemLimit
-        };
-      });
-    } else {
-      throw new Error('[Tribute] No collection specified.');
-    }
-
-    new _TributeRange["default"](this);
-    new _TributeEvents["default"](this);
-    new _TributeMenuEvents["default"](this);
-    new _TributeSearch["default"](this);
-  }
-
-  _createClass(Tribute, [{
-    key: "triggers",
-    value: function triggers() {
-      return this.collection.map(function (config) {
-        return config.trigger;
-      });
-    }
-  }, {
-    key: "attach",
-    value: function attach(el) {
-      if (!el) {
-        throw new Error('[Tribute] Must pass in a DOM node or NodeList.');
-      } // Check if it is a jQuery collection
-
-
-      if (typeof jQuery !== 'undefined' && el instanceof jQuery) {
-        el = el.get();
-      } // Is el an Array/Array-like object?
-
-
-      if (el.constructor === NodeList || el.constructor === HTMLCollection || el.constructor === Array) {
-        var length = el.length;
-
-        for (var i = 0; i < length; ++i) {
-          this._attach(el[i]);
-        }
-      } else {
-        this._attach(el);
-      }
-    }
-  }, {
-    key: "_attach",
-    value: function _attach(el) {
-      if (el.hasAttribute('data-tribute')) {
-        console.warn('Tribute was already bound to ' + el.nodeName);
-      }
-
-      this.ensureEditable(el);
-      this.events.bind(el);
-      el.setAttribute('data-tribute', true);
-    }
-  }, {
-    key: "ensureEditable",
-    value: function ensureEditable(element) {
-      if (Tribute.inputTypes().indexOf(element.nodeName) === -1) {
-        if (element.contentEditable) {
-          element.contentEditable = true;
-        } else {
-          throw new Error('[Tribute] Cannot bind to ' + element.nodeName);
-        }
-      }
-    }
-  }, {
-    key: "createMenu",
-    value: function createMenu() {
-      var wrapper = this.range.getDocument().createElement('div'),
-          ul = this.range.getDocument().createElement('ul');
-      wrapper.className = 'tribute-container';
-      wrapper.setAttribute('aria-expanded','true');
-      ul.setAttribute('id','results');
-      wrapper.appendChild(ul);
-
-      if (this.menuContainer) {
-        return this.menuContainer.appendChild(wrapper);
-      }
-
-      return this.range.getDocument().body.appendChild(wrapper);
-    }
-  }, {
-    key: "showMenuFor",
-    value: function showMenuFor(element, scrollTo) {
-      var _this2 = this;
-
-      // Only proceed if menu is not already shown for the current element & mentionText
-      if (this.isActive && this.current.element === element && this.current.mentionText === this.currentMentionTextSnapshot) {
-        return;
-      }
-
-      this.currentMentionTextSnapshot = this.current.mentionText; // create the menu if it does not exist.
-
-      if (!this.menu) {
-        this.menu = this.createMenu();
-        element.tributeMenu = this.menu;
-        this.menuEvents.bind(this.menu);
-      }
-
-      this.isActive = true;
-      this.menuSelected = 0;
-
-      if (!this.current.mentionText) {
-        this.current.mentionText = '';
-      }
-
-      var processValues = function processValues(values) {
-        // Tribute may not be active any more by the time the value callback returns
-        if (!_this2.isActive) {
-          return;
-        }
-
-        var items = _this2.search.filter(_this2.current.mentionText, values, {
-          pre: _this2.current.collection.searchOpts.pre || '<span>',
-          post: _this2.current.collection.searchOpts.post || '</span>',
-          skip: _this2.current.collection.searchOpts.skip,
-          extract: function extract(el) {
-            if (typeof _this2.current.collection.lookup === 'string') {
-              return el[_this2.current.collection.lookup];
-            } else if (typeof _this2.current.collection.lookup === 'function') {
-              return _this2.current.collection.lookup(el, _this2.current.mentionText);
-            } else {
-              throw new Error('Invalid lookup attribute, lookup must be string or function.');
-            }
-          }
-        });
-
-        if (_this2.current.collection.menuItemLimit) {
-          items = items.slice(0, _this2.current.collection.menuItemLimit);
-        }
-
-        _this2.current.filteredItems = items;
-
-        var ul = _this2.menu.querySelector('ul');
-
-        _this2.range.positionMenuAtCaret(scrollTo);
-
-        if (!items.length) {
-          var noMatchEvent = new CustomEvent('tribute-no-match', {
-            detail: _this2.menu
-          });
-
-          _this2.current.element.dispatchEvent(noMatchEvent);
-
-          if (typeof _this2.current.collection.noMatchTemplate === 'function' && !_this2.current.collection.noMatchTemplate() || !_this2.current.collection.noMatchTemplate) {
-            _this2.hideMenu();
-          } else {
-            typeof _this2.current.collection.noMatchTemplate === 'function' ? ul.innerHTML = _this2.current.collection.noMatchTemplate() : ul.innerHTML = _this2.current.collection.noMatchTemplate;
-          }
-
-          return;
-        }
-
-        ul.innerHTML = '';
-
-        var fragment = _this2.range.getDocument().createDocumentFragment();
-
-        items.forEach(function (item, index) {
-          var li = _this2.range.getDocument().createElement('li');
-          li.setAttribute('role', 'option');
-          li.setAttribute('data-index', index);
-          li.addEventListener('mousemove', function (e) {
-            var _this2$_findLiTarget = _this2._findLiTarget(e.target),
-                _this2$_findLiTarget2 = _slicedToArray(_this2$_findLiTarget, 2),
-                li = _this2$_findLiTarget2[0],
-                index = _this2$_findLiTarget2[1];
-
-            if (e.movementY !== 0) {
-              _this2.events.setActiveLi(index);
-            }
-          });
-
-          if (_this2.menuSelected === index) {
-            li.className = _this2.current.collection.selectClass;
-          }
-
-          li.innerHTML = _this2.current.collection.menuItemTemplate(item);
-          fragment.appendChild(li);
-        });
-        ul.appendChild(fragment);
-      };
-
-      if (typeof this.current.collection.values === 'function') {
-        this.current.collection.values(this.current.mentionText, processValues);
-      } else {
-        processValues(this.current.collection.values);
-      }
-    }
-  }, {
-    key: "_findLiTarget",
-    value: function _findLiTarget(el) {
-      if (!el) return [];
-      var index = el.getAttribute('data-index');
-      return !index ? this._findLiTarget(el.parentNode) : [el, index];
-    }
-  }, {
-    key: "showMenuForCollection",
-    value: function showMenuForCollection(element, collectionIndex) {
-      if (element !== document.activeElement) {
-        this.placeCaretAtEnd(element);
-      }
-
-      this.current.collection = this.collection[collectionIndex || 0];
-      this.current.externalTrigger = true;
-      this.current.element = element;
-      if (element.isContentEditable) this.insertTextAtCursor(this.current.collection.trigger);else this.insertAtCaret(element, this.current.collection.trigger);
-      this.showMenuFor(element);
-    } // TODO: make sure this works for inputs/textareas
-
-  }, {
-    key: "placeCaretAtEnd",
-    value: function placeCaretAtEnd(el) {
-      el.focus();
-
-      if (typeof window.getSelection != "undefined" && typeof document.createRange != "undefined") {
-        var range = document.createRange();
-        range.selectNodeContents(el);
-        range.collapse(false);
-        var sel = window.getSelection();
-        sel.removeAllRanges();
-        sel.addRange(range);
-      } else if (typeof document.body.createTextRange != "undefined") {
-        var textRange = document.body.createTextRange();
-        textRange.moveToElementText(el);
-        textRange.collapse(false);
-        textRange.select();
-      }
-    } // for contenteditable
-
-  }, {
-    key: "insertTextAtCursor",
-    value: function insertTextAtCursor(text) {
-      var sel, range, html;
-      sel = window.getSelection();
-      range = sel.getRangeAt(0);
-      range.deleteContents();
-      var textNode = document.createTextNode(text);
-      range.insertNode(textNode);
-      range.selectNodeContents(textNode);
-      range.collapse(false);
-      sel.removeAllRanges();
-      sel.addRange(range);
-    } // for regular inputs
-
-  }, {
-    key: "insertAtCaret",
-    value: function insertAtCaret(textarea, text) {
-      var scrollPos = textarea.scrollTop;
-      var caretPos = textarea.selectionStart;
-      var front = textarea.value.substring(0, caretPos);
-      var back = textarea.value.substring(textarea.selectionEnd, textarea.value.length);
-      textarea.value = front + text + back;
-      caretPos = caretPos + text.length;
-      textarea.selectionStart = caretPos;
-      textarea.selectionEnd = caretPos;
-      textarea.focus();
-      textarea.scrollTop = scrollPos;
-    }
-  }, {
-    key: "hideMenu",
-    value: function hideMenu() {
-      if (this.menu) {
-        this.menu.style.cssText = 'display: none;';
-        this.isActive = false;
-        this.menuSelected = 0;
-        this.current = {};
-      }
-    }
-  }, {
-    key: "selectItemAtIndex",
-    value: function selectItemAtIndex(index, originalEvent) {
-      index = parseInt(index);
-      if (typeof index !== 'number' || isNaN(index)) return;
-      var item = this.current.filteredItems[index];
-      var content = this.current.collection.selectTemplate(item);
-      if (content !== null) this.replaceText(content, originalEvent, item);
-    }
-  }, {
-    key: "replaceText",
-    value: function replaceText(content, originalEvent, item) {
-      this.range.replaceTriggerText(content, true, true, originalEvent, item);
-    }
-  }, {
-    key: "_append",
-    value: function _append(collection, newValues, replace) {
-      if (typeof collection.values === 'function') {
-        throw new Error('Unable to append to values, as it is a function.');
-      } else if (!replace) {
-        collection.values = collection.values.concat(newValues);
-      } else {
-        collection.values = newValues;
-      }
-    }
-  }, {
-    key: "append",
-    value: function append(collectionIndex, newValues, replace) {
-      var index = parseInt(collectionIndex);
-      if (typeof index !== 'number') throw new Error('please provide an index for the collection to update.');
-      var collection = this.collection[index];
-
-      this._append(collection, newValues, replace);
-    }
-  }, {
-    key: "appendCurrent",
-    value: function appendCurrent(newValues, replace) {
-      if (this.isActive) {
-        this._append(this.current.collection, newValues, replace);
-      } else {
-        throw new Error('No active state. Please use append instead and pass an index.');
-      }
-    }
-  }, {
-    key: "detach",
-    value: function detach(el) {
-      if (!el) {
-        throw new Error('[Tribute] Must pass in a DOM node or NodeList.');
-      } // Check if it is a jQuery collection
-
-
-      if (typeof jQuery !== 'undefined' && el instanceof jQuery) {
-        el = el.get();
-      } // Is el an Array/Array-like object?
-
-
-      if (el.constructor === NodeList || el.constructor === HTMLCollection || el.constructor === Array) {
-        var length = el.length;
-
-        for (var i = 0; i < length; ++i) {
-          this._detach(el[i]);
-        }
-      } else {
-        this._detach(el);
-      }
-    }
-  }, {
-    key: "_detach",
-    value: function _detach(el) {
-      var _this3 = this;
-
-      this.events.unbind(el);
-
-      if (el.tributeMenu) {
-        this.menuEvents.unbind(el.tributeMenu);
-      }
-
-      setTimeout(function () {
-        el.removeAttribute('data-tribute');
-        _this3.isActive = false;
-
-        if (el.tributeMenu) {
-          el.tributeMenu.remove();
-        }
-      });
-    }
-  }], [{
-    key: "defaultSelectTemplate",
-    value: function defaultSelectTemplate(item) {
-      if (typeof item === 'undefined') return null;
-
-      if (this.range.isContentEditable(this.current.element)) {
-        return '<span class="tribute-mention">' + (this.current.collection.trigger + item.original[this.current.collection.fillAttr]) + '</span>';
-      }
-
-      return this.current.collection.trigger + item.original[this.current.collection.fillAttr];
-    }
-  }, {
-    key: "defaultMenuItemTemplate",
-    value: function defaultMenuItemTemplate(matchItem) {
-      return matchItem.string;
-    }
-  }, {
-    key: "inputTypes",
-    value: function inputTypes() {
-      return ['TEXTAREA', 'INPUT'];
-    }
-  }]);
-
-  return Tribute;
-}();
-
-var _default = Tribute;
-exports["default"] = _default;
-module.exports = exports.default;
-
-},{"./TributeEvents":2,"./TributeMenuEvents":3,"./TributeRange":4,"./TributeSearch":5,"./utils":7}],2:[function(require,module,exports){
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-var TributeEvents =
-/*#__PURE__*/
-function () {
-  function TributeEvents(tribute) {
-    _classCallCheck(this, TributeEvents);
-
-    this.tribute = tribute;
-    this.tribute.events = this;
-  }
-
-  _createClass(TributeEvents, [{
-    key: "bind",
-    value: function bind(element) {
-      element.boundKeydown = this.keydown.bind(element, this);
-      element.boundKeyup = this.keyup.bind(element, this);
-      element.boundInput = this.input.bind(element, this);
-      element.addEventListener('keydown', element.boundKeydown, false);
-      element.addEventListener('keyup', element.boundKeyup, false);
-      element.addEventListener('input', element.boundInput, false);
-    }
-  }, {
-    key: "unbind",
-    value: function unbind(element) {
-      element.removeEventListener('keydown', element.boundKeydown, false);
-      element.removeEventListener('keyup', element.boundKeyup, false);
-      element.removeEventListener('input', element.boundInput, false);
-      delete element.boundKeydown;
-      delete element.boundKeyup;
-      delete element.boundInput;
-    }
-  }, {
-    key: "keydown",
-    value: function keydown(instance, event) {
-      if (instance.shouldDeactivate(event)) {
-        instance.tribute.isActive = false;
-        instance.tribute.hideMenu();
-      }
-
-      var element = this;
-      instance.commandEvent = false;
-      TributeEvents.keys().forEach(function (o) {
-        if (o.key === event.keyCode) {
-          instance.commandEvent = true;
-          instance.callbacks()[o.value.toLowerCase()](event, element);
-        }
-      });
-    }
-  }, {
-    key: "input",
-    value: function input(instance, event) {
-      instance.inputEvent = true;
-      instance.keyup.call(this, instance, event);
-    }
-  }, {
-    key: "click",
-    value: function click(instance, event) {
-      var tribute = instance.tribute;
-
-      if (tribute.menu && tribute.menu.contains(event.target)) {
-        var li = event.target;
-        event.preventDefault();
-        event.stopPropagation();
-
-        while (li.nodeName.toLowerCase() !== 'li') {
-          li = li.parentNode;
-
-          if (!li || li === tribute.menu) {
-            throw new Error('cannot find the <li> container for the click');
-          }
-        }
-
-        if (li.getElementsByClassName("disabled-tribute-element")[0]==undefined){
-          tribute.selectItemAtIndex(li.getAttribute('data-index'), event);
-          tribute.hideMenu(); // TODO: should fire with externalTrigger and target is outside of menu
-        }
-      } else if (tribute.current.element && !tribute.current.externalTrigger) {
-        tribute.current.externalTrigger = false;
-        setTimeout(function () {
-          return tribute.hideMenu();
-        });
-      }
-    }
-  }, {
-    key: "keyup",
-    value: function keyup(instance, event) {
-      if (instance.inputEvent) {
-        instance.inputEvent = false;
-      }
-
-      instance.updateSelection(this);
-      if (event.keyCode === 27) return;
-
-      if (!instance.tribute.allowSpaces && instance.tribute.hasTrailingSpace) {
-        instance.tribute.hasTrailingSpace = false;
-        instance.commandEvent = true;
-        instance.callbacks()["space"](event, this);
-        return;
-      }
-
-      if (!instance.tribute.isActive) {
-        if (instance.tribute.autocompleteMode) {
-          instance.callbacks().triggerChar(event, this, '');
-        } else {
-          var keyCode = instance.getKeyCode(instance, this, event);
-          if (isNaN(keyCode) || !keyCode) return;
-          var trigger = instance.tribute.triggers().find(function (trigger) {
-            return trigger.charCodeAt(0) === keyCode;
-          });
-
-          if (typeof trigger !== 'undefined') {
-            instance.callbacks().triggerChar(event, this, trigger);
-          }
-        }
-      }
-
-      if ((instance.tribute.current.trigger || instance.tribute.autocompleteMode) && instance.commandEvent === false || instance.tribute.isActive && event.keyCode === 8) {
-        instance.tribute.showMenuFor(this, true);
-      }
-    }
-  }, {
-    key: "shouldDeactivate",
-    value: function shouldDeactivate(event) {
-      if (!this.tribute.isActive) return false;
-
-      if (this.tribute.current.mentionText.length === 0) {
-        var eventKeyPressed = false;
-        TributeEvents.keys().forEach(function (o) {
-          if (event.keyCode === o.key) eventKeyPressed = true;
-        });
-        return !eventKeyPressed;
-      }
-
-      return false;
-    }
-  }, {
-    key: "getKeyCode",
-    value: function getKeyCode(instance, el, event) {
-      var _char;
-
-      var tribute = instance.tribute;
-      var info = tribute.range.getTriggerInfo(false, tribute.hasTrailingSpace, true, tribute.allowSpaces, tribute.autocompleteMode);
-
-      if (info) {
-        return info.mentionTriggerChar.charCodeAt(0);
-      } else {
-        return false;
-      }
-    }
-  }, {
-    key: "updateSelection",
-    value: function updateSelection(el) {
-      this.tribute.current.element = el;
-      var info = this.tribute.range.getTriggerInfo(false, this.tribute.hasTrailingSpace, true, this.tribute.allowSpaces, this.tribute.autocompleteMode);
-
-      if (info) {
-        this.tribute.current.selectedPath = info.mentionSelectedPath;
-        this.tribute.current.mentionText = info.mentionText;
-        this.tribute.current.selectedOffset = info.mentionSelectedOffset;
-      }
-    }
-  }, {
-    key: "callbacks",
-    value: function callbacks() {
-      var _this = this;
-
-      return {
-        triggerChar: function triggerChar(e, el, trigger) {
-          var tribute = _this.tribute;
-          tribute.current.trigger = trigger;
-          var collectionItem = tribute.collection.find(function (item) {
-            return item.trigger === trigger;
-          });
-          tribute.current.collection = collectionItem;
-          if (tribute.inputEvent) tribute.showMenuFor(el, true);
-        },
-        enter: function enter(e, el) {
-          // choose selection
-          if (_this.tribute.isActive && _this.tribute.current.filteredItems) {
-            e.preventDefault();
-            e.stopPropagation();
-            setTimeout(function () {
-              _this.tribute.selectItemAtIndex(_this.tribute.menuSelected, e);
-
-              _this.tribute.hideMenu();
-            }, 0);
-          }
-        },
-        escape: function escape(e, el) {
-          if (_this.tribute.isActive) {
-            e.preventDefault();
-            e.stopPropagation();
-            _this.tribute.isActive = false;
-
-            _this.tribute.hideMenu();
-          }
-        },
-        tab: function tab(e, el) {
-          // choose first match
-          _this.callbacks().enter(e, el);
-        },
-        space: function space(e, el) {
-          if (_this.tribute.isActive) {
-            if (_this.tribute.spaceSelectsMatch) {
-              _this.callbacks().enter(e, el);
-            } else if (!_this.tribute.allowSpaces) {
-              e.stopPropagation();
-              setTimeout(function () {
-                _this.tribute.hideMenu();
-
-                _this.tribute.isActive = false;
-              }, 0);
-            }
-          }
-        },
-        up: function up(e, el) {
-          // navigate up ul
-          if (_this.tribute.isActive && _this.tribute.current.filteredItems) {
-            e.preventDefault();
-            e.stopPropagation();
-            var count = _this.tribute.current.filteredItems.length,
-                selected = _this.tribute.menuSelected;
-
-            if (count > selected && selected > 0) {
-              _this.tribute.menuSelected--;
-
-              _this.setActiveLi();
-            } else if (selected === 0) {
-              _this.tribute.menuSelected = count - 1;
-
-              _this.setActiveLi();
-
-              _this.tribute.menu.scrollTop = _this.tribute.menu.scrollHeight;
-            }
-          }
-        },
-        down: function down(e, el) {
-          // navigate down ul
-          if (_this.tribute.isActive && _this.tribute.current.filteredItems) {
-            e.preventDefault();
-            e.stopPropagation();
-            var count = _this.tribute.current.filteredItems.length - 1,
-                selected = _this.tribute.menuSelected;
-
-            if (count > selected) {
-              _this.tribute.menuSelected++;
-
-              _this.setActiveLi();
-            } else if (count === selected) {
-              _this.tribute.menuSelected = 0;
-
-              _this.setActiveLi();
-
-              _this.tribute.menu.scrollTop = 0;
-            }
-          }
-        },
-        "delete": function _delete(e, el) {
-          if (_this.tribute.isActive && _this.tribute.current.mentionText.length < 1) {
-            _this.tribute.hideMenu();
-          } else if (_this.tribute.isActive) {
-            _this.tribute.showMenuFor(el);
-          }
-        }
-      };
-    }
-  }, {
-    key: "setActiveLi",
-    value: function setActiveLi(index) {
-      var lis = this.tribute.menu.querySelectorAll('li'),
-          length = lis.length >>> 0;
-      if (index) this.tribute.menuSelected = parseInt(index);
-
-      for (var i = 0; i < length; i++) {
-        var li = lis[i];
-
-        if (i === this.tribute.menuSelected) {
-          li.classList.add(this.tribute.current.collection.selectClass);
-          var liClientRect = li.getBoundingClientRect();
-          var menuClientRect = this.tribute.menu.getBoundingClientRect();
-
-          if (liClientRect.bottom > menuClientRect.bottom) {
-            var scrollDistance = liClientRect.bottom - menuClientRect.bottom;
-            this.tribute.menu.scrollTop += scrollDistance;
-          } else if (liClientRect.top < menuClientRect.top) {
-            var _scrollDistance = menuClientRect.top - liClientRect.top;
-
-            this.tribute.menu.scrollTop -= _scrollDistance;
-          }
-        } else {
-          li.classList.remove(this.tribute.current.collection.selectClass);
-        }
-      }
-    }
-  }, {
-    key: "getFullHeight",
-    value: function getFullHeight(elem, includeMargin) {
-      var height = elem.getBoundingClientRect().height;
-
-      if (includeMargin) {
-        var style = elem.currentStyle || window.getComputedStyle(elem);
-        return height + parseFloat(style.marginTop) + parseFloat(style.marginBottom);
-      }
-
-      return height;
-    }
-  }], [{
-    key: "keys",
-    value: function keys() {
-      return [{
-        key: 9,
-        value: 'TAB'
-      }, {
-        key: 8,
-        value: 'DELETE'
-      }, {
-        key: 13,
-        value: 'ENTER'
-      }, {
-        key: 27,
-        value: 'ESCAPE'
-      }, {
-        key: 32,
-        value: 'SPACE'
-      }, {
-        key: 38,
-        value: 'UP'
-      }, {
-        key: 40,
-        value: 'DOWN'
-      }];
-    }
-  }]);
-
-  return TributeEvents;
-}();
-
-var _default = TributeEvents;
-exports["default"] = _default;
-module.exports = exports.default;
-
-},{}],3:[function(require,module,exports){
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-var TributeMenuEvents =
-/*#__PURE__*/
-function () {
-  function TributeMenuEvents(tribute) {
-    _classCallCheck(this, TributeMenuEvents);
-
-    this.tribute = tribute;
-    this.tribute.menuEvents = this;
-    this.menu = this.tribute.menu;
-  }
-
-  _createClass(TributeMenuEvents, [{
-    key: "bind",
-    value: function bind(menu) {
-      var _this = this;
-
-      this.menuClickEvent = this.tribute.events.click.bind(null, this);
-      this.menuContainerScrollEvent = this.debounce(function () {
-        if (_this.tribute.isActive) {
-          _this.tribute.showMenuFor(_this.tribute.current.element, false);
-        }
-      }, 300, false);
-      this.windowResizeEvent = this.debounce(function () {
-        if (_this.tribute.isActive) {
-          _this.tribute.range.positionMenuAtCaret(true);
-        }
-      }, 300, false); // fixes IE11 issues with mousedown
-
-      this.tribute.range.getDocument().addEventListener('MSPointerDown', this.menuClickEvent, false);
-      this.tribute.range.getDocument().addEventListener('mousedown', this.menuClickEvent, false);
-      window.addEventListener('resize', this.windowResizeEvent);
-
-      if (this.menuContainer) {
-        this.menuContainer.addEventListener('scroll', this.menuContainerScrollEvent, false);
-      } else {
-        window.addEventListener('scroll', this.menuContainerScrollEvent);
-      }
-    }
-  }, {
-    key: "unbind",
-    value: function unbind(menu) {
-      this.tribute.range.getDocument().removeEventListener('mousedown', this.menuClickEvent, false);
-      this.tribute.range.getDocument().removeEventListener('MSPointerDown', this.menuClickEvent, false);
-      window.removeEventListener('resize', this.windowResizeEvent);
-
-      if (this.menuContainer) {
-        this.menuContainer.removeEventListener('scroll', this.menuContainerScrollEvent, false);
-      } else {
-        window.removeEventListener('scroll', this.menuContainerScrollEvent);
-      }
-    }
-  }, {
-    key: "debounce",
-    value: function debounce(func, wait, immediate) {
-      var _this2 = this,
-          _arguments = arguments;
-
-      var timeout;
-      return function () {
-        var context = _this2,
-            args = _arguments;
-
-        var later = function later() {
-          timeout = null;
-          if (!immediate) func.apply(context, args);
-        };
-
-        var callNow = immediate && !timeout;
-        clearTimeout(timeout);
-        timeout = setTimeout(later, wait);
-        if (callNow) func.apply(context, args);
-      };
-    }
-  }]);
-
-  return TributeMenuEvents;
-}();
-
-var _default = TributeMenuEvents;
-exports["default"] = _default;
-module.exports = exports.default;
-
-},{}],4:[function(require,module,exports){
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-// Thanks to https://github.com/jeff-collins/ment.io
-var TributeRange =
-/*#__PURE__*/
-function () {
-  function TributeRange(tribute) {
-    _classCallCheck(this, TributeRange);
-
-    this.tribute = tribute;
-    this.tribute.range = this;
-  }
-
-  _createClass(TributeRange, [{
-    key: "getDocument",
-    value: function getDocument() {
-      var iframe;
-
-      if (this.tribute.current.collection) {
-        iframe = this.tribute.current.collection.iframe;
-      }
-
-      if (!iframe) {
-        return document;
-      }
-
-      return iframe.contentWindow.document;
-    }
-  }, {
-    key: "positionMenuAtCaret",
-    value: function positionMenuAtCaret(scrollTo) {
-      var _this = this;
-
-      var context = this.tribute.current,
-          coordinates;
-      var info = this.getTriggerInfo(false, this.tribute.hasTrailingSpace, true, this.tribute.allowSpaces, this.tribute.autocompleteMode);
-
-      if (typeof info !== 'undefined') {
-        if (!this.tribute.positionMenu) {
-          this.tribute.menu.style.cssText = "display: block;";
-          return;
-        }
-
-        if (!this.isContentEditable(context.element)) {
-          coordinates = this.getTextAreaOrInputUnderlinePosition(this.tribute.current.element, info.mentionPosition);
-        } else {
-          coordinates = this.getContentEditableCaretPosition(info.mentionPosition);
-        }
-
-        this.tribute.menu.style.cssText = "top: ".concat(coordinates.top, "px;\n                                     left: ").concat(coordinates.left, "px;\n                                     right: ").concat(coordinates.right, "px;\n                                     bottom: ").concat(coordinates.bottom, "px;\n                                     position: absolute;\n                                     display: block;");
-
-        if (coordinates.left === 'auto') {
-          this.tribute.menu.style.left = 'auto';
-        }
-
-        if (coordinates.top === 'auto') {
-          this.tribute.menu.style.top = 'auto';
-        }
-
-        if (scrollTo) this.scrollIntoView();
-        window.setTimeout(function () {
-          var menuDimensions = {
-            width: _this.tribute.menu.offsetWidth,
-            height: _this.tribute.menu.offsetHeight
-          };
-
-          var menuIsOffScreen = _this.isMenuOffScreen(coordinates, menuDimensions);
-
-          var menuIsOffScreenHorizontally = window.innerWidth > menuDimensions.width && (menuIsOffScreen.left || menuIsOffScreen.right);
-          var menuIsOffScreenVertically = window.innerHeight > menuDimensions.height && (menuIsOffScreen.top || menuIsOffScreen.bottom);
-
-          if (menuIsOffScreenHorizontally || menuIsOffScreenVertically) {
-            _this.tribute.menu.style.cssText = 'display: none';
-
-            _this.positionMenuAtCaret(scrollTo);
-          }
-        }, 0);
-      } else {
-        this.tribute.menu.style.cssText = 'display: none';
-      }
-    }
-  }, {
-    key: "selectElement",
-    value: function selectElement(targetElement, path, offset) {
-      var range;
-      var elem = targetElement;
-
-      if (path) {
-        for (var i = 0; i < path.length; i++) {
-          elem = elem.childNodes[path[i]];
-
-          if (elem === undefined) {
-            return;
-          }
-
-          while (elem.length < offset) {
-            offset -= elem.length;
-            elem = elem.nextSibling;
-          }
-
-          if (elem.childNodes.length === 0 && !elem.length) {
-            elem = elem.previousSibling;
-          }
-        }
-      }
-
-      var sel = this.getWindowSelection();
-      range = this.getDocument().createRange();
-      range.setStart(elem, offset);
-      range.setEnd(elem, offset);
-      range.collapse(true);
-
-      try {
-        sel.removeAllRanges();
-      } catch (error) {}
-
-      sel.addRange(range);
-      targetElement.focus();
-    }
-  }, {
-    key: "replaceTriggerText",
-    value: function replaceTriggerText(text, requireLeadingSpace, hasTrailingSpace, originalEvent, item) {
-      var info = this.getTriggerInfo(true, hasTrailingSpace, requireLeadingSpace, this.tribute.allowSpaces, this.tribute.autocompleteMode);
-
-      if (info !== undefined) {
-        var context = this.tribute.current;
-        var replaceEvent = new CustomEvent('tribute-replaced', {
-          detail: {
-            item: item,
-            instance: context,
-            context: info,
-            event: originalEvent
-          }
-        });
-
-        if (!this.isContentEditable(context.element)) {
-          var myField = this.tribute.current.element;
-          var textSuffix = typeof this.tribute.replaceTextSuffix == 'string' ? this.tribute.replaceTextSuffix : ' ';
-          text += textSuffix;
-          var startPos = info.mentionPosition;
-          var endPos = info.mentionPosition + info.mentionText.length + textSuffix.length;
-          myField.value = myField.value.substring(0, startPos) + text + myField.value.substring(endPos, myField.value.length);
-          myField.selectionStart = startPos + text.length;
-          myField.selectionEnd = startPos + text.length;
-        } else {
-          // add a space to the end of the pasted text
-          var _textSuffix = typeof this.tribute.replaceTextSuffix == 'string' ? this.tribute.replaceTextSuffix : '\xA0';
-
-          text += _textSuffix;
-          this.pasteHtml(text, info.mentionPosition, info.mentionPosition + info.mentionText.length + !this.tribute.autocompleteMode);
-        }
-
-        context.element.dispatchEvent(replaceEvent);
-      }
-    }
-  }, {
-    key: "pasteHtml",
-    value: function pasteHtml(html, startPos, endPos) {
-      var range, sel;
-      sel = this.getWindowSelection();
-      range = this.getDocument().createRange();
-      range.setStart(sel.anchorNode, startPos);
-      range.setEnd(sel.anchorNode, endPos);
-      range.deleteContents();
-      var el = this.getDocument().createElement('div');
-      el.innerHTML = html;
-      var frag = this.getDocument().createDocumentFragment(),
-          node,
-          lastNode;
-
-      while (node = el.firstChild) {
-        lastNode = frag.appendChild(node);
-      }
-
-      range.insertNode(frag); // Preserve the selection
-
-      if (lastNode) {
-        range = range.cloneRange();
-        range.setStartAfter(lastNode);
-        range.collapse(true);
-        sel.removeAllRanges();
-        sel.addRange(range);
-      }
-    }
-  }, {
-    key: "getWindowSelection",
-    value: function getWindowSelection() {
-      if (this.tribute.collection.iframe) {
-        return this.tribute.collection.iframe.contentWindow.getSelection();
-      }
-
-      return window.getSelection();
-    }
-  }, {
-    key: "getNodePositionInParent",
-    value: function getNodePositionInParent(element) {
-      if (element.parentNode === null) {
-        return 0;
-      }
-
-      for (var i = 0; i < element.parentNode.childNodes.length; i++) {
-        var node = element.parentNode.childNodes[i];
-
-        if (node === element) {
-          return i;
-        }
-      }
-    }
-  }, {
-    key: "getContentEditableSelectedPath",
-    value: function getContentEditableSelectedPath(ctx) {
-      var sel = this.getWindowSelection();
-      var selected = sel.anchorNode;
-      var path = [];
-      var offset;
-
-      if (selected != null) {
-        var i;
-        var ce = selected.contentEditable;
-
-        while (selected !== null && ce !== 'true') {
-          i = this.getNodePositionInParent(selected);
-          path.push(i);
-          selected = selected.parentNode;
-
-          if (selected !== null) {
-            ce = selected.contentEditable;
-          }
-        }
-
-        path.reverse(); // getRangeAt may not exist, need alternative
-
-        offset = sel.getRangeAt(0).startOffset;
-        return {
-          selected: selected,
-          path: path,
-          offset: offset
-        };
-      }
-    }
-  }, {
-    key: "getTextPrecedingCurrentSelection",
-    value: function getTextPrecedingCurrentSelection() {
-      var context = this.tribute.current,
-          text = '';
-
-      if (!this.isContentEditable(context.element)) {
-        var textComponent = this.tribute.current.element;
-
-        if (textComponent) {
-          var startPos = textComponent.selectionStart;
-
-          if (textComponent.value && startPos >= 0) {
-            text = textComponent.value.substring(0, startPos);
-          }
-        }
-      } else {
-        var selectedElem = this.getWindowSelection().anchorNode;
-
-        if (selectedElem != null) {
-          var workingNodeContent = selectedElem.textContent;
-          var selectStartOffset = this.getWindowSelection().getRangeAt(0).startOffset;
-
-          if (workingNodeContent && selectStartOffset >= 0) {
-            text = workingNodeContent.substring(0, selectStartOffset);
-          }
-        }
-      }
-
-      return text;
-    }
-  }, {
-    key: "getLastWordInText",
-    value: function getLastWordInText(text) {
-      text = text.replace(/\u00A0/g, ' '); // https://stackoverflow.com/questions/29850407/how-do-i-replace-unicode-character-u00a0-with-a-space-in-javascript
-
-      var wordsArray = text.split(/\s+/);
-      var worldsCount = wordsArray.length - 1;
-      return wordsArray[worldsCount].trim();
-    }
-  }, {
-    key: "getTriggerInfo",
-    value: function getTriggerInfo(menuAlreadyActive, hasTrailingSpace, requireLeadingSpace, allowSpaces, isAutocomplete) {
-      var _this2 = this;
-
-      var ctx = this.tribute.current;
-      var selected, path, offset;
-
-      if (!this.isContentEditable(ctx.element)) {
-        selected = this.tribute.current.element;
-      } else {
-        var selectionInfo = this.getContentEditableSelectedPath(ctx);
-
-        if (selectionInfo) {
-          selected = selectionInfo.selected;
-          path = selectionInfo.path;
-          offset = selectionInfo.offset;
-        }
-      }
-
-      var effectiveRange = this.getTextPrecedingCurrentSelection();
-      var lastWordOfEffectiveRange = this.getLastWordInText(effectiveRange);
-
-      if (isAutocomplete) {
-        return {
-          mentionPosition: effectiveRange.length - lastWordOfEffectiveRange.length,
-          mentionText: lastWordOfEffectiveRange,
-          mentionSelectedElement: selected,
-          mentionSelectedPath: path,
-          mentionSelectedOffset: offset
-        };
-      }
-
-      if (effectiveRange !== undefined && effectiveRange !== null) {
-        var mostRecentTriggerCharPos = -1;
-        var triggerChar;
-        this.tribute.collection.forEach(function (config) {
-          var c = config.trigger;
-          var idx = config.requireLeadingSpace ? _this2.lastIndexWithLeadingSpace(effectiveRange, c) : effectiveRange.lastIndexOf(c);
-
-          if (idx > mostRecentTriggerCharPos) {
-            mostRecentTriggerCharPos = idx;
-            triggerChar = c;
-            requireLeadingSpace = config.requireLeadingSpace;
-          }
-        });
-
-        if (mostRecentTriggerCharPos >= 0 && (mostRecentTriggerCharPos === 0 || !requireLeadingSpace || /[\xA0\s]/g.test(effectiveRange.substring(mostRecentTriggerCharPos - 1, mostRecentTriggerCharPos)))) {
-          var currentTriggerSnippet = effectiveRange.substring(mostRecentTriggerCharPos + 1, effectiveRange.length);
-          triggerChar = effectiveRange.substring(mostRecentTriggerCharPos, mostRecentTriggerCharPos + 1);
-          var firstSnippetChar = currentTriggerSnippet.substring(0, 1);
-          var leadingSpace = currentTriggerSnippet.length > 0 && (firstSnippetChar === ' ' || firstSnippetChar === '\xA0');
-
-          if (hasTrailingSpace) {
-            currentTriggerSnippet = currentTriggerSnippet.trim();
-          }
-
-          var regex = allowSpaces ? /[^\S ]/g : /[\xA0\s]/g;
-          this.tribute.hasTrailingSpace = regex.test(currentTriggerSnippet);
-
-          if (!leadingSpace && (menuAlreadyActive || !regex.test(currentTriggerSnippet))) {
-            return {
-              mentionPosition: mostRecentTriggerCharPos,
-              mentionText: currentTriggerSnippet,
-              mentionSelectedElement: selected,
-              mentionSelectedPath: path,
-              mentionSelectedOffset: offset,
-              mentionTriggerChar: triggerChar
-            };
-          }
-        }
-      }
-    }
-  }, {
-    key: "lastIndexWithLeadingSpace",
-    value: function lastIndexWithLeadingSpace(str, _char) {
-      var reversedStr = str.split('').reverse().join('');
-      var index = -1;
-
-      for (var cidx = 0, len = str.length; cidx < len; cidx++) {
-        var firstChar = cidx === str.length - 1;
-        var leadingSpace = /\s/.test(reversedStr[cidx + 1]);
-        var match = _char === reversedStr[cidx];
-
-        if (match && (firstChar || leadingSpace)) {
-          index = str.length - 1 - cidx;
-          break;
-        }
-      }
-
-      return index;
-    }
-  }, {
-    key: "isContentEditable",
-    value: function isContentEditable(element) {
-      return element.nodeName !== 'INPUT' && element.nodeName !== 'TEXTAREA';
-    }
-  }, {
-    key: "isMenuOffScreen",
-    value: function isMenuOffScreen(coordinates, menuDimensions) {
-      var windowWidth = window.innerWidth;
-      var windowHeight = window.innerHeight;
-      var doc = document.documentElement;
-      var windowLeft = (window.pageXOffset || doc.scrollLeft) - (doc.clientLeft || 0);
-      var windowTop = (window.pageYOffset || doc.scrollTop) - (doc.clientTop || 0);
-      var menuTop = typeof coordinates.top === 'number' ? coordinates.top : windowTop + windowHeight - coordinates.bottom - menuDimensions.height;
-      var menuRight = typeof coordinates.right === 'number' ? coordinates.right : coordinates.left + menuDimensions.width;
-      var menuBottom = typeof coordinates.bottom === 'number' ? coordinates.bottom : coordinates.top + menuDimensions.height;
-      var menuLeft = typeof coordinates.left === 'number' ? coordinates.left : windowLeft + windowWidth - coordinates.right - menuDimensions.width;
-      return {
-        top: menuTop < Math.floor(windowTop),
-        right: menuRight > Math.ceil(windowLeft + windowWidth),
-        bottom: menuBottom > Math.ceil(windowTop + windowHeight),
-        left: menuLeft < Math.floor(windowLeft)
-      };
-    }
-  }, {
-    key: "getMenuDimensions",
-    value: function getMenuDimensions() {
-      // Width of the menu depends of its contents and position
-      // We must check what its width would be without any obstruction
-      // This way, we can achieve good positioning for flipping the menu
-      var dimensions = {
-        width: null,
-        height: null
-      };
-      this.tribute.menu.style.cssText = "top: 0px;\n                                 left: 0px;\n                                 position: fixed;\n                                 display: block;\n                                 visibility; hidden;";
-      dimensions.width = this.tribute.menu.offsetWidth;
-      dimensions.height = this.tribute.menu.offsetHeight;
-      this.tribute.menu.style.cssText = "display: none;";
-      return dimensions;
-    }
-  }, {
-    key: "getTextAreaOrInputUnderlinePosition",
-    value: function getTextAreaOrInputUnderlinePosition(element, position, flipped) {
-      var properties = ['direction', 'boxSizing', 'width', 'height', 'overflowX', 'overflowY', 'borderTopWidth', 'borderRightWidth', 'borderBottomWidth', 'borderLeftWidth', 'paddingTop', 'paddingRight', 'paddingBottom', 'paddingLeft', 'fontStyle', 'fontVariant', 'fontWeight', 'fontStretch', 'fontSize', 'fontSizeAdjust', 'lineHeight', 'fontFamily', 'textAlign', 'textTransform', 'textIndent', 'textDecoration', 'letterSpacing', 'wordSpacing'];
-      var isFirefox = window.mozInnerScreenX !== null;
-      var div = this.getDocument().createElement('div');
-      div.id = 'input-textarea-caret-position-mirror-div';
-      this.getDocument().body.appendChild(div);
-      var style = div.style;
-      var computed = window.getComputedStyle ? getComputedStyle(element) : element.currentStyle;
-      style.whiteSpace = 'pre-wrap';
-
-      if (element.nodeName !== 'INPUT') {
-        style.wordWrap = 'break-word';
-      } // position off-screen
-
-
-      style.position = 'absolute';
-      style.visibility = 'hidden'; // transfer the element's properties to the div
-
-      properties.forEach(function (prop) {
-        style[prop] = computed[prop];
-      });
-
-      if (isFirefox) {
-        style.width = "".concat(parseInt(computed.width) - 2, "px");
-        if (element.scrollHeight > parseInt(computed.height)) style.overflowY = 'scroll';
-      } else {
-        style.overflow = 'hidden';
-      }
-
-      div.textContent = element.value.substring(0, position);
-
-      if (element.nodeName === 'INPUT') {
-        div.textContent = div.textContent.replace(/\s/g, ' ');
-      }
-
-      var span = this.getDocument().createElement('span');
-      span.textContent = element.value.substring(position) || '.';
-      div.appendChild(span);
-      var rect = element.getBoundingClientRect();
-      var doc = document.documentElement;
-      var windowLeft = (window.pageXOffset || doc.scrollLeft) - (doc.clientLeft || 0);
-      var windowTop = (window.pageYOffset || doc.scrollTop) - (doc.clientTop || 0);
-      var top = 0;
-      var left = 0;
-
-      if (this.menuContainerIsBody) {
-        top = rect.top;
-        left = rect.left;
-      }
-
-      var coordinates = {
-        top: top + windowTop + span.offsetTop + parseInt(computed.borderTopWidth) + parseInt(computed.fontSize) - element.scrollTop,
-        left: left + windowLeft + span.offsetLeft + parseInt(computed.borderLeftWidth)
-      };
-      var windowWidth = window.innerWidth;
-      var windowHeight = window.innerHeight;
-      var menuDimensions = this.getMenuDimensions();
-      var menuIsOffScreen = this.isMenuOffScreen(coordinates, menuDimensions);
-
-      if (menuIsOffScreen.right) {
-        coordinates.right = windowWidth - coordinates.left;
-        coordinates.left = 'auto';
-      }
-
-      var parentHeight = this.tribute.menuContainer ? this.tribute.menuContainer.offsetHeight : this.getDocument().body.offsetHeight;
-
-      if (menuIsOffScreen.bottom) {
-        var parentRect = this.tribute.menuContainer ? this.tribute.menuContainer.getBoundingClientRect() : this.getDocument().body.getBoundingClientRect();
-        var scrollStillAvailable = parentHeight - (windowHeight - parentRect.top);
-        coordinates.bottom = scrollStillAvailable + (windowHeight - rect.top - span.offsetTop);
-        coordinates.top = 'auto';
-      }
-
-      menuIsOffScreen = this.isMenuOffScreen(coordinates, menuDimensions);
-
-      if (menuIsOffScreen.left) {
-        coordinates.left = windowWidth > menuDimensions.width ? windowLeft + windowWidth - menuDimensions.width : windowLeft;
-        delete coordinates.right;
-      }
-
-      if (menuIsOffScreen.top) {
-        coordinates.top = windowHeight > menuDimensions.height ? windowTop + windowHeight - menuDimensions.height : windowTop;
-        delete coordinates.bottom;
-      }
-
-      this.getDocument().body.removeChild(div);
-      return coordinates;
-    }
-  }, {
-    key: "getContentEditableCaretPosition",
-    value: function getContentEditableCaretPosition(selectedNodePosition) {
-      var markerTextChar = '';
-      var markerEl,
-          markerId = "sel_".concat(new Date().getTime(), "_").concat(Math.random().toString().substr(2));
-      var range;
-      var sel = this.getWindowSelection();
-      var prevRange = sel.getRangeAt(0);
-      range = this.getDocument().createRange();
-      range.setStart(sel.anchorNode, selectedNodePosition);
-      range.setEnd(sel.anchorNode, selectedNodePosition);
-      range.collapse(false); // Create the marker element containing a single invisible character using DOM methods and insert it
-
-      markerEl = this.getDocument().createElement('span');
-      markerEl.id = markerId;
-      markerEl.appendChild(this.getDocument().createTextNode(markerTextChar));
-      range.insertNode(markerEl);
-      sel.removeAllRanges();
-      sel.addRange(prevRange);
-      var rect = markerEl.getBoundingClientRect();
-      var doc = document.documentElement;
-      var windowLeft = (window.pageXOffset || doc.scrollLeft) - (doc.clientLeft || 0);
-      var windowTop = (window.pageYOffset || doc.scrollTop) - (doc.clientTop || 0);
-      var left = 0;
-      var top = 0;
-
-      if (this.menuContainerIsBody) {
-        left = rect.left;
-        top = rect.top;
-      } else {
-        left = markerEl.offsetLeft;
-        top = markerEl.offsetTop;
-      }
-
-      var coordinates = {
-        left: left + windowLeft,
-        top: top + markerEl.offsetHeight + windowTop
-      };
-      var windowWidth = window.innerWidth;
-      var windowHeight = window.innerHeight;
-      var menuDimensions = this.getMenuDimensions();
-      var menuIsOffScreen = this.isMenuOffScreen(coordinates, menuDimensions);
-
-      if (menuIsOffScreen.right) {
-        coordinates.left = 'auto';
-        coordinates.right = windowWidth - rect.left - windowLeft;
-      }
-
-      var parentHeight = this.tribute.menuContainer ? this.tribute.menuContainer.offsetHeight : this.getDocument().body.offsetHeight;
-
-      if (menuIsOffScreen.bottom) {
-        var parentRect = this.tribute.menuContainer ? this.tribute.menuContainer.getBoundingClientRect() : this.getDocument().body.getBoundingClientRect();
-        var scrollStillAvailable = parentHeight - (windowHeight - parentRect.top);
-        coordinates.top = 'auto';
-        coordinates.bottom = scrollStillAvailable + (windowHeight - rect.top);
-      }
-
-      menuIsOffScreen = this.isMenuOffScreen(coordinates, menuDimensions);
-
-      if (menuIsOffScreen.left) {
-        coordinates.left = windowWidth > menuDimensions.width ? windowLeft + windowWidth - menuDimensions.width : windowLeft;
-        delete coordinates.right;
-      }
-
-      if (menuIsOffScreen.top) {
-        coordinates.top = windowHeight > menuDimensions.height ? windowTop + windowHeight - menuDimensions.height : windowTop;
-        delete coordinates.bottom;
-      }
-
-      markerEl.parentNode.removeChild(markerEl);
-      return coordinates;
-    }
-  }, {
-    key: "scrollIntoView",
-    value: function scrollIntoView(elem) {
-      var reasonableBuffer = 20,
-          clientRect;
-      var maxScrollDisplacement = 100;
-      var e = this.menu;
-      if (typeof e === 'undefined') return;
-
-      while (clientRect === undefined || clientRect.height === 0) {
-        clientRect = e.getBoundingClientRect();
-
-        if (clientRect.height === 0) {
-          e = e.childNodes[0];
-
-          if (e === undefined || !e.getBoundingClientRect) {
-            return;
-          }
-        }
-      }
-
-      var elemTop = clientRect.top;
-      var elemBottom = elemTop + clientRect.height;
-
-      if (elemTop < 0) {
-        window.scrollTo(0, window.pageYOffset + clientRect.top - reasonableBuffer);
-      } else if (elemBottom > window.innerHeight) {
-        var maxY = window.pageYOffset + clientRect.top - reasonableBuffer;
-
-        if (maxY - window.pageYOffset > maxScrollDisplacement) {
-          maxY = window.pageYOffset + maxScrollDisplacement;
-        }
-
-        var targetY = window.pageYOffset - (window.innerHeight - elemBottom);
-
-        if (targetY > maxY) {
-          targetY = maxY;
-        }
-
-        window.scrollTo(0, targetY);
-      }
-    }
-  }, {
-    key: "menuContainerIsBody",
-    get: function get() {
-      return this.tribute.menuContainer === document.body || !this.tribute.menuContainer;
-    }
-  }]);
-
-  return TributeRange;
-}();
-
-var _default = TributeRange;
-exports["default"] = _default;
-module.exports = exports.default;
-
-},{}],5:[function(require,module,exports){
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-// Thanks to https://github.com/mattyork/fuzzy
-var TributeSearch =
-/*#__PURE__*/
-function () {
-  function TributeSearch(tribute) {
-    _classCallCheck(this, TributeSearch);
-
-    this.tribute = tribute;
-    this.tribute.search = this;
-  }
-
-  _createClass(TributeSearch, [{
-    key: "simpleFilter",
-    value: function simpleFilter(pattern, array) {
-      var _this = this;
-
-      return array.filter(function (string) {
-        return _this.test(pattern, string);
-      });
-    }
-  }, {
-    key: "test",
-    value: function test(pattern, string) {
-      return this.match(pattern, string) !== null;
-    }
-  }, {
-    key: "match",
-    value: function match(pattern, string, opts) {
-      opts = opts || {};
-      var patternIdx = 0,
-          result = [],
-          len = string.length,
-          totalScore = 0,
-          currScore = 0,
-          pre = opts.pre || '',
-          post = opts.post || '',
-          compareString = opts.caseSensitive && string || string.toLowerCase(),
-          ch,
-          compareChar;
-
-      if (opts.skip) {
-        return {
-          rendered: string,
-          score: 0
-        };
-      }
-
-      pattern = opts.caseSensitive && pattern || pattern.toLowerCase();
-      var patternCache = this.traverse(compareString, pattern, 0, 0, []);
-
-      if (!patternCache) {
-        return null;
-      }
-
-      return {
-        rendered: this.render(string, patternCache.cache, pre, post),
-        score: patternCache.score
-      };
-    }
-  }, {
-    key: "traverse",
-    value: function traverse(string, pattern, stringIndex, patternIndex, patternCache) {
-      // if the pattern search at end
-      if (pattern.length === patternIndex) {
-        // calculate score and copy the cache containing the indices where it is found
-        return {
-          score: this.calculateScore(patternCache),
-          cache: patternCache.slice()
-        };
-      } // if string at end or remaining pattern > remaining string
-
-
-      if (string.length === stringIndex || pattern.length - patternIndex > string.length - stringIndex) {
-        return undefined;
-      }
-
-      var c = pattern[patternIndex];
-      var index = string.indexOf(c, stringIndex);
-      var best, temp;
-
-      while (index > -1) {
-        patternCache.push(index);
-        temp = this.traverse(string, pattern, index + 1, patternIndex + 1, patternCache);
-        patternCache.pop(); // if downstream traversal failed, return best answer so far
-
-        if (!temp) {
-          return best;
-        }
-
-        if (!best || best.score < temp.score) {
-          best = temp;
-        }
-
-        index = string.indexOf(c, index + 1);
-      }
-
-      return best;
-    }
-  }, {
-    key: "calculateScore",
-    value: function calculateScore(patternCache) {
-      var score = 0;
-      var temp = 1;
-      patternCache.forEach(function (index, i) {
-        if (i > 0) {
-          if (patternCache[i - 1] + 1 === index) {
-            temp += temp + 1;
-          } else {
-            temp = 1;
-          }
-        }
-
-        score += temp;
-      });
-      return score;
-    }
-  }, {
-    key: "render",
-    value: function render(string, indices, pre, post) {
-      var rendered = string.substring(0, indices[0]);
-      indices.forEach(function (index, i) {
-        rendered += pre + string[index] + post + string.substring(index + 1, indices[i + 1] ? indices[i + 1] : string.length);
-      });
-      return rendered;
-    }
-  }, {
-    key: "filter",
-    value: function filter(pattern, arr, opts) {
-      var _this2 = this;
-
-      opts = opts || {};
-      return arr.reduce(function (prev, element, idx, arr) {
-        var str = element;
-
-        if (opts.extract) {
-          str = opts.extract(element);
-
-          if (!str) {
-            // take care of undefineds / nulls / etc.
-            str = '';
-          }
-        }
-
-        var rendered = _this2.match(pattern, str, opts);
-
-        if (rendered != null) {
-          prev[prev.length] = {
-            string: rendered.rendered,
-            score: rendered.score,
-            index: idx,
-            original: element
-          };
-        }
-
-        return prev;
-      }, []).sort(function (a, b) {
-        var compare = b.score - a.score;
-        if (compare) return compare;
-        return a.index - b.index;
-      });
-    }
-  }]);
-
-  return TributeSearch;
-}();
-
-var _default = TributeSearch;
-exports["default"] = _default;
-module.exports = exports.default;
-
-},{}],6:[function(require,module,exports){
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _Tribute = _interopRequireDefault(require("./Tribute"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-/**
-* Tribute.js
-* Native ES6 JavaScript @mention Plugin
-**/
-var _default = _Tribute["default"];
-exports["default"] = _default;
-module.exports = exports.default;
-
-},{"./Tribute":1}],7:[function(require,module,exports){
-"use strict";
-
-if (!Array.prototype.find) {
-  Array.prototype.find = function (predicate) {
-    if (this === null) {
-      throw new TypeError('Array.prototype.find called on null or undefined');
-    }
-
-    if (typeof predicate !== 'function') {
-      throw new TypeError('predicate must be a function');
-    }
-
-    var list = Object(this);
-    var length = list.length >>> 0;
-    var thisArg = arguments[1];
-    var value;
-
-    for (var i = 0; i < length; i++) {
-      value = list[i];
-
-      if (predicate.call(thisArg, value, i, list)) {
-        return value;
-      }
-    }
-
-    return undefined;
-  };
-}
-
-if (window && typeof window.CustomEvent !== "function") {
-  var CustomEvent = function CustomEvent(event, params) {
-    params = params || {
-      bubbles: false,
-      cancelable: false,
-      detail: undefined
-    };
-    var evt = document.createEvent('CustomEvent');
-    evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail);
-    return evt;
-  };
-
-  if (typeof window.Event !== 'undefined') {
-    CustomEvent.prototype = window.Event.prototype;
-  }
-
-  window.CustomEvent = CustomEvent;
-}
-
-},{}]},{},[6])(6)
-});
diff --git a/decidim-core/app/packs/stylesheets/decidim/_editor_suggestions.scss b/decidim-core/app/packs/stylesheets/decidim/_editor_suggestions.scss
new file mode 100644
index 0000000000000..8e5a8f7530597
--- /dev/null
+++ b/decidim-core/app/packs/stylesheets/decidim/_editor_suggestions.scss
@@ -0,0 +1,49 @@
+.editor-suggestions-props {
+  --editor-suggestions-border-color: #000;
+  --editor-suggestions-background-color: #eee;
+  --editor-suggestions-selected-highlight-color: #ccc;
+}
+
+.editor-suggestions {
+  @apply editor-suggestions-props border-0 bg-[var(--editor-suggestions-background-color)] max-w-sm drop-shadow-md rounded-md;
+
+  &:hover {
+    .editor-suggestions-item[data-selected]:not(:hover) {
+      @apply bg-transparent;
+    }
+  }
+
+  .editor-suggestions-item {
+    @apply flex items-center gap-2 w-full text-left py-[0.375rem] px-1.5 border-0 rounded-none text-sm;
+
+    &:first-child {
+      @apply rounded-t-md;
+    }
+
+    &:last-child {
+      @apply rounded-b-md;
+    }
+
+    &:hover,
+    &[data-selected] {
+      @apply bg-[var(--editor-suggestions-selected-highlight-color)];
+    }
+
+    .editor-suggestions-item-avatar {
+      @apply rounded-full w-6 h-6 object-cover flex-none;
+    }
+
+    .editor-suggestions-item-label {
+      @apply truncate;
+    }
+  }
+
+  .editor-suggestions-item-disabled {
+    @apply cursor-default;
+
+    &:hover,
+    &[data-selected] {
+      @apply bg-transparent;
+    }
+  }
+}
diff --git a/decidim-core/app/packs/stylesheets/decidim/_tribute.scss b/decidim-core/app/packs/stylesheets/decidim/_tribute.scss
deleted file mode 100644
index de5472c2efbdf..0000000000000
--- a/decidim-core/app/packs/stylesheets/decidim/_tribute.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-.tribute-container {
-  @apply w-full relative;
-
-  #results {
-    @apply absolute max-h-[225px] top-full left-0 right-0 p-0 my-2 rounded z-50 overflow-y-scroll bg-white border border-gray-3;
-
-    li {
-      @apply flex items-center gap-2 cursor-pointer px-4 py-2;
-    }
-
-    li:hover {
-      @apply cursor-pointer bg-background;
-    }
-
-    img {
-      @apply rounded-full w-6 h-6 object-cover;
-    }
-
-    span,
-    strong {
-      @apply font-semibold text-sm text-secondary;
-    }
-
-    small {
-      @apply font-normal text-gray-2 text-xs;
-    }
-
-    svg {
-      @apply w-4 h-4 text-primary fill-current;
-    }
-
-    .is-group {
-      @apply ml-auto flex items-center gap-1;
-    }
-  }
-}
diff --git a/decidim-core/app/packs/stylesheets/decidim/editor.scss b/decidim-core/app/packs/stylesheets/decidim/editor.scss
index 9bd3cfb21797f..a09ff2ccd2a1a 100644
--- a/decidim-core/app/packs/stylesheets/decidim/editor.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/editor.scss
@@ -1,3 +1,5 @@
+@use "stylesheets/decidim/editor_suggestions";
+
 .editor-props {
   --editor-active-color: #487bda;
   --editor-disabled-color: #eee;
@@ -5,12 +7,6 @@
   --editor-bubble-shadow-color: #333;
 }
 
-.editor-suggestions-props {
-  --editor-suggestions-border-color: #000;
-  --editor-suggestions-background-color: #eee;
-  --editor-suggestions-selected-highlight-color: #ccc;
-}
-
 .editor-active {
   @apply outline outline-4 outline-[var(--editor-active-color)];
 }
@@ -186,30 +182,3 @@
     }
   }
 }
-
-.editor-suggestions {
-  @apply editor-suggestions-props border-0 bg-[var(--editor-suggestions-background-color)] max-w-sm drop-shadow-md rounded-md;
-
-  &:hover {
-    .editor-suggestions-item[data-selected]:not(:hover) {
-      @apply bg-transparent;
-    }
-  }
-
-  .editor-suggestions-item {
-    @apply block w-full text-left py-[0.375rem] px-1.5 border-0 rounded-none truncate text-sm;
-
-    &:first-child {
-      @apply rounded-t-md;
-    }
-
-    &:last-child {
-      @apply rounded-b-md;
-    }
-
-    &:hover,
-    &[data-selected] {
-      @apply bg-[var(--editor-suggestions-selected-highlight-color)];
-    }
-  }
-}
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/comments_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/comments_examples.rb
index af402ef753694..ee702d89850b3 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/comments_examples.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/comments_examples.rb
@@ -1000,16 +1000,16 @@
         let(:content) { "A valid user mention: @#{mentioned_user.nickname}" }
 
         context "when text finish with a mention" do
-          it "shows the tribute container" do
-            expect(page).to have_css(".tribute-container", text: mentioned_user.name, wait: 10)
+          it "shows the suggestions menu" do
+            expect(page).to have_css(".editor-suggestions-item", text: "@#{mentioned_user.nickname} (#{mentioned_user.name})", wait: 10)
           end
         end
 
         context "when text contains a mention" do
           let(:content) { "A valid user mention: @#{mentioned_user.nickname}." }
 
-          it "shows the tribute container" do
-            expect(page).to have_no_css(".tribute-container", text: mentioned_user.name)
+          it "hides the suggestions menu" do
+            expect(page).to have_no_css(".editor-suggestions-item", text: "@#{mentioned_user.nickname} (#{mentioned_user.name})")
           end
         end
       end
@@ -1018,8 +1018,8 @@
         let!(:mentioned_user) { create(:user, organization:) }
         let(:content) { "A unconfirmed user mention: @#{mentioned_user.nickname}" }
 
-        it "do not show the tribute container" do
-          expect(page).to have_no_css(".tribute-container", text: mentioned_user.name)
+        it "does not show the suggestions menu" do
+          expect(page).to have_no_css(".editor-suggestions-item", text: "@#{mentioned_user.nickname} (#{mentioned_user.name})")
         end
       end
     end

From 51bdc48d6548f41d872910bc0816fe6d0c80ceaa Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Fri, 5 Jun 2026 11:51:43 +0200
Subject: [PATCH 059/131] Backport 'Check for existing user in new
 officialization form' to v0.31 (#17030)

* Handled non-existing user case for show_email

* Run linter

* Fixed linter issue

* Small refactor

* Removed blank line

* Apply review recommendation

* Check for user existence in officialize form

* Added success case in test file

* Added test cases

---------

Co-authored-by: andra-panaite <135139066+andra-panaite@users.noreply.github.com>
Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
---
 .../admin/officializations_controller.rb      |  2 ++
 decidim-admin/config/locales/en.yml           |  1 +
 .../officializations_controller_spec.rb       | 25 +++++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/decidim-admin/app/controllers/decidim/admin/officializations_controller.rb b/decidim-admin/app/controllers/decidim/admin/officializations_controller.rb
index 6d80a4ba60bc2..dd9158819296d 100644
--- a/decidim-admin/app/controllers/decidim/admin/officializations_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/officializations_controller.rb
@@ -22,6 +22,8 @@ def index
       def new
         enforce_permission_to :create, :officialization
 
+        return redirect_to(officializations_path, alert: I18n.t("officializations.create.no_user_found", scope: "decidim.admin")) unless user
+
         @form = form(OfficializationForm).from_model(user)
       end
 
diff --git a/decidim-admin/config/locales/en.yml b/decidim-admin/config/locales/en.yml
index 8db31fc8bef15..926c7af9b0cc1 100644
--- a/decidim-admin/config/locales/en.yml
+++ b/decidim-admin/config/locales/en.yml
@@ -844,6 +844,7 @@ en:
             invalid: There was a problem unblocking the participants.
             success: Participants successfully unblocked.
         create:
+          no_user_found: Participant was not found.
           success: Participant successfully officialized.
         destroy:
           success: Participant successfully unofficialized.
diff --git a/decidim-admin/spec/controllers/officializations_controller_spec.rb b/decidim-admin/spec/controllers/officializations_controller_spec.rb
index 6252de80aecc5..fe6941237d4ba 100644
--- a/decidim-admin/spec/controllers/officializations_controller_spec.rb
+++ b/decidim-admin/spec/controllers/officializations_controller_spec.rb
@@ -16,7 +16,32 @@ module Admin
         sign_in current_user, scope: :user
       end
 
+      describe "new" do
+        context "when user is not found" do
+          it "redirects to officializations path with alert" do
+            get :new, params: { user_id: 999_999_999 }
+
+            expect(flash[:alert]).to eq(I18n.t("officializations.create.no_user_found", scope: "decidim.admin"))
+            expect(response).to redirect_to(officializations_path)
+          end
+        end
+
+        context "when user is found" do
+          let(:user) { create(:user, :confirmed, organization:) }
+
+          it "renders the new with form with success" do
+            get :new, params: { user_id: user.id }
+
+            expect(response).to have_http_status(:ok)
+            expect(assigns(:form)).to be_a(Decidim::Admin::OfficializationForm)
+            expect(assigns(:form).user).to eq(user)
+          end
+        end
+      end
+
       describe "show_email" do
+        render_views
+
         context "when user is not found" do
           it "sets a not found message" do
             get :show_email, params: { user_id: 999_999_999 }

From 30db01561da151f8064528d425b35d5c487af291 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Sun, 7 Jun 2026 16:06:06 +0200
Subject: [PATCH 060/131] Backport 'Fix crash on login/logout with unsupported
 image file extensions' to v0.31 (#17037)

* change .map to use .filter_map

* add spec check

Co-authored-by: Elvia Benedith <116598037+ElviaBth@users.noreply.github.com>
---
 decidim-core/app/uploaders/decidim/image_uploader.rb |  2 +-
 decidim-core/spec/uploaders/image_uploader_spec.rb   | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/decidim-core/app/uploaders/decidim/image_uploader.rb b/decidim-core/app/uploaders/decidim/image_uploader.rb
index 4383df8101fce..84872c51291b1 100644
--- a/decidim-core/app/uploaders/decidim/image_uploader.rb
+++ b/decidim-core/app/uploaders/decidim/image_uploader.rb
@@ -8,7 +8,7 @@ def validable_dimensions
     end
 
     def content_type_allowlist
-      extension_allowlist.map { |ext| MiniMime.lookup_by_extension(ext).content_type }.uniq
+      extension_allowlist.filter_map { |ext| MiniMime.lookup_by_extension(ext)&.content_type }.uniq
     end
 
     # Fetches info about different variants, their processors and dimensions
diff --git a/decidim-core/spec/uploaders/image_uploader_spec.rb b/decidim-core/spec/uploaders/image_uploader_spec.rb
index 4b8a50461a7f4..61720ddfef8ff 100644
--- a/decidim-core/spec/uploaders/image_uploader_spec.rb
+++ b/decidim-core/spec/uploaders/image_uploader_spec.rb
@@ -30,6 +30,18 @@ module Decidim
       it "returns the correct MIME types" do
         expect(subject).to eq(%w(image/jpeg image/gif image/png))
       end
+
+      context "when the allowlist contains unsupported extensions" do
+        let(:extensions) { %w(jpg asdf silly png) }
+
+        it "does not raise" do
+          expect { subject }.not_to raise_error
+        end
+
+        it "returns only the MIME types for known extensions" do
+          expect(subject).to eq(%w(image/jpeg image/png))
+        end
+      end
     end
   end
 end

From 72f9adffa8592a4019a99233bf1eb7bd25c3eab1 Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Sun, 7 Jun 2026 21:12:39 +0300
Subject: [PATCH 061/131] Backport 'Fix flaky on generators bundler
 (multijson)' to v0.31 (#17039)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix flaky on generators bundler (multijson)

* Add multi_json gem for GCS provider

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 decidim-generators/lib/decidim/generators/app_generator.rb   | 5 ++++-
 .../lib/decidim/generators/install_generator.rb              | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/decidim-generators/lib/decidim/generators/app_generator.rb b/decidim-generators/lib/decidim/generators/app_generator.rb
index d9dcaaa69e581..59241036027e0 100644
--- a/decidim-generators/lib/decidim/generators/app_generator.rb
+++ b/decidim-generators/lib/decidim/generators/app_generator.rb
@@ -218,7 +218,10 @@ def add_storage_provider
         add_production_gems do
           gem "aws-sdk-s3", require: false if providers.include?("s3")
           gem "azure-storage-blob", require: false if providers.include?("azure")
-          gem "google-cloud-storage", "~> 1.11", require: false if providers.include?("gcs")
+          if providers.include?("gcs")
+            gem "google-cloud-storage", "~> 1.11", require: false
+            gem "multi_json"
+          end
         end
       end
 
diff --git a/decidim-generators/lib/decidim/generators/install_generator.rb b/decidim-generators/lib/decidim/generators/install_generator.rb
index d872f5f6078cf..c61c081e388a8 100644
--- a/decidim-generators/lib/decidim/generators/install_generator.rb
+++ b/decidim-generators/lib/decidim/generators/install_generator.rb
@@ -165,7 +165,7 @@ def tweak_spring
       end
 
       def bundle_install
-        run "bundle install"
+        Bundler.with_original_env { run "bundle install" }
       end
 
       def copy_migrations

From a295b567746463d8137b47e39550cab12e081757 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Mon, 8 Jun 2026 13:08:26 +0200
Subject: [PATCH 062/131] Backport 'Fix search indexing for unexisting locales'
 to v0.31 (#17046)

Co-authored-by: Antti Hukkanen <antti.hukkanen@mainiotech.fi>
---
 decidim-core/lib/decidim/searchable.rb   |  5 +++++
 decidim-core/spec/lib/searchable_spec.rb | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/decidim-core/lib/decidim/searchable.rb b/decidim-core/lib/decidim/searchable.rb
index 9ad46b191f57d..e1af16b1ad1db 100644
--- a/decidim-core/lib/decidim/searchable.rb
+++ b/decidim-core/lib/decidim/searchable.rb
@@ -117,6 +117,11 @@ def try_update_index_for_search_resource(current_depth = 0)
             searchables_in_org.find_each do |sr|
               next if sr.blank?
 
+              unless sr.locale.in?(org.available_locales)
+                sr.destroy
+                next
+              end
+
               sr.update(contents_to_searchable_resource_attributes(fields, sr.locale))
             end
           end
diff --git a/decidim-core/spec/lib/searchable_spec.rb b/decidim-core/spec/lib/searchable_spec.rb
index 988dd21d5744b..91b41b45db1c5 100644
--- a/decidim-core/spec/lib/searchable_spec.rb
+++ b/decidim-core/spec/lib/searchable_spec.rb
@@ -98,6 +98,26 @@ module Decidim
           participatory_process.update!(published_at: nil)
         end
       end
+
+      context "when the resource locale is not an available locale" do
+        let!(:searchable_resource) do
+          create(
+            :searchable_resource,
+            resource: participatory_process,
+            organization: participatory_process.organization,
+            decidim_participatory_space: participatory_process,
+            locale: "tlh"
+          )
+        end
+
+        it "deletes the searchable resource for unexisting locale" do
+          expect do
+            participatory_process.update!(title: { en: "Updated" })
+          end.to change(Decidim::SearchableResource, :count).by(-1)
+
+          expect(Decidim::SearchableResource.count).to eq(0)
+        end
+      end
     end
   end
 end

From 8e109d9f2262273b930440bcf73f6f626a786382 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Mon, 8 Jun 2026 16:29:48 +0200
Subject: [PATCH 063/131] Backport 'Fix census permissions in surveys' to v0.31
 (#17053)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix census permissions in surveys

* Fix test

* Include test

* Lint

Co-authored-by: Alejandro Rueda López <alejandro.rueda@nazaries.com>
---
 .../decidim/surveys/surveys_controller.rb     |  2 +-
 .../helpers/decidim/surveys/survey_helper.rb  |  2 +-
 .../surveys/surveys/no_permission.html.erb    | 50 ++++++++++++++++---
 decidim-surveys/spec/system/survey_spec.rb    | 38 +++++++++++++-
 4 files changed, 82 insertions(+), 10 deletions(-)

diff --git a/decidim-surveys/app/controllers/decidim/surveys/surveys_controller.rb b/decidim-surveys/app/controllers/decidim/surveys/surveys_controller.rb
index 0b1a83ad175e6..cece5d6284ea9 100644
--- a/decidim-surveys/app/controllers/decidim/surveys/surveys_controller.rb
+++ b/decidim-surveys/app/controllers/decidim/surveys/surveys_controller.rb
@@ -30,7 +30,7 @@ def edit
       end
 
       def check_permissions
-        render :no_permission unless action_authorized_to(:response, resource: survey).ok?
+        render :no_permission unless action_authorized_to(:respond, resource: survey).ok?
       end
 
       def questionnaire_for
diff --git a/decidim-surveys/app/helpers/decidim/surveys/survey_helper.rb b/decidim-surveys/app/helpers/decidim/surveys/survey_helper.rb
index ea2943718c498..88494775df336 100644
--- a/decidim-surveys/app/helpers/decidim/surveys/survey_helper.rb
+++ b/decidim-surveys/app/helpers/decidim/surveys/survey_helper.rb
@@ -24,7 +24,7 @@ def authorize_action_path(handler_name)
       end
 
       def authorizations
-        @authorizations ||= action_authorized_to(:response, resource: questionnaire_for)
+        @authorizations ||= action_authorized_to(:respond, resource: questionnaire_for)
       end
 
       def filter_date_values
diff --git a/decidim-surveys/app/views/decidim/surveys/surveys/no_permission.html.erb b/decidim-surveys/app/views/decidim/surveys/surveys/no_permission.html.erb
index ae944942c0d0f..05d08346a4a6d 100644
--- a/decidim-surveys/app/views/decidim/surveys/surveys/no_permission.html.erb
+++ b/decidim-surveys/app/views/decidim/surveys/surveys/no_permission.html.erb
@@ -1,9 +1,45 @@
-<div class="row">
-  <div class="columns large-6">
-    <div class="card">
-      <div>
-        <%= cell "decidim/authorization_modal", authorizations %>
-      </div>
+<% add_decidim_meta_tags({
+                           title: translated_attribute(questionnaire.title),
+                           description: translated_attribute(questionnaire.description)
+                         }) %>
+
+<%= render layout: "layouts/decidim/shared/layout_center" do %>
+  <div class="text-center mt-8">
+    <div class="flex justify-center">
+      <%= icon "lock-line", class: "w-20 h-20" %>
+    </div>
+    <h1 tabindex="-1" class="h1">
+      <%= t("#{authorizations.global_code || :missing}.title", scope: "decidim.authorization_modals.content") %>
+    </h1>
+    <div class="authorization-modal__verification-container">
+      <% authorizations.statuses.each do |status| %>
+        <% next if status.ok? %>
+        <% next if authorizations.global_code && status.code != (authorizations.global_code || :missing) %>
+
+        <div class="authorization-modal__verification">
+          <p>
+            <%= t(
+                  "#{status.code}.explanation",
+                  authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers"),
+                  scope: "decidim.authorization_modals.content"
+                ) %>
+          </p>
+
+          <% if status.data[:action].present? %>
+            <%= action_authorized_link_to(
+                  :respond,
+                  t(
+                    "#{status.code}.#{status.data[:action]}",
+                    authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers"),
+                    scope: "decidim.authorization_modals.content"
+                  ),
+                  survey_path(questionnaire_for),
+                  class: "button button__lg button__secondary",
+                  resource: questionnaire_for
+                ) %>
+          <% end %>
+        </div>
+      <% end %>
     </div>
   </div>
-</div>
+<% end %>
diff --git a/decidim-surveys/spec/system/survey_spec.rb b/decidim-surveys/spec/system/survey_spec.rb
index c21b7c055e376..df67453745d8d 100644
--- a/decidim-surveys/spec/system/survey_spec.rb
+++ b/decidim-surveys/spec/system/survey_spec.rb
@@ -126,7 +126,7 @@
   context "when the survey requires permissions to be responded" do
     before do
       permissions = {
-        response: {
+        respond: {
           authorization_handlers: {
             "dummy_authorization_handler" => { "options" => {} }
           }
@@ -146,6 +146,42 @@
     end
   end
 
+  context "when the survey requires an ephemeral authorization to be responded" do
+    let!(:organization) do
+      create(:organization, available_authorizations: %w(ephemeral_dummy_authorization_handler dummy_authorization_handler))
+    end
+
+    before do
+      permissions = {
+        respond: {
+          authorization_handlers: {
+            "ephemeral_dummy_authorization_handler" => { "options" => { "allowed_postal_codes" => "1234, 4567" } }
+          }
+        }
+      }
+
+      component.update!(permissions:)
+      survey.update!(allow_responses: true, starts_at: 1.week.ago, ends_at: 1.day.from_now)
+      visit_component
+      choose "All"
+      click_on translated_attribute(questionnaire.title)
+    end
+
+    it "renders the inline authorization page with a verification call to action" do
+      expect(page).to have_text("Authorization required")
+      expect(page).to have_link(text: /Authorize with/)
+    end
+
+    it "lets an unregistered user verify their identity without signing in" do
+      expect do
+        click_on "Authorize with \"Ephemeral example authorization\""
+      end.to change { Decidim::User.ephemeral.count }.by(1)
+
+      expect(page).to have_css("h1", text: "Verify with Ephemeral example authorization")
+      expect(page).to have_no_css("#loginModal", visible: :visible)
+    end
+  end
+
   context "when the survey allow responses" do
     context "when the survey is closed by start and end dates" do
       before do

From 615524503a0b6262d5a51032dcf2ddede367a900 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Tue, 9 Jun 2026 11:20:26 +0200
Subject: [PATCH 064/131] Backport 'Fix exception on post new page as a
 visitor' to v0.31 (#17059)

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
---
 .../decidim/blogs/posts_controller.rb         |  1 +
 .../decidim/blogs/posts_controller_spec.rb    | 74 ++++++++++++++++---
 2 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb b/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
index 0a3dbb969658f..08e385443ad6a 100644
--- a/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
+++ b/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
@@ -12,6 +12,7 @@ class PostsController < Decidim::Blogs::ApplicationController
       include Decidim::FormFactory
 
       helper_method :posts, :post, :post_presenter, :paginate_posts, :posts_most_commented, :tabs, :panels
+      before_action :authenticate_user!, only: [:new, :create, :edit, :update, :destroy]
 
       def index; end
 
diff --git a/decidim-blogs/spec/controllers/decidim/blogs/posts_controller_spec.rb b/decidim-blogs/spec/controllers/decidim/blogs/posts_controller_spec.rb
index 6351f93ded640..51bbc8a5ac5d1 100644
--- a/decidim-blogs/spec/controllers/decidim/blogs/posts_controller_spec.rb
+++ b/decidim-blogs/spec/controllers/decidim/blogs/posts_controller_spec.rb
@@ -5,22 +5,25 @@
 module Decidim
   module Blogs
     describe PostsController do
+      include Decidim::Core::Engine.routes.url_helpers
+
+      let(:organization) { create(:organization) }
+      let(:participatory_process) { create(:participatory_process, organization:) }
+      let!(:post_component) { create(:post_component, participatory_space: participatory_process) }
+      let!(:published) { create(:post, component: post_component, created_at: 2.days.ago, published_at: 2.days.ago) }
+
+      before do
+        request.env["decidim.current_organization"] = organization
+        request.env["decidim.current_component"] = post_component
+        request.env["decidim.current_participatory_space"] = participatory_process
+      end
+
       describe "show" do
         context "when the post has not published yet" do
-          let(:organization) { create(:organization) }
-          let(:participatory_process) { create(:participatory_process, organization:) }
-          let!(:post_component) { create(:post_component, participatory_space: participatory_process) }
           let!(:unpublished) { create(:post, component: post_component, created_at: 2.days.ago, published_at: 2.days.from_now) }
-          let!(:published) { create(:post, component: post_component, created_at: 2.days.ago, published_at: 2.days.ago) }
           let!(:another_published) { create(:post, component: post_component, created_at: 3.days.ago, published_at: 1.day.ago) }
           let!(:current_user) { create(:user, :admin, :confirmed, organization:) }
 
-          before do
-            request.env["decidim.current_organization"] = organization
-            request.env["decidim.current_component"] = post_component
-            request.env["decidim.current_participatory_space"] = participatory_process
-          end
-
           it "lists only published posts" do
             get :index
             expect(controller.helpers.posts).to eq([another_published, published])
@@ -63,6 +66,57 @@ module Blogs
           end
         end
       end
+
+      describe "#destroy" do
+        context "when user is not authenticated" do
+          it "redirects to login page" do
+            delete(:destroy, params: { id: published.id })
+            expect(flash[:alert]).to eq("You need to log in or create an account before continuing.")
+            expect(response).to redirect_to(new_user_session_path)
+            expect(published.reload).to be_present
+          end
+        end
+      end
+
+      describe "#new" do
+        context "when user is not authenticated" do
+          it "redirects to login page" do
+            get :new
+            expect(flash[:alert]).to eq("You need to log in or create an account before continuing.")
+            expect(response).to redirect_to(new_user_session_path)
+          end
+        end
+      end
+
+      describe "#create" do
+        context "when user is not authenticated" do
+          it "redirects to login page" do
+            post(:create, params: { component_id: post_component.id })
+            expect(flash[:alert]).to eq("You need to log in or create an account before continuing.")
+            expect(response).to redirect_to(new_user_session_path)
+          end
+        end
+      end
+
+      describe "#edit" do
+        context "when user is not authenticated" do
+          it "redirects to login page" do
+            get :edit, params: { component_id: post_component.id, id: published.id }
+            expect(flash[:alert]).to eq("You need to log in or create an account before continuing.")
+            expect(response).to redirect_to(new_user_session_path)
+          end
+        end
+      end
+
+      describe "#update" do
+        context "when user is not authenticated" do
+          it "redirects to login page" do
+            put :update, params: { component_id: post_component.id, id: published.id }
+            expect(flash[:alert]).to eq("You need to log in or create an account before continuing.")
+            expect(response).to redirect_to(new_user_session_path)
+          end
+        end
+      end
     end
   end
 end

From ac134d11e642c747a923e164774a30c9c3a71d3b Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Tue, 9 Jun 2026 19:16:59 +0200
Subject: [PATCH 065/131] Backport 'Fix exception in intiatives when
 `has_authorship?` receives a nil argument for u' to v0.31 (#17067)

* Fix initiatives pipeline

* Add spec to prevent regression

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
---
 .github/workflows/ci_initiatives.yml                       | 1 +
 decidim-initiatives/app/models/decidim/initiative.rb       | 1 +
 decidim-initiatives/spec/models/decidim/initiative_spec.rb | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/.github/workflows/ci_initiatives.yml b/.github/workflows/ci_initiatives.yml
index 2dd5b83241e4b..9c19f7fa432d0 100644
--- a/.github/workflows/ci_initiatives.yml
+++ b/.github/workflows/ci_initiatives.yml
@@ -16,6 +16,7 @@ on:
       - "decidim-core/**"
       - "decidim-dev/**"
       - "decidim-initiatives/**"
+      - "decidim-meetings/**"
       - "decidim-verifications/**"
 
 permissions:
diff --git a/decidim-initiatives/app/models/decidim/initiative.rb b/decidim-initiatives/app/models/decidim/initiative.rb
index 9ce1d59fd3d14..ed19712269778 100644
--- a/decidim-initiatives/app/models/decidim/initiative.rb
+++ b/decidim-initiatives/app/models/decidim/initiative.rb
@@ -388,6 +388,7 @@ def comments_have_votes?
     #
     # Returns a Boolean.
     def has_authorship?(user)
+      return false unless user
       return true if author.id == user.id
 
       committee_members.approved.where(decidim_users_id: user.id).any?
diff --git a/decidim-initiatives/spec/models/decidim/initiative_spec.rb b/decidim-initiatives/spec/models/decidim/initiative_spec.rb
index 779dd5b3b4a72..aee29a29d29de 100644
--- a/decidim-initiatives/spec/models/decidim/initiative_spec.rb
+++ b/decidim-initiatives/spec/models/decidim/initiative_spec.rb
@@ -173,6 +173,10 @@ module Decidim
       it "returns false for any other user" do
         expect(initiative).not_to have_authorship(user)
       end
+
+      it "returns false for any inexistent user" do
+        expect(initiative).not_to have_authorship(nil)
+      end
     end
 
     describe "signatures calculations" do

From 7de23062de1af5720b06c24db09ffef06c39f5be Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Wed, 10 Jun 2026 15:11:48 +0300
Subject: [PATCH 066/131] Backport 'Fix create meeting display button' to v0.31
 (#17056)

* Fix create meeting display button

* Fix create meeting display button

* Apply coderabbit's suggestions

* Fix failing spec

* Fix failing specs
---
 .../decidim/meetings/meetings_controller.rb   |  1 +
 .../decidim/meetings/meeting_permissions.rb   |  2 -
 .../meetings/meetings_controller_spec.rb      | 77 +++++++++++++++++--
 .../spec/system/user_creates_meeting_spec.rb  | 66 ++++++++++++++++
 4 files changed, 139 insertions(+), 7 deletions(-)

diff --git a/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb b/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb
index 84090d599e9be..f06b8d11516bd 100644
--- a/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb
+++ b/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb
@@ -21,6 +21,7 @@ class MeetingsController < Decidim::Meetings::ApplicationController
       helper_method :meetings, :meeting, :registration, :registration_qr_code_image, :search, :tab_panel_items, :withdrawn_meetings?
 
       before_action :add_additional_csp_directives, only: [:show]
+      before_action :authenticate_user!, only: [:new, :create, :edit, :update, :withdraw]
 
       def new
         enforce_permission_to :create, :meeting
diff --git a/decidim-meetings/app/permissions/decidim/meetings/meeting_permissions.rb b/decidim-meetings/app/permissions/decidim/meetings/meeting_permissions.rb
index 64a6e6ad0543e..8f6c34800e67f 100644
--- a/decidim-meetings/app/permissions/decidim/meetings/meeting_permissions.rb
+++ b/decidim-meetings/app/permissions/decidim/meetings/meeting_permissions.rb
@@ -39,8 +39,6 @@ def can_decline_invitation?
       end
 
       def can_create?
-        return false unless user
-
         (component_settings&.creation_enabled_for_participants? && can_participate?) || initiative_authorship?
       end
 
diff --git a/decidim-meetings/spec/controllers/decidim/meetings/meetings_controller_spec.rb b/decidim-meetings/spec/controllers/decidim/meetings/meetings_controller_spec.rb
index b5457366d3827..7f377e776c761 100644
--- a/decidim-meetings/spec/controllers/decidim/meetings/meetings_controller_spec.rb
+++ b/decidim-meetings/spec/controllers/decidim/meetings/meetings_controller_spec.rb
@@ -3,6 +3,8 @@
 require "spec_helper"
 
 describe Decidim::Meetings::MeetingsController do
+  include Decidim::Core::Engine.routes.url_helpers
+
   let(:organization) { create(:organization) }
   let(:participatory_process) { create(:participatory_process, organization:) }
   let(:meeting_component) { create(:meeting_component, :with_creation_enabled, participatory_space: participatory_process) }
@@ -49,15 +51,15 @@
         component_id: meeting_component.id
       }
     end
-    let(:params) { { meeting: meeting_params } }
-
-    before { sign_in user }
+    let(:params) { { meeting: meeting_params, id: meeting.id } }
 
     context "when an authorized user is withdrawing a meeting" do
       let(:meeting) { create(:meeting, component: meeting_component, author: user) }
 
+      before { sign_in user }
+
       it "withdraws the meeting" do
-        put :withdraw, params: params.merge(id: meeting.id)
+        put(:withdraw, params:)
 
         expect(flash[:notice]).to eq("The meeting has been withdrawn successfully.")
         expect(response).to have_http_status(:found)
@@ -70,8 +72,10 @@
       let(:current_user) { create(:user, organization: meeting_component.organization) }
       let(:meeting) { create(:meeting, component: meeting_component, author: current_user) }
 
+      before { sign_in user }
+
       it "is not able to withdraw the meeting" do
-        put :withdraw, params: params.merge(id: meeting.id)
+        put(:withdraw, params:)
 
         expect(flash[:alert]).to eq("You are not authorized to perform this action.")
         expect(response).to have_http_status(:found)
@@ -79,6 +83,18 @@
         expect(meeting.withdrawn?).to be false
       end
     end
+
+    context "when user is not authenticated" do
+      let(:user) { nil }
+
+      it "redirects to login page" do
+        put(:withdraw, params:)
+        expect(flash[:alert]).to eq("You need to log in or create an account before continuing.")
+        expect(response).to redirect_to(new_user_session_path)
+        meeting.reload
+        expect(meeting.withdrawn?).to be false
+      end
+    end
   end
 
   describe "#show" do
@@ -160,4 +176,55 @@
       end
     end
   end
+
+  describe "#create" do
+    let(:meeting_params) do
+      {
+        component_id: meeting_component.id
+      }
+    end
+    let(:params) { { meeting: meeting_params } }
+
+    context "when user is not authenticated" do
+      it "redirects to login page" do
+        post(:create, params:)
+        expect(flash[:alert]).to eq("You need to log in or create an account before continuing.")
+        expect(response).to redirect_to(new_user_session_path)
+      end
+    end
+  end
+
+  describe "#edit" do
+    let(:meeting_params) do
+      {
+        component_id: meeting_component.id
+      }
+    end
+    let(:params) { { meeting: meeting_params, id: meeting.id } }
+
+    context "when user is not authenticated" do
+      it "redirects to login page" do
+        get(:edit, params:)
+        expect(flash[:alert]).to eq("You need to log in or create an account before continuing.")
+        expect(response).to redirect_to(new_user_session_path)
+      end
+    end
+  end
+
+  describe "#update" do
+    let(:meeting_params) do
+      {
+        component_id: meeting_component.id
+      }
+    end
+    let(:params) { { meeting: meeting_params, id: meeting.id } }
+
+    context "when user is not authenticated" do
+      it "redirects to login page" do
+        put(:update, params:)
+        expect(flash[:alert]).to eq("You need to log in or create an account before continuing.")
+        expect(response).to redirect_to(new_user_session_path)
+      end
+    end
+  end
 end
diff --git a/decidim-meetings/spec/system/user_creates_meeting_spec.rb b/decidim-meetings/spec/system/user_creates_meeting_spec.rb
index c0fe104c59569..34c1c533f27fa 100644
--- a/decidim-meetings/spec/system/user_creates_meeting_spec.rb
+++ b/decidim-meetings/spec/system/user_creates_meeting_spec.rb
@@ -33,6 +33,72 @@
     switch_to_host(organization.host)
   end
 
+  context "when the user is not logged in" do
+    context "when creation is enabled" do
+      let!(:component) do
+        create(:meeting_component,
+               participatory_space: participatory_process,
+               settings: { creation_enabled_for_participants: true, taxonomy_filters: [taxonomy_filter.id] })
+      end
+
+      it "displays the new meeting button" do
+        visit_component
+        expect(page).to have_text("New meeting")
+      end
+
+      it "redirects to login page when visiting new page" do
+        visit Decidim::EngineRouter.main_proxy(component).new_meeting_path
+        expect(page).to have_text("You need to log in or create an account before continuing.")
+        expect(page).to have_current_path(decidim.new_user_session_path)
+      end
+    end
+
+    context "when creation is disabled" do
+      let!(:component) do
+        create(:meeting_component,
+               participatory_space: participatory_process,
+               settings: { taxonomy_filters: [taxonomy_filter.id] })
+      end
+
+      it "hides the new meeting button" do
+        visit_component
+        expect(page).to have_no_text("New meeting")
+      end
+    end
+  end
+
+  context "when the user is logged in" do
+    before do
+      login_as user, scope: :user
+    end
+
+    context "when creation is enabled" do
+      let!(:component) do
+        create(:meeting_component,
+               participatory_space: participatory_process,
+               settings: { creation_enabled_for_participants: true, taxonomy_filters: [taxonomy_filter.id] })
+      end
+
+      it "displays the new post button" do
+        visit_component
+        expect(page).to have_text("New meeting")
+      end
+    end
+
+    context "when creation is disabled" do
+      let!(:component) do
+        create(:meeting_component,
+               participatory_space: participatory_process,
+               settings: { taxonomy_filters: [taxonomy_filter.id] })
+      end
+
+      it "hides the new meeting button" do
+        visit_component
+        expect(page).to have_no_text("New meeting")
+      end
+    end
+  end
+
   context "when creating a new meeting" do
     let(:user) { create(:user, :confirmed, organization:) }
 

From 2d1a78b014fd32023b3c7836b9312c347b50d5a9 Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Wed, 10 Jun 2026 15:13:06 +0300
Subject: [PATCH 067/131] Backport 'Fix conversations multiple mentions UI' to
 v0.31 (#17079)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix conversations multiple mentions UI

Prompt:

"""
Replace the legacy usage of the Autocomplete on the Multiple Mentions
controller with TomSelect
"""

Assisted-By: DeepSeek V4 Flash Free (OpenCode)
<andreslucena+ai@users.noreply.github.com>

* Fix styles

* Escape the values displayed by Tom Select

* Fix specs

* Fix rubocop offenses

* Escape the values displayed by Tom Select (part 2)

* Fix eslint offense

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 .../multiple_mentions/controller.js           | 100 ++++++++++++------
 .../input_multiple_mentions.test.js           |  53 ++++++----
 .../stylesheets/decidim/_tom_select.scss      |  23 ++++
 .../stylesheets/decidim/application.scss      |   2 +
 .../system/messaging/conversations_spec.rb    |  19 ++--
 5 files changed, 132 insertions(+), 65 deletions(-)
 create mode 100644 decidim-core/app/packs/stylesheets/decidim/_tom_select.scss

diff --git a/decidim-core/app/packs/src/decidim/controllers/multiple_mentions/controller.js b/decidim-core/app/packs/src/decidim/controllers/multiple_mentions/controller.js
index 6d7a35533feac..851ad85c552f7 100644
--- a/decidim-core/app/packs/src/decidim/controllers/multiple_mentions/controller.js
+++ b/decidim-core/app/packs/src/decidim/controllers/multiple_mentions/controller.js
@@ -1,5 +1,5 @@
 import { Controller } from "@hotwired/stimulus"
-import AutoComplete from "src/decidim/refactor/moved/autocomplete";
+import TomSelect from "tom-select/dist/cjs/tom-select.popular";
 import icon from "src/decidim/refactor/moved/icon";
 
 export default class extends Controller {
@@ -16,20 +16,6 @@ export default class extends Controller {
 
     this.initializeEmptyFocusElement();
     this.initializeAutoComplete();
-    this.setupSelectionListener();
-  }
-
-  /**
-   * Setup the selection event listener
-   * @returns {void}
-   */
-  setupSelectionListener() {
-    this.selectionHandler = (event) => {
-      const feedback = event.detail;
-      const selection = feedback.selection;
-      this.handleSelection(selection);
-    };
-    this.searchInput.addEventListener("selection", this.selectionHandler);
   }
 
   /*
@@ -37,8 +23,8 @@ export default class extends Controller {
    * @returns {void}
    */
   disconnect() {
-    if (this.searchInput && this.selectionHandler) {
-      this.searchInput.removeEventListener("selection", this.selectionHandler);
+    if (this.tomSelect) {
+      this.tomSelect.destroy();
     }
   }
 
@@ -80,11 +66,56 @@ export default class extends Controller {
    * @returns {void}
    */
   initializeAutoComplete() {
-    this.autoComplete = new AutoComplete(this.searchInput, {
-      dataMatchKeys: ["name", "nickname"],
-      dataSource: this.getDataSource.bind(this),
-      dataFilter: this.filterResults.bind(this),
-      modifyResult: this.modifyResult.bind(this)
+    this.tomSelect = new TomSelect(this.searchInput, {
+      maxItems: 1,
+      valueField: "id",
+      labelField: "name",
+      searchField: ["name", "nickname"],
+      loadThrottle: 200,
+      loadingClass: "loading",
+      preload: false,
+      highlight: true,
+      load: (query, callback) => {
+        if (!query || query.length < 2) {
+          callback();
+          return;
+        }
+        this.getDataSource(query, (results) => {
+          const filtered = this.filterResults(results);
+          filtered.forEach((item) => {
+            if (item.directMessagesEnabled === "false") {
+              item.disabled = true;
+            }
+          });
+          callback(filtered);
+        });
+      },
+      render: {
+        option: (data, escape) => {
+          const isDisabled = data.directMessagesEnabled === "false";
+          const className = isDisabled
+            ? "disabled"
+            : "";
+          const disabledMsg = isDisabled
+            ? `<small>${escape(this.searchInput.dataset.directMessagesDisabled)}</small>`
+            : "";
+          return `<div class="${className}">
+            <img src="${escape(data.avatarUrl)}" alt="${escape(data.name)}">
+            <span>${escape(data.nickname)}</span>
+            <small>${escape(data.name)}</small>
+            ${disabledMsg}
+          </div>`;
+        },
+        "no_results": () => `<div class="no-results">${this.searchInput.dataset.noresults || ""}</div>`
+      },
+      onChange: (value) => {
+        if (value) {
+          const option = this.tomSelect.options[value];
+          this.handleSelection({ value: option });
+          this.tomSelect.clear();
+          this.tomSelect.clearOptions();
+        }
+      }
     });
   }
 
@@ -129,7 +160,7 @@ export default class extends Controller {
    */
   filterResults(list) {
     return list.filter(
-      (item) => !this.selected.includes(item.value.id)
+      (item) => !this.selected.includes(item.id)
     );
   }
 
@@ -161,18 +192,23 @@ export default class extends Controller {
    */
   handleSelection(selection) {
     const id = selection.value.id;
-    // Check if we have reached the maximum limit or if direct messages are disabled
     if (this.isMaxLimitReached() || selection.value.directMessagesEnabled === "false") {
       return;
     }
 
     this.addSelectedUser(selection, id);
-    this.autoComplete.setInput("");
     this.selected.push(id);
+  }
 
-    if (this.autoComplete && this.autoComplete.autocomplete) {
-      this.autoComplete.autocomplete.close();
-    }
+  /**
+   * Escape HTML characters in a string
+   * @param {string} str - The string to escape
+   * @returns {string} The escaped HTML string
+   */
+  htmlEscape(str) {
+    const div = document.createElement("div");
+    div.appendChild(document.createTextNode(str));
+    return div.innerHTML;
   }
 
   /**
@@ -187,10 +223,10 @@ export default class extends Controller {
     const listItem = document.createElement("li");
     listItem.tabIndex = "-1";
     listItem.innerHTML = `
-      <input type="hidden" name="${this.options.name}" value="${id}">
-      <img src="${selection.value.avatarUrl}" alt="${selection.value.name}">
-      <span>${selection.value.name}</span>
-      <button type="button" data-remove="${id}" tabindex="0" aria-controls="0" aria-label="${label}">${icon("delete-bin-line")}</button>
+      <input type="hidden" name="${this.htmlEscape(this.options.name)}" value="${this.htmlEscape(id)}">
+      <img src="${this.htmlEscape(selection.value.avatarUrl)}" alt="${this.htmlEscape(selection.value.name)}">
+      <span>${this.htmlEscape(selection.value.name)}</span>
+      <button type="button" data-remove="${this.htmlEscape(id)}" tabindex="0" aria-controls="0" aria-label="${this.htmlEscape(label)}">${icon("delete-bin-line")}</button>
     `;
 
     this.selectedItems.appendChild(listItem);
diff --git a/decidim-core/app/packs/src/decidim/controllers/multiple_mentions/input_multiple_mentions.test.js b/decidim-core/app/packs/src/decidim/controllers/multiple_mentions/input_multiple_mentions.test.js
index 2ee43ac67922f..257db953b6347 100644
--- a/decidim-core/app/packs/src/decidim/controllers/multiple_mentions/input_multiple_mentions.test.js
+++ b/decidim-core/app/packs/src/decidim/controllers/multiple_mentions/input_multiple_mentions.test.js
@@ -7,13 +7,14 @@
 import { Application } from "@hotwired/stimulus"
 import MultipleMentionsController from "src/decidim/controllers/multiple_mentions/controller"
 
-const AutoComplete = require("src/decidim/refactor/moved/autocomplete");
+const TomSelect = require("tom-select/dist/cjs/tom-select.popular");
 const iconMock = require("src/decidim/refactor/moved/icon");
 
 // Mock the dependencies
-jest.mock("src/decidim/refactor/moved/autocomplete", () => {
+jest.mock("tom-select/dist/cjs/tom-select.popular", () => {
   return jest.fn().mockImplementation(() => ({
-    setInput: jest.fn()
+    destroy: jest.fn(),
+    clearOptions: jest.fn()
   }));
 });
 
@@ -114,12 +115,22 @@ describe("MultipleMentionsManager", () => {
       expect(controller.emptyFocusElement).toBe(existingElement);
     });
 
-    it("should initialize AutoComplete with correct configuration", () => {
-      expect(AutoComplete).toHaveBeenCalledWith(searchInput, {
-        dataMatchKeys: ["name", "nickname"],
-        dataSource: expect.any(Function),
-        dataFilter: expect.any(Function),
-        modifyResult: expect.any(Function)
+    it("should initialize TomSelect with correct configuration", () => {
+      expect(TomSelect).toHaveBeenCalledWith(searchInput, {
+        maxItems: 1,
+        valueField: "id",
+        labelField: "name",
+        searchField: ["name", "nickname"],
+        loadThrottle: 200,
+        loadingClass: "loading",
+        preload: false,
+        highlight: true,
+        load: expect.any(Function),
+        render: {
+          option: expect.any(Function),
+          "no_results": expect.any(Function)
+        },
+        onChange: expect.any(Function)
       });
     });
   });
@@ -226,24 +237,24 @@ describe("MultipleMentionsManager", () => {
       controller.selected = ["1", "3"];
 
       const list = [
-        { value: { id: "1" } },
-        { value: { id: "2" } },
-        { value: { id: "3" } },
-        { value: { id: "4" } }
+        { id: "1" },
+        { id: "2" },
+        { id: "3" },
+        { id: "4" }
       ];
 
       const filtered = controller.filterResults(list);
 
       expect(filtered).toEqual([
-        { value: { id: "2" } },
-        { value: { id: "4" } }
+        { id: "2" },
+        { id: "4" }
       ]);
     });
 
     it("should return all users when none are selected", () => {
       const list = [
-        { value: { id: "1" } },
-        { value: { id: "2" } }
+        { id: "1" },
+        { id: "2" }
       ];
 
       const filtered = controller.filterResults(list);
@@ -255,8 +266,8 @@ describe("MultipleMentionsManager", () => {
       controller.selected = ["1", "2"];
 
       const list = [
-        { value: { id: "1" } },
-        { value: { id: "2" } }
+        { id: "1" },
+        { id: "2" }
       ];
 
       const filtered = controller.filterResults(list);
@@ -330,7 +341,6 @@ describe("MultipleMentionsManager", () => {
 
       expect(controller.selected).toContain("1");
       expect(selectedItems.children.length).toBe(1);
-      expect(controller.autoComplete.setInput).toHaveBeenCalledWith("");
     });
 
     it("should not add user when max limit is reached", () => {
@@ -350,7 +360,6 @@ describe("MultipleMentionsManager", () => {
 
       expect(controller.selected).not.toContain("10");
       expect(selectedItems.children.length).toBe(0);
-      expect(controller.autoComplete.setInput).not.toHaveBeenCalled();
     });
 
     it("should not add user when direct messages are disabled", () => {
@@ -368,7 +377,6 @@ describe("MultipleMentionsManager", () => {
 
       expect(controller.selected).not.toContain("1");
       expect(selectedItems.children.length).toBe(0);
-      expect(controller.autoComplete.setInput).not.toHaveBeenCalled();
     });
 
     it("should handle multiple valid selections", () => {
@@ -383,7 +391,6 @@ describe("MultipleMentionsManager", () => {
 
       expect(controller.selected).toEqual(["1", "2"]);
       expect(selectedItems.children.length).toBe(2);
-      expect(controller.autoComplete.setInput).toHaveBeenCalledTimes(2);
     });
   });
 
diff --git a/decidim-core/app/packs/stylesheets/decidim/_tom_select.scss b/decidim-core/app/packs/stylesheets/decidim/_tom_select.scss
new file mode 100644
index 0000000000000..9c5cfc3fde45e
--- /dev/null
+++ b/decidim-core/app/packs/stylesheets/decidim/_tom_select.scss
@@ -0,0 +1,23 @@
+@use "tom-select/dist/scss/tom-select";
+
+.ts {
+  &-control {
+    @apply border-gray text-md min-h-[40px];
+
+    input {
+      @apply font-normal text-black text-md;
+    }
+  }
+
+  &-dropdown {
+    @apply text-md text-gray-2 font-normal;
+
+    .option img {
+      @apply inline;
+    }
+
+    .active {
+      @apply bg-gray-3;
+    }
+  }
+}
diff --git a/decidim-core/app/packs/stylesheets/decidim/application.scss b/decidim-core/app/packs/stylesheets/decidim/application.scss
index 7a85caabde943..99df230867229 100644
--- a/decidim-core/app/packs/stylesheets/decidim/application.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/application.scss
@@ -6,6 +6,8 @@
 // Datepicker
 @use "stylesheets/decidim/vendor/datepicker_light";
 @use "stylesheets/decidim/datepicker";
+// TomSelect
+@use "stylesheets/decidim/tom_select";
 // On the other hand, the following styles match with specific routes
 @use "stylesheets/decidim/header";
 @use "stylesheets/decidim/footer";
diff --git a/decidim-core/spec/system/messaging/conversations_spec.rb b/decidim-core/spec/system/messaging/conversations_spec.rb
index 9aca224dd7dbb..c13f8ad30e2a0 100644
--- a/decidim-core/spec/system/messaging/conversations_spec.rb
+++ b/decidim-core/spec/system/messaging/conversations_spec.rb
@@ -287,11 +287,10 @@
           visit_inbox
           expect(page).to have_content("New conversation")
           click_on "New conversation"
-          expect(page).to have_css("#add_conversation_users")
-          field = find_by_id("add_conversation_users")
-          field.set ""
+          expect(page).to have_css(".ts-control input")
+          field = find(".ts-control input")
           field.native.send_keys "@#{interlocutor2.nickname.slice(0, 3)}"
-          expect(page).to have_css("#autoComplete_list_1 li.disabled", wait: 5)
+          expect(page).to have_css(".ts-dropdown .option.disabled", wait: 5)
         end
       end
 
@@ -302,19 +301,19 @@
         it "does not insert element twice and closes dropdown", :slow do
           visit_inbox
           click_on "New conversation"
-          expect(page).to have_css("#add_conversation_users")
+          expect(page).to have_css(".ts-control input")
 
-          field = find_by_id("add_conversation_users")
+          field = find(".ts-control input")
           field.native.send_keys "Mar"
 
-          expect(page).to have_css("#autoComplete_list_1 li", wait: 5)
+          expect(page).to have_css(".ts-dropdown .option", wait: 5)
 
-          find("#autoComplete_list_1 li").click
+          find(".ts-dropdown .option", match: :first).click
 
           expect(page).to have_css(".conversation__modal-results li", count: 1)
           expect(page).to have_content("Maria")
-          expect(page).to have_no_css("#autoComplete_list_1 li", wait: 2)
-          expect(field.value).to eq("")
+          expect(page).to have_no_css(".ts-dropdown .option", visible: :visible)
+          expect(find_by_id("add_conversation_users", visible: false).value).to eq("")
         end
       end
     end

From bf75dd39e49995cb8b0e1924ae7856920292621c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= <ivan@pokecode.net>
Date: Wed, 10 Jun 2026 16:56:57 +0200
Subject: [PATCH 068/131] avoid html char in js (#106)

---
 .../app/views/decidim/proposals/proposals/index.js.erb          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/decidim-proposals/app/views/decidim/proposals/proposals/index.js.erb b/decidim-proposals/app/views/decidim/proposals/proposals/index.js.erb
index 9dd9fc0cc9e0e..c5dc68b2a569c 100644
--- a/decidim-proposals/app/views/decidim/proposals/proposals/index.js.erb
+++ b/decidim-proposals/app/views/decidim/proposals/proposals/index.js.erb
@@ -10,7 +10,7 @@ $orderFilterInput.val('<%= order %>');
   if (controller) {
     var markerData = JSON.parse('<%= escape_javascript cell("decidim/map", @proposals, metadata_card: "decidim/proposals/proposal_metadata").geocoded_data.to_json.html_safe %>');
     controller.clearMarkers();
-    if (markerData.length > 0 ) {
+    if (markerData.length) {
       controller.addMarkers(markerData);
     }
   }

From 9d0d3ed53d72b02c594f250a69acfae24ec4db2b Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Wed, 10 Jun 2026 18:53:44 +0200
Subject: [PATCH 069/131] Backport 'Fix performance when sending digest
 notitfications' to v0.31 (#17076)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Reduce user scope in digest mails, inline tasks

We preselect all Notifications and the affected users in the configured
time period. Then we only enqueue the job for these users.

Tasks were inlined to prevent rake task method bleed:
https://albertoalmagro.com/ruby-methods-defined-in-rake-tasks/

* Add specs

Prompt:

"""
Check out the change done in f113124e0046693accaf1a0759d220f2ab8628e8
Add a spec for each of the rake tasks in separate files
"""

Assisted-By: GPT-5.3-Codex (OpenCode)
<andreslucena+ai@users.noreply.github.com>

* Add change proposed in code review

---------

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
Co-authored-by: Thomas Burkhalter <new.mysteryman@gmail.com>
---
 .../lib/tasks/decidim_mailers_tasks.rake      | 40 ++++++++++++++-----
 ...mailers_notifications_digest_daily_spec.rb | 37 +++++++++++++++++
 ...ailers_notifications_digest_weekly_spec.rb | 37 +++++++++++++++++
 3 files changed, 105 insertions(+), 9 deletions(-)
 create mode 100644 decidim-core/spec/tasks/decidim_mailers_notifications_digest_daily_spec.rb
 create mode 100644 decidim-core/spec/tasks/decidim_mailers_notifications_digest_weekly_spec.rb

diff --git a/decidim-core/lib/tasks/decidim_mailers_tasks.rake b/decidim-core/lib/tasks/decidim_mailers_tasks.rake
index b774583958850..699dc39e6cbaa 100644
--- a/decidim-core/lib/tasks/decidim_mailers_tasks.rake
+++ b/decidim-core/lib/tasks/decidim_mailers_tasks.rake
@@ -4,20 +4,42 @@ namespace :decidim do
   namespace :mailers do
     desc "Sends the notification digest email with the daily report"
     task notifications_digest_daily: :environment do
-      notifications_digest(:daily)
+      time = Time.now.utc
+      target_users = Decidim::User.where(notifications_sending_frequency: :daily)
+
+      target_users.find_in_batches do |batch|
+        notification_users =
+          Decidim::Notification
+          .daily(time)
+          .where(decidim_user_id: batch.pluck(:id))
+          .select(:decidim_user_id)
+          .distinct
+          .pluck(:decidim_user_id)
+
+        notification_users.each do |user_id|
+          Decidim::EmailNotificationsDigestGeneratorJob.perform_later(user_id, :daily, time:)
+        end
+      end
     end
 
     desc "Sends the notification digest email with the weekly report"
     task notifications_digest_weekly: :environment do
-      notifications_digest(:weekly)
-    end
-  end
+      time = Time.now.utc
+      target_users = Decidim::User.where(notifications_sending_frequency: :weekly)
+
+      target_users.find_in_batches do |batch|
+        notification_users =
+          Decidim::Notification
+          .weekly(time)
+          .where(decidim_user_id: batch.pluck(:id))
+          .select(:decidim_user_id)
+          .distinct
+          .pluck(:decidim_user_id)
 
-  def notifications_digest(frequency)
-    target_users = Decidim::User.where(notifications_sending_frequency: frequency)
-    time = Time.now.utc
-    target_users.find_each do |user|
-      Decidim::EmailNotificationsDigestGeneratorJob.perform_later(user.id, frequency, time:)
+        notification_users.each do |user_id|
+          Decidim::EmailNotificationsDigestGeneratorJob.perform_later(user_id, :weekly, time:)
+        end
+      end
     end
   end
 end
diff --git a/decidim-core/spec/tasks/decidim_mailers_notifications_digest_daily_spec.rb b/decidim-core/spec/tasks/decidim_mailers_notifications_digest_daily_spec.rb
new file mode 100644
index 0000000000000..bc2da02e16e37
--- /dev/null
+++ b/decidim-core/spec/tasks/decidim_mailers_notifications_digest_daily_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "rake decidim:mailers:notifications_digest_daily", type: :task do
+  let(:organization) { create(:organization) }
+  let(:resource) { create(:dummy_resource, organization:) }
+  let(:current_time) { Time.utc(2026, 1, 15, 12, 0, 0) }
+  let!(:target_user) { create(:user, organization:, notifications_sending_frequency: :daily) }
+  let!(:user_with_wrong_frequency) { create(:user, organization:, notifications_sending_frequency: :weekly) }
+  let!(:user_without_notifications) { create(:user, organization:, notifications_sending_frequency: :daily) }
+
+  before do
+    allow(Time).to receive(:now).and_return(current_time)
+    allow(Decidim::EmailNotificationsDigestGeneratorJob).to receive(:perform_later)
+
+    create(:notification, user: target_user, resource:, created_at: current_time - 1.day)
+    create(:notification, user: target_user, resource:, created_at: current_time - 1.day + 2.hours)
+    create(:notification, user: user_with_wrong_frequency, resource:, created_at: current_time - 1.day)
+    create(:notification, user: target_user, resource:, created_at: current_time - 2.days)
+  end
+
+  it "enqueues one daily digest job for each matching user" do
+    task.execute
+
+    expect(Decidim::EmailNotificationsDigestGeneratorJob)
+      .to have_received(:perform_later)
+      .with(target_user.id, :daily, time: current_time)
+      .once
+    expect(Decidim::EmailNotificationsDigestGeneratorJob)
+      .not_to have_received(:perform_later)
+      .with(user_with_wrong_frequency.id, :daily, time: current_time)
+    expect(Decidim::EmailNotificationsDigestGeneratorJob)
+      .not_to have_received(:perform_later)
+      .with(user_without_notifications.id, :daily, time: current_time)
+  end
+end
diff --git a/decidim-core/spec/tasks/decidim_mailers_notifications_digest_weekly_spec.rb b/decidim-core/spec/tasks/decidim_mailers_notifications_digest_weekly_spec.rb
new file mode 100644
index 0000000000000..b6bbfc69974c8
--- /dev/null
+++ b/decidim-core/spec/tasks/decidim_mailers_notifications_digest_weekly_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "rake decidim:mailers:notifications_digest_weekly", type: :task do
+  let(:organization) { create(:organization) }
+  let(:resource) { create(:dummy_resource, organization:) }
+  let(:current_time) { Time.utc(2026, 1, 15, 12, 0, 0) }
+  let!(:target_user) { create(:user, organization:, notifications_sending_frequency: :weekly) }
+  let!(:user_with_wrong_frequency) { create(:user, organization:, notifications_sending_frequency: :daily) }
+  let!(:user_without_notifications) { create(:user, organization:, notifications_sending_frequency: :weekly) }
+
+  before do
+    allow(Time).to receive(:now).and_return(current_time)
+    allow(Decidim::EmailNotificationsDigestGeneratorJob).to receive(:perform_later)
+
+    create(:notification, user: target_user, resource:, created_at: current_time - 1.week - 1.day)
+    create(:notification, user: target_user, resource:, created_at: current_time - 1.week - 4.days)
+    create(:notification, user: user_with_wrong_frequency, resource:, created_at: current_time - 1.week - 1.day)
+    create(:notification, user: target_user, resource:, created_at: current_time - 2.weeks)
+  end
+
+  it "enqueues one weekly digest job for each matching user" do
+    task.execute
+
+    expect(Decidim::EmailNotificationsDigestGeneratorJob)
+      .to have_received(:perform_later)
+      .with(target_user.id, :weekly, time: current_time)
+      .once
+    expect(Decidim::EmailNotificationsDigestGeneratorJob)
+      .not_to have_received(:perform_later)
+      .with(user_with_wrong_frequency.id, :weekly, time: current_time)
+    expect(Decidim::EmailNotificationsDigestGeneratorJob)
+      .not_to have_received(:perform_later)
+      .with(user_without_notifications.id, :weekly, time: current_time)
+  end
+end

From b2acde46997dd5bca85ffa005992275672943626 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Wed, 10 Jun 2026 20:09:57 +0200
Subject: [PATCH 070/131] Backport 'Show errors in new conversation' to v0.31
 (#17086)

* Fix Error pop-up on new conversation message

* Make the pop-up work, add some basic styling

* Run rubocops, remove unused string

* Apply review recommendations

* Apply suggestions from code review



* Apply review recommenedation - rename modal scss file

* Apply latest review suggestions

* Npm run stylelint

---------

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 decidim-core/app/packs/src/decidim/index.js   |  1 +
 .../stylesheets/decidim/_conversations.scss   | 14 +++++++++
 .../conversations/_error_modal.html.erb       | 30 +++++++------------
 .../messaging/conversations/error.js.erb      | 19 +++++++-----
 decidim-core/config/locales/en.yml            |  1 -
 .../system/messaging/conversations_spec.rb    |  9 ++++++
 6 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/decidim-core/app/packs/src/decidim/index.js b/decidim-core/app/packs/src/decidim/index.js
index e7c9bc1bf37b6..5fa554b615cc0 100644
--- a/decidim-core/app/packs/src/decidim/index.js
+++ b/decidim-core/app/packs/src/decidim/index.js
@@ -61,6 +61,7 @@ window.Decidim = window.Decidim || {
   announceForScreenReader
 };
 
+window.createDialog = createDialog;
 window.morphdom = morphdom
 
 // eslint-disable-next-line max-params
diff --git a/decidim-core/app/packs/stylesheets/decidim/_conversations.scss b/decidim-core/app/packs/stylesheets/decidim/_conversations.scss
index 26a1589474e95..f65e56444f232 100644
--- a/decidim-core/app/packs/stylesheets/decidim/_conversations.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/_conversations.scss
@@ -88,6 +88,20 @@
   }
 
   &__modal {
+    &-error {
+      [data-dialog-closable] {
+        @apply top-6 right-6;
+      }
+
+      [data-dialog-container] {
+        @apply inline grid-cols-none;
+      }
+
+      [data-dialog-title] {
+        @apply col-span-2 md:col-span-1 md:col-start-2 grid grid-cols-[auto_1fr] items-start md:items-center gap-2 pb-4 text-left text-xl text-gray-2 md:border-b md:border-gray-3;
+      }
+    }
+
     &-results {
       @apply mb-20 flex flex-wrap gap-x-8 gap-y-4;
     }
diff --git a/decidim-core/app/views/decidim/messaging/conversations/_error_modal.html.erb b/decidim-core/app/views/decidim/messaging/conversations/_error_modal.html.erb
index 394e5631802f1..7f2af87a82f85 100644
--- a/decidim-core/app/views/decidim/messaging/conversations/_error_modal.html.erb
+++ b/decidim-core/app/views/decidim/messaging/conversations/_error_modal.html.erb
@@ -1,21 +1,13 @@
-<div id="messageErrorModal" data-reveal>
-  <div>
-    <h2><%= error %></h2>
-    <button class="close-button" data-close aria-label="<%= t(".close") %>"
-      type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <div class="reveal__body">
-    <p><%= t(".intro") %></p>
-    <p>
-      <%= messages.join("<br>") %>
-    </p>
-    <p><%= t(".correct_errors") %></p>
-  </div>
-  <div>
-    <div>
-      <a class="button" role="button" href="#" data-close aria-label="<%= t(".ok") %>"><%= t(".ok") %></a>
+<%= decidim_modal id: "messageErrorModal", class: "conversation__modal-error" do %>
+  <div data-dialog-container>
+    <h2 id="dialog-title-messageErrorModal" tabindex="-1" data-dialog-title><%= error %></h2>
+    <div id="dialog-desc-messageErrorModal" class="mt-4">
+      <p><%= t(".intro") %></p>
+      <p><%= safe_join(messages, tag.br) %></p>
+      <p><%= t(".correct_errors") %></p>
+    </div>
+    <div data-dialog-actions>
+      <button type="button" class="button button__sm lg:button__lg button__secondary" data-dialog-close="messageErrorModal" aria-label="<%= t(".ok") %>"><%= t(".ok") %></button>
     </div>
   </div>
-</div>
+<% end %>
diff --git a/decidim-core/app/views/decidim/messaging/conversations/error.js.erb b/decidim-core/app/views/decidim/messaging/conversations/error.js.erb
index 25f484ac850a2..bdb7c2882b53a 100644
--- a/decidim-core/app/views/decidim/messaging/conversations/error.js.erb
+++ b/decidim-core/app/views/decidim/messaging/conversations/error.js.erb
@@ -1,10 +1,15 @@
-var $messageError = $("#messageErrorModal");
-if ($messageError.length > 0) {
-  $messageError.foundation("_destroy").remove();
+var messageError = document.getElementById("messageErrorModal")
+
+if (messageError) {
+  messageError.remove();
 }
+document.body.insertAdjacentHTML("beforeend", "<%= j(render "error_modal", error:, messages:).html_safe %>");
 
-$("#messages").append("<%= j(render "error_modal", error:, messages:).html_safe %>");
-$messageError = $("#messageErrorModal");
+messageError = document.getElementById("messageErrorModal")
+if (messageError) {
+  window.createDialog(messageError);
 
-var messageErrorReveal = new Foundation.Reveal($messageError);
-messageErrorReveal.open();
+  if (Decidim.currentDialogs.messageErrorModal) {
+    window.Decidim.currentDialogs.messageErrorModal.open();
+  }
+}
diff --git a/decidim-core/config/locales/en.yml b/decidim-core/config/locales/en.yml
index 503f77a301c31..59191fdd02d74 100644
--- a/decidim-core/config/locales/en.yml
+++ b/decidim-core/config/locales/en.yml
@@ -1219,7 +1219,6 @@ en:
         create:
           error: Conversation not started. Try again later.
         error_modal:
-          close: Close modal
           correct_errors: Please correct the errors and try again.
           intro: 'There were the following errors with your message:'
           ok: OK
diff --git a/decidim-core/spec/system/messaging/conversations_spec.rb b/decidim-core/spec/system/messaging/conversations_spec.rb
index c13f8ad30e2a0..5a901b4325130 100644
--- a/decidim-core/spec/system/messaging/conversations_spec.rb
+++ b/decidim-core/spec/system/messaging/conversations_spec.rb
@@ -51,6 +51,15 @@
 
     it_behaves_like "accessible page"
 
+    it "displays an error pop-up", :slow do
+      recipient.destroy!
+      start_conversation("Is this a Ryanair style democracy?")
+
+      expect(page).to have_css("#messageErrorModal[aria-hidden='false']")
+      expect(page).to have_css(".conversation__modal-error")
+      expect(page).to have_text("Conversation not started. Try again later.")
+    end
+
     it "shows an empty conversation page" do
       expect(page).to have_no_selector(".card--list__item")
       expect(page).to have_current_path decidim.new_conversation_path(recipient_id: recipient.id)

From 4b531398e6c0b14850df86295b70a515f7605ca3 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Wed, 10 Jun 2026 21:18:55 +0200
Subject: [PATCH 071/131] Backport 'Improve taxonomy filter update performance'
 to v0.31 (#17083)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Improve taxonomy filter update performance

* Lint

* Improve performance on taxonomy filter form

Co-authored-by: Alejandro Rueda López <alejandro.rueda@nazaries.com>
---
 .../decidim/admin/create_taxonomy_filter.rb   | 18 +++++-
 .../decidim/admin/update_taxonomy_filter.rb   | 30 ++++++++--
 .../decidim/admin/taxonomy_filter_form.rb     | 20 ++++---
 .../admin/create_taxonomy_filter_spec.rb      |  7 ++-
 .../admin/update_taxonomy_filter_spec.rb      | 56 ++++++++++++++++++-
 5 files changed, 112 insertions(+), 19 deletions(-)

diff --git a/decidim-admin/app/commands/decidim/admin/create_taxonomy_filter.rb b/decidim-admin/app/commands/decidim/admin/create_taxonomy_filter.rb
index 0e5b373d18d17..d89ac3721d3ca 100644
--- a/decidim-admin/app/commands/decidim/admin/create_taxonomy_filter.rb
+++ b/decidim-admin/app/commands/decidim/admin/create_taxonomy_filter.rb
@@ -5,20 +5,34 @@ module Admin
     # A command with all the business logic to create a new taxonomy filter in the
     # system.
     class CreateTaxonomyFilter < Decidim::Commands::CreateResource
-      fetch_form_attributes :root_taxonomy_id, :filter_items, :internal_name, :name, :participatory_space_manifests
+      fetch_form_attributes :root_taxonomy_id, :internal_name, :name, :participatory_space_manifests
 
       protected
 
       def resource_class = Decidim::TaxonomyFilter
 
+      def run_after_hooks
+        create_filter_items!
+      end
+
       def extra_params
         {
           extra: {
             taxonomy_name: form.root_taxonomy.name,
-            filter_items_count: form.filter_items.count
+            filter_items_count: selected_taxonomy_item_ids.size
           }
         }
       end
+
+      private
+
+      def create_filter_items!
+        selected_taxonomy_item_ids.each { |taxonomy_item_id| resource.filter_items.create!(taxonomy_item_id:) }
+      end
+
+      def selected_taxonomy_item_ids
+        form.taxonomy_items.map(&:to_i).uniq
+      end
     end
   end
 end
diff --git a/decidim-admin/app/commands/decidim/admin/update_taxonomy_filter.rb b/decidim-admin/app/commands/decidim/admin/update_taxonomy_filter.rb
index 03f8b1f485749..0f34371017192 100644
--- a/decidim-admin/app/commands/decidim/admin/update_taxonomy_filter.rb
+++ b/decidim-admin/app/commands/decidim/admin/update_taxonomy_filter.rb
@@ -2,27 +2,45 @@
 
 module Decidim
   module Admin
-    # A command with all the business logic to create a new taxonomy filter in the
-    # system.
+    # A command with all the business logic to update an existing taxonomy filter
+    # in the system.
     class UpdateTaxonomyFilter < Decidim::Commands::UpdateResource
-      fetch_form_attributes :filter_items, :internal_name, :name, :participatory_space_manifests
+      fetch_form_attributes :internal_name, :name, :participatory_space_manifests
 
       protected
 
       def resource_class = Decidim::TaxonomyFilter
 
-      def run_before_hooks
-        resource.filter_items.destroy_all
+      def run_after_hooks
+        sync_filter_items!
       end
 
       def extra_params
         {
           extra: {
             taxonomy_name: resource.root_taxonomy.name,
-            filter_items_count: form.filter_items.count
+            filter_items_count: selected_taxonomy_item_ids.size
           }
         }
       end
+
+      private
+
+      def sync_filter_items!
+        removed_ids = current_taxonomy_item_ids - selected_taxonomy_item_ids
+        added_ids = selected_taxonomy_item_ids - current_taxonomy_item_ids
+
+        resource.filter_items.where(taxonomy_item_id: removed_ids).destroy_all if removed_ids.any?
+        added_ids.each { |taxonomy_item_id| resource.filter_items.create!(taxonomy_item_id:) }
+      end
+
+      def current_taxonomy_item_ids
+        resource.filter_items.pluck(:taxonomy_item_id)
+      end
+
+      def selected_taxonomy_item_ids
+        form.taxonomy_items.map(&:to_i).uniq
+      end
     end
   end
 end
diff --git a/decidim-admin/app/forms/decidim/admin/taxonomy_filter_form.rb b/decidim-admin/app/forms/decidim/admin/taxonomy_filter_form.rb
index a0eacb5de4632..54d50dc7a02a5 100644
--- a/decidim-admin/app/forms/decidim/admin/taxonomy_filter_form.rb
+++ b/decidim-admin/app/forms/decidim/admin/taxonomy_filter_form.rb
@@ -43,7 +43,7 @@ def filter_items
       def items_collection
         return [] unless root_taxonomy
 
-        @items_collection ||= map_items_collection(root_taxonomy)
+        @items_collection ||= build_items_collection
       end
 
       def root_taxonomy
@@ -61,22 +61,24 @@ def available_participatory_space_manifests
 
       private
 
-      def map_items_collection(taxonomy)
-        taxonomy.children.map do |item|
+      def build_items_collection
+        children_by_parent_id = root_taxonomy.all_children.group_by(&:parent_id)
+        build_subtree(root_taxonomy.id, children_by_parent_id)
+      end
+
+      def build_subtree(parent_id, children_by_parent_id)
+        Array(children_by_parent_id[parent_id]).map do |item|
           Item.new(
             name: translated_attribute(item.name),
             value: item.id,
-            children: map_items_collection(item)
+            children: build_subtree(item.id, children_by_parent_id)
           )
         end
       end
 
       def valid_taxonomy_items
-        return if taxonomy_items.all? do |item|
-          next unless root_taxonomy
-
-          root_taxonomy.all_children.map(&:id).include?(item.to_i)
-        end
+        valid_ids = root_taxonomy ? root_taxonomy.all_children.pluck(:id).to_set : Set.new
+        return if taxonomy_items.all? { |item| valid_ids.include?(item.to_i) }
 
         errors.add(:taxonomy_items, :invalid)
       end
diff --git a/decidim-admin/spec/commands/decidim/admin/create_taxonomy_filter_spec.rb b/decidim-admin/spec/commands/decidim/admin/create_taxonomy_filter_spec.rb
index 22256d74cb08c..37d10b614082d 100644
--- a/decidim-admin/spec/commands/decidim/admin/create_taxonomy_filter_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/create_taxonomy_filter_spec.rb
@@ -72,13 +72,18 @@ module Decidim::Admin
           .with(
             Decidim::TaxonomyFilter,
             form.current_user,
-            hash_including(:root_taxonomy_id, :name, :internal_name, :filter_items, :participatory_space_manifests),
+            hash_including(:root_taxonomy_id, :name, :internal_name, :participatory_space_manifests),
             hash_including(extra: hash_including(:filter_items_count, :taxonomy_name))
           )
           .and_call_original
 
         expect { subject.call }.to change(Decidim::ActionLog, :count)
       end
+
+      it "keeps filter_items_count counter cache accurate" do
+        subject.call
+        expect(last_taxonomy_filter.filter_items_count).to eq(taxonomy_items.size)
+      end
     end
   end
 end
diff --git a/decidim-admin/spec/commands/decidim/admin/update_taxonomy_filter_spec.rb b/decidim-admin/spec/commands/decidim/admin/update_taxonomy_filter_spec.rb
index 6301c54562a4c..f460f29aef7af 100644
--- a/decidim-admin/spec/commands/decidim/admin/update_taxonomy_filter_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/update_taxonomy_filter_spec.rb
@@ -61,7 +61,7 @@ module Decidim::Admin
           .with(
             taxonomy_filter,
             form.current_user,
-            hash_including(:name, :internal_name, :filter_items, :participatory_space_manifests),
+            hash_including(:name, :internal_name, :participatory_space_manifests),
             hash_including(extra: hash_including(:filter_items_count, :taxonomy_name))
           )
           .and_call_original
@@ -69,5 +69,59 @@ module Decidim::Admin
         expect { subject.call }.to change(Decidim::ActionLog, :count)
       end
     end
+
+    context "when syncing filter items" do
+      let!(:existing_items) { create_list(:taxonomy, 3, parent: root_taxonomy, organization:) }
+      let!(:taxonomy_filter) do
+        filter = create(:taxonomy_filter, root_taxonomy:)
+        existing_items.each { |item| create(:taxonomy_filter_item, taxonomy_filter: filter, taxonomy_item: item) }
+        filter
+      end
+      let(:new_item) { create(:taxonomy, parent: root_taxonomy, organization:) }
+
+      context "with a partial change (one removed, one added)" do
+        let(:taxonomies) { [existing_items[0], existing_items[1], new_item] }
+
+        it "removes only deselected items and inserts only newly selected items" do
+          subject.call
+          expect(taxonomy_filter.reload.filter_items.pluck(:taxonomy_item_id))
+            .to contain_exactly(existing_items[0].id, existing_items[1].id, new_item.id)
+        end
+
+        it "keeps filter_items_count counter cache accurate" do
+          subject.call
+          expect(taxonomy_filter.reload.filter_items_count).to eq(3)
+        end
+
+        it "keeps per-taxonomy filter_items_count counters accurate" do
+          subject.call
+          expect(existing_items[0].reload.filter_items_count).to eq(1)
+          expect(existing_items[2].reload.filter_items_count).to eq(0)
+          expect(new_item.reload.filter_items_count).to eq(1)
+        end
+      end
+
+      context "when no items changed" do
+        let(:taxonomies) { existing_items }
+
+        it "does not recreate existing filter items" do
+          original_ids = taxonomy_filter.filter_items.pluck(:id)
+          subject.call
+          expect(taxonomy_filter.filter_items.reload.pluck(:id)).to match_array(original_ids)
+        end
+      end
+
+      context "with a large filter" do
+        let(:existing_items) { create_list(:taxonomy, 50, parent: root_taxonomy, organization:) }
+        let(:taxonomies) { existing_items + [new_item] }
+
+        it "preserves existing filter item rows when adding new ones" do
+          original_ids = taxonomy_filter.filter_items.pluck(:id)
+          subject.call
+          preserved_ids = taxonomy_filter.filter_items.reload.where(taxonomy_item_id: existing_items.map(&:id)).pluck(:id)
+          expect(preserved_ids).to match_array(original_ids)
+        end
+      end
+    end
   end
 end

From e2f923d212a99364d73c803380d6e0d0735a524b Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Thu, 11 Jun 2026 11:45:55 +0200
Subject: [PATCH 072/131] Backport 'Fix rendering mentions for Proposals'
 answer page' to v0.31 (#17092)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix rendering mentions for Proposals' answer page

* Fix a11y issue

* Fix display of links and other rich text styles

* Add specs

* Sanitize title and author name

* Make explicit the rich text editor configuration (suggested by Code Rabbit)

* Remove unecessary alert acceptance

* Implement same escaping method than in the frontend in the proposals' title in the admin

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 .../proposals/admin/proposals/show.html.erb   | 10 ++--
 .../spec/shared/merge_proposals_examples.rb   |  4 --
 .../view_proposal_details_from_admin_spec.rb  | 46 +++++++++++++++++++
 3 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/decidim-proposals/app/views/decidim/proposals/admin/proposals/show.html.erb b/decidim-proposals/app/views/decidim/proposals/admin/proposals/show.html.erb
index 7cf1f1e88b167..44a710fb57027 100644
--- a/decidim-proposals/app/views/decidim/proposals/admin/proposals/show.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/admin/proposals/show.html.erb
@@ -4,7 +4,7 @@
     <%= render partial: "decidim/admin/shared/adjacent_navigation", locals: { adjacent_paths: filtered_adjacent_paths(proposal, :proposal_path) } %>
     <div class="component__show_header">
       <h2 class="component__show_header-title">
-        <%= decidim_html_escape(present(proposal).title).html_safe %>
+        <%= present(proposal).title(html_escape: true) %>
       </h2>
     </div>
 
@@ -18,7 +18,7 @@
             <li class="component__show_nav-author-title">
               <%= link_to_if(
                     presented_author.profile_path.present?,
-                    presented_author.name,
+                    decidim_html_escape(presented_author.name),
                     presented_author.profile_path,
                     target: :blank
                   ) %>
@@ -45,9 +45,9 @@
         <div class="card-section">
           <div class="row column">
             <span class="component__show-title"><%= t ".body" %></span>
-            <p class="component__show-text">
-              <%= simple_format(present(proposal).body(strip_tags: true)) %>
-            </p>
+            <div class="component__show-text editor-content">
+              <%= render_proposal_body(proposal) %>
+            </div>
           </div>
         </div>
 
diff --git a/decidim-proposals/spec/shared/merge_proposals_examples.rb b/decidim-proposals/spec/shared/merge_proposals_examples.rb
index 05fc84afeb94f..3a6e909679598 100644
--- a/decidim-proposals/spec/shared/merge_proposals_examples.rb
+++ b/decidim-proposals/spec/shared/merge_proposals_examples.rb
@@ -80,10 +80,6 @@
           context "when merging to another component" do
             before do
               click_on "My result merge proposal"
-              wait = Selenium::WebDriver::Wait.new(timeout: 10)
-              wait.until { page.driver.browser.switch_to.alert }
-              alert = page.driver.browser.switch_to.alert
-              alert.accept
               new_proposal_url = find("a", text: "See proposal")[:href]
               visit new_proposal_url
             end
diff --git a/decidim-proposals/spec/system/admin/view_proposal_details_from_admin_spec.rb b/decidim-proposals/spec/system/admin/view_proposal_details_from_admin_spec.rb
index 86aee3735d8b3..7ca36e1270410 100644
--- a/decidim-proposals/spec/system/admin/view_proposal_details_from_admin_spec.rb
+++ b/decidim-proposals/spec/system/admin/view_proposal_details_from_admin_spec.rb
@@ -82,6 +82,52 @@
     expect(page).to have_content(strip_tags(translated(proposal.body)).strip)
   end
 
+  describe "with rich text proposal body" do
+    include_context "with rich text editor content"
+
+    context "when it is an official proposal" do
+      let!(:proposal) { create(:proposal, :official, body: content, component: current_component) }
+
+      before do
+        go_to_admin_proposal_page(proposal)
+      end
+
+      it_behaves_like "rendering safe content", ".editor-content"
+    end
+
+    context "when it is an official meeting proposal" do
+      let!(:proposal) { create(:proposal, :official_meeting, body: content, component: current_component) }
+
+      before do
+        go_to_admin_proposal_page(proposal)
+      end
+
+      it_behaves_like "rendering safe content", ".editor-content"
+    end
+
+    context "when rich text editor is enabled for participants" do
+      let!(:proposal) { create(:proposal, body: content, component: current_component) }
+
+      before do
+        current_component.organization.update(rich_text_editor_in_public_views: true)
+        go_to_admin_proposal_page(proposal)
+      end
+
+      it_behaves_like "rendering safe content", ".editor-content"
+    end
+
+    context "when rich text editor is NOT enabled for participants" do
+      let!(:proposal) { create(:proposal, body: content, component: current_component) }
+
+      before do
+        current_component.organization.update(rich_text_editor_in_public_views: false)
+        go_to_admin_proposal_page(proposal)
+      end
+
+      it_behaves_like "rendering unsafe content", ".editor-content"
+    end
+  end
+
   describe "with an specific creation date" do
     let!(:proposal) { create(:proposal, component: current_component, created_at: Time.zone.parse("2020-01-29 15:00")) }
 

From cf8f9de815fee78f133d186f78a67ceca9487d23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= <ivan@pokecode.net>
Date: Thu, 11 Jun 2026 15:43:58 +0200
Subject: [PATCH 073/131] store raw data in cache

---
 .../omniauth_registrations_controller.rb      | 28 +++++++---
 .../omniauth_registrations_controller_spec.rb | 51 ++++++++++---------
 2 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/decidim-core/app/controllers/decidim/devise/omniauth_registrations_controller.rb b/decidim-core/app/controllers/decidim/devise/omniauth_registrations_controller.rb
index b42d1181ee6fa..756037a29c2f7 100644
--- a/decidim-core/app/controllers/decidim/devise/omniauth_registrations_controller.rb
+++ b/decidim-core/app/controllers/decidim/devise/omniauth_registrations_controller.rb
@@ -77,6 +77,9 @@ def oauth_data
 
       # Private: Create trusted form params from oauth data stored server-side.
       # Since we are using trusted oauth data we are generating a valid signature.
+      # Note: raw_data is stored in Rails.cache (not session) to avoid cookie size issues.
+      # If cache is not shared across nodes, raw_data may not be available on retry —
+      # the registration flow will still succeed but raw_data will be empty.
       def pending_oauth_form_params
         return {} if pending_oauth_data.blank?
 
@@ -88,7 +91,7 @@ def pending_oauth_form_params
           nickname: pending_oauth_data[:nickname],
           oauth_signature: OmniauthRegistrationForm.create_signature(pending_oauth_data[:provider], pending_oauth_data[:uid]),
           avatar_url: pending_oauth_data[:avatar_url],
-          raw_data: pending_oauth_data[:raw_data],
+          raw_data: restore_raw_data_from_cache,
           pending_oauth_token:
         }
       end
@@ -116,19 +119,27 @@ def store_pending_oauth_data!
           name: oauth_data.dig(:info, :name),
           nickname: oauth_data.dig(:info, :nickname),
           avatar_url: oauth_data.dig(:info, :image),
-          verified_email: oauth_data.dig(:info, :email).presence,
-          raw_data: oauth_hash
+          verified_email: oauth_data.dig(:info, :email).presence
         }
 
-        session[:omniauth_registration] = {
-          token: SecureRandom.hex(16),
-          data:
-        }
+        token = SecureRandom.hex(16)
+        session[:omniauth_registration] = { token:, data: }
+        Rails.cache.write(raw_data_cache_key(token), oauth_hash, expires_in: 30.minutes)
 
-        @pending_oauth_token = session[:omniauth_registration][:token]
+        @pending_oauth_token = token
         data
       end
 
+      def raw_data_cache_key(token)
+        "decidim/omniauth_registration/raw_data/#{token}"
+      end
+
+      def restore_raw_data_from_cache
+        return {} if pending_oauth_token.blank?
+
+        Rails.cache.read(raw_data_cache_key(pending_oauth_token)) || {}
+      end
+
       def restore_pending_oauth_data
         token = params.dig(:user, :pending_oauth_token)
         return {} if token.blank?
@@ -145,6 +156,7 @@ def restore_pending_oauth_data
       end
 
       def clear_pending_oauth_data!
+        Rails.cache.delete(raw_data_cache_key(pending_oauth_token)) if pending_oauth_token.present?
         session.delete(:omniauth_registration)
       end
 
diff --git a/decidim-core/spec/controllers/omniauth_registrations_controller_spec.rb b/decidim-core/spec/controllers/omniauth_registrations_controller_spec.rb
index a58cc615cc962..9d769d59ed770 100644
--- a/decidim-core/spec/controllers/omniauth_registrations_controller_spec.rb
+++ b/decidim-core/spec/controllers/omniauth_registrations_controller_spec.rb
@@ -245,34 +245,37 @@ module Decidim
         end
 
         it "preserves oauth data in pending state and creates the account on retry" do
-          expect do
-            post :create, params: { locale: I18n.locale, user: { tos_agreement: nil } }
-          end.not_to change(User, :count)
+          Rails.cache.with_local_cache do
+            expect do
+              post :create, params: { locale: I18n.locale, user: { tos_agreement: nil } }
+            end.not_to change(User, :count)
 
-          expect(response).to render_template(:new_tos_fields)
+            expect(response).to render_template(:new_tos_fields)
 
-          token = session.dig(:omniauth_registration, :token)
-          expect(token).to be_present
-          expect(session.dig(:omniauth_registration, :data, :raw_data)).to eq(raw_data.deep_symbolize_keys)
+            token = session.dig(:omniauth_registration, :token)
+            expect(token).to be_present
+            expect(session.dig(:omniauth_registration, :data)).not_to have_key(:raw_data)
+            expect(Rails.cache.read("decidim/omniauth_registration/raw_data/#{token}")).to eq(raw_data.deep_symbolize_keys)
 
-          request.env["omniauth.auth"] = nil
-          allow(ActiveSupport::Notifications).to receive(:publish).and_call_original
+            request.env["omniauth.auth"] = nil
+            allow(ActiveSupport::Notifications).to receive(:publish).and_call_original
 
-          expect do
-            post :create, params: { locale: I18n.locale, user: { pending_oauth_token: token, tos_agreement: "1" } }
-          end.to change(User, :count).by(1)
+            expect do
+              post :create, params: { locale: I18n.locale, user: { pending_oauth_token: token, tos_agreement: "1" } }
+            end.to change(User, :count).by(1)
 
-          expect(controller).to be_user_signed_in
-          expect(User.find_by(email:)).to be_present
-          expect(ActiveSupport::Notifications).to have_received(:publish).with(
-            "decidim.user.omniauth_registration",
-            hash_including(
-              provider:,
-              uid:,
-              email:,
-              raw_data: raw_data.deep_symbolize_keys
+            expect(controller).to be_user_signed_in
+            expect(User.find_by(email:)).to be_present
+            expect(ActiveSupport::Notifications).to have_received(:publish).with(
+              "decidim.user.omniauth_registration",
+              hash_including(
+                provider:,
+                uid:,
+                email:,
+                raw_data: raw_data.deep_symbolize_keys
+              )
             )
-          )
+          end
         end
       end
 
@@ -316,10 +319,10 @@ module Decidim
               "name" => "Facebook User",
               "nickname" => "facebook_user",
               "avatar_url" => nil,
-              "verified_email" => email,
-              "raw_data" => pending_raw_data
+              "verified_email" => email
             }
           }
+          Rails.cache.write("decidim/omniauth_registration/raw_data/#{pending_token}", pending_raw_data)
         end
 
         it "restores the pending state and signs in" do

From 874308406fde161375ce9e712b04d393835c49dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= <ivan@pokecode.net>
Date: Thu, 11 Jun 2026 16:11:41 +0200
Subject: [PATCH 074/131] log cache misses

---
 .../devise/omniauth_registrations_controller.rb |  6 +++++-
 .../omniauth_registrations_controller_spec.rb   | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/decidim-core/app/controllers/decidim/devise/omniauth_registrations_controller.rb b/decidim-core/app/controllers/decidim/devise/omniauth_registrations_controller.rb
index 756037a29c2f7..adfb2ae4cfc31 100644
--- a/decidim-core/app/controllers/decidim/devise/omniauth_registrations_controller.rb
+++ b/decidim-core/app/controllers/decidim/devise/omniauth_registrations_controller.rb
@@ -137,7 +137,11 @@ def raw_data_cache_key(token)
       def restore_raw_data_from_cache
         return {} if pending_oauth_token.blank?
 
-        Rails.cache.read(raw_data_cache_key(pending_oauth_token)) || {}
+        raw_data = Rails.cache.read(raw_data_cache_key(pending_oauth_token))
+        return raw_data if raw_data.present?
+
+        Rails.logger.warn("[Decidim::OmniauthRegistrationsController] Missing raw_data in cache for pending_oauth_token=#{pending_oauth_token}")
+        {}
       end
 
       def restore_pending_oauth_data
diff --git a/decidim-core/spec/controllers/omniauth_registrations_controller_spec.rb b/decidim-core/spec/controllers/omniauth_registrations_controller_spec.rb
index 9d769d59ed770..b3fc5a09ebe37 100644
--- a/decidim-core/spec/controllers/omniauth_registrations_controller_spec.rb
+++ b/decidim-core/spec/controllers/omniauth_registrations_controller_spec.rb
@@ -333,6 +333,23 @@ module Decidim
           expect(controller).to be_user_signed_in
           expect(User.find_by(email:)).to be_present
         end
+
+        context "when raw_data is missing in cache" do
+          before do
+            Rails.cache.delete("decidim/omniauth_registration/raw_data/#{pending_token}")
+          end
+
+          it "logs a warning and signs in" do
+            expect(Rails.logger).to receive(:warn).with(/Missing raw_data in cache for pending_oauth_token=/)
+
+            expect do
+              post :create, params: { locale: I18n.locale, user: { pending_oauth_token: pending_token, tos_agreement: "1" } }
+            end.to change(Identity, :count).by(1)
+
+            expect(controller).to be_user_signed_in
+            expect(User.find_by(email:)).to be_present
+          end
+        end
       end
     end
   end

From d1d5cedaf9ac17419ee1d46b20244fd2d6f8ea16 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Thu, 11 Jun 2026 19:11:25 +0200
Subject: [PATCH 075/131] Backport 'Fix flaky spec at admin adds display
 condition on template' to v0.31 (#17097)

Co-authored-by: Antti Hukkanen <antti.hukkanen@mainiotech.fi>
---
 ..._adds_display_condition_on_questionnaire_templates_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/decidim-templates/spec/system/admin/admin_adds_display_condition_on_questionnaire_templates_spec.rb b/decidim-templates/spec/system/admin/admin_adds_display_condition_on_questionnaire_templates_spec.rb
index bb24e368e5876..dc86b8ff6d700 100644
--- a/decidim-templates/spec/system/admin/admin_adds_display_condition_on_questionnaire_templates_spec.rb
+++ b/decidim-templates/spec/system/admin/admin_adds_display_condition_on_questionnaire_templates_spec.rb
@@ -16,8 +16,8 @@
 
   it "adds display condition to questionnaire question" do
     questionnaire = template.templatable
-    question_one = create(:questionnaire_question, mandatory: true, question_type: "matrix_single", rows: matrix_rows, options: response_options, questionnaire:)
-    question_two = create(:questionnaire_question, :with_response_options, questionnaire:)
+    question_one = create(:questionnaire_question, position: 0, mandatory: true, question_type: "matrix_single", rows: matrix_rows, options: response_options, questionnaire:)
+    question_two = create(:questionnaire_question, :with_response_options, position: 1, questionnaire:)
 
     visit decidim_admin_templates.edit_questions_questionnaire_template_path(template.id)
     # expand question two

From e8461eba622e0fbb6e8c16c1b2a094153ae35c1b Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Fri, 12 Jun 2026 08:44:30 +0200
Subject: [PATCH 076/131] Backport 'Change setting "comments max length" for
 "max characters per comment"' to v0.31 (#17103)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 decidim-accountability/config/locales/en.yml | 2 +-
 decidim-admin/config/locales/en.yml          | 2 +-
 decidim-blogs/config/locales/en.yml          | 2 +-
 decidim-budgets/config/locales/en.yml        | 2 +-
 decidim-core/config/locales/en.yml           | 2 +-
 decidim-debates/config/locales/en.yml        | 2 +-
 decidim-meetings/config/locales/en.yml       | 2 +-
 decidim-proposals/config/locales/en.yml      | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/decidim-accountability/config/locales/en.yml b/decidim-accountability/config/locales/en.yml
index 6e794e4e3465c..4b944a2cce429 100644
--- a/decidim-accountability/config/locales/en.yml
+++ b/decidim-accountability/config/locales/en.yml
@@ -303,7 +303,7 @@ en:
           global:
             clear_all: Clear all
             comments_enabled: Comments enabled
-            comments_max_length: Comments max length (Leave 0 for default value)
+            comments_max_length: Max characters per comment (Leave 0 for default value)
             default_taxonomy: Default taxonomy
             default_taxonomy_help: Select which taxonomy you want to show by default. If no taxonomy is selected, the results will be shown in a list format.
             define_taxonomy_filters: Please define some filters for this participatory space before using this setting.
diff --git a/decidim-admin/config/locales/en.yml b/decidim-admin/config/locales/en.yml
index 926c7af9b0cc1..04eeab27191a1 100644
--- a/decidim-admin/config/locales/en.yml
+++ b/decidim-admin/config/locales/en.yml
@@ -45,7 +45,7 @@ en:
         alert_color: Alert
         available_authorizations: Available authorizations
         badges_enabled: Enable badges
-        comments_max_length: Comments max length (Leave 0 for default value)
+        comments_max_length: Max characters per comment (Leave 0 for default value)
         customize_welcome_notification: Customize welcome notification
         default_locale: Default locale
         description: Description
diff --git a/decidim-blogs/config/locales/en.yml b/decidim-blogs/config/locales/en.yml
index d7e172c686e1a..4ad945abaeb8f 100644
--- a/decidim-blogs/config/locales/en.yml
+++ b/decidim-blogs/config/locales/en.yml
@@ -114,7 +114,7 @@ en:
             announcement: Announcement
             attachments_allowed: Allow attachments
             comments_enabled: Comments enabled
-            comments_max_length: Comments max length (Leave 0 for default value)
+            comments_max_length: Max characters per comment (Leave 0 for default value)
             creation_enabled_for_participants: Participants can create posts
             define_taxonomy_filters: Please define some filters for this participatory space before using this setting.
             no_taxonomy_filters_found: No taxonomy filters found.
diff --git a/decidim-budgets/config/locales/en.yml b/decidim-budgets/config/locales/en.yml
index b75dc4d8a733e..3fde5d1e75525 100644
--- a/decidim-budgets/config/locales/en.yml
+++ b/decidim-budgets/config/locales/en.yml
@@ -347,7 +347,7 @@ en:
             announcement: Announcement
             clear_all: Clear all
             comments_enabled: Comments enabled
-            comments_max_length: Comments max length (Leave 0 for default value)
+            comments_max_length: Max characters per comment (Leave 0 for default value)
             define_taxonomy_filters: Please define some filters for this participatory space before using this setting.
             form:
               errors:
diff --git a/decidim-core/config/locales/en.yml b/decidim-core/config/locales/en.yml
index 59191fdd02d74..888b181b635eb 100644
--- a/decidim-core/config/locales/en.yml
+++ b/decidim-core/config/locales/en.yml
@@ -557,7 +557,7 @@ en:
           global:
             amendments_enabled: Amendments enabled
             comments_enabled: Comments enabled
-            comments_max_length: Comments max length
+            comments_max_length: Max characters per comment
             define_taxonomy_filters: Please define some filters for this participatory space before using this setting.
             dummy_global_attribute1: Dummy Attribute 1
             dummy_global_attribute2: Dummy Attribute 2
diff --git a/decidim-debates/config/locales/en.yml b/decidim-debates/config/locales/en.yml
index 0610386b9a8fa..0943006bb8ee1 100644
--- a/decidim-debates/config/locales/en.yml
+++ b/decidim-debates/config/locales/en.yml
@@ -41,7 +41,7 @@ en:
             attachments_allowed: Allow attachments
             clear_all: Clear all
             comments_enabled: Comments enabled
-            comments_max_length: Comments max length (Leave 0 for default value)
+            comments_max_length: Max characters per comment (Leave 0 for default value)
             define_taxonomy_filters: Please define some filters for this participatory space before using this setting.
             no_taxonomy_filters_found: No taxonomy filters found.
             taxonomy_filters: Select filters for the component
diff --git a/decidim-meetings/config/locales/en.yml b/decidim-meetings/config/locales/en.yml
index 951b3cc2ae536..b438cab4cf373 100644
--- a/decidim-meetings/config/locales/en.yml
+++ b/decidim-meetings/config/locales/en.yml
@@ -169,7 +169,7 @@ en:
             announcement: Announcement
             clear_all: Clear all
             comments_enabled: Comments enabled
-            comments_max_length: Comments max length (Leave 0 for default value)
+            comments_max_length: Max characters per comment (Leave 0 for default value)
             creation_enabled_for_participants: Participants can create meetings
             default_registration_terms: Default registration terms
             define_taxonomy_filters: Please define some filters for this participatory space before using this setting.
diff --git a/decidim-proposals/config/locales/en.yml b/decidim-proposals/config/locales/en.yml
index 4528075ed165f..5f9bafaeb9f87 100644
--- a/decidim-proposals/config/locales/en.yml
+++ b/decidim-proposals/config/locales/en.yml
@@ -179,7 +179,7 @@ en:
             collaborative_drafts_enabled: Collaborative drafts enabled
             collaborative_drafts_enabled_help: The Collaborative Drafts feature will be removed in Decidim v0.32. Organizations using it can switch to the new proposal co-authorship feature.
             comments_enabled: Comments enabled
-            comments_max_length: Comments max length (Leave 0 for default value)
+            comments_max_length: Max characters per comment (Leave 0 for default value)
             default_sort_order: Default proposal sorting
             default_sort_order_help: Automatic means that if the votes are enabled, the proposals will be shown sorted by random, and if the votes are blocked, then they will be sorted by the most voted.
             default_sort_order_options:

From d541ff990d905a7243cad24c08c8c33a2530c1c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?=
 <andreslucena@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:28:45 +0200
Subject: [PATCH 077/131] Add missing imagemagick dependency to devcontainer
 (v0.31) (#17123)

---
 .devcontainer/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 9712972405086..26fed7c35198e 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -5,7 +5,7 @@ RUN wget -q -O /tmp/google-chrome-key.pub https://dl-ssl.google.com/linux/linux_
     && sudo gpg --dearmor -o /usr/share/keyrings/google-chrome-keyring.gpg /tmp/google-chrome-key.pub \
     && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/google-chrome-keyring.gpg] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google-chrome.list \
     && sudo apt-get update \
-    && sudo apt-get install -y google-chrome-stable libicu-dev \
+    && sudo apt-get install -y google-chrome-stable libicu-dev imagemagick \
     && sudo rm -rf /var/lib/apt/lists/* /tmp/google-chrome-key.pub
 
 ENV BINDING="0.0.0.0"

From b537ebf2e07f712d63403541559716396f02d397 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:52:33 +0200
Subject: [PATCH 078/131] Backport 'Do not show the status select in the result
 form if no statuses' to v0.31 (#17129)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Do not show the status select in the result form if no statuses

* Do not show the status select in the bulk form if no statuses

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 .../admin/results/_form.html.erb              |  8 ++++---
 .../results/bulk_actions/_dropdown.html.erb   | 12 ++++++-----
 .../manage_results_bulk_actions_examples.rb   | 15 +++++++++++++
 .../spec/shared/manage_results_examples.rb    | 21 +++++++++++++++++++
 4 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/decidim-accountability/app/views/decidim/accountability/admin/results/_form.html.erb b/decidim-accountability/app/views/decidim/accountability/admin/results/_form.html.erb
index 3444b5e6497ef..573e1ca6029df 100644
--- a/decidim-accountability/app/views/decidim/accountability/admin/results/_form.html.erb
+++ b/decidim-accountability/app/views/decidim/accountability/admin/results/_form.html.erb
@@ -48,9 +48,11 @@
       <% end %>
 
       <div class="row">
-        <div class="columns">
-          <%= form.select :decidim_accountability_status_id, statuses.map { |status| [translated_attribute(status.name), status.id, { "data-progress" => status.progress }] }, include_blank: true %>
-        </div>
+        <% if statuses.any? %>
+          <div class="columns">
+            <%= form.select :decidim_accountability_status_id, statuses.map { |status| [translated_attribute(status.name), status.id, { "data-progress" => status.progress }] }, include_blank: true %>
+          </div>
+        <% end %>
 
         <div class="columns">
           <%= form.number_field :progress %>
diff --git a/decidim-accountability/app/views/decidim/accountability/admin/results/bulk_actions/_dropdown.html.erb b/decidim-accountability/app/views/decidim/accountability/admin/results/bulk_actions/_dropdown.html.erb
index bfdbee7d665f8..1ccc9dc001ebc 100644
--- a/decidim-accountability/app/views/decidim/accountability/admin/results/bulk_actions/_dropdown.html.erb
+++ b/decidim-accountability/app/views/decidim/accountability/admin/results/bulk_actions/_dropdown.html.erb
@@ -27,10 +27,12 @@
         <%= t(".change_dates") %>
       </button>
     </li>
-    <li class="dropdown__item">
-      <button type="button" class="dropdown__button" data-action="change-status">
-        <%= t(".change_status") %>
-      </button>
-    </li>
+    <% if statuses.any? %>
+      <li class="dropdown__item">
+        <button type="button" class="dropdown__button" data-action="change-status">
+          <%= t(".change_status") %>
+        </button>
+      </li>
+    <% end %>
   </ul>
 </div>
diff --git a/decidim-accountability/spec/shared/manage_results_bulk_actions_examples.rb b/decidim-accountability/spec/shared/manage_results_bulk_actions_examples.rb
index 950236f2ae50d..6f7305720e344 100644
--- a/decidim-accountability/spec/shared/manage_results_bulk_actions_examples.rb
+++ b/decidim-accountability/spec/shared/manage_results_bulk_actions_examples.rb
@@ -37,6 +37,21 @@
           expect(page).to have_selector(:link_or_button, "Change status")
           expect(page).to have_selector(:link_or_button, "Change dates")
         end
+
+        context "when there are no statuses" do
+          before do
+            Decidim::Accountability::Status.where(component: current_component).destroy_all
+            visit current_path
+            page.find_by_id("results_bulk").set(true)
+            click_on "Actions"
+          end
+
+          it "does not show the change status option" do
+            expect(page).to have_selector(:link_or_button, "Change taxonomies")
+            expect(page).to have_no_selector(:link_or_button, "Change status")
+            expect(page).to have_selector(:link_or_button, "Change dates")
+          end
+        end
       end
 
       context "when change taxonomies is selected from actions dropdown" do
diff --git a/decidim-accountability/spec/shared/manage_results_examples.rb b/decidim-accountability/spec/shared/manage_results_examples.rb
index e4fead52c5839..b2bb665449e25 100644
--- a/decidim-accountability/spec/shared/manage_results_examples.rb
+++ b/decidim-accountability/spec/shared/manage_results_examples.rb
@@ -9,6 +9,27 @@
     it_behaves_like "having a rich text editor", "new_result", "full"
   end
 
+  context "when there are statuses" do
+    before do
+      click_on "New result"
+    end
+
+    it "displays the status select" do
+      expect(page).to have_select "result_decidim_accountability_status_id"
+    end
+  end
+
+  context "when there are no statuses" do
+    before do
+      Decidim::Accountability::Status.where(component: current_component).destroy_all
+      click_on "New result"
+    end
+
+    it "does not display the status select" do
+      expect(page).to have_no_select "result_decidim_accountability_status_id"
+    end
+  end
+
   context "when the proposal module is not installed" do
     before do
       allow(Decidim).to receive(:module_installed?).and_return(false)

From 8c0850f35861ccc88d182db97b425c76cd1c58c9 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Mon, 15 Jun 2026 18:31:42 +0200
Subject: [PATCH 079/131] Backport 'Add validation in status' progress field'
 to v0.31 (#17127)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 .../accountability/admin/status_form.rb       |  1 +
 .../spec/forms/admin/status_form_spec.rb      | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/decidim-accountability/app/forms/decidim/accountability/admin/status_form.rb b/decidim-accountability/app/forms/decidim/accountability/admin/status_form.rb
index c7e2f7353b8cf..66f95c2bb9ad7 100644
--- a/decidim-accountability/app/forms/decidim/accountability/admin/status_form.rb
+++ b/decidim-accountability/app/forms/decidim/accountability/admin/status_form.rb
@@ -15,6 +15,7 @@ class StatusForm < Decidim::Form
 
         validates :key, presence: true
         validates :name, translatable_presence: true
+        validates :progress, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 100 }, if: ->(form) { form.progress.present? }
       end
     end
   end
diff --git a/decidim-accountability/spec/forms/admin/status_form_spec.rb b/decidim-accountability/spec/forms/admin/status_form_spec.rb
index fbf672487e3aa..a7be1b8be3561 100644
--- a/decidim-accountability/spec/forms/admin/status_form_spec.rb
+++ b/decidim-accountability/spec/forms/admin/status_form_spec.rb
@@ -46,5 +46,29 @@ module Decidim::Accountability
 
       it { is_expected.not_to be_valid }
     end
+
+    describe "when progress is negative" do
+      let(:progress) { -12 }
+
+      it { is_expected.not_to be_valid }
+    end
+
+    describe "when progress is greater than 100" do
+      let(:progress) { 999 }
+
+      it { is_expected.not_to be_valid }
+    end
+
+    describe "when progress is between 0 and 100" do
+      let(:progress) { (0..100).to_a.sample }
+
+      it { is_expected.to be_valid }
+    end
+
+    describe "when progress is empty" do
+      let(:progress) { nil }
+
+      it { is_expected.to be_valid }
+    end
   end
 end

From 7af016fb183a94f66df5853e53f73d88526ab799 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Wed, 17 Jun 2026 19:40:27 +0200
Subject: [PATCH 080/131] Backport 'Fix data migration for answers to responses
 change' to v0.31 (#17141)

* Fix data migration for responses

* Apply suggestions from code review



* Running rubocops

---------

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 ...60616144141_rename_answers_to_responses.rb |  31 +++++
 .../data/rename_answers_to_responses_spec.rb  | 128 ++++++++++++++++++
 2 files changed, 159 insertions(+)
 create mode 100644 decidim-forms/db/data/20260616144141_rename_answers_to_responses.rb
 create mode 100644 decidim-forms/spec/db/data/rename_answers_to_responses_spec.rb

diff --git a/decidim-forms/db/data/20260616144141_rename_answers_to_responses.rb b/decidim-forms/db/data/20260616144141_rename_answers_to_responses.rb
new file mode 100644
index 0000000000000..66a762c906e9d
--- /dev/null
+++ b/decidim-forms/db/data/20260616144141_rename_answers_to_responses.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class RenameAnswersToResponses < ActiveRecord::Migration[7.2]
+  class Attachment < ApplicationRecord
+    self.table_name = "decidim_attachments"
+  end
+
+  class ActionLog < ApplicationRecord
+    self.table_name = "decidim_action_logs"
+  end
+
+  class Version < ApplicationRecord
+    self.table_name = "versions"
+  end
+
+  def up
+    # rubocop:disable Rails/SkipsModelValidations
+    Attachment.where(attached_to_type: "Decidim::Forms::Answer").update_all(attached_to_type: "Decidim::Forms::Response")
+    ActionLog.where(resource_type: "Decidim::Forms::Answer").update_all(resource_type: "Decidim::Forms::Response")
+    Version.where(item_type: "Decidim::Forms::Answer").update_all(item_type: "Decidim::Forms::Response")
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+
+  def down
+    # rubocop:disable Rails/SkipsModelValidations
+    Attachment.where(attached_to_type: "Decidim::Forms::Response").update_all(attached_to_type: "Decidim::Forms::Answer")
+    ActionLog.where(resource_type: "Decidim::Forms::Response").update_all(resource_type: "Decidim::Forms::Answer")
+    Version.where(item_type: "Decidim::Forms::Response").update_all(item_type: "Decidim::Forms::Answer")
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+end
diff --git a/decidim-forms/spec/db/data/rename_answers_to_responses_spec.rb b/decidim-forms/spec/db/data/rename_answers_to_responses_spec.rb
new file mode 100644
index 0000000000000..6ab746efdaa8a
--- /dev/null
+++ b/decidim-forms/spec/db/data/rename_answers_to_responses_spec.rb
@@ -0,0 +1,128 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+require "./db/data/20260616144141_rename_answers_to_responses"
+
+describe RenameAnswersToResponses do
+  let(:migrator) do
+    described_class.new.tap do |m|
+      m.verbose = false
+    end
+  end
+
+  let(:organization) { create(:organization) }
+  let!(:participatory_process) { create(:participatory_process, organization:) }
+  let(:user) { create(:user, organization:) }
+  let!(:questionnaire) { create(:questionnaire, questionnaire_for: participatory_process) }
+  let(:response) { create(:response, questionnaire:) }
+  let!(:action_logs_with_other_types) do
+    create_list(:action_log, 2, resource: create(:dummy_resource, organization:))
+  end
+  let!(:action_logs_with_old_type) do
+    # rubocop:disable Rails/SkipsModelValidations
+    Decidim::ActionLog.insert_all([
+                                    {
+                                      decidim_organization_id: organization.id,
+                                      user_id: user.id,
+                                      user_type: "Decidim::User",
+                                      resource_type: "Decidim::Forms::Questionnaire",
+                                      resource_id: questionnaire.id,
+                                      action: "create",
+                                      visibility: "public-only",
+                                      extra: {
+                                        "user" => {
+                                          "ip" => "127.0.0.1",
+                                          "name" => "Dummy user",
+                                          "nickname" => "dummy"
+                                        },
+                                        "resource" => {},
+                                        "component" => {},
+                                        "participatory_space" => {}
+                                      },
+                                      created_at: Time.current,
+                                      updated_at: Time.current
+                                    },
+                                    {
+                                      decidim_organization_id: organization.id,
+                                      user_id: user.id,
+                                      user_type: "Decidim::User",
+                                      resource_type: "Decidim::Forms::Answer",
+                                      resource_id: response.id,
+                                      action: "create",
+                                      visibility: "public-only",
+                                      extra: {
+                                        "user" => {
+                                          "ip" => "127.0.0.1",
+                                          "name" => "Dummy user",
+                                          "nickname" => "dummy"
+                                        },
+                                        "resource" => {},
+                                        "component" => {},
+                                        "participatory_space" => {}
+                                      },
+                                      created_at: Time.current,
+                                      updated_at: Time.current
+                                    }
+                                  ])
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+
+  it "updates properly the action logs" do
+    expect(Decidim::ActionLog.where(resource_type: "Decidim::Forms::Questionnaire").first.resource).to eq(questionnaire)
+    expect(Decidim::ActionLog.where(resource_type: "Decidim::Forms::Response").first).to be_nil
+
+    migrator.migrate(:up)
+    expect(Decidim::ActionLog.where(resource_type: "Decidim::Forms::Questionnaire").first.resource).to eq(questionnaire)
+    expect(Decidim::ActionLog.where(resource_type: "Decidim::Forms::Response").first.resource).to eq(response)
+
+    migrator.migrate(:down)
+    expect(Decidim::ActionLog.where(resource_type: "Decidim::Forms::Questionnaire").first.resource).to eq(questionnaire)
+    expect(Decidim::ActionLog.where(resource_type: "Decidim::Forms::Response").first).to be_nil
+  end
+
+  class Version < ApplicationRecord
+    self.table_name = "versions"
+  end
+
+  it "updates properly the paper trail versions" do
+    Version.create!(
+      item_type: "Decidim::Forms::Answer",
+      item_id: response.id,
+      event: "update",
+      whodunnit: user.id.to_s,
+      object: "{}",
+      object_changes: "{}",
+      created_at: Time.current
+    )
+
+    expect(Version.where(item_type: "Decidim::Forms::Response").first).to be_nil
+
+    migrator.migrate(:up)
+    expect(Version.where(item_type: "Decidim::Forms::Response").first.item_id).to eq(response.id)
+
+    migrator.migrate(:down)
+    expect(Version.where(item_type: "Decidim::Forms::Response").first).to be_nil
+  end
+
+  context "when having attachments" do
+    let!(:response) { create(:response, :with_attachments, questionnaire:) }
+    let!(:other_attachment) { create(:attachment, attached_to: participatory_process) }
+
+    it "updates properly the attachments" do
+      # rubocop:disable Rails/SkipsModelValidations
+      Decidim::Attachment.where(attached_to_type: "Decidim::Forms::Response").update_all(attached_to_type: "Decidim::Forms::Answer")
+      # rubocop:enable Rails/SkipsModelValidations
+
+      expect(Decidim::Attachment.where(attached_to_type: "Decidim::Forms::Answer").first).to be_present
+
+      migrator.migrate(:up)
+      expect(Decidim::Attachment.where(attached_to_type: "Decidim::Forms::Response").first).to eq(response.attachments.first)
+      expect(Decidim::Attachment.where(attached_to_type: "Decidim::ParticipatoryProcess").first).to eq(other_attachment)
+
+      migrator.migrate(:down)
+      expect(Decidim::Attachment.where(attached_to_type: "Decidim::Forms::Answer").first).to be_present
+      expect(Decidim::Attachment.where(attached_to_type: "Decidim::ParticipatoryProcess").first).to eq(other_attachment)
+    end
+  end
+end

From 100e926a32d1c7082d1cfc6258e73c71fa5f4e1e Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Thu, 18 Jun 2026 10:43:21 +0300
Subject: [PATCH 081/131] Backport 'Fix system organization form (short name
 update and only one locale)' to v0.31 (#17144)

Co-authored-by: Elvia Benedith <116598037+ElviaBth@users.noreply.github.com>
---
 .../app/commands/decidim/system/update_organization.rb         | 1 +
 .../app/controllers/decidim/system/organizations_controller.rb | 2 +-
 .../spec/commands/decidim/system/update_organization_spec.rb   | 1 +
 decidim-system/spec/system/organizations_spec.rb               | 3 ++-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/decidim-system/app/commands/decidim/system/update_organization.rb b/decidim-system/app/commands/decidim/system/update_organization.rb
index c84fbee17c23c..be1cea80a453f 100644
--- a/decidim-system/app/commands/decidim/system/update_organization.rb
+++ b/decidim-system/app/commands/decidim/system/update_organization.rb
@@ -45,6 +45,7 @@ def organization
 
       def save_organization
         organization.name = form.name
+        organization.short_name = form.short_name
         organization.host = form.host
         organization.secondary_hosts = form.clean_secondary_hosts
         organization.force_users_to_authenticate_before_access_organization = form.force_users_to_authenticate_before_access_organization
diff --git a/decidim-system/app/controllers/decidim/system/organizations_controller.rb b/decidim-system/app/controllers/decidim/system/organizations_controller.rb
index 4aa65546820e6..6676f83e35db2 100644
--- a/decidim-system/app/controllers/decidim/system/organizations_controller.rb
+++ b/decidim-system/app/controllers/decidim/system/organizations_controller.rb
@@ -82,7 +82,7 @@ def default_params
           host: request.host,
           organization_admin_name: current_admin.email.split("@")[0],
           organization_admin_email: current_admin.email,
-          available_locales: Decidim.available_locales.map(&:to_s),
+          available_locales: [Decidim.default_locale],
           default_locale: Decidim.default_locale,
           users_registration_mode: "enabled"
         }
diff --git a/decidim-system/spec/commands/decidim/system/update_organization_spec.rb b/decidim-system/spec/commands/decidim/system/update_organization_spec.rb
index 29fd5487b6376..84f181bd35385 100644
--- a/decidim-system/spec/commands/decidim/system/update_organization_spec.rb
+++ b/decidim-system/spec/commands/decidim/system/update_organization_spec.rb
@@ -58,6 +58,7 @@ module System
             organization = Organization.last
 
             expect(translated(organization.name)).to eq("Gotham City")
+            expect(translated(organization.short_name)).to eq("GothamCity")
             expect(organization.host).to eq("decide.example.org")
             expect(organization.secondary_hosts).to contain_exactly("foo.example.org", "bar.example.org")
             expect(organization.users_registration_mode).to eq("existing")
diff --git a/decidim-system/spec/system/organizations_spec.rb b/decidim-system/spec/system/organizations_spec.rb
index a393fae94ae6f..aceac8a681001 100644
--- a/decidim-system/spec/system/organizations_spec.rb
+++ b/decidim-system/spec/system/organizations_spec.rb
@@ -33,7 +33,8 @@
         expect(find(:xpath, "//input[@id='organization_organization_admin_name']").value).to eq(admin.email.split("@")[0])
         expect(find(:xpath, "//input[@id='organization_organization_admin_email']").value).to eq(admin.email)
         within "table" do
-          expect(all("input[type=checkbox]")).to all(be_checked)
+          expect(page).to have_field(type: "checkbox", checked: true, count: 1)
+          expect(find(:xpath, "//input[@id='organization_available_locales_#{Decidim.default_locale}']")).to be_checked
           expect(find(:xpath, "//input[@name='organization[default_locale]']", match: :first)).to be_checked
         end
         expect(find(:xpath, "//input[@name='organization[users_registration_mode]']", match: :first).value).to eq("enabled")

From 8452cee13091dca84b89cae0992d385437a9267f Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Thu, 18 Jun 2026 16:41:12 +0300
Subject: [PATCH 082/131] Backport 'Remove check-spelling github workflow' to
 v0.31 (#17152)

---
 .github/actions/spelling/README.md            |  18 -
 .github/actions/spelling/advice.md            |  31 -
 .github/actions/spelling/allow.txt            |  13 -
 .../actions/spelling/block-delimiters.list    |  15 -
 .github/actions/spelling/candidate.patterns   | 660 ------------
 .github/actions/spelling/excludes.txt         | 120 ---
 .github/actions/spelling/expect.txt           | 997 ------------------
 .../actions/spelling/line_forbidden.patterns  | 151 ---
 .github/actions/spelling/patterns.txt         | 164 ---
 .github/actions/spelling/reject.txt           |  11 -
 .github/workflows/spelling.yml                | 150 ---
 11 files changed, 2330 deletions(-)
 delete mode 100644 .github/actions/spelling/README.md
 delete mode 100644 .github/actions/spelling/advice.md
 delete mode 100644 .github/actions/spelling/allow.txt
 delete mode 100644 .github/actions/spelling/block-delimiters.list
 delete mode 100644 .github/actions/spelling/candidate.patterns
 delete mode 100644 .github/actions/spelling/excludes.txt
 delete mode 100644 .github/actions/spelling/expect.txt
 delete mode 100644 .github/actions/spelling/line_forbidden.patterns
 delete mode 100644 .github/actions/spelling/patterns.txt
 delete mode 100644 .github/actions/spelling/reject.txt
 delete mode 100644 .github/workflows/spelling.yml

diff --git a/.github/actions/spelling/README.md b/.github/actions/spelling/README.md
deleted file mode 100644
index da6f2e9d9b52a..0000000000000
--- a/.github/actions/spelling/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# check-spelling/check-spelling configuration
-
-File | Purpose | Format | Info
--|-|-|-
-[dictionary.txt](dictionary.txt) | Replacement dictionary (creating this file will override the default dictionary) | one word per line | [dictionary](https://github.com/check-spelling/check-spelling/wiki/Configuration#dictionary)
-[allow.txt](allow.txt) | Add words to the dictionary | one word per line (only letters and `'`s allowed) | [allow](https://github.com/check-spelling/check-spelling/wiki/Configuration#allow)
-[reject.txt](reject.txt) | Remove words from the dictionary (after allow) | grep pattern matching whole dictionary words | [reject](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-reject)
-[excludes.txt](excludes.txt) | Files to ignore entirely | perl regular expression | [excludes](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-excludes)
-[only.txt](only.txt) | Only check matching files (applied after excludes) | perl regular expression | [only](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-only)
-[patterns.txt](patterns.txt) | Patterns to ignore from checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
-[candidate.patterns](candidate.patterns) | Patterns that might be worth adding to [patterns.txt](patterns.txt) | perl regular expression with optional comment block introductions (all matches will be suggested) | [candidates](https://github.com/check-spelling/check-spelling/wiki/Feature:-Suggest-patterns)
-[line_forbidden.patterns](line_forbidden.patterns) | Patterns to flag in checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
-[expect.txt](expect.txt) | Expected words that aren't in the dictionary | one word per line (sorted, alphabetically) | [expect](https://github.com/check-spelling/check-spelling/wiki/Configuration#expect)
-[advice.md](advice.md) | Supplement for GitHub comment when unrecognized words are found | GitHub Markdown | [advice](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice)
-[block-delimiters.list](block-delimiters.list) | Define block begin/end markers to ignore lines of text | line with _literal string_ for **start** followed by line with _literal string_ for **end** | [block ignore](https://github.com/check-spelling/check-spelling/wiki/Feature%3A-Block-Ignore#status)
-
-Note: you can replace any of these files with a directory by the same name (minus the suffix)
-and then include multiple files inside that directory (with that suffix) to merge multiple files together.
diff --git a/.github/actions/spelling/advice.md b/.github/actions/spelling/advice.md
deleted file mode 100644
index a32d1090aafe1..0000000000000
--- a/.github/actions/spelling/advice.md
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice --> <!-- markdownlint-disable MD033 MD041 -->
-<details><summary>If the flagged items are :exploding_head: false positives</summary>
-
-If items relate to a ...
-* binary file (or some other file you wouldn't want to check at all).
-
-  Please add a file path to the `excludes.txt` file matching the containing file.
-
-  File paths are Perl 5 Regular Expressions - you can [test](
-https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.
-
-  `^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](
-../tree/HEAD/README.md) (on whichever branch you're using).
-
-* well-formed pattern.
-
-  If you can write a [pattern](
-https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
-) that would match it,
-  try adding it to the `patterns.txt` file.
-
-  Patterns are Perl 5 Regular Expressions - you can [test](
-https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your lines.
-
-  Note that patterns can't match multiline strings.
-
-</details>
-
-<!-- adoption information-->
-:steam_locomotive: If you're seeing this message and your PR is from a branch that doesn't have check-spelling,
-please merge to your PR's base branch to get the version configured for your repository.
diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
deleted file mode 100644
index 2cea09386f672..0000000000000
--- a/.github/actions/spelling/allow.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-autolabeler
-github
-https
-ssh
-ubuntu
-workarounds
-tokendispatcher
-pkce
-HTTPOK
-iat
-jti
-JWA
-tlh
diff --git a/.github/actions/spelling/block-delimiters.list b/.github/actions/spelling/block-delimiters.list
deleted file mode 100644
index 4f21922b366f2..0000000000000
--- a/.github/actions/spelling/block-delimiters.list
+++ /dev/null
@@ -1,15 +0,0 @@
-# Public Keys
------BEGIN PUBLIC KEY-----
------END PUBLIC KEY-----
-
-# RSA Private Key
------BEGIN RSA PRIVATE KEY-----
------END RSA PRIVATE KEY-----
-
-# GPG Public Key
------BEGIN PGP PUBLIC KEY BLOCK-----
------END PGP PUBLIC KEY BLOCK-----
-
-# Certificates
------BEGIN CERTIFICATE-----
------END CERTIFICATE-----
diff --git a/.github/actions/spelling/candidate.patterns b/.github/actions/spelling/candidate.patterns
deleted file mode 100644
index 922e699dd920e..0000000000000
--- a/.github/actions/spelling/candidate.patterns
+++ /dev/null
@@ -1,660 +0,0 @@
-# marker to ignore all code on line
-^.*/\* #no-spell-check-line \*/.*$
-# marker to ignore all code on line
-^.*\bno-spell-check(?:-line|)(?:\s.*|)$
-
-# https://cspell.org/configuration/document-settings/
-# cspell inline
-^.*\b[Cc][Ss][Pp][Ee][Ll]{2}:\s*[Dd][Ii][Ss][Aa][Bb][Ll][Ee]-[Ll][Ii][Nn][Ee]\b
-
-# patch hunk comments
-^\@\@ -\d+(?:,\d+|) \+\d+(?:,\d+|) \@\@ .*
-# git index header
-index (?:[0-9a-z]{7,40},|)[0-9a-z]{7,40}\.\.[0-9a-z]{7,40}
-
-# file permissions
-['"`\s][-bcdLlpsw](?:[-r][-w][-Ssx]){2}[-r][-w][-SsTtx]\+?['"`\s]
-
-# css url wrappings
-\burl\([^)]+\)
-
-# cid urls
-(['"])cid:.*?\g{-1}
-
-# data url in parens
-\(data:(?:[^) ][^)]*?|)(?:[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})[^)]*\)
-# data url in quotes
-([`'"])data:(?:[^ `'"].*?|)(?:[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,}).*\g{-1}
-# data url
-\bdata:[-a-zA-Z=;:/0-9+]*,\S*
-
-# https/http/file urls
-(?:\b(?:https?|ftp|file)://)[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]
-
-# mailto urls
-#mailto:[-a-zA-Z=;:/?%&0-9+@._]{3,}
-
-# magnet urls
-magnet:[?=:\w]+
-
-# magnet urls
-"magnet:[^"]+"
-
-# obs:
-"obs:[^"]*"
-
-# The `\b` here means a break, it's the fancy way to handle urls, but it makes things harder to read
-# In this examples content, I'm using a number of different ways to match things to show various approaches
-# asciinema
-\basciinema\.org/a/[0-9a-zA-Z]+
-
-# asciinema v2
-^\[\d+\.\d+, "[io]", ".*"\]$
-
-# apple
-\bdeveloper\.apple\.com/[-\w?=/]+
-# Apple music
-\bembed\.music\.apple\.com/fr/playlist/usr-share/[-\w.]+
-
-# appveyor api
-\bci\.appveyor\.com/api/projects/status/[0-9a-z]+
-# appveyor project
-\bci\.appveyor\.com/project/(?:[^/\s"]*/){2}builds?/\d+/job/[0-9a-z]+
-
-# Amazon
-
-# Amazon
-\bamazon\.com/[-\w]+/(?:dp/[0-9A-Z]+|)
-# AWS S3
-\b\w*\.s3[^.]*\.amazonaws\.com/[-\w/&#%_?:=]*
-# AWS execute-api
-\b[0-9a-z]{10}\.execute-api\.[-0-9a-z]+\.amazonaws\.com\b
-# AWS ELB
-\b\w+\.[-0-9a-z]+\.elb\.amazonaws\.com\b
-# AWS SNS
-\bsns\.[-0-9a-z]+.amazonaws\.com/[-\w/&#%_?:=]*
-# AWS VPC
-vpc-\w+
-
-# While you could try to match `http://` and `https://` by using `s?` in `https?://`, sometimes there
-# YouTube url
-\b(?:(?:www\.|)youtube\.com|youtu.be)/(?:channel/|embed/|user/|playlist\?list=|watch\?v=|v/|)[-a-zA-Z0-9?&=_%]*
-# YouTube music
-\bmusic\.youtube\.com/youtubei/v1/browse(?:[?&]\w+=[-a-zA-Z0-9?&=_]*)
-# YouTube tag
-<\s*youtube\s+id=['"][-a-zA-Z0-9?_]*['"]
-# YouTube image
-\bimg\.youtube\.com/vi/[-a-zA-Z0-9?&=_]*
-# Google Accounts
-\baccounts.google.com/[-_/?=.:;+%&0-9a-zA-Z]*
-# Google Analytics
-\bgoogle-analytics\.com/collect.[-0-9a-zA-Z?%=&_.~]*
-# Google APIs
-\bgoogleapis\.(?:com|dev)/[a-z]+/(?:v\d+/|)[a-z]+/[-@:./?=\w+|&]+
-# Google Storage
-\b[-a-zA-Z0-9.]*\bstorage\d*\.googleapis\.com(?:/\S*|)
-# Google Calendar
-\bcalendar\.google\.com/calendar(?:/u/\d+|)/embed\?src=[@./?=\w&%]+
-\w+\@group\.calendar\.google\.com\b
-# Google DataStudio
-\bdatastudio\.google\.com/(?:(?:c/|)u/\d+/|)(?:embed/|)(?:open|reporting|datasources|s)/[-0-9a-zA-Z]+(?:/page/[-0-9a-zA-Z]+|)
-# The leading `/` here is as opposed to the `\b` above
-# ... a short way to match `https://` or `http://` since most urls have one of those prefixes
-# Google Docs
-/docs\.google\.com/[a-z]+/(?:ccc\?key=\w+|(?:u/\d+|d/(?:e/|)[0-9a-zA-Z_-]+/)?(?:edit\?[-\w=#.]*|/\?[\w=&]*|))
-# Google Drive
-\bdrive\.google\.com/(?:file/d/|open)[-0-9a-zA-Z_?=]*
-# Google Groups
-\bgroups\.google\.com(?:/[a-z]+/(?:#!|)[^/\s"]+)*
-# Google Maps
-\bmaps\.google\.com/maps\?[\w&;=]*
-# Google themes
-themes\.googleusercontent\.com/static/fonts/[^/\s"]+/v\d+/[^.]+.
-# Google CDN
-\bclients2\.google(?:usercontent|)\.com[-0-9a-zA-Z/.]*
-# Goo.gl
-/goo\.gl/[a-zA-Z0-9]+
-# Google Chrome Store
-\bchrome\.google\.com/webstore/detail/[-\w]*(?:/\w*|)
-# Google Books
-\bgoogle\.(?:\w{2,4})/books(?:/\w+)*\?[-\w\d=&#.]*
-# Google Fonts
-\bfonts\.(?:googleapis|gstatic)\.com/[-/?=:;+&0-9a-zA-Z]*
-# Google Forms
-\bforms\.gle/\w+
-# Google Scholar
-\bscholar\.google\.com/citations\?user=[A-Za-z0-9_]+
-# Google Colab Research Drive
-\bcolab\.research\.google\.com/drive/[-0-9a-zA-Z_?=]*
-
-# GitHub SHAs (api)
-\bapi.github\.com/repos(?:/[^/\s"]+){3}/[0-9a-f]+\b
-# GitHub SHAs (markdown)
-(?:\[`?[0-9a-f]+`?\]\(https:/|)/(?:www\.|)github\.com(?:/[^/\s"]+){2,}(?:/[^/\s")]+)(?:[0-9a-f]+(?:[-0-9a-zA-Z/#.]*|)\b|)
-# GitHub SHAs
-\bgithub\.com(?:/[^/\s"]+){2}[@#][0-9a-f]+\b
-# GitHub SHA refs
-\[([0-9a-f]+)\]\(https://(?:www\.|)github.com/[-\w]+/[-\w]+/commit/\g{-1}[0-9a-f]*
-# GitHub wiki
-\bgithub\.com/(?:[^/]+/){2}wiki/(?:(?:[^/]+/|)_history|[^/]+(?:/_compare|)/[0-9a-f.]{40,})\b
-# githubusercontent
-/[-a-z0-9]+\.githubusercontent\.com/[-a-zA-Z0-9?&=_\/.]*
-# githubassets
-\bgithubassets.com/[0-9a-f]+(?:[-/\w.]+)
-# gist github
-\bgist\.github\.com/[^/\s"]+/[0-9a-f]+
-# git.io
-\bgit\.io/[0-9a-zA-Z]+
-# GitHub JSON
-"node_id": "[-a-zA-Z=;:/0-9+_]*"
-# Contributor
-\[[^\]]+\]\(https://github\.com/[^/\s"]+/?\)
-# GHSA
-GHSA(?:-[0-9a-z]{4}){3}
-
-# GitHub actions
-\buses:\s+[-\w.]+/[-\w./]+@[-\w.]+
-
-# GitLab commit
-\bgitlab\.[^/\s"]*/\S+/\S+/commit/[0-9a-f]{7,16}#[0-9a-f]{40}\b
-# GitLab merge requests
-\bgitlab\.[^/\s"]*/\S+/\S+/-/merge_requests/\d+/diffs#[0-9a-f]{40}\b
-# GitLab uploads
-\bgitlab\.[^/\s"]*/uploads/[-a-zA-Z=;:/0-9+]*
-# GitLab commits
-\bgitlab\.[^/\s"]*/(?:[^/\s"]+/){2}commits?/[0-9a-f]+\b
-
-# binance
-accounts\.binance\.com/[a-z/]*oauth/authorize\?[-0-9a-zA-Z&%]*
-
-# bitbucket diff
-\bapi\.bitbucket\.org/\d+\.\d+/repositories/(?:[^/\s"]+/){2}diff(?:stat|)(?:/[^/\s"]+){2}:[0-9a-f]+
-# bitbucket repositories commits
-\bapi\.bitbucket\.org/\d+\.\d+/repositories/(?:[^/\s"]+/){2}commits?/[0-9a-f]+
-# bitbucket commits
-\bbitbucket\.org/(?:[^/\s"]+/){2}commits?/[0-9a-f]+
-
-# bit.ly
-\bbit\.ly/\w+
-
-# bitrise
-\bapp\.bitrise\.io/app/[0-9a-f]*/[\w.?=&]*
-
-# bootstrapcdn.com
-\bbootstrapcdn\.com/[-./\w]+
-
-# cdn.cloudflare.com
-\bcdnjs\.cloudflare\.com/[./\w]+
-
-# circleci
-\bcircleci\.com/gh(?:/[^/\s"]+){1,5}.[a-z]+\?[-0-9a-zA-Z=&]+
-
-# gitter
-\bgitter\.im(?:/[^/\s"]+){2}\?at=[0-9a-f]+
-
-# gravatar
-\bgravatar\.com/avatar/[0-9a-f]+
-
-# ibm
-[a-z.]*ibm\.com/[-_#=:%!?~.\\/\d\w]*
-
-# imgur
-\bimgur\.com/[^.]+
-
-# Internet Archive
-\barchive\.org/web/\d+/(?:[-\w.?,'/\\+&%$#_:]*)
-
-# discord
-/discord(?:app\.com|\.gg)/(?:invite/)?[a-zA-Z0-9]{7,}
-
-# Disqus
-\bdisqus\.com/[-\w/%.()!?&=_]*
-
-# medium link
-\blink\.medium\.com/[a-zA-Z0-9]+
-# medium
-\bmedium\.com/\@?[^/\s"]+/[-\w]+
-
-# microsoft
-\b(?:https?://|)(?:(?:download\.visualstudio|docs|msdn2?|research)\.microsoft|blogs\.msdn)\.com/[-_a-zA-Z0-9()=./%]*
-# powerbi
-\bapp\.powerbi\.com/reportEmbed/[^"' ]*
-# vs devops
-\bvisualstudio.com(?::443|)/[-\w/?=%&.]*
-# microsoft store
-\bmicrosoft\.com/store/apps/\w+
-
-# mvnrepository.com
-\bmvnrepository\.com/[-0-9a-z./]+
-
-# now.sh
-/[0-9a-z-.]+\.now\.sh\b
-
-# oracle
-\bdocs\.oracle\.com/[-0-9a-zA-Z./_?#&=]*
-
-# chromatic.com
-/\S+.chromatic.com\S*[")]
-
-# codacy
-\bapi\.codacy\.com/project/badge/Grade/[0-9a-f]+
-
-# compai
-\bcompai\.pub/v1/png/[0-9a-f]+
-
-# mailgun api
-\.api\.mailgun\.net/v3/domains/[0-9a-z]+\.mailgun.org/messages/[0-9a-zA-Z=@]*
-# mailgun
-\b[0-9a-z]+.mailgun.org
-
-# /message-id/
-/message-id/[-\w@./%]+
-
-# Reddit
-\breddit\.com/r/[/\w_]*
-
-# requestb.in
-\brequestb\.in/[0-9a-z]+
-
-# sched
-\b[a-z0-9]+\.sched\.com\b
-
-# Slack url
-slack://[a-zA-Z0-9?&=]+
-# Slack
-\bslack\.com/[-0-9a-zA-Z/_~?&=.]*
-# Slack edge
-\bslack-edge\.com/[-a-zA-Z0-9?&=%./]+
-# Slack images
-\bslack-imgs\.com/[-a-zA-Z0-9?&=%.]+
-
-# shields.io
-\bshields\.io/[-\w/%?=&.:+;,]*
-
-# stackexchange -- https://stackexchange.com/feeds/sites
-\b(?:askubuntu|serverfault|stack(?:exchange|overflow)|superuser).com/(?:questions/\w+/[-\w]+|a/)
-
-# Sentry
-[0-9a-f]{32}\@o\d+\.ingest\.sentry\.io\b
-
-# Twitter markdown
-\[\@[^[/\]:]*?\]\(https://twitter.com/[^/\s"')]*(?:/status/\d+(?:\?[-_0-9a-zA-Z&=]*|)|)\)
-# Twitter hashtag
-\btwitter\.com/hashtag/[\w?_=&]*
-# Twitter status
-\btwitter\.com/[^/\s"')]*(?:/status/\d+(?:\?[-_0-9a-zA-Z&=]*|)|)
-# Twitter profile images
-\btwimg\.com/profile_images/[_\w./]*
-# Twitter media
-\btwimg\.com/media/[-_\w./?=]*
-# Twitter link shortened
-\bt\.co/\w+
-
-# facebook
-\bfburl\.com/[0-9a-z_]+
-# facebook CDN
-\bfbcdn\.net/[\w/.,]*
-# facebook watch
-\bfb\.watch/[0-9A-Za-z]+
-
-# dropbox
-\bdropbox\.com/sh?/[^/\s"]+/[-0-9A-Za-z_.%?=&;]+
-
-# ipfs protocol
-ipfs://[0-9a-zA-Z]{3,}
-# ipfs url
-/ipfs/[0-9a-zA-Z]{3,}
-
-# w3
-\bw3\.org/[-0-9a-zA-Z/#.]+
-
-# loom
-\bloom\.com/embed/[0-9a-f]+
-
-# regex101
-\bregex101\.com/r/[^/\s"]+/\d+
-
-# figma
-\bfigma\.com/file(?:/[0-9a-zA-Z]+/)+
-
-# freecodecamp.org
-\bfreecodecamp\.org/[-\w/.]+
-
-# image.tmdb.org
-\bimage\.tmdb\.org/[/\w.]+
-
-# mermaid
-\bmermaid\.ink/img/[-\w]+|\bmermaid-js\.github\.io/mermaid-live-editor/#/edit/[-\w]+
-
-# Wikipedia
-\ben\.wikipedia\.org/wiki/[-\w%.#]+
-
-# gitweb
-[^"\s]+/gitweb/\S+;h=[0-9a-f]+
-
-# HyperKitty lists
-/archives/list/[^@/]+\@[^/\s"]*/message/[^/\s"]*/
-
-# lists
-/thread\.html/[^"\s]+
-
-# list-management
-\blist-manage\.com/subscribe(?:[?&](?:u|id)=[0-9a-f]+)+
-
-# kubectl.kubernetes.io/last-applied-configuration
-"kubectl.kubernetes.io/last-applied-configuration": ".*"
-
-# pgp
-\bgnupg\.net/pks/lookup[?&=0-9a-zA-Z]*
-
-# Spotify
-\bopen\.spotify\.com/embed/playlist/\w+
-
-# Mastodon
-\bmastodon\.[-a-z.]*/(?:media/|\@)[?&=0-9a-zA-Z_]*
-
-# scastie
-\bscastie\.scala-lang\.org/[^/]+/\w+
-
-# images.unsplash.com
-\bimages\.unsplash\.com/(?:(?:flagged|reserve)/|)[-\w./%?=%&.;]+
-
-# pastebin
-\bpastebin\.com/[\w/]+
-
-# heroku
-\b\w+\.heroku\.com/source/archive/\w+
-
-# quip
-\b\w+\.quip\.com/\w+(?:(?:#|/issues/)\w+)?
-
-# badgen.net
-\bbadgen\.net/badge/[^")\]'\s]+
-
-# statuspage.io
-\w+\.statuspage\.io\b
-
-# media.giphy.com
-\bmedia\.giphy\.com/media/[^/]+/[\w.?&=]+
-
-# tinyurl
-\btinyurl\.com/\w+
-
-# codepen
-\bcodepen\.io/[\w/]+
-
-# registry.npmjs.org
-\bregistry\.npmjs\.org/(?:@[^/"']+/|)[^/"']+/-/[-\w@.]+
-
-# getopts
-\bgetopts\s+(?:"[^"]+"|'[^']+')
-
-# ANSI color codes
-(?:\\(?:u00|x)1[Bb]|\x1b|\\u\{1[Bb]\})\[\d+(?:;\d+|)m
-
-# URL escaped characters
-%[0-9A-F][A-F](?=[A-Za-z])
-# lower URL escaped characters
-%[0-9a-f][a-f](?=[a-z]{2,})
-# IPv6
-\b(?:[0-9a-fA-F]{0,4}:){3,7}[0-9a-fA-F]{0,4}\b
-# c99 hex digits (not the full format, just one I've seen)
-0x[0-9a-fA-F](?:\.[0-9a-fA-F]*|)[pP]
-# Punycode
-\bxn--[-0-9a-z]+
-# sha
-sha\d+:[0-9]*[a-f]{3,}[0-9a-f]*
-# sha-... -- uses a fancy capture
-(\\?['"]|&quot;)[0-9a-f]{40,}\g{-1}
-# hex runs
-\b[0-9a-fA-F]{16,}\b
-# hex in url queries
-=[0-9a-fA-F]*?(?:[A-F]{3,}|[a-f]{3,})[0-9a-fA-F]*?&
-# ssh
-(?:ssh-\S+|-nistp256) [-a-zA-Z=;:/0-9+]{12,}
-
-# PGP
-\b(?:[0-9A-F]{4} ){9}[0-9A-F]{4}\b
-# GPG keys
-\b(?:[0-9A-F]{4} ){5}(?: [0-9A-F]{4}){5}\b
-# Well known gpg keys
-.well-known/openpgpkey/[\w./]+
-
-# pki
------BEGIN.*-----END
-
-# uuid:
-\b[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}\b
-# hex digits including css/html color classes:
-(?:[\\0][xX]|\\u|[uU]\+|#x?|%23)[0-9_a-fA-FgGrR]*?[a-fA-FgGrR]{2,}[0-9_a-fA-FgGrR]*(?:[uUlL]{0,3}|[iu]\d+)\b
-# integrity
-integrity=(['"])(?:\s*sha\d+-[-a-zA-Z=;:/0-9+]{40,})+\g{-1}
-
-# https://www.gnu.org/software/groff/manual/groff.html
-# man troff content
-\\f[BCIPR]
-# '/"
-\\\([ad]q
-
-# .desktop mime types
-^MimeTypes?=.*$
-# .desktop localized entries
-^[A-Z][a-z]+\[[a-z]+\]=.*$
-# Localized .desktop content
-Name\[[^\]]+\]=.*
-
-# IServiceProvider / isAThing
-\b(?:I|isA)(?=(?:[A-Z][a-z]{2,})+(?:[A-Z]|\b))
-
-# crypt
-(['"])\$2[ayb]\$.{56}\g{-1}
-
-# scrypt / argon
-\$(?:scrypt|argon\d+[di]*)\$\S+
-
-# go.sum
-\bh1:\S+
-
-# scala modules
-("[^"]+"\s*%%?\s*){2,3}"[^"]+"
-
-# Input to GitHub JSON
-content: (['"])[-a-zA-Z=;:/0-9+]*=\g{-1}
-
-# This does not cover multiline strings, if your repository has them,
-# you'll want to remove the `(?=.*?")` suffix.
-# The `(?=.*?")` suffix should limit the false positives rate
-# printf
-%(?:(?:(?:hh?|ll?|[jzt])?[diuoxn]|l?[cs]|L?[fega]|p)(?=[a-z]{2,})|(?:X|L?[FEGA]|p)(?=[a-zA-Z]{2,}))(?!%)(?=[_a-zA-Z]+(?!%)\b)(?=.*?['"])
-
-# Alternative printf
-# %s
-%(?:s(?=[a-z]{2,}))(?!%)(?=[_a-zA-Z]+(?!%)\b)(?=.*?['"])
-
-# Python string prefix / binary prefix
-# Note that there's a high false positive rate, remove the `?=` and search for the regex to see if the matches seem like reasonable strings
-(?<!['"])\b(?:B|BR|Br|F|FR|Fr|R|RB|RF|Rb|Rf|U|UR|Ur|b|bR|br|f|fR|fr|r|rB|rF|rb|rf|u|uR|ur)['"](?=[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})
-
-# Regular expressions for (P|p)assword
-\([A-Z]\|[a-z]\)[a-z]+
-
-# JavaScript regular expressions
-# javascript test regex
-/.{3,}/[gim]*\.test\(
-# javascript match regex
-\.match\(/[^/\s"]{3,}/[gim]*\s*
-# javascript match regex
-\.match\(/\\[b].{3,}?/[gim]*\s*\)(?:;|$)
-# javascript regex
-^\s*/\\[b]{3,}*/[gim]*\s*(?:\)(?:;|$)|,$)
-# javascript replace regex
-\.replace\(/[^/\s"]{3,}/[gim]*\s*,
-# assign regex
-= /[^*]*?(?:[a-z]{3,}|[A-Z]{3,}|[A-Z][a-z]{2,}).*/
-# perl regex test
-[!=]~ (?:/.*/|m\{.*?\}|m<.*?>|m([|!/@#,;']).*?\g{-1})
-
-# perl qr regex
-(?<!\$)\bqr(?:\{.*?\}|<.*?>|\(.*?\)|([|!/@#,;']).*?\g{-1})
-
-# perl run
-perl(?:\s+-[a-zA-Z]\w*)+
-
-# C network byte conversions
-#(?:\d|\bh)to(?!ken)(?=[a-z])|to(?=[adhiklpun]\()
-
-# Go regular expressions
-regexp?\.MustCompile\(`[^`]*`\)
-
-# regex choice
-\(\?:[^)]+\|[^)]+\)
-
-# proto
-^\s*(\w+)\s\g{-1} =
-
-# sed regular expressions
-sed 's/(?:[^/]*?[a-zA-Z]{3,}[^/]*?/){2}
-
-# node packages
-(["'])\@[^/'" ]+/[^/'" ]+\g{-1}
-
-# go install
-go install(?:\s+[a-z]+\.[-@\w/.]+)+
-
-# jetbrains schema https://youtrack.jetbrains.com/issue/RSRP-489571
-urn:shemas-jetbrains-com
-
-# kubernetes pod status lists
-# https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase
-\w+(?:-\w+)+\s+\d+/\d+\s+(?:Running|Pending|Succeeded|Failed|Unknown)\s+
-
-# kubectl - pods in CrashLoopBackOff
-\w+-[0-9a-f]+-\w+\s+\d+/\d+\s+CrashLoopBackOff\s+
-
-# kubernetes object suffix
--[0-9a-f]{10}-\w{5}\s
-
-# posthog secrets
-([`'"])phc_[^"',]+\g{-1}
-
-# xcode
-
-# xcodeproject scenes
-(?:Controller|destination|ID|id)="\w{3}-\w{2}-\w{3}"
-
-# xcode api botches
-customObjectInstantitationMethod
-
-# configure flags
-.* \| --\w{2,}.*?(?=\w+\s\w+)
-
-# font awesome classes
-\.fa-[-a-z0-9]+
-
-# bearer auth
-(['"])Bear[e][r] .*?\g{-1}
-
-# bearer auth
-Bear[e][r]:? [-a-zA-Z=;:/0-9+.]+
-
-# basic auth
-(['"])Basic [-a-zA-Z=;:/0-9+]{3,}\g{-1}
-
-# base64 encoded content
-([`'"])[-a-zA-Z=;:/0-9+]{3,}=\g{-1}
-# base64 encoded content in xml/sgml
->[-a-zA-Z=;:/0-9+]{3,}=</
-# base64 encoded content, possibly wrapped in mime
-#(?:^|[\s=;:?])[-a-zA-Z=;:/0-9+]{50,}(?:[\s=;:?]|$)
-
-# encoded-word
-=\?[-a-zA-Z0-9"*%]+\?[BQ]\?[^?]{0,75}\?=
-
-# Time Zones
-\b(?:Africa|Atlantic|America|Antarctica|Asia|Australia|Europe|Indian|Pacific)(?:/\w+)+
-
-# linux kernel info
-^(?:bugs|flags|Features)\s+:.*
-
-# systemd mode
-systemd.*?running in system mode \([-+].*\)$
-
-# Lorem
-# Update Lorem based on your content (requires `ge` and `w` from https://github.com/jsoref/spelling; and `review` from https://github.com/check-spelling/check-spelling/wiki/Looking-for-items-locally )
-# grep '^[^#].*lorem' .github/actions/spelling/patterns.txt|perl -pne 's/.*i..\?://;s/\).*//' |tr '|' "\n"|sort -f |xargs -n1 ge|perl -pne 's/^[^:]*://'|sort -u|w|sed -e 's/ .*//'|w|review -
-# Warning, while `(?i)` is very neat and fancy, if you have some binary files that aren't proper unicode, you might run into:
-# ... Operation "substitution (s///)" returns its argument for non-Unicode code point 0x1C19AE (the code point will vary).
-# ... You could manually change `(?i)X...` to use `[Xx]...`
-# ... or you could add the files to your `excludes` file (a version after 0.0.19 should identify the file path)
-(?:(?:\w|\s|[,.])*\b(?i)(?:amet|consectetur|cursus|dolor|eros|ipsum|lacus|libero|ligula|lorem|magna|neque|nulla|suscipit|tempus)\b(?:\w|\s|[,.])*)
-
-# Non-English
-[a-zA-Z]*[ÀÁÂÃÄÅÆČÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæčçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3}[a-zA-ZÀÁÂÃÄÅÆČÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæčçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]*|[a-zA-Z]{3,}[ÀÁÂÃÄÅÆČÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæčçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]|[ÀÁÂÃÄÅÆČÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæčçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3,}
-
-# highlighted letters
-\[[A-Z]\][a-z]+
-
-# French
-# This corpus only had capital letters, but you probably want lowercase ones as well.
-\b[LN]'+[a-z]{2,}\b
-
-# latex (check-spelling <= 0.0.21)
-\\(?:n(?:ew|ormal|osub)|r(?:enew)|t(?:able(?:of|)|he|itle))(?=[a-z]+)
-
-# latex (check-spelling >= 0.0.22)
-\\\w{2,}\{
-
-# eslint
-"varsIgnorePattern": ".+"
-
-# Windows short paths
-[/\\][^/\\]{5,6}~\d{1,2}[/\\]
-
-# cygwin paths
-/cygdrive/[a-zA-Z]/(?:Program Files(?: \(.*?\)| ?)(?:/[-+.~\\/()\w ]+)*|[-+.~\\/()\w])+
-
-# in check-spelling@v0.0.22+, printf markers aren't automatically consumed
-# printf markers
-(?<!\\)\\[nrt](?=[a-z]{2,})
-# alternate markers if you run into latex and friends
-(?<!\\)\\[nrt](?=[a-z]{2,})(?=.*['"`])
-
-# apache
-a2(?:en|dis)
-
-# weak e-tag
-W/"[^"]+"
-
-# the negative lookahead here is to allow catching 'templatesz' as a misspelling
-# but to otherwise recognize a Windows path with \templates\foo.template or similar:
-\\(?:necessary|r(?:eport|esolve[dr]?|esult)|t(?:arget|emplates?))(?![a-z])
-# ignore long runs of a single character:
-\b([A-Za-z])\g{-1}{3,}\b
-
-# version suffix <word>v#
-(?:(?<=[A-Z]{2})V|(?<=[a-z]{2}|[A-Z]{2})v)\d+(?:\b|(?=[a-zA-Z_]))
-
-# Compiler flags (Unix, Java/Scala)
-# Use if you have things like `-Pdocker` and want to treat them as `docker`
-#(?:^|[\t ,>"'`=(])-(?:(?:J-|)[DPWXY]|[Llf])(?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
-
-# Compiler flags (Windows / PowerShell)
-# This is a subset of the more general compiler flags pattern.
-# It avoids matching `-Path` to prevent it from being treated as `ath`
-#(?:^|[\t ,"'`=(])-(?:[DPL](?=[A-Z]{2,})|[WXYlf](?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,}))
-
-# Compiler flags (linker)
-,-B
-
-# curl arguments
-\b(?:\\n|)curl(?:\.exe|)(?:\s+-[a-zA-Z]{1,2}\b)*(?:\s+-[a-zA-Z]{3,})(?:\s+-[a-zA-Z]+)*
-# set arguments
-\b(?:bash|sh|set)(?:\s+-[abefimouxE]{1,2})*\s+-[abefimouxE]{3,}(?:\s+-[abefimouxE]+)*
-# tar arguments
-\b(?:\\n|)g?tar(?:\.exe|)(?:(?:\s+--[-a-zA-Z]+|\s+-[a-zA-Z]+|\s[ABGJMOPRSUWZacdfh-pr-xz]+\b)(?:=[^ ]*|))+
-# tput arguments -- https://man7.org/linux/man-pages/man5/terminfo.5.html -- technically they can be more than 5 chars long...
-\btput\s+(?:(?:-[SV]|-T\s*\w+)\s+)*\w{3,5}\b
-# macOS temp folders
-/var/folders/\w\w/[+\w]+/(?:T|-Caches-)/
-# github runner temp folders
-/home/runner/work/_temp/[-_/a-z0-9]+
diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt
deleted file mode 100644
index cb7f1f58cd5bc..0000000000000
--- a/.github/actions/spelling/excludes.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-excludes
-(?:^|/)(?i)COPYRIGHT
-(?:^|/)(?i)LICEN[CS]E
-(?:^|/)3rdparty/
-(?:^|/)\.keep$
-(?:^|/)go\.sum$
-(?:^|/)package(?:-lock|)\.json$
-(?:^|/)Pipfile$
-(?:^|/)pyproject.toml
-(?:^|/)requirements(?:-dev|-doc|-test|)\.txt$
-(?:^|/)vendor/
-[^/]\.jwk$
-[^/]\.odt$
-\.a$
-\.ai$
-\.all-contributorsrc$
-\.avi$
-\.bmp$
-\.bz2$
-\.cer$
-\.class$
-\.coveragerc$
-\.crl$
-\.crt$
-\.csr$
-\.dll$
-\.docx?$
-\.drawio$
-\.DS_Store$
-\.eot$
-\.eps$
-\.exe$
-\.gif$
-\.git-blame-ignore-revs$
-\.gitattributes$
-\.gitkeep$
-\.graffle$
-\.gz$
-\.icns$
-\.ico$
-\.ipynb$
-\.jar$
-\.jks$
-\.jpe?g$
-\.key$
-\.lib$
-\.lock$
-\.map$
-\.min\..
-\.mo$
-\.mod$
-\.mp[34]$
-\.o$
-\.ocf$
-\.otf$
-\.p12$
-\.parquet$
-\.pdf$
-\.pem$
-\.pfx$
-\.png$
-\.psd$
-\.pyc$
-\.pylintrc$
-\.qm$
-\.s$
-\.sig$
-\.so$
-\.svgz?$
-\.sys$
-\.tar$
-\.tgz$
-\.tiff?$
-\.ttf$
-\.wav$
-\.webm$
-\.webp$
-\.woff2?$
-\.xcf$
-\.xlsx?$
-\.xpm$
-\.xz$
-\.zip$
-^\.github/actions/spelling/
-^\Q.github/workflows/spelling.yml\E$
-/db/migrate/
-/locales/
-^\Q.erb-lint.yml\E$
-^\Q.erb_lint.yml\E$
-^\Q.spelling.yml\E$
-^\QCHANGELOG.md\E$
-^\Qpubliccode.yml\E$
-^\Qdecidim-accountability/spec/fixtures/valid_result.csv\E$
-^\Qdecidim-assemblies/app/packs/src/decidim/assemblies/orgchart.js\E$
-^\Qdecidim-core/app/cells/decidim/amendable/amenders_list/show.erb\E$
-^\Qdecidim-core/app/cells/decidim/card_l/extra_data.erb\E$
-^\Qdecidim-core/app/cells/decidim/content_blocks/base/content.erb\E$
-^\Qdecidim-core/app/packs/src/decidim/decidim_application.js\E$
-^\Qdecidim-core/app/views/decidim/account/_user_groups.html.erb\E$
-^\Qdecidim-core/app/views/decidim/shared/_comments.html.erb\E$
-^\Qdecidim-core/app/views/layouts/decidim/_edit_link.html.erb\E$
-^\Qdecidim-core/lib/decidim/db/common-passwords.txt\E$
-^\Qdecidim-core/spec/mailers/decidim_devise_mailer_spec.rb\E$
-^\Qdecidim-core/spec/db/data/add_short_name_to_organizations_spec.rb\E$
-^\Qdecidim-dev/lib/decidim/dev/assets/assemblies.json\E$
-^\Qdecidim-dev/lib/decidim/dev/assets/base64_content.html\E$
-^\Qdecidim-dev/lib/decidim/dev/assets/import_proposals.csv\E$
-^\Qdecidim-dev/lib/decidim/dev/assets/import_proposals.json\E$
-^\Qdecidim-dev/lib/decidim/dev/assets/import_proposals_broken.csv\E$
-^\Qdecidim-dev/lib/decidim/dev/assets/participatory_processes.json\E$
-^\Qdecidim-initiatives/app/views/decidim/initiatives/initiatives/_linked_initiatives.html.erb\E$
-^\Qdecidim-meetings/app/views/decidim/meetings/admin/agenda/show.html.erb\E$
-^\Qdecidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/_statistics.html.erb\E$
-^\Qdecidim-ai/data/blocked_accounts.csv\E$
-^\Qdecidim-ai/data/sms-spam.csv\E$
-^\Qdecidim-ai/data/spam_comments.csv\E$
-^\Qdecidim-ai/spec/support/test.csv\E$
-^\Qdocs/modules/develop/assets/attachments/grafana/metadecidim-graphql.json\E$
-^\Qdocs/modules/develop/assets/attachments/grafana/metadecidim-csv.json\E$
-ignore$
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
deleted file mode 100644
index 1a1733c921422..0000000000000
--- a/.github/actions/spelling/expect.txt
+++ /dev/null
@@ -1,997 +0,0 @@
-Aaaa
-Aabb
-abans
-abcd
-abcert
-abcloktpes
-acceptada
-accesslist
-acentos
-acro
-activejob
-activelog
-activemodel
-activerecord
-activestorage
-actualitzar
-actualizado
-addlabel
-Adeu
-adjunt
-admins
-adoc
-AFFERO
-AGPL
-aitools
-Ajuntament
-Ajuntamentde
-alabs
-alecslupu
-Alexandru
-amagat
-amd
-amendables
-AMR
-andreslucena
-ANOT
-antora
-Anunci
-apiauth
-apikey
-aproximadamente
-aquesta
-ARBITRARYREF
-arel
-Arquitectura
-Arrakis
-Artagnan
-arxiu
-associacio
-atcat
-atiger
-Atlassian
-attachables
-attachablesform
-authlogic
-authorable
-auths
-autocorrection
-autocorrects
-automatisms
-autosort
-autotranslated
-autowidth
-AXXXXXXXX
-backported
-backporter
-backticks
-barcat
-Basecamp
-Basecontroller
-Batchloader
-bayes
-bbb
-Bbbb
-BCN
-beforeinput
-beforeinstallprompt
-belighted
-bem
-bgset
-Biblioteca
-bindir
-binread
-binstub
-binwrite
-blabla
-blockless
-blockquotes
-blogpost
-blogs
-bmbm
-boundingbox
-Brakus
-breadcrumb
-browserstack
-bugfixing
-busques
-Butlletins
-byebug
-bytesize
-cacatua
-Calafell
-Calibri
-callouts
-CALSCALE
-Cambios
-camelization
-cami
-Capfile
-carolromero
-Carrer
-carryforward
-catala
-Catalunya
-categorizable
-cattr
-cbracket
-CCORP
-ccv
-cdn
-cdp
-cellphone
-changeme
-chartkick
-cherrypicking
-childs
-chromedriver
-cityhall
-clickable
-clickbait
-cmax
-cmin
-coauthorable
-coauthorabledummy
-cobertura
-codecov
-codefor
-codespace
-CODEOWNERS
-codeql
-coditramuntana
-commentables
-commentaire
-commenters
-commentvotes
-conferenceinvites
-conferenceregistrations
-confirmada
-confirmado
-confirmat
-Consolas
-constantized
-contingut
-continuar
-contrasenya
-coopdevs
-correu
-Cov
-Cprojects
-crdownload
-crear
-createcluster
-createuser
-crowdin
-crt
-cryptor
-CSPs
-csrf
-csslintrc
-CSSs
-cta
-cuenta
-Cugat
-customise
-Customising
-cweek
-cyclomatic
-danline
-dasherize
-dataconsent
-dataselect
-dataviz
-Daunou
-dayjs
-DDG
-ddmm
-deauthorizes
-debante
-debian
-decidiamo
-decidim
-decidimcommandscreateresource
-decidimcommandsdestroyresource
-decidimcommandsupdateresource
-deconstantize
-Defg
-deivid
-demodulize
-demodulized
-Denesik
-denunciat
-detalles
-devcontainer
-dfd
-Dfyv
-DIBA
-diffable
-diffing
-diffs
-diffy
-digidemlab
-dilema
-Disableable
-displaycondition
-django
-dni
-dockerflow
-Doctum
-doesnot
-doggotrainer
-Dokku
-Dota
-dotfiles
-douban
-downvoted
-downvotes
-downvoting
-draggables
-dragula
-drinkform
-dropcluster
-dsl
-dtend
-dtgt
-dtgteq
-dtlt
-dtlteq
-dtstart
-dvh
-editlabel
-editorlabel
-edu
-eeny
-elina
-emoji
-emojiable
-emojidata
-Emph
-encryptable
-encryptor
-endo
-endr
-enduml
-enquestes
-ent
-Entra
-entrypath
-entrypoints
-enviado
-envrc
-EOCONTENT
-EOEXPECTED
-EOLIST
-EOPARAGRAPH
-EORESULT
-EOTASK
-eql
-equalcat
-equales
-equalto
-erabaki
-erblint
-Errbit
-Esa
-espa
-estar
-estat
-etherpad
-evanfuture
-evt
-Exampledocument
-Existente
-EXISTINGCITY
-exitstatus
-faketoken
-Fal
-fcell
-fcm
-FEDER
-felipe
-fhtagn
-fieldsets
-Fillmurray
-filn
-finaltype
-fingerprintable
-Firefox
-flaggable
-flamegraph
-flexbugs
-Flickr
-flt
-focusguard
-fontawesome
-Fonticons
-foobardoe
-foobaz
-foocat
-foodform
-fooes
-fooo
-foos
-formattings
-formelements
-formfield
-forminvalid
-formreset
-formvalid
-formvalidator
-Fpb
-freetext
-Fritsch
-Froilan
-gadgetmodel
-gamification
-gamified
-GCell
-gcs
-Gcv
-gemfile
-genereation
-genis
-geocodable
-geocoded
-geocodes
-geocoordinate
-geolocalizable
-geolocated
-getobj
-GFM
-GHSA
-gia
-Girona
-gitpod
-googleoff
-googleon
-gotchas
-gpg
-gpu
-gql
-grafana
-Graphi
-graphiql
-groupless
-Gruhier
-grup
-gsutil
-gteq
-Gual
-GVzd
-Gyver
-hadolint
-haml
-Hammes
-hashdiff
-hashtaggable
-hashtags
-heighta
-heightb
-hereapi
-Heroku
-hexapdf
-hideable
-highlightjs
-hll
-HMi
-hmr
-hmtl
-Hnwif
-Hodor
-Holas
-honeypots
-hooli
-hotwired
-housenumber
-hsh
-hsts
-httpdate
-httpfoobar
-httpsfoobar
-huedelta
-iaa
-iban
-ical
-icalendar
-icondata
-ics
-idx
-iframes
-iife
-Ijkl
-ilike
-illgotten
-impersonatable
-inbox
-includeurl
-Indicacions
-infoa
-infob
-informables
-Inici
-iniciar
-iniciat
-inodes
-inputdialog
-inputname
-Inscriu
-interf
-inviteduser
-isbn
-iseq
-isready
-Italiano
-ivan
-Jaskolski
-Jaume
-javascripts
-jdoe
-Jeet
-Jenae
-Jfcm
-jfif
-jkl
-JKR
-joannadoe
-joedoe
-joh
-johndoe
-johnohara
-jon
-josepjaume
-jpe
-jschmoe
-jslib
-jsperezg
-julia
-justme
-kathline
-Kerrigan
-keyfile
-keyout
-keypart
-keyserver
-kramdoc
-kramdown
-kwbegin
-laguardia
-Lalalilo
-latlng
-Layouter
-LCell
-legacysupport
-Lesch
-lfo
-libicu
-libpq
-libreadline
-libreoffice
-libu
-libyaml
-Liddel
-lighthouserc
-likeables
-linebreak
-linkbubble
-linkedin
-linthtml
-linthtmlrc
-linting
-listid
-litem
-llarg
-Llaurador
-Llobregat
-lng
-Localret
-localvars
-loggable
-lon
-LOPD
-los
-Lovecraft
-lsclusters
-lte
-lteq
-LTREE
-Lupu
-lvh
-magick
-mainio
-Malgrat
-Mandaliya
-maptiles
-markercluster
-marydoe
-Massot
-matrixmultiple
-matutes
-maxtimeout
-mcdoggo
-mcell
-medios
-meeny
-meh
-mensaje
-mentionables
-mergeable
-meses
-metadatas
-metadecidim
-metaprogrammed
-metaprogramming
-metatags
-mic
-mickdoe
-mikedoe
-Milhouse
-millor
-Millora
-mintimeout
-minuscat
-misogi
-mlat
-mlon
-moby
-Mobi
-modals
-modernizrrc
-modestbranding
-modificado
-modifs
-modqule
-mongoid
-morphdom
-Mostrar
-mozilla
-mpassid
-mrc
-mri
-mso
-msword
-multichoice
-multifield
-multitenant
-mycity
-myengine
-mypass
-myprovider
-mytesturl
-myuser
-neighbourhoods
-Neue
-newadmin
-NEWCODE
-newsletterable
-newusermanager
-newwindow
-ngrams
-nicknamenicknamenick
-nicknamenicknamenickname
-nicknamizable
-nicknamize
-nie
-nikola
-nlevel
-nocaps
-nocookie
-NOCREATEROLE
-nodoc
-nok
-nombre
-nominatim
-noresults
-normalcase
-notif
-notselected
-nric
-nto
-nuqmnw
-NVDA
-objecte
-oblidat
-Occaecati
-ocultat
-odf
-odnoklassniki
-odt
-officedocument
-officializating
-officializations
-officializes
-ofthe
-Okuneva
-oldman
-Oma
-Omnia
-OMNIATH
-omniauth
-omniauthable
-oneline
-Onmi
-Ooo
-opencollective
-opendocument
-openstreetmap
-openxmlformats
-OPR
-optin
-orga
-Oriol
-oriolgual
-ORMs
-osallistu
-osm
-oss
-osv
-osx
-otf
-otg
-otheradmin
-otherpath
-ots
-ott
-outdenting
-outdents
-outdir
-outro
-owib
-Paa
-paddable
-pageload
-paginable
-palotes
-pamplona
-pandoc
-paramxx
-partcipatory
-participatoryspaceprivateusers
-patrimonigracia
-Peguera
-pepito
-Percebe
-perfil
-Peroy
-persistor
-personalitzat
-pgdata
-pgp
-PGVERSION
-Phargo
-phoe
-pids
-pinterest
-Placeholdit
-plantuml
-plataforma
-platoniq
-pluscat
-plusplus
-Poblenou
-Podemos
-Poemes
-pokecode
-Pollich
-polygonpoints
-popupclose
-popupopen
-posmatch
-postgre
-postgresql
-ppx
-prebuilds
-precache
-preheader
-premailer
-Preproc
-presenceness
-previewurl
-privatable
-Procesos
-processess
-procfile
-PRODID
-progname
-progressbox
-promotal
-promotors
-proposta
-Propostes
-Propuesta
-prosemirror
-protonmail
-publicable
-Pujol
-pwa
-QLiterals
-qlty
-queda
-qux
-raf
-railtie
-railties
-randomable
-ransackable
-Ratke
-Raymundo
-rbngzlv
-reallowed
-rebornix
-rebutjada
-recapitated
-reconfirmable
-redcarpet
-reddit
-refactorings
-regexes
-regexps
-registrado
-registrat
-reivindicate
-relogin
-remindable
-remittant
-remixicon
-renderized
-Renetta
-reofficialize
-reorderer
-Repelle
-reportables
-reportat
-resourcable
-resourceable
-Returs
-Riera
-Rigoberto
-riseup
-roadmap
-Rojman
-routable
-rowdata
-rowi
-RQR
-rqrcode
-rroe
-rsefa
-rsimplecov
-Rubo
-rubycw
-rumany
-ruybgems
-rvm
-Ryanair
-Sangtrait
-sanitizers
-scannables
-SCell
-scheleton
-Schoen
-scopable
-screenreader
-screenshots
-searchables
-sectorials
-selectables
-selectednode
-selfxss
-separador
-sereneinserenade
-serializeds
-setseed
-sgid
-shakapacker
-sharedapp
-shellcheckrc
-shs
-sidekiq
-signedby
-siguientes
-similars
-Simonis
-singlechoice
-slugization
-slugizes
-smartbreak
-Smileys
-Snowlvhme
-Snoworg
-softdeleteable
-somecapitalguy
-somedatabase
-Sorbier
-sortings
-sortitions
-sortupdate
-sourced
-spammer
-spos
-spreadsheetml
-sqbracket
-sss
-Stabby
-stackprof
-Stadi
-standarized
-startuml
-stftime
-Stylelinter
-stylelintrc
-subattributes
-subelements
-subforms
-subgems
-subkeys
-submodel
-subpage
-subquery
-subrecord
-subresult
-subscope
-subsubscope
-subtemplate
-subtpl
-subu
-subvalue
-suomifi
-Superkalifragilistic
-superklass
-superprocess
-sustainability
-swc
-tableize
-tailwindcss
-tarekraafat
-taxonomizable
-taxonomization
-technopolitical
-templatable
-templateable
-Terica
-Terrassa
-terrats
-territorials
-testid
-testsecret
-teva
-texta
-Textareas
-textb
-texto
-thant
-thelma
-thepassword
-THH
-thi
-Tiene
-tilelayer
-timedout
-timelapse
-timeoutable
-timeouter
-timestamped
-tiptap
-TLDR
-Tmpname
-todos
-Tomorrowland
-tomselect
-tooshort
-topbar
-tophat
-traceabilty
-traducido
-Tramuntana
-trashable
-traslatable
-trgm
-trobada
-trobat
-tsearch
-turbolinks
-Twilio
-tzid
-ucw
-udev
-ueee
-ugc
-ujs
-ukmany
-unassigning
-unassigns
-uncollapsing
-uncommentable
-undefines
-unfollow
-unhides
-Uninstalls
-unmark
-unofficializating
-unofficialization
-unofficialize
-unofficialized
-unofficializing
-unperformant
-Unpublicable
-unpublishes
-unpublishing
-unpublshed
-unregisters
-unreport
-unresolveable
-unsigning
-unsigns
-unsubscribes
-untrains
-unvotes
-upcomingfoobar
-UPDREF
-uploaders
-upvoted
-upvotes
-upvoting
-usecase
-usename
-usuarias
-Uth
-utm
-Uusimaa
-Valero
-validable
-valids
-Valuetypes
-VCALENDAR
-veeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeery
-verificator
-verylongnicknamethatcreatesanerror
-VEVENT
-vfield
-Vilanova
-vimeo
-VJHT
-vkontakte
-vnd
-voner
-vostre
-votar
-votings
-VPAGQ
-vrojman
-wadus
-WAI
-wcag
-webcam
-webpacker
-webpage
-webpush
-websites
-wechat
-whatislove
-whatsapp
-widtha
-widthb
-wifi
-wingrunr
-winutils
-wip
-wisper
-withdrawability
-WYSWYG
-XForwarded
-xing
-xobject
-Xvfb
-XXXXXXXXY
-XXXXXXXY
-yardopts
-ydd
-yieldparam
-yieldreturn
-yoda
-youruser
-youtu
-youtube
-yuyuyukie
-Zbd
-Zupper
-zzz
diff --git a/.github/actions/spelling/line_forbidden.patterns b/.github/actions/spelling/line_forbidden.patterns
deleted file mode 100644
index bcc1b36625c73..0000000000000
--- a/.github/actions/spelling/line_forbidden.patterns
+++ /dev/null
@@ -1,151 +0,0 @@
-# reject `m_data` as VxWorks defined it and that breaks things if it's used elsewhere
-# see [fprime](https://github.com/nasa/fprime/commit/d589f0a25c59ea9a800d851ea84c2f5df02fb529)
-# and [Qt](https://github.com/qtproject/qt-solutions/blame/fb7bc42bfcc578ff3fa3b9ca21a41e96eb37c1c7/qtscriptclassic/src/qscriptbuffer_p.h#L46)
-#\bm_data\b
-
-# Were you debugging using a framework with `fit()`?
-# If you have a framework that uses `it()` for testing and `fit()` for debugging a specific test,
-# you might not want to check in code where you skip all the other tests.
-#\bfit\(
-
-# Should be `anymore`
-\bany more[,.]
-
-# Should be `cannot` (or `can't`)
-# See https://www.grammarly.com/blog/cannot-or-can-not/
-# > Don't use `can not` when you mean `cannot`. The only time you're likely to see `can not` written as separate words is when the word `can` happens to precede some other phrase that happens to start with `not`.
-# > `Can't` is a contraction of `cannot`, and it's best suited for informal writing.
-# > In formal writing and where contractions are frowned upon, use `cannot`.
-# > It is possible to write `can not`, but you generally find it only as part of some other construction, such as `not only . . . but also.`
-# - if you encounter such a case, add a pattern for that case to patterns.txt.
-\b[Cc]an not\b
-
-# Should be `GitHub`
-(?<![&*.]|// |\btype )\bGithub\b(?![{)])
-
-# Should be `GitLab`
-(?<![&*.]|// |\btype )\bGitlab\b(?![{)])
-
-# Should be `JavaScript`
-\bJavascript\b
-
-# Should be `macOS` or `Mac OS X` or ...
-\bMacOS\b
-
-# Should be `Microsoft`
-\bMicroSoft\b
-
-# Should be `OAuth`
-(?:^|[^-/*$])[ '"]oAuth(?: [a-z]|\d+ |[^ a-zA-Z0-9:;_.()])
-
-# Should be `TypeScript`
-\bTypescript\b
-
-# Should be `another`
-\ban[- ]other\b
-
-# Should be `case-(in)sensitive`
-\bcase (?:in|)sensitive\b
-
-# Should be `deprecation warning(s)`
-\b[Dd]epreciation [Ww]arnings?\b
-
-# Should be `greater than`
-\bgreater then\b
-
-# Should be `in front of`
-\bin from of\b
-
-# Should be `into`
-# when not phrasal and when `in order to` would be wrong:
-# https://thewritepractice.com/into-vs-in-to/
-#\sin to\s(?!if\b)
-
-# Should be `is obsolete`
-\bis obsolescent\b
-
-# Should be `it's` or `its`
-\bits['’]
-
-# Should be `its`
-\bit's(?= own\b)
-
-# Should be `perform its`
-\bperform it's\b
-
-# Should be `opt-in`
-(?<!\sfor)\sopt in\s
-
-# Should be `less than`
-\bless then\b
-
-# Should be `one of`
-\bon of\b
-
-# Should be `otherwise`
-\bother[- ]wise\b
-
-# Should be `or (more|less)`
-\bore (?:more|less)\b
-
-# Should be `rather than`
-\brather then\b
-
-# Should be `regardless, ...` or `regardless of (whether)`
-\b[Rr]egardless if you\b
-
-# Should be `no longer needed`
-\bno more needed\b(?! than\b)
-
-# Should be `nonexistent`
-\bnon existing\b
-
-# Should be `nonexistent`
-\b[Nn]o[nt][- ]existent\b
-
-# Should be `brief` / `details` / `param` / `return` / `retval`
-(?:^\s*|(?:\*|//|/*)\s+`)[\\@](?:breif|(?:detail|detials)|(?:params(?!\.)|prama?)|ret(?:uns?)|retvl)\b
-
-# Should be `preexisting`
-[Pp]re[- ]existing
-
-# Should be `preempt`
-[Pp]re[- ]empt\b
-
-# Should be `preemptively`
-[Pp]re[- ]emptively
-
-# Should be `recently changed` or `recent changes`
-[Rr]ecent changed
-
-# Should be `reentrancy`
-[Rr]e[- ]entrancy
-
-# Should be `reentrant`
-[Rr]e[- ]entrant
-
-# Should be `understand`
-\bunder stand\b
-
-# Should be `workarounds`
-\bwork[- ]arounds\b
-
-# Should be `workaround`
-(?:(?:[Aa]|[Tt]he|ugly)\swork[- ]around\b|\swork[- ]around\s+for)
-
-# Should be `(coarse|fine)-grained`
-\b(?:coarse|fine) grained\b
-
-# Should be `neither/nor` -- or reword
-#\bnot\b[^.?!"/(]+\bnor\b
-
-# Should be `neither/nor` (plus rewording the beginning)
-# This is probably a double negative...
-#\bnot\b[^.?!"/]*\bneither\b[^.?!"/(]*\bnor\b
-
-# In English, duplicated words are generally mistakes
-# There are a few exceptions (e.g. "that that").
-# If the highlighted doubled word pair is in:
-# * code, write a pattern to mask it.
-# * prose, have someone read the English before you dismiss this error.
-\s([A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})\s\g{-1}\s
diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt
deleted file mode 100644
index 665ac7918ced2..0000000000000
--- a/.github/actions/spelling/patterns.txt
+++ /dev/null
@@ -1,164 +0,0 @@
-# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
-
-# Automatically suggested patterns
-# hit-count: 1341 file-count: 323
-# https/http/file urls
-(?:\b(?:https?|ftp|file)://)[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]
-
-# Non-English
-^\s*(?:es|ca): ".+"
-
-# hit-count: 150 file-count: 27
-# hex digits including css/html color classes:
-(?:[\\0][xX]|\\u|[uU]\+|#x?|%23)[0-9_a-fA-FgGrR]*?[a-fA-FgGrR]{2,}[0-9_a-fA-FgGrR]*(?:[uUlL]{0,3}|[iu]\d+)\b
-
-# hit-count: 91 file-count: 40
-# node packages
-(["'])\@[^/'" ]+/[^/'" ]+\g{-1}
-
-# hit-count: 78 file-count: 44
-# Non-English
-[a-zA-Z]*[ÀÁÂÃÄÅÆČÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæčçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3}[a-zA-ZÀÁÂÃÄÅÆČÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæčçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]*|[a-zA-Z]{3,}[ÀÁÂÃÄÅÆČÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæčçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]|[ÀÁÂÃÄÅÆČÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæčçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3,}
-
-# hit-count: 72 file-count: 35
-# hex runs
-\b[0-9a-fA-F]{16,}\b
-
-# hit-count: 61 file-count: 13
-# URL escaped characters
-\%[0-9A-F][A-F](?=[A-Za-z])
-
-# hit-count: 45 file-count: 14
-# Lorem
-# Update Lorem based on your content (requires `ge` and `w` from https://github.com/jsoref/spelling; and `review` from https://github.com/check-spelling/check-spelling/wiki/Looking-for-items-locally )
-# grep '^[^#].*lorem' .github/actions/spelling/patterns.txt|perl -pne 's/.*i..\?://;s/\).*//' |tr '|' "\n"|sort -f |xargs -n1 ge|perl -pne 's/^[^:]*://'|sort -u|w|sed -e 's/ .*//'|w|review -
-# Warning, while `(?i)` is very neat and fancy, if you have some binary files that aren't proper unicode, you might run into:
-# ... Operation "substitution (s///)" returns its argument for non-Unicode code point 0x1C19AE (the code point will vary).
-# ... You could manually change `(?i)X...` to use `[Xx]...`
-# ... or you could add the files to your `excludes` file (a version after 0.0.19 should identify the file path)
-(?:(?:\w|\s|[,.])*\b(?i)(?:accusamus|adipisci|adipiscing|aliquam|aliquid|amet|animi|aperiam|architecto|asperiores|assumenda|consectetur|consequatur|consequuntur|corporis|cupiditate|cursus|debitis|dolor|Donec|earum|enim|eros|facilisis|harum|illo|impedit|incidunt|ipsum|lacus|libero|ligula|lorem|magna|neque|nulla|suscipit|tempus|vitae)\b(?:\w|\s|[,.])*)
-
-# hit-count: 33 file-count: 5
-# css url wrappings
-\burl\([^)]+\)
-
-# hit-count: 31 file-count: 17
-# in check-spelling@v0.0.22+, printf markers aren't automatically consumed
-# printf markers
-(?<!\\)\\[nrt](?=[a-z]{2,})
-
-# hit-count: 15 file-count: 5
-# IServiceProvider / isAThing
-\b(?:I|isA)(?=(?:[A-Z][a-z]{2,})+(?:[A-Z]|\b))
-
-# hit-count: 12 file-count: 9
-# version suffix <word>v#
-(?:(?<=[A-Z]{2})V|(?<=[a-z]{2}|[A-Z]{2})v)\d+(?:\b|(?=[a-zA-Z_]))
-
-# hit-count: 8 file-count: 6
-# GitHub actions
-\buses:\s+[-\w.]+/[-\w./]+@[-\w.]+
-
-# hit-count: 5 file-count: 2
-# assign regex
-= /[^*]*?(?:[a-z]{3,}|[A-Z]{3,}|[A-Z][a-z]{2,}).*/
-
-# hit-count: 4 file-count: 4
-# javascript match regex
-\.match\(/[^/\s"]{3,}/[gim]*\s*
-
-# hit-count: 4 file-count: 4
-# perl regex test
-[!=]~ (?:/.*/|m\{.*?\}|m<.*?>|m([|!/@#,;']).*?\g{-1})
-
-# hit-count: 4 file-count: 2
-# lower URL escaped characters
-%[0-9a-f][a-f](?=[a-z]{2,})
-
-# hit-count: 3 file-count: 3
-# javascript replace regex
-\.replace\(/[^/\s"]{3,}/[gim]*\s*,
-
-# hit-count: 3 file-count: 2
-# data url in quotes
-([`'"])data:(?:[^ `'"].*?|)(?:[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,}).*\g{-1}
-
-# hit-count: 3 file-count: 2
-# regex choice
-\(\?:[^)]+\|[^)]+\)
-
-# hit-count: 2 file-count: 2
-# uuid:
-\b[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}\b
-
-# hit-count: 2 file-count: 2
-# base64 encoded content
-([`'"])[-a-zA-Z=;:/0-9+]{3,}=\g{-1}
-
-# hit-count: 2 file-count: 2
-# curl arguments
-\b(?:\\n|)curl(?:\.exe|)(?:\s+-[a-zA-Z]{1,2}\b)*(?:\s+-[a-zA-Z]{3,})(?:\s+-[a-zA-Z]+)*
-
-/redirect/[^/]+
-
-(\b|")(?:ar|ca|cs|cy|da|de|de-CH|e[lsu]|es-MX|f[ari]|ga|he|hi|id|it|nl|no|pt|pl|pt-BR|ru|si|sv|th|tr|uk|ur|vi|zh)\g{-1}(?: =>|:) ".*?"
-
-sgid=[-%\w]+
-(?:href|name|value)=&quot;.*?&quot;
-
-\\A(?=[A-Za-z]{2})
-
-IDENTIFICATION_PRIVATE_KEY: '.*'
-password(?:: | = )".*"
-let\(:password\) \{ ".*"
-value="[-\w]{16,}
-_key: "[\w]{10,}=
-
-let\(:\w+\) \{ "[a-z]+[A-Z0-9][a-zA-Z0-9]+"
-
-W3C
-
-^.*# intentionally misspelled
-
-# Foreign names -- check-spelling doesn't handle these well
-\b[a-zO]'[a-z]{3,}\b
-
-%250a
-
-@rails/\w+
-
-organization_name[):{ ]*"?(?:\w+\s)+\w+[",} ]*$
-expect\(.*\)\.to eq\(".*"
-gem ".*?"
-".*?typo\b.*?"
-
-# Questionably acceptable forms of `in to`
-# Personally, I prefer `log into`, but people object
-# https://www.tprteaching.com/log-into-log-in-to-login/
-\b(?:[Ll]og|[Ss]ign) in to\b
-
-# to opt in
-\bto opt in\b
-
-# acceptable duplicates
-# ls directory listings
-[-bcdlpsw](?:[-r][-w][-SsTtx]){3}[\.+*]?\s+\d+\s+\S+\s+\S+\s+\d+\s+
-# mount
-\bmount\s+-t\s+(\w+)\s+\g{-1}\b
-# C types and repeated CSS values
-\s(auto|center|div|inherit|long|LONG|none|normal|solid|thin|text|think|transparent|very)(?: \g{-1})+\s
-# C struct
-\bstruct\s+(\w+)\s+\g{-1}\b
-# go templates
-\s(\w+)\s+\g{-1}\s+\`(?:graphql|inject|json|yaml):
-# doxygen / javadoc / .net
-(?:[\\@](?:brief|groupname|t?param|return|retval)|(?:public|private|\[Parameter(?:\(.+\)|)\])(?:\s+static|\s+override|\s+readonly)*)(?:\s+\{\w+\}|)\s+(\w+)\s+\g{-1}\s
-
-# Commit message -- Signed-off-by and friends
-^\s*(?:(?:Based-on-patch|Co-authored|Helped|Mentored|Reported|Reviewed|Signed-off)-by|Thanks-to): (?:[^<]*<[^>]*>|[^<]*)\s*$
-
-# Autogenerated revert commit message
-^This reverts commit [0-9a-f]{40}\.$
-
-# ignore long runs of a single character:
-\b([A-Za-z])\g{-1}{3,}\b
diff --git a/.github/actions/spelling/reject.txt b/.github/actions/spelling/reject.txt
deleted file mode 100644
index e5e4c3eef82e4..0000000000000
--- a/.github/actions/spelling/reject.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-^attache$
-^bellow$
-benefitting
-occurences?
-^dependan.*
-^oer$
-Sorce
-^[Ss]pae.*
-^untill$
-^untilling$
-^wether.*
diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
deleted file mode 100644
index 249efd1b3801d..0000000000000
--- a/.github/workflows/spelling.yml
+++ /dev/null
@@ -1,150 +0,0 @@
-name: Check Spelling
-
-# Comment management is handled through a secondary job, for details see:
-# https://github.com/check-spelling/check-spelling/wiki/Feature%3A-Restricted-Permissions
-#
-# `jobs.comment-push` runs when a push is made to a repository and the `jobs.spelling` job needs to make a comment
-#   (in odd cases, it might actually run just to collapse a comment, but that's fairly rare)
-#   it needs `contents: write` in order to add a comment.
-#
-# `jobs.comment-pr` runs when a pull_request is made to a repository and the `jobs.spelling` job needs to make a comment
-#   or collapse a comment (in the case where it had previously made a comment and now no longer needs to show a comment)
-#   it needs `pull-requests: write` in order to manipulate those comments.
-
-# Updating pull request branches is managed via comment handling.
-# For details, see: https://github.com/check-spelling/check-spelling/wiki/Feature:-Update-expect-list
-#
-# These elements work together to make it happen:
-#
-# `on.issue_comment`
-#   This event listens to comments by users asking to update the metadata.
-#
-# `jobs.update`
-#   This job runs in response to an issue_comment and will push a new commit
-#   to update the spelling metadata.
-#
-# `with.experimental_apply_changes_via_bot`
-#   Tells the action to support and generate messages that enable it
-#   to make a commit to update the spelling metadata.
-#
-# `with.ssh_key`
-#   In order to trigger workflows when the commit is made, you can provide a
-#   secret (typically, a write-enabled github deploy key).
-#
-#   For background, see: https://github.com/check-spelling/check-spelling/wiki/Feature:-Update-with-deploy-key
-
-# Sarif reporting
-#
-# Access to Sarif reports is generally restricted (by GitHub) to members of the repository.
-#
-# Requires enabling `security-events: write`
-# and configuring the action with `use_sarif: 1`
-#
-#   For information on the feature, see: https://github.com/check-spelling/check-spelling/wiki/Feature:-Sarif-output
-
-# Minimal workflow structure:
-#
-# on:
-#   push:
-#     ...
-#   pull_request_target:
-#     ...
-# jobs:
-#   # you only want the spelling job, all others should be omitted
-#   spelling:
-#     # remove `security-events: write` and `use_sarif: 1`
-#     # remove `experimental_apply_changes_via_bot: 1`
-#     ... otherwise adjust the `with:` as you wish
-
-on:
-  push:
-    branches:
-    - "**"
-    tags-ignore:
-    - "**"
-  pull_request_target:
-    branches:
-    - "**"
-    types:
-    - 'opened'
-    - 'reopened'
-    - 'synchronize'
-  issue_comment:
-    types:
-    - 'created'
-
-jobs:
-  spelling:
-    name: Check Spelling
-    permissions:
-      contents: read
-      pull-requests: read
-      actions: read
-      security-events: write
-    outputs:
-      followup: ${{ steps.spelling.outputs.followup }}
-    runs-on: ubuntu-22.04
-    if: ${{ contains(github.event_name, 'pull_request') || github.event_name == 'push' }}
-    concurrency:
-      group: spelling-${{ github.event.pull_request.number || github.ref }}
-      # note: If you use only_check_changed_files, you do not want cancel-in-progress
-      cancel-in-progress: true
-    steps:
-    - name: check-spelling
-      id: spelling
-      uses: check-spelling/check-spelling@v0.0.24
-      with:
-        suppress_push_for_open_pull_request: ${{ github.actor != 'dependabot[bot]' && 1 }}
-        checkout: true
-        check_file_names: 1
-        spell_check_this: check-spelling/spell-check-this@prerelease
-        post_comment: 0
-        use_magic_file: 1
-        report-timing: 1
-        warnings: bad-regex,binary-file,deprecated-feature,ignored-expect-variant,large-file,limited-references,no-newline-at-eof,noisy-file,non-alpha-in-dictionary,token-is-substring,unexpected-line-ending,whitespace-in-dictionary,minified-file,unsupported-configuration,no-files-to-check
-        experimental_apply_changes_via_bot: ${{ github.repository_owner != 'decidim' && 1 }}
-        use_sarif: ${{ (!github.event.pull_request || (github.event.pull_request.head.repo.full_name == github.repository)) && 1 }}
-        check_extra_dictionaries: ''
-        extra_dictionaries:
-          cspell:software-terms/dict/softwareTerms.txt
-          cspell:lorem-ipsum/dictionary.txt
-          cspell:fullstack/dict/fullstack.txt
-          cspell:typescript/dict/typescript.txt
-          cspell:aws/aws.txt
-          cspell:php/dict/php.txt
-          cspell:python/src/python/python-lib.txt
-          cspell:html/dict/html.txt
-          cspell:ruby/dict/ruby.txt
-          cspell:filetypes/filetypes.txt
-          cspell:java/src/java.txt
-          cspell:node/dict/node.txt
-          cspell:npm/dict/npm.txt
-          cspell:css/dict/css.txt
-          cspell:shell/dict/shell-all-words.txt
-          cspell:k8s/dict/k8s.txt
-          cspell:python/src/common/extra.txt
-          cspell:dotnet/dict/dotnet.txt
-
-  update:
-    name: Update PR
-    permissions:
-      contents: write
-      pull-requests: write
-      actions: read
-    runs-on: ubuntu-22.04
-    if: ${{
-        github.repository_owner != 'decidim' &&
-        github.event_name == 'issue_comment' &&
-        github.event.issue.pull_request &&
-        contains(github.event.comment.body, '@check-spelling-bot apply')
-      }}
-    concurrency:
-      group: spelling-update-${{ github.event.issue.number }}
-      cancel-in-progress: false
-    steps:
-    - name: apply spelling updates
-      uses: check-spelling/check-spelling@v0.0.24
-      with:
-        experimental_apply_changes_via_bot: 1
-        checkout: true
-        ssh_key: "${{ secrets.CHECK_SPELLING }}"

From 4480e4faf8512bd90310b091b6ae2db221550dc1 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Fri, 19 Jun 2026 10:33:46 +0200
Subject: [PATCH 083/131] Backport 'Fix cache invalidation bug in highlighted
 spaces content blocks' to v0.31 (#17171)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix cache invalidation bug in highlighted spaces content blocks

* Fix cells cache always active in development

* Fix author cell always active

* Remove unecessary method

Detected on code review

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 decidim-core/app/cells/decidim/author_cell.rb                 | 4 ----
 .../content_blocks/highlighted_participatory_spaces_cell.rb   | 2 +-
 decidim-core/lib/decidim/view_model.rb                        | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/decidim-core/app/cells/decidim/author_cell.rb b/decidim-core/app/cells/decidim/author_cell.rb
index 34e443143e24a..aaedb01ed691a 100644
--- a/decidim-core/app/cells/decidim/author_cell.rb
+++ b/decidim-core/app/cells/decidim/author_cell.rb
@@ -31,10 +31,6 @@ def flag_user
       render unless current_user == model
     end
 
-    def perform_caching?
-      true
-    end
-
     def raw_model
       model.try(:__getobj__) || model
     end
diff --git a/decidim-core/app/cells/decidim/content_blocks/highlighted_participatory_spaces_cell.rb b/decidim-core/app/cells/decidim/content_blocks/highlighted_participatory_spaces_cell.rb
index 5c91715fdb0c2..979ebb2408763 100644
--- a/decidim-core/app/cells/decidim/content_blocks/highlighted_participatory_spaces_cell.rb
+++ b/decidim-core/app/cells/decidim/content_blocks/highlighted_participatory_spaces_cell.rb
@@ -28,7 +28,7 @@ def max_results; end
       private
 
       def cache_hash
-        [I18n.locale, highlighted_spaces.map(&:cache_key_with_version)].join(Decidim.cache_key_separator)
+        [I18n.locale, model.cache_key_with_version, highlighted_spaces.map(&:cache_key_with_version)].join(Decidim.cache_key_separator)
       end
 
       def section_class
diff --git a/decidim-core/lib/decidim/view_model.rb b/decidim-core/lib/decidim/view_model.rb
index b1a4da8718db9..159c7410a3db0 100644
--- a/decidim-core/lib/decidim/view_model.rb
+++ b/decidim-core/lib/decidim/view_model.rb
@@ -79,7 +79,7 @@ def instrument(name, **options)
     end
 
     def perform_caching?
-      cache_hash.present?
+      super && cache_hash.present?
     end
 
     def cache_hash

From 25c533fa8b981b2f2dff590bd0fd7532a43373c1 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Fri, 19 Jun 2026 22:28:45 +0200
Subject: [PATCH 084/131] Backport 'Fix flaky spec at `authorizations_spec.rb`'
 to v0.31 (#17179)

Co-authored-by: Antti Hukkanen <antti.hukkanen@mainiotech.fi>
---
 decidim-verifications/spec/system/authorizations_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/decidim-verifications/spec/system/authorizations_spec.rb b/decidim-verifications/spec/system/authorizations_spec.rb
index f0dd68b6db5a4..63ed21b27a060 100644
--- a/decidim-verifications/spec/system/authorizations_spec.rb
+++ b/decidim-verifications/spec/system/authorizations_spec.rb
@@ -441,5 +441,6 @@ def sign_in
       fill_in :session_user_password, with: "decidim123456789"
       find("*[type=submit]").click
     end
+    expect(page).to have_button(id: "trigger-dropdown-account")
   end
 end

From 533ed55640b3ea3a8e45e4a3e1e03b1fc60ca2f5 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Fri, 19 Jun 2026 23:17:11 +0200
Subject: [PATCH 085/131] Backport 'Add visual feedback for the "Use my current
 location" feature' to v0.31 (#17165)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add visual feedback for the "Use my current location" feature

Prompt:

"""
When using the "Use my location" feature, I don't have any feedback.

I should have a spinner or something similar letting me know that the
location is fetching.
"""

Assisted-By: Qwen3.7 Plus (OpenCode)
<andreslucena+ai@users.noreply.github.com>

* Run i18n-tasks normalize

* Do not use string interpolation for the geocoding spinner

* Implement BEM in CSS classes

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 .../decidim/geocoding/reverse_geocoding.js    |  20 +-
 .../geocoding/reverse_geocoding.test.js       | 197 ++++++++++++++++++
 .../stylesheets/decidim/geocoding_addons.scss |  12 +-
 decidim-core/lib/decidim/map/autocomplete.rb  |   7 +-
 .../spec/lib/map/autocomplete_spec.rb         |  13 ++
 decidim-proposals/config/locales/en.yml       |   1 +
 6 files changed, 240 insertions(+), 10 deletions(-)
 create mode 100644 decidim-core/app/packs/src/decidim/geocoding/reverse_geocoding.test.js

diff --git a/decidim-core/app/packs/src/decidim/geocoding/reverse_geocoding.js b/decidim-core/app/packs/src/decidim/geocoding/reverse_geocoding.js
index e1f0fc0146309..b119c0f32641e 100644
--- a/decidim-core/app/packs/src/decidim/geocoding/reverse_geocoding.js
+++ b/decidim-core/app/packs/src/decidim/geocoding/reverse_geocoding.js
@@ -13,13 +13,24 @@ export const initializeReverseGeocoding = function() {
 
   const setLocating = (button, enable) => {
     if (enable) {
+      button.dataset.originalContent = button.innerHTML;
+      button.textContent = "";
+      const spinner = document.createElement("span");
+      spinner.className = "geocoding__spinner";
+      button.appendChild(spinner);
+      button.append(` ${button.dataset.locatingText || "Locating..."}`);
       button.setAttribute("disabled", true);
+      button.classList.add("geocoding__button--locating");
     } else {
+      if (button.dataset.originalContent) {
+        button.innerHTML = button.dataset.originalContent;
+      }
       button.removeAttribute("disabled");
+      button.classList.remove("geocoding__button--locating");
     }
   };
 
-  document.querySelectorAll(".user-device-location button").forEach((button) => {
+  document.querySelectorAll(".geocoding__button").forEach((button) => {
     button.addEventListener("click", (event) => {
       const target = event.target;
       if (target.disabled) {
@@ -36,19 +47,18 @@ export const initializeReverseGeocoding = function() {
         navigator.geolocation.getCurrentPosition((position) => {
           const coordinates = [position.coords.latitude, position.coords.longitude];
 
-          // reverse geolocation
           $.post(url, { latitude: coordinates[0], longitude: coordinates[1] }, (data) => {
             input.value = data.address;
             $(input).trigger("geocoder-suggest-coordinates.decidim", [coordinates]);
+            setLocating(target, false);
           }).fail((xhr, status, error) => {
             info(input, `${errorNoLocation} ${error}`);
+            setLocating(target, false);
           });
 
-          setLocating(target, false);
-
         }, (evt) => {
           info(input, `${errorNoLocation} ${evt.message}`);
-          target.removeAttribute("disabled");
+          setLocating(target, false);
         }, {
           enableHighAccuracy: true
         });
diff --git a/decidim-core/app/packs/src/decidim/geocoding/reverse_geocoding.test.js b/decidim-core/app/packs/src/decidim/geocoding/reverse_geocoding.test.js
new file mode 100644
index 0000000000000..b41929f7598fa
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/geocoding/reverse_geocoding.test.js
@@ -0,0 +1,197 @@
+/* global global, jest */
+
+import { initializeReverseGeocoding } from "src/decidim/geocoding/reverse_geocoding";
+
+describe("reverseGeocoding", () => {
+  let container = null;
+  let button = null;
+  let input = null;
+  let label = null;
+  let mockGeolocation = null;
+  let mockPost = null;
+  let originalGeolocation = null;
+
+  beforeEach(() => {
+    document.body.innerHTML = "";
+
+    container = document.createElement("div");
+    container.innerHTML = `
+      <label>
+        <input id="test_address" type="text" />
+        <div class="geocoding__locate">
+          <button
+            class="geocoding__button"
+            type="button"
+            data-input="test_address"
+            data-error-no-location="Could not detect location."
+            data-error-unsupported="Device not supported."
+            data-locating-text="Locating..."
+            data-url="/locate">
+            Use my location
+          </button>
+        </div>
+      </label>
+    `;
+    document.body.appendChild(container);
+
+    button = container.querySelector(".geocoding__button");
+    input = container.querySelector("#test_address");
+    label = container.querySelector("label");
+
+    originalGeolocation = navigator.geolocation;
+    mockGeolocation = {
+      getCurrentPosition: jest.fn()
+    };
+    Reflect.defineProperty(global.navigator, "geolocation", {
+      value: mockGeolocation,
+      configurable: true
+    });
+
+    mockPost = jest.fn();
+    global.jQuery = jest.fn(() => ({ trigger: jest.fn() }));
+    global.jQuery.post = mockPost;
+    // eslint-disable-next-line id-length
+    global.$ = global.jQuery;
+
+    initializeReverseGeocoding();
+  });
+
+  afterEach(() => {
+    Reflect.defineProperty(global.navigator, "geolocation", {
+      value: originalGeolocation,
+      configurable: true
+    });
+    jest.restoreAllMocks();
+  });
+
+  describe("when clicking the button", () => {
+    it("shows the spinner and disables the button", () => {
+      mockGeolocation.getCurrentPosition.mockImplementation(() => {});
+
+      button.click();
+
+      expect(button.disabled).toBe(true);
+      expect(button.classList.contains("geocoding__button--locating")).toBe(true);
+      expect(button.querySelector(".geocoding__spinner")).not.toBeNull();
+      expect(button.textContent).toContain("Locating...");
+    });
+
+    it("uses custom locating text from data attribute", () => {
+      button.dataset.locatingText = "Finding you...";
+      mockGeolocation.getCurrentPosition.mockImplementation(() => {});
+
+      button.click();
+
+      expect(button.textContent).toContain("Finding you...");
+    });
+
+    it("stores original content for restoration", () => {
+      mockGeolocation.getCurrentPosition.mockImplementation(() => {});
+
+      button.click();
+
+      expect(button.dataset.originalContent).toContain("Use my location");
+    });
+  });
+
+  describe("when geolocation succeeds", () => {
+    it("restores the button after successful reverse geocoding", () => {
+      const mockPosition = {
+        coords: { latitude: 40.7128, longitude: -74.006 }
+      };
+      mockGeolocation.getCurrentPosition.mockImplementation((success) => {
+        success(mockPosition);
+      });
+
+      const mockDeferred = { fail: jest.fn() };
+      mockPost.mockImplementation((url, data, callback) => {
+        callback({ address: "New York, NY, USA" });
+        return mockDeferred;
+      });
+
+      button.click();
+
+      expect(button.disabled).toBe(false);
+      expect(button.classList.contains("geocoding__button--locating")).toBe(false);
+      expect(button.querySelector(".geocoding__spinner")).toBeNull();
+      expect(button.textContent).toContain("Use my location");
+      expect(input.value).toBe("New York, NY, USA");
+    });
+
+    it("restores the button when reverse geocoding fails", () => {
+      const mockPosition = {
+        coords: { latitude: 40.7128, longitude: -74.006 }
+      };
+      mockGeolocation.getCurrentPosition.mockImplementation((success) => {
+        success(mockPosition);
+      });
+
+      const mockDeferred = { fail: jest.fn((callback) => {
+        callback({}, "error", "Not Found");
+      }) };
+      mockPost.mockReturnValue(mockDeferred);
+
+      button.click();
+
+      expect(button.disabled).toBe(false);
+      expect(button.classList.contains("geocoding__button--locating")).toBe(false);
+      expect(button.textContent).toContain("Use my location");
+    });
+  });
+
+  describe("when geolocation fails", () => {
+    it("restores the button when user denies permission", () => {
+      const mockError = { message: "User denied geolocation" };
+      mockGeolocation.getCurrentPosition.mockImplementation((success, error) => {
+        error(mockError);
+      });
+
+      button.click();
+
+      expect(button.disabled).toBe(false);
+      expect(button.classList.contains("geocoding__button--locating")).toBe(false);
+      expect(button.textContent).toContain("Use my location");
+    });
+
+    it("shows an error message", () => {
+      const mockError = { message: "User denied geolocation" };
+      mockGeolocation.getCurrentPosition.mockImplementation((success, error) => {
+        error(mockError);
+      });
+
+      button.click();
+
+      const errorElement = label.querySelector(".form-error");
+      expect(errorElement).not.toBeNull();
+      expect(errorElement.textContent).toContain("Could not detect location.");
+    });
+  });
+
+  describe("when geolocation is not supported", () => {
+    it("shows an unsupported error and does not show spinner", () => {
+      Reflect.defineProperty(global.navigator, "geolocation", {
+        value: null,
+        configurable: true
+      });
+
+      button.click();
+
+      expect(button.disabled).toBe(false);
+      expect(button.classList.contains("geocoding__button--locating")).toBe(false);
+      const errorElement = label.querySelector(".form-error");
+      expect(errorElement).not.toBeNull();
+      expect(errorElement.textContent).toContain("Device not supported.");
+    });
+  });
+
+  describe("when button is already disabled", () => {
+    it("does not trigger geolocation again", () => {
+      button.disabled = true;
+      mockGeolocation.getCurrentPosition.mockImplementation(() => {});
+
+      button.click();
+
+      expect(mockGeolocation.getCurrentPosition).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/decidim-core/app/packs/stylesheets/decidim/geocoding_addons.scss b/decidim-core/app/packs/stylesheets/decidim/geocoding_addons.scss
index 8f1879fda76a2..b43c183760adc 100644
--- a/decidim-core/app/packs/stylesheets/decidim/geocoding_addons.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/geocoding_addons.scss
@@ -1,5 +1,13 @@
-.geocoding-container {
-  .user-device-location button {
+.geocoding {
+  &__locate .geocoding__button {
     @apply mt-4;
+
+    &--locating {
+      @apply opacity-70 cursor-wait;
+    }
+
+    .geocoding__spinner {
+      @apply inline-block w-4 h-4 rounded-full animate-spin border-2 border-l-transparent border-y-transparent border-r-secondary align-middle;
+    }
   }
 }
diff --git a/decidim-core/lib/decidim/map/autocomplete.rb b/decidim-core/lib/decidim/map/autocomplete.rb
index c349b46f5e2f8..be9be4169b7b7 100644
--- a/decidim-core/lib/decidim/map/autocomplete.rb
+++ b/decidim-core/lib/decidim/map/autocomplete.rb
@@ -37,19 +37,20 @@ def geocoding_field_with_location_button(object_name, method, options)
           template.snippets.add(:decidim_geocoding_scripts, template.append_javascript_pack_tag("decidim_geocoding"))
           template.snippets.add(:decidim_geocoding_styles, template.append_stylesheet_pack_tag("decidim_geocoding"))
 
-          template.content_tag(:div, class: "geocoding-container") do
+          template.content_tag(:div, class: "geocoding") do
             template.text_field(
               object_name,
               method,
               options.merge("data-decidim-geocoding" => view_options.to_json)
             ) +
-              template.content_tag(:div, class: "input-group-button user-device-location") do
-                template.content_tag(:button, class: "button button__sm md:button__sm button__text-secondary", type: "button", data: {
+              template.content_tag(:div, class: "input-group-button geocoding__locate") do
+                template.content_tag(:button, class: "button button__sm md:button__sm button__text-secondary geocoding__button", type: "button", data: {
                                        input: "#{object_name}_#{method}",
                                        latitude: "#{object_name}_latitude",
                                        longitude: "#{object_name}_longitude",
                                        error_no_location: I18n.t("errors.no_device_location", scope: "decidim.proposals.forms"),
                                        error_unsupported: I18n.t("errors.device_not_supported", scope: "decidim.proposals.forms"),
+                                       locating_text: I18n.t("locating", scope: "decidim.proposals.forms"),
                                        url: Decidim::Core::Engine.routes.url_helpers.locate_path
                                      }) do
                   icon("map-pin-line", role: "img", "aria-hidden": true) + " #{I18n.t("use_my_location", scope: "decidim.proposals.forms")}"
diff --git a/decidim-core/spec/lib/map/autocomplete_spec.rb b/decidim-core/spec/lib/map/autocomplete_spec.rb
index 84c5357055365..3410d596f26d3 100644
--- a/decidim-core/spec/lib/map/autocomplete_spec.rb
+++ b/decidim-core/spec/lib/map/autocomplete_spec.rb
@@ -93,6 +93,19 @@ module Map
 
         it_behaves_like "having a help text"
       end
+
+      context "when showing the location button" do
+        let(:component) { double(manifest_name: "proposals") }
+
+        before do
+          allow(template).to receive(:current_component).and_return(component)
+        end
+
+        it "renders the button with data-locating-text attribute" do
+          expect(form_markup).to include("data-locating-text")
+          expect(form_markup).to include("geocoding__locate")
+        end
+      end
     end
   end
 end
diff --git a/decidim-proposals/config/locales/en.yml b/decidim-proposals/config/locales/en.yml
index 5f9bafaeb9f87..d4d71dd99966b 100644
--- a/decidim-proposals/config/locales/en.yml
+++ b/decidim-proposals/config/locales/en.yml
@@ -859,6 +859,7 @@ en:
         errors:
           device_not_supported: Your device does not support location services. Please enter the address manually.
           no_device_location: Sorry, we could not detect your location. Please enter the address manually.
+        locating: Locating...
         use_my_location: Use my current location
       invite_coauthors:
         cancel:

From ca285eb8545d6701fc59231905a1d06901401eb3 Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Sun, 21 Jun 2026 09:59:31 +0300
Subject: [PATCH 086/131] Backport 'Fix editing components with attachments' to
 v0.31 (#17146)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix editing components with attachments

* fixed the create election command to build based on attachments

* fixed the update command wthin elections to include on multiple attachments

* private methods applied to class affecting the election form

* documents object added to form attachment column in the view

* document_cleanup added to run after hooks method within create election command

* moved relevent methods to attachment attribute to clean implementation of using the attachment_attribute to utilise multiple attachments

* removed methods from election_form

* failed to readd attached_to resource required for the multiple attachments command

* fixes to the tests with regards to election creation and update on the file

* update to elections spec fix to multiple attachments command

* fix to only store a pharsed string and value if they exist

* Renamed partial to be consistent with rest of the changes

* Renamed partial to refect change in form

* implemented attachment attribute documents to the project form

* locales updated to change within the attachments

* extracted and implemented updates to update and create project

* renamed partial to reflect update from gallery to attachments

* Update to specs within budgets to reflect updates to change from photos to documents

* normalize i18n tasks within the admin yml

* regression added to elections to manage edits within the components with attachments

* Removed methods handling the documents attachment handling as these now exist within attachment attributes

* projects regression for attachments failure added

* updated error method on missing attachment to reflect changes within the form

* updated spec to check for title change back on the main tab

* updated project spec to check for title change when saving an update in the form

* fix to budgets examples spec within create project spec

* refactor to avoid string/array missmatch within attribute attachments

* Revert "refactor to avoid string/array missmatch within attribute attachments"

This reverts commit b50e61d21b0b4cbb5c5568d79c5861128c73b684.

* Removed the gallarymethods command from the decidim suite

* Removed gallery methods from the proposals module

* Removed gallery methods from update and create initiative commands

* Replaced GalleryMethods for MultipeAttachment methods

* Updated decidim-dev with the correct attributes

* create and update initative using correct commands in reading, updating the inititive with attachements

* Update decidim-initiatives/app/commands/decidim/initiatives/create_initiative.rb

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update decidim-initiatives/app/commands/decidim/initiatives/update_initiative.rb

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Potential fix for pull request finding 'Useless assignment to local variable'

Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>

* Update initiative command removed extra line to method

* Updated dummy resource spec to account for the documents added instead ofthe photos attribute which was a part of the gallerymethods

* Removed photo_cleanup method from the update command in initiatives due to it deriving from the gallerymethods command

* Updated update_initiative spec to test with attachments

* Specs added when pre exisiting attachments are added to debates

* Updated wording of debate spec when attachment exists

* Added additional handling for the form to allow the elements to appear before rspec interacts with them

* Removing spec for photo count as this is now handled via a document

* Added a block to test for proposal editing while having attachments

* Block added to allow for proposals to be edited while having attachments in the system spec

* Refactored block in edit inititaive spec to account for editing one while with attachments

* Removed duplicate spec from edit_proposals

* Fixed wording on context block for edit initiative spec

* Unit test for editing a debate in as an participant by checking the attachemnt and editing the title successfully

* Proposal front end test from the participant adding a proposal, the naming convention is the same as the rest of the specs

* Meeting admin facing test for editing while having an attachment

* Expectation added to check for the title updated correctly

* Improved edit proposal as a participant using recommended format

* Improved wording on first block for having an attachment

* Improved the edit meeting as an admin context block to test for attaching and removing files

* Block on being able to attach a file to a debate added to user participant side

* Dynamically removing debate as a user without admin permissions added to block

* Improved admin attachment block for debates

* Improved admin side inititaive dynamic attachment context spec

* Fix specs as admin managing projects

* Fix admin manages elections block

* Refactor structure to admin manages meeting spec

* Add expectation to admin manages elections spec

* Fix user edits debate with attachment block

* Fix admin edits proposal spec

* Delet initiative attachment test block

* Admin manages attachment spec block applied

* Update decidim-admin/app/views/decidim/admin/shared/_attachments.html.erb

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

* Update decidim-admin/app/views/decidim/admin/shared/_attachments.html.erb

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

* Update decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

* Use attachment instead of document in attachment method

* Fix wording in commands

* Fix wording in budget project form

* Fix project specs

* Fix project system spec

* Strings applied for the attachment attribute

* Fix attribute documents for attachments

* Fixed condition in fill_data form inititaives

* Fix documents attribute in forms, propoasls and debates

* Fix user edits debate spec

* Fix specs in debates

* Fix specs proposals

* Fix initiatives specs

* Fix elections specs

* Replace in attribute documents and method call

* Fix dummy resource spec

* Fix form specs and valiation in forms

* Applied translations

* Fix specs in blogs

* Fix specs in debates

* Fix specs in elections

* Fix spces in proposals

* Fix initiative specs

* Fix spelling for attachments in debates examples

* Fix miss spelling of attachments in all debate examples

* Fix response questionnaire spec in forms

* Fixed gallery examples

* Fixed meeting registration spec

* Replaced attribute in create proposal command

* Fix proposal edit and merge spec

* Fix survey spec within examples

* Remove attachment count in inititaive example

* Fix election specs by using attachment

* Fix create election spec

* Update attach file to attachments not documents

* Fix spam anylsis spec to use attachments attribute

* Add missing translation for upload modal

* Update decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

* Update decidim-elections/app/commands/decidim/elections/admin/create_election.rb

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

* Remove unused strings according to review

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>
Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

* Fix failing specs

* Fix more specs

---------

Co-authored-by: Tom Greenwood <101816158+greenwoodt@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>
Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 .../admin/shared/_attachments.html.erb        |  15 +++
 .../decidim/admin/shared/_gallery.html.erb    |  15 ---
 decidim-admin/config/locales/en.yml           |  14 ++-
 .../debates/user_creates_debate_spec.rb       |   4 +-
 .../app/commands/decidim/blogs/update_post.rb |   2 +-
 .../app/forms/decidim/blogs/post_form.rb      |   4 +-
 .../views/decidim/blogs/posts/_form.html.erb  |   2 +-
 .../spec/system/user_manages_posts_spec.rb    |   2 +-
 .../decidim/budgets/admin/create_project.rb   |  12 +-
 .../decidim/budgets/admin/update_project.rb   |  12 +-
 .../decidim/budgets/admin/project_form.rb     |   6 +-
 .../budgets/admin/projects/_form.html.erb     |   2 +-
 .../budgets/admin/create_project_spec.rb      |   8 +-
 .../budgets/admin/update_project_spec.rb      |   8 +-
 .../system/admin_manages_projects_spec.rb     |  88 ++++++++++++++
 .../app/commands/decidim/gallery_methods.rb   | 107 ------------------
 .../decidim/multiple_attachments_methods.rb   |  55 ++++-----
 .../lib/decidim/attachment_attributes.rb      |  67 +++++++++--
 .../admin_resource_gallery_examples.rb        |  20 ++--
 .../decidim/create_dummy_resource_spec.rb     |   3 +-
 .../decidim/debates/admin/update_debate.rb    |   2 +-
 .../commands/decidim/debates/update_debate.rb |   2 +-
 .../decidim/debates/admin/debate_form.rb      |   6 +-
 .../app/forms/decidim/debates/debate_form.rb  |   4 +-
 .../debates/admin/debates/_form.html.erb      |   2 +-
 .../decidim/debates/debates/_form.html.erb    |   2 +-
 .../debates/admin/create_debate_spec.rb       |   4 +-
 .../debates/admin/update_debate_spec.rb       |   4 +-
 .../decidim/debates/create_debate_spec.rb     |   4 +-
 .../decidim/debates/update_debate_spec.rb     |   4 +-
 .../decidim/debates/admin/debate_form_spec.rb |  12 +-
 .../forms/decidim/debates/debate_form_spec.rb |   8 +-
 .../spec/shared/manage_debates_examples.rb    | 103 ++++++++++++++---
 .../spec/system/user_creates_debate_spec.rb   |  10 +-
 .../spec/system/user_edits_debate_spec.rb     |  61 +++++++++-
 .../decidim/dev/create_dummy_resource.rb      |  12 +-
 .../elections/admin/create_election.rb        |  12 +-
 .../elections/admin/update_election.rb        |  12 +-
 .../decidim/elections/admin/election_form.rb  |   4 +-
 .../elections/admin/elections/_form.html.erb  |   2 +-
 .../elections/admin/create_election_spec.rb   |   8 +-
 .../elections/admin/update_election_spec.rb   |   8 +-
 .../admin/admin_manages_elections_spec.rb     |  73 +++++++++++-
 .../decidim/forms/response_questionnaire.rb   |   4 +-
 .../app/forms/decidim/forms/response_form.rb  |  14 +--
 .../questionnaires/responses/_files.html.erb  |   2 +-
 .../forms/response_questionnaire_spec.rb      |   2 +-
 .../forms/decidim/forms/response_form_spec.rb |   4 +-
 .../decidim/initiatives/create_initiative.rb  |   9 +-
 .../decidim/initiatives/update_initiative.rb  |  12 +-
 .../decidim/initiatives/initiative_form.rb    |   2 +-
 .../create_initiative/fill_data.html.erb      |   2 +-
 .../initiatives/initiatives/_form.html.erb    |   2 +-
 .../initiatives/update_initiative_spec.rb     |  14 +--
 .../spec/shared/create_initiative_example.rb  |   4 +-
 .../admin/admin_manages_initiatives_spec.rb   |  75 ++++++++++++
 .../spec/system/create_initiative_spec.rb     |   9 +-
 .../spec/system/edit_initiative_spec.rb       |  65 ++++++++---
 decidim-meetings/config/locales/en.yml        |   2 -
 .../admin/admin_manages_meetings_spec.rb      |  56 +++++++++
 .../spec/system/meeting_registrations_spec.rb |   2 +-
 .../proposals/admin/update_proposal.rb        |   2 +-
 .../decidim/proposals/create_proposal.rb      |   2 +-
 .../decidim/proposals/gallery_methods.rb      |  18 ---
 .../decidim/proposals/update_proposal.rb      |   2 +-
 .../decidim/proposals/admin/proposal_form.rb  |  57 +---------
 .../proposals/admin/proposals_merge_form.rb   |   4 +-
 .../forms/decidim/proposals/proposal_form.rb  |   6 +-
 .../proposals/admin/proposals/_form.html.erb  |   2 +-
 .../admin/proposals_merges/_form.html.erb     |   2 +-
 .../_edit_form_fields.html.erb                |   2 +-
 .../proposals/_edit_form_fields.html.erb      |   2 +-
 decidim-proposals/config/locales/en.yml       |   4 +-
 .../proposals/admin/create_proposal_spec.rb   |   4 +-
 .../proposals/admin/merge_proposals_spec.rb   |   6 +-
 .../proposals/admin/update_proposal_spec.rb   |   4 +-
 .../create_collaborative_draft_spec.rb        |   2 +-
 .../decidim/proposals/update_proposal_spec.rb |   4 +-
 .../spec/shared/manage_proposals_examples.rb  |   2 +-
 .../admin/admin_creates_proposal_spec.rb      |   4 +-
 .../system/admin/admin_edits_proposal_spec.rb |  16 +--
 .../collaborative_drafts_fields_spec.rb       |   2 +-
 .../system/edit_collaborative_draft_spec.rb   |   2 +-
 .../spec/system/edit_proposal_spec.rb         |  69 ++++++++++-
 .../spec/system/proposals_fields_spec.rb      |   8 +-
 decidim-surveys/config/locales/en.yml         |   3 +
 .../editable_survey_response_examples.rb      |   4 +-
 87 files changed, 852 insertions(+), 466 deletions(-)
 create mode 100644 decidim-admin/app/views/decidim/admin/shared/_attachments.html.erb
 delete mode 100644 decidim-admin/app/views/decidim/admin/shared/_gallery.html.erb
 delete mode 100644 decidim-core/app/commands/decidim/gallery_methods.rb
 delete mode 100644 decidim-proposals/app/commands/decidim/proposals/gallery_methods.rb

diff --git a/decidim-admin/app/views/decidim/admin/shared/_attachments.html.erb b/decidim-admin/app/views/decidim/admin/shared/_attachments.html.erb
new file mode 100644
index 0000000000000..d4ff89e227d8d
--- /dev/null
+++ b/decidim-admin/app/views/decidim/admin/shared/_attachments.html.erb
@@ -0,0 +1,15 @@
+<div class="row column mt-4">
+  <fieldset>
+    <legend><%= t(".attachment_legend") %></legend>
+
+    <div>
+      <%= form.attachment :attachments,
+                          multiple: true,
+                          label: t(".add_attachments"),
+                          button_label: t(".add_attachments"),
+                          button_edit_label: t(".edit_attachments"),
+                          button_class: "button button__sm button__transparent-secondary",
+                          help_i18n_scope: "decidim.forms.file_help.attachment" %>
+    </div>
+  </fieldset>
+</div>
diff --git a/decidim-admin/app/views/decidim/admin/shared/_gallery.html.erb b/decidim-admin/app/views/decidim/admin/shared/_gallery.html.erb
deleted file mode 100644
index 1a3a62425f462..0000000000000
--- a/decidim-admin/app/views/decidim/admin/shared/_gallery.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="row column mt-4">
-  <fieldset>
-    <legend><%= t(".gallery_legend") %></legend>
-
-    <div>
-      <%= form.attachment :photos,
-                          multiple: true,
-                          label: t(".add_images"),
-                          button_label: t(".add_images"),
-                          button_edit_label: t(".edit_images"),
-                          button_class: "button button__sm button__transparent-secondary",
-                          help_i18n_scope: "decidim.forms.file_help.image" %>
-    </div>
-  </fieldset>
-</div>
diff --git a/decidim-admin/config/locales/en.yml b/decidim-admin/config/locales/en.yml
index 04eeab27191a1..6dbb295d8c96b 100644
--- a/decidim-admin/config/locales/en.yml
+++ b/decidim-admin/config/locales/en.yml
@@ -12,6 +12,7 @@ en:
         plural: Plural
       attachment:
         attachment_collection_id: Folder
+        attachments: Attachments
         description: Description
         file: File
         title: Attachment or image name
@@ -1071,10 +1072,10 @@ en:
           next_title: Next item
           previous: Previous
           previous_title: Previous item
-        gallery:
-          add_images: Add images
-          edit_images: Edit images
-          gallery_legend: Add an image gallery (Optional)
+        attachments:
+          add_attachments: Add attachments
+          attachment_legend: Add an attachment gallery (Optional)
+          edit_attachments: Edit attachments
       static_page_topics:
         create:
           error: There was a problem creating a new topic.
@@ -1289,6 +1290,11 @@ en:
       errors:
         impersonate_user:
           reason: You need to provide a reason when managing a non-managed participant.
+      file_help:
+        attachment:
+          explanation: 'Guidance for file:'
+          message_1: CSV, JSON and Excel (.xlsx) files are supported
+          message_2: For CSV files, the separator between columns must be a semicolon (";")
     moderations:
       actions:
         expand: Expand
diff --git a/decidim-ai/spec/event_handlers/debates/user_creates_debate_spec.rb b/decidim-ai/spec/event_handlers/debates/user_creates_debate_spec.rb
index e7e0283f295ee..914218070383e 100644
--- a/decidim-ai/spec/event_handlers/debates/user_creates_debate_spec.rb
+++ b/decidim-ai/spec/event_handlers/debates/user_creates_debate_spec.rb
@@ -10,8 +10,8 @@
       title:,
       description:,
       taxonomizations:,
-      add_documents: attachments,
-      documents: [],
+      add_attachments: attachments,
+      attachments: [],
       current_user: author,
       current_component: component,
       current_organization: organization
diff --git a/decidim-blogs/app/commands/decidim/blogs/update_post.rb b/decidim-blogs/app/commands/decidim/blogs/update_post.rb
index fb3b6159a8c8f..e1656ba3ec1bc 100644
--- a/decidim-blogs/app/commands/decidim/blogs/update_post.rb
+++ b/decidim-blogs/app/commands/decidim/blogs/update_post.rb
@@ -38,7 +38,7 @@ def attributes
 
       def run_after_hooks
         @attached_to = resource
-        document_cleanup!(include_all_attachments: true)
+        attachment_cleanup!(include_all_attachments: true)
         create_attachments(first_weight: 1) if process_attachments?
       end
     end
diff --git a/decidim-blogs/app/forms/decidim/blogs/post_form.rb b/decidim-blogs/app/forms/decidim/blogs/post_form.rb
index 9a23a3943f563..e3ad79ae9f478 100644
--- a/decidim-blogs/app/forms/decidim/blogs/post_form.rb
+++ b/decidim-blogs/app/forms/decidim/blogs/post_form.rb
@@ -14,7 +14,7 @@ class PostForm < Decidim::Form
 
       attribute :decidim_author_id, Integer
 
-      attachments_attribute :documents
+      attachments_attribute :attachments
 
       validates :body, translatable_presence: true
       validates :title, translatable_presence: true
@@ -28,7 +28,7 @@ def map_model(model)
 
         self.title = presenter.title
         self.body = presenter.body
-        self.documents = model.attachments
+        self.attachments = model.attachments
       end
 
       def author
diff --git a/decidim-blogs/app/views/decidim/blogs/posts/_form.html.erb b/decidim-blogs/app/views/decidim/blogs/posts/_form.html.erb
index cba2af0f33d07..8b847ee1e1e0c 100644
--- a/decidim-blogs/app/views/decidim/blogs/posts/_form.html.erb
+++ b/decidim-blogs/app/views/decidim/blogs/posts/_form.html.erb
@@ -12,7 +12,7 @@
 
 <% if component_settings.attachments_allowed? %>
   <div>
-    <%= form.attachment :documents,
+    <%= form.attachment :attachments,
                         multiple: true,
                         label: t("decidim.blogs.posts.edit.add_attachments"),
                         button_label: t("decidim.blogs.posts.edit.add_attachments"),
diff --git a/decidim-blogs/spec/system/user_manages_posts_spec.rb b/decidim-blogs/spec/system/user_manages_posts_spec.rb
index 03feba3f7592c..56c0c06beedd0 100644
--- a/decidim-blogs/spec/system/user_manages_posts_spec.rb
+++ b/decidim-blogs/spec/system/user_manages_posts_spec.rb
@@ -70,7 +70,7 @@
 
         fill_in "post_title", with: "My post"
         fill_in "post_body", with: "This is my post"
-        dynamically_attach_file(:post_documents, Decidim::Dev.asset("city.jpeg"))
+        dynamically_attach_file(:post_attachments, Decidim::Dev.asset("city.jpeg"))
         click_on "Create"
 
         expect(page).to have_content "My post"
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb b/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
index 66e06267db52b..49204f97be46e 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
@@ -6,24 +6,24 @@ module Admin
       # This command is executed when the user creates a Project from the admin
       # panel.
       class CreateProject < Decidim::Commands::CreateResource
-        include ::Decidim::GalleryMethods
+        include ::Decidim::MultipleAttachmentsMethods
         fetch_form_attributes :budget, :taxonomizations, :title, :description, :budget_amount, :address, :latitude, :longitude
 
         private
 
-        attr_reader :gallery
+        attr_reader :attachments
 
         def run_after_hooks
           @attached_to = resource
           link_proposals
-          create_gallery if process_gallery?
+          create_attachments if process_attachments?
         end
 
         def run_before_hooks
-          return unless process_gallery?
+          return unless process_attachments?
 
-          build_gallery
-          raise Decidim::Commands::HookError if gallery_invalid?
+          build_attachments
+          raise Decidim::Commands::HookError if attachments_invalid?
         end
 
         def extra_params
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb b/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
index 3cd42cd6d0652..417e0836623f9 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
@@ -6,7 +6,7 @@ module Admin
       # This command is executed when the user changes a Project from the admin
       # panel.
       class UpdateProject < Decidim::Commands::UpdateResource
-        include ::Decidim::GalleryMethods
+        include ::Decidim::MultipleAttachmentsMethods
         fetch_form_attributes :taxonomizations, :title, :description, :budget_amount, :address, :latitude, :longitude
 
         def initialize(form, project)
@@ -18,15 +18,15 @@ def initialize(form, project)
 
         def run_after_hooks
           link_proposals
-          create_gallery if process_gallery?
-          photo_cleanup!
+          create_attachments if process_attachments?
+          attachment_cleanup!(include_all_attachments: true)
         end
 
         def run_before_hooks
-          return unless process_gallery?
+          return unless process_attachments?
 
-          build_gallery
-          raise Decidim::Commands::HookError if gallery_invalid?
+          build_attachments
+          raise Decidim::Commands::HookError if attachments_invalid?
         end
 
         def attributes
diff --git a/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb b/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
index 530e4099dac94..e074aade5b554 100644
--- a/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
+++ b/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
@@ -22,7 +22,7 @@ class ProjectForm < Decidim::Form
         attribute :attachment, AttachmentForm
         attribute :selected, Boolean
 
-        attachments_attribute :photos
+        attachments_attribute :attachments
 
         validates :title, translatable_presence: true
         validates :description, translatable_presence: true
@@ -36,6 +36,8 @@ class ProjectForm < Decidim::Form
         def map_model(model)
           self.proposal_ids = model.linked_resources(:proposals, "included_proposals").pluck(:id)
           self.selected = model.selected?
+          self.attachments = model.attachments.ids
+          self.add_attachments = model.attachments.map { |att| { id: att.id, title: att.title } }
         end
 
         def participatory_space_manifest
@@ -74,7 +76,7 @@ def budget
         # an error, the attachment is lost, so we need a way to inform the user of
         # this problem.
         def notify_missing_attachment_if_errored
-          errors.add(:add_photos, :needs_to_be_reattached) if errors.any? && add_photos.present?
+          errors.add(:add_attachments, :needs_to_be_reattached) if errors.any? && add_attachments.present?
         end
       end
     end
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/_form.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/_form.html.erb
index 964a508b87457..a4cd8b541c031 100644
--- a/decidim-budgets/app/views/decidim/budgets/admin/projects/_form.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/_form.html.erb
@@ -33,7 +33,7 @@
       </div>
     <% end %>
 
-      <%= render partial: "decidim/admin/shared/gallery", locals: { form: } %>
+      <%= render partial: "decidim/admin/shared/attachments", locals: { form: } %>
 
       <% if form.object.persisted? %>
         <div class="row column">
diff --git a/decidim-budgets/spec/commands/decidim/budgets/admin/create_project_spec.rb b/decidim-budgets/spec/commands/decidim/budgets/admin/create_project_spec.rb
index 6f2c900d8617d..7ab4bf1038fcd 100644
--- a/decidim-budgets/spec/commands/decidim/budgets/admin/create_project_spec.rb
+++ b/decidim-budgets/spec/commands/decidim/budgets/admin/create_project_spec.rb
@@ -11,8 +11,8 @@ module Decidim::Budgets
     let(:participatory_process) { create(:participatory_process, organization:) }
     let(:current_component) { create(:component, manifest_name: :budgets, participatory_space: participatory_process) }
     let(:budget) { create(:budget, component: current_component) }
-    let(:uploaded_photos) { [] }
-    let(:photos) { [] }
+    let(:uploaded_attachments) { [] }
+    let(:attachments) { [] }
     let(:address) { nil }
     let(:latitude) { 40.1234 }
     let(:longitude) { 2.1234 }
@@ -42,8 +42,8 @@ module Decidim::Budgets
         longitude:,
         taxonomizations:,
         proposal_ids: proposals.map(&:id),
-        photos:,
-        add_photos: uploaded_photos,
+        attachments:,
+        add_attachments: uploaded_attachments,
         budget:
       )
     end
diff --git a/decidim-budgets/spec/commands/decidim/budgets/admin/update_project_spec.rb b/decidim-budgets/spec/commands/decidim/budgets/admin/update_project_spec.rb
index 013972c7ee142..f970bf277cc2b 100644
--- a/decidim-budgets/spec/commands/decidim/budgets/admin/update_project_spec.rb
+++ b/decidim-budgets/spec/commands/decidim/budgets/admin/update_project_spec.rb
@@ -11,12 +11,12 @@ module Decidim::Budgets
     let(:organization) { budget.component.organization }
     let(:participatory_process) { budget.component.participatory_space }
     let(:current_user) { create(:user, :admin, :confirmed, organization:) }
-    let(:uploaded_photos) { [] }
+    let(:uploaded_attachments) { [] }
     let(:selected) { nil }
     let(:address) { "something" }
     let(:latitude) { 40.1234 }
     let(:longitude) { 2.1234 }
-    let(:current_photos) { [] }
+    let(:current_attachments) { [] }
     let(:taxonomizations) do
       2.times.map { build(:taxonomization, taxonomy: create(:taxonomy, :with_parent, organization:), taxonomizable: nil) }
     end
@@ -40,8 +40,8 @@ module Decidim::Budgets
         proposal_ids: proposals.map(&:id),
         taxonomizations:,
         selected:,
-        photos: current_photos,
-        add_photos: uploaded_photos,
+        attachments: current_attachments,
+        add_attachments: uploaded_attachments,
         address:,
         latitude:,
         longitude:
diff --git a/decidim-budgets/spec/system/admin_manages_projects_spec.rb b/decidim-budgets/spec/system/admin_manages_projects_spec.rb
index 3a70f38b2f2b3..ac10fcb8fcc70 100644
--- a/decidim-budgets/spec/system/admin_manages_projects_spec.rb
+++ b/decidim-budgets/spec/system/admin_manages_projects_spec.rb
@@ -125,6 +125,94 @@
     end
   end
 
+  context "when a project has an attachment" do
+    let!(:budget_with_attachment) { create(:budget, component: current_component) }
+    let!(:project_with_attachment) do
+      create(:project, budget: budget_with_attachment)
+    end
+
+    let!(:attachment) { create(:attachment, :with_image, attached_to: project_with_attachment) }
+
+    before do
+      visit_component_admin
+
+      within "tr", text: translated(budget_with_attachment.title) do
+        find("button[data-controller='dropdown']").click
+        click_on "Add projects"
+      end
+    end
+
+    it "can remove an attachment" do
+      within "tr", text: translated(project_with_attachment.title) do
+        find("button[data-controller='dropdown']").click
+        click_on "Edit"
+      end
+
+      click_on("Edit attachments")
+      within "li[data-filename='#{attachment.file.blob.filename}']" do
+        click_on("Remove")
+      end
+
+      click_on("Save")
+
+      expect(page).to have_no_css("img[src*='#{attachment.file.blob.filename}']")
+    end
+
+    it "can attach a file" do
+      within "tr", text: translated(project_with_attachment.title) do
+        find("button[data-controller='dropdown']").click
+        click_on "Edit"
+      end
+
+      click_on("Edit attachments")
+
+      within ".upload-modal" do
+        find("input[type='file']", visible: :all).attach_file(Decidim::Dev.asset(attachment.file.blob.filename.to_s))
+      end
+
+      click_on("Save")
+      click_on("Update")
+
+      expect(page).to have_text("Project successfully updated.")
+
+      within "tr", text: translated_attribute(project_with_attachment.title) do
+        find("button[data-controller='dropdown']").click
+        click_on "Edit"
+      end
+
+      expect(page).to have_css("img[src*='#{attachment.file.blob.filename}']")
+    end
+
+    it "can edit a project with an attachment" do
+      within "tr", text: translated(project_with_attachment.title) do
+        find("button[data-controller='dropdown']").click
+        click_on "Edit"
+      end
+
+      expect(page.html).to include(attachment.file.blob.filename.to_s)
+
+      fill_in_i18n(:project_title, "#project-title-tabs", en: "Updated project title with attachments")
+      click_on "Update"
+
+      expect(page).to have_content "Project successfully updated."
+
+      visit_component_admin
+
+      within "tr", text: translated(budget_with_attachment.title) do
+        find("button[data-controller='dropdown']").click
+        click_on "Add projects"
+      end
+
+      within "tr", text: "Updated project title with attachments" do
+        find("button[data-controller='dropdown']").click
+        click_on "Edit"
+      end
+
+      expect(page).to have_field("project_title_en", with: "Updated project title with attachments")
+      expect(page.html).to include(attachment.file.blob.filename.to_s)
+    end
+  end
+
   private
 
   def format_title(budget)
diff --git a/decidim-core/app/commands/decidim/gallery_methods.rb b/decidim-core/app/commands/decidim/gallery_methods.rb
deleted file mode 100644
index 413ce685dcc3c..0000000000000
--- a/decidim-core/app/commands/decidim/gallery_methods.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # A module with all the gallery common methods
-  # Allows to create several image attachments at once
-  module GalleryMethods
-    private
-
-    def build_gallery(attached_to = nil)
-      @gallery = []
-      @form.add_photos.compact_blank.each do |photo|
-        if photo.is_a?(Hash) && photo.has_key?(:id)
-          update_attachment_title_for(photo)
-          next
-        end
-
-        @gallery << Attachment.new(
-          title: photos_title(photo),
-          attached_to: attached_to || gallery_attached_to,
-          file: photos_signed_id(photo), # Define attached_to before this
-          content_type: photos_content_type(photo)
-        )
-      end
-    end
-
-    def update_attachment_title_for(photo)
-      Decidim::Attachment.find(photo[:id]).update(title: photos_title(photo))
-    end
-
-    def image?(signed_id)
-      blob(signed_id).content_type.start_with? "image"
-    end
-
-    def gallery_invalid?
-      @gallery.each do |photo|
-        if photo.invalid? && photo.errors.has_key?(:file)
-          @form.errors.add(:add_photos, photo.errors[:file])
-          return true
-        end
-      end
-      false
-    end
-
-    def create_gallery(first_weight: 0)
-      weight = first_weight
-      # Add the weights first to the old photos
-      @form.photos.each do |photo|
-        photo.update!(weight:)
-        weight += 1
-      end
-      @gallery.map! do |photo|
-        photo.weight = weight
-        photo.attached_to = gallery_attached_to
-        photo.save!
-        weight += 1
-        @form.photos << photo
-      end
-    end
-
-    def photo_cleanup!
-      gallery_attached_to.photos.each do |photo|
-        next unless @form.photos.map(&:id).exclude?(photo.id)
-
-        photo.destroy! if (@form.respond_to?(:documents) && @form.documents.map(&:id).exclude?(photo.id)) || !@form.respond_to?(:documents)
-      end
-      # manually reset cached photos
-      gallery_attached_to.reload
-      gallery_attached_to.instance_variable_set(:@photos, nil)
-    end
-
-    # maybe a custom settings options would be nice
-    def gallery_allowed?
-      true
-    end
-
-    def process_gallery?
-      gallery_allowed? && @form.add_photos.any?
-    end
-
-    def gallery_attached_to
-      return @attached_to if @attached_to.present?
-      return form.current_organization if form.respond_to?(:current_organization)
-
-      form.current_component.organization if form.respond_to?(:current_component)
-    end
-
-    def photos_signed_id(photo)
-      return photo[:file] if photo.is_a?(Hash)
-
-      photo
-    end
-
-    def photos_title(photo)
-      return { I18n.locale => photo[:title] } if photo.is_a?(Hash) && photo.has_key?(:title)
-
-      { I18n.locale => "" }
-    end
-
-    def photos_content_type(photo)
-      blob(photos_signed_id(photo)).content_type
-    end
-
-    def blob(signed_id)
-      ActiveStorage::Blob.find_signed(signed_id)
-    end
-  end
-end
diff --git a/decidim-core/app/commands/decidim/multiple_attachments_methods.rb b/decidim-core/app/commands/decidim/multiple_attachments_methods.rb
index 248d604e0d7e3..b52b28afd1914 100644
--- a/decidim-core/app/commands/decidim/multiple_attachments_methods.rb
+++ b/decidim-core/app/commands/decidim/multiple_attachments_methods.rb
@@ -5,16 +5,16 @@ module MultipleAttachmentsMethods
     private
 
     def build_attachments
-      @documents = []
-      @form.add_documents.compact_blank.each do |attachment|
+      @attachments = []
+      @form.add_attachments.compact_blank.each do |attachment|
         if attachment.is_a?(Hash) && attachment.has_key?(:id)
           update_attachment_title_for(attachment)
           next
         end
 
-        @documents << Attachment.new(
+        @attachments << Attachment.new(
           title: title_for(attachment),
-          attached_to: @attached_to || documents_attached_to,
+          attached_to: @attached_to || attachments_attached_to,
           file: signed_id_for(attachment),
           content_type: content_type_for(attachment)
         )
@@ -26,11 +26,11 @@ def update_attachment_title_for(attachment)
     end
 
     def attachments_invalid?
-      @documents.each do |document|
-        next if document.valid? || !document.errors.has_key?(:file)
+      @attachments.each do |attachment|
+        next if attachment.valid? || !attachment.errors.has_key?(:file)
 
-        document.errors[:file].each do |error|
-          @form.errors.add(:add_documents, error)
+        attachment.errors[:file].each do |error|
+          @form.errors.add(:add_attachments, error)
         end
 
         return true
@@ -41,37 +41,38 @@ def attachments_invalid?
 
     def create_attachments(first_weight: 0)
       weight = first_weight
-      # Add the weights first to the old documents
-      document_ids = keep_ids
-      Decidim::Attachment.where(id: document_ids).each do |document|
-        document.update!(weight:)
+      # Add the weights first to the old attachments
+      attachment_ids = keep_ids
+      Decidim::Attachment.where(id: attachment_ids).each do |attachment|
+        attachment.update!(weight:)
         weight += 1
       end
-      @documents.map! do |document|
-        document.weight = weight
-        document.attached_to = documents_attached_to
-        document.save!
+      @attachments.map! do |attachment|
+        attachment.weight = weight
+        attachment.attached_to = attachments_attached_to
+        attachment.save!
         weight += 1
-        @form.documents << document
+        @form.attachments << attachment
       end
     end
 
-    def document_cleanup!(include_all_attachments: false)
-      documents = include_all_attachments ? documents_attached_to.attachments.with_attached_file : documents_attached_to.documents
+    def attachment_cleanup!(include_all_attachments: false)
+      attachments = include_all_attachments ? attachments_attached_to.attachments.with_attached_file : attachments_attached_to.attachments
 
-      documents.each do |document|
-        document.destroy! unless keep_ids.include?(document.id)
+      attachments.each do |attachment|
+        attachment.destroy! unless keep_ids.include?(attachment.id)
       end
 
-      documents_attached_to.reload
-      documents_attached_to.instance_variable_set(:@documents, nil)
+      attachments_attached_to.reload
+      attachments_attached_to.instance_variable_set(:@attachments, nil)
+      attachments_attached_to.instance_variable_set(:@photos, nil)
     end
 
     def process_attachments?
-      @form.add_documents.any?
+      @form.add_attachments.any?
     end
 
-    def documents_attached_to
+    def attachments_attached_to
       return @attached_to if @attached_to.present?
       return form.current_organization if form.respond_to?(:current_organization)
 
@@ -101,8 +102,8 @@ def blob(signed_id)
     end
 
     def keep_ids
-      documents_array = Array(@form.documents)
-      documents_array.map do |doc|
+      attachments_array = Array(@form.attachments)
+      attachments_array.map do |doc|
         case doc
         when Decidim::Attachment
           doc.id
diff --git a/decidim-core/lib/decidim/attachment_attributes.rb b/decidim-core/lib/decidim/attachment_attributes.rb
index fde84f6c412ad..b48431e1c5bf4 100644
--- a/decidim-core/lib/decidim/attachment_attributes.rb
+++ b/decidim-core/lib/decidim/attachment_attributes.rb
@@ -15,24 +15,39 @@ module AttachmentAttributes
       #
       # name - The attribute's name
       #
-      #
       # Example:
       #
-      #   attachment_attribute :photos
+      #   attachments_attribute :photos
       #   # This will create two attributes of the following types:
       #   #   attribute :photos, Array[Integer]
       #   #   attribute :add_photos, Array
-      #   # In addition, it will generate the getter method for the attribute
-      #   # returning an array of the Decidim::Attachment records.
+      #   # In addition, it will generate:
+      #   #   - A setter that handles String (JSON/CSV), Integer, or Array inputs.
+      #   #   - A getter that falls back to add_photos when the attribute is blank.
+      #   #   - Private helpers for parsing and extracting IDs.
       #
       # Returns nothing.
-      def attachments_attribute(name)
+      def attachments_attribute(name) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         attribute name, Array[Integer]
         attribute :"add_#{name}", Array
 
-        # Define the getter method that fetches the attachment records based on
-        # their types. For Strings and Integers, assumes they are IDs and will
-        # fetch the attachment record matching that ID.
+        # Setter: coerces String (JSON or comma-separated IDs) and bare Integer
+        # values into the expected Array[Integer] format before delegating to super.
+        define_method :"#{name}=" do |value|
+          case value
+          when String
+            parsed = send(:"parse_string_#{name}", value)
+            parsed.any? ? super(parsed) : super(value)
+          when Integer
+            super([value])
+          else
+            super(value)
+          end
+        end
+
+        # Getter: resolves stored integer IDs to Decidim::Attachment records,
+        # caching the result on the instance. Falls back to extracting IDs from
+        # add_<name> when the attribute itself is blank, then resolves those too.
         variable_name = "@#{name}_records"
         define_method name do
           return instance_variable_get(variable_name) if instance_variable_defined?(variable_name)
@@ -40,9 +55,15 @@ def attachments_attribute(name)
           original = @attributes[name.to_s].value_before_type_cast
           return original if original && !original.is_a?(Array)
 
+          ids = if super().blank? && send(:"add_#{name}").present?
+                  send(:"extract_ids_from_add_#{name}")
+                else
+                  super()
+                end
+
           instance_variable_set(
             variable_name,
-            super().map do |attachment|
+            ids.map do |attachment|
               if attachment.is_a?(Integer)
                 Decidim::Attachment.find_by(id: attachment)
               else
@@ -51,6 +72,34 @@ def attachments_attribute(name)
             end.compact
           )
         end
+
+        # Private helpers -------------------------------------------------------
+
+        define_method :"extract_ids_from_add_#{name}" do
+          send(:"add_#{name}")
+            .select { |item| item.is_a?(Hash) && (item[:id].present? || item["id"].present?) }
+            .map { |item| (item[:id] || item["id"]).to_i }
+        end
+
+        define_method :"parse_string_#{name}" do |value|
+          return [] if value.blank?
+
+          send(:"parse_#{name}_ids", value)
+        end
+
+        define_method :"parse_#{name}_ids" do |value|
+          ids = begin
+            Array(JSON.parse(value))
+          rescue JSON::ParserError
+            value.split(",").map(&:strip)
+          end
+
+          ids.map(&:to_i).reject(&:zero?)
+        end
+
+        private :"extract_ids_from_add_#{name}"
+        private :"parse_string_#{name}"
+        private :"parse_#{name}_ids"
       end
     end
   end
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb
index f41f3c13873cb..feb5156e621a5 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb
@@ -87,7 +87,7 @@
 
 shared_examples "admin creates resource gallery" do
   context "when uploading images" do
-    let(:uploaded_photos) do
+    let(:uploaded_attachments) do
       [
         {
           title: "Picture of the city",
@@ -99,10 +99,10 @@
         }
       ]
     end
-    let(:photos) { [] }
+    let(:current_attachments) { [] }
 
     it "creates a gallery for the resource" do
-      expect { command.call }.to change(Decidim::Attachment, :count).by(uploaded_photos.count)
+      expect { command.call }.to change(Decidim::Attachment, :count).by(uploaded_attachments.count)
 
       resource = resource_class.last
       expect(resource.photos.count).to eq(2)
@@ -111,7 +111,7 @@
     end
 
     context "when gallery is left blank" do
-      let(:uploaded_photos) { [] }
+      let(:uploaded_attachments) { [] }
 
       it "broadcasts ok" do
         expect { command.call }.to broadcast(:ok)
@@ -122,7 +122,7 @@
 
 shared_examples "admin manages resource gallery" do
   context "when managing images" do
-    let(:uploaded_photos) do
+    let(:uploaded_attachments) do
       [
         {
           title: "Picture of the city",
@@ -134,10 +134,10 @@
         }
       ]
     end
-    let(:photos) { [] }
+    let(:current_attachments) { [] }
 
     it "creates a gallery for the resource" do
-      expect { command.call }.to change(Decidim::Attachment, :count).by(uploaded_photos.count)
+      expect { command.call }.to change(Decidim::Attachment, :count).by(uploaded_attachments.count)
       resource = resource_class.last
       expect(resource.photos.count).to eq(2)
       last_attachment = Decidim::Attachment.last
@@ -145,7 +145,7 @@
     end
 
     context "when gallery is left blank" do
-      let(:uploaded_photos) { [] }
+      let(:uploaded_attachments) { [] }
 
       it "broadcasts ok" do
         expect { command.call }.to broadcast(:ok)
@@ -155,8 +155,8 @@
     context "when images are removed" do
       let!(:image1) { create(:attachment, :with_image, attached_to: resource) }
       let!(:image2) { create(:attachment, :with_image, attached_to: resource) }
-      let(:uploaded_photos) { [] }
-      let(:current_photos) { [image1] }
+      let(:uploaded_attachments) { [] }
+      let(:current_attachments) { [image1.id] }
 
       it "to decrease the number of photos in the gallery" do
         expect(resource.attachments.count).to eq(2)
diff --git a/decidim-core/spec/commands/decidim/create_dummy_resource_spec.rb b/decidim-core/spec/commands/decidim/create_dummy_resource_spec.rb
index 40322ec7e96d5..36667ec851488 100644
--- a/decidim-core/spec/commands/decidim/create_dummy_resource_spec.rb
+++ b/decidim-core/spec/commands/decidim/create_dummy_resource_spec.rb
@@ -20,7 +20,8 @@ module Decidim
         title:,
         body:,
         photos:,
-        add_photos: uploaded_images,
+        add_attachments: uploaded_images,
+        attachments: [],
         current_component:
       )
     end
diff --git a/decidim-debates/app/commands/decidim/debates/admin/update_debate.rb b/decidim-debates/app/commands/decidim/debates/admin/update_debate.rb
index 49de255ab70ea..026f1029f0a57 100644
--- a/decidim-debates/app/commands/decidim/debates/admin/update_debate.rb
+++ b/decidim-debates/app/commands/decidim/debates/admin/update_debate.rb
@@ -45,7 +45,7 @@ def attributes
 
         def run_after_hooks
           @attached_to = resource
-          document_cleanup!(include_all_attachments: true)
+          attachment_cleanup!(include_all_attachments: true)
           create_attachments(first_weight: 1) if process_attachments?
         end
       end
diff --git a/decidim-debates/app/commands/decidim/debates/update_debate.rb b/decidim-debates/app/commands/decidim/debates/update_debate.rb
index 33dbf27a77539..65db16d19b697 100644
--- a/decidim-debates/app/commands/decidim/debates/update_debate.rb
+++ b/decidim-debates/app/commands/decidim/debates/update_debate.rb
@@ -56,7 +56,7 @@ def attributes
 
       def run_after_hooks
         @attached_to = resource
-        document_cleanup!(include_all_attachments: true)
+        attachment_cleanup!(include_all_attachments: true)
         create_attachments(first_weight: 1) if process_attachments?
       end
     end
diff --git a/decidim-debates/app/forms/decidim/debates/admin/debate_form.rb b/decidim-debates/app/forms/decidim/debates/admin/debate_form.rb
index 9fa79245c3cd2..6018bb2066124 100644
--- a/decidim-debates/app/forms/decidim/debates/admin/debate_form.rb
+++ b/decidim-debates/app/forms/decidim/debates/admin/debate_form.rb
@@ -23,7 +23,7 @@ class DebateForm < Decidim::Form
         attribute :comments_enabled, Boolean, default: true
         attribute :attachment, AttachmentForm
 
-        attachments_attribute :documents
+        attachments_attribute :attachments
 
         validates :title, :description, translatable_presence: true
         validates :title, :description, translated_etiquette: true
@@ -42,7 +42,7 @@ def map_model(model)
           self.title = presenter.title(all_locales: title.is_a?(Hash))
           self.description = presenter.description(all_locales: description.is_a?(Hash))
           self.comments_layout = model.comments_layout || "single_column"
-          self.documents = model.attachments
+          self.attachments = model.attachments
         end
 
         def participatory_space_manifest
@@ -72,7 +72,7 @@ def comments_layout_change
         # an error, the attachment is lost, so we need a way to inform the user of
         # this problem.
         def notify_missing_attachment_if_errored
-          errors.add(:add_documents, :needs_to_be_reattached) if errors.any? && add_documents.present?
+          errors.add(:add_attachments, :needs_to_be_reattached) if errors.any? && add_attachments.present?
         end
       end
     end
diff --git a/decidim-debates/app/forms/decidim/debates/debate_form.rb b/decidim-debates/app/forms/decidim/debates/debate_form.rb
index dba70b7a999a8..cf0480018930e 100644
--- a/decidim-debates/app/forms/decidim/debates/debate_form.rb
+++ b/decidim-debates/app/forms/decidim/debates/debate_form.rb
@@ -13,7 +13,7 @@ class DebateForm < Decidim::Form
       attribute :description, String
       attribute :attachment, AttachmentForm
 
-      attachments_attribute :documents
+      attachments_attribute :attachments
 
       validates :title, :description, presence: true
       validates :title, :description, etiquette: true
@@ -26,7 +26,7 @@ def map_model(debate)
         # user locale is taken as the text locale.
         self.title = debate.title.values.first
         self.description = debate.description.values.first
-        self.documents = debate.attachments
+        self.attachments = debate.attachments
       end
 
       def participatory_space_manifest
diff --git a/decidim-debates/app/views/decidim/debates/admin/debates/_form.html.erb b/decidim-debates/app/views/decidim/debates/admin/debates/_form.html.erb
index e0ba6efc86814..cce626f7dc9b6 100644
--- a/decidim-debates/app/views/decidim/debates/admin/debates/_form.html.erb
+++ b/decidim-debates/app/views/decidim/debates/admin/debates/_form.html.erb
@@ -58,7 +58,7 @@
 
       <% if component_settings.attachments_allowed? %>
         <div class="row column">
-          <%= form.attachment :documents,
+          <%= form.attachment :attachments,
                               multiple: true,
                               label: t("decidim.debates.admin.debates.form.add_attachments"),
                               button_label: t("decidim.debates.admin.debates.form.add_attachments"),
diff --git a/decidim-debates/app/views/decidim/debates/debates/_form.html.erb b/decidim-debates/app/views/decidim/debates/debates/_form.html.erb
index ecfebed1024fc..9fa7cad90fb72 100644
--- a/decidim-debates/app/views/decidim/debates/debates/_form.html.erb
+++ b/decidim-debates/app/views/decidim/debates/debates/_form.html.erb
@@ -12,7 +12,7 @@
 
   <% if component_settings.attachments_allowed? %>
     <div class="row column">
-      <%= form.attachment :documents,
+      <%= form.attachment :attachments,
                           multiple: true,
                           label: t("decidim.debates.admin.debates.form.add_attachments"),
                           button_label: t("decidim.debates.admin.debates.form.add_attachments"),
diff --git a/decidim-debates/spec/commands/decidim/debates/admin/create_debate_spec.rb b/decidim-debates/spec/commands/decidim/debates/admin/create_debate_spec.rb
index d597345a66737..bb43a1d538b06 100644
--- a/decidim-debates/spec/commands/decidim/debates/admin/create_debate_spec.rb
+++ b/decidim-debates/spec/commands/decidim/debates/admin/create_debate_spec.rb
@@ -31,8 +31,8 @@
       finite:,
       comments_enabled: true,
       comments_layout:,
-      add_documents: attachments,
-      documents: [],
+      add_attachments: attachments,
+      attachments: [],
       errors: ActiveModel::Errors.new(self)
     )
   end
diff --git a/decidim-debates/spec/commands/decidim/debates/admin/update_debate_spec.rb b/decidim-debates/spec/commands/decidim/debates/admin/update_debate_spec.rb
index 3d92c4a673827..b4c85550bba9e 100644
--- a/decidim-debates/spec/commands/decidim/debates/admin/update_debate_spec.rb
+++ b/decidim-debates/spec/commands/decidim/debates/admin/update_debate_spec.rb
@@ -30,8 +30,8 @@
       comments_enabled: true,
       comments_layout:,
       attachment: attachment_params,
-      add_documents: uploaded_files,
-      documents: current_files,
+      add_attachments: uploaded_files,
+      attachments: current_files,
       errors: ActiveModel::Errors.new(self)
     )
   end
diff --git a/decidim-debates/spec/commands/decidim/debates/create_debate_spec.rb b/decidim-debates/spec/commands/decidim/debates/create_debate_spec.rb
index 7783ea2b7927b..e1cd37169b84d 100644
--- a/decidim-debates/spec/commands/decidim/debates/create_debate_spec.rb
+++ b/decidim-debates/spec/commands/decidim/debates/create_debate_spec.rb
@@ -22,8 +22,8 @@
       current_user: user,
       current_component:,
       current_organization: organization,
-      add_documents: attachments,
-      documents: [],
+      add_attachments: attachments,
+      attachments: [],
       errors: ActiveModel::Errors.new(self)
     )
   end
diff --git a/decidim-debates/spec/commands/decidim/debates/update_debate_spec.rb b/decidim-debates/spec/commands/decidim/debates/update_debate_spec.rb
index 7987add432acd..18e340863bfb2 100644
--- a/decidim-debates/spec/commands/decidim/debates/update_debate_spec.rb
+++ b/decidim-debates/spec/commands/decidim/debates/update_debate_spec.rb
@@ -18,8 +18,8 @@
     Decidim::Debates::DebateForm.from_params(
       title: "Title",
       description: "Description",
-      documents: current_files,
-      add_documents: uploaded_files,
+      attachments: current_files,
+      add_attachments: uploaded_files,
       taxonomies:,
       id: debate.id
     ).with_context(
diff --git a/decidim-debates/spec/forms/decidim/debates/admin/debate_form_spec.rb b/decidim-debates/spec/forms/decidim/debates/admin/debate_form_spec.rb
index be15849e8bf5f..d994a08ab37b5 100644
--- a/decidim-debates/spec/forms/decidim/debates/admin/debate_form_spec.rb
+++ b/decidim-debates/spec/forms/decidim/debates/admin/debate_form_spec.rb
@@ -37,8 +37,8 @@
       instructions:,
       start_time:,
       end_time:,
-      add_documents: uploaded_files,
-      documents: current_files
+      add_attachments: uploaded_files,
+      attachments: current_files
     }
   end
 
@@ -118,7 +118,7 @@
 
     it "accepts valid attachments" do
       expect(form).to be_valid
-      expect(form.add_documents.count).to eq(2)
+      expect(form.add_attachments.count).to eq(2)
     end
 
     context "when an attachment is invalid" do
@@ -129,7 +129,7 @@
       end
 
       it "does not add the invalid file to the form" do
-        expect(form.documents).to be_empty
+        expect(form.attachments).to be_empty
       end
     end
   end
@@ -151,8 +151,8 @@
     end
 
     it "sets the documents correctly" do
-      expect(subject.documents).to match_array(attachments)
-      expect(subject.documents.map { |doc| doc.title["en"] }).to contain_exactly("Document 1", "Document 2")
+      expect(subject.attachments).to match_array(attachments)
+      expect(subject.attachments.map { |doc| doc.title["en"] }).to contain_exactly("Document 1", "Document 2")
     end
 
     context "when the debate has start and end dates" do
diff --git a/decidim-debates/spec/forms/decidim/debates/debate_form_spec.rb b/decidim-debates/spec/forms/decidim/debates/debate_form_spec.rb
index 7d46e5245845a..403ceedfd13cc 100644
--- a/decidim-debates/spec/forms/decidim/debates/debate_form_spec.rb
+++ b/decidim-debates/spec/forms/decidim/debates/debate_form_spec.rb
@@ -25,8 +25,8 @@
       taxonomies:,
       title:,
       description:,
-      add_documents: uploaded_files,
-      documents: current_files
+      add_attachments: uploaded_files,
+      attachments: current_files
     }
   end
 
@@ -81,7 +81,7 @@
 
     it "accepts valid attachments" do
       expect(form).to be_valid
-      expect(form.add_documents.count).to eq(2)
+      expect(form.add_attachments.count).to eq(2)
     end
   end
 
@@ -103,7 +103,7 @@
     end
 
     it "sets the attachments" do
-      expect(subject.documents).to eq(debate.documents)
+      expect(subject.attachments).to eq(debate.attachments)
     end
   end
 end
diff --git a/decidim-debates/spec/shared/manage_debates_examples.rb b/decidim-debates/spec/shared/manage_debates_examples.rb
index 792087e5c9a06..a12bd67fa2e58 100644
--- a/decidim-debates/spec/shared/manage_debates_examples.rb
+++ b/decidim-debates/spec/shared/manage_debates_examples.rb
@@ -260,8 +260,8 @@
           choose "Open"
         end
 
-        dynamically_attach_file(:debate_documents, image_path)
-        dynamically_attach_file(:debate_documents, document_path)
+        dynamically_attach_file(:debate_attachments, image_path)
+        dynamically_attach_file(:debate_attachments, document_path)
 
         within ".new_debate" do
           find("*[type=submit]").click
@@ -279,7 +279,7 @@
       end
 
       it "shows validation error when format is not accepted" do
-        dynamically_attach_file(:debate_documents, invalid_document, keep_modal_open: true) do
+        dynamically_attach_file(:debate_attachments, invalid_document, keep_modal_open: true) do
           expect(page).to have_content("Accepted formats: #{Decidim::OrganizationSettings.for(organization).upload_allowed_file_extensions.join(", ")}")
         end
         expect(page).to have_content("Validation error!")
@@ -301,8 +301,8 @@
           fill_in_i18n_editor(:debate_instructions, "#debate-instructions-tabs", **attributes[:instructions].except("machine_translations"))
         end
 
-        dynamically_attach_file(:debate_documents, image_path)
-        dynamically_attach_file(:debate_documents, document_path)
+        dynamically_attach_file(:debate_attachments, image_path)
+        dynamically_attach_file(:debate_attachments, document_path)
 
         within ".edit_debate" do
           find("*[type=submit]").click
@@ -319,18 +319,6 @@
         expect(page).to have_content(document_filename)
       end
     end
-
-    context "when attachments are not allowed" do
-      before do
-        component_settings = current_component["settings"]["global"].merge!(attachments_allowed: false)
-        current_component.update!(settings: component_settings)
-        click_on "New debate"
-      end
-
-      it "does not show the attachments form", :slow do
-        expect(page).to have_no_css("#debate_documents_button")
-      end
-    end
   end
 
   describe "closing a debate", versioning: true do
@@ -372,4 +360,85 @@
       end
     end
   end
+
+  context "when the debate has an attachment" do
+    let!(:debate_with_attachment) { create(:debate, component: current_component) }
+    let!(:document) { create(:attachment, :with_image, attached_to: debate_with_attachment) }
+    let(:document_filename) { "Exampledocument.pdf" }
+    let(:document_path) { Decidim::Dev.asset(document_filename) }
+
+    before do
+      component_settings = current_component["settings"]["global"].merge!(attachments_allowed: true)
+      current_component.update!(settings: component_settings)
+      visit_component_admin
+    end
+
+    it "can remove an attachment" do
+      within "tr[data-id=\"#{debate_with_attachment.id}\"]" do
+        find("button[data-controller='dropdown']").click
+        click_on "Edit"
+      end
+      within ".edit_debate" do
+        find_by_id("debate_attachments_button").click
+      end
+      within ".upload-modal" do
+        click_on "Remove"
+        click_on "Save"
+      end
+      within ".edit_debate" do
+        expect(page).to have_no_css("img[src*='#{document.file.blob.filename}']")
+      end
+    end
+
+    it "can attach a file" do
+      click_on "New debate"
+
+      within ".new_debate" do
+        fill_in_i18n(:debate_title, "#debate-title-tabs", **attributes[:title].except("machine_translations"))
+        fill_in_i18n_editor(:debate_description, "#debate-description-tabs", **attributes[:description].except("machine_translations"))
+        fill_in_i18n_editor(:debate_instructions, "#debate-instructions-tabs", **attributes[:instructions].except("machine_translations"))
+
+        choose "Open"
+      end
+
+      dynamically_attach_file(:debate_attachments, document_path)
+
+      within ".new_debate" do
+        find("*[type=submit]").click
+      end
+
+      expect(page).to have_content "Debate successfully created"
+
+      within "tr[data-id=\"#{Decidim::Debates::Debate.last.id}\"]" do
+        find("button[data-controller='dropdown']").click
+        click_on "Edit"
+      end
+
+      expect(page).to have_text(document_filename)
+    end
+
+    it "can edit a debate with an attachment" do
+      within "tr[data-id=\"#{debate_with_attachment.id}\"]" do
+        find("button[data-controller='dropdown']").click
+        click_on "Edit"
+      end
+
+      expect(page.html).to include(document.file.blob.filename.to_s)
+
+      fill_in_i18n(:debate_title, "#debate-title-tabs", en: "Updated debate title with attachments")
+      click_on "Update"
+
+      expect(page).to have_content "Debate successfully updated"
+
+      visit_component_admin
+
+      within "tr", text: "Updated debate title with attachments" do
+        find("button[data-controller='dropdown']").click
+        click_on "Edit"
+      end
+
+      expect(page.html).to include(document.file.blob.filename.to_s)
+      expect(page).to have_field("debate_title_en", with: "Updated debate title with attachments")
+    end
+  end
 end
diff --git a/decidim-debates/spec/system/user_creates_debate_spec.rb b/decidim-debates/spec/system/user_creates_debate_spec.rb
index c3a639ba39042..63cb2687cfdda 100644
--- a/decidim-debates/spec/system/user_creates_debate_spec.rb
+++ b/decidim-debates/spec/system/user_creates_debate_spec.rb
@@ -60,7 +60,7 @@
           end
 
           it "does not show the attachments form" do
-            expect(page).to have_no_css("#debate_documents_button")
+            expect(page).to have_no_css("#debate_attachments_button")
           end
         end
 
@@ -84,8 +84,8 @@
               fill_in :debate_description, with: "Add your comments on whether Decidim is useful for every organization."
             end
 
-            dynamically_attach_file(:debate_documents, image_path)
-            dynamically_attach_file(:debate_documents, document_path)
+            dynamically_attach_file(:debate_attachments, image_path)
+            dynamically_attach_file(:debate_attachments, document_path)
 
             within ".new_debate" do
               find("*[type=submit]").click
@@ -104,7 +104,7 @@
           end
 
           it "shows validation error when format is not accepted" do
-            dynamically_attach_file(:debate_documents, Decidim::Dev.asset("dummy-dummies-example.xlsx"), keep_modal_open: true) do
+            dynamically_attach_file(:debate_attachments, Decidim::Dev.asset("dummy-dummies-example.xlsx"), keep_modal_open: true) do
               expect(page).to have_content("Accepted formats: #{Decidim::OrganizationSettings.for(organization).upload_allowed_file_extensions.join(", ")}")
             end
             expect(page).to have_content("Validation error!")
@@ -112,7 +112,7 @@
 
           context "when attaching an invalid file format" do
             it "shows an error message" do
-              dynamically_attach_file(:debate_documents, Decidim::Dev.asset("participatory_text.odt"), keep_modal_open: true) do
+              dynamically_attach_file(:debate_attachments, Decidim::Dev.asset("participatory_text.odt"), keep_modal_open: true) do
                 expect(page).to have_content("Accepted formats: #{Decidim::OrganizationSettings.for(organization).upload_allowed_file_extensions.join(", ")}")
               end
               expect(page).to have_content("Validation error! Check that the file has an allowed extension or size.")
diff --git a/decidim-debates/spec/system/user_edits_debate_spec.rb b/decidim-debates/spec/system/user_edits_debate_spec.rb
index aac38d0613615..8bec0343d10c2 100644
--- a/decidim-debates/spec/system/user_edits_debate_spec.rb
+++ b/decidim-debates/spec/system/user_edits_debate_spec.rb
@@ -85,7 +85,7 @@
         find("#dropdown-trigger-resource-#{debate.id}").click
         click_on "Edit"
 
-        expect(page).to have_no_css("#debate_documents_button")
+        expect(page).to have_no_css("#debate_attachments_button")
       end
     end
 
@@ -109,8 +109,8 @@
           fill_in :debate_description, with: "Add your comments on whether Decidim is useful for every organization."
         end
 
-        dynamically_attach_file(:debate_documents, image_path)
-        dynamically_attach_file(:debate_documents, document_path)
+        dynamically_attach_file(:debate_attachments, image_path)
+        dynamically_attach_file(:debate_attachments, document_path)
 
         within ".edit_debate" do
           find("*[type=submit]").click
@@ -128,12 +128,65 @@
 
       context "when attaching an invalid file format" do
         it "shows an error message" do
-          dynamically_attach_file(:debate_documents, Decidim::Dev.asset("participatory_text.odt"), keep_modal_open: true) do
+          dynamically_attach_file(:debate_attachments, Decidim::Dev.asset("participatory_text.odt"), keep_modal_open: true) do
             expect(page).to have_content("Accepted formats: #{Decidim::OrganizationSettings.for(organization).upload_allowed_file_extensions.join(", ")}")
           end
           expect(page).to have_content("Validation error! Check that the file has an allowed extension or size.")
         end
       end
     end
+
+    context "when the debate has an attachment", :slow do
+      let(:attachments_allowed) { true }
+      let(:image_filename) { "city.jpeg" }
+      let(:document_filename) { "Exampledocument.pdf" }
+      let(:document_path) { Decidim::Dev.asset(document_filename) }
+      let!(:image_attachment) { create(:attachment, :with_image, attached_to: debate) }
+
+      it "can remove an attachment" do
+        visit_component
+        click_on debate.title.values.first
+        find("#dropdown-trigger-resource-#{debate.id}").click
+        click_on "Edit"
+
+        click_on("Edit attachments")
+        within "li[data-filename='#{image_attachment.file.blob.filename}']" do
+          click_on("Remove")
+        end
+
+        click_on("Save")
+        expect(page).to have_no_css("img[src*='#{image_filename}']")
+      end
+
+      it "can attach a file" do
+        visit_component
+        click_on debate.title.values.first
+
+        find("#dropdown-trigger-resource-#{debate.id}").click
+        click_on "Edit"
+
+        dynamically_attach_file(:debate_attachments, document_path)
+        click_on("Save")
+
+        click_on("Documents")
+        expect(page).to have_text("Exampledocument.pdf")
+      end
+
+      it "can edit a debate with an attachment" do
+        visit_component
+
+        click_on debate.title.values.first
+        find("#dropdown-trigger-resource-#{debate.id}").click
+        click_on "Edit"
+
+        within ".edit_debate" do
+          fill_in :debate_title, with: "Should every organization use Decidim?"
+          find("*[type=submit]").click
+        end
+
+        expect(page).to have_text("Debate successfully updated.")
+        expect(page).to have_css("img[src*='#{image_filename}']")
+      end
+    end
   end
 end
diff --git a/decidim-dev/app/commands/decidim/dev/create_dummy_resource.rb b/decidim-dev/app/commands/decidim/dev/create_dummy_resource.rb
index 0b0413350ea42..dd1c192c38e79 100644
--- a/decidim-dev/app/commands/decidim/dev/create_dummy_resource.rb
+++ b/decidim-dev/app/commands/decidim/dev/create_dummy_resource.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Dev
     class CreateDummyResource < Decidim::Command
-      include Decidim::GalleryMethods
+      include Decidim::MultipleAttachmentsMethods
 
       def initialize(form)
         @form = form
@@ -15,14 +15,14 @@ def initialize(form)
       def call
         return broadcast(:invalid) if @form.invalid?
 
-        if process_gallery?
-          build_gallery
-          return broadcast(:invalid) if gallery_invalid?
+        if process_attachments?
+          build_attachments
+          return broadcast(:invalid) if attachments_invalid?
         end
 
         transaction do
           create_dummy_resource
-          create_gallery if process_gallery?
+          create_attachments if process_attachments?
         end
 
         broadcast(:ok)
@@ -30,7 +30,7 @@ def call
 
       private
 
-      attr_reader :form, :dummy_resource, :gallery
+      attr_reader :form, :dummy_resource, :attachments
 
       def create_dummy_resource
         @dummy_resource = DummyResource.create!(
diff --git a/decidim-elections/app/commands/decidim/elections/admin/create_election.rb b/decidim-elections/app/commands/decidim/elections/admin/create_election.rb
index f0f169795eea7..75307871285a0 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/create_election.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/create_election.rb
@@ -4,13 +4,13 @@ module Decidim
   module Elections
     module Admin
       class CreateElection < Decidim::Commands::CreateResource
-        include ::Decidim::GalleryMethods
+        include ::Decidim::MultipleAttachmentsMethods
 
         fetch_form_attributes :title, :description, :start_at, :end_at, :results_availability
 
         protected
 
-        attr_reader :gallery
+        attr_reader :attachments
 
         def resource_class = Decidim::Elections::Election
 
@@ -34,14 +34,14 @@ def attributes
 
         def run_after_hooks
           @attached_to = resource
-          create_gallery if process_gallery?
+          create_attachments if process_attachments?
         end
 
         def run_before_hooks
-          return unless process_gallery?
+          return unless process_attachments?
 
-          build_gallery
-          raise Decidim::Commands::HookError if gallery_invalid?
+          build_attachments
+          raise Decidim::Commands::HookError if attachments_invalid?
         end
       end
     end
diff --git a/decidim-elections/app/commands/decidim/elections/admin/update_election.rb b/decidim-elections/app/commands/decidim/elections/admin/update_election.rb
index 442dcc20dd341..9e0c166b14576 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/update_election.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/update_election.rb
@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       class UpdateElection < Decidim::Commands::UpdateResource
-        include ::Decidim::GalleryMethods
+        include ::Decidim::MultipleAttachmentsMethods
         fetch_form_attributes :title, :description, :start_at, :end_at, :results_availability
 
         def initialize(form, election)
@@ -43,15 +43,15 @@ def parsed_description
         end
 
         def run_after_hooks
-          create_gallery if process_gallery?
-          photo_cleanup!
+          create_attachments if process_attachments?
+          attachment_cleanup!(include_all_attachments: true)
         end
 
         def run_before_hooks
-          return unless process_gallery?
+          return unless process_attachments?
 
-          build_gallery
-          raise Decidim::Commands::HookError if gallery_invalid?
+          build_attachments
+          raise Decidim::Commands::HookError if attachments_invalid?
         end
       end
     end
diff --git a/decidim-elections/app/forms/decidim/elections/admin/election_form.rb b/decidim-elections/app/forms/decidim/elections/admin/election_form.rb
index 1a4972fb8a490..bc5afa74b7012 100644
--- a/decidim-elections/app/forms/decidim/elections/admin/election_form.rb
+++ b/decidim-elections/app/forms/decidim/elections/admin/election_form.rb
@@ -20,7 +20,7 @@ class ElectionForm < Decidim::Form
         attribute :results_availability, String, default: "after_end"
         attribute :attachment, AttachmentForm
 
-        attachments_attribute :photos
+        attachments_attribute :attachments
 
         validates :title, translatable_presence: true
         validates :results_availability, inclusion: { in: Decidim::Elections::Election::RESULTS_AVAILABILITY_OPTIONS }
@@ -33,6 +33,8 @@ class ElectionForm < Decidim::Form
 
         def map_model(election)
           self.manual_start = election.start_at.blank?
+          self.attachments = election.attachments.ids
+          self.add_attachments = election.attachments.map { |att| { id: att.id, title: att.title } }
         end
 
         def results_availability_labels
diff --git a/decidim-elections/app/views/decidim/elections/admin/elections/_form.html.erb b/decidim-elections/app/views/decidim/elections/admin/elections/_form.html.erb
index 88d94f9fa5b4c..4625e6f11e154 100644
--- a/decidim-elections/app/views/decidim/elections/admin/elections/_form.html.erb
+++ b/decidim-elections/app/views/decidim/elections/admin/elections/_form.html.erb
@@ -21,7 +21,7 @@
         </div>
 
         <div class="row column">
-          <%= form.attachment :photos,
+          <%= form.attachment :attachments,
                               multiple: true,
                               label: false,
                               button_label: t("decidim.elections.admin.elections.form.add_images"),
diff --git a/decidim-elections/spec/commands/decidim/elections/admin/create_election_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/create_election_spec.rb
index 50fcb122e611b..3d3a79f5d45f7 100644
--- a/decidim-elections/spec/commands/decidim/elections/admin/create_election_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/admin/create_election_spec.rb
@@ -17,8 +17,8 @@ module Admin
         let(:start_at) { 1.day.from_now }
         let(:end_at) { 2.days.from_now }
         let(:manual_start) { false }
-        let(:uploaded_photos) { [] }
-        let(:photos) { [] }
+        let(:uploaded_attachments) { [] }
+        let(:attachments) { [] }
         let(:invalid) { false }
 
         let(:form) do
@@ -34,8 +34,8 @@ module Admin
             end_at:,
             manual_start:,
             results_availability: "after_end",
-            photos:,
-            add_photos: uploaded_photos
+            attachments:,
+            add_attachments: uploaded_attachments
           )
         end
 
diff --git a/decidim-elections/spec/commands/decidim/elections/admin/update_election_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/update_election_spec.rb
index a1431b9a9f919..c4c3c27ac8e45 100644
--- a/decidim-elections/spec/commands/decidim/elections/admin/update_election_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/admin/update_election_spec.rb
@@ -19,8 +19,8 @@ module Admin
         let(:start_at) { 1.day.from_now }
         let(:end_at) { 2.days.from_now }
         let(:manual_start) { false }
-        let(:uploaded_photos) { [] }
-        let(:current_photos) { [] }
+        let(:uploaded_attachments) { [] }
+        let(:current_attachments) { [] }
         let(:invalid) { false }
 
         let(:form) do
@@ -35,8 +35,8 @@ module Admin
             end_at:,
             manual_start:,
             results_availability: "after_end",
-            photos: current_photos,
-            add_photos: uploaded_photos
+            attachments: current_attachments,
+            add_attachments: uploaded_attachments
           )
         end
 
diff --git a/decidim-elections/spec/system/admin/admin_manages_elections_spec.rb b/decidim-elections/spec/system/admin/admin_manages_elections_spec.rb
index cd7c83fd53f58..6d7599ba9522d 100644
--- a/decidim-elections/spec/system/admin/admin_manages_elections_spec.rb
+++ b/decidim-elections/spec/system/admin/admin_manages_elections_spec.rb
@@ -145,7 +145,7 @@
         expect(page).to have_field("election_end_at_date", disabled: true)
         expect(page).to have_field("election_end_at_time", disabled: true)
       end
-      dynamically_attach_file(:election_photos, Decidim::Dev.asset("city2.jpeg"))
+      dynamically_attach_file(:election_attachments, Decidim::Dev.asset("city2.jpeg"))
 
       click_on "Save and continue"
       expect(page).to have_admin_callout "Election updated successfully"
@@ -301,4 +301,75 @@
       end
     end
   end
+
+  context "when the election has an attachment" do
+    let!(:election_with_attachment) do
+      create(:election, component: current_component)
+    end
+
+    let!(:document) { create(:attachment, :with_image, attached_to: election_with_attachment) }
+
+    before do
+      visit_component_admin
+
+      within "tr", text: translated(election_with_attachment.title) do
+        find("button[data-controller='dropdown']").click
+      end
+    end
+
+    it "can remove an attachment" do
+      click_on translated(election_with_attachment.title)
+
+      click_on("Edit attachments")
+
+      within "li[data-filename='#{document.file.blob.filename}']" do
+        click_on("Remove")
+      end
+
+      click_on("Save")
+
+      expect(page).to have_no_css("img[src*='#{document.file.blob.filename}']")
+    end
+
+    it "can attach a file" do
+      click_on translated(election_with_attachment.title)
+
+      click_on("Edit attachments")
+
+      within ".upload-modal" do
+        find("input[type='file']", visible: :all).attach_file(Decidim::Dev.asset(document.file.blob.filename.to_s))
+      end
+
+      click_on("Save")
+
+      sleep 1
+
+      click_on("Save and continue")
+      expect(page).to have_text("Election updated successfully")
+
+      click_on("Main")
+      expect(page).to have_css("img[src*='#{document.file.blob.filename}']")
+    end
+
+    it "can edit an election with an attachment" do
+      click_on translated(election_with_attachment.title)
+
+      expect(page.html).to include(document.file.blob.filename.to_s)
+
+      fill_in_i18n(:election_title, "#election-title-tabs", en: "Updated election title with attachments")
+      click_on "Save and continue"
+
+      expect(page).to have_content "Election updated successfully"
+
+      visit_component_admin
+
+      within "tr", text: "Updated election title with attachments" do
+        find("button[data-controller='dropdown']").click
+        click_on "Edit election"
+      end
+
+      expect(page.html).to include(document.file.blob.filename.to_s)
+      expect(page).to have_field("election_title_en", with: "Updated election title with attachments")
+    end
+  end
 end
diff --git a/decidim-forms/app/commands/decidim/forms/response_questionnaire.rb b/decidim-forms/app/commands/decidim/forms/response_questionnaire.rb
index 6f0046c414fe2..a90b9f57854ed 100644
--- a/decidim-forms/app/commands/decidim/forms/response_questionnaire.rb
+++ b/decidim-forms/app/commands/decidim/forms/response_questionnaire.rb
@@ -59,7 +59,7 @@ def event_arguments
       # of this problem.
       def reset_form_attachments
         @form.responses.each do |response|
-          response.errors.add(:add_documents, :needs_to_be_reattached) if response.has_attachments? || response.has_error_in_attachments?
+          response.errors.add(:add_attachments, :needs_to_be_reattached) if response.has_attachments? || response.has_error_in_attachments?
         end
       end
 
@@ -116,7 +116,7 @@ def response_questionnaire
             end
 
             create_attachments if process_attachments?
-            document_cleanup!
+            attachment_cleanup!
           end
 
           @form = @main_form
diff --git a/decidim-forms/app/forms/decidim/forms/response_form.rb b/decidim-forms/app/forms/decidim/forms/response_form.rb
index 8da91883d050d..ed213a2856bc4 100644
--- a/decidim-forms/app/forms/decidim/forms/response_form.rb
+++ b/decidim-forms/app/forms/decidim/forms/response_form.rb
@@ -12,7 +12,7 @@ class ResponseForm < Decidim::Form
       attribute :choices, Array[ResponseChoiceForm]
       attribute :matrix_choices, Array[ResponseChoiceForm]
 
-      attachments_attribute :documents
+      attachments_attribute :attachments
 
       validates :body, presence: true, if: :mandatory_body?
       validates :selected_choices, presence: true, if: :mandatory_choices?
@@ -20,7 +20,7 @@ class ResponseForm < Decidim::Form
       validate :max_choices, if: -> { question.max_choices }
       validate :all_choices, if: :sorting?
       validate :min_choices, if: -> { question.matrix? && question.mandatory? }
-      validate :documents_present, if: -> { question.question_type == "files" && question.mandatory? }
+      validate :attachments_present, if: -> { question.question_type == "files" && question.mandatory? }
       validate :max_characters, if: -> { question.max_characters.positive? }
 
       delegate :mandatory_body?, :mandatory_choices?, :matrix?, to: :question
@@ -44,7 +44,7 @@ def label
       def map_model(model)
         self.question_id = model.decidim_question_id
         self.question = model.question
-        self.documents = model.attachments
+        self.attachments = model.attachments
 
         self.choices = model.choices.map do |choice|
           ResponseChoiceForm.from_model(choice)
@@ -82,11 +82,11 @@ def optional_conditions_fulfilled?
       end
 
       def has_attachments?
-        question.has_attachments? && errors[:add_documents].empty? && add_documents.present?
+        question.has_attachments? && errors[:add_attachments].empty? && add_attachments.present?
       end
 
       def has_error_in_attachments?
-        errors[:add_documents].present?
+        errors[:add_attachments].present?
       end
 
       def sorting?
@@ -141,8 +141,8 @@ def max_choices_label
         I18n.t("questionnaires.question.max_choices", scope: "decidim.forms", n: question.max_choices)
       end
 
-      def documents_present
-        errors.add(:add_documents, :blank) if add_documents.empty? && errors[:add_documents].empty?
+      def attachments_present
+        errors.add(:add_attachments, :blank) if add_attachments.empty? && errors[:add_attachments].empty?
       end
     end
   end
diff --git a/decidim-forms/app/views/decidim/forms/questionnaires/responses/_files.html.erb b/decidim-forms/app/views/decidim/forms/questionnaires/responses/_files.html.erb
index 3613d3c53f706..298845835d75c 100644
--- a/decidim-forms/app/views/decidim/forms/questionnaires/responses/_files.html.erb
+++ b/decidim-forms/app/views/decidim/forms/questionnaires/responses/_files.html.erb
@@ -1 +1 @@
-<%= response_form.upload :add_documents, attachments: response.documents, label: false, multiple: true, id: field_id, disabled:, button_class: "button button__lg button__transparent-secondary w-full" %>
+<%= response_form.upload :add_attachments, attachments: response.attachments, label: false, multiple: true, id: field_id, disabled:, button_class: "button button__lg button__transparent-secondary w-full" %>
diff --git a/decidim-forms/spec/commands/decidim/forms/response_questionnaire_spec.rb b/decidim-forms/spec/commands/decidim/forms/response_questionnaire_spec.rb
index 282683846f990..2a84d0966d5f1 100644
--- a/decidim-forms/spec/commands/decidim/forms/response_questionnaire_spec.rb
+++ b/decidim-forms/spec/commands/decidim/forms/response_questionnaire_spec.rb
@@ -144,7 +144,7 @@ def tokenize(id)
             {
               "responses" => [
                 {
-                  "add_documents" => uploaded_files,
+                  "add_attachments" => uploaded_files,
                   "question_id" => question1.id
                 }
               ],
diff --git a/decidim-forms/spec/forms/decidim/forms/response_form_spec.rb b/decidim-forms/spec/forms/decidim/forms/response_form_spec.rb
index 0528b2b2dc32d..4b7d0c5a59e31 100644
--- a/decidim-forms/spec/forms/decidim/forms/response_form_spec.rb
+++ b/decidim-forms/spec/forms/decidim/forms/response_form_spec.rb
@@ -87,7 +87,7 @@ module Forms
           context "when the body is empty" do
             before do
               subject.body = nil
-              subject.add_documents = uploaded_files
+              subject.add_attachments = uploaded_files
             end
 
             it "is valid" do
@@ -97,7 +97,7 @@ module Forms
 
           context "when there are no uploaded files" do
             before do
-              subject.add_documents = nil
+              subject.add_attachments = nil
             end
 
             it "is not valid if there are no files" do
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/create_initiative.rb b/decidim-initiatives/app/commands/decidim/initiatives/create_initiative.rb
index 251e35d5ec52e..90778a95c5db2 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/create_initiative.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/create_initiative.rb
@@ -8,7 +8,6 @@ module Initiatives
     class CreateInitiative < Decidim::Command
       include CurrentLocale
       include ::Decidim::MultipleAttachmentsMethods
-      include ::Decidim::GalleryMethods
 
       delegate :current_user, to: :form
       # Public: Initializes the command.
@@ -32,11 +31,6 @@ def call
           return broadcast(:invalid) if attachments_invalid?
         end
 
-        if process_gallery?
-          build_gallery
-          return broadcast(:invalid) if gallery_invalid?
-        end
-
         initiative = create_initiative
 
         if initiative.persisted?
@@ -60,7 +54,7 @@ def event_arguments
 
       private
 
-      attr_reader :form, :attachment, :initiative
+      attr_reader :form, :attachments, :initiative
 
       # Creates the initiative and all default components
       def create_initiative
@@ -72,7 +66,6 @@ def create_initiative
 
           @attached_to = initiative
           create_attachments if process_attachments?
-          create_gallery if process_gallery?
 
           create_components_for(initiative)
           send_notification(initiative)
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/update_initiative.rb b/decidim-initiatives/app/commands/decidim/initiatives/update_initiative.rb
index 0b83d0e5e314e..b999fe2536166 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/update_initiative.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/update_initiative.rb
@@ -6,7 +6,6 @@ module Initiatives
     # existing initiative.
     class UpdateInitiative < Decidim::Command
       include ::Decidim::MultipleAttachmentsMethods
-      include ::Decidim::GalleryMethods
       include CurrentLocale
       delegate :current_user, to: :form
 
@@ -34,11 +33,6 @@ def call
           return broadcast(:invalid) if attachments_invalid?
         end
 
-        if process_gallery?
-          build_gallery
-          return broadcast(:invalid) if gallery_invalid?
-        end
-
         with_events(with_transaction: true) do
           @initiative = Decidim.traceability.update!(
             initiative,
@@ -46,10 +40,8 @@ def call
             attributes
           )
 
-          photo_cleanup!
-          document_cleanup!
+          attachment_cleanup!
           create_attachments if process_attachments?
-          create_gallery if process_gallery?
         end
 
         broadcast(:ok, initiative)
@@ -71,7 +63,7 @@ def event_arguments
 
       private
 
-      attr_reader :form, :initiative
+      attr_reader :form, :initiative, :attachments
 
       def attributes
         attrs = {
diff --git a/decidim-initiatives/app/forms/decidim/initiatives/initiative_form.rb b/decidim-initiatives/app/forms/decidim/initiatives/initiative_form.rb
index aea38b2586c4c..6da5aec38a523 100644
--- a/decidim-initiatives/app/forms/decidim/initiatives/initiative_form.rb
+++ b/decidim-initiatives/app/forms/decidim/initiatives/initiative_form.rb
@@ -20,7 +20,7 @@ class InitiativeForm < Form
       attribute :scope_id, Integer
 
       attachments_attribute :photos
-      attachments_attribute :documents
+      attachments_attribute :attachments
 
       validates :title, :description, presence: true
       validates :title, length: { maximum: 150 }
diff --git a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/fill_data.html.erb b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/fill_data.html.erb
index bac76accc3d6c..bba2f0bafea9c 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/fill_data.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/fill_data.html.erb
@@ -41,7 +41,7 @@
     <% end %>
 
     <% if initiative_type.attachments_enabled? %>
-      <%= f.attachment :documents,
+      <%= f.attachment :attachments,
                        multiple: true,
                        label: t("decidim.initiatives.form.add_attachments"),
                        button_label: t("decidim.initiatives.form.add_attachments"),
diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiatives/_form.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiatives/_form.html.erb
index c091f3fcbb03f..1dc5e20da6a3b 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/initiatives/_form.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/initiatives/_form.html.erb
@@ -47,7 +47,7 @@
 <% end %>
 
 <% if current_initiative.type.attachments_enabled? %>
-  <%= form.attachment :documents,
+  <%= form.attachment :attachments,
                       multiple: true,
                       label: t("decidim.initiatives.form.add_attachments"),
                       button_label: t("decidim.initiatives.form.add_attachments"),
diff --git a/decidim-initiatives/spec/commands/decidim/initiatives/update_initiative_spec.rb b/decidim-initiatives/spec/commands/decidim/initiatives/update_initiative_spec.rb
index 738cb732636b0..9bdfe550123b9 100644
--- a/decidim-initiatives/spec/commands/decidim/initiatives/update_initiative_spec.rb
+++ b/decidim-initiatives/spec/commands/decidim/initiatives/update_initiative_spec.rb
@@ -33,8 +33,8 @@ module Initiatives
             signature_type:,
             type_id:,
             attachment:,
-            add_documents: uploaded_files,
-            documents: current_files
+            add_attachments: uploaded_files,
+            attachments: current_files
           }
         end
         let(:command) do
@@ -86,8 +86,8 @@ module Initiatives
                 signature_type:,
                 type_id: initiative_type.id,
                 attachment:,
-                add_documents: uploaded_files,
-                documents: current_files,
+                add_attachments: uploaded_files,
+                attachments: current_files,
                 signature_end_date: Date.tomorrow
               }
             end
@@ -146,7 +146,7 @@ module Initiatives
               it "keeps the new and old attachments" do
                 command.call
                 initiative.reload
-                expect(initiative.documents.count).to eq(3)
+                expect(initiative.attachments.count).to eq(3)
               end
 
               context "when the old attachments are deleted by the user" do
@@ -155,8 +155,8 @@ module Initiatives
                 it "deletes the old attachments" do
                   command.call
                   initiative.reload
-                  expect(initiative.documents.count).to eq(2)
-                  expect(initiative.documents).not_to include(document)
+                  expect(initiative.attachments.count).to eq(2)
+                  expect(initiative.attachments).not_to include(document)
                 end
               end
             end
diff --git a/decidim-initiatives/spec/shared/create_initiative_example.rb b/decidim-initiatives/spec/shared/create_initiative_example.rb
index 142e0dfbb68ce..f04dfeb985c3f 100644
--- a/decidim-initiatives/spec/shared/create_initiative_example.rb
+++ b/decidim-initiatives/spec/shared/create_initiative_example.rb
@@ -24,8 +24,8 @@
         type_id: scoped_type.type.id,
         signature_type: "online",
         scope_id: scoped_type.scope.id,
-        add_documents: uploaded_files,
-        documents: current_files
+        add_attachments: uploaded_files,
+        attachments: current_files
       }
     end
 
diff --git a/decidim-initiatives/spec/system/admin/admin_manages_initiatives_spec.rb b/decidim-initiatives/spec/system/admin/admin_manages_initiatives_spec.rb
index 28bc1d65f0a08..619be04ad22e3 100644
--- a/decidim-initiatives/spec/system/admin/admin_manages_initiatives_spec.rb
+++ b/decidim-initiatives/spec/system/admin/admin_manages_initiatives_spec.rb
@@ -133,4 +133,79 @@ def initiative_without_area(area)
 
     it_behaves_like "paginating a collection"
   end
+
+  context "when the initiative has an attachment" do
+    let!(:initiative_with_attachment) { create(:initiative, organization:) }
+    let!(:document) { create(:attachment, :with_image, attached_to: initiative_with_attachment) }
+
+    it "can remove an attachment" do
+      visit decidim_admin_initiatives.edit_initiative_path(initiative_with_attachment)
+      click_on("Edit")
+
+      find("tbody tr:first-child button[data-controller='dropdown']").click
+      click_on "Delete"
+
+      click_on "OK"
+
+      expect(page).to have_text("Attachment destroyed successfully.")
+
+      visit decidim_admin_initiatives.edit_initiative_path(initiative_with_attachment)
+
+      expect(page).to have_no_text(document.file.blob.filename.to_s)
+    end
+
+    it "can attach a file" do
+      visit decidim_admin_initiatives.edit_initiative_path(initiative_with_attachment)
+
+      within("#accordion-homepage_attachments") do
+        click_on("New")
+      end
+
+      fill_in_i18n(
+        :attachment_title,
+        "#attachment-title-tabs",
+        en: "Super city!"
+      )
+      fill_in_i18n(
+        :attachment_description,
+        "#attachment-description-tabs",
+        en: "Attachment description"
+      )
+
+      click_on("Add file")
+
+      within(".upload-modal") do
+        find("input[type='file']", visible: :all).attach_file(Decidim::Dev.asset("city3.jpeg"))
+        sleep(1)
+        click_on("Save")
+      end
+
+      click_on("Create attachment")
+
+      expect(page).to have_text("Super city!")
+    end
+
+    it "can edit an initiative with an attachment" do
+      visit decidim_admin_initiatives.edit_initiative_path(initiative_with_attachment)
+
+      expect(page.html).to include(document.file.blob.filename.to_s)
+
+      fill_in_i18n(
+        :initiative_title,
+        "#initiative-title-tabs",
+        en: "Updated initiative title with attachments"
+      )
+
+      within("[data-content]") do
+        find("*[type=submit]").click
+      end
+
+      expect(page).to have_content "The initiative has been successfully updated."
+
+      visit decidim_admin_initiatives.edit_initiative_path(initiative_with_attachment)
+
+      expect(page.html).to include(document.file.blob.filename.to_s)
+      expect(page).to have_field("initiative_title_en", with: "Updated initiative title with attachments")
+    end
+  end
 end
diff --git a/decidim-initiatives/spec/system/create_initiative_spec.rb b/decidim-initiatives/spec/system/create_initiative_spec.rb
index 5b0ac8301d586..dae3d1b72af67 100644
--- a/decidim-initiatives/spec/system/create_initiative_spec.rb
+++ b/decidim-initiatives/spec/system/create_initiative_spec.rb
@@ -752,6 +752,8 @@
 
           fill_in "Title", with: translated(initiative.title, locale: :en)
           fill_in "initiative_description", with: translated(initiative.description, locale: :en)
+
+          expect(page).to have_select("Signature collection type")
           select("Online", from: "Signature collection type")
           select(translated(initiative_type_scope&.scope&.name, locale: :en), from: "Scope")
           find_button("Continue").click
@@ -810,7 +812,7 @@
           fill_in "initiative_description", with: translated(initiative.description, locale: :en)
           select("Online", from: "Signature collection type")
           select(translated(initiative_type_scope&.scope&.name, locale: :en), from: "Scope")
-          dynamically_attach_file(:initiative_documents, Decidim::Dev.asset("Exampledocument.pdf"))
+          dynamically_attach_file(:initiative_attachments, Decidim::Dev.asset("Exampledocument.pdf"))
           dynamically_attach_file(:initiative_photos, Decidim::Dev.asset("avatar.jpg"))
           find_button("Continue").click
           expect(page).to have_content("Your initiative has been successfully created.")
@@ -818,7 +820,6 @@
 
         it "saves the attachments" do
           expect(Decidim::Initiative.last.documents.count).to eq(1)
-          expect(Decidim::Initiative.last.photos.count).to eq(1)
         end
 
         context "when minimum committee size is above zero" do
@@ -844,6 +845,8 @@
 
           fill_in "Title", with: translated(initiative.title, locale: :en)
           fill_in "initiative_description", with: translated(initiative.description, locale: :en)
+
+          expect(page).to have_select("Signature collection type")
           select("Online", from: "Signature collection type")
           select(translated(initiative_type_scope&.scope&.name, locale: :en), from: "Scope")
           find_button("Continue").click
@@ -869,6 +872,8 @@
 
           fill_in "Title", with: translated(initiative.title, locale: :en)
           fill_in "initiative_description", with: translated(initiative.description, locale: :en)
+
+          expect(page).to have_select("Signature collection type")
           select("Online", from: "Signature collection type")
           select(translated(initiative_type_scope&.scope&.name, locale: :en), from: "Scope")
           find_button("Continue").click
diff --git a/decidim-initiatives/spec/system/edit_initiative_spec.rb b/decidim-initiatives/spec/system/edit_initiative_spec.rb
index fa9070596f7b0..bf3ea64d2f825 100644
--- a/decidim-initiatives/spec/system/edit_initiative_spec.rb
+++ b/decidim-initiatives/spec/system/edit_initiative_spec.rb
@@ -86,27 +86,66 @@
       expect(page).to have_no_xpath("//select[@id='initiative_state']")
     end
 
-    it "allows adding attachments" do
-      visit initiative_path
+    context "when the initiative has an attachment" do
+      let!(:initiative) { create(:initiative, :created, author: user, scoped_type:, organization:) }
+      let!(:document) { create(:attachment, :with_pdf, attached_to: initiative) }
+      let!(:image) { create(:attachment, :with_image, attached_to: initiative) }
 
-      click_on("Edit")
+      it "can remove an attachment" do
+        visit initiative_path
 
-      expect(page).to have_content "Edit Initiative"
+        click_on("Edit")
 
-      expect(initiative.reload.attachments.count).to eq(0)
+        expect(page).to have_text "Edit Initiative"
 
-      dynamically_attach_file(:initiative_documents, Decidim::Dev.asset("Exampledocument.pdf"))
-      dynamically_attach_file(:initiative_photos, Decidim::Dev.asset("avatar.jpg"))
+        within "form.edit_initiative" do
+          find_by_id("initiative_attachments_button").click
+        end
+        within ".upload-modal" do
+          within "[data-filename='#{document.file.blob.filename}']" do
+            click_on "Remove"
+          end
+          click_on "Save"
+        end
+        within "form.edit_initiative" do
+          expect(page).to have_no_css("img[src*='#{document.file.blob.filename}']")
+        end
+      end
 
-      within "form.edit_initiative" do
-        click_on "Update"
+      it "can attach a file" do
+        visit initiative_path
+
+        click_on("Edit")
+
+        expect(page).to have_content "Edit Initiative"
+
+        dynamically_attach_file(:initiative_attachments, Decidim::Dev.asset("city3.jpeg"))
+
+        within "form.edit_initiative" do
+          click_on "Update"
+        end
+
+        perform_enqueued_jobs
+
+        expect(initiative.reload.attachments.count).to eq(3)
       end
 
-      perform_enqueued_jobs
+      it "can edit an initiative with attachments" do
+        visit initiative_path
 
-      expect(initiative.reload.documents.count).to eq(1)
-      expect(initiative.photos.count).to eq(1)
-      expect(initiative.attachments.count).to eq(2)
+        click_on("Edit")
+
+        expect(page).to have_text "Edit Initiative"
+
+        fill_in :initiative_title, with: "Updated initiative title with attachments"
+
+        within "form.edit_initiative" do
+          click_on "Update"
+        end
+
+        expect(page).to have_text("Updated initiative title with attachments")
+        expect(initiative.reload.attachments.count).to eq(1)
+      end
     end
 
     context "when using the wizard steps" do
diff --git a/decidim-meetings/config/locales/en.yml b/decidim-meetings/config/locales/en.yml
index b438cab4cf373..9092cfd3cf53b 100644
--- a/decidim-meetings/config/locales/en.yml
+++ b/decidim-meetings/config/locales/en.yml
@@ -50,8 +50,6 @@ en:
       meeting_registration_invite:
         email: Email
         name: Name
-      response:
-        add_documents: Add documents
       validate_registration_code:
         code: Code
     errors:
diff --git a/decidim-meetings/spec/system/admin/admin_manages_meetings_spec.rb b/decidim-meetings/spec/system/admin/admin_manages_meetings_spec.rb
index fa82e964fac55..9d0c93d9c2ccf 100644
--- a/decidim-meetings/spec/system/admin/admin_manages_meetings_spec.rb
+++ b/decidim-meetings/spec/system/admin/admin_manages_meetings_spec.rb
@@ -792,6 +792,62 @@
     end
   end
 
+  context "when the meeting has an attachment" do
+    let(:attachment_collection) { create(:attachment_collection, collection_for: meeting) }
+    let!(:attachment) { create(:attachment, attached_to: meeting, attachment_collection:) }
+
+    it "can remove an attachment" do
+      visit_component_admin
+      within "tr", text: translated(meeting.title) do
+        find("button[data-controller='dropdown']").click
+        click_on "Add attachment"
+      end
+
+      within "tr[data-id='#{attachment.id}']" do
+        find("button[data-controller='dropdown']").click
+        click_on "Delete"
+      end
+
+      accept_confirm
+      expect(page).to have_no_css("tr[data-id='#{attachment.id}']")
+    end
+
+    it "can attach a file" do
+      visit_component_admin
+      within "tr", text: translated(meeting.title) do
+        find("button[data-controller='dropdown']").click
+        click_on "Add attachment"
+      end
+
+      click_on "New attachment"
+
+      fill_in_i18n(:attachment_title, "#attachment-title-tabs", en: "Test attachment")
+      fill_in_i18n(:attachment_description, "#attachment-description-tabs", en: "Test description")
+
+      dynamically_attach_file(:attachment_file, Decidim::Dev.asset("Exampledocument.pdf"))
+
+      click_on "Create attachment"
+
+      expect(page).to have_text("Test attachment")
+    end
+
+    it "can edit a meeting with an attachment" do
+      visit_component_admin
+      within "tr", text: translated(meeting.title) do
+        find("button[data-controller='dropdown']").click
+        click_on "Edit"
+      end
+
+      within ".edit_meeting" do
+        fill_in_i18n(:meeting_title, "#meeting-title-tabs", en: "Updated title", ca: "Títol actualitzat", es: "Título actualizado")
+        find("*[type=submit]").click
+      end
+
+      expect(page).to have_content("Meeting successfully updated.")
+      expect(page).to have_text("Updated title")
+    end
+  end
+
   private
 
   def fill_in_services
diff --git a/decidim-meetings/spec/system/meeting_registrations_spec.rb b/decidim-meetings/spec/system/meeting_registrations_spec.rb
index 4fd1549006adf..6593290a460c8 100644
--- a/decidim-meetings/spec/system/meeting_registrations_spec.rb
+++ b/decidim-meetings/spec/system/meeting_registrations_spec.rb
@@ -284,7 +284,7 @@ def see_questionnaire_questions; end
         it "shows errors for invalid file" do
           visit questionnaire_public_path
 
-          dynamically_attach_file("questionnaire_responses_0_add_documents", Decidim::Dev.asset("verify_user_groups.csv"), keep_modal_open: true)
+          dynamically_attach_file("questionnaire_responses_0_add_attachments", Decidim::Dev.asset("verify_user_groups.csv"), keep_modal_open: true)
 
           expect(page).to have_content("Validation error!")
         end
diff --git a/decidim-proposals/app/commands/decidim/proposals/admin/update_proposal.rb b/decidim-proposals/app/commands/decidim/proposals/admin/update_proposal.rb
index be2e381c5c278..3682c82a3d539 100644
--- a/decidim-proposals/app/commands/decidim/proposals/admin/update_proposal.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/admin/update_proposal.rb
@@ -36,7 +36,7 @@ def call
           transaction do
             update_proposal
             update_proposal_author
-            document_cleanup!(include_all_attachments: true)
+            attachment_cleanup!(include_all_attachments: true)
             create_attachments(first_weight: first_attachment_weight) if process_attachments?
           end
 
diff --git a/decidim-proposals/app/commands/decidim/proposals/create_proposal.rb b/decidim-proposals/app/commands/decidim/proposals/create_proposal.rb
index 0c413a46519f3..4c42d25493926 100644
--- a/decidim-proposals/app/commands/decidim/proposals/create_proposal.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/create_proposal.rb
@@ -82,7 +82,7 @@ def create_proposal
             )
 
             proposal.taxonomizations = form.taxonomizations if form.taxonomizations.present?
-            proposal.documents = form.documents if form.documents.present?
+            proposal.attachments = form.attachments if form.attachments.present?
             if form.geocoded?
               proposal.latitude = form.latitude
               proposal.longitude = form.longitude
diff --git a/decidim-proposals/app/commands/decidim/proposals/gallery_methods.rb b/decidim-proposals/app/commands/decidim/proposals/gallery_methods.rb
deleted file mode 100644
index 9d22e3557be43..0000000000000
--- a/decidim-proposals/app/commands/decidim/proposals/gallery_methods.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Proposals
-    # A module with all the gallery common methods for proposals
-    # and collaborative draft commands.
-    # Allows to create several image attachments at once
-    module GalleryMethods
-      include ::Decidim::GalleryMethods
-
-      private
-
-      def gallery_allowed?
-        @form.current_component.settings.attachments_allowed?
-      end
-    end
-  end
-end
diff --git a/decidim-proposals/app/commands/decidim/proposals/update_proposal.rb b/decidim-proposals/app/commands/decidim/proposals/update_proposal.rb
index b2fff70357d45..8b3cb3c633425 100644
--- a/decidim-proposals/app/commands/decidim/proposals/update_proposal.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/update_proposal.rb
@@ -39,7 +39,7 @@ def call
             update_proposal
           end
 
-          document_cleanup!(include_all_attachments: true)
+          attachment_cleanup!(include_all_attachments: true)
 
           create_attachments(first_weight: first_attachment_weight) if process_attachments?
         end
diff --git a/decidim-proposals/app/forms/decidim/proposals/admin/proposal_form.rb b/decidim-proposals/app/forms/decidim/proposals/admin/proposal_form.rb
index f4d392a9d53f6..71e9fd12b7e54 100644
--- a/decidim-proposals/app/forms/decidim/proposals/admin/proposal_form.rb
+++ b/decidim-proposals/app/forms/decidim/proposals/admin/proposal_form.rb
@@ -14,7 +14,7 @@ class ProposalForm < Decidim::Proposals::Admin::ProposalBaseForm
         translatable_attribute :body, Decidim::Attributes::RichText
         attribute :attachment, AttachmentForm
 
-        attachments_attribute :documents
+        attachments_attribute :attachments
 
         validates :title, :body, translatable_presence: true
         validates :title, :body, translated_etiquette: true
@@ -27,61 +27,12 @@ def map_model(model)
 
           self.title = presenter.title(all_locales: title.is_a?(Hash))
           self.body = presenter.editor_body(all_locales: body.is_a?(Hash))
-          self.documents = model.attachments.ids
-          self.add_documents = model.attachments.map { |att| { id: att.id, title: att.title } }
-        end
-
-        def documents=(value)
-          case value
-          when String
-            super(parse_string_documents(value))
-          when Integer
-            super([value])
-          else
-            super
-          end
-        end
-
-        def documents
-          result = super
-
-          if should_use_add_documents?(result)
-            extract_ids_from_add_documents
-          else
-            result.is_a?(Array) ? result : []
-          end
+          self.attachments = model.attachments.ids
+          self.add_attachments = model.attachments.map { |att| { id: att.id, title: att.title } }
         end
 
         def notify_missing_attachment_if_errored
-          errors.add(:add_documents, :needs_to_be_reattached) if errors.any? && add_documents.present?
-        end
-
-        private
-
-        def should_use_add_documents?(result)
-          (result.blank? || result.is_a?(String)) && add_documents.present?
-        end
-
-        def extract_ids_from_add_documents
-          add_documents
-            .select { |doc| doc.is_a?(Hash) && (doc[:id].present? || doc["id"].present?) }
-            .map { |doc| (doc[:id] || doc["id"]).to_i }
-        end
-
-        def parse_string_documents(value)
-          return [] if value.blank?
-
-          parse_document_ids(value)
-        end
-
-        def parse_document_ids(value)
-          ids = begin
-            Array(JSON.parse(value))
-          rescue JSON::ParserError
-            value.split(",").map(&:strip)
-          end
-
-          ids.map(&:to_i).reject(&:zero?)
+          errors.add(:add_attachments, :needs_to_be_reattached) if errors.any? && add_attachments.present?
         end
       end
     end
diff --git a/decidim-proposals/app/forms/decidim/proposals/admin/proposals_merge_form.rb b/decidim-proposals/app/forms/decidim/proposals/admin/proposals_merge_form.rb
index e3ce715b6dd8a..bb46a04410086 100644
--- a/decidim-proposals/app/forms/decidim/proposals/admin/proposals_merge_form.rb
+++ b/decidim-proposals/app/forms/decidim/proposals/admin/proposals_merge_form.rb
@@ -15,7 +15,7 @@ class ProposalsMergeForm < ProposalBaseForm
         attribute :target_component_id, Array[Integer]
         attribute :proposal_ids, Array
 
-        attachments_attribute :documents
+        attachments_attribute :attachments
 
         validates :target_component, :proposals, :current_component, presence: true
         validates :proposal_ids, length: { minimum: 2 }
@@ -61,7 +61,7 @@ def clean_target_component_id
         end
 
         def notify_missing_attachment_if_errored
-          errors.add(:add_documents, :needs_to_be_reattached) if errors.any? && add_documents.present?
+          errors.add(:add_attachments, :needs_to_be_reattached) if errors.any? && add_attachments.present?
         end
       end
     end
diff --git a/decidim-proposals/app/forms/decidim/proposals/proposal_form.rb b/decidim-proposals/app/forms/decidim/proposals/proposal_form.rb
index 3b606b825af26..373fe034195f9 100644
--- a/decidim-proposals/app/forms/decidim/proposals/proposal_form.rb
+++ b/decidim-proposals/app/forms/decidim/proposals/proposal_form.rb
@@ -19,7 +19,7 @@ class ProposalForm < Decidim::Form
       attribute :longitude, Float
       attribute :attachment, AttachmentForm
 
-      attachments_attribute :documents
+      attachments_attribute :attachments
 
       validates :title, :body, presence: true
       validates :title, :body, etiquette: true
@@ -42,7 +42,7 @@ def map_model(model)
         presenter = ProposalPresenter.new(model)
         self.body = presenter.editor_body(all_locales: body.is_a?(Hash))
 
-        self.documents = model.attachments
+        self.attachments = model.attachments
       end
 
       def participatory_space_manifest
@@ -73,7 +73,7 @@ def body_is_not_bare_template
       # in any other field. This is needed because when the form has an error, the attachment
       # is lost, so we need a way to inform the user of this problem.
       def notify_missing_attachment_if_errored
-        errors.add(:add_documents, :needs_to_be_reattached) if errors.any? && add_documents.present?
+        errors.add(:add_attachments, :needs_to_be_reattached) if errors.any? && add_attachments.present?
       end
     end
   end
diff --git a/decidim-proposals/app/views/decidim/proposals/admin/proposals/_form.html.erb b/decidim-proposals/app/views/decidim/proposals/admin/proposals/_form.html.erb
index cdd320c1a4fb8..2e289cdc156c9 100644
--- a/decidim-proposals/app/views/decidim/proposals/admin/proposals/_form.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/admin/proposals/_form.html.erb
@@ -36,7 +36,7 @@
 
       <% if component_settings.attachments_allowed? %>
         <div class="row column">
-          <%= form.attachment :documents,
+          <%= form.attachment :attachments,
                               multiple: true,
                               label: t("decidim.proposals.proposals.edit.add_attachments"),
                               button_label: t("decidim.proposals.proposals.edit.add_attachments"),
diff --git a/decidim-proposals/app/views/decidim/proposals/admin/proposals_merges/_form.html.erb b/decidim-proposals/app/views/decidim/proposals/admin/proposals_merges/_form.html.erb
index 5222ddc412fb8..33893dce0e28f 100644
--- a/decidim-proposals/app/views/decidim/proposals/admin/proposals_merges/_form.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/admin/proposals_merges/_form.html.erb
@@ -33,7 +33,7 @@
       <% end %>
       <% if component_settings.attachments_allowed? %>
         <div class="row column pt-4">
-          <%= form.attachment :documents,
+          <%= form.attachment :attachments,
                               multiple: true,
                               label: t("decidim.proposals.proposals.edit.add_attachments"),
                               button_label: t("decidim.proposals.proposals.edit.add_attachments"),
diff --git a/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb b/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb
index ecb6049f3bbd6..e4eae63c7965d 100644
--- a/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb
@@ -14,7 +14,7 @@
 <% end %>
 
 <% if component_settings.attachments_allowed? %>
-  <%= form.attachment :documents,
+  <%= form.attachment :attachments,
                       multiple: false,
                       label: t("decidim.proposals.collaborative_drafts.new.add_file"),
                       button_label: t("decidim.proposals.collaborative_drafts.new.add_file"),
diff --git a/decidim-proposals/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb b/decidim-proposals/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb
index 90175af59b412..e72dc7aed9abc 100644
--- a/decidim-proposals/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb
@@ -23,7 +23,7 @@
   <% end %>
 <% end %>
 <% if component_settings.attachments_allowed? && (new_proposal || @proposal) %>
-  <%= form.attachment :documents,
+  <%= form.attachment :attachments,
                       multiple: true,
                       label: t("decidim.proposals.proposals.edit.add_attachments"),
                       button_label: t("decidim.proposals.proposals.edit.add_attachments"),
diff --git a/decidim-proposals/config/locales/en.yml b/decidim-proposals/config/locales/en.yml
index d4d71dd99966b..a2aea8abedd9e 100644
--- a/decidim-proposals/config/locales/en.yml
+++ b/decidim-proposals/config/locales/en.yml
@@ -63,9 +63,7 @@ en:
               allowed_file_content_types: 'Invalid document type. Only files with the following extensions are allowed: %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Needs to be reattached
-            add_photos:
+            add_attachments:
               needs_to_be_reattached: Needs to be reattached
             body:
               cant_be_equal_to_template: cannot be equal to the template
diff --git a/decidim-proposals/spec/commands/decidim/proposals/admin/create_proposal_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/admin/create_proposal_spec.rb
index f596535fdcff9..70066cce5fb55 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/admin/create_proposal_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/admin/create_proposal_spec.rb
@@ -41,8 +41,8 @@ module Admin
               address:,
               has_address:,
               attachment: attachment_params,
-              documents: current_files,
-              add_documents: uploaded_files,
+              attachments: current_files,
+              add_attachments: uploaded_files,
               created_in_meeting:,
               meeting_id:
             }
diff --git a/decidim-proposals/spec/commands/decidim/proposals/admin/merge_proposals_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/admin/merge_proposals_spec.rb
index 2dc507679cfb2..4f55f7758c6f8 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/admin/merge_proposals_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/admin/merge_proposals_spec.rb
@@ -25,7 +25,7 @@ module Admin
               same_component?: same_component,
               current_user: create(:user, :admin, organization: current_component.organization),
               add_photos: [],
-              add_documents: [],
+              add_attachments: [],
               title: { "en" => "Valid Long Proposal Title" },
               body: { "en" => "Valid body text" },
               address: "",
@@ -34,7 +34,7 @@ module Admin
               created_in_meeting: false,
               created_in_meeting?: false,
               author:,
-              documents: []
+              attachments: []
             )
           end
           let(:command) { described_class.new(form) }
@@ -100,7 +100,7 @@ module Admin
                     same_component?: same_component,
                     current_user: create(:user, :admin, organization: current_component.organization),
                     add_photos: [valid_photo],
-                    add_documents: [valid_document],
+                    add_attachments: [valid_document],
                     title: { "en" => "Valid very Long Proposal Title" },
                     body: { "en" => "Valid body text" },
                     address: "",
diff --git a/decidim-proposals/spec/commands/decidim/proposals/admin/update_proposal_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/admin/update_proposal_spec.rb
index ee6bbcddcbe7b..cd3cc1c38be9f 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/admin/update_proposal_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/admin/update_proposal_spec.rb
@@ -39,8 +39,8 @@
         address:,
         has_address:,
         attachment: attachment_params,
-        documents: current_files,
-        add_documents: uploaded_files
+        attachments: current_files,
+        add_attachments: uploaded_files
       }
     end
 
diff --git a/decidim-proposals/spec/commands/decidim/proposals/create_collaborative_draft_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/create_collaborative_draft_spec.rb
index 2c674bcafd0cc..cb6bc7a09e531 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/create_collaborative_draft_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/create_collaborative_draft_spec.rb
@@ -37,7 +37,7 @@ module Proposals
             has_address:,
             latitude:,
             longitude:,
-            add_documents: attachment_params
+            add_attachments: attachment_params
           }
         end
 
diff --git a/decidim-proposals/spec/commands/decidim/proposals/update_proposal_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/update_proposal_spec.rb
index 1a0f380f525b2..d04cc6f76e1b4 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/update_proposal_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/update_proposal_spec.rb
@@ -41,8 +41,8 @@ module Proposals
             address:,
             has_address:,
             attachment: attachment_params,
-            documents: current_files,
-            add_documents: uploaded_files,
+            attachments: current_files,
+            add_attachments: uploaded_files,
             errors:
           }
         end
diff --git a/decidim-proposals/spec/shared/manage_proposals_examples.rb b/decidim-proposals/spec/shared/manage_proposals_examples.rb
index ded0053bde75e..e958ac9536ec4 100644
--- a/decidim-proposals/spec/shared/manage_proposals_examples.rb
+++ b/decidim-proposals/spec/shared/manage_proposals_examples.rb
@@ -195,7 +195,7 @@
               fill_in_i18n_editor :proposal_body, "#proposal-body-tabs", en: "This is my proposal and I want to upload attachments."
             end
 
-            dynamically_attach_file(:proposal_documents, image_path)
+            dynamically_attach_file(:proposal_attachments, image_path)
 
             within ".new_proposal" do
               find("*[type=submit]").click
diff --git a/decidim-proposals/spec/system/admin/admin_creates_proposal_spec.rb b/decidim-proposals/spec/system/admin/admin_creates_proposal_spec.rb
index 56c26b261b9c2..83008ccc92cb4 100644
--- a/decidim-proposals/spec/system/admin/admin_creates_proposal_spec.rb
+++ b/decidim-proposals/spec/system/admin/admin_creates_proposal_spec.rb
@@ -33,8 +33,8 @@
 
     fill_in_i18n :proposal_title, "#proposal-title-tabs", en: new_title
     fill_in_i18n_editor :proposal_body, "#proposal-body-tabs", en: new_body
-    dynamically_attach_file(:proposal_documents, image_path)
-    dynamically_attach_file(:proposal_documents, document_path)
+    dynamically_attach_file(:proposal_attachments, image_path)
+    dynamically_attach_file(:proposal_attachments, document_path)
 
     click_on("Create")
     within "tr", text: translated_attribute(new_title) do
diff --git a/decidim-proposals/spec/system/admin/admin_edits_proposal_spec.rb b/decidim-proposals/spec/system/admin/admin_edits_proposal_spec.rb
index 7a3f7a2a10d9c..b40218f36a106 100644
--- a/decidim-proposals/spec/system/admin/admin_edits_proposal_spec.rb
+++ b/decidim-proposals/spec/system/admin/admin_edits_proposal_spec.rb
@@ -93,7 +93,7 @@
       end
     end
 
-    context "when the proposal has attachment" do
+    context "when the proposal has an attachment" do
       let!(:component) do
         create(:proposal_component,
                :with_creation_enabled,
@@ -112,7 +112,7 @@
 
       let!(:document) { create(:attachment, :with_pdf, attached_to: proposal) }
 
-      it "can remove attachment" do
+      it "can remove an attachment" do
         visit_component_admin
         within "tr", text: translated_attribute(proposal.title) do
           find("button[data-controller='dropdown']").click
@@ -132,10 +132,12 @@
         expect(page).to have_content("Proposal successfully updated.")
 
         visit_component_admin
+
         within "tr", text: translated_attribute(proposal.title) do
           find("button[data-controller='dropdown']").click
           click_on "Edit proposal"
         end
+
         expect(page).to have_no_content(document.file.blob.filename)
       end
 
@@ -145,14 +147,14 @@
           find("button[data-controller='dropdown']").click
           click_on "Edit proposal"
         end
-        dynamically_attach_file(:proposal_documents, image_path)
 
         click_on("Edit attachments")
-        within "li[data-filename='#{image_filename}']" do
-          click_on("Remove")
+
+        within ".upload-modal" do
+          find("input[type='file']", visible: :all).attach_file(Decidim::Dev.asset("Exampledocument.pdf"))
         end
-        click_on("Save")
 
+        click_on("Save")
         click_on("Update")
 
         within "tr", text: translated_attribute(proposal.title) do
@@ -160,7 +162,7 @@
           click_on "Edit proposal"
         end
 
-        expect(page).to have_no_content("city.jpeg")
+        expect(page).to have_no_content("Exampledocument.pdf")
       end
 
       it "can edit a proposal with an attachment" do
diff --git a/decidim-proposals/spec/system/collaborative_drafts_fields_spec.rb b/decidim-proposals/spec/system/collaborative_drafts_fields_spec.rb
index f4fbf44c3a9e2..f54ad3d040c0e 100644
--- a/decidim-proposals/spec/system/collaborative_drafts_fields_spec.rb
+++ b/decidim-proposals/spec/system/collaborative_drafts_fields_spec.rb
@@ -232,7 +232,7 @@
               fill_in :collaborative_draft_body, with: "This is my collaborative draft and I want to upload attachments."
             end
 
-            dynamically_attach_file(:collaborative_draft_documents, Decidim::Dev.asset("city.jpeg"))
+            dynamically_attach_file(:collaborative_draft_attachments, Decidim::Dev.asset("city.jpeg"))
 
             within ".new_collaborative_draft" do
               find("*[type=submit]").click
diff --git a/decidim-proposals/spec/system/edit_collaborative_draft_spec.rb b/decidim-proposals/spec/system/edit_collaborative_draft_spec.rb
index 04cf4ed7d6cd8..1fa921f5e4ab3 100644
--- a/decidim-proposals/spec/system/edit_collaborative_draft_spec.rb
+++ b/decidim-proposals/spec/system/edit_collaborative_draft_spec.rb
@@ -60,7 +60,7 @@
           find("#dropdown-trigger-resource-#{collaborative_draft.id}").click
           click_on "Edit"
 
-          dynamically_attach_file(:collaborative_draft_documents, Decidim::Dev.asset("city.jpeg"))
+          dynamically_attach_file(:collaborative_draft_attachments, Decidim::Dev.asset("city.jpeg"))
 
           within "form.edit_collaborative_draft" do
             find("*[type=submit]").click
diff --git a/decidim-proposals/spec/system/edit_proposal_spec.rb b/decidim-proposals/spec/system/edit_proposal_spec.rb
index 1c8f9805f00fd..7c5aa81c1f4ba 100644
--- a/decidim-proposals/spec/system/edit_proposal_spec.rb
+++ b/decidim-proposals/spec/system/edit_proposal_spec.rb
@@ -81,7 +81,7 @@
       it "shows validation error when format is not accepted" do
         find("#dropdown-trigger-resource-#{proposal.id}").click
         click_on "Edit"
-        dynamically_attach_file(:proposal_documents, Decidim::Dev.asset("dummy-dummies-example.xlsx"), keep_modal_open: true) do
+        dynamically_attach_file(:proposal_attachments, Decidim::Dev.asset("dummy-dummies-example.xlsx"), keep_modal_open: true) do
           expect(page).to have_content("Accepted formats: #{Decidim::OrganizationSettings.for(organization).upload_allowed_file_extensions_image.join(", ")}")
         end
         expect(page).to have_content("Validation error!")
@@ -195,18 +195,18 @@
 
           find("#dropdown-trigger-resource-#{proposal.id}").click
           click_on "Edit proposal"
-          dynamically_attach_file(:proposal_documents, Decidim::Dev.asset("city.jpeg"))
-          dynamically_attach_file(:proposal_documents, Decidim::Dev.asset("icon.png"))
-          dynamically_attach_file(:proposal_documents, Decidim::Dev.asset("avatar.jpg"))
+          dynamically_attach_file(:proposal_attachments, Decidim::Dev.asset("city.jpeg"))
+          dynamically_attach_file(:proposal_attachments, Decidim::Dev.asset("icon.png"))
+          dynamically_attach_file(:proposal_attachments, Decidim::Dev.asset("avatar.jpg"))
           click_on "Send"
           click_on "Edit proposal"
           expect(page).to have_content("city.jpeg")
           expect(page).to have_content("icon.png")
           expect(page).to have_content("avatar.jpg")
-          dynamically_attach_file(:proposal_documents, Decidim::Dev.asset("city2.jpeg"))
+          dynamically_attach_file(:proposal_attachments, Decidim::Dev.asset("city2.jpeg"))
           expect(page).to have_content("city2.jpeg")
           expect(page).to have_no_content("city3.jpeg")
-          dynamically_attach_file(:proposal_documents, Decidim::Dev.asset("city3.jpeg"))
+          dynamically_attach_file(:proposal_attachments, Decidim::Dev.asset("city3.jpeg"))
           expect(page).to have_content("city2.jpeg")
           expect(page).to have_content("city3.jpeg")
           click_on "Send"
@@ -409,4 +409,61 @@
       expect(page).to have_content("not authorized")
     end
   end
+
+  context "when the proposal has an attachment" do
+    let(:component) { create(:proposal_component, :with_attachments_allowed, participatory_space: participatory_process) }
+    let!(:proposal) { create(:proposal, users: [user], component:) }
+    let!(:document) { create(:attachment, :with_pdf, attached_to: proposal) }
+    let(:document_filename) { document.file.blob.filename.to_s }
+
+    before do
+      login_as user, scope: :user
+      visit_component
+      click_on proposal_title
+      find("#dropdown-trigger-resource-#{proposal.id}").click
+      click_on "Edit"
+      expect(page).to have_text "Edit proposal"
+    end
+
+    it "can remove an attachment" do
+      click_on("Edit attachments")
+      within ".upload-modal" do
+        within "li[data-filename='#{document.file.blob.filename}']" do
+          click_on("Remove")
+        end
+        click_on "Save"
+      end
+      click_on("Send")
+      expect(page).to have_text("Proposal successfully updated.")
+      expect(page).to have_no_text("Documents")
+    end
+
+    it "can attach a file" do
+      page.execute_script("document.getElementById('proposal_attachments_button').click()")
+      within ".upload-modal" do
+        within "li[data-filename='#{document.file.blob.filename}']" do
+          click_on("Remove")
+        end
+        find("input[type='file']", visible: :all).attach_file(Decidim::Dev.asset("Exampledocument.pdf"))
+        within "[data-filename='Exampledocument.pdf']" do
+          expect(page).to have_css("li progress[value='100']")
+        end
+        expect(page).to have_button("Save", disabled: false)
+        click_on "Save"
+      end
+      click_on("Send")
+      expect(page).to have_text("Proposal successfully updated.")
+      expect(page).to have_text("Exampledocument.pdf")
+    end
+
+    it "can edit a proposal with attachments" do
+      expect(page.html).to include(document_filename)
+      within "form.edit_proposal" do
+        fill_in :proposal_title, with: "Updated proposal title with attachments"
+        click_on "Send"
+      end
+      expect(page).to have_text("Proposal successfully updated.")
+      expect(page).to have_text("Updated proposal title with attachments")
+    end
+  end
 end
diff --git a/decidim-proposals/spec/system/proposals_fields_spec.rb b/decidim-proposals/spec/system/proposals_fields_spec.rb
index fd00c94b32ce8..752a929a48590 100644
--- a/decidim-proposals/spec/system/proposals_fields_spec.rb
+++ b/decidim-proposals/spec/system/proposals_fields_spec.rb
@@ -223,7 +223,7 @@
               fill_in :proposal_body, with: "This is my proposal and I want to upload attachments."
             end
 
-            dynamically_attach_file(:proposal_documents, Decidim::Dev.asset("city.jpeg"))
+            dynamically_attach_file(:proposal_attachments, Decidim::Dev.asset("city.jpeg"))
 
             within ".edit_proposal" do
               find("*[type=submit]").click
@@ -253,12 +253,12 @@
               skip "REDESIGN_PENDING - Flaky test: upload modal fails on GitHub with multiple files https://github.com/decidim/decidim/issues/10961"
 
               # Attach one card image and two document images and go to preview
-              dynamically_attach_file(:proposal_documents, Decidim::Dev.asset("city.jpeg"))
+              dynamically_attach_file(:proposal_attachments, Decidim::Dev.asset("city.jpeg"))
               expect(page).to have_content("city.jpeg")
-              dynamically_attach_file(:proposal_documents, Decidim::Dev.asset("city2.jpeg"))
+              dynamically_attach_file(:proposal_attachments, Decidim::Dev.asset("city2.jpeg"))
               expect(page).to have_content("city.jpeg")
               expect(page).to have_content("city2.jpeg")
-              dynamically_attach_file(:proposal_documents, Decidim::Dev.asset("city3.jpeg"))
+              dynamically_attach_file(:proposal_attachments, Decidim::Dev.asset("city3.jpeg"))
               expect(page).to have_content("city.jpeg")
               expect(page).to have_content("city2.jpeg")
               expect(page).to have_content("city3.jpeg")
diff --git a/decidim-surveys/config/locales/en.yml b/decidim-surveys/config/locales/en.yml
index 05f7b1860b7d2..7029bb380baef 100644
--- a/decidim-surveys/config/locales/en.yml
+++ b/decidim-surveys/config/locales/en.yml
@@ -1,6 +1,9 @@
 ---
 en:
   activemodel:
+    attributes:
+      response:
+        add_attachments: Add attachments
     models:
       decidim/surveys/closed_survey_event: Survey ended
       decidim/surveys/opened_survey_event: Survey started
diff --git a/decidim-surveys/spec/shared/editable_survey_response_examples.rb b/decidim-surveys/spec/shared/editable_survey_response_examples.rb
index 9f739494bf3de..99e7fe6bbf352 100644
--- a/decidim-surveys/spec/shared/editable_survey_response_examples.rb
+++ b/decidim-surveys/spec/shared/editable_survey_response_examples.rb
@@ -62,7 +62,7 @@
     check :questionnaire_responses_5_matrix_row_1_choice_0_body
     check :questionnaire_responses_5_matrix_row_2_choice_0_body
 
-    dynamically_attach_file("questionnaire_responses_6_add_documents", Decidim::Dev.asset("city.jpeg"))
+    dynamically_attach_file("questionnaire_responses_6_add_attachments", Decidim::Dev.asset("city.jpeg"))
 
     page.execute_script "window.scrollBy(0,1800)"
     within ".js-sortable-check-box-collection" do
@@ -122,7 +122,7 @@
     check :questionnaire_responses_5_matrix_row_1_choice_2_body
     check :questionnaire_responses_5_matrix_row_2_choice_2_body
 
-    dynamically_attach_file("questionnaire_responses_6_add_documents", Decidim::Dev.asset("city2.jpeg"), remove_before: true)
+    dynamically_attach_file("questionnaire_responses_6_add_attachments", Decidim::Dev.asset("city2.jpeg"), remove_before: true)
 
     page.execute_script "window.scrollBy(0,1800)"
 

From 1301783c20ac1e1c857ee481a5fa90a5d815b79a Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Mon, 22 Jun 2026 09:59:35 +0300
Subject: [PATCH 087/131] Backport 'Fix file size validator in content block
 settings' to v0.31 (#16970)

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 .../decidim/admin/create_newsletter.rb        |   2 +-
 .../decidim/admin/newsletters_controller.rb   |   1 +
 .../system/admin_manages_newsletters_spec.rb  |  14 +-
 ...dmin_manages_organization_homepage_spec.rb | 166 ++++++++++++++++--
 .../content_blocks/cta_settings_form/show.erb |   2 +-
 .../hero_settings_form/show.erb               |   4 +-
 .../show.erb                                  |   2 +-
 .../show.erb                                  |   2 +-
 .../lib/decidim/dev/assets/8001x4000.png      | Bin 0 -> 102068 bytes
 .../shared/manage_landing_page_examples.rb    |  11 ++
 10 files changed, 178 insertions(+), 26 deletions(-)
 create mode 100644 decidim-dev/lib/decidim/dev/assets/8001x4000.png

diff --git a/decidim-admin/app/commands/decidim/admin/create_newsletter.rb b/decidim-admin/app/commands/decidim/admin/create_newsletter.rb
index abd9fd5a4f1b4..66fdc7bec55b0 100644
--- a/decidim-admin/app/commands/decidim/admin/create_newsletter.rb
+++ b/decidim-admin/app/commands/decidim/admin/create_newsletter.rb
@@ -31,7 +31,7 @@ def run_after_hooks
             @content_block = content_block
           end
           on(:invalid) do
-            raise "There was a problem persisting the changes to the content block"
+            raise Decidim::Commands::HookError, "There was a problem persisting the changes to the content block"
           end
         end
       end
diff --git a/decidim-admin/app/controllers/decidim/admin/newsletters_controller.rb b/decidim-admin/app/controllers/decidim/admin/newsletters_controller.rb
index fbdc80e89ff86..a8409768eeb79 100644
--- a/decidim-admin/app/controllers/decidim/admin/newsletters_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/newsletters_controller.rb
@@ -55,6 +55,7 @@ def create
 
           on(:invalid) do |newsletter|
             @newsletter = newsletter
+            @form.images = content_block.images_container
             flash.now[:error] = I18n.t("newsletters.create.error", scope: "decidim.admin")
             render action: :new, status: :unprocessable_entity
           end
diff --git a/decidim-admin/spec/system/admin_manages_newsletters_spec.rb b/decidim-admin/spec/system/admin_manages_newsletters_spec.rb
index 59e11b74830ee..656d9192282eb 100644
--- a/decidim-admin/spec/system/admin_manages_newsletters_spec.rb
+++ b/decidim-admin/spec/system/admin_manages_newsletters_spec.rb
@@ -29,7 +29,7 @@
   end
 
   describe "creates and previews a newsletter" do
-    it "allows a newsletter to be created" do
+    before do
       visit decidim_admin.newsletters_path
 
       find(".button.new").click
@@ -73,7 +73,9 @@
           ca: "Hola, %{name}! Contingut rellevant."
         )
       end
+    end
 
+    it "allows a newsletter to be created" do
       dynamically_attach_file(:newsletter_images_main_image, Decidim::Dev.asset("city2.jpeg"))
 
       within ".new_newsletter" do
@@ -86,6 +88,16 @@
       visit decidim_admin.root_path
       expect(page).to have_content("created the #{translated(attributes[:subject])} newsletter")
     end
+
+    it "displays the 'Resolution is too large' error message when image is invalid" do
+      dynamically_attach_file(:newsletter_images_main_image, Decidim::Dev.asset("8001x4000.png"))
+
+      within ".new_newsletter" do
+        find("*[type=submit]").click
+      end
+
+      expect(page).to have_text("File resolution is too large")
+    end
   end
 
   describe "previews a newsletter" do
diff --git a/decidim-admin/spec/system/admin_manages_organization_homepage_spec.rb b/decidim-admin/spec/system/admin_manages_organization_homepage_spec.rb
index 2d38cd12f2675..b8e0a371e60ad 100644
--- a/decidim-admin/spec/system/admin_manages_organization_homepage_spec.rb
+++ b/decidim-admin/spec/system/admin_manages_organization_homepage_spec.rb
@@ -29,32 +29,113 @@
     end
   end
 
-  context "when editing a persisted content block" do
-    let!(:content_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) }
+  context "when editing settings of content blocks" do
+    context "and edits hero and cta settings" do
+      let!(:content_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) }
+
+      it "updates the settings of the content block" do
+        visit decidim_admin.edit_organization_homepage_content_block_path(content_block)
+
+        fill_in(:content_block_settings_welcome_text_en, with: "Custom welcome text!")
+        fill_in(:content_block_settings_cta_button_text_en, with: "Custom button!")
+        fill_in(:content_block_settings_cta_button_path_en, with: "http://example.org")
+
+        click_on "Update"
+        sleep 1
+        visit decidim.root_path
+        expect(page).to have_content("Custom welcome text!")
+        expect(page).to have_link("Custom button!", href: "http://example.org")
+      end
 
-    it "updates the settings of the content block" do
-      visit decidim_admin.edit_organization_homepage_content_block_path(content_block)
+      it "updates the images of the content block" do
+        visit decidim_admin.edit_organization_homepage_content_block_path(content_block)
 
-      fill_in(
-        :content_block_settings_welcome_text_en,
-        with: "Custom welcome text!"
-      )
+        dynamically_attach_file(:content_block_images_background_image, Decidim::Dev.asset("city2.jpeg"))
 
-      click_on "Update"
-      sleep 1
-      visit decidim.root_path
-      expect(page).to have_content("Custom welcome text!")
+        click_on "Update"
+        sleep 1
+        visit decidim.root_path
+        expect(page.html).to include("city2.jpeg")
+      end
+
+      it "displays the 'Resolution is too large' error message when image is invalid" do
+        visit decidim_admin.edit_organization_homepage_content_block_path(content_block)
+
+        dynamically_attach_file(:content_block_images_background_image, Decidim::Dev.asset("8001x4000.png"))
+
+        click_on "Update"
+        sleep 1
+
+        expect(page).to have_text("File resolution is too large")
+      end
     end
 
-    it "updates the images of the content block" do
-      visit decidim_admin.edit_organization_homepage_content_block_path(content_block)
+    context "and edits highlighted content banner settings" do
+      let!(:content_block) { create(:content_block, organization:, manifest_name: :highlighted_content_banner, scope_name: :homepage) }
 
-      dynamically_attach_file(:content_block_images_background_image, Decidim::Dev.asset("city2.jpeg"))
+      it "updates the settings of the content block" do
+        visit decidim_admin.edit_organization_homepage_content_block_path(content_block)
 
-      click_on "Update"
-      sleep 1
-      visit decidim.root_path
-      expect(page.html).to include("city2.jpeg")
+        fill_in(:content_block_settings_title_en, with: "Custom title text!")
+        fill_in(:content_block_settings_action_button_title_en, with: "Custom action title!")
+        fill_in(:content_block_settings_action_button_subtitle_en, with: "Custom action subtitle!")
+        fill_in(:content_block_settings_action_button_url, with: "http://example.org")
+
+        fill_in_i18n_editor :content_block_settings_short_description, "#content_block-settings--short_description-tabs",
+                            en: "<p>The Short description</p>"
+
+        click_on "Update"
+        sleep 1
+        visit decidim.root_path
+        expect(page).to have_text("Custom title text!")
+        expect(page).to have_text("The Short description")
+        expect(page).to have_link("Custom action subtitle!", href: "http://example.org")
+      end
+
+      it "updates the images of the content block" do
+        visit decidim_admin.edit_organization_homepage_content_block_path(content_block)
+
+        fill_in(:content_block_settings_title_en, with: "Custom title text!")
+        fill_in(:content_block_settings_action_button_title_en, with: "Custom action title!")
+        fill_in(:content_block_settings_action_button_subtitle_en, with: "Custom action subtitle!")
+        fill_in(:content_block_settings_action_button_url, with: "http://example.org")
+
+        fill_in_i18n_editor :content_block_settings_short_description, "#content_block-settings--short_description-tabs",
+                            en: "<p>The Short description</p>"
+
+        dynamically_attach_file(:content_block_images_background_image, Decidim::Dev.asset("city2.jpeg"))
+
+        click_on "Update"
+
+        sleep 1
+        visit decidim.root_path
+        expect(page.html).to include("city2.jpeg")
+      end
+
+      it "displays the 'Resolution is too large' error message when image is invalid" do
+        visit decidim_admin.edit_organization_homepage_content_block_path(content_block)
+
+        dynamically_attach_file(:content_block_images_background_image, Decidim::Dev.asset("8001x4000.png"))
+
+        click_on "Update"
+        sleep 1
+
+        expect(page).to have_text("File resolution is too large")
+      end
+    end
+
+    context "and edits html settings" do
+      let!(:content_block) { create(:content_block, organization:, manifest_name: :html, scope_name: :homepage) }
+
+      it "updates the settings of the content block" do
+        visit decidim_admin.edit_organization_homepage_content_block_path(content_block)
+
+        fill_in(:content_block_settings_html_content_en, with: "Custom HTML text!")
+        click_on "Update"
+        sleep 1
+        visit decidim.root_path
+        expect(page).to have_text("Custom HTML text!")
+      end
     end
   end
 
@@ -75,4 +156,51 @@
       expect(page).to have_text("Active content blocks")
     end
   end
+
+  context "when publishing a content block via admin UI" do
+    let!(:hero_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage, weight: nil, published_at: nil) }
+
+    it "shows published content block on the homepage" do
+      visit decidim_admin.edit_organization_homepage_path
+      page.refresh
+
+      within ".edit_content_blocks" do
+        within ".js-list-available" do
+          expect(page).to have_css("li", text: "Hero image")
+        end
+
+        first("ul.js-list-available li").drag_to(find("ul.js-list-actives"))
+        sleep 2
+      end
+
+      expect(hero_block.reload.published_at).not_to be_nil
+
+      visit decidim.root_path
+      expect(page).to have_css("[id^=hero]")
+    end
+  end
+
+  context "when unpublishing a content block via admin UI" do
+    let!(:hero_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage, weight: 1, published_at: Time.current) }
+    let!(:extra_block) { create(:content_block, organization:, manifest_name: :sub_hero, scope_name: :homepage, weight: 2, published_at: Time.current) }
+
+    it "does not show unpublished content block on the homepage" do
+      visit decidim_admin.edit_organization_homepage_path
+      page.refresh
+
+      within ".edit_content_blocks" do
+        within ".js-list-actives" do
+          expect(page).to have_css("li", text: "Hero image")
+        end
+
+        first("ul.js-list-actives li").drag_to(find("ul.js-list-available"))
+        sleep 2
+      end
+
+      expect(hero_block.reload.published_at).to be_nil
+
+      visit decidim.root_path
+      expect(page).to have_no_css("[id^=hero]")
+    end
+  end
 end
diff --git a/decidim-core/app/cells/decidim/content_blocks/cta_settings_form/show.erb b/decidim-core/app/cells/decidim/content_blocks/cta_settings_form/show.erb
index ee2e372caf992..2878acaffce11 100644
--- a/decidim-core/app/cells/decidim/content_blocks/cta_settings_form/show.erb
+++ b/decidim-core/app/cells/decidim/content_blocks/cta_settings_form/show.erb
@@ -4,6 +4,6 @@
   <%= settings_fields.translated :text_field, :description, label: t("decidim.content_blocks.cta_settings_form.description") %>
 <% end %>
 
-<% form.fields_for :images, form.object.images do |images_fields| %>
+<% form.fields_for :images, content_block.images_container do |images_fields| %>
   <%= images_fields.upload :background_image, label: t("decidim.content_blocks.cta_settings_form.background_image") %>
 <% end %>
diff --git a/decidim-core/app/cells/decidim/content_blocks/hero_settings_form/show.erb b/decidim-core/app/cells/decidim/content_blocks/hero_settings_form/show.erb
index fd40f5b447a8a..5e94a7ecd61c1 100644
--- a/decidim-core/app/cells/decidim/content_blocks/hero_settings_form/show.erb
+++ b/decidim-core/app/cells/decidim/content_blocks/hero_settings_form/show.erb
@@ -5,7 +5,7 @@
 
   <div class="row column" data-controller="slug">
     <%= settings_fields.translated :text_field, :cta_button_path, label: t(".cta_button_path") %>
-    <p class="help-text"><%= t(".cta_button_path_help", url: decidim_form_slug_url("", translated_attribute(form.object.settings.cta_button_path))) %></p>
+    <p class="help-text"><%= t(".cta_button_path_help", url: decidim_form_slug_url("", translated_attribute(form.object.settings["cta_button_path"]))) %></p>
   </div>
 
   <div class="row column">
@@ -14,7 +14,7 @@
   </div>
 <% end %>
 
-<% form.fields_for :images, form.object.images do |images_fields| %>
+<% form.fields_for :images, content_block.images_container do |images_fields| %>
   <div class="row column">
     <%= images_fields.upload :background_image, label: t(".background_image"), button_class: "button button__sm button__transparent-secondary" %>
   </div>
diff --git a/decidim-core/app/cells/decidim/content_blocks/highlighted_content_banner_settings_form/show.erb b/decidim-core/app/cells/decidim/content_blocks/highlighted_content_banner_settings_form/show.erb
index 19c789a0f2f54..1d941e28d61a4 100644
--- a/decidim-core/app/cells/decidim/content_blocks/highlighted_content_banner_settings_form/show.erb
+++ b/decidim-core/app/cells/decidim/content_blocks/highlighted_content_banner_settings_form/show.erb
@@ -20,7 +20,7 @@
   </div>
 <% end %>
 
-<% form.fields_for :images, form.object.images do |images_fields| %>
+<% form.fields_for :images, content_block.images_container do |images_fields| %>
   <div class="row column">
     <%= images_fields.upload :background_image, label: t(".background_image"), button_class: "button button__sm button__transparent-secondary" %>
   </div>
diff --git a/decidim-core/app/cells/decidim/content_blocks/participatory_space_hero_settings_form/show.erb b/decidim-core/app/cells/decidim/content_blocks/participatory_space_hero_settings_form/show.erb
index 4463b6f8a74e0..c5b691886ac25 100644
--- a/decidim-core/app/cells/decidim/content_blocks/participatory_space_hero_settings_form/show.erb
+++ b/decidim-core/app/cells/decidim/content_blocks/participatory_space_hero_settings_form/show.erb
@@ -8,7 +8,7 @@
   </div>
 <% end %>
 
-<% form.fields_for :images, form.object.images do |images_fields| %>
+<% form.fields_for :images, content_block.images_container do |images_fields| %>
   <div class="row column">
     <%= images_fields.upload :background_image, label: t("decidim.content_blocks.cta_settings_form.background_image"), button_class: "button button__sm button__transparent-secondary" %>
   </div>
diff --git a/decidim-dev/lib/decidim/dev/assets/8001x4000.png b/decidim-dev/lib/decidim/dev/assets/8001x4000.png
new file mode 100644
index 0000000000000000000000000000000000000000..db751479769b787bd914b9dc7ca324d649678fa3
GIT binary patch
literal 102068
zcmeI5e{5Cd8OKixtWuyfoj}<N+%X94#;^&_m6kzE+t90NtqxZRB~(jM#!8#Eu@xuW
zLY$zHmJk={tY{VI{wQ1B)FD5FfdLf=WD8DggcTf0S-UOS521tId%5rXJh%N`Vr0#2
zy<ZY|zxQ6b=bX<u&*vPU_XRc<7R(<N`?XldaYniGa_)7UNm-6F`uSU;z3+^B@6<`h
ziF$lRc6OmVJKI%RRk3`<kINh<dGlkN-@5ByX42bBe~`QR@{sAt9gQ!fe~_D-v~tXo
zh2QvNY-{?~;>#nNZl97eW7E2o2M$bn>b{t94=$NdJS^*PF&ox;(o){c+j!=#*zY_r
zJFV;B?nfJT*Ln(Xn|bWwhNz}hKmTP;@zG^PZ|^L+CGq#p<WIJ2D?94GH(}qo&WTa`
zKFWRMXV-Sko&T$*-z3JzZ!A5UTHZ0LV_W`*XZPHlv^;mw)H&0hOZ{}+p@!n3*=x=f
zS1vlc?f#j~P1EAO`qblh{P6VFG5Jr|HKn!uDE;FR;~VZfzWCYKs-F37_d81y-~II4
z?-l=I){{fWwhbLV`PK#Z%o~44%Wp5fv@q}Fn)btUJ1$SHN;&_n`pu<LV;*W;GWS1|
zdb&=%dw2e7_X}w!KI=%ERGRtzj1#ZSI{xprbGH|G&d#jd@kY-x>8V%Tt6O*EZt`3$
zKil!<j+96De;k+Ev+T&rm+s7Jnm1?kp6w^US5|*u@$(NJ>ulZC@P`;z{*tK`p7q%!
zdon-hoYUR4s{5~JW*)n`#`)=;RXa=5Pu=D{FT*SI7F9dWjBomWM%C?@`>^-Tm>PF}
zZp_8#aq+2%NyA@!-}~11n%spo*%jsGWvgnO?5eW+Ys!|nYFE@e<eKl!FD$B$8|OGK
z$DNb4pzidg_N*w6GxE@{hg^H^a6?nxlm(gFcYodcCFsY8uNV2Q5AegY{fP|lw)d^f
z+3ivIla4>f;Sb_R*WwR6b-x>eKRI-80{*}?u?v6T{Jk;;f3ksxg23>sASw<oFo=a^
z53$f-5DR6DvG5iNx$tfevGBnKV&Q`e#KH#`h=mU>5DOn%AQnEjU@Uxaah#uAYH#z=
z+3#B0*}NsW5s>;zs2;@DQ2mUOxKO>3S)uwY+z24=Aud3LR~LZduow{)Y6VcCRsa--
zT0vB(6-0$v0aU0J0EJpXQ24Y0sZc8bizj*Sl@_xWfd4}T2=U1UKna6lHZ*69_3cUG
z`HH>O3BwZfUR8%$6mm4w0+ZBGD?Iimg<37bjcDY7Ok4np!>bEXVKE{q)C!<NtpF(0
z3WDNLD+mj<0;o_c01CB&pinE23bg{TP%8imwSu68Pb+QJhy8zYXMIm=Z9z+>KXXz6
zog;Sq5Eaf<A}X9z092?I0EKgv2uc_x67+6R^_qssRJ|dgN2*@a2xO`rKpCv6U%Ix|
z`&U3*|9b(zVNsR<3U6QtibGifER-dHGALzvqs1t4jBJ()3!B(1wJ22JiV+3FMo#To
z6e>_F3WkZ)iXov#YDLp9nOZR<^hm8}8i7o$04SW=MNq;wwd>y-sveybsvc3H>H!t1
z9zf|Q)uY8IvUT>!goPxw--U%F&Q%HvNo>Ch3!A7Fi$VozMZvI<TCpfppjH$N6Th5V
z`Q)+JU&U(ycoCR0uf{LuMW7DQ8+qb`dH7%P!~-aUa!wx|hr=U*SonB^u!KdBu7|r8
z`gW$I@vVOzci)<4c8u*TLqd=2l4}|!vrBGB=#gD=O(T%06#%85y5zmKM0fQ9;(tkZ
zAu4niph9;6D0CNs!o?hr3bg{TP%8imwSu5fE09V!wQ}hAgb}`-8u^bmKAN>LdN@0N
z@D#D*hp>dD<7an-=ft8=f#*cQFp<+#hJ+ru_C?b$xsO&#CN4SAdo2Lb8C-hogU)<N
zT!w@miA&QknKv*)LXEtEDHt|VD;9+c)QW;(Beh~tNT61Pg`_X6l~9XO<g3{%6&8{>
zwJR(nacWmsND61O)L{c#PJ~K4Cklp%RJ|dgN2*@aFqx`1B=ktFXc~b`tpF&TZbwk~
zv;wJ6D*y|%0-#VU2ulBHrO#p%+58vo$;emO#0IHFp#mGE3WkYnkQx$tjND>;CwE@A
zS_{CM(U(Oavt|GkuB${)_|Hc`D%1+VLahKO)Cz(^tw1W&3cy0G04UT7f-;!2;`!6A
z(kSmic(SgZ%9wVK%a_^Cf@hVJZwL#!<bVph<Nyk_f}r$Ymt1d+?$R_&rn?LYHPT%Q
zhK*d0WKpO<ttc2aQY#jP1ZqWCNTODRg(PZ4SV*E)goRDv*UAkRqu9M<pG;7w6d4O_
z3KJj6QELIz@terrvLT_z$Xz|+rNB8DeJKPo>jXgIy#+xTOmi^T_n#FH&Lb-xKw-rr
zD6Du$g<1hvs1*Q(T0u~#6-cFDv;r5S$mZEB6&8}%EEN`#*en$mHif@gYIh|l@DdKf
z5qQB%7*OFQ44`mj6@tQ*Rgem`0<cgk01CB&pinE23bg{TP%8jRBx~hJ`MFnREkJ+P
zOngS|bRYcGBWG4$m=Zh1oQTL+b777)cx2l*n8)>3TxWr(uuc$_erfym-Vis^n~3){
z-36d<$_hc@log~xtpF_43V=ebASl!dq(ZF#EYu2sLaiVu15_&yT-Y?sx4U2YY;pIq
zIrT%?_Jt>}KU-LKgWQNkA%VSRVIhfY#Ds+;F0c_6lBgA7VH34tQK&$zC>S<UD;9+c
z)QW;(BDG>j=#g5{G)#^Vt<;@9&?0LA%)zUXHKSnI$eOVzR2bMb6KXMv8~~@=g@q*c
zmW72)>@8aqDsUB#f?*@IVo|6-ttc2KQY(gp9;p>g!(?j3kkBKwqG<#&wF01UCLBQ-
zpfllIdJ0b#?~Diw?~I7b&E6UNEJl%y4D7~_?59nf9<eASu+=LpB(c>iEF`hwg@q()
zMOfHGtymN)P%8?Cjns-op#rs{V3<g)7!rEC8LeEa|L^KhYXMl8nzG3(OhZDAEKCK%
z#+xZj`z3+EV(d-C_j(W&W9FsyHs3DqcdhMg-jdwt%ly|i{1kfq!kLR+K>RP+_C-|K
z_C-`~w(YCFlf|fD*vMkEC{$oEDi}7h7%d73)QYf>M6C!5Nz{t4kVLHr3!A7Fi$Voz
zMZvI<TCpfp7{FS&!D19S0QSj*g``2$C-d(#`^j?dB(a|?EF`hwg@q(mys)r|TCpfp
zpjH$N8zWCE*BUPG>$?_!HDfOc6<9M0hK-R|GxpFO)`_r?#5xfcl2|9gLJ}WYg@sN1
zqZPOq#cq?!QUrx0_LhZ(B=(ktg(UWtg@vR6+*_8NREZU@VA#ltw<uI##VZ&#vf?cY
z3Dk<PkVLHr3rW<9u#iNp2n(C26^lXzYDK}Yky^1RRQUW_+0dLZ*7q9|&sXfNP8gP8
zzJx6-Lqd)H)5204@I`K<7ZCqTw%-vIw%-vIx(iT=RIR*rC3|nsS^(AzxH<;YpFj5R
zexzQ`{)6Ww%u6_!03VNnd0c<RIzd$Ucm$~MegdF4)C!^!N-J&EhogP}{raBP+JctM
zX!bD?J@zpX74|U^mCxVDG{2iymm#4?UR|1o$-KG@2{rPjrC``dtymN)P%8?Cjns-o
zA%R*E7LuqHVIhfH5f+lD6=7i$wPI1IFj%$nN{GcMa%k*b3JaUqyR;}&VDD1FurXBc
zG9p^NFE9Vs6OJ=-lshMDK~k4x5*(<QU>^QgR1AO;5jDd)0cW1~768SG=z9z61Y8oV
r699#Ef}n5(BBH|QE=1-3sg>y~FHHV^TFRK&z74r^3vzbOD_QqHG+OZ>

literal 0
HcmV?d00001

diff --git a/decidim-participatory_processes/spec/shared/manage_landing_page_examples.rb b/decidim-participatory_processes/spec/shared/manage_landing_page_examples.rb
index 98643844b02ea..8129c4b1b0d83 100644
--- a/decidim-participatory_processes/spec/shared/manage_landing_page_examples.rb
+++ b/decidim-participatory_processes/spec/shared/manage_landing_page_examples.rb
@@ -86,6 +86,17 @@
 
       expect(content_block.settings.to_json).to match(/Custom button text!/)
     end
+
+    it "displays the 'Resolution is too large' error message when image is invalid" do
+      visit edit_content_block_path(resource, content_block)
+
+      dynamically_attach_file(:content_block_images_background_image, Decidim::Dev.asset("8001x4000.png"))
+
+      click_on "Update"
+      sleep 1
+
+      expect(page).to have_text("File resolution is too large")
+    end
   end
 end
 

From 1d5c59406838f5b201a80a6a23d962df24a12add Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Mon, 22 Jun 2026 10:00:58 +0300
Subject: [PATCH 088/131] Backport 'Make the fields at the "highlighted content
 banner" content block required' to v0.31 (#17125)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 ...dmin_manages_organization_homepage_spec.rb | 80 +++++++++++++++++++
 .../highlighted_content_banner_cell.rb        |  2 +-
 .../core/content_blocks/registry_manager.rb   |  8 +-
 3 files changed, 85 insertions(+), 5 deletions(-)

diff --git a/decidim-admin/spec/system/admin_manages_organization_homepage_spec.rb b/decidim-admin/spec/system/admin_manages_organization_homepage_spec.rb
index b8e0a371e60ad..ae39a92bc15fb 100644
--- a/decidim-admin/spec/system/admin_manages_organization_homepage_spec.rb
+++ b/decidim-admin/spec/system/admin_manages_organization_homepage_spec.rb
@@ -137,6 +137,86 @@
         expect(page).to have_text("Custom HTML text!")
       end
     end
+
+    context "and edits highlighted content banner settings" do
+      let!(:content_block) { create(:content_block, organization:, manifest_name: :highlighted_content_banner, scope_name: :homepage) }
+
+      it "updates the settings of the content block" do
+        visit decidim_admin.edit_organization_homepage_content_block_path(content_block)
+
+        fill_in(:content_block_settings_title_en, with: "Custom title text!")
+        fill_in(:content_block_settings_action_button_title_en, with: "Custom action title!")
+        fill_in(:content_block_settings_action_button_subtitle_en, with: "Custom action subtitle!")
+        fill_in(:content_block_settings_action_button_url, with: "http://example.org")
+
+        fill_in_i18n_editor :content_block_settings_short_description, "#content_block-settings--short_description-tabs",
+                            en: "<p>The Short description</p>"
+
+        click_on "Update"
+        sleep 1
+        visit decidim.root_path
+        expect(page).to have_text("Custom title text!")
+        expect(page).to have_text("The Short description")
+        expect(page).to have_link("Custom action subtitle!", href: "http://example.org")
+      end
+
+      it "updates the images of the content block" do
+        visit decidim_admin.edit_organization_homepage_content_block_path(content_block)
+
+        fill_in(:content_block_settings_title_en, with: "Custom title text!")
+        fill_in(:content_block_settings_action_button_title_en, with: "Custom action title!")
+        fill_in(:content_block_settings_action_button_subtitle_en, with: "Custom action subtitle!")
+        fill_in(:content_block_settings_action_button_url, with: "http://example.org")
+
+        fill_in_i18n_editor :content_block_settings_short_description, "#content_block-settings--short_description-tabs",
+                            en: "<p>The Short description</p>"
+
+        dynamically_attach_file(:content_block_images_background_image, Decidim::Dev.asset("city2.jpeg"))
+
+        click_on "Update"
+
+        sleep 1
+        visit decidim.root_path
+        expect(page.html).to include("city2.jpeg")
+      end
+
+      it "displays the 'Resolution is too large' error message when image is invalid" do
+        visit decidim_admin.edit_organization_homepage_content_block_path(content_block)
+
+        fill_in(:content_block_settings_title_en, with: "Custom title text!")
+        fill_in(:content_block_settings_action_button_title_en, with: "Custom action title!")
+        fill_in(:content_block_settings_action_button_subtitle_en, with: "Custom action subtitle!")
+        fill_in(:content_block_settings_action_button_url, with: "http://example.org")
+
+        dynamically_attach_file(:content_block_images_background_image, Decidim::Dev.asset("8001x4000.png"))
+
+        click_on "Update"
+
+        expect(page).to have_text("File resolution is too large")
+      end
+
+      it "displays validation errors when required fields are empty" do
+        visit decidim_admin.edit_organization_homepage_content_block_path(content_block)
+
+        click_on "Update"
+
+        expect(page).to have_text("There is an error in this field.")
+      end
+    end
+
+    context "and edits html settings" do
+      let!(:content_block) { create(:content_block, organization:, manifest_name: :html, scope_name: :homepage) }
+
+      it "updates the settings of the content block" do
+        visit decidim_admin.edit_organization_homepage_content_block_path(content_block)
+
+        fill_in(:content_block_settings_html_content_en, with: "Custom HTML text!")
+        click_on "Update"
+        sleep 1
+        visit decidim.root_path
+        expect(page).to have_text("Custom HTML text!")
+      end
+    end
   end
 
   context "when loading non-existing content blocks" do
diff --git a/decidim-core/app/cells/decidim/content_blocks/highlighted_content_banner_cell.rb b/decidim-core/app/cells/decidim/content_blocks/highlighted_content_banner_cell.rb
index 5c883bd8289d1..a09cf0af691cb 100644
--- a/decidim-core/app/cells/decidim/content_blocks/highlighted_content_banner_cell.rb
+++ b/decidim-core/app/cells/decidim/content_blocks/highlighted_content_banner_cell.rb
@@ -32,7 +32,7 @@ def background_image
       private
 
       def render?
-        required_keys = [:title, :short_description, :action_button_title, :action_button_subtitle, :action_button_url]
+        required_keys = [:title, :action_button_title, :action_button_subtitle, :action_button_url]
         required_keys.all? { |key| model.settings.public_send(key).present? }
       end
     end
diff --git a/decidim-core/lib/decidim/core/content_blocks/registry_manager.rb b/decidim-core/lib/decidim/core/content_blocks/registry_manager.rb
index 88baa9bf50170..cbcb4702e0659 100644
--- a/decidim-core/lib/decidim/core/content_blocks/registry_manager.rb
+++ b/decidim-core/lib/decidim/core/content_blocks/registry_manager.rb
@@ -51,11 +51,11 @@ def self.register_homepage_content_blocks!
             ]
 
             content_block.settings do |settings|
-              settings.attribute :title, type: :text, translated: true
+              settings.attribute :title, type: :text, translated: true, required: true
               settings.attribute :short_description, type: :text, translated: true
-              settings.attribute :action_button_title, type: :text, translated: true
-              settings.attribute :action_button_subtitle, type: :text, translated: true
-              settings.attribute :action_button_url, type: :text
+              settings.attribute :action_button_title, type: :text, translated: true, required: true
+              settings.attribute :action_button_subtitle, type: :text, translated: true, required: true
+              settings.attribute :action_button_url, type: :text, required: true
             end
 
             content_block.default!

From 07837e8767657745782bf110c96f7077369e3acb Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Mon, 29 Jun 2026 17:15:53 +0300
Subject: [PATCH 089/131] Backport 'Show debates' comments visualization locked
 on the form' to v0.31 (#17174)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
Co-authored-by: Tom Greenwood <101816158+greenwoodt@users.noreply.github.com>
Co-authored-by: Tom Greenwood <tom.t.greenwood@gmail.com>
---
 ...dmin_manages_organization_homepage_spec.rb | 82 +------------------
 .../debates/admin/debates_controller.rb       |  2 +-
 .../decidim/debates/admin/debate_form.rb      |  4 +
 .../debates/admin/debates/_form.html.erb      |  8 +-
 decidim-debates/config/locales/en.yml         |  3 +-
 .../decidim/debates/admin/debate_form_spec.rb | 53 ++++++++++++
 .../spec/shared/manage_debates_examples.rb    | 13 +--
 7 files changed, 71 insertions(+), 94 deletions(-)

diff --git a/decidim-admin/spec/system/admin_manages_organization_homepage_spec.rb b/decidim-admin/spec/system/admin_manages_organization_homepage_spec.rb
index ae39a92bc15fb..ca9d6bf66491f 100644
--- a/decidim-admin/spec/system/admin_manages_organization_homepage_spec.rb
+++ b/decidim-admin/spec/system/admin_manages_organization_homepage_spec.rb
@@ -43,7 +43,7 @@
         click_on "Update"
         sleep 1
         visit decidim.root_path
-        expect(page).to have_content("Custom welcome text!")
+        expect(page).to have_text("Custom welcome text!")
         expect(page).to have_link("Custom button!", href: "http://example.org")
       end
 
@@ -115,93 +115,15 @@
       it "displays the 'Resolution is too large' error message when image is invalid" do
         visit decidim_admin.edit_organization_homepage_content_block_path(content_block)
 
-        dynamically_attach_file(:content_block_images_background_image, Decidim::Dev.asset("8001x4000.png"))
-
-        click_on "Update"
-        sleep 1
-
-        expect(page).to have_text("File resolution is too large")
-      end
-    end
-
-    context "and edits html settings" do
-      let!(:content_block) { create(:content_block, organization:, manifest_name: :html, scope_name: :homepage) }
-
-      it "updates the settings of the content block" do
-        visit decidim_admin.edit_organization_homepage_content_block_path(content_block)
-
-        fill_in(:content_block_settings_html_content_en, with: "Custom HTML text!")
-        click_on "Update"
-        sleep 1
-        visit decidim.root_path
-        expect(page).to have_text("Custom HTML text!")
-      end
-    end
-
-    context "and edits highlighted content banner settings" do
-      let!(:content_block) { create(:content_block, organization:, manifest_name: :highlighted_content_banner, scope_name: :homepage) }
-
-      it "updates the settings of the content block" do
-        visit decidim_admin.edit_organization_homepage_content_block_path(content_block)
-
-        fill_in(:content_block_settings_title_en, with: "Custom title text!")
-        fill_in(:content_block_settings_action_button_title_en, with: "Custom action title!")
-        fill_in(:content_block_settings_action_button_subtitle_en, with: "Custom action subtitle!")
-        fill_in(:content_block_settings_action_button_url, with: "http://example.org")
-
-        fill_in_i18n_editor :content_block_settings_short_description, "#content_block-settings--short_description-tabs",
-                            en: "<p>The Short description</p>"
-
-        click_on "Update"
-        sleep 1
-        visit decidim.root_path
-        expect(page).to have_text("Custom title text!")
-        expect(page).to have_text("The Short description")
-        expect(page).to have_link("Custom action subtitle!", href: "http://example.org")
-      end
-
-      it "updates the images of the content block" do
-        visit decidim_admin.edit_organization_homepage_content_block_path(content_block)
-
-        fill_in(:content_block_settings_title_en, with: "Custom title text!")
-        fill_in(:content_block_settings_action_button_title_en, with: "Custom action title!")
-        fill_in(:content_block_settings_action_button_subtitle_en, with: "Custom action subtitle!")
-        fill_in(:content_block_settings_action_button_url, with: "http://example.org")
-
-        fill_in_i18n_editor :content_block_settings_short_description, "#content_block-settings--short_description-tabs",
-                            en: "<p>The Short description</p>"
-
-        dynamically_attach_file(:content_block_images_background_image, Decidim::Dev.asset("city2.jpeg"))
-
-        click_on "Update"
-
-        sleep 1
-        visit decidim.root_path
-        expect(page.html).to include("city2.jpeg")
-      end
-
-      it "displays the 'Resolution is too large' error message when image is invalid" do
-        visit decidim_admin.edit_organization_homepage_content_block_path(content_block)
-
-        fill_in(:content_block_settings_title_en, with: "Custom title text!")
-        fill_in(:content_block_settings_action_button_title_en, with: "Custom action title!")
-        fill_in(:content_block_settings_action_button_subtitle_en, with: "Custom action subtitle!")
         fill_in(:content_block_settings_action_button_url, with: "http://example.org")
 
         dynamically_attach_file(:content_block_images_background_image, Decidim::Dev.asset("8001x4000.png"))
 
         click_on "Update"
+        sleep 1
 
         expect(page).to have_text("File resolution is too large")
       end
-
-      it "displays validation errors when required fields are empty" do
-        visit decidim_admin.edit_organization_homepage_content_block_path(content_block)
-
-        click_on "Update"
-
-        expect(page).to have_text("There is an error in this field.")
-      end
     end
 
     context "and edits html settings" do
diff --git a/decidim-debates/app/controllers/decidim/debates/admin/debates_controller.rb b/decidim-debates/app/controllers/decidim/debates/admin/debates_controller.rb
index 1e96c3d69739b..965508cb4d79a 100644
--- a/decidim-debates/app/controllers/decidim/debates/admin/debates_controller.rb
+++ b/decidim-debates/app/controllers/decidim/debates/admin/debates_controller.rb
@@ -41,7 +41,7 @@ def create
 
         def edit
           enforce_permission_to(:update, :debate, debate:)
-          @form = form(Decidim::Debates::Admin::DebateForm).from_model(debate)
+          @form = form(Decidim::Debates::Admin::DebateForm).from_model(debate, debate:)
         end
 
         def update
diff --git a/decidim-debates/app/forms/decidim/debates/admin/debate_form.rb b/decidim-debates/app/forms/decidim/debates/admin/debate_form.rb
index 6018bb2066124..b57efd05ba1cc 100644
--- a/decidim-debates/app/forms/decidim/debates/admin/debate_form.rb
+++ b/decidim-debates/app/forms/decidim/debates/admin/debate_form.rb
@@ -45,6 +45,10 @@ def map_model(model)
           self.attachments = model.attachments
         end
 
+        def comments_layout_locked?
+          debate&.comments_count&.positive?
+        end
+
         def participatory_space_manifest
           @participatory_space_manifest ||= current_component.participatory_space.manifest.name
         end
diff --git a/decidim-debates/app/views/decidim/debates/admin/debates/_form.html.erb b/decidim-debates/app/views/decidim/debates/admin/debates/_form.html.erb
index cce626f7dc9b6..388441108ac9b 100644
--- a/decidim-debates/app/views/decidim/debates/admin/debates/_form.html.erb
+++ b/decidim-debates/app/views/decidim/debates/admin/debates/_form.html.erb
@@ -48,9 +48,13 @@
 
       <div class="row column">
         <%= label_tag :comments_layout, t(".comments_visualization") %>
-        <span class="help-text"><%= t(".comments_warning") %></span>
+        <% if @form.comments_layout_locked? %>
+          <%= cell("decidim/announcement", t(".comments_layout_locked_warning"), callout_class: "warning") %>
+        <% else %>
+          <span class="help-text"><%= t(".comments_warning") %></span>
+        <% end %>
         <div>
-          <%= form.collection_radio_buttons(:comments_layout, [[t(".single_column"), "single_column"], [t(".two_columns"), "two_columns"]], :last, :first) do |builder|
+          <%= form.collection_radio_buttons(:comments_layout, [[t(".single_column"), "single_column"], [t(".two_columns"), "two_columns"]], :last, :first, {}, { disabled: @form.comments_layout_locked? }) do |builder|
             builder.label(class: "form__wrapper-checkbox-label") { builder.radio_button + builder.text }
           end %>
         </div>
diff --git a/decidim-debates/config/locales/en.yml b/decidim-debates/config/locales/en.yml
index 0943006bb8ee1..0bbc73232f51f 100644
--- a/decidim-debates/config/locales/en.yml
+++ b/decidim-debates/config/locales/en.yml
@@ -76,12 +76,13 @@ en:
           form:
             add_attachments: Add attachments
             attachment_legend: Add a document or an image
+            comments_layout_locked_warning: The comment layout cannot be changed because comments have already been posted.
             comments_visualization: Comments visualization
             comments_warning: Once the first comment is posted, the selected display option cannot be changed.
             debate_type: Debate type
             edit_attachments: Edit attachments
             errors:
-              comments_layout_locked: You cannot change the comment layout once comments have been posted.
+              comments_layout_locked: The comment layout cannot be changed because comments have already been posted.
             finite: Finite (With start and end times)
             open: Open (No start or end times)
             single_column: 'Single column: Comments are displayed in chronological order and can have replies.'
diff --git a/decidim-debates/spec/forms/decidim/debates/admin/debate_form_spec.rb b/decidim-debates/spec/forms/decidim/debates/admin/debate_form_spec.rb
index d994a08ab37b5..3b37b73c41ebb 100644
--- a/decidim-debates/spec/forms/decidim/debates/admin/debate_form_spec.rb
+++ b/decidim-debates/spec/forms/decidim/debates/admin/debate_form_spec.rb
@@ -29,6 +29,7 @@
   let(:uploaded_files) { [] }
   let(:current_files) { [] }
   let(:taxonomies) { [] }
+  let(:comments_layout) { "single_column" }
   let(:attributes) do
     {
       taxonomies:,
@@ -37,6 +38,7 @@
       instructions:,
       start_time:,
       end_time:,
+      comments_layout:,
       add_attachments: uploaded_files,
       attachments: current_files
     }
@@ -134,6 +136,57 @@
     end
   end
 
+  describe "comments_layout validation" do
+    let(:component) { create(:debates_component) }
+    let(:current_component) { component }
+    let(:debate) { create(:debate, component:, comments_layout: "single_column") }
+    let(:context) do
+      {
+        current_organization: organization,
+        current_component:,
+        current_participatory_space: participatory_process,
+        debate:
+      }
+    end
+
+    context "when debate has no comments" do
+      let(:debate) { create(:debate, component:, comments_layout: "single_column", comments_count: 0) }
+
+      context "and comments_layout changes" do
+        let(:comments_layout) { "two_columns" }
+
+        it { is_expected.to be_valid }
+      end
+
+      context "and comments_layout does not change" do
+        let(:comments_layout) { "single_column" }
+
+        it { is_expected.to be_valid }
+      end
+    end
+
+    context "when debate has comments" do
+      let(:debate) { create(:debate, component:, comments_layout: "single_column", comments_count: 5) }
+
+      context "and comments_layout does not change" do
+        let(:comments_layout) { "single_column" }
+
+        it { is_expected.to be_valid }
+      end
+
+      context "and comments_layout changes" do
+        let(:comments_layout) { "two_columns" }
+
+        it { is_expected.not_to be_valid }
+
+        it "adds an error to comments_layout" do
+          subject.valid?
+          expect(subject.errors[:comments_layout]).to include(I18n.t("form.errors.comments_layout_locked", scope: "decidim.debates.admin.debates"))
+        end
+      end
+    end
+  end
+
   describe "from model" do
     subject { described_class.from_model(debate).with_context(context) }
 
diff --git a/decidim-debates/spec/shared/manage_debates_examples.rb b/decidim-debates/spec/shared/manage_debates_examples.rb
index a12bd67fa2e58..727620433d55d 100644
--- a/decidim-debates/spec/shared/manage_debates_examples.rb
+++ b/decidim-debates/spec/shared/manage_debates_examples.rb
@@ -107,21 +107,14 @@
       let!(:debate) { create(:debate, component: current_component, comments_layout: "two_columns") }
       let!(:comment) { create(:comment, commentable: debate, body: { "en" => "This is a test comment" }) }
 
-      it "prevents admin from updating debate layout once comments have been posted" do
+      it "shows disabled layout field with warning callout" do
         within "tr", text: translated(debate.title) do
           find("button[data-controller='dropdown']").click
           click_on "Edit"
         end
 
-        within ".edit_debate" do
-          choose "Single column"
-          find("*[type=submit]").click
-        end
-
-        expect(page).to have_content("You cannot change the comment layout once comments have been posted")
-
-        debate.reload
-        expect(debate.comments_layout).to eq("two_columns")
+        expect(page).to have_css("input[name='debate[comments_layout]'][disabled]")
+        expect(page).to have_content("The comment layout cannot be changed because comments have already been posted")
       end
     end
   end

From ed3e57fee6274c32dfed3fe0c9cf169b23684292 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Mon, 29 Jun 2026 16:48:31 +0200
Subject: [PATCH 090/131] Backport 'Bump ruby from 3.3.0 to 3.3.4 in
 manual.adoc' to v0.31 (#17200)

Co-authored-by: passionroro <88278592+passionroro@users.noreply.github.com>
Co-authored-by: Tom Greenwood <101816158+greenwoodt@users.noreply.github.com>
---
 docs/modules/install/pages/manual.adoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/modules/install/pages/manual.adoc b/docs/modules/install/pages/manual.adoc
index 321b22b30b393..69c9674cc96f3 100644
--- a/docs/modules/install/pages/manual.adoc
+++ b/docs/modules/install/pages/manual.adoc
@@ -4,7 +4,7 @@ In order to develop on decidim, you will need:
 
 * *Git* 2.34+
 * *PostgreSQL* 17.4+
-* *Ruby* 3.3.0
+* *Ruby* 3.3.4
 * *NodeJS* 22.14.x
 * *Npm* 10.9.x
 * *ImageMagick*
@@ -33,8 +33,8 @@ echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc
 echo 'eval "$(rbenv init -)"' >> ~/.bashrc
 source ~/.bashrc
 git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build
-rbenv install 3.3.0
-rbenv global 3.3.0
+rbenv install 3.3.4
+rbenv global 3.3.4
 ----
 
 == 2. Installing PostgreSQL

From b5a60ddd580f3bcc851235154b0ba7d1d73afdef Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Mon, 29 Jun 2026 17:15:13 +0200
Subject: [PATCH 091/131] Backport 'Fix flaky spec at
 `admin_manages_participatory_process_components_spec.rb`' to v0.31 (#17183)

Co-authored-by: Antti Hukkanen <antti.hukkanen@mainiotech.fi>
Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
Co-authored-by: Tom Greenwood <101816158+greenwoodt@users.noreply.github.com>
---
 decidim-accountability/spec/types/integration_schema_spec.rb   | 2 +-
 .../spec/commands/decidim/admin/update_component_spec.rb       | 2 +-
 decidim-blogs/spec/types/integration_schema_spec.rb            | 2 +-
 decidim-budgets/spec/types/integration_schema_spec.rb          | 2 +-
 .../spec/types/integration_schema_spec.rb                      | 2 +-
 decidim-core/lib/decidim/core/test/factories.rb                | 3 +++
 decidim-debates/spec/types/integration_schema_spec.rb          | 2 +-
 decidim-meetings/spec/types/integration_schema_spec.rb         | 2 +-
 decidim-pages/spec/types/integration_schema_spec.rb            | 2 +-
 decidim-proposals/spec/types/integration_schema_spec.rb        | 2 +-
 decidim-sortitions/spec/types/integration_schema_spec.rb       | 2 +-
 decidim-surveys/spec/types/integration_schema_spec.rb          | 2 +-
 12 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/decidim-accountability/spec/types/integration_schema_spec.rb b/decidim-accountability/spec/types/integration_schema_spec.rb
index 312da1eeaa58d..725e14629a500 100644
--- a/decidim-accountability/spec/types/integration_schema_spec.rb
+++ b/decidim-accountability/spec/types/integration_schema_spec.rb
@@ -156,7 +156,7 @@
         ]
       },
       "url" => Decidim::EngineRouter.main_proxy(current_component).root_url,
-      "weight" => 0
+      "weight" => current_component.weight
     }
   end
   let!(:current_component) { create(:accountability_component, participatory_space: participatory_process) }
diff --git a/decidim-admin/spec/commands/decidim/admin/update_component_spec.rb b/decidim-admin/spec/commands/decidim/admin/update_component_spec.rb
index 3f2bafabe88f4..32aa8b489d335 100644
--- a/decidim-admin/spec/commands/decidim/admin/update_component_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/update_component_spec.rb
@@ -6,7 +6,7 @@ module Decidim::Admin
   describe UpdateComponent do
     let!(:participatory_process) { create(:participatory_process, :with_steps) }
     let(:step) { participatory_process.steps.first }
-    let!(:component) { create(:component, :with_one_step, participatory_space: participatory_process) }
+    let!(:component) { create(:component, :with_one_step, participatory_space: participatory_process, weight: 0) }
     let(:manifest) { component.manifest }
     let(:user) { create(:user) }
 
diff --git a/decidim-blogs/spec/types/integration_schema_spec.rb b/decidim-blogs/spec/types/integration_schema_spec.rb
index c108281253b59..f44a45194a998 100644
--- a/decidim-blogs/spec/types/integration_schema_spec.rb
+++ b/decidim-blogs/spec/types/integration_schema_spec.rb
@@ -124,7 +124,7 @@
         }
       },
       "url" => Decidim::EngineRouter.main_proxy(current_component).root_url,
-      "weight" => 0
+      "weight" => current_component.weight
     }
   end
 
diff --git a/decidim-budgets/spec/types/integration_schema_spec.rb b/decidim-budgets/spec/types/integration_schema_spec.rb
index d164389d7087d..31bed9c46ae76 100644
--- a/decidim-budgets/spec/types/integration_schema_spec.rb
+++ b/decidim-budgets/spec/types/integration_schema_spec.rb
@@ -119,7 +119,7 @@
         ]
       },
       "url" => Decidim::EngineRouter.main_proxy(current_component).root_url,
-      "weight" => 0
+      "weight" => current_component.weight
     }
   end
 
diff --git a/decidim-collaborative_texts/spec/types/integration_schema_spec.rb b/decidim-collaborative_texts/spec/types/integration_schema_spec.rb
index aa03116aea08f..098ab7beec2a2 100644
--- a/decidim-collaborative_texts/spec/types/integration_schema_spec.rb
+++ b/decidim-collaborative_texts/spec/types/integration_schema_spec.rb
@@ -71,7 +71,7 @@
         }
       },
       "url" => Decidim::EngineRouter.main_proxy(current_component).root_url,
-      "weight" => 0
+      "weight" => current_component.weight
     }
   end
 
diff --git a/decidim-core/lib/decidim/core/test/factories.rb b/decidim-core/lib/decidim/core/test/factories.rb
index 8dba2074c6a53..7289e83ba6509 100644
--- a/decidim-core/lib/decidim/core/test/factories.rb
+++ b/decidim-core/lib/decidim/core/test/factories.rb
@@ -85,6 +85,8 @@ def generate_title(field = nil, skip_injection:)
     "#{Faker::Lorem.sentence(word_count: 1, supplemental: true, random_words_to_add: 3)} #{n}"
   end
 
+  sequence(:component_position)
+
   factory :category, class: "Decidim::Category" do
     transient do
       skip_injection { false }
@@ -463,6 +465,7 @@ def generate_title(field = nil, skip_injection:)
     manifest_name { "dummy" }
     published_at { Time.current }
     deleted_at { nil }
+    weight { generate(:component_position) }
     settings do
       {
         dummy_global_translatable_text: generate_localized_title(:dummy_global_translatable_text, skip_injection:),
diff --git a/decidim-debates/spec/types/integration_schema_spec.rb b/decidim-debates/spec/types/integration_schema_spec.rb
index 1a1da4f307871..073cc946047e3 100644
--- a/decidim-debates/spec/types/integration_schema_spec.rb
+++ b/decidim-debates/spec/types/integration_schema_spec.rb
@@ -124,7 +124,7 @@
         ]
       },
       "url" => Decidim::EngineRouter.main_proxy(current_component).root_url,
-      "weight" => 0
+      "weight" => current_component.weight
     }
   end
 
diff --git a/decidim-meetings/spec/types/integration_schema_spec.rb b/decidim-meetings/spec/types/integration_schema_spec.rb
index d9fbf607eac5c..306a6ae785650 100644
--- a/decidim-meetings/spec/types/integration_schema_spec.rb
+++ b/decidim-meetings/spec/types/integration_schema_spec.rb
@@ -196,7 +196,7 @@
         ]
       },
       "url" => Decidim::EngineRouter.main_proxy(current_component).root_url,
-      "weight" => 0
+      "weight" => current_component.weight
     }
   end
 
diff --git a/decidim-pages/spec/types/integration_schema_spec.rb b/decidim-pages/spec/types/integration_schema_spec.rb
index 3409a6bf95cca..291e130830d73 100644
--- a/decidim-pages/spec/types/integration_schema_spec.rb
+++ b/decidim-pages/spec/types/integration_schema_spec.rb
@@ -52,7 +52,7 @@
         ]
       },
       "url" => Decidim::EngineRouter.main_proxy(current_component).root_url,
-      "weight" => 0
+      "weight" => current_component.weight
     }
   end
 
diff --git a/decidim-proposals/spec/types/integration_schema_spec.rb b/decidim-proposals/spec/types/integration_schema_spec.rb
index b8d078deb43c0..2a15f2b6fd0a9 100644
--- a/decidim-proposals/spec/types/integration_schema_spec.rb
+++ b/decidim-proposals/spec/types/integration_schema_spec.rb
@@ -224,7 +224,7 @@
         ]
       },
       "url" => Decidim::EngineRouter.main_proxy(current_component).root_url,
-      "weight" => 0
+      "weight" => current_component.weight
     }
   end
 
diff --git a/decidim-sortitions/spec/types/integration_schema_spec.rb b/decidim-sortitions/spec/types/integration_schema_spec.rb
index 9806240409abf..da80d26d6ab66 100644
--- a/decidim-sortitions/spec/types/integration_schema_spec.rb
+++ b/decidim-sortitions/spec/types/integration_schema_spec.rb
@@ -96,7 +96,7 @@
         ]
       },
       "url" => Decidim::EngineRouter.main_proxy(current_component).root_url,
-      "weight" => 0
+      "weight" => current_component.weight
     }
   end
 
diff --git a/decidim-surveys/spec/types/integration_schema_spec.rb b/decidim-surveys/spec/types/integration_schema_spec.rb
index 91472d1118763..08df6b600587f 100644
--- a/decidim-surveys/spec/types/integration_schema_spec.rb
+++ b/decidim-surveys/spec/types/integration_schema_spec.rb
@@ -124,7 +124,7 @@
         ]
       },
       "url" => Decidim::EngineRouter.main_proxy(current_component).root_url,
-      "weight" => 0
+      "weight" => current_component.weight
     }
   end
 

From fc27f82df45d9da361b4b8dffbbe03cd5436d0a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?=
 <andreslucena@users.noreply.github.com>
Date: Wed, 1 Jul 2026 10:10:20 +0200
Subject: [PATCH 092/131] Backport 'Fix typos in docs' to v0.31 (#17224)

---
 docs/modules/configure/pages/environment_variables.adoc       | 4 ++--
 docs/modules/configure/pages/system.adoc                      | 2 +-
 docs/modules/services/pages/index.adoc                        | 1 +
 .../{machine_translation.adoc => machine_translations.adoc}   | 0
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename docs/modules/services/pages/{machine_translation.adoc => machine_translations.adoc} (100%)

diff --git a/docs/modules/configure/pages/environment_variables.adoc b/docs/modules/configure/pages/environment_variables.adoc
index 8298020b5055c..7d94133208ff3 100644
--- a/docs/modules/configure/pages/environment_variables.adoc
+++ b/docs/modules/configure/pages/environment_variables.adoc
@@ -690,13 +690,13 @@ A content processor is a concept to refer to a set of two classes:
 
 |*DECIDIM_ENABLE_MACHINE_TRANSLATION*
 | Whether the Decidim attempt to automatically translate missing translations.
-Read more about this at xref:services:machine_translation.adoc[Machine Translation] service page.
+Read more about this at xref:services:machine_translations.adoc[Machine Translations] service page.
 | false
 | No
 
 |*DECIDIM_MACHINE_TRANSLATION_SERVICE*
 | The name of the class to translate user content.
-Read more about this at xref:services:machine_translation.adoc[Machine Translation] service page.
+Read more about this at xref:services:machine_translations.adoc[Machine Translations] service page.
 | nil
 | No
 
diff --git a/docs/modules/configure/pages/system.adoc b/docs/modules/configure/pages/system.adoc
index 06b58b7a82604..ca688cba8a04b 100644
--- a/docs/modules/configure/pages/system.adoc
+++ b/docs/modules/configure/pages/system.adoc
@@ -127,7 +127,7 @@ in multi tenant mode. To learn more, check this https://developer.mozilla.org/en
 ==== Allow participants to register and login
 
 Most of the installations use this setting. Means that everyone can register a participant account and login, without restrictions, only with an email account confirmation.
-You can disable that confirmation also if you want to through xref:configure:environment_variables.adoc.adoc[Decidim's environment variables], although we do not recommend doing that,
+You can disable that confirmation also if you want to through xref:configure:environment_variables.adoc[Decidim's environment variables], although we do not recommend doing that,
 as it is a measure for stopping spam accounts. For additional details, read about `DECIDIM_UNCONFIRMED_ACCESS_FOR` environment variable.
 
 ==== Do not allow participants to register, but allow existing participants to login
diff --git a/docs/modules/services/pages/index.adoc b/docs/modules/services/pages/index.adoc
index f52dc2264ac35..6d7f531c808ae 100644
--- a/docs/modules/services/pages/index.adoc
+++ b/docs/modules/services/pages/index.adoc
@@ -6,6 +6,7 @@ There are multiple services that can be enabled in a Decidim installation. It is
 * xref:services:activestorage.adoc[Active Storage]
 * xref:services:aitools.adoc[AI tools]
 * xref:services:etherpad.adoc[Etherpad]
+* xref:services:machine_translations.adoc[Machine Translations]
 * xref:services:maps.adoc[Maps]
 * xref:services:sms.adoc[SMS]
 * xref:services:smtp.adoc[SMTP]
diff --git a/docs/modules/services/pages/machine_translation.adoc b/docs/modules/services/pages/machine_translations.adoc
similarity index 100%
rename from docs/modules/services/pages/machine_translation.adoc
rename to docs/modules/services/pages/machine_translations.adoc

From 73c5a36efabb8f1fe8babe4fcdfa96867c73b80a Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Wed, 1 Jul 2026 10:27:47 +0200
Subject: [PATCH 093/131] New Crowdin updates (#17013)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* New translations en.yml (Chinese Traditional)

[ci skip]

* New translations en.yml (Chinese Traditional)

[ci skip]

* New translations en.yml (Chinese Traditional)

[ci skip]

* New translations en.yml (Chinese Traditional)

[ci skip]

* New translations en.yml (Chinese Traditional)

[ci skip]

* New translations en.yml (Chinese Traditional)

[ci skip]

* New translations en.yml (Chinese Traditional)

[ci skip]

* New translations en.yml (Galician)

[ci skip]

* New translations en.yml (Galician)

[ci skip]

* New translations en.yml (Galician)

[ci skip]

* New translations en.yml (Galician)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (Thai)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (Luxembourgish)

[ci skip]

* New translations en.yml (Luxembourgish)

[ci skip]

* New translations en.yml (Luxembourgish)

[ci skip]

* New translations en.yml (Luxembourgish)

[ci skip]

* New translations en.yml (Luxembourgish)

[ci skip]

* New translations en.yml (Luxembourgish)

[ci skip]

* New translations en.yml (Luxembourgish)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Russian with many plural form)

[ci skip]

* New translations en.yml (Russian with many plural form)

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (Romanian)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (Spanish)

[ci skip]

* New translations en.yml (Arabic)

[ci skip]

* New translations en.yml (Bulgarian)

[ci skip]

* New translations en.yml (Catalan)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (German)

[ci skip]

* New translations en.yml (Greek)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Hungarian)

[ci skip]

* New translations en.yml (Italian)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Lithuanian)

[ci skip]

* New translations en.yml (Dutch)

[ci skip]

* New translations en.yml (Norwegian)

[ci skip]

* New translations en.yml (Polish)

[ci skip]

* New translations en.yml (Portuguese)

[ci skip]

* New translations en.yml (Slovak)

[ci skip]

* New translations en.yml (Swedish)

[ci skip]

* New translations en.yml (Turkish)

[ci skip]

* New translations en.yml (Chinese Simplified)

[ci skip]

* New translations en.yml (Chinese Traditional)

[ci skip]

* New translations en.yml (Galician)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Indonesian)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (Latvian)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Ukrainian with many plural form)

[ci skip]

* New translations en.yml (Russian with many plural form)

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Romanian)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (Spanish)

[ci skip]

* New translations en.yml (Catalan)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (German)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Slovak)

[ci skip]

* New translations en.yml (Swedish)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (Spanish)

[ci skip]

* New translations en.yml (Catalan)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Romanian)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (Spanish)

[ci skip]

* New translations en.yml (Spanish)

[ci skip]

* New translations en.yml (Spanish)

[ci skip]

* New translations en.yml (Spanish)

[ci skip]

* New translations en.yml (Arabic)

[ci skip]

* New translations en.yml (Bulgarian)

[ci skip]

* New translations en.yml (Catalan)

[ci skip]

* New translations en.yml (Catalan)

[ci skip]

* New translations en.yml (Catalan)

[ci skip]

* New translations en.yml (Catalan)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (German)

[ci skip]

* New translations en.yml (German)

[ci skip]

* New translations en.yml (Greek)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Hungarian)

[ci skip]

* New translations en.yml (Italian)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Korean)

[ci skip]

* New translations en.yml (Lithuanian)

[ci skip]

* New translations en.yml (Dutch)

[ci skip]

* New translations en.yml (Norwegian)

[ci skip]

* New translations en.yml (Polish)

[ci skip]

* New translations en.yml (Portuguese)

[ci skip]

* New translations en.yml (Slovak)

[ci skip]

* New translations en.yml (Slovak)

[ci skip]

* New translations en.yml (Slovak)

[ci skip]

* New translations en.yml (Swedish)

[ci skip]

* New translations en.yml (Swedish)

[ci skip]

* New translations en.yml (Turkish)

[ci skip]

* New translations en.yml (Chinese Simplified)

[ci skip]

* New translations en.yml (Chinese Traditional)

[ci skip]

* New translations en.yml (Galician)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (Latvian)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (Luxembourgish)

[ci skip]

* New translations en.yml (Bosnian)

[ci skip]

* New translations en.yml (Serbian (Latin))

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Karakalpak)

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Swedish)

[ci skip]

* New translations en.yml (German)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (Spanish)

[ci skip]

* New translations en.yml (Catalan)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (German)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Portuguese)

[ci skip]

* New translations en.yml (Slovak)

[ci skip]

* New translations en.yml (Swedish)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

---------

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 decidim-accountability/config/locales/ar.yml  |   1 -
 decidim-accountability/config/locales/bg.yml  |   1 -
 .../config/locales/ca-IT.yml                  |   2 +-
 decidim-accountability/config/locales/ca.yml  |   2 +-
 decidim-accountability/config/locales/cs.yml  |   1 -
 decidim-accountability/config/locales/da.yml  |   1 -
 decidim-accountability/config/locales/de.yml  |   1 -
 decidim-accountability/config/locales/el.yml  |   1 -
 .../config/locales/es-MX.yml                  |   4 +-
 .../config/locales/es-PY.yml                  |   4 +-
 decidim-accountability/config/locales/es.yml  |   2 +-
 decidim-accountability/config/locales/eu.yml  |   6 +-
 .../config/locales/fr-CA.yml                  |   2 +-
 decidim-accountability/config/locales/fr.yml  |   2 +-
 decidim-accountability/config/locales/gl.yml  |   1 -
 .../config/locales/he-IL.yml                  |   1 -
 decidim-accountability/config/locales/hu.yml  |   1 -
 decidim-accountability/config/locales/it.yml  |   1 -
 decidim-accountability/config/locales/ja.yml  |   2 +-
 decidim-accountability/config/locales/ko.yml  |   1 -
 decidim-accountability/config/locales/lb.yml  |   1 -
 decidim-accountability/config/locales/lt.yml  |   1 -
 decidim-accountability/config/locales/nl.yml  |   1 -
 decidim-accountability/config/locales/no.yml  |   1 -
 decidim-accountability/config/locales/pl.yml  |   1 -
 .../config/locales/pt-BR.yml                  |   1 -
 decidim-accountability/config/locales/pt.yml  |   1 -
 .../config/locales/ro-RO.yml                  |   1 -
 decidim-accountability/config/locales/ru.yml  |   1 -
 decidim-accountability/config/locales/sk.yml  |   5 +-
 .../config/locales/sq-AL.yml                  |   1 -
 decidim-accountability/config/locales/sv.yml  |   1 -
 .../config/locales/th-TH.yml                  |   1 -
 .../config/locales/tr-TR.yml                  |   1 -
 .../config/locales/zh-CN.yml                  |   1 -
 .../config/locales/zh-TW.yml                  |   1 -
 decidim-admin/config/locales/ar.yml           |   5 -
 decidim-admin/config/locales/bg.yml           |   5 -
 decidim-admin/config/locales/bs-BA.yml        |   4 -
 decidim-admin/config/locales/ca-IT.yml        |  17 +-
 decidim-admin/config/locales/ca.yml           |  17 +-
 decidim-admin/config/locales/cs.yml           |  14 +-
 decidim-admin/config/locales/de.yml           |   5 -
 decidim-admin/config/locales/el.yml           |   6 -
 decidim-admin/config/locales/es-MX.yml        |  17 +-
 decidim-admin/config/locales/es-PY.yml        |  17 +-
 decidim-admin/config/locales/es.yml           |  17 +-
 decidim-admin/config/locales/eu.yml           |  27 ++-
 decidim-admin/config/locales/fi-plain.yml     |   7 +-
 decidim-admin/config/locales/fi.yml           |  15 +-
 decidim-admin/config/locales/fr-CA.yml        |  54 ++++-
 decidim-admin/config/locales/fr.yml           |  54 ++++-
 decidim-admin/config/locales/gl.yml           |   6 -
 decidim-admin/config/locales/he-IL.yml        |   1 -
 decidim-admin/config/locales/hu.yml           |   6 -
 decidim-admin/config/locales/it.yml           |   4 -
 decidim-admin/config/locales/ja.yml           |  14 +-
 decidim-admin/config/locales/kaa.yml          |   4 -
 decidim-admin/config/locales/ko.yml           |   6 -
 decidim-admin/config/locales/lb.yml           |   5 -
 decidim-admin/config/locales/lt.yml           |   6 -
 decidim-admin/config/locales/lv.yml           |   4 -
 decidim-admin/config/locales/nl.yml           |   6 -
 decidim-admin/config/locales/no.yml           |   6 -
 decidim-admin/config/locales/pl.yml           |   5 -
 decidim-admin/config/locales/pt-BR.yml        |   9 +-
 decidim-admin/config/locales/pt.yml           |   5 -
 decidim-admin/config/locales/ro-RO.yml        |   6 -
 decidim-admin/config/locales/sk.yml           |   9 +-
 decidim-admin/config/locales/sl.yml           |   1 -
 decidim-admin/config/locales/sq-AL.yml        |   1 -
 decidim-admin/config/locales/sr-CS.yml        |   4 -
 decidim-admin/config/locales/sv.yml           |   6 +-
 decidim-admin/config/locales/tr-TR.yml        |  19 +-
 decidim-admin/config/locales/zh-CN.yml        |   5 -
 decidim-admin/config/locales/zh-TW.yml        |   6 -
 decidim-assemblies/config/locales/ca-IT.yml   |   2 +-
 decidim-assemblies/config/locales/fr-CA.yml   |   4 +
 decidim-assemblies/config/locales/fr.yml      |   6 +-
 decidim-assemblies/config/locales/hu.yml      |   2 +-
 decidim-assemblies/config/locales/pt-BR.yml   |   2 +-
 decidim-assemblies/config/locales/tr-TR.yml   |   8 +-
 decidim-blogs/config/locales/ar.yml           |   1 -
 decidim-blogs/config/locales/bg.yml           |   1 -
 decidim-blogs/config/locales/ca-IT.yml        |   2 +-
 decidim-blogs/config/locales/ca.yml           |   2 +-
 decidim-blogs/config/locales/cs.yml           |   1 -
 decidim-blogs/config/locales/de.yml           |   1 -
 decidim-blogs/config/locales/el.yml           |   1 -
 decidim-blogs/config/locales/es-MX.yml        |   2 +-
 decidim-blogs/config/locales/es-PY.yml        |   2 +-
 decidim-blogs/config/locales/es.yml           |   2 +-
 decidim-blogs/config/locales/eu.yml           |   4 +-
 decidim-blogs/config/locales/fr-CA.yml        |  13 +-
 decidim-blogs/config/locales/fr.yml           |   2 +-
 decidim-blogs/config/locales/gl.yml           |   1 -
 decidim-blogs/config/locales/hu.yml           |   1 -
 decidim-blogs/config/locales/it.yml           |   1 -
 decidim-blogs/config/locales/ja.yml           |   2 +-
 decidim-blogs/config/locales/ko.yml           |   1 -
 decidim-blogs/config/locales/lb.yml           |   1 -
 decidim-blogs/config/locales/lt.yml           |   1 -
 decidim-blogs/config/locales/nl.yml           |   1 -
 decidim-blogs/config/locales/no.yml           |   1 -
 decidim-blogs/config/locales/pl.yml           |   1 -
 decidim-blogs/config/locales/pt-BR.yml        |   1 -
 decidim-blogs/config/locales/pt.yml           |   1 -
 decidim-blogs/config/locales/ro-RO.yml        |   1 -
 decidim-blogs/config/locales/ru.yml           |   1 -
 decidim-blogs/config/locales/sk.yml           |   1 -
 decidim-blogs/config/locales/sq-AL.yml        |   1 -
 decidim-blogs/config/locales/sv.yml           |   1 -
 decidim-blogs/config/locales/tr-TR.yml        |   3 +-
 decidim-blogs/config/locales/zh-CN.yml        |   1 -
 decidim-blogs/config/locales/zh-TW.yml        |   1 -
 decidim-budgets/config/locales/bg.yml         |   1 -
 decidim-budgets/config/locales/ca-IT.yml      |   2 +-
 decidim-budgets/config/locales/ca.yml         |   2 +-
 decidim-budgets/config/locales/cs.yml         |   1 -
 decidim-budgets/config/locales/de.yml         |   1 -
 decidim-budgets/config/locales/el.yml         |   1 -
 decidim-budgets/config/locales/es-MX.yml      |   2 +-
 decidim-budgets/config/locales/es-PY.yml      |   2 +-
 decidim-budgets/config/locales/es.yml         |   2 +-
 decidim-budgets/config/locales/eu.yml         |   4 +-
 decidim-budgets/config/locales/fr-CA.yml      |   2 +-
 decidim-budgets/config/locales/fr.yml         |   2 +-
 decidim-budgets/config/locales/gl.yml         |   1 -
 decidim-budgets/config/locales/hu.yml         |   1 -
 decidim-budgets/config/locales/it.yml         |   1 -
 decidim-budgets/config/locales/ja.yml         |   2 +-
 decidim-budgets/config/locales/lb.yml         |   1 -
 decidim-budgets/config/locales/lt.yml         |   1 -
 decidim-budgets/config/locales/nl.yml         |   1 -
 decidim-budgets/config/locales/no.yml         |   1 -
 decidim-budgets/config/locales/pl.yml         |   1 -
 decidim-budgets/config/locales/pt-BR.yml      |   1 -
 decidim-budgets/config/locales/pt.yml         |   1 -
 decidim-budgets/config/locales/ro-RO.yml      |   1 -
 decidim-budgets/config/locales/sk.yml         |   1 -
 decidim-budgets/config/locales/sv.yml         |   1 -
 decidim-budgets/config/locales/tr-TR.yml      |   1 -
 decidim-budgets/config/locales/zh-CN.yml      |   1 -
 decidim-budgets/config/locales/zh-TW.yml      |   1 -
 .../config/locales/eu.yml                     |   2 +-
 decidim-comments/config/locales/pl.yml        |   2 +-
 decidim-conferences/config/locales/sk.yml     |   8 +-
 decidim-core/config/locales/ar.yml            |   2 -
 decidim-core/config/locales/bg.yml            |   2 -
 decidim-core/config/locales/ca-IT.yml         |   7 +-
 decidim-core/config/locales/ca.yml            |   7 +-
 decidim-core/config/locales/cs.yml            |   4 +-
 decidim-core/config/locales/de.yml            |  11 +-
 decidim-core/config/locales/el.yml            |   1 -
 decidim-core/config/locales/es-MX.yml         |   5 +-
 decidim-core/config/locales/es-PY.yml         |   5 +-
 decidim-core/config/locales/es.yml            |   5 +-
 decidim-core/config/locales/eu.yml            |   7 +-
 decidim-core/config/locales/fi-plain.yml      |   2 -
 decidim-core/config/locales/fi.yml            |   1 -
 decidim-core/config/locales/fr-CA.yml         |   4 +-
 decidim-core/config/locales/fr.yml            |   4 +-
 decidim-core/config/locales/hu.yml            |   2 -
 decidim-core/config/locales/it.yml            |   2 -
 decidim-core/config/locales/ja.yml            |  32 +--
 decidim-core/config/locales/lb.yml            |   2 -
 decidim-core/config/locales/lt.yml            |   2 -
 decidim-core/config/locales/nl.yml            |   2 -
 decidim-core/config/locales/no.yml            |   2 -
 decidim-core/config/locales/pl.yml            |   6 +-
 decidim-core/config/locales/pt-BR.yml         |   7 +-
 decidim-core/config/locales/pt.yml            |   2 -
 decidim-core/config/locales/ro-RO.yml         |   5 +-
 decidim-core/config/locales/sk.yml            |   5 +-
 decidim-core/config/locales/sv.yml            |   3 -
 decidim-core/config/locales/tr-TR.yml         |   2 -
 decidim-core/config/locales/zh-CN.yml         |   2 -
 decidim-core/config/locales/zh-TW.yml         |   2 -
 decidim-debates/config/locales/bg.yml         |   1 -
 decidim-debates/config/locales/ca-IT.yml      |   5 +-
 decidim-debates/config/locales/ca.yml         |   5 +-
 decidim-debates/config/locales/cs.yml         |   4 +-
 decidim-debates/config/locales/de.yml         |   3 -
 decidim-debates/config/locales/el.yml         |   1 -
 decidim-debates/config/locales/es-MX.yml      |   5 +-
 decidim-debates/config/locales/es-PY.yml      |   5 +-
 decidim-debates/config/locales/es.yml         |   5 +-
 decidim-debates/config/locales/eu.yml         |   5 +-
 decidim-debates/config/locales/fi-plain.yml   |   2 -
 decidim-debates/config/locales/fi.yml         |   3 +-
 decidim-debates/config/locales/fr-CA.yml      |   5 +-
 decidim-debates/config/locales/fr.yml         |   5 +-
 decidim-debates/config/locales/hu.yml         |   1 -
 decidim-debates/config/locales/it.yml         |   1 -
 decidim-debates/config/locales/ja.yml         |   4 +-
 decidim-debates/config/locales/lb.yml         |   1 -
 decidim-debates/config/locales/lt.yml         |   1 -
 decidim-debates/config/locales/nl.yml         |   1 -
 decidim-debates/config/locales/no.yml         |   1 -
 decidim-debates/config/locales/pl.yml         |   1 -
 decidim-debates/config/locales/pt-BR.yml      |   3 -
 decidim-debates/config/locales/pt.yml         |   3 -
 decidim-debates/config/locales/ro-RO.yml      |   1 -
 decidim-debates/config/locales/sk.yml         |   5 +-
 decidim-debates/config/locales/sv.yml         |   3 -
 decidim-debates/config/locales/tr-TR.yml      |   5 +-
 decidim-debates/config/locales/zh-CN.yml      |   1 -
 decidim-debates/config/locales/zh-TW.yml      |   1 -
 decidim-design/config/locales/eu.yml          |   2 +-
 decidim-design/config/locales/fi-plain.yml    |   4 +-
 decidim-elections/config/locales/eu.yml       |  10 +-
 decidim-initiatives/config/locales/ca-IT.yml  |   6 -
 decidim-meetings/config/locales/ar.yml        |   1 -
 decidim-meetings/config/locales/bg.yml        |   1 -
 decidim-meetings/config/locales/ca-IT.yml     |   4 +-
 decidim-meetings/config/locales/ca.yml        |   4 +-
 decidim-meetings/config/locales/cs.yml        |   3 -
 decidim-meetings/config/locales/de.yml        |   3 -
 decidim-meetings/config/locales/el.yml        |   1 -
 decidim-meetings/config/locales/es-MX.yml     |   4 +-
 decidim-meetings/config/locales/es-PY.yml     |   4 +-
 decidim-meetings/config/locales/es.yml        |   4 +-
 decidim-meetings/config/locales/eu.yml        |   4 +-
 decidim-meetings/config/locales/fi-plain.yml  |   2 -
 decidim-meetings/config/locales/fi.yml        |   2 -
 decidim-meetings/config/locales/fr-CA.yml     |   4 +-
 decidim-meetings/config/locales/fr.yml        |   4 +-
 decidim-meetings/config/locales/hu.yml        |   1 -
 decidim-meetings/config/locales/it.yml        |   1 -
 decidim-meetings/config/locales/ja.yml        |   4 +-
 decidim-meetings/config/locales/lb.yml        |   1 -
 decidim-meetings/config/locales/lt.yml        |   1 -
 decidim-meetings/config/locales/nl.yml        |   1 -
 decidim-meetings/config/locales/no.yml        |   1 -
 decidim-meetings/config/locales/pl.yml        |   1 -
 decidim-meetings/config/locales/pt-BR.yml     |   3 -
 decidim-meetings/config/locales/pt.yml        |   1 -
 decidim-meetings/config/locales/ro-RO.yml     |   1 -
 decidim-meetings/config/locales/sk.yml        |   3 -
 decidim-meetings/config/locales/sv.yml        |   3 -
 decidim-meetings/config/locales/tr-TR.yml     |   1 -
 decidim-meetings/config/locales/zh-CN.yml     |   1 -
 decidim-meetings/config/locales/zh-TW.yml     |   1 -
 decidim-pages/config/locales/pt-BR.yml        |   2 +-
 .../config/locales/ca-IT.yml                  |   4 +-
 .../config/locales/es-MX.yml                  |  12 +-
 .../config/locales/es-PY.yml                  |  12 +-
 .../config/locales/fi-plain.yml               | 208 +++++++++---------
 .../config/locales/fi.yml                     | 208 +++++++++---------
 .../config/locales/fr-CA.yml                  |  11 +
 .../config/locales/fr.yml                     |  12 +
 decidim-proposals/config/locales/ar.yml       |   5 -
 decidim-proposals/config/locales/bg.yml       |   5 -
 decidim-proposals/config/locales/ca-IT.yml    |  12 +-
 decidim-proposals/config/locales/ca.yml       |   9 +-
 decidim-proposals/config/locales/cs.yml       |   5 -
 decidim-proposals/config/locales/de.yml       |   7 +-
 decidim-proposals/config/locales/el.yml       |   5 -
 decidim-proposals/config/locales/es-MX.yml    |   9 +-
 decidim-proposals/config/locales/es-PY.yml    |   9 +-
 decidim-proposals/config/locales/es.yml       |   9 +-
 decidim-proposals/config/locales/eu.yml       |  23 +-
 decidim-proposals/config/locales/fi-plain.yml |   4 -
 decidim-proposals/config/locales/fi.yml       |   7 +-
 decidim-proposals/config/locales/fr-CA.yml    |   9 +-
 decidim-proposals/config/locales/fr.yml       |   9 +-
 decidim-proposals/config/locales/gl.yml       |   4 -
 decidim-proposals/config/locales/hu.yml       |   4 -
 decidim-proposals/config/locales/id-ID.yml    |   4 -
 decidim-proposals/config/locales/it.yml       |   5 -
 decidim-proposals/config/locales/ja.yml       |   6 +-
 decidim-proposals/config/locales/lt.yml       |   5 -
 decidim-proposals/config/locales/lv.yml       |   4 -
 decidim-proposals/config/locales/nl.yml       |   5 -
 decidim-proposals/config/locales/no.yml       |   5 -
 decidim-proposals/config/locales/pl.yml       |   5 -
 decidim-proposals/config/locales/pt-BR.yml    |   5 -
 decidim-proposals/config/locales/pt.yml       |   5 -
 decidim-proposals/config/locales/ro-RO.yml    |   5 -
 decidim-proposals/config/locales/ru.yml       |   8 -
 decidim-proposals/config/locales/sk.yml       |   7 +-
 decidim-proposals/config/locales/sv.yml       |   6 +-
 decidim-proposals/config/locales/tr-TR.yml    |   9 +-
 decidim-proposals/config/locales/uk.yml       |   8 -
 decidim-proposals/config/locales/zh-CN.yml    |   5 -
 decidim-proposals/config/locales/zh-TW.yml    |   5 -
 decidim-sortitions/config/locales/eu.yml      |   8 +-
 decidim-surveys/config/locales/ca-IT.yml      |   3 +
 decidim-surveys/config/locales/ca.yml         |   3 +
 decidim-surveys/config/locales/es-MX.yml      |   3 +
 decidim-surveys/config/locales/es-PY.yml      |   3 +
 decidim-surveys/config/locales/es.yml         |   3 +
 decidim-surveys/config/locales/eu.yml         |   3 +
 decidim-surveys/config/locales/fi.yml         |   5 +-
 decidim-surveys/config/locales/fr-CA.yml      |   3 +
 decidim-surveys/config/locales/fr.yml         |   3 +
 decidim-surveys/config/locales/sk.yml         |   3 +
 decidim-system/config/locales/eu.yml          |   1 -
 decidim-system/config/locales/fr-CA.yml       |   2 +-
 decidim-system/config/locales/ja.yml          |   5 +-
 decidim-templates/config/locales/eu.yml       |   2 +-
 decidim-verifications/config/locales/eu.yml   |   4 +-
 .../config/locales/fi-plain.yml               |   1 +
 decidim-verifications/config/locales/ja.yml   |   1 +
 .../config/locales/tr-TR.yml                  |   2 +-
 305 files changed, 722 insertions(+), 981 deletions(-)

diff --git a/decidim-accountability/config/locales/ar.yml b/decidim-accountability/config/locales/ar.yml
index 268fc12f947c9..ec6813fff1481 100644
--- a/decidim-accountability/config/locales/ar.yml
+++ b/decidim-accountability/config/locales/ar.yml
@@ -228,7 +228,6 @@ ar:
           global:
             clear_all: إمسح الكل
             comments_enabled: تم تمكين التعليقات
-            comments_max_length: الحد الأقصى لطول التعليقات (اترك ال0 للقيمة الافتراضية)
             define_taxonomy_filters: الرجاء تحديد بعض عوامل التصفية لهذه المساحة التشاركية قبل استخدام هذا الإعداد.
             display_progress_enabled: عرض التقدم
             geocoding_enabled: تم تمكين الخرائط
diff --git a/decidim-accountability/config/locales/bg.yml b/decidim-accountability/config/locales/bg.yml
index 4ad075d25d71d..71e9cb20d8216 100644
--- a/decidim-accountability/config/locales/bg.yml
+++ b/decidim-accountability/config/locales/bg.yml
@@ -162,7 +162,6 @@ bg:
         settings:
           global:
             comments_enabled: Коментарите са разрешени
-            comments_max_length: Максимална дължина на коментарите (Оставете 0 за стойност по подразбиране)
             display_progress_enabled: Показвай развитието
             intro: Въведение
           step:
diff --git a/decidim-accountability/config/locales/ca-IT.yml b/decidim-accountability/config/locales/ca-IT.yml
index 013e39ecfbfeb..7b0fde2dea781 100644
--- a/decidim-accountability/config/locales/ca-IT.yml
+++ b/decidim-accountability/config/locales/ca-IT.yml
@@ -302,7 +302,7 @@ ca-IT:
           global:
             clear_all: Netejar-ho tot
             comments_enabled: Comentaris habilitats
-            comments_max_length: Longitud màxima dels comentaris (deixa 0 si vols mantenir la configuració per defecte)
+            comments_max_length: Caràcters màxims per comentari (deixar a 0 el valor predeterminat)
             default_taxonomy: Taxonomia predeterminada
             default_taxonomy_help: Selecciona quina taxonomia vols mostrar per defecte. Si no se selecciona cap taxonomia, els resultats es mostraran en un format de llista.
             define_taxonomy_filters: Si us plau, defineix algunes filtres per aquest espai de participació abans de fer servir aquesta configuració.
diff --git a/decidim-accountability/config/locales/ca.yml b/decidim-accountability/config/locales/ca.yml
index 72af9173ff0e1..938f18dafaf5b 100644
--- a/decidim-accountability/config/locales/ca.yml
+++ b/decidim-accountability/config/locales/ca.yml
@@ -302,7 +302,7 @@ ca:
           global:
             clear_all: Netejar-ho tot
             comments_enabled: Comentaris habilitats
-            comments_max_length: Longitud màxima dels comentaris (deixa 0 si vols mantenir la configuració per defecte)
+            comments_max_length: Caràcters màxims per comentari (deixar a 0 el valor predeterminat)
             default_taxonomy: Taxonomia predeterminada
             default_taxonomy_help: Selecciona quina taxonomia vols mostrar per defecte. Si no se selecciona cap taxonomia, els resultats es mostraran en un format de llista.
             define_taxonomy_filters: Si us plau, defineix algunes filtres per aquest espai de participació abans de fer servir aquesta configuració.
diff --git a/decidim-accountability/config/locales/cs.yml b/decidim-accountability/config/locales/cs.yml
index 4fd1783312d51..23dd1ddeac812 100644
--- a/decidim-accountability/config/locales/cs.yml
+++ b/decidim-accountability/config/locales/cs.yml
@@ -315,7 +315,6 @@ cs:
           global:
             clear_all: Vymazat vše
             comments_enabled: Komentáře povoleny
-            comments_max_length: Maximální délka komentáře (ponechte 0 pro výchozí hodnotu)
             default_taxonomy: Výchozí taxonomie
             default_taxonomy_help: Vyberte taxonomii, která se má zobrazovat jako výchozí. Pokud není vybrána žádná taxonomie, výsledky se zobrazí ve formátu seznamu.
             define_taxonomy_filters: Před použitím tohoto nastavení prosím definujte některé filtry pro tento participační prostor.
diff --git a/decidim-accountability/config/locales/da.yml b/decidim-accountability/config/locales/da.yml
index a405209eea8a5..831a4ab0bb108 100644
--- a/decidim-accountability/config/locales/da.yml
+++ b/decidim-accountability/config/locales/da.yml
@@ -111,7 +111,6 @@ da:
         settings:
           global:
             comments_enabled: Kommentarer aktiveret
-            comments_max_length: Kommentarer maks. længde (Leave 0 for standardværdi)
             display_progress_enabled: Vis fremskridt
             intro: Intro
     resource_links:
diff --git a/decidim-accountability/config/locales/de.yml b/decidim-accountability/config/locales/de.yml
index 736884236b53c..2c3a317d2db88 100644
--- a/decidim-accountability/config/locales/de.yml
+++ b/decidim-accountability/config/locales/de.yml
@@ -301,7 +301,6 @@ de:
           global:
             clear_all: Alles löschen
             comments_enabled: Kommentare aktiviert
-            comments_max_length: Maximale Länge der Kommentare (0 für Standardwert)
             default_taxonomy: Standard Klassifizierung
             default_taxonomy_help: Wählen Sie, welche Klassifizierung standardmäßig angezeigt werden soll. Wenn keine Taxonomie ausgewählt ist, werden die Ergebnisse in einem Listenformat angezeigt.
             define_taxonomy_filters: Bitte definieren Sie einige Filter für diesen partizipativen Bereich, bevor Sie diese Einstellung verwenden.
diff --git a/decidim-accountability/config/locales/el.yml b/decidim-accountability/config/locales/el.yml
index 422fd3d66c2a9..94aa4de8aa8a2 100644
--- a/decidim-accountability/config/locales/el.yml
+++ b/decidim-accountability/config/locales/el.yml
@@ -292,7 +292,6 @@ el:
           global:
             clear_all: Εκκαθάριση όλων
             comments_enabled: Τα σχόλια ενεργοποιήθηκαν
-            comments_max_length: Μέγιστο μέγεθος σχολίων (Αφήστε το 0 για το προκαθορισμένο μέγεθος)
             define_taxonomy_filters: Παρακαλώ καθορίστε μερικά φίλτρα για αυτόν τον συμμετοχικό χώρο πριν χρησιμοποιήσετε αυτή τη ρύθμιση.
             display_progress_enabled: Εμφάνιση προόδου
             geocoding_enabled: Χάρτες ενεργοποιημένοι
diff --git a/decidim-accountability/config/locales/es-MX.yml b/decidim-accountability/config/locales/es-MX.yml
index ef1137b27cf72..37a041d36d390 100644
--- a/decidim-accountability/config/locales/es-MX.yml
+++ b/decidim-accountability/config/locales/es-MX.yml
@@ -95,7 +95,7 @@ es-MX:
               <li>Haz los cambios en local. Sólo puedes modificar las siguientes columnas del CSV  (el resto será ignorado):
                 <ul>
                 <li><b>taxonomies/ids:</b> IDs para la taxonomia (si hay más de una, sepárelas con una coma)</li>
-                <li><b>parent/id:</b> ID para el padre (para resultados relacionados). 
+                <li><b>parent/id:</b> ID para el padre (para resultados relacionados).
               <br>Opcional</li>
                 <li><b>title/I18N:</b> título en el idioma X</li>
                 <li><b>description/I18N:</b> descripción en el idioma X</li>
@@ -302,7 +302,7 @@ es-MX:
           global:
             clear_all: Limpiar todo
             comments_enabled: Comentarios habilitados
-            comments_max_length: Longitud máxima de los comentarios (deja 0 si quieres mantener la configuración por defecto)
+            comments_max_length: Caracteres máximos por comentario (dejar 0 para el valor predeterminado)
             default_taxonomy: Taxonomía predeterminada
             default_taxonomy_help: Selecciona qué taxonomía quieres mostrar por defecto. Si no se selecciona alguna taxonomía, los resultados se mostrarán en un formato de lista.
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
diff --git a/decidim-accountability/config/locales/es-PY.yml b/decidim-accountability/config/locales/es-PY.yml
index aa3549b668311..8f378c91e6a90 100644
--- a/decidim-accountability/config/locales/es-PY.yml
+++ b/decidim-accountability/config/locales/es-PY.yml
@@ -95,7 +95,7 @@ es-PY:
               <li>Haz los cambios en local. Sólo puedes modificar las siguientes columnas del CSV  (el resto será ignorado):
                 <ul>
                 <li><b>taxonomies/ids:</b> IDs para la taxonomia (si hay más de una, sepárelas con una coma)</li>
-                <li><b>parent/id:</b> ID para el padre (para resultados relacionados). 
+                <li><b>parent/id:</b> ID para el padre (para resultados relacionados).
               <br>Opcional</li>
                 <li><b>title/I18N:</b> título en el idioma X</li>
                 <li><b>description/I18N:</b> descripción en el idioma X</li>
@@ -302,7 +302,7 @@ es-PY:
           global:
             clear_all: Limpiar todo
             comments_enabled: Comentarios habilitados
-            comments_max_length: Longitud máxima de los comentarios (deja 0 si quieres mantener la configuración por defecto)
+            comments_max_length: Caracteres máximos por comentario (dejar 0 para el valor predeterminado)
             default_taxonomy: Taxonomía predeterminada
             default_taxonomy_help: Selecciona qué taxonomía quieres mostrar por defecto. Si no se selecciona alguna taxonomía, los resultados se mostrarán en un formato de lista.
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
diff --git a/decidim-accountability/config/locales/es.yml b/decidim-accountability/config/locales/es.yml
index 7e4404011fbc9..5b4d19aa61c23 100644
--- a/decidim-accountability/config/locales/es.yml
+++ b/decidim-accountability/config/locales/es.yml
@@ -302,7 +302,7 @@ es:
           global:
             clear_all: Limpiar todo
             comments_enabled: Comentarios habilitados
-            comments_max_length: Longitud máxima de los comentarios (deja 0 si quieres mantener la configuración por defecto)
+            comments_max_length: Caracteres máximos por comentario (dejar 0 para el valor predeterminado)
             default_taxonomy: Taxonomía predeterminada
             default_taxonomy_help: Selecciona qué taxonomía quieres mostrar por defecto. Si no se selecciona alguna taxonomía, los resultados se mostrarán en un formato de lista.
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
diff --git a/decidim-accountability/config/locales/eu.yml b/decidim-accountability/config/locales/eu.yml
index 87c826829e46a..a1eb2c81be718 100644
--- a/decidim-accountability/config/locales/eu.yml
+++ b/decidim-accountability/config/locales/eu.yml
@@ -106,7 +106,7 @@ eu:
               </ul>
               </li>
               </ol>
-            title: Inportatu emaitzak CSV fitxategitik
+            title: Emaitzak CSV fitxategitik inportartu
         imports:
           create:
             invalid: Arazo bat egon da emaitzak inportatzean.
@@ -277,7 +277,7 @@ eu:
           title: Mugarriak
         no_results: Ez dago proiekturik
         root_taxonomies:
-          title: 'Ikusi honela:'
+          title: 'Honen bidez bistaratu:'
         search:
           search: Bilatu ekintzak
         show:
@@ -301,7 +301,7 @@ eu:
           global:
             clear_all: Garbitu dena
             comments_enabled: Iruzkinak gaituta
-            comments_max_length: Iruzkinen gehieneko luzera (utzi 0 hasierako konfigurazioari eusteko)
+            comments_max_length: Iruzkin bakoitzeko gehieneko karaktereak (utzi 0 aurrez zehaztutako baliorako)
             default_taxonomy: Taxonomia akatsa
             default_taxonomy_help: Aukeratu zein taxonomia erakutsi nahi duzun akatsez. Taxonomiarik aukeratzen ez bada, emaitzak zerrenda formatuan agertuko dira.
             define_taxonomy_filters: Mesedez, eszenatoki hau erabili aurretik, zehaztu iragazki batzuk partaidetza-espazio honetarako.
diff --git a/decidim-accountability/config/locales/fr-CA.yml b/decidim-accountability/config/locales/fr-CA.yml
index eac77d8857265..0485ab0b2edfd 100644
--- a/decidim-accountability/config/locales/fr-CA.yml
+++ b/decidim-accountability/config/locales/fr-CA.yml
@@ -302,7 +302,7 @@ fr-CA:
           global:
             clear_all: Tout supprimer
             comments_enabled: Activer le module de commentaire
-            comments_max_length: Longueur max des commentaires (laisser 0 pour la valeur par défaut)
+            comments_max_length: Nombre maximum de caractères par commentaire (Laisser 0 pour la valeur par défaut)
             default_taxonomy: Taxonomie par défaut
             default_taxonomy_help: Sélectionnez la taxonomie que vous voulez afficher par défaut. Si aucune taxonomie n'est sélectionnée, les résultats seront affichés dans un format de liste.
             define_taxonomy_filters: Pour utiliser ce paramètre, des filtres doivent être définis dans cet espace participatif.
diff --git a/decidim-accountability/config/locales/fr.yml b/decidim-accountability/config/locales/fr.yml
index 58493a21eb60a..a0aac76d02f4f 100644
--- a/decidim-accountability/config/locales/fr.yml
+++ b/decidim-accountability/config/locales/fr.yml
@@ -302,7 +302,7 @@ fr:
           global:
             clear_all: Tout supprimer
             comments_enabled: Activer le module de commentaire
-            comments_max_length: Longueur max des commentaires (laisser 0 pour la valeur par défaut)
+            comments_max_length: Nombre maximum de caractères par commentaire (Laisser 0 pour la valeur par défaut)
             default_taxonomy: Taxonomie par défaut
             default_taxonomy_help: Sélectionnez la taxonomie que vous voulez afficher par défaut. Si aucune taxonomie n'est sélectionnée, les résultats seront affichés dans un format de liste.
             define_taxonomy_filters: Pour utiliser ce paramètre, des filtres doivent être définis dans cet espace participatif.
diff --git a/decidim-accountability/config/locales/gl.yml b/decidim-accountability/config/locales/gl.yml
index c474184d5a688..7932fa8f8224a 100644
--- a/decidim-accountability/config/locales/gl.yml
+++ b/decidim-accountability/config/locales/gl.yml
@@ -124,7 +124,6 @@ gl:
         settings:
           global:
             comments_enabled: Comentarios habilitados
-            comments_max_length: Lonxitude máxima dos comentarios (0 para valor predefinido)
             display_progress_enabled: Mostrar o progreso
             intro: Intro
           step:
diff --git a/decidim-accountability/config/locales/he-IL.yml b/decidim-accountability/config/locales/he-IL.yml
index 846620afc4c44..565ae1f6f7f02 100644
--- a/decidim-accountability/config/locales/he-IL.yml
+++ b/decidim-accountability/config/locales/he-IL.yml
@@ -211,7 +211,6 @@ he:
           global:
             clear_all: נקה הכל
             comments_enabled: תגובות אפשריות
-            comments_max_length: אורך מקסימלי להערות (השאירו 0 לערך ברירת המחדל)
             display_progress_enabled: הצגת התקדמות
             intro: הקדמה
           step:
diff --git a/decidim-accountability/config/locales/hu.yml b/decidim-accountability/config/locales/hu.yml
index 6a3f59e35dc3f..c302b1239f805 100644
--- a/decidim-accountability/config/locales/hu.yml
+++ b/decidim-accountability/config/locales/hu.yml
@@ -167,7 +167,6 @@ hu:
         settings:
           global:
             comments_enabled: Megjegyzések engedélyezve
-            comments_max_length: Kommentek maximális hossza (Hagyjon 0 -t az alapértékhez)
             display_progress_enabled: Állapot megjelenítése
             intro: Intro
           step:
diff --git a/decidim-accountability/config/locales/it.yml b/decidim-accountability/config/locales/it.yml
index adf4bb14825dd..51fad32d3987c 100644
--- a/decidim-accountability/config/locales/it.yml
+++ b/decidim-accountability/config/locales/it.yml
@@ -281,7 +281,6 @@ it:
           global:
             clear_all: Cancella tutto
             comments_enabled: Commenti abilitati
-            comments_max_length: Lunghezza massima dei commenti (Lasciare 0 per il valore predefinito)
             default_taxonomy: Tassonomia di default
             default_taxonomy_help: Seleziona quale tassonomia vuoi mostrare di default. Se nessuna tassonomia è selezionata, i risultati saranno mostrati in formato elenco.
             define_taxonomy_filters: Si prega di definire alcuni filtri per questo spazio partecipativo prima di utilizzare questa impostazione.
diff --git a/decidim-accountability/config/locales/ja.yml b/decidim-accountability/config/locales/ja.yml
index b10dceb2c9250..df0fd4ec2111d 100644
--- a/decidim-accountability/config/locales/ja.yml
+++ b/decidim-accountability/config/locales/ja.yml
@@ -294,7 +294,7 @@ ja:
           global:
             clear_all: すべてクリア
             comments_enabled: コメントを有効にする
-            comments_max_length: コメント最大長 (デフォルト値は 0 のまま)
+            comments_max_length: 各コメントの最大文字数 (0はデフォルト値のまま)
             default_taxonomy: デフォルトのタクソノミー
             default_taxonomy_help: デフォルトで表示するタクソノミーを選択します。タクソノミーが選択されていない場合、結果はリスト形式で表示されます。
             define_taxonomy_filters: この設定を使用する前に、参加型スペースのフィルターをいくつか定義してください。
diff --git a/decidim-accountability/config/locales/ko.yml b/decidim-accountability/config/locales/ko.yml
index daebb79673eb3..22f78a79bc98c 100644
--- a/decidim-accountability/config/locales/ko.yml
+++ b/decidim-accountability/config/locales/ko.yml
@@ -154,7 +154,6 @@ ko:
         settings:
           global:
             comments_enabled: 댓글 활성화됨
-            comments_max_length: 댓글 최대 길이(기본값은 0으로 남김)
             display_progress_enabled: 진행사항 보기
             intro: 소개
           step:
diff --git a/decidim-accountability/config/locales/lb.yml b/decidim-accountability/config/locales/lb.yml
index 87e27cc061426..5cf150c410e94 100644
--- a/decidim-accountability/config/locales/lb.yml
+++ b/decidim-accountability/config/locales/lb.yml
@@ -124,7 +124,6 @@ lb:
         settings:
           global:
             comments_enabled: Kommentare aktiviert
-            comments_max_length: Maximale Länge der Kommentare (0 für Standardwert)
             display_progress_enabled: Fortschritt anzeigen
             intro: Einführung
           step:
diff --git a/decidim-accountability/config/locales/lt.yml b/decidim-accountability/config/locales/lt.yml
index 3da14b29a3e29..72b1b792e8bcf 100644
--- a/decidim-accountability/config/locales/lt.yml
+++ b/decidim-accountability/config/locales/lt.yml
@@ -163,7 +163,6 @@ lt:
         settings:
           global:
             comments_enabled: Įjungti komentarai
-            comments_max_length: Maksimalus komentaro ilgis (įrašyti 0 įprastam ilgiui)
             display_progress_enabled: Rodyti progresą
             intro: Įžanga
           step:
diff --git a/decidim-accountability/config/locales/nl.yml b/decidim-accountability/config/locales/nl.yml
index 845ce8ba3af84..d89160eb82dfa 100644
--- a/decidim-accountability/config/locales/nl.yml
+++ b/decidim-accountability/config/locales/nl.yml
@@ -128,7 +128,6 @@ nl:
         settings:
           global:
             comments_enabled: Reacties ingeschakeld
-            comments_max_length: Commentaar maximale lengte (laat 0 voor standaard waarde)
             display_progress_enabled: Geef de voortgang weer
             intro: Inleiding
           step:
diff --git a/decidim-accountability/config/locales/no.yml b/decidim-accountability/config/locales/no.yml
index 7107d3b7e5b14..85b59cbe2f7fc 100644
--- a/decidim-accountability/config/locales/no.yml
+++ b/decidim-accountability/config/locales/no.yml
@@ -128,7 +128,6 @@
         settings:
           global:
             comments_enabled: Kommentarer aktivert
-            comments_max_length: Maks lengde på kommentarer (Sett 0 for standardverdi)
             display_progress_enabled: Vis fremgang
             intro: Introduksjon
           step:
diff --git a/decidim-accountability/config/locales/pl.yml b/decidim-accountability/config/locales/pl.yml
index a969cb1431009..84eba6b62320b 100644
--- a/decidim-accountability/config/locales/pl.yml
+++ b/decidim-accountability/config/locales/pl.yml
@@ -169,7 +169,6 @@ pl:
         settings:
           global:
             comments_enabled: Komentarze włączone
-            comments_max_length: Maksymalna długość komentarzy (Pozostaw 0 dla wartości domyślnej)
             display_progress_enabled: Wyświetl postęp
             intro: Wprowadzenie
           step:
diff --git a/decidim-accountability/config/locales/pt-BR.yml b/decidim-accountability/config/locales/pt-BR.yml
index b7f18e1f976ca..e4e188e1c924f 100644
--- a/decidim-accountability/config/locales/pt-BR.yml
+++ b/decidim-accountability/config/locales/pt-BR.yml
@@ -300,7 +300,6 @@ pt-BR:
           global:
             clear_all: Apagar tudo
             comments_enabled: Comentários ativados
-            comments_max_length: Tamanho máximo de comentários (deixe 0 para o valor padrão)
             default_taxonomy: Taxonomia padrão
             default_taxonomy_help: Selecione qual taxonomia você deseja mostrar por padrão. Se nenhuma taxonomia for selecionada, os resultados serão exibidos em um formato de lista.
             define_taxonomy_filters: Por favor, defina alguns filtros para este espaço participativo antes de usar esta configuração.
diff --git a/decidim-accountability/config/locales/pt.yml b/decidim-accountability/config/locales/pt.yml
index ef780cc810755..2652c56821a9e 100644
--- a/decidim-accountability/config/locales/pt.yml
+++ b/decidim-accountability/config/locales/pt.yml
@@ -144,7 +144,6 @@ pt:
           global:
             clear_all: Apagar tudo
             comments_enabled: Comentários ativados
-            comments_max_length: Comprimento máximo dos comentários (Deixar 0 para o valor predefinido)
             define_taxonomy_filters: Para usar esta definição, filtros devem estar definidos neste espaço participativo.
             display_progress_enabled: Mostrar progresso
             intro: Introdução
diff --git a/decidim-accountability/config/locales/ro-RO.yml b/decidim-accountability/config/locales/ro-RO.yml
index 9ed0e9741da52..790070ba969f0 100644
--- a/decidim-accountability/config/locales/ro-RO.yml
+++ b/decidim-accountability/config/locales/ro-RO.yml
@@ -308,7 +308,6 @@ ro:
           global:
             clear_all: Eliminați tot
             comments_enabled: Comentarii activate
-            comments_max_length: Lungimea maximă a comentariilor (Lăsați 0 pentru valoarea implicită)
             default_taxonomy: Taxonomie implicită
             default_taxonomy_help: Selectați ce taxonomie doriți să afișați implicit. Dacă nu este selectată nicio taxonomie, rezultatele vor fi afișate într-un format de listă.
             define_taxonomy_filters: Vă rugăm să definiți niște filtre pentru acest spațiu participativ înainte de a utiliza această setare.
diff --git a/decidim-accountability/config/locales/ru.yml b/decidim-accountability/config/locales/ru.yml
index 4cf6f66843a86..4144e695b4816 100644
--- a/decidim-accountability/config/locales/ru.yml
+++ b/decidim-accountability/config/locales/ru.yml
@@ -289,7 +289,6 @@ ru:
           global:
             clear_all: Очистить все
             comments_enabled: Комментарии включены
-            comments_max_length: Максимальная длина комментариев (оставьте 0 для значения по умолчанию)
             default_taxonomy: Таксономия по умолчанию
             default_taxonomy_help: Выберите, какую таксономию вы хотите показать по умолчанию. Если таксономия не выбрана, результаты будут показаны в виде списка.
             define_taxonomy_filters: Пожалуйста, определите фильтры для этого партисипативного пространства перед использованием этой настройки.
diff --git a/decidim-accountability/config/locales/sk.yml b/decidim-accountability/config/locales/sk.yml
index 5065721165308..2810dcb4c7c4a 100644
--- a/decidim-accountability/config/locales/sk.yml
+++ b/decidim-accountability/config/locales/sk.yml
@@ -13,7 +13,7 @@ sk:
         description: Popis
         end_date: Koniec
         progress: Postup
-        start_date: Začiatok 
+        start_date: Začiatok
         subresults: Čiastkové výsledky
         title: Názov
         updated_at: Aktualizované
@@ -268,7 +268,7 @@ sk:
             end_date: Koniec
             id: ID
             progress: Postup
-            start_date: Začiatok 
+            start_date: Začiatok
             status: Stav
             taxonomies: Taxonómie
             title: Názov
@@ -315,7 +315,6 @@ sk:
           global:
             clear_all: Vymazať všetko
             comments_enabled: Komentáre povolené
-            comments_max_length: Maximálna dĺžka komentárov (Ponechajte 0 pre predvolenú hodnotu)
             default_taxonomy: Predvolená taxonómia
             default_taxonomy_help: Vyberte, ktorú taxonómiu chcete predvolene zobraziť. Ak nie je vybraná žiadna taxonómia, výsledky sa zobrazia vo formáte zoznamu.
             define_taxonomy_filters: Pred použitím tohto nastavenia definujte nejaké filtre pre tento participatívny priestor.
diff --git a/decidim-accountability/config/locales/sq-AL.yml b/decidim-accountability/config/locales/sq-AL.yml
index 76e751f7c074e..4871b3fe797e4 100644
--- a/decidim-accountability/config/locales/sq-AL.yml
+++ b/decidim-accountability/config/locales/sq-AL.yml
@@ -162,7 +162,6 @@ sq:
         settings:
           global:
             comments_enabled: Komentet e aktivizuara
-            comments_max_length: Madhësia maks. e komenteve
             display_progress_enabled: Shfaq ecurinë
             intro: Hyrje
           step:
diff --git a/decidim-accountability/config/locales/sv.yml b/decidim-accountability/config/locales/sv.yml
index 82d78ed152b51..cd7937cec716a 100644
--- a/decidim-accountability/config/locales/sv.yml
+++ b/decidim-accountability/config/locales/sv.yml
@@ -302,7 +302,6 @@ sv:
           global:
             clear_all: Rensa alla
             comments_enabled: Aktivera kommentarer
-            comments_max_length: Maximal kommentarslängd (ange 0 för att använda standardvärdet)
             default_taxonomy: Standardkategori
             default_taxonomy_help: Välj vilka kategorier du vill visa som standard. Om ingen kategori är vald, kommer resultatet visas som en lista.
             define_taxonomy_filters: Ställ in filter innan du använder den här inställningen.
diff --git a/decidim-accountability/config/locales/th-TH.yml b/decidim-accountability/config/locales/th-TH.yml
index ba4ceb24cb5aa..4c72bfe0088bb 100644
--- a/decidim-accountability/config/locales/th-TH.yml
+++ b/decidim-accountability/config/locales/th-TH.yml
@@ -110,7 +110,6 @@ th:
         settings:
           global:
             comments_enabled: เปิดใช้งานความคิดเห็นแล้ว
-            comments_max_length: ความคิดเห็นความยาวสูงสุด (ปล่อยให้ 0 เป็นค่าเริ่มต้น)
             display_progress_enabled: แสดงความคืบหน้า
             intro: คำแนะนำ
           step:
diff --git a/decidim-accountability/config/locales/tr-TR.yml b/decidim-accountability/config/locales/tr-TR.yml
index d967ab9add062..39fe34d8d7a2c 100644
--- a/decidim-accountability/config/locales/tr-TR.yml
+++ b/decidim-accountability/config/locales/tr-TR.yml
@@ -301,7 +301,6 @@ tr:
           global:
             clear_all: Tümünü sil
             comments_enabled: Yorumlar etkin
-            comments_max_length: Maksimum yorum uzunluğu (Varsayılan değer için 0 bırakın)
             default_taxonomy: Varsayılan sınıflandırma
             default_taxonomy_help: Varsayılan olarak hangi sınıflandırmayı göstermek istediğinizi seçin. Eğer herhangi bir sınıflandırma seçilmezse, sonuçlar liste biçiminde gösterilecektir.
             define_taxonomy_filters: Bu ayarı kullanmadan önce lütfen bu katılımcı alan için bazı filtreler tanımlayın.
diff --git a/decidim-accountability/config/locales/zh-CN.yml b/decidim-accountability/config/locales/zh-CN.yml
index ea49bc27cabc4..ef0488296af82 100644
--- a/decidim-accountability/config/locales/zh-CN.yml
+++ b/decidim-accountability/config/locales/zh-CN.yml
@@ -109,7 +109,6 @@ zh-CN:
         settings:
           global:
             comments_enabled: 评论已启用
-            comments_max_length: 评论最大长度 (默认值留0)
             display_progress_enabled: 显示进度
             intro: 简介
           step:
diff --git a/decidim-accountability/config/locales/zh-TW.yml b/decidim-accountability/config/locales/zh-TW.yml
index 5ea94b37309ba..04bb6c3692bac 100644
--- a/decidim-accountability/config/locales/zh-TW.yml
+++ b/decidim-accountability/config/locales/zh-TW.yml
@@ -153,7 +153,6 @@ zh-TW:
         settings:
           global:
             comments_enabled: 已啟用留言
-            comments_max_length: 留言字數上限 (0 表示使用預設)
             display_progress_enabled: 顯示進度
             intro: 介紹
           step:
diff --git a/decidim-admin/config/locales/ar.yml b/decidim-admin/config/locales/ar.yml
index 044a6b3cf7227..19e495ffe47c6 100644
--- a/decidim-admin/config/locales/ar.yml
+++ b/decidim-admin/config/locales/ar.yml
@@ -44,7 +44,6 @@ ar:
         alert_color: تنبيه
         available_authorizations: التراخيص المتاحة
         badges_enabled: تمكين الشارات
-        comments_max_length: الحد الأقصى لطول التعليقات (اترك 0 لاستعمال القيمة الافتراضية)
         customize_welcome_notification: تخصيص إشعار الترحيب
         default_locale: اللغة الافتراضية
         description: الوصف
@@ -715,10 +714,6 @@ ar:
           'true': 'نعم'
         new:
           create: إنشاء
-      shared:
-        gallery:
-          add_images: إضافة صور
-          edit_images: تعديل الصورة
       static_page_topics:
         create:
           error: كانت هناك مشكلة في إنشاء موضوع جديد.
diff --git a/decidim-admin/config/locales/bg.yml b/decidim-admin/config/locales/bg.yml
index 618b170a02451..7eafd1641890d 100644
--- a/decidim-admin/config/locales/bg.yml
+++ b/decidim-admin/config/locales/bg.yml
@@ -44,7 +44,6 @@ bg:
         alert_color: Аларма
         available_authorizations: Активни оторизации
         badges_enabled: Включи значките
-        comments_max_length: Максимална дължина на коментарите (Оставете 0 за стойност по подразбиране)
         customize_welcome_notification: Персонализирайте приветствието
         default_locale: Език по подразбиране
         description: Описание
@@ -850,10 +849,6 @@ bg:
           next_title: Следващ елемент
           previous: Предишен
           previous_title: Предишен елемент
-        gallery:
-          add_images: Добави изображения
-          edit_images: Редактиране на изображения
-          gallery_legend: Добавяне на галерия с изображения (незадължително)
       static_page_topics:
         create:
           error: Възникна проблем при създаването на нова тема.
diff --git a/decidim-admin/config/locales/bs-BA.yml b/decidim-admin/config/locales/bs-BA.yml
index ed938f426c378..a4ff486b5759d 100644
--- a/decidim-admin/config/locales/bs-BA.yml
+++ b/decidim-admin/config/locales/bs-BA.yml
@@ -452,10 +452,6 @@ bs:
           update: Ažuriraj
         new:
           create: Stvori
-      shared:
-        gallery:
-          add_images: Dodaj slike
-          gallery_legend: Dodaj galeriju slika (opciono)
       titles:
         area_types: Tipovi oblasti
         pages: Stranice
diff --git a/decidim-admin/config/locales/ca-IT.yml b/decidim-admin/config/locales/ca-IT.yml
index f3577c084bae6..8e78225b11d94 100644
--- a/decidim-admin/config/locales/ca-IT.yml
+++ b/decidim-admin/config/locales/ca-IT.yml
@@ -12,6 +12,7 @@ ca-IT:
         plural: Plural
       attachment:
         attachment_collection_id: Carpeta
+        attachments: Fitxers adjunts
         description: Descripció
         file: Arxiu
         title: Nom de l'adjunt o imatge
@@ -45,7 +46,7 @@ ca-IT:
         alert_color: Alerta
         available_authorizations: Autoritzacions disponibles
         badges_enabled: Habilitar les ensenyes
-        comments_max_length: Longitud màxima dels comentaris (deixa 0 si vols mantenir la configuració per defecte)
+        comments_max_length: Caràcters màxims per comentari (deixar a 0 el valor predeterminat)
         customize_welcome_notification: Personalitza la notificació de benvinguda
         default_locale: Idioma per defecte
         description: Descripció
@@ -844,6 +845,7 @@ ca-IT:
             invalid: Hi ha hagut un problema en desbloquejar a les participants.
             success: Participants desbloquejades correctament.
         create:
+          no_user_found: No s'ha trobat aquesta participant.
           success: Participant oficialitzada correctament.
         destroy:
           success: S'ha retirat correctament l'oficialització de la participant.
@@ -1070,10 +1072,10 @@ ca-IT:
           next_title: Següent element
           previous: Anterior
           previous_title: Element anterior
-        gallery:
-          add_images: Afegir imatges
-          edit_images: Editar imatges
-          gallery_legend: Afegir una galeria d'imatges (opcional)
+        attachments:
+          add_attachments: Afegir fitxer(s) adjunt(s)
+          attachment_legend: Afegir una galeria de fitxers adjunts (opcional)
+          edit_attachments: Edita els fitxers adjunts
       static_page_topics:
         create:
           error: S'ha produït un error en crear un tema nou.
@@ -1288,6 +1290,11 @@ ca-IT:
       errors:
         impersonate_user:
           reason: Has d'indicar un motiu per a la gestió d'una participant no gestionada.
+      file_help:
+        attachment:
+          explanation: 'Instruccions per al fitxer:'
+          message_1: S'admeten fitxers CSV, JSON y Excel (.xlsx)
+          message_2: Pels arxius CSV, el separador entre columnes ha de ser un punt i coma (";")
     moderations:
       actions:
         expand: Expandir
diff --git a/decidim-admin/config/locales/ca.yml b/decidim-admin/config/locales/ca.yml
index 5c354fc8178fa..8d6a450c9757b 100644
--- a/decidim-admin/config/locales/ca.yml
+++ b/decidim-admin/config/locales/ca.yml
@@ -12,6 +12,7 @@ ca:
         plural: Plural
       attachment:
         attachment_collection_id: Carpeta
+        attachments: Fitxers adjunts
         description: Descripció
         file: Arxiu
         title: Nom de l'adjunt o imatge
@@ -45,7 +46,7 @@ ca:
         alert_color: Alerta
         available_authorizations: Autoritzacions disponibles
         badges_enabled: Habilitar les ensenyes
-        comments_max_length: Longitud màxima dels comentaris (deixa 0 si vols mantenir la configuració per defecte)
+        comments_max_length: Caràcters màxims per comentari (deixar a 0 el valor predeterminat)
         customize_welcome_notification: Personalitza la notificació de benvinguda
         default_locale: Idioma per defecte
         description: Descripció
@@ -844,6 +845,7 @@ ca:
             invalid: Hi ha hagut un problema en desbloquejar a les participants.
             success: Participants desbloquejades correctament.
         create:
+          no_user_found: No s'ha trobat aquesta participant.
           success: Participant oficialitzada correctament.
         destroy:
           success: S'ha retirat correctament l'oficialització de la participant.
@@ -1070,10 +1072,10 @@ ca:
           next_title: Següent element
           previous: Anterior
           previous_title: Element anterior
-        gallery:
-          add_images: Afegir imatges
-          edit_images: Editar imatges
-          gallery_legend: Afegir una galeria d'imatges (opcional)
+        attachments:
+          add_attachments: Afegir fitxer(s) adjunt(s)
+          attachment_legend: Afegir una galeria de fitxers adjunts (opcional)
+          edit_attachments: Edita els fitxers adjunts
       static_page_topics:
         create:
           error: S'ha produït un error en crear un tema nou.
@@ -1288,6 +1290,11 @@ ca:
       errors:
         impersonate_user:
           reason: Has d'indicar un motiu per a la gestió d'una participant no gestionada.
+      file_help:
+        attachment:
+          explanation: 'Instruccions per al fitxer:'
+          message_1: S'admeten fitxers CSV, JSON y Excel (.xlsx)
+          message_2: Pels arxius CSV, el separador entre columnes ha de ser un punt i coma (";")
     moderations:
       actions:
         expand: Expandir
diff --git a/decidim-admin/config/locales/cs.yml b/decidim-admin/config/locales/cs.yml
index 5ebf706b260b1..4e8098323d82d 100644
--- a/decidim-admin/config/locales/cs.yml
+++ b/decidim-admin/config/locales/cs.yml
@@ -12,6 +12,7 @@ cs:
         plural: Množné číslo
       attachment:
         attachment_collection_id: Složka
+        attachments: Přílohy
         description: Popis
         file: Soubor
         title: Název přílohy nebo obrázku
@@ -45,7 +46,7 @@ cs:
         alert_color: Upozornění
         available_authorizations: Dostupná oprávnění
         badges_enabled: Povolit odznaky
-        comments_max_length: Maximální délka komentáře (ponechte 0 pro výchozí hodnotu)
+        comments_max_length: Maximální počet znaků na komentář (ponechte 0 pro výchozí hodnotu)
         customize_welcome_notification: Přizpůsobit uvítací oznámení
         default_locale: Výchozí jazyk
         description: Popis
@@ -1080,10 +1081,9 @@ cs:
           next_title: Další položka
           previous: Předchozí
           previous_title: Předchozí položka
-        gallery:
-          add_images: Přidat obrázky
-          edit_images: Upravit obrázky
-          gallery_legend: Přidat galerii obrázků (volitelné)
+        attachments:
+          add_attachments: Přidat přílohy
+          edit_attachments: Upravit přílohy
       static_page_topics:
         create:
           error: Při vytváření nového tématu došlo k chybě.
@@ -1299,6 +1299,10 @@ cs:
       errors:
         impersonate_user:
           reason: Musíte uvést důvod pro správu neřízeného účastníka.
+      file_help:
+        attachment:
+          explanation: 'Pokyny pro soubor:'
+          message_1: CSV, JSON a Excel (.xlsx) jsou podporovány
     moderations:
       actions:
         expand: Rozbalit
diff --git a/decidim-admin/config/locales/de.yml b/decidim-admin/config/locales/de.yml
index 46ad33e39db86..b31ac0cead614 100644
--- a/decidim-admin/config/locales/de.yml
+++ b/decidim-admin/config/locales/de.yml
@@ -45,7 +45,6 @@ de:
         alert_color: Benachrichtigung
         available_authorizations: Verfügbare Autorisierungen
         badges_enabled: Abzeichen aktivieren
-        comments_max_length: Maximale Länge der Kommentare (0 für Standardwert)
         customize_welcome_notification: Willkommens-Benachrichtigung anpassen
         default_locale: Standardgebietsschema
         description: Beschreibung
@@ -1065,10 +1064,6 @@ de:
           next_title: Nächstes Element
           previous: Zurück
           previous_title: Vorheriges Element
-        gallery:
-          add_images: Bilder hinzufügen
-          edit_images: Bilder bearbeiten
-          gallery_legend: Bildergalerie hinzufügen (Optional)
       static_page_topics:
         create:
           error: Beim Erstellen eines neuen Themas ist ein Fehler aufgetreten.
diff --git a/decidim-admin/config/locales/el.yml b/decidim-admin/config/locales/el.yml
index 7d05e3e5128ce..f136854245209 100644
--- a/decidim-admin/config/locales/el.yml
+++ b/decidim-admin/config/locales/el.yml
@@ -45,7 +45,6 @@ el:
         alert_color: Ειδοποίηση
         available_authorizations: Διαθέσιμες εγκρίσεις
         badges_enabled: Ενεργοποίηση εμβλημάτων
-        comments_max_length: Μέγιστο μέγεθος σχολίων (Αφήστε το 0 για το προκαθορισμένο μέγεθος)
         customize_welcome_notification: Προσαρμογή ειδοποίησης καλωσορίσματος
         default_locale: Προεπιλεγμένες τοπικές ρυθμίσεις
         description: Περιγραφή
@@ -807,11 +806,6 @@ el:
       share_tokens:
         actions:
           destroy: Διαγραφή
-      shared:
-        gallery:
-          add_images: Προσθήκη εικόνων
-          edit_images: Επεξεργασία εικόνας
-          gallery_legend: Προσθήκη συλλογής εικόνων (προαιρετικά)
       static_page_topics:
         create:
           error: Υπήρξε ένα πρόβλημα κατά τη δημιουργία ενός νέου θέματος.
diff --git a/decidim-admin/config/locales/es-MX.yml b/decidim-admin/config/locales/es-MX.yml
index a2eed7818cb20..a209f63346102 100644
--- a/decidim-admin/config/locales/es-MX.yml
+++ b/decidim-admin/config/locales/es-MX.yml
@@ -12,6 +12,7 @@ es-MX:
         plural: Plural
       attachment:
         attachment_collection_id: Carpeta
+        attachments: Archivos adjuntos
         description: Descripción
         file: Archivo
         title: Nombre del adjunto o imagen
@@ -45,7 +46,7 @@ es-MX:
         alert_color: Alerta
         available_authorizations: Autorizaciones disponibles
         badges_enabled: Habilitar insignias
-        comments_max_length: Longitud máxima de los comentarios (deja 0 si quieres mantener la configuración por defecto)
+        comments_max_length: Caracteres máximos por comentario (dejar 0 para el valor predeterminado)
         customize_welcome_notification: Personalizar notificación de bienvenida
         default_locale: Idioma predeterminado
         description: Descripción
@@ -844,6 +845,7 @@ es-MX:
             invalid: Se ha producido un error al desbloquear a las participantes.
             success: Participantes desbloqueadas correctamente.
         create:
+          no_user_found: No se ha encontrado a esta participante.
           success: Participante oficializada correctamente.
         destroy:
           success: Se ha retirado correctamente la oficialización de la participante.
@@ -1070,10 +1072,10 @@ es-MX:
           next_title: Siguiente elemento
           previous: Anterior
           previous_title: Elemento anterior
-        gallery:
-          add_images: Añadir imágenes
-          edit_images: Editar imagenes
-          gallery_legend: Añadir una galería de imágenes (opccional)
+        attachments:
+          add_attachments: Agregar archivo(s) adjunto(s)
+          attachment_legend: Añadir una galería de archivos adjuntos (opcional)
+          edit_attachments: Editar los archivos adjuntos
       static_page_topics:
         create:
           error: Se ha producido un error al crear un nuevo tema.
@@ -1288,6 +1290,11 @@ es-MX:
       errors:
         impersonate_user:
           reason: Debes indicar un motivo para la gestión de una participante no gestionada.
+      file_help:
+        attachment:
+          explanation: 'Instrucciones para el archivo:'
+          message_1: Se admiten archivos CSV, JSON y Excel (.xlsx)
+          message_2: Para archivos CSV, el separador entre columnas debe ser un punto y coma (";")
     moderations:
       actions:
         expand: Expandir
diff --git a/decidim-admin/config/locales/es-PY.yml b/decidim-admin/config/locales/es-PY.yml
index 5aee3b0742303..af62cf193b508 100644
--- a/decidim-admin/config/locales/es-PY.yml
+++ b/decidim-admin/config/locales/es-PY.yml
@@ -12,6 +12,7 @@ es-PY:
         plural: Plural
       attachment:
         attachment_collection_id: Carpeta
+        attachments: Archivos adjuntos
         description: Descripción
         file: Archivo
         title: Nombre del adjunto o imagen
@@ -45,7 +46,7 @@ es-PY:
         alert_color: Alerta
         available_authorizations: Autorizaciones disponibles
         badges_enabled: Habilitar insignias
-        comments_max_length: Longitud máxima de los comentarios (deja 0 si quieres mantener la configuración por defecto)
+        comments_max_length: Caracteres máximos por comentario (dejar 0 para el valor predeterminado)
         customize_welcome_notification: Personalizar notificación de bienvenida
         default_locale: Idioma predeterminado
         description: Descripción
@@ -844,6 +845,7 @@ es-PY:
             invalid: Se ha producido un error al desbloquear a las participantes.
             success: Participantes desbloqueadas correctamente.
         create:
+          no_user_found: No se ha encontrado a esta participante.
           success: Participante oficializada correctamente.
         destroy:
           success: Se ha retirado correctamente la oficialización de la participante.
@@ -1070,10 +1072,10 @@ es-PY:
           next_title: Siguiente elemento
           previous: Anterior
           previous_title: Elemento anterior
-        gallery:
-          add_images: Añadir imágenes
-          edit_images: Editar imagenes
-          gallery_legend: Añadir una galería de imágenes (opccional)
+        attachments:
+          add_attachments: Agregar archivo(s) adjunto(s)
+          attachment_legend: Añadir una galería de archivos adjuntos (opcional)
+          edit_attachments: Editar los archivos adjuntos
       static_page_topics:
         create:
           error: Se ha producido un error al crear un nuevo tema.
@@ -1288,6 +1290,11 @@ es-PY:
       errors:
         impersonate_user:
           reason: Debes indicar un motivo para la gestión de una participante no gestionada.
+      file_help:
+        attachment:
+          explanation: 'Instrucciones para el archivo:'
+          message_1: Se admiten archivos CSV, JSON y Excel (.xlsx)
+          message_2: Para archivos CSV, el separador entre columnas debe ser un punto y coma (";")
     moderations:
       actions:
         expand: Expandir
diff --git a/decidim-admin/config/locales/es.yml b/decidim-admin/config/locales/es.yml
index 4fa874adf9ebd..a089e0908a7a6 100644
--- a/decidim-admin/config/locales/es.yml
+++ b/decidim-admin/config/locales/es.yml
@@ -12,6 +12,7 @@ es:
         plural: Plural
       attachment:
         attachment_collection_id: Carpeta
+        attachments: Archivos adjuntos
         description: Descripción
         file: Archivo
         title: Nombre del adjunto o imagen
@@ -45,7 +46,7 @@ es:
         alert_color: Alerta
         available_authorizations: Autorizaciones disponibles
         badges_enabled: Habilitar insignias
-        comments_max_length: Longitud máxima de los comentarios (deja 0 si quieres mantener la configuración por defecto)
+        comments_max_length: Caracteres máximos por comentario (dejar 0 para el valor predeterminado)
         customize_welcome_notification: Personalizar notificación de bienvenida
         default_locale: Idioma predeterminado
         description: Descripción
@@ -844,6 +845,7 @@ es:
             invalid: Se ha producido un error al desbloquear a las participantes.
             success: Participantes desbloqueadas correctamente.
         create:
+          no_user_found: No se ha encontrado a esta participante.
           success: Participante oficializada correctamente.
         destroy:
           success: Se ha retirado correctamente la oficialización de la participante.
@@ -1070,10 +1072,10 @@ es:
           next_title: Siguiente elemento
           previous: Anterior
           previous_title: Elemento anterior
-        gallery:
-          add_images: Añadir imágenes
-          edit_images: Editar imagenes
-          gallery_legend: Añadir una galería de imágenes (opcional)
+        attachments:
+          add_attachments: Agregar archivo(s) adjunto(s)
+          attachment_legend: Añadir una galería de archivos adjuntos (opcional)
+          edit_attachments: Editar los archivos adjuntos
       static_page_topics:
         create:
           error: Se ha producido un error al crear un nuevo tema.
@@ -1288,6 +1290,11 @@ es:
       errors:
         impersonate_user:
           reason: Debes indicar un motivo para la gestión de una participante no gestionada.
+      file_help:
+        attachment:
+          explanation: 'Instrucciones para el archivo:'
+          message_1: Se admiten archivos CSV, JSON y Excel (.xlsx)
+          message_2: Para archivos CSV, el separador entre columnas debe ser un punto y coma (";")
     moderations:
       actions:
         expand: Expandir
diff --git a/decidim-admin/config/locales/eu.yml b/decidim-admin/config/locales/eu.yml
index 4f84e89bce22c..915edbeab7311 100644
--- a/decidim-admin/config/locales/eu.yml
+++ b/decidim-admin/config/locales/eu.yml
@@ -12,6 +12,7 @@ eu:
         plural: Plurala
       attachment:
         attachment_collection_id: Karpeta
+        attachments: Erantsitako fitxategiak
         description: Deskribapena
         file: Fitxategia
         title: Erantsitakoaren edo irudiaren izena
@@ -45,7 +46,7 @@ eu:
         alert_color: Abisua
         available_authorizations: Baimen erabilgarriak
         badges_enabled: Gaitu garaikurrak
-        comments_max_length: Iruzkinen gehieneko luzera (utzi 0 defektuz konfigurazioa mantendu nahi baduzu)
+        comments_max_length: Iruzkin bakoitzeko gehieneko karaktereak (utzi 0 aurrez zehaztutako baliorako)
         customize_welcome_notification: Pertsonalizatu ongi etorri jakinarazpena
         default_locale: Kokapen lehenetsia
         description: Deskribapena
@@ -184,7 +185,7 @@ eu:
         configure: Konfiguratu
         confirm_delete_component: |
           Ziur zaude osagai hau ezabatu nahi duzula?
-          Osagai honek honako hauek ditu: 
+          Osagai honek honako hauek ditu:
           <ul class="list-disc ml-6 my-2">
            <li class="font-bold">%{resources_count}  resources</li>
           </ul>
@@ -233,7 +234,7 @@ eu:
           title: Editatu arlo mota
           update: Eguneratu
         new:
-          create: Sortu arlo mota
+          create: Arlo mota sortu
           title: Beste arlo mota bat
         update:
           error: Arazo bat egon da arlo mota hau eguneratzean.
@@ -393,7 +394,7 @@ eu:
           title: Zain dauden moderazioak
         show:
           dropdown: Goitibeherako zerrrenda
-          view_more_logs: Ikusi erregistro gehiago 
+          view_more_logs: Ikusi erregistro gehiago
       domain_allowlist:
         form:
           domain_too_short: Domeinu laburregia
@@ -834,7 +835,7 @@ eu:
       officializations:
         block:
           error: Arazo bat izan da parte-hartzailea blokeatzean.
-          no_user: Ez da parte-hartzailerik aurkitu 
+          no_user: Ez da parte-hartzailerik aurkitu
           success: Parte-hartzailea zuzen blokeatua.
         bulk_action:
           block:
@@ -844,6 +845,7 @@ eu:
             invalid: Arazo bat izan da parte-hartzaileak desblokeatzean.
             success: Parte-hartzaileak zuzen desblokeatuta.
         create:
+          no_user_found: Ez da Parte-hartzailerik aurkitu.
           success: Pate-hartzailea zuzen ofizializatua.
         destroy:
           success: Parte-hartzailearen ofizializazioa behar bezala desgaitua.
@@ -1070,10 +1072,10 @@ eu:
           next_title: Hurrengo elementua
           previous: Aurrekoa
           previous_title: Aurreko elementua
-        gallery:
-          add_images: Gehitu irudiak
-          edit_images: Editatu irudiak
-          gallery_legend: Gehitu irudi-galeria bat (aukerakoa)
+        attachments:
+          add_attachments: Gehitu eranskinak
+          attachment_legend: Gehitu irudi-galeria bat (aukerakoa)
+          edit_attachments: Editatu eranskinak
       static_page_topics:
         create:
           error: Arazo bat egon da beste gai bat sortzean.
@@ -1234,7 +1236,7 @@ eu:
         dashboard: Kontrol-panela
         edit_external_domains: Baimendutako kanpoko domeinuen zerrenda
         impersonatable_users: Parte-hartzaile erabilgarriak
-        impersonations: Parte-hartzaileen kudeaketa
+        impersonations: Erabiltzaileen kudeaketa
         menu: Menua
         page_topics: Gaiak
         pages: Orriak
@@ -1288,6 +1290,11 @@ eu:
       errors:
         impersonate_user:
           reason: Arrazoi bat adierazi behar duzu kudeatu gabeko parte-hartzaile bat kudeatzeko.
+      file_help:
+        attachment:
+          explanation: 'Fitxategiako jarraibieak:'
+          message_1: CSV, JSON eta Excel (.xlsx) fitxategiak onartzen dira
+          message_2: CSV fitxategietarako, zutabeen arteko bereizgailuak erdikolona (";") izan behar du
     moderations:
       actions:
         expand: Zabaldu
diff --git a/decidim-admin/config/locales/fi-plain.yml b/decidim-admin/config/locales/fi-plain.yml
index e50812f739c85..8d2a4488db734 100644
--- a/decidim-admin/config/locales/fi-plain.yml
+++ b/decidim-admin/config/locales/fi-plain.yml
@@ -844,6 +844,7 @@ fi-pl:
             invalid: Osallistujien eston peruminen epäonnistui.
             success: Osallistujien eston peruminen onnistui.
         create:
+          no_user_found: Osallistujaa ei löytynyt.
           success: Osallistujan virallistaminen onnistui.
         destroy:
           success: Osallistujan virallistamisen peruuttaminen onnistui.
@@ -868,6 +869,8 @@ fi-pl:
           badge: Virallistamismerkki
           officialize: Virallista
           title: Virallista käyttäjä "%{name}"
+        show_email:
+          no_user: Käyttäjää ei löytynyt
         show_email_modal:
           description: Jos haluat ottaa suoraan yhteyttä osallistujaan, voit klikata Näytä-painiketta nähdäksesi hänen sähköpostiosoitteensa. Tästä toiminnosta jää jälki lokiin.
           email_address: Sähköpostiosoite
@@ -1068,10 +1071,6 @@ fi-pl:
           next_title: Seuraava kohde
           previous: Edellinen
           previous_title: Edellinen kohde
-        gallery:
-          add_images: Lisää kuvia
-          edit_images: Muokkaa kuvia
-          gallery_legend: Lisää kuvagalleria (valinnainen)
       static_page_topics:
         create:
           error: Uuden aiheen luomisessa tapahtui virhe.
diff --git a/decidim-admin/config/locales/fi.yml b/decidim-admin/config/locales/fi.yml
index ad4a551eb69b7..a74dd12079d5c 100644
--- a/decidim-admin/config/locales/fi.yml
+++ b/decidim-admin/config/locales/fi.yml
@@ -12,6 +12,7 @@ fi:
         plural: Monikko
       attachment:
         attachment_collection_id: Kansio
+        attachments: Liitteet
         description: Kuvaus
         file: Tiedosto
         title: Liitetiedoston tai kuvan nimi
@@ -844,6 +845,7 @@ fi:
             invalid: Osallistujien eston peruminen epäonnistui.
             success: Osallistujien eston peruminen onnistui.
         create:
+          no_user_found: Osallistujaa ei löytynyt.
           success: Osallistujan virallistaminen onnistui.
         destroy:
           success: Osallistujan virallistamisen peruminen onnistui.
@@ -1070,10 +1072,10 @@ fi:
           next_title: Seuraava kohde
           previous: Edellinen
           previous_title: Edellinen kohde
-        gallery:
-          add_images: Lisää kuvia
-          edit_images: Muokkaa kuvia
-          gallery_legend: Lisää kuvagalleria (valinnainen)
+        attachments:
+          add_attachments: Lisää liitteitä
+          attachment_legend: Lisää liitegalleria (valinnainen)
+          edit_attachments: Muokkaa liitteitä
       static_page_topics:
         create:
           error: Uuden aiheen luonti epäonnistui.
@@ -1288,6 +1290,11 @@ fi:
       errors:
         impersonate_user:
           reason: Sinun on annettava syy, kun hallitset osallistujaa, joka ei ole hallittu osallistuja.
+      file_help:
+        attachment:
+          explanation: 'Tiedoston ohjeistus:'
+          message_1: CSV-, JSON- ja Excel-tiedostoja (.xlsx) tuetaan
+          message_2: CSV-tiedostoissa sarake-erottimen on oltava puolipiste (";")
     moderations:
       actions:
         expand: Avaa
diff --git a/decidim-admin/config/locales/fr-CA.yml b/decidim-admin/config/locales/fr-CA.yml
index 7e545bfbdb822..46783f47e9342 100644
--- a/decidim-admin/config/locales/fr-CA.yml
+++ b/decidim-admin/config/locales/fr-CA.yml
@@ -12,6 +12,7 @@ fr-CA:
         plural: Pluriel
       attachment:
         attachment_collection_id: Dossier
+        attachments: Pièces jointes
         description: Description
         file: Fichier
         title: Nom de la pièce jointe ou de l'image
@@ -45,7 +46,7 @@ fr-CA:
         alert_color: Alerte
         available_authorizations: Autorisations disponibles
         badges_enabled: Activer les badges
-        comments_max_length: Longueur max des commentaires (laisser 0 pour la valeur par défaut)
+        comments_max_length: Nombre maximum de caractères par commentaire (Laisser 0 pour la valeur par défaut)
         customize_welcome_notification: Personnaliser le mail de bienvenue
         default_locale: Langue par défaut
         description: Description
@@ -360,6 +361,7 @@ fr-CA:
           text: Recherche par email, nom ou pseudo de l'utilisateur actuel
         managed_user_name: Utilisateur représenté
         solved: Résolu
+        title: Conflits de vérification
         transfer:
           email: Email
           error: Une erreur est survenue lors du transfert de l'utilisateur actuel en utilisateur représenté.
@@ -575,6 +577,7 @@ fr-CA:
         promotions:
           new:
             explanation: Les utilisateurs représentés peuvent être promu utilisateurs standard. Cela signifie qu'ils seront invités à s'inscrire sur l'application et vous ne pourrez plus agir à leur place. L'utilisateur recevra un email pour accepter votre invitation.
+            new_managed_user_promotion: Nouvelle promotion d'un utilisateur représenté
             promote: Promouvoir
       menu:
         admin_log: Journal d'activité personnel
@@ -757,6 +760,7 @@ fr-CA:
           title: Modèles de newsletter
           use_template: Utiliser ce modèle
         show:
+          preview: 'Prévisualiser le modèle: %{template_name}'
           use_template: Utiliser ce modèle
       newsletters:
         confirm_recipients:
@@ -841,6 +845,7 @@ fr-CA:
             invalid: Une erreur s'est produite lors du déblocage des participants.
             success: Participants débloqués avec succès.
         create:
+          no_user_found: Le participant n'a pas été trouvé.
           success: Utilisateur validé avec succès.
         destroy:
           success: Validation de l'utilisateur retirée avec succès.
@@ -1067,10 +1072,10 @@ fr-CA:
           next_title: Élément suivant
           previous: Précédent
           previous_title: Élément précédent
-        gallery:
-          add_images: Ajouter des images
-          edit_images: Modifier les images
-          gallery_legend: Ajouter une galerie d'images (facultatif)
+        attachments:
+          add_attachments: Ajouter des pièces jointes
+          attachment_legend: Ajouter une galerie de pièces jointes (facultatif)
+          edit_attachments: Modifier les pièces jointes
       static_page_topics:
         create:
           error: Une erreur s'est produite lors de la création d'un nouveau sujet.
@@ -1140,7 +1145,9 @@ fr-CA:
         filters:
           search_placeholder: Rechercher
         index:
+          description: Les taxonomies et les filtres permettent aux administrateurs de trier et d'organiser le contenu. Par exemple, ajoutez une taxonomie avec les arrondissements et quartiers de la ville et créez ensuite des filtres uniquement avec les arrondissements ou pour un quartier spécifique.
           new_taxonomy: Nouvelle taxonomie
+          no_items_found: Aucune taxonomie trouvée correspondant aux critères de recherche.
         name: Nom
         new:
           create: Créer la taxonomie
@@ -1149,6 +1156,8 @@ fr-CA:
         table:
           to_next_page: Faites glisser pour passer à la page suivante
           to_prev_page: Faites glisser pour passer à la page précédente
+        taxonomy_actions:
+          confirm_destroy: 'Êtes-vous sûr de vouloir supprimer %{name}? Cela supprimera également tous les éléments enfants. NOTE : Les ressources qui utilisent cette taxonomie ne seront pas affectées, mais elles perdront la référence à cette taxonomie.'
         total_filters: Filtres
         total_items: Éléments de la taxonomie
         update:
@@ -1164,11 +1173,20 @@ fr-CA:
         create:
           error: Un problème a été rencontré lors de la création de ce filtre de taxonomie.
           success: Filtre de taxonomie créé avec succès.
+        destroy:
+          error: Un problème a été rencontré lors de la suppression de ce filtre de taxonomie.
+          success: Filtre de taxonomie supprimé avec succès.
         edit:
           back: Revenir en arrière
           title: Modifier le filtre de taxonomie
           update: Mettre à jour le filtre de taxonomie
         form:
+          all: Toutes
+          items:
+            one: "{count} élément sélectionné"
+            other: "{count} éléments sélectionnés"
+          name_help: Le titre du filtre à afficher dans l'interface publique.
+          no_items: Aucun élément n'est disponible pour cette taxonomie. Vous pouvez créer des éléments dans les paramètres de configuration de taxonomie.
           space_filter: Disponible comme filtre pour
         index:
           description: Un filtre de taxonomie permet aux administrateurs de trier et de filtrer les espaces participatifs selon une taxonomie. Par exemple, ajoutez un filtre de taxonomie pour trier les processus par étendue géographique.
@@ -1181,6 +1199,7 @@ fr-CA:
         table:
           actions: Actions
           components_count: Composants utilisant ceci
+          confirm_destroy: 'Êtes-vous sûr de vouloir supprimer le filtre %{name}? NOTE : Les ressources qui utilisent ce filtre ne seront pas affectées, mais elles perdront la référence à ce filtre.'
           destroy: Supprimer
           edit: Modifier
         update:
@@ -1188,6 +1207,7 @@ fr-CA:
           success: Filtre de taxonomie mis à jour avec succès.
       taxonomy_filters_selector:
         new:
+          add_new_items_html: Si vous avez besoin de définir un nouveau filtre ou un nouvel élément, faites-le dans <a href="%{url}">les paramètres de configuration</a>.
           items_count: "%{count} éléments"
           save: Enregistrer
         show:
@@ -1196,12 +1216,24 @@ fr-CA:
         taxonomies_select:
           filters: Filtres
           select_filter: Sélectionnez un filtre
+          select_taxonomy: Sélectionner une taxonomie
           taxonomies: Taxonomies
+      taxonomy_items:
+        edit:
+          title: Modifier l'élément dans %{taxonomy}
+          update: Mettre l'élément à jour
+        new:
+          create: Créer l'élément
+          none: Aucune
+          title: Nouvel élément dans %{taxonomy}
       titles:
+        admin_log: Journal d'administration
         area_types: Types de périmètre d'assemblée
         areas: Zones d'application
         authorization_workflows: Méthodes de vérification
+        dashboard: Tableau de bord
         edit_external_domains: Liste des domaines externes autorisés
+        impersonatable_users: Utilisateurs pouvant être représentés
         impersonations: Gestion des utilisateurs
         menu: Menu
         page_topics: Sujets
@@ -1212,6 +1244,8 @@ fr-CA:
         scopes: Périmètres d'application
         statistics: Statistiques
         taxonomies: Taxonomies
+        taxonomy_filters: Filtres de taxonomie pour "%{taxonomy}"
+        users: Administrateurs
       tooltips:
         cannot_destroy_taxonomy_filter: Impossible de détruire ce filtre de taxonomie
         cannot_edit_taxonomy_filter: Impossible de modifier ce filtre de taxonomie
@@ -1254,6 +1288,11 @@ fr-CA:
       errors:
         impersonate_user:
           reason: Vous devez fournir une raison lorsque vous représentez un participant non représenté.
+      file_help:
+        attachment:
+          explanation: 'Instructions concernant le fichier :'
+          message_1: Les fichiers CSV, JSON et Excel (.xlsx) sont pris en charge
+          message_2: Pour les fichiers CSV, le séparateur entre les colonnes doit être un point-virgule (";")
     moderations:
       actions:
         expand: Agrandir
@@ -1268,13 +1307,18 @@ fr-CA:
         reportable:
           bulk_action:
             hide:
+              failed: 'Une erreur est survenue lors du masquage de certaines ressouces: %{errored}'
               invalid: Aucune modération sélectionnée.
               success: Ressources cachées avec succès.
             ignore:
               invalid: Aucune modération d'utilisateur sélectionnée.
+              success: Participants dé-signalés avec succès.
             unhide:
+              failed: 'Une erreur est survenue lors du dé-masquage de certaines ressouces: %{errored}'
               invalid: Aucune modération sélectionnée.
+              success: Ressource dé-masquée avec succès.
             unreport:
+              failed: 'Un problème a été rencontré lors du dé-signalement de certaines ressources %{errored}'
               invalid: Aucune modération sélectionnée.
           hide:
             invalid: Il y a eu un problème au moment de masquer le contenu.
diff --git a/decidim-admin/config/locales/fr.yml b/decidim-admin/config/locales/fr.yml
index 02b9272bcbea9..13af5289b4f80 100644
--- a/decidim-admin/config/locales/fr.yml
+++ b/decidim-admin/config/locales/fr.yml
@@ -12,6 +12,7 @@ fr:
         plural: Pluriel
       attachment:
         attachment_collection_id: Dossier
+        attachments: Pièces jointes
         description: Description
         file: Fichier
         title: Nom de la pièce jointe ou de l'image
@@ -45,7 +46,7 @@ fr:
         alert_color: Alerte
         available_authorizations: Autorisations disponibles
         badges_enabled: Activer les badges
-        comments_max_length: Longueur max des commentaires (laisser 0 pour la valeur par défaut)
+        comments_max_length: Nombre maximum de caractères par commentaire (Laisser 0 pour la valeur par défaut)
         customize_welcome_notification: Personnaliser le mail de bienvenue
         default_locale: Langue par défaut
         description: Description
@@ -360,6 +361,7 @@ fr:
           text: Recherche par email, nom ou pseudo de l'utilisateur actuel
         managed_user_name: Utilisateur représenté
         solved: Résolu
+        title: Conflits de vérification
         transfer:
           email: Email
           error: Une erreur est survenue lors du transfert de l'utilisateur actuel en utilisateur représenté.
@@ -575,6 +577,7 @@ fr:
         promotions:
           new:
             explanation: Les utilisateurs représentés peuvent être promu utilisateurs standard. Cela signifie qu'ils seront invités à s'inscrire sur l'application et vous ne pourrez plus agir à leur place. L'utilisateur recevra un email pour accepter votre invitation.
+            new_managed_user_promotion: Nouvelle promotion d'un utilisateur représenté
             promote: Promouvoir
       menu:
         admin_log: Journal d'activité personnel
@@ -757,6 +760,7 @@ fr:
           title: Modèles de newsletter
           use_template: Utiliser ce modèle
         show:
+          preview: 'Prévisualiser le modèle: %{template_name}'
           use_template: Utiliser ce modèle
       newsletters:
         confirm_recipients:
@@ -841,6 +845,7 @@ fr:
             invalid: Une erreur s'est produite lors du déblocage des participants.
             success: Participants débloqués avec succès.
         create:
+          no_user_found: Le participant n'a pas été trouvé.
           success: Utilisateur validé avec succès.
         destroy:
           success: Validation de l'utilisateur retirée avec succès.
@@ -1067,10 +1072,10 @@ fr:
           next_title: Élément suivant
           previous: Précédent
           previous_title: Élément précédent
-        gallery:
-          add_images: Ajouter des images
-          edit_images: Modifier les images
-          gallery_legend: Ajouter une galerie d'images (facultatif)
+        attachments:
+          add_attachments: Ajouter des pièces jointes
+          attachment_legend: Ajouter une galerie de pièces jointes (facultatif)
+          edit_attachments: Modifier les pièces jointes
       static_page_topics:
         create:
           error: Une erreur s'est produite lors de la création d'un nouveau sujet.
@@ -1140,7 +1145,9 @@ fr:
         filters:
           search_placeholder: Rechercher
         index:
+          description: Les taxonomies et les filtres permettent aux administrateurs de trier et d'organiser le contenu. Par exemple, ajoutez une taxonomie avec les arrondissements et quartiers de la ville et créez ensuite des filtres uniquement avec les arrondissements ou pour un quartier spécifique.
           new_taxonomy: Nouvelle taxonomie
+          no_items_found: Aucune taxonomie trouvée correspondant aux critères de recherche.
         name: Nom
         new:
           create: Créer la taxonomie
@@ -1149,6 +1156,8 @@ fr:
         table:
           to_next_page: Faites glisser pour passer à la page suivante
           to_prev_page: Faites glisser pour passer à la page précédente
+        taxonomy_actions:
+          confirm_destroy: 'Êtes-vous sûr de vouloir supprimer %{name}? Cela supprimera également tous les éléments enfants. NOTE : Les ressources qui utilisent cette taxonomie ne seront pas affectées, mais elles perdront la référence à cette taxonomie.'
         total_filters: Filtres
         total_items: Éléments de la taxonomie
         update:
@@ -1164,11 +1173,20 @@ fr:
         create:
           error: Un problème a été rencontré lors de la création de ce filtre de taxonomie.
           success: Filtre de taxonomie créé avec succès.
+        destroy:
+          error: Un problème a été rencontré lors de la suppression de ce filtre de taxonomie.
+          success: Filtre de taxonomie supprimé avec succès.
         edit:
           back: Revenir en arrière
           title: Modifier le filtre de taxonomie
           update: Mettre à jour le filtre de taxonomie
         form:
+          all: Toutes
+          items:
+            one: "{count} élément sélectionné"
+            other: "{count} éléments sélectionnés"
+          name_help: Le titre du filtre à afficher dans l'interface publique.
+          no_items: Aucun élément n'est disponible pour cette taxonomie. Vous pouvez créer des éléments dans les paramètres de configuration de taxonomie.
           space_filter: Disponible comme filtre pour
         index:
           description: Un filtre de taxonomie permet aux administrateurs de trier et de filtrer les espaces participatifs selon une taxonomie. Par exemple, ajoutez un filtre de taxonomie pour trier les processus par étendue géographique.
@@ -1181,6 +1199,7 @@ fr:
         table:
           actions: Actions
           components_count: Composants utilisant ceci
+          confirm_destroy: 'Êtes-vous sûr de vouloir supprimer le filtre %{name}? NOTE : Les ressources qui utilisent ce filtre ne seront pas affectées, mais elles perdront la référence à ce filtre.'
           destroy: Supprimer
           edit: Modifier
         update:
@@ -1188,6 +1207,7 @@ fr:
           success: Filtre de taxonomie mis à jour avec succès.
       taxonomy_filters_selector:
         new:
+          add_new_items_html: Si vous avez besoin de définir un nouveau filtre ou un nouvel élément, faites-le dans <a href="%{url}">les paramètres de configuration</a>.
           items_count: "%{count} éléments"
           save: Enregistrer
         show:
@@ -1196,12 +1216,24 @@ fr:
         taxonomies_select:
           filters: Filtres
           select_filter: Sélectionnez un filtre
+          select_taxonomy: Sélectionner une taxonomie
           taxonomies: Taxonomies
+      taxonomy_items:
+        edit:
+          title: Modifier l'élément dans %{taxonomy}
+          update: Mettre l'élément à jour
+        new:
+          create: Créer l'élément
+          none: Aucune
+          title: Nouvel élément dans %{taxonomy}
       titles:
+        admin_log: Journal d'administration
         area_types: Types de périmètre d'assemblée
         areas: Périmètres d'assemblée
         authorization_workflows: Méthodes de vérification
+        dashboard: Tableau de bord
         edit_external_domains: Liste des domaines externes autorisés
+        impersonatable_users: Utilisateurs pouvant être représentés
         impersonations: Gestion des utilisateurs
         menu: Menu
         page_topics: Sujets
@@ -1212,6 +1244,8 @@ fr:
         scopes: Secteurs
         statistics: Statistiques
         taxonomies: Taxonomies
+        taxonomy_filters: Filtres de taxonomie pour "%{taxonomy}"
+        users: Administrateurs
       tooltips:
         cannot_destroy_taxonomy_filter: Impossible de détruire ce filtre de taxonomie
         cannot_edit_taxonomy_filter: Impossible de modifier ce filtre de taxonomie
@@ -1254,6 +1288,11 @@ fr:
       errors:
         impersonate_user:
           reason: Vous devez fournir une raison lorsque vous représentez un participant non représenté.
+      file_help:
+        attachment:
+          explanation: 'Instructions concernant le fichier :'
+          message_1: Les fichiers CSV, JSON et Excel (.xlsx) sont pris en charge
+          message_2: Pour les fichiers CSV, le séparateur entre les colonnes doit être un point-virgule (";")
     moderations:
       actions:
         expand: Agrandir
@@ -1268,13 +1307,18 @@ fr:
         reportable:
           bulk_action:
             hide:
+              failed: 'Une erreur est survenue lors du masquage de certaines ressouces: %{errored}'
               invalid: Aucune modération sélectionnée.
               success: Ressources cachées avec succès.
             ignore:
               invalid: Aucune modération d'utilisateur sélectionnée.
+              success: Participants dé-signalés avec succès.
             unhide:
+              failed: 'Une erreur est survenue lors du dé-masquage de certaines ressouces: %{errored}'
               invalid: Aucune modération sélectionnée.
+              success: Ressource dé-masquée avec succès.
             unreport:
+              failed: 'Un problème a été rencontré lors du dé-signalement de certaines ressources %{errored}'
               invalid: Aucune modération sélectionnée.
           hide:
             invalid: Il y a eu un problème au moment de masquer le contenu.
diff --git a/decidim-admin/config/locales/gl.yml b/decidim-admin/config/locales/gl.yml
index 06f818f15a9e7..5406f2a284fcb 100644
--- a/decidim-admin/config/locales/gl.yml
+++ b/decidim-admin/config/locales/gl.yml
@@ -34,7 +34,6 @@ gl:
         alert_color: Alerta
         available_authorizations: Autorizacións dispoñíbeis
         badges_enabled: Activar emblemas
-        comments_max_length: Lonxitude máxima dos comentarios (0 para valor predefinido)
         customize_welcome_notification: Personalizar a notificación de benvida
         default_locale: Configuración predeterminada
         description: Descrición
@@ -683,11 +682,6 @@ gl:
       share_tokens:
         actions:
           destroy: Eliminar
-      shared:
-        gallery:
-          add_images: Engadir imaxes
-          edit_images: Editar imaxes
-          gallery_legend: Engadir unha galería de imaxes (opcional)
       static_page_topics:
         create:
           error: Produciuse un erro ao crear un tema novo.
diff --git a/decidim-admin/config/locales/he-IL.yml b/decidim-admin/config/locales/he-IL.yml
index f84ce64e44df8..52e3b01c6c9ab 100644
--- a/decidim-admin/config/locales/he-IL.yml
+++ b/decidim-admin/config/locales/he-IL.yml
@@ -44,7 +44,6 @@ he:
         alert_color: התראה
         available_authorizations: הרשאות זמינות
         badges_enabled: אפשר תגיות
-        comments_max_length: אורך מקסימלי לתגובות (השאירו 0 לערך ברירת המחדל)
       participatory_space_private_user:
         name: שם
       participatory_space_private_user_csv_import:
diff --git a/decidim-admin/config/locales/hu.yml b/decidim-admin/config/locales/hu.yml
index 401de1853b19a..0475e9f615e78 100644
--- a/decidim-admin/config/locales/hu.yml
+++ b/decidim-admin/config/locales/hu.yml
@@ -44,7 +44,6 @@ hu:
         alert_color: Figyelmeztetés
         available_authorizations: Elérhető authorizációk
         badges_enabled: Jelvények engedélyezése
-        comments_max_length: Kommentek maximális hossza (Hagyjon 0 -t az alapértékhez)
         customize_welcome_notification: Az üdvözlő értesítések testreszabása
         default_locale: Alapértelmezett hely
         description: Leírás
@@ -822,11 +821,6 @@ hu:
       share_tokens:
         actions:
           destroy: Törlés
-      shared:
-        gallery:
-          add_images: Képek hozzáadása
-          edit_images: Kép szerkesztése
-          gallery_legend: Képgaléria hozzáadása (opcionális)
       static_page_topics:
         create:
           error: Hiba történt egy új téma létrehozásakor.
diff --git a/decidim-admin/config/locales/it.yml b/decidim-admin/config/locales/it.yml
index c95dcea091094..ba16d911d55d4 100644
--- a/decidim-admin/config/locales/it.yml
+++ b/decidim-admin/config/locales/it.yml
@@ -44,7 +44,6 @@ it:
         alert_color: Notifica
         available_authorizations: Autorizzazioni disponibili
         badges_enabled: Abilita badge
-        comments_max_length: Lunghezza massima dei commenti (Lasciare 0 per il valore predefinito)
         customize_welcome_notification: Personalizza la notifica di benvenuto
         default_locale: Lingua predefinita
         description: Descrizione
@@ -979,9 +978,6 @@ it:
         adjacent_navigation:
           next: Successivo
           next_title: Articolo successivo
-        gallery:
-          add_images: Aggiungi immagini
-          gallery_legend: Aggiungi una galleria di immagini (opzionale)
       static_page_topics:
         create:
           error: Si è verificato un errore durante la creazione di un nuovo argomento.
diff --git a/decidim-admin/config/locales/ja.yml b/decidim-admin/config/locales/ja.yml
index bf95fa1109dd2..9ce840c153ec8 100644
--- a/decidim-admin/config/locales/ja.yml
+++ b/decidim-admin/config/locales/ja.yml
@@ -45,7 +45,7 @@ ja:
         alert_color: アラート
         available_authorizations: 利用可能な認証方式
         badges_enabled: バッジを有効にする
-        comments_max_length: コメント最大長 (デフォルト値は 0 のまま)
+        comments_max_length: 各コメントの最大文字数 (0はデフォルト値のまま)
         customize_welcome_notification: ウェルカム通知をカスタマイズ
         default_locale: 既定のロケール：
         description: 説明
@@ -829,6 +829,7 @@ ja:
       officializations:
         block:
           error: 参加者のブロック中に問題が発生しました。
+          no_user: ユーザーが見つかりません
           success: 参加者をブロックしました。
         bulk_action:
           block:
@@ -838,6 +839,7 @@ ja:
             invalid: 参加者のブロック解除中に問題が発生しました。
             success: 参加者のブロックを解除しました。
         create:
+          no_user_found: 参加者が見つかりません。
           success: 参加者が公式化されました。
         destroy:
           success: 参加者が非公式化されました。
@@ -862,6 +864,8 @@ ja:
           badge: 公式バッジ
           officialize: 公式化
           title: 参加者 "%{name} " を正規化
+        show_email:
+          no_user: ユーザーが見つかりません
         show_email_modal:
           description: 直接参加者に連絡する必要がある場合、彼らの電子メールアドレスを見るために表示ボタンをクリックしてください。このアクションは記録されます。
           email_address: メールアドレス
@@ -956,7 +960,7 @@ ja:
             explanation: '%{count} 人のプライベート参加者がいます。'
             title: プライベート参加者を削除
           example_file: 'サンプルファイル：'
-          explanation: "CSVファイルをアップロードしてください。ファイルには2つの列が必要で、1列目にはメールアドレス、最後の列には参加スペースに追加したいユーザーの名前を入力してください。ヘッダー行は不要です。ユーザー名には、`<>?%&^*#@()[]=+:;\"{}\\|`などの無効な文字を使用しないでください。\n"
+          explanation: "CSVファイルをアップロードしてください。ファイルには2つの列が必要で、1列目にはメールアドレス、最後の列には参加スペースに追加したいユーザーの名前を入力してください。ヘッダー行は不要です。ユーザー名には、`<>?%&^*#@()[]=+:;\"{}\\\\|`などの無効な文字を使用しないでください。\n"
           explanation_example: |
             john.doe@example.org%{csv_col_sep}John Doe
             jane.doe@example.org%{csv_col_sep}Jane Doe
@@ -1060,10 +1064,6 @@ ja:
           next_title: 次の項目
           previous: 前へ
           previous_title: 前の項目
-        gallery:
-          add_images: 画像を追加
-          edit_images: 画像を編集
-          gallery_legend: 画像ギャラリーを追加 (オプション)
       static_page_topics:
         create:
           error: 新しいトピックを作成中に問題が発生しました。
@@ -1153,7 +1153,7 @@ ja:
           success: タクソノミーを更新しました。
       taxonomy_filters:
         actions:
-          new_taxonomy_filter: 新規タクソノミフィルター
+          new_taxonomy_filter: 新規分類フィルター
         breadcrumb:
           edit: フィルターの編集
           filters: フィルター
diff --git a/decidim-admin/config/locales/kaa.yml b/decidim-admin/config/locales/kaa.yml
index b0b7f91a141e5..4f13867a5140d 100644
--- a/decidim-admin/config/locales/kaa.yml
+++ b/decidim-admin/config/locales/kaa.yml
@@ -170,10 +170,6 @@ kaa:
       share_tokens:
         actions:
           destroy: Óshiriw
-      shared:
-        gallery:
-          add_images: Súwretlerdi qosıw
-          edit_images: Súwretlerdi ózgertiw
       static_pages:
         edit:
           update: Jańalaw
diff --git a/decidim-admin/config/locales/ko.yml b/decidim-admin/config/locales/ko.yml
index 4d012560cba47..ed20c4860a197 100644
--- a/decidim-admin/config/locales/ko.yml
+++ b/decidim-admin/config/locales/ko.yml
@@ -35,7 +35,6 @@ ko:
       organization:
         alert_color: 알림
         badges_enabled: 뱃지 활성화
-        comments_max_length: 댓글 최대 길이(기본값은 0으로 남김)
         customize_welcome_notification: 환영 알림 커스터마이징
         default_locale: 기본 위치
         description: 상세정보
@@ -569,11 +568,6 @@ ko:
       share_tokens:
         actions:
           destroy: 삭제
-      shared:
-        gallery:
-          add_images: 이미지 추가
-          edit_images: 이미지 편집
-          gallery_legend: 이미지 갤러리 추가하기 (선택사항)
       static_page_topics:
         update:
           success: 주제가 성공적으로 업데이트되었습니다
diff --git a/decidim-admin/config/locales/lb.yml b/decidim-admin/config/locales/lb.yml
index 2a3d521ae7467..64b7f758b54e5 100644
--- a/decidim-admin/config/locales/lb.yml
+++ b/decidim-admin/config/locales/lb.yml
@@ -34,7 +34,6 @@ lb:
         alert_color: Benachrichtigung
         available_authorizations: Verfügbare Autorisierungen
         badges_enabled: Abzeichen aktivieren
-        comments_max_length: Maximale Länge der Kommentare (0 für Standardwert)
         customize_welcome_notification: Willkommens-Benachrichtigung anpassen
         default_locale: Standardgebietsschema
         description: Beschreibung
@@ -644,10 +643,6 @@ lb:
       share_tokens:
         actions:
           destroy: Löschen
-      shared:
-        gallery:
-          add_images: Bilder hinzufügen
-          gallery_legend: Bildergalerie hinzufügen (Optional)
       static_page_topics:
         create:
           error: Beim Erstellen eines neuen Themas ist ein Fehler aufgetreten.
diff --git a/decidim-admin/config/locales/lt.yml b/decidim-admin/config/locales/lt.yml
index 72e922607eeb9..709f93ea4f205 100644
--- a/decidim-admin/config/locales/lt.yml
+++ b/decidim-admin/config/locales/lt.yml
@@ -42,7 +42,6 @@ lt:
         alert_color: Įspėjimas
         available_authorizations: Leidžiamos autorizacijos
         badges_enabled: Aktyvinti ženklelius
-        comments_max_length: Maksimalus komentarų ilgis (numatytoji vertė – 0)
         customize_welcome_notification: Individualizuoti pasisveikinimo pranešimą
         default_locale: Numatytoji lokalė
         description: Aprašymas
@@ -795,11 +794,6 @@ lt:
       share_tokens:
         actions:
           destroy: Ištrinti
-      shared:
-        gallery:
-          add_images: Pridėti paveikslėlių
-          edit_images: Redaguoti paveikslėlį
-          gallery_legend: Pridėti paveikslėlių galeriją (Neprivaloma)
       static_page_topics:
         create:
           error: Kuriant naują temą iškilo problema.
diff --git a/decidim-admin/config/locales/lv.yml b/decidim-admin/config/locales/lv.yml
index e369a585679bb..2819838ea9dd0 100644
--- a/decidim-admin/config/locales/lv.yml
+++ b/decidim-admin/config/locales/lv.yml
@@ -498,10 +498,6 @@ lv:
         update:
           error: Tvēruma atjaunināšanas laikā radās problēma.
           success: Tvērums ir veiksmīgi atjaunināts
-      shared:
-        gallery:
-          add_images: Pievienot attēlus
-          gallery_legend: Pievienojiet attēlu galeriju (pēc izvēles)
       static_page_topics:
         create:
           error: Tēmas izveides laikā radās problēma.
diff --git a/decidim-admin/config/locales/nl.yml b/decidim-admin/config/locales/nl.yml
index 655b47322f252..3042d7724859d 100644
--- a/decidim-admin/config/locales/nl.yml
+++ b/decidim-admin/config/locales/nl.yml
@@ -34,7 +34,6 @@ nl:
         alert_color: Alarm
         available_authorizations: Beschikbare autorisaties
         badges_enabled: Schakel badges in
-        comments_max_length: Commentaar maximale lengte (laat 0 voor standaard waarde)
         customize_welcome_notification: Pas welkomstmelding aan
         default_locale: Standaard taal
         description: Beschrijving
@@ -704,11 +703,6 @@ nl:
       share_tokens:
         actions:
           destroy: Verwijderen
-      shared:
-        gallery:
-          add_images: Afbeeldingen toevoegen
-          edit_images: Bewerk afbeeldingen
-          gallery_legend: Voeg een afbeeldingsgalerij toe (optioneel)
       static_page_topics:
         create:
           error: Er is een fout opgetreden bij het maken van een nieuw onderwerp.
diff --git a/decidim-admin/config/locales/no.yml b/decidim-admin/config/locales/no.yml
index e3bb258f46b09..7fe5050a9ac4a 100644
--- a/decidim-admin/config/locales/no.yml
+++ b/decidim-admin/config/locales/no.yml
@@ -34,7 +34,6 @@
         alert_color: Varsel
         available_authorizations: Tilgjengelige autorisasjoner
         badges_enabled: Aktiver utmerkelse
-        comments_max_length: Maks lengde på kommentarer (Sett 0 for standardverdi)
         customize_welcome_notification: Tilpass dine velkomstvarsler
         default_locale: Standardspråk
         description: Beskrivelse
@@ -709,11 +708,6 @@
       share_tokens:
         actions:
           destroy: Slett
-      shared:
-        gallery:
-          add_images: Legg til bilder
-          edit_images: Rediger bilder
-          gallery_legend: Legg til et bildegalleri (valgfritt)
       static_page_topics:
         create:
           error: Det oppstod et problem med å opprette et nytt emne.
diff --git a/decidim-admin/config/locales/pl.yml b/decidim-admin/config/locales/pl.yml
index 3b7c4aadc5aa8..734c0953098d6 100644
--- a/decidim-admin/config/locales/pl.yml
+++ b/decidim-admin/config/locales/pl.yml
@@ -45,7 +45,6 @@ pl:
         alert_color: Powiadomienie
         available_authorizations: Dostępne formy uwierzytelniania
         badges_enabled: Włącz odznaki
-        comments_max_length: Maksymalna długość komentarza (pozostaw 0 dla wartości domyślnej)
         customize_welcome_notification: Dostosuj treść komunikatu powitalnego
         default_locale: Domyślny język
         description: Opis
@@ -852,10 +851,6 @@ pl:
           next_title: Następny element
           previous: Poprzedni
           previous_title: Poprzedni element
-        gallery:
-          add_images: Dodaj obrazy
-          edit_images: Edytuj obrazy
-          gallery_legend: Dodaj galerię obrazów (opcjonalnie)
       static_page_topics:
         create:
           error: Wystąpił błąd podczas tworzenia nowego tematu.
diff --git a/decidim-admin/config/locales/pt-BR.yml b/decidim-admin/config/locales/pt-BR.yml
index a1b647315e49b..b9d213131f559 100644
--- a/decidim-admin/config/locales/pt-BR.yml
+++ b/decidim-admin/config/locales/pt-BR.yml
@@ -45,7 +45,6 @@ pt-BR:
         alert_color: Alerta
         available_authorizations: Autorizações disponíveis
         badges_enabled: Ativar emblemas
-        comments_max_length: Tamanho máximo de comentários (deixe 0 para o valor padrão)
         customize_welcome_notification: Personalizar notificação de boas-vindas
         default_locale: Idioma padrão
         description: Descrição
@@ -211,11 +210,11 @@ pt-BR:
         view_deleted_components: Visualizar componentes excluídos
       admin_terms_of_service:
         accept:
-          error: Houve um erro ao aceitar os termos de serviço de administrador. 
+          error: Houve um erro ao aceitar os termos de serviço de administrador.
           success: Ótimo! Você aceitou os termos de uso do administrador.
         actions:
           accept: Concordo com estes termos
-          are_you_sure: Tem certeza que deseja negar os termos de Serviço para administrador? 
+          are_you_sure: Tem certeza que deseja negar os termos de Serviço para administrador?
           refuse: Recusar os termos de administrador
           title: "Concordo com os termos de serviço\n"
         required_review:
@@ -1066,10 +1065,6 @@ pt-BR:
           next_title: Próximo item
           previous: Anterior
           previous_title: Item anterior
-        gallery:
-          add_images: Adicione imagens
-          edit_images: Editar imagens
-          gallery_legend: Adicionar uma galeria de imagens (Opcional)
       static_page_topics:
         create:
           error: Ocorreu um erro ao criar um novo tópico.
diff --git a/decidim-admin/config/locales/pt.yml b/decidim-admin/config/locales/pt.yml
index 0918f68bf577b..dd569f2a76868 100644
--- a/decidim-admin/config/locales/pt.yml
+++ b/decidim-admin/config/locales/pt.yml
@@ -34,7 +34,6 @@ pt:
         alert_color: Alerta
         available_authorizations: Autorizações disponíveis
         badges_enabled: Ativar distintivos
-        comments_max_length: Comprimento máximo dos comentários (Deixar 0 para o valor predefinido)
         customize_welcome_notification: Personalizar a notificação de boas-vindas
         default_locale: Idioma por defeito
         description: Descrição
@@ -669,10 +668,6 @@ pt:
       share_tokens:
         actions:
           destroy: Eliminar
-      shared:
-        gallery:
-          add_images: Adicionar imagens
-          gallery_legend: Adicionar uma galeria de imagens (Opcional)
       static_page_topics:
         create:
           error: Ocorreu um problema ao criar um novo tópico.
diff --git a/decidim-admin/config/locales/ro-RO.yml b/decidim-admin/config/locales/ro-RO.yml
index fc97c9ef272e3..b120dfb4394ab 100644
--- a/decidim-admin/config/locales/ro-RO.yml
+++ b/decidim-admin/config/locales/ro-RO.yml
@@ -44,7 +44,6 @@ ro:
         alert_color: Alertă
         available_authorizations: Autorizații disponibile
         badges_enabled: Activează insigne
-        comments_max_length: Lungimea maximă a comentariilor (Lasă 0 pentru valoarea implicită)
         customize_welcome_notification: Personalizați notificarea de bun venit
         default_locale: Localizare implicită
         description: Descriere
@@ -800,11 +799,6 @@ ro:
         index:
           copied: Link de acces copiat!
           title: 'Link-uri de acces pentru: %{name}'
-      shared:
-        gallery:
-          add_images: Adaugă imagini
-          edit_images: Editare imagini
-          gallery_legend: Adaugă o galerie de imagini (opțional)
       static_page_topics:
         create:
           error: A apărut o problemă la crearea unui subiect nou.
diff --git a/decidim-admin/config/locales/sk.yml b/decidim-admin/config/locales/sk.yml
index 91eea04f3112c..ef24cd869410c 100644
--- a/decidim-admin/config/locales/sk.yml
+++ b/decidim-admin/config/locales/sk.yml
@@ -45,7 +45,6 @@ sk:
         alert_color: Upozornenie
         available_authorizations: Dostupné autorizácie
         badges_enabled: Povoliť odznaky
-        comments_max_length: Maximálna dĺžka komentárov (Ponechajte 0 pre predvolenú hodnotu)
         customize_welcome_notification: Prispôsobte uvítanie
         default_locale: Predvolený jazyk
         description: Popis
@@ -165,7 +164,7 @@ sk:
         client_id: ID klienta
         client_secret: Tajný kľúč klienta
         organization_name: Názov organizácie
-        organization_url: Odkaz na stránku organizácie 
+        organization_url: Odkaz na stránku organizácie
         redirect_uri: Presmerovanie URI
         site: Webstránka
   decidim:
@@ -1079,10 +1078,8 @@ sk:
           next_title: Nasledujúca položka
           previous: Predchádzajúci
           previous_title: Predchádzajúca položka
-        gallery:
-          add_images: Pridať obrázky
-          edit_images: Upraviť obrázky
-          gallery_legend: Pridať galériu (voliteľné)
+        attachments:
+          add_attachments: Nové prílohy
       static_page_topics:
         create:
           error: Pri tvorbe novej témy nastala chyba.
diff --git a/decidim-admin/config/locales/sl.yml b/decidim-admin/config/locales/sl.yml
index 213a360a3b1d5..6fce34a0a3a45 100644
--- a/decidim-admin/config/locales/sl.yml
+++ b/decidim-admin/config/locales/sl.yml
@@ -31,7 +31,6 @@ sl:
       organization:
         alert_color: Opozorilo
         badges_enabled: Omogoči značke
-        comments_max_length: Maksimalna dolžina komentarjev (0 je privzeta)
         customize_welcome_notification: Priredi obvestilo dobrodošlice
         default_locale: Privzeto območje
         description: Opis
diff --git a/decidim-admin/config/locales/sq-AL.yml b/decidim-admin/config/locales/sq-AL.yml
index 2560375738d7a..c11d35464cf54 100644
--- a/decidim-admin/config/locales/sq-AL.yml
+++ b/decidim-admin/config/locales/sq-AL.yml
@@ -44,7 +44,6 @@ sq:
         alert_color: Paralajmërim
         available_authorizations: Autorizimet në dispozicion
         badges_enabled: Aktivizo emblemat
-        comments_max_length: Madhësia maks. e komenteve(0 për vlerën e paracaktuar)
         customize_welcome_notification: Personalizo njoftimin e mirëseardhjes
         default_locale: Lokalizimi i parazgjedhur
         description: Përshkrimi
diff --git a/decidim-admin/config/locales/sr-CS.yml b/decidim-admin/config/locales/sr-CS.yml
index 9d00a72849ae3..bc33769e50a69 100644
--- a/decidim-admin/config/locales/sr-CS.yml
+++ b/decidim-admin/config/locales/sr-CS.yml
@@ -454,10 +454,6 @@ sr:
           update: Ažuriraj
         new:
           create: Stvori
-      shared:
-        gallery:
-          add_images: Dodaj slike
-          gallery_legend: Dodaj galeriju slika (opciono)
       titles:
         area_types: Tipovi oblasti
         pages: Stranice
diff --git a/decidim-admin/config/locales/sv.yml b/decidim-admin/config/locales/sv.yml
index 37973ae837d09..3dab698e985ec 100644
--- a/decidim-admin/config/locales/sv.yml
+++ b/decidim-admin/config/locales/sv.yml
@@ -45,7 +45,6 @@ sv:
         alert_color: Larm
         available_authorizations: Tillgängliga auktoriseringar
         badges_enabled: Aktivera märken
-        comments_max_length: Maximal kommentarslängd (ange 0 för att använda standardvärdet)
         customize_welcome_notification: Anpassa välkomstmeddelande
         default_locale: Förvalt språk och region
         description: Beskrivning
@@ -837,6 +836,7 @@ sv:
             invalid: Det gick inte att avblockera deltagarna.
             success: Deltagarna har avblockerats.
         create:
+          no_user_found: Deltagaren hittades inte.
           success: Deltagaren har fått officiell status.
         destroy:
           success: Deltagaren har inte längre officiell status.
@@ -1060,10 +1060,6 @@ sv:
           next_title: Nästa
           previous: Föregående
           previous_title: Föregående
-        gallery:
-          add_images: Lägg till bilder
-          edit_images: Redigera bilder
-          gallery_legend: Lägg till ett bildgalleri (Frivilligt)
       static_page_topics:
         create:
           error: Det gick inte att skapa ett nytt ämne.
diff --git a/decidim-admin/config/locales/tr-TR.yml b/decidim-admin/config/locales/tr-TR.yml
index 6f99c7ec2824c..55e4e49a3f11a 100644
--- a/decidim-admin/config/locales/tr-TR.yml
+++ b/decidim-admin/config/locales/tr-TR.yml
@@ -45,7 +45,6 @@ tr:
         alert_color: Alarm
         available_authorizations: Uygun yetkilendirmeler
         badges_enabled: Rozetleri etkinleştir
-        comments_max_length: Maksimum yorum uzunluğu (Varsayılan değer için 0 bırakın)
         customize_welcome_notification: Karşılama bildirimlerini özelleştir
         default_locale: Varsayılan yerel ayar
         description: Açıklama
@@ -183,9 +182,9 @@ tr:
         confirm_delete_component: |
           Bu bileşeni silmek istediğinizden emin misiniz? <br>
 
-          Bu bileşen şunu içeriyor: <br> 
-          <ul class="list-disc ml-6 my-2">   
-           <li class="font-bold"> %{resources_count} kaynakları </li> 
+          Bu bileşen şunu içeriyor: <br>
+          <ul class="list-disc ml-6 my-2">
+           <li class="font-bold"> %{resources_count} kaynakları </li>
           </ul>
           Fikrinizi değiştirirseniz daha sonra yeniden yükleyebilirsiniz.
         export_all: Tümünü dışa aktar
@@ -359,11 +358,11 @@ tr:
           error: Bu içerik bloğu oluşturulurken bir sorun oluştu.
           success: Içerik bloğu başarıyla oluşturuldu.
         destroy:
-          error: Bu içerik bloğunu silmeye çalişirken bir sorun oluştu.  
+          error: Bu içerik bloğunu silmeye çalişirken bir sorun oluştu.
           success: İçerik bloğu başariyla silindi.
         edit:
           active_content_blocks: Etkin içerik blokları
-          add: İçerik bloğu ekle 
+          add: İçerik bloğu ekle
           destroy_confirmation: Bu içerik bloğunu silmek istediğnizden emin misiniz?
           inactive_content_blocks: Etkin olmayan içerik blokları
           title: Sayfa İçeriği
@@ -958,8 +957,8 @@ tr:
           never: Asla
           new_share_token_button: Yeni erişim linki
           share_tokens_help_html: |
-            Diğerlerinin bu yayınlanmamış kaynağı görüntüleyebilmesi için bir erişim linki oluşturun ve paylaşın. 
-            Erişim linkleri sadece kayıtlı kullanıcılar için geçerli olabilir ve gerekirse bir son kullanım tarihi belirlenebilir. 
+            Diğerlerinin bu yayınlanmamış kaynağı görüntüleyebilmesi için bir erişim linki oluşturun ve paylaşın.
+            Erişim linkleri sadece kayıtlı kullanıcılar için geçerli olabilir ve gerekirse bir son kullanım tarihi belirlenebilir.
             Yeni bir erişim linki paylaşmak için, oluşturduktan sonra "%{clipboard} ikonunu kullanarak linki kopyalayın.
           title: '%{name} için erişim linkleri'
         new:
@@ -974,10 +973,6 @@ tr:
           next_title: Sonraki öğe
           previous: Önceki
           previous_title: Önceki öğe
-        gallery:
-          add_images: Resim ekle
-          edit_images: Resimleri düzenle
-          gallery_legend: Bir resim galerisi ekleyin (İsteğe bağlı)
       static_page_topics:
         create:
           error: Yeni bir konu oluştururken bir hata oluştu.
diff --git a/decidim-admin/config/locales/zh-CN.yml b/decidim-admin/config/locales/zh-CN.yml
index 98828b41c07ba..437d02d683774 100644
--- a/decidim-admin/config/locales/zh-CN.yml
+++ b/decidim-admin/config/locales/zh-CN.yml
@@ -32,7 +32,6 @@ zh-CN:
       organization:
         alert_color: 警告
         badges_enabled: 启用徽章
-        comments_max_length: 评论最大长度 (默认值留0)
         customize_welcome_notification: 自定义欢迎通知
         default_locale: 默认区域设置
         description: 描述
@@ -521,10 +520,6 @@ zh-CN:
       share_tokens:
         actions:
           destroy: 删除
-      shared:
-        gallery:
-          add_images: 添加图像
-          gallery_legend: 添加图片库 (可选)
       static_page_topics:
         create:
           error: 创建一个新主题时出现问题。
diff --git a/decidim-admin/config/locales/zh-TW.yml b/decidim-admin/config/locales/zh-TW.yml
index 2bb862450dcc4..b411b0b99c93c 100644
--- a/decidim-admin/config/locales/zh-TW.yml
+++ b/decidim-admin/config/locales/zh-TW.yml
@@ -42,7 +42,6 @@ zh-TW:
         alert_color: 警告
         available_authorizations: 可用認證方式
         badges_enabled: 啟用勳章
-        comments_max_length: 留言字數上限 (0 表示使用預設)
         customize_welcome_notification: 自訂歡迎通知
         default_locale: 預設語言
         description: 說明
@@ -774,11 +773,6 @@ zh-TW:
       share_tokens:
         actions:
           destroy: 刪除
-      shared:
-        gallery:
-          add_images: 添加圖案
-          edit_images: 編輯圖片
-          gallery_legend: 新增圖片庫(可選)
       static_page_topics:
         create:
           error: 建立新主題時發生問題。
diff --git a/decidim-assemblies/config/locales/ca-IT.yml b/decidim-assemblies/config/locales/ca-IT.yml
index 44e11d2cf4c46..ada87716dab62 100644
--- a/decidim-assemblies/config/locales/ca-IT.yml
+++ b/decidim-assemblies/config/locales/ca-IT.yml
@@ -172,7 +172,7 @@ ca-IT:
           attachments: Adjunts
           components: Components
           info: Quant a aquesta assemblea
-          landing_page: Disposició de la pàgina de destinació
+          landing_page: Disposició de la pàgina d'inici
           moderations: Moderacions
           private_users: Membres
           see_assembly: Veure l'assemblea
diff --git a/decidim-assemblies/config/locales/fr-CA.yml b/decidim-assemblies/config/locales/fr-CA.yml
index 3ac3cbe69858d..8d5f4b5a6bda1 100644
--- a/decidim-assemblies/config/locales/fr-CA.yml
+++ b/decidim-assemblies/config/locales/fr-CA.yml
@@ -172,6 +172,7 @@ fr-CA:
           attachments: Documents liés
           components: Composants
           info: À propos de cette assemblée
+          landing_page: Mise en page de la page d'accueil
           moderations: Modérations
           private_users: Membres
           see_assembly: Voir l'assemblée
@@ -397,7 +398,10 @@ fr-CA:
           created_at: La date de création de cet espace
           created_by: Qui a créé cette assemblée
           created_by_other: Autre créateur de l'assemblée
+          creation_date: La date de création de l'assemblée
+          decidim_scope_id: La portée de l'assemblée
           description: Une description longue de l'assemblée
+          developer_group: Le groupe promoteur de l'assemblée
           duration: La durée de l'assemblée
           follows_count: Le nombre d'utilisateurs suivant cet espace
           id: L'identifiant unique de cette assemblée
diff --git a/decidim-assemblies/config/locales/fr.yml b/decidim-assemblies/config/locales/fr.yml
index 76afe5f67e3bd..cf540d1713a06 100644
--- a/decidim-assemblies/config/locales/fr.yml
+++ b/decidim-assemblies/config/locales/fr.yml
@@ -90,7 +90,7 @@ fr:
   decidim:
     admin:
       actions:
-        confirm_delete_assembly: Êtes-vous sûr(e) de vouloir supprimer cette assemblée ? Si vous changez d'avis, vous pourrez la restaurer plus tard.
+        confirm_delete_assembly: Êtes-vous sûr·e de vouloir supprimer cette assemblée ? Si vous changez d'avis, vous pourrez la restaurer plus tard.
         import_assembly: Importer
         new_assembly: Nouvelle assemblée
         new_assembly_user_role: Nouvel administrateur de l'assemblée
@@ -172,6 +172,7 @@ fr:
           attachments: Documents liés
           components: Fonctionnalités
           info: À propos de cette assemblée
+          landing_page: Mise en page de la page d'accueil
           moderations: Modérations
           private_users: Membres
           see_assembly: Voir l'assemblée
@@ -397,7 +398,10 @@ fr:
           created_at: La date de création de cet espace
           created_by: Qui a créé cette assemblée
           created_by_other: Autre créateur de l'assemblée
+          creation_date: La date de création de l'assemblée
+          decidim_scope_id: La portée de l'assemblée
           description: Une description longue de l'assemblée
+          developer_group: Le groupe promoteur de l'assemblée
           duration: La durée de l'assemblée
           follows_count: Le nombre d'utilisateurs suivant cet espace
           id: L'identifiant unique de cette assemblée
diff --git a/decidim-assemblies/config/locales/hu.yml b/decidim-assemblies/config/locales/hu.yml
index 40104946067b9..b94b8a440c0b1 100644
--- a/decidim-assemblies/config/locales/hu.yml
+++ b/decidim-assemblies/config/locales/hu.yml
@@ -209,7 +209,7 @@ hu:
       admin:
         assemblies:
           form:
-            announcement_help: Az itt megadott szöveg a gyűlés információs oldalán fog megjelenni a felhasználók számára. 
+            announcement_help: Az itt megadott szöveg a gyűlés információs oldalán fog megjelenni a felhasználók számára.
             duration: Időtartam
             duration_help: Ha a gyűlés időtartama korlátozott, válassz befejező dátumot. Ellenkező esetben határozatlan idejű lesz.
             images: képek
diff --git a/decidim-assemblies/config/locales/pt-BR.yml b/decidim-assemblies/config/locales/pt-BR.yml
index 20b215b5cea64..3abe7dea999ae 100644
--- a/decidim-assemblies/config/locales/pt-BR.yml
+++ b/decidim-assemblies/config/locales/pt-BR.yml
@@ -335,7 +335,7 @@ pt-BR:
         home:
           highlighted_assemblies:
             active_spaces: Assembleias ativas
-            see_all_spaces: Ver todas as assembleias 
+            see_all_spaces: Ver todas as assembleias
         user_profile:
           member_of:
             member_of: Membro de
diff --git a/decidim-assemblies/config/locales/tr-TR.yml b/decidim-assemblies/config/locales/tr-TR.yml
index 68bdf8656e02f..17e1dd1afc49f 100644
--- a/decidim-assemblies/config/locales/tr-TR.yml
+++ b/decidim-assemblies/config/locales/tr-TR.yml
@@ -18,7 +18,7 @@ tr:
         decidim_scope_id: kapsam
         description: Açıklama
         developer_group: Tanıtım grubu
-        document: Belge 
+        document: Belge
         domain: domain
         duplicate_categories: Yinelenen kategoriler
         duplicate_features: Yinelenen özellikler
@@ -26,9 +26,9 @@ tr:
         facebook: Facebook
         github: GitHub
         hero_image: Ana resim
-        import_attachments: Eki içe aktar 
-        import_categories: Kategorileri içe aktar 
-        import_components: Bireşenleri içe aktar 
+        import_attachments: Eki içe aktar
+        import_categories: Kategorileri içe aktar
+        import_components: Bireşenleri içe aktar
         included_at: Dahil
         instagram: Instagram
         is_transparent: Şeffaf mı
diff --git a/decidim-blogs/config/locales/ar.yml b/decidim-blogs/config/locales/ar.yml
index d61639bca34b7..84abb76b05045 100644
--- a/decidim-blogs/config/locales/ar.yml
+++ b/decidim-blogs/config/locales/ar.yml
@@ -67,7 +67,6 @@ ar:
           global:
             announcement: إعلان
             comments_enabled: تم تمكين التعليقات
-            comments_max_length: الحد الأقصى لطول التعليقات (اترك 0 للقيمة الافتراضية)
           step:
             announcement: إعلان
             comments_blocked: تم حظر التعليقات
diff --git a/decidim-blogs/config/locales/bg.yml b/decidim-blogs/config/locales/bg.yml
index e6a35bb956374..00b18771c0b06 100644
--- a/decidim-blogs/config/locales/bg.yml
+++ b/decidim-blogs/config/locales/bg.yml
@@ -76,7 +76,6 @@ bg:
           global:
             announcement: Обявление
             comments_enabled: Коментарите са разрешени
-            comments_max_length: Максимална дължина на коментарите (Оставете 0 за стойност по подразбиране)
           step:
             announcement: Обявление
             comments_blocked: Коментарите са блокирани
diff --git a/decidim-blogs/config/locales/ca-IT.yml b/decidim-blogs/config/locales/ca-IT.yml
index 5a4afbd1d8a83..060b0d3edfe34 100644
--- a/decidim-blogs/config/locales/ca-IT.yml
+++ b/decidim-blogs/config/locales/ca-IT.yml
@@ -114,7 +114,7 @@ ca-IT:
             announcement: Avís
             attachments_allowed: Permetre fitxers adjunts
             comments_enabled: Comentaris habilitats
-            comments_max_length: Longitud màxima dels comentaris (deixa 0 si vols mantenir la configuració per defecte)
+            comments_max_length: Caràcters màxims per comentari (deixar a 0 el valor predeterminat)
             creation_enabled_for_participants: Les participants poden crear noves entrades en el blog
             define_taxonomy_filters: Si us plau, defineix alguns filtres per aquest espai de participació abans de fer servir aquesta configuració.
             no_taxonomy_filters_found: No s'han trobat filtres de taxonomia.
diff --git a/decidim-blogs/config/locales/ca.yml b/decidim-blogs/config/locales/ca.yml
index 27360081aa67f..8a74db39a9c04 100644
--- a/decidim-blogs/config/locales/ca.yml
+++ b/decidim-blogs/config/locales/ca.yml
@@ -114,7 +114,7 @@ ca:
             announcement: Avís
             attachments_allowed: Permetre fitxers adjunts
             comments_enabled: Comentaris habilitats
-            comments_max_length: Longitud màxima dels comentaris (deixa 0 si vols mantenir la configuració per defecte)
+            comments_max_length: Caràcters màxims per comentari (deixar a 0 el valor predeterminat)
             creation_enabled_for_participants: Les participants poden crear noves entrades en el blog
             define_taxonomy_filters: Si us plau, defineix alguns filtres per aquest espai de participació abans de fer servir aquesta configuració.
             no_taxonomy_filters_found: No s'han trobat filtres de taxonomia.
diff --git a/decidim-blogs/config/locales/cs.yml b/decidim-blogs/config/locales/cs.yml
index f9935e1a4b642..6e4a8eb3b3a87 100644
--- a/decidim-blogs/config/locales/cs.yml
+++ b/decidim-blogs/config/locales/cs.yml
@@ -118,7 +118,6 @@ cs:
             announcement: Oznámení
             attachments_allowed: Povolit přílohy
             comments_enabled: Komentáře povoleny
-            comments_max_length: Maximální délka komentáře (ponechte 0 pro výchozí hodnotu)
             creation_enabled_for_participants: Účastníci mohou vytvářet příspěvky
             define_taxonomy_filters: Před použitím tohoto nastavení prosím definujte některé filtry pro tento participační prostor.
             no_taxonomy_filters_found: Nebyly nalezeny žádné filtry taxonomie.
diff --git a/decidim-blogs/config/locales/de.yml b/decidim-blogs/config/locales/de.yml
index c3c421514c151..77ea25ddb78f6 100644
--- a/decidim-blogs/config/locales/de.yml
+++ b/decidim-blogs/config/locales/de.yml
@@ -114,7 +114,6 @@ de:
             announcement: Ankündigung
             attachments_allowed: Anhänge zulassen
             comments_enabled: Kommentare aktiviert
-            comments_max_length: Maximale Länge der Kommentare (0 für Standardwert)
             creation_enabled_for_participants: Teilnehmende können Beiträge erstellen
             define_taxonomy_filters: Bitte definieren Sie einige Filter für diesen partizipativen Bereich, bevor Sie diese Einstellung verwenden.
             no_taxonomy_filters_found: Keine Klassifizierungsfilter gefunden.
diff --git a/decidim-blogs/config/locales/el.yml b/decidim-blogs/config/locales/el.yml
index 8c3cbb40c178b..bfbee041335c8 100644
--- a/decidim-blogs/config/locales/el.yml
+++ b/decidim-blogs/config/locales/el.yml
@@ -65,7 +65,6 @@ el:
           global:
             announcement: Ανακοίνωση
             comments_enabled: Τα σχόλια ενεργοποιήθηκαν
-            comments_max_length: Μέγιστο μέγεθος σχολίων (Αφήστε το 0 για το προκαθορισμένο μέγεθος)
           step:
             announcement: Ανακοίνωση
             comments_blocked: Τα σχόλια αποκλείστηκαν
diff --git a/decidim-blogs/config/locales/es-MX.yml b/decidim-blogs/config/locales/es-MX.yml
index 00824154b2e4f..66af461ac377c 100644
--- a/decidim-blogs/config/locales/es-MX.yml
+++ b/decidim-blogs/config/locales/es-MX.yml
@@ -114,7 +114,7 @@ es-MX:
             announcement: Anuncio
             attachments_allowed: Permitir archivos adjuntos
             comments_enabled: Comentarios habilitados
-            comments_max_length: Longitud máxima de los comentarios (deja 0 si quieres mantener la configuración por defecto)
+            comments_max_length: Caracteres máximos por comentario (dejar 0 para el valor predeterminado)
             creation_enabled_for_participants: Las participantes pueden crear nuevas entradas en el blog
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
             no_taxonomy_filters_found: No se han encontrado filtros de taxonomía.
diff --git a/decidim-blogs/config/locales/es-PY.yml b/decidim-blogs/config/locales/es-PY.yml
index 6cbb4c0900eaa..ba6554a04dcfc 100644
--- a/decidim-blogs/config/locales/es-PY.yml
+++ b/decidim-blogs/config/locales/es-PY.yml
@@ -114,7 +114,7 @@ es-PY:
             announcement: Anuncio
             attachments_allowed: Permitir archivos adjuntos
             comments_enabled: Comentarios habilitados
-            comments_max_length: Longitud máxima de los comentarios (deja 0 si quieres mantener la configuración por defecto)
+            comments_max_length: Caracteres máximos por comentario (dejar 0 para el valor predeterminado)
             creation_enabled_for_participants: Las participantes pueden crear nuevas entradas en el blog
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
             no_taxonomy_filters_found: No se han encontrado filtros de taxonomía.
diff --git a/decidim-blogs/config/locales/es.yml b/decidim-blogs/config/locales/es.yml
index 2180a453abcaa..0cd7b9a9eb430 100644
--- a/decidim-blogs/config/locales/es.yml
+++ b/decidim-blogs/config/locales/es.yml
@@ -114,7 +114,7 @@ es:
             announcement: Aviso
             attachments_allowed: Permitir archivos adjuntos
             comments_enabled: Comentarios habilitados
-            comments_max_length: Longitud máxima de los comentarios (deja 0 si quieres mantener la configuración por defecto)
+            comments_max_length: Caracteres máximos por comentario (dejar 0 para el valor predeterminado)
             creation_enabled_for_participants: Las participantes pueden crear nuevas entradas en el blog
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
             no_taxonomy_filters_found: No se han encontrado filtros de taxonomía.
diff --git a/decidim-blogs/config/locales/eu.yml b/decidim-blogs/config/locales/eu.yml
index 06f5f09138007..2d67c6ea0c1df 100644
--- a/decidim-blogs/config/locales/eu.yml
+++ b/decidim-blogs/config/locales/eu.yml
@@ -88,7 +88,7 @@ eu:
           title: Izenburua
         index:
           count:
-            one: "%{count} argitalpen"
+            one: "Argitalpen bat"
             other: "%{count} argitalpen"
           empty: Oraindik ez dago argitalpenik.
           new_post: Beste sarrera bat
@@ -114,7 +114,7 @@ eu:
             announcement: Iragarpena
             attachments_allowed: Baimendu eranskinak
             comments_enabled: Iruzkinak gaituta
-            comments_max_length: Iruzkinen gehieneko luzera (utzi 0 lehenetsitako konfigurazioari eutsi nahi badiozu)
+            comments_max_length: Iruzkin bakoitzeko gehieneko karaktereak (utzi 0 aurrez zehaztutako baliorako)
             creation_enabled_for_participants: Parte-hartzaileek sarrerak sor ditzakete
             define_taxonomy_filters: Mesedez, zehaztu iragazki batzuk partaidetza-espazio honetarako eszenatoki hau erabili aurretik.
             no_taxonomy_filters_found: Ez da taxonomia-iragazkirik aurkitu.
diff --git a/decidim-blogs/config/locales/fr-CA.yml b/decidim-blogs/config/locales/fr-CA.yml
index 08fa504b4be76..ee5bfa70e6045 100644
--- a/decidim-blogs/config/locales/fr-CA.yml
+++ b/decidim-blogs/config/locales/fr-CA.yml
@@ -106,6 +106,7 @@ fr-CA:
           comment: Commenter
           create: Créer
           destroy: Supprimer
+          like: Soutenir
           update: Mettre à jour
         name: Actualités
         settings:
@@ -113,7 +114,7 @@ fr-CA:
             announcement: Annonce
             attachments_allowed: Autoriser les pièces jointes
             comments_enabled: Activer le module de commentaire
-            comments_max_length: Longueur max des commentaires (laisser 0 pour la valeur par défaut)
+            comments_max_length: Nombre maximum de caractères par commentaire (Laisser 0 pour la valeur par défaut)
             creation_enabled_for_participants: Les participants peuvent créer des articles
             define_taxonomy_filters: Veuillez définir des filtres pour cet espace participatif avant d'utiliser ce paramètre.
             no_taxonomy_filters_found: Aucun filtre de taxonomie trouvé.
@@ -122,6 +123,8 @@ fr-CA:
           step:
             announcement: Annonce
             comments_blocked: Commentaires désactivés
+            likes_blocked: Soutiens bloqués
+            likes_enabled: Soutiens activés
     events:
       blogs:
         post_created:
@@ -136,14 +139,22 @@ fr-CA:
           author: Le nom du participant qui a fait ce commentaire
           body: Le commentaire lui-même
           commentable_id: L'identifiant unique du commentaire
+          commentable_type: Le type de l'élément commenté (s'il s'agit d'un résultat, d'une proposition, etc.)
           created_at: La date de création de ce commentaire
+          depth: L'endroit où ce commentaire se trouve dans l'arborescence des commentaires (si c'est une réponse ou une réponse à une réponse)
           id: L'id de ce commentaire
+          locale: La langue que le participant a utilisé en créant ce commentaire
+          root_commentable_url: L'URL de la ressource liée à ce commentaire
         posts:
+          author: Les informations de l'auteur
           body: Le corps de l'article
           comments_count: Le nombre de commentaires sur cet article
           component: Le composant auquel appartient l'article
           created_at: La date de création de cet article
+          follows_count: Le nombre de personnes qui suivent cet article
           id: L'identifiant unique de cet article
+          likes_count: Le nombre de soutiens à cet article
+          participatory_space: 'À quel espace (ex : Concertation ou Assemblée) appartient cet article'
           published_at: La date à laquelle cet article a été publié
           title: Le titre de l'article
           updated_at: La dernière date de mise à jour de cet article
diff --git a/decidim-blogs/config/locales/fr.yml b/decidim-blogs/config/locales/fr.yml
index 05c5405f41085..10ab4e8b60f0a 100644
--- a/decidim-blogs/config/locales/fr.yml
+++ b/decidim-blogs/config/locales/fr.yml
@@ -114,7 +114,7 @@ fr:
             announcement: Annonce
             attachments_allowed: Autoriser les pièces jointes
             comments_enabled: Activer le module de commentaire
-            comments_max_length: Longueur max des commentaires (laisser 0 pour la valeur par défaut)
+            comments_max_length: Nombre maximum de caractères par commentaire (Laisser 0 pour la valeur par défaut)
             creation_enabled_for_participants: Les participants peuvent créer des articles
             define_taxonomy_filters: Veuillez définir des filtres pour cet espace participatif avant d'utiliser ce paramètre.
             no_taxonomy_filters_found: Aucun filtre de taxonomie trouvé.
diff --git a/decidim-blogs/config/locales/gl.yml b/decidim-blogs/config/locales/gl.yml
index 43db66c1fe8c7..54e9278fb8feb 100644
--- a/decidim-blogs/config/locales/gl.yml
+++ b/decidim-blogs/config/locales/gl.yml
@@ -43,7 +43,6 @@ gl:
           global:
             announcement: Anuncio
             comments_enabled: Comentarios habilitados
-            comments_max_length: Lonxitude máxima dos comentarios (0 para valor predefinido)
           step:
             announcement: Anuncio
             comments_blocked: Comentarios bloqueados
diff --git a/decidim-blogs/config/locales/hu.yml b/decidim-blogs/config/locales/hu.yml
index f4e0e38afcb5e..52b2d6d72bf63 100644
--- a/decidim-blogs/config/locales/hu.yml
+++ b/decidim-blogs/config/locales/hu.yml
@@ -73,7 +73,6 @@ hu:
           global:
             announcement: Közlemény
             comments_enabled: Megjegyzések engedélyezve
-            comments_max_length: Kommentek maximális hossza (Hagyjon 0 -t az alapértékhez)
           step:
             announcement: Közlemény
             comments_blocked: Megjegyzések letiltva
diff --git a/decidim-blogs/config/locales/it.yml b/decidim-blogs/config/locales/it.yml
index 08a3fd5acb594..ed14f15ff21af 100644
--- a/decidim-blogs/config/locales/it.yml
+++ b/decidim-blogs/config/locales/it.yml
@@ -41,7 +41,6 @@ it:
           global:
             announcement: Annuncio
             comments_enabled: Commenti abilitati
-            comments_max_length: Lunghezza massima dei commenti (Lasciare 0 per il valore predefinito)
           step:
             announcement: Annuncio
             comments_blocked: Commenti bloccati
diff --git a/decidim-blogs/config/locales/ja.yml b/decidim-blogs/config/locales/ja.yml
index b89c0c8162888..7ce8bb18f5b1f 100644
--- a/decidim-blogs/config/locales/ja.yml
+++ b/decidim-blogs/config/locales/ja.yml
@@ -112,7 +112,7 @@ ja:
             announcement: お知らせ
             attachments_allowed: 添付ファイルを許可
             comments_enabled: コメントを有効にする
-            comments_max_length: コメント最大長 (デフォルト値は 0 のまま)
+            comments_max_length: 各コメントの最大文字数 (0はデフォルト値のまま)
             creation_enabled_for_participants: 参加者は投稿を作成できます
             define_taxonomy_filters: この設定を使用する前に、参加型スペースのフィルターをいくつか定義してください。
             no_taxonomy_filters_found: タクソノミーフィルタが見つかりません。
diff --git a/decidim-blogs/config/locales/ko.yml b/decidim-blogs/config/locales/ko.yml
index ffba1e6deddee..ccd8d7b3c88f2 100644
--- a/decidim-blogs/config/locales/ko.yml
+++ b/decidim-blogs/config/locales/ko.yml
@@ -38,7 +38,6 @@ ko:
           global:
             announcement: 공지 사항
             comments_enabled: 댓글 활성화됨
-            comments_max_length: 댓글 최대 길이(기본값은 0으로 남김)
           step:
             announcement: 공지 사항
             comments_blocked: 댓글 차단됨
diff --git a/decidim-blogs/config/locales/lb.yml b/decidim-blogs/config/locales/lb.yml
index 510507a577b54..9a750c2f959a1 100644
--- a/decidim-blogs/config/locales/lb.yml
+++ b/decidim-blogs/config/locales/lb.yml
@@ -41,7 +41,6 @@ lb:
           global:
             announcement: Ankündigung
             comments_enabled: Kommentare aktiviert
-            comments_max_length: Maximale Länge der Kommentare (0 für Standardwert)
           step:
             announcement: Ankündigung
             comments_blocked: Kommentare blockiert
diff --git a/decidim-blogs/config/locales/lt.yml b/decidim-blogs/config/locales/lt.yml
index ad0ebab3fd124..f12f874574907 100644
--- a/decidim-blogs/config/locales/lt.yml
+++ b/decidim-blogs/config/locales/lt.yml
@@ -72,7 +72,6 @@ lt:
           global:
             announcement: Pranešimas
             comments_enabled: Komentarai įjungti
-            comments_max_length: Maksimalus komentaro ilgis (įrašyti 0 įprastam ilgiui)
           step:
             announcement: Pranešimas
             comments_blocked: Komentarai užblokuoti
diff --git a/decidim-blogs/config/locales/nl.yml b/decidim-blogs/config/locales/nl.yml
index 013392813af94..b73ad19f80131 100644
--- a/decidim-blogs/config/locales/nl.yml
+++ b/decidim-blogs/config/locales/nl.yml
@@ -49,7 +49,6 @@ nl:
           global:
             announcement: Aankondiging
             comments_enabled: Reacties ingeschakeld
-            comments_max_length: Commentaar maximale lengte (laat 0 voor standaard waarde)
           step:
             announcement: Aankondiging
             comments_blocked: Reacties geblokkeerd
diff --git a/decidim-blogs/config/locales/no.yml b/decidim-blogs/config/locales/no.yml
index d1f601dbf30b6..46090ebfbc440 100644
--- a/decidim-blogs/config/locales/no.yml
+++ b/decidim-blogs/config/locales/no.yml
@@ -43,7 +43,6 @@
           global:
             announcement: Kunngjøring
             comments_enabled: Kommentarer aktivert
-            comments_max_length: Maks lengde på kommentarer (Sett 0 for standardverdi)
           step:
             announcement: Kunngjøring
             comments_blocked: Kommentarer blokkert
diff --git a/decidim-blogs/config/locales/pl.yml b/decidim-blogs/config/locales/pl.yml
index a55187a01404e..5c197e3d93975 100644
--- a/decidim-blogs/config/locales/pl.yml
+++ b/decidim-blogs/config/locales/pl.yml
@@ -75,7 +75,6 @@ pl:
           global:
             announcement: Ogłoszenie
             comments_enabled: Komentarze włączone
-            comments_max_length: Maksymalna długość komentarzy (Pozostaw 0 dla wartości domyślnej)
           step:
             announcement: Ogłoszenie
             comments_blocked: Komentarze zablokowane
diff --git a/decidim-blogs/config/locales/pt-BR.yml b/decidim-blogs/config/locales/pt-BR.yml
index c5e68b58d8f05..bf26b14cc8f5d 100644
--- a/decidim-blogs/config/locales/pt-BR.yml
+++ b/decidim-blogs/config/locales/pt-BR.yml
@@ -114,7 +114,6 @@ pt-BR:
             announcement: Anúncio
             attachments_allowed: Permitir anexos
             comments_enabled: Comentários ativados
-            comments_max_length: Tamanho máximo de comentários (deixe 0 para o valor padrão)
             creation_enabled_for_participants: Os usuários podem criar postagens
             define_taxonomy_filters: Por favor, defina alguns filtros para este espaço participativo antes de usar esta configuração.
             no_taxonomy_filters_found: Nenhum filtro de taxonomia encontrado.
diff --git a/decidim-blogs/config/locales/pt.yml b/decidim-blogs/config/locales/pt.yml
index b4b5974d873fe..39392b32328ec 100644
--- a/decidim-blogs/config/locales/pt.yml
+++ b/decidim-blogs/config/locales/pt.yml
@@ -106,7 +106,6 @@ pt:
           global:
             announcement: Anúncio
             comments_enabled: Comentários ativados
-            comments_max_length: Comprimento máximo dos comentários (Deixar 0 para o valor predefinido)
             creation_enabled_for_participants: Os participantes podem criar publicações
           step:
             announcement: Anúncio
diff --git a/decidim-blogs/config/locales/ro-RO.yml b/decidim-blogs/config/locales/ro-RO.yml
index bdbb7f1cf5493..dc715162c71c9 100644
--- a/decidim-blogs/config/locales/ro-RO.yml
+++ b/decidim-blogs/config/locales/ro-RO.yml
@@ -116,7 +116,6 @@ ro:
             announcement: Anunț
             attachments_allowed: Permiteți atașamente
             comments_enabled: Comentarii activate
-            comments_max_length: Lungimea maximă a comentariilor (lăsați 0 pentru valoarea implicită)
             creation_enabled_for_participants: Participanții pot crea postări
             define_taxonomy_filters: Vă rugăm să definiți niște filtre pentru acest spațiu participativ înainte de a utiliza această setare.
             no_taxonomy_filters_found: Nici un filtru de taxonomie găsit.
diff --git a/decidim-blogs/config/locales/ru.yml b/decidim-blogs/config/locales/ru.yml
index e06b60273004b..55a80f20d33b5 100644
--- a/decidim-blogs/config/locales/ru.yml
+++ b/decidim-blogs/config/locales/ru.yml
@@ -71,7 +71,6 @@ ru:
           global:
             announcement: Объявление
             comments_enabled: Комментарии включены
-            comments_max_length: Максимальная длина комментариев (оставьте 0 для значения по умолчанию)
           step:
             announcement: Объявление
             comments_blocked: Комментарии отключены
diff --git a/decidim-blogs/config/locales/sk.yml b/decidim-blogs/config/locales/sk.yml
index b5c64bca52903..ebec8e46477d2 100644
--- a/decidim-blogs/config/locales/sk.yml
+++ b/decidim-blogs/config/locales/sk.yml
@@ -118,7 +118,6 @@ sk:
             announcement: Oznámenie
             attachments_allowed: Povoliť prílohy
             comments_enabled: Komentáre povolené
-            comments_max_length: Maximálna dĺžka komentárov (Ponechajte 0 pre predvolenú hodnotu)
             creation_enabled_for_participants: Účastníci môžu vytvárať príspevky
             define_taxonomy_filters: Pred použitím tohto nastavenia definujte nejaké filtre pre tento participatívny priestor.
             no_taxonomy_filters_found: Nenašli sa žiadne filtre taxonómie.
diff --git a/decidim-blogs/config/locales/sq-AL.yml b/decidim-blogs/config/locales/sq-AL.yml
index 7e838337d39f0..db8ec228224bc 100644
--- a/decidim-blogs/config/locales/sq-AL.yml
+++ b/decidim-blogs/config/locales/sq-AL.yml
@@ -76,7 +76,6 @@ sq:
           global:
             announcement: Njoftim
             comments_enabled: Komentet janë aktivizuar
-            comments_max_length: Gjatësia maksimale e komenteve (Lëre 0 për vlerën e paracaktuar)
           step:
             announcement: Njoftim
             comments_blocked: Komentet të bllokuara
diff --git a/decidim-blogs/config/locales/sv.yml b/decidim-blogs/config/locales/sv.yml
index 47b401c83e774..807206292a030 100644
--- a/decidim-blogs/config/locales/sv.yml
+++ b/decidim-blogs/config/locales/sv.yml
@@ -114,7 +114,6 @@ sv:
             announcement: Meddelande
             attachments_allowed: Tillåt bilagor
             comments_enabled: Aktivera kommentarer
-            comments_max_length: Maximal kommentarslängd (ange 0 för att använda standardvärdet)
             creation_enabled_for_participants: Deltagarna kan skapa inlägg
             define_taxonomy_filters: Ställ in filter innan du använder den här inställningen.
             no_taxonomy_filters_found: Inga filter för kategorier hittades.
diff --git a/decidim-blogs/config/locales/tr-TR.yml b/decidim-blogs/config/locales/tr-TR.yml
index dc6703b8fa170..eea175fa9e6d7 100644
--- a/decidim-blogs/config/locales/tr-TR.yml
+++ b/decidim-blogs/config/locales/tr-TR.yml
@@ -6,7 +6,7 @@ tr:
         body: Vücut
         decidim_author_id: Yazar
         published_at: Yayın zamanı
-        title: Başlik / Unvani 
+        title: Başlik / Unvani
     models:
       decidim/blogs/create_post_event: Yeni blog yazısı
   activerecord:
@@ -44,7 +44,6 @@ tr:
           global:
             announcement: duyuru
             comments_enabled: Yorumlar etkin
-            comments_max_length: Maksimum yorum uzunluğu (Varsayılan değer için 0 bırakın)
           step:
             announcement: duyuru
             comments_blocked: Yorumlar engellendi
diff --git a/decidim-blogs/config/locales/zh-CN.yml b/decidim-blogs/config/locales/zh-CN.yml
index d5183a6066194..679c012d24918 100644
--- a/decidim-blogs/config/locales/zh-CN.yml
+++ b/decidim-blogs/config/locales/zh-CN.yml
@@ -36,7 +36,6 @@ zh-CN:
           global:
             announcement: 通 知
             comments_enabled: 评论已启用
-            comments_max_length: 评论最大长度 (默认值留0)
           step:
             announcement: 通 知
             comments_blocked: 评论已阻止
diff --git a/decidim-blogs/config/locales/zh-TW.yml b/decidim-blogs/config/locales/zh-TW.yml
index 85283895a55a1..6f5dd2435e39a 100644
--- a/decidim-blogs/config/locales/zh-TW.yml
+++ b/decidim-blogs/config/locales/zh-TW.yml
@@ -64,7 +64,6 @@ zh-TW:
           global:
             announcement: 公告
             comments_enabled: 啟用評論功能
-            comments_max_length: 評論字數最大長度(若要使用預設值請輸入0)
           step:
             announcement: 公告
             comments_blocked: 留言已封鎖
diff --git a/decidim-budgets/config/locales/bg.yml b/decidim-budgets/config/locales/bg.yml
index 1e485f71c6e61..30fc78a0106b2 100644
--- a/decidim-budgets/config/locales/bg.yml
+++ b/decidim-budgets/config/locales/bg.yml
@@ -272,7 +272,6 @@ bg:
           global:
             announcement: Обявление
             comments_enabled: Коментарите са активирани
-            comments_max_length: Максимална дължина на коментарите (Оставете 0 за стойност по подразбиране)
             form:
               errors:
                 budget_voting_rule_only_one: Трябва да бъде активирано само едно правило за гласуване.
diff --git a/decidim-budgets/config/locales/ca-IT.yml b/decidim-budgets/config/locales/ca-IT.yml
index bc16bf7a95903..68d9b50c879b0 100644
--- a/decidim-budgets/config/locales/ca-IT.yml
+++ b/decidim-budgets/config/locales/ca-IT.yml
@@ -347,7 +347,7 @@ ca-IT:
             announcement: Avís
             clear_all: Netejar-ho tot
             comments_enabled: Comentaris habilitats
-            comments_max_length: Longitud màxima dels comentaris (deixa 0 si vols mantenir la configuració per defecte)
+            comments_max_length: Caràcters màxims per comentari (deixar a 0 el valor predeterminat)
             define_taxonomy_filters: Si us plau, defineix algunes filtres per aquest espai de participació abans de fer servir aquesta configuració.
             form:
               errors:
diff --git a/decidim-budgets/config/locales/ca.yml b/decidim-budgets/config/locales/ca.yml
index 989f42bee07f2..70a0440c89abe 100644
--- a/decidim-budgets/config/locales/ca.yml
+++ b/decidim-budgets/config/locales/ca.yml
@@ -347,7 +347,7 @@ ca:
             announcement: Avís
             clear_all: Netejar-ho tot
             comments_enabled: Comentaris habilitats
-            comments_max_length: Longitud màxima dels comentaris (deixa 0 si vols mantenir la configuració per defecte)
+            comments_max_length: Caràcters màxims per comentari (deixar a 0 el valor predeterminat)
             define_taxonomy_filters: Si us plau, defineix algunes filtres per aquest espai de participació abans de fer servir aquesta configuració.
             form:
               errors:
diff --git a/decidim-budgets/config/locales/cs.yml b/decidim-budgets/config/locales/cs.yml
index 8ce5865c3a36f..a5b29cc4c9b1e 100644
--- a/decidim-budgets/config/locales/cs.yml
+++ b/decidim-budgets/config/locales/cs.yml
@@ -367,7 +367,6 @@ cs:
             announcement: Oznámení
             clear_all: Vymazat vše
             comments_enabled: Komentáře povoleny
-            comments_max_length: Maximální délka komentáře (ponechte 0 pro výchozí hodnotu)
             define_taxonomy_filters: Před použitím tohoto nastavení prosím definujte některé filtry pro tento participační prostor.
             form:
               errors:
diff --git a/decidim-budgets/config/locales/de.yml b/decidim-budgets/config/locales/de.yml
index 095a24192bda7..72efe02896158 100644
--- a/decidim-budgets/config/locales/de.yml
+++ b/decidim-budgets/config/locales/de.yml
@@ -345,7 +345,6 @@ de:
             announcement: Ankündigung
             clear_all: Alles löschen
             comments_enabled: Kommentare aktiviert
-            comments_max_length: Maximale Länge der Kommentare (0 für Standardwert)
             define_taxonomy_filters: Bitte definieren Sie einige Filter für diesen partizipativen Bereich, bevor Sie diese Einstellung verwenden.
             form:
               errors:
diff --git a/decidim-budgets/config/locales/el.yml b/decidim-budgets/config/locales/el.yml
index 46ad898cf9560..e7aeb66038b5f 100644
--- a/decidim-budgets/config/locales/el.yml
+++ b/decidim-budgets/config/locales/el.yml
@@ -231,7 +231,6 @@ el:
           global:
             announcement: Ανακοίνωση
             comments_enabled: Τα σχόλια ενεργοποιήθηκαν
-            comments_max_length: Μέγιστο μέγεθος σχολίων (Αφήστε το 0 για το προκαθορισμένο μέγεθος)
             form:
               errors:
                 budget_voting_rule_only_one: Μόνο ένας κανόνας ψηφοφορίας πρέπει να είναι ενεργοποιημένος.
diff --git a/decidim-budgets/config/locales/es-MX.yml b/decidim-budgets/config/locales/es-MX.yml
index 324c96af4adc4..3515aaacab3f0 100644
--- a/decidim-budgets/config/locales/es-MX.yml
+++ b/decidim-budgets/config/locales/es-MX.yml
@@ -344,7 +344,7 @@ es-MX:
             announcement: Anuncio
             clear_all: Limpiar todo
             comments_enabled: Comentarios habilitados
-            comments_max_length: Longitud máxima de los comentarios (deja 0 si quieres mantener la configuración por defecto)
+            comments_max_length: Caracteres máximos por comentario (dejar 0 para el valor predeterminado)
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
             form:
               errors:
diff --git a/decidim-budgets/config/locales/es-PY.yml b/decidim-budgets/config/locales/es-PY.yml
index 752a28df90a43..b83f5f8fde0e4 100644
--- a/decidim-budgets/config/locales/es-PY.yml
+++ b/decidim-budgets/config/locales/es-PY.yml
@@ -347,7 +347,7 @@ es-PY:
             announcement: Anuncio
             clear_all: Limpiar todo
             comments_enabled: Comentarios habilitados
-            comments_max_length: Longitud máxima de los comentarios (deja 0 si quieres mantener la configuración por defecto)
+            comments_max_length: Caracteres máximos por comentario (dejar 0 para el valor predeterminado)
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
             form:
               errors:
diff --git a/decidim-budgets/config/locales/es.yml b/decidim-budgets/config/locales/es.yml
index 725cf4adae8b6..34d31e987cd7d 100644
--- a/decidim-budgets/config/locales/es.yml
+++ b/decidim-budgets/config/locales/es.yml
@@ -347,7 +347,7 @@ es:
             announcement: Aviso
             clear_all: Limpiar todo
             comments_enabled: Comentarios habilitados
-            comments_max_length: Longitud máxima de los comentarios (deja 0 si quieres mantener la configuración por defecto)
+            comments_max_length: Caracteres máximos por comentario (dejar 0 para el valor predeterminado)
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
             form:
               errors:
diff --git a/decidim-budgets/config/locales/eu.yml b/decidim-budgets/config/locales/eu.yml
index 4c08aa38e2be9..7da8292080b50 100644
--- a/decidim-budgets/config/locales/eu.yml
+++ b/decidim-budgets/config/locales/eu.yml
@@ -180,7 +180,7 @@ eu:
           only_one: ezabatu zure babesa eta hasi berriro.
         completed: Amaituta
         count:
-          one: "%{count} aurrekontu"
+          one: "Aurrekontu %{count}"
           other: "%{count} aurrekontu"
         empty: Oraindik ez dago aurrekonturik
         finished_message: Amaitu duzu babesa emateko prozesua. Eskerrik asko parte hartzeagatik!
@@ -347,7 +347,7 @@ eu:
             announcement: Oharra
             clear_all: Garbitu dena
             comments_enabled: Iruzkinak gaituta
-            comments_max_length: Iruzkinen gehieneko luzera (uzti 0 defektuz konfigurazioa mantendu nahi baduzu)
+            comments_max_length: Iruzkin bakoitzeko gehieneko karaktereak (utzi 0 aurrez zehaztutako baliorako)
             define_taxonomy_filters: Mesedez, eszenatoki hau erabili aurretik, zehaztu espazio parte-hartzaile honetarako iragazki batzuk.
             form:
               errors:
diff --git a/decidim-budgets/config/locales/fr-CA.yml b/decidim-budgets/config/locales/fr-CA.yml
index 67c26618114fc..a8e95d2f60415 100644
--- a/decidim-budgets/config/locales/fr-CA.yml
+++ b/decidim-budgets/config/locales/fr-CA.yml
@@ -337,7 +337,7 @@ fr-CA:
           global:
             announcement: Annonce
             comments_enabled: Activer le module de commentaire
-            comments_max_length: Longueur max des commentaires (laisser 0 pour la valeur par défaut)
+            comments_max_length: Nombre maximum de caractères par commentaire (Laisser 0 pour la valeur par défaut)
             define_taxonomy_filters: Veuillez définir des filtres pour cet espace participatif avant d'utiliser ce paramètre.
             form:
               errors:
diff --git a/decidim-budgets/config/locales/fr.yml b/decidim-budgets/config/locales/fr.yml
index 8ea82f2dee6b2..22281e453adc8 100644
--- a/decidim-budgets/config/locales/fr.yml
+++ b/decidim-budgets/config/locales/fr.yml
@@ -337,7 +337,7 @@ fr:
           global:
             announcement: Annonce
             comments_enabled: Activer le module de commentaire
-            comments_max_length: Longueur max des commentaires (laisser 0 pour la valeur par défaut)
+            comments_max_length: Nombre maximum de caractères par commentaire (Laisser 0 pour la valeur par défaut)
             define_taxonomy_filters: Veuillez définir des filtres pour cet espace participatif avant d'utiliser ce paramètre.
             form:
               errors:
diff --git a/decidim-budgets/config/locales/gl.yml b/decidim-budgets/config/locales/gl.yml
index c1d23922d7e4d..2bc921b1c93ef 100644
--- a/decidim-budgets/config/locales/gl.yml
+++ b/decidim-budgets/config/locales/gl.yml
@@ -166,7 +166,6 @@ gl:
           global:
             announcement: Anuncio
             comments_enabled: Comentarios habilitados
-            comments_max_length: Lonxitude máxima dos comentarios (0 para valor predefinido)
             projects_per_page: Proxectos por páxina
             title: Título
             total_budget: Orzamento total
diff --git a/decidim-budgets/config/locales/hu.yml b/decidim-budgets/config/locales/hu.yml
index a1172ae7e996c..46d7343b87c9c 100644
--- a/decidim-budgets/config/locales/hu.yml
+++ b/decidim-budgets/config/locales/hu.yml
@@ -255,7 +255,6 @@ hu:
           global:
             announcement: Közlemény
             comments_enabled: Megjegyzések engedélyezve
-            comments_max_length: Kommentek maximális hossza (Hagyjon 0 -t az alapértékhez)
             form:
               errors:
                 budget_voting_rule_only_one: Csak egy szavazási szabály állítható be.
diff --git a/decidim-budgets/config/locales/it.yml b/decidim-budgets/config/locales/it.yml
index aa5866f53472a..020e3baae8059 100644
--- a/decidim-budgets/config/locales/it.yml
+++ b/decidim-budgets/config/locales/it.yml
@@ -170,7 +170,6 @@ it:
           global:
             announcement: Annuncio
             comments_enabled: Commenti abilitati
-            comments_max_length: Lunghezza massima dei commenti (Lasciare 0 per il valore predefinito)
             landing_page_content: Pagina iniziale dei budget
             more_information_modal: Finestra modale "Maggiori informazioni"
             projects_per_page: Progetti per pagina
diff --git a/decidim-budgets/config/locales/ja.yml b/decidim-budgets/config/locales/ja.yml
index 8fe6e177b03a4..8d63dd4b623c7 100644
--- a/decidim-budgets/config/locales/ja.yml
+++ b/decidim-budgets/config/locales/ja.yml
@@ -337,7 +337,7 @@ ja:
             announcement: お知らせ
             clear_all: すべてクリア
             comments_enabled: コメントを有効にする
-            comments_max_length: コメント最大長 (デフォルト値は 0 のまま)
+            comments_max_length: 各コメントの最大文字数 (0はデフォルト値のまま)
             define_taxonomy_filters: この設定を使用する前に、参加型スペースのフィルターをいくつか定義してください。
             form:
               errors:
diff --git a/decidim-budgets/config/locales/lb.yml b/decidim-budgets/config/locales/lb.yml
index 261fe0716ec5e..a77b0a2599767 100644
--- a/decidim-budgets/config/locales/lb.yml
+++ b/decidim-budgets/config/locales/lb.yml
@@ -148,7 +148,6 @@ lb:
           global:
             announcement: Ankündigung
             comments_enabled: Kommentare aktiviert
-            comments_max_length: Maximale Länge der Kommentare (0 für Standardwert)
             landing_page_content: Budgets Landingpage
             more_information_modal: Weitere Informationen
             projects_per_page: Projekte pro Seite
diff --git a/decidim-budgets/config/locales/lt.yml b/decidim-budgets/config/locales/lt.yml
index be57962b208c5..173e85d3f3fa8 100644
--- a/decidim-budgets/config/locales/lt.yml
+++ b/decidim-budgets/config/locales/lt.yml
@@ -257,7 +257,6 @@ lt:
           global:
             announcement: Pranešimas
             comments_enabled: Komentarai aktyvuoti
-            comments_max_length: Maksimalus komentaro ilgis (įrašyti 0 įprastam ilgiui)
             form:
               errors:
                 budget_voting_rule_only_one: Turi būti įjungta tik viena balsavimo taisyklė.
diff --git a/decidim-budgets/config/locales/nl.yml b/decidim-budgets/config/locales/nl.yml
index 342cfeeba9406..f7a7eb5c12236 100644
--- a/decidim-budgets/config/locales/nl.yml
+++ b/decidim-budgets/config/locales/nl.yml
@@ -196,7 +196,6 @@ nl:
           global:
             announcement: Aankondiging
             comments_enabled: Reacties ingeschakeld
-            comments_max_length: Commentaar maximale lengte (laat 0 voor standaardwaarde)
             landing_page_content: Budgetten landingspagina
             more_information_modal: Meer informatie
             projects_per_page: Projecten per pagina
diff --git a/decidim-budgets/config/locales/no.yml b/decidim-budgets/config/locales/no.yml
index e8804dd492ebe..92a9f6248b6ca 100644
--- a/decidim-budgets/config/locales/no.yml
+++ b/decidim-budgets/config/locales/no.yml
@@ -187,7 +187,6 @@
           global:
             announcement: Kunngjøring
             comments_enabled: Kommentarer aktivert
-            comments_max_length: Maks lengde på kommentarer (Sett 0 for standardverdi)
             landing_page_content: Landingsside budsjett
             more_information_modal: Mer informasjon
             projects_per_page: Prosjekter per side
diff --git a/decidim-budgets/config/locales/pl.yml b/decidim-budgets/config/locales/pl.yml
index 5cb6d34251035..e6979573e016a 100644
--- a/decidim-budgets/config/locales/pl.yml
+++ b/decidim-budgets/config/locales/pl.yml
@@ -268,7 +268,6 @@ pl:
           global:
             announcement: Ogłoszenie
             comments_enabled: Komentarze włączone
-            comments_max_length: Maksymalna długość komentarzy (Pozostaw 0 dla wartości domyślnej)
             form:
               errors:
                 budget_voting_rule_only_one: Może być włączona tylko jedna reguła głosowania.
diff --git a/decidim-budgets/config/locales/pt-BR.yml b/decidim-budgets/config/locales/pt-BR.yml
index 10a9d7e1dbaa1..b9380c38eca07 100644
--- a/decidim-budgets/config/locales/pt-BR.yml
+++ b/decidim-budgets/config/locales/pt-BR.yml
@@ -347,7 +347,6 @@ pt-BR:
             announcement: Anúncio
             clear_all: Limpar tudo
             comments_enabled: Comentários ativados
-            comments_max_length: Tamanho máximo de comentários (deixe 0 para o valor padrão)
             define_taxonomy_filters: Por favor, defina alguns filtros para este espaço participativo antes de usar esta configuração.
             form:
               errors:
diff --git a/decidim-budgets/config/locales/pt.yml b/decidim-budgets/config/locales/pt.yml
index 41f3d44c78227..af34438442cb6 100644
--- a/decidim-budgets/config/locales/pt.yml
+++ b/decidim-budgets/config/locales/pt.yml
@@ -158,7 +158,6 @@ pt:
           global:
             announcement: Anúncio
             comments_enabled: Comentários ativados
-            comments_max_length: Comprimento máximo dos comentários (Deixar 0 para o valor predefinido)
             landing_page_content: Página de entrada dos orçamentos
             more_information_modal: Mais informações modal
             projects_per_page: Projetos por página
diff --git a/decidim-budgets/config/locales/ro-RO.yml b/decidim-budgets/config/locales/ro-RO.yml
index f8c105067f9ff..c6b3c9dd8f426 100644
--- a/decidim-budgets/config/locales/ro-RO.yml
+++ b/decidim-budgets/config/locales/ro-RO.yml
@@ -191,7 +191,6 @@ ro:
           global:
             announcement: Anunţ
             comments_enabled: Comentarii activate
-            comments_max_length: Lungimea maximă a comentariilor (lăsați 0 pentru valoarea implicită)
             landing_page_content: Pagina pentru bugetare participativă
             more_information_modal: Mai multe informații
             projects_per_page: Proiecte pe pagină
diff --git a/decidim-budgets/config/locales/sk.yml b/decidim-budgets/config/locales/sk.yml
index 1a542710dbe15..a9918cf415c68 100644
--- a/decidim-budgets/config/locales/sk.yml
+++ b/decidim-budgets/config/locales/sk.yml
@@ -367,7 +367,6 @@ sk:
             announcement: Oznámenie
             clear_all: Vymazať všetko
             comments_enabled: Komentáre povolené
-            comments_max_length: Maximálna dĺžka komentárov (Ponechajte 0 pre predvolenú hodnotu)
             define_taxonomy_filters: Pred použitím tohto nastavenia definujte nejaké filtre pre tento participatívny priestor.
             form:
               errors:
diff --git a/decidim-budgets/config/locales/sv.yml b/decidim-budgets/config/locales/sv.yml
index 7db806c7d778a..55236474bf116 100644
--- a/decidim-budgets/config/locales/sv.yml
+++ b/decidim-budgets/config/locales/sv.yml
@@ -347,7 +347,6 @@ sv:
             announcement: Meddelande
             clear_all: Återställ
             comments_enabled: Aktivera kommentarer
-            comments_max_length: Maximal kommentarslängd (ange 0 för att använda standardvärdet)
             define_taxonomy_filters: Ställ in filter innan du använder den här inställningen.
             form:
               errors:
diff --git a/decidim-budgets/config/locales/tr-TR.yml b/decidim-budgets/config/locales/tr-TR.yml
index bfabb4f5d3b82..a83e5cfd668b8 100644
--- a/decidim-budgets/config/locales/tr-TR.yml
+++ b/decidim-budgets/config/locales/tr-TR.yml
@@ -155,7 +155,6 @@ tr:
           global:
             announcement: Duyurular
             comments_enabled: Yorumlar etkin
-            comments_max_length: Maksimum yorum uzunluğu (Varsayılan değer için 0 bırakın)
             landing_page_content: Bütçeler ana sayfası
             more_information_modal: Daha fazla bilgi
             projects_per_page: Sayfa başına projeler
diff --git a/decidim-budgets/config/locales/zh-CN.yml b/decidim-budgets/config/locales/zh-CN.yml
index cfcb603f99283..e80f8c7440641 100644
--- a/decidim-budgets/config/locales/zh-CN.yml
+++ b/decidim-budgets/config/locales/zh-CN.yml
@@ -141,7 +141,6 @@ zh-CN:
           global:
             announcement: 通 知
             comments_enabled: 评论已启用
-            comments_max_length: 评论最大长度 (默认值留0)
             landing_page_content: 预算登陆页
             more_information_modal: 更多信息模式
             projects_per_page: 每页项目数
diff --git a/decidim-budgets/config/locales/zh-TW.yml b/decidim-budgets/config/locales/zh-TW.yml
index 94b36f96f63f1..e3397e647bb25 100644
--- a/decidim-budgets/config/locales/zh-TW.yml
+++ b/decidim-budgets/config/locales/zh-TW.yml
@@ -227,7 +227,6 @@ zh-TW:
           global:
             announcement: 公告
             comments_enabled: 啟用評論功能
-            comments_max_length: 評論字數最大長度(若要使用預設值請輸入0)
             form:
               errors:
                 budget_voting_rule_only_one: 僅能啟用一個投票規則。
diff --git a/decidim-collaborative_texts/config/locales/eu.yml b/decidim-collaborative_texts/config/locales/eu.yml
index 1de9e0eb6698d..0fc8c3501e2dd 100644
--- a/decidim-collaborative_texts/config/locales/eu.yml
+++ b/decidim-collaborative_texts/config/locales/eu.yml
@@ -13,7 +13,7 @@ eu:
           original: Jatorrizko testua
           replace: Ordezkapena
         version:
-          body: Gorputza
+          body: Testua
           draft: Zirriborroa
           version_number: Bertsio zenbakia
   activerecord:
diff --git a/decidim-comments/config/locales/pl.yml b/decidim-comments/config/locales/pl.yml
index aaaa5e2eeec42..ffd3b2c454fb5 100644
--- a/decidim-comments/config/locales/pl.yml
+++ b/decidim-comments/config/locales/pl.yml
@@ -159,7 +159,7 @@ pl:
           email_intro: Wspomniano o Tobie
           email_outro: Otrzymałeś to powiadomienie, ponieważ wspomniano o Tobie w %{resource_title}.
           email_subject: Wspomniano o Tobie w %{resource_title}
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> wspomniał(a) o Tobie w <a href="%{resource_path}">%{resource_title}</a> 
+          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> wspomniał(a) o Tobie w <a href="%{resource_path}">%{resource_title}</a>
   errors:
     messages:
       cannot_have_comments: nie może mieć komentarzy
diff --git a/decidim-conferences/config/locales/sk.yml b/decidim-conferences/config/locales/sk.yml
index 781e01a77a6b2..6860cb3b1e98d 100644
--- a/decidim-conferences/config/locales/sk.yml
+++ b/decidim-conferences/config/locales/sk.yml
@@ -501,7 +501,7 @@ sk:
         show:
           already_have_an_account?: Už máte účet?
           are_you_new?: Nový účastník?
-          login_as: Ste prihlásení ako %{name} %{email} 
+          login_as: Ste prihlásení ako %{name} %{email}
           make_conference_registration: Zaregistrovať sa na konferenciu
           manage_registration: Spravovať registráciu
           register: Registrovať
@@ -591,10 +591,10 @@ sk:
         conference_registration_validation_pending:
           notification_title: Vaša registrácia na konferencii <a href="%{resource_url}">%{resource_title}</a> čaká na potvrdenie.
         conference_registrations_over_percentage:
-          email_intro: Konferencia "%{resource_title}" je obsadená na viac, než%{percentage} %. 
+          email_intro: Konferencia "%{resource_title}" je obsadená na viac, než%{percentage} %.
           email_outro: Túto notifikáciu ste dostali, pretože ste administrátorom participatívneho priestoru konferencie.
-          email_subject: Konferencia "%{resource_title}" je obsadená na viac, než%{percentage} %. 
-          notification_title: Konferencia <a href="%{resource_path}">%{resource_title}</a> je obsadená na viac, než %{percentage} %. 
+          email_subject: Konferencia "%{resource_title}" je obsadená na viac, než%{percentage} %.
+          notification_title: Konferencia <a href="%{resource_path}">%{resource_title}</a> je obsadená na viac, než %{percentage} %.
         conference_updated:
           email_intro: 'Konferencia "%{resource_title}" bola aktualizovaná. Novú verziu si môžete pozrieť na jej stránke:'
           email_outro: Túto notifikáciu ste dostali, pretože sledujete konferenciu "%{resource_title}". Notifikácie môžete zrušiť po kliknutí na predchádzajúci odkaz.
diff --git a/decidim-core/config/locales/ar.yml b/decidim-core/config/locales/ar.yml
index 59a646074cd34..958045c433968 100644
--- a/decidim-core/config/locales/ar.yml
+++ b/decidim-core/config/locales/ar.yml
@@ -407,7 +407,6 @@ ar:
           global:
             amendments_enabled: تم تمكين التعديلات
             comments_enabled: تم تمكين التعليقات
-            comments_max_length: الحد الأقصى لطول التعليقات
             dummy_global_attribute1: السمة الدمية 1
             dummy_global_attribute2: السمة الدمية 2
             dummy_global_translatable_text: نص افتراضي قابل للترجمة
@@ -810,7 +809,6 @@ ar:
           modal_title: محادثة جديدة
           no_results: لا توجد نتائج
         error_modal:
-          close: اغلاق النموذج
           correct_errors: يرجى تصحيح الأخطاء والمحاولة مرة أخرى.
           intro: 'حدثت الأخطاء التالية في رسالتك:'
           ok: حسناً
diff --git a/decidim-core/config/locales/bg.yml b/decidim-core/config/locales/bg.yml
index 0dc473f799e1b..f4d41513289a4 100644
--- a/decidim-core/config/locales/bg.yml
+++ b/decidim-core/config/locales/bg.yml
@@ -458,7 +458,6 @@ bg:
           global:
             amendments_enabled: Поправки разрешени
             comments_enabled: Коментари разрешени
-            comments_max_length: Максимална дължина на коментарите
             dummy_global_attribute1: Макетен атрибут 1
             dummy_global_attribute2: Макетен атрибут 2
             dummy_global_translatable_text: Макетен преводим текст
@@ -930,7 +929,6 @@ bg:
         create:
           error: Разговора не започна. Опитайте по-късно.
         error_modal:
-          close: Затвори прозореца
           correct_errors: Моля, коригирайте грешките и опитайте отново.
           intro: 'Имаше следните грешки с вашето съобщение:'
           ok: ОК
diff --git a/decidim-core/config/locales/ca-IT.yml b/decidim-core/config/locales/ca-IT.yml
index 7cc3d534e7287..949e6be649c3b 100644
--- a/decidim-core/config/locales/ca-IT.yml
+++ b/decidim-core/config/locales/ca-IT.yml
@@ -554,7 +554,7 @@ ca-IT:
           global:
             amendments_enabled: Esmenes habilitades
             comments_enabled: Comentaris habilitats
-            comments_max_length: Longitud màxima dels comentaris
+            comments_max_length: Caràcters màxims per comentari
             define_taxonomy_filters: Si us plau, defineix algunes filtres per aquest espai de participació abans de fer servir aquesta configuració.
             dummy_global_attribute1: Atribut de prova 1
             dummy_global_attribute2: Atribut de prova 2
@@ -1175,7 +1175,7 @@ ca-IT:
         taxonomy_presenter:
           not_found: 'No s''ha trobat la taxonomia a la base de dades (ID: %{id})'
     machine_translations:
-      automatic: traducció automàtica a %{locale_name} 
+      automatic: traducció automàtica a %{locale_name}
     managed_users:
       expired_session: La sessió actual d'administració d'una participant ha caducat.
     map:
@@ -1212,7 +1212,6 @@ ca-IT:
         create:
           error: No s'ha iniciat la conversa. Torna-ho a provar més tard.
         error_modal:
-          close: Tanca la finestra
           correct_errors: Si us plau, corregiu els errors i torneu-ho a intentar.
           intro: 'Hi ha els següents errors al vostre missatge:'
           ok: D'acord
@@ -1529,7 +1528,7 @@ ca-IT:
         greetings_html: |
           Atentament,<br>
           %{organization_name}
-        hello: Benvolgut/da %{username},
+        hello: Hola %{username},
         subject: Avís de compte inactiu
     passwords:
       update:
diff --git a/decidim-core/config/locales/ca.yml b/decidim-core/config/locales/ca.yml
index ca259a1ae3db4..974a0a68cd208 100644
--- a/decidim-core/config/locales/ca.yml
+++ b/decidim-core/config/locales/ca.yml
@@ -554,7 +554,7 @@ ca:
           global:
             amendments_enabled: Esmenes habilitades
             comments_enabled: Comentaris habilitats
-            comments_max_length: Longitud màxima dels comentaris
+            comments_max_length: Caràcters màxims per comentari
             define_taxonomy_filters: Si us plau, defineix algunes filtres per aquest espai de participació abans de fer servir aquesta configuració.
             dummy_global_attribute1: Atribut de prova 1
             dummy_global_attribute2: Atribut de prova 2
@@ -1212,7 +1212,6 @@ ca:
         create:
           error: No s'ha iniciat la conversa. Torna-ho a provar més tard.
         error_modal:
-          close: Tanca la finestra
           correct_errors: Si us plau, corregiu els errors i torneu-ho a intentar.
           intro: 'Hi ha els següents errors al vostre missatge:'
           ok: D'acord
@@ -1529,7 +1528,7 @@ ca:
         greetings_html: |
           Atentament,<br>
           %{organization_name}
-        hello: Benvolgut/da %{username},
+        hello: Hola %{username},
         subject: Avís de compte inactiu
     passwords:
       update:
@@ -1858,7 +1857,7 @@ ca:
       invite_collaborator:
         subject: T'han convidat a col·laborar a %{organization}
       invite_private_user:
-        subject: T'han convidat a participar en un espai de participació privat a%{organization}
+        subject: T'han convidat a participar en un espai de participació privat a %{organization}
       organization_admin_invitation_instructions:
         subject: T'han convidat a administrar %{organization}
       password_change:
diff --git a/decidim-core/config/locales/cs.yml b/decidim-core/config/locales/cs.yml
index 07d1c8ba2d62d..0d91f6bdca795 100644
--- a/decidim-core/config/locales/cs.yml
+++ b/decidim-core/config/locales/cs.yml
@@ -585,7 +585,7 @@ cs:
           global:
             amendments_enabled: Pozměňovací návrhy povoleny
             comments_enabled: Komentáře povoleny
-            comments_max_length: Maximální délka komentářů
+            comments_max_length: Maximální počet znaků na komentář
             define_taxonomy_filters: Před použitím tohoto nastavení prosím definujte některé filtry pro tento participační prostor.
             dummy_global_attribute1: Zástupný atribut 1
             dummy_global_attribute2: Zástupný atribut 2
@@ -1240,7 +1240,6 @@ cs:
         create:
           error: Konverzace nebyla zahájena. Zkuste to znovu později.
         error_modal:
-          close: Zavřít okno
           correct_errors: Opravte chyby a zkuste to znovu.
           intro: 'Došlo k následujícím chybám ve vaší zprávě:'
           ok: OK
@@ -1551,7 +1550,6 @@ cs:
         greetings_html: |
           S pozdravem,<br>
           %{organization_name}
-        hello: Dobrý den %{username},
         subject: Neaktivní účet byl smazán
     passwords:
       update:
diff --git a/decidim-core/config/locales/de.yml b/decidim-core/config/locales/de.yml
index 845497a028d02..072c0668e7d81 100644
--- a/decidim-core/config/locales/de.yml
+++ b/decidim-core/config/locales/de.yml
@@ -553,7 +553,6 @@ de:
           global:
             amendments_enabled: Änderungen aktiviert
             comments_enabled: Kommentare aktiviert
-            comments_max_length: Maximallänge der Kommentare
             define_taxonomy_filters: Bitte definieren Sie einige Filter für diesen partizipativen Bereich, bevor Sie diese Einstellung verwenden.
             dummy_global_attribute1: Dummy-Attribut 1
             dummy_global_attribute2: Dummy-Attribut 2
@@ -704,12 +703,12 @@ de:
           notice: |-
             <p>Hallo, sind Sie sicher, dass Sie keinen Newsletter erhalten möchten?
             Bitte prüfen Sie noch einmal, ob Sie das Kästchen mit der Bestellung des Newsletters nicht doch ankreuzen möchten.
-            Es ist sehr wichtig für uns, dass Sie gelegentlich E-Mails erhalten können, 
+            Es ist sehr wichtig für uns, dass Sie gelegentlich E-Mails erhalten können,
             damit wir Ihnen wichtige Informationen mitteilen können. Sie können die
             Seite mit den Einstellungen für Mitteilungen jederzeit ändern.</p>
             <p>Wenn Sie das Kästchen nicht ankreuzen, könnten Sie vielleicht wichtige Informationen
-             über neue Möglichkeiten der Teilnahme an der Plattform verpassen.<br>
-            Wenn Sie dennoch keinen Newsletter erhalten möchten, 
+            über neue Möglichkeiten der Teilnahme an der Plattform verpassen.<br>
+            Wenn Sie dennoch keinen Newsletter erhalten möchten,
             haben wir vollstes Verständnis für Ihre Entscheidung.</p>
             <p>Vielen Dank, dass Sie sich die Zeit zum Lesen genommen haben!</p>
           title: Newsletter Benachrichtigungen
@@ -1206,7 +1205,6 @@ de:
         create:
           error: Die Unterhaltung wurde nicht gestartet. Versuchen Sie es später noch einmal.
         error_modal:
-          close: Fenster schließen
           correct_errors: Bitte korrigiere diese Fehler und versuche es erneut.
           intro: 'Es gab folgende Fehler bei Ihrer Nachricht:'
           ok: OK
@@ -1364,7 +1362,7 @@ de:
             one: "%{count} Ressource"
             other: "%{count} Ressourcen"
           spaces: Bereiche
-          title: Open Data Dateien für %{organization} 
+          title: Open Data Dateien für %{organization}
         moderated_users:
           about: Die Beschreibung des Kontos
           block_reasons: Der Grund der Blockierung eines Kontos durch einen Admin
@@ -1522,7 +1520,6 @@ de:
         greetings_html: |
           Freundliche Grüsse,<br>
           %{organization_name}
-        hello: Hallo %{username},
         subject: Inaktives Konto gelöscht
     passwords:
       update:
diff --git a/decidim-core/config/locales/el.yml b/decidim-core/config/locales/el.yml
index 612a4b93c8304..9b3330fd9579c 100644
--- a/decidim-core/config/locales/el.yml
+++ b/decidim-core/config/locales/el.yml
@@ -368,7 +368,6 @@ el:
           global:
             amendments_enabled: Οι τροποποιήσεις ενεργοποιήθηκαν
             comments_enabled: Τα σχόλια ενεργοποιήθηκαν
-            comments_max_length: Μέγιστο μήκος σχολίων
             dummy_global_attribute1: Εικονικό χαρακτηριστικό 1
             dummy_global_attribute2: Εικονικό χαρακτηριστικό 2
             dummy_global_translatable_text: Εικονικό μετατρέψιμο κείμενο
diff --git a/decidim-core/config/locales/es-MX.yml b/decidim-core/config/locales/es-MX.yml
index db027e5ee6c4d..3c9f7ca7955b7 100644
--- a/decidim-core/config/locales/es-MX.yml
+++ b/decidim-core/config/locales/es-MX.yml
@@ -557,7 +557,7 @@ es-MX:
           global:
             amendments_enabled: Enmiendas habilitadas
             comments_enabled: Comentarios habilitados
-            comments_max_length: Longitud máxima de los comentarios
+            comments_max_length: Máximo de caracteres por comentario
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
             dummy_global_attribute1: Atributo de prueba 1
             dummy_global_attribute2: Atributo de prueba 2
@@ -1215,7 +1215,6 @@ es-MX:
         create:
           error: No se ha iniciado la conversación. Vuelve a intentarlo más tarde.
         error_modal:
-          close: Cerrar modal
           correct_errors: Por favor, corrige los errores e inténtalo de nuevo.
           intro: 'Se han producido los siguientes errores en tu mensaje:'
           ok: De acuerdo
@@ -1532,7 +1531,7 @@ es-MX:
         greetings_html: |
           Atentamente,<br>
           %{organization_name}
-        hello: Estimado/a %{username},
+        hello: Hola %{username},
         subject: Aviso de cuenta inactiva
     passwords:
       update:
diff --git a/decidim-core/config/locales/es-PY.yml b/decidim-core/config/locales/es-PY.yml
index f77ace9288ec8..7b3f4d8dbaef5 100644
--- a/decidim-core/config/locales/es-PY.yml
+++ b/decidim-core/config/locales/es-PY.yml
@@ -557,7 +557,7 @@ es-PY:
           global:
             amendments_enabled: Enmiendas habilitadas
             comments_enabled: Comentarios habilitados
-            comments_max_length: Longitud máxima de los comentarios
+            comments_max_length: Máximo de caracteres por comentario
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
             dummy_global_attribute1: Atributo ficticio 1
             dummy_global_attribute2: Atributo ficticio 2
@@ -1215,7 +1215,6 @@ es-PY:
         create:
           error: No se ha iniciado la conversación. Vuelve a intentarlo más tarde.
         error_modal:
-          close: Cerrar modal
           correct_errors: Por favor, corrige los errores e inténtalo de nuevo.
           intro: 'Se han producido los siguientes errores en tu mensaje:'
           ok: De acuerdo
@@ -1532,7 +1531,7 @@ es-PY:
         greetings_html: |
           Atentamente,<br>
           %{organization_name}
-        hello: Estimado/a %{username},
+        hello: Hola %{username},
         subject: Aviso de cuenta inactiva
     passwords:
       update:
diff --git a/decidim-core/config/locales/es.yml b/decidim-core/config/locales/es.yml
index 446a6439b7c1f..504f967e2011e 100644
--- a/decidim-core/config/locales/es.yml
+++ b/decidim-core/config/locales/es.yml
@@ -554,7 +554,7 @@ es:
           global:
             amendments_enabled: Enmiendas habilitadas
             comments_enabled: Comentarios habilitados
-            comments_max_length: Longitud máxima de los comentarios
+            comments_max_length: Máximo de caracteres por comentario
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
             dummy_global_attribute1: Atributo de prueba 1
             dummy_global_attribute2: Atributo de prueba 2
@@ -1212,7 +1212,6 @@ es:
         create:
           error: No se ha iniciado la conversación. Vuelve a intentarlo más tarde.
         error_modal:
-          close: Cerrar modal
           correct_errors: Por favor, corrige los errores e inténtalo de nuevo.
           intro: 'Se han producido los siguientes errores en tu mensaje:'
           ok: De acuerdo
@@ -1529,7 +1528,7 @@ es:
         greetings_html: |
           Atentamente,<br>
           %{organization_name}
-        hello: Estimado/a %{username},
+        hello: Hola %{username},
         subject: Aviso de cuenta inactiva
     passwords:
       update:
diff --git a/decidim-core/config/locales/eu.yml b/decidim-core/config/locales/eu.yml
index 9b698da0c4c36..0f3d9e5b3278c 100644
--- a/decidim-core/config/locales/eu.yml
+++ b/decidim-core/config/locales/eu.yml
@@ -555,7 +555,7 @@ eu:
           global:
             amendments_enabled: Zuzenketak gaituta
             comments_enabled: Iruzkinak gaituta
-            comments_max_length: Iruzkinen gehieneko luzera
+            comments_max_length: Iruzkin bakoitzeko gehieneko karaktereak
             define_taxonomy_filters: Mesedez, eszenatoki hau erabili aurretik, zehaztu espazio parte-hartzaile honetarako iragazki batzuk.
             dummy_global_attribute1: Balizko atributua 1
             dummy_global_attribute2: Balizko atributua 2
@@ -774,7 +774,7 @@ eu:
           created_at: Zein datatan eta zein ordutan sortu zen parte-hartzaile pribatu hau
           id: Parte-hartzaile honen identifikatzaile bakarra
           privatable_to: Zein espaziotakoa den parte-hartzaile pribatu hau
-          published: Ea parte-hartzaile pribatu hau argitaratuta dagoen ala ez
+          published: Parte-hartzaile pribatu hau argitaratuta dagoen ala ez
           role: Zein rol duen parte-hartzaile pribatu honek
           updated_at: Zein datatan eta zein ordutan eguneratu zen parte-hartzaile pribatu hau
         reports:
@@ -1212,7 +1212,6 @@ eu:
         create:
           error: Elkarrizketa ez da hasi. Saiatu berriro geroago.
         error_modal:
-          close: Itxi leihoa
           correct_errors: Mesedez, zuzendu akatsak eta saiatu berriro.
           intro: 'Zure mezuan honako akats hauek gertatu dira:'
           ok: Ados
@@ -1529,7 +1528,7 @@ eu:
         greetings_html: |
           Adeitasunez,<br>
           %{organization_name}
-        hello: "%{username}, agurgarria:\n"
+        hello: '%{username}, estimatua:'
         subject: Kontu inaktiboa ezabatua
     passwords:
       update:
diff --git a/decidim-core/config/locales/fi-plain.yml b/decidim-core/config/locales/fi-plain.yml
index 4f3e9c9d84044..d2fac290a38b0 100644
--- a/decidim-core/config/locales/fi-plain.yml
+++ b/decidim-core/config/locales/fi-plain.yml
@@ -1214,7 +1214,6 @@ fi-pl:
         create:
           error: Keskustelun aloittaminen epäonnistui. Yritä myöhemmin uudelleen.
         error_modal:
-          close: Sulje ikkuna
           correct_errors: Korjaa virheet ja yritä uudestaan.
           intro: 'Viestisi sisältää seuraavia virheitä:'
           ok: OK
@@ -1531,7 +1530,6 @@ fi-pl:
         greetings_html: |
           Terveisin,<br>
           %{organization_name}
-        hello: Hei %{username},
         subject: Käyttämättä ollut tili on poistettu
     passwords:
       update:
diff --git a/decidim-core/config/locales/fi.yml b/decidim-core/config/locales/fi.yml
index 29264d8834e64..0afacced47170 100644
--- a/decidim-core/config/locales/fi.yml
+++ b/decidim-core/config/locales/fi.yml
@@ -1214,7 +1214,6 @@ fi:
         create:
           error: Keskustelun aloittaminen epäonnistui. Yritä myöhemmin uudestaan.
         error_modal:
-          close: Sulje ikkuna
           correct_errors: Korjaa virheet ja yritä uudestaan.
           intro: 'Viestisi sisältää seuraavia virheitä:'
           ok: OK
diff --git a/decidim-core/config/locales/fr-CA.yml b/decidim-core/config/locales/fr-CA.yml
index 4643ef3cacb27..8e2623a87203a 100644
--- a/decidim-core/config/locales/fr-CA.yml
+++ b/decidim-core/config/locales/fr-CA.yml
@@ -518,7 +518,7 @@ fr-CA:
           global:
             amendments_enabled: Modifications activées
             comments_enabled: Activer le module de commentaire
-            comments_max_length: Longueur maximale des commentaires
+            comments_max_length: Nombre maximum de caractères par commentaire
             dummy_global_attribute1: Attribut factice 1
             dummy_global_attribute2: Attribut factice 2
             dummy_global_translatable_text: Texte traduisible factice
@@ -1090,7 +1090,6 @@ fr-CA:
         create:
           error: La conversation n'a pas commencé. Réessayez plus tard.
         error_modal:
-          close: Fermer la fenêtre de dialogue
           correct_errors: Veuillez corriger les erreurs et réessayer.
           intro: 'Il y a eu les erreurs suivantes avec votre message :'
           ok: Ok
@@ -1382,7 +1381,6 @@ fr-CA:
         greetings_html: |
           Cordialement,<br>
           %{organization_name}
-        hello: Cher(ère) %{username},
         subject: Compte inactif supprimé
     passwords:
       update:
diff --git a/decidim-core/config/locales/fr.yml b/decidim-core/config/locales/fr.yml
index 1d018353cbcdb..5a4983f034562 100644
--- a/decidim-core/config/locales/fr.yml
+++ b/decidim-core/config/locales/fr.yml
@@ -431,6 +431,7 @@ fr:
         explanation: Procédure d'autorisation factice
         name: Procédure d'autorisation factice
       ephemeral_dummy_authorization_handler:
+        explanation: Obtenir une vérification en saisissant un numéro de document se terminant par « X ».
         fields:
           allowed_postal_codes: Codes postaux autorisés (séparés par des virgules)
           document_number: Numéro du document
@@ -518,7 +519,7 @@ fr:
           global:
             amendments_enabled: Modifications activées
             comments_enabled: Activer le module de commentaire
-            comments_max_length: Longueur maximale des commentaires
+            comments_max_length: Nombre maximum de caractères par commentaire
             dummy_global_attribute1: Attribut factice 1
             dummy_global_attribute2: Attribut factice 2
             dummy_global_translatable_text: Texte traduisible factice
@@ -1090,7 +1091,6 @@ fr:
         create:
           error: La conversation n'a pas commencé. Réessayez plus tard.
         error_modal:
-          close: Fermer la fenêtre de dialogue
           correct_errors: Veuillez corriger les erreurs et réessayer.
           intro: 'Il y a eu les erreurs suivantes avec votre message :'
           ok: Ok
diff --git a/decidim-core/config/locales/hu.yml b/decidim-core/config/locales/hu.yml
index e13ad8e7a3444..682842cb52be5 100644
--- a/decidim-core/config/locales/hu.yml
+++ b/decidim-core/config/locales/hu.yml
@@ -416,7 +416,6 @@ hu:
           global:
             amendments_enabled: A módosítások engedélyezve vannak
             comments_enabled: Megjegyzések engedélyezve
-            comments_max_length: A hozzászólások maximális hossza
             dummy_global_attribute1: Dummy tulajdonság 1
             dummy_global_attribute2: Dummy tulajdonság 2
             dummy_global_translatable_text: Kenyérszöveg - nem valódi fordítható szöveg
@@ -837,7 +836,6 @@ hu:
         create:
           error: A beszélgetés nem kezdődött el. Próbáld újra később.
         error_modal:
-          close: Ablak bezárás
           correct_errors: Kérjük javítsa a hibákat és próbálja újra.
           intro: 'A következő hibákat tartalmazza az üzenet:'
           ok: OK
diff --git a/decidim-core/config/locales/it.yml b/decidim-core/config/locales/it.yml
index e93c6ab0ecc88..4f75aa55b001b 100644
--- a/decidim-core/config/locales/it.yml
+++ b/decidim-core/config/locales/it.yml
@@ -428,7 +428,6 @@ it:
           global:
             amendments_enabled: Emendamenti abilitati
             comments_enabled: Commenti abilitati
-            comments_max_length: Lunghezza massima dei commenti
             dummy_global_attribute1: Attributo fittizio 1
             dummy_global_attribute2: Attributo fittizio 2
             dummy_global_translatable_text: Testo traducibile Dummy
@@ -754,7 +753,6 @@ it:
           modal_title: Nuova conversazione
           no_results: Nessun risultato
         error_modal:
-          close: Chiudi modalità
           correct_errors: Correggi gli errori e riprova.
           intro: 'Ci sono stati i seguenti errori con il tuo messaggio:'
           ok: Ok
diff --git a/decidim-core/config/locales/ja.yml b/decidim-core/config/locales/ja.yml
index 65b76290c96a3..63af73a36076f 100644
--- a/decidim-core/config/locales/ja.yml
+++ b/decidim-core/config/locales/ja.yml
@@ -407,6 +407,10 @@ ja:
       withdraw:
         error: 修正案の取り消し中に問題がありました。
         success: 修正を撤回しました。
+      wizard_step_form:
+        steps:
+          '1': 修正内容を作成する
+          '2': 修正内容を公開
     anonymous_user: 匿名です
     application:
       document:
@@ -536,7 +540,7 @@ ja:
           global:
             amendments_enabled: 修正を有効にする
             comments_enabled: コメントを有効にする
-            comments_max_length: コメント最大長
+            comments_max_length: 各コメントの最大文字数
             define_taxonomy_filters: この設定を使用する前に、参加型スペースのフィルターをいくつか定義してください。
             dummy_global_attribute1: ダミーステータス１
             dummy_global_attribute2: ダミーステータス2
@@ -859,7 +863,7 @@ ja:
             notification_title: <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> が作成した <a href="%{emendation_path}">修正</a> が <a href="%{amendable_path}">%{amendable_title}</a> に採用されました。
           follower:
             email_intro: '%{amendable_title}の修正が承認されました。このページから確認できます:'
-            email_outro: '%{amendable_title}をフォローしているため、この通知を受け取りました。前のリンクに続く通知の受信を停止することができます。'
+            email_outro: '%{amendable_title}をフォローしているため、この通知を受け取りました。上記のリンクから通知の受信を停止することができます。'
             email_subject: '%{amendable_title} から %{emendation_author_nickname} の修正を承認しました'
             notification_title: <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> が作成した <a href="%{emendation_path}">修正</a> が <a href="%{amendable_path}">%{amendable_title}</a> に採用されました。
         amendment_created:
@@ -870,7 +874,7 @@ ja:
             notification_title: <a href="%{amendable_path}">%{amendable_title}</a> の新しい修正が作成されました。
           follower:
             email_intro: '%{amendable_title}の新しい修正が作成されました。このページから確認できます:'
-            email_outro: '%{amendable_title}をフォローしているため、この通知を受け取りました。前のリンクに続く通知の受信を停止することができます。'
+            email_outro: '%{amendable_title}をフォローしているため、この通知を受け取りました。上記のリンクから通知の受信を停止することができます。'
             email_subject: '%{amendable_title} の新しい修正'
             notification_title: <a href="%{amendable_path}">%{amendable_title}</a> の新しい修正が作成されました。
         amendment_promoted:
@@ -881,7 +885,7 @@ ja:
             notification_title: <a href="%{amendable_path}">%{amendable_title}</a>についての<a href="%{emendation_path}">却下された修正</a> が新しい %{amendable_type} として <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>によって公開されました.
           follower:
             email_intro: '%{amendable_title} の修正が却下されました。新しい %{amendable_type}として公開されました。このページから見ることができます:'
-            email_outro: '%{amendable_title}をフォローしているため、この通知を受け取りました。前のリンクに続く通知の受信を停止することができます。'
+            email_outro: '%{amendable_title}をフォローしているため、この通知を受け取りました。上記のリンクから通知の受信を停止することができます。'
             email_subject: '%{emendation_author_nickname} からの修正が新しい %{amendable_type} として公開されました'
             notification_title: <a href="%{amendable_path}">%{amendable_title}</a>についての<a href="%{emendation_path}">却下された修正</a>が新しい%{amendable_type} として <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>によって公開されました.
         amendment_rejected:
@@ -892,7 +896,7 @@ ja:
             notification_title: <a href="%{emendation_path}">修正</a> <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> によって作成された <a href="%{amendable_path}">%{amendable_title}</a> は拒否されました。
           follower:
             email_intro: '%{amendable_title}の修正が拒否されました。このページから確認できます:'
-            email_outro: '%{amendable_title}をフォローしているため、この通知を受け取りました。前のリンクに続く通知の受信を停止することができます。'
+            email_outro: '%{amendable_title}をフォローしているため、この通知を受け取りました。上記のリンクから通知の受信を停止することができます。'
             email_subject: '%{amendable_title} から %{emendation_author_nickname} の修正が却下されました'
             notification_title: <a href="%{emendation_path}">修正</a> <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> によって作成された <a href="%{amendable_path}">%{amendable_title}</a> は拒否されました。
         emendation_promoted:
@@ -909,13 +913,13 @@ ja:
       components:
         component_published:
           email_intro: '%{resource_title} コンポーネントが %{participatory_space_title}でアクティブになりました。このページから見ることができます:'
-          email_outro: '%{participatory_space_title}をフォローしているため、この通知を受け取りました。前のリンクに続く通知の受信を停止することができます。'
+          email_outro: '%{participatory_space_title}をフォローしているため、この通知を受け取りました。上記のリンクから通知の受信を停止することができます。'
           email_subject: '%{participatory_space_title} への更新'
           notification_title: '%{resource_title} コンポーネントが <a href="%{resource_path}">%{participatory_space_title}</a> のためにアクティブになりました'
       email_event:
         email_greeting: こんにちは、 %{user_name} さん。
         email_intro: '"%{resource_title}" の更新がありました。このページから見ることができます：'
-        email_outro: '「%{resource_title}」をフォローしているため、この通知を受け取りました。前のリンクからこの通知をアンフォローすることができます。'
+        email_outro: '「%{resource_title}」をフォローしているため、この通知を受け取りました。上記のリンクからアンフォローすることができます。'
         email_subject: '%{resource_title} への更新'
       gamification:
         badge_earned:
@@ -942,8 +946,8 @@ ja:
           email_subject: '%{resource_type} は表示されなくなりました'
           notification_title: |-
             あなたの%{resource_type}は表示されなくなりました。<br>
-            これは、あなたが返信した提案、ミーティング、討論、またはコメントがモデレーションされたためです。 
-            元の投稿が再び表示可能になった場合、あなたのコメントも自動的に復元されます。 
+            これは、あなたが返信した提案、ミーティング、討論、またはコメントがモデレーションされたためです。
+            元の投稿が再び表示可能になった場合、あなたのコメントも自動的に復元されます。
             <i>%{resource_content}</i>
         resource_hidden:
           email_intro: '%{report_reasons} として報告されたため、管理者が %{resource_type} を削除しました。'
@@ -1192,7 +1196,6 @@ ja:
         create:
           error: 会話が開始されませんでした。後ほど改めてお試しください。
         error_modal:
-          close: ウィンドウを閉じる
           correct_errors: エラーを修正して、再度お試しください
           intro: 'あなたのメッセージには次のエラーがありました:'
           ok: OK
@@ -1318,6 +1321,7 @@ ja:
         own_activity: 誰かが私の提案にコメントしたり、私に言及したりした時など、自分自身の活動
         push_notifications: プッシュ通知
         push_notifications_reminder: プラットフォームから通知を受け取るには、まずブラウザの設定で通知を許可する必要があります。
+        push_notifications_unsupported_browser: お使いのブラウザはサポートされていません。
         receive_notifications_about: 受け取りたい通知
         update_notifications_settings: 変更を保存
       update:
@@ -1376,7 +1380,7 @@ ja:
           is_root: このタクソノミーが親を持たない場合は True
           name: このタクソノミーの名前
           parent_id: このタクソノミーの親の固有ID(もしあれば)
-          part_of: このタクソノミが他のタクソノミの一部であるかどうかを検出するために使用されます
+          part_of: この分類が他の分類の一部であるかどうかを検出するために使用されます
           taxonomizations_count: このタクソノミーを使用するリソースの数
           updated_at: このタクソノミーの最終更新日時
           weight: このタクソノミーが表示される順序
@@ -1492,7 +1496,7 @@ ja:
     participants_account_mailer:
       inactivity_notification:
         body_html: |
-          <p>記録によると、あなたは<strong>%{date_account_creation}</strong>に%{organization_name}のアカウントを作成しましたが、<strong>%{date_last_connection}</strong>以降は利用されていないようです。</p> <p>プライバシー保護のため、このアカウントは<strong>%{days}日後</strong>に自動削除される予定です。</p> 
+          <p>記録によると、あなたは<strong>%{date_account_creation}</strong>に%{organization_name}のアカウントを作成しましたが、<strong>%{date_last_connection}</strong>以降は利用されていないようです。</p> <p>プライバシー保護のため、このアカウントは<strong>%{days}日後</strong>に自動削除される予定です。</p>
           <p>%{organization_name}のアカウントを保持したい場合は、それまでに%{login_url}にアクセスするだけでアカウントは維持されます。</p>
         greetings_html: |
           よろしくお願いいたします。<br>
@@ -1506,7 +1510,6 @@ ja:
         greetings_html: |
           よろしくお願いいたします。<br>
           %{organization_name}
-        hello: こんにちは %{username} さん、
         subject: 非アクティブなアカウントが削除されました
     passwords:
       update:
@@ -1797,6 +1800,7 @@ ja:
         nickname_help: ニックネームは %{organization} です。英文字、数字、'-' および '_' のみ使用できます。
         submit_button: 保存
         subtitle: 招待を受け入れる場合は、アカウントIDとパスワードを設定してください。
+        subtitle_no_password: 招待を受け入れる場合は、ニックネームを設定してください。
       invitation_removed: 招待が削除されました。
       invitation_token_invalid: 指定された招待トークンは無効です！
       new:
@@ -1804,6 +1808,8 @@ ja:
         submit_button: 招待状を送信
       no_invitations_remaining: 招待状は残っていません
       send_instructions: '%{email} に招待メールが送信されました。'
+      updated: 招待が承認されました。サインインしています。
+      updated_not_active: 招待が承認されました。
     mailer:
       confirmation_instructions:
         action: アカウントを確認する
diff --git a/decidim-core/config/locales/lb.yml b/decidim-core/config/locales/lb.yml
index b9843012b7bde..87c7da1ea9b75 100644
--- a/decidim-core/config/locales/lb.yml
+++ b/decidim-core/config/locales/lb.yml
@@ -301,7 +301,6 @@ lb:
           global:
             amendments_enabled: Ännerungen aktivéiert
             comments_enabled: Kommentarer aktiv
-            comments_max_length: Maximal Längt vun de Kommentären
             dummy_global_attribute1: Dummy Attribut 1
             dummy_global_attribute2: Dummy Attribut 2
             dummy_global_translatable_text: Dummy Text ze iwwersetzen
@@ -610,7 +609,6 @@ lb:
           modal_title: Nei Konversatioun
           no_results: Keen Resultat
         error_modal:
-          close: Dialog zou maachen
           correct_errors: Korrigéier w. e. g. dëse Feeler a probéier op en Neits.
           intro: 'Bei denger Noriicht ass dësen Feeler opgetrueden:'
           ok: OK
diff --git a/decidim-core/config/locales/lt.yml b/decidim-core/config/locales/lt.yml
index 230dc0948dcb6..caf00526d10c1 100644
--- a/decidim-core/config/locales/lt.yml
+++ b/decidim-core/config/locales/lt.yml
@@ -472,7 +472,6 @@ lt:
           global:
             amendments_enabled: Pataisos leidžiamos
             comments_enabled: Komentarai leidžiami
-            comments_max_length: Komentarų maksimalus ilgis
             dummy_global_attribute1: Fiktyvus atributas 1
             dummy_global_attribute2: Fiktyvus atributas 2
             dummy_global_translatable_text: Testinis verčiamas tekstas
@@ -920,7 +919,6 @@ lt:
         create:
           error: Pokalbis neprasidėjo. Bandykite dar kartą vėliau.
         error_modal:
-          close: Uždaryti modalinį langą
           correct_errors: Ištaisykite klaidas ir bandykite dar kartą.
           intro: 'Jūsų pranešime aptiktos šios klaidos:'
           ok: Gerai
diff --git a/decidim-core/config/locales/nl.yml b/decidim-core/config/locales/nl.yml
index 8a3794ad74285..841e045e20c0a 100644
--- a/decidim-core/config/locales/nl.yml
+++ b/decidim-core/config/locales/nl.yml
@@ -302,7 +302,6 @@ nl:
           global:
             amendments_enabled: Wijzigingen toegestaan
             comments_enabled: Reacties ingeschakeld
-            comments_max_length: Commentaar maximale lengte
             dummy_global_attribute1: Voorbeeld-kenmerk 1
             dummy_global_attribute2: Voorbeeld-kenmerk 2
             dummy_global_translatable_text: Vertaalbare tekst Dummy
@@ -611,7 +610,6 @@ nl:
           modal_title: Nieuwe conversatie
           no_results: Geen resultaten gevonden
         error_modal:
-          close: Sluit venster
           correct_errors: Corrigeer de fouten en probeer opnieuw.
           intro: 'Er waren de volgende fouten met je bericht:'
           ok: OK
diff --git a/decidim-core/config/locales/no.yml b/decidim-core/config/locales/no.yml
index de5305e2ded1e..7c8f7e081bee6 100644
--- a/decidim-core/config/locales/no.yml
+++ b/decidim-core/config/locales/no.yml
@@ -308,7 +308,6 @@
           global:
             amendments_enabled: Endringer aktivert
             comments_enabled: Kommentarer aktivert
-            comments_max_length: Maks lengde på kommentarer
             dummy_global_attribute1: Dummy Egenskap 1
             dummy_global_attribute2: Dummy Egenskap 2
             dummy_global_translatable_text: Dummy Oversettbar tekst
@@ -625,7 +624,6 @@
           modal_title: Ny Samtale
           no_results: Ingen resultater
         error_modal:
-          close: Lukk modal
           correct_errors: Vennligst korriger feilene og prøv på nytt.
           intro: 'Det var følgende feil med din melding:'
           ok: Ok
diff --git a/decidim-core/config/locales/pl.yml b/decidim-core/config/locales/pl.yml
index 692bdbc0a96a4..0b44b9e7f6a9a 100644
--- a/decidim-core/config/locales/pl.yml
+++ b/decidim-core/config/locales/pl.yml
@@ -445,7 +445,6 @@ pl:
           global:
             amendments_enabled: Poprawki dozwolone
             comments_enabled: Komentarze włączone
-            comments_max_length: Maksymalna długość komentarzy
             dummy_global_attribute1: Przykładowy atrybut 1
             dummy_global_attribute2: Przykładowy atrybut 2
             dummy_global_translatable_text: Przykładowy tekst do tłumaczenia
@@ -572,7 +571,7 @@ pl:
           notice: |-
             <p>Hej, czy jesteś pewien, że nie chcesz otrzymywać newslettera?
             Prosimy o ponowne zaznaczenie pola wyboru newslettera poniżej. To dla nas bardzo ważne, abyś mógł otrzymywać sporadyczne e-maile z ważnymi informacjami. Zawsze możesz zmienić to na stronie ustawień o powiadomieniach.</p>
-            <p>Jeśli nie zaznaczysz tego pola, mogą cię ominąć istotne informacje na temat możliwości 
+            <p>Jeśli nie zaznaczysz tego pola, mogą cię ominąć istotne informacje na temat możliwości
             uczestnictwa w procesach na platformie.<br>Jeśli mimo wszystko nie chcesz otrzymywać newsletterów, doskonale rozumiemy twoją decyzję.</p>
             <p>Dziękujemy za uwagę!</p>
           title: Powiadomienia newslettera
@@ -928,7 +927,6 @@ pl:
         create:
           error: Rozmowa nie została rozpoczęta. Spróbuj ponownie później.
         error_modal:
-          close: Zamknij okno
           correct_errors: Popraw daty i spróbuj ponownie.
           intro: 'W wiadomości wystąpiły błędy:'
           ok: ok
@@ -1329,7 +1327,7 @@ pl:
         hello: Witaj %{email},
         ignore: |-
           Jeżeli nie chcesz zaakceptować zaproszenia, zignoruj ten e-mail.<br />
-           Twoje konto nie zostanie utworzone, dopóki nie skorzystasz z linku powyżej i nie ustawisz pseudonimu i hasła.
+          Twoje konto nie zostanie utworzone, dopóki nie skorzystasz z linku powyżej i nie ustawisz pseudonimu i hasła.
         invited_you_as_admin: "%{invited_by} zaprasza Cię jako administratora %{application}. Możesz zaakceptować zaproszenie za pomocą poniższego linku."
         invited_you_as_private_user: "%{invited_by} zaprasza Cię jako prywatnego użytkownika %{application}. Możesz zaakceptować to zaproszenie za pomocą poniższego linku."
         someone_invited_you: Ktoś zaprosił Cię do %{application}. Możesz zaakceptować zaproszenie za pomocą poniższego linku.
diff --git a/decidim-core/config/locales/pt-BR.yml b/decidim-core/config/locales/pt-BR.yml
index 75237e2b64fe0..a0f91d2d1378c 100644
--- a/decidim-core/config/locales/pt-BR.yml
+++ b/decidim-core/config/locales/pt-BR.yml
@@ -553,7 +553,6 @@ pt-BR:
           global:
             amendments_enabled: Alterações ativadas
             comments_enabled: Comentários ativados
-            comments_max_length: Comprimento máximo de comentários
             define_taxonomy_filters: Por favor, defina alguns filtros para este espaço participativo antes de usar esta configuração.
             dummy_global_attribute1: Dummy Atributo 1
             dummy_global_attribute2: Dummy Attribute 2
@@ -960,8 +959,8 @@ pt-BR:
           email_outro: Você recebeu está notificação porque você é autor do %{resource_type} afetado.
           email_subject: Seu %{resource_type} não está mais visível
           notification_title: |-
-            Seu %{resource_type} não está mais visível. <br> 
-             Isso aconteceu porque a proposta, reunião, debate ou comentário que você respondeu foi moderado. Se voltar a ficar disponível, o seu comentário será restaurado automaticamente.<i>%{resource_content}</i>
+            Seu %{resource_type} não está mais visível. <br>
+            Isso aconteceu porque a proposta, reunião, debate ou comentário que você respondeu foi moderado. Se voltar a ficar disponível, o seu comentário será restaurado automaticamente.<i>%{resource_content}</i>
         resource_hidden:
           email_intro: Um administrador removeu seu %{resource_type} porque ele foi reportado como %{report_reasons}.
           email_outro: Você recebeu esta notificação porque você é um autor do conteúdo removido.
@@ -1209,7 +1208,6 @@ pt-BR:
         create:
           error: Conversa não iniciada. Tente mais tarde.
         error_modal:
-          close: Fechar modal
           correct_errors: Por favor, corrija os itens citados e tente novamente.
           intro: 'Sua mensagem contém os seguintes erros:'
           ok: OK
@@ -1525,7 +1523,6 @@ pt-BR:
         greetings_html: |
           Atenciosamente,<br>
           %{organization_name}
-        hello: Prezado %{username},
         subject: Conta inativa excluída
     passwords:
       update:
diff --git a/decidim-core/config/locales/pt.yml b/decidim-core/config/locales/pt.yml
index ea1e8bc34157b..2d842381f6997 100644
--- a/decidim-core/config/locales/pt.yml
+++ b/decidim-core/config/locales/pt.yml
@@ -301,7 +301,6 @@ pt:
           global:
             amendments_enabled: Modificações ativadas
             comments_enabled: Comentários ativados
-            comments_max_length: Comprimento máximo dos comentários
             dummy_global_attribute1: Atributo Fictício 1
             dummy_global_attribute2: Atributo Fictício 2
             dummy_global_translatable_text: Texto Traduzível Fictício
@@ -614,7 +613,6 @@ pt:
           modal_title: Nova conversa
           no_results: Sem resultados
         error_modal:
-          close: Fechar modal
           correct_errors: Por favor corrija os erros e tente de novo
           intro: 'Há os seguintes erros com a sua mensagem:'
           ok: OK
diff --git a/decidim-core/config/locales/ro-RO.yml b/decidim-core/config/locales/ro-RO.yml
index e711f69131533..67f04f7bf5aef 100644
--- a/decidim-core/config/locales/ro-RO.yml
+++ b/decidim-core/config/locales/ro-RO.yml
@@ -567,7 +567,6 @@ ro:
           global:
             amendments_enabled: Amendamente activate
             comments_enabled: Comentarii activate
-            comments_max_length: Lungimea maximă a comentariilor
             define_taxonomy_filters: Vă rugăm să definiți niște filtre pentru acest spațiu participativ înainte de a utiliza această setare.
             dummy_global_attribute1: Mostră de atribut 1
             dummy_global_attribute2: Mostră de atribut 2
@@ -714,7 +713,7 @@ ro:
             <p>Sigur nu doriți să primiți un buletin informativ?<br>
             Vă rugăm să bifați din nou caseta din buletinul informativ de mai jos.<br>
             Este foarte important pentru noi să puteți primi e-mailuri ocazionale
-            pentru a face anunțuri importante, puteți modifica oricând opțiunea pe 
+            pentru a face anunțuri importante, puteți modifica oricând opțiunea pe
             pagina cu setări pentru notificări. </p>
             <p>Dacă nu bifați caseta ați putea rata informații importante
             despre noi oportunități de participare în cadrul platformei.<br>Dacă, totuși, doriți să evitați primirea de buletine informative, înțelegem
@@ -1181,7 +1180,6 @@ ro:
           participants:
             title: Participanți
         error_modal:
-          close: Închidere
           correct_errors: Vă rugăm să remediați erorile și să încercați din nou.
           intro: 'Au existat următoarele erori cu mesajul tău:'
           ok: Ok
@@ -1415,7 +1413,6 @@ ro:
         greetings_html: |
           Cu stimă,<br>
           %{organization_name}
-        hello: Dragă %{username},
         subject: Cont inactiv șters
     profile:
       deleted: Participant șters
diff --git a/decidim-core/config/locales/sk.yml b/decidim-core/config/locales/sk.yml
index 335b0ab9b5a6d..23eefebcec6c1 100644
--- a/decidim-core/config/locales/sk.yml
+++ b/decidim-core/config/locales/sk.yml
@@ -584,7 +584,6 @@ sk:
           global:
             amendments_enabled: Zmeny povolené
             comments_enabled: Komentáre povolené
-            comments_max_length: Maximálna dĺžka komentárov
             define_taxonomy_filters: Pred použitím tohto nastavenia definujte nejaké filtre pre tento participatívny priestor.
             dummy_global_attribute1: Zástupný atribút 1
             dummy_global_attribute2: Zástupný atribút 2
@@ -1254,7 +1253,6 @@ sk:
         create:
           error: Konverzácia sa nezačala. Skúste to znova neskôr.
         error_modal:
-          close: Zavrieť okno
           correct_errors: Opravte chyby a skúste to znova.
           intro: 'Vo vašej správe sa vyskytli nasledujúce chyby:'
           ok: OK
@@ -1572,7 +1570,6 @@ sk:
         greetings_html: |
           S pozdravom,<br>
           %{organization_name}
-        hello: Vážený/á %{username},
         subject: Neaktívny účet bol vymazaný
     passwords:
       update:
@@ -2315,7 +2312,7 @@ sk:
     dropdown:
       choose_diff_view_html: 'Mód zobrazenia HTML:'
       choose_diff_view_mode: 'Mód srovnávacího zobrazení:'
-      option_escaped: Nepoužívané 
+      option_escaped: Nepoužívané
       option_split: Vedle sebe (Sbs)
       option_unescaped: Používané
       option_unified: Sjednocené
diff --git a/decidim-core/config/locales/sv.yml b/decidim-core/config/locales/sv.yml
index dcc8bf58b635b..dc3f74faea53e 100644
--- a/decidim-core/config/locales/sv.yml
+++ b/decidim-core/config/locales/sv.yml
@@ -556,7 +556,6 @@ sv:
           global:
             amendments_enabled: Aktivera ändringsförslag
             comments_enabled: Aktivera kommentarer
-            comments_max_length: Maximal längd på kommentarer
             define_taxonomy_filters: Ställ in filter innan du använder den här inställningen.
             dummy_global_attribute1: Dummy Attribut 1
             dummy_global_attribute2: Dummy Attribut 2
@@ -1215,7 +1214,6 @@ sv:
         create:
           error: Konversationen har inte startat. Försök igen senare.
         error_modal:
-          close: Stäng fönster
           correct_errors: Vänligen korrigera felen och försök igen.
           intro: 'Det fanns följande fel med ditt meddelande:'
           ok: Ok
@@ -1532,7 +1530,6 @@ sv:
         greetings_html: |
           Vänliga hälsningar,<br>
           %{organization_name}
-        hello: Hej %{username},
         subject: Inaktivt konto raderat
     passwords:
       update:
diff --git a/decidim-core/config/locales/tr-TR.yml b/decidim-core/config/locales/tr-TR.yml
index c85beb1aa8ff4..9c186caf0ffea 100644
--- a/decidim-core/config/locales/tr-TR.yml
+++ b/decidim-core/config/locales/tr-TR.yml
@@ -301,7 +301,6 @@ tr:
           global:
             amendments_enabled: Değişiklikler etkinleştirildi
             comments_enabled: Yorumlar etkin
-            comments_max_length: Maksimum yorum uzunluğu
             dummy_global_attribute1: Sahet Özellik 1
             dummy_global_attribute2: Sahte Özellik 2
             dummy_global_translatable_text: Sahte Çevrilebilir Metin
@@ -629,7 +628,6 @@ tr:
           modal_title: Yeni görüşme
           no_results: Sonuç bulunamadı
         error_modal:
-          close: Pencereyi kapat
           correct_errors: Lütfen hataları düzeltip tekrar deneyin.
           intro: 'Mesajınızda aşağıdaki hatalar vardı:'
           ok: OK
diff --git a/decidim-core/config/locales/zh-CN.yml b/decidim-core/config/locales/zh-CN.yml
index dd0e8d0c5ca33..4eddb73e88181 100644
--- a/decidim-core/config/locales/zh-CN.yml
+++ b/decidim-core/config/locales/zh-CN.yml
@@ -263,7 +263,6 @@ zh-CN:
           global:
             amendments_enabled: 修改已启用
             comments_enabled: 评论已启用
-            comments_max_length: 评论最大长度
             dummy_global_attribute1: 虚拟属性 1
             dummy_global_attribute2: 虚拟属性 2
             dummy_global_translatable_text: 虚拟可翻译文本
@@ -543,7 +542,6 @@ zh-CN:
           modal_title: 新建对话
           no_results: 没有结果
         error_modal:
-          close: 关闭模式
           correct_errors: 请更正错误，然后重试。
           intro: '您的消息有以下错误：'
           ok: 好的
diff --git a/decidim-core/config/locales/zh-TW.yml b/decidim-core/config/locales/zh-TW.yml
index cf9040d0c1c36..8812f196738cf 100644
--- a/decidim-core/config/locales/zh-TW.yml
+++ b/decidim-core/config/locales/zh-TW.yml
@@ -406,7 +406,6 @@ zh-TW:
           global:
             amendments_enabled: 修改功能已啟用
             comments_enabled: 啟用評論功能
-            comments_max_length: 評論最大長度
             dummy_global_attribute1: 虛擬屬性 1
             dummy_global_attribute2: 虛擬屬性 2
             dummy_global_translatable_text: 虛擬可翻譯文字
@@ -816,7 +815,6 @@ zh-TW:
         create:
           error: 對話未開始。請稍後再試。
         error_modal:
-          close: 關閉視窗
           correct_errors: 請修正錯誤後再試一次。
           intro: '您的訊息有以下錯誤：'
           ok: 好的
diff --git a/decidim-debates/config/locales/bg.yml b/decidim-debates/config/locales/bg.yml
index 537dedd47ee33..66a1f29a24a13 100644
--- a/decidim-debates/config/locales/bg.yml
+++ b/decidim-debates/config/locales/bg.yml
@@ -31,7 +31,6 @@ bg:
           global:
             announcement: Обявление
             comments_enabled: Коментарите са активирани
-            comments_max_length: Максимална дължина на коментарите (Оставете 0 за стойност по подразбиране)
           step:
             announcement: Обявление
             comments_blocked: Коментарите са блокирани
diff --git a/decidim-debates/config/locales/ca-IT.yml b/decidim-debates/config/locales/ca-IT.yml
index 78d7af9ba2797..9d1ab03472e76 100644
--- a/decidim-debates/config/locales/ca-IT.yml
+++ b/decidim-debates/config/locales/ca-IT.yml
@@ -41,7 +41,7 @@ ca-IT:
             attachments_allowed: Permetre fitxers adjunts
             clear_all: Netejar-ho tot
             comments_enabled: Comentaris habilitats
-            comments_max_length: Longitud màxima dels comentaris (deixa 0 si vols mantenir la configuració per defecte)
+            comments_max_length: Caràcters màxims per comentari (deixar a 0 el valor predeterminat)
             define_taxonomy_filters: Si us plau, defineix algunes filtres per aquest espai de participació abans de fer servir aquesta configuració.
             no_taxonomy_filters_found: No s'han trobat filtres de taxonomia.
             taxonomy_filters: Seleccionar filtres pel component
@@ -76,12 +76,13 @@ ca-IT:
           form:
             add_attachments: Afegir fitxer(s) adjunt(s)
             attachment_legend: Afegir un document o una imatge
+            comments_layout_locked_warning: No es pot canviar el disseny dels comentaris perquè ja s'han publicat comentaris.
             comments_visualization: Visualització dels comentaris
             comments_warning: Una vegada que es publica el primer comentari, l'opció de visualització seleccionada no es pot canviar.
             debate_type: Tipus de debat
             edit_attachments: Edita els fitxers adjunts
             errors:
-              comments_layout_locked: No pots canviar el disseny del comentari una vegada que s'hagi publicat algun comentario.
+              comments_layout_locked: No es pot canviar el disseny dels comentaris perquè ja s'han publicat comentaris.
             finite: Finit (amb moments d'inici i de fi)
             open: Obert (sense moments d'inici ni de fi)
             single_column: 'Columna única: Els comentaris es mostren per ordre cronològic i poden rebre respostes.'
diff --git a/decidim-debates/config/locales/ca.yml b/decidim-debates/config/locales/ca.yml
index 5c95c56563f39..6349e37d26540 100644
--- a/decidim-debates/config/locales/ca.yml
+++ b/decidim-debates/config/locales/ca.yml
@@ -41,7 +41,7 @@ ca:
             attachments_allowed: Permetre fitxers adjunts
             clear_all: Netejar-ho tot
             comments_enabled: Comentaris habilitats
-            comments_max_length: Longitud màxima dels comentaris (deixa 0 si vols mantenir la configuració per defecte)
+            comments_max_length: Caràcters màxims per comentari (deixar a 0 el valor predeterminat)
             define_taxonomy_filters: Si us plau, defineix algunes filtres per aquest espai de participació abans de fer servir aquesta configuració.
             no_taxonomy_filters_found: No s'han trobat filtres de taxonomia.
             taxonomy_filters: Seleccionar filtres pel component
@@ -76,12 +76,13 @@ ca:
           form:
             add_attachments: Afegir fitxer(s) adjunt(s)
             attachment_legend: Afegir un document o una imatge
+            comments_layout_locked_warning: No es pot canviar el disseny dels comentaris perquè ja s'han publicat comentaris.
             comments_visualization: Visualització dels comentaris
             comments_warning: Una vegada que es publica el primer comentari, l'opció de visualització seleccionada no es pot canviar.
             debate_type: Tipus de debat
             edit_attachments: Edita els fitxers adjunts
             errors:
-              comments_layout_locked: No pots canviar el disseny del comentari una vegada que s'hagi publicat algun comentario.
+              comments_layout_locked: No es pot canviar el disseny dels comentaris perquè ja s'han publicat comentaris.
             finite: Finit (amb moments d'inici i de fi)
             open: Obert (sense moments d'inici ni de fi)
             single_column: 'Columna única: Els comentaris es mostren per ordre cronològic i poden rebre respostes.'
diff --git a/decidim-debates/config/locales/cs.yml b/decidim-debates/config/locales/cs.yml
index 246a7d2701b61..cc3f0a543114f 100644
--- a/decidim-debates/config/locales/cs.yml
+++ b/decidim-debates/config/locales/cs.yml
@@ -43,7 +43,7 @@ cs:
             attachments_allowed: Povolit přílohy
             clear_all: Vymazat vše
             comments_enabled: Komentáře povoleny
-            comments_max_length: Maximální délka komentáře (ponechte 0 pro výchozí hodnotu)
+            comments_max_length: Maximální počet znaků na komentář (ponechte 0 pro výchozí hodnotu)
             define_taxonomy_filters: Před použitím tohoto nastavení prosím definujte některé filtry pro tento participační prostor.
             no_taxonomy_filters_found: Nebyly nalezeny žádné filtry taxonomie.
             taxonomy_filters: Vyberte filtry pro komponentu
@@ -82,8 +82,6 @@ cs:
             comments_warning: Jakmile je vložen první komentář, zvolenou možnost zobrazení nelze změnit.
             debate_type: Typ debaty
             edit_attachments: Upravit přílohy
-            errors:
-              comments_layout_locked: Po odeslání komentářů nelze změnit rozložení komentáře.
             finite: Konečný (s počátečním a koncovým obdobím)
             open: Otevřený (žádné počáteční nebo koncové období)
             single_column: 'Jeden sloupec: Komentáře jsou zobrazeny chronologicky a mohou mít odpovědi.'
diff --git a/decidim-debates/config/locales/de.yml b/decidim-debates/config/locales/de.yml
index aa581ef16d195..3dcc77936d94a 100644
--- a/decidim-debates/config/locales/de.yml
+++ b/decidim-debates/config/locales/de.yml
@@ -41,7 +41,6 @@ de:
             attachments_allowed: Anhänge zulassen
             clear_all: Alles löschen
             comments_enabled: Kommentare aktiviert
-            comments_max_length: Maximale Länge der Kommentare (0 für Standardwert)
             define_taxonomy_filters: Bitte definieren Sie einige Filter für diesen partizipativen Bereich, bevor Sie diese Einstellung verwenden.
             no_taxonomy_filters_found: Keine Klassifizierungsfilter gefunden.
             taxonomy_filters: Filter für die Komponente auswählen
@@ -80,8 +79,6 @@ de:
             comments_warning: Sobald der erste Kommentar veröffentlicht wurde, kann die gewählte Anzeigeoption nicht geändert werden.
             debate_type: Debatten-Typ
             edit_attachments: Anhänge bearbeiten
-            errors:
-              comments_layout_locked: Sie können das Kommentaransicht nicht ändern, sobald Kommentare veröffentlicht wurden.
             finite: Zeitlich begrenzt (mit Start- und Endzeit)
             open: Offen (keine Start- und Endzeit)
             single_column: 'Einzelne Spalte: Kommentare werden in chronologischer Reihenfolge angezeigt und können beantwortet werden.'
diff --git a/decidim-debates/config/locales/el.yml b/decidim-debates/config/locales/el.yml
index 0f796472be197..565e0532941a5 100644
--- a/decidim-debates/config/locales/el.yml
+++ b/decidim-debates/config/locales/el.yml
@@ -31,7 +31,6 @@ el:
           global:
             announcement: Ανακοίνωση
             comments_enabled: Τα σχόλια ενεργοποιήθηκαν
-            comments_max_length: Μέγιστο μέγεθος σχολίων (Αφήστε το 0 για την προκαθορισμένη τιμή)
           step:
             announcement: Ανακοίνωση
             comments_blocked: Τα σχόλια αποκλείστηκαν
diff --git a/decidim-debates/config/locales/es-MX.yml b/decidim-debates/config/locales/es-MX.yml
index 53b1ce9a140af..74df0194e023e 100644
--- a/decidim-debates/config/locales/es-MX.yml
+++ b/decidim-debates/config/locales/es-MX.yml
@@ -41,7 +41,7 @@ es-MX:
             attachments_allowed: Permitir archivos adjuntos
             clear_all: Limpiar todo
             comments_enabled: Comentarios habilitados
-            comments_max_length: Longitud máxima de los comentarios (deja 0 si quieres mantener la configuración por defecto)
+            comments_max_length: Caracteres máximos por comentario (dejar 0 para el valor predeterminado)
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
             no_taxonomy_filters_found: No se han encontrado filtros de taxonomía.
             taxonomy_filters: Seleccionar filtros para el componente
@@ -76,12 +76,13 @@ es-MX:
           form:
             add_attachments: Agregar archivo(s) adjunto(s)
             attachment_legend: Añadir un documento o una imagen
+            comments_layout_locked_warning: No se puede cambiar el formato de los comentarios porque ya se han publicado algunos.
             comments_visualization: Visualización de los comentarios
             comments_warning: Una vez que se publique el primer comentario, la opción de visualización seleccionada no se puede cambiar.
             debate_type: Tipo de debate
             edit_attachments: Editar los archivos adjuntos
             errors:
-              comments_layout_locked: No puedes cambiar el diseño del comentario una vez que se haya publicado algún comentario.
+              comments_layout_locked: No se puede cambiar el formato de los comentarios porque ya se han publicado algunos.
             finite: Finito (con hora de inicio y final)
             open: Abierto (no hay hora de inicio o final)
             single_column: 'Columna única: Los comentarios se muestran en orden cronológico y pueden recibir respuestas.'
diff --git a/decidim-debates/config/locales/es-PY.yml b/decidim-debates/config/locales/es-PY.yml
index 3ed16f390d866..bf9016c1d9de7 100644
--- a/decidim-debates/config/locales/es-PY.yml
+++ b/decidim-debates/config/locales/es-PY.yml
@@ -41,7 +41,7 @@ es-PY:
             attachments_allowed: Permitir archivos adjuntos
             clear_all: Limpiar todo
             comments_enabled: Comentarios habilitados
-            comments_max_length: Longitud máxima de los comentarios (deja 0 si quieres mantener la configuración por defecto)
+            comments_max_length: Caracteres máximos por comentario (dejar 0 para el valor predeterminado)
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
             no_taxonomy_filters_found: No se han encontrado filtros de taxonomía.
             taxonomy_filters: Seleccionar filtros para el componente
@@ -76,12 +76,13 @@ es-PY:
           form:
             add_attachments: Agregar archivo(s) adjunto(s)
             attachment_legend: Añadir un documento o una imagen
+            comments_layout_locked_warning: No se puede cambiar el formato de los comentarios porque ya se han publicado algunos.
             comments_visualization: Visualización de los comentarios
             comments_warning: Una vez que se publique el primer comentario, la opción de visualización seleccionada no se puede cambiar.
             debate_type: Tipo de debate
             edit_attachments: Editar los archivos adjuntos
             errors:
-              comments_layout_locked: No puedes cambiar el diseño del comentario una vez que se haya publicado algún comentario.
+              comments_layout_locked: No se puede cambiar el formato de los comentarios porque ya se han publicado algunos.
             finite: Finito (con hora de inicio y final)
             open: Abierto (no hay hora de inicio o final)
             single_column: 'Columna única: Los comentarios se muestran en orden cronológico y pueden recibir respuestas.'
diff --git a/decidim-debates/config/locales/es.yml b/decidim-debates/config/locales/es.yml
index c5223ee1dafd3..d56a9120497e4 100644
--- a/decidim-debates/config/locales/es.yml
+++ b/decidim-debates/config/locales/es.yml
@@ -41,7 +41,7 @@ es:
             attachments_allowed: Permitir archivos adjuntos
             clear_all: Limpiar todo
             comments_enabled: Comentarios habilitados
-            comments_max_length: Longitud máxima de los comentarios (deja 0 si quieres mantener la configuración por defecto)
+            comments_max_length: Caracteres máximos por comentario (dejar 0 para el valor predeterminado)
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
             no_taxonomy_filters_found: No se han encontrado filtros de taxonomía.
             taxonomy_filters: Seleccionar filtros para el componente
@@ -76,12 +76,13 @@ es:
           form:
             add_attachments: Agregar archivo(s) adjunto(s)
             attachment_legend: Añadir un documento o una imagen
+            comments_layout_locked_warning: No se puede cambiar el formato de los comentarios porque ya se han publicado algunos.
             comments_visualization: Visualización de los comentarios
             comments_warning: Una vez que se publique el primer comentario, la opción de visualización seleccionada no se puede cambiar.
             debate_type: Tipo de debate
             edit_attachments: Editar los archivos adjuntos
             errors:
-              comments_layout_locked: No puedes cambiar el diseño del comentario una vez que se haya publicado algún comentario.
+              comments_layout_locked: No se puede cambiar el formato de los comentarios porque ya se han publicado algunos.
             finite: Finito (con hora de inicio y final)
             open: Abierto (no hay hora de inicio o final)
             single_column: 'Columna única: Los comentarios se muestran en orden cronológico y pueden recibir respuestas.'
diff --git a/decidim-debates/config/locales/eu.yml b/decidim-debates/config/locales/eu.yml
index 09541480c9437..075ae252bf549 100644
--- a/decidim-debates/config/locales/eu.yml
+++ b/decidim-debates/config/locales/eu.yml
@@ -41,7 +41,7 @@ eu:
             attachments_allowed: Baimendu eranskinak
             clear_all: Garbitu dena
             comments_enabled: Iruzkinak gaituta
-            comments_max_length: Iruzkinen gehieneko luzera (utzi 0 lehenetsitako konfigurazioari eutsi nahi badiozu)
+            comments_max_length: Iruzkin bakoitzeko gehieneko karaktereak (utzi 0 aurrez zehaztutako baliorako)
             define_taxonomy_filters: Mesedez, eszenatoki hau erabili aurretik, zehaztu partaidetza-espazioa honetarako iragazki batzuk.
             no_taxonomy_filters_found: Ez da taxonomia-iragazkirik aurkitu.
             taxonomy_filters: Hautatu iragazkiak osagairako
@@ -76,12 +76,13 @@ eu:
           form:
             add_attachments: Gehitu eranskinak
             attachment_legend: Gehitu dokumentu bat edo irudi bat
+            comments_layout_locked_warning: Iruzkinen formatoa ezin da aldatu iruzkinak argitaratu direlako.
             comments_visualization: Iruzkinak bistaratzea
             comments_warning: Lehen iruzkina argitaratu ondoren, ezin da aldatu aukeratutako bistaratze-aukera.
             debate_type: Eztabaida mota
             edit_attachments: Eranskinak editatu
             errors:
-              comments_layout_locked: Iruzkinen planoa ezin da aldatu iruzkinak argitaratu ondoren.
+              comments_layout_locked: Iruzkinen formatoa ezin da aldatu iruzkin batzuk argitaratu direlako.
             finite: Amaiera (hasiera- eta amaiera-ordua)
             open: Zabalik (ez dago hasiera- edo amaiera-ordurik)
             single_column: 'Zutabe bakarra: iruzkinak hurrenkera kronologikoan agertzen dira eta erantzunak izan ditzakete.'
diff --git a/decidim-debates/config/locales/fi-plain.yml b/decidim-debates/config/locales/fi-plain.yml
index 8151a852b9852..5881868933a8c 100644
--- a/decidim-debates/config/locales/fi-plain.yml
+++ b/decidim-debates/config/locales/fi-plain.yml
@@ -80,8 +80,6 @@ fi-pl:
             comments_warning: Ensimmäisen kommentin jälkeen kommenttien esitysmuotoasetusta ei voi muuttaa.
             debate_type: Keskustelun tyyppi
             edit_attachments: Muokkaa liitteitä
-            errors:
-              comments_layout_locked: Et voi muuttaa kommenttien esitysmuotoa sen jälkeen, kun kommentteja on laadittu.
             finite: Määräaikainen (keskustelulla on alku- ja loppuaika)
             open: Avoin (keskustelulla ei ole alku- ja loppuaikaa)
             single_column: 'Yksi sarake: kommentit näytetään yhdessä sarakkeessa kronologisessa järjestyksessä ja niihin voi vastata.'
diff --git a/decidim-debates/config/locales/fi.yml b/decidim-debates/config/locales/fi.yml
index 1592bbbb72a9a..a60f47ba621f8 100644
--- a/decidim-debates/config/locales/fi.yml
+++ b/decidim-debates/config/locales/fi.yml
@@ -76,12 +76,13 @@ fi:
           form:
             add_attachments: Lisää liitteitä
             attachment_legend: Lisää asiakirja tai kuva
+            comments_layout_locked_warning: Kommenttien asettelua ei voi muuttaa, koska kommentteja on jo lähetetty.
             comments_visualization: Kommenttien visualisointi
             comments_warning: Ensimmäisen kommentin jälkeen kommenttien esitysmuotoasetusta ei voi muuttaa.
             debate_type: Keskustelun tyyppi
             edit_attachments: Muokkaa liitteitä
             errors:
-              comments_layout_locked: Et voi muuttaa kommenttien esitysmuotoa sen jälkeen, kun kommentteja on laadittu.
+              comments_layout_locked: Kommenttien asettelua ei voi muuttaa, koska kommentteja on jo lähetetty.
             finite: Määräaikainen (keskustelulla on alku- ja loppuaika)
             open: Avoin (keskustelulla ei ole alku- ja loppuaikaa)
             single_column: 'Yksi sarake: kommentit näytetään yhdessä sarakkeessa kronologisessa järjestyksessä ja niihin voi vastata.'
diff --git a/decidim-debates/config/locales/fr-CA.yml b/decidim-debates/config/locales/fr-CA.yml
index b91748a32f25d..b1f9b7c907a72 100644
--- a/decidim-debates/config/locales/fr-CA.yml
+++ b/decidim-debates/config/locales/fr-CA.yml
@@ -39,7 +39,7 @@ fr-CA:
             announcement: Annonce
             attachments_allowed: Autoriser les pièces jointes
             comments_enabled: Commentaires activés
-            comments_max_length: Longueur max des commentaires (laisser 0 pour la valeur par défaut)
+            comments_max_length: Nombre maximum de caractères par commentaire (Laisser 0 pour la valeur par défaut)
             taxonomy_filters_add: Ajouter un filtre
           step:
             announcement: Annonce
@@ -69,11 +69,12 @@ fr-CA:
           form:
             add_attachments: Ajouter des pièces jointes
             attachment_legend: Ajouter un document ou une image
+            comments_layout_locked_warning: La mise en page du commentaire ne peut pas être modifiée car les commentaires ont déjà été publiés.
             comments_warning: Une fois le premier commentaire publié, l'option d'affichage sélectionnée ne peut pas être modifiée.
             debate_type: Type de débat
             edit_attachments: Modifier les pièces jointes
             errors:
-              comments_layout_locked: Vous ne pouvez pas modifier la mise en page des commentaires une fois que les commentaires ont été publiés.
+              comments_layout_locked: La mise en page du commentaire ne peut pas être modifiée car les commentaires ont déjà été publiés.
             finite: Limité (Avec les heures de début et de fin)
             open: Ouvert (pas de date de début et de fin)
           index:
diff --git a/decidim-debates/config/locales/fr.yml b/decidim-debates/config/locales/fr.yml
index a46dab4c4612e..b9858c7c554f2 100644
--- a/decidim-debates/config/locales/fr.yml
+++ b/decidim-debates/config/locales/fr.yml
@@ -39,7 +39,7 @@ fr:
             announcement: Annonce
             attachments_allowed: Autoriser les pièces jointes
             comments_enabled: Commentaires activés
-            comments_max_length: Longueur max des commentaires (laisser 0 pour la valeur par défaut)
+            comments_max_length: Nombre maximum de caractères par commentaire (Laisser 0 pour la valeur par défaut)
             taxonomy_filters_add: Ajouter un filtre
           step:
             announcement: Annonce
@@ -69,11 +69,12 @@ fr:
           form:
             add_attachments: Ajouter des pièces jointes
             attachment_legend: Ajouter un document ou une image
+            comments_layout_locked_warning: La mise en page du commentaire ne peut pas être modifiée car les commentaires ont déjà été publiés.
             comments_warning: Une fois le premier commentaire publié, l'option d'affichage sélectionnée ne peut pas être modifiée.
             debate_type: Type de débat
             edit_attachments: Modifier les pièces jointes
             errors:
-              comments_layout_locked: Vous ne pouvez pas modifier la mise en page des commentaires une fois que les commentaires ont été publiés.
+              comments_layout_locked: La mise en page du commentaire ne peut pas être modifiée car les commentaires ont déjà été publiés.
             finite: Limité (Avec les heures de début et de fin)
             open: Ouvert (pas de date de début et de fin)
           index:
diff --git a/decidim-debates/config/locales/hu.yml b/decidim-debates/config/locales/hu.yml
index 5a076a453b36f..f2d6c91e7d075 100644
--- a/decidim-debates/config/locales/hu.yml
+++ b/decidim-debates/config/locales/hu.yml
@@ -31,7 +31,6 @@ hu:
           global:
             announcement: Közlemény
             comments_enabled: Megjegyzések engedélyezve
-            comments_max_length: Kommentek maximális hossza (Hagyjon 0 -t az alapértékhez)
           step:
             announcement: Közlemény
             comments_blocked: Megjegyzések letiltva
diff --git a/decidim-debates/config/locales/it.yml b/decidim-debates/config/locales/it.yml
index eef1cb2bce696..d594d18eefc46 100644
--- a/decidim-debates/config/locales/it.yml
+++ b/decidim-debates/config/locales/it.yml
@@ -31,7 +31,6 @@ it:
           global:
             announcement: Annuncio
             comments_enabled: Commenti abilitati
-            comments_max_length: Lunghezza massima dei commenti (Lasciare 0 per il valore predefinito)
           step:
             announcement: Annuncio
             comments_blocked: Commenti bloccati
diff --git a/decidim-debates/config/locales/ja.yml b/decidim-debates/config/locales/ja.yml
index 26d0cf55c9577..85a5dd0197362 100644
--- a/decidim-debates/config/locales/ja.yml
+++ b/decidim-debates/config/locales/ja.yml
@@ -40,7 +40,7 @@ ja:
             attachments_allowed: 添付ファイルを許可
             clear_all: すべてクリア
             comments_enabled: コメントを有効にする
-            comments_max_length: コメント最大長 (デフォルト値は 0 のまま)
+            comments_max_length: 各コメントの最大文字数 (0はデフォルト値のまま)
             define_taxonomy_filters: この設定を使用する前に、参加型スペースのフィルターをいくつか定義してください。
             no_taxonomy_filters_found: タクソノミーフィルタが見つかりません。
             taxonomy_filters: コンポーネントのフィルタを選択
@@ -79,8 +79,6 @@ ja:
             comments_warning: 最初のコメントが投稿されると、選択した表示オプションは変更できません。
             debate_type: ディベートタイプ
             edit_attachments: 添付ファイルを編集
-            errors:
-              comments_layout_locked: コメントが投稿されると、コメントレイアウトを変更することはできません。
             finite: 期間限定 (開始時刻と終了時刻あり)
             open: 無期限 (開始時刻または終了時刻なし)
             single_column: '1カラム: コメントは時系列で表示され、返信を持つことができます。'
diff --git a/decidim-debates/config/locales/lb.yml b/decidim-debates/config/locales/lb.yml
index 7fb3d3294c4e3..78821661d63df 100644
--- a/decidim-debates/config/locales/lb.yml
+++ b/decidim-debates/config/locales/lb.yml
@@ -30,7 +30,6 @@ lb:
           global:
             announcement: Ankündigung
             comments_enabled: Kommentare aktiviert
-            comments_max_length: Maximale Länge der Kommentare (0 für Standardwert)
           step:
             announcement: Ankündigung
             comments_blocked: Kommentare blockiert
diff --git a/decidim-debates/config/locales/lt.yml b/decidim-debates/config/locales/lt.yml
index 264debec6bae1..65031b9569ebb 100644
--- a/decidim-debates/config/locales/lt.yml
+++ b/decidim-debates/config/locales/lt.yml
@@ -33,7 +33,6 @@ lt:
           global:
             announcement: Pranešimas
             comments_enabled: Komentarai įjungti
-            comments_max_length: Maksimalus komentarų ilgis (numatytoji vertė – 0)
           step:
             announcement: Pranešimas
             comments_blocked: Komentarai užblokuoti
diff --git a/decidim-debates/config/locales/nl.yml b/decidim-debates/config/locales/nl.yml
index ab1c916f57c4e..b02eb533c7ae9 100644
--- a/decidim-debates/config/locales/nl.yml
+++ b/decidim-debates/config/locales/nl.yml
@@ -31,7 +31,6 @@ nl:
           global:
             announcement: Aankondiging
             comments_enabled: Reacties ingeschakeld
-            comments_max_length: Commentaar maximale lengte (laat 0 voor standaard waarde)
           step:
             announcement: Aankondiging
             comments_blocked: Reacties geblokkeerd
diff --git a/decidim-debates/config/locales/no.yml b/decidim-debates/config/locales/no.yml
index ff397586acdae..8134e60054fc0 100644
--- a/decidim-debates/config/locales/no.yml
+++ b/decidim-debates/config/locales/no.yml
@@ -31,7 +31,6 @@
           global:
             announcement: Kunngjøring
             comments_enabled: Kommentarer er aktivert
-            comments_max_length: Maks kommentarlengde
           step:
             announcement: Kunngjøring
             comments_blocked: Kommentarer er blokkert
diff --git a/decidim-debates/config/locales/pl.yml b/decidim-debates/config/locales/pl.yml
index f783cb88c97d9..b426d585717a7 100644
--- a/decidim-debates/config/locales/pl.yml
+++ b/decidim-debates/config/locales/pl.yml
@@ -33,7 +33,6 @@ pl:
           global:
             announcement: Ogłoszenie
             comments_enabled: Komentarze włączone
-            comments_max_length: Maksymalna długość komentarzy (Pozostaw 0 dla wartości domyślnej)
           step:
             announcement: Ogłoszenie
             comments_blocked: Komentarze zablokowane
diff --git a/decidim-debates/config/locales/pt-BR.yml b/decidim-debates/config/locales/pt-BR.yml
index 0cbf3c25a1c98..f23efd864111c 100644
--- a/decidim-debates/config/locales/pt-BR.yml
+++ b/decidim-debates/config/locales/pt-BR.yml
@@ -41,7 +41,6 @@ pt-BR:
             attachments_allowed: Permitir anexos
             clear_all: Limpar tudo
             comments_enabled: Comentários ativados
-            comments_max_length: Tamanho máximo de comentários (deixe 0 para o valor padrão)
             define_taxonomy_filters: Por favor, defina alguns filtros para este espaço participativo antes de usar esta configuração.
             no_taxonomy_filters_found: Nenhum filtro de taxonomia encontrado.
             taxonomy_filters: Selecione filtros para o componente
@@ -80,8 +79,6 @@ pt-BR:
             comments_warning: Uma vez que o primeiro comentário é publicado, a opção de exibição selecionada não pode ser alterada.
             debate_type: Tipo de debate
             edit_attachments: Editar anexos
-            errors:
-              comments_layout_locked: Você não pode alterar o layout dos comentários, uma vez que os comentários foram postados.
             finite: Finito (com hora de início e fim)
             open: Abra (Sem horas de início ou fim)
             single_column: 'Coluna única: Os comentários são exibidos em ordem cronológica e podem ter respostas.'
diff --git a/decidim-debates/config/locales/pt.yml b/decidim-debates/config/locales/pt.yml
index 865e31415f68f..785ea71717fa7 100644
--- a/decidim-debates/config/locales/pt.yml
+++ b/decidim-debates/config/locales/pt.yml
@@ -38,7 +38,6 @@ pt:
             attachments_allowed: Permitir anexos
             clear_all: Limpar tudo
             comments_enabled: Comentários ativados
-            comments_max_length: Comprimento máximo dos comentários (Deixar 0 para o valor predefinido)
             define_taxonomy_filters: Defina alguns filtros para este espaço de participação antes de usar esta configuração.
             no_taxonomy_filters_found: Nenhum filtro de taxonomia encontrado.
             taxonomy_filters: Selecionar filtros para o componente
@@ -75,8 +74,6 @@ pt:
             comments_warning: Depois de o primeiro comentário ser publicado, a opção de exibição selecionada não poderá ser alterada.
             debate_type: Tipo de debate
             edit_attachments: Editar anexos
-            errors:
-              comments_layout_locked: Não pode alterar o layout dos comentários depois de eles serem publicados.
             finite: Finito (com hora de abertura e de fecho)
             open: Aberto (sem hora de abertura ou fecho)
             single_column: 'Coluna única: Os comentários são exibidos por ordem cronológica e podem ter respostas.'
diff --git a/decidim-debates/config/locales/ro-RO.yml b/decidim-debates/config/locales/ro-RO.yml
index 9d171bb051300..a3bfe6b1e00a0 100644
--- a/decidim-debates/config/locales/ro-RO.yml
+++ b/decidim-debates/config/locales/ro-RO.yml
@@ -39,7 +39,6 @@ ro:
             attachments_allowed: Permite atașamente
             clear_all: Ștergeți toate
             comments_enabled: Comentarii activate
-            comments_max_length: Lungimea maximă a comentariilor (Lasă 0 pentru valoarea implicită)
             define_taxonomy_filters: Vă rugăm să definiți niște filtre pentru acest spațiu participativ înainte de a utiliza această setare.
             no_taxonomy_filters_found: Nici un filtru de taxonomie găsit.
             taxonomy_filters: Selectați filtrele pentru componentă
diff --git a/decidim-debates/config/locales/sk.yml b/decidim-debates/config/locales/sk.yml
index 8dbfbaa91a179..4e7411bc2cd11 100644
--- a/decidim-debates/config/locales/sk.yml
+++ b/decidim-debates/config/locales/sk.yml
@@ -43,7 +43,6 @@ sk:
             attachments_allowed: Povoliť prílohy
             clear_all: Vymazať všetko
             comments_enabled: Komentáre povolené
-            comments_max_length: Maximálna dĺžka komentárov (Ponechajte 0 pre predvolenú hodnotu)
             define_taxonomy_filters: Pred použitím tohto nastavenia definujte nejaké filtre pre tento participatívny priestor.
             no_taxonomy_filters_found: Nenašli sa žiadne taxonomické filtre.
             taxonomy_filters: Vyberte filtre pre komponent
@@ -82,8 +81,6 @@ sk:
             comments_warning: Po zverejnení prvého komentára už nie je možné zmeniť vybranú možnosť zobrazenia.
             debate_type: Typ debaty
             edit_attachments: Upraviť prílohy
-            errors:
-              comments_layout_locked: Po zverejnení komentárov už nemôžete zmeniť rozloženie komentárov.
             finite: Konečná (so začiatočným a koncovým časom)
             open: Otvorená (bez začiatočného alebo koncového času)
             single_column: 'Jeden stĺpec: Komentáre sa zobrazujú v chronologickom poradí a môžu mať odpovede.'
@@ -243,7 +240,7 @@ sk:
           description_own: Zúčastnili ste sa na %{score} debatách.
           name: Debaty
           next_level_in: Podieľajte sa na ďalších %{score} debatách pre dosiahnutie ďalšej úrovne!
-          unearned_another: Tento účastník sa nezúčastnil na žiadnej debate. 
+          unearned_another: Tento účastník sa nezúčastnil na žiadnej debate.
           unearned_own: Zatiaľ ste sa nezúčastnili žiadnych debát.
     open_data:
       help:
diff --git a/decidim-debates/config/locales/sv.yml b/decidim-debates/config/locales/sv.yml
index 5cbe63649a304..f669e5295c9b9 100644
--- a/decidim-debates/config/locales/sv.yml
+++ b/decidim-debates/config/locales/sv.yml
@@ -41,7 +41,6 @@ sv:
             attachments_allowed: Tillåt bilagor
             clear_all: Rensa
             comments_enabled: Aktivera kommentarer
-            comments_max_length: Maximal kommentarslängd (ange 0 för att använda standardvärdet)
             define_taxonomy_filters: Ställ in filter innan du använder den här inställningen.
             no_taxonomy_filters_found: Inga filter för kategorier hittades.
             taxonomy_filters: Välj filter för komponenten
@@ -80,8 +79,6 @@ sv:
             comments_warning: Visningsalternativet inte längre ändras efter att den första kommentaren har postats.
             debate_type: Typ av debatt
             edit_attachments: Redigera bilagor
-            errors:
-              comments_layout_locked: Du kan inte ändra kommentarslayouten när kommentarer har postats.
             finite: Tidsbegränsad (med start- och sluttid)
             open: Öppen (utan start- eller sluttid)
             single_column: 'En kolumn: Kommentarer visas i kronologisk ordning och kan ha svar.'
diff --git a/decidim-debates/config/locales/tr-TR.yml b/decidim-debates/config/locales/tr-TR.yml
index 55d08a67d6975..4027a82cda27b 100644
--- a/decidim-debates/config/locales/tr-TR.yml
+++ b/decidim-debates/config/locales/tr-TR.yml
@@ -31,7 +31,6 @@ tr:
             announcement: duyuru
             attachments_allowed: Eklere İzin Ver
             comments_enabled: Yorumlar etkin
-            comments_max_length: Maksimum yorum uzunluğu (Varsayılan değer için 0 bırakın)
           step:
             announcement: duyuru
             comments_blocked: Yorumlar engellendi
@@ -138,8 +137,8 @@ tr:
         create_debate_event:
           space_followers:
             email_intro: |-
-              Merhaba 
-              %{participatory_space_title} katılımcı alanında yeni bir "%{resource_title}" tartışma başlığı oluşturuldu. İnceleyerek katkıda bulunabilirsiniz. 
+              Merhaba
+              %{participatory_space_title} katılımcı alanında yeni bir "%{resource_title}" tartışma başlığı oluşturuldu. İnceleyerek katkıda bulunabilirsiniz.
             email_outro: Bu bildirimi %{participatory_space_title} katılımcılık Başlıklı alanını takip ettiğiniz için aldınız. Bildirim almayı önceki bağlantı linkini izleyerek durdurabilirsiniz.
             email_subject: '%{participatory_space_title} başlıpı ile ilgili yeni tartışma "%{resource_title}"'
             notification_title: <a href="%{resource_path}">%{resource_title</a> tartışması <a href="%{participatory_space_url}">%{participatory_space_title</a> tarihinde oluşturuldu.
diff --git a/decidim-debates/config/locales/zh-CN.yml b/decidim-debates/config/locales/zh-CN.yml
index f4da8e48b3167..73bbcf51de761 100644
--- a/decidim-debates/config/locales/zh-CN.yml
+++ b/decidim-debates/config/locales/zh-CN.yml
@@ -27,7 +27,6 @@ zh-CN:
           global:
             announcement: 通 知
             comments_enabled: 评论已启用
-            comments_max_length: 评论最大长度 (默认值留0)
           step:
             announcement: 通 知
             comments_blocked: 评论已阻止
diff --git a/decidim-debates/config/locales/zh-TW.yml b/decidim-debates/config/locales/zh-TW.yml
index b681432b376f0..61eaeb9968ece 100644
--- a/decidim-debates/config/locales/zh-TW.yml
+++ b/decidim-debates/config/locales/zh-TW.yml
@@ -30,7 +30,6 @@ zh-TW:
           global:
             announcement: 公告
             comments_enabled: 啟用評論功能
-            comments_max_length: 評論字數最大長度(若要使用預設值請輸入0)
           step:
             announcement: 公告
             comments_blocked: 留言已封鎖
diff --git a/decidim-design/config/locales/eu.yml b/decidim-design/config/locales/eu.yml
index 002ed635eab5c..c172dc1f89e95 100644
--- a/decidim-design/config/locales/eu.yml
+++ b/decidim-design/config/locales/eu.yml
@@ -98,7 +98,7 @@ eu:
           illogical_heading_paragraph: Orrialde bakoitzak goiburuko ordena logiko bat izan behar du <h1>, <h2>, <h3>, <h4>, <h5> eta <h6> elementuak erabiltzean.
           important_sections_heading: Sail garrantzitsuen goiburuan doa
           important_sections_paragraph: Oso garrantzitsua da orrialdeko atal garrantzitsu bakoitzak sarrera bat izatea, errazago ulertzeko zer atal garrantzitsu dauden orrian bere sarreretan nabigatuz.
-          learn_more_about_html: Irakurri gehiago %{link} (e) ri buruz
+          learn_more_about_html: 'Irakurri gehiago honi buruz: %{link}'
           links_and_buttons: Estekak eta Botoiak
           links_and_buttons_paragraph: Ainguraketa-elementuak (hau da, estekak) orrialde desberdinei lotzeko edo orrialdearen barruan posizioak ainguratzeko erabiltzen dira. Elementuak orri horretan ezkutatutako elementuren bat ireki behar duela uste bada, <button> elementua erabili behar du haren ordez.
           unique_h1: H1 bakarra
diff --git a/decidim-design/config/locales/fi-plain.yml b/decidim-design/config/locales/fi-plain.yml
index 16df2bb7b508d..4354d38e562a5 100644
--- a/decidim-design/config/locales/fi-plain.yml
+++ b/decidim-design/config/locales/fi-plain.yml
@@ -154,7 +154,7 @@ fi-pl:
           typefaces_description_2: Tämä fontti on lisensoitu Open Font License (OFL) -ehtojen mukaisesti
       helpers:
         accountability: Vastuullisuus
-        accountability_cards_html: 'Käytetään <i>Vastuullisuushankkeiden</i> korteissa. Tämä kortti vaatii kyseisen moduulin omien tyylitiedostojen sisällyttämisen sivulle, eli seuraavan koodin lisäämistä näkymään: <code>append_stylesheet_pack_tag \"decidim_accountability\"</code>'
+        accountability_cards_html: 'Käytetään <i>Vastuullisuushankkeiden</i> korteissa. Tämä kortti vaatii kyseisen moduulin omien tyylitiedostojen sisällyttämisen sivulle, eli seuraavan koodin lisäämistä näkymään: <code>append_stylesheet_pack_tag "decidim_accountability"</code>'
         activity: Toiminta
         address_description: Osoitesolu saa tiedokseen tietueen, jolta solu etsii geolokalisoituja tietoja lisätäkseen oikeanlaiset merkinnät näkymään.
         address_description_2: Sisällön tyypistä riippuen osoite voi olla verkko-osoite. Näissä tapauksissa näytettävä tieto on hyvin samankaltainen, mutta se muotoillaan sopimaan sisältöpaikalle.
@@ -170,7 +170,7 @@ fi-pl:
         block_text: Käytä extra_data -lohkoa
         blog_cards_html: Käytetään <i>Blogien</i> korteissa
         blogs: Blogit
-        budget_card_html: 'Käytetään <i>Budjetointiprojektien</i> korteissa. Tämä kortti vaatii kyseisen moduulin omien tyylitiedostojen sisällyttämisen sivulle, eli seuraavan koodin lisäämistä näkymään: <code>append_stylesheet_pack_tag \"decidim_budgets\"</code>'
+        budget_card_html: 'Käytetään <i>Budjetointiprojektien</i> korteissa. Tämä kortti vaatii kyseisen moduulin omien tyylitiedostojen sisällyttämisen sivulle, eli seuraavan koodin lisäämistä näkymään: <code>append_stylesheet_pack_tag "decidim_budgets"</code>'
         budgets: Budjetit
         callout_class: Huomautuselementin luokka
         callout_description: Tämä attribuutti määrittää ilmoituksen tilan. Oletuksena se käyttää toissijaista väriä.
diff --git a/decidim-elections/config/locales/eu.yml b/decidim-elections/config/locales/eu.yml
index 4caab5a1c619a..25dded457ca1a 100644
--- a/decidim-elections/config/locales/eu.yml
+++ b/decidim-elections/config/locales/eu.yml
@@ -188,7 +188,7 @@ eu:
         question:
           update: "%{user_name} parte-hartzaileak eguneratu ditu %{resource_name} aukerako galderak"
       censuses:
-        census_ready_html: Erroldako datuak kargatuta daude eta prest daude % <b>%{election_title}{@eleccion_title}</b> bozketan erabiltzeko.
+        census_ready_html: Erroldako datuak kargatuta eta prest daude % <b>{eleccion_title}</b> bozketan erabiltzeko.
         census_size_html:
           one: Gaur egun <strong>bat</strong> pertsona dago hautesleku honetan botoa jasotzeko gai dena (hau errolda dinamiko batean alda daiteke).
           other: Gaur egun <strong>bat</strong> pertsona daude hautesleku honetan botoa jasotzeko gai deirnak (hau errolda dinamiko batean alda daiteke).
@@ -210,7 +210,7 @@ eu:
           verify_with_method: Egiaztatu %{name} izenaz
         token_csv:
           example: |
-            e-maila: 
+            e-maila:
             user@example.org;123456
             user2@example.org;ABCXYZ
           info_html: |
@@ -255,7 +255,7 @@ eu:
           vote_button: Eman babesa
           voted: Bozkatu duzu. Berriz bozkatu dezakezu, zure azken botoa baino ez da kontuan hartuko.
           votes_count:
-            one: 1 boto
+            one: Boto 1
             other: "%{count} boto"
           voting_began: 'Bozketa hasi zen: %{start_date}'
         vote_results:
@@ -280,7 +280,7 @@ eu:
         waiting:
           description: Hemen itxaron dezakezu hurrengo galdera egin arte. Automatikoki hurrengo galderara itzuliko zara prest dagoenean.
           edit_vote: Zure botoa editau
-          exit_button: Itxarongelatik irten
+          exit_button: Irten itxarongelatik
           title: Hurrengo galderaren zain
       status:
         active: Aktibo
@@ -313,7 +313,7 @@ eu:
           next: Hurrengoa
         receipt:
           description: Bozkatzeko epea zabalik dagoen bitartean edozein unetan eman daiteke berriro botoa. Zure aurreko botoa berriaz gainidatziko da.
-          edit_vote: Zure botoa editau
+          edit_vote: Editatu zure botoa
           exit_button: Irten bozkatzeko kabinatik
           title: Zure botoak zuzen eman dira
     metadata:
diff --git a/decidim-initiatives/config/locales/ca-IT.yml b/decidim-initiatives/config/locales/ca-IT.yml
index 7ca3193553ce1..1ec371189230b 100644
--- a/decidim-initiatives/config/locales/ca-IT.yml
+++ b/decidim-initiatives/config/locales/ca-IT.yml
@@ -72,9 +72,6 @@ ca-IT:
       decidim/initiative_comittee:
         one: Comitè
         other: Comitès
-      decidim/initiative_vote:
-        one: Signatura
-        other: Signatures
   decidim:
     admin:
       actions:
@@ -589,9 +586,6 @@ ca-IT:
           signature_collection: Signatures recollides
           state: Estat
           type: Tipus
-        signatures_count:
-          one: " signatura"
-          other: " signatures"
         vote_cabin:
           already_voted: Ja has signat
           vote: Signar
diff --git a/decidim-meetings/config/locales/ar.yml b/decidim-meetings/config/locales/ar.yml
index 979254cc57ed3..5c3adf1590aba 100644
--- a/decidim-meetings/config/locales/ar.yml
+++ b/decidim-meetings/config/locales/ar.yml
@@ -121,7 +121,6 @@ ar:
           global:
             announcement: إعلان
             comments_enabled: تم تمكين التعليقات
-            comments_max_length: الحد الأقصى لطول التعليقات (اترك 0 لاستعمال القيمة الافتراضية)
             creation_enabled_for_participants: يمكن للمشاركين إنشاء اجتماعات
             default_registration_terms: شروط التسجيل الافتراضية
             enable_pads_creation: تمكين إنشاء منصات
diff --git a/decidim-meetings/config/locales/bg.yml b/decidim-meetings/config/locales/bg.yml
index 9d109f799dedb..a521eb2529152 100644
--- a/decidim-meetings/config/locales/bg.yml
+++ b/decidim-meetings/config/locales/bg.yml
@@ -146,7 +146,6 @@ bg:
           global:
             announcement: Обявление
             comments_enabled: Коментарите са активирани
-            comments_max_length: Максимална дължина на коментарите (Оставете 0 за стойност по подразбиране)
             creation_enabled_for_participants: Участниците могат да създават срещи
             default_registration_terms: Условия за регистрация по подразбиране
             enable_pads_creation: Активирай създаване на бележки
diff --git a/decidim-meetings/config/locales/ca-IT.yml b/decidim-meetings/config/locales/ca-IT.yml
index f3cb1c4849068..853f1dd69d2d0 100644
--- a/decidim-meetings/config/locales/ca-IT.yml
+++ b/decidim-meetings/config/locales/ca-IT.yml
@@ -50,8 +50,6 @@ ca-IT:
       meeting_registration_invite:
         email: Correu electrònic
         name: Nom
-      response:
-        add_documents: Afegir documents
       validate_registration_code:
         code: Codi
     errors:
@@ -169,7 +167,7 @@ ca-IT:
             announcement: Avís
             clear_all: Netejar-ho tot
             comments_enabled: Comentaris habilitats
-            comments_max_length: Longitud màxima dels comentaris (deixa 0 si vols mantenir la configuració per defecte)
+            comments_max_length: Caràcters màxims per comentari (deixar a 0 el valor predeterminat)
             creation_enabled_for_participants: Les participants poden crear trobades
             default_registration_terms: Termes de registre per defecte
             define_taxonomy_filters: Si us plau, defineix algunes filtres per aquest espai de participació abans de fer servir aquesta configuració.
diff --git a/decidim-meetings/config/locales/ca.yml b/decidim-meetings/config/locales/ca.yml
index c43bd1b8e57c5..24862d7ebfb9f 100644
--- a/decidim-meetings/config/locales/ca.yml
+++ b/decidim-meetings/config/locales/ca.yml
@@ -50,8 +50,6 @@ ca:
       meeting_registration_invite:
         email: Correu electrònic
         name: Nom
-      response:
-        add_documents: Afegir documents
       validate_registration_code:
         code: Codi
     errors:
@@ -169,7 +167,7 @@ ca:
             announcement: Avís
             clear_all: Netejar-ho tot
             comments_enabled: Comentaris habilitats
-            comments_max_length: Longitud màxima dels comentaris (deixa 0 si vols mantenir la configuració per defecte)
+            comments_max_length: Caràcters màxims per comentari (deixar a 0 el valor predeterminat)
             creation_enabled_for_participants: Les participants poden crear trobades
             default_registration_terms: Termes de registre per defecte
             define_taxonomy_filters: Si us plau, defineix algunes filtres per aquest espai de participació abans de fer servir aquesta configuració.
diff --git a/decidim-meetings/config/locales/cs.yml b/decidim-meetings/config/locales/cs.yml
index f80aaa0f7a283..6d48d13b08bee 100644
--- a/decidim-meetings/config/locales/cs.yml
+++ b/decidim-meetings/config/locales/cs.yml
@@ -50,8 +50,6 @@ cs:
       meeting_registration_invite:
         email: E-mail
         name: Jméno
-      response:
-        add_documents: Přidat dokumenty
       validate_registration_code:
         code: Kód
     errors:
@@ -175,7 +173,6 @@ cs:
             announcement: Oznámení
             clear_all: Vymazat vše
             comments_enabled: Komentáře povoleny
-            comments_max_length: Maximální délka komentáře (ponechte 0 pro výchozí hodnotu)
             creation_enabled_for_participants: Účastníci mohou vytvářet schůzky
             default_registration_terms: Výchozí podmínky registrace
             define_taxonomy_filters: Před použitím tohoto nastavení prosím definujte některé filtry pro tento participační prostor.
diff --git a/decidim-meetings/config/locales/de.yml b/decidim-meetings/config/locales/de.yml
index 2361a1a2d3776..549a2539da0c2 100644
--- a/decidim-meetings/config/locales/de.yml
+++ b/decidim-meetings/config/locales/de.yml
@@ -50,8 +50,6 @@ de:
       meeting_registration_invite:
         email: E-Mail
         name: Name
-      response:
-        add_documents: Dokumente hinzufügen
       validate_registration_code:
         code: Code
     errors:
@@ -168,7 +166,6 @@ de:
             announcement: Ankündigung
             clear_all: Alles löschen
             comments_enabled: Kommentare aktiviert
-            comments_max_length: Maximale Länge der Kommentare (0 für Standardwert)
             creation_enabled_for_participants: Teilnehmende können Veranstaltungen erstellen
             default_registration_terms: Standard-Registrierungsbedingungen
             define_taxonomy_filters: Bitte definieren Sie einige Filter für diesen partizipativen Bereich, bevor Sie diese Einstellung verwenden.
diff --git a/decidim-meetings/config/locales/el.yml b/decidim-meetings/config/locales/el.yml
index 20ee2ef6ad020..700d56a26a3c4 100644
--- a/decidim-meetings/config/locales/el.yml
+++ b/decidim-meetings/config/locales/el.yml
@@ -123,7 +123,6 @@ el:
           global:
             announcement: Ανακοίνωση
             comments_enabled: Τα σχόλια ενεργοποιήθηκαν
-            comments_max_length: Μέγιστο μέγεθος σχολίων (Αφήστε το 0 για την προκαθορισμένη τιμή)
             creation_enabled_for_participants: Οι συμμετέχοντες μπορούν να δημιουργήσουν συναντήσεις
             default_registration_terms: Προεπιλεγμένοι όροι εγγραφής
             enable_pads_creation: Ενεργοποίηση δημιουργίας πινάκων σημειώσεων
diff --git a/decidim-meetings/config/locales/es-MX.yml b/decidim-meetings/config/locales/es-MX.yml
index f1a8753fd779d..b0d9834f42a9a 100644
--- a/decidim-meetings/config/locales/es-MX.yml
+++ b/decidim-meetings/config/locales/es-MX.yml
@@ -50,8 +50,6 @@ es-MX:
       meeting_registration_invite:
         email: Correo electrónico
         name: Nombre
-      response:
-        add_documents: Añadir documentos
       validate_registration_code:
         code: Código
     errors:
@@ -169,7 +167,7 @@ es-MX:
             announcement: Anuncio
             clear_all: Limpiar todo
             comments_enabled: Comentarios habilitados
-            comments_max_length: Longitud máxima de los comentarios (deja 0 si quieres mantener la configuración por defecto)
+            comments_max_length: Caracteres máximos por comentario (dejar 0 para el valor predeterminado)
             creation_enabled_for_participants: Las participantes pueden crear encuentros
             default_registration_terms: Términos de registro predeterminados
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
diff --git a/decidim-meetings/config/locales/es-PY.yml b/decidim-meetings/config/locales/es-PY.yml
index bf8f249054079..404777df277c6 100644
--- a/decidim-meetings/config/locales/es-PY.yml
+++ b/decidim-meetings/config/locales/es-PY.yml
@@ -50,8 +50,6 @@ es-PY:
       meeting_registration_invite:
         email: Correo electrónico
         name: Nombre
-      response:
-        add_documents: Añadir documentos
       validate_registration_code:
         code: Código
     errors:
@@ -169,7 +167,7 @@ es-PY:
             announcement: Anuncio
             clear_all: Limpiar todo
             comments_enabled: Comentarios habilitados
-            comments_max_length: Longitud máxima de los comentarios (deja 0 si quieres mantener la configuración por defecto)
+            comments_max_length: Caracteres máximos por comentario (dejar 0 para el valor predeterminado)
             creation_enabled_for_participants: Las participantes pueden crear encuentros
             default_registration_terms: Términos de registro predeterminados
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
diff --git a/decidim-meetings/config/locales/es.yml b/decidim-meetings/config/locales/es.yml
index 1bc07aaefb754..8e96a00453687 100644
--- a/decidim-meetings/config/locales/es.yml
+++ b/decidim-meetings/config/locales/es.yml
@@ -50,8 +50,6 @@ es:
       meeting_registration_invite:
         email: Correo electrónico
         name: Nombre
-      response:
-        add_documents: Añadir documentos
       validate_registration_code:
         code: Código
     errors:
@@ -169,7 +167,7 @@ es:
             announcement: Aviso
             clear_all: Limpiar todo
             comments_enabled: Comentarios habilitados
-            comments_max_length: Longitud máxima de los comentarios (deja 0 si quieres mantener la configuración por defecto)
+            comments_max_length: Caracteres máximos por comentario (dejar 0 para el valor predeterminado)
             creation_enabled_for_participants: Las participantes pueden crear encuentros
             default_registration_terms: Términos de registro predeterminados
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
diff --git a/decidim-meetings/config/locales/eu.yml b/decidim-meetings/config/locales/eu.yml
index 3565556a43af7..962f66388ab9e 100644
--- a/decidim-meetings/config/locales/eu.yml
+++ b/decidim-meetings/config/locales/eu.yml
@@ -50,8 +50,6 @@ eu:
       meeting_registration_invite:
         email: Helbide elektronikoa
         name: Izena
-      response:
-        add_documents: Dokumentuak gehitu
       validate_registration_code:
         code: Kodea
     errors:
@@ -169,7 +167,7 @@ eu:
             announcement: Iragarpena
             clear_all: Garbitu dena
             comments_enabled: Iruzkinak gaituta
-            comments_max_length: Iruzkinen gehieneko luzera (utzi 0 lehenetsita konfigurazioa mantendu nahi baduzu)
+            comments_max_length: Iruzkin bakoitzeko gehieneko karaktereak (utzi 0 aurrez zehaztutako baliorako)
             creation_enabled_for_participants: Parte-hartzaileek topaketak sortu ahal dituzte
             default_registration_terms: Izen-emate baldintzak lehenetsiak
             define_taxonomy_filters: Mesedez, eszenatoki hau erabili aurretik, zehaztu partaidetza-espazio honetarako iragazki batzuk.
diff --git a/decidim-meetings/config/locales/fi-plain.yml b/decidim-meetings/config/locales/fi-plain.yml
index 732b74fb9f82b..16035bc958960 100644
--- a/decidim-meetings/config/locales/fi-plain.yml
+++ b/decidim-meetings/config/locales/fi-plain.yml
@@ -50,8 +50,6 @@ fi-pl:
       meeting_registration_invite:
         email: Sähköpostiosoite
         name: Nimi
-      response:
-        add_documents: Lisää asiakirjoja
       validate_registration_code:
         code: Koodi
     errors:
diff --git a/decidim-meetings/config/locales/fi.yml b/decidim-meetings/config/locales/fi.yml
index 355c215703b89..23ac9d63ebd3b 100644
--- a/decidim-meetings/config/locales/fi.yml
+++ b/decidim-meetings/config/locales/fi.yml
@@ -50,8 +50,6 @@ fi:
       meeting_registration_invite:
         email: Sähköpostiosoite
         name: Nimi
-      response:
-        add_documents: Lisää asiakirjoja
       validate_registration_code:
         code: Koodi
     errors:
diff --git a/decidim-meetings/config/locales/fr-CA.yml b/decidim-meetings/config/locales/fr-CA.yml
index 8f2aff5aeb3f3..0a1adb9f8cdd9 100644
--- a/decidim-meetings/config/locales/fr-CA.yml
+++ b/decidim-meetings/config/locales/fr-CA.yml
@@ -50,8 +50,6 @@ fr-CA:
       meeting_registration_invite:
         email: Email
         name: Nom
-      response:
-        add_documents: Ajouter des documents
       validate_registration_code:
         code: Code
     errors:
@@ -168,7 +166,7 @@ fr-CA:
           global:
             announcement: Annonce
             comments_enabled: Activer le module de commentaire
-            comments_max_length: Longueur max des commentaires (laisser 0 pour la valeur par défaut)
+            comments_max_length: Nombre maximum de caractères par commentaire (Laisser 0 pour la valeur par défaut)
             creation_enabled_for_participants: Les participants peuvent créer des réunions
             default_registration_terms: Conditions d'inscription par défaut
             define_taxonomy_filters: Veuillez définir des filtres pour cet espace participatif avant d'utiliser ce paramètre.
diff --git a/decidim-meetings/config/locales/fr.yml b/decidim-meetings/config/locales/fr.yml
index a7640b2bd036d..35f9127616b9e 100644
--- a/decidim-meetings/config/locales/fr.yml
+++ b/decidim-meetings/config/locales/fr.yml
@@ -50,8 +50,6 @@ fr:
       meeting_registration_invite:
         email: Email
         name: Nom
-      response:
-        add_documents: Ajouter des documents
       validate_registration_code:
         code: Code
     errors:
@@ -168,7 +166,7 @@ fr:
           global:
             announcement: Annonce
             comments_enabled: Activer le module de commentaire
-            comments_max_length: Longueur max des commentaires (laisser 0 pour la valeur par défaut)
+            comments_max_length: Nombre maximum de caractères par commentaire (Laisser 0 pour la valeur par défaut)
             creation_enabled_for_participants: Les participants peuvent créer des rencontres
             default_registration_terms: Conditions d'inscription par défaut
             define_taxonomy_filters: Veuillez définir des filtres pour cet espace participatif avant d'utiliser ce paramètre.
diff --git a/decidim-meetings/config/locales/hu.yml b/decidim-meetings/config/locales/hu.yml
index 9836aa6648063..aa2eceb837e3e 100644
--- a/decidim-meetings/config/locales/hu.yml
+++ b/decidim-meetings/config/locales/hu.yml
@@ -92,7 +92,6 @@ hu:
           global:
             announcement: Közlemény
             comments_enabled: Megjegyzések engedélyezve
-            comments_max_length: Kommentek maximális hossza (Hagyjon 0 -t az alapértékhez)
             creation_enabled_for_participants: A résztvevők létrehozhatnak találkozókat
             default_registration_terms: Alapértelmezett regisztrációs feltételek
             enable_pads_creation: A közös dokumentum létrehozásának engedélyezése
diff --git a/decidim-meetings/config/locales/it.yml b/decidim-meetings/config/locales/it.yml
index 07dd9c9e5edd3..49f771f06c3bf 100644
--- a/decidim-meetings/config/locales/it.yml
+++ b/decidim-meetings/config/locales/it.yml
@@ -86,7 +86,6 @@ it:
           global:
             announcement: Annuncio
             comments_enabled: Commenti abilitati
-            comments_max_length: Lunghezza massima dei commenti (Lasciare 0 per il valore predefinito)
             creation_enabled_for_participants: I partecipanti possono creare riunioni
             default_registration_terms: Termini di registrazione predefiniti
             enable_pads_creation: Abilita la creazione di pad
diff --git a/decidim-meetings/config/locales/ja.yml b/decidim-meetings/config/locales/ja.yml
index df5191b3ac208..b7bdd612b6990 100644
--- a/decidim-meetings/config/locales/ja.yml
+++ b/decidim-meetings/config/locales/ja.yml
@@ -50,8 +50,6 @@ ja:
       meeting_registration_invite:
         email: Eメールアドレス
         name: 名前
-      response:
-        add_documents: ドキュメントを追加
       validate_registration_code:
         code: コード
     errors:
@@ -166,7 +164,7 @@ ja:
             announcement: お知らせ
             clear_all: すべてクリア
             comments_enabled: コメントが有効
-            comments_max_length: コメント最大長 (デフォルト値は 0 のまま)
+            comments_max_length: 各コメントの最大文字数 (0はデフォルト値のまま)
             creation_enabled_for_participants: 出席者はミーティングを作成できます
             default_registration_terms: デフォルトの登録条件
             define_taxonomy_filters: この設定を使用する前に、参加型スペースのフィルターをいくつか定義してください。
diff --git a/decidim-meetings/config/locales/lb.yml b/decidim-meetings/config/locales/lb.yml
index a917c906700f9..fe311d6f11afd 100644
--- a/decidim-meetings/config/locales/lb.yml
+++ b/decidim-meetings/config/locales/lb.yml
@@ -83,7 +83,6 @@ lb:
           global:
             announcement: Ankündigung
             comments_enabled: Kommentare aktiviert
-            comments_max_length: Maximale Länge der Kommentare (0 für Standardwert)
             creation_enabled_for_participants: Teilnehmer können Besprechungen erstellen
             default_registration_terms: Standard-Registrierungsbedingungen
             enable_pads_creation: Aktivieren Sie die Pads-Erstellung
diff --git a/decidim-meetings/config/locales/lt.yml b/decidim-meetings/config/locales/lt.yml
index 89113a68e4688..704de76a33bc2 100644
--- a/decidim-meetings/config/locales/lt.yml
+++ b/decidim-meetings/config/locales/lt.yml
@@ -132,7 +132,6 @@ lt:
           global:
             announcement: Pranešimas
             comments_enabled: Komentarai aktyvuoti
-            comments_max_length: Maksimalus komentarų ilgis (numatytoji vertė – 0)
             creation_enabled_for_participants: Dalyviai gali sukurti susitikimus
             default_registration_terms: Numatytos registracijos sąlygos
             enable_pads_creation: Leisti bendrų dokumentų kūrimą
diff --git a/decidim-meetings/config/locales/nl.yml b/decidim-meetings/config/locales/nl.yml
index cecccc4ff7615..e37313514c984 100644
--- a/decidim-meetings/config/locales/nl.yml
+++ b/decidim-meetings/config/locales/nl.yml
@@ -92,7 +92,6 @@ nl:
           global:
             announcement: Aankondiging
             comments_enabled: Reacties ingeschakeld
-            comments_max_length: Commentaar maximale lengte (laat 0 voor standaard waarde)
             creation_enabled_for_participants: Deelnemers kunnen vergaderingen aanmaken
             default_registration_terms: Standaard registratievoorwaarden
             enable_pads_creation: Schakel het maken van pads in
diff --git a/decidim-meetings/config/locales/no.yml b/decidim-meetings/config/locales/no.yml
index b5f34971de7b6..4c3c37a7f0997 100644
--- a/decidim-meetings/config/locales/no.yml
+++ b/decidim-meetings/config/locales/no.yml
@@ -84,7 +84,6 @@
           global:
             announcement: Kunngjøring
             comments_enabled: Kommentarer aktivert
-            comments_max_length: Maks lengde på kommentarer (Sett 0 for standardverdi)
             creation_enabled_for_participants: Deltakere kan opprette møter
             default_registration_terms: Standard registreringsvilkår
             enable_pads_creation: Aktiver oppretting av pads
diff --git a/decidim-meetings/config/locales/pl.yml b/decidim-meetings/config/locales/pl.yml
index e84747ed79e47..d09c3d272972a 100644
--- a/decidim-meetings/config/locales/pl.yml
+++ b/decidim-meetings/config/locales/pl.yml
@@ -152,7 +152,6 @@ pl:
           global:
             announcement: Ogłoszenie
             comments_enabled: Komentarze włączone
-            comments_max_length: Maksymalna długość komentarzy (Pozostaw 0 dla wartości domyślnej)
             creation_enabled_for_participants: Uczestnicy mogą tworzyć spotkania
             default_registration_terms: Domyślne warunki rejestracji
             enable_pads_creation: Włącz tworzenie padów
diff --git a/decidim-meetings/config/locales/pt-BR.yml b/decidim-meetings/config/locales/pt-BR.yml
index 66230f55256d9..04778d57407a2 100644
--- a/decidim-meetings/config/locales/pt-BR.yml
+++ b/decidim-meetings/config/locales/pt-BR.yml
@@ -50,8 +50,6 @@ pt-BR:
       meeting_registration_invite:
         email: E-mail
         name: Nome
-      response:
-        add_documents: Adicionar documentos
       validate_registration_code:
         code: Código
     errors:
@@ -169,7 +167,6 @@ pt-BR:
             announcement: Anúncio
             clear_all: Limpar tudo
             comments_enabled: Comentários ativados
-            comments_max_length: Tamanho máximo de comentários (deixe 0 para o valor padrão)
             creation_enabled_for_participants: Os participantes podem criar reuniões
             default_registration_terms: Termos de registro padrão
             define_taxonomy_filters: Por favor, defina alguns filtros para este espaço participativo antes de usar esta configuração.
diff --git a/decidim-meetings/config/locales/pt.yml b/decidim-meetings/config/locales/pt.yml
index 3dd9c42def946..8ef1b99853afc 100644
--- a/decidim-meetings/config/locales/pt.yml
+++ b/decidim-meetings/config/locales/pt.yml
@@ -85,7 +85,6 @@ pt:
           global:
             announcement: Anúncio
             comments_enabled: Comentários ativados
-            comments_max_length: Comprimento máximo dos comentários (Deixar 0 para o valor predefinido)
             creation_enabled_for_participants: Os participantes podem criar reuniões
             default_registration_terms: Termos de registo predefinidos
             enable_pads_creation: Ativar criação de blocos
diff --git a/decidim-meetings/config/locales/ro-RO.yml b/decidim-meetings/config/locales/ro-RO.yml
index a9bd5c81ebe64..842fe7502002d 100644
--- a/decidim-meetings/config/locales/ro-RO.yml
+++ b/decidim-meetings/config/locales/ro-RO.yml
@@ -127,7 +127,6 @@ ro:
           global:
             announcement: Anunţ
             comments_enabled: Comentarii activate
-            comments_max_length: Lungimea maximă a comentariilor (Leave 0 pentru valoarea implicită)
             creation_enabled_for_participants: Participanții pot crea întâlniri
             default_registration_terms: Condiții de înregistrare implicite
             enable_pads_creation: Activează crearea de pad-uri
diff --git a/decidim-meetings/config/locales/sk.yml b/decidim-meetings/config/locales/sk.yml
index 25b18df100bda..24d9b459725e4 100644
--- a/decidim-meetings/config/locales/sk.yml
+++ b/decidim-meetings/config/locales/sk.yml
@@ -50,8 +50,6 @@ sk:
       meeting_registration_invite:
         email: E-mail
         name: Meno
-      response:
-        add_documents: Pridať dokumenty
       validate_registration_code:
         code: Kód
     errors:
@@ -175,7 +173,6 @@ sk:
             announcement: Oznámenie
             clear_all: Vymazať všetko
             comments_enabled: Komentáre povolené
-            comments_max_length: Maximálna dĺžka komentárov (Ponechajte 0 pre predvolenú hodnotu)
             creation_enabled_for_participants: Účastníci môžu vytvárať stretnutia
             default_registration_terms: Východiskové podmienky registrácia
             define_taxonomy_filters: Pred použitím tohto nastavenia definujte nejaké filtre pre tento participatívny priestor.
diff --git a/decidim-meetings/config/locales/sv.yml b/decidim-meetings/config/locales/sv.yml
index a4aca1785695f..6ff6d323b5763 100644
--- a/decidim-meetings/config/locales/sv.yml
+++ b/decidim-meetings/config/locales/sv.yml
@@ -50,8 +50,6 @@ sv:
       meeting_registration_invite:
         email: E-post
         name: Namn
-      response:
-        add_documents: Lägg till dokument
       validate_registration_code:
         code: Kod
     errors:
@@ -168,7 +166,6 @@ sv:
             announcement: Meddelande
             clear_all: Återställ
             comments_enabled: Aktivera kommentarer
-            comments_max_length: Maximal kommentarslängd (ange 0 för att använda standardvärdet)
             creation_enabled_for_participants: Deltagarna kan skapa möten
             default_registration_terms: Villkor för standardanmälan
             define_taxonomy_filters: Ställ in filter innan du använder den här inställningen.
diff --git a/decidim-meetings/config/locales/tr-TR.yml b/decidim-meetings/config/locales/tr-TR.yml
index 765fd79406387..92d9ccda443c4 100644
--- a/decidim-meetings/config/locales/tr-TR.yml
+++ b/decidim-meetings/config/locales/tr-TR.yml
@@ -65,7 +65,6 @@ tr:
           global:
             announcement: Duyuru
             comments_enabled: Yorumlar etkin
-            comments_max_length: Maksimum yorum uzunluğu (Varsayılan değer için 0 bırakın)
             creation_enabled_for_participants: Katılımcılar toplantı oluşturabilir
             default_registration_terms: Varsayılan kayıt şartları
             enable_pads_creation: Altlık oluşturmayı etkinleştirin
diff --git a/decidim-meetings/config/locales/zh-CN.yml b/decidim-meetings/config/locales/zh-CN.yml
index a976c4c0ab628..05dc242d57931 100644
--- a/decidim-meetings/config/locales/zh-CN.yml
+++ b/decidim-meetings/config/locales/zh-CN.yml
@@ -57,7 +57,6 @@ zh-CN:
           global:
             announcement: 通 知
             comments_enabled: 评论已启用
-            comments_max_length: 评论最大长度 (默认值留0)
             creation_enabled_for_participants: 参与者可以创建会议
             default_registration_terms: 默认注册条款
             enable_pads_creation: 启用页面创建
diff --git a/decidim-meetings/config/locales/zh-TW.yml b/decidim-meetings/config/locales/zh-TW.yml
index 12308573b4a68..407e47159c9d1 100644
--- a/decidim-meetings/config/locales/zh-TW.yml
+++ b/decidim-meetings/config/locales/zh-TW.yml
@@ -121,7 +121,6 @@ zh-TW:
           global:
             announcement: 公告
             comments_enabled: 已啟用留言
-            comments_max_length: 評論字數最大長度(若要使用預設值請輸入0)
             creation_enabled_for_participants: 參與者可以建立會議
             default_registration_terms: 預設報名條款
             enable_pads_creation: 啟用平板創建
diff --git a/decidim-pages/config/locales/pt-BR.yml b/decidim-pages/config/locales/pt-BR.yml
index ea3cc5df8f2c2..f3f93f0d89b6f 100644
--- a/decidim-pages/config/locales/pt-BR.yml
+++ b/decidim-pages/config/locales/pt-BR.yml
@@ -24,7 +24,7 @@ pt-BR:
           component: O componente ao qual a página pertence
           created_at: A data em que esta página foi criada
           id: O identificador exclusivo desta página
-          participatory_space: A qual espaço (por exemplo, processo participativo, ou Assembléia) esta página pertence 
+          participatory_space: A qual espaço (por exemplo, processo participativo, ou Assembléia) esta página pertence
           title: O título da página
           updated_at: A última data que esta página foi atualizada
           url: A URL para esta página
diff --git a/decidim-participatory_processes/config/locales/ca-IT.yml b/decidim-participatory_processes/config/locales/ca-IT.yml
index 4df222e8eb7a0..ec36a7683aa2f 100644
--- a/decidim-participatory_processes/config/locales/ca-IT.yml
+++ b/decidim-participatory_processes/config/locales/ca-IT.yml
@@ -109,7 +109,7 @@ ca-IT:
         participatory_process_groups: Grups de processos
         participatory_process_groups_submenu:
           info: Quant a aquest grup de processos
-          landing_page: Disposició de la pàgina de destinació
+          landing_page: Disposició de la pàgina d'inici
         participatory_processes: Processos
         participatory_processes_submenu:
           attachment_collections: Carpetes
@@ -117,7 +117,7 @@ ca-IT:
           attachments: Adjunts
           components: Components
           info: Quant a aquest procés
-          landing_page: Disposició de la pàgina de destinació
+          landing_page: Disposició de la pàgina d'inici
           moderations: Moderacions
           private_users: Membres
           process_admins: Administradores del procés
diff --git a/decidim-participatory_processes/config/locales/es-MX.yml b/decidim-participatory_processes/config/locales/es-MX.yml
index 8cad467aac9f1..fdd7b30ffab29 100644
--- a/decidim-participatory_processes/config/locales/es-MX.yml
+++ b/decidim-participatory_processes/config/locales/es-MX.yml
@@ -639,7 +639,7 @@ es-MX:
             <p>La calidad democrática es un principio básico de Decidim. Para mantenerlo, se ha desarrollado un sistema de indicadores que ayudan a evaluar la calidad de los procesos participativos en la plataforma. En este artículo explicamos cómo se calculan estos indicadores.</p>
 
             <h3>¿Cómo se calculan los indicadores?</h3>
-            <p>Se han definido dos métodos para la recogida de indicadores de calidad:</p> 
+            <p>Se han definido dos métodos para la recogida de indicadores de calidad:</p>
 
             <ol>
             <li><strong>Métricas automáticas:</strong> Se calculan directamente a partir de los datos de la plataforma Decidim.</li>
@@ -683,7 +683,7 @@ es-MX:
 
             <h3>Hibridación</h3>
 
-            <p>Este indicador mide el nivel de combinación entre espacios presenciales y digitales durante el proceso.</p> 
+            <p>Este indicador mide el nivel de combinación entre espacios presenciales y digitales durante el proceso.</p>
             <ul>
             <li>¿Hay algún componente de encuentros? (Sí=5, No=0)</li>
             <li>¿Hay encuentros presenciales? (Sí=5, No=0)</li>
@@ -702,7 +702,7 @@ es-MX:
 
             <h3>Trazabilidad</h3>
 
-            <p>Este indicador mide la transparencia y trazabilidad del proceso participativo. Refleja con qué facilidad la ciudadanía pueden seguir la evolución de las propuestas y verificar las acciones institucionales a través de los registros publicados.</p> 
+            <p>Este indicador mide la transparencia y trazabilidad del proceso participativo. Refleja con qué facilidad la ciudadanía pueden seguir la evolución de las propuestas y verificar las acciones institucionales a través de los registros publicados.</p>
             <ul>
             <li>Número de propuestas con historial (n/total)</li>
             <li>Porcentaje de resultados vinculados a propuestas (n/total)</li>
@@ -714,14 +714,14 @@ es-MX:
             <br><br>
             <h3>Métricas de autoevaluación</h3>
 
-            <p>Además de las métricas automáticas, proponemos el uso de un <strong>formulario de autoevaluación</strong> para valorar las dimensiones cualitativas de cada proceso participativo. Este formulario será rellenado, al finalizar cada proceso participativo, por las responsables de estos, y las respuestas se mostrarán públicamente en el bloque de contenido de indicadores.</p> 
+            <p>Además de las métricas automáticas, proponemos el uso de un <strong>formulario de autoevaluación</strong> para valorar las dimensiones cualitativas de cada proceso participativo. Este formulario será rellenado, al finalizar cada proceso participativo, por las responsables de estos, y las respuestas se mostrarán públicamente en el bloque de contenido de indicadores.</p>
 
-            <p>Estas preguntas pretenden captar aspectos de la calidad democrática que no pueden evaluarse únicamente a través de datos cuantitativos. Es importante tener en cuenta que las respuestas a esta encuesta están sesgadas por la opinión de las responsables del proceso participativo en cuestión.</p> 
+            <p>Estas preguntas pretenden captar aspectos de la calidad democrática que no pueden evaluarse únicamente a través de datos cuantitativos. Es importante tener en cuenta que las respuestas a esta encuesta están sesgadas por la opinión de las responsables del proceso participativo en cuestión.</p>
 
             <br><br>
             <h3>Preguntas de autoevaluación</h3>
 
-            <p>A continuación se exponen las preguntas que componen el formulario de autoevaluación respondidas por las responsables del proceso, así como los valores asociados a cada respuesta.</p> 
+            <p>A continuación se exponen las preguntas que componen el formulario de autoevaluación respondidas por las responsables del proceso, así como los valores asociados a cada respuesta.</p>
 
             <h4>Inclusividad</h4>
 
diff --git a/decidim-participatory_processes/config/locales/es-PY.yml b/decidim-participatory_processes/config/locales/es-PY.yml
index d2acab4895465..72e6ea59b0814 100644
--- a/decidim-participatory_processes/config/locales/es-PY.yml
+++ b/decidim-participatory_processes/config/locales/es-PY.yml
@@ -639,7 +639,7 @@ es-PY:
             <p>La calidad democrática es un principio básico de Decidim. Para mantenerlo, se ha desarrollado un sistema de indicadores que ayudan a evaluar la calidad de los procesos participativos en la plataforma. En este artículo explicamos cómo se calculan estos indicadores.</p>
 
             <h3>¿Cómo se calculan los indicadores?</h3>
-            <p>Se han definido dos métodos para la recogida de indicadores de calidad:</p> 
+            <p>Se han definido dos métodos para la recogida de indicadores de calidad:</p>
 
             <ol>
             <li><strong>Métricas automáticas:</strong> Se calculan directamente a partir de los datos de la plataforma Decidim.</li>
@@ -683,7 +683,7 @@ es-PY:
 
             <h3>Hibridación</h3>
 
-            <p>Este indicador mide el nivel de combinación entre espacios presenciales y digitales durante el proceso.</p> 
+            <p>Este indicador mide el nivel de combinación entre espacios presenciales y digitales durante el proceso.</p>
             <ul>
             <li>¿Hay algún componente de encuentros? (Sí=5, No=0)</li>
             <li>¿Hay encuentros presenciales? (Sí=5, No=0)</li>
@@ -702,7 +702,7 @@ es-PY:
 
             <h3>Trazabilidad</h3>
 
-            <p>Este indicador mide la transparencia y trazabilidad del proceso participativo. Refleja con qué facilidad la ciudadanía pueden seguir la evolución de las propuestas y verificar las acciones institucionales a través de los registros publicados.</p> 
+            <p>Este indicador mide la transparencia y trazabilidad del proceso participativo. Refleja con qué facilidad la ciudadanía pueden seguir la evolución de las propuestas y verificar las acciones institucionales a través de los registros publicados.</p>
             <ul>
             <li>Número de propuestas con historial (n/total)</li>
             <li>Porcentaje de resultados vinculados a propuestas (n/total)</li>
@@ -714,14 +714,14 @@ es-PY:
             <br><br>
             <h3>Métricas de autoevaluación</h3>
 
-            <p>Además de las métricas automáticas, proponemos el uso de un <strong>formulario de autoevaluación</strong> para valorar las dimensiones cualitativas de cada proceso participativo. Este formulario será rellenado, al finalizar cada proceso participativo, por las responsables de estos, y las respuestas se mostrarán públicamente en el bloque de contenido de indicadores.</p> 
+            <p>Además de las métricas automáticas, proponemos el uso de un <strong>formulario de autoevaluación</strong> para valorar las dimensiones cualitativas de cada proceso participativo. Este formulario será rellenado, al finalizar cada proceso participativo, por las responsables de estos, y las respuestas se mostrarán públicamente en el bloque de contenido de indicadores.</p>
 
-            <p>Estas preguntas pretenden captar aspectos de la calidad democrática que no pueden evaluarse únicamente a través de datos cuantitativos. Es importante tener en cuenta que las respuestas a esta encuesta están sesgadas por la opinión de las responsables del proceso participativo en cuestión.</p> 
+            <p>Estas preguntas pretenden captar aspectos de la calidad democrática que no pueden evaluarse únicamente a través de datos cuantitativos. Es importante tener en cuenta que las respuestas a esta encuesta están sesgadas por la opinión de las responsables del proceso participativo en cuestión.</p>
 
             <br><br>
             <h3>Preguntas de autoevaluación</h3>
 
-            <p>A continuación se exponen las preguntas que componen el formulario de autoevaluación respondidas por las responsables del proceso, así como los valores asociados a cada respuesta.</p> 
+            <p>A continuación se exponen las preguntas que componen el formulario de autoevaluación respondidas por las responsables del proceso, así como los valores asociados a cada respuesta.</p>
 
             <h4>Inclusividad</h4>
 
diff --git a/decidim-participatory_processes/config/locales/fi-plain.yml b/decidim-participatory_processes/config/locales/fi-plain.yml
index 178bb4e91dca5..4827aea464f88 100644
--- a/decidim-participatory_processes/config/locales/fi-plain.yml
+++ b/decidim-participatory_processes/config/locales/fi-plain.yml
@@ -641,18 +641,18 @@ fi-pl:
             <p>Määrittelimme kaksi menetelmää laatuindikaattorien keräämiseksi:</p>
 
             <ol>
-             <li><strong>Automaattiset tilastot:</strong> nämä lasketaan suoraan Decidim-alustalla olevista tiedoista.</li>
-             <li><strong>Itsearvioinnin kysymykset:</strong> nämä perustuvat hallintakäyttäjien antamiin kyselylomakkeen vastauksiin.</li>
+            <li><strong>Automaattiset tilastot:</strong> nämä lasketaan suoraan Decidim-alustalla olevista tiedoista.</li>
+            <li><strong>Itsearvioinnin kysymykset:</strong> nämä perustuvat hallintakäyttäjien antamiin kyselylomakkeen vastauksiin.</li>
             </ol>
 
             <p>Jokainen tilasto esitetään prosentuaalisena arvona (n/kokonaismäärä). Tämä prosentuaalinen osuus pisteytetään asteikolla 1-5 seuraavasti:</p>
 
             <ul>
-             <li>1 = 0–20%</li>
-             <li>2 = 20–40%</li>
-             <li>3 = 40–60%</li>
-             <li>4 = 60–80%</li>
-             <li>5 = 80–100%</li>
+            <li>1 = 0–20%</li>
+            <li>2 = 20–40%</li>
+            <li>3 = 40–60%</li>
+            <li>4 = 60–80%</li>
+            <li>5 = 80–100%</li>
             </ul>
 
             <br><br>
@@ -666,20 +666,20 @@ fi-pl:
             <p>Tämä tilasto mittaa kansalaisvaikuttamisen tasoa hyväksyttyjen ehdotusten ja prosessien lopputulosten osalta.</p>
 
             <ul>
-             <li>
-             Kansalaisvaikuttaminen ehdotusten kautta
-             <ul>
-             <li>Hyväksyttyjen ehdotusten määrä (n/kokonaismäärä)</li>
-             <li>Hyväksyttyjen <em>kansalaisten</em> jättämien ehdotusten prosentuaalinen osuus kaikista kansalaisten jättämien ehdotusten määrästä (kansalaisvaikuttamisen kokonaistaso hyväksyttyihin ehdotuksiin)</li>
-             <li>Hyväksyttyjen kansalaisten jättämien ehdotusten prosentuaalinen osuus kaikkien hyväksyttyjen ehdotusten määrästä (suhteellinen kansalaisten vaikutusvalta hyväksyttyihin ehdotuksiin)</li>
-             </ul>
-             </li>
-             <li>
-             Kansalaisvaikuttaminen johtopäätöksiin tai lopputuloksiin
-             <ul>
-             <li>Ehdotuksiin liitettyjen tulosten prosentuaalinen määrä kaikkien tulosten määrästä (kansalaisvaikuttamisen kokonaistaso lopputuloksiin)</li>
-             </ul>
-             </li>
+            <li>
+            Kansalaisvaikuttaminen ehdotusten kautta
+            <ul>
+            <li>Hyväksyttyjen ehdotusten määrä (n/kokonaismäärä)</li>
+            <li>Hyväksyttyjen <em>kansalaisten</em> jättämien ehdotusten prosentuaalinen osuus kaikista kansalaisten jättämien ehdotusten määrästä (kansalaisvaikuttamisen kokonaistaso hyväksyttyihin ehdotuksiin)</li>
+            <li>Hyväksyttyjen kansalaisten jättämien ehdotusten prosentuaalinen osuus kaikkien hyväksyttyjen ehdotusten määrästä (suhteellinen kansalaisten vaikutusvalta hyväksyttyihin ehdotuksiin)</li>
+            </ul>
+            </li>
+            <li>
+            Kansalaisvaikuttaminen johtopäätöksiin tai lopputuloksiin
+            <ul>
+            <li>Ehdotuksiin liitettyjen tulosten prosentuaalinen määrä kaikkien tulosten määrästä (kansalaisvaikuttamisen kokonaistaso lopputuloksiin)</li>
+            </ul>
+            </li>
             </ul>
 
             <h3>Hybridisointi</h3>
@@ -687,11 +687,11 @@ fi-pl:
             <p>Tämä tilasto mittaa verkossa ja verkon ulkopuolella olevien tilojen yhdistämisen tasoa prosessin aikana</p>
 
             <ul>
-             <li>Onko prosessissa järjestetty tapaamisia? (Kyllä=5, Ei=0)</li>
-             <li>Onko prosessin aikana ollut naamatusten järjestettyjä fyysisiä tapaamisia? (Kyllä=5, Ei=0)</li>
-             <li>Onko prosessin aikana ollut verkkotapaamisia? (Kyllä=5, Ei=0)</li>
-             <li>Onko prosessin aikana ollut hybriditapaamisia? (Kyllä=5, Ei=0)</li>
-             <li>Onko tapaamisten perusteella luotu ehdotuksia? (Kyllä=5, Ei=0)</li>
+            <li>Onko prosessissa järjestetty tapaamisia? (Kyllä=5, Ei=0)</li>
+            <li>Onko prosessin aikana ollut naamatusten järjestettyjä fyysisiä tapaamisia? (Kyllä=5, Ei=0)</li>
+            <li>Onko prosessin aikana ollut verkkotapaamisia? (Kyllä=5, Ei=0)</li>
+            <li>Onko prosessin aikana ollut hybriditapaamisia? (Kyllä=5, Ei=0)</li>
+            <li>Onko tapaamisten perusteella luotu ehdotuksia? (Kyllä=5, Ei=0)</li>
             </ul>
 
             <h3>Reaktiivisuus</h3>
@@ -699,8 +699,8 @@ fi-pl:
             <p>Tämä tilasto mittaa organisaation reaktiivisuuden tasoa osallistujien aktiivisuuteen nähden. Tilasto kertoo, kuinka hyvin viranhaltijat ovat sitoutuneet antamaan virallisia vastauksia ja toteuttamaan tehtyjä päätöksiä.</p>
 
             <ul>
-             <li>Vastattujen ehdotusten prosentiaalinen osuus (n/kokonaismäärä) – Viranhaltijoiden reaktiivisuus ehdotuksiin</li>
-             <li>100% valmistuneiden tulosten prosentuaalinen osuus (n/kokonaismäärä)</li>
+            <li>Vastattujen ehdotusten prosentiaalinen osuus (n/kokonaismäärä) – Viranhaltijoiden reaktiivisuus ehdotuksiin</li>
+            <li>100% valmistuneiden tulosten prosentuaalinen osuus (n/kokonaismäärä)</li>
             </ul>
 
             <h3>Seurattavuus</h3>
@@ -708,11 +708,11 @@ fi-pl:
             <p>Tämä tilasto mittaa osallistumisprosessin läpinäkyvyyttä ja seurattavuutta. Tilasto kertoo, miten helposti osallistujat voivat seurata ehdotusten kehittymistä ja etenemistä sekä tarkastaa viranhaltijoiden suorittamia toimenpiteitä julkaistujen tietojen pohjalta.</p>
 
             <ul>
-             <li>Muutettujen ehdotusten prosentuaalinen osuus (n/kokonaismäärä)</li>
-             <li>Ehdotuksiin linkattujen tulosten prosentuaalinen osuus (n/kokonaismäärä)</li>
-             <li>Julkaistun tapaamismuistion kanssa suljettujen tapaamisten prosentuaalinen osuus (n/kokonaismäärä)</li>
-             <li>Avoimen datan moduulin aktivoiminen (kahtiajako: 0 tai 5)</li>
-             <li>Budjetteihin liitettyjen ehdotusten prosentuaalinen osuus (n/kokonaismäärä)</li>
+            <li>Muutettujen ehdotusten prosentuaalinen osuus (n/kokonaismäärä)</li>
+            <li>Ehdotuksiin linkattujen tulosten prosentuaalinen osuus (n/kokonaismäärä)</li>
+            <li>Julkaistun tapaamismuistion kanssa suljettujen tapaamisten prosentuaalinen osuus (n/kokonaismäärä)</li>
+            <li>Avoimen datan moduulin aktivoiminen (kahtiajako: 0 tai 5)</li>
+            <li>Budjetteihin liitettyjen ehdotusten prosentuaalinen osuus (n/kokonaismäärä)</li>
             </ul>
 
             <br><br>
@@ -730,87 +730,87 @@ fi-pl:
             <h4>Informatiivisuus</h4>
 
             <ol>
-             <li>Selventääkö julkaistu tieto päätöksenteon tapoja (esim. äänestys, yhteisymmärrys, suorat neuvottelut)?
-             <ul>
-             <li>Ei selkeyttä = 0</li>
-             <li>Matalan tason selkeys = 1</li>
-             <li>Riittävä selkeys = 2,5</li>
-             <li>Täysi selkeys = 5</li>
-             </ul>
-             </li>
-             <li>Onko osallistujille tarjottu tietoa heidän vaikutusmahdollisuuksistaan käsiteltävään asiaan (prosessin viestinnässä, kutsuissa ja jokaisen keskustelutilaisuuden alussa)?
-             <ul>
-             <li>Ei koskaan = 0</li>
-             <li>Ei miltei koskaan = 1</li>
-             <li>Yleensä = 2,5</li>
-             <li>Aina = 5</li>
-             </ul>
-             </li>
+            <li>Selventääkö julkaistu tieto päätöksenteon tapoja (esim. äänestys, yhteisymmärrys, suorat neuvottelut)?
+            <ul>
+            <li>Ei selkeyttä = 0</li>
+            <li>Matalan tason selkeys = 1</li>
+            <li>Riittävä selkeys = 2,5</li>
+            <li>Täysi selkeys = 5</li>
+            </ul>
+            </li>
+            <li>Onko osallistujille tarjottu tietoa heidän vaikutusmahdollisuuksistaan käsiteltävään asiaan (prosessin viestinnässä, kutsuissa ja jokaisen keskustelutilaisuuden alussa)?
+            <ul>
+            <li>Ei koskaan = 0</li>
+            <li>Ei miltei koskaan = 1</li>
+            <li>Yleensä = 2,5</li>
+            <li>Aina = 5</li>
+            </ul>
+            </li>
             </ol>
 
             <h4>Kansalaisvaikuttaminen</h4>
 
             <ol>
-             <li>Prosessin osallistumismahdollisuuksien arviointi
-             <ul>
-             <li>Osallistujille on annettu tietoa organisaation puolesta = 1</li>
-             <li>Osallistujat ovat osallistuneet kuulemisiin aktiivisesti tai antaneet palautetta organisaatiolle = 2</li>
-             <li>Osallistujille on annettu päätöksentekovaltaa = 3</li>
-             <li>Osallistujat on otettu määrätietoisesti mukaan päätöksentekoon = 4</li>
-             <li>Osallistujat ovat olleet osana päätöksentekoa ja hallinnoineet toteutusten resursseja = 5</li>
-             </ul>
-             </li>
-             <li>Prosessin vaiheiden arviointi asteikolla 0-5 kansalaisten päätöksenteon mahdollisuuksista.
-             <p>Kaikista prosessn vaiheista (asioiden valinnasta toimeenpanon valvontaan), monessa vaiheessa osallistujilla on ollut päätöksenteko- tai toimeenpanovaltaa?</p>
-             <ul>
-             <li>0-20% = 1</li>
-             <li>20-40% = 2</li>
-             <li>40-60% = 3</li>
-             <li>60-80% = 4</li>
-             <li>80-100% = 5</li>
-             </ul>
-             </li>
+            <li>Prosessin osallistumismahdollisuuksien arviointi
+            <ul>
+            <li>Osallistujille on annettu tietoa organisaation puolesta = 1</li>
+            <li>Osallistujat ovat osallistuneet kuulemisiin aktiivisesti tai antaneet palautetta organisaatiolle = 2</li>
+            <li>Osallistujille on annettu päätöksentekovaltaa = 3</li>
+            <li>Osallistujat on otettu määrätietoisesti mukaan päätöksentekoon = 4</li>
+            <li>Osallistujat ovat olleet osana päätöksentekoa ja hallinnoineet toteutusten resursseja = 5</li>
+            </ul>
+            </li>
+            <li>Prosessin vaiheiden arviointi asteikolla 0-5 kansalaisten päätöksenteon mahdollisuuksista.
+            <p>Kaikista prosessn vaiheista (asioiden valinnasta toimeenpanon valvontaan), monessa vaiheessa osallistujilla on ollut päätöksenteko- tai toimeenpanovaltaa?</p>
+            <ul>
+            <li>0-20% = 1</li>
+            <li>20-40% = 2</li>
+            <li>40-60% = 3</li>
+            <li>60-80% = 4</li>
+            <li>80-100% = 5</li>
+            </ul>
+            </li>
             </ol>
 
             <h4>Inklusiivisuus</h4>
 
             <ol>
-             <li>Miten toimijoiden ja osallistujien monimuotoisuutta on arvioitu päätöksenteon kohteena olevien asukkaiden kohderyhmään suhteutettuna?
-             <ul>
-             <li>Ei mitenkään = 0</li>
-             <li>Hieman = 1</li>
-             <li>Riittävästi = 2,5</li>
-             <li>Hyvällä tasolla = 5</li>
-             </ul>
-             </li>
-             <li>Kuinka monella kielellä prosessista on viestitty?
-             <ul>
-             <li>Yhdellä kielellä = 1</li>
-             <li>Alle puolilla yhteisön puhumista kielistä = 2,5</li>
-             <li>Yli puolilla yhteisön puhumista kielistä = 5</li>
-             </ul>
-             </li>
-             <li>Olivatko tapahtumapaikat kasvokkain järjestetyissä tapaamisissa liikuntarajoitteistan henkilöiden saavutettavissa?
-             <ul>
-             <li>Eivät = 0</li>
-             <li>Osittain = 2,5</li>
-             <li>Kyllä = 5</li>
-             </ul>
-             </li>
-             <li>Onko osallistumistilaisuuksia on järjestetty eri aikoina (aamulla, keskipäivällä, iltapäivällä, iltaisin ja viikonloppuisin)?
-             <ul>
-             <li>Ei = 0</li>
-             <li>Osittain = 2,5</li>
-             <li>Kyllä = 5</li>
-             </ul>
-             </li>
-             <li>Onko osallistujille tarjottu digitaalista tukea?
-             <ul>
-             <li>Ei = 0</li>
-             <li>Osittain = 2,5</li>
-             <li>Kyllä = 5</li>
-             </ul>
-             </li>
+            <li>Miten toimijoiden ja osallistujien monimuotoisuutta on arvioitu päätöksenteon kohteena olevien asukkaiden kohderyhmään suhteutettuna?
+            <ul>
+            <li>Ei mitenkään = 0</li>
+            <li>Hieman = 1</li>
+            <li>Riittävästi = 2,5</li>
+            <li>Hyvällä tasolla = 5</li>
+            </ul>
+            </li>
+            <li>Kuinka monella kielellä prosessista on viestitty?
+            <ul>
+            <li>Yhdellä kielellä = 1</li>
+            <li>Alle puolilla yhteisön puhumista kielistä = 2,5</li>
+            <li>Yli puolilla yhteisön puhumista kielistä = 5</li>
+            </ul>
+            </li>
+            <li>Olivatko tapahtumapaikat kasvokkain järjestetyissä tapaamisissa liikuntarajoitteistan henkilöiden saavutettavissa?
+            <ul>
+            <li>Eivät = 0</li>
+            <li>Osittain = 2,5</li>
+            <li>Kyllä = 5</li>
+            </ul>
+            </li>
+            <li>Onko osallistumistilaisuuksia on järjestetty eri aikoina (aamulla, keskipäivällä, iltapäivällä, iltaisin ja viikonloppuisin)?
+            <ul>
+            <li>Ei = 0</li>
+            <li>Osittain = 2,5</li>
+            <li>Kyllä = 5</li>
+            </ul>
+            </li>
+            <li>Onko osallistujille tarjottu digitaalista tukea?
+            <ul>
+            <li>Ei = 0</li>
+            <li>Osittain = 2,5</li>
+            <li>Kyllä = 5</li>
+            </ul>
+            </li>
             </ol>
           title: Demokraattiset laatumittarit
     statistics:
diff --git a/decidim-participatory_processes/config/locales/fi.yml b/decidim-participatory_processes/config/locales/fi.yml
index 6bc57d5c4c861..ae49eaa7f4091 100644
--- a/decidim-participatory_processes/config/locales/fi.yml
+++ b/decidim-participatory_processes/config/locales/fi.yml
@@ -641,18 +641,18 @@ fi:
             <p>Määrittelimme kaksi menetelmää laatuindikaattorien keräämiseksi:</p>
 
             <ol>
-             <li><strong>Automaattiset tilastot:</strong> nämä lasketaan suoraan Decidim-alustalla olevista tiedoista.</li>
-             <li><strong>Itsearvioinnin kysymykset:</strong> nämä perustuvat hallintakäyttäjien antamiin kyselylomakkeen vastauksiin.</li>
+            <li><strong>Automaattiset tilastot:</strong> nämä lasketaan suoraan Decidim-alustalla olevista tiedoista.</li>
+            <li><strong>Itsearvioinnin kysymykset:</strong> nämä perustuvat hallintakäyttäjien antamiin kyselylomakkeen vastauksiin.</li>
             </ol>
 
             <p>Jokainen tilasto esitetään prosentuaalisena arvona (n/kokonaismäärä). Tämä prosentuaalinen osuus pisteytetään asteikolla 1-5 seuraavasti:</p>
 
             <ul>
-             <li>1 = 0–20%</li>
-             <li>2 = 20–40%</li>
-             <li>3 = 40–60%</li>
-             <li>4 = 60–80%</li>
-             <li>5 = 80–100%</li>
+            <li>1 = 0–20%</li>
+            <li>2 = 20–40%</li>
+            <li>3 = 40–60%</li>
+            <li>4 = 60–80%</li>
+            <li>5 = 80–100%</li>
             </ul>
 
             <br><br>
@@ -666,20 +666,20 @@ fi:
             <p>Tämä tilasto mittaa kansalaisvaikuttamisen tasoa hyväksyttyjen ehdotusten ja prosessien lopputulosten osalta.</p>
 
             <ul>
-             <li>
-             Kansalaisvaikuttaminen ehdotusten kautta
-             <ul>
-             <li>Hyväksyttyjen ehdotusten määrä (n/kokonaismäärä)</li>
-             <li>Hyväksyttyjen <em>kansalaisten</em> jättämien ehdotusten prosentuaalinen osuus kaikista kansalaisten jättämien ehdotusten määrästä (kansalaisvaikuttamisen kokonaistaso hyväksyttyihin ehdotuksiin)</li>
-             <li>Hyväksyttyjen kansalaisten jättämien ehdotusten prosentuaalinen osuus kaikkien hyväksyttyjen ehdotusten määrästä (suhteellinen kansalaisten vaikutusvalta hyväksyttyihin ehdotuksiin)</li>
-             </ul>
-             </li>
-             <li>
-             Kansalaisvaikuttaminen johtopäätöksiin tai lopputuloksiin
-             <ul>
-             <li>Ehdotuksiin liitettyjen tulosten prosentuaalinen määrä kaikkien tulosten määrästä (kansalaisvaikuttamisen kokonaistaso lopputuloksiin)</li>
-             </ul>
-             </li>
+            <li>
+            Kansalaisvaikuttaminen ehdotusten kautta
+            <ul>
+            <li>Hyväksyttyjen ehdotusten määrä (n/kokonaismäärä)</li>
+            <li>Hyväksyttyjen <em>kansalaisten</em> jättämien ehdotusten prosentuaalinen osuus kaikista kansalaisten jättämien ehdotusten määrästä (kansalaisvaikuttamisen kokonaistaso hyväksyttyihin ehdotuksiin)</li>
+            <li>Hyväksyttyjen kansalaisten jättämien ehdotusten prosentuaalinen osuus kaikkien hyväksyttyjen ehdotusten määrästä (suhteellinen kansalaisten vaikutusvalta hyväksyttyihin ehdotuksiin)</li>
+            </ul>
+            </li>
+            <li>
+            Kansalaisvaikuttaminen johtopäätöksiin tai lopputuloksiin
+            <ul>
+            <li>Ehdotuksiin liitettyjen tulosten prosentuaalinen määrä kaikkien tulosten määrästä (kansalaisvaikuttamisen kokonaistaso lopputuloksiin)</li>
+            </ul>
+            </li>
             </ul>
 
             <h3>Hybridisointi</h3>
@@ -687,11 +687,11 @@ fi:
             <p>Tämä tilasto mittaa verkossa ja verkon ulkopuolella olevien tilojen yhdistämisen tasoa prosessin aikana</p>
 
             <ul>
-             <li>Onko prosessissa järjestetty tapaamisia? (Kyllä=5, Ei=0)</li>
-             <li>Onko prosessin aikana ollut naamatusten järjestettyjä fyysisiä tapaamisia? (Kyllä=5, Ei=0)</li>
-             <li>Onko prosessin aikana ollut verkkotapaamisia? (Kyllä=5, Ei=0)</li>
-             <li>Onko prosessin aikana ollut hybriditapaamisia? (Kyllä=5, Ei=0)</li>
-             <li>Onko tapaamisten perusteella luotu ehdotuksia? (Kyllä=5, Ei=0)</li>
+            <li>Onko prosessissa järjestetty tapaamisia? (Kyllä=5, Ei=0)</li>
+            <li>Onko prosessin aikana ollut naamatusten järjestettyjä fyysisiä tapaamisia? (Kyllä=5, Ei=0)</li>
+            <li>Onko prosessin aikana ollut verkkotapaamisia? (Kyllä=5, Ei=0)</li>
+            <li>Onko prosessin aikana ollut hybriditapaamisia? (Kyllä=5, Ei=0)</li>
+            <li>Onko tapaamisten perusteella luotu ehdotuksia? (Kyllä=5, Ei=0)</li>
             </ul>
 
             <h3>Reaktiivisuus</h3>
@@ -699,8 +699,8 @@ fi:
             <p>Tämä tilasto mittaa organisaation reaktiivisuuden tasoa osallistujien aktiivisuuteen nähden. Tilasto kertoo, kuinka hyvin viranhaltijat ovat sitoutuneet antamaan virallisia vastauksia ja toteuttamaan tehtyjä päätöksiä.</p>
 
             <ul>
-             <li>Vastattujen ehdotusten prosentiaalinen osuus (n/kokonaismäärä) – Viranhaltijoiden reaktiivisuus ehdotuksiin</li>
-             <li>100% valmistuneiden tulosten prosentuaalinen osuus (n/kokonaismäärä)</li>
+            <li>Vastattujen ehdotusten prosentiaalinen osuus (n/kokonaismäärä) – Viranhaltijoiden reaktiivisuus ehdotuksiin</li>
+            <li>100% valmistuneiden tulosten prosentuaalinen osuus (n/kokonaismäärä)</li>
             </ul>
 
             <h3>Seurattavuus</h3>
@@ -708,11 +708,11 @@ fi:
             <p>Tämä tilasto mittaa osallistumisprosessin läpinäkyvyyttä ja seurattavuutta. Tilasto kertoo, miten helposti osallistujat voivat seurata ehdotusten kehittymistä ja etenemistä sekä tarkastaa viranhaltijoiden suorittamia toimenpiteitä julkaistujen tietojen pohjalta.</p>
 
             <ul>
-             <li>Muutettujen ehdotusten prosentuaalinen osuus (n/kokonaismäärä)</li>
-             <li>Ehdotuksiin linkattujen tulosten prosentuaalinen osuus (n/kokonaismäärä)</li>
-             <li>Julkaistun tapaamismuistion kanssa suljettujen tapaamisten prosentuaalinen osuus (n/kokonaismäärä)</li>
-             <li>Avoimen datan moduulin aktivoiminen (kahtiajako: 0 tai 5)</li>
-             <li>Budjetteihin liitettyjen ehdotusten prosentuaalinen osuus (n/kokonaismäärä)</li>
+            <li>Muutettujen ehdotusten prosentuaalinen osuus (n/kokonaismäärä)</li>
+            <li>Ehdotuksiin linkattujen tulosten prosentuaalinen osuus (n/kokonaismäärä)</li>
+            <li>Julkaistun tapaamismuistion kanssa suljettujen tapaamisten prosentuaalinen osuus (n/kokonaismäärä)</li>
+            <li>Avoimen datan moduulin aktivoiminen (kahtiajako: 0 tai 5)</li>
+            <li>Budjetteihin liitettyjen ehdotusten prosentuaalinen osuus (n/kokonaismäärä)</li>
             </ul>
 
             <br><br>
@@ -730,87 +730,87 @@ fi:
             <h4>Informatiivisuus</h4>
 
             <ol>
-             <li>Selventääkö julkaistu tieto päätöksenteon tapoja (esim. äänestys, yhteisymmärrys, suorat neuvottelut)?
-             <ul>
-             <li>Ei selkeyttä = 0</li>
-             <li>Matalan tason selkeys = 1</li>
-             <li>Riittävä selkeys = 2,5</li>
-             <li>Täysi selkeys = 5</li>
-             </ul>
-             </li>
-             <li>Onko osallistujille tarjottu tietoa heidän vaikutusmahdollisuuksistaan käsiteltävään asiaan (prosessin viestinnässä, kutsuissa ja jokaisen keskustelutilaisuuden alussa)?
-             <ul>
-             <li>Ei koskaan = 0</li>
-             <li>Ei miltei koskaan = 1</li>
-             <li>Yleensä = 2,5</li>
-             <li>Aina = 5</li>
-             </ul>
-             </li>
+            <li>Selventääkö julkaistu tieto päätöksenteon tapoja (esim. äänestys, yhteisymmärrys, suorat neuvottelut)?
+            <ul>
+            <li>Ei selkeyttä = 0</li>
+            <li>Matalan tason selkeys = 1</li>
+            <li>Riittävä selkeys = 2,5</li>
+            <li>Täysi selkeys = 5</li>
+            </ul>
+            </li>
+            <li>Onko osallistujille tarjottu tietoa heidän vaikutusmahdollisuuksistaan käsiteltävään asiaan (prosessin viestinnässä, kutsuissa ja jokaisen keskustelutilaisuuden alussa)?
+            <ul>
+            <li>Ei koskaan = 0</li>
+            <li>Ei miltei koskaan = 1</li>
+            <li>Yleensä = 2,5</li>
+            <li>Aina = 5</li>
+            </ul>
+            </li>
             </ol>
 
             <h4>Kansalaisvaikuttaminen</h4>
 
             <ol>
-             <li>Prosessin osallistumismahdollisuuksien arviointi
-             <ul>
-             <li>Osallistujille on annettu tietoa organisaation puolesta = 1</li>
-             <li>Osallistujat ovat osallistuneet kuulemisiin aktiivisesti tai antaneet palautetta organisaatiolle = 2</li>
-             <li>Osallistujille on annettu päätöksentekovaltaa = 3</li>
-             <li>Osallistujat on otettu määrätietoisesti mukaan päätöksentekoon = 4</li>
-             <li>Osallistujat ovat olleet osana päätöksentekoa ja hallinnoineet toteutusten resursseja = 5</li>
-             </ul>
-             </li>
-             <li>Prosessin vaiheiden arviointi asteikolla 0-5 kansalaisten päätöksenteon mahdollisuuksista.
-             <p>Kaikista prosessn vaiheista (asioiden valinnasta toimeenpanon valvontaan), monessa vaiheessa osallistujilla on ollut päätöksenteko- tai toimeenpanovaltaa?</p>
-             <ul>
-             <li>0-20% = 1</li>
-             <li>20-40% = 2</li>
-             <li>40-60% = 3</li>
-             <li>60-80% = 4</li>
-             <li>80-100% = 5</li>
-             </ul>
-             </li>
+            <li>Prosessin osallistumismahdollisuuksien arviointi
+            <ul>
+            <li>Osallistujille on annettu tietoa organisaation puolesta = 1</li>
+            <li>Osallistujat ovat osallistuneet kuulemisiin aktiivisesti tai antaneet palautetta organisaatiolle = 2</li>
+            <li>Osallistujille on annettu päätöksentekovaltaa = 3</li>
+            <li>Osallistujat on otettu määrätietoisesti mukaan päätöksentekoon = 4</li>
+            <li>Osallistujat ovat olleet osana päätöksentekoa ja hallinnoineet toteutusten resursseja = 5</li>
+            </ul>
+            </li>
+            <li>Prosessin vaiheiden arviointi asteikolla 0-5 kansalaisten päätöksenteon mahdollisuuksista.
+            <p>Kaikista prosessn vaiheista (asioiden valinnasta toimeenpanon valvontaan), monessa vaiheessa osallistujilla on ollut päätöksenteko- tai toimeenpanovaltaa?</p>
+            <ul>
+            <li>0-20% = 1</li>
+            <li>20-40% = 2</li>
+            <li>40-60% = 3</li>
+            <li>60-80% = 4</li>
+            <li>80-100% = 5</li>
+            </ul>
+            </li>
             </ol>
 
             <h4>Inklusiivisuus</h4>
 
             <ol>
-             <li>Miten toimijoiden ja osallistujien monimuotoisuutta on arvioitu päätöksenteon kohteena olevien asukkaiden kohderyhmään suhteutettuna?
-             <ul>
-             <li>Ei mitenkään = 0</li>
-             <li>Hieman = 1</li>
-             <li>Riittävästi = 2,5</li>
-             <li>Hyvällä tasolla = 5</li>
-             </ul>
-             </li>
-             <li>Kuinka monella kielellä prosessista on viestitty?
-             <ul>
-             <li>Yhdellä kielellä = 1</li>
-             <li>Alle puolilla yhteisön puhumista kielistä = 2,5</li>
-             <li>Yli puolilla yhteisön puhumista kielistä = 5</li>
-             </ul>
-             </li>
-             <li>Olivatko tapahtumapaikat kasvokkain järjestetyissä tapaamisissa liikuntarajoitteistan henkilöiden saavutettavissa?
-             <ul>
-             <li>Eivät = 0</li>
-             <li>Osittain = 2,5</li>
-             <li>Kyllä = 5</li>
-             </ul>
-             </li>
-             <li>Onko osallistumistilaisuuksia on järjestetty eri aikoina (aamulla, keskipäivällä, iltapäivällä, iltaisin ja viikonloppuisin)?
-             <ul>
-             <li>Ei = 0</li>
-             <li>Osittain = 2,5</li>
-             <li>Kyllä = 5</li>
-             </ul>
-             </li>
-             <li>Onko osallistujille tarjottu digitaalista tukea?
-             <ul>
-             <li>Ei = 0</li>
-             <li>Osittain = 2,5</li>
-             <li>Kyllä = 5</li>
-             </ul>
-             </li>
+            <li>Miten toimijoiden ja osallistujien monimuotoisuutta on arvioitu päätöksenteon kohteena olevien asukkaiden kohderyhmään suhteutettuna?
+            <ul>
+            <li>Ei mitenkään = 0</li>
+            <li>Hieman = 1</li>
+            <li>Riittävästi = 2,5</li>
+            <li>Hyvällä tasolla = 5</li>
+            </ul>
+            </li>
+            <li>Kuinka monella kielellä prosessista on viestitty?
+            <ul>
+            <li>Yhdellä kielellä = 1</li>
+            <li>Alle puolilla yhteisön puhumista kielistä = 2,5</li>
+            <li>Yli puolilla yhteisön puhumista kielistä = 5</li>
+            </ul>
+            </li>
+            <li>Olivatko tapahtumapaikat kasvokkain järjestetyissä tapaamisissa liikuntarajoitteistan henkilöiden saavutettavissa?
+            <ul>
+            <li>Eivät = 0</li>
+            <li>Osittain = 2,5</li>
+            <li>Kyllä = 5</li>
+            </ul>
+            </li>
+            <li>Onko osallistumistilaisuuksia on järjestetty eri aikoina (aamulla, keskipäivällä, iltapäivällä, iltaisin ja viikonloppuisin)?
+            <ul>
+            <li>Ei = 0</li>
+            <li>Osittain = 2,5</li>
+            <li>Kyllä = 5</li>
+            </ul>
+            </li>
+            <li>Onko osallistujille tarjottu digitaalista tukea?
+            <ul>
+            <li>Ei = 0</li>
+            <li>Osittain = 2,5</li>
+            <li>Kyllä = 5</li>
+            </ul>
+            </li>
             </ol>
           title: Demokraattiset laatumittarit
     statistics:
diff --git a/decidim-participatory_processes/config/locales/fr-CA.yml b/decidim-participatory_processes/config/locales/fr-CA.yml
index a8a1e5f9ec5ea..741b49b9d51d9 100644
--- a/decidim-participatory_processes/config/locales/fr-CA.yml
+++ b/decidim-participatory_processes/config/locales/fr-CA.yml
@@ -109,6 +109,7 @@ fr-CA:
         participatory_process_groups: Groupes de concertations
         participatory_process_groups_submenu:
           info: À propos de ce groupe de processus
+          landing_page: Mise en page de la page d'accueil
         participatory_processes: Concertations
         participatory_processes_submenu:
           attachment_collections: Dossiers
@@ -116,6 +117,7 @@ fr-CA:
           attachments: Documents liés
           components: Fonctionnalités
           info: A propos de cette concertation
+          landing_page: Mise en page de la page d'accueil
           moderations: Modérations
           private_users: Membres
           process_admins: Administrateurs de la concertation
@@ -290,6 +292,7 @@ fr-CA:
         import: "%{user_name} a importé la concertation %{resource_name}"
         publish: "%{user_name} a publié la concertation %{resource_name}"
         publish_all_members: "%{user_name} a publié tous les membres du processus participatif %{resource_name}"
+        restore: "%{user_name} a restauré le processus participatif %{resource_name}"
         unpublish: "%{user_name} n'a pas publié la concertation %{resource_name}"
         unpublish_all_members: "%{user_name} a dépublié tous les membres du processus participatif %{resource_name}"
         update: "%{user_name} a mis à jour la concertation %{resource_name}"
@@ -345,6 +348,14 @@ fr-CA:
     open_data:
       help:
         participatory_processes:
+          announcement: Information sur l'annonce (callout)
+          created_at: La date de création de cet espace
+          description: Une description longue du processus
+          developer_group: Le groupe promoteur de la concertation. Il s'agit de l'organisation qui porte la concertation.
+          end_date: La date de fin de la concertation
+          promoted: Si la concertation est promue ou non
+          published_at: La date de publication de cet espace
+          reference: La référence unique de l'espace
           updated_at: La dernière date de mise à jour de cet espace
           url: L'URL de l'espace
     participatory_process_groups:
diff --git a/decidim-participatory_processes/config/locales/fr.yml b/decidim-participatory_processes/config/locales/fr.yml
index 40585014dc1e8..db9a26c619504 100644
--- a/decidim-participatory_processes/config/locales/fr.yml
+++ b/decidim-participatory_processes/config/locales/fr.yml
@@ -109,6 +109,7 @@ fr:
         participatory_process_groups: Groupes de concertations
         participatory_process_groups_submenu:
           info: À propos de ce groupe de processus
+          landing_page: Mise en page de la page d'accueil
         participatory_processes: Concertations
         participatory_processes_submenu:
           attachment_collections: Dossiers
@@ -116,6 +117,7 @@ fr:
           attachments: Documents liés
           components: Fonctionnalités
           info: A propos de cette concertation
+          landing_page: Mise en page de la page d'accueil
           moderations: Modérations
           private_users: Membres
           process_admins: Administrateurs de la concertation
@@ -290,6 +292,8 @@ fr:
         import: "%{user_name} a importé la concertation %{resource_name}"
         publish: "%{user_name} a publié la concertation %{resource_name}"
         publish_all_members: "%{user_name} a publié tous les membres du processus participatif %{resource_name}"
+        restore: "%{user_name} a restauré le processus participatif %{resource_name}"
+        soft_delete: "%{user_name} a déplacé le processus participatif %{resource_name} dans la corbeille"
         unpublish: "%{user_name} n'a pas publié la concertation %{resource_name}"
         unpublish_all_members: "%{user_name} a dépublié tous les membres du processus participatif %{resource_name}"
         update: "%{user_name} a mis à jour la concertation %{resource_name}"
@@ -345,6 +349,14 @@ fr:
     open_data:
       help:
         participatory_processes:
+          announcement: Information sur l'annonce (callout)
+          created_at: La date de création de cet espace
+          description: Une description longue de la concertation
+          developer_group: Le groupe promoteur de la concertation. Il s'agit de l'organisation qui porte la concertation.
+          end_date: La date de fin de la concertation
+          promoted: Si la concertation est promue ou non
+          published_at: La date de publication de cet espace
+          reference: La référence unique de l'espace
           updated_at: La dernière date de mise à jour de cet espace
           url: L'URL de l'espace
     participatory_process_groups:
diff --git a/decidim-proposals/config/locales/ar.yml b/decidim-proposals/config/locales/ar.yml
index 3371e708c2203..d365ee529f7ef 100644
--- a/decidim-proposals/config/locales/ar.yml
+++ b/decidim-proposals/config/locales/ar.yml
@@ -44,10 +44,6 @@ ar:
               allowed_file_content_types: 'نوع الوثيقة غير صالح. يسمح فقط بالملفات ذات الإضافات التالية: %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: يحتاج إلى إعادة ربط
-            add_photos:
-              needs_to_be_reattached: يحتاج إلى إعادة ربط
             body:
               cant_be_equal_to_template: لا يمكن أن يساوي القالب
               identical: لا يمكن أن يكون العنوان متطابقًا
@@ -125,7 +121,6 @@ ar:
             attachments_allowed: السماح للمرفقات
             collaborative_drafts_enabled: تم تمكين المسودات التعاونية
             comments_enabled: تم تمكين التعليقات
-            comments_max_length: الحد الأقصى لطول التعليقات (اترك 0 لاستعمال القيمة الافتراضية)
             default_sort_order: التصنيف الافتراضي للاقتراح
             default_sort_order_options:
               most_commented: صاحبة الأكثر تعليقات
diff --git a/decidim-proposals/config/locales/bg.yml b/decidim-proposals/config/locales/bg.yml
index 3714866c37159..2db5382a35b03 100644
--- a/decidim-proposals/config/locales/bg.yml
+++ b/decidim-proposals/config/locales/bg.yml
@@ -52,10 +52,6 @@ bg:
               allowed_file_content_types: 'Невалиден файлов формат. Позволени са само файлове със следните разширения: %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Необходимо е да се прикачи отново
-            add_photos:
-              needs_to_be_reattached: Необходимо е да се прикачи отново
             body:
               cant_be_equal_to_template: не може да е еднакво с шаблона
               identical: И заглавието не може да е еднакво
@@ -134,7 +130,6 @@ bg:
             can_accumulate_votes_beyond_threshold: Може да натрупва гласове над прага
             collaborative_drafts_enabled: Съвместните чернови са разрешени
             comments_enabled: Коментарите са разрешени
-            comments_max_length: Максимална дължина на коментарите (Оставете 0 за стойност по подразбиране)
             default_sort_order: Сортиране на предложения по подразбиране
             default_sort_order_help: Автоматично означава, че ако гласовете са активирани, предложенията ще се показват сортирани на случаен принцип, а ако гласовете са блокирани, тогава те ще бъдат сортирани по най-гласуваните.
             default_sort_order_options:
diff --git a/decidim-proposals/config/locales/ca-IT.yml b/decidim-proposals/config/locales/ca-IT.yml
index 63c4cb6001fbc..0580fd3e84f5b 100644
--- a/decidim-proposals/config/locales/ca-IT.yml
+++ b/decidim-proposals/config/locales/ca-IT.yml
@@ -63,10 +63,8 @@ ca-IT:
               allowed_file_content_types: 'Tipus de document no vàlid. Només s''accepten arxius amb les següents extensions: %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: És necessari tornar a adjuntar l'arxiu
-            add_photos:
-              needs_to_be_reattached: És necessari tornar a adjuntar l'arxiu
+            add_attachments:
+              needs_to_be_reattached: És necessari tornar a adjuntar el fitxer
             body:
               cant_be_equal_to_template: No pot ser igual a la plantilla
               identical: I el títol no pot ser idèntic
@@ -107,9 +105,6 @@ ca-IT:
       decidim/proposals/proposal:
         one: Proposta
         other: Propostes
-      decidim/proposals/proposal_note:
-        one: Nota
-        other: Notes
       decidim/proposals/proposal_vote:
         one: Donar suport
         other: Suports
@@ -179,7 +174,7 @@ ca-IT:
             collaborative_drafts_enabled: Esborranys col·laboratius habilitats
             collaborative_drafts_enabled_help: La funció «Esborranys col·laboratius» s'eliminarà pròximament. Si la feies servir, a partir de la versió 0.32 de Decidim podràs fer servir la funcionalitat de coautoria de propostes.
             comments_enabled: Comentaris habilitats
-            comments_max_length: Longitud màxima dels comentaris (deixa 0 si vols mantenir la configuració per defecte)
+            comments_max_length: Caràcters màxims per comentari (deixar a 0 el valor predeterminat)
             default_sort_order: Ordre de propostes per defecte
             default_sort_order_help: '''Per defecte'' vol dir que si els suports estan habilitats, les propostes es mostraran aleatòriament, i si els suports estan bloquejats, aleshores es mostraran de més a menys suports.'
             default_sort_order_options:
@@ -859,6 +854,7 @@ ca-IT:
         errors:
           device_not_supported: El teu dispositiu no admet serveis d'ubicació. Si us plau, introdueix l'adreça postal completa manualment (tipus de via, nom de la via, número, codi postal i ciutat).
           no_device_location: Si us plau, no hem pogut detectar la teva ubicació. Si us plau, introdueix l'adreça postal completa manualment (tipus de via, nom de la via, número, codi postal i ciutat).
+        locating: Localitzant...
         use_my_location: Fer servir la meva ubicació actual
       invite_coauthors:
         cancel:
diff --git a/decidim-proposals/config/locales/ca.yml b/decidim-proposals/config/locales/ca.yml
index e21fd2a2d0032..308305981fc86 100644
--- a/decidim-proposals/config/locales/ca.yml
+++ b/decidim-proposals/config/locales/ca.yml
@@ -63,10 +63,8 @@ ca:
               allowed_file_content_types: 'Tipus de document no vàlid. Només s''accepten arxius amb les següents extensions: %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: És necessari tornar a adjuntar l'arxiu
-            add_photos:
-              needs_to_be_reattached: És necessari tornar a adjuntar l'arxiu
+            add_attachments:
+              needs_to_be_reattached: És necessari tornar a adjuntar el fitxer
             body:
               cant_be_equal_to_template: No pot ser igual a la plantilla
               identical: I el títol no pot ser idèntic
@@ -179,7 +177,7 @@ ca:
             collaborative_drafts_enabled: Esborranys col·laboratius habilitats
             collaborative_drafts_enabled_help: La funció «Esborranys col·laboratius» s'eliminarà pròximament. Si la feies servir, a partir de la versió 0.32 de Decidim podràs fer servir la funcionalitat de coautoria de propostes.
             comments_enabled: Comentaris habilitats
-            comments_max_length: Longitud màxima dels comentaris (deixa 0 si vols mantenir la configuració per defecte)
+            comments_max_length: Caràcters màxims per comentari (deixar a 0 el valor predeterminat)
             default_sort_order: Ordre de propostes per defecte
             default_sort_order_help: '''Per defecte'' vol dir que si els suports estan habilitats, les propostes es mostraran aleatòriament, i si els suports estan bloquejats, aleshores es mostraran de més a menys suports.'
             default_sort_order_options:
@@ -859,6 +857,7 @@ ca:
         errors:
           device_not_supported: El teu dispositiu no admet serveis d'ubicació. Si us plau, introdueix l'adreça postal completa manualment (tipus de via, nom de la via, número, codi postal i ciutat).
           no_device_location: Si us plau, no hem pogut detectar la teva ubicació. Si us plau, introdueix l'adreça postal completa manualment (tipus de via, nom de la via, número, codi postal i ciutat).
+        locating: Localitzant...
         use_my_location: Fer servir la meva ubicació actual
       invite_coauthors:
         cancel:
diff --git a/decidim-proposals/config/locales/cs.yml b/decidim-proposals/config/locales/cs.yml
index ccd7e14959611..43af1fa506966 100644
--- a/decidim-proposals/config/locales/cs.yml
+++ b/decidim-proposals/config/locales/cs.yml
@@ -63,10 +63,6 @@ cs:
               allowed_file_content_types: 'Neplatný typ dokumentu. Jsou povoleny pouze soubory s následujícími příponami: %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Potřebuje být znovu připojen
-            add_photos:
-              needs_to_be_reattached: Potřebuje být znovu připojen
             body:
               cant_be_equal_to_template: nelze se rovnat šabloně
               identical: A název nemůže být totožný
@@ -186,7 +182,6 @@ cs:
             collaborative_drafts_enabled: Společné koncepty povoleny
             collaborative_drafts_enabled_help: Funkce „Spolunávrhy“ bude odstraněna v Decidim v0.32. Organizace, které ji používají, mohou přejít na novou funkci spoluautorství.
             comments_enabled: Komentáře povoleny
-            comments_max_length: Maximální délka komentáře (ponechte 0 pro výchozí hodnotu)
             default_sort_order: Výchozí řazení návrhu
             default_sort_order_help: Automaticky znamená, že pokud je hlasování povoleno, návrhy se zobrazují seřazené náhodně, a pokud je hlasování zablokováno, pak se zobrazují seřazené podle počtu hlasů.
             default_sort_order_options:
diff --git a/decidim-proposals/config/locales/de.yml b/decidim-proposals/config/locales/de.yml
index b45401739fa61..903c34f9d0f0f 100644
--- a/decidim-proposals/config/locales/de.yml
+++ b/decidim-proposals/config/locales/de.yml
@@ -62,10 +62,6 @@ de:
               allowed_file_content_types: 'Ungültiger Dokumententyp. Nur Dateien mit folgenden Erweiterungen sind erlaubt: %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Der Anhang muss erneut angehängt werden
-            add_photos:
-              needs_to_be_reattached: Der Anhang muss erneut angehängt werden
             body:
               cant_be_equal_to_template: kann nicht gleich der Vorlage sein
               identical: UND Titel dürfen nicht identisch sein
@@ -177,7 +173,6 @@ de:
             clear_all: Alles löschen
             collaborative_drafts_enabled: Kollaborative Entwürfe aktiviert
             comments_enabled: Kommentare aktiviert
-            comments_max_length: Maximale Länge der Kommentare (0 für Standardwert)
             default_sort_order: Standardsortierung für Vorschläge
             default_sort_order_help: Standardmäßig bedeutet, dass bei aktivierten Stimmensammlung die Vorschläge nach Zufall und bei deaktivierter Stimmensammlung nach den meist gewählten Vorschläge sortiert werden.
             default_sort_order_options:
@@ -190,7 +185,7 @@ de:
               recent: Neueste
               with_more_authors: Mit mehr Autoren
             define_taxonomy_filters: Bitte definieren Sie einige Filter für diesen partizipativen Bereich, bevor Sie diese Einstellung verwenden.
-            edit_time: Vorschläge können vor Ablauf dieser Zeit von den Autoren bearbeitet werden
+            edit_time: Autoren können Vorschläge während dieser Zeit nach der Einreichung bearbeiten
             edit_time_units:
               days: Tage
               hours: Stunden
diff --git a/decidim-proposals/config/locales/el.yml b/decidim-proposals/config/locales/el.yml
index 87597edb64cbb..0b2eeedb5bb8a 100644
--- a/decidim-proposals/config/locales/el.yml
+++ b/decidim-proposals/config/locales/el.yml
@@ -39,10 +39,6 @@ el:
               allowed_file_content_types: 'Μη έγκυρος τύπος εγγράφου. Επιτρέπονται μόνο αρχεία με τις ακόλουθες επεκτάσεις: %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Πρέπει να επισυναφθεί ξανά
-            add_photos:
-              needs_to_be_reattached: Πρέπει να επισυναφθεί ξανά
             body:
               cant_be_equal_to_template: δεν μπορεί να είναι ίσο με το πρότυπο
               identical: ΚΑΙ ο τίτλος δεν μπορεί να είναι ίδιος
@@ -113,7 +109,6 @@ el:
             attachments_allowed: Να επιτρέπονται τα συνημμένα
             collaborative_drafts_enabled: Τα προσχέδια συνεργασίας ενεργοποιήθηκαν
             comments_enabled: Τα σχόλια ενεργοποιήθηκαν
-            comments_max_length: Μέγιστο μέγεθος σχολίων (Αφήστε το 0 για την προκαθορισμένη τιμή)
             default_sort_order: Προεπιλεγμένη ταξινόμηση προτάσεων
             default_sort_order_options:
               most_commented: Πιο σχολιασμένες
diff --git a/decidim-proposals/config/locales/es-MX.yml b/decidim-proposals/config/locales/es-MX.yml
index 67ab88669e981..8d370291de73d 100644
--- a/decidim-proposals/config/locales/es-MX.yml
+++ b/decidim-proposals/config/locales/es-MX.yml
@@ -63,10 +63,8 @@ es-MX:
               allowed_file_content_types: 'Tipo de documento no válido. Sólo se permiten archivos con las siguientes extensiones: %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Es necesario volver a adjuntar el fichero
-            add_photos:
-              needs_to_be_reattached: Es necesario volver a adjuntar el fichero
+            add_attachments:
+              needs_to_be_reattached: Es necesario volver a adjuntar el archivo
             body:
               cant_be_equal_to_template: no puede ser igual a la plantilla
               identical: Y el título no puede ser idéntico
@@ -179,7 +177,7 @@ es-MX:
             collaborative_drafts_enabled: Habilitar borradores colaborativos
             collaborative_drafts_enabled_help: La función "Borradores colaborativos" se eliminará próximamente. Si la utilizas a partir de la versión 0.32 de Decidim, podrás utilizar la funcionalidad de coautoría de propuestas.
             comments_enabled: Comentarios habilitados
-            comments_max_length: Longitud máxima de los comentarios (deja 0 si quieres mantener la configuración por defecto)
+            comments_max_length: Caracteres máximos por comentario (dejar 0 para el valor predeterminado)
             default_sort_order: Ordenación por defecto de propuestas
             default_sort_order_help: '''Automático'' significa que si los apoyos están habilitados, las propuestas se mostrarán en orden aleatorio, y si los apoyos están bloqueados, se ordenarán de más a menos apoyos.'
             default_sort_order_options:
@@ -859,6 +857,7 @@ es-MX:
         errors:
           device_not_supported: Su dispositivo no soporta servicios de ubicación. Por favor, introduzca la dirección postal completa manualmente (tipo de vía, nombre de la vía, número, código postal y ciudad).
           no_device_location: Lo sentimos, no hemos podido detectar tu ubicación. Por favor, introduce la dirección postal completa manualmente (tipo de vía, nombre de la vía, número, código postal y ciudad).
+        locating: Localizando...
         use_my_location: Usar mi ubicación actual
       invite_coauthors:
         cancel:
diff --git a/decidim-proposals/config/locales/es-PY.yml b/decidim-proposals/config/locales/es-PY.yml
index e93e3d3f890c0..10e29d3f30aae 100644
--- a/decidim-proposals/config/locales/es-PY.yml
+++ b/decidim-proposals/config/locales/es-PY.yml
@@ -63,10 +63,8 @@ es-PY:
               allowed_file_content_types: 'Tipo de documento no válido. Sólo se permiten archivos con las siguientes extensiones: %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Es necesario volver a adjuntar el fichero
-            add_photos:
-              needs_to_be_reattached: Es necesario volver a adjuntar el fichero
+            add_attachments:
+              needs_to_be_reattached: Es necesario volver a adjuntar el archivo
             body:
               cant_be_equal_to_template: no puede ser igual a la plantilla
               identical: Y el título no puede ser idéntico
@@ -179,7 +177,7 @@ es-PY:
             collaborative_drafts_enabled: Habilitar borradores colaborativos
             collaborative_drafts_enabled_help: La función "Borradores colaborativos" se eliminará próximamente. Si la utilizas a partir de la versión 0.32 de Decidim, podrás utilizar la funcionalidad de coautoría de propuestas.
             comments_enabled: Comentarios habilitados
-            comments_max_length: Longitud máxima de los comentarios (deja 0 si quieres mantener la configuración por defecto)
+            comments_max_length: Caracteres máximos por comentario (dejar 0 para el valor predeterminado)
             default_sort_order: Ordenación por defecto de propuestas
             default_sort_order_help: '''Automático'' significa que si los apoyos están habilitados, las propuestas se mostrarán en orden aleatorio, y si los apoyos están bloqueados, se ordenarán de más a menos apoyos.'
             default_sort_order_options:
@@ -859,6 +857,7 @@ es-PY:
         errors:
           device_not_supported: Su dispositivo no soporta servicios de ubicación. Por favor, introduzca la dirección postal completa manualmente (tipo de vía, nombre de la vía, número, código postal y ciudad).
           no_device_location: Lo sentimos, no hemos podido detectar tu ubicación. Por favor, introduce la dirección postal completa manualmente (tipo de vía, nombre de la vía, número, código postal y ciudad).
+        locating: Localizando...
         use_my_location: Usar mi ubicación actual
       invite_coauthors:
         cancel:
diff --git a/decidim-proposals/config/locales/es.yml b/decidim-proposals/config/locales/es.yml
index fbffc54c0963b..2223deca51d98 100644
--- a/decidim-proposals/config/locales/es.yml
+++ b/decidim-proposals/config/locales/es.yml
@@ -63,10 +63,8 @@ es:
               allowed_file_content_types: 'Tipo de documento no válido. Sólo se permiten archivos con las siguientes extensiones: %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Es necesario volver a adjuntar el fichero
-            add_photos:
-              needs_to_be_reattached: Es necesario volver a adjuntar el fichero
+            add_attachments:
+              needs_to_be_reattached: Es necesario volver a adjuntar el archivo
             body:
               cant_be_equal_to_template: no puede ser igual a la plantilla
               identical: Y el título no puede ser idéntico
@@ -179,7 +177,7 @@ es:
             collaborative_drafts_enabled: Borradores colaborativos habilitados
             collaborative_drafts_enabled_help: La función "Borradores colaborativos" se eliminará próximamente. Si la utilizas a partir de la versión 0.32 de Decidim, podrás utilizar la funcionalidad de coautoría de propuestas.
             comments_enabled: Comentarios habilitados
-            comments_max_length: Longitud máxima de los comentarios (deja 0 si quieres mantener la configuración por defecto)
+            comments_max_length: Caracteres máximos por comentario (dejar 0 para el valor predeterminado)
             default_sort_order: Ordenación por defecto de propuestas
             default_sort_order_help: '''Automático'' significa que si los apoyos están habilitados, las propuestas se mostrarán en orden aleatorio, y si los apoyos están bloqueados, se ordenarán de más a menos apoyos.'
             default_sort_order_options:
@@ -859,6 +857,7 @@ es:
         errors:
           device_not_supported: Su dispositivo no soporta servicios de ubicación. Por favor, introduzca la dirección postal completa manualmente (tipo de vía, nombre de la vía, número, código postal y ciudad).
           no_device_location: Lo sentimos, no hemos podido detectar tu ubicación. Por favor, introduce la dirección postal completa manualmente (tipo de vía, nombre de la vía, número, código postal y ciudad).
+        locating: Localizando...
         use_my_location: Usar mi ubicación actual
       invite_coauthors:
         cancel:
diff --git a/decidim-proposals/config/locales/eu.yml b/decidim-proposals/config/locales/eu.yml
index d3ac0892a2a72..ca2a765ec7fd7 100644
--- a/decidim-proposals/config/locales/eu.yml
+++ b/decidim-proposals/config/locales/eu.yml
@@ -19,7 +19,7 @@ eu:
         address: Helbidea
         answer: Erantzuna
         answered_at: '-k erantzuna'
-        body: Gorputza
+        body: Testua
         decidim_proposals_proposal_state_id: Egoera
         decidim_scope_id: Eremua
         has_address: Helbidea du
@@ -63,10 +63,8 @@ eu:
               allowed_file_content_types: 'Dokumentu mota hau ez da onartzen. Honako hauek onartzen dira: %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Fitxategia berriro erantsi behar da
-            add_photos:
-              needs_to_be_reattached: Fitxategia berriro erantsi behar da
+            add_attachments:
+              needs_to_be_reattached: Berriro erantsi behar da
             body:
               cant_be_equal_to_template: ezin da plantilla bezalakoa izan
               identical: ETA izenburua ezin da berdina izan
@@ -179,7 +177,7 @@ eu:
             collaborative_drafts_enabled: Zirriborro kolaboratiboak gaituta
             collaborative_drafts_enabled_help: Elkarlaneko zirriborroak Decidim v0.32an ezabatuko dira. Erabiltzen duten erakundeek proposamen berriaren egilekidetzara pasa daitezke.
             comments_enabled: Iruzkinak gaituta
-            comments_max_length: Iruzkinen gehieneko luzera (utzi 0 lehenetsitako ezarpenei eusteko)
+            comments_max_length: Iruzkin bakoitzeko gehieneko karaktereak (utzi 0 aurrez zehaztutako baliorako)
             default_sort_order: Proposamenen hurrenkera lehenetsia
             default_sort_order_help: Automatikoak esan nahi du, babesak gaituta badaude, proposamenak ausaz ordenatuta agertuko direla, eta babesak blokeatuta badaude, bozkatuenaren arabera ordenatuko direla.
             default_sort_order_options:
@@ -391,7 +389,7 @@ eu:
           conditions:
           - Aukeratu zure intereseko partaidetza-espazioa proposamenak bidaltzeko
           - Egin daitezkeen proposamenak egiten saiatu. Horrela onartuak izateko aukera gehiago dute.
-          description: Garaikur hau proposamen berriekin aktiboki parte hartzen duzunean eta horiek onartzen direnean ematen da 
+          description: Garaikur hau proposamen berriekin aktiboki parte hartzen duzunean eta horiek onartzen direnean ematen da
           description_another: Parte-hartzaile honek %{score} proposamen onartu ditu.
           description_own: Zure %{score} proposamen onartu dira.
           name: Proposamen onartuak
@@ -663,7 +661,7 @@ eu:
           show:
             amendments_count: Zuzenketa kopurua
             assigned_evaluators: Ebaluatzaileak esleituta
-            body: Gorputza
+            body: Testua
             comments_count: Iruzkin kopurua
             documents: Dokumentuak
             evaluators: Ebaluatzaileak
@@ -742,7 +740,7 @@ eu:
       collaborative_drafts:
         collaborative_draft:
           publish:
-            error: Arazoak izan dira zirriborro kolaboratiboa argitaratzean.
+            error: Arazo bat egon da testu kolaboratiboa gordetzen.
             irreversible_action_modal:
               body: Zirriborroa proposamen gisa argitaratu ondoren, jada ez da editagarria izango. Proposamenak ez du beste egile edo ekarpenik onartuko.
               cancel: Utzi
@@ -779,11 +777,11 @@ eu:
         filters_small_view:
           close_modal: Itxi leihoa
           filter: Iragazi
-          filter_by: 'Honen arabera iragazi:'
+          filter_by: Iragazi honen arabera
           unfold: Zabaldu
         index:
           count:
-            one: "Zirriborro kolaboratibo %{count}"
+            one: "%{count} zirriborro kolaboratibo"
             other: "%{count} zirriborro kolaboratibo"
         name: Zirriborro kolaboratzaileak
         new:
@@ -793,7 +791,7 @@ eu:
         new_collaborative_draft_button:
           new_collaborative_draft: Testu kolaboratibo zirriborro berria
         orders:
-          label: 'Zirriborroak honela ordenatu:'
+          label: 'Ordenatu zirriborroak honen arabera:'
           most_contributed: Bozka gehien jaso duena
           random: Ausazko ordena
           recent: Azkenak
@@ -859,6 +857,7 @@ eu:
         errors:
           device_not_supported: Zure gailuak ez ditu kokapen-zerbitzuak onartzen. Mesedez, sartu helbidea eskuz.
           no_device_location: Barkatu, ezin izan dugu zure kokapena antzeman. Mesedez, sartu helbidea eskuz.
+        locating: Lokalizatzen...
         use_my_location: Erabili nire egungo kokapena
       invite_coauthors:
         cancel:
diff --git a/decidim-proposals/config/locales/fi-plain.yml b/decidim-proposals/config/locales/fi-plain.yml
index 877cf7aedf0b4..0bc9124926511 100644
--- a/decidim-proposals/config/locales/fi-plain.yml
+++ b/decidim-proposals/config/locales/fi-plain.yml
@@ -63,10 +63,6 @@ fi-pl:
               allowed_file_content_types: 'Virheellinen tiedostomuoto. Ainoastaan seuraavat tiedostomuodot on sallittu: %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Liitettävä uudelleen
-            add_photos:
-              needs_to_be_reattached: Liitettävä uudelleen
             body:
               cant_be_equal_to_template: ei voi vastata mallipohjaa
               identical: JA otsikko ei voi olla täysin sama
diff --git a/decidim-proposals/config/locales/fi.yml b/decidim-proposals/config/locales/fi.yml
index 8f45764cbb4a4..79f01b92b12fa 100644
--- a/decidim-proposals/config/locales/fi.yml
+++ b/decidim-proposals/config/locales/fi.yml
@@ -63,10 +63,8 @@ fi:
               allowed_file_content_types: 'Virheellinen tiedostomuoto. Ainoastaan seuraavat tiedostomuodot on sallittu: %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Liitettävä uudelleen
-            add_photos:
-              needs_to_be_reattached: Liitettävä uudelleen
+            add_attachments:
+              needs_to_be_reattached: Liitettävä uudestaan
             body:
               cant_be_equal_to_template: ei voi vastata mallipohjaa
               identical: JA otsikko ei voi olla täysin sama
@@ -859,6 +857,7 @@ fi:
         errors:
           device_not_supported: Laitteesi ei tue sijaintipalveluita. Syötä osoite manuaalisesti.
           no_device_location: Valitettavasti sijaintijasi ei voitu tunnistaa automaattisesti. Syötä osoite manuaalisesti.
+        locating: Paikannetaan...
         use_my_location: Käytä nykyistä sijaintiani
       invite_coauthors:
         cancel:
diff --git a/decidim-proposals/config/locales/fr-CA.yml b/decidim-proposals/config/locales/fr-CA.yml
index f576cc397d1a5..01c52442befca 100644
--- a/decidim-proposals/config/locales/fr-CA.yml
+++ b/decidim-proposals/config/locales/fr-CA.yml
@@ -63,10 +63,8 @@ fr-CA:
               allowed_file_content_types: 'Type de document invalide. Seuls les fichiers avec les extensions suivantes sont autorisés : %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Doit être téléchargé de nouveau
-            add_photos:
-              needs_to_be_reattached: Doit être téléchargé de nouveau
+            add_attachments:
+              needs_to_be_reattached: Doit être ré-attachée
             body:
               cant_be_equal_to_template: ne peut pas être égal au modèle
               identical: ET le titre ne peut pas être identique
@@ -176,7 +174,7 @@ fr-CA:
             collaborative_drafts_enabled: Brouillons collaboratifs activés
             collaborative_drafts_enabled_help: La fonctionnalité « Brouillons collaboratifs » sera supprimée dans Decidim v0.32. Les organisations qui l’utilisent peuvent passer à la nouvelle fonctionnalité de co-auteur de proposition.
             comments_enabled: Activer le module de commentaire
-            comments_max_length: Longueur maximum (en caractères) des commentaires (laisser 0 pour la valeur par défaut)
+            comments_max_length: Nombre maximum de caractères par commentaire (Laisser 0 pour la valeur par défaut)
             default_sort_order: Tri des propositions par défaut
             default_sort_order_help: Automatique signifie que si les votes sont activés, les propositions seront affichées par ordre aléatoire, et si les votes sont bloqués, elles seront triées par ordre décroissant des votes.
             default_sort_order_options:
@@ -772,6 +770,7 @@ fr-CA:
         errors:
           device_not_supported: Votre appareil ne prend pas en charge les services de localisation. Veuillez entrer l'adresse manuellement.
           no_device_location: Désolé, nous n'avons pas pu détecter votre position. Veuillez entrer l'adresse manuellement.
+        locating: Localisation en cours...
         use_my_location: Utiliser ma position actuelle
       invite_coauthors:
         cancel:
diff --git a/decidim-proposals/config/locales/fr.yml b/decidim-proposals/config/locales/fr.yml
index dfbfec91b7800..b48e152ef7e18 100644
--- a/decidim-proposals/config/locales/fr.yml
+++ b/decidim-proposals/config/locales/fr.yml
@@ -63,10 +63,8 @@ fr:
               allowed_file_content_types: 'Type de document invalide. Seuls les fichiers avec les extensions suivantes sont autorisés : %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Doit être téléchargé de nouveau
-            add_photos:
-              needs_to_be_reattached: Doit être téléchargé de nouveau
+            add_attachments:
+              needs_to_be_reattached: Doit être ré-attachée
             body:
               cant_be_equal_to_template: ne peut pas être égal au modèle
               identical: ET le titre ne peut pas être identique
@@ -176,7 +174,7 @@ fr:
             collaborative_drafts_enabled: Brouillons collaboratifs activés
             collaborative_drafts_enabled_help: La fonctionnalité « Brouillons collaboratifs » sera supprimée dans Decidim v0.32. Les organisations qui l’utilisent peuvent passer à la nouvelle fonctionnalité de co-auteur de proposition.
             comments_enabled: Activer le module de commentaire
-            comments_max_length: Longueur maximum (en caractères) des commentaires (laisser 0 pour la valeur par défaut)
+            comments_max_length: Nombre maximum de caractères par commentaire (Laisser 0 pour la valeur par défaut)
             default_sort_order: Tri des propositions par défaut
             default_sort_order_help: Automatique signifie que si les votes sont activés, les propositions seront affichées par ordre aléatoire, et si les votes sont bloqués, elles seront triées par ordre décroissant des votes.
             default_sort_order_options:
@@ -772,6 +770,7 @@ fr:
         errors:
           device_not_supported: Votre appareil ne prend pas en charge les services de localisation. Veuillez entrer l'adresse manuellement.
           no_device_location: Désolé, nous n'avons pas pu détecter votre position. Veuillez entrer l'adresse manuellement.
+        locating: Localisation en cours...
         use_my_location: Utiliser ma position actuelle
       invite_coauthors:
         cancel:
diff --git a/decidim-proposals/config/locales/gl.yml b/decidim-proposals/config/locales/gl.yml
index 5668149ef1f19..fdfa9e1b71c1a 100644
--- a/decidim-proposals/config/locales/gl.yml
+++ b/decidim-proposals/config/locales/gl.yml
@@ -34,10 +34,6 @@ gl:
       models:
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: É preciso anexar de novo o ficheiro
-            add_photos:
-              needs_to_be_reattached: É preciso anexar de novo o ficheiro
             body:
               cant_be_equal_to_template: non pode ser igual ao modelo
               identical: E o título non pode ser idéntico
diff --git a/decidim-proposals/config/locales/hu.yml b/decidim-proposals/config/locales/hu.yml
index 3c47f19ae3001..1a84ad4629811 100644
--- a/decidim-proposals/config/locales/hu.yml
+++ b/decidim-proposals/config/locales/hu.yml
@@ -31,10 +31,6 @@ hu:
       models:
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Újra kell csatolni
-            add_photos:
-              needs_to_be_reattached: Újra kell csatolni
             body:
               cant_be_equal_to_template: nem lehet egyenlő a sablonnal
               identical: A cím nem lehet azonos
diff --git a/decidim-proposals/config/locales/id-ID.yml b/decidim-proposals/config/locales/id-ID.yml
index 8d4db995455e4..88c426382adc6 100644
--- a/decidim-proposals/config/locales/id-ID.yml
+++ b/decidim-proposals/config/locales/id-ID.yml
@@ -28,10 +28,6 @@ id:
       models:
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Perlu disambungkan kembali
-            add_photos:
-              needs_to_be_reattached: Perlu disambungkan kembali
             body:
               identical: DAN judul tidak bisa sama
             title:
diff --git a/decidim-proposals/config/locales/it.yml b/decidim-proposals/config/locales/it.yml
index 3f27b9db225dc..db47d47a4c76e 100644
--- a/decidim-proposals/config/locales/it.yml
+++ b/decidim-proposals/config/locales/it.yml
@@ -34,10 +34,6 @@ it:
       models:
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Necessita di essere riallegato
-            add_photos:
-              needs_to_be_reattached: Necessita di essere riallegato
             body:
               cant_be_equal_to_template: non può essere uguale al modello
               identical: Il titolo AND non può essere identico
@@ -102,7 +98,6 @@ it:
             attachments_allowed: Consenti allegati
             collaborative_drafts_enabled: Bozze collaborative abilitate
             comments_enabled: Commenti abilitati
-            comments_max_length: Lunghezza massima dei commenti (Lasciare 0 per il valore predefinito)
             default_sort_order_options:
               random: Casuale
               recent: Recenti
diff --git a/decidim-proposals/config/locales/ja.yml b/decidim-proposals/config/locales/ja.yml
index 5f573510a46d3..052153eea7fa5 100644
--- a/decidim-proposals/config/locales/ja.yml
+++ b/decidim-proposals/config/locales/ja.yml
@@ -63,10 +63,6 @@ ja:
               allowed_file_content_types: '無効なドキュメントタイプです。次の拡張子を持つファイルのみ許可されています: %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: 再接続が必要
-            add_photos:
-              needs_to_be_reattached: 再接続が必要
             body:
               cant_be_equal_to_template: はテンプレートと等しくすることはできません
               identical: ANDタイトルは同一にすることはできません
@@ -175,7 +171,7 @@ ja:
             collaborative_drafts_enabled: 共同草稿を有効にする
             collaborative_drafts_enabled_help: 共同草案機能は Decidim v0.32 で廃止されます。この機能を現在使用している組織は、新しい提案共同作成機能に移行することができます。
             comments_enabled: コメントを有効にする
-            comments_max_length: コメント最大長 (デフォルト値は 0 のまま)
+            comments_max_length: 各コメントの最大文字数 (0はデフォルト値のまま)
             default_sort_order: デフォルトの提案の並べ替え
             default_sort_order_help: '「自動」にすると、投票が有効になっている間、提案はランダムにソートされます。 投票がブロックされると、最も投票数が多い順に並べられます'
             default_sort_order_options:
diff --git a/decidim-proposals/config/locales/lt.yml b/decidim-proposals/config/locales/lt.yml
index 709e6a1e1ef2e..288ec0abffbab 100644
--- a/decidim-proposals/config/locales/lt.yml
+++ b/decidim-proposals/config/locales/lt.yml
@@ -39,10 +39,6 @@ lt:
               allowed_file_content_types: 'Nevalidus turinio tipas. Leidžiamos rinkmenos tik su šiomis galūnėmis: %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Reikia pridėti iš naujo
-            add_photos:
-              needs_to_be_reattached: Reikia pridėti iš naujo
             body:
               cant_be_equal_to_template: negali prilygti šablonui
               identical: IR pavadinimas negali sutapti
@@ -119,7 +115,6 @@ lt:
             attachments_allowed: Leisti failų prisegimus
             collaborative_drafts_enabled: Bendri projektai įjungti
             comments_enabled: Komentarai įjungti
-            comments_max_length: Maksimalus komentarų ilgis (Palikite 0 kaip numatytą vertę)
             default_sort_order: Numatytas pasiūlymų rikiavimas
             default_sort_order_options:
               most_commented: Labiausiai komentuojamas
diff --git a/decidim-proposals/config/locales/lv.yml b/decidim-proposals/config/locales/lv.yml
index 0fba7ecfa8d54..21ad011410db7 100644
--- a/decidim-proposals/config/locales/lv.yml
+++ b/decidim-proposals/config/locales/lv.yml
@@ -29,10 +29,6 @@ lv:
       models:
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Jāpievieno no jauna
-            add_photos:
-              needs_to_be_reattached: Jāpievieno no jauna
             body:
               cant_be_equal_to_template: nevar būt vienāds ar veidni
               identical: UN nosaukums nevar būt identisks
diff --git a/decidim-proposals/config/locales/nl.yml b/decidim-proposals/config/locales/nl.yml
index 88e8c0fde4fe7..dffa4e8745002 100644
--- a/decidim-proposals/config/locales/nl.yml
+++ b/decidim-proposals/config/locales/nl.yml
@@ -34,10 +34,6 @@ nl:
       models:
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Moet opnieuw worden gekoppeld
-            add_photos:
-              needs_to_be_reattached: Moet opnieuw worden gekoppeld
             body:
               cant_be_equal_to_template: mag niet gelijk zijn aan het template
               identical: EN titel kan niet identiek zijn
@@ -86,7 +82,6 @@ nl:
             attachments_allowed: Bijlagen toestaan
             collaborative_drafts_enabled: Samenwerkingsconcepten ingeschakeld
             comments_enabled: Reacties ingeschakeld
-            comments_max_length: Commentaar maximale lengte (laat 0 voor standaard waarde)
             default_sort_order: Standaardsortering
             default_sort_order_options:
               most_commented: Meeste reacties
diff --git a/decidim-proposals/config/locales/no.yml b/decidim-proposals/config/locales/no.yml
index 5c9e6247fc11c..a5372c24213c5 100644
--- a/decidim-proposals/config/locales/no.yml
+++ b/decidim-proposals/config/locales/no.yml
@@ -34,10 +34,6 @@
       models:
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Må festes på nytt
-            add_photos:
-              needs_to_be_reattached: Må festes på nytt
             body:
               cant_be_equal_to_template: kan ikke være lik malen
               identical: OG tittelen kan ikke være identisk
@@ -102,7 +98,6 @@
             attachments_allowed: Tillat vedlegg
             collaborative_drafts_enabled: Samarbeids utkaster aktivert
             comments_enabled: Kommentarer aktivert
-            comments_max_length: Maks lengde på kommentarer (Sett 0 for standardverdi)
             default_sort_order: Standard sortering av forslag
             default_sort_order_options:
               most_commented: Mest kommenterte
diff --git a/decidim-proposals/config/locales/pl.yml b/decidim-proposals/config/locales/pl.yml
index 1490f44a3d9cc..af7bc6fefe9f1 100644
--- a/decidim-proposals/config/locales/pl.yml
+++ b/decidim-proposals/config/locales/pl.yml
@@ -52,10 +52,6 @@ pl:
               allowed_file_content_types: 'Nieprawidłowy typ dokumentu. Dozwolone są tylko pliki z następującymi rozszerzeniami: %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Musi zostać ponownie załączony
-            add_photos:
-              needs_to_be_reattached: Musi zostać ponownie załączony
             body:
               cant_be_equal_to_template: nie może być taki sam jak szablon
               identical: I tytuł nie może być identyczny
@@ -137,7 +133,6 @@ pl:
             can_accumulate_votes_beyond_threshold: Może gromadzić głosy powyżej progu
             collaborative_drafts_enabled: Zezwalaj na wspólne szkice
             comments_enabled: Komentarze włączone
-            comments_max_length: Maksymalna długość komentarzy (Pozostaw 0 dla wartości domyślnej)
             default_sort_order: Domyślne sortowanie propozycji
             default_sort_order_help: Automatycznie oznacza, że jeśli głosy są włączone, propozycje będą wyświetlane w losowej kolejności i jeśli głosy zostaną zablokowane, zostaną posortowane według tych z największą ilością głosów.
             default_sort_order_options:
diff --git a/decidim-proposals/config/locales/pt-BR.yml b/decidim-proposals/config/locales/pt-BR.yml
index 4fdaf5036edf0..c618970f874d4 100644
--- a/decidim-proposals/config/locales/pt-BR.yml
+++ b/decidim-proposals/config/locales/pt-BR.yml
@@ -62,10 +62,6 @@ pt-BR:
               allowed_file_content_types: 'Tipo de documento inválido. Apenas arquivos com as seguintes extensões são permitidos: %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Precisa ser recolocado
-            add_photos:
-              needs_to_be_reattached: Precisa ser recolocado
             body:
               cant_be_equal_to_template: não pode ser igual ao modelo
               identical: E o título não pode ser idêntico
@@ -178,7 +174,6 @@ pt-BR:
             collaborative_drafts_enabled: Rascunhos colaborativos ativados
             collaborative_drafts_enabled_help: O recurso de Rascunhos colaborativos será removido no Decidim v0.32. As organizações que o usam, podem alternar para o novo recurso de co-autoria de proposta.
             comments_enabled: Comentários ativados
-            comments_max_length: Tamanho máximo de comentários (deixe 0 para o valor padrão)
             default_sort_order: Classificação de proposta padrão
             default_sort_order_help: Automático significa que, se os votos estiverem habilitados, as propostas serão mostradas por ordem aleatória, e se as votações estiverem bloqueadas, serão ordenadas pela maioria das votações.
             default_sort_order_options:
diff --git a/decidim-proposals/config/locales/pt.yml b/decidim-proposals/config/locales/pt.yml
index a696a78311e64..ef6475630e751 100644
--- a/decidim-proposals/config/locales/pt.yml
+++ b/decidim-proposals/config/locales/pt.yml
@@ -34,10 +34,6 @@ pt:
       models:
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Necessita de ser recolocado
-            add_photos:
-              needs_to_be_reattached: Necessita de ser recolocado
             body:
               cant_be_equal_to_template: não pode ser igual ao modelo
               identical: E o título não pode ser idêntico
@@ -102,7 +98,6 @@ pt:
             attachments_allowed: Permitir anexos
             collaborative_drafts_enabled: Rascunhos colaborativos ativados
             comments_enabled: Comentários ativados
-            comments_max_length: Comprimento máximo dos comentários (Deixar 0 para o valor predefinido)
             default_sort_order: Ordenamento por defeitos das propostas
             default_sort_order_options:
               most_commented: Mais comentada
diff --git a/decidim-proposals/config/locales/ro-RO.yml b/decidim-proposals/config/locales/ro-RO.yml
index 47a7f6bd90c6c..24f2f3d18141e 100644
--- a/decidim-proposals/config/locales/ro-RO.yml
+++ b/decidim-proposals/config/locales/ro-RO.yml
@@ -38,10 +38,6 @@ ro:
       models:
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Trebuie să fie reatașate
-            add_photos:
-              needs_to_be_reattached: Trebuie să fie reatașate
             body:
               cant_be_equal_to_template: nu poate fi egal cu modelul
               identical: Nici titlul nu poate fi identic
@@ -116,7 +112,6 @@ ro:
             attachments_allowed: Permite atașamente
             collaborative_drafts_enabled: Ciornele colaborative au fost activate
             comments_enabled: Comentariile au fost activate
-            comments_max_length: Număr maxim de caractere a comentariilor (păstrează 0 pentru valoarea implicită)
             default_sort_order: Mod implicit de sortare a propunerilor
             default_sort_order_options:
               most_commented: Cele mai comentate
diff --git a/decidim-proposals/config/locales/ru.yml b/decidim-proposals/config/locales/ru.yml
index b31f9e20f9f08..7c79e214f37d5 100644
--- a/decidim-proposals/config/locales/ru.yml
+++ b/decidim-proposals/config/locales/ru.yml
@@ -14,14 +14,6 @@ ru:
         answer: Ответить
       proposals_copy:
         origin_component_id: Составляющая, откуда нужно скопировать предложения
-    errors:
-      models:
-        proposal:
-          attributes:
-            add_documents:
-              needs_to_be_reattached: Необходимо заново прикрепить
-            add_photos:
-              needs_to_be_reattached: Необходимо заново прикрепить
     models:
       decidim/proposals/creation_enabled_event: Включена возможность создания предложений
       decidim/proposals/proposal_mentioned_event: Предложение упомянуто
diff --git a/decidim-proposals/config/locales/sk.yml b/decidim-proposals/config/locales/sk.yml
index 5168d3b91ede5..19f73e4078180 100644
--- a/decidim-proposals/config/locales/sk.yml
+++ b/decidim-proposals/config/locales/sk.yml
@@ -63,10 +63,6 @@ sk:
               allowed_file_content_types: 'Neplatný typ dokumentu. Povolené sú iba súbory s nasledujúcimi príponami: %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Je potrebné priložiť znovu
-            add_photos:
-              needs_to_be_reattached: Je potrebné priložiť znovu
             body:
               cant_be_equal_to_template: nemôže byť rovnaké, ako šablóna
               identical: A názov nemôže byť totožný
@@ -187,7 +183,6 @@ sk:
             collaborative_drafts_enabled: Spoločné návrhy sú povolené
             collaborative_drafts_enabled_help: Funkcia kolaboratívnych konceptov bude odstránená vo verzii Decidim v0.32. Organizácie, ktoré ju používajú, môžu prejsť na novú funkciu spoluautorstva návrhov.
             comments_enabled: Komentáre povolené
-            comments_max_length: Maximálna dĺžka komentárov (Pre predvolenú hodnotu ponechajte 0)
             default_sort_order: Predvolené zoradenie návrhov
             default_sort_order_help: Automaticky znamená, že ak sú hlasy povolené, návrhy sa zobrazia náhodne zoradené, a ak sú hlasy zablokované, zoradia sa podľa najvyššieho počtu hlasov.
             default_sort_order_options:
@@ -318,7 +313,7 @@ sk:
           email_intro: '%{requester_name} bol/a odmietnutý/á ako prispievateľ do spoločného konceptu <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Toto upozornenie ste dostali, pretože ste spolupracovníkom <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} mal odmietnutý pre prístup ako prispievateľ ku %{resource_title} kolektívnemu návrhu."
-          notification_title: <a href="%{requester_path}">%{requester_name}%{requester_nickname} </a><strong> mal odmietnutý prístup ako prispievateľ </strong>ku spoločnému návrhu <a href = "%{resource_path}" >%{resource_title} </a>. 
+          notification_title: <a href="%{requester_path}">%{requester_name}%{requester_nickname} </a><strong> mal odmietnutý prístup ako prispievateľ </strong>ku spoločnému návrhu <a href = "%{resource_path}" >%{resource_title} </a>.
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} požiadal/a o prístup ako prispievateľ. Žiadosť môžete <strong>prijať alebo odmietnuť</strong> na stránke spoločného konceptu <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Toto upozornenie ste dostali, pretože ste spolupracovníkom <a href="%{resource_url}">%{resource_title}</a>.
diff --git a/decidim-proposals/config/locales/sv.yml b/decidim-proposals/config/locales/sv.yml
index 16164224a8cc5..2f78b0d28b810 100644
--- a/decidim-proposals/config/locales/sv.yml
+++ b/decidim-proposals/config/locales/sv.yml
@@ -63,10 +63,6 @@ sv:
               allowed_file_content_types: 'Ogiltig dokumenttyp. Endast filer med följande tillägg är tillåtna: %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Måste bifogas igen
-            add_photos:
-              needs_to_be_reattached: Måste bifogas igen
             body:
               cant_be_equal_to_template: kan inte vara detsamma som mallen
               identical: OCH titeln kan inte vara identisk
@@ -179,7 +175,6 @@ sv:
             collaborative_drafts_enabled: Aktivera gemensamma utkast
             collaborative_drafts_enabled_help: Funktionen gemensamma utkast kommer att tas bort i Decidim v0.32. Organisationer som använder det kan växla till den nya funktionen för medförfattare.
             comments_enabled: Aktivera kommentarer
-            comments_max_length: Maximal kommentarslängd (ange 0 för att använda standardvärdet)
             default_sort_order: Förvald sortering
             default_sort_order_help: Automatiskt betyder att om röstning är aktiverat kommer förslagen sorteras slumpmässigt, och om röstning är avstängt kommer de att sorteras efter mest valda.
             default_sort_order_options:
@@ -859,6 +854,7 @@ sv:
         errors:
           device_not_supported: Din enhet stöder inte platstjänster. Ange adressen manuellt.
           no_device_location: Tyvärr, vi kunde inte upptäcka din plats. Ange adressen manuellt.
+        locating: Lokaliserar...
         use_my_location: Använd min nuvarande plats
       invite_coauthors:
         cancel:
diff --git a/decidim-proposals/config/locales/tr-TR.yml b/decidim-proposals/config/locales/tr-TR.yml
index d3fa4a9333229..9289126c7ba44 100644
--- a/decidim-proposals/config/locales/tr-TR.yml
+++ b/decidim-proposals/config/locales/tr-TR.yml
@@ -26,7 +26,7 @@ tr:
         cost_report: Maliyet raporu
         execution_period: Yürütme süresi
       proposal_state:
-        announcement_title: Yanıt Başlığı 
+        announcement_title: Yanıt Başlığı
         bg_color: Arka plan rengi
         colors:
           blue: Mavi
@@ -47,10 +47,6 @@ tr:
       models:
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Yeniden eklenmesi gerekiyor
-            add_photos:
-              needs_to_be_reattached: Yeniden eklenmesi gerekiyor
             body:
               cant_be_equal_to_template: şablona eşit olamaz
               identical: VE başlık aynı olamaz
@@ -108,7 +104,6 @@ tr:
             attachments_allowed: Eklere izin ver
             collaborative_drafts_enabled: Ortak çalışma taslakları etkin
             comments_enabled: Yorumlar etkin
-            comments_max_length: Maksimum yorum uzunluğu (Varsayılan değer için 0 bırakın)
             new_proposal_body_template: Yeni teklif gövdesi şablonu
             new_proposal_body_template_help: Yeni Tekliflerin sahip olacağı önceden doldurulmuş metni tanımlayabilirsiniz
             new_proposal_help_text: Yeni teklif yardım metni
@@ -476,7 +471,7 @@ tr:
             title: Başlık
             votes: Oylar
         proposal_state:
-          css_class: CSS Sınıfı 
+          css_class: CSS Sınıfı
           title: Durum
       participatory_text_proposal:
         alternative_title: Şu anda katılımcı metin yok
diff --git a/decidim-proposals/config/locales/uk.yml b/decidim-proposals/config/locales/uk.yml
index ce746e9d0411f..cedc6eefae9f5 100644
--- a/decidim-proposals/config/locales/uk.yml
+++ b/decidim-proposals/config/locales/uk.yml
@@ -14,14 +14,6 @@ uk:
         answer: Відповісти
       proposals_copy:
         origin_component_id: Складова, звідки потрібно скопіювати пропозиції
-    errors:
-      models:
-        proposal:
-          attributes:
-            add_documents:
-              needs_to_be_reattached: Необхідно повторно вкласти
-            add_photos:
-              needs_to_be_reattached: Необхідно повторно вкласти
     models:
       decidim/proposals/creation_enabled_event: Внесення пропозицій увімкнено
       decidim/proposals/proposal_mentioned_event: Пропозицію було згадано
diff --git a/decidim-proposals/config/locales/zh-CN.yml b/decidim-proposals/config/locales/zh-CN.yml
index 87671524f1449..964049e490186 100644
--- a/decidim-proposals/config/locales/zh-CN.yml
+++ b/decidim-proposals/config/locales/zh-CN.yml
@@ -31,10 +31,6 @@ zh-CN:
       models:
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: 需要重新连接
-            add_photos:
-              needs_to_be_reattached: 需要重新连接
             body:
               cant_be_equal_to_template: 不能等于模板
               identical: 和标题不能相同
@@ -86,7 +82,6 @@ zh-CN:
             attachments_allowed: 允许附件
             collaborative_drafts_enabled: 协作草稿已启用
             comments_enabled: 评论已启用
-            comments_max_length: 评论最大长度 (默认值留0)
             new_proposal_body_template: 新的提案正文模板
             new_proposal_body_template_help: 您可以定义新建议将包含的预填文本
             new_proposal_help_text: 新建议帮助文本
diff --git a/decidim-proposals/config/locales/zh-TW.yml b/decidim-proposals/config/locales/zh-TW.yml
index b816fa90c11a2..30b13af2dd0c4 100644
--- a/decidim-proposals/config/locales/zh-TW.yml
+++ b/decidim-proposals/config/locales/zh-TW.yml
@@ -39,10 +39,6 @@ zh-TW:
               allowed_file_content_types: '無效文件類型。只允許使用以下副檔名的文件：%{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: 需要重新附加
-            add_photos:
-              needs_to_be_reattached: 需要重新附加
             body:
               cant_be_equal_to_template: 不能與模板相同
               identical: 並且標題不能相同
@@ -104,7 +100,6 @@ zh-TW:
             attachments_allowed: 允許附檔
             collaborative_drafts_enabled: ' 啟用協作草稿'
             comments_enabled: 已啟用留言
-            comments_max_length: 評論字數最大長度(若要使用預設值請輸入0)
             default_sort_order: 預設提案排序
             default_sort_order_options:
               most_commented: 最多評論
diff --git a/decidim-sortitions/config/locales/eu.yml b/decidim-sortitions/config/locales/eu.yml
index 84de4e8833d10..824eb129e83a8 100644
--- a/decidim-sortitions/config/locales/eu.yml
+++ b/decidim-sortitions/config/locales/eu.yml
@@ -36,21 +36,21 @@ eu:
         sortition_created:
           email_intro: '"%{resource_title}" zozketa jarraitzen ari zaren "%{participatory_space_title}" espazioan gehitu da.'
           email_outro: Jakinarazpen hau jaso duzu "%{participatory_space_title}" jarraitzen ari zarelako. Aurreko estekan sartu jarraitzeari uzteko.
-          email_subject: Zozketa berria gehitu da %{participatory_space_title} espaziora
+          email_subject: Beste zozketa bat gehitu da %{participatory_space_title} espaziora
           notification_title: <a href="%{resource_path}">%{resource_title}</a> zozketa %{participatory_space_title} espaziora gehitu da
     sortitions:
       admin:
         actions:
           destroy: Zozketa bertan behera utzi
           edit: Editatu
-          new_sortition: Zozketa berria
+          new_sortition: Beste zozketa bat
           show: Zozketaren xehetasunak
           title: Ekintzak
         deprecation_warning_html: "⚠️ <b>Deprezazioaren Oharra.</b> Zozketen modulua ezabatuko da Decidim v0.32an. Mesedez, planifikatu eta pentsatu irtenbide alternatiboak parte-hartzailearentzat edo proposamenak hautatzeko."
         models:
           sortition:
             fields:
-              created_at: Sortze data
+              created_at: Sortze-data
               decidim_proposals_component: Proposamenen osagaia
               dice: Dadoa
               reference: Erreferentzia
@@ -136,7 +136,7 @@ eu:
             one: aukeratutako proposamena
             other: aukeratutako proposamenak
         sortition_author:
-          deleted: Ezabatutako parte-hartailea
+          deleted: Parte-hartzailea ezabatua
         sortition_cancel_author:
           deleted: Ezabatutako parte-hartzailea
         sortitions_count:
diff --git a/decidim-surveys/config/locales/ca-IT.yml b/decidim-surveys/config/locales/ca-IT.yml
index 06d519a068cb7..f94d23c09119e 100644
--- a/decidim-surveys/config/locales/ca-IT.yml
+++ b/decidim-surveys/config/locales/ca-IT.yml
@@ -1,6 +1,9 @@
 ---
 ca-IT:
   activemodel:
+    attributes:
+      response:
+        add_attachments: Afegir fitxer(s) adjunt(s)
     models:
       decidim/surveys/closed_survey_event: Ha acabat l'enquesta
       decidim/surveys/opened_survey_event: Ha començat l'enquesta
diff --git a/decidim-surveys/config/locales/ca.yml b/decidim-surveys/config/locales/ca.yml
index fd4e870b32ba6..908b8c900357e 100644
--- a/decidim-surveys/config/locales/ca.yml
+++ b/decidim-surveys/config/locales/ca.yml
@@ -1,6 +1,9 @@
 ---
 ca:
   activemodel:
+    attributes:
+      response:
+        add_attachments: Afegir fitxer(s) adjunt(s)
     models:
       decidim/surveys/closed_survey_event: Ha acabat l'enquesta
       decidim/surveys/opened_survey_event: Ha començat l'enquesta
diff --git a/decidim-surveys/config/locales/es-MX.yml b/decidim-surveys/config/locales/es-MX.yml
index 67fd9efc28134..6efe29e7b0630 100644
--- a/decidim-surveys/config/locales/es-MX.yml
+++ b/decidim-surveys/config/locales/es-MX.yml
@@ -1,6 +1,9 @@
 ---
 es-MX:
   activemodel:
+    attributes:
+      response:
+        add_attachments: Agregar archivo(s) adjunto(s)
     models:
       decidim/surveys/closed_survey_event: Encuesta terminada
       decidim/surveys/opened_survey_event: La encuesta ha empezado
diff --git a/decidim-surveys/config/locales/es-PY.yml b/decidim-surveys/config/locales/es-PY.yml
index 9a4163c78c367..9bdd55fdc7b61 100644
--- a/decidim-surveys/config/locales/es-PY.yml
+++ b/decidim-surveys/config/locales/es-PY.yml
@@ -1,6 +1,9 @@
 ---
 es-PY:
   activemodel:
+    attributes:
+      response:
+        add_attachments: Agregar archivo(s) adjunto(s)
     models:
       decidim/surveys/closed_survey_event: Encuesta terminada
       decidim/surveys/opened_survey_event: La encuesta ha empezado
diff --git a/decidim-surveys/config/locales/es.yml b/decidim-surveys/config/locales/es.yml
index 6389047242ea5..f755363fd7735 100644
--- a/decidim-surveys/config/locales/es.yml
+++ b/decidim-surveys/config/locales/es.yml
@@ -1,6 +1,9 @@
 ---
 es:
   activemodel:
+    attributes:
+      response:
+        add_attachments: Agregar archivo(s) adjunto(s)
     models:
       decidim/surveys/closed_survey_event: La encuesta ha acabado
       decidim/surveys/opened_survey_event: La encuesta ha empezado
diff --git a/decidim-surveys/config/locales/eu.yml b/decidim-surveys/config/locales/eu.yml
index 1f0474a27bf5e..10027f62a3bb2 100644
--- a/decidim-surveys/config/locales/eu.yml
+++ b/decidim-surveys/config/locales/eu.yml
@@ -1,6 +1,9 @@
 ---
 eu:
   activemodel:
+    attributes:
+      response:
+        add_attachments: Gehitu eranskinak
     models:
       decidim/surveys/closed_survey_event: Inkesta amaitu da
       decidim/surveys/opened_survey_event: Inkesta hasi da
diff --git a/decidim-surveys/config/locales/fi.yml b/decidim-surveys/config/locales/fi.yml
index dd509fa9031fb..f85998cc6c19c 100644
--- a/decidim-surveys/config/locales/fi.yml
+++ b/decidim-surveys/config/locales/fi.yml
@@ -1,6 +1,9 @@
 ---
 fi:
   activemodel:
+    attributes:
+      response:
+        add_attachments: Lisää liitteitä
     models:
       decidim/surveys/closed_survey_event: Kysely päättyi
       decidim/surveys/opened_survey_event: Kysely alkoi
@@ -29,7 +32,7 @@ fi:
     components:
       surveys:
         actions:
-          respond: Vastaa
+          respond: Vastaaminen
         name: Kyselyt
         settings:
           announcement: Ilmoitus
diff --git a/decidim-surveys/config/locales/fr-CA.yml b/decidim-surveys/config/locales/fr-CA.yml
index eda220019e054..7d659999d04a3 100644
--- a/decidim-surveys/config/locales/fr-CA.yml
+++ b/decidim-surveys/config/locales/fr-CA.yml
@@ -1,6 +1,9 @@
 ---
 fr-CA:
   activemodel:
+    attributes:
+      response:
+        add_attachments: Ajouter des pièces jointes
     models:
       decidim/surveys/closed_survey_event: Enquête terminée
       decidim/surveys/opened_survey_event: Enquête commencée
diff --git a/decidim-surveys/config/locales/fr.yml b/decidim-surveys/config/locales/fr.yml
index b1796ec751df0..8afabb68d2786 100644
--- a/decidim-surveys/config/locales/fr.yml
+++ b/decidim-surveys/config/locales/fr.yml
@@ -1,6 +1,9 @@
 ---
 fr:
   activemodel:
+    attributes:
+      response:
+        add_attachments: Ajouter des pièces jointes
     models:
       decidim/surveys/closed_survey_event: Enquête terminée
       decidim/surveys/opened_survey_event: Enquête commencée
diff --git a/decidim-surveys/config/locales/sk.yml b/decidim-surveys/config/locales/sk.yml
index a883c45368b7b..f6a9b920504c4 100644
--- a/decidim-surveys/config/locales/sk.yml
+++ b/decidim-surveys/config/locales/sk.yml
@@ -1,6 +1,9 @@
 ---
 sk:
   activemodel:
+    attributes:
+      response:
+        add_attachments: Pridať prílohy k odpovedi
     models:
       decidim/surveys/closed_survey_event: Prieskum ukončený
       decidim/surveys/opened_survey_event: Prieskum začal
diff --git a/decidim-system/config/locales/eu.yml b/decidim-system/config/locales/eu.yml
index 14efa86cdbad7..3183a46e3cf68 100644
--- a/decidim-system/config/locales/eu.yml
+++ b/decidim-system/config/locales/eu.yml
@@ -241,7 +241,6 @@ eu:
           default_src_hint: |
             Default-src kanpoko eduki osorako konbentzio lehenetsia da, hala nola, JavaScript, irudiak, CSS, iturriak, dei asinkronikoak, markoak eta multimedia fitxategiak HTML5.
             Plataformak "'self' 'unsafe-inline'" erantsiko du, baina gehiago gehitzeko aukera duzu. Utzi zuriz, ziur ez bazaude.
-
           font_src: Font src
           font_src_hint: |
             font-src ereduko direktibak using @font-face erabiliz kargatu daitezkeen URLak murrizten ditu.
diff --git a/decidim-system/config/locales/fr-CA.yml b/decidim-system/config/locales/fr-CA.yml
index 5575513229332..be2a1acccd0bb 100644
--- a/decidim-system/config/locales/fr-CA.yml
+++ b/decidim-system/config/locales/fr-CA.yml
@@ -151,7 +151,7 @@ fr-CA:
           error_invitation: Il y a eu un problème lors de la création d'une nouvelle organisation. Vérifiez le nom de l'administrateur de votre organisation.
           success_html: |
             <p>
-              Organisation créée avec succès. 
+              Organisation créée avec succès.
             </p>
             <ol>
               <li>Vous devrez peut-être mettre à jour le code de votre application pour autoriser les requêtes à %{host}, vous devez ajouter ce qui suit à la configuration de votre environnement
diff --git a/decidim-system/config/locales/ja.yml b/decidim-system/config/locales/ja.yml
index d2c10afba5f32..8d042785cdec8 100644
--- a/decidim-system/config/locales/ja.yml
+++ b/decidim-system/config/locales/ja.yml
@@ -37,6 +37,8 @@ ja:
               must_be_ssl: リダイレクト URI は SSL が有効な URI でなければなりません
         organization:
           attributes:
+            host:
+              invalid: は無効な値です
             password:
               secret_key: このフィールドを保存するには、環境変数 SECRET_KEY_BASE を定義する必要があります
   decidim:
@@ -192,9 +194,8 @@ ja:
             user: "GraphQL API への呼び出し時に、与えられたトークンを使用してサインイン中のユーザーとして操作を行うための権限です。これは、現在のユーザーに関する情報を必要とするすべての api:write 操作や api:read 操作に必要です。\n"
           scopes_help_html: |
             選択したスコープは、認可プロセス中に接続されたアプリケーションがリクエストできるようになります。ユーザーが OAuth を利用してサインインする際には、認可リクエストの詳細が表示されます。 <br>
-            スコープによって、付与されたアクセストークンを用いた認証後に利用できる機能が異なります。 <br> 
+            スコープによって、付与されたアクセストークンを用いた認証後に利用できる機能が異なります。 <br>
             <strong>注意:</strong> 外部アプリケーションでユーザー認証のみを行いたい場合は、<strong>profile</strong> スコープだけで十分です。Decidim API と連携するアプリケーションには、他のスコープも必要になります。
-
           select_organization: 組織を選択
         index:
           confirm_delete: このアプリケーションを削除してもよろしいですか？
diff --git a/decidim-templates/config/locales/eu.yml b/decidim-templates/config/locales/eu.yml
index d73508e144b90..1f9a4a9643b83 100644
--- a/decidim-templates/config/locales/eu.yml
+++ b/decidim-templates/config/locales/eu.yml
@@ -93,7 +93,7 @@ eu:
             empty: Oraindik ez dago galderarik.
             manage_questions: Galderak
             questionnaire: Galdetegia
-            title: Galdetegiaren txantiloia editatu
+            title: Editatu galdetegiaren txantiloia
           edit_questions:
             add_question: Gehitu galdera
             add_separator: Gehitu banatzailea
diff --git a/decidim-verifications/config/locales/eu.yml b/decidim-verifications/config/locales/eu.yml
index 0dd6a432633e0..6409fddf4be23 100644
--- a/decidim-verifications/config/locales/eu.yml
+++ b/decidim-verifications/config/locales/eu.yml
@@ -68,7 +68,7 @@ eu:
           - Egiaztatu "A" letraz hasten den pasaporte zenbaki bat sartuz.
         csv_census:
           help:
-          - Administratzaileek onartutako parte-hartzaileen posta elektronikoak dituen CSV igotzen dute. 
+          - Administratzaileek onartutako parte-hartzaileen posta elektronikoak dituen CSV igotzen dute.
           - CSV fitxategian posta elektroniko bat duten parte-hartzaileak soilik egiaztatu ahal dira.
         default:
           help:
@@ -183,7 +183,7 @@ eu:
             index:
               empty: Ez dago errolda-daturik. Erabili %{import_csv} inportatzeko CSV fitxategi bat.
               no_sign_in: Saioa inoiz ez hasia
-              no_user: Ez da parte-hartzailerik aurkitu 
+              no_user: Ez da parte-hartzailerik aurkitu
             last_login:
               no_sign_in: Inoiz ez sinatua
               no_user: Parte-hartzailerik gabe
diff --git a/decidim-verifications/config/locales/fi-plain.yml b/decidim-verifications/config/locales/fi-plain.yml
index c021d7415bb74..1d8b50f9ab7db 100644
--- a/decidim-verifications/config/locales/fi-plain.yml
+++ b/decidim-verifications/config/locales/fi-plain.yml
@@ -49,6 +49,7 @@ fi-pl:
             confirm: Ennen valittua päivämäärää tehtyjen vahvistustietojen tuhoamista ei voi peruuttaa. Haluatko varmasti jatkaa?
             confirm_all: Vahvistusten tuhoamista ei voi peruuttaa. Haluatko varmasti jatkaa?
           destroy_nok: Vahvistusten kumoaminen epäonnistui.
+          destroy_ok: Tunnistautumisten kumoaminen on käynnissä. Tämän valmistuminen voi kestää useamman minuutin ajan.
           info: Yhteensä %{count} varmennettua osallistujaa.
           no_data: Ei vahvistettuja osallistujia.
           title: Tunnistautumisten peruuttaminen
diff --git a/decidim-verifications/config/locales/ja.yml b/decidim-verifications/config/locales/ja.yml
index 3d2b711f84f6a..9d615f9f6f6bf 100644
--- a/decidim-verifications/config/locales/ja.yml
+++ b/decidim-verifications/config/locales/ja.yml
@@ -49,6 +49,7 @@ ja:
             confirm: 指定日以前の認証の取り消しはやり直すことができません。続行してもよろしいですか？
             confirm_all: すべての権限を取り消すと、元に戻すことができません。本当に続行しますか？
           destroy_nok: 認証の取り消し中に問題が発生しました。
+          destroy_ok: 権限の取り消しが進行中です。完了までに数分かかることがあります。
           info: '%{count} 人の確認済み参加者がいます。'
           no_data: 検証済みの参加者はいません。
           title: 認証の取り消し方法
diff --git a/decidim-verifications/config/locales/tr-TR.yml b/decidim-verifications/config/locales/tr-TR.yml
index adc2641e5689c..44df11f5ea680 100644
--- a/decidim-verifications/config/locales/tr-TR.yml
+++ b/decidim-verifications/config/locales/tr-TR.yml
@@ -131,7 +131,7 @@ tr:
           new:
             send: Doğrulama isteğinde bulun
             title: Kimlik belgenizi yükleyin
-        identification_number: Kimlik Numarası 
+        identification_number: Kimlik Numarası
         passport: Pasaport
       postal_letter:
         admin:

From 14055469f271fa3603a9e9a7951d37913d650bf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?=
 <andreslucena@users.noreply.github.com>
Date: Wed, 1 Jul 2026 21:10:35 +0200
Subject: [PATCH 094/131] Backport 'Fix delete user email notification' to
 v0.31 (#17226)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix delete user email notification

* Fix delete user email notification

* Fix typos, fix normalization issues

* Remove html_safe from greeting

* Apply suggestions from code review

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Apply review recommendations

* Add comment for the mail

* Running rubocops

* Remove specs

* Apply review recommendations

* Apply suggestions from code review

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

* Remove unecessary strings from i18n

---------

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 .../app/commands/decidim/destroy_account.rb   | 13 +++++++-
 .../process_inactive_participant_job.rb       |  7 ----
 .../app/mailers/decidim/delete_user_mailer.rb | 14 ++++++++
 .../decidim/participants_account_mailer.rb    | 16 ----------
 .../delete_user_mailer/delete.html.erb        |  6 ++++
 .../removal_notification.html.erb             | 11 -------
 decidim-core/config/locales/en.yml            | 14 ++++----
 decidim-core/lib/decidim/command.rb           |  2 +-
 decidim-core/lib/decidim/core/engine.rb       |  8 +++++
 .../commands/decidim/destroy_account_spec.rb  | 13 ++++++++
 .../delete_inactive_participants_job_spec.rb  | 19 +++++++++--
 .../spec/mailers/delete_user_mailer_spec.rb   | 32 +++++++++++++++++++
 .../participants_account_mailer_spec.rb       | 21 ------------
 13 files changed, 110 insertions(+), 66 deletions(-)
 create mode 100644 decidim-core/app/mailers/decidim/delete_user_mailer.rb
 create mode 100644 decidim-core/app/views/decidim/delete_user_mailer/delete.html.erb
 delete mode 100644 decidim-core/app/views/decidim/participants_account_mailer/removal_notification.html.erb
 create mode 100644 decidim-core/spec/mailers/delete_user_mailer_spec.rb

diff --git a/decidim-core/app/commands/decidim/destroy_account.rb b/decidim-core/app/commands/decidim/destroy_account.rb
index 6199f2ffbf6cb..b682149ce2e9a 100644
--- a/decidim-core/app/commands/decidim/destroy_account.rb
+++ b/decidim-core/app/commands/decidim/destroy_account.rb
@@ -15,7 +15,7 @@ def initialize(form)
     def call
       return broadcast(:invalid) unless @form.valid?
 
-      Decidim::User.transaction do
+      with_events(with_transaction: true) do
         destroy_user_account!
         destroy_user_identities
         destroy_follows
@@ -110,5 +110,16 @@ def delegate_destroy_to_participatory_spaces
         space_manifest.invoke_on_destroy_account(current_user)
       end
     end
+
+    # We use memoization in this particular email, as we want to have the data available before the actual anonymization
+    def event_arguments
+      @event_arguments ||= {
+        user_id: current_user.id,
+        user_email: current_user.email,
+        user_name: current_user.name,
+        locale: current_user.locale,
+        organization: current_user.organization
+      }
+    end
   end
 end
diff --git a/decidim-core/app/jobs/decidim/process_inactive_participant_job.rb b/decidim-core/app/jobs/decidim/process_inactive_participant_job.rb
index 34ac46744d8f0..2a2413291fe42 100644
--- a/decidim-core/app/jobs/decidim/process_inactive_participant_job.rb
+++ b/decidim-core/app/jobs/decidim/process_inactive_participant_job.rb
@@ -31,13 +31,6 @@ def process_send_warning(user, type, days)
     end
 
     def process_remove_user(user)
-      email = user.email
-      name = user.name
-      locale = user.locale
-      organization = user.organization
-
-      ParticipantsAccountMailer.removal_notification(email, name, locale, organization).deliver_later
-
       Decidim::DestroyAccount.call(
         Decidim::DeleteAccountForm.from_params(
           delete_reason: I18n.t("decidim.account.destroy.inactive_account_removal_reason", inactivity_period: Decidim.delete_inactive_users_after_days)
diff --git a/decidim-core/app/mailers/decidim/delete_user_mailer.rb b/decidim-core/app/mailers/decidim/delete_user_mailer.rb
new file mode 100644
index 0000000000000..e6b64f4684e26
--- /dev/null
+++ b/decidim-core/app/mailers/decidim/delete_user_mailer.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  class DeleteUserMailer < ApplicationMailer
+    # This email is being sent when a user deletes his own account, or when the user was inactive for too long.
+    def delete(user_email:, user_name:, locale:, organization:)
+      I18n.with_locale(locale) do
+        @user_name = user_name
+        @organization = organization
+        mail(to: user_email, subject: I18n.t("decidim.delete_user_mailer.subject"))
+      end
+    end
+  end
+end
diff --git a/decidim-core/app/mailers/decidim/participants_account_mailer.rb b/decidim-core/app/mailers/decidim/participants_account_mailer.rb
index eef337bce4d7d..ffe865badf226 100644
--- a/decidim-core/app/mailers/decidim/participants_account_mailer.rb
+++ b/decidim-core/app/mailers/decidim/participants_account_mailer.rb
@@ -18,21 +18,5 @@ def inactivity_notification(user, days)
         mail(to: user.email, subject:)
       end
     end
-
-    # Notify user about account removal due to inactivity
-    def removal_notification(email, name, locale, organization)
-      @email = email
-      @user_name = name
-      @organization = organization
-
-      I18n.with_locale(locale) do
-        subject = I18n.t(
-          "decidim.participants_account_mailer.removal_notification.subject",
-          organization_name: organization_name(@organization)
-        )
-
-        mail(to: email, subject:)
-      end
-    end
   end
 end
diff --git a/decidim-core/app/views/decidim/delete_user_mailer/delete.html.erb b/decidim-core/app/views/decidim/delete_user_mailer/delete.html.erb
new file mode 100644
index 0000000000000..bbb8f29e93947
--- /dev/null
+++ b/decidim-core/app/views/decidim/delete_user_mailer/delete.html.erb
@@ -0,0 +1,6 @@
+<p class="email-greeting"><%= t(".hello", username: @user_name) %></p>
+
+<p class="email-instructions"><%= t ".body_1" %></p>
+<p class="email-instructions"><%= t ".body_2" %></p>
+
+<p class="email-closing"><%= t(".greetings_html", organization_name: organization_name(@organization), organization_url: decidim.root_url(host: @organization.host)) %></p>
diff --git a/decidim-core/app/views/decidim/participants_account_mailer/removal_notification.html.erb b/decidim-core/app/views/decidim/participants_account_mailer/removal_notification.html.erb
deleted file mode 100644
index 5a21b12091860..0000000000000
--- a/decidim-core/app/views/decidim/participants_account_mailer/removal_notification.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<p class="email-greeting">
-  <%= t(".hello", username: @user_name) %>
-</p>
-
-<p class="email-body">
-  <%= t(".body", organization_name: organization_name(@organization)) %>
-</p>
-
-<p class="email-closing">
-  <%= t(".greetings_html", organization_name: organization_name(@organization), organization_url: decidim.root_url(host: @organization.host)) %>
-</p>
diff --git a/decidim-core/config/locales/en.yml b/decidim-core/config/locales/en.yml
index 888b181b635eb..3d2817b41c6eb 100644
--- a/decidim-core/config/locales/en.yml
+++ b/decidim-core/config/locales/en.yml
@@ -664,6 +664,13 @@ en:
           all: All
         filter_taxonomy_values:
           all: All
+    delete_user_mailer:
+      delete:
+        body_1: Your account has been deactivated and is no longer accessible. Your personal data is scheduled for permanent deletion in accordance with our data retention policies.
+        body_2: For security reasons, some authorization-related data will be retained; if you create a new account and authorize again, it may be linked to your new account.
+        greetings_html: Kind regards,<br/><a href="%{organization_url}">%{organization_name}</a>
+        hello: Dear %{username},
+      subject: Your account has been deleted
     devise:
       omniauth_registrations:
         create:
@@ -1530,13 +1537,6 @@ en:
         log_in: log in
         never_logged_in: never logged in
         subject: Inactive account warning
-      removal_notification:
-        body: Your %{organization_name} account has been deleted due to inactivity.
-        greetings_html: |
-          Kind regards,<br>
-          %{organization_name}
-        hello: Dear %{username},
-        subject: Inactive account deleted
     passwords:
       update:
         error: There was a problem updating the password.
diff --git a/decidim-core/lib/decidim/command.rb b/decidim-core/lib/decidim/command.rb
index 4fde094cd10fa..113d9e53d095e 100644
--- a/decidim-core/lib/decidim/command.rb
+++ b/decidim-core/lib/decidim/command.rb
@@ -53,7 +53,7 @@ def with_events(with_transaction: false, &)
     protected
 
     def event_arguments
-      raise "#{self.class} must implement #event_arguments"
+      raise "#{self.class} must implement #event_arguments (passed to #{event_namespace})"
     end
 
     def event_namespace
diff --git a/decidim-core/lib/decidim/core/engine.rb b/decidim-core/lib/decidim/core/engine.rb
index 07cce68e13f3d..fa381d451f97a 100644
--- a/decidim-core/lib/decidim/core/engine.rb
+++ b/decidim-core/lib/decidim/core/engine.rb
@@ -495,6 +495,14 @@ def named_variants
         end
       end
 
+      initializer "decidim_core.delete_account" do
+        config.to_prepare do
+          ActiveSupport::Notifications.subscribe("decidim.destroy_account:after") do |_event_name, data|
+            Decidim::DeleteUserMailer.delete(user_email: data[:user_email], user_name: data[:user_name], locale: data[:locale], organization: data[:organization]).deliver_later
+          end
+        end
+      end
+
       initializer "decidim_core.add_cells_view_paths" do
         Cell::ViewModel.view_paths << Rails.root.join("app/views") # for partials
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Core::Engine.root}/app/cells")
diff --git a/decidim-core/spec/commands/decidim/destroy_account_spec.rb b/decidim-core/spec/commands/decidim/destroy_account_spec.rb
index a5ef541383240..63ed1a32c8b13 100644
--- a/decidim-core/spec/commands/decidim/destroy_account_spec.rb
+++ b/decidim-core/spec/commands/decidim/destroy_account_spec.rb
@@ -31,6 +31,9 @@ module Decidim
       end
     end
 
+    it_behaves_like "fires an ActiveSupport::Notification event", "decidim.destroy_account:before"
+    it_behaves_like "fires an ActiveSupport::Notification event", "decidim.destroy_account:after"
+
     context "when valid" do
       let(:valid) { true }
 
@@ -44,6 +47,16 @@ module Decidim
         expect(user.reload.authenticatable_salt).not_to eq(old_salt)
       end
 
+      it "sends the email" do
+        original_name = user.name
+        command.call
+        perform_enqueued_jobs
+        email = last_email
+        expect(email.subject).to eq("Your account has been deleted")
+        expect(last_email_body).to include("Dear #{original_name}")
+        expect(last_email_body).to include("Your account has been deactivated and is no longer accessible.")
+      end
+
       it "stores the deleted_at and delete_reason to the user" do
         command.call
         expect(user.reload.delete_reason).to eq(data[:delete_reason])
diff --git a/decidim-core/spec/jobs/decidim/delete_inactive_participants_job_spec.rb b/decidim-core/spec/jobs/decidim/delete_inactive_participants_job_spec.rb
index 60fd1524d8e72..81acfe86fba78 100644
--- a/decidim-core/spec/jobs/decidim/delete_inactive_participants_job_spec.rb
+++ b/decidim-core/spec/jobs/decidim/delete_inactive_participants_job_spec.rb
@@ -11,7 +11,6 @@
   before do
     Decidim.delete_inactive_users_after_days = 300
     allow(Decidim::ParticipantsAccountMailer).to receive(:inactivity_notification).and_return(double(deliver_later: true))
-    allow(Decidim::ParticipantsAccountMailer).to receive(:removal_notification).and_return(double(deliver_later: true))
   end
 
   describe "#perform" do
@@ -95,12 +94,28 @@
           "inactivity_notification" => { "notification_type" => "second", "sent_at" => 8.days.ago.to_s }
         }
       end
+      let!(:user) { create(:user, :confirmed, organization:, created_at:, current_sign_in_at:, extended_data:) }
 
       it "removes the user and sends deletion notification" do
         perform_enqueued_jobs { subject.perform_later(organization) }
 
         expect(user.reload.email).to be_empty
-        expect(Decidim::ParticipantsAccountMailer).to have_received(:removal_notification).with(email, name, locale, organization).once
+
+        expect(last_email.subject).to eq("Your account has been deleted")
+        expect(last_email_body).to include("Your account has been deactivated and is no longer accessible.")
+      end
+
+      context "when deleting an inactive participant" do
+        before do
+          allow(Decidim::DeleteUserMailer).to receive(:delete).and_return(double(deliver_later: true))
+        end
+
+        it "removes the user and sends the email" do
+          perform_enqueued_jobs { subject.perform_later(organization) }
+
+          expect(user.reload.email).to be_empty
+          expect(Decidim::DeleteUserMailer).to have_received(:delete).with(user_email: email, user_name: name, locale:, organization:).once
+        end
       end
     end
   end
diff --git a/decidim-core/spec/mailers/delete_user_mailer_spec.rb b/decidim-core/spec/mailers/delete_user_mailer_spec.rb
new file mode 100644
index 0000000000000..0c6fc6c4ff8cc
--- /dev/null
+++ b/decidim-core/spec/mailers/delete_user_mailer_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe DeleteUserMailer do
+    let(:organization) { create(:organization, name: { en: "Test Organization" }) }
+    let(:user) { create(:user, organization:, email: "user@example.org", name: "John Doe") }
+    let(:default_sender_email) { "test@example.org" }
+    let!(:user_email) { user.email }
+    let!(:user_name) { user.name }
+    let!(:locale) { user.locale }
+
+    describe "#delete" do
+      let(:mail) { described_class.delete(user_email:, user_name:, locale:, organization:) }
+
+      it "renders the headers" do
+        expect(mail.subject).to eq("Your account has been deleted")
+        expect(mail.to).to eq([user.email])
+        expect(mail.from).to eq([default_sender_email])
+      end
+
+      it "includes the organization name in the body" do
+        expect(mail.body.encoded).to include("Test Organization")
+      end
+
+      it "provides a removal confirmation message" do
+        expect(mail.body.encoded).to include("Your account has been deactivated and is no longer accessible.")
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/mailers/participants_account_mailer_spec.rb b/decidim-core/spec/mailers/participants_account_mailer_spec.rb
index d1b5828dab0fa..3ca869e7b25b3 100644
--- a/decidim-core/spec/mailers/participants_account_mailer_spec.rb
+++ b/decidim-core/spec/mailers/participants_account_mailer_spec.rb
@@ -41,26 +41,5 @@ module Decidim
         expect(mail.body.encoded).to include("this account has been scheduled for automatic deletion ")
       end
     end
-
-    describe "#removal_notification" do
-      let!(:email) { user.email }
-      let!(:name) { user.name }
-      let!(:locale) { user.locale }
-      let(:mail) { described_class.removal_notification(email, name, locale, organization) }
-
-      it "renders the headers" do
-        expect(mail.subject).to eq("Inactive account deleted")
-        expect(mail.to).to eq([user.email])
-        expect(mail.from).to eq([default_sender_email])
-      end
-
-      it "includes the organization name in the body" do
-        expect(mail.body.encoded).to include("Test Organization")
-      end
-
-      it "provides a removal confirmation message" do
-        expect(mail.body.encoded).to include("Your Test Organization account has been deleted due to inactivity.")
-      end
-    end
   end
 end

From a24eec814606dc2385c5c42e82ad60f6436d8d7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?=
 <andreslucena@users.noreply.github.com>
Date: Wed, 1 Jul 2026 22:14:43 +0200
Subject: [PATCH 095/131] Backport 'Fix flaky specs on
 `authentication_spec.rb`' to v0.31 (#17227)

---
 decidim-core/spec/system/authentication_spec.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/decidim-core/spec/system/authentication_spec.rb b/decidim-core/spec/system/authentication_spec.rb
index 3e2f2e5e5b82c..6be6dfc6d6541 100644
--- a/decidim-core/spec/system/authentication_spec.rb
+++ b/decidim-core/spec/system/authentication_spec.rb
@@ -700,7 +700,7 @@
               within ".new_user" do
                 fill_in :session_user_email, with: user.email
                 fill_in :session_user_password, with: "not-the-password"
-                find("*[type=submit]").click
+                perform_enqueued_jobs { find("*[type=submit]").click }
               end
             end
           end
@@ -709,10 +709,12 @@
             within ".new_user" do
               fill_in :session_user_email, with: user.email
               fill_in :session_user_password, with: "not-the-password"
-              perform_enqueued_jobs { find("*[type=submit]").click }
+              find("*[type=submit]").click
             end
 
             expect(page).to have_content("Invalid")
+
+            perform_enqueued_jobs(only: ActionMailer::MailDeliveryJob)
             expect(emails.count).to eq(1)
           end
         end

From fe27e117d9bd2d737ffb2b90163c5535f4dd0fe8 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Thu, 2 Jul 2026 09:18:10 +0200
Subject: [PATCH 096/131] New Crowdin updates (#17234)

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]
---
 decidim-admin/config/locales/fi-plain.yml             | 10 ++++++++++
 decidim-admin/config/locales/ja.yml                   | 11 ++++++++++-
 decidim-budgets/config/locales/eu.yml                 |  2 +-
 decidim-core/config/locales/fi-plain.yml              |  1 +
 decidim-core/config/locales/fr-CA.yml                 |  2 ++
 decidim-debates/config/locales/fi-plain.yml           |  3 +++
 decidim-debates/config/locales/ja.yml                 |  3 +++
 .../config/locales/fr-CA.yml                          |  1 +
 decidim-proposals/config/locales/fi-plain.yml         |  3 +++
 decidim-proposals/config/locales/ja.yml               |  2 ++
 decidim-surveys/config/locales/fi-plain.yml           |  3 +++
 11 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/decidim-admin/config/locales/fi-plain.yml b/decidim-admin/config/locales/fi-plain.yml
index 8d2a4488db734..20964e0cc3589 100644
--- a/decidim-admin/config/locales/fi-plain.yml
+++ b/decidim-admin/config/locales/fi-plain.yml
@@ -12,6 +12,7 @@ fi-pl:
         plural: Monikko
       attachment:
         attachment_collection_id: Kansio
+        attachments: Liitteet
         description: Kuvaus
         file: Tiedosto
         title: Liitetiedoston tai kuvan nimi
@@ -1071,6 +1072,10 @@ fi-pl:
           next_title: Seuraava kohde
           previous: Edellinen
           previous_title: Edellinen kohde
+        attachments:
+          add_attachments: Lisää liitteitä
+          attachment_legend: Lisää liitegalleria (valinnainen)
+          edit_attachments: Muokkaa liitteitä
       static_page_topics:
         create:
           error: Uuden aiheen luomisessa tapahtui virhe.
@@ -1285,6 +1290,11 @@ fi-pl:
       errors:
         impersonate_user:
           reason: Sinun on annettava syy, kun hallitset osallistujaa, joka ei ole hallittu osallistuja.
+      file_help:
+        attachment:
+          explanation: 'Tiedoston ohjeistus:'
+          message_1: CSV-, JSON- ja Excel-tiedostoja (.xlsx) tuetaan
+          message_2: CSV-tiedostoissa sarake-erottimen on oltava puolipiste (";")
     moderations:
       actions:
         expand: Avaa
diff --git a/decidim-admin/config/locales/ja.yml b/decidim-admin/config/locales/ja.yml
index 9ce840c153ec8..52166c281564e 100644
--- a/decidim-admin/config/locales/ja.yml
+++ b/decidim-admin/config/locales/ja.yml
@@ -12,6 +12,7 @@ ja:
         plural: 複数形
       attachment:
         attachment_collection_id: フォルダ
+        attachments: 添付ファイル
         description: 説明
         file: ファイル
         title: 添付ファイルまたは画像名
@@ -960,7 +961,7 @@ ja:
             explanation: '%{count} 人のプライベート参加者がいます。'
             title: プライベート参加者を削除
           example_file: 'サンプルファイル：'
-          explanation: "CSVファイルをアップロードしてください。ファイルには2つの列が必要で、1列目にはメールアドレス、最後の列には参加スペースに追加したいユーザーの名前を入力してください。ヘッダー行は不要です。ユーザー名には、`<>?%&^*#@()[]=+:;\"{}\\\\|`などの無効な文字を使用しないでください。\n"
+          explanation: "CSVファイルをアップロードしてください。ファイルには2つの列が必要で、1列目にはメールアドレス、最後の列には参加スペースに追加したいユーザーの名前を入力してください。ヘッダー行は不要です。ユーザー名には、`<>?%&^*#@()[]=+:;\"{}\\\\\\\\|`などの無効な文字を使用しないでください。\n"
           explanation_example: |
             john.doe@example.org%{csv_col_sep}John Doe
             jane.doe@example.org%{csv_col_sep}Jane Doe
@@ -1064,6 +1065,10 @@ ja:
           next_title: 次の項目
           previous: 前へ
           previous_title: 前の項目
+        attachments:
+          add_attachments: 添付ファイルを追加
+          attachment_legend: 添付ファイルギャラリーを追加（オプション）
+          edit_attachments: 添付ファイルを編集
       static_page_topics:
         create:
           error: 新しいトピックを作成中に問題が発生しました。
@@ -1277,6 +1282,10 @@ ja:
       errors:
         impersonate_user:
           reason: 管理対象ではない参加者を管理する場合は、理由を入力する必要があります。
+      file_help:
+        attachment:
+          explanation: 'ファイルのガイダンス：'
+          message_1: CSV、JSON、Excel (.xlsx) ファイルがサポートされています
     moderations:
       actions:
         expand: 展開
diff --git a/decidim-budgets/config/locales/eu.yml b/decidim-budgets/config/locales/eu.yml
index 7da8292080b50..c0815e87e5b03 100644
--- a/decidim-budgets/config/locales/eu.yml
+++ b/decidim-budgets/config/locales/eu.yml
@@ -153,7 +153,7 @@ eu:
           orders:
             description: Parte-hatzaileek mezu elektroniko bat jasoko dute, eskaera bat egiteke duten aurrekontuetarako estekekin.
             title:
-              one: Gogorarazpen bat bidaltzear zaude posta elektronikoz %{count} partte-hartzaileari
+              one: Gogorarazpen bat bidaltzear zaude posta elektronikoz %{count} erabiltzaileri
               other: Gogorarazpen bat bidaltzear zaude posta elektronikoz %{count} parte-hartzaileri
       admin_log:
         budget:
diff --git a/decidim-core/config/locales/fi-plain.yml b/decidim-core/config/locales/fi-plain.yml
index d2fac290a38b0..c5f6710d1bf65 100644
--- a/decidim-core/config/locales/fi-plain.yml
+++ b/decidim-core/config/locales/fi-plain.yml
@@ -1530,6 +1530,7 @@ fi-pl:
         greetings_html: |
           Terveisin,<br>
           %{organization_name}
+        hello: Hei %{username},
         subject: Käyttämättä ollut tili on poistettu
     passwords:
       update:
diff --git a/decidim-core/config/locales/fr-CA.yml b/decidim-core/config/locales/fr-CA.yml
index 8e2623a87203a..1dba21298bc6f 100644
--- a/decidim-core/config/locales/fr-CA.yml
+++ b/decidim-core/config/locales/fr-CA.yml
@@ -431,6 +431,7 @@ fr-CA:
         explanation: Procédure d'autorisation factice
         name: Procédure d'autorisation factice
       ephemeral_dummy_authorization_handler:
+        explanation: Obtenir une vérification en saisissant un numéro de document se terminant par « X ».
         fields:
           allowed_postal_codes: Codes postaux autorisés (séparés par des virgules)
           document_number: Numéro du document
@@ -1381,6 +1382,7 @@ fr-CA:
         greetings_html: |
           Cordialement,<br>
           %{organization_name}
+        hello: Cher(ère) %{username},
         subject: Compte inactif supprimé
     passwords:
       update:
diff --git a/decidim-debates/config/locales/fi-plain.yml b/decidim-debates/config/locales/fi-plain.yml
index 5881868933a8c..61a27c2c61b57 100644
--- a/decidim-debates/config/locales/fi-plain.yml
+++ b/decidim-debates/config/locales/fi-plain.yml
@@ -76,10 +76,13 @@ fi-pl:
           form:
             add_attachments: Lisää liitteitä
             attachment_legend: Lisää asiakirja tai kuva
+            comments_layout_locked_warning: Kommenttien asettelua ei voi muuttaa, koska kommentteja on jo lähetetty.
             comments_visualization: Kommenttien visualisointi
             comments_warning: Ensimmäisen kommentin jälkeen kommenttien esitysmuotoasetusta ei voi muuttaa.
             debate_type: Keskustelun tyyppi
             edit_attachments: Muokkaa liitteitä
+            errors:
+              comments_layout_locked: Kommenttien asettelua ei voi muuttaa, koska kommentteja on jo lähetetty.
             finite: Määräaikainen (keskustelulla on alku- ja loppuaika)
             open: Avoin (keskustelulla ei ole alku- ja loppuaikaa)
             single_column: 'Yksi sarake: kommentit näytetään yhdessä sarakkeessa kronologisessa järjestyksessä ja niihin voi vastata.'
diff --git a/decidim-debates/config/locales/ja.yml b/decidim-debates/config/locales/ja.yml
index 85a5dd0197362..e3ca9a4a64ec5 100644
--- a/decidim-debates/config/locales/ja.yml
+++ b/decidim-debates/config/locales/ja.yml
@@ -75,10 +75,13 @@ ja:
           form:
             add_attachments: 添付ファイルを追加
             attachment_legend: ドキュメントまたは画像を追加
+            comments_layout_locked_warning: コメントがすでに投稿されているため、コメントレイアウトを変更できません。
             comments_visualization: コメントの視覚化
             comments_warning: 最初のコメントが投稿されると、選択した表示オプションは変更できません。
             debate_type: ディベートタイプ
             edit_attachments: 添付ファイルを編集
+            errors:
+              comments_layout_locked: コメントがすでに投稿されているため、コメントレイアウトを変更できません。
             finite: 期間限定 (開始時刻と終了時刻あり)
             open: 無期限 (開始時刻または終了時刻なし)
             single_column: '1カラム: コメントは時系列で表示され、返信を持つことができます。'
diff --git a/decidim-participatory_processes/config/locales/fr-CA.yml b/decidim-participatory_processes/config/locales/fr-CA.yml
index 741b49b9d51d9..5f08384ea4ba9 100644
--- a/decidim-participatory_processes/config/locales/fr-CA.yml
+++ b/decidim-participatory_processes/config/locales/fr-CA.yml
@@ -293,6 +293,7 @@ fr-CA:
         publish: "%{user_name} a publié la concertation %{resource_name}"
         publish_all_members: "%{user_name} a publié tous les membres du processus participatif %{resource_name}"
         restore: "%{user_name} a restauré le processus participatif %{resource_name}"
+        soft_delete: "%{user_name} a déplacé le processus participatif %{resource_name} dans la corbeille"
         unpublish: "%{user_name} n'a pas publié la concertation %{resource_name}"
         unpublish_all_members: "%{user_name} a dépublié tous les membres du processus participatif %{resource_name}"
         update: "%{user_name} a mis à jour la concertation %{resource_name}"
diff --git a/decidim-proposals/config/locales/fi-plain.yml b/decidim-proposals/config/locales/fi-plain.yml
index 0bc9124926511..fa42762589fdc 100644
--- a/decidim-proposals/config/locales/fi-plain.yml
+++ b/decidim-proposals/config/locales/fi-plain.yml
@@ -63,6 +63,8 @@ fi-pl:
               allowed_file_content_types: 'Virheellinen tiedostomuoto. Ainoastaan seuraavat tiedostomuodot on sallittu: %{types}'
         proposal:
           attributes:
+            add_attachments:
+              needs_to_be_reattached: Liitettävä uudestaan
             body:
               cant_be_equal_to_template: ei voi vastata mallipohjaa
               identical: JA otsikko ei voi olla täysin sama
@@ -855,6 +857,7 @@ fi-pl:
         errors:
           device_not_supported: Laitteesi ei tue sijaintipalveluita. Syötä osoite manuaalisesti.
           no_device_location: Valitettavasti sijaintijasi ei voitu tunnistaa automaattisesti. Syötä osoite manuaalisesti.
+        locating: Paikannetaan...
         use_my_location: Käytä nykyistä sijaintiani
       invite_coauthors:
         cancel:
diff --git a/decidim-proposals/config/locales/ja.yml b/decidim-proposals/config/locales/ja.yml
index 052153eea7fa5..7bf497f2280be 100644
--- a/decidim-proposals/config/locales/ja.yml
+++ b/decidim-proposals/config/locales/ja.yml
@@ -63,6 +63,8 @@ ja:
               allowed_file_content_types: '無効なドキュメントタイプです。次の拡張子を持つファイルのみ許可されています: %{types}'
         proposal:
           attributes:
+            add_attachments:
+              needs_to_be_reattached: 再接続が必要
             body:
               cant_be_equal_to_template: はテンプレートと等しくすることはできません
               identical: ANDタイトルは同一にすることはできません
diff --git a/decidim-surveys/config/locales/fi-plain.yml b/decidim-surveys/config/locales/fi-plain.yml
index f90f343b35f1e..97987df083d8d 100644
--- a/decidim-surveys/config/locales/fi-plain.yml
+++ b/decidim-surveys/config/locales/fi-plain.yml
@@ -1,6 +1,9 @@
 ---
 fi-pl:
   activemodel:
+    attributes:
+      response:
+        add_attachments: Lisää liitteitä
     models:
       decidim/surveys/closed_survey_event: Kysely päättyi
       decidim/surveys/opened_survey_event: Kysely alkoi

From 09f9cf0fec2646277d014b9d89fea64cae0b3dfb Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Thu, 2 Jul 2026 13:49:06 +0200
Subject: [PATCH 097/131] New Crowdin updates (#17240)

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Romanian)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (Spanish)

[ci skip]

* New translations en.yml (Catalan)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (German)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Slovak)

[ci skip]

* New translations en.yml (Swedish)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]
---
 decidim-admin/config/locales/ja.yml      |  1 +
 decidim-core/config/locales/ca-IT.yml    | 14 +++++++-------
 decidim-core/config/locales/ca.yml       | 14 +++++++-------
 decidim-core/config/locales/cs.yml       |  6 ------
 decidim-core/config/locales/de.yml       |  6 ------
 decidim-core/config/locales/es-MX.yml    | 14 +++++++-------
 decidim-core/config/locales/es-PY.yml    | 14 +++++++-------
 decidim-core/config/locales/es.yml       | 14 +++++++-------
 decidim-core/config/locales/eu.yml       | 14 +++++++-------
 decidim-core/config/locales/fi-plain.yml | 14 +++++++-------
 decidim-core/config/locales/fi.yml       | 14 +++++++-------
 decidim-core/config/locales/fr-CA.yml    | 14 +++++++-------
 decidim-core/config/locales/fr.yml       | 14 +++++++-------
 decidim-core/config/locales/ja.yml       | 13 +++++++------
 decidim-core/config/locales/pt-BR.yml    |  6 ------
 decidim-core/config/locales/ro-RO.yml    |  6 ------
 decidim-core/config/locales/sk.yml       |  6 ------
 decidim-core/config/locales/sv.yml       |  6 ------
 decidim-proposals/config/locales/ja.yml  |  1 +
 decidim-surveys/config/locales/ja.yml    |  3 +++
 decidim-system/config/locales/ja.yml     |  2 ++
 21 files changed, 84 insertions(+), 112 deletions(-)

diff --git a/decidim-admin/config/locales/ja.yml b/decidim-admin/config/locales/ja.yml
index 52166c281564e..8f8eb2f312625 100644
--- a/decidim-admin/config/locales/ja.yml
+++ b/decidim-admin/config/locales/ja.yml
@@ -1286,6 +1286,7 @@ ja:
         attachment:
           explanation: 'ファイルのガイダンス：'
           message_1: CSV、JSON、Excel (.xlsx) ファイルがサポートされています
+          message_2: CSV ファイルの場合、カラム間の区切り文字はセミコロン(";")でなければなりません
     moderations:
       actions:
         expand: 展開
diff --git a/decidim-core/config/locales/ca-IT.yml b/decidim-core/config/locales/ca-IT.yml
index 949e6be649c3b..2f4a09914b36c 100644
--- a/decidim-core/config/locales/ca-IT.yml
+++ b/decidim-core/config/locales/ca-IT.yml
@@ -661,6 +661,13 @@ ca-IT:
           all: Tots
         filter_taxonomy_values:
           all: Totes
+    delete_user_mailer:
+      delete:
+        body_1: El teu compte s'ha desactivat i ja no és accessible. Les teves dades personals estan programades per eliminar-les permanentment d'acord amb les nostres polítiques de retenció de dades.
+        body_2: Per raons de seguretat, es conservaran algunes dades relacionades amb la verificació; d'aquesta manera si creessis un compte nou i el tornes a verificar, es podria vincular l'autorització amb aquest compte nou.
+        greetings_html: Atentament,<br/><a href="%{organization_url}">%{organization_name}</a>
+        hello: Hola %{username},
+      subject: El teu compte ha estat eliminat
     devise:
       omniauth_registrations:
         create:
@@ -1523,13 +1530,6 @@ ca-IT:
         log_in: entra
         never_logged_in: mai ha iniciat sessió
         subject: Avís de compte inactiu
-      removal_notification:
-        body: El teu compte a %{organization_name} s'ha eliminat per inactivitat.
-        greetings_html: |
-          Atentament,<br>
-          %{organization_name}
-        hello: Hola %{username},
-        subject: Avís de compte inactiu
     passwords:
       update:
         error: Hi ha hagut un problema en actualitzar la contrasenya.
diff --git a/decidim-core/config/locales/ca.yml b/decidim-core/config/locales/ca.yml
index 974a0a68cd208..f8b6cd4d2f8a5 100644
--- a/decidim-core/config/locales/ca.yml
+++ b/decidim-core/config/locales/ca.yml
@@ -661,6 +661,13 @@ ca:
           all: Tots
         filter_taxonomy_values:
           all: Totes
+    delete_user_mailer:
+      delete:
+        body_1: El teu compte s'ha desactivat i ja no és accessible. Les teves dades personals estan programades per eliminar-les permanentment d'acord amb les nostres polítiques de retenció de dades.
+        body_2: Per raons de seguretat, es conservaran algunes dades relacionades amb la verificació; d'aquesta manera si creessis un compte nou i el tornes a verificar, es podria vincular l'autorització amb aquest compte nou.
+        greetings_html: Atentament,<br/><a href="%{organization_url}">%{organization_name}</a>
+        hello: Hola %{username},
+      subject: El teu compte ha estat eliminat
     devise:
       omniauth_registrations:
         create:
@@ -1523,13 +1530,6 @@ ca:
         log_in: entra
         never_logged_in: mai ha iniciat sessió
         subject: Avís de compte inactiu
-      removal_notification:
-        body: El teu compte a %{organization_name} s'ha eliminat per inactivitat.
-        greetings_html: |
-          Atentament,<br>
-          %{organization_name}
-        hello: Hola %{username},
-        subject: Avís de compte inactiu
     passwords:
       update:
         error: Hi ha hagut un problema en actualitzar la contrasenya.
diff --git a/decidim-core/config/locales/cs.yml b/decidim-core/config/locales/cs.yml
index 0d91f6bdca795..b48ae9d9357ef 100644
--- a/decidim-core/config/locales/cs.yml
+++ b/decidim-core/config/locales/cs.yml
@@ -1545,12 +1545,6 @@ cs:
         log_in: přihlásit se
         never_logged_in: nikdy se nepřihlásil
         subject: Upozornění na neaktivní účet
-      removal_notification:
-        body: Váš %{organization_name} účet byl odstraněn z důvodu neaktivity.
-        greetings_html: |
-          S pozdravem,<br>
-          %{organization_name}
-        subject: Neaktivní účet byl smazán
     passwords:
       update:
         error: Došlo k problému s aktualizací hesla.
diff --git a/decidim-core/config/locales/de.yml b/decidim-core/config/locales/de.yml
index 072c0668e7d81..866791e274761 100644
--- a/decidim-core/config/locales/de.yml
+++ b/decidim-core/config/locales/de.yml
@@ -1515,12 +1515,6 @@ de:
         log_in: anmelden
         never_logged_in: Nie angemeldet
         subject: Inaktive Kontowarnung
-      removal_notification:
-        body: Ihr %{organization_name} Konto wurde aufgrund von Inaktivität gelöscht.
-        greetings_html: |
-          Freundliche Grüsse,<br>
-          %{organization_name}
-        subject: Inaktives Konto gelöscht
     passwords:
       update:
         error: Es gab ein Problem bei der Aktualisierung des Passwortes.
diff --git a/decidim-core/config/locales/es-MX.yml b/decidim-core/config/locales/es-MX.yml
index 3c9f7ca7955b7..41806ebf715c8 100644
--- a/decidim-core/config/locales/es-MX.yml
+++ b/decidim-core/config/locales/es-MX.yml
@@ -664,6 +664,13 @@ es-MX:
           all: Todos
         filter_taxonomy_values:
           all: Todas
+    delete_user_mailer:
+      delete:
+        body_1: Tu cuenta ha sido desactivada y ya no es accesible. Tus datos personales están programados para su eliminación permanente de acuerdo con nuestras políticas de retención de datos.
+        body_2: Por razones de seguridad, se conservarán algunos datos relacionados con la verificación; de este modo si crearas una nueva cuenta y la verificaras de nuevo, se podría vincular la autorización con esta nueva cuenta.
+        greetings_html: Atentamente,<br/><a href="%{organization_url}">%{organization_name}</a>
+        hello: Hola %{username},
+      subject: Tu cuenta ha sido eliminada
     devise:
       omniauth_registrations:
         create:
@@ -1526,13 +1533,6 @@ es-MX:
         log_in: entra
         never_logged_in: nunca ha iniciado sesión
         subject: Aviso de cuenta inactiva
-      removal_notification:
-        body: Tu cuenta en %{organization_name} ha sido eliminada por inactividad.
-        greetings_html: |
-          Atentamente,<br>
-          %{organization_name}
-        hello: Hola %{username},
-        subject: Aviso de cuenta inactiva
     passwords:
       update:
         error: Ha habido un problema al actualizar la contraseña.
diff --git a/decidim-core/config/locales/es-PY.yml b/decidim-core/config/locales/es-PY.yml
index 7b3f4d8dbaef5..bdc303d86b1c7 100644
--- a/decidim-core/config/locales/es-PY.yml
+++ b/decidim-core/config/locales/es-PY.yml
@@ -664,6 +664,13 @@ es-PY:
           all: Todos
         filter_taxonomy_values:
           all: Todas
+    delete_user_mailer:
+      delete:
+        body_1: Tu cuenta ha sido desactivada y ya no es accesible. Tus datos personales están programados para su eliminación permanente de acuerdo con nuestras políticas de retención de datos.
+        body_2: Por razones de seguridad, se conservarán algunos datos relacionados con la verificación; de este modo si crearas una nueva cuenta y la verificaras de nuevo, se podría vincular la autorización con esta nueva cuenta.
+        greetings_html: Atentamente,<br/><a href="%{organization_url}">%{organization_name}</a>
+        hello: Hola %{username},
+      subject: Tu cuenta ha sido eliminada
     devise:
       omniauth_registrations:
         create:
@@ -1526,13 +1533,6 @@ es-PY:
         log_in: entra
         never_logged_in: nunca ha iniciado sesión
         subject: Aviso de cuenta inactiva
-      removal_notification:
-        body: Tu cuenta en %{organization_name} ha sido eliminada por inactividad.
-        greetings_html: |
-          Atentamente,<br>
-          %{organization_name}
-        hello: Hola %{username},
-        subject: Aviso de cuenta inactiva
     passwords:
       update:
         error: Ha habido un problema al actualizar la contraseña.
diff --git a/decidim-core/config/locales/es.yml b/decidim-core/config/locales/es.yml
index 504f967e2011e..d75626885c959 100644
--- a/decidim-core/config/locales/es.yml
+++ b/decidim-core/config/locales/es.yml
@@ -661,6 +661,13 @@ es:
           all: Todos
         filter_taxonomy_values:
           all: Todas
+    delete_user_mailer:
+      delete:
+        body_1: Tu cuenta ha sido desactivada y ya no es accesible. Tus datos personales están programados para su eliminación permanente de acuerdo con nuestras políticas de retención de datos.
+        body_2: Por razones de seguridad, se conservarán algunos datos relacionados con la verificación; de este modo si crearas una nueva cuenta y la verificaras de nuevo, se podría vincular la autorización con esta nueva cuenta.
+        greetings_html: Atentamente,<br/><a href="%{organization_url}">%{organization_name}</a>
+        hello: Hola %{username},
+      subject: Tu cuenta ha sido eliminada
     devise:
       omniauth_registrations:
         create:
@@ -1523,13 +1530,6 @@ es:
         log_in: entra
         never_logged_in: nunca ha iniciado sesión
         subject: Aviso de cuenta inactiva
-      removal_notification:
-        body: Tu cuenta en %{organization_name} ha sido eliminada por inactividad.
-        greetings_html: |
-          Atentamente,<br>
-          %{organization_name}
-        hello: Hola %{username},
-        subject: Aviso de cuenta inactiva
     passwords:
       update:
         error: Se ha producido un error al actualizar la contraseña.
diff --git a/decidim-core/config/locales/eu.yml b/decidim-core/config/locales/eu.yml
index 0f3d9e5b3278c..49a1a7602e653 100644
--- a/decidim-core/config/locales/eu.yml
+++ b/decidim-core/config/locales/eu.yml
@@ -662,6 +662,13 @@ eu:
           all: Guztiak
         filter_taxonomy_values:
           all: Guztiak
+    delete_user_mailer:
+      delete:
+        body_1: Zure kontua desaktibatu egin da eta ezin da sartu. Zure datu pertsonalak behin betiko ezabatuko dira, datuak gordetzeko gure politikekin bat etorriz.
+        body_2: Segurtasun arrazoiengatik, baimenarekin lotutako datu batzuk gordeko dira; kontu berri bat sortu eta berriro baimena ematen baduzu, zure kontu berriarekin lotuta egon daiteke.
+        greetings_html: Adeitasunez, <br/><a href="%{organization_url}">%{organization_name}</a>
+        hello: '%{username}, estimatua:'
+      subject: Zure kontua ezabatu egin da
     devise:
       omniauth_registrations:
         create:
@@ -1523,13 +1530,6 @@ eu:
         log_in: hasi saioa
         never_logged_in: inoiz ez konektatua
         subject: Kontu inaktiboaren abisua
-      removal_notification:
-        body: Zure %{organization_name} kontua ezabatu egin da inaktibitateagatik.
-        greetings_html: |
-          Adeitasunez,<br>
-          %{organization_name}
-        hello: '%{username}, estimatua:'
-        subject: Kontu inaktiboa ezabatua
     passwords:
       update:
         error: Arazo bat egon da pasahitza eguneratzean.
diff --git a/decidim-core/config/locales/fi-plain.yml b/decidim-core/config/locales/fi-plain.yml
index c5f6710d1bf65..a0dd6857b1ce7 100644
--- a/decidim-core/config/locales/fi-plain.yml
+++ b/decidim-core/config/locales/fi-plain.yml
@@ -664,6 +664,13 @@ fi-pl:
           all: Kaikki
         filter_taxonomy_values:
           all: Kaikki
+    delete_user_mailer:
+      delete:
+        body_1: Tilisi on poistettu käytöstä ja se ei ole enää käytettävissä. Henkilötietosi on tarkoitus poistaa pysyvästi tietojen säilyttämiskäytäntöjemme mukaisesti.
+        body_2: Turvallisuussyistä tietyt vahvistuksiin liittyvät tiedot säilytetään. Jos luot uuden tilin ja vahvistat sen uudestaan, tiedot voidaan liittää uuteen tiliisi.
+        greetings_html: Terveisin,<br/><a href="%{organization_url}">%{organization_name}</a>
+        hello: Hei %{username},
+      subject: Tilisi on poistettu
     devise:
       omniauth_registrations:
         create:
@@ -1525,13 +1532,6 @@ fi-pl:
         log_in: kirjaudu sisään
         never_logged_in: et ole koskaan kirjautunut palveluun
         subject: Varoitus passiivisesta käyttäjätilistä
-      removal_notification:
-        body: Tilisi palvelussa %{organization_name} on poistettu, koska tiliä ei ole käytetty pitkään aikaan.
-        greetings_html: |
-          Terveisin,<br>
-          %{organization_name}
-        hello: Hei %{username},
-        subject: Käyttämättä ollut tili on poistettu
     passwords:
       update:
         error: Salasanan päivitys epäonnistui.
diff --git a/decidim-core/config/locales/fi.yml b/decidim-core/config/locales/fi.yml
index 0afacced47170..ecb28b6949bbe 100644
--- a/decidim-core/config/locales/fi.yml
+++ b/decidim-core/config/locales/fi.yml
@@ -664,6 +664,13 @@ fi:
           all: Kaikki
         filter_taxonomy_values:
           all: Kaikki
+    delete_user_mailer:
+      delete:
+        body_1: Tilisi on poistettu käytöstä ja se ei ole enää käytettävissä. Henkilötietosi on tarkoitus poistaa pysyvästi tietojen säilyttämiskäytäntöjemme mukaisesti.
+        body_2: Turvallisuussyistä tietyt vahvistuksiin liittyvät tiedot säilytetään. Jos luot uuden tilin ja vahvistat sen uudestaan, tiedot voidaan liittää uuteen tiliisi.
+        greetings_html: Terveisin,<br/><a href="%{organization_url}">%{organization_name}</a>
+        hello: Hei %{username},
+      subject: Tilisi on poistettu
     devise:
       omniauth_registrations:
         create:
@@ -1525,13 +1532,6 @@ fi:
         log_in: kirjaudu sisään
         never_logged_in: et ole koskaan kirjautunut palveluun
         subject: Varoitus passiivisesta käyttäjätilistä
-      removal_notification:
-        body: Tilisi palvelussa %{organization_name} on poistettu, koska tiliä ei ole käytetty pitkään aikaan.
-        greetings_html: |
-          Terveisin,<br>
-          %{organization_name}
-        hello: Hei %{username},
-        subject: Käyttämättä ollut tili on poistettu
     passwords:
       update:
         error: Salasanan päivitys epäonnistui.
diff --git a/decidim-core/config/locales/fr-CA.yml b/decidim-core/config/locales/fr-CA.yml
index 1dba21298bc6f..c4782e10beb84 100644
--- a/decidim-core/config/locales/fr-CA.yml
+++ b/decidim-core/config/locales/fr-CA.yml
@@ -622,6 +622,13 @@ fr-CA:
           all: Tout
         filter_scope_values:
           all: Tout
+    delete_user_mailer:
+      delete:
+        body_1: Votre compte a été désactivé et n'est plus accessible. La suppression permanente de vos données personnelles a été programmée, conformément à nos politiques de conservation.
+        body_2: Pour des raisons de sécurité, certaines données relatives à l’autorisation seront conservées ; si vous créez un nouveau compte et que vous l'autorisez à nouveau, elles peuvent être reliées à votre nouveau compte.
+        greetings_html: Cordialement,<br/><a href="%{organization_url}">%{organization_name}</a>
+        hello: Cher(ère) %{username},
+      subject: Votre compte a été supprimé
     devise:
       omniauth_registrations:
         create:
@@ -1377,13 +1384,6 @@ fr-CA:
         log_in: se connecter
         never_logged_in: jamais connecté
         subject: Avertissement de compte inactif
-      removal_notification:
-        body: Votre compte %{organization_name} a été supprimé en raison de son inactivité.
-        greetings_html: |
-          Cordialement,<br>
-          %{organization_name}
-        hello: Cher(ère) %{username},
-        subject: Compte inactif supprimé
     passwords:
       update:
         error: Il y a eu un problème lors de la mise à jour de votre mot de passe.
diff --git a/decidim-core/config/locales/fr.yml b/decidim-core/config/locales/fr.yml
index 5a4983f034562..219922a375d71 100644
--- a/decidim-core/config/locales/fr.yml
+++ b/decidim-core/config/locales/fr.yml
@@ -622,6 +622,13 @@ fr:
           all: Tout
         filter_scope_values:
           all: Tout
+    delete_user_mailer:
+      delete:
+        body_1: Votre compte a été désactivé et n'est plus accessible. La suppression permanente de vos données personnelles a été programmée, conformément à nos politiques de conservation.
+        body_2: Pour des raisons de sécurité, certaines données relatives à l’autorisation seront conservées ; si vous créez un nouveau compte et que vous l'autorisez à nouveau, elles peuvent être reliées à votre nouveau compte.
+        greetings_html: Cordialement,<br/><a href="%{organization_url}">%{organization_name}</a>
+        hello: Cher(ère) %{username},
+      subject: Votre compte a été supprimé
     devise:
       omniauth_registrations:
         create:
@@ -1377,13 +1384,6 @@ fr:
         log_in: se connecter
         never_logged_in: jamais connecté
         subject: Avertissement de compte inactif
-      removal_notification:
-        body: Votre compte %{organization_name} a été supprimé en raison de son inactivité.
-        greetings_html: |
-          Cordialement,<br>
-          %{organization_name}
-        hello: Cher(ère) %{username},
-        subject: Compte inactif supprimé
     passwords:
       update:
         error: Il y a eu un problème lors de la mise à jour de votre mot de passe.
diff --git a/decidim-core/config/locales/ja.yml b/decidim-core/config/locales/ja.yml
index 63af73a36076f..2d314ba4a4f15 100644
--- a/decidim-core/config/locales/ja.yml
+++ b/decidim-core/config/locales/ja.yml
@@ -647,6 +647,13 @@ ja:
           all: すべて
         filter_taxonomy_values:
           all: すべて
+    delete_user_mailer:
+      delete:
+        body_1: アカウントは無効化されており、現在アクセスできません。あなたの個人データは、本サービスのデータ保持ポリシーに従い、永久削除される予定です。
+        body_2: セキュリティ上の理由から、一部の認証関連データは保持されます。新たにアカウントを作成し、再度認証を行った場合、これらのデータが新規アカウントに紐付けられる可能性があります。
+        greetings_html: よろしくお願いいたします。<br/><a href="%{organization_url}">%{organization_name}</a>
+        hello: こんにちは %{username} さん、
+      subject: アカウントは削除されました
     devise:
       omniauth_registrations:
         create:
@@ -1505,12 +1512,6 @@ ja:
         log_in: ログイン
         never_logged_in: ログインしたことがない
         subject: 非アクティブなアカウントの警告
-      removal_notification:
-        body: あなたの %{organization_name} アカウントは非アクティブのため削除されました。
-        greetings_html: |
-          よろしくお願いいたします。<br>
-          %{organization_name}
-        subject: 非アクティブなアカウントが削除されました
     passwords:
       update:
         error: パスワードの更新中に問題が発生しました。
diff --git a/decidim-core/config/locales/pt-BR.yml b/decidim-core/config/locales/pt-BR.yml
index a0f91d2d1378c..7b3d7d494d5a4 100644
--- a/decidim-core/config/locales/pt-BR.yml
+++ b/decidim-core/config/locales/pt-BR.yml
@@ -1518,12 +1518,6 @@ pt-BR:
         log_in: iniciar sessão
         never_logged_in: nunca iniciou sessão
         subject: Aviso de conta inativa
-      removal_notification:
-        body: Sua conta %{organization_name} foi excluída devido a inatividade.
-        greetings_html: |
-          Atenciosamente,<br>
-          %{organization_name}
-        subject: Conta inativa excluída
     passwords:
       update:
         error: Houve um problema ao atualizar a senha.
diff --git a/decidim-core/config/locales/ro-RO.yml b/decidim-core/config/locales/ro-RO.yml
index 67f04f7bf5aef..807ccb0666fa7 100644
--- a/decidim-core/config/locales/ro-RO.yml
+++ b/decidim-core/config/locales/ro-RO.yml
@@ -1408,12 +1408,6 @@ ro:
         log_in: autentificare
         never_logged_in: niciodată autentificat
         subject: Avertizare cont inactiv
-      removal_notification:
-        body: Contul dumneavoastră din %{organization_name} a fost șters din cauza inactivității.
-        greetings_html: |
-          Cu stimă,<br>
-          %{organization_name}
-        subject: Cont inactiv șters
     profile:
       deleted: Participant șters
     profiles:
diff --git a/decidim-core/config/locales/sk.yml b/decidim-core/config/locales/sk.yml
index 23eefebcec6c1..086346d775a71 100644
--- a/decidim-core/config/locales/sk.yml
+++ b/decidim-core/config/locales/sk.yml
@@ -1565,12 +1565,6 @@ sk:
         log_in: prihlásiť sa
         never_logged_in: nikdy neprihlásený/á
         subject: Upozornenie na neaktívny účet
-      removal_notification:
-        body: Váš účet %{organization_name} bol vymazaný z dôvodu neaktivity.
-        greetings_html: |
-          S pozdravom,<br>
-          %{organization_name}
-        subject: Neaktívny účet bol vymazaný
     passwords:
       update:
         error: Pri aktualizácii hesla sa vyskytol problém.
diff --git a/decidim-core/config/locales/sv.yml b/decidim-core/config/locales/sv.yml
index dc3f74faea53e..0730822155a96 100644
--- a/decidim-core/config/locales/sv.yml
+++ b/decidim-core/config/locales/sv.yml
@@ -1525,12 +1525,6 @@ sv:
         log_in: logga in
         never_logged_in: har aldrig loggat in
         subject: Varning om inaktivt konto
-      removal_notification:
-        body: Ditt %{organization_name}-konto har tagits bort på grund av inaktivitet.
-        greetings_html: |
-          Vänliga hälsningar,<br>
-          %{organization_name}
-        subject: Inaktivt konto raderat
     passwords:
       update:
         error: Det gick inte att uppdatera lösenordet.
diff --git a/decidim-proposals/config/locales/ja.yml b/decidim-proposals/config/locales/ja.yml
index 7bf497f2280be..c0240ae59b4ac 100644
--- a/decidim-proposals/config/locales/ja.yml
+++ b/decidim-proposals/config/locales/ja.yml
@@ -847,6 +847,7 @@ ja:
         errors:
           device_not_supported: お使いのデバイスは位置情報サービスをサポートしていません。アドレスを手動で入力してください。
           no_device_location: 申し訳ありませんが、場所を検出できませんでした。アドレスを手動で入力してください。
+        locating: 位置情報を取得中…
         use_my_location: 現在地を使用
       invite_coauthors:
         cancel:
diff --git a/decidim-surveys/config/locales/ja.yml b/decidim-surveys/config/locales/ja.yml
index fde39b294af7b..75e2e0b3d3749 100644
--- a/decidim-surveys/config/locales/ja.yml
+++ b/decidim-surveys/config/locales/ja.yml
@@ -1,6 +1,9 @@
 ---
 ja:
   activemodel:
+    attributes:
+      response:
+        add_attachments: 添付ファイルを追加
     models:
       decidim/surveys/closed_survey_event: アンケートが終了しました
       decidim/surveys/opened_survey_event: アンケートを開始
diff --git a/decidim-system/config/locales/ja.yml b/decidim-system/config/locales/ja.yml
index 8d042785cdec8..9f4955eec6a8d 100644
--- a/decidim-system/config/locales/ja.yml
+++ b/decidim-system/config/locales/ja.yml
@@ -41,6 +41,8 @@ ja:
               invalid: は無効な値です
             password:
               secret_key: このフィールドを保存するには、環境変数 SECRET_KEY_BASE を定義する必要があります
+            secondary_hosts:
+              invalid: は無効な値です
   decidim:
     system:
       actions:

From 6086e12a32638bc5df0c0b4e156d1acb2c287a73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?=
 <andreslucena@users.noreply.github.com>
Date: Mon, 6 Jul 2026 10:24:51 +0200
Subject: [PATCH 098/131] Bump to v0.31.6 version (#17241)

---
 .decidim-version                              |   2 +-
 CHANGELOG.md                                  |  96 +++++++++
 Gemfile.lock                                  | 198 +++++++++---------
 .../lib/decidim/accountability/version.rb     |   2 +-
 decidim-admin/lib/decidim/admin/version.rb    |   2 +-
 decidim-ai/lib/decidim/ai/version.rb          |   2 +-
 decidim-api/lib/decidim/api/version.rb        |   2 +-
 .../lib/decidim/assemblies/version.rb         |   2 +-
 decidim-blogs/lib/decidim/blogs/version.rb    |   2 +-
 .../lib/decidim/budgets/version.rb            |   2 +-
 .../decidim/collaborative_texts/version.rb    |   2 +-
 .../lib/decidim/comments/version.rb           |   2 +-
 .../lib/decidim/conferences/version.rb        |   2 +-
 decidim-core/lib/decidim/core/version.rb      |   2 +-
 .../lib/decidim/debates/version.rb            |   2 +-
 .../lib/decidim/demographics/version.rb       |   2 +-
 decidim-design/lib/decidim/design/version.rb  |   2 +-
 decidim-dev/lib/decidim/dev/version.rb        |   2 +-
 .../lib/decidim/elections/version.rb          |   2 +-
 decidim-forms/lib/decidim/forms/version.rb    |   2 +-
 decidim-generators/Gemfile.lock               | 198 +++++++++---------
 .../component_templates/Gemfile.erb           |   4 +-
 .../lib/decidim/generators/version.rb         |   2 +-
 .../lib/decidim/initiatives/version.rb        |   2 +-
 .../lib/decidim/meetings/version.rb           |   2 +-
 decidim-pages/lib/decidim/pages/version.rb    |   2 +-
 .../participatory_processes/version.rb        |   2 +-
 .../lib/decidim/proposals/version.rb          |   2 +-
 .../lib/decidim/sortitions/version.rb         |   2 +-
 .../lib/decidim/surveys/version.rb            |   2 +-
 decidim-system/lib/decidim/system/version.rb  |   2 +-
 .../lib/decidim/templates/version.rb          |   2 +-
 .../lib/decidim/verifications/version.rb      |   2 +-
 lib/decidim/version.rb                        |   2 +-
 package-lock.json                             |  14 +-
 packages/browserslist-config/package.json     |   2 +-
 packages/core/package.json                    |   2 +-
 packages/dev/package.json                     |   2 +-
 packages/eslint-config/package.json           |   2 +-
 packages/prettier-config/package.json         |   2 +-
 packages/stylelint-config/package.json        |   2 +-
 packages/webpacker/package.json               |   2 +-
 42 files changed, 340 insertions(+), 244 deletions(-)

diff --git a/.decidim-version b/.decidim-version
index 2b0d003c65c87..1866f2628c30a 100644
--- a/.decidim-version
+++ b/.decidim-version
@@ -1 +1 @@
-0.31.5
\ No newline at end of file
+0.31.6
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86447cc4874d0..0b52d5b62eb9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,101 @@
 # Changelog
 
+## [0.31.6](https://github.com/decidim/decidim/tree/0.31.6)
+
+### Added
+
+- **decidim-verifications**: Backport 'Execute authorization revocation in the background' to v0.31 [\#16806](https://github.com/decidim/decidim/pull/16806)
+- **decidim-system**: Backport 'Fix system organization form (short name update and only one locale)' to v0.31 [\#17144](https://github.com/decidim/decidim/pull/17144)
+
+### Changed
+
+Nothing.
+
+### Fixed
+
+- **decidim-admin**, **decidim-core**: Backport 'Fix spacing in content block settings forms' to v0.31 [\#16780](https://github.com/decidim/decidim/pull/16780)
+- **decidim-verifications**: Backport 'Execute authorization revocation in the background' to v0.31 [\#16806](https://github.com/decidim/decidim/pull/16806)
+- **decidim-core**: Backport 'Fix browser freeze when editing filters with many taxonomy items' to v0.31 [\#16804](https://github.com/decidim/decidim/pull/16804)
+- **decidim-admin**: Backport 'Fix flaky admin manages newsletters specs' to v0.31 [\#16815](https://github.com/decidim/decidim/pull/16815)
+- **decidim-forms**, **decidim-surveys**: Backport 'Fix modify responses on survey' to v0.31 [\#16809](https://github.com/decidim/decidim/pull/16809)
+- **decidim-core**: Backport 'Add default order to UserEntityList API function' to v0.31 [\#16839](https://github.com/decidim/decidim/pull/16839)
+- **decidim-core**: Backport 'Fix image upload HTML validation errors' to v0.31 [\#16849](https://github.com/decidim/decidim/pull/16849)
+- **decidim-elections**: Backport 'Display description richtext in elections questions' body' to v0.31 [\#16866](https://github.com/decidim/decidim/pull/16866)
+- **decidim-core**: Backport 'Fix floating help with the access modes alert on mobile' to v0.31 [\#16871](https://github.com/decidim/decidim/pull/16871)
+- **decidim-assemblies**, **decidim-conferences**, **decidim-core**, **decidim-dev**, **decidim-participatory processes**, **decidim-system**: Backport 'Fix `ActiveStorage::FileNotFoundError` in specs' to v0.31 [\#16863](https://github.com/decidim/decidim/pull/16863)
+- **decidim-budgets**: Backport 'Vote button shows budget projects when user is logged out' to v0.31 [\#16870](https://github.com/decidim/decidim/pull/16870)
+- **decidim-budgets**, **decidim-proposals**: Backport 'Fix blank state select import on budgets & proposal component' to v0.31 [\#16874](https://github.com/decidim/decidim/pull/16874)
+- **decidim-blogs**, **decidim-collaborative_texts**, **decidim-core**, **decidim-debates**, **decidim-meetings**, **decidim-proposals**: Backport 'Fix role menu/presentation on action buttons' to v0.31 [\#16878](https://github.com/decidim/decidim/pull/16878)
+- **decidim-comments**, **decidim-core**, **decidim-forms**, **decidim-meetings**, **decidim-templates**: Backport 'Fix Toggle Stimulus controller usage' to v0.31 [\#16868](https://github.com/decidim/decidim/pull/16868)
+- **decidim-admin**: Backport 'Check for existing user in "block user" form' to v0.31 [\#16901](https://github.com/decidim/decidim/pull/16901)
+- **decidim-admin**: Backport 'Check for existing user in "show email" form' to v0.31 [\#16905](https://github.com/decidim/decidim/pull/16905)
+- Backport 'Parametrize accessibility validator version' to v0.31 [\#16915](https://github.com/decidim/decidim/pull/16915)
+- **decidim-pages**: Backport 'Fix the pages component duplicate/copy hook name' to v0.31 [\#16921](https://github.com/decidim/decidim/pull/16921)
+- **decidim-blogs**: Backport 'Fix blogs `:comments_count` stat returning post count' to v0.31 [\#16923](https://github.com/decidim/decidim/pull/16923)
+- **decidim-assemblies**, **decidim-pages**, **decidim-participatory processes**: Backport 'Drop the "Duplicate landing page content blocks" from Duplicate Spaces forms' to v0.31 [\#16939](https://github.com/decidim/decidim/pull/16939)
+- **decidim-accountability**, **decidim-blogs**, **decidim-budgets**, **decidim-comments**, **decidim-core**, **decidim-debates**: Backport 'Fix comments count in statistics' to v0.31 [\#16945](https://github.com/decidim/decidim/pull/16945)
+- **decidim-accountability**, **decidim-admin**, **decidim-assemblies**, **decidim-blogs**, **decidim-budgets**, **decidim-collaborative_texts**, **decidim-conferences**, **decidim-debates**, **decidim-elections**, **decidim-initiatives**, **decidim-meetings**, **decidim-participatory processes**, **decidim-proposals**, **decidim-verifications**: Backport 'Open the actions' disabled button tooltip to the left' to v0.31 [\#16950](https://github.com/decidim/decidim/pull/16950)
+- **decidim-core**: Backport 'Fix unconditionally service workers inclusion in development' to v0.31 [\#16956](https://github.com/decidim/decidim/pull/16956)
+- **decidim-admin**, **decidim-assemblies**, **decidim-conferences**, **decidim-core**, **decidim-design**, **decidim-elections**, **decidim-initiatives**, **decidim-meetings**, **decidim-participatory processes**, **decidim-system**: Backport 'Fix add missing landmark roles for accessibility' to v0.31 [\#16963](https://github.com/decidim/decidim/pull/16963)
+- **decidim-proposals**: Backport 'Show number of votes in transparent space' to v0.31 [\#16975](https://github.com/decidim/decidim/pull/16975)
+- **decidim-meetings**: Backport 'Fix exception when user is already invited in meetings' to v0.31 [\#16987](https://github.com/decidim/decidim/pull/16987)
+- **decidim-elections**: Backport 'Prevent start date validation on manual start when editing published elections' to v0.31 [\#16998](https://github.com/decidim/decidim/pull/16998)
+- **decidim-core**: Backport 'Fix content renderers with DOM-aware replacement to respect HTML context' to v0.31 [\#16996](https://github.com/decidim/decidim/pull/16996)
+- **decidim-admin**, **decidim-core**, **decidim-meetings**, **decidim-proposals**: Backport 'Fix column sorting in admin tables' to v0.31 [\#16979](https://github.com/decidim/decidim/pull/16979)
+- **decidim-core**: Backport 'Fix locale setup in devise controllers' to v0.31 [\#16973](https://github.com/decidim/decidim/pull/16973)
+- **decidim-proposals**: Backport 'Fix eslint plugin import usage' to v0.31 [\#16967](https://github.com/decidim/decidim/pull/16967)
+- **decidim-core**: Backport 'Fix double-escaping on mobile menu navigation links' to v0.31 [\#17008](https://github.com/decidim/decidim/pull/17008)
+- **decidim-assemblies**, **decidim-participatory processes**: Backport 'Make import of assemblies/processes attachments more robust' to v0.31 [\#17015](https://github.com/decidim/decidim/pull/17015)
+- **decidim-assemblies**, **decidim-conferences**, **decidim-participatory processes**: Backport 'Fix unique constraint in space commands caused by deleted spaces' to v0.31 [\#17006](https://github.com/decidim/decidim/pull/17006)
+- **decidim-admin**, **decidim-comments**, **decidim-core**: Backport 'Replace tribute javascript with resource mention UI' to v0.31 [\#17021](https://github.com/decidim/decidim/pull/17021)
+- **decidim-admin**: Backport 'Check for existing user in new officialization form' to v0.31 [\#17030](https://github.com/decidim/decidim/pull/17030)
+- **decidim-core**: Backport 'Fix crash on login/logout with unsupported image file extensions' to v0.31 [\#17037](https://github.com/decidim/decidim/pull/17037)
+- **decidim-generators**: Backport 'Fix flaky on generators bundler (multijson)' to v0.31 [\#17039](https://github.com/decidim/decidim/pull/17039)
+- **decidim-core**: Backport 'Fix search indexing for unexisting locales' to v0.31 [\#17046](https://github.com/decidim/decidim/pull/17046)
+- **decidim-surveys**: Backport 'Fix census permissions in surveys' to v0.31 [\#17053](https://github.com/decidim/decidim/pull/17053)
+- **decidim-blogs**: Backport 'Fix exception on post new page as a visitor' to v0.31 [\#17059](https://github.com/decidim/decidim/pull/17059)
+- **decidim-initiatives**: Backport 'Fix exception in intiatives when `has_authorship?` receives a nil argument for u' to v0.31 [\#17067](https://github.com/decidim/decidim/pull/17067)
+- **decidim-blogs**, **decidim-debates**, **decidim-initiatives**, **decidim-meetings**, **decidim-proposals**: Backport 'Fix create meeting display button' to v0.31 [\#17056](https://github.com/decidim/decidim/pull/17056)
+- **decidim-core**: Backport 'Fix conversations multiple mentions UI' to v0.31 [\#17079](https://github.com/decidim/decidim/pull/17079)
+- **decidim-core**: Backport 'Fix performance when sending digest notitfications' to v0.31 [\#17076](https://github.com/decidim/decidim/pull/17076)
+- **decidim-core**: Backport 'Show errors in new conversation' to v0.31 [\#17086](https://github.com/decidim/decidim/pull/17086)
+- **decidim-admin**: Backport 'Improve taxonomy filter update performance' to v0.31 [\#17083](https://github.com/decidim/decidim/pull/17083)
+- **decidim-proposals**: Backport 'Fix rendering mentions for Proposals' answer page' to v0.31 [\#17092](https://github.com/decidim/decidim/pull/17092)
+- **decidim-templates**: Backport 'Fix flaky spec at admin adds display condition on template' to v0.31 [\#17097](https://github.com/decidim/decidim/pull/17097)
+- **decidim-accountability**, **decidim-admin**, **decidim-blogs**, **decidim-budgets**, **decidim-core**, **decidim-debates**, **decidim-meetings**, **decidim-proposals**: Backport 'Change setting "comments max length" for "max characters per comment"' to v0.31 [\#17103](https://github.com/decidim/decidim/pull/17103)
+- **decidim-accountability**: Backport 'Do not show the status select in the result form if no statuses' to v0.31 [\#17129](https://github.com/decidim/decidim/pull/17129)
+- **decidim-accountability**: Backport 'Add validation in status' progress field' to v0.31 [\#17127](https://github.com/decidim/decidim/pull/17127)
+- **decidim-forms**: Backport 'Fix data migration for answers to responses change' to v0.31 [\#17141](https://github.com/decidim/decidim/pull/17141)
+- **decidim-system**: Backport 'Fix system organization form (short name update and only one locale)' to v0.31 [\#17144](https://github.com/decidim/decidim/pull/17144)
+- Backport 'Remove check-spelling github workflow' to v0.31 [\#17152](https://github.com/decidim/decidim/pull/17152)
+- **decidim-core**: Backport 'Fix cache invalidation bug in highlighted spaces content blocks' to v0.31 [\#17171](https://github.com/decidim/decidim/pull/17171)
+- **decidim-verifications**: Backport 'Fix flaky spec at `authorizations_spec.rb`' to v0.31 [\#17179](https://github.com/decidim/decidim/pull/17179)
+- **decidim-core**, **decidim-proposals**: Backport 'Add visual feedback for the "Use my current location" feature' to v0.31 [\#17165](https://github.com/decidim/decidim/pull/17165)
+- **decidim-admin**, **decidim-ai**, **decidim-blogs**, **decidim-budgets**, **decidim-core**, **decidim-debates**, **decidim-dev**, **decidim-elections**, **decidim-forms**, **decidim-initiatives**, **decidim-meetings**, **decidim-proposals**, **decidim-surveys**: Backport 'Fix editing components with attachments' to v0.31 [\#17146](https://github.com/decidim/decidim/pull/17146)
+- **decidim-admin**, **decidim-core**, **decidim-dev**, **decidim-participatory processes**: Backport 'Fix file size validator in content block settings' to v0.31 [\#16970](https://github.com/decidim/decidim/pull/16970)
+- **decidim-admin**, **decidim-core**, **decidim-dev**: Backport 'Make the fields at the "highlighted content banner" content block required' to v0.31 [\#17125](https://github.com/decidim/decidim/pull/17125)
+- **decidim-admin**, **decidim-debates**: Backport 'Show debates' comments visualization locked on the form' to v0.31 [\#17174](https://github.com/decidim/decidim/pull/17174)
+- Backport 'Bump ruby from 3.3.0 to 3.3.4 in manual.adoc' to v0.31 [\#17200](https://github.com/decidim/decidim/pull/17200)
+- **decidim-accountability**, **decidim-admin**, **decidim-blogs**, **decidim-budgets**, **decidim-collaborative_texts**, **decidim-core**, **decidim-debates**, **decidim-meetings**, **decidim-pages**, **decidim-proposals**, **decidim-surveys**: Backport 'Fix flaky spec at `admin_manages_participatory_process_components_spec.rb`' to v0.31 [\#17183](https://github.com/decidim/decidim/pull/17183)
+- Backport 'Fix typos in docs' to v0.31 [\#17224](https://github.com/decidim/decidim/pull/17224)
+- **decidim-core**: Backport 'Fix delete user email notification' to v0.31 [\#17226](https://github.com/decidim/decidim/pull/17226)
+- **decidim-core**: Backport 'Fix flaky specs on `authentication_spec.rb`' to v0.31 [\#17227](https://github.com/decidim/decidim/pull/17227)
+
+### Removed
+
+Nothing.
+
+### Developer improvements
+
+Nothing.
+
+### Internal
+
+- Add devcontainer configuration and scripts for v0.31 [\#16743](https://github.com/decidim/decidim/pull/16743)
+- **decidim-admin**, **decidim-comments**, **decidim-core**: Backport 'Replace tribute javascript with resource mention UI' to v0.31 [\#17021](https://github.com/decidim/decidim/pull/17021)
+- Add missing imagemagick dependency to devcontainer (v0.31) [\#17123](https://github.com/decidim/decidim/pull/17123)
+- Backport 'Remove check-spelling github workflow' to v0.31 [\#17152](https://github.com/decidim/decidim/pull/17152)
+
 ## [0.31.5](https://github.com/decidim/decidim/tree/0.31.5)
 
 ### Added
diff --git a/Gemfile.lock b/Gemfile.lock
index a14c190b624d0..8661d78873766 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,62 +1,62 @@
 PATH
   remote: .
   specs:
-    decidim (0.31.5)
-      decidim-accountability (= 0.31.5)
-      decidim-admin (= 0.31.5)
-      decidim-api (= 0.31.5)
-      decidim-assemblies (= 0.31.5)
-      decidim-blogs (= 0.31.5)
-      decidim-budgets (= 0.31.5)
-      decidim-comments (= 0.31.5)
-      decidim-core (= 0.31.5)
-      decidim-debates (= 0.31.5)
-      decidim-forms (= 0.31.5)
-      decidim-generators (= 0.31.5)
-      decidim-meetings (= 0.31.5)
-      decidim-pages (= 0.31.5)
-      decidim-participatory_processes (= 0.31.5)
-      decidim-proposals (= 0.31.5)
-      decidim-sortitions (= 0.31.5)
-      decidim-surveys (= 0.31.5)
-      decidim-system (= 0.31.5)
-      decidim-verifications (= 0.31.5)
-    decidim-accountability (0.31.5)
-      decidim-comments (= 0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-admin (0.31.5)
+    decidim (0.31.6)
+      decidim-accountability (= 0.31.6)
+      decidim-admin (= 0.31.6)
+      decidim-api (= 0.31.6)
+      decidim-assemblies (= 0.31.6)
+      decidim-blogs (= 0.31.6)
+      decidim-budgets (= 0.31.6)
+      decidim-comments (= 0.31.6)
+      decidim-core (= 0.31.6)
+      decidim-debates (= 0.31.6)
+      decidim-forms (= 0.31.6)
+      decidim-generators (= 0.31.6)
+      decidim-meetings (= 0.31.6)
+      decidim-pages (= 0.31.6)
+      decidim-participatory_processes (= 0.31.6)
+      decidim-proposals (= 0.31.6)
+      decidim-sortitions (= 0.31.6)
+      decidim-surveys (= 0.31.6)
+      decidim-system (= 0.31.6)
+      decidim-verifications (= 0.31.6)
+    decidim-accountability (0.31.6)
+      decidim-comments (= 0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-admin (0.31.6)
       active_link_to (~> 1.0)
-      decidim-core (= 0.31.5)
+      decidim-core (= 0.31.6)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0, >= 2.0.9)
-    decidim-ai (0.31.5)
+    decidim-ai (0.31.6)
       classifier-reborn (~> 2.3.0)
-      decidim-core (= 0.31.5)
-    decidim-api (0.31.5)
-      decidim-core (= 0.31.5)
+      decidim-core (= 0.31.6)
+    decidim-api (0.31.6)
+      decidim-core (= 0.31.6)
       devise-jwt (~> 0.12.1)
       graphql (~> 2.4.0, >= 2.4.17)
       graphql-docs (~> 5.0)
       rack-cors (~> 1.0)
-    decidim-assemblies (0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-blogs (0.31.5)
-      decidim-admin (= 0.31.5)
-      decidim-comments (= 0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-budgets (0.31.5)
-      decidim-comments (= 0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-collaborative_texts (0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-comments (0.31.5)
-      decidim-core (= 0.31.5)
+    decidim-assemblies (0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-blogs (0.31.6)
+      decidim-admin (= 0.31.6)
+      decidim-comments (= 0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-budgets (0.31.6)
+      decidim-comments (= 0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-collaborative_texts (0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-comments (0.31.6)
+      decidim-core (= 0.31.6)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-conferences (0.31.5)
-      decidim-core (= 0.31.5)
-      decidim-meetings (= 0.31.5)
-    decidim-core (0.31.5)
+    decidim-conferences (0.31.6)
+      decidim-core (= 0.31.6)
+      decidim-meetings (= 0.31.6)
+    decidim-core (0.31.6)
       active_link_to (~> 1.0)
       acts_as_list (~> 1.0)
       batch-loader (~> 2.0)
@@ -111,24 +111,24 @@ PATH
       valid_email2 (~> 7.0)
       web-push (~> 3.0)
       wisper (~> 3.0)
-    decidim-debates (0.31.5)
-      decidim-comments (= 0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-demographics (0.31.5)
-      decidim-core (= 0.31.5)
-      decidim-forms (= 0.31.5)
-    decidim-design (0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-dev (0.31.5)
+    decidim-debates (0.31.6)
+      decidim-comments (= 0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-demographics (0.31.6)
+      decidim-core (= 0.31.6)
+      decidim-forms (= 0.31.6)
+    decidim-design (0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-dev (0.31.6)
       bullet (~> 8.0.0)
       byebug (~> 11.0)
       capybara (~> 3.39)
-      decidim-admin (= 0.31.5)
-      decidim-api (= 0.31.5)
-      decidim-comments (= 0.31.5)
-      decidim-core (= 0.31.5)
-      decidim-generators (= 0.31.5)
-      decidim-verifications (= 0.31.5)
+      decidim-admin (= 0.31.6)
+      decidim-api (= 0.31.6)
+      decidim-comments (= 0.31.6)
+      decidim-core (= 0.31.6)
+      decidim-generators (= 0.31.6)
+      decidim-verifications (= 0.31.6)
       erb_lint (~> 0.8.0)
       factory_bot_rails (~> 6.2)
       faker (~> 3.2)
@@ -161,51 +161,51 @@ PATH
       w3c_rspec_validators (~> 0.3.0)
       webmock (~> 3.18)
       wisper-rspec (~> 1.0)
-    decidim-elections (0.31.5)
-      decidim-admin (= 0.31.5)
-      decidim-core (= 0.31.5)
-      decidim-forms (= 0.31.5)
-    decidim-forms (0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-generators (0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-initiatives (0.31.5)
-      decidim-admin (= 0.31.5)
-      decidim-comments (= 0.31.5)
-      decidim-core (= 0.31.5)
-      decidim-verifications (= 0.31.5)
-    decidim-meetings (0.31.5)
-      decidim-core (= 0.31.5)
-      decidim-forms (= 0.31.5)
+    decidim-elections (0.31.6)
+      decidim-admin (= 0.31.6)
+      decidim-core (= 0.31.6)
+      decidim-forms (= 0.31.6)
+    decidim-forms (0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-generators (0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-initiatives (0.31.6)
+      decidim-admin (= 0.31.6)
+      decidim-comments (= 0.31.6)
+      decidim-core (= 0.31.6)
+      decidim-verifications (= 0.31.6)
+    decidim-meetings (0.31.6)
+      decidim-core (= 0.31.6)
+      decidim-forms (= 0.31.6)
       icalendar (~> 2.5)
-    decidim-pages (0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-participatory_processes (0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-proposals (0.31.5)
-      decidim-comments (= 0.31.5)
-      decidim-core (= 0.31.5)
+    decidim-pages (0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-participatory_processes (0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-proposals (0.31.6)
+      decidim-comments (= 0.31.6)
+      decidim-core (= 0.31.6)
       doc2text (~> 0.4.0, >= 0.4.8)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-sortitions (0.31.5)
-      decidim-admin (= 0.31.5)
-      decidim-comments (= 0.31.5)
-      decidim-core (= 0.31.5)
-      decidim-proposals (= 0.31.5)
-    decidim-surveys (0.31.5)
-      decidim-core (= 0.31.5)
-      decidim-forms (= 0.31.5)
-    decidim-system (0.31.5)
+    decidim-sortitions (0.31.6)
+      decidim-admin (= 0.31.6)
+      decidim-comments (= 0.31.6)
+      decidim-core (= 0.31.6)
+      decidim-proposals (= 0.31.6)
+    decidim-surveys (0.31.6)
+      decidim-core (= 0.31.6)
+      decidim-forms (= 0.31.6)
+    decidim-system (0.31.6)
       active_link_to (~> 1.0)
-      decidim-core (= 0.31.5)
+      decidim-core (= 0.31.6)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0, >= 2.0.9)
-    decidim-templates (0.31.5)
-      decidim-core (= 0.31.5)
-      decidim-forms (= 0.31.5)
-    decidim-verifications (0.31.5)
-      decidim-core (= 0.31.5)
+    decidim-templates (0.31.6)
+      decidim-core (= 0.31.6)
+      decidim-forms (= 0.31.6)
+    decidim-verifications (0.31.6)
+      decidim-core (= 0.31.6)
 
 GEM
   remote: https://rubygems.org/
diff --git a/decidim-accountability/lib/decidim/accountability/version.rb b/decidim-accountability/lib/decidim/accountability/version.rb
index 397ed0c0e0ab7..a00a05f80626b 100644
--- a/decidim-accountability/lib/decidim/accountability/version.rb
+++ b/decidim-accountability/lib/decidim/accountability/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-accountability version.
   module Accountability
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-admin/lib/decidim/admin/version.rb b/decidim-admin/lib/decidim/admin/version.rb
index 05284ecfd052b..4c4574a0f8397 100644
--- a/decidim-admin/lib/decidim/admin/version.rb
+++ b/decidim-admin/lib/decidim/admin/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-admin version.
   module Admin
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-ai/lib/decidim/ai/version.rb b/decidim-ai/lib/decidim/ai/version.rb
index fd4d9250b86cd..903594c159b82 100644
--- a/decidim-ai/lib/decidim/ai/version.rb
+++ b/decidim-ai/lib/decidim/ai/version.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Ai
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-api/lib/decidim/api/version.rb b/decidim-api/lib/decidim/api/version.rb
index 8256e3d5549f1..5a83fa7e1a000 100644
--- a/decidim-api/lib/decidim/api/version.rb
+++ b/decidim-api/lib/decidim/api/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-api version.
   module Api
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-assemblies/lib/decidim/assemblies/version.rb b/decidim-assemblies/lib/decidim/assemblies/version.rb
index e49bef4da0b3b..f47c81efd02c5 100644
--- a/decidim-assemblies/lib/decidim/assemblies/version.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-assemblies version.
   module Assemblies
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-blogs/lib/decidim/blogs/version.rb b/decidim-blogs/lib/decidim/blogs/version.rb
index d68e2baab951d..d3144d59b443a 100644
--- a/decidim-blogs/lib/decidim/blogs/version.rb
+++ b/decidim-blogs/lib/decidim/blogs/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-pages version.
   module Blogs
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-budgets/lib/decidim/budgets/version.rb b/decidim-budgets/lib/decidim/budgets/version.rb
index 3825076381c14..6400ef4f812b2 100644
--- a/decidim-budgets/lib/decidim/budgets/version.rb
+++ b/decidim-budgets/lib/decidim/budgets/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-budgets version.
   module Budgets
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-collaborative_texts/lib/decidim/collaborative_texts/version.rb b/decidim-collaborative_texts/lib/decidim/collaborative_texts/version.rb
index ac613b4b33f67..82a702073b2d3 100644
--- a/decidim-collaborative_texts/lib/decidim/collaborative_texts/version.rb
+++ b/decidim-collaborative_texts/lib/decidim/collaborative_texts/version.rb
@@ -3,7 +3,7 @@
 module Decidim
   module CollaborativeTexts
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-comments/lib/decidim/comments/version.rb b/decidim-comments/lib/decidim/comments/version.rb
index 209e4f320c722..4f7763da2de16 100644
--- a/decidim-comments/lib/decidim/comments/version.rb
+++ b/decidim-comments/lib/decidim/comments/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-comments version.
   module Comments
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-conferences/lib/decidim/conferences/version.rb b/decidim-conferences/lib/decidim/conferences/version.rb
index ce06329833124..2e5b60f9c1800 100644
--- a/decidim-conferences/lib/decidim/conferences/version.rb
+++ b/decidim-conferences/lib/decidim/conferences/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-conferences version.
   module Conferences
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-core/lib/decidim/core/version.rb b/decidim-core/lib/decidim/core/version.rb
index 3df1f88d46d37..4007a8dc78c42 100644
--- a/decidim-core/lib/decidim/core/version.rb
+++ b/decidim-core/lib/decidim/core/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-debates/lib/decidim/debates/version.rb b/decidim-debates/lib/decidim/debates/version.rb
index c1c55cb07b683..d1af65af5b0b2 100644
--- a/decidim-debates/lib/decidim/debates/version.rb
+++ b/decidim-debates/lib/decidim/debates/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-debates version.
   module Debates
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-demographics/lib/decidim/demographics/version.rb b/decidim-demographics/lib/decidim/demographics/version.rb
index 1783d7873711e..08ceab66a456a 100644
--- a/decidim-demographics/lib/decidim/demographics/version.rb
+++ b/decidim-demographics/lib/decidim/demographics/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-demographics version.
   module Demographics
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-design/lib/decidim/design/version.rb b/decidim-design/lib/decidim/design/version.rb
index fdf8ef697d075..11a82b12877c2 100644
--- a/decidim-design/lib/decidim/design/version.rb
+++ b/decidim-design/lib/decidim/design/version.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Design
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-dev/lib/decidim/dev/version.rb b/decidim-dev/lib/decidim/dev/version.rb
index f095cae9754d8..52cd0f57e1b1e 100644
--- a/decidim-dev/lib/decidim/dev/version.rb
+++ b/decidim-dev/lib/decidim/dev/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-dev version.
   module Dev
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-elections/lib/decidim/elections/version.rb b/decidim-elections/lib/decidim/elections/version.rb
index 6e70faddd4be1..3ca9eabc3e765 100644
--- a/decidim-elections/lib/decidim/elections/version.rb
+++ b/decidim-elections/lib/decidim/elections/version.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Elections
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-forms/lib/decidim/forms/version.rb b/decidim-forms/lib/decidim/forms/version.rb
index 4be89252dff11..649b9f2757b4a 100644
--- a/decidim-forms/lib/decidim/forms/version.rb
+++ b/decidim-forms/lib/decidim/forms/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-forms version.
   module Forms
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-generators/Gemfile.lock b/decidim-generators/Gemfile.lock
index 73566a7745715..4828876d2361a 100644
--- a/decidim-generators/Gemfile.lock
+++ b/decidim-generators/Gemfile.lock
@@ -1,62 +1,62 @@
 PATH
   remote: ..
   specs:
-    decidim (0.31.5)
-      decidim-accountability (= 0.31.5)
-      decidim-admin (= 0.31.5)
-      decidim-api (= 0.31.5)
-      decidim-assemblies (= 0.31.5)
-      decidim-blogs (= 0.31.5)
-      decidim-budgets (= 0.31.5)
-      decidim-comments (= 0.31.5)
-      decidim-core (= 0.31.5)
-      decidim-debates (= 0.31.5)
-      decidim-forms (= 0.31.5)
-      decidim-generators (= 0.31.5)
-      decidim-meetings (= 0.31.5)
-      decidim-pages (= 0.31.5)
-      decidim-participatory_processes (= 0.31.5)
-      decidim-proposals (= 0.31.5)
-      decidim-sortitions (= 0.31.5)
-      decidim-surveys (= 0.31.5)
-      decidim-system (= 0.31.5)
-      decidim-verifications (= 0.31.5)
-    decidim-accountability (0.31.5)
-      decidim-comments (= 0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-admin (0.31.5)
+    decidim (0.31.6)
+      decidim-accountability (= 0.31.6)
+      decidim-admin (= 0.31.6)
+      decidim-api (= 0.31.6)
+      decidim-assemblies (= 0.31.6)
+      decidim-blogs (= 0.31.6)
+      decidim-budgets (= 0.31.6)
+      decidim-comments (= 0.31.6)
+      decidim-core (= 0.31.6)
+      decidim-debates (= 0.31.6)
+      decidim-forms (= 0.31.6)
+      decidim-generators (= 0.31.6)
+      decidim-meetings (= 0.31.6)
+      decidim-pages (= 0.31.6)
+      decidim-participatory_processes (= 0.31.6)
+      decidim-proposals (= 0.31.6)
+      decidim-sortitions (= 0.31.6)
+      decidim-surveys (= 0.31.6)
+      decidim-system (= 0.31.6)
+      decidim-verifications (= 0.31.6)
+    decidim-accountability (0.31.6)
+      decidim-comments (= 0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-admin (0.31.6)
       active_link_to (~> 1.0)
-      decidim-core (= 0.31.5)
+      decidim-core (= 0.31.6)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0, >= 2.0.9)
-    decidim-ai (0.31.5)
+    decidim-ai (0.31.6)
       classifier-reborn (~> 2.3.0)
-      decidim-core (= 0.31.5)
-    decidim-api (0.31.5)
-      decidim-core (= 0.31.5)
+      decidim-core (= 0.31.6)
+    decidim-api (0.31.6)
+      decidim-core (= 0.31.6)
       devise-jwt (~> 0.12.1)
       graphql (~> 2.4.0, >= 2.4.17)
       graphql-docs (~> 5.0)
       rack-cors (~> 1.0)
-    decidim-assemblies (0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-blogs (0.31.5)
-      decidim-admin (= 0.31.5)
-      decidim-comments (= 0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-budgets (0.31.5)
-      decidim-comments (= 0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-collaborative_texts (0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-comments (0.31.5)
-      decidim-core (= 0.31.5)
+    decidim-assemblies (0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-blogs (0.31.6)
+      decidim-admin (= 0.31.6)
+      decidim-comments (= 0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-budgets (0.31.6)
+      decidim-comments (= 0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-collaborative_texts (0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-comments (0.31.6)
+      decidim-core (= 0.31.6)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-conferences (0.31.5)
-      decidim-core (= 0.31.5)
-      decidim-meetings (= 0.31.5)
-    decidim-core (0.31.5)
+    decidim-conferences (0.31.6)
+      decidim-core (= 0.31.6)
+      decidim-meetings (= 0.31.6)
+    decidim-core (0.31.6)
       active_link_to (~> 1.0)
       acts_as_list (~> 1.0)
       batch-loader (~> 2.0)
@@ -111,24 +111,24 @@ PATH
       valid_email2 (~> 7.0)
       web-push (~> 3.0)
       wisper (~> 3.0)
-    decidim-debates (0.31.5)
-      decidim-comments (= 0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-demographics (0.31.5)
-      decidim-core (= 0.31.5)
-      decidim-forms (= 0.31.5)
-    decidim-design (0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-dev (0.31.5)
+    decidim-debates (0.31.6)
+      decidim-comments (= 0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-demographics (0.31.6)
+      decidim-core (= 0.31.6)
+      decidim-forms (= 0.31.6)
+    decidim-design (0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-dev (0.31.6)
       bullet (~> 8.0.0)
       byebug (~> 11.0)
       capybara (~> 3.39)
-      decidim-admin (= 0.31.5)
-      decidim-api (= 0.31.5)
-      decidim-comments (= 0.31.5)
-      decidim-core (= 0.31.5)
-      decidim-generators (= 0.31.5)
-      decidim-verifications (= 0.31.5)
+      decidim-admin (= 0.31.6)
+      decidim-api (= 0.31.6)
+      decidim-comments (= 0.31.6)
+      decidim-core (= 0.31.6)
+      decidim-generators (= 0.31.6)
+      decidim-verifications (= 0.31.6)
       erb_lint (~> 0.8.0)
       factory_bot_rails (~> 6.2)
       faker (~> 3.2)
@@ -161,51 +161,51 @@ PATH
       w3c_rspec_validators (~> 0.3.0)
       webmock (~> 3.18)
       wisper-rspec (~> 1.0)
-    decidim-elections (0.31.5)
-      decidim-admin (= 0.31.5)
-      decidim-core (= 0.31.5)
-      decidim-forms (= 0.31.5)
-    decidim-forms (0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-generators (0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-initiatives (0.31.5)
-      decidim-admin (= 0.31.5)
-      decidim-comments (= 0.31.5)
-      decidim-core (= 0.31.5)
-      decidim-verifications (= 0.31.5)
-    decidim-meetings (0.31.5)
-      decidim-core (= 0.31.5)
-      decidim-forms (= 0.31.5)
+    decidim-elections (0.31.6)
+      decidim-admin (= 0.31.6)
+      decidim-core (= 0.31.6)
+      decidim-forms (= 0.31.6)
+    decidim-forms (0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-generators (0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-initiatives (0.31.6)
+      decidim-admin (= 0.31.6)
+      decidim-comments (= 0.31.6)
+      decidim-core (= 0.31.6)
+      decidim-verifications (= 0.31.6)
+    decidim-meetings (0.31.6)
+      decidim-core (= 0.31.6)
+      decidim-forms (= 0.31.6)
       icalendar (~> 2.5)
-    decidim-pages (0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-participatory_processes (0.31.5)
-      decidim-core (= 0.31.5)
-    decidim-proposals (0.31.5)
-      decidim-comments (= 0.31.5)
-      decidim-core (= 0.31.5)
+    decidim-pages (0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-participatory_processes (0.31.6)
+      decidim-core (= 0.31.6)
+    decidim-proposals (0.31.6)
+      decidim-comments (= 0.31.6)
+      decidim-core (= 0.31.6)
       doc2text (~> 0.4.0, >= 0.4.8)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-sortitions (0.31.5)
-      decidim-admin (= 0.31.5)
-      decidim-comments (= 0.31.5)
-      decidim-core (= 0.31.5)
-      decidim-proposals (= 0.31.5)
-    decidim-surveys (0.31.5)
-      decidim-core (= 0.31.5)
-      decidim-forms (= 0.31.5)
-    decidim-system (0.31.5)
+    decidim-sortitions (0.31.6)
+      decidim-admin (= 0.31.6)
+      decidim-comments (= 0.31.6)
+      decidim-core (= 0.31.6)
+      decidim-proposals (= 0.31.6)
+    decidim-surveys (0.31.6)
+      decidim-core (= 0.31.6)
+      decidim-forms (= 0.31.6)
+    decidim-system (0.31.6)
       active_link_to (~> 1.0)
-      decidim-core (= 0.31.5)
+      decidim-core (= 0.31.6)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0, >= 2.0.9)
-    decidim-templates (0.31.5)
-      decidim-core (= 0.31.5)
-      decidim-forms (= 0.31.5)
-    decidim-verifications (0.31.5)
-      decidim-core (= 0.31.5)
+    decidim-templates (0.31.6)
+      decidim-core (= 0.31.6)
+      decidim-forms (= 0.31.6)
+    decidim-verifications (0.31.6)
+      decidim-core (= 0.31.6)
 
 GEM
   remote: https://rubygems.org/
diff --git a/decidim-generators/lib/decidim/generators/component_templates/Gemfile.erb b/decidim-generators/lib/decidim/generators/component_templates/Gemfile.erb
index aa2f1d70fb926..c9444ed2ea822 100644
--- a/decidim-generators/lib/decidim/generators/component_templates/Gemfile.erb
+++ b/decidim-generators/lib/decidim/generators/component_templates/Gemfile.erb
@@ -5,7 +5,7 @@ source "https://rubygems.org"
 
 ruby RUBY_VERSION
 
-gem "decidim", "~> 0.31.5"
+gem "decidim", "~> 0.31.6"
 gem "decidim-<%= component_name %>", path: "."
 
 gem "puma", ">= 6.3.1"
@@ -14,7 +14,7 @@ gem "bootsnap", "~> 1.4"
 group :development, :test do
   gem "byebug", "~> 11.0", platform: :mri
 
-  gem "decidim-dev", "~> 0.31.5"
+  gem "decidim-dev", "~> 0.31.6"
 end
 
 group :development do
diff --git a/decidim-generators/lib/decidim/generators/version.rb b/decidim-generators/lib/decidim/generators/version.rb
index 264d9fb140a8d..cbd87fec8ed76 100644
--- a/decidim-generators/lib/decidim/generators/version.rb
+++ b/decidim-generators/lib/decidim/generators/version.rb
@@ -4,7 +4,7 @@
 module Decidim
   module Generators
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-initiatives/lib/decidim/initiatives/version.rb b/decidim-initiatives/lib/decidim/initiatives/version.rb
index 808894d3d0b83..d8a290e9ccc6b 100644
--- a/decidim-initiatives/lib/decidim/initiatives/version.rb
+++ b/decidim-initiatives/lib/decidim/initiatives/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-initiatives version.
   module Initiatives
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-meetings/lib/decidim/meetings/version.rb b/decidim-meetings/lib/decidim/meetings/version.rb
index 12147d6c40fdb..cc457fe6e5189 100644
--- a/decidim-meetings/lib/decidim/meetings/version.rb
+++ b/decidim-meetings/lib/decidim/meetings/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Meetings
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-pages/lib/decidim/pages/version.rb b/decidim-pages/lib/decidim/pages/version.rb
index a6b36e502aa3c..ebb5845c29523 100644
--- a/decidim-pages/lib/decidim/pages/version.rb
+++ b/decidim-pages/lib/decidim/pages/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-pages version.
   module Pages
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/version.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/version.rb
index 899bd8dbb3fe8..e5af1b84399f9 100644
--- a/decidim-participatory_processes/lib/decidim/participatory_processes/version.rb
+++ b/decidim-participatory_processes/lib/decidim/participatory_processes/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-participatory_processes version.
   module ParticipatoryProcesses
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-proposals/lib/decidim/proposals/version.rb b/decidim-proposals/lib/decidim/proposals/version.rb
index b7992c1d82dab..7e8f31e4d3326 100644
--- a/decidim-proposals/lib/decidim/proposals/version.rb
+++ b/decidim-proposals/lib/decidim/proposals/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-sortitions/lib/decidim/sortitions/version.rb b/decidim-sortitions/lib/decidim/sortitions/version.rb
index 9f804479a2c9a..163ec2b199cc2 100644
--- a/decidim-sortitions/lib/decidim/sortitions/version.rb
+++ b/decidim-sortitions/lib/decidim/sortitions/version.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Sortitions
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-surveys/lib/decidim/surveys/version.rb b/decidim-surveys/lib/decidim/surveys/version.rb
index 5bedacf257a87..986083f947b68 100644
--- a/decidim-surveys/lib/decidim/surveys/version.rb
+++ b/decidim-surveys/lib/decidim/surveys/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-surveys version.
   module Surveys
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-system/lib/decidim/system/version.rb b/decidim-system/lib/decidim/system/version.rb
index 2fbdfef26f6fd..e5d327c69382d 100644
--- a/decidim-system/lib/decidim/system/version.rb
+++ b/decidim-system/lib/decidim/system/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-system version.
   module System
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-templates/lib/decidim/templates/version.rb b/decidim-templates/lib/decidim/templates/version.rb
index 6936d1d8a9e87..8e9a5b6f9e383 100644
--- a/decidim-templates/lib/decidim/templates/version.rb
+++ b/decidim-templates/lib/decidim/templates/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-templates version.
   module Templates
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/decidim-verifications/lib/decidim/verifications/version.rb b/decidim-verifications/lib/decidim/verifications/version.rb
index d85a6275c8bf5..873b91637c200 100644
--- a/decidim-verifications/lib/decidim/verifications/version.rb
+++ b/decidim-verifications/lib/decidim/verifications/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-verifications version.
   module Verifications
     def self.version
-      "0.31.5"
+      "0.31.6"
     end
   end
 end
diff --git a/lib/decidim/version.rb b/lib/decidim/version.rb
index 178c9431500d9..e53b9e78ded5b 100644
--- a/lib/decidim/version.rb
+++ b/lib/decidim/version.rb
@@ -3,6 +3,6 @@
 # This holds the decidim version and the faker version it uses.
 module Decidim
   def self.version
-    "0.31.5"
+    "0.31.6"
   end
 end
diff --git a/package-lock.json b/package-lock.json
index f351072dc3aca..8dbaa4e038b7a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20990,12 +20990,12 @@
     },
     "packages/browserslist-config": {
       "name": "@decidim/browserslist-config",
-      "version": "0.31.5",
+      "version": "0.31.6",
       "license": "AGPL-3.0-or-later"
     },
     "packages/core": {
       "name": "@decidim/core",
-      "version": "0.31.5",
+      "version": "0.31.6",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "@emoji-mart/data": "^1.1.2",
@@ -21073,7 +21073,7 @@
     },
     "packages/dev": {
       "name": "@decidim/dev",
-      "version": "0.31.5",
+      "version": "0.31.6",
       "dev": true,
       "license": "AGPL-3.0-or-later",
       "dependencies": {
@@ -21084,7 +21084,7 @@
     },
     "packages/eslint-config": {
       "name": "@decidim/eslint-config",
-      "version": "0.31.5",
+      "version": "0.31.6",
       "dev": true,
       "license": "AGPL-3.0-or-later",
       "peerDependencies": {
@@ -21102,7 +21102,7 @@
     },
     "packages/prettier-config": {
       "name": "@decidim/prettier-config",
-      "version": "0.31.5",
+      "version": "0.31.6",
       "dev": true,
       "license": "AGPL-3.0-or-later",
       "peerDependencies": {
@@ -21111,7 +21111,7 @@
     },
     "packages/stylelint-config": {
       "name": "@decidim/stylelint-config",
-      "version": "0.31.5",
+      "version": "0.31.6",
       "dev": true,
       "license": "AGPL-3.0-or-later",
       "peerDependencies": {
@@ -21121,7 +21121,7 @@
     },
     "packages/webpacker": {
       "name": "@decidim/webpacker",
-      "version": "0.31.5",
+      "version": "0.31.6",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "@hotwired/stimulus": "^3.2.2",
diff --git a/packages/browserslist-config/package.json b/packages/browserslist-config/package.json
index 1f73ec7561476..8a0d3a22748c7 100644
--- a/packages/browserslist-config/package.json
+++ b/packages/browserslist-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/browserslist-config",
   "description": "The Browserslist configuration for Decidim",
-  "version": "0.31.5",
+  "version": "0.31.6",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/core/package.json b/packages/core/package.json
index 450e5b4f921e5..368e8cfb1ca41 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/core",
   "description": "The core dependencies for Decidim",
-  "version": "0.31.5",
+  "version": "0.31.6",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/dev/package.json b/packages/dev/package.json
index 0c3ee08f0bf65..254414f4f7c66 100644
--- a/packages/dev/package.json
+++ b/packages/dev/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/dev",
   "description": "The dev dependencies for Decidim",
-  "version": "0.31.5",
+  "version": "0.31.6",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
index f2707133e217d..ceb9af165af85 100644
--- a/packages/eslint-config/package.json
+++ b/packages/eslint-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/eslint-config",
   "description": "The eslint configuration for Decidim",
-  "version": "0.31.5",
+  "version": "0.31.6",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json
index a170d14799953..162e1ca3a5039 100644
--- a/packages/prettier-config/package.json
+++ b/packages/prettier-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/prettier-config",
   "description": "The prettier configuration for Decidim",
-  "version": "0.31.5",
+  "version": "0.31.6",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/stylelint-config/package.json b/packages/stylelint-config/package.json
index 4ed5b19171dfa..3b118beb0de07 100644
--- a/packages/stylelint-config/package.json
+++ b/packages/stylelint-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/stylelint-config",
   "description": "The stylelint configuration for Decidim",
-  "version": "0.31.5",
+  "version": "0.31.6",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/webpacker/package.json b/packages/webpacker/package.json
index 08e28be479fd9..455ab2810ca42 100644
--- a/packages/webpacker/package.json
+++ b/packages/webpacker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/webpacker",
   "description": "The webpacker dependencies for Decidim",
-  "version": "0.31.5",
+  "version": "0.31.6",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",

From 3c72651a35bc925efbeeb825180df090ebbb5e75 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Mon, 6 Jul 2026 12:57:01 +0200
Subject: [PATCH 099/131] Backport 'Add ARIA role for the accessibility report
 button' to v0.31 (#17260)

Co-authored-by: Antti Hukkanen <antti.hukkanen@mainiotech.fi>
---
 decidim-dev/app/packs/src/decidim/dev/accessibility.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/decidim-dev/app/packs/src/decidim/dev/accessibility.js b/decidim-dev/app/packs/src/decidim/dev/accessibility.js
index f6a5260c43fee..9087696482b7a 100644
--- a/decidim-dev/app/packs/src/decidim/dev/accessibility.js
+++ b/decidim-dev/app/packs/src/decidim/dev/accessibility.js
@@ -41,7 +41,7 @@ const htmlEncode = (text) => {
 
 document.addEventListener("turbo:load", () => {
   const $badge = $(`
-    <div lang="en" class="decidim-accessibility-badge" tabindex="0" aria-label="Toggle accessibility report">
+    <div lang="en" class="decidim-accessibility-badge" tabindex="0" role="button" aria-label="Toggle accessibility report">
       <div class="decidim-accessibility-title">WAI WCAG</div>
       <div class="decidim-accessibility-info"></div>
     </div>

From 2ba8f95afe6a75d65f24b207f646350ea8bda52e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?=
 <andreslucena@users.noreply.github.com>
Date: Mon, 6 Jul 2026 12:59:32 +0200
Subject: [PATCH 100/131] Backport 'Remove user's nickname from notifications
 and emails' to v0.31 (#17225)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove user's nickname from notifications and emails

* Removed nickname from emails and notifications

* Small fix

* Updated test files

* Fixed linter issues

* Updated test files

* Small fix in test case

* Fixed test file

* Fixed test

* Updated test file

* Applied code review suggestions

* Updated test files

* Fixed tests

* Adapt test file

* Removed unused string conversion

* Update decidim-core/lib/decidim/core/test/shared_examples/amendable/amendment_event_examples.rb

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

---------

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Fix specs

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

* Fix spec

* Fix specs

* Fix specs

* Fix spec

---------

Co-authored-by: andra-panaite <135139066+andra-panaite@users.noreply.github.com>
Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
---
 decidim-comments/config/locales/en.yml        |  8 ++--
 .../comment_by_followed_user_event_spec.rb    |  2 +-
 .../comments/comment_created_event_spec.rb    |  2 +-
 .../comments/reply_created_event_spec.rb      |  2 +-
 .../comments/user_mentioned_event_spec.rb     |  4 +-
 .../decidim/amendable/amendment_base_event.rb |  8 +++-
 decidim-core/config/locales/en.yml            | 46 +++++++++----------
 .../amendable/amendment_event_examples.rb     |  4 +-
 .../amendment_promoted_event_examples.rb      |  6 +--
 .../resource_liked_event_examples.rb          |  6 +--
 ...ile_updated_event_officialize_user_spec.rb |  4 +-
 .../decidim/profile_updated_event_spec.rb     |  8 ++--
 decidim-debates/config/locales/en.yml         |  8 ++--
 .../debates/create_debate_event_spec.rb       |  8 ++--
 .../approve_membership_request_event.rb       |  5 ++
 .../revoke_membership_request_event.rb        |  5 ++
 .../spawn_committee_request_event.rb          |  5 ++
 decidim-initiatives/config/locales/en.yml     | 26 +++++------
 .../approve_membership_request_event_spec.rb  |  8 ++--
 .../create_initiative_event_spec.rb           |  8 ++--
 .../revoke_membership_request_event_spec.rb   |  8 ++--
 .../spawn_committee_request_event_spec.rb     |  8 ++--
 decidim-proposals/config/locales/en.yml       | 28 +++++------
 .../admin/proposal_note_created_event_spec.rb |  4 +-
 .../amendment_accepted_event_spec.rb          |  3 +-
 .../amendment_rejected_event_spec.rb          |  2 +-
 ...rative_draft_access_accepted_event_spec.rb |  4 +-
 ...rative_draft_access_rejected_event_spec.rb |  4 +-
 ...ative_draft_access_requested_event_spec.rb |  4 +-
 ...ollaborative_draft_withdrawn_event_spec.rb |  7 ++-
 .../proposals/publish_proposal_event_spec.rb  | 10 ++--
 31 files changed, 135 insertions(+), 120 deletions(-)

diff --git a/decidim-comments/config/locales/en.yml b/decidim-comments/config/locales/en.yml
index c3149702743ef..4748259a425ff 100644
--- a/decidim-comments/config/locales/en.yml
+++ b/decidim-comments/config/locales/en.yml
@@ -166,12 +166,12 @@ en:
           email_intro: "%{author_name} has left a comment in %{resource_title}. You can read it in this page:"
           email_outro: You have received this notification because you are following %{author_name}. You can unfollow this user from their profile page.
           email_subject: There is a new comment by %{author_name} in %{resource_title}
-          notification_title: There is a new comment by <a href="%{author_path}">%{author_name} %{author_nickname}</a> in <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: There is a new comment by <a href="%{author_path}">%{author_name}</a> in <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} has been commented. You can read the comment in this page:"
           email_outro: You have received this notification because you are following "%{resource_title}" or its author. You can unfollow it from the previous link.
           email_subject: There is a new comment from %{author_name} in %{resource_title}
-          notification_title: There is a new comment from <a href="%{author_path}">%{author_name} %{author_nickname}</a> in <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: There is a new comment from <a href="%{author_path}">%{author_name}</a> in <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Your comment in "%{resource_title}" has been downvoted. It now has a total of %{upvotes} upvotes and %{downvotes} downvotes.
           email_outro: You have received this notification because you are the author of this comment.
@@ -186,12 +186,12 @@ en:
           email_intro: "%{author_name} has replied your comment in %{resource_title}. You can read it in this page:"
           email_outro: You have received this notification because your comment was replied.
           email_subject: "%{author_name} has replied your comment in %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> has replied your comment in <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: <a href="%{author_path}">%{author_name}</a> has replied your comment in <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: You have been mentioned
           email_outro: You have received this notification because you have been mentioned in %{resource_title}.
           email_subject: You have been mentioned in %{resource_title}
-          notification_title: You have been mentioned in <a href="%{resource_path}">%{resource_title}</a> by <a href="%{author_path}">%{author_name} %{author_nickname}</a>
+          notification_title: You have been mentioned in <a href="%{resource_path}">%{resource_title}</a> by <a href="%{author_path}">%{author_name}</a>
   errors:
     messages:
       cannot_have_comments: cannot have comments
diff --git a/decidim-comments/spec/events/decidim/comments/comment_by_followed_user_event_spec.rb b/decidim-comments/spec/events/decidim/comments/comment_by_followed_user_event_spec.rb
index 857bb1906fbea..6717c6db40f03 100644
--- a/decidim-comments/spec/events/decidim/comments/comment_by_followed_user_event_spec.rb
+++ b/decidim-comments/spec/events/decidim/comments/comment_by_followed_user_event_spec.rb
@@ -12,7 +12,7 @@ module Comments
       let(:email_subject) { "There is a new comment by #{author_name} in #{resource_title}" }
       let(:email_intro) { "#{author_name} has left a comment in #{resource_title}. You can read it in this page:" }
       let(:email_outro) { "You have received this notification because you are following #{author_name}. You can unfollow this user from their profile page." }
-      let(:notification_title) { "There is a new comment by <a href=\"#{author_path}\">#{author_name} #{author_nickname}</a> in <a href=\"#{resource_path}?commentId=#{comment.id}#comment_#{comment.id}\">#{resource_title}</a>." }
+      let(:notification_title) { "There is a new comment by <a href=\"#{author_path}\">#{author_name}</a> in <a href=\"#{resource_path}?commentId=#{comment.id}#comment_#{comment.id}\">#{resource_title}</a>." }
 
       it_behaves_like "a simple event email"
       it_behaves_like "a simple event notification"
diff --git a/decidim-comments/spec/events/decidim/comments/comment_created_event_spec.rb b/decidim-comments/spec/events/decidim/comments/comment_created_event_spec.rb
index c64f9f2f3526e..4c4c29dd828a5 100644
--- a/decidim-comments/spec/events/decidim/comments/comment_created_event_spec.rb
+++ b/decidim-comments/spec/events/decidim/comments/comment_created_event_spec.rb
@@ -8,7 +8,7 @@
   let(:email_subject) { "There is a new comment from #{comment_author.name} in #{resource_title}" }
   let(:email_intro) { "#{resource_title} has been commented. You can read the comment in this page:" }
   let(:email_outro) { "You have received this notification because you are following \"#{resource_title}\" or its author. You can unfollow it from the previous link." }
-  let(:notification_title) { "There is a new comment from <a href=\"/profiles/#{comment_author.nickname}\">#{comment_author.name} @#{comment_author.nickname}</a> in <a href=\"#{resource_path}?commentId=#{comment.id}#comment_#{comment.id}\">#{resource_title}</a>" }
+  let(:notification_title) { "There is a new comment from <a href=\"/profiles/#{comment_author.nickname}\">#{comment_author.name}</a> in <a href=\"#{resource_path}?commentId=#{comment.id}#comment_#{comment.id}\">#{resource_title}</a>" }
 
   it_behaves_like "a simple event email"
   it_behaves_like "a simple event notification"
diff --git a/decidim-comments/spec/events/decidim/comments/reply_created_event_spec.rb b/decidim-comments/spec/events/decidim/comments/reply_created_event_spec.rb
index f234f31ab892d..0ab0483ee18e5 100644
--- a/decidim-comments/spec/events/decidim/comments/reply_created_event_spec.rb
+++ b/decidim-comments/spec/events/decidim/comments/reply_created_event_spec.rb
@@ -11,7 +11,7 @@
   let(:email_subject) { "#{comment_author_name} has replied your comment in #{resource_title}" }
   let(:email_intro) { "#{comment_author_name} has replied your comment in #{resource_title}. You can read it in this page:" }
   let(:email_outro) { "You have received this notification because your comment was replied." }
-  let(:notification_title) { "<a href=\"/profiles/#{comment_author.nickname}\">#{comment_author_name} @#{comment_author.nickname}</a> has replied your comment in <a href=\"#{resource_path}?commentId=#{comment.id}#comment_#{comment.id}\">#{resource_title}</a>" }
+  let(:notification_title) { "<a href=\"/profiles/#{comment_author.nickname}\">#{comment_author_name}</a> has replied your comment in <a href=\"#{resource_path}?commentId=#{comment.id}#comment_#{comment.id}\">#{resource_title}</a>" }
 
   it_behaves_like "a simple event email"
   it_behaves_like "a simple event notification"
diff --git a/decidim-comments/spec/events/decidim/comments/user_mentioned_event_spec.rb b/decidim-comments/spec/events/decidim/comments/user_mentioned_event_spec.rb
index eff70c46b9ab7..3140401efa54b 100644
--- a/decidim-comments/spec/events/decidim/comments/user_mentioned_event_spec.rb
+++ b/decidim-comments/spec/events/decidim/comments/user_mentioned_event_spec.rb
@@ -22,7 +22,7 @@
   let(:author) { create(:user, organization:) }
   let!(:comment) { create(:comment, body:, author:, commentable:) }
   let(:user) { create(:user, organization:, locale: "ca") }
-  let(:notification_title) { "You have been mentioned in <a href=\"#{resource_path}?commentId=#{comment.id}#comment_#{comment.id}\">#{resource_title}</a> by <a href=\"/profiles/#{author.nickname}\">#{author.name} @#{author.nickname}</a>" }
+  let(:notification_title) { "You have been mentioned in <a href=\"#{resource_path}?commentId=#{comment.id}#comment_#{comment.id}\">#{resource_title}</a> by <a href=\"/profiles/#{author.nickname}\">#{author.name}</a>" }
   let(:email_subject) { "You have been mentioned in #{resource_title}" }
   let(:email_intro) { "You have been mentioned" }
   let(:email_outro) { "You have received this notification because you have been mentioned in #{resource_title}." }
@@ -34,7 +34,7 @@
   describe "resource_text" do
     it "correctly renders comments with mentions" do
       expect(subject.resource_text).not_to include("gid://")
-      expect(subject.resource_text).to include("@#{author.nickname}")
+      expect(subject.resource_text).to include(author.nickname)
     end
   end
 
diff --git a/decidim-core/app/events/decidim/amendable/amendment_base_event.rb b/decidim-core/app/events/decidim/amendable/amendment_base_event.rb
index d0fa9d860e59e..73a7c7b6d4edd 100644
--- a/decidim-core/app/events/decidim/amendable/amendment_base_event.rb
+++ b/decidim-core/app/events/decidim/amendable/amendment_base_event.rb
@@ -3,7 +3,7 @@
 module Decidim::Amendable
   class AmendmentBaseEvent < Decidim::Events::SimpleEvent
     i18n_attributes :amendable_path, :amendable_type, :amendable_title,
-                    :emendation_path, :emendation_author_nickname, :emendation_author_path
+                    :emendation_path, :emendation_author_nickname, :emendation_author_name, :emendation_author_path
 
     def amendable_title
       @amendable_title ||= translated_attribute(amendable_resource.title)
@@ -33,6 +33,12 @@ def emendation_author_nickname
       @emendation_author_nickname ||= emendation_author.nickname
     end
 
+    def emendation_author_name
+      return unless emendation_resource
+
+      @emendation_author_name ||= emendation_author.name
+    end
+
     def emendation_author_path
       return unless emendation_resource
 
diff --git a/decidim-core/config/locales/en.yml b/decidim-core/config/locales/en.yml
index 3d2817b41c6eb..76542a06ed84b 100644
--- a/decidim-core/config/locales/en.yml
+++ b/decidim-core/config/locales/en.yml
@@ -888,13 +888,13 @@ en:
           affected_user:
             email_intro: 'An amendment has been accepted for %{amendable_title}. You can see it from this page:'
             email_outro: You have received this notification because you are an author of %{amendable_title}.
-            email_subject: Accepted amendment for %{amendable_title} from %{emendation_author_nickname}
-            notification_title: The <a href="%{emendation_path}">amendment</a> created by <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> has been accepted for <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Accepted amendment for %{amendable_title} from %{emendation_author_name}
+            notification_title: The <a href="%{emendation_path}">amendment</a> created by <a href="%{emendation_author_path}">%{emendation_author_name}</a> has been accepted for <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'An amendment has been accepted for %{amendable_title}. You can see it from this page:'
             email_outro: You have received this notification because you are following %{amendable_title}. You can stop receiving notifications following the previous link.
-            email_subject: Accepted amendment for %{amendable_title} from %{emendation_author_nickname}
-            notification_title: The <a href="%{emendation_path}">amendment</a> created by <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> has been accepted for <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Accepted amendment for %{amendable_title} from %{emendation_author_name}
+            notification_title: The <a href="%{emendation_path}">amendment</a> created by <a href="%{emendation_author_path}">%{emendation_author_name}</a> has been accepted for <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'A new amendment has been created for %{amendable_title}. You can see it from this page:'
@@ -910,29 +910,29 @@ en:
           affected_user:
             email_intro: 'A rejected amendment for %{amendable_title} has been published as a new %{amendable_type}. You can see it from this page:'
             email_outro: You have received this notification because you are an author of %{amendable_title}.
-            email_subject: An amendment from %{emendation_author_nickname} has been published as a new %{amendable_type}
-            notification_title: A <a href="%{emendation_path}">rejected amendment</a> for <a href="%{amendable_path}">%{amendable_title}</a> has been published as a new %{amendable_type} by <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
+            email_subject: An amendment from %{emendation_author_name} has been published as a new %{amendable_type}
+            notification_title: A <a href="%{emendation_path}">rejected amendment</a> for <a href="%{amendable_path}">%{amendable_title}</a> has been published as a new %{amendable_type} by <a href="%{emendation_author_path}">%{emendation_author_name}</a>.
           follower:
             email_intro: 'A rejected amendment for %{amendable_title} has been published as a new %{amendable_type}. You can see it from this page:'
             email_outro: You have received this notification because you are following %{amendable_title}. You can stop receiving notifications following the previous link.
-            email_subject: An amendment from %{emendation_author_nickname} has been published as a new %{amendable_type}
-            notification_title: A <a href="%{emendation_path}">rejected amendment</a> for <a href="%{amendable_path}">%{amendable_title}</a> has been published as a new %{amendable_type} by <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
+            email_subject: An amendment from %{emendation_author_name} has been published as a new %{amendable_type}
+            notification_title: A <a href="%{emendation_path}">rejected amendment</a> for <a href="%{amendable_path}">%{amendable_title}</a> has been published as a new %{amendable_type} by <a href="%{emendation_author_path}">%{emendation_author_name}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'An amendment has been rejected for %{amendable_title}. You can see it from this page:'
             email_outro: You have received this notification because you are an author of %{amendable_title}.
-            email_subject: Amendment rejected for %{amendable_title} from %{emendation_author_nickname}
-            notification_title: The <a href="%{emendation_path}">amendment</a> created by <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> has been rejected for <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Amendment rejected for %{amendable_title} from %{emendation_author_name}
+            notification_title: The <a href="%{emendation_path}">amendment</a> created by <a href="%{emendation_author_path}">%{emendation_author_name}</a> has been rejected for <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'An amendment has been rejected for %{amendable_title}. You can see it from this page:'
             email_outro: You have received this notification because you are following %{amendable_title}. You can stop receiving notifications following the previous link.
-            email_subject: Amendment rejected for %{amendable_title} from %{emendation_author_nickname}
-            notification_title: The <a href="%{emendation_path}">amendment</a> created by <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> has been rejected for <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Amendment rejected for %{amendable_title} from %{emendation_author_name}
+            notification_title: The <a href="%{emendation_path}">amendment</a> created by <a href="%{emendation_author_path}">%{emendation_author_name}</a> has been rejected for <a href="%{amendable_path}">%{amendable_title}</a>.
         emendation_promoted:
           follower:
             email_intro: 'An emendation has been published for %{amendable_title}. You can see it from this page:'
             email_outro: You have received this notification because you are an author of %{amendable_title}.
-            email_subject: An emendation from %{emendation_author_nickname} has been published as a new %{amendable_type}
+            email_subject: An emendation from %{emendation_author_name} has been published as a new %{amendable_type}
       attachments:
         attachment_created:
           email_intro: 'A new document has been added to %{resource_title}. You can see it from this page:'
@@ -984,24 +984,24 @@ en:
             An administrator removed your %{resource_type} because it has been reported as %{report_reasons}.</br>
             <i>%{resource_content}</i>
       resource_liked:
-        email_intro: '%{liker_name} %{liker_nickname}, who you are following, has just liked "%{resource_title}" and we think it may be interesting to you. Check it out and contribute:'
-        email_outro: You have received this notification because you are following %{liker_nickname}. You can stop receiving notifications following the previous link.
-        email_subject: "%{liker_nickname} has performed a new like"
-        notification_title: The <a href="%{resource_path}">%{resource_title}</a> %{resource_type} has been liked by <a href="%{liker_path}">%{liker_name} %{liker_nickname}</a>.
+        email_intro: '%{liker_name}, who you are following, has just liked "%{resource_title}" and we think it may be interesting to you. Check it out and contribute:'
+        email_outro: You have received this notification because you are following %{liker_name}. You can stop receiving notifications following the previous link.
+        email_subject: "%{liker_name} has performed a new like"
+        notification_title: The <a href="%{resource_path}">%{resource_title}</a> %{resource_type} has been liked by <a href="%{liker_path}">%{liker_name}</a>.
       resources:
         soft_deleted:
           notification_title: An admin has deleted your "%{resource_type}" "%{resource_title}".
       users:
         profile_updated:
-          email_intro: The <a href="%{resource_url}">profile page</a> of %{name} (%{nickname}), who you are following, has been updated.
-          email_outro: You have received this notification because you are following %{nickname}. You can stop receiving notifications following the previous link.
-          email_subject: "%{nickname} updated their profile"
-          notification_title: The <a href="%{resource_path}">profile page</a> of %{name} (%{nickname}), who you are following, has been updated.
+          email_intro: The <a href="%{resource_url}">profile page</a> of %{name}, who you are following, has been updated.
+          email_outro: You have received this notification because you are following %{name}. You can stop receiving notifications following the previous link.
+          email_subject: "%{name} updated their profile"
+          notification_title: The <a href="%{resource_path}">profile page</a> of %{name}, who you are following, has been updated.
         user_officialized:
-          email_intro: Participant %{name} (%{nickname}) has been officialized.
+          email_intro: Participant %{name} has been officialized.
           email_outro: You have received this notification because you are an administrator of the organization.
           email_subject: "%{name} has been officialized"
-          notification_title: Participant %{name} (%{nickname}) has been officialized.
+          notification_title: Participant %{name} has been officialized.
     export_mailer:
       download_your_data_export:
         click_button_html: Click the next link to download your data.<br/>The file will be available for download until %{date}.
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/amendable/amendment_event_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/amendable/amendment_event_examples.rb
index eeb0b135bc08b..2a71d28899a89 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/amendable/amendment_event_examples.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/amendable/amendment_event_examples.rb
@@ -8,7 +8,7 @@
   it_behaves_like "a simple event email"
   it_behaves_like "a simple event notification"
 
-  let(:emendation_author_nickname) { "@#{emendation.creator_author.nickname}" }
+  let(:emendation_author_name) { emendation.creator_author.name }
   let(:emendation_path) { Decidim::ResourceLocatorPresenter.new(emendation).path }
   let(:emendation_author_path) { Decidim::UserPresenter.new(emendation.creator_author).profile_path }
   let(:amendable_path) { Decidim::ResourceLocatorPresenter.new(amendable).path }
@@ -16,5 +16,5 @@
   let(:email_intro) { "An amendment has been #{amendment_type} for #{amendable_title}. You can see it from this page:" }
   let(:email_outro) { "You have received this notification because you are following #{amendable_title}. You can stop receiving notifications following the previous link." }
 
-  let(:notification_title) { "The <a href=\"#{emendation_path}\">amendment</a> created by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a> has been #{amendment_type} for <a href=\"#{amendable_path}\">#{amendable_title}</a>." } # rubocop:disable Layout/LineLength
+  let(:notification_title) { "The <a href=\"#{emendation_path}\">amendment</a> created by <a href=\"#{emendation_author_path}\">#{emendation_author_name}</a> has been #{amendment_type} for <a href=\"#{amendable_path}\">#{amendable_title}</a>." } # rubocop:disable Layout/LineLength
 end
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/amendable/amendment_promoted_event_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/amendable/amendment_promoted_event_examples.rb
index 15500d8badc28..6a86cb8022c34 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/amendable/amendment_promoted_event_examples.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/amendable/amendment_promoted_event_examples.rb
@@ -10,15 +10,15 @@
   it_behaves_like "a simple event email"
   it_behaves_like "a simple event notification"
 
-  let(:emendation_author_nickname) { "@#{emendation.creator_author.nickname}" }
+  let(:emendation_author_name) { emendation.creator_author.name }
   let(:emendation_path) { Decidim::ResourceLocatorPresenter.new(emendation).path }
   let(:emendation_author_path) { Decidim::UserPresenter.new(emendation.creator_author).profile_path }
   let(:amendable_path) { Decidim::ResourceLocatorPresenter.new(amendable).path }
 
-  let(:email_subject) { "An amendment from #{emendation_author_nickname} has been published as a new proposal" }
+  let(:email_subject) { "An amendment from #{emendation_author_name} has been published as a new proposal" }
   let(:email_intro) { "A rejected amendment for #{amendable_title} has been published as a new #{amendable_type}. You can see it from this page:" }
   let(:email_outro) { "You have received this notification because you are following #{amendable_title}. You can stop receiving notifications following the previous link." }
   # rubocop:disable Layout/LineLength
-  let(:notification_title) { "A <a href=\"#{emendation_path}\">rejected amendment</a> for <a href=\"#{amendable_path}\">#{amendable_title}</a> has been published as a new #{amendable_type} by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a>." }
+  let(:notification_title) { "A <a href=\"#{emendation_path}\">rejected amendment</a> for <a href=\"#{amendable_path}\">#{amendable_title}</a> has been published as a new #{amendable_type} by <a href=\"#{emendation_author_path}\">#{emendation_author_name}</a>." }
   # rubocop:enable Layout/LineLength
 end
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/resource_liked_event_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/resource_liked_event_examples.rb
index ba1e7f9865aaf..d13693c0c25ee 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/resource_liked_event_examples.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/resource_liked_event_examples.rb
@@ -30,7 +30,7 @@
 
   describe "email_subject" do
     it "is generated correctly" do
-      expect(subject.email_subject).to eq("#{author_presenter.nickname} has performed a new like")
+      expect(subject.email_subject).to eq("#{author_presenter.name} has performed a new like")
     end
   end
 
@@ -38,7 +38,7 @@
     let(:resource_title) { decidim_sanitize_translated(resource.title) }
     it "is generated correctly" do
       expect(subject.email_intro)
-        .to eq("#{author.name} #{author_presenter.nickname}, who you are following, " \
+        .to eq("#{author.name}, who you are following, " \
                "has just liked \"#{resource_title}\" and we think it may be interesting to you. Check it out and contribute:")
     end
   end
@@ -51,7 +51,7 @@
         .to include("The <a href=\"#{resource_path}\">#{resource_title}</a> #{resource_type} has been liked by ")
 
       expect(subject.notification_title)
-        .to include("<a href=\"/profiles/#{author.nickname}\">#{author.name} #{author_presenter.nickname}</a>.")
+        .to include("<a href=\"/profiles/#{author.nickname}\">#{author.name}</a>.")
     end
   end
 
diff --git a/decidim-core/spec/events/decidim/profile_updated_event_officialize_user_spec.rb b/decidim-core/spec/events/decidim/profile_updated_event_officialize_user_spec.rb
index 18573a3fea699..2e818307f885d 100644
--- a/decidim-core/spec/events/decidim/profile_updated_event_officialize_user_spec.rb
+++ b/decidim-core/spec/events/decidim/profile_updated_event_officialize_user_spec.rb
@@ -9,9 +9,9 @@
   let(:resource) { create(:user) }
   let(:author) { resource }
   let(:email_subject) { "#{resource.name} has been officialized" }
-  let(:email_intro) { "Participant #{resource.name} (@#{resource.nickname}) has been officialized." }
+  let(:email_intro) { "Participant #{resource.name} has been officialized." }
   let(:email_outro) { "You have received this notification because you are an administrator of the organization." }
-  let(:notification_title) { "Participant #{resource.name} (@#{resource.nickname}) has been officialized." }
+  let(:notification_title) { "Participant #{resource.name} has been officialized." }
 
   it_behaves_like "a simple event", true
   it_behaves_like "a simple event email"
diff --git a/decidim-core/spec/events/decidim/profile_updated_event_spec.rb b/decidim-core/spec/events/decidim/profile_updated_event_spec.rb
index 2d3ca49ef359d..25b75894ddb24 100644
--- a/decidim-core/spec/events/decidim/profile_updated_event_spec.rb
+++ b/decidim-core/spec/events/decidim/profile_updated_event_spec.rb
@@ -8,10 +8,10 @@
   let(:event_name) { "decidim.events.users.profile_updated" }
   let(:resource) { create(:user) }
   let(:author) { resource }
-  let(:email_subject) { "@#{resource.nickname} updated their profile" }
-  let(:email_intro) { "The <a href=\"#{author_presenter.profile_url}\">profile page</a> of #{resource.name} (@#{resource.nickname}), who you are following, has been updated." }
-  let(:email_outro) { "You have received this notification because you are following @#{resource.nickname}. You can stop receiving notifications following the previous link." }
-  let(:notification_title) { "The <a href=\"#{author_presenter.profile_path}\">profile page</a> of #{resource.name} (@#{resource.nickname}), who you are following, has been updated." }
+  let(:email_subject) { "#{resource.name} updated their profile" }
+  let(:email_intro) { "The <a href=\"#{author_presenter.profile_url}\">profile page</a> of #{resource.name}, who you are following, has been updated." }
+  let(:email_outro) { "You have received this notification because you are following #{resource.name}. You can stop receiving notifications following the previous link." }
+  let(:notification_title) { "The <a href=\"#{author_presenter.profile_path}\">profile page</a> of #{resource.name}, who you are following, has been updated." }
 
   it_behaves_like "a simple event", true
   it_behaves_like "a simple event email"
diff --git a/decidim-debates/config/locales/en.yml b/decidim-debates/config/locales/en.yml
index 0bbc73232f51f..98eff34fa84c3 100644
--- a/decidim-debates/config/locales/en.yml
+++ b/decidim-debates/config/locales/en.yml
@@ -205,10 +205,10 @@ en:
           user_followers:
             email_intro: |-
               Hi,
-              %{author_name} %{author_nickname}, who you are following, has created a new debate "%{resource_title}". Check it out and contribute:
-            email_outro: You have received this notification because you are following %{author_nickname}. You can stop receiving notifications following the previous link.
-            email_subject: New debate "%{resource_title}" by %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> created the <a href="%{resource_path}">%{resource_title}</a> debate.
+              %{author_name}, who you are following, has created a new debate "%{resource_title}". Check it out and contribute:
+            email_outro: You have received this notification because you are following %{author_name}. You can stop receiving notifications following the previous link.
+            email_subject: New debate "%{resource_title}" by %{author_name}
+            notification_title: <a href="%{author_path}">%{author_name}</a> created the <a href="%{resource_path}">%{resource_title}</a> debate.
         creation_disabled:
           email_intro: 'Debate creation is no longer active in %{participatory_space_title}. You can still participate in open debates from this page:'
           email_outro: You have received this notification because you are following %{participatory_space_title}. You can stop receiving notifications following the previous link.
diff --git a/decidim-debates/spec/events/decidim/debates/create_debate_event_spec.rb b/decidim-debates/spec/events/decidim/debates/create_debate_event_spec.rb
index 4af2e47270b2a..0b36269f8d834 100644
--- a/decidim-debates/spec/events/decidim/debates/create_debate_event_spec.rb
+++ b/decidim-debates/spec/events/decidim/debates/create_debate_event_spec.rb
@@ -21,10 +21,10 @@
   context "when the notification is for user followers" do
     let(:type) { :user }
     let(:i18n_scope) { "decidim.events.debates.create_debate_event.user_followers" }
-    let(:email_subject) { "New debate \"#{resource_title}\" by @#{author.nickname}" }
-    let(:email_intro) { "Hi,\n#{author.name} @#{author.nickname}, who you are following, has created a new debate \"#{resource_title}\". Check it out and contribute:" }
-    let(:email_outro) { "You have received this notification because you are following @#{author.nickname}. You can stop receiving notifications following the previous link." }
-    let(:notification_title) { "<a href=\"/profiles/#{author.nickname}\">#{author.name} @#{author.nickname}</a> created the <a href=\"#{resource_path}\">#{resource_title}</a> debate." }
+    let(:email_subject) { "New debate \"#{resource_title}\" by #{author.name}" }
+    let(:email_intro) { "Hi,\n#{author.name}, who you are following, has created a new debate \"#{resource_title}\". Check it out and contribute:" }
+    let(:email_outro) { "You have received this notification because you are following #{author.name}. You can stop receiving notifications following the previous link." }
+    let(:notification_title) { "<a href=\"/profiles/#{author.nickname}\">#{author.name}</a> created the <a href=\"#{resource_path}\">#{resource_title}</a> debate." }
 
     it_behaves_like "a simple event"
     it_behaves_like "a simple event email"
diff --git a/decidim-initiatives/app/events/decidim/initiatives/approve_membership_request_event.rb b/decidim-initiatives/app/events/decidim/initiatives/approve_membership_request_event.rb
index dc75aac70f8fb..9139d7ee66197 100644
--- a/decidim-initiatives/app/events/decidim/initiatives/approve_membership_request_event.rb
+++ b/decidim-initiatives/app/events/decidim/initiatives/approve_membership_request_event.rb
@@ -8,6 +8,7 @@ def i18n_scope = "decidim.initiatives.events.approve_membership_request"
       def i18n_options
         {
           author_nickname:,
+          author_name:,
           author_profile_url:,
           participatory_space_title:,
           participatory_space_url:,
@@ -24,6 +25,10 @@ def author_nickname
         author.nickname
       end
 
+      def author_name
+        author.name
+      end
+
       def author_profile_url
         author.profile_url
       end
diff --git a/decidim-initiatives/app/events/decidim/initiatives/revoke_membership_request_event.rb b/decidim-initiatives/app/events/decidim/initiatives/revoke_membership_request_event.rb
index efc9a1dd01f59..5a84d19f37454 100644
--- a/decidim-initiatives/app/events/decidim/initiatives/revoke_membership_request_event.rb
+++ b/decidim-initiatives/app/events/decidim/initiatives/revoke_membership_request_event.rb
@@ -8,6 +8,7 @@ def i18n_scope = "decidim.initiatives.events.revoke_membership_request"
       def i18n_options
         {
           author_nickname:,
+          author_name:,
           author_profile_url:,
           participatory_space_title:,
           participatory_space_url:,
@@ -24,6 +25,10 @@ def author_nickname
         author.nickname
       end
 
+      def author_name
+        author.name
+      end
+
       def author_profile_url
         author.profile_url
       end
diff --git a/decidim-initiatives/app/events/decidim/initiatives/spawn_committee_request_event.rb b/decidim-initiatives/app/events/decidim/initiatives/spawn_committee_request_event.rb
index f0b7d6ba64f69..1b45dcc9c0492 100644
--- a/decidim-initiatives/app/events/decidim/initiatives/spawn_committee_request_event.rb
+++ b/decidim-initiatives/app/events/decidim/initiatives/spawn_committee_request_event.rb
@@ -8,6 +8,7 @@ def i18n_scope = "decidim.initiatives.events.spawn_committee_request_event"
       def i18n_options
         {
           applicant_nickname:,
+          applicant_name:,
           applicant_profile_url:,
           participatory_space_title:,
           participatory_space_url:,
@@ -24,6 +25,10 @@ def applicant_nickname
         applicant.nickname
       end
 
+      def applicant_name
+        applicant.name
+      end
+
       def applicant_profile_url
         applicant.profile_url
       end
diff --git a/decidim-initiatives/config/locales/en.yml b/decidim-initiatives/config/locales/en.yml
index 488c661bbd916..cc231e3572d69 100644
--- a/decidim-initiatives/config/locales/en.yml
+++ b/decidim-initiatives/config/locales/en.yml
@@ -440,25 +440,25 @@ en:
         update: Update
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} accepted your application to be part of the promoter committee for the initiative %{resource_title}."
+          email_intro: "%{author_name} accepted your application to be part of the promoter committee for the initiative %{resource_title}."
           email_outro: 'You received this notification because you applied to this initiative: %{resource_title}'
-          email_subject: "%{author_nickname} accepted your application to the promoter committee"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> accepted your application to be part of the promoter committee for the following initiative <a href="%{resource_url}">%{resource_title}</a>.
+          email_subject: "%{author_name} accepted your application to the promoter committee"
+          notification_title: <a href="%{author_profile_url}">%{author_name}</a> accepted your application to be part of the promoter committee for the following initiative <a href="%{resource_url}">%{resource_title}</a>.
         create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, who you are following, has created a new initiative, check it out and contribute:"
-          email_outro: You have received this notification because you are following %{author_nickname}. You can stop receiving notifications following the previous link.
-          email_subject: New initiative by %{author_nickname}
-          notification_title: The <a href="%{resource_path}">%{resource_title}</a> initiative was created by <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+          email_intro: "%{author_name}, who you are following, has created a new initiative, check it out and contribute:"
+          email_outro: You have received this notification because you are following %{author_name}. You can stop receiving notifications following the previous link.
+          email_subject: New initiative by %{author_name}
+          notification_title: The <a href="%{resource_path}">%{resource_title}</a> initiative was created by <a href="%{author_path}">%{author_name}</a>.
         revoke_membership_request:
-          email_intro: "%{author_nickname} rejected your application to be part of the promoter committee for the following initiative %{resource_title}."
+          email_intro: "%{author_name} rejected your application to be part of the promoter committee for the following initiative %{resource_title}."
           email_outro: 'You received this notification because you applied to this initiative: %{resource_title}.'
-          email_subject: "%{author_nickname} rejected your application to the promoter committee"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> rejected your application to be part of the promoter committee for the following initiative <a href="%{resource_url}">%{resource_title}</a>.
+          email_subject: "%{author_name} rejected your application to the promoter committee"
+          notification_title: <a href="%{author_profile_url}">%{author_name}</a> rejected your application to be part of the promoter committee for the following initiative <a href="%{resource_url}">%{resource_title}</a>.
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} applied for the promoter committee of your initiative %{resource_title}. To accept or reject the application, go to the edit form of your initiative."
+          email_intro: "%{applicant_name} applied for the promoter committee of your initiative %{resource_title}. To accept or reject the application, go to the edit form of your initiative."
           email_outro: 'You received this notification because you are the author of this initiative: %{resource_title}'
-          email_subject: "%{applicant_nickname} wants to join your initiative"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> applied for the promoter committee of your initiative <a href="%{resource_url}">%{resource_title}</a>. To accept or reject click <a href="%{resource_url}/edit">here</a>.
+          email_subject: "%{applicant_name} wants to join your initiative"
+          notification_title: <a href="%{applicant_profile_url}">%{applicant_name}</a> applied for the promoter committee of your initiative <a href="%{resource_url}">%{resource_title}</a>. To accept or reject click <a href="%{resource_url}/edit">here</a>.
       form:
         add_attachments: Add attachments
         add_image: Add image
diff --git a/decidim-initiatives/spec/events/decidim/initiatives/approve_membership_request_event_spec.rb b/decidim-initiatives/spec/events/decidim/initiatives/approve_membership_request_event_spec.rb
index 6f0ec15e2fe4b..ac3d2247efb3e 100644
--- a/decidim-initiatives/spec/events/decidim/initiatives/approve_membership_request_event_spec.rb
+++ b/decidim-initiatives/spec/events/decidim/initiatives/approve_membership_request_event_spec.rb
@@ -13,13 +13,13 @@
 
   let(:author) { resource.author }
   let(:author_profile_url) { Decidim::UserPresenter.new(author).profile_url }
-  let(:author_nickname) { Decidim::UserPresenter.new(author).nickname }
+  let(:author_name) { Decidim::UserPresenter.new(author).name }
   let(:user) { create(:initiatives_committee_member, initiative: resource, state: "requested").user }
   let(:resource_url) { resource_locator(resource).url }
-  let(:email_subject) { "#{author_nickname} accepted your application to the promoter committee" }
-  let(:email_intro) { "#{author_nickname} accepted your application to be part of the promoter committee for the initiative #{resource_title}." }
+  let(:email_subject) { "#{author_name} accepted your application to the promoter committee" }
+  let(:email_intro) { "#{author_name} accepted your application to be part of the promoter committee for the initiative #{resource_title}." }
   let(:email_outro) { "You received this notification because you applied to this initiative: #{resource_title}" }
-  let(:notification_title) { "<a href=\"#{author_profile_url}\">#{author_nickname}</a> accepted your application to be part of the promoter committee for the following initiative <a href=\"#{resource_url}\">#{resource_title}</a>." }
+  let(:notification_title) { "<a href=\"#{author_profile_url}\">#{author_name}</a> accepted your application to be part of the promoter committee for the following initiative <a href=\"#{resource_url}\">#{resource_title}</a>." }
 
   describe "types" do
     subject { described_class }
diff --git a/decidim-initiatives/spec/events/decidim/initiatives/create_initiative_event_spec.rb b/decidim-initiatives/spec/events/decidim/initiatives/create_initiative_event_spec.rb
index 990168739d2e7..cf10bbdd2cde1 100644
--- a/decidim-initiatives/spec/events/decidim/initiatives/create_initiative_event_spec.rb
+++ b/decidim-initiatives/spec/events/decidim/initiatives/create_initiative_event_spec.rb
@@ -15,10 +15,10 @@
   let(:event_name) { "decidim.events.initiatives.initiative_created" }
   let(:user) { create(:user, organization:) }
   let(:resource_path) { resource_locator(resource).path }
-  let(:email_subject) { "New initiative by @#{initiative_author.nickname}" }
-  let(:email_intro) { "#{initiative_author.name} @#{initiative_author.nickname}, who you are following, has created a new initiative, check it out and contribute:" }
-  let(:email_outro) { "You have received this notification because you are following @#{initiative_author.nickname}. You can stop receiving notifications following the previous link." }
-  let(:notification_title) { "The <a href=\"#{resource_path}\">#{resource_title}</a> initiative was created by <a href=\"/profiles/#{initiative_author.nickname}\">#{initiative_author.name} @#{initiative_author.nickname}</a>." }
+  let(:email_subject) { "New initiative by #{initiative_author.name}" }
+  let(:email_intro) { "#{initiative_author.name}, who you are following, has created a new initiative, check it out and contribute:" }
+  let(:email_outro) { "You have received this notification because you are following #{initiative_author.name}. You can stop receiving notifications following the previous link." }
+  let(:notification_title) { "The <a href=\"#{resource_path}\">#{resource_title}</a> initiative was created by <a href=\"/profiles/#{initiative_author.nickname}\">#{initiative_author.name}</a>." }
 
   it_behaves_like "a simple event email"
   it_behaves_like "a simple event notification"
diff --git a/decidim-initiatives/spec/events/decidim/initiatives/revoke_membership_request_event_spec.rb b/decidim-initiatives/spec/events/decidim/initiatives/revoke_membership_request_event_spec.rb
index beb4ce6101e14..a16ead10c1302 100644
--- a/decidim-initiatives/spec/events/decidim/initiatives/revoke_membership_request_event_spec.rb
+++ b/decidim-initiatives/spec/events/decidim/initiatives/revoke_membership_request_event_spec.rb
@@ -12,13 +12,13 @@
   let!(:resource) { create(:initiative, :created, organization:) }
   let(:author) { resource.author }
   let(:author_profile_url) { Decidim::UserPresenter.new(author).profile_url }
-  let(:author_nickname) { Decidim::UserPresenter.new(author).nickname }
+  let(:author_name) { Decidim::UserPresenter.new(author).name }
   let(:user) { create(:initiatives_committee_member, initiative: resource, state: "requested").user }
   let(:resource_url) { resource_locator(resource).url }
-  let(:email_subject) { "#{author_nickname} rejected your application to the promoter committee" }
-  let(:email_intro) { "#{author_nickname} rejected your application to be part of the promoter committee for the following initiative #{resource_title}." }
+  let(:email_subject) { "#{author_name} rejected your application to the promoter committee" }
+  let(:email_intro) { "#{author_name} rejected your application to be part of the promoter committee for the following initiative #{resource_title}." }
   let(:email_outro) { "You received this notification because you applied to this initiative: #{resource_title}." }
-  let(:notification_title) { "<a href=\"#{author_profile_url}\">#{author_nickname}</a> rejected your application to be part of the promoter committee for the following initiative <a href=\"#{resource_url}\">#{resource_title}</a>." }
+  let(:notification_title) { "<a href=\"#{author_profile_url}\">#{author_name}</a> rejected your application to be part of the promoter committee for the following initiative <a href=\"#{resource_url}\">#{resource_title}</a>." }
 
   it_behaves_like "a simple event email"
   it_behaves_like "a simple event notification"
diff --git a/decidim-initiatives/spec/events/decidim/initiatives/spawn_committee_request_event_spec.rb b/decidim-initiatives/spec/events/decidim/initiatives/spawn_committee_request_event_spec.rb
index de4d8c6045fba..15f4ddc7ac5ba 100644
--- a/decidim-initiatives/spec/events/decidim/initiatives/spawn_committee_request_event_spec.rb
+++ b/decidim-initiatives/spec/events/decidim/initiatives/spawn_committee_request_event_spec.rb
@@ -13,12 +13,12 @@
   let(:event_name) { "decidim.events.initiatives.initiative_created" }
   let(:applicant) { create(:user, organization:) }
   let(:applicant_profile_url) { Decidim::UserPresenter.new(applicant).profile_url }
-  let(:applicant_nickname) { Decidim::UserPresenter.new(applicant).nickname }
+  let(:applicant_name) { Decidim::UserPresenter.new(applicant).name }
   let(:resource_url) { resource_locator(resource).url }
-  let(:email_subject) { "#{applicant_nickname} wants to join your initiative" }
-  let(:email_intro) { "#{applicant_nickname} applied for the promoter committee of your initiative #{resource_title}. To accept or reject the application, go to the edit form of your initiative." }
+  let(:email_subject) { "#{applicant_name} wants to join your initiative" }
+  let(:email_intro) { "#{applicant_name} applied for the promoter committee of your initiative #{resource_title}. To accept or reject the application, go to the edit form of your initiative." }
   let(:email_outro) { "You received this notification because you are the author of this initiative: #{resource_title}" }
-  let(:notification_title) { "<a href=\"#{applicant_profile_url}\">#{applicant_nickname}</a> applied for the promoter committee of your initiative <a href=\"#{resource_url}\">#{resource_title}</a>. To accept or reject click <a href=\"#{resource_url}/edit\">here</a>." }
+  let(:notification_title) { "<a href=\"#{applicant_profile_url}\">#{applicant_name}</a> applied for the promoter committee of your initiative <a href=\"#{resource_url}\">#{resource_title}</a>. To accept or reject click <a href=\"#{resource_url}/edit\">here</a>." }
 
   describe "types" do
     subject { described_class }
diff --git a/decidim-proposals/config/locales/en.yml b/decidim-proposals/config/locales/en.yml
index a2aea8abedd9e..af70517c2c8d7 100644
--- a/decidim-proposals/config/locales/en.yml
+++ b/decidim-proposals/config/locales/en.yml
@@ -276,17 +276,17 @@ en:
             email_intro: '%{author_name} has created a private note in %{resource_title}. Check it out at <a href="%{admin_proposal_info_url}">the admin panel</a>.'
             email_outro: You have received this notification because you can evaluate the proposal.
             email_subject: Someone left a note on proposal %{resource_title}.
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> has created a private note in <a href="%{resource_path}">%{resource_title}</a>. Check it out at <a href="%{admin_proposal_info_path}">the admin panel</a>.
+            notification_title: <a href="%{author_path}">%{author_name}</a> has created a private note in <a href="%{resource_path}">%{resource_title}</a>. Check it out at <a href="%{admin_proposal_info_path}">the admin panel</a>.
           proposal_note_mentioned:
-            email_intro: You have been mentioned in a private note in "%{resource_title}" by "%{author_name}" "%{author_nickname}". Check it out at <a href="%{admin_proposal_info_url}">the admin panel</a>.
+            email_intro: You have been mentioned in a private note in "%{resource_title}" by "%{author_name}". Check it out at <a href="%{admin_proposal_info_url}">the admin panel</a>.
             email_outro: You have received this notification because you have been mentioned in a private note.
             email_subject: Someone mentioned you in a note on the proposal %{resource_title}.
-            notification_title: You have been mentioned in a private note in <a href="%{resource_path}">%{resource_title}</a> by <a href="%{author_path}">%{author_name} %{author_nickname}</a>. Check it out at <a href="%{admin_proposal_info_path}">the admin panel</a>.
+            notification_title: You have been mentioned in a private note in <a href="%{resource_path}">%{resource_title}</a> by <a href="%{author_path}">%{author_name}</a>. Check it out at <a href="%{admin_proposal_info_path}">the admin panel</a>.
           proposal_note_replied:
             email_intro: '%{author_name} has replied your private note in %{resource_title}. Check it out at <a href="%{admin_proposal_info_url}">the admin panel</a>.'
             email_outro: You have received this notification because you are the author of the note.
             email_subject: "%{author_name} has replied your private note in %{resource_title}."
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> has replied your private note in <a href="%{resource_path}">%{resource_title}</a>. Check it out at <a href="%{admin_proposal_info_path}">the admin panel</a>.
+            notification_title: <a href="%{author_path}">%{author_name}</a> has replied your private note in <a href="%{resource_path}">%{resource_title}</a>. Check it out at <a href="%{admin_proposal_info_path}">the admin panel</a>.
         coauthor_accepted_invite:
           notification_title: <a href="%{coauthor_path}">%{coauthor_name}</a> has accepted your invitation to become a co-author of the proposal <a href="%{resource_path}">%{resource_title}</a>.
         coauthor_invited:
@@ -303,17 +303,17 @@ en:
           email_intro: '%{requester_name} has been accepted to access as a contributor of the <a href="%{resource_url}">%{resource_title}</a> collaborative draft.'
           email_outro: You have received this notification because you are a collaborator of <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} has been accepted to access as a contributor of the %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> has been <strong>accepted to access as a contributor</strong> of the <a href="%{resource_path}">%{resource_title}</a> collaborative draft.
+          notification_title: <a href="%{requester_path}">%{requester_name}</a> has been <strong>accepted to access as a contributor</strong> of the <a href="%{resource_path}">%{resource_title}</a> collaborative draft.
         collaborative_draft_access_rejected:
           email_intro: '%{requester_name} has been rejected to access as a contributor of the <a href="%{resource_url}">%{resource_title}</a> collaborative draft.'
           email_outro: You have received this notification because you are a collaborator of <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} has been rejected to access as a contributor of the %{resource_title} collaborative draft."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> has been <strong>rejected to access as a contributor</strong> of the <a href="%{resource_path}">%{resource_title}</a> collaborative draft.
+          notification_title: <a href="%{requester_path}">%{requester_name}</a> has been <strong>rejected to access as a contributor</strong> of the <a href="%{resource_path}">%{resource_title}</a> collaborative draft.
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} requested access as a contributor. You can <strong>accept or reject the request</strong> from the <a href="%{resource_url}">%{resource_title}</a> collaborative draft page.'
           email_outro: You have received this notification because you are a collaborator of <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} requested access to contribute to %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> requested access to contribute to the <a href="%{resource_path}">%{resource_title}</a> collaborative draft. Please <strong>accept or reject the request</strong>.
+          notification_title: <a href="%{requester_path}">%{requester_name}</a> requested access to contribute to the <a href="%{resource_path}">%{resource_title}</a> collaborative draft. Please <strong>accept or reject the request</strong>.
         collaborative_draft_access_requester_accepted:
           email_intro: You have been accepted to access as a contributor of the <a href="%{resource_url}">%{resource_title}</a> collaborative draft.
           email_outro: You have received this notification because you requested to become a collaborator of <a href="%{resource_url}">%{resource_title}</a>.
@@ -325,10 +325,10 @@ en:
           email_subject: You have been rejected as a contributor of %{resource_title}.
           notification_title: You have been <strong>rejected to access as a contributor</strong> of the <a href="%{resource_path}">%{resource_title}</a> collaborative draft.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> withdrawn the <a href="%{resource_url}">%{resource_title}</a> collaborative draft.
+          email_intro: <a href="%{author_url}">%{author_name}</a> has withdrawn the <a href="%{resource_url}">%{resource_title}</a> collaborative draft.
           email_outro: You have received this notification because you are a collaborator of <a href="%{resource_url}">%{resource_title}</a>.
-          email_subject: "%{author_name} %{author_nickname} withdrawn the %{resource_title} collaborative draft."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>withdrawn</strong> the <a href="%{resource_path}">%{resource_title}</a> collaborative draft.
+          email_subject: "%{author_name} has withdrawn the %{resource_title} collaborative draft."
+          notification_title: <a href="%{author_path}">%{author_name}</a> has <strong>withdrawn</strong> the <a href="%{resource_path}">%{resource_title}</a> collaborative draft.
         creation_enabled:
           email_intro: 'You can now create new proposals in %{participatory_space_title}! Start participating in this page:'
           email_outro: You have received this notification because you are following %{participatory_space_title}. You can stop receiving notifications following the previous link.
@@ -350,10 +350,10 @@ en:
           email_subject: The %{resource_title} proposal has been merged
           notification_title: The <a href="%{resource_path}">%{resource_title}</a> proposal has been merged by an admin.
         proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, who you are following, has published a new proposal called "%{resource_title}". Check it out and contribute:'
-          email_outro: You have received this notification because you are following %{author_nickname}. You can stop receiving notifications following the previous link.
-          email_subject: New proposal "%{resource_title}" by %{author_nickname}
-          notification_title: The <a href="%{resource_path}">%{resource_title}</a> proposal was published by <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+          email_intro: '%{author_name}, who you are following, has published a new proposal called "%{resource_title}". Check it out and contribute:'
+          email_outro: You have received this notification because you are following %{author_name}. You can stop receiving notifications following the previous link.
+          email_subject: New proposal "%{resource_title}" by %{author_name}
+          notification_title: The <a href="%{resource_path}">%{resource_title}</a> proposal was published by <a href="%{author_path}">%{author_name}</a>.
         proposal_published_for_space:
           email_intro: The proposal "%{resource_title}" has been added to "%{participatory_space_title}" that you are following.
           email_outro: You have received this notification because you are following "%{participatory_space_title}". You can stop receiving notifications following the previous link.
diff --git a/decidim-proposals/spec/events/decidim/proposals/admin/proposal_note_created_event_spec.rb b/decidim-proposals/spec/events/decidim/proposals/admin/proposal_note_created_event_spec.rb
index 9d7e644ebb137..c3529e88e4753 100644
--- a/decidim-proposals/spec/events/decidim/proposals/admin/proposal_note_created_event_spec.rb
+++ b/decidim-proposals/spec/events/decidim/proposals/admin/proposal_note_created_event_spec.rb
@@ -16,7 +16,7 @@
   let(:email_subject) { "#{author.name} has replied your private note in #{resource_title}." }
   let(:email_intro) { %(#{author.name} has replied your private note in #{resource_title}. Check it out at <a href="#{admin_proposal_info_url}">the admin panel</a>.) }
   let(:email_outro) { "You have received this notification because you are the author of the note." }
-  let(:notification_title) { %(<a href="/profiles/#{author.nickname}">#{author.name} @#{author.nickname}</a> has replied your private note in <a href="#{resource_path}">#{resource_title}</a>. Check it out at <a href="#{admin_proposal_info_path}">the admin panel</a>.) }
+  let(:notification_title) { %(<a href="/profiles/#{author.nickname}">#{author.name}</a> has replied your private note in <a href="#{resource_path}">#{resource_title}</a>. Check it out at <a href="#{admin_proposal_info_path}">the admin panel</a>.) }
 
   it_behaves_like "a simple event"
   it_behaves_like "a simple event email"
@@ -29,7 +29,7 @@
     let(:admin_proposal_info_path) { "/admin/assemblies/#{participatory_space.slug}/components/#{component.id}/manage/proposals/#{resource.id}" }
     let(:admin_proposal_info_url) { "http://#{organization.host}/admin/assemblies/#{participatory_space.slug}/components/#{component.id}/manage/proposals/#{resource.id}" }
     let(:email_intro) { %(#{author.name} has replied your private note in #{resource_title}. Check it out at <a href="#{admin_proposal_info_url}">the admin panel</a>.) }
-    let(:notification_title) { %(<a href="/profiles/#{author.nickname}">#{author.name} @#{author.nickname}</a> has replied your private note in <a href="#{resource_path}">#{resource_title}</a>. Check it out at <a href="#{admin_proposal_info_path}">the admin panel</a>.) }
+    let(:notification_title) { %(<a href="/profiles/#{author.nickname}">#{author.name}</a> has replied your private note in <a href="#{resource_path}">#{resource_title}</a>. Check it out at <a href="#{admin_proposal_info_path}">the admin panel</a>.) }
 
     it_behaves_like "a simple event email"
     it_behaves_like "a simple event notification"
diff --git a/decidim-proposals/spec/events/decidim/proposals/amendable/amendment_accepted_event_spec.rb b/decidim-proposals/spec/events/decidim/proposals/amendable/amendment_accepted_event_spec.rb
index 21c22ba2b0fa5..177aa2191dfc7 100644
--- a/decidim-proposals/spec/events/decidim/proposals/amendable/amendment_accepted_event_spec.rb
+++ b/decidim-proposals/spec/events/decidim/proposals/amendable/amendment_accepted_event_spec.rb
@@ -11,9 +11,10 @@ module Amendable
       let!(:amendment) { create(:amendment, amendable:, emendation:) }
       let(:amendable_title) { "My super proposal" }
 
+      let(:emendation_author_name) { emendation.creator_author.name }
       let(:event_name) { "decidim.events.amendments.amendment_accepted" }
       let(:amendment_type) { "accepted" }
-      let(:email_subject) { "Accepted amendment for #{amendable_title} from #{emendation_author_nickname}" }
+      let(:email_subject) { "Accepted amendment for #{amendable_title} from #{emendation_author_name}" }
 
       include_examples "amendment event"
     end
diff --git a/decidim-proposals/spec/events/decidim/proposals/amendable/amendment_rejected_event_spec.rb b/decidim-proposals/spec/events/decidim/proposals/amendable/amendment_rejected_event_spec.rb
index 33dd20cb8e4fd..1633fc62b4c69 100644
--- a/decidim-proposals/spec/events/decidim/proposals/amendable/amendment_rejected_event_spec.rb
+++ b/decidim-proposals/spec/events/decidim/proposals/amendable/amendment_rejected_event_spec.rb
@@ -13,7 +13,7 @@ module Amendable
 
       let(:event_name) { "decidim.events.amendments.amendment_rejected" }
       let(:amendment_type) { "rejected" }
-      let(:email_subject) { "Amendment rejected for #{amendable_title} from #{emendation_author_nickname}" }
+      let(:email_subject) { "Amendment rejected for #{amendable_title} from #{emendation_author_name}" }
 
       include_examples "amendment event"
     end
diff --git a/decidim-proposals/spec/events/decidim/proposals/collaborative_draft_access_accepted_event_spec.rb b/decidim-proposals/spec/events/decidim/proposals/collaborative_draft_access_accepted_event_spec.rb
index a830af6ebc858..41c0239939807 100644
--- a/decidim-proposals/spec/events/decidim/proposals/collaborative_draft_access_accepted_event_spec.rb
+++ b/decidim-proposals/spec/events/decidim/proposals/collaborative_draft_access_accepted_event_spec.rb
@@ -14,12 +14,10 @@
   let(:author_presenter) { Decidim::UserPresenter.new(author) }
   let(:author_path) { author_presenter.profile_path }
   let(:author_name) { author_presenter.name }
-  let(:author_nickname) { author_presenter.nickname }
   let(:requester) { create(:user, :confirmed, organization: resource.organization) }
   let(:requester_presenter) { Decidim::UserPresenter.new(requester) }
   let(:requester_id) { requester.id }
   let(:requester_name) { requester.name }
-  let(:requester_nickname) { requester_presenter.nickname }
   let(:requester_path) { requester_presenter.profile_path }
   let(:extra) { { requester_id: } }
 
@@ -27,7 +25,7 @@
     let(:email_subject) { "#{requester_name} has been accepted to access as a contributor of the #{resource_title}." }
     let(:email_intro) { %(#{requester_name} has been accepted to access as a contributor of the <a href="#{resource_url}">#{decidim_html_escape(resource_title)}</a> collaborative draft.) }
     let(:email_outro) { %(You have received this notification because you are a collaborator of <a href="#{resource_url}">#{decidim_html_escape(resource_title)}</a>.) }
-    let(:notification_title) { %(<a href="#{requester_path}">#{requester_name} #{requester_nickname}</a> has been <strong>accepted to access as a contributor</strong> of the <a href="#{resource_path}">#{decidim_html_escape(resource_title)}</a> collaborative draft.) }
+    let(:notification_title) { %(<a href="#{requester_path}">#{requester_name}</a> has been <strong>accepted to access as a contributor</strong> of the <a href="#{resource_path}">#{decidim_html_escape(resource_title)}</a> collaborative draft.) }
 
     it_behaves_like "a simple event"
     it_behaves_like "a simple event email"
diff --git a/decidim-proposals/spec/events/decidim/proposals/collaborative_draft_access_rejected_event_spec.rb b/decidim-proposals/spec/events/decidim/proposals/collaborative_draft_access_rejected_event_spec.rb
index 125bb7a2f379e..1d290e6187472 100644
--- a/decidim-proposals/spec/events/decidim/proposals/collaborative_draft_access_rejected_event_spec.rb
+++ b/decidim-proposals/spec/events/decidim/proposals/collaborative_draft_access_rejected_event_spec.rb
@@ -14,12 +14,10 @@
   let(:author_presenter) { Decidim::UserPresenter.new(author) }
   let(:author_path) { author_presenter.profile_path }
   let(:author_name) { author_presenter.name }
-  let(:author_nickname) { author_presenter.nickname }
   let(:requester) { create(:user, :confirmed, organization: resource.organization) }
   let(:requester_presenter) { Decidim::UserPresenter.new(requester) }
   let(:requester_id) { requester.id }
   let(:requester_name) { requester.name }
-  let(:requester_nickname) { requester_presenter.nickname }
   let(:requester_path) { requester_presenter.profile_path }
   let(:extra) { { requester_id: } }
 
@@ -27,7 +25,7 @@
     let(:email_subject) { "#{requester_name} has been rejected to access as a contributor of the #{translated(resource.title)} collaborative draft." }
     let(:email_intro) { %(#{requester_name} has been rejected to access as a contributor of the <a href="#{resource_url}">#{resource_title}</a> collaborative draft.) }
     let(:email_outro) { %(You have received this notification because you are a collaborator of <a href="#{resource_url}">#{resource_title}</a>.) }
-    let(:notification_title) { %(<a href="#{requester_path}">#{requester_name} #{requester_nickname}</a> has been <strong>rejected to access as a contributor</strong> of the <a href="#{resource_path}">#{resource_title}</a> collaborative draft.) }
+    let(:notification_title) { %(<a href="#{requester_path}">#{requester_name}</a> has been <strong>rejected to access as a contributor</strong> of the <a href="#{resource_path}">#{resource_title}</a> collaborative draft.) }
 
     it_behaves_like "a simple event"
     it_behaves_like "a simple event email"
diff --git a/decidim-proposals/spec/events/decidim/proposals/collaborative_draft_access_requested_event_spec.rb b/decidim-proposals/spec/events/decidim/proposals/collaborative_draft_access_requested_event_spec.rb
index faa8e33bc3511..0ac37cb05f441 100644
--- a/decidim-proposals/spec/events/decidim/proposals/collaborative_draft_access_requested_event_spec.rb
+++ b/decidim-proposals/spec/events/decidim/proposals/collaborative_draft_access_requested_event_spec.rb
@@ -14,17 +14,15 @@
   let(:author_presenter) { Decidim::UserPresenter.new(author) }
   let(:author_path) { author_presenter.profile_path }
   let(:author_name) { author_presenter.name }
-  let(:author_nickname) { author_presenter.nickname }
   let(:requester) { create(:user, :confirmed, organization: resource.organization) }
   let(:requester_name) { requester.name }
   let(:requester_id) { requester.id }
   let(:requester_presenter) { Decidim::UserPresenter.new(requester) }
   let(:requester_path) { requester_presenter.profile_path }
-  let(:requester_nickname) { requester_presenter.nickname }
   let(:extra) { { requester_id: } }
 
   context "when the notification is for coauthor users" do
-    let(:notification_title) { %(<a href="#{requester_path}">#{requester_name} #{requester_nickname}</a> requested access to contribute to the <a href="#{resource_path}">#{decidim_html_escape(resource_title)}</a> collaborative draft. Please <strong>accept or reject the request</strong>.) }
+    let(:notification_title) { %(<a href="#{requester_path}">#{requester_name}</a> requested access to contribute to the <a href="#{resource_path}">#{decidim_html_escape(resource_title)}</a> collaborative draft. Please <strong>accept or reject the request</strong>.) }
     let(:email_outro) { %(You have received this notification because you are a collaborator of <a href="#{resource_url}">#{decidim_html_escape(resource_title)}</a>.) }
     let(:email_intro) { %(#{requester_name} requested access as a contributor. You can <strong>accept or reject the request</strong> from the <a href="#{resource_url}">#{decidim_html_escape(resource_title)}</a> collaborative draft page.) }
     let(:email_subject) { "#{requester_name} requested access to contribute to #{resource_title}." }
diff --git a/decidim-proposals/spec/events/decidim/proposals/collaborative_draft_withdrawn_event_spec.rb b/decidim-proposals/spec/events/decidim/proposals/collaborative_draft_withdrawn_event_spec.rb
index fbfb06b153ff5..c397d01d028bf 100644
--- a/decidim-proposals/spec/events/decidim/proposals/collaborative_draft_withdrawn_event_spec.rb
+++ b/decidim-proposals/spec/events/decidim/proposals/collaborative_draft_withdrawn_event_spec.rb
@@ -15,14 +15,13 @@
   let(:author_path) { author_presenter.profile_path }
   let(:author_url) { author_presenter.profile_url }
   let(:author_name) { author_presenter.name }
-  let(:author_nickname) { author_presenter.nickname }
   let(:extra) { { author_id: } }
 
   context "when the notification is for coauthor users" do
-    let(:notification_title) { %(<a href="#{author_path}">#{author_name} #{author_nickname}</a> <strong>withdrawn</strong> the <a href="#{resource_path}">#{resource_title}</a> collaborative draft.) }
+    let(:notification_title) { %(<a href="#{author_path}">#{author_name}</a> has <strong>withdrawn</strong> the <a href="#{resource_path}">#{resource_title}</a> collaborative draft.) }
     let(:email_outro) { %(You have received this notification because you are a collaborator of <a href="#{resource_url}">#{resource_title}</a>.) }
-    let(:email_intro) { %(<a href="#{author_url}">#{author_name} #{author_nickname}</a> withdrawn the <a href="#{resource_url}">#{resource_title}</a> collaborative draft.) }
-    let(:email_subject) { "#{author_name} #{author_nickname} withdrawn the #{decidim_sanitize(resource_title)} collaborative draft." }
+    let(:email_intro) { %(<a href="#{author_url}">#{author_name}</a> has withdrawn the <a href="#{resource_url}">#{resource_title}</a> collaborative draft.) }
+    let(:email_subject) { "#{author_name} has withdrawn the #{decidim_sanitize(resource_title)} collaborative draft." }
 
     it_behaves_like "a simple event"
     it_behaves_like "a simple event email"
diff --git a/decidim-proposals/spec/events/decidim/proposals/publish_proposal_event_spec.rb b/decidim-proposals/spec/events/decidim/proposals/publish_proposal_event_spec.rb
index 0a3ab35eb50e3..eeb434e9aac2d 100644
--- a/decidim-proposals/spec/events/decidim/proposals/publish_proposal_event_spec.rb
+++ b/decidim-proposals/spec/events/decidim/proposals/publish_proposal_event_spec.rb
@@ -26,26 +26,26 @@ module Proposals
           let(:resource) { create(:proposal) }
 
           it "is generated correctly" do
-            expect(subject.email_subject).to eq("New proposal \"#{resource_title}\" by @#{author.nickname}")
+            expect(subject.email_subject).to eq("New proposal \"#{resource_title}\" by #{author.name}")
           end
         end
 
         it "is generated correctly" do
-          expect(subject.email_subject).to eq("New proposal \"#{resource_title}\" by @#{author.nickname}")
+          expect(subject.email_subject).to eq("New proposal \"#{resource_title}\" by #{author.name}")
         end
       end
 
       describe "email_intro" do
         it "is generated correctly" do
           expect(subject.email_intro)
-            .to eq("#{author.name} @#{author.nickname}, who you are following, has published a new proposal called \"#{resource_title}\". Check it out and contribute:")
+            .to eq("#{author.name}, who you are following, has published a new proposal called \"#{resource_title}\". Check it out and contribute:")
         end
       end
 
       describe "email_outro" do
         it "is generated correctly" do
           expect(subject.email_outro)
-            .to eq("You have received this notification because you are following @#{author.nickname}. You can stop receiving notifications following the previous link.")
+            .to eq("You have received this notification because you are following #{author.name}. You can stop receiving notifications following the previous link.")
         end
       end
 
@@ -55,7 +55,7 @@ module Proposals
             .to include("The <a href=\"#{resource_path}\">#{resource_title}</a> proposal was published by ")
 
           expect(subject.notification_title)
-            .to include("<a href=\"/profiles/#{author.nickname}\">#{author.name} @#{author.nickname}</a>.")
+            .to include("<a href=\"/profiles/#{author.nickname}\">#{author.name}</a>.")
         end
       end
 

From aa36f62d7b9af571c780290634ea299a776a0994 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Mon, 6 Jul 2026 15:12:14 +0200
Subject: [PATCH 101/131] Backport 'Fix flaky spec at admin publishes and
 unpublishes document' to v0.31 (#17264)

* Fix flaky spec at admin publishes and unpublishes document

* Remove the admin current page check

Because this breaks a lot of other specs.

* Expect correct page and message before running the specs

Co-authored-by: Antti Hukkanen <antti.hukkanen@mainiotech.fi>
---
 .../admin/admin_publishes_and_unpublishes_document_spec.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/decidim-collaborative_texts/spec/system/admin/admin_publishes_and_unpublishes_document_spec.rb b/decidim-collaborative_texts/spec/system/admin/admin_publishes_and_unpublishes_document_spec.rb
index ddcbd3593bc32..aefa9afcd387a 100644
--- a/decidim-collaborative_texts/spec/system/admin/admin_publishes_and_unpublishes_document_spec.rb
+++ b/decidim-collaborative_texts/spec/system/admin/admin_publishes_and_unpublishes_document_spec.rb
@@ -16,6 +16,7 @@
     fill_in "Title", with: title
     fill_in_editor :document_body, with: body
     click_on "Create"
+    expect(page).to have_text("Document successfully created")
   end
 
   it "publishes and unpublish a document" do
@@ -41,6 +42,9 @@
   context "when unpublished document" do
     before do
       visit_component
+      within ".account-container", visible: :hidden do
+        expect(page).to have_text(:all, user.name)
+      end
     end
 
     it "displays unpublished documents in public view" do
@@ -53,6 +57,9 @@
       before do
         login_as regular_user, scope: :user
         visit_component
+        within ".account-container", visible: :hidden do
+          expect(page).to have_text(:all, regular_user.name)
+        end
       end
 
       it "does not display unpublished documents in public view" do

From 7422dbac51e8deb80c78c94b9b02ea7db1c4a792 Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Thu, 9 Jul 2026 11:34:52 +0300
Subject: [PATCH 102/131] Backport 'Fix double-escaping of component names in
 participatory space nav links and card' to v0.31 (#16965)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix double-escaping of component names in participatory space nav links and cards

* Use component name not escaped or translated in helpers

* Add test

* Fix tests

* Replace word

* Apply suggestion from @fblupi

Co-authored-by: Fran Bolívar (FBO) <francisco.bolivar.lupianez@gmail.com>

* Apply suggestions from code review

Co-authored-by: Fran Bolívar (FBO) <francisco.bolivar.lupianez@gmail.com>

* Prevent dobule escaping in card metadata cell space item

* Use html_safe in escaped translation to avoid double escaping when the text is interpolated

* Update tests to check that the contents are actually escaped

* Remove double escaping in expected text

* Make card metadata fix similar to other fixes

* Implement consistency check for behavior in all spaces

* Fix inconsistency issues in decidim-conferences nav links

* Retry the full CI (empty commit)

---------

Co-authored-by: Eduardo Martinez Echevarria <eduardomech@gmail.com>
Co-authored-by: Fran Bolívar (FBO) <francisco.bolivar.lupianez@gmail.com>

* Fix failing specs

* Fix assemblies pipelines

* Fix additional specs

* Fix core specs

* Fix processes specs

* Fix additional specs

---------

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
Co-authored-by: Eduardo Martinez Echevarria <eduardomech@gmail.com>
Co-authored-by: Fran Bolívar (FBO) <francisco.bolivar.lupianez@gmail.com>
---
 .../decidim/assemblies/assemblies_helper.rb   |  2 +-
 .../manage_assembly_components_examples.rb    |  5 +++--
 .../spec/system/assemblies_spec.rb            | 20 +++++++++++++++++--
 .../decidim/conferences/conference_helper.rb  |  4 ++--
 .../manage_conference_components_examples.rb  |  4 ++--
 .../spec/system/conference_program_spec.rb    |  4 ++--
 .../spec/system/conferences_spec.rb           | 18 ++++++++++++++++-
 .../app/cells/decidim/card_metadata_cell.rb   |  2 +-
 .../links.erb                                 |  2 +-
 .../has_space_in_mcell_examples.rb            |  3 ++-
 .../cells/decidim/card_metadata_cell_spec.rb  |  3 ++-
 .../decidim/initiatives/initiatives_helper.rb |  2 +-
 ...dmin_manages_initiative_components_spec.rb | 20 +++++++++++++++++--
 .../spec/system/initiative_spec.rb            | 14 +++++++------
 .../highlighted_meetings_cell_spec.rb         |  3 ++-
 .../decidim/meetings/meeting_l_cell_spec.rb   |  3 ++-
 .../directory/meetings_controller_spec.rb     |  4 ++--
 .../spec/system/directory_meetings_spec.rb    |  6 ++++--
 .../participatory_process_helper.rb           |  2 +-
 .../manage_process_components_examples.rb     |  5 +++--
 .../system/participatory_processes_spec.rb    | 20 +++++++++++++++++--
 21 files changed, 110 insertions(+), 36 deletions(-)

diff --git a/decidim-assemblies/app/helpers/decidim/assemblies/assemblies_helper.rb b/decidim-assemblies/app/helpers/decidim/assemblies/assemblies_helper.rb
index ad43eb1b23ee6..535e2a433d8de 100644
--- a/decidim-assemblies/app/helpers/decidim/assemblies/assemblies_helper.rb
+++ b/decidim-assemblies/app/helpers/decidim/assemblies/assemblies_helper.rb
@@ -30,7 +30,7 @@ def assembly_nav_items(participatory_space)
            )
         ] + components.map do |component|
           {
-            name: decidim_escape_translated(component.name),
+            name: translated_attribute(component.name),
             url: main_component_path(component),
             active: is_active_link?(main_component_path(component), :inclusive)
           }
diff --git a/decidim-assemblies/spec/shared/manage_assembly_components_examples.rb b/decidim-assemblies/spec/shared/manage_assembly_components_examples.rb
index d0ba6eb492772..5603b18602875 100644
--- a/decidim-assemblies/spec/shared/manage_assembly_components_examples.rb
+++ b/decidim-assemblies/spec/shared/manage_assembly_components_examples.rb
@@ -201,7 +201,8 @@
 
       it "hides the component from the menu" do
         visit decidim_assemblies.assembly_path(assembly, locale: I18n.locale)
-        expect(page).to have_content decidim_escape_translated(component.name)
+        expect(page).to have_content translated(component.name)
+        expect(page.html).to include decidim_escape_translated(component.name).gsub("&quot;", "\"")
 
         visit decidim_admin_assemblies.components_path(assembly)
 
@@ -216,7 +217,7 @@
         end
 
         visit decidim_assemblies.assembly_path(assembly, locale: I18n.locale)
-        expect(page).to have_no_content decidim_escape_translated(component.name)
+        expect(page).to have_no_content translated(component.name)
       end
     end
 
diff --git a/decidim-assemblies/spec/system/assemblies_spec.rb b/decidim-assemblies/spec/system/assemblies_spec.rb
index 3fa7457d1d4eb..7d7abe4a26aed 100644
--- a/decidim-assemblies/spec/system/assemblies_spec.rb
+++ b/decidim-assemblies/spec/system/assemblies_spec.rb
@@ -252,8 +252,24 @@
 
         it "shows the components" do
           within ".participatory-space__nav-container" do
-            expect(page).to have_content(decidim_escape_translated(proposals_component.name))
-            expect(page).to have_no_content(decidim_escape_translated(meetings_component.name))
+            expect(page).to have_content(translated(proposals_component.name))
+            expect(page.html).to include(decidim_escape_translated(proposals_component.name).gsub("&quot;", "\""))
+            expect(page).to have_no_content(translated(meetings_component.name))
+          end
+        end
+
+        describe "when there are special characters (', &) in the nav links" do
+          let(:participatory_space) { assembly }
+          let(:component_name) { "People's Budget & Ideas" }
+          let!(:proposal_component) { create(:proposal_component, name: { en: component_name }, participatory_space:) }
+
+          it "renders the component name correctly" do
+            visit current_path
+            within ".participatory-space__nav-container" do
+              expect(page).to have_content(component_name)
+              expect(page).to have_no_content("&#39;")
+              expect(page).to have_no_content("&amp;#39;")
+            end
           end
         end
       end
diff --git a/decidim-conferences/app/helpers/decidim/conferences/conference_helper.rb b/decidim-conferences/app/helpers/decidim/conferences/conference_helper.rb
index be78362b94eb1..61c3de9df7b57 100644
--- a/decidim-conferences/app/helpers/decidim/conferences/conference_helper.rb
+++ b/decidim-conferences/app/helpers/decidim/conferences/conference_helper.rb
@@ -42,7 +42,7 @@ def conference_nav_items(participatory_space)
             next unless Decidim::Meetings::Meeting.where(component:).published.not_hidden.visible_for(current_user).exists?
 
             items << {
-              name: decidim_escape_translated(component.name),
+              name: translated_attribute(component.name),
               url: decidim_conferences.conference_conference_program_path(participatory_space, id: component.id)
             }
           end
@@ -63,7 +63,7 @@ def conference_nav_items(participatory_space)
 
           other_components.each do |component|
             items << {
-              name: decidim_escape_translated(component.name),
+              name: translated_attribute(component.name),
               url: main_component_path(component)
             }
           end
diff --git a/decidim-conferences/spec/shared/manage_conference_components_examples.rb b/decidim-conferences/spec/shared/manage_conference_components_examples.rb
index e8864e661c218..924faad96fd20 100644
--- a/decidim-conferences/spec/shared/manage_conference_components_examples.rb
+++ b/decidim-conferences/spec/shared/manage_conference_components_examples.rb
@@ -197,7 +197,7 @@
 
       it "hides the component from the menu" do
         visit decidim_conferences.conference_path(conference, locale: I18n.locale)
-        expect(page).to have_content decidim_escape_translated(component.name)
+        expect(page).to have_content translated_attribute(component.name)
 
         visit decidim_admin_conferences.components_path(conference)
 
@@ -212,7 +212,7 @@
         end
 
         visit decidim_conferences.conference_path(conference, locale: I18n.locale)
-        expect(page).to have_no_content decidim_escape_translated(component.name)
+        expect(page).to have_no_content translated_attribute(component.name)
       end
     end
 
diff --git a/decidim-conferences/spec/system/conference_program_spec.rb b/decidim-conferences/spec/system/conference_program_spec.rb
index 091136f369ee4..4403a2dd09b25 100644
--- a/decidim-conferences/spec/system/conference_program_spec.rb
+++ b/decidim-conferences/spec/system/conference_program_spec.rb
@@ -52,8 +52,8 @@
           visit decidim_conferences.conference_path(conference)
 
           within "aside .conference__nav-container" do
-            expect(page).to have_content(decidim_escape_translated(component.name))
-            click_on decidim_escape_translated(component.name)
+            expect(page).to have_content(translated_attribute(component.name))
+            click_on translated_attribute(component.name)
           end
 
           expect(page).to have_current_path decidim_conferences.conference_conference_program_path(conference, component)
diff --git a/decidim-conferences/spec/system/conferences_spec.rb b/decidim-conferences/spec/system/conferences_spec.rb
index 849d8fffc114e..d732e039f9aaa 100644
--- a/decidim-conferences/spec/system/conferences_spec.rb
+++ b/decidim-conferences/spec/system/conferences_spec.rb
@@ -230,11 +230,27 @@
     context "when the conference has some components" do
       it "shows the components" do
         within ".conference__nav" do
-          expect(page).to have_content(decidim_escape_translated(proposals_component.name))
+          expect(page).to have_content(translated(proposals_component.name))
+          expect(page.html).to include(decidim_escape_translated(proposals_component.name).gsub("&quot;", "\""))
           expect(page).to have_no_content(decidim_escape_translated(meetings_component.name))
         end
       end
 
+      describe "when there are special characters (', &) in the nav links" do
+        let(:participatory_space) { conference }
+        let(:component_name) { "People's Budget & Ideas" }
+        let!(:proposal_component) { create(:proposal_component, name: { en: component_name }, participatory_space:) }
+
+        it "renders the component name correctly" do
+          visit current_path
+          within ".conference__nav-container" do
+            expect(page).to have_content(component_name)
+            expect(page).to have_no_content("&#39;")
+            expect(page).to have_no_content("&amp;#39;")
+          end
+        end
+      end
+
       it "renders the stats for those components that are visible" do
         within all("[data-statistic]")[0] do
           expect(page).to have_css(".statistic__title", text: "Proposals")
diff --git a/decidim-core/app/cells/decidim/card_metadata_cell.rb b/decidim-core/app/cells/decidim/card_metadata_cell.rb
index e8bf4102480f6..322b31b19a0b0 100644
--- a/decidim-core/app/cells/decidim/card_metadata_cell.rb
+++ b/decidim-core/app/cells/decidim/card_metadata_cell.rb
@@ -29,7 +29,7 @@ def space_item
       return unless show_space?
 
       {
-        text: decidim_escape_translated(participatory_space.title),
+        text: translated_attribute(participatory_space.title),
         icon: resource_type_icon_key(participatory_space.class),
         url: Decidim::ResourceLocatorPresenter.new(participatory_space).path
       }
diff --git a/decidim-core/app/cells/decidim/participatory_space_dropdown_metadata/links.erb b/decidim-core/app/cells/decidim/participatory_space_dropdown_metadata/links.erb
index ab02418703794..62d21102d6f04 100644
--- a/decidim-core/app/cells/decidim/participatory_space_dropdown_metadata/links.erb
+++ b/decidim-core/app/cells/decidim/participatory_space_dropdown_metadata/links.erb
@@ -2,7 +2,7 @@
   <% nav_items.each do |item| %>
     <li>
       <%= link_to item[:url] do %>
-        <span><%= item[:name] %></span><%= icon "arrow-right-line" %>
+        <span><%= decidim_escape_translated(item[:name]) %></span><%= icon "arrow-right-line" %>
       <% end %>
     </li>
   <% end %>
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/has_space_in_mcell_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/has_space_in_mcell_examples.rb
index 888f3583c70a6..76276450c5b6e 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/has_space_in_mcell_examples.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/has_space_in_mcell_examples.rb
@@ -8,7 +8,8 @@
     let(:show_space) { true }
 
     it "renders the space where the model belongs to" do
-      expect(cell_html).to have_content(decidim_escape_translated(model.component.participatory_space.title))
+      expect(cell_html).to have_content(translated_attribute(model.component.participatory_space.title))
+      expect(cell_html.to_s).to include(decidim_escape_translated(model.component.participatory_space.title).gsub("&quot;", "\""))
     end
   end
 end
diff --git a/decidim-core/spec/cells/decidim/card_metadata_cell_spec.rb b/decidim-core/spec/cells/decidim/card_metadata_cell_spec.rb
index f9c54d9125b84..2c8804cbb3a9f 100644
--- a/decidim-core/spec/cells/decidim/card_metadata_cell_spec.rb
+++ b/decidim-core/spec/cells/decidim/card_metadata_cell_spec.rb
@@ -26,7 +26,8 @@
     let(:options) { { show_space: true } }
 
     it "renders the space the model belongs to" do
-      expect(cell_html).to have_content(decidim_escape_translated(model.component.participatory_space.title))
+      expect(cell_html).to have_content(translated_attribute(model.component.participatory_space.title))
+      expect(cell_html.to_s).to include(decidim_escape_translated(model.component.participatory_space.title).gsub("&quot;", "\""))
     end
   end
 
diff --git a/decidim-initiatives/app/helpers/decidim/initiatives/initiatives_helper.rb b/decidim-initiatives/app/helpers/decidim/initiatives/initiatives_helper.rb
index 5c9c89c18acd8..e0b197bf137a1 100644
--- a/decidim-initiatives/app/helpers/decidim/initiatives/initiatives_helper.rb
+++ b/decidim-initiatives/app/helpers/decidim/initiatives/initiatives_helper.rb
@@ -13,7 +13,7 @@ def initiative_nav_items(participatory_space)
 
         components.map do |component|
           {
-            name: decidim_escape_translated(component.name),
+            name: translated_attribute(component.name),
             url: main_component_path(component),
             active: is_active_link?(main_component_path(component), :inclusive)
           }
diff --git a/decidim-initiatives/spec/system/admin/admin_manages_initiative_components_spec.rb b/decidim-initiatives/spec/system/admin/admin_manages_initiative_components_spec.rb
index 4d0a19fea811b..6e792b9b86d0e 100644
--- a/decidim-initiatives/spec/system/admin/admin_manages_initiative_components_spec.rb
+++ b/decidim-initiatives/spec/system/admin/admin_manages_initiative_components_spec.rb
@@ -210,9 +210,25 @@
     context "when the component is published" do
       let(:published_at) { Time.current }
 
+      describe "when there are special characters (', &) in the nav links" do
+        let(:participatory_space) { initiative }
+        let(:component_name) { "People's Budget & Ideas" }
+        let!(:proposal_component) { create(:proposal_component, name: { en: component_name }, participatory_space:) }
+
+        it "renders the component name correctly" do
+          visit decidim_initiatives.initiative_path(initiative, locale: I18n.locale)
+          within ".participatory-space__nav-container" do
+            expect(page).to have_content(component_name)
+            expect(page).to have_no_content("&#39;")
+            expect(page).to have_no_content("&amp;#39;")
+          end
+        end
+      end
+
       it "hides the component from the menu" do
         visit decidim_initiatives.initiative_path(initiative, locale: I18n.locale)
-        expect(page).to have_content decidim_escape_translated(component.name)
+        expect(page).to have_content translated(component.name)
+        expect(page.html).to include decidim_escape_translated(component.name).gsub("&quot;", "\"")
 
         visit decidim_admin_initiatives.components_path(initiative)
 
@@ -227,7 +243,7 @@
         end
 
         visit decidim_initiatives.initiative_path(initiative, locale: I18n.locale)
-        expect(page).to have_no_content decidim_escape_translated(component.name)
+        expect(page).to have_no_content translated(component.name)
       end
     end
 
diff --git a/decidim-initiatives/spec/system/initiative_spec.rb b/decidim-initiatives/spec/system/initiative_spec.rb
index 8b89b9731d717..098abc030028a 100644
--- a/decidim-initiatives/spec/system/initiative_spec.rb
+++ b/decidim-initiatives/spec/system/initiative_spec.rb
@@ -247,15 +247,17 @@
 
       it "shows the components" do
         within ".participatory-space__nav-container" do
-          expect(page).to have_content(decidim_escape_translated(meetings_component.name))
-          expect(page).to have_no_content(decidim_escape_translated(unpublished_proposals_component.name))
-          expect(page).to have_content(decidim_escape_translated(blogs_component.name))
+          expect(page).to have_content(translated(meetings_component.name))
+          expect(page.html).to include(decidim_escape_translated(meetings_component.name).gsub("&quot;", "\""))
+          expect(page).to have_no_content(translated(unpublished_proposals_component.name))
+          expect(page).to have_content(translated(blogs_component.name))
+          expect(page.html).to include(decidim_escape_translated(blogs_component.name).gsub("&quot;", "\""))
         end
       end
 
       it "allows visiting the components" do
         within ".participatory-space__nav-container" do
-          click_on decidim_escape_translated(meetings_component.name)
+          click_on translated(meetings_component.name)
         end
 
         expect(page).to have_css('[id^="meetings__meeting"]', count: 3)
@@ -388,7 +390,7 @@
 
       it "has special permissions to create posts" do
         within ".participatory-space__nav-container" do
-          click_on decidim_escape_translated(blogs_component.name)
+          click_on translated(blogs_component.name)
         end
 
         expect(page).to have_content("New post")
@@ -396,7 +398,7 @@
 
       it "has special permissions to create meetings" do
         within ".participatory-space__nav-container" do
-          click_on decidim_escape_translated(meetings_component.name)
+          click_on translated(meetings_component.name)
         end
 
         expect(page).to have_content("New meeting")
diff --git a/decidim-meetings/spec/cells/decidim/meetings/content_blocks/highlighted_meetings_cell_spec.rb b/decidim-meetings/spec/cells/decidim/meetings/content_blocks/highlighted_meetings_cell_spec.rb
index e5f2c706d7564..95edeae277580 100644
--- a/decidim-meetings/spec/cells/decidim/meetings/content_blocks/highlighted_meetings_cell_spec.rb
+++ b/decidim-meetings/spec/cells/decidim/meetings/content_blocks/highlighted_meetings_cell_spec.rb
@@ -49,7 +49,8 @@ module ContentBlocks
             it { expect(meetings_ids).not_to include(item_id(unpublished_meeting)) }
 
             it "shows the participatory space on homepage" do
-              expect(html).to have_content(decidim_escape_translated(meeting.component.participatory_space.title))
+              expect(html).to have_content(translated_attribute(meeting.component.participatory_space.title))
+              expect(html.to_s).to include(decidim_escape_translated(meeting.component.participatory_space.title).gsub("&quot;", "\""))
             end
 
             it "orders them correctly" do
diff --git a/decidim-meetings/spec/cells/decidim/meetings/meeting_l_cell_spec.rb b/decidim-meetings/spec/cells/decidim/meetings/meeting_l_cell_spec.rb
index 9a7fb5eff059f..b6b9b8503b07a 100644
--- a/decidim-meetings/spec/cells/decidim/meetings/meeting_l_cell_spec.rb
+++ b/decidim-meetings/spec/cells/decidim/meetings/meeting_l_cell_spec.rb
@@ -136,7 +136,8 @@ module Decidim::Meetings
       let(:my_cell) { cell("decidim/meetings/meeting_l", meeting, context: { show_space: true }) }
 
       it "shows the participatory space" do
-        expect(subject).to have_content(decidim_escape_translated(meeting.component.participatory_space.title))
+        expect(subject).to have_content(translated_attribute(meeting.component.participatory_space.title))
+        expect(subject.to_s).to include(decidim_escape_translated(meeting.component.participatory_space.title).gsub("&quot;", "\""))
       end
     end
 
diff --git a/decidim-meetings/spec/controllers/decidim/meetings/directory/meetings_controller_spec.rb b/decidim-meetings/spec/controllers/decidim/meetings/directory/meetings_controller_spec.rb
index f5df559d61f1f..2ec0f40f181c7 100644
--- a/decidim-meetings/spec/controllers/decidim/meetings/directory/meetings_controller_spec.rb
+++ b/decidim-meetings/spec/controllers/decidim/meetings/directory/meetings_controller_spec.rb
@@ -65,8 +65,8 @@
     it { expect(response).to have_http_status(:success) }
 
     it "shows the participatory space for each meeting" do
-      expect(response.body).to include(ERB::Util.html_escape(decidim_escape_translated(participatory_process1.title)))
-      expect(response.body).to include(ERB::Util.html_escape(decidim_escape_translated(participatory_process2.title)))
+      expect(response.body).to include(decidim_escape_translated(participatory_process1.title))
+      expect(response.body).to include(decidim_escape_translated(participatory_process2.title))
     end
   end
 end
diff --git a/decidim-meetings/spec/system/directory_meetings_spec.rb b/decidim-meetings/spec/system/directory_meetings_spec.rb
index 4ceafc268e273..f13796a50c5c8 100644
--- a/decidim-meetings/spec/system/directory_meetings_spec.rb
+++ b/decidim-meetings/spec/system/directory_meetings_spec.rb
@@ -34,8 +34,10 @@
 
   it "shows the participatory space name for each meeting in the main list" do
     within ".layout-2col__main" do
-      expect(page).to have_content(decidim_escape_translated(participatory_process1.title))
-      expect(page).to have_content(decidim_escape_translated(participatory_process2.title))
+      expect(page).to have_content translated(participatory_process1.title)
+      expect(page.html).to include decidim_escape_translated(participatory_process1.title).gsub("&quot;", "\"")
+      expect(page).to have_content translated(participatory_process2.title)
+      expect(page.html).to include decidim_escape_translated(participatory_process2.title).gsub("&quot;", "\"")
     end
   end
 end
diff --git a/decidim-participatory_processes/app/helpers/decidim/participatory_processes/participatory_process_helper.rb b/decidim-participatory_processes/app/helpers/decidim/participatory_processes/participatory_process_helper.rb
index ad0c0f4079a62..84cadd9d0c7e3 100644
--- a/decidim-participatory_processes/app/helpers/decidim/participatory_processes/participatory_process_helper.rb
+++ b/decidim-participatory_processes/app/helpers/decidim/participatory_processes/participatory_process_helper.rb
@@ -76,7 +76,7 @@ def process_nav_items(participatory_space)
         ] + components.map do |component|
           {
             id: component.id,
-            name: decidim_escape_translated(component.name),
+            name: translated_attribute(component.name),
             url: main_component_path(component),
             active: is_active_link?(main_component_path(component), :inclusive)
           }
diff --git a/decidim-participatory_processes/spec/shared/manage_process_components_examples.rb b/decidim-participatory_processes/spec/shared/manage_process_components_examples.rb
index 7bbcb2791c0de..496c12e956797 100644
--- a/decidim-participatory_processes/spec/shared/manage_process_components_examples.rb
+++ b/decidim-participatory_processes/spec/shared/manage_process_components_examples.rb
@@ -321,7 +321,8 @@
 
       it "hides the component from the menu" do
         visit decidim_participatory_processes.participatory_process_path(participatory_process, locale: I18n.locale)
-        expect(page).to have_content decidim_escape_translated(component.name)
+        expect(page).to have_content translated(component.name)
+        expect(page.html).to include decidim_escape_translated(component.name).gsub("&quot;", "\"")
 
         visit decidim_admin_participatory_processes.components_path(participatory_process)
 
@@ -336,7 +337,7 @@
         end
 
         visit decidim_participatory_processes.participatory_process_path(participatory_process, locale: I18n.locale)
-        expect(page).to have_no_content decidim_escape_translated(component.name)
+        expect(page).to have_no_content translated(component.name)
       end
     end
 
diff --git a/decidim-participatory_processes/spec/system/participatory_processes_spec.rb b/decidim-participatory_processes/spec/system/participatory_processes_spec.rb
index 0f44c8615b9f1..e5fdcbc972fb7 100644
--- a/decidim-participatory_processes/spec/system/participatory_processes_spec.rb
+++ b/decidim-participatory_processes/spec/system/participatory_processes_spec.rb
@@ -312,13 +312,29 @@
 
           it "shows the components" do
             within ".participatory-space__nav-container" do
-              expect(page).to have_content(decidim_escape_translated(proposals_component.name))
-              expect(page).to have_no_content(decidim_escape_translated(meetings_component.name))
+              expect(page).to have_content(translated(proposals_component.name))
+              expect(page).to have_no_content(translated(meetings_component.name))
+              expect(page.html).to include decidim_escape_translated(proposals_component.name).gsub("&quot;", "\"")
             end
           end
 
           it_behaves_like "accessible page"
 
+          describe "when there are special characters (', &) in the nav links" do
+            let(:participatory_space) { participatory_process }
+            let(:component_name) { "People's Budget & Ideas" }
+            let!(:proposal_component) { create(:proposal_component, name: { en: component_name }, participatory_space:) }
+
+            it "renders the component name correctly" do
+              visit current_path
+              within ".participatory-space__nav-container" do
+                expect(page).to have_content(component_name)
+                expect(page).to have_no_content("&#39;")
+                expect(page).to have_no_content("&amp;#39;")
+              end
+            end
+          end
+
           context "and the process statistics are enabled" do
             let(:blocks_manifests) { [:hero, :stats] }
 

From f2b4a15ec3ff9a14ed1610a4441044a3be3ac320 Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Thu, 9 Jul 2026 18:15:48 +0300
Subject: [PATCH 103/131] Backport 'Fix ENV var for setting inactive users
 deletion period' to v0.31 (#17276)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Ivan Vergés <ivan@pokecode.net>
---
 decidim-core/lib/decidim/core.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/decidim-core/lib/decidim/core.rb b/decidim-core/lib/decidim/core.rb
index f194a6cdfbf30..9ef25f65deb4d 100644
--- a/decidim-core/lib/decidim/core.rb
+++ b/decidim-core/lib/decidim/core.rb
@@ -295,7 +295,7 @@ def self.reset_all_column_information
 
   # Users that have not logged in for this period of time will be deleted
   config_accessor :delete_inactive_users_after_days do
-    Decidim::Env.new("DELETE_INACTIVE_USERS_AFTER_DAYS", 365).to_i
+    Decidim::Env.new("DECIDIM_DELETE_INACTIVE_USERS_AFTER_DAYS", 365).to_i
   end
 
   # The minimum allowed inactivity period for deleting participants.

From f4a7ecf16630b9e3641c84eac4768b4bb272e061 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Mon, 13 Jul 2026 08:31:53 +0200
Subject: [PATCH 104/131] Backport 'Fix comments `loginModal` for non-logged in
 users' to v0.31 (#17285)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Tom Greenwood <101816158+greenwoodt@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 .../app/cells/decidim/comments_button_cell.rb | 10 ++++++-
 .../test/shared_examples/comments_examples.rb | 26 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/decidim-core/app/cells/decidim/comments_button_cell.rb b/decidim-core/app/cells/decidim/comments_button_cell.rb
index c9196d38fcdab..f09bbb7f48b73 100644
--- a/decidim-core/app/cells/decidim/comments_button_cell.rb
+++ b/decidim-core/app/cells/decidim/comments_button_cell.rb
@@ -23,7 +23,9 @@ def comments_enabled?
     end
 
     def path
-      "#add-comment-anchor"
+      return "#add-comment-anchor" if current_user
+
+      nil
     end
 
     def text
@@ -37,5 +39,11 @@ def icon_name
     def button_classes
       "button button__sm button__transparent-secondary add-comment-mobile"
     end
+
+    def html_options
+      return {} if current_user
+
+      { data: { "dialog-open": "loginModal" } }
+    end
   end
 end
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/comments_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/comments_examples.rb
index ee702d89850b3..90c5920364648 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/comments_examples.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/comments_examples.rb
@@ -147,6 +147,16 @@
       expect(page).to have_css(".comment-thread")
     end
 
+    it "opens the login modal when clicking the comment button" do
+      visit resource_path
+
+      expect(page).to have_no_css("#loginModal-content", visible: :visible)
+
+      find(".add-comment-mobile").click
+
+      expect(page).to have_css("#loginModal-content", visible: :visible)
+    end
+
     context "when user visit a mobile browser" do
       before do
         driven_by(:iphone)
@@ -176,6 +186,22 @@
       expect(page).to have_css(".add-comment form")
     end
 
+    it "does not show login modal when clicking the comment button" do
+      visit resource_path
+
+      find("a.add-comment-mobile").click
+
+      expect(page).to have_no_css("#loginModal-content", visible: :visible)
+    end
+
+    it "guides the user to the comment form when clicking the comment button" do
+      visit resource_path
+
+      find("a.add-comment-mobile").click
+
+      expect(page).to have_css("#add-comment-anchor")
+    end
+
     context "when user visit a computer browser" do
       before do
         switch_to_host(organization.host)

From 9c2bac50f939e4fefcc684a95e8ba88f38b286c8 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Wed, 15 Jul 2026 13:03:00 +0200
Subject: [PATCH 105/131] Backport 'Fix meeting social share image preview not
 displaying description image' to v0.31 (#17297)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Elvia Benedith <116598037+ElviaBth@users.noreply.github.com>
Co-authored-by: Ivan Vergés <ivan@pokecode.net>
---
 .../app/resolvers/decidim/meta_image_url_resolver.rb      | 7 +++++++
 .../spec/services/decidim/meta_image_url_resolver_spec.rb | 8 ++++++++
 .../spec/system/meetings_social_share_spec.rb             | 2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/decidim-core/app/resolvers/decidim/meta_image_url_resolver.rb b/decidim-core/app/resolvers/decidim/meta_image_url_resolver.rb
index 3ea3f48be844a..1d097888168e1 100644
--- a/decidim-core/app/resolvers/decidim/meta_image_url_resolver.rb
+++ b/decidim-core/app/resolvers/decidim/meta_image_url_resolver.rb
@@ -79,6 +79,9 @@ def blob_from_description
         image_url = image_element["src"]
         next if image_url.blank?
 
+        blob = find_blob_by_id(image_url.split("/").last)
+        return blob if blob.present?
+
         blob = find_blob_by_key(image_url.split("/").second_to_last)
         return blob if blob.present?
       end
@@ -120,6 +123,10 @@ def find_blob_by_key(blob_key)
       ActiveStorage::Blob.find_signed(blob_key) if blob_key.present?
     end
 
+    def find_blob_by_id(blob_id)
+      ActiveStorage::Blob.find_by(id: blob_id) if blob_id.present?
+    end
+
     def blob_from_attached_file(file)
       return unless file.respond_to?(:attached?) && file.attached?
 
diff --git a/decidim-core/spec/services/decidim/meta_image_url_resolver_spec.rb b/decidim-core/spec/services/decidim/meta_image_url_resolver_spec.rb
index d428cec3d8c46..eff1fb4dd88df 100644
--- a/decidim-core/spec/services/decidim/meta_image_url_resolver_spec.rb
+++ b/decidim-core/spec/services/decidim/meta_image_url_resolver_spec.rb
@@ -92,6 +92,14 @@
     it { is_expected.to end_with("/description_image.jpg") }
   end
 
+  context "when no attachments and description image is referenced by blob id" do
+    let(:resource) { proposal }
+    let(:attachment) { nil }
+    let(:description_image_path) { "/rails/active_storage/blobs/#{description_image.id}" }
+
+    it { is_expected.to end_with("/description_image.jpg") }
+  end
+
   context "when no previous images and belongs to a participatory space" do
     let(:resource) { proposal }
     let(:attachment) { nil }
diff --git a/decidim-meetings/spec/system/meetings_social_share_spec.rb b/decidim-meetings/spec/system/meetings_social_share_spec.rb
index 4c586b33abb8e..0e82219c129eb 100644
--- a/decidim-meetings/spec/system/meetings_social_share_spec.rb
+++ b/decidim-meetings/spec/system/meetings_social_share_spec.rb
@@ -79,7 +79,7 @@
     end
   end
 
-  context "when no attachment images" do
+  context "when no attachment image" do
     let!(:attachment) { nil }
 
     it_behaves_like "a social share meta tag", "description_image.jpg"

From be61a5aa4280e98f101e641e0c50aeece333e317 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Thu, 16 Jul 2026 10:09:14 +0200
Subject: [PATCH 106/131] Backport 'Fix inverted survey response pagination' to
 v0.31 (#17300)

Co-authored-by: Tom Greenwood <101816158+greenwoodt@users.noreply.github.com>
---
 .../views/decidim/surveys/admin/responses/show.html.erb   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/decidim-surveys/app/views/decidim/surveys/admin/responses/show.html.erb b/decidim-surveys/app/views/decidim/surveys/admin/responses/show.html.erb
index 8ae094744e3ac..6af4c5b036da3 100644
--- a/decidim-surveys/app/views/decidim/surveys/admin/responses/show.html.erb
+++ b/decidim-surveys/app/views/decidim/surveys/admin/responses/show.html.erb
@@ -3,10 +3,10 @@
     <h1 class="item_show__header-title">
       <%= t ".title", number: current_idx %>
 
-      <%= link_to t("actions.next", scope: "decidim.forms.admin.questionnaires.responses").html_safe, next_url, rel: "next", class: "button button__sm button__secondary next" unless last? %>
-     <%= link_to t("actions.previous", scope: "decidim.forms.admin.questionnaires.responses").html_safe, prev_url, rel: "prev", class: "button button__sm button__secondary prev" unless first? %>
-      <%= link_to t("actions.export", scope: "decidim.forms.admin.questionnaires.responses"), questionnaire_export_response_url(@participant.session_token), class: "button button__sm button__secondary export" %>
-      <%= link_to t("actions.back", scope: "decidim.forms.admin.questionnaires.responses"), questionnaire_participants_url, class: "button button__sm button__secondary back" %>
+      <%= link_to t("actions.previous", scope: "decidim.forms.admin.questionnaires.responses").html_safe, prev_url, rel: "prev", class: "button button__sm button__transparent-secondary prev" unless first? %>
+      <%= link_to t("actions.next", scope: "decidim.forms.admin.questionnaires.responses").html_safe, next_url, rel: "next", class: "button button__sm button__transparent-secondary next" unless last? %>
+      <%= link_to t("actions.export", scope: "decidim.forms.admin.questionnaires.responses"), questionnaire_export_response_url(@participant.session_token), class: "button button__sm button__transparent-secondary export" %>
+      <%= link_to t("actions.back", scope: "decidim.forms.admin.questionnaires.responses"), questionnaire_participants_url, class: "button button__sm button__transparent-secondary back" %>
     </h1>
   </div>
   <div class="card-section">

From 131be53eb7be0f75e95747599da657d8e4841ad1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= <ivan@pokecode.net>
Date: Thu, 16 Jul 2026 11:50:39 +0200
Subject: [PATCH 107/131] backport taxonomies in posts (#110)

* backport taxonomies in posts

* fix merge errors
---
 .../cells/decidim/blogs/post_metadata_cell.rb |  4 +-
 .../controllers/decidim/blogs/orderable.rb    | 61 +++++++++++++++++++
 .../decidim/blogs/posts_controller.rb         | 24 +++++---
 .../decidim/blogs/application_helper.rb       | 15 +++++
 .../app/models/decidim/blogs/post.rb          | 33 ++++++++++
 .../views/decidim/blogs/posts/_posts.html.erb | 13 ++++
 .../views/decidim/blogs/posts/index.html.erb  | 17 ++----
 .../views/decidim/blogs/posts/index.js.erb    |  8 +++
 .../views/decidim/blogs/posts/show.html.erb   |  6 +-
 decidim-blogs/config/locales/en.yml           |  5 ++
 .../decidim/blogs/posts_controller_spec.rb    |  7 ++-
 .../spec/system/explore_posts_spec.rb         | 49 +++++++++++++++
 .../spec/system/search_posts_spec.rb          | 18 ++++++
 13 files changed, 234 insertions(+), 26 deletions(-)
 create mode 100644 decidim-blogs/app/controllers/decidim/blogs/orderable.rb
 create mode 100644 decidim-blogs/app/views/decidim/blogs/posts/_posts.html.erb
 create mode 100644 decidim-blogs/app/views/decidim/blogs/posts/index.js.erb
 create mode 100644 decidim-blogs/spec/system/search_posts_spec.rb

diff --git a/decidim-blogs/app/cells/decidim/blogs/post_metadata_cell.rb b/decidim-blogs/app/cells/decidim/blogs/post_metadata_cell.rb
index 6822dd45ada1d..b061eb9db6f29 100644
--- a/decidim-blogs/app/cells/decidim/blogs/post_metadata_cell.rb
+++ b/decidim-blogs/app/cells/decidim/blogs/post_metadata_cell.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   module Blogs
-    # This cell renders metadata for an instance of a Proposal
+    # This cell renders metadata for an instance of a Post
     class PostMetadataCell < Decidim::CardMetadataCell
       def initialize(*)
         super
@@ -13,7 +13,7 @@ def initialize(*)
       private
 
       def post_items
-        [author_item, creation_date, comments_count_item, likes_count_item]
+        [author_item] + taxonomy_items + [creation_date, comments_count_item, likes_count_item]
       end
 
       def creation_date
diff --git a/decidim-blogs/app/controllers/decidim/blogs/orderable.rb b/decidim-blogs/app/controllers/decidim/blogs/orderable.rb
new file mode 100644
index 0000000000000..161c5606afcc0
--- /dev/null
+++ b/decidim-blogs/app/controllers/decidim/blogs/orderable.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Blogs
+    module Orderable
+      extend ActiveSupport::Concern
+
+      included do
+        include Decidim::Orderable
+
+        private
+
+        # i18n-tasks-use t('decidim.blogs.posts.orders.label')
+        # i18n-tasks-use t('decidim.blogs.posts.orders.most_commented')
+        # i18n-tasks-use t('decidim.blogs.posts.orders.random')
+        # i18n-tasks-use t('decidim.blogs.posts.orders.recent')
+
+        def available_orders
+          @available_orders ||= possible_orders
+        end
+
+        def possible_orders
+          @possible_orders ||= begin
+            possible_orders = %w(random recent)
+            possible_orders << "most_commented" if most_commented_order_available?
+            possible_orders
+          end
+        end
+
+        def default_order
+          "recent"
+        end
+
+        def most_commented_order_available?
+          return @most_commented_order_available if defined?(@most_commented_order_available)
+
+          @most_commented_order_available = Decidim::Blogs::Post.most_commented_available?(current_component)
+        end
+
+        def reorder(posts)
+          case order
+          when "recent"
+            posts.order(published_at: :desc)
+          when "most_commented"
+            posts.order(comments_count: :desc)
+          when "random"
+            posts.order_randomly(random_seed)
+          else
+            posts
+          end
+        end
+
+        def paginate_posts
+          @paginate_posts ||= paginate(reorder(posts))
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb b/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
index 08e385443ad6a..2d2380e126a40 100644
--- a/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
+++ b/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
@@ -6,7 +6,9 @@ module Blogs
     class PostsController < Decidim::Blogs::ApplicationController
       include Flaggable
       include Paginable
+      include FilterResource
       include Decidim::IconHelper
+      include Decidim::Blogs::Orderable
 
       helper Decidim::Blogs::PostsSelectHelper
       include Decidim::FormFactory
@@ -78,10 +80,6 @@ def destroy
 
       private
 
-      def paginate_posts
-        @paginate_posts ||= paginate(posts.created_at_desc)
-      end
-
       def post
         @post ||= posts.find(params[:id])
       end
@@ -91,11 +89,7 @@ def post_presenter
       end
 
       def posts
-        @posts ||= if current_user&.admin?
-                     Post.where(component: current_component).published_at_desc
-                   else
-                     Post.published.where(component: current_component).published_at_desc
-                   end
+        @posts ||= search.result
       end
 
       # PROVISIONAL if we implement counter cache
@@ -104,6 +98,18 @@ def posts_most_commented
                                        .select("count(decidim_comments_comments.id) as counter")
                                        .select("decidim_blogs_posts.*").order("counter DESC").published_at_desc.limit(7)
       end
+
+      def search_collection
+        if current_user&.admin?
+          Post.where(component: current_component)
+        else
+          Post.published.where(component: current_component)
+        end
+      end
+
+      def default_filter_params
+        { search_text_cont: "", with_any_taxonomies: nil }
+      end
     end
   end
 end
diff --git a/decidim-blogs/app/helpers/decidim/blogs/application_helper.rb b/decidim-blogs/app/helpers/decidim/blogs/application_helper.rb
index c5858d6f57b6c..3203e38f09ca2 100644
--- a/decidim-blogs/app/helpers/decidim/blogs/application_helper.rb
+++ b/decidim-blogs/app/helpers/decidim/blogs/application_helper.rb
@@ -11,10 +11,25 @@ module ApplicationHelper
       include ::Decidim::LikeableHelper
       include ::Decidim::FollowableHelper
       include Decidim::Comments::CommentsHelper
+      include Decidim::CheckBoxesTreeHelper
 
       def component_name
         (defined?(current_component) && translated_attribute(current_component&.name).presence) || t("decidim.components.blogs.name")
       end
+
+      def filter_sections
+        @filter_sections ||= current_component.available_taxonomy_filters.map do |taxonomy_filter|
+          {
+            method: :with_any_taxonomies,
+            name: "[with_any_taxonomies][#{taxonomy_filter.root_taxonomy_id}]",
+            collection: filter_taxonomy_values_for(taxonomy_filter),
+            label: decidim_sanitize_translated(taxonomy_filter.name),
+            id: "taxonomy-#{taxonomy_filter.root_taxonomy_id}"
+          }
+        end
+      end
+
+      def search_variable = :search_text_cont
     end
   end
 end
diff --git a/decidim-blogs/app/models/decidim/blogs/post.rb b/decidim-blogs/app/models/decidim/blogs/post.rb
index c1c1801729431..fd70589d535da 100644
--- a/decidim-blogs/app/models/decidim/blogs/post.rb
+++ b/decidim-blogs/app/models/decidim/blogs/post.rb
@@ -21,6 +21,8 @@ class Post < Blogs::ApplicationRecord
       include Traceable
       include Loggable
       include Decidim::SoftDeletable
+      include Decidim::FilterableResource
+      include Decidim::Randomable
 
       component_manifest_name "blogs"
 
@@ -101,6 +103,37 @@ def reported_attributes
       def reported_searchable_content_extras
         [author.name]
       end
+
+      # Create i18n ransackers for :title and :body.
+      # Create the :search_text ransacker alias for searching from both of these.
+      ransacker_i18n_multi :search_text, [:title, :body]
+
+      def self.most_commented_available?(component)
+        return false unless component.settings.comments_enabled?
+
+        where(component:)
+          .not_hidden
+          .where("comments_count > 0")
+          .exists?
+      end
+
+      def self.ransackable_scopes(_auth_object = nil)
+        [:with_any_taxonomies]
+      end
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w(search_text title body)
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w(taxonomies)
+      end
+
+      private
+
+      def comments_blocked?
+        component.current_settings.comments_blocked
+      end
     end
   end
 end
diff --git a/decidim-blogs/app/views/decidim/blogs/posts/_posts.html.erb b/decidim-blogs/app/views/decidim/blogs/posts/_posts.html.erb
new file mode 100644
index 0000000000000..fbd7f238381fc
--- /dev/null
+++ b/decidim-blogs/app/views/decidim/blogs/posts/_posts.html.erb
@@ -0,0 +1,13 @@
+<% if posts.empty? %>
+    <%= cell("decidim/announcement", t("empty", scope: "decidim.blogs.posts.index")) %>
+<% else %>
+    <h2 class="h5 md:h3 decorator"><%= t("count", scope: "decidim.blogs.posts.index", count: posts.length) %></h2>
+<% end %>
+
+<%= order_selector available_orders, i18n_scope: "decidim.blogs.posts.orders" %>
+
+<% paginate_posts.each do |post| %>
+    <%= card_for post, size: :l %>
+<% end %>
+
+<%= decidim_paginate paginate_posts %>
\ No newline at end of file
diff --git a/decidim-blogs/app/views/decidim/blogs/posts/index.html.erb b/decidim-blogs/app/views/decidim/blogs/posts/index.html.erb
index c3c33130c29ef..596944738e344 100644
--- a/decidim-blogs/app/views/decidim/blogs/posts/index.html.erb
+++ b/decidim-blogs/app/views/decidim/blogs/posts/index.html.erb
@@ -19,6 +19,10 @@
         <%= icon "add-line" %>
       <% end %>
   <% end %>
+
+  <%= render layout: "decidim/shared/filters", locals: { filter_sections:, search_variable:, skip_to_id: "blogs" } do %>
+    <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
+  <% end %>
 <% end %>
 
 <%= render layout: "layouts/decidim/shared/layout_two_col" do %>
@@ -26,17 +30,6 @@
   <%= render partial: "decidim/shared/component_announcement" %>
 
   <section id="blogs" class="layout-main__section layout-main__heading">
-    <% if posts.empty? %>
-      <%= cell("decidim/announcement", t("empty", scope: "decidim.blogs.posts.index")) %>
-    <% else %>
-      <h2 class="h5 md:h3 decorator"><%= t("count", scope: "decidim.blogs.posts.index", count: posts.length) %></h2>
-    <% end %>
-
-    <% paginate_posts.each do |post| %>
-      <%= card_for post, size: :l %>
-    <% end %>
-
-    <%= decidim_paginate paginate_posts %>
+    <%= render partial: "posts" %>
   </section>
-
 <% end %>
diff --git a/decidim-blogs/app/views/decidim/blogs/posts/index.js.erb b/decidim-blogs/app/views/decidim/blogs/posts/index.js.erb
new file mode 100644
index 0000000000000..2ca29c4a41390
--- /dev/null
+++ b/decidim-blogs/app/views/decidim/blogs/posts/index.js.erb
@@ -0,0 +1,8 @@
+var blogs = document.getElementById('blogs');
+var orderFilterInput = document.querySelector('.order_filter');
+
+blogs.innerHTML = '<%= j(render partial: "posts").strip.html_safe %>';
+if (orderFilterInput) { orderFilterInput.value = '<%= order %>'; }
+
+blogs.innerHTML = blogs.innerHTML.replace('data-open="false"', 'data-open="true"');
+document.dispatchEvent(new CustomEvent("ajax:loaded", { detail: blogs }));
diff --git a/decidim-blogs/app/views/decidim/blogs/posts/show.html.erb b/decidim-blogs/app/views/decidim/blogs/posts/show.html.erb
index 259ea2d8c6405..f9891a561e0c2 100644
--- a/decidim-blogs/app/views/decidim/blogs/posts/show.html.erb
+++ b/decidim-blogs/app/views/decidim/blogs/posts/show.html.erb
@@ -51,10 +51,12 @@
     </div>
 
     <%= attachments_for post %>
-
-    <%= render partial: "actions" %>
   </section>
 
+  <%= cell "decidim/tags", post %>
+
+  <%= render partial: "actions" %>
+
   <section class="layout-main__section">
     <%= comments_for post %>
   </section>
diff --git a/decidim-blogs/config/locales/en.yml b/decidim-blogs/config/locales/en.yml
index 4ad945abaeb8f..5e176bf01d62f 100644
--- a/decidim-blogs/config/locales/en.yml
+++ b/decidim-blogs/config/locales/en.yml
@@ -100,6 +100,11 @@ en:
           back: Back to posts
           button: Create
           title: Create new post
+        orders:
+          label: Order posts by
+          most_commented: Most commented
+          random: Random order
+          recent: Most recent
     components:
       blogs:
         actions:
diff --git a/decidim-blogs/spec/controllers/decidim/blogs/posts_controller_spec.rb b/decidim-blogs/spec/controllers/decidim/blogs/posts_controller_spec.rb
index 51bbc8a5ac5d1..f923e0e3e2403 100644
--- a/decidim-blogs/spec/controllers/decidim/blogs/posts_controller_spec.rb
+++ b/decidim-blogs/spec/controllers/decidim/blogs/posts_controller_spec.rb
@@ -26,7 +26,12 @@ module Blogs
 
           it "lists only published posts" do
             get :index
-            expect(controller.helpers.posts).to eq([another_published, published])
+            expect(controller.helpers.posts).to match_array([another_published, published]) # rubocop:disable RSpec/MatchArray
+          end
+
+          it "orders posts by most recently published first" do
+            get :index
+            expect(controller.helpers.paginate_posts).to eq([another_published, published])
           end
 
           it "shows published posts" do
diff --git a/decidim-blogs/spec/system/explore_posts_spec.rb b/decidim-blogs/spec/system/explore_posts_spec.rb
index f8596bad46a51..2d8cdc229d393 100644
--- a/decidim-blogs/spec/system/explore_posts_spec.rb
+++ b/decidim-blogs/spec/system/explore_posts_spec.rb
@@ -117,4 +117,53 @@
       it_behaves_like "has embedded video in description", :body
     end
   end
+
+  context "when filtering posts by TAXONOMY" do
+    let(:root_taxonomy) { create(:taxonomy, organization:) }
+    let!(:taxonomy) { create(:taxonomy, skip_injection: true, name: { en: "Category A" }, parent: root_taxonomy, organization:) }
+    let!(:taxonomy2) { create(:taxonomy, skip_injection: true, name: { en: "Category B" }, parent: root_taxonomy, organization:) }
+    let(:taxonomy_filter) { create(:taxonomy_filter, root_taxonomy:, participatory_space_manifests: [component.participatory_space.manifest.name]) }
+    let!(:taxonomy_filter_item) { create(:taxonomy_filter_item, taxonomy_item: taxonomy, taxonomy_filter:) }
+    let!(:taxonomy_filter_item2) { create(:taxonomy_filter_item, taxonomy_item: taxonomy2, taxonomy_filter:) }
+
+    let!(:posts_with_taxonomy) { create_list(:post, 2, component:, taxonomies: [taxonomy]) }
+    let!(:post_with_taxonomy2) { create(:post, component:, taxonomies: [taxonomy2]) }
+    let!(:post_no_taxonomy) { create(:post, component:, taxonomies: []) }
+
+    before do
+      component.update!(settings: { taxonomy_filters: [taxonomy_filter.id] })
+      visit_component
+    end
+
+    it "shows the taxonomy filter in the sidebar" do
+      within "form.new_filter" do
+        expect(page).to have_text("Category A")
+        expect(page).to have_text("Category B")
+      end
+    end
+
+    context "when selecting one taxonomy" do
+      it "lists only posts with that taxonomy" do
+        within "#dropdown-menu-filters div.filter-container", text: "Category B" do
+          uncheck "All"
+          check decidim_sanitize_translated(taxonomy.name)
+        end
+
+        expect(page).to have_css("#blogs > a", count: 2)
+      end
+    end
+
+    context "when no taxonomy filter is configured" do
+      before do
+        component.update!(settings: { taxonomy_filters: [] })
+        visit_component
+      end
+
+      it "does not show taxonomy filter" do
+        within "form.new_filter" do
+          expect(page).to have_no_text("Category A")
+        end
+      end
+    end
+  end
 end
diff --git a/decidim-blogs/spec/system/search_posts_spec.rb b/decidim-blogs/spec/system/search_posts_spec.rb
new file mode 100644
index 0000000000000..480102b9b5892
--- /dev/null
+++ b/decidim-blogs/spec/system/search_posts_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Search posts" do
+  include ActionView::Helpers::SanitizeHelper
+
+  include_context "with a component"
+  let(:manifest_name) { "blogs" }
+  let!(:searchables) { create_list(:post, 3, component:) }
+  let!(:term) { strip_tags(translated(searchables.first.title)).split.last }
+
+  before do
+    searchables << create(:post, component:, title: { en: "A post with a title" })
+  end
+
+  include_examples "searchable results"
+end

From 784ec9c7f2e0632767af78963737b70cee7646ef Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Mon, 20 Jul 2026 08:24:32 +0200
Subject: [PATCH 108/131] Backport 'Exclude removed items from total agenda
 duration calculation' to v0.31 (#17312)

Co-authored-by: andra-panaite <135139066+andra-panaite@users.noreply.github.com>
Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
---
 .../meetings/admin/meeting_agenda_form.rb     |  6 +-
 .../forms/admin/meeting_agenda_form_spec.rb   | 83 +++++++++++++++++++
 2 files changed, 86 insertions(+), 3 deletions(-)

diff --git a/decidim-meetings/app/forms/decidim/meetings/admin/meeting_agenda_form.rb b/decidim-meetings/app/forms/decidim/meetings/admin/meeting_agenda_form.rb
index 9a7af85f83f89..948eda6b208de 100644
--- a/decidim-meetings/app/forms/decidim/meetings/admin/meeting_agenda_form.rb
+++ b/decidim-meetings/app/forms/decidim/meetings/admin/meeting_agenda_form.rb
@@ -35,12 +35,12 @@ def agenda_duration_too_long
         end
 
         def agenda_duration
-          @agenda_duration ||= agenda_items.sum(&:duration)
+          @agenda_duration ||= agenda_items.reject(&:deleted?).sum(&:duration)
         end
 
         def agenda_items_duration_too_long
-          agenda_items.each do |agenda_item|
-            children_duration = agenda_item.agenda_item_children.sum(&:duration)
+          agenda_items.reject(&:deleted?).each do |agenda_item|
+            children_duration = agenda_item.agenda_item_children.reject(&:deleted?).sum(&:duration)
 
             if children_duration > agenda_item.duration
               difference = children_duration - agenda_item.duration
diff --git a/decidim-meetings/spec/forms/admin/meeting_agenda_form_spec.rb b/decidim-meetings/spec/forms/admin/meeting_agenda_form_spec.rb
index a9ff7481ff9f5..3a8c9f3220ddd 100644
--- a/decidim-meetings/spec/forms/admin/meeting_agenda_form_spec.rb
+++ b/decidim-meetings/spec/forms/admin/meeting_agenda_form_spec.rb
@@ -114,5 +114,88 @@ module Decidim::Meetings
 
       it { is_expected.not_to be_valid }
     end
+
+    describe "when deleting an item with longer than meeting duration and adding a new one with shorter duration" do
+      let(:agenda) { create(:agenda, meeting:) }
+      let(:existing_item) { create(:agenda_item, agenda:, duration: meeting.meeting_duration + 2.hours) }
+      let(:agenda_items) do
+        [
+          {
+            id: existing_item.id,
+            title: existing_item.title,
+            description: existing_item.description,
+            deleted: true,
+            duration: existing_item.duration,
+            position: 0
+          },
+          {
+            title: Decidim::Faker::Localized.sentence(word_count: 2),
+            description: Decidim::Faker::Localized.sentence(word_count: 5),
+            deleted: false,
+            duration: meeting.meeting_duration - 3.hours,
+            position: 1
+          }
+        ]
+      end
+
+      it { is_expected.to be_valid }
+    end
+
+    describe "when adding an item with less than meeting duration" do
+      let(:agenda) { create(:agenda, meeting:) }
+      let(:existing_item) { create(:agenda_item, agenda:, duration: meeting.meeting_duration - 3.hours) }
+      let(:agenda_items) do
+        [
+          {
+            id: existing_item.id,
+            title: existing_item.title,
+            description: existing_item.description,
+            deleted: false,
+            duration: existing_item.duration,
+            position: 0
+          }
+        ]
+      end
+
+      it { is_expected.to be_valid }
+    end
+
+    describe "when deleting shorter than meeting items and keeping longer than meeting items" do
+      let(:agenda) { create(:agenda, meeting:) }
+      let(:existing_item1) { create(:agenda_item, agenda:, duration: meeting.meeting_duration - 3.hours) }
+      let(:existing_item2) { create(:agenda_item, agenda:, duration: meeting.meeting_duration + 2.hours) }
+      let(:existing_item3) { create(:agenda_item, agenda:, duration: meeting.meeting_duration - 2.hours) }
+
+      let(:agenda_items) do
+        [
+          {
+            id: existing_item1.id,
+            title: existing_item1.title,
+            description: existing_item1.description,
+            deleted: true,
+            duration: existing_item1.duration,
+            position: 0
+          },
+          {
+            id: existing_item2.id,
+            title: existing_item2.title,
+            description: existing_item2.description,
+            deleted: false,
+            duration: existing_item2.duration,
+            position: 1
+          },
+          {
+            id: existing_item3.id,
+            title: existing_item3.title,
+            description: existing_item3.description,
+            deleted: true,
+            duration: existing_item3.duration,
+            position: 0
+          }
+        ]
+      end
+
+      it { is_expected.not_to be_valid }
+    end
   end
 end

From 69cc9b790cb787733a4febf4bb386db0d84432e2 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Mon, 20 Jul 2026 11:34:46 +0200
Subject: [PATCH 109/131] Backport 'Fix focus when changing the "Sort by" in
 comments' to v0.31 (#17327)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Prompt:

"""
When changing the "Sort by" order in the Comments sections the focus is
lost.
"""

Assisted-By: Kimi K2.6 (OpenCode)
<andreslucena+ai@users.noreply.github.com>

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 .../views/decidim/comments/comments/reload.js.erb  | 12 ++++++++++++
 .../spec/system/order_comments_spec.rb             | 14 ++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/decidim-comments/app/views/decidim/comments/comments/reload.js.erb b/decidim-comments/app/views/decidim/comments/comments/reload.js.erb
index 8fee7536997ad..b2a3f42b99540 100644
--- a/decidim-comments/app/views/decidim/comments/comments/reload.js.erb
+++ b/decidim-comments/app/views/decidim/comments/comments/reload.js.erb
@@ -3,6 +3,10 @@
 
   var $comments = $("#" + rootCommentableId);
   var component = $comments.data("comments");
+
+  // Save the focused element id to restore focus after reload
+  var activeElementId = document.activeElement ? document.activeElement.id : null;
+
   component.unmountComponent();
 
   var commentsHtml = '<%== j(inline_comments_for(commentable, order:).inline).strip %>';
@@ -16,4 +20,12 @@
   // Update the comments count
   $(".comments-count", $comments).text(<%== t("decidim.components.comments.title", count: @comments_count).to_json %>);
 
+  // Restore focus to the previously focused element if it still exists
+  if (activeElementId) {
+    var newActiveElement = document.getElementById(activeElementId);
+    if (newActiveElement) {
+      newActiveElement.focus();
+    }
+  }
+
 }());
diff --git a/decidim-comments/spec/system/order_comments_spec.rb b/decidim-comments/spec/system/order_comments_spec.rb
index 840e481d93339..2ef4d6e3bd00d 100644
--- a/decidim-comments/spec/system/order_comments_spec.rb
+++ b/decidim-comments/spec/system/order_comments_spec.rb
@@ -51,6 +51,20 @@
       expect(page).to have_select("order", selected: "Best rated", wait: 5)
     end
 
+    it "keeps the focus on the sort dropdown after changing the order", :js, :slow do
+      within ".comment-order-by" do
+        page.evaluate_script("document.getElementById('order').focus()")
+        select "Best rated", from: "order"
+      end
+
+      within(".comment-threads", wait: 5) do
+        expect(page).to have_css("div:first-child#comment_#{best_rated_comment.id}", wait: 5)
+      end
+
+      expect(page).to have_select("order", selected: "Best rated", wait: 5)
+      expect(page.evaluate_script("document.activeElement.id")).to eq("order")
+    end
+
     it "user selects \"Most discussed\" as sorting criteria", :js, :slow do
       within ".comment-order-by" do
         select "Most discussed", from: "order"

From 780328ceae410201aff43de384f153dc41763720 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Mon, 20 Jul 2026 13:14:40 +0200
Subject: [PATCH 110/131] Backport 'Make the proposal official when importing'
 to v0.31 (#17303)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 .../lib/decidim/proposals/import/proposal_creator.rb  | 11 +++--------
 .../decidim/proposals/import/proposal_creator_spec.rb |  9 +++++++++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/decidim-proposals/lib/decidim/proposals/import/proposal_creator.rb b/decidim-proposals/lib/decidim/proposals/import/proposal_creator.rb
index 7a581a41e8327..2e81b2a8f4c79 100644
--- a/decidim-proposals/lib/decidim/proposals/import/proposal_creator.rb
+++ b/decidim-proposals/lib/decidim/proposals/import/proposal_creator.rb
@@ -26,7 +26,7 @@ def initialize(data, context = nil)
         #
         # Returns a proposal
         def produce
-          resource.add_coauthor(context[:current_user])
+          resource.add_coauthor(component.organization)
 
           resource
         end
@@ -101,8 +101,7 @@ def notify(proposal)
           Decidim::EventsManager.publish(
             event: "decidim.events.proposals.proposal_published",
             event_class: Decidim::Proposals::PublishProposalEvent,
-            resource: proposal,
-            followers: coauthors_followers(proposal)
+            resource: proposal
           )
         end
 
@@ -111,16 +110,12 @@ def publish(proposal)
             event: "decidim.events.proposals.proposal_published",
             event_class: Decidim::Proposals::PublishProposalEvent,
             resource: proposal,
-            followers: proposal.participatory_space.followers - coauthors_followers(proposal),
+            followers: proposal.participatory_space.followers,
             extra: {
               participatory_space: true
             }
           )
         end
-
-        def coauthors_followers(proposal)
-          @coauthors_followers ||= proposal.authors.flat_map(&:followers)
-        end
       end
     end
   end
diff --git a/decidim-proposals/spec/lib/decidim/proposals/import/proposal_creator_spec.rb b/decidim-proposals/spec/lib/decidim/proposals/import/proposal_creator_spec.rb
index c5b849dbd7e2f..8c8315f1d0b6f 100644
--- a/decidim-proposals/spec/lib/decidim/proposals/import/proposal_creator_spec.rb
+++ b/decidim-proposals/spec/lib/decidim/proposals/import/proposal_creator_spec.rb
@@ -80,17 +80,26 @@
       expect(record.longitude).to eq(data[:longitude])
       expect(record.published_at).to be >= (moment)
     end
+
+    it "sets the organization as author (official proposal)" do
+      record = subject.produce
+
+      expect(record.authors).to contain_exactly(organization)
+      expect(record.official?).to be true
+    end
   end
 
   describe "#finish!" do
     it "saves the proposal" do
       record = subject.produce
       subject.finish!
+
       expect(record.new_record?).to be(false)
     end
 
     it "creates admin log" do
       record = subject.produce
+
       expect { subject.finish! }.to change(Decidim::ActionLog, :count).by(1)
       expect(Decidim::ActionLog.last.user).to eq(user)
       expect(Decidim::ActionLog.last.resource).to eq(record)

From d8b87f8d9b629fea30c0abc640a843dddaa2c6a3 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Mon, 20 Jul 2026 13:14:44 +0200
Subject: [PATCH 111/131] Backport 'Convert to a proper table the cookies
 information' to v0.31 (#17324)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 .../cells/decidim/data_consent/category.erb   | 53 +++++++------------
 .../packs/stylesheets/decidim/_cookies.scss   | 18 +++++--
 2 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/decidim-core/app/cells/decidim/data_consent/category.erb b/decidim-core/app/cells/decidim/data_consent/category.erb
index b13dd3e6d2e8d..9e1e7f78f6b90 100644
--- a/decidim-core/app/cells/decidim/data_consent/category.erb
+++ b/decidim-core/app/cells/decidim/data_consent/category.erb
@@ -30,39 +30,26 @@
     <p><%= category[:description] %></p>
 
     <% if category[:items].present? %>
-    <div>
-      <div class="cookies__category-panel__tr">
-        <div class="cookies__category-panel__th">
-          <%= t("layouts.decidim.data_consent.details.columns.type") %>
-        </div>
-        <div class="cookies__category-panel__th">
-          <%= t("layouts.decidim.data_consent.details.columns.name") %>
-        </div>
-        <div class="cookies__category-panel__th">
-          <%= t("layouts.decidim.data_consent.details.columns.service") %>
-        </div>
-        <div class="cookies__category-panel__th">
-          <%= t("layouts.decidim.data_consent.details.columns.description") %>
-        </div>
-      </div>
-
-      <% category[:items].each do |item| %>
-        <div class="cookies__category-panel__tr">
-          <div class="cookies__category-panel__td">
-            <%= t("layouts.decidim.data_consent.details.types.#{item[:type]}") %>
-          </div>
-          <div class="cookies__category-panel__td">
-            <%= item[:name] %>
-          </div>
-          <div class="cookies__category-panel__td">
-            <%= t("layouts.decidim.data_consent.details.items.#{item[:name]}.service") %>
-          </div>
-          <div class="cookies__category-panel__td">
-            <%= t("layouts.decidim.data_consent.details.items.#{item[:name]}.description") %>
-          </div>
-        </div>
-      <% end %>
-    </div>
+    <table>
+      <thead>
+        <tr>
+          <th><%= t("layouts.decidim.data_consent.details.columns.type") %></th>
+          <th><%= t("layouts.decidim.data_consent.details.columns.name") %></th>
+          <th><%= t("layouts.decidim.data_consent.details.columns.service") %></th>
+          <th><%= t("layouts.decidim.data_consent.details.columns.description") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% category[:items].each do |item| %>
+          <tr>
+            <td><%= t("layouts.decidim.data_consent.details.types.#{item[:type]}") %></td>
+            <td><%= item[:name] %></td>
+            <td><%= t("layouts.decidim.data_consent.details.items.#{item[:name]}.service") %></td>
+            <td><%= t("layouts.decidim.data_consent.details.items.#{item[:name]}.description") %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
     <% end %>
   </div>
 </div>
diff --git a/decidim-core/app/packs/stylesheets/decidim/_cookies.scss b/decidim-core/app/packs/stylesheets/decidim/_cookies.scss
index ccaa6d4bb159e..70eedf6b94869 100644
--- a/decidim-core/app/packs/stylesheets/decidim/_cookies.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/_cookies.scss
@@ -65,17 +65,25 @@
     &-panel {
       @apply divide-y divide-gray-3 [&>*]:py-4 [&>p]:text-gray-2;
 
-      &__tr {
-        @apply flex items-center justify-between rounded first-of-type:bg-background-4;
+      table {
+        @apply w-full border-collapse;
       }
 
-      &__th {
-        @apply w-1/4 p-2 bg-background-4 text-gray-2 font-bold text-sm;
+      thead tr {
+        @apply bg-background-4;
       }
 
-      &__td {
+      th {
+        @apply w-1/4 p-2 text-gray-2 font-bold text-sm text-left;
+      }
+
+      td {
         @apply w-1/4 p-2 text-gray-2 text-xs;
       }
+
+      tbody tr {
+        @apply border-b border-gray-3;
+      }
     }
 
     &-toggle {

From 36584bb892ee10c0add7c9cc94cbe97bbe99f3ed Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Mon, 20 Jul 2026 16:28:43 +0300
Subject: [PATCH 112/131] Backport 'Fix space visibility announcement' to v0.31
 (#17320)

---
 .../app/views/decidim/assemblies/assemblies/show.html.erb      | 2 +-
 decidim-core/config/locales/en.yml                             | 3 +++
 .../participatory_processes/show.html.erb                      | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb b/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb
index 5873e609de339..5767bb0d476d7 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb
@@ -33,7 +33,7 @@ edit_link(
 
   </div>
 
-  <section class="participatory-space__block-reference">
+  <section class="participatory-space__block-reference" aria-label="<%= t("reference", scope: "decidim.participatory_space.labels") %>">
     <p><%= resource_reference(current_participatory_space) %></p>
   </section>
 </main>
diff --git a/decidim-core/config/locales/en.yml b/decidim-core/config/locales/en.yml
index 76542a06ed84b..64d1551b2bd79 100644
--- a/decidim-core/config/locales/en.yml
+++ b/decidim-core/config/locales/en.yml
@@ -1537,6 +1537,9 @@ en:
         log_in: log in
         never_logged_in: never logged in
         subject: Inactive account warning
+    participatory_space:
+      labels:
+        reference: Reference of the space
     passwords:
       update:
         error: There was a problem updating the password.
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb
index 39b4b4e0b4868..f2e8c89ee32ff 100644
--- a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb
+++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb
@@ -37,7 +37,7 @@
 
   </div>
 
-  <section class="participatory-space__block-reference">
+  <section class="participatory-space__block-reference" aria-label="<%= t("reference", scope: "decidim.participatory_space.labels") %>">
     <p><%= resource_reference(current_participatory_space) %></p>
   </section>
 </main>

From 8340f2815d0b5ce012be7420de68ed041922c678 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Mon, 20 Jul 2026 17:23:42 +0200
Subject: [PATCH 113/131] Backport 'Fix responsiveness in "Related documents"
 content block' to v0.31 (#17334)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix responsiveness in "Related documents" content block

* Fix edge case when the title in the card is a really long word

* Implement CodeRabbit feedback

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 decidim-core/app/packs/stylesheets/decidim/_cards.scss          | 2 +-
 decidim-core/app/packs/stylesheets/decidim/_documents.scss      | 2 +-
 .../app/packs/stylesheets/decidim/_participatory_spaces.scss    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/decidim-core/app/packs/stylesheets/decidim/_cards.scss b/decidim-core/app/packs/stylesheets/decidim/_cards.scss
index 11be043f4efd0..019098a5d6273 100644
--- a/decidim-core/app/packs/stylesheets/decidim/_cards.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/_cards.scss
@@ -55,7 +55,7 @@
     }
 
     &-content {
-      @apply flex flex-col gap-2.5;
+      @apply flex flex-col gap-2.5 min-w-0 break-words;
     }
 
     &-title {
diff --git a/decidim-core/app/packs/stylesheets/decidim/_documents.scss b/decidim-core/app/packs/stylesheets/decidim/_documents.scss
index 6c8ddeb1f74c6..2fd6a67c296b7 100644
--- a/decidim-core/app/packs/stylesheets/decidim/_documents.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/_documents.scss
@@ -3,7 +3,7 @@
     @apply divide-y divide-background [&>*]:py-4 first:[&>*]:pt-0 last:[&>*]:pb-0;
 
     > * {
-      @apply flex items-center justify-between gap-4;
+      @apply grid sm:flex items-center justify-between gap-4;
     }
   }
 
diff --git a/decidim-core/app/packs/stylesheets/decidim/_participatory_spaces.scss b/decidim-core/app/packs/stylesheets/decidim/_participatory_spaces.scss
index e078db9c252ad..7dbb3838a1b4d 100644
--- a/decidim-core/app/packs/stylesheets/decidim/_participatory_spaces.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/_participatory_spaces.scss
@@ -49,7 +49,7 @@
         }
 
         &__collection-content {
-          @apply w-auto ml-6 my-4 pl-4 lg:pl-8 border-l border-[#D3D5D9];
+          @apply w-auto sm:ml-6 sm:my-4 sm:pl-4 lg:pl-8 sm:border-l sm:border-[#D3D5D9];
 
           p {
             @apply pt-4;

From 3ab47c19e34e96bde024a2eed7da686713257139 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Mon, 20 Jul 2026 18:20:27 +0200
Subject: [PATCH 114/131] Backport 'Make idempotent the "show password" toggle'
 to v0.31 (#17336)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Make idempotent the "show password" toggle

Prompt:

"""
Fix a11y bug where the password visibility toggle button in the login
modal receives focus twice and the first instance is non-interactive.

Root cause: PasswordTogglerController
(decidim-core/app/packs/src/decidim/controllers/password_toggler/controller.js)
creates a new <button> and .input-group__password wrapper on every
connect(). Because a11y.js moves dialogs to document.body on init,
Stimulus disconnects and reconnects the controller, producing nested
duplicate elements. disconnect() only removes listeners, not DOM.

Changes required:
1. Controller: Make connect() idempotent — detect and reuse an existing
.input-group__password wrapper + button + status text instead of always
creating new ones. Keep disconnect() removing listeners.
2. Tests: Fix the test fixture in password_toggler.test.js to start from
a clean <input type="password"> without pre-rendered wrappers/buttons.
Add a test simulating disconnect() then connect() and asserting only one
button/wrapper exists afterward.
3. System template: Remove the hardcoded .input-group__password wrapper
in decidim-system/app/views/decidim/system/shared/_api_users.html.erb so
the controller owns the structure.

Verification: After the fix, inspecting #loginModal should show exactly
one .input-group__password with one <button> inside it, even after
Stimulus reconnects.
"""

Assisted-By: Kimi K2.6 (OpenCode)
<andreslucena+ai@users.noreply.github.com>

* Fix spec

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 .../password_toggler/controller.js            | 23 +++++++++++++-
 .../password_toggler/password_toggler.test.js | 31 +++++++------------
 .../decidim/system/shared/_api_users.html.erb | 17 +++++-----
 .../system/explore_api_credentials_spec.rb    |  4 +--
 4 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/decidim-core/app/packs/src/decidim/controllers/password_toggler/controller.js b/decidim-core/app/packs/src/decidim/controllers/password_toggler/controller.js
index 9362ffb575fd9..6edfe67a9ea3e 100644
--- a/decidim-core/app/packs/src/decidim/controllers/password_toggler/controller.js
+++ b/decidim-core/app/packs/src/decidim/controllers/password_toggler/controller.js
@@ -55,6 +55,18 @@ export default class extends Controller {
       hide: icon("eye-off-line")
     }
 
+    const existingWrapper = this.input.closest(".input-group__password");
+    if (existingWrapper) {
+      const existingButton = existingWrapper.querySelector('button[type="button"]');
+      const existingStatusText = existingWrapper.querySelector('span.sr-only[aria-live="polite"]');
+      if (existingButton && existingStatusText) {
+        this.button = existingButton;
+        this.statusText = existingStatusText;
+        this.bindListeners();
+        return;
+      }
+    }
+
     this.init();
   }
 
@@ -81,8 +93,17 @@ export default class extends Controller {
    */
   init() {
     this.createControls();
+    this.bindListeners();
+  }
+
+  bindListeners() {
+    if (this.button && this.boundToggleVisibility) {
+      this.button.removeEventListener("click", this.boundToggleVisibility);
+    }
+    if (this.form && this.boundHidePassword) {
+      this.form.removeEventListener("submit", this.boundHidePassword);
+    }
 
-    // Bind methods to maintain correct context
     this.boundToggleVisibility = this.toggleVisibility.bind(this);
     this.boundHidePassword = this.hidePassword.bind(this);
 
diff --git a/decidim-core/app/packs/src/decidim/controllers/password_toggler/password_toggler.test.js b/decidim-core/app/packs/src/decidim/controllers/password_toggler/password_toggler.test.js
index 24714f016a77d..61e7411532765 100644
--- a/decidim-core/app/packs/src/decidim/controllers/password_toggler/password_toggler.test.js
+++ b/decidim-core/app/packs/src/decidim/controllers/password_toggler/password_toggler.test.js
@@ -22,17 +22,7 @@ describe("PasswordToggler", () => {
     container = document.createElement("div");
     container.innerHTML = `
       <div data-controller="password-toggler" class="flex flex-row items-center gap-x-2" data-show-password="Show secret" data-hide-password="Hide Secret" data-hidden-password="Secret is hidden" data-shown-password="Secret is shown">
-        <div class="input-group__password">
-          <div class="input-group__password">
-            <button type="button" aria-controls="token_162" aria-label="Show password">
-              <svg width="0.75em" height="0.75em" role="img" aria-hidden="true">
-                <title>eye-line</title>
-                <use href="/decidim-packs/media/images/remixicon.symbol-e643e553623ffcd49f94.svg#ri-eye-line"></use>
-              </svg>
-            </button>
-            <input type="password" id="token_162" value="AXXXXXXXX" class="w-full" autocomplete="off">
-          </div>
-        </div>
+        <input type="password" id="token_162" value="AXXXXXXXX" class="w-full" autocomplete="off">
         <div class="basis-1/4">
           <button type="button" class="button button__sm button__text-primary" data-clipboard-copy="#token_162">
             <span>Copy secret</span>
@@ -204,22 +194,23 @@ describe("PasswordToggler", () => {
     });
   });
 
-  describe("integration with existing markup", () => {
-    it("works with existing button structure", () => {
-      const existingButton = passwordElement.querySelector('button[aria-controls="token_162"]');
-      expect(existingButton).toBeTruthy();
+  describe("idempotency", () => {
+    it("does not duplicate controls on reconnect", () => {
+      controller.disconnect();
+      controller.connect();
 
-      controller.init();
+      const wrappers = passwordElement.querySelectorAll(".input-group__password");
+      const buttons = passwordElement.querySelectorAll('button[aria-controls="token_162"]');
 
-      // Should work alongside existing button
-      expect(controller.button).toBeDefined();
-      expect(controller.input.getAttribute("type")).toBe("password");
+      expect(wrappers.length).toBe(1);
+      expect(buttons.length).toBe(1);
     });
+  });
 
+  describe("integration with existing markup", () => {
     it("handles password input with existing value", () => {
       expect(controller.input.value).toBe("AXXXXXXXX");
 
-      controller.init();
       controller.showPassword();
 
       expect(controller.input.getAttribute("type")).toBe("text");
diff --git a/decidim-system/app/views/decidim/system/shared/_api_users.html.erb b/decidim-system/app/views/decidim/system/shared/_api_users.html.erb
index a268174e1646a..0c73ae82d145b 100644
--- a/decidim-system/app/views/decidim/system/shared/_api_users.html.erb
+++ b/decidim-system/app/views/decidim/system/shared/_api_users.html.erb
@@ -22,15 +22,14 @@
         </td>
         <td>
           <% if fresh_token?(api_user) %>
-            <div data-controller="password-toggler" class="flex flex-row items-center gap-x-2">
-              <div class="input-group__password">
-                <input type="password" id="<%= "token_#{api_user.id}" %>" value="<%= @secret_user[:secret] %>" class="w-full" autocomplete="off">
-              </div>
-              <div class="basis-1/4"
-                data-show-password="<%= t "api_user.show_secret", scope: "decidim.system.actions" %>"
-                data-hide-password="<%= t "api_user.hide_secret", scope: "decidim.system.actions" %>"
-                data-hidden-password="<%= t "api_user.hidden_secret", scope: "decidim.system.actions" %>"
-                data-shown-password="<%= t "api_user.shown_secret", scope: "decidim.system.actions" %>">
+            <div data-controller="password-toggler"
+                 class="flex flex-row items-center gap-x-2"
+                 data-show-password="<%= t "api_user.show_secret", scope: "decidim.system.actions" %>"
+                 data-hide-password="<%= t "api_user.hide_secret", scope: "decidim.system.actions" %>"
+                 data-hidden-password="<%= t "api_user.hidden_secret", scope: "decidim.system.actions" %>"
+                 data-shown-password="<%= t "api_user.shown_secret", scope: "decidim.system.actions" %>">
+              <input type="password" id="<%= "token_#{api_user.id}" %>" value="<%= @secret_user[:secret] %>" class="w-full" autocomplete="off">
+              <div class="basis-1/4">
                 <button type="button"
                       class="button button__sm button__text-primary"
                       data-controller="clipboard-copy"
diff --git a/decidim-system/spec/system/explore_api_credentials_spec.rb b/decidim-system/spec/system/explore_api_credentials_spec.rb
index 2550d5cc96db4..81ba3d7c53b44 100644
--- a/decidim-system/spec/system/explore_api_credentials_spec.rb
+++ b/decidim-system/spec/system/explore_api_credentials_spec.rb
@@ -137,8 +137,8 @@
       secret_input = find("input#token_#{masked_user.id}")
       expect(secret_input[:type]).to eq("password")
       expect(secret_input.value).to eq(dummy_token)
-      expect(page).to have_css('button[aria-label="Show password"]', count: 1)
-      find('button[aria-label="Show password"]').click
+      expect(page).to have_css('button[aria-label="Show secret"]', count: 1)
+      find('button[aria-label="Show secret"]').click
       expect(secret_input[:type]).to eq("text")
     end
   end

From d92bb124b463a2b2ea8f0f3921a80ed3bd25105e Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Tue, 21 Jul 2026 10:26:29 +0200
Subject: [PATCH 115/131] Backport 'Add validation for password confirmation
 mismatch in admin system form' to v0.31 (#17341)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Added test case

* Add validations for password mismatch in admins' system form

* Adapt spec to new behavior

* Add specs

Prompt:

"""
Create unit tests for
@decidim-system/app/forms/decidim/system/admin_form.rb
"""

Assisted-By: Kimi K2.6 (OpenCode)
<andreslucena+ai@users.noreply.github.com>

* Apply suggestions from code review



* Fix rubocop offense

---------

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
Co-authored-by: andra-panaite <andra.panaite@tremend.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 .../app/forms/decidim/system/admin_form.rb    |   9 +-
 .../forms/decidim/system/admin_form_spec.rb   | 119 ++++++++++++++++++
 .../spec/system/manage_admins_spec.rb         |  17 +++
 3 files changed, 143 insertions(+), 2 deletions(-)
 create mode 100644 decidim-system/spec/forms/decidim/system/admin_form_spec.rb

diff --git a/decidim-system/app/forms/decidim/system/admin_form.rb b/decidim-system/app/forms/decidim/system/admin_form.rb
index c9aede1b834aa..624214bda969a 100644
--- a/decidim-system/app/forms/decidim/system/admin_form.rb
+++ b/decidim-system/app/forms/decidim/system/admin_form.rb
@@ -12,8 +12,9 @@ class AdminForm < Form
       attribute :password_confirmation, String
 
       validates :email, presence: true
-      validates :password, confirmation: true, presence: true, unless: :admin_exists?
-      validates :password_confirmation, presence: true, unless: :admin_exists?
+      validates :password, presence: true, unless: :admin_exists?
+      validates :password, confirmation: true, if: :password_present?
+      validates :password_confirmation, presence: true, if: :password_present?
 
       validates :password, password: { email: :email }
 
@@ -31,6 +32,10 @@ def email_uniqueness
       def admin_exists?
         id.present?
       end
+
+      def password_present?
+        password.present? || password_confirmation.present?
+      end
     end
   end
 end
diff --git a/decidim-system/spec/forms/decidim/system/admin_form_spec.rb b/decidim-system/spec/forms/decidim/system/admin_form_spec.rb
new file mode 100644
index 0000000000000..edaa2c9add37c
--- /dev/null
+++ b/decidim-system/spec/forms/decidim/system/admin_form_spec.rb
@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module System
+    describe AdminForm do
+      subject { described_class.from_params(attributes) }
+
+      let(:email) { "admin@example.org" }
+      let(:password) { "decidim123456789" }
+      let(:password_confirmation) { "decidim123456789" }
+
+      let(:attributes) do
+        {
+          "admin" => {
+            "email" => email,
+            "password" => password,
+            "password_confirmation" => password_confirmation
+          }
+        }
+      end
+
+      context "when everything is OK" do
+        it { is_expected.to be_valid }
+      end
+
+      context "when the email is missing" do
+        let(:email) { nil }
+
+        it { is_expected.not_to be_valid }
+      end
+
+      context "when the password is missing on create" do
+        let(:password) { nil }
+        let(:password_confirmation) { nil }
+
+        it { is_expected.not_to be_valid }
+      end
+
+      context "when the password confirmation is missing on create" do
+        let(:password_confirmation) { nil }
+
+        it { is_expected.not_to be_valid }
+      end
+
+      context "when the password is too common" do
+        let(:password) { "password1234" }
+        let(:password_confirmation) { "password1234" }
+
+        it { is_expected.not_to be_valid }
+      end
+
+      context "when the password and confirmation do not match" do
+        let(:password_confirmation) { "mismatched123456" }
+
+        it { is_expected.not_to be_valid }
+      end
+
+      context "when the email is already taken" do
+        let!(:existing_admin) { create(:admin, email:) }
+
+        it { is_expected.not_to be_valid }
+      end
+
+      context "when updating an existing admin" do
+        let(:admin) { create(:admin) }
+
+        let(:attributes) do
+          {
+            "admin" => {
+              "id" => admin.id,
+              "email" => email,
+              "password" => password,
+              "password_confirmation" => password_confirmation
+            }
+          }
+        end
+
+        context "and everything is OK" do
+          it { is_expected.to be_valid }
+        end
+
+        context "and the password fields are blank" do
+          let(:password) { "" }
+          let(:password_confirmation) { "" }
+
+          it { is_expected.to be_valid }
+        end
+
+        context "and only the password confirmation is blank" do
+          let(:password_confirmation) { "" }
+
+          it { is_expected.not_to be_valid }
+        end
+
+        context "and the password and confirmation do not match" do
+          let(:password_confirmation) { "mismatched123456" }
+
+          it { is_expected.not_to be_valid }
+        end
+
+        context "and the password is too common" do
+          let(:password) { "password1234" }
+          let(:password_confirmation) { "password1234" }
+
+          it { is_expected.not_to be_valid }
+        end
+
+        context "and the email is already taken by another admin" do
+          let!(:another_admin) { create(:admin) }
+          let(:email) { another_admin.email }
+
+          it { is_expected.not_to be_valid }
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-system/spec/system/manage_admins_spec.rb b/decidim-system/spec/system/manage_admins_spec.rb
index a3ac7cbc6688c..4dbc20e6ead46 100644
--- a/decidim-system/spec/system/manage_admins_spec.rb
+++ b/decidim-system/spec/system/manage_admins_spec.rb
@@ -90,6 +90,23 @@
         expect(page).to have_css(".form-error.is-visible", text: "is too common")
       end
     end
+
+    context "when password and password confirmation mismatch" do
+      it "gives an error" do
+        within "tr", text: admin.email do
+          click_on "Edit"
+        end
+
+        within ".edit_admin" do
+          fill_in :admin_password, with: "decidim123456789"
+          fill_in :admin_password_confirmation, with: "123456789decidim"
+
+          find("*[type=submit]").click
+        end
+
+        expect(page).to have_css(".form-error.is-visible", text: "does not match Password")
+      end
+    end
   end
 
   it "deletes an admin" do

From 397c6c678290b10871c3aa23e4c0eb18e89441e7 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Wed, 22 Jul 2026 13:14:30 +0200
Subject: [PATCH 116/131] Backport 'Ensure JWT secret exists for `devise-jwt`'
 to v0.31 (#17346)

* Ensure JWT secret exists for

* Fix spelling

Co-authored-by: Antti Hukkanen <antti.hukkanen@mainiotech.fi>
---
 .../concerns/decidim/api/user_extension.rb    | 19 +++++++++
 decidim-api/config/initializers/devise.rb     | 26 -------------
 decidim-api/lib/decidim/api/engine.rb         | 39 +++++++++++++++++++
 decidim-core/app/models/decidim/user.rb       |  4 +-
 4 files changed, 60 insertions(+), 28 deletions(-)
 create mode 100644 decidim-api/app/models/concerns/decidim/api/user_extension.rb
 delete mode 100644 decidim-api/config/initializers/devise.rb

diff --git a/decidim-api/app/models/concerns/decidim/api/user_extension.rb b/decidim-api/app/models/concerns/decidim/api/user_extension.rb
new file mode 100644
index 0000000000000..37889a92b4718
--- /dev/null
+++ b/decidim-api/app/models/concerns/decidim/api/user_extension.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Api
+    # This concern adds the JWT authenticable strategy for the User models to
+    # allow regular users to sign in through the API (if configured from the
+    # system panel). Allows normal users to utilize the API e.g. through mobile
+    # applications.
+    module UserExtension
+      extend ActiveSupport::Concern
+
+      included do
+        devise :jwt_authenticatable, jwt_revocation_strategy: Decidim::Api::JwtDenylist
+      end
+    end
+  end
+end
diff --git a/decidim-api/config/initializers/devise.rb b/decidim-api/config/initializers/devise.rb
deleted file mode 100644
index 0df184e7c0b96..0000000000000
--- a/decidim-api/config/initializers/devise.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-Devise.jwt do |jwt|
-  # In order to be compatible with the JWT authentication, we need to set these
-  # configurations. JWT secret is being used by the devise-jwt to sign the
-  # tokens, once the user authenticated. The token signature ensures the
-  # validity of the token and that the user has not tampered with it. If the
-  # secret is not set correctly, the API authentication does not work.
-  #
-  # Note that the `dispatch_requests` and `revocation_requests` paths are the
-  # full paths because we do not want the JWT tokens to be dispatched or revoked
-  # during normal Decidim user sign ins or sign outs. This also requires a small
-  # override to `Warden::JWTAuth` which is defined at
-  # `decidim-api/lib/warden/jwt_auth/decidim_overrides.rb`.
-  jwt.secret = Decidim::Env.new("DECIDIM_API_JWT_SECRET").value
-  next unless jwt.secret
-
-  jwt.dispatch_requests = [
-    ["POST", %r{^/api/sign_in$}]
-  ]
-  jwt.revocation_requests = [
-    ["DELETE", %r{^/api/sign_out$}]
-  ]
-  jwt.expiration_time = Decidim::Api.jwt_expires_in.minutes.to_i
-  jwt.aud_header = "X_JWT_AUD"
-end
diff --git a/decidim-api/lib/decidim/api/engine.rb b/decidim-api/lib/decidim/api/engine.rb
index e1a2c5c559bd4..0d13ec508b350 100644
--- a/decidim-api/lib/decidim/api/engine.rb
+++ b/decidim-api/lib/decidim/api/engine.rb
@@ -41,6 +41,45 @@ class Engine < ::Rails::Engine
         end
       end
 
+      initializer "decidim_api.devise", before: "add_routing_paths" do |app|
+        config.to_prepare do
+          Decidim::User.include Decidim::Api::UserExtension
+        end
+
+        # Required for the development environment because otherwise the JWT
+        # authentication strategy would be lost during code reloads.
+        app.reloader.after_class_unload do
+          Decidim::User.include Decidim::Api::UserExtension
+        end
+      end
+
+      initializer "decidim_api.devise_jwt", after: "devise.secret_key" do
+        Devise.jwt do |jwt|
+          # In order to be compatible with the JWT authentication, we need to set these
+          # configurations. JWT secret is being used by the devise-jwt to sign the
+          # tokens, once the user authenticated. The token signature ensures the
+          # validity of the token and that the user has not tampered with it. If the
+          # secret is not set correctly, the API authentication does not work.
+          #
+          # Note that the `dispatch_requests` and `revocation_requests` paths are the
+          # full paths because we do not want the JWT tokens to be dispatched or revoked
+          # during normal Decidim user sign ins or sign outs. This also requires a small
+          # override to `Warden::JWTAuth` which is defined at
+          # `decidim-api/lib/warden/jwt_auth/decidim_overrides.rb`.
+          jwt.secret = Decidim::Env.new("DECIDIM_API_JWT_SECRET").value || Devise.secret_key
+          raise "Please define the secret key for Devise" unless jwt.secret
+
+          jwt.dispatch_requests = [
+            ["POST", %r{^/api/sign_in$}]
+          ]
+          jwt.revocation_requests = [
+            ["DELETE", %r{^/api/sign_out$}]
+          ]
+          jwt.expiration_time = Decidim::Api.jwt_expires_in.minutes.to_i
+          jwt.aud_header = "X_JWT_AUD"
+        end
+      end
+
       initializer "decidim_api.data_migrate", after: "decidim_core.data_migrate" do
         DataMigrate.configure do |config|
           config.data_migrations_path << root.join("db/data").to_s
diff --git a/decidim-core/app/models/decidim/user.rb b/decidim-core/app/models/decidim/user.rb
index d499702c79fd5..2bcdd5d28b771 100644
--- a/decidim-core/app/models/decidim/user.rb
+++ b/decidim-core/app/models/decidim/user.rb
@@ -21,8 +21,8 @@ def self.all
 
     devise :invitable, :database_authenticatable, :registerable, :confirmable, :timeoutable,
            :recoverable, :trackable, :lockable,
-           :decidim_validatable, :decidim_newsletterable, :jwt_authenticatable,
-           :omniauthable, omniauth_providers: Decidim::OmniauthProvider.available.keys, jwt_revocation_strategy: Decidim::Api::JwtDenylist,
+           :decidim_validatable, :decidim_newsletterable,
+           :omniauthable, omniauth_providers: Decidim::OmniauthProvider.available.keys,
                           request_keys: [:env], reset_password_keys: [:decidim_organization_id, :email],
                           confirmation_keys: [:decidim_organization_id, :email]
     devise :rememberable if Decidim.enable_remember_me

From cf338d02de6305094d289162d74821ad70a39eae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= <ivan@pokecode.net>
Date: Thu, 23 Jul 2026 18:09:26 +0200
Subject: [PATCH 117/131] Fix filter import when filters already exist

---
 .../decidim/maintenance/taxonomy_importer.rb  |  5 ++-
 .../lib/maintenance/taxonomy_importer_spec.rb | 45 +++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/decidim-core/lib/decidim/maintenance/taxonomy_importer.rb b/decidim-core/lib/decidim/maintenance/taxonomy_importer.rb
index 304d4b48ac1ad..f89e822b09d7b 100644
--- a/decidim-core/lib/decidim/maintenance/taxonomy_importer.rb
+++ b/decidim-core/lib/decidim/maintenance/taxonomy_importer.rb
@@ -85,7 +85,10 @@ def import_filter(root, data)
           component = GlobalID::Locator.locate(component_id)
           if component
             begin
-              component.update!(settings: component.settings.to_h.merge(taxonomy_filters: [filter.id.to_s]))
+              settings = component.settings.to_h
+              settings[:taxonomy_filters] ||= []
+              settings[:taxonomy_filters] << filter.id.to_s unless settings[:taxonomy_filters].include?(filter.id.to_s)
+              component.update!(settings:)
               result[:components_assigned][filter.internal_name[organization.default_locale]] ||= []
               result[:components_assigned][filter.internal_name[organization.default_locale]] << component_id
             rescue ActiveRecord::RecordInvalid
diff --git a/decidim-core/spec/lib/maintenance/taxonomy_importer_spec.rb b/decidim-core/spec/lib/maintenance/taxonomy_importer_spec.rb
index 4734638aa6257..9884feb7c381f 100644
--- a/decidim-core/spec/lib/maintenance/taxonomy_importer_spec.rb
+++ b/decidim-core/spec/lib/maintenance/taxonomy_importer_spec.rb
@@ -180,6 +180,51 @@ module Decidim::Maintenance
         end
       end
 
+      context "when component already has taxonomy filters" do
+        let(:json_filters) do
+          [
+            {
+              "name" => "New root taxonomy",
+              "internal_name" => "Imported filter",
+              "participatory_space_manifests" => participatory_space_manifests,
+              "items" => [["New taxonomy", "New child taxonomy"]],
+              "components" => [
+                component_id
+              ]
+            }
+          ]
+        end
+        let!(:existing_filter) { create(:taxonomy_filter, root_taxonomy: create(:taxonomy, organization:)) }
+        let!(:another_existing_filter) { create(:taxonomy_filter, root_taxonomy: create(:taxonomy, organization:)) }
+
+        before do
+          component.update!(settings: { taxonomy_filters: [existing_filter.id.to_s, another_existing_filter.id.to_s] })
+        end
+
+        it "preserves existing taxonomy filters and appends the imported one without duplicates" do
+          subject.import!
+
+          imported_filter = Decidim::TaxonomyFilter.find_by!(
+            internal_name: { organization.default_locale => "Imported filter" },
+            root_taxonomy:
+          )
+
+          expect(component.reload.settings[:taxonomy_filters]).to contain_exactly(
+            existing_filter.id.to_s,
+            another_existing_filter.id.to_s,
+            imported_filter.id.to_s
+          )
+
+          subject.import!
+
+          expect(component.reload.settings[:taxonomy_filters]).to contain_exactly(
+            existing_filter.id.to_s,
+            another_existing_filter.id.to_s,
+            imported_filter.id.to_s
+          )
+        end
+      end
+
       context "when a filter already exists" do
         let!(:root_taxonomy) { create(:taxonomy, organization:, name: { organization.default_locale => "New root taxonomy" }) }
         let!(:filter) { create(:taxonomy_filter, root_taxonomy:, participatory_space_manifests: ["participatory_processes"]) }

From 191614822de64f310f4b5f65a8c3ed5371fedaf9 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Fri, 24 Jul 2026 09:03:26 +0200
Subject: [PATCH 118/131] Backport 'Add address in proposals' answer page' to
 v0.31 (#17356)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Tom Greenwood <101816158+greenwoodt@users.noreply.github.com>
---
 .../proposals/admin/proposals/show.html.erb   | 14 ++++++++++
 decidim-proposals/config/locales/en.yml       |  1 +
 .../admin/admin_answers_proposal_spec.rb      | 26 +++++++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/decidim-proposals/app/views/decidim/proposals/admin/proposals/show.html.erb b/decidim-proposals/app/views/decidim/proposals/admin/proposals/show.html.erb
index 44a710fb57027..61d73f949bb63 100644
--- a/decidim-proposals/app/views/decidim/proposals/admin/proposals/show.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/admin/proposals/show.html.erb
@@ -99,6 +99,20 @@
           </div>
         <% end %>
 
+        <% if component_settings.geocoding_enabled? && proposal.address.present? %>
+          <div class="card-section">
+            <div class="row column">
+              <span class="component__show-title"><%= t ".address" %></span>
+              <div class="flex items-center gap-x-2 mt-2">
+                <%= icon "map-pin-line", class: "fill-gray" %>
+                <p class="component__show-icon-text">
+                  <%= proposal.address %>
+                </p>
+              </div>
+            </div>
+          </div>
+        <% end %>
+
         <div class="card-section">
           <div class="row column" data-votes>
             <span class="component__show-title"><%= t ".votes_count" %></span>
diff --git a/decidim-proposals/config/locales/en.yml b/decidim-proposals/config/locales/en.yml
index af70517c2c8d7..1b14175bf47d1 100644
--- a/decidim-proposals/config/locales/en.yml
+++ b/decidim-proposals/config/locales/en.yml
@@ -659,6 +659,7 @@ en:
             number_of_proposals: Answers for %{number} proposal's will be published?
             select_a_proposal: Please select a proposal.
           show:
+            address: Address
             amendments_count: Amendments count
             assigned_evaluators: Assigned evaluators
             body: Body
diff --git a/decidim-proposals/spec/system/admin/admin_answers_proposal_spec.rb b/decidim-proposals/spec/system/admin/admin_answers_proposal_spec.rb
index 001775408d281..2060316e61108 100644
--- a/decidim-proposals/spec/system/admin/admin_answers_proposal_spec.rb
+++ b/decidim-proposals/spec/system/admin/admin_answers_proposal_spec.rb
@@ -117,5 +117,31 @@
         expect(page).to have_css(".flash", text: "Proposal successfully answered.")
       end
     end
+
+    context "when geocoding is enabled" do
+      let!(:component) { create(:proposal_component, :with_geocoding_enabled, participatory_space:) }
+      let!(:proposals) { create_list(:proposal, 3, component:, cost_report: {}) }
+
+      before do
+        component.update!(
+          settings: { proposal_answering_enabled: true, geocoding_enabled: true },
+          step_settings: {
+            component.participatory_space.active_step.id => {
+              proposal_answering_enabled: true
+            }
+          }
+        )
+        visit_component_admin
+      end
+
+      it "shows the address on the proposal show page" do
+        within "tr", text: translated(proposals.first.title) do
+          find("button[data-controller='dropdown']").click
+          click_on "Answer proposal"
+        end
+        expect(page).to have_css(".component__show-title", text: "Address")
+        expect(page).to have_text(proposals.first.address)
+      end
+    end
   end
 end

From 863a947ad919c70ee955cfa23f979765baa1dc6f Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Mon, 27 Jul 2026 13:17:08 +0200
Subject: [PATCH 119/131] Backport 'Fix the focus guard in the "QR code" modal'
 to v0.31 (#17366)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix the focus guard in the "QR code" modal

Prompt:

"""
Problem: Opening the QR modal from within the Share modal breaks focus
management. Focus leaks back to hidden elements of the parent Share
modal, and closing the QR modal does not return focus to its opener.

Root cause: FocusGuard only tracks a single dialog. Opening the QR
dialog overwrites the guarded element, so the parent Share modal loses
its focus trap. The QR modal template also lacks the dialog-title-* id
needed for autofocus on open.

Goal: Make FocusGuard support nested (stacked) dialogs so each new
dialog pushes its state and closing pops back to the previous one,
restoring focus to the correct trigger. Ensure QR modals have proper
dialog-title-* ids so focus moves to their heading on open
"""

Assisted-By: Kimi K2.6 (OpenCode)
<andreslucena+ai@users.noreply.github.com>

* Fix eslint offenses

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
---
 .../decidim/share_widget/qr_code_modal.erb    |   2 +-
 .../src/decidim/refactor/moved/focus_guard.js |  24 ++--
 .../refactor/moved/focus_guard.test.js        | 136 ++++++++++++++++++
 .../_registration_code_modal.html.erb         |   2 +-
 4 files changed, 150 insertions(+), 14 deletions(-)
 create mode 100644 decidim-core/app/packs/src/decidim/refactor/moved/focus_guard.test.js

diff --git a/decidim-core/app/cells/decidim/share_widget/qr_code_modal.erb b/decidim-core/app/cells/decidim/share_widget/qr_code_modal.erb
index ebcff7f2cd138..7af0d8aa34701 100644
--- a/decidim-core/app/cells/decidim/share_widget/qr_code_modal.erb
+++ b/decidim-core/app/cells/decidim/share_widget/qr_code_modal.erb
@@ -2,7 +2,7 @@
   <div data-dialog-container>
     <div data-dialog-title>
       <%= icon "qr-code-line" %>
-      <h2 tabindex="-1"><%= t("decidim.share_widget.qr_code") %></h2>
+      <h2 id="dialog-title-qr-code-dialog" tabindex="-1"><%= t("decidim.share_widget.qr_code") %></h2>
     </div>
     <div class="content">
       <div>
diff --git a/decidim-core/app/packs/src/decidim/refactor/moved/focus_guard.js b/decidim-core/app/packs/src/decidim/refactor/moved/focus_guard.js
index 5b7b0bdedbb7e..aa520f708ef58 100644
--- a/decidim-core/app/packs/src/decidim/refactor/moved/focus_guard.js
+++ b/decidim-core/app/packs/src/decidim/refactor/moved/focus_guard.js
@@ -5,14 +5,12 @@ const focusableDisableableNodes = ["BUTTON", "INPUT", "TEXTAREA", "SELECT"];
 export default class FocusGuard {
   constructor(container) {
     this.container = container;
-    this.guardedElement = null;
-    this.triggerElement = null;
+    this.stack = [];
   }
 
   trap(element, trigger) {
     this.enable();
-    this.guardedElement = element;
-    this.triggerElement = trigger;
+    this.stack.push({ element, trigger });
   }
 
   enable() {
@@ -45,14 +43,15 @@ export default class FocusGuard {
   }
 
   disable() {
-    const guards = this.container.querySelectorAll(`:scope > .${focusGuardClass}`);
-    guards.forEach((guard) => guard.remove());
+    const current = this.stack.pop();
 
-    this.guardedElement = null;
+    if (this.stack.length === 0) {
+      const guards = this.container.querySelectorAll(`:scope > .${focusGuardClass}`);
+      guards.forEach((guard) => guard.remove());
+    }
 
-    if (this.triggerElement) {
-      this.triggerElement.focus();
-      this.triggerElement = null;
+    if (current && current.trigger) {
+      current.trigger.focus();
     }
   }
 
@@ -67,12 +66,13 @@ export default class FocusGuard {
   };
 
   handleContainerFocus(guard) {
-    if (!this.guardedElement) {
+    const current = this.stack[this.stack.length - 1];
+    if (!current || !current.element) {
       guard.blur();
       return;
     }
 
-    const visibleNodes = Array.from(this.guardedElement.querySelectorAll("*")).filter((item) => {
+    const visibleNodes = Array.from(current.element.querySelectorAll("*")).filter((item) => {
       return this.isVisible(item);
     });
 
diff --git a/decidim-core/app/packs/src/decidim/refactor/moved/focus_guard.test.js b/decidim-core/app/packs/src/decidim/refactor/moved/focus_guard.test.js
new file mode 100644
index 0000000000000..63e728acfaec2
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/refactor/moved/focus_guard.test.js
@@ -0,0 +1,136 @@
+/* global jest */
+
+import FocusGuard from "src/decidim/refactor/moved/focus_guard"
+
+describe("FocusGuard", () => {
+  let focusGuard = null;
+
+  beforeEach(() => {
+    document.body.innerHTML = "";
+    focusGuard = new FocusGuard(document.body);
+  });
+
+  afterEach(() => {
+    document.body.innerHTML = "";
+  });
+
+  describe("single dialog", () => {
+    it("creates focus guards on trap", () => {
+      const dialog = document.createElement("div");
+      const trigger = document.createElement("button");
+      document.body.appendChild(dialog);
+      document.body.appendChild(trigger);
+
+      focusGuard.trap(dialog, trigger);
+      const guards = document.body.querySelectorAll(".focusguard");
+      expect(guards.length).toBe(2);
+    });
+
+    it("removes focus guards and returns focus on disable", () => {
+      const dialog = document.createElement("div");
+      const trigger = document.createElement("button");
+      document.body.appendChild(dialog);
+      document.body.appendChild(trigger);
+
+      focusGuard.trap(dialog, trigger);
+      focusGuard.disable();
+
+      const guards = document.body.querySelectorAll(".focusguard");
+      expect(guards.length).toBe(0);
+      expect(document.activeElement).toBe(trigger);
+    });
+  });
+
+  describe("nested dialogs", () => {
+    it("keeps guards when inner dialog is disabled", () => {
+      const outerDialog = document.createElement("div");
+      const outerTrigger = document.createElement("button");
+      const innerDialog = document.createElement("div");
+      const innerTrigger = document.createElement("button");
+
+      document.body.appendChild(outerDialog);
+      document.body.appendChild(outerTrigger);
+      document.body.appendChild(innerDialog);
+      document.body.appendChild(innerTrigger);
+
+      focusGuard.trap(outerDialog, outerTrigger);
+      focusGuard.trap(innerDialog, innerTrigger);
+
+      expect(document.body.querySelectorAll(".focusguard").length).toBe(2);
+
+      focusGuard.disable();
+
+      expect(document.body.querySelectorAll(".focusguard").length).toBe(2);
+      expect(document.activeElement).toBe(innerTrigger);
+    });
+
+    it("removes guards when outer dialog is disabled last", () => {
+      const outerDialog = document.createElement("div");
+      const outerTrigger = document.createElement("button");
+      const innerDialog = document.createElement("div");
+      const innerTrigger = document.createElement("button");
+
+      document.body.appendChild(outerDialog);
+      document.body.appendChild(outerTrigger);
+      document.body.appendChild(innerDialog);
+      document.body.appendChild(innerTrigger);
+
+      focusGuard.trap(outerDialog, outerTrigger);
+      focusGuard.trap(innerDialog, innerTrigger);
+
+      focusGuard.disable();
+      focusGuard.disable();
+
+      expect(document.body.querySelectorAll(".focusguard").length).toBe(0);
+      expect(document.activeElement).toBe(outerTrigger);
+    });
+
+    it("cycles focus to the current top dialog when a guard receives focus", () => {
+      jest.spyOn(focusGuard, "isVisible").mockReturnValue(true);
+
+      const outerDialog = document.createElement("div");
+      const outerInput = document.createElement("input");
+      outerDialog.appendChild(outerInput);
+
+      const innerDialog = document.createElement("div");
+      const innerInput = document.createElement("input");
+      innerDialog.appendChild(innerInput);
+
+      document.body.appendChild(outerDialog);
+      document.body.appendChild(innerDialog);
+
+      focusGuard.trap(outerDialog, null);
+      focusGuard.trap(innerDialog, null);
+
+      const endGuard = document.body.querySelector('.focusguard[data-position="end"]');
+      endGuard.focus();
+
+      expect(document.activeElement).toBe(innerInput);
+    });
+
+    it("cycles focus backward to the current top dialog when the start guard receives focus", () => {
+      jest.spyOn(focusGuard, "isVisible").mockReturnValue(true);
+
+      const outerDialog = document.createElement("div");
+      const outerInput = document.createElement("input");
+      outerDialog.appendChild(outerInput);
+
+      const innerDialog = document.createElement("div");
+      const innerInput = document.createElement("input");
+      const innerButton = document.createElement("button");
+      innerDialog.appendChild(innerInput);
+      innerDialog.appendChild(innerButton);
+
+      document.body.appendChild(outerDialog);
+      document.body.appendChild(innerDialog);
+
+      focusGuard.trap(outerDialog, null);
+      focusGuard.trap(innerDialog, null);
+
+      const startGuard = document.body.querySelector('.focusguard[data-position="start"]');
+      startGuard.focus();
+
+      expect(document.activeElement).toBe(innerButton);
+    });
+  });
+});
diff --git a/decidim-meetings/app/views/decidim/meetings/meetings/_registration_code_modal.html.erb b/decidim-meetings/app/views/decidim/meetings/meetings/_registration_code_modal.html.erb
index 52270a3b1a077..9b8478f4eddc0 100644
--- a/decidim-meetings/app/views/decidim/meetings/meetings/_registration_code_modal.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/meetings/_registration_code_modal.html.erb
@@ -2,7 +2,7 @@
   <div data-dialog-container>
     <div data-dialog-title>
       <%= icon "qr-code-line" %>
-      <h2 class="h4" tabindex="-1"><%= t("registration_and_qr_code", scope: "decidim.meetings.meetings.show") %></h2>
+      <h2 id="dialog-title-registration-qr-code-dialog" class="h4" tabindex="-1"><%= t("registration_and_qr_code", scope: "decidim.meetings.meetings.show") %></h2>
     </div>
     <div class="content">
       <div>

From 4e5899be7e827f86f64d2fd1919a4debd669701b Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Mon, 27 Jul 2026 15:39:14 +0200
Subject: [PATCH 120/131] Backport 'Fix email update order for converting
 groups to user' to v0.31 (#17368)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Ivan Vergés <ivan@pokecode.net>
---
 .../migrate/20250217192438_convert_user_groups_into_users.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/decidim-core/db/migrate/20250217192438_convert_user_groups_into_users.rb b/decidim-core/db/migrate/20250217192438_convert_user_groups_into_users.rb
index 92744a5b92984..1a5c38230b907 100644
--- a/decidim-core/db/migrate/20250217192438_convert_user_groups_into_users.rb
+++ b/decidim-core/db/migrate/20250217192438_convert_user_groups_into_users.rb
@@ -33,8 +33,8 @@ def another_user_with_same_email_in_organization?(group)
   def up
     User.old_group.find_each do |group|
       if group.email.blank? || another_user_with_same_email_in_organization?(group)
-        group.update_attribute(:email, "user_group_#{group.id}@#{group.organization.host}.invalid")
         group.update_attribute(:extended_data, (group.extended_data || {}).merge("patched" => true, "previous_email" => group.email))
+        group.update_attribute(:email, "user_group_#{group.id}@#{group.organization.host}.invalid")
 
         group.reload
       end
@@ -49,7 +49,8 @@ def down
     User.new_group.find_each do |group|
       group.update_attribute(:officialized_at, nil)
       group.update_attribute(:type, "Decidim::UserGroup")
-      group.update_attribute(:extended_data, (group.extended_data || {}).except("group"))
+      group.update_attribute(:email, group.extended_data["previous_email"]) if group.extended_data["previous_email"].present?
+      group.update_attribute(:extended_data, (group.extended_data || {}).except("group", "patched", "previous_email"))
     end
   end
   # rubocop:enable Rails/SkipsModelValidations

From 17fb76e774f46a74b2fb044dc1135e99e4bdaefc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?=
 <andreslucena@users.noreply.github.com>
Date: Wed, 29 Jul 2026 16:15:06 +0200
Subject: [PATCH 121/131] Backport 'Show elements on footer with accordion on
 mobile viewports ' to v0.31 (#17381)

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 .../app/cells/decidim/footer_topics/show.erb  |  13 +-
 .../app/helpers/decidim/menu_helper.rb        |   2 -
 .../controllers/accordion/accordion.test.js   | 238 ++++++++++++++----
 .../controllers/accordion/controller.js       | 110 ++++++--
 .../packs/stylesheets/decidim/_footer.scss    |  34 ++-
 .../decidim/footer_menu_presenter.rb          |   6 +-
 .../layouts/decidim/footer/_main.html.erb     |   2 +-
 .../decidim/footer/_main_links.html.erb       |  84 ++++---
 decidim-core/spec/system/footer_spec.rb       |  77 ++++++
 .../process_step/show.erb                     |   2 +-
 10 files changed, 464 insertions(+), 104 deletions(-)
 create mode 100644 decidim-core/spec/system/footer_spec.rb

diff --git a/decidim-core/app/cells/decidim/footer_topics/show.erb b/decidim-core/app/cells/decidim/footer_topics/show.erb
index be65c6c713a63..cfd5727dd4804 100644
--- a/decidim-core/app/cells/decidim/footer_topics/show.erb
+++ b/decidim-core/app/cells/decidim/footer_topics/show.erb
@@ -1,8 +1,5 @@
-<nav role="navigation" aria-label="<%= t("layouts.decidim.footer.help") %>">
-  <h2 class="h4 mb-4"><%= t("layouts.decidim.footer.help") %></h2>
-  <ul class="space-y-4 break-inside-avoid">
-    <% topics.each do |topic| %>
-      <%= topic_item(topic, class: "font-semibold underline") %>
-    <% end %>
-  </ul>
-</nav>
+<ul>
+  <% topics.each do |topic| %>
+    <%= topic_item(topic, class: "font-semibold underline") %>
+  <% end %>
+</ul>
diff --git a/decidim-core/app/helpers/decidim/menu_helper.rb b/decidim-core/app/helpers/decidim/menu_helper.rb
index 7f01f96a7d1e8..6294b43e9acf1 100644
--- a/decidim-core/app/helpers/decidim/menu_helper.rb
+++ b/decidim-core/app/helpers/decidim/menu_helper.rb
@@ -55,10 +55,8 @@ def footer_menu
       @footer_menu ||= ::Decidim::FooterMenuPresenter.new(
         :menu,
         self,
-        element_class: "font-semibold underline",
         active_class: "is-active",
         role: false,
-        container_options: { class: "space-y-4 break-inside-avoid" },
         label: t("layouts.decidim.footer.decidim_title")
       )
     end
diff --git a/decidim-core/app/packs/src/decidim/controllers/accordion/accordion.test.js b/decidim-core/app/packs/src/decidim/controllers/accordion/accordion.test.js
index 497b2ee7be538..cef930e853d1b 100644
--- a/decidim-core/app/packs/src/decidim/controllers/accordion/accordion.test.js
+++ b/decidim-core/app/packs/src/decidim/controllers/accordion/accordion.test.js
@@ -1,36 +1,44 @@
 /* global jest */
 
 import AccordionController from "src/decidim/controllers/accordion/controller";
+import { screens } from "tailwindcss/defaultTheme"
 
 jest.mock("a11y-accordion-component", () => ({
   render: jest.fn(),
   destroy: jest.fn()
 }));
 
+const createController = (controllerElement) => {
+  const instance = Object.create(AccordionController.prototype);
+  Reflect.defineProperty(instance, "element", {
+    get: () => controllerElement,
+    configurable: true
+  });
+  return instance;
+};
+
 describe("AccordionController", () => {
   let controller = null;
   let accordionElement = null;
   let panel1 = null;
   let panel2 = null;
 
-  const createController = (controllerElement) => {
-    const ControllerClass = AccordionController;
-    const instance = Object.create(ControllerClass.prototype);
-    Reflect.defineProperty(instance, "element", {
-      get: () => controllerElement,
-      configurable: true
+  const mockMatchMedia = (matchesOrPredicate = false) => {
+    window.matchMedia = jest.fn().mockImplementation((query) => {
+      const matches = typeof matchesOrPredicate === "function"
+        ? matchesOrPredicate(query)
+        : matchesOrPredicate;
+      return {
+        matches,
+        media: query,
+        addEventListener: jest.fn(),
+        removeEventListener: jest.fn()
+      };
     });
-    return instance;
   };
 
   beforeEach(() => {
-    window.matchMedia = jest.fn().mockImplementation((query) => ({
-      matches: false,
-      media: query,
-      addListener: jest.fn(),
-      removeListener: jest.fn()
-    }));
-
+    mockMatchMedia(false);
     document.body.innerHTML = `
       <div id="test-accordion" data-controller="accordion">
         <button id="trigger-1" data-controls="panel-1">Trigger 1</button>
@@ -39,11 +47,9 @@ describe("AccordionController", () => {
         <div id="panel-2">Panel 2 Content</div>
       </div>
     `;
-
     accordionElement = document.getElementById("test-accordion");
     panel1 = document.getElementById("panel-1");
     panel2 = document.getElementById("panel-2");
-
     controller = createController(accordionElement);
   });
 
@@ -56,10 +62,8 @@ describe("AccordionController", () => {
     it("changes role from region to group when data-panel-role is group", () => {
       panel1.setAttribute("role", "region");
       panel2.setAttribute("role", "region");
-
       accordionElement.dataset.panelRole = "group";
       controller.fixPanelRole();
-
       expect(panel1.getAttribute("role")).toBe("group");
       expect(panel2.getAttribute("role")).toBe("group");
     });
@@ -67,52 +71,202 @@ describe("AccordionController", () => {
     it("removes role attribute when data-panel-role is none", () => {
       panel1.setAttribute("role", "region");
       panel2.setAttribute("role", "region");
-
       accordionElement.dataset.panelRole = "none";
       controller.fixPanelRole();
-
       expect(panel1.getAttribute("role")).toBeNull();
       expect(panel2.getAttribute("role")).toBeNull();
     });
 
-    it("does nothing when data-panel-role is not set", () => {
-      panel1.setAttribute("role", "region");
-      panel2.setAttribute("role", "region");
-
-      Reflect.deleteProperty(accordionElement.dataset, "panelRole");
-      controller.fixPanelRole();
-
-      expect(panel1.getAttribute("role")).toBe("region");
-      expect(panel2.getAttribute("role")).toBe("region");
-    });
-
-    it("does nothing when data-panel-role is empty", () => {
+    it("does nothing when data-panel-role is not set or empty", () => {
       panel1.setAttribute("role", "region");
-
-      accordionElement.dataset.panelRole = "";
       controller.fixPanelRole();
-
       expect(panel1.getAttribute("role")).toBe("region");
     });
 
     it("sets custom role value when data-panel-role is set", () => {
       panel1.setAttribute("role", "region");
-
       accordionElement.dataset.panelRole = "navigation";
       controller.fixPanelRole();
-
       expect(panel1.getAttribute("role")).toBe("navigation");
     });
 
     it("handles nonexistent panels gracefully", () => {
       accordionElement.dataset.panelRole = "group";
+      const trigger = document.createElement("button");
+      trigger.dataset.controls = "nonexistent-panel";
+      accordionElement.appendChild(trigger);
+      expect(() => controller.fixPanelRole()).not.toThrow();
+    });
+  });
 
-      const nonExistentTrigger = document.createElement("button");
-      nonExistentTrigger.dataset.controls = "nonexistent-panel";
-      accordionElement.appendChild(nonExistentTrigger);
+  describe("_applyBreakpointOpenAttributes", () => {
+    beforeEach(() => {
+      controller.initialize();
+    });
 
-      expect(() => controller.fixPanelRole()).not.toThrow();
+    it("removes data-open when no breakpoint matches and no original exists", () => {
+      accordionElement.innerHTML = `
+        <button data-controls="panel-1" data-open-lg="true">Trigger</button>
+        <div id="panel-1">Panel 1</div>
+      `;
+      controller._applyBreakpointOpenAttributes();
+      expect(accordionElement.querySelector("[data-controls]").hasAttribute("data-open")).toBe(false);
+    });
+
+    it("sets data-open from breakpoint attribute when viewport matches", () => {
+      mockMatchMedia((query) => query === `(min-width: ${screens.lg})`);
+      accordionElement.innerHTML = `
+        <button data-controls="panel-1" data-open-lg="true">Trigger</button>
+        <div id="panel-1">Panel 1</div>
+      `;
+      controller.initialize();
+      controller._applyBreakpointOpenAttributes();
+      expect(accordionElement.querySelector("[data-controls]").getAttribute("data-open")).toBe("true");
+    });
+
+    it("restores original data-open when breakpoint no longer matches", () => {
+      const lgQuery = `(min-width: ${screens.lg})`;
+      accordionElement.innerHTML = `
+        <button data-controls="panel-1" data-open="false" data-open-lg="true">Trigger</button>
+        <div id="panel-1">Panel 1</div>
+      `;
+      const trigger = accordionElement.querySelector("[data-controls]");
+      controller.initialize();
+
+      mockMatchMedia((query) => query === lgQuery);
+      controller._applyBreakpointOpenAttributes();
+      expect(trigger.getAttribute("data-open")).toBe("true");
+
+      mockMatchMedia(() => false);
+      controller._applyBreakpointOpenAttributes();
+      expect(trigger.getAttribute("data-open")).toBe("false");
+    });
+
+    it("removes data-open when breakpoint stops matching and no original existed", () => {
+      const lgQuery = `(min-width: ${screens.lg})`;
+      accordionElement.innerHTML = `
+        <button data-controls="panel-1" data-open-lg="true">Trigger</button>
+        <div id="panel-1">Panel 1</div>
+      `;
+      const trigger = accordionElement.querySelector("[data-controls]");
+      controller.initialize();
+
+      mockMatchMedia((query) => query === lgQuery);
+      controller._applyBreakpointOpenAttributes();
+      expect(trigger.getAttribute("data-open")).toBe("true");
+
+      mockMatchMedia(() => false);
+      controller._applyBreakpointOpenAttributes();
+      expect(trigger.hasAttribute("data-open")).toBe(false);
+    });
+
+    it("applies the last matching breakpoint when multiple match", () => {
+      mockMatchMedia((query) =>
+        query === `(min-width: ${screens.sm})` || query === `(min-width: ${screens.lg})`
+      );
+      accordionElement.innerHTML = `
+        <button data-controls="panel-1" data-open-sm="false" data-open-lg="true">Trigger</button>
+        <div id="panel-1">Panel 1</div>
+      `;
+      controller.initialize();
+      controller._applyBreakpointOpenAttributes();
+      expect(accordionElement.querySelector("[data-controls]").getAttribute("data-open")).toBe("true");
+    });
+
+    it("leaves triggers without breakpoint attributes unchanged", () => {
+      controller.initialize();
+      controller._applyBreakpointOpenAttributes();
+      expect(accordionElement.querySelector("#trigger-1").hasAttribute("data-open")).toBe(false);
+      expect(accordionElement.querySelector("#trigger-2").hasAttribute("data-open")).toBe(false);
     });
   });
-});
 
+  describe("_listenForBreakpointChanges", () => {
+    beforeEach(() => {
+      controller.initialize();
+    });
+
+    it("registers change listeners for breakpoints with matching triggers", () => {
+      accordionElement.innerHTML = `
+        <button data-controls="panel-1" data-open-lg="true">Trigger</button>
+        <div id="panel-1">Panel 1</div>
+      `;
+      controller._listenForBreakpointChanges();
+      expect(window.matchMedia).toHaveBeenCalledWith(`(min-width: ${screens.lg})`);
+      expect(window.matchMedia.mock.results[0].value.addEventListener).toHaveBeenCalledWith("change", expect.any(Function));
+    });
+
+    it("skips breakpoints without matching triggers", () => {
+      accordionElement.innerHTML = `
+        <button data-controls="panel-1" data-open-lg="true">Trigger</button>
+        <div id="panel-1">Panel 1</div>
+      `;
+      controller._listenForBreakpointChanges();
+      expect(window.matchMedia).toHaveBeenCalledTimes(1);
+    });
+
+    it("registers nothing when there are no breakpoint triggers", () => {
+      controller._listenForBreakpointChanges();
+      expect(controller._mediaQueries.length).toBe(0);
+    });
+
+    it("registers listeners for multiple breakpoints", () => {
+      accordionElement.innerHTML = `
+        <button data-controls="panel-1" data-open-sm="true" data-open-lg="false">Trigger</button>
+        <div id="panel-1">Panel 1</div>
+      `;
+      controller._listenForBreakpointChanges();
+      expect(window.matchMedia).toHaveBeenCalledWith(`(min-width: ${screens.sm})`);
+      expect(window.matchMedia).toHaveBeenCalledWith(`(min-width: ${screens.lg})`);
+      expect(controller._mediaQueries.length).toBe(2);
+    });
+  });
+
+  describe("_stopListeningForBreakpointChanges", () => {
+    beforeEach(() => {
+      controller.initialize();
+    });
+
+    it("removes all registered change listeners", () => {
+      accordionElement.innerHTML = `
+        <button data-controls="panel-1" data-open-lg="true">Trigger</button>
+        <div id="panel-1">Panel 1</div>
+      `;
+      controller._listenForBreakpointChanges();
+      const mql = window.matchMedia.mock.results[0].value;
+      controller._stopListeningForBreakpointChanges();
+      expect(mql.removeEventListener).toHaveBeenCalledWith("change", expect.any(Function));
+      expect(controller._mediaQueries.length).toBe(0);
+    });
+
+    it("does nothing when no listeners exist", () => {
+      expect(() => controller._stopListeningForBreakpointChanges()).not.toThrow();
+    });
+  });
+
+  describe("connect/disconnect/reconnect with breakpoints", () => {
+    beforeEach(() => {
+      controller.initialize();
+    });
+
+    it("connect applies breakpoint attributes and sets up listeners", () => {
+      const applySpy = jest.spyOn(controller, "_applyBreakpointOpenAttributes");
+      const listenSpy = jest.spyOn(controller, "_listenForBreakpointChanges");
+      controller.connect();
+      expect(applySpy).toHaveBeenCalled();
+      expect(listenSpy).toHaveBeenCalled();
+    });
+
+    it("disconnect tears down breakpoint listeners", () => {
+      const spy = jest.spyOn(controller, "_stopListeningForBreakpointChanges");
+      controller.disconnect();
+      expect(spy).toHaveBeenCalled();
+    });
+
+    it("reconnect re-evaluates breakpoint attributes", () => {
+      const spy = jest.spyOn(controller, "_applyBreakpointOpenAttributes");
+      controller.reconnect({});
+      expect(spy).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/decidim-core/app/packs/src/decidim/controllers/accordion/controller.js b/decidim-core/app/packs/src/decidim/controllers/accordion/controller.js
index efe711c1531af..7aab7a60d1837 100644
--- a/decidim-core/app/packs/src/decidim/controllers/accordion/controller.js
+++ b/decidim-core/app/packs/src/decidim/controllers/accordion/controller.js
@@ -2,6 +2,9 @@ import { Controller } from "@hotwired/stimulus"
 import Accordions from "a11y-accordion-component";
 import { screens } from "tailwindcss/defaultTheme"
 export default class extends Controller {
+  initialize() {
+    this._originalOpenValues = new WeakMap();
+  }
 
   /**
    * Create accordion from a component
@@ -16,21 +19,8 @@ export default class extends Controller {
     accordionOptions.isMultiSelectable = this.element.dataset.multiselectable !== "false";
     accordionOptions.isCollapsible = this.element.dataset.collapsible !== "false";
 
-    // This snippet allows to change the OPEN data-attribute based on the current viewport
-    // Just include the breakpoint where the different value will be applied from.
-    // Ex:
-    // data-open="false" data-open-md="true"
-    Object.keys(screens).forEach((key) => {
-      if (!this.isScreenSize(key)) {
-        return;
-      }
-
-      const elementsToOpen = this.element.querySelectorAll(`[data-controls][data-open-${key}]`);
-
-      elementsToOpen.forEach((elem) => {
-        (elem.dataset.open = elem.dataset[`open-${key}`.replace(/-([a-z])/g, (str) => str[1].toUpperCase())])
-      })
-    })
+    this._applyBreakpointOpenAttributes();
+    this._listenForBreakpointChanges();
 
     if (!this.element.id) {
       // when component has no id, we enforce to have it one
@@ -59,20 +49,106 @@ export default class extends Controller {
     }
 
     if (this.boundExpand) {
-      this.toggleButton.addEventListener("click", this.boundExpand);
+      this.toggleButton.removeEventListener("click", this.boundExpand);
     }
+
+    this._stopListeningForBreakpointChanges();
   }
 
   reconnect(event) {
     this.disconnect();
 
-    if (event.detail && event.detail.collapse) {
+    if (event && event.detail && event.detail.collapse) {
       this.previouslyExpanded = false;
     }
 
     this.connect();
   }
 
+  /**
+   * Applies viewport-conditional data-open attributes and resets
+   * previously applied values when the viewport no longer matches.
+   *
+   * @returns {void}
+   */
+  _applyBreakpointOpenAttributes() {
+    const controlledTriggers = new Set();
+
+    Object.keys(screens).forEach((key) => {
+      this.element.querySelectorAll(`[data-controls][data-open-${key}]`).forEach((elem) => {
+        controlledTriggers.add(elem);
+
+        if (!this._originalOpenValues.has(elem)) {
+          this._originalOpenValues.set(elem, elem.getAttribute("data-open"));
+        }
+      });
+    });
+
+    // Reset all controlled triggers to their original data-open state
+    controlledTriggers.forEach((elem) => {
+      const original = this._originalOpenValues.get(elem);
+      if (original === null) {
+        elem.removeAttribute("data-open");
+      } else {
+        elem.setAttribute("data-open", original);
+      }
+    });
+
+    // Apply breakpoint-specific values for the current viewport
+    Object.keys(screens).forEach((key) => {
+      if (!this.isScreenSize(key)) {
+        return;
+      }
+
+      this.element.querySelectorAll(`[data-controls][data-open-${key}]`).forEach((elem) => {
+        elem.dataset.open = elem.getAttribute(`data-open-${key}`);
+      });
+    });
+  }
+
+  /**
+   * Listens for viewport changes that cross breakpoints relevant
+   * to this accordion and reconnects to keep state in sync.
+   *
+   * @returns {void}
+   */
+  _listenForBreakpointChanges() {
+    this._mediaQueries = [];
+
+    Object.keys(screens).forEach((key) => {
+      const hasRelevantTriggers = this.element.querySelector(`[data-controls][data-open-${key}]`);
+      if (!hasRelevantTriggers) {
+        return;
+      }
+
+      const mql = window.matchMedia(`(min-width: ${screens[key]})`);
+      const handler = () => {
+        this.reconnect({ detail: { collapse: true } });
+      };
+
+      if (mql.addEventListener) {
+        mql.addEventListener("change", handler);
+      } else if (mql.addListener) {
+        mql.addListener(handler);
+      }
+
+      this._mediaQueries.push({ mql, handler });
+    });
+  }
+
+  _stopListeningForBreakpointChanges() {
+    if (this._mediaQueries) {
+      this._mediaQueries.forEach(({ mql, handler }) => {
+        if (mql.removeEventListener) {
+          mql.removeEventListener("change", handler);
+        } else if (mql.removeListener) {
+          mql.removeListener(handler);
+        }
+      });
+      this._mediaQueries = [];
+    }
+  }
+
   expandIfNeeded()
   {
     if (!this.toggleButton) {
diff --git a/decidim-core/app/packs/stylesheets/decidim/_footer.scss b/decidim-core/app/packs/stylesheets/decidim/_footer.scss
index 6fcf8478c0e4c..7b7eb985bd3be 100644
--- a/decidim-core/app/packs/stylesheets/decidim/_footer.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/_footer.scss
@@ -3,12 +3,44 @@ footer {
     @apply bg-gray-4;
 
     &__top {
-      @apply hidden lg:flex flex-row gap-8 container py-10;
+      @apply flex flex-col lg:flex-row gap-0 lg:gap-8 container py-10;
 
       .prose a,
       .prose strong {
         @apply text-white;
       }
+
+      .footer__nav {
+        @apply border-b border-white/20 lg:border-0;
+
+        ul {
+          @apply space-y-4 break-inside-avoid mb-4;
+
+          li a {
+            @apply font-semibold underline decoration-1 underline-offset-1;
+          }
+        }
+
+        > [data-controls] {
+          @apply flex items-center justify-between w-full py-4 lg:pointer-events-none lg:cursor-default text-left text-white font-semibold;
+
+          svg {
+            @apply w-4 h-4 fill-current transition-transform lg:hidden;
+          }
+
+          &[aria-expanded="true"] svg {
+            @apply rotate-180;
+          }
+        }
+
+        [id*="panel"][aria-hidden="true"] {
+          @apply hidden lg:block;
+        }
+
+        [id*="panel"][aria-hidden="false"] {
+          @apply block;
+        }
+      }
     }
 
     &__down {
diff --git a/decidim-core/app/presenters/decidim/footer_menu_presenter.rb b/decidim-core/app/presenters/decidim/footer_menu_presenter.rb
index 8d6fe3f416a8b..fc9c6c079efc6 100644
--- a/decidim-core/app/presenters/decidim/footer_menu_presenter.rb
+++ b/decidim-core/app/presenters/decidim/footer_menu_presenter.rb
@@ -3,10 +3,8 @@
 module Decidim
   # A presenter to render footer menu
   class FooterMenuPresenter < MenuPresenter
-    def render
-      content_tag(:nav, :role => "navigation", "aria-label" => @options[:label]) do
-        safe_join([content_tag(:h2, @options[:label], class: "h5 mb-4"), render_menu])
-      end
+    def render_menu_items
+      render_menu
     end
   end
 end
diff --git a/decidim-core/app/views/layouts/decidim/footer/_main.html.erb b/decidim-core/app/views/layouts/decidim/footer/_main.html.erb
index 7f141154c2605..be098fbe62033 100644
--- a/decidim-core/app/views/layouts/decidim/footer/_main.html.erb
+++ b/decidim-core/app/views/layouts/decidim/footer/_main.html.erb
@@ -3,7 +3,7 @@
     <div class="lg:w-1/3">
       <%= render partial: "layouts/decidim/footer/main_intro" %>
     </div>
-    <div class="lg:w-2/3 grid grid-cols-1 gap-x-4 gap-y-10 lg:grid-cols-4 text-md text-white">
+    <div class="lg:w-2/3 grid grid-cols-1 gap-x-4 lg:grid-cols-4 text-md text-white">
       <%= render partial: "layouts/decidim/footer/main_links" %>
     </div>
   </div>
diff --git a/decidim-core/app/views/layouts/decidim/footer/_main_links.html.erb b/decidim-core/app/views/layouts/decidim/footer/_main_links.html.erb
index edee42ccf38db..46428bba43c6c 100644
--- a/decidim-core/app/views/layouts/decidim/footer/_main_links.html.erb
+++ b/decidim-core/app/views/layouts/decidim/footer/_main_links.html.erb
@@ -1,31 +1,59 @@
-<%= footer_menu.render %>
+<div data-controller="accordion" data-multiselectable="true" class="contents">
+  <nav class="footer__nav" role="navigation" aria-label="<%= t("layouts.decidim.footer.decidim_title") %>">
+    <button type="button" id="panel-footer-menu-trigger" data-controls="panel-footer-menu" data-open-lg="true">
+      <span class="h4"><%= t("layouts.decidim.footer.decidim_title") %></span>
+      <%= icon "arrow-down-s-line" %>
+    </button>
+    <div id="panel-footer-menu" aria-hidden="true">
+      <%= footer_menu.render_menu_items %>
+    </div>
+  </nav>
 
-<nav role="navigation" aria-label="<%= t("layouts.decidim.user_menu.profile") %>">
-  <h2 class="h4 mb-4"><%= t("layouts.decidim.user_menu.profile") %></h2>
-  <ul class="space-y-4 break-inside-avoid">
-    <% if current_user %>
-      <li class="font-semibold underline"><%= link_to t("layouts.decidim.user_menu.configuration"), decidim.account_path %></li>
-      <li class="font-semibold underline"><%= link_to t("layouts.decidim.user_menu.public_profile"), decidim.profile_path(current_user.nickname) %></li>
-      <li class="font-semibold underline"><%= link_to t("layouts.decidim.user_menu.notifications"), decidim.notifications_path %></li>
-      <li class="font-semibold underline"><%= link_to t("layouts.decidim.user_menu.conversations"), decidim.conversations_path %></li>
-    <% else %>
-      <% if current_organization.sign_up_enabled? %>
-        <li class="font-semibold underline"><%= link_to t("layouts.decidim.footer.sign_up"), decidim.new_user_registration_path %></li>
-      <% end %>
-      <li class="font-semibold underline"><%= link_to t("layouts.decidim.footer.log_in"), decidim.new_user_session_path %></li>
-    <% end %>
-  </ul>
-</nav>
+  <nav class="footer__nav" role="navigation" aria-label="<%= t("layouts.decidim.user_menu.profile") %>">
+    <button type="button" id="panel-profile-trigger" data-controls="panel-profile" data-open-lg="true">
+      <span class="h4"><%= t("layouts.decidim.user_menu.profile") %></span>
+      <%= icon "arrow-down-s-line" %>
+    </button>
+    <div id="panel-profile" aria-hidden="true">
+      <ul>
+        <% if current_user %>
+          <li><%= link_to t("layouts.decidim.user_menu.configuration"), decidim.account_path %></li>
+          <li><%= link_to t("layouts.decidim.user_menu.public_profile"), decidim.profile_path(current_user.nickname) %></li>
+          <li><%= link_to t("layouts.decidim.user_menu.notifications"), decidim.notifications_path %></li>
+          <li><%= link_to t("layouts.decidim.user_menu.conversations"), decidim.conversations_path %></li>
+        <% else %>
+          <% if current_organization.sign_up_enabled? %>
+            <li><%= link_to t("layouts.decidim.footer.sign_up"), decidim.new_user_registration_path %></li>
+          <% end %>
+          <li><%= link_to t("layouts.decidim.footer.log_in"), decidim.new_user_session_path %></li>
+        <% end %>
+      </ul>
+    </div>
+  </nav>
 
-<nav role="navigation" aria-label="<%= t("layouts.decidim.footer.resources") %>">
-  <h2 class="h4 mb-4"><%= t("layouts.decidim.footer.resources") %></h2>
-  <ul class="space-y-4 break-inside-avoid">
-    <li class="font-semibold underline"><%= link_to t("decidim.profiles.show.activity"), decidim.last_activities_path %></li>
-    <% if Decidim.module_installed?(:meetings) %>
-      <li class="font-semibold underline"><%= link_to t("decidim.pages.home.extended.meetings"), Decidim::Meetings::DirectoryEngine.routes.url_helpers.root_path %></li>
-    <% end %>
-    <li class="font-semibold underline"><%= link_to t("layouts.decidim.footer.open_data"), decidim.open_data_path %></li>
-  </ul>
-</nav>
+  <nav class="footer__nav" role="navigation" aria-label="<%= t("layouts.decidim.footer.resources") %>">
+    <button type="button" id="panel-resources-trigger" data-controls="panel-resources" data-open-lg="true">
+      <span class="h4"><%= t("layouts.decidim.footer.resources") %></span>
+      <%= icon "arrow-down-s-line" %>
+    </button>
+    <div id="panel-resources" aria-hidden="true">
+      <ul>
+        <li><%= link_to t("decidim.profiles.show.activity"), decidim.last_activities_path %></li>
+        <% if Decidim.module_installed?(:meetings) %>
+          <li><%= link_to t("decidim.pages.home.extended.meetings"), Decidim::Meetings::DirectoryEngine.routes.url_helpers.root_path %></li>
+        <% end %>
+        <li><%= link_to t("layouts.decidim.footer.open_data"), decidim.open_data_path %></li>
+      </ul>
+    </div>
+  </nav>
 
-<%= cell("decidim/footer_topics", nil) %>
+  <nav class="footer__nav" role="navigation" aria-label="<%= t("layouts.decidim.footer.help") %>">
+    <button type="button" id="panel-help-trigger" data-controls="panel-help" data-open-lg="true">
+      <span class="h4"><%= t("layouts.decidim.footer.help") %></span>
+      <%= icon "arrow-down-s-line" %>
+    </button>
+    <div id="panel-help" aria-hidden="true">
+      <%= cell("decidim/footer_topics", nil) %>
+    </div>
+  </nav>
+</div>
diff --git a/decidim-core/spec/system/footer_spec.rb b/decidim-core/spec/system/footer_spec.rb
new file mode 100644
index 0000000000000..94b2c8acf7bce
--- /dev/null
+++ b/decidim-core/spec/system/footer_spec.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Footer" do
+  let(:organization) { create(:organization) }
+
+  context "when on a large viewport (accordion disabled)" do
+    before do
+      switch_to_host(organization.host)
+      visit decidim.root_path
+    end
+
+    it "shows all footer panels by default" do
+      within "footer" do
+        %w(panel-footer-menu panel-profile panel-resources panel-help).each do |panel_id|
+          expect(page).to have_css("##{panel_id}[aria-hidden='false']")
+        end
+      end
+    end
+
+    it "renders footer accordion triggers as buttons with the expected markup" do
+      within "footer" do
+        %w(panel-footer-menu-trigger panel-profile-trigger panel-resources-trigger panel-help-trigger).each do |trigger_id|
+          trigger = find("##{trigger_id}")
+          expect(trigger.tag_name).to eq("button")
+          expect(trigger[:type]).to eq("button")
+          expect(trigger).to have_css(".h4")
+        end
+      end
+    end
+
+    it "does not allow pointer events on accordion triggers" do
+      within "footer" do
+        %w(panel-footer-menu-trigger panel-profile-trigger panel-resources-trigger panel-help-trigger).each do |trigger_id|
+          trigger = find("##{trigger_id}")
+          pointer_events = page.evaluate_script("window.getComputedStyle(arguments[0]).pointerEvents", trigger.native)
+          expect(pointer_events).to eq("none")
+        end
+      end
+    end
+  end
+
+  context "when on a small viewport (accordion enabled)" do
+    before do
+      driven_by(:iphone)
+      switch_to_host(organization.host)
+      visit decidim.root_path
+      click_on(id: "dc-dialog-accept")
+    end
+
+    it "hides all footer panels by default" do
+      within "footer" do
+        %w(panel-footer-menu panel-profile panel-resources panel-help).each do |panel_id|
+          expect(page).to have_css("##{panel_id}[aria-hidden='true']", visible: :all)
+        end
+      end
+    end
+
+    it "expands a panel when its trigger is clicked" do
+      within "footer" do
+        find_by_id("panel-footer-menu-trigger").click
+        expect(page).to have_css("#panel-footer-menu[aria-hidden='false']")
+      end
+    end
+
+    it "collapses a panel when its trigger is clicked again" do
+      within "footer" do
+        find_by_id("panel-footer-menu-trigger").click
+        expect(page).to have_css("#panel-footer-menu[aria-hidden='false']")
+
+        find_by_id("panel-footer-menu-trigger").click
+        expect(page).to have_css("#panel-footer-menu[aria-hidden='true']", visible: :all)
+      end
+    end
+  end
+end
diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_step/show.erb b/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_step/show.erb
index 9711ff69f405f..7277c34117720 100644
--- a/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_step/show.erb
+++ b/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_step/show.erb
@@ -1,7 +1,7 @@
 <%= decidim_modal id: "process-steps-modal", class: "participatory-space__metadata-modal", data: do %>
   <div data-dialog-container>
     <%= icon "flag-line" %>
-    <h3 id="dialog-title-process-steps-modal" data-dialog-title><%= t("participatory_process_steps.index.process_steps", scope: "decidim") %></h3>
+    <h2 id="dialog-title-process-steps-modal" data-dialog-title><%= t("participatory_process_steps.index.process_steps", scope: "decidim") %></h2>
     <div>
       <div class="participatory-space__metadata-modal__list-container" data-controller="accordion" data-multiselectable="false" data-collapsible="false">
         <ol class="participatory-space__metadata-modal__list">

From e17cdf02fd25b18910bb3272c83027b358b2caf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?=
 <andreslucena@users.noreply.github.com>
Date: Wed, 29 Jul 2026 16:19:53 +0200
Subject: [PATCH 122/131] Backport 'Pin rack-proxy to a version compatible with
 shakapacker' to v0.31 (#17375)

---
 Gemfile.lock                      | 3 ++-
 decidim-core/decidim-core.gemspec | 3 +++
 decidim-generators/Gemfile.lock   | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8661d78873766..737de6ca905e5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -99,6 +99,7 @@ PATH
       premailer-rails (~> 1.10)
       rack (~> 2.2, >= 2.2.8.1)
       rack-attack (~> 6.0)
+      rack-proxy (~> 0.8.3, < 1.0)
       rails (~> 7.2.0, >= 7.2.2.2)
       rails-i18n (~> 7.0)
       ransack (~> 4.2.0)
@@ -658,7 +659,7 @@ GEM
     rack-protection (3.2.0)
       base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
-    rack-proxy (0.7.7)
+    rack-proxy (0.8.3)
       rack
     rack-session (1.0.2)
       rack (< 3)
diff --git a/decidim-core/decidim-core.gemspec b/decidim-core/decidim-core.gemspec
index bda64f09ba9a4..86595e5fb7481 100644
--- a/decidim-core/decidim-core.gemspec
+++ b/decidim-core/decidim-core.gemspec
@@ -74,6 +74,9 @@ Gem::Specification.new do |s|
   s.add_dependency "premailer-rails", "~> 1.10"
   s.add_dependency "rack", "~> 2.2", ">= 2.2.8.1"
   s.add_dependency "rack-attack", "~> 6.0"
+  # Workaround until shakapacker releases a new version compatible with rack-proxy v1.0
+  # @see https://github.com/shakacode/shakapacker/issues/1220
+  s.add_dependency "rack-proxy", "~> 0.8.3", "< 1.0"
   s.add_dependency "rails", "~> 7.2.0", ">= 7.2.2.2"
   s.add_dependency "rails-i18n", "~> 7.0"
   s.add_dependency "ransack", "~> 4.2.0"
diff --git a/decidim-generators/Gemfile.lock b/decidim-generators/Gemfile.lock
index 4828876d2361a..73dde4adad9c8 100644
--- a/decidim-generators/Gemfile.lock
+++ b/decidim-generators/Gemfile.lock
@@ -99,6 +99,7 @@ PATH
       premailer-rails (~> 1.10)
       rack (~> 2.2, >= 2.2.8.1)
       rack-attack (~> 6.0)
+      rack-proxy (~> 0.8.3, < 1.0)
       rails (~> 7.2.0, >= 7.2.2.2)
       rails-i18n (~> 7.0)
       ransack (~> 4.2.0)
@@ -652,7 +653,7 @@ GEM
     rack-protection (3.2.0)
       base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
-    rack-proxy (0.7.7)
+    rack-proxy (0.8.3)
       rack
     rack-session (1.0.2)
       rack (< 3)

From 070a8a8e299992763017e0e2a09ad499d63fe6a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?=
 <andreslucena@users.noreply.github.com>
Date: Wed, 29 Jul 2026 16:22:32 +0200
Subject: [PATCH 123/131] Backport 'Add the `aria-expanded="false"` attribute
 when loading the Dropdowns' to v0.31 (#17378)

---
 .../controllers/dropdown/controller.js        |  6 ++++
 .../controllers/dropdown/dropdown.test.js     | 28 +++++++++++++++++++
 .../views/decidim/searches/_filters.html.erb  |  2 +-
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/decidim-core/app/packs/src/decidim/controllers/dropdown/controller.js b/decidim-core/app/packs/src/decidim/controllers/dropdown/controller.js
index 34f755f37decb..a88bb5891b22a 100644
--- a/decidim-core/app/packs/src/decidim/controllers/dropdown/controller.js
+++ b/decidim-core/app/packs/src/decidim/controllers/dropdown/controller.js
@@ -47,6 +47,12 @@ export default class extends Controller {
       this.element.id = `dropdown-${Math.random().toString(36).substring(7)}`
     }
 
+    if (!this.element.hasAttribute("aria-expanded")) {
+      this.element.setAttribute("aria-expanded", dropdownOptions.isOpen
+        ? "true"
+        : "false");
+    }
+
     const autofocus = this.element.dataset.autofocus;
     if (autofocus) {
       // set the focus to some inner element, use setTimeout hack due to waiting for element to display
diff --git a/decidim-core/app/packs/src/decidim/controllers/dropdown/dropdown.test.js b/decidim-core/app/packs/src/decidim/controllers/dropdown/dropdown.test.js
index 72aed33913de0..0afeccdea120f 100644
--- a/decidim-core/app/packs/src/decidim/controllers/dropdown/dropdown.test.js
+++ b/decidim-core/app/packs/src/decidim/controllers/dropdown/dropdown.test.js
@@ -142,6 +142,34 @@ describe("DropdownController", () => {
     });
   });
 
+  describe("aria-expanded initialization", () => {
+    it("sets aria-expanded to false when missing and isOpen is false", () => {
+      const testController = createController(element);
+
+      testController.connect();
+
+      expect(element.getAttribute("aria-expanded")).toBe("false");
+    });
+
+    it("sets aria-expanded to true when missing and data-open is true", () => {
+      element.setAttribute("data-open", "true");
+      const testController = createController(element);
+
+      testController.connect();
+
+      expect(element.getAttribute("aria-expanded")).toBe("true");
+    });
+
+    it("does not override existing aria-expanded attribute", () => {
+      element.setAttribute("aria-expanded", "true");
+      const testController = createController(element);
+
+      testController.connect();
+
+      expect(element.getAttribute("aria-expanded")).toBe("true");
+    });
+  });
+
   describe("data-add-aria-roles option", () => {
     it("keeps role menu when data-add-aria-roles is true", () => {
       element.setAttribute("data-add-aria-roles", "true");
diff --git a/decidim-core/app/views/decidim/searches/_filters.html.erb b/decidim-core/app/views/decidim/searches/_filters.html.erb
index f49f17534813d..7a6f95414a92e 100644
--- a/decidim-core/app/views/decidim/searches/_filters.html.erb
+++ b/decidim-core/app/views/decidim/searches/_filters.html.erb
@@ -16,7 +16,7 @@
         </button>
       <% end %>
     </div>
-    <button id="dropdown-trigger-search" data-controller="dropdown" data-target="dropdown-menu-search" data-auto-close="true" aria-expanded="true">
+    <button id="dropdown-trigger-search" data-controller="dropdown" data-target="dropdown-menu-search" data-auto-close="true">
       <%= content_tag :span, t("decidim.searches.filters_small_view.filter_by"), class: "#{"is-active" if params.dig(:filter, :with_resource_type) == nil}" %>
       <% @blocks.each do |elements| %>
         <% elements.each do |type, results| %>

From b7ea7b2abf1428c9958b8d785e6e6a29e02bb6ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?=
 <andreslucena@users.noreply.github.com>
Date: Wed, 29 Jul 2026 16:29:21 +0200
Subject: [PATCH 124/131] Backport 'Add maps controls ('Zoom in/Zoom out') to
 i18n' to v0.31 (#17377)

---
 .../app/packs/src/decidim/map/controller.js   | 11 +++++++++-
 decidim-core/config/locales/en.yml            |  2 ++
 decidim-core/lib/decidim/map/dynamic_map.rb   |  4 +++-
 decidim-core/spec/lib/map/dynamic_map_spec.rb | 21 +++++++++++++++++--
 .../lib/map/provider/dynamic_map/here_spec.rb | 16 ++++++++++----
 .../lib/map/provider/dynamic_map/osm_spec.rb  | 12 ++++++++---
 6 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/decidim-core/app/packs/src/decidim/map/controller.js b/decidim-core/app/packs/src/decidim/map/controller.js
index ea1fa632877dd..df518ba1dddcc 100644
--- a/decidim-core/app/packs/src/decidim/map/controller.js
+++ b/decidim-core/app/packs/src/decidim/map/controller.js
@@ -29,7 +29,16 @@ export default class MapController {
   }
 
   load() {
-    this.map = L.map(this.mapId);
+    const zoomControl = L.control.zoom({
+      zoomInTitle: this.config.zoomInText || "Zoom in",
+      zoomOutTitle: this.config.zoomOutText || "Zoom out"
+    });
+
+    this.map = L.map(this.mapId, {
+      zoomControl: false
+    });
+
+    this.map.addControl(zoomControl);
 
     this.map.scrollWheelZoom.disable();
 
diff --git a/decidim-core/config/locales/en.yml b/decidim-core/config/locales/en.yml
index 64d1551b2bd79..58fc3827883b2 100644
--- a/decidim-core/config/locales/en.yml
+++ b/decidim-core/config/locales/en.yml
@@ -1196,6 +1196,8 @@ en:
       dynamic:
         screen_reader_explanation: The following element is a map which presents the items on this page as map points. The element can be used with a screen reader but it may be hard to understand.
         skip_button: Skip map
+        zoom_in: Zoom in
+        zoom_out: Zoom out
       static:
         latlng_text: 'latitude: %{latitude}, longitude: %{longitude}'
         map_service_brand: OpenStreetMap
diff --git a/decidim-core/lib/decidim/map/dynamic_map.rb b/decidim-core/lib/decidim/map/dynamic_map.rb
index 64d9c3834d4cd..74a4c2774417d 100644
--- a/decidim-core/lib/decidim/map/dynamic_map.rb
+++ b/decidim-core/lib/decidim/map/dynamic_map.rb
@@ -30,7 +30,9 @@ def builder_class
       def builder_options
         {
           marker_color: organization.colors.fetch("primary", "#e02d2d"),
-          tile_layer: tile_layer_configuration
+          tile_layer: tile_layer_configuration,
+          zoom_in_text: I18n.t("zoom_in", scope: "decidim.map.dynamic"),
+          zoom_out_text: I18n.t("zoom_out", scope: "decidim.map.dynamic")
         }
       end
 
diff --git a/decidim-core/spec/lib/map/dynamic_map_spec.rb b/decidim-core/spec/lib/map/dynamic_map_spec.rb
index 9e7c7cdfbc112..81a895c9f16c5 100644
--- a/decidim-core/spec/lib/map/dynamic_map_spec.rb
+++ b/decidim-core/spec/lib/map/dynamic_map_spec.rb
@@ -17,7 +17,9 @@ module Map
           expect(Decidim::Map::DynamicMap::Builder).to receive(:new).with(
             template,
             { marker_color: "#e02d2d",
-              tile_layer: { url: nil, options: {} } }
+              tile_layer: { url: nil, options: {} },
+              zoom_in_text: "Zoom in",
+              zoom_out_text: "Zoom out" }
           ).and_call_original
 
           builder = subject.create_builder(template, options)
@@ -35,10 +37,25 @@ module Map
         it "prepares and returns the correct builder options" do
           expect(utility.builder_options).to eq(
             marker_color: "#e02d2d",
-            tile_layer: { url: nil, options: {} }
+            tile_layer: { url: nil, options: {} },
+            zoom_in_text: "Zoom in",
+            zoom_out_text: "Zoom out"
           )
         end
       end
+
+      describe "Builder" do
+        include_context "with dynamic map builder" do
+          subject { utility.create_builder(template, options) }
+        end
+
+        describe "#view_options" do
+          it "includes zoom control translations" do
+            view_opts = subject.send(:view_options)
+            expect(view_opts).to include("zoomInText" => "Zoom in", "zoomOutText" => "Zoom out")
+          end
+        end
+      end
     end
   end
 end
diff --git a/decidim-core/spec/lib/map/provider/dynamic_map/here_spec.rb b/decidim-core/spec/lib/map/provider/dynamic_map/here_spec.rb
index 60b0ae41245a4..8f62881c74457 100644
--- a/decidim-core/spec/lib/map/provider/dynamic_map/here_spec.rb
+++ b/decidim-core/spec/lib/map/provider/dynamic_map/here_spec.rb
@@ -32,7 +32,9 @@ module DynamicMap
                 marker_color: "#e02d2d",
                 tile_layer: {
                   api_key: "key1234", foo: "bar", language: "en"
-                }
+                },
+                zoom_in_text: "Zoom in",
+                zoom_out_text: "Zoom out"
               )
             end
 
@@ -51,7 +53,9 @@ module DynamicMap
                   marker_color: "#e02d2d",
                   tile_layer: {
                     api_key: "key1234", foo: "bar", language: "ca"
-                  }
+                  },
+                  zoom_in_text: "Zoom in",
+                  zoom_out_text: "Zoom out"
                 )
               end
 
@@ -61,7 +65,9 @@ module DynamicMap
                   marker_color: "#e02d2d",
                   tile_layer: {
                     api_key: "key1234", foo: "bar", language: "es"
-                  }
+                  },
+                  zoom_in_text: "Zoom in",
+                  zoom_out_text: "Zoom out"
                 )
               end
             end
@@ -82,7 +88,9 @@ module DynamicMap
                     api_key: "appid123secret456",
                     foo: "bar",
                     language: "en"
-                  }
+                  },
+                  zoom_in_text: "Zoom in",
+                  zoom_out_text: "Zoom out"
                 )
               end
             end
diff --git a/decidim-core/spec/lib/map/provider/dynamic_map/osm_spec.rb b/decidim-core/spec/lib/map/provider/dynamic_map/osm_spec.rb
index 66c8f4d3f1beb..ec8eceb3d129f 100644
--- a/decidim-core/spec/lib/map/provider/dynamic_map/osm_spec.rb
+++ b/decidim-core/spec/lib/map/provider/dynamic_map/osm_spec.rb
@@ -34,7 +34,9 @@ module DynamicMap
                 tile_layer: {
                   url: "https://tiles.example.org",
                   options: {}
-                }
+                },
+                zoom_in_text: "Zoom in",
+                zoom_out_text: "Zoom out"
               )
             end
 
@@ -55,7 +57,9 @@ module DynamicMap
                   tile_layer: {
                     url: "https://tiles.example.org",
                     options: { foo: "bar", baz: "foobar" }
-                  }
+                  },
+                  zoom_in_text: "Zoom in",
+                  zoom_out_text: "Zoom out"
                 )
               end
             end
@@ -79,7 +83,9 @@ module DynamicMap
                   tile_layer: {
                     url: "https://tiles.example.org",
                     options: { api_key: "key1234", foo: "bar", baz: "foobar" }
-                  }
+                  },
+                  zoom_in_text: "Zoom in",
+                  zoom_out_text: "Zoom out"
                 )
               end
             end

From 227188832e07bc1fc9224b6b091fffbf112ad1ce Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Wed, 29 Jul 2026 16:45:57 +0200
Subject: [PATCH 125/131] New Crowdin updates (#17266)

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Romanian)

[ci skip]

* New translations en.yml (Romanian)

[ci skip]

* New translations en.yml (Romanian)

[ci skip]

* New translations en.yml (Romanian)

[ci skip]

* New translations en.yml (Romanian)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (Spanish)

[ci skip]

* New translations en.yml (Spanish)

[ci skip]

* New translations en.yml (Spanish)

[ci skip]

* New translations en.yml (Spanish)

[ci skip]

* New translations en.yml (Spanish)

[ci skip]

* New translations en.yml (Arabic)

[ci skip]

* New translations en.yml (Arabic)

[ci skip]

* New translations en.yml (Arabic)

[ci skip]

* New translations en.yml (Arabic)

[ci skip]

* New translations en.yml (Arabic)

[ci skip]

* New translations en.yml (Bulgarian)

[ci skip]

* New translations en.yml (Bulgarian)

[ci skip]

* New translations en.yml (Bulgarian)

[ci skip]

* New translations en.yml (Bulgarian)

[ci skip]

* New translations en.yml (Bulgarian)

[ci skip]

* New translations en.yml (Catalan)

[ci skip]

* New translations en.yml (Catalan)

[ci skip]

* New translations en.yml (Catalan)

[ci skip]

* New translations en.yml (Catalan)

[ci skip]

* New translations en.yml (Catalan)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (German)

[ci skip]

* New translations en.yml (German)

[ci skip]

* New translations en.yml (German)

[ci skip]

* New translations en.yml (German)

[ci skip]

* New translations en.yml (German)

[ci skip]

* New translations en.yml (Greek)

[ci skip]

* New translations en.yml (Greek)

[ci skip]

* New translations en.yml (Greek)

[ci skip]

* New translations en.yml (Greek)

[ci skip]

* New translations en.yml (Greek)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Hungarian)

[ci skip]

* New translations en.yml (Hungarian)

[ci skip]

* New translations en.yml (Hungarian)

[ci skip]

* New translations en.yml (Hungarian)

[ci skip]

* New translations en.yml (Hungarian)

[ci skip]

* New translations en.yml (Italian)

[ci skip]

* New translations en.yml (Italian)

[ci skip]

* New translations en.yml (Italian)

[ci skip]

* New translations en.yml (Italian)

[ci skip]

* New translations en.yml (Italian)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Lithuanian)

[ci skip]

* New translations en.yml (Lithuanian)

[ci skip]

* New translations en.yml (Lithuanian)

[ci skip]

* New translations en.yml (Lithuanian)

[ci skip]

* New translations en.yml (Lithuanian)

[ci skip]

* New translations en.yml (Dutch)

[ci skip]

* New translations en.yml (Dutch)

[ci skip]

* New translations en.yml (Dutch)

[ci skip]

* New translations en.yml (Dutch)

[ci skip]

* New translations en.yml (Dutch)

[ci skip]

* New translations en.yml (Norwegian)

[ci skip]

* New translations en.yml (Norwegian)

[ci skip]

* New translations en.yml (Norwegian)

[ci skip]

* New translations en.yml (Norwegian)

[ci skip]

* New translations en.yml (Norwegian)

[ci skip]

* New translations en.yml (Polish)

[ci skip]

* New translations en.yml (Polish)

[ci skip]

* New translations en.yml (Polish)

[ci skip]

* New translations en.yml (Polish)

[ci skip]

* New translations en.yml (Polish)

[ci skip]

* New translations en.yml (Portuguese)

[ci skip]

* New translations en.yml (Portuguese)

[ci skip]

* New translations en.yml (Portuguese)

[ci skip]

* New translations en.yml (Portuguese)

[ci skip]

* New translations en.yml (Portuguese)

[ci skip]

* New translations en.yml (Slovak)

[ci skip]

* New translations en.yml (Slovak)

[ci skip]

* New translations en.yml (Slovak)

[ci skip]

* New translations en.yml (Slovak)

[ci skip]

* New translations en.yml (Slovak)

[ci skip]

* New translations en.yml (Swedish)

[ci skip]

* New translations en.yml (Swedish)

[ci skip]

* New translations en.yml (Swedish)

[ci skip]

* New translations en.yml (Swedish)

[ci skip]

* New translations en.yml (Swedish)

[ci skip]

* New translations en.yml (Turkish)

[ci skip]

* New translations en.yml (Turkish)

[ci skip]

* New translations en.yml (Turkish)

[ci skip]

* New translations en.yml (Turkish)

[ci skip]

* New translations en.yml (Turkish)

[ci skip]

* New translations en.yml (Chinese Simplified)

[ci skip]

* New translations en.yml (Chinese Simplified)

[ci skip]

* New translations en.yml (Chinese Simplified)

[ci skip]

* New translations en.yml (Chinese Simplified)

[ci skip]

* New translations en.yml (Chinese Simplified)

[ci skip]

* New translations en.yml (Chinese Traditional)

[ci skip]

* New translations en.yml (Chinese Traditional)

[ci skip]

* New translations en.yml (Chinese Traditional)

[ci skip]

* New translations en.yml (Chinese Traditional)

[ci skip]

* New translations en.yml (Chinese Traditional)

[ci skip]

* New translations en.yml (Galician)

[ci skip]

* New translations en.yml (Galician)

[ci skip]

* New translations en.yml (Galician)

[ci skip]

* New translations en.yml (Galician)

[ci skip]

* New translations en.yml (Galician)

[ci skip]

* New translations en.yml (Icelandic)

[ci skip]

* New translations en.yml (Icelandic)

[ci skip]

* New translations en.yml (Icelandic)

[ci skip]

* New translations en.yml (Icelandic)

[ci skip]

* New translations en.yml (Icelandic)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Portuguese, Brazilian)

[ci skip]

* New translations en.yml (Indonesian)

[ci skip]

* New translations en.yml (Indonesian)

[ci skip]

* New translations en.yml (Indonesian)

[ci skip]

* New translations en.yml (Indonesian)

[ci skip]

* New translations en.yml (Indonesian)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (Latvian)

[ci skip]

* New translations en.yml (Latvian)

[ci skip]

* New translations en.yml (Latvian)

[ci skip]

* New translations en.yml (Latvian)

[ci skip]

* New translations en.yml (Latvian)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (Luxembourgish)

[ci skip]

* New translations en.yml (Luxembourgish)

[ci skip]

* New translations en.yml (Luxembourgish)

[ci skip]

* New translations en.yml (Luxembourgish)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Ukrainian with many plural form)

[ci skip]

* New translations en.yml (Ukrainian with many plural form)

[ci skip]

* New translations en.yml (Ukrainian with many plural form)

[ci skip]

* New translations en.yml (Ukrainian with many plural form)

[ci skip]

* New translations en.yml (Ukrainian with many plural form)

[ci skip]

* New translations en.yml (Russian with many plural form)

[ci skip]

* New translations en.yml (Russian with many plural form)

[ci skip]

* New translations en.yml (Russian with many plural form)

[ci skip]

* New translations en.yml (Russian with many plural form)

[ci skip]

* New translations en.yml (Russian with many plural form)

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (Czech)

[ci skip]

* New translations en.yml (Czech)

[ci skip]
---
 decidim-admin/config/locales/cs.yml           |   4 +
 decidim-blogs/config/locales/cs.yml           |   1 +
 decidim-budgets/config/locales/cs.yml         |   1 +
 decidim-comments/config/locales/ar.yml        |   4 -
 decidim-comments/config/locales/bg.yml        |   4 -
 decidim-comments/config/locales/ca-IT.yml     |   8 +-
 decidim-comments/config/locales/ca.yml        |   8 +-
 decidim-comments/config/locales/cs.yml        |   6 +-
 decidim-comments/config/locales/de.yml        |   4 -
 decidim-comments/config/locales/el.yml        |   4 -
 decidim-comments/config/locales/es-MX.yml     |   8 +-
 decidim-comments/config/locales/es-PY.yml     |   8 +-
 decidim-comments/config/locales/es.yml        |   8 +-
 decidim-comments/config/locales/eu.yml        |   8 +-
 decidim-comments/config/locales/fi-plain.yml  |   8 +-
 decidim-comments/config/locales/fi.yml        |   8 +-
 decidim-comments/config/locales/fr-CA.yml     |   4 -
 decidim-comments/config/locales/fr.yml        |   4 -
 decidim-comments/config/locales/gl.yml        |   4 -
 decidim-comments/config/locales/hu.yml        |   4 -
 decidim-comments/config/locales/id-ID.yml     |   4 -
 decidim-comments/config/locales/is-IS.yml     |   4 -
 decidim-comments/config/locales/it.yml        |   4 -
 decidim-comments/config/locales/ja.yml        |   8 +-
 decidim-comments/config/locales/lb.yml        |   4 -
 decidim-comments/config/locales/lt.yml        |   4 -
 decidim-comments/config/locales/lv.yml        |   4 -
 decidim-comments/config/locales/nl.yml        |   4 -
 decidim-comments/config/locales/no.yml        |   4 -
 decidim-comments/config/locales/pl.yml        |   4 -
 decidim-comments/config/locales/pt-BR.yml     |   4 -
 decidim-comments/config/locales/pt.yml        |   4 -
 decidim-comments/config/locales/ro-RO.yml     |   4 -
 decidim-comments/config/locales/ru.yml        |   4 -
 decidim-comments/config/locales/sk.yml        |   4 -
 decidim-comments/config/locales/sv.yml        |   8 +-
 decidim-comments/config/locales/tr-TR.yml     |   4 -
 decidim-comments/config/locales/uk.yml        |   4 -
 decidim-comments/config/locales/zh-CN.yml     |   4 -
 decidim-comments/config/locales/zh-TW.yml     |   4 -
 decidim-core/config/locales/ar.yml            |  20 --
 decidim-core/config/locales/bg.yml            |  19 --
 decidim-core/config/locales/ca-IT.yml         |  46 ++---
 decidim-core/config/locales/ca.yml            |  46 ++---
 decidim-core/config/locales/cs.yml            |  34 ++--
 decidim-core/config/locales/de.yml            |  25 ---
 decidim-core/config/locales/el.yml            |  18 --
 decidim-core/config/locales/es-MX.yml         |  46 ++---
 decidim-core/config/locales/es-PY.yml         |  46 ++---
 decidim-core/config/locales/es.yml            |  46 ++---
 decidim-core/config/locales/eu.yml            |  46 ++---
 decidim-core/config/locales/fi-plain.yml      |  46 ++---
 decidim-core/config/locales/fi.yml            |  46 ++---
 decidim-core/config/locales/fr-CA.yml         |  20 +-
 decidim-core/config/locales/fr.yml            |  20 +-
 decidim-core/config/locales/gl.yml            |  19 --
 decidim-core/config/locales/hu.yml            |  17 --
 decidim-core/config/locales/id-ID.yml         |  18 --
 decidim-core/config/locales/is-IS.yml         |   6 -
 decidim-core/config/locales/it.yml            |  17 --
 decidim-core/config/locales/ja.yml            |  46 ++---
 decidim-core/config/locales/lb.yml            |  18 --
 decidim-core/config/locales/lt.yml            |  19 --
 decidim-core/config/locales/lv.yml            |  18 --
 decidim-core/config/locales/nl.yml            |  18 --
 decidim-core/config/locales/no.yml            |  18 --
 decidim-core/config/locales/pl.yml            |  19 --
 decidim-core/config/locales/pt-BR.yml         |  25 ---
 decidim-core/config/locales/pt.yml            |  18 --
 decidim-core/config/locales/ro-RO.yml         |  18 --
 decidim-core/config/locales/ru.yml            |   8 -
 decidim-core/config/locales/sk.yml            |  25 ---
 decidim-core/config/locales/sv.yml            |  29 +--
 decidim-core/config/locales/tr-TR.yml         |  18 --
 decidim-core/config/locales/uk.yml            |   6 -
 decidim-core/config/locales/zh-CN.yml         |  16 --
 decidim-core/config/locales/zh-TW.yml         |  19 --
 decidim-debates/config/locales/ar.yml         |   8 -
 decidim-debates/config/locales/bg.yml         |   7 -
 decidim-debates/config/locales/ca-IT.yml      |   8 +-
 decidim-debates/config/locales/ca.yml         |   8 +-
 decidim-debates/config/locales/cs.yml         |   4 +-
 decidim-debates/config/locales/de.yml         |   7 -
 decidim-debates/config/locales/el.yml         |   8 -
 decidim-debates/config/locales/es-MX.yml      |   8 +-
 decidim-debates/config/locales/es-PY.yml      |   8 +-
 decidim-debates/config/locales/es.yml         |   8 +-
 decidim-debates/config/locales/eu.yml         |   4 +-
 decidim-debates/config/locales/fi-plain.yml   |   8 +-
 decidim-debates/config/locales/fi.yml         |   8 +-
 decidim-debates/config/locales/fr-CA.yml      |   7 +-
 decidim-debates/config/locales/fr.yml         |   7 +-
 decidim-debates/config/locales/gl.yml         |   8 -
 decidim-debates/config/locales/hu.yml         |   8 -
 decidim-debates/config/locales/id-ID.yml      |   8 -
 decidim-debates/config/locales/is-IS.yml      |   3 -
 decidim-debates/config/locales/it.yml         |   8 -
 decidim-debates/config/locales/ja.yml         |   8 +-
 decidim-debates/config/locales/lb.yml         |  10 -
 decidim-debates/config/locales/lt.yml         |   8 -
 decidim-debates/config/locales/lv.yml         |   7 -
 decidim-debates/config/locales/nl.yml         |   8 -
 decidim-debates/config/locales/no.yml         |   8 -
 decidim-debates/config/locales/pl.yml         |   7 -
 decidim-debates/config/locales/pt-BR.yml      |   7 -
 decidim-debates/config/locales/pt.yml         |   7 -
 decidim-debates/config/locales/ro-RO.yml      |   8 -
 decidim-debates/config/locales/ru.yml         |   3 -
 decidim-debates/config/locales/sk.yml         |   7 -
 decidim-debates/config/locales/sv.yml         |   7 -
 decidim-debates/config/locales/tr-TR.yml      |   7 -
 decidim-debates/config/locales/uk.yml         |   3 -
 decidim-debates/config/locales/zh-CN.yml      |   8 -
 decidim-debates/config/locales/zh-TW.yml      |   8 -
 decidim-elections/config/locales/cs.yml       |   9 +
 decidim-initiatives/config/locales/ar.yml     |   6 -
 decidim-initiatives/config/locales/bg.yml     |  14 --
 decidim-initiatives/config/locales/ca-IT.yml  |  26 +--
 decidim-initiatives/config/locales/ca.yml     |  26 +--
 decidim-initiatives/config/locales/cs.yml     |  15 +-
 decidim-initiatives/config/locales/de.yml     |  14 --
 decidim-initiatives/config/locales/el.yml     |   6 -
 decidim-initiatives/config/locales/es-MX.yml  |  26 +--
 decidim-initiatives/config/locales/es-PY.yml  |  26 +--
 decidim-initiatives/config/locales/es.yml     |  26 +--
 decidim-initiatives/config/locales/eu.yml     |  26 +--
 .../config/locales/fi-plain.yml               |  26 +--
 decidim-initiatives/config/locales/fi.yml     |  26 +--
 decidim-initiatives/config/locales/fr-CA.yml  |  14 --
 decidim-initiatives/config/locales/fr.yml     |  14 --
 decidim-initiatives/config/locales/gl.yml     |   6 -
 decidim-initiatives/config/locales/hu.yml     |  14 --
 decidim-initiatives/config/locales/id-ID.yml  |   6 -
 decidim-initiatives/config/locales/is-IS.yml  |   6 -
 decidim-initiatives/config/locales/it.yml     |  14 --
 decidim-initiatives/config/locales/ja.yml     |  26 +--
 decidim-initiatives/config/locales/lb.yml     |  14 --
 decidim-initiatives/config/locales/lt.yml     |  14 --
 decidim-initiatives/config/locales/lv.yml     |   6 -
 decidim-initiatives/config/locales/nl.yml     |  16 --
 decidim-initiatives/config/locales/no.yml     |   9 -
 decidim-initiatives/config/locales/pl.yml     |  14 --
 decidim-initiatives/config/locales/pt-BR.yml  |  14 --
 decidim-initiatives/config/locales/pt.yml     |  14 --
 decidim-initiatives/config/locales/ro-RO.yml  |  14 --
 decidim-initiatives/config/locales/ru.yml     |   6 -
 decidim-initiatives/config/locales/sk.yml     |  14 --
 decidim-initiatives/config/locales/sv.yml     |  14 --
 decidim-initiatives/config/locales/tr-TR.yml  |   6 -
 decidim-initiatives/config/locales/uk.yml     |   6 -
 decidim-initiatives/config/locales/zh-CN.yml  |   6 -
 decidim-initiatives/config/locales/zh-TW.yml  |  14 --
 decidim-meetings/config/locales/cs.yml        |   1 +
 .../config/locales/cs.yml                     | 182 ++++++++++++++++++
 decidim-proposals/config/locales/ar.yml       |  11 --
 decidim-proposals/config/locales/bg.yml       |  11 --
 decidim-proposals/config/locales/ca-IT.yml    |  28 +--
 decidim-proposals/config/locales/ca.yml       |  28 +--
 decidim-proposals/config/locales/cs.yml       |  18 +-
 decidim-proposals/config/locales/de.yml       |  15 --
 decidim-proposals/config/locales/el.yml       |  11 --
 decidim-proposals/config/locales/es-MX.yml    |  28 +--
 decidim-proposals/config/locales/es-PY.yml    |  28 +--
 decidim-proposals/config/locales/es.yml       |  28 +--
 decidim-proposals/config/locales/eu.yml       |  24 +--
 decidim-proposals/config/locales/fi-plain.yml |  28 +--
 decidim-proposals/config/locales/fi.yml       |  28 +--
 decidim-proposals/config/locales/fr-CA.yml    |  15 +-
 decidim-proposals/config/locales/fr.yml       |  15 +-
 decidim-proposals/config/locales/gl.yml       |  11 --
 decidim-proposals/config/locales/hu.yml       |  11 --
 decidim-proposals/config/locales/id-ID.yml    |  11 --
 decidim-proposals/config/locales/is-IS.yml    |   3 -
 decidim-proposals/config/locales/it.yml       |  11 --
 decidim-proposals/config/locales/ja.yml       |  26 +--
 decidim-proposals/config/locales/lt.yml       |  11 --
 decidim-proposals/config/locales/lv.yml       |  11 --
 decidim-proposals/config/locales/nl.yml       |  11 --
 decidim-proposals/config/locales/no.yml       |  11 --
 decidim-proposals/config/locales/pl.yml       |  11 --
 decidim-proposals/config/locales/pt-BR.yml    |  15 --
 decidim-proposals/config/locales/pt.yml       |  11 --
 decidim-proposals/config/locales/ro-RO.yml    |  11 --
 decidim-proposals/config/locales/ru.yml       |   3 -
 decidim-proposals/config/locales/sk.yml       |  15 --
 decidim-proposals/config/locales/sv.yml       |  15 --
 decidim-proposals/config/locales/tr-TR.yml    |  11 --
 decidim-proposals/config/locales/uk.yml       |   3 -
 decidim-proposals/config/locales/zh-CN.yml    |  10 -
 decidim-proposals/config/locales/zh-TW.yml    |  11 --
 decidim-system/config/locales/cs.yml          |   2 +
 191 files changed, 752 insertions(+), 1934 deletions(-)

diff --git a/decidim-admin/config/locales/cs.yml b/decidim-admin/config/locales/cs.yml
index 4e8098323d82d..f9973a2f621bf 100644
--- a/decidim-admin/config/locales/cs.yml
+++ b/decidim-admin/config/locales/cs.yml
@@ -769,6 +769,7 @@ cs:
           title: Šablony zpravodaje
           use_template: Použít tuto šablonu
         show:
+          preview: 'Náhled šablony: %{template_name}'
           use_template: Použít tuto šablonu
       newsletters:
         confirm_recipients:
@@ -1083,6 +1084,7 @@ cs:
           previous_title: Předchozí položka
         attachments:
           add_attachments: Přidat přílohy
+          attachment_legend: Přidat galerii příloh (volitelné)
           edit_attachments: Upravit přílohy
       static_page_topics:
         create:
@@ -1239,6 +1241,7 @@ cs:
           none: Žádné
           title: Nová položka v %{taxonomy}
       titles:
+        admin_log: Záznamy administrátora
         area_types: Typy oblastí
         areas: Oblasti
         authorization_workflows: Metody ověření
@@ -1303,6 +1306,7 @@ cs:
         attachment:
           explanation: 'Pokyny pro soubor:'
           message_1: CSV, JSON a Excel (.xlsx) jsou podporovány
+          message_2: V CSV souborech musí být oddělovač mezi sloupci středník (";")
     moderations:
       actions:
         expand: Rozbalit
diff --git a/decidim-blogs/config/locales/cs.yml b/decidim-blogs/config/locales/cs.yml
index 6e4a8eb3b3a87..bde46a79c357b 100644
--- a/decidim-blogs/config/locales/cs.yml
+++ b/decidim-blogs/config/locales/cs.yml
@@ -118,6 +118,7 @@ cs:
             announcement: Oznámení
             attachments_allowed: Povolit přílohy
             comments_enabled: Komentáře povoleny
+            comments_max_length: Maximální počet znaků na komentář (ponechte 0 pro výchozí hodnotu)
             creation_enabled_for_participants: Účastníci mohou vytvářet příspěvky
             define_taxonomy_filters: Před použitím tohoto nastavení prosím definujte některé filtry pro tento participační prostor.
             no_taxonomy_filters_found: Nebyly nalezeny žádné filtry taxonomie.
diff --git a/decidim-budgets/config/locales/cs.yml b/decidim-budgets/config/locales/cs.yml
index a5b29cc4c9b1e..0a0faff98352d 100644
--- a/decidim-budgets/config/locales/cs.yml
+++ b/decidim-budgets/config/locales/cs.yml
@@ -367,6 +367,7 @@ cs:
             announcement: Oznámení
             clear_all: Vymazat vše
             comments_enabled: Komentáře povoleny
+            comments_max_length: Maximální počet znaků na komentář (ponechte 0 pro výchozí hodnotu)
             define_taxonomy_filters: Před použitím tohoto nastavení prosím definujte některé filtry pro tento participační prostor.
             form:
               errors:
diff --git a/decidim-comments/config/locales/ar.yml b/decidim-comments/config/locales/ar.yml
index d7b7b50529c78..6652ae33b6e47 100644
--- a/decidim-comments/config/locales/ar.yml
+++ b/decidim-comments/config/locales/ar.yml
@@ -122,12 +122,10 @@ ar:
           email_intro: "%{author_name} ترك تعليق في %{resource_title}. يمكنك قراءتها في هذه الصفحة:"
           email_outro: لقد تلقيت هذا الإشعار لأنك تتابع %{author_name}. يمكنك إلغاء تتبع هذا المستخدم من صفحة ملفه الشخصي.
           email_subject: هناك تعليق جديد مِن %{author_name} على %{resource_title}
-          notification_title: هناك تعليق جديد مِن <a href="%{author_path}">%{author_name} %{author_nickname}</a> على <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} تم التعليق. يمكنك قراءة التعليق في هذه الصفحة:"
           email_outro: لقد تلقيت هذا الإشعار لأنك تتابع "%{resource_title}" أو مؤلفه. يمكنك إلغاء تتبعه من الرابط السابق.
           email_subject: هناك تعليق جديد من %{author_name} في %{resource_title}
-          notification_title: هناك تعليق جديد مِن <a href="%{author_path}">%{author_name} %{author_nickname}</a> على <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: تم خفض تعليقك في "%{resource_title}". الآن يحتوي على ما مجموعه %{upvotes} أصوات أعلى و %{downvotes} أصوات أدنى.
           email_outro: لقد تلقيت هذا الإشعار لأنك مؤلف هذا التعليق.
@@ -142,9 +140,7 @@ ar:
           email_intro: "%{author_name} رد على تعليقك في %{resource_title}. يمكنك قراءتها في هذه الصفحة:"
           email_outro: لقد تلقيت هذا الإشعار لأنه تم الرد على تعليقك.
           email_subject: "%{author_name} رد على تعليقك في %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> رد على تعليقك في <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: لقد ذكرت
           email_outro: لقد تلقيت هذا الإشعار لأنك ذكرت في %{resource_title}.
           email_subject: لقد ذكرت في %{resource_title}
-          notification_title: لقد ذكرت في <a href="%{resource_path}">%{resource_title}</a> من <a href="%{author_path}">%{author_name} %{author_nickname}</a>
diff --git a/decidim-comments/config/locales/bg.yml b/decidim-comments/config/locales/bg.yml
index 148a4aa89f35a..d8230f1ec7b74 100644
--- a/decidim-comments/config/locales/bg.yml
+++ b/decidim-comments/config/locales/bg.yml
@@ -129,12 +129,10 @@ bg:
           email_intro: "%{author_name} остави коментар в %{resource_title}. Можете да го прочетете на тази страница:"
           email_outro: Получихте това известие, защото следвате %{author_name}. Можете да спрете да следвате този потребител от страницата на неговия профил.
           email_subject: Има нов коментар от %{author_name} в(ъв) %{resource_title}
-          notification_title: Има нов коментар от <a href="%{author_path}">%{author_name} %{author_nickname}</a> в(ъв) <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} получи коментар. Можете да прочетете коментара на тази страница:"
           email_outro: Получавате това известие, защото следвате „%{resource_title}“ или неговия автор. Можете да прекратите следването от предходната връзка.
           email_subject: Има нов коментар от %{author_name} по %{resource_title}
-          notification_title: Има нов коментар от <a href="%{author_path}">%{author_name} %{author_nickname}</a> по <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Вашият коментар в „%{resource_title}“ беше гласуван против. Вече има общо %{upvotes} гласа за и %{downvotes} гласа против.
           email_outro: Получихте това известие, защото вие сте авторът на този коментар.
@@ -149,12 +147,10 @@ bg:
           email_intro: "%{author_name} отговори на вашия коментар в %{resource_title}. Можете да го прочетете на тази страница:"
           email_outro: Получавате това известие, защото някой отговори на коментара Ви.
           email_subject: "%{author_name} отговори на коментара Ви по %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> отговори на коментара Ви по <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Бяхте споменати
           email_outro: Получавате това известие, защото бяхте споменати в(ъв) %{resource_title}.
           email_subject: Бяхте споменати в(ъв) %{resource_title}
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> Ви спомена в(ъв) <a href="%{resource_path}">%{resource_title}</a>
   errors:
     messages:
       cannot_have_comments: не може да има коментари
diff --git a/decidim-comments/config/locales/ca-IT.yml b/decidim-comments/config/locales/ca-IT.yml
index a2adcbabcc8b8..0beab37df1e6e 100644
--- a/decidim-comments/config/locales/ca-IT.yml
+++ b/decidim-comments/config/locales/ca-IT.yml
@@ -166,12 +166,12 @@ ca-IT:
           email_intro: "%{author_name} ha deixat un comentari a %{resource_title}. Podeu llegir-lo en aquesta pàgina:"
           email_outro: Has rebut aquesta notificació perquè estàs seguint el comentari "%{author_name}". Pots deixar de seguir a aquesta participant des de la seva pàgina de perfil.
           email_subject: Hi ha un nou comentari de %{author_name} en %{resource_title}
-          notification_title: Hi ha un nou comentari per <a href="%{author_path}">%{author_name} %{author_nickname}</a> a <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: Hi ha un nou comentari de <a href="%{author_path}">%{author_name}</a> a<a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "Algú ha deixat un comentari a \"%{resource_title}\". Pots llegir el comentari a través del següent enllaç:"
           email_outro: Has rebut aquesta notificació perquè estàs seguint el comentari "%{resource_title}" o la seva autora. Pots deixar de seguir-la des de l'enllaç anterior.
           email_subject: Hi ha un nou comentari de %{author_name} a %{resource_title}
-          notification_title: Hi ha un nou comentari de <a href="%{author_path}">%{author_name} %{author_nickname}</a> en <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: Hi ha un nou comentari de <a href="%{author_path}">%{author_name}</a> a<a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: El teu comentari a "%{resource_title}" ha rebut un vot negatiu. Ara té un total de %{upvotes} vots positius i %{downvotes} vots negatius.
           email_outro: Has rebut aquesta notificació perquè vas fer aquest comentari.
@@ -186,12 +186,12 @@ ca-IT:
           email_intro: "%{author_name} ha respost el teu comentari a %{resource_title}. Pots llegir-lo en aquesta pàgina:"
           email_outro: Has rebut aquesta notificació perquè s'ha respost el teu comentari.
           email_subject: "%{author_name} ha respost el teu comentari a %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha respost el teu comentari a <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: <a href="%{author_path}">%{author_name}</a> ha respost el teu comentari a <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Has estat esmentada
           email_outro: Has rebut aquesta notificació perquè t'han esmentat al comentari "%{resource_title}".
           email_subject: Has estat esmentada a %{resource_title}
-          notification_title: Has estat esmentada a <a href="%{resource_path}">%{resource_title}</a> per <a href="%{author_path}">%{author_name} %{author_nickname}</a>
+          notification_title: Has estat esmentada per <a href="%{author_path}">%{author_name}</a> a <a href="%{resource_path}">%{resource_title}</a>
   errors:
     messages:
       cannot_have_comments: no es poden fer comentaris
diff --git a/decidim-comments/config/locales/ca.yml b/decidim-comments/config/locales/ca.yml
index b91461cd0ea6a..c27215d561743 100644
--- a/decidim-comments/config/locales/ca.yml
+++ b/decidim-comments/config/locales/ca.yml
@@ -166,12 +166,12 @@ ca:
           email_intro: "%{author_name} ha deixat un comentari a %{resource_title}. Podeu llegir-lo en aquesta pàgina:"
           email_outro: Has rebut aquesta notificació perquè estàs seguint el comentari "%{author_name}". Pots deixar de seguir a aquesta participant des de la seva pàgina de perfil.
           email_subject: Hi ha un nou comentari de %{author_name} en %{resource_title}
-          notification_title: Hi ha un nou comentari per <a href="%{author_path}">%{author_name} %{author_nickname}</a> a <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: Hi ha un nou comentari de <a href="%{author_path}">%{author_name}</a> a<a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "Algú ha deixat un comentari a \"%{resource_title}\". Pots llegir el comentari a través del següent enllaç:"
           email_outro: Has rebut aquesta notificació perquè estàs seguint el comentari "%{resource_title}" o la seva autora. Pots deixar de seguir-la des de l'enllaç anterior.
           email_subject: Hi ha un nou comentari de %{author_name} a %{resource_title}
-          notification_title: Hi ha un nou comentari de <a href="%{author_path}">%{author_name} %{author_nickname}</a> en <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: Hi ha un nou comentari de <a href="%{author_path}">%{author_name}</a> a<a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: El teu comentari a "%{resource_title}" ha rebut un vot negatiu. Ara té un total de %{upvotes} vots positius i %{downvotes} vots negatius.
           email_outro: Has rebut aquesta notificació perquè vas fer aquest comentari.
@@ -186,12 +186,12 @@ ca:
           email_intro: "%{author_name} ha respost el teu comentari a %{resource_title}. Pots llegir-lo en aquesta pàgina:"
           email_outro: Has rebut aquesta notificació perquè s'ha respost el teu comentari.
           email_subject: "%{author_name} ha respost el teu comentari a %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha respost el teu comentari a <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: <a href="%{author_path}">%{author_name}</a> ha respost el teu comentari a <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Has estat esmentada
           email_outro: Has rebut aquesta notificació perquè t'han esmentat al comentari "%{resource_title}".
           email_subject: Has estat esmentada a %{resource_title}
-          notification_title: Has estat esmentada a <a href="%{resource_path}">%{resource_title}</a> per <a href="%{author_path}">%{author_name} %{author_nickname}</a>
+          notification_title: Has estat esmentada per <a href="%{author_path}">%{author_name}</a> a <a href="%{resource_path}">%{resource_title}</a>
   errors:
     messages:
       cannot_have_comments: no es poden fer comentaris
diff --git a/decidim-comments/config/locales/cs.yml b/decidim-comments/config/locales/cs.yml
index 4aaa8f11c10db..88e3474a81b7e 100644
--- a/decidim-comments/config/locales/cs.yml
+++ b/decidim-comments/config/locales/cs.yml
@@ -172,12 +172,12 @@ cs:
           email_intro: "%{author_name} zanechal komentář v %{resource_title}. Můžete si je přečíst na této stránce:"
           email_outro: Toto oznámení jste obdrželi, protože jste sledovali %{author_name}. Tento uživatel můžete zrušit ze své profilové stránky.
           email_subject: K dispozici je nový komentář %{author_name} v %{resource_title}
-          notification_title: Je tu nový komentář <a href="%{author_path}">%{author_name} %{author_nickname}</a> v <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: Nový komentář od <a href="%{author_path}">%{author_name}</a> v <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} bylo komentováno. Můžete si přečíst komentář na této stránce:"
           email_outro: Toto oznámení jste obdrželi, protože jste sledovali "%{resource_title}" nebo jeho autora. Můžete jej odhlásit od předchozího odkazu.
           email_subject: K dispozici je nový komentář od %{author_name} do %{resource_title}
-          notification_title: Je tu nový komentář od <a href="%{author_path}">%{author_name} %{author_nickname}</a> do <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: Nový komentář od <a href="%{author_path}">%{author_name}</a> v <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Váš komentář v "%{resource_title}" byl nepodpořen. Nyní má celkem %{upvotes} hlasů podpory a %{downvotes} hlasuje proti.
           email_outro: Obdrželi jste toto oznámení, protože jste autorem tohoto komentáře.
@@ -192,12 +192,10 @@ cs:
           email_intro: "%{author_name} odpověděl váš komentář v %{resource_title}. Můžete si je přečíst na této stránce:"
           email_outro: Toto oznámení jste obdrželi, protože váš komentář byl zodpovězen.
           email_subject: "%{author_name} odpověděl váš komentář v %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> odpověděl na váš komentář v <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Byl jste zmíněn
           email_outro: Toto oznámení jste obdrželi, protože jste byli uvedeni v %{resource_title}.
           email_subject: Byl jste zmíněn v %{resource_title}
-          notification_title: Byli jste zmíněni v <a href="%{resource_path}">%{resource_title}</a> od <a href="%{author_path}">%{author_name} %{author_nickname}</a>
   errors:
     messages:
       cannot_have_comments: nelze komentovat
diff --git a/decidim-comments/config/locales/de.yml b/decidim-comments/config/locales/de.yml
index a5e2d02f4bf41..70e38049dfc07 100644
--- a/decidim-comments/config/locales/de.yml
+++ b/decidim-comments/config/locales/de.yml
@@ -166,12 +166,10 @@ de:
           email_intro: "%{author_name} hat einen Kommentar zu %{resource_title} hinterlassen. Sie können diesen auf dieser Seite lesen:"
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie %{author_name} folgen. Falls Sie keine solchen Benachrichtigungen mehr erhalten möchten, besuchen Sie die Profil-Seite dieses Benutzers.
           email_subject: Neuer Kommentar von %{author_name} zu %{resource_title}
-          notification_title: Es gibt einen neuen Kommentar von <a href="%{author_path}">%{author_name} %{author_nickname}</a> zu <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} wurde kommentiert. Sie können den Kommentar auf dieser Seite lesen:"
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie "%{resource_title}" oder seinem Autor folgen. Falls Sie keine solchen Benachrichtigungen mehr erhalten möchten, besuchen Sie den obigen Link.
           email_subject: Neuer Kommentar von %{author_name} zu %{resource_title}
-          notification_title: Es gibt einen neuen Kommentar von <a href="%{author_path}">%{author_name} %{author_nickname}</a> zu <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Ihr Kommentar in "%{resource_title}" wurde negativ bewertet. Er hat nun insgesamt %{upvotes} positive und %{downvotes} negative Stimmen.
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie der Autor des Vorschlags sind.
@@ -186,12 +184,10 @@ de:
           email_intro: "%{author_name} hat auf Ihren Kommentar zu %{resource_title} geantwortet. Sie können das auf dieser Seite lesen:"
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Ihr Kommentar beantwortet wurde.
           email_subject: "%{author_name} hat auf Ihren Kommentar zu %{resource_title} geantwortet"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> hat auf Ihren Kommentar in <a href="%{resource_path}">%{resource_title}</a> geantwortet
         user_mentioned:
           email_intro: Sie wurden erwähnt
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie in %{resource_title} erwähnt wurden.
           email_subject: Sie wurden in %{resource_title} erwähnt
-          notification_title: Sie wurden in <a href="%{resource_path}">%{resource_title}</a> von <a href="%{author_path}">%{author_name} %{author_nickname}</a> erwähnt
   errors:
     messages:
       cannot_have_comments: kann keine Kommentare haben
diff --git a/decidim-comments/config/locales/el.yml b/decidim-comments/config/locales/el.yml
index 491e626b53ad4..19c60dd301383 100644
--- a/decidim-comments/config/locales/el.yml
+++ b/decidim-comments/config/locales/el.yml
@@ -118,12 +118,10 @@ el:
           email_intro: "Ο συντάκτης %{author_name} έκανε ένα σχόλιο στο στοιχείο %{resource_title}. Μπορείτε να το διαβάσετε σε αυτήν τη σελίδα:"
           email_outro: Λάβατε αυτήν την ειδοποίηση επειδή ακολουθείτε τον συντάκτη %{author_name}. Μπορείτε να σταματήσετε να ακολουθείτε αυτόν τον χρήστη από τη σελίδα προφίλ του.
           email_subject: Υπάρχει ένα νέο σχόλιο από τον συντάκτη %{author_name} στο στοιχείο %{resource_title}
-          notification_title: Υπάρχει ένα νέο σχόλιο από τον συντάκτη <a href="%{author_path}">%{author_name} %{author_nickname}</a> στο στοιχείο <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "Το στοιχείο %{resource_title} έχει σχολιαστεί. Μπορείτε να διαβάσετε το σχόλιο σε αυτήν τη σελίδα:"
           email_outro: Λάβατε αυτήν την ειδοποίηση επειδή ακολουθείτε το στοιχείο «%{resource_title}» ή τον συντάκτη του. Μπορείτε να σταματήσετε να την ακολουθείτε από τον προηγούμενο σύνδεσμο.
           email_subject: Υπάρχει ένα νέο σχόλιο από τον συντάκτη %{author_name} στο στοιχείο %{resource_title}
-          notification_title: Υπάρχει ένα νέο σχόλιο από τον συντάκτη<a href="%{author_path}">%{author_name} %{author_nickname}</a> στο στοιχείο <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Το σχόλιό σας στο "%{resource_title}" έχει καταψηφιστεί. Τώρα έχει συνολικές ψήφους %{upvotes} υπέρ και %{downvotes} κατά.
           email_outro: Λάβατε αυτή την ειδοποίηση επειδή είστε ο συγγραφέας αυτού του σχολίου.
@@ -138,12 +136,10 @@ el:
           email_intro: "Ο συντάκτης %{author_name} απάντησε στο σχόλιό σας στο στοιχείο %{resource_title}. Μπορείτε να το διαβάσετε σε αυτήν τη σελίδα:"
           email_outro: Λάβατε αυτήν την ειδοποίηση, επειδή το σχόλιό σας απαντήθηκε.
           email_subject: "Ο συντάκτης %{author_name} απάντησε στο σχόλιό σας στο στοιχείο %{resource_title}"
-          notification_title: Ο συντάκτης <a href="%{author_path}">%{author_name} %{author_nickname}</a> απάντησε στο σχόλιό σας στο στοιχείο <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Έγινε αναφορά σε εσάς
           email_outro: Λάβατε αυτήν την ειδοποίηση επειδή έγινε αναφορά σε εσάς στο στοιχείο %{resource_title}.
           email_subject: Έγινε αναφορά σε εσάς στο στοιχείο %{resource_title}
-          notification_title: Έγινε αναφορά σε εσάς στο στοιχείο <a href="%{resource_path}">%{resource_title}</a> από τον συντάκτη <a href="%{author_path}">%{author_name} %{author_nickname}</a>
   errors:
     messages:
       cannot_have_comments: δεν μπορεί να έχει σχόλια
diff --git a/decidim-comments/config/locales/es-MX.yml b/decidim-comments/config/locales/es-MX.yml
index 3ba43c315d2f7..65456a3e7347c 100644
--- a/decidim-comments/config/locales/es-MX.yml
+++ b/decidim-comments/config/locales/es-MX.yml
@@ -166,12 +166,12 @@ es-MX:
           email_intro: "%{author_name} ha dejado un comentario en %{resource_title}. Puedes leerlo en esta página:"
           email_outro: Has recibido esta notificación porque sigues "%{author_name}". Puedes dejar de seguirlo desde el enlace anterior.
           email_subject: Hay un nuevo comentario de %{author_name} en %{resource_title}
-          notification_title: Hay un nuevo comentario de <a href="%{author_path}">%{author_name} %{author_nickname}</a> en <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: Hay un nuevo comentario de <a href="%{author_path}">%{author_name}</a> en <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} ha sido comentado. Puedes leer el comentario en esta página:"
           email_outro: Has recibido esta notificación porque está siguiendo "%{resource_title}" o su autor. Puedes dejar de seguirlo desde el enlace anterior.
           email_subject: Hay un nuevo comentario de %{author_name} en %{resource_title}
-          notification_title: Hay un nuevo comentario de <a href="%{author_path}">%{author_name} %{author_nickname}</a> en <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: Hay un nuevo comentario de <a href="%{author_path}">%{author_name}</a> en <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Tu comentario en "%{resource_title}" ha sido votado negativamente. Ahora tiene un total de %{upvotes} votos positivos y %{downvotes} votos negativos.
           email_outro: Has recibido esta notificación porque eres la autora de este comentario.
@@ -186,12 +186,12 @@ es-MX:
           email_intro: "%{author_name} ha respondido a tu comentario en %{resource_title}. Puedes leerlo en esta página:"
           email_outro: Has recibido esta notificación porque tu comentario fue respondido.
           email_subject: "%{author_name} ha respondido a tu comentario en %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha respondido a tu comentario en <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: <a href="%{author_path}">%{author_name}</a> ha respondido a tu comentario en <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Has sido mencionado
           email_outro: Has recibido esta notificación porque has sido mencionado en %{resource_title}.
           email_subject: Has sido mencionado en %{resource_title}
-          notification_title: Has sido mencionado en <a href="%{resource_path}">%{resource_title}</a> por <a href="%{author_path}">%{author_name} %{author_nickname}</a>
+          notification_title: Has sido mencionada por <a href="%{author_path}">%{author_name}</a> en <a href="%{resource_path}">%{resource_title}</a>
   errors:
     messages:
       cannot_have_comments: no se pueden hacer comentarios
diff --git a/decidim-comments/config/locales/es-PY.yml b/decidim-comments/config/locales/es-PY.yml
index 3aa3da9c833c6..3450516a3e2ee 100644
--- a/decidim-comments/config/locales/es-PY.yml
+++ b/decidim-comments/config/locales/es-PY.yml
@@ -166,12 +166,12 @@ es-PY:
           email_intro: "%{author_name} ha dejado un comentario en %{resource_title}. Puedes leerlo en esta página:"
           email_outro: Has recibido esta notificación porque sigues "%{author_name}". Puedes dejar de seguirlo desde el enlace anterior.
           email_subject: Hay un nuevo comentario de %{author_name} en %{resource_title}
-          notification_title: Hay un nuevo comentario de <a href="%{author_path}">%{author_name} %{author_nickname}</a> en <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: Hay un nuevo comentario de <a href="%{author_path}">%{author_name}</a> en <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} ha sido comentado. Puedes leer el comentario en esta página:"
           email_outro: Has recibido esta notificación porque está siguiendo "%{resource_title}" o su autor. Puedes dejar de seguirlo desde el enlace anterior.
           email_subject: Hay un nuevo comentario de %{author_name} en %{resource_title}
-          notification_title: Hay un nuevo comentario de <a href="%{author_path}">%{author_name} %{author_nickname}</a> en <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: Hay un nuevo comentario de <a href="%{author_path}">%{author_name}</a> en <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Tu comentario en "%{resource_title}" ha sido votado negativamente. Ahora tiene un total de %{upvotes} votos positivos y %{downvotes} votos negativos.
           email_outro: Has recibido esta notificación porque eres la autora de este comentario.
@@ -186,12 +186,12 @@ es-PY:
           email_intro: "%{author_name} ha respondido a tu comentario en %{resource_title}. Puedes leerlo en esta página:"
           email_outro: Has recibido esta notificación porque tu comentario fue respondido.
           email_subject: "%{author_name} ha respondido a tu comentario en %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha respondido a tu comentario en <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: <a href="%{author_path}">%{author_name}</a> ha respondido a tu comentario en <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Has sido mencionado
           email_outro: Has recibido esta notificación porque has sido mencionado en %{resource_title}.
           email_subject: Has sido mencionado en %{resource_title}
-          notification_title: Has sido mencionado en <a href="%{resource_path}">%{resource_title}</a> por <a href="%{author_path}">%{author_name} %{author_nickname}</a>
+          notification_title: Has sido mencionada por <a href="%{author_path}">%{author_name}</a> en <a href="%{resource_path}">%{resource_title}</a>
   errors:
     messages:
       cannot_have_comments: no se pueden hacer comentarios
diff --git a/decidim-comments/config/locales/es.yml b/decidim-comments/config/locales/es.yml
index b1541a7e81abf..3c9bbf72e8560 100644
--- a/decidim-comments/config/locales/es.yml
+++ b/decidim-comments/config/locales/es.yml
@@ -166,12 +166,12 @@ es:
           email_intro: "%{author_name} ha dejado un comentario en %{resource_title}. Puedes leerlo en esta página:"
           email_outro: Has recibido esta notificación porque sigues a "%{author_name}". Puedes dejar de seguir a esta participante desde su página de perfil.
           email_subject: Hay un nuevo comentario de %{author_name} en %{resource_title}
-          notification_title: Hay un nuevo comentario de <a href="%{author_path}">%{author_name} %{author_nickname}</a> en <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: Hay un nuevo comentario de <a href="%{author_path}">%{author_name}</a> en <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "Alguien ha dejado un comentario en \"%{resource_title}\". Puedes leer el comentario a través del siguiente enlace:"
           email_outro: Has recibido esta notificación porque estás siguiendo el comentario "%{resource_title}" o a su autora. Puedes dejar de seguirla desde el enlace anterior.
           email_subject: Hay un nuevo comentario de %{author_name} en %{resource_title}
-          notification_title: Hay un nuevo comentario de <a href="%{author_path}">%{author_name} %{author_nickname}</a> en <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: Hay un nuevo comentario de <a href="%{author_path}">%{author_name}</a> en <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Tu comentario en "%{resource_title}" ha sido votado negativamente. Ahora tiene un total de %{upvotes} votos positivos y %{downvotes} votos negativos.
           email_outro: Has recibido esta notificación porque hiciste este comentario.
@@ -186,12 +186,12 @@ es:
           email_intro: "%{author_name} ha respondido a tu comentario en %{resource_title}. Puedes leerlo en esta página:"
           email_outro: Has recibido esta notificación porque han respondido a tu comentario.
           email_subject: "%{author_name} ha respondido a tu comentario en %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha respondido a tu comentario en <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: <a href="%{author_path}">%{author_name}</a> ha respondido a tu comentario en <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Has sido mencionada
           email_outro: Has recibido esta notificación porque te han mencionado en el comentario "%{resource_title}".
           email_subject: Has sido mencionada en %{resource_title}
-          notification_title: Has sido mencionada en <a href="%{resource_path}">%{resource_title}</a> por <a href="%{author_path}">%{author_name} %{author_nickname}</a>
+          notification_title: Has sido mencionada por <a href="%{author_path}">%{author_name}</a> en <a href="%{resource_path}">%{resource_title}</a>
   errors:
     messages:
       cannot_have_comments: no se pueden hacer comentarios
diff --git a/decidim-comments/config/locales/eu.yml b/decidim-comments/config/locales/eu.yml
index 7e3e6c3881fe4..52a87d647454f 100644
--- a/decidim-comments/config/locales/eu.yml
+++ b/decidim-comments/config/locales/eu.yml
@@ -166,12 +166,12 @@ eu:
           email_intro: "%{author_name} egileak iruzkin bat utzi du %{resource_title} helbidean. Orri honetan irakur dezakezu:"
           email_outro: Jakinarazpen hau jaso duzu %{author_name} parte-hartzailea jarraitzen duzulako. Nahi izatekotan erabiltzaile hori bere profil-orritik jarraitzeari utz diezaiokezu.
           email_subject: '%{author_name} egileak beste iruzkin bat egin du hemen: %{resource_title}'
-          notification_title: '<a href="%{author_path}">%{author_name} %{author_nickname}</a> parte-hartzaileak iruzkin berri bat egin du hemen: <a href="%{resource_path}">%{resource_title}</a>.'
+          notification_title: '<a href="%{author_path}">%{author_name}</a> egileak beste iruzkin bat egin du hemen: <a href="%{resource_path}">%{resource_title}</a>.'
         comment_created:
           email_intro: "Norbaitek iruzkin bat egin du hemen: %{resource_title}. Orri honetan irakur dezakezu:"
           email_outro: Jakinarazpen hau jaso duzu "%{resource_title}" edo bere egilea jarraitzen duzulako. Aurreko estekan jarrai dezakezu.
           email_subject: '%{author_name} egileak beste iruzkin berri bat egin du hemen: %{resource_title}'
-          notification_title: '<a href="%{author_path}">%{author_name} %{author_nickname}</a> parte-hartzaileak iruzkin berri bat egin du hemen: <a href="%{resource_path}">%{resource_title}</a>'
+          notification_title: '<a href="%{author_path}">%{author_name}</a> egileak beste iruzkin bat egin du hemen: <a href="%{resource_path}">%{resource_title}</a>'
         comment_downvoted:
           email_intro: Zure iruzkina hemen "%{resource_title}" negatiboki bozkatu da. Orain %{upvotes} babes positibo eta %{downvotes} boto negatibo dituzu guztira.
           email_outro: Jakinarazpen hau jaso duzu iruzkin honen egilea zarelako.
@@ -186,12 +186,12 @@ eu:
           email_intro: "%{author_name} egileak zure iruzkina erantzun du hemen: %{resource_title}. Orri honetan irakur dezakezu:"
           email_outro: Jakinarazpen hau jaso duzu zure iruzkinak erantzuna izan duelako.
           email_subject: "%{author_name} parte-hartzaileak zure iruzkina erantzun du hemen: %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> -k zure iruzkinari erantzun dio hemen <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: '<a href="%{author_path}">%{author_name}</a> parte-hartzaileak zure iruzkina erantzun du hemen: <a href="%{resource_path}">%{resource_title}</a>'
         user_mentioned:
           email_intro: Aipatu zaituzte
           email_outro: 'Jakinarazpen hau jaso duzu hemen aipatu zaituztelako: %{resource_title}.'
           email_subject: 'Hemen: %{resource_title} aipatu zaituzte'
-          notification_title: 'Hemen: <a href="%{group_path}">%{group_name} %{group_nickname}</a> egile honek: <a href="%{author_path}">%{author_name} %{author_nickname}</a> aipatu zaitu'
+          notification_title: '<a href="%{author_path}">%{author_name}</a> parte-hartzaileak aipatu zaitu hemen: <a href="%{resource_path}">%{resource_title}</a>'
   errors:
     messages:
       cannot_have_comments: ezin zaio iruzkinik egin
diff --git a/decidim-comments/config/locales/fi-plain.yml b/decidim-comments/config/locales/fi-plain.yml
index dc5c1766f4c64..104ce2ddd8a1f 100644
--- a/decidim-comments/config/locales/fi-plain.yml
+++ b/decidim-comments/config/locales/fi-plain.yml
@@ -166,12 +166,12 @@ fi-pl:
           email_intro: "%{author_name} on jättänyt kommentin %{resource_title}. Voit lukea sen tällä sivulla:"
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat %{author_name}. Voit perua seuraamisen kyseisen käyttäjän profiilisivulta.
           email_subject: '%{author_name} on jättänyt uuden kommentin kohtaan %{resource_title}'
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> on jättänyt uuden kommentin kohtaan <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: Uusi kommentti osallistujalta <a href="%{author_path}">%{author_name}</a> kohteeseen <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} on kommentoitu. Voit lukea kommentin tällä sivulla:"
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat "%{resource_title}" tai sen kirjoittajaa. Voit lopettaa seuraamisen edellä esitetyn linkin kautta.
           email_subject: '%{author_name} on jättänyt uuden kommentin kohtaan %{resource_title}'
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a>on jättänyt uuden kommentin kohtaan <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: Uusi kommentti osallistujalta <a href="%{author_path}">%{author_name}</a> kohteeseen <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Kommenttisi kohteessa "%{resource_title}" sai miinusäänen. Sillä on yhteensä %{upvotes} ääntä ja %{downvotes} miinusääntä.
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet jättänyt tämän kommentin.
@@ -186,12 +186,12 @@ fi-pl:
           email_intro: "%{author_name} on vastannut kommentiisi kohdassa %{resource_title}. Voit lukea sen tällä sivulla:"
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska kommenttiisi vastattiin.
           email_subject: "%{author_name} on vastannut kommentiisi %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> on vastannut kommentiisi kohdassa <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: <a href="%{author_path}">%{author_name}</a> vastasi kommenttiisi kohteessa <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Sinut on mainittu
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska sinut on mainittu kohdssa %{resource_title}.
           email_subject: Sinut on mainittu kohdassa %{resource_title}
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> on maininnut sinut kohdassa <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: <a href="%{author_path}">%{author_name} </a> on maininnut sinut kohteessa <a href="%{resource_path}">%{resource_title}</a>
   errors:
     messages:
       cannot_have_comments: ei voi sisältää kommentteja
diff --git a/decidim-comments/config/locales/fi.yml b/decidim-comments/config/locales/fi.yml
index a023942f43431..0cd2cd3e01c3e 100644
--- a/decidim-comments/config/locales/fi.yml
+++ b/decidim-comments/config/locales/fi.yml
@@ -166,12 +166,12 @@ fi:
           email_intro: "%{author_name} on jättänyt kommentin kohteessa %{resource_title}. Voit lukea sen sivulta:"
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat osallistujaa %{author_name}. Voit perua seuraamisen kyseisen osallistujan profiilisivulta.
           email_subject: '%{author_name} on jättänyt uuden kommentin kohteessa %{resource_title}'
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> on jättänyt uuden kommentin kohteessa <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: Uusi kommentti osallistujalta <a href="%{author_path}">%{author_name}</a> kohteeseen <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} on kommentoitu. Voit lukea kommentin sivulta:"
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat "%{resource_title}" tai sen kirjoittajaa. Voit lopettaa seuraamisen edellä esitetyn linkin kautta.
           email_subject: '%{author_name} on jättänyt uuden kommentin kohteessa %{resource_title}'
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a>on jättänyt uuden kommentin kohteessa <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: Uusi kommentti osallistujalta <a href="%{author_path}">%{author_name}</a> kohteeseen <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Kommenttisi kohteessa "%{resource_title}" sai miinusäänen. Sillä on yhteensä %{upvotes} ääntä ja %{downvotes} miinusääntä.
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet jättänyt tämän kommentin.
@@ -186,12 +186,12 @@ fi:
           email_intro: "%{author_name} on vastannut kommentiisi kohdassa %{resource_title}. Voit lukea sen sivulta:"
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska kommenttiisi vastattiin.
           email_subject: "%{author_name} on vastannut kommentiisi %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> on vastannut kommentiisi kohteessa <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: <a href="%{author_path}">%{author_name}</a> vastasi kommenttiisi kohteessa <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Sinut on mainittu
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska sinut on mainittu kohteessa %{resource_title}.
           email_subject: Sinut on mainittu kohdassa %{resource_title}
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> on maininnut sinut kohteessa <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: <a href="%{author_path}">%{author_name} </a> on maininnut sinut kohteessa <a href="%{resource_path}">%{resource_title}</a>
   errors:
     messages:
       cannot_have_comments: ei voi sisältää kommentteja
diff --git a/decidim-comments/config/locales/fr-CA.yml b/decidim-comments/config/locales/fr-CA.yml
index cb0342cb75e31..66679775951f5 100644
--- a/decidim-comments/config/locales/fr-CA.yml
+++ b/decidim-comments/config/locales/fr-CA.yml
@@ -160,12 +160,10 @@ fr-CA:
           email_intro: "%{author_name} a laissé un commentaire dans %{resource_title}. Vous pouvez le lire sur la page suivante :"
           email_outro: Vous avez reçu cette notification, car vous suivez %{author_name}. Vous pouvez vous désabonner de cet utilisateur depuis sa page de profil.
           email_subject: Un nouveau commentaire vient d'être déposé par %{author_name} dans %{resource_title}
-          notification_title: Un nouveau commentaire a été publié par <a href="%{author_path}">%{author_name} %{author_nickname}</a> dans <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} a été commenté. Vous pouvez lire le commentaire sur cette page :"
           email_outro: Vous venez de recevoir cette notification parce que vous suivez "%{resource_title}" ou son auteur. Vous pouvez vous désabonner à partir du lien précédant.
           email_subject: Un nouveau commentaire vient d'être publié par %{author_name} dans %{resource_title}
-          notification_title: Un nouveau commentaire de <a href="%{author_path}">%{author_name} %{author_nickname}</a> vient d'être publié dans <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Votre commentaire sur "%{resource_title}" a reçu un vote défavorable. Il a maintenant un total de %{upvotes} votes positifs et %{downvotes} votes négatifs.
           email_outro: Vous avez reçu cette notification parce que vous êtes l'auteur de ce commentaire.
@@ -180,12 +178,10 @@ fr-CA:
           email_intro: "%{author_name} a répondu à votre commentaire dans %{resource_title}. Vous pouvez le lire depuis la page suivante :"
           email_outro: Vous venez de recevoir une notification à votre commentaire.
           email_subject: "%{author_name} a répondu à votre commentaire dans %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> a réagi à votre commentaire sur <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Vous avez été mentionné
           email_outro: Vous avez reçu cette notification parce que vous avez été mentionné dans %{resource_title}.
           email_subject: Vous avez été mentionné dans %{resource_title}
-          notification_title: Vous avez été mentionné dans <a href="%{resource_path}">%{resource_title}</a> par <a href="%{author_path}">%{author_name} %{author_nickname}</a>
   errors:
     messages:
       cannot_have_comments: ne peut pas avoir de commentaires
diff --git a/decidim-comments/config/locales/fr.yml b/decidim-comments/config/locales/fr.yml
index a65c86b2d6405..266b81d51a190 100644
--- a/decidim-comments/config/locales/fr.yml
+++ b/decidim-comments/config/locales/fr.yml
@@ -160,12 +160,10 @@ fr:
           email_intro: "%{author_name} a laissé un commentaire dans %{resource_title}. Vous pouvez le lire sur la page suivante :"
           email_outro: Vous avez reçu cette notification, car vous suivez %{author_name}. Vous pouvez vous désabonner de cet utilisateur depuis sa page de profil, ou bien vous rendre dans l'onglet “Mon compte” > “Paramètres des notifications”.
           email_subject: Un nouveau commentaire vient d'être déposé par %{author_name} dans %{resource_title}
-          notification_title: Un nouveau commentaire a été publié par <a href="%{author_path}">%{author_name} %{author_nickname}</a> dans <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} a été commenté. Vous pouvez lire le commentaire sur cette page :"
           email_outro: Vous venez de recevoir cette notification parce que vous suivez "%{resource_title}" ou son auteur. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
           email_subject: Un nouveau commentaire vient d'être publié par %{author_name} dans %{resource_title}
-          notification_title: Un nouveau commentaire de <a href="%{author_path}">%{author_name} %{author_nickname}</a> vient d'être publié dans <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Votre commentaire sur "%{resource_title}" a reçu un vote défavorable. Il a maintenant un total de %{upvotes} votes positifs et %{downvotes} votes négatifs.
           email_outro: Vous avez reçu cette notification parce que vous êtes l'auteur de ce commentaire. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
@@ -180,12 +178,10 @@ fr:
           email_intro: "%{author_name} a répondu à votre commentaire dans %{resource_title}. Vous pouvez le lire depuis la page suivante :"
           email_outro: Vous avez reçu cette notification parce que votre commentaire a reçu une réponse. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
           email_subject: "%{author_name} a répondu à votre commentaire dans %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> a réagi à votre commentaire sur <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Vous avez été mentionné
           email_outro: Vous avez reçu cette notification parce que vous avez été mentionné dans %{resource_title}. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
           email_subject: Vous avez été mentionné dans %{resource_title}
-          notification_title: Vous avez été mentionné dans <a href="%{resource_path}">%{resource_title}</a> par <a href="%{author_path}">%{author_name} %{author_nickname}</a>
   errors:
     messages:
       cannot_have_comments: ne peut pas avoir de commentaires
diff --git a/decidim-comments/config/locales/gl.yml b/decidim-comments/config/locales/gl.yml
index fe35e52385796..b6285b22841f9 100644
--- a/decidim-comments/config/locales/gl.yml
+++ b/decidim-comments/config/locales/gl.yml
@@ -109,19 +109,15 @@ gl:
           email_intro: "%{author_name} deixou un comentario en %{resource_title}. Podes lelo nesta páxina:"
           email_outro: Recibiches esta notificación porque estás seguindo %{author_name}. Podes deixar de seguir este usuario desde a súa páxina de perfil.
           email_subject: Hai un novo comentario por %{author_name} en %{resource_title}
-          notification_title: Hai un novo comentario <a href="%{author_path}">%{author_name} %{author_nickname}</a> en <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "Comentouse %{resource_title} . Podes ler o comentario nesta páxina:"
           email_outro: Recibiches esta notificación porque estás seguindo "%{resource_title}" ou o seu autor. Podes deixar de seguir desde a ligazón anterior.
           email_subject: Hai un novo comentario de %{author_name} en %{resource_title}
-          notification_title: Hai un novo comentario de <a href="%{author_path}">%{author_name} %{author_nickname}</a> en <a href="%{resource_path}">%{resource_title}</a>
         reply_created:
           email_intro: "%{author_name} respondeu o teu comentario en %{resource_title}. Podes lelo nesta páxina:"
           email_outro: Recibiches esta notificación porque o teu comentario foi respondido.
           email_subject: "%{author_name} respondeu o teu comentario en %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> respondeu o seu comentario en <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Foi mencionado
           email_outro: Recibiches esta notificación porque foi mencionado en %{resource_title}.
           email_subject: Foi mencionado en %{resource_title}
-          notification_title: Foi mencionado en <a href="%{resource_path}">%{resource_title}</a> por <a href="%{author_path}">%{author_name} %{author_nickname}</a>
diff --git a/decidim-comments/config/locales/hu.yml b/decidim-comments/config/locales/hu.yml
index 53184bc357bbc..b1c86df2eb59b 100644
--- a/decidim-comments/config/locales/hu.yml
+++ b/decidim-comments/config/locales/hu.yml
@@ -120,12 +120,10 @@ hu:
           email_intro: "%{author_name} megjegyzést hagyott itt: %{resource_title}. Ezen az oldalon megtalálod:"
           email_outro: 'Ezt az értesítést azért kaptad, mert ezt követed: "%{author_name}". Leiratkozás az előző link segítségével.'
           email_subject: '%{author_name} új megjegyzése itt: %{resource_title}'
-          notification_title: 'Új megjegyzés: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <a href="%{resource_path}">%{resource_title}</a>.'
         comment_created:
           email_intro: "A \"%{resource_title}\" témához megjegyzést fűzött valaki. Itt tudod elolvasni:"
           email_outro: 'Ezt az értesítést azért kaptad, mert ezt (vagy ennek szerzőjét) követed: "%{resource_title}". Ha szeretnél, a link segítségével leiratkozhatsz.'
           email_subject: 'Új megjegyzés érkezett ehhez: %{resource_title}, tőle: %{author_name}'
-          notification_title: 'Új megjegyzés tőle: <a href="%{author_path}">%{author_name} %{author_nickname}</a>, ehhez: <a href="%{resource_path}">%{resource_title}</a>'
         comment_downvoted:
           email_intro: A hozzászólásod itt %{resource_title} leszavazásra került. Most %{upvotes} szavazat van mellette és %{downvotes} ellene.
           email_outro: Ezt az értesítést kaptad, mert te vagy a hozzászólás szerzője.
@@ -140,12 +138,10 @@ hu:
           email_intro: "%{author_name} megjegyzést fűzött ehhez: %{resource_title}. Ezen az oldalon megtalálod:"
           email_outro: Ezt az értesítést azért kaptad, mert valaki választolt a mejegyzésedre.
           email_subject: "%{author_name} megjegyzést tett a kommentedhez itt: %{resource_title}"
-          notification_title: '<a href="%{author_path}">%{author_name} %{author_nickname}</a> válaszolt a megjegyzésedre itt: <a href="%{resource_path}">%{resource_title}</a>'
         user_mentioned:
           email_intro: Valaki említette a neved
           email_outro: Ezt az értesítést azért kaptad, mert korábban megemlítettek a(z) "%{resource_title}" témában.
           email_subject: Megemlítettek a(z) %{resource_title} témában
-          notification_title: '<a href="%{author_path}">%{author_name} %{author_nickname}</a> megemlített itt: <a href="%{resource_path}">%{resource_title}</a>'
   errors:
     messages:
       cannot_have_comments: nem adhat hozzá hozzászólásokat
diff --git a/decidim-comments/config/locales/id-ID.yml b/decidim-comments/config/locales/id-ID.yml
index b35bbcea8c149..d73359f9d99a5 100644
--- a/decidim-comments/config/locales/id-ID.yml
+++ b/decidim-comments/config/locales/id-ID.yml
@@ -63,19 +63,15 @@ id:
           email_intro: "%{author_name} telah menulis komentar dalam %{resource_title}. Anda dapat membacanya di halaman ini:"
           email_outro: Anda telah menerima pemberitahuan ini karena Anda mengikuti %{author_name}. Anda dapat berhenti mengikuti pengguna ini dari halaman profil mereka.
           email_subject: Ada komentar baru dengan %{author_name} in %{resource_title}
-          notification_title: Ada komentar baru oleh <a href="%{author_path}">%{author_name} %{author_nickname}</a> di <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} telah dikomentari. Anda dapat membaca komentar di halaman ini:"
           email_outro: Anda telah menerima pemberitahuan ini karena Anda mengikuti "%{resource_title}" atau penulisnya. Anda dapat berhenti mengikutinya dari tautan sebelumnya.
           email_subject: Ada komentar baru dari %{author_name} in %{resource_title}
-          notification_title: Ada komentar baru dari <a href="%{author_path}">%{author_name} %{author_nickname}</a> di <a href="%{resource_path}">%{resource_title}</a>
         reply_created:
           email_intro: "%{author_name} telah membalas komentar Anda dalam %{resource_title}. Anda dapat membacanya di halaman ini:"
           email_outro: Anda telah menerima pemberitahuan ini karena komentar Anda dijawab.
           email_subject: "%{author_name} telah membalas komentar Anda dalam %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> telah menjawab komentar Anda di <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Anda telah disebutkan
           email_outro: Anda telah menerima pemberitahuan ini karena Anda telah disebutkan dalam %{resource_title}.
           email_subject: Anda telah disebutkan dalam %{resource_title}
-          notification_title: Anda telah disebutkan dalam <a href="%{resource_path}">%{resource_title}</a> oleh <a href="%{author_path}">%{author_name} %{author_nickname}</a>
diff --git a/decidim-comments/config/locales/is-IS.yml b/decidim-comments/config/locales/is-IS.yml
index c5fe3702d91a8..8226c8af09682 100644
--- a/decidim-comments/config/locales/is-IS.yml
+++ b/decidim-comments/config/locales/is-IS.yml
@@ -41,19 +41,15 @@ is:
           email_intro: "%{author_name} hefur skilið eftir athugasemd í %{resource_title}. Þú getur lesið það á þessari síðu:"
           email_outro: Þú hefur fengið þessa tilkynningu vegna þess að þú fylgist með %{author_name}. Þú getur sleppt þessari notanda frá prófílssíðunni sinni.
           email_subject: Það er nýtt ummæli um %{author_name} í %{resource_title}
-          notification_title: Það er nýtt ummæli við <a href="%{author_path}">%{author_name} %{author_nickname}</a> í <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} hefur verið skrifað ummæli. Þú getur lesið athugasemdina á þessari síðu:"
           email_outro: Þú hefur fengið þessa tilkynningu vegna þess að þú fylgist með "%{resource_title}" eða höfundinum. Þú getur sleppt því frá fyrri tengilinn.
           email_subject: Það er nýtt ummæli frá %{author_name} í %{resource_title}
-          notification_title: Það er nýtt ummæli frá <a href="%{author_path}">%{author_name} %{author_nickname}</a> í <a href="%{resource_path}">%{resource_title}</a>
         reply_created:
           email_intro: "%{author_name} hefur svarað ummæli þín í %{resource_title}. Þú getur lesið það á þessari síðu:"
           email_outro: Þú hefur fengið þessa tilkynningu vegna þess að ummæli þín voru svarað.
           email_subject: "%{author_name} hefur svarað ummæli þín í %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> hefur svarað athugasemd þinni í <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Þú hefur verið nefndur
           email_outro: Þú hefur fengið þessa tilkynningu vegna þess að þú hefur verið nefndur í %{resource_title}.
           email_subject: Þú hefur verið nefndur í %{resource_title}
-          notification_title: Þú hefur verið nefndur í <a href="%{resource_path}">%{resource_title}</a> af <a href="%{author_path}">%{author_name} %{author_nickname}</a>
diff --git a/decidim-comments/config/locales/it.yml b/decidim-comments/config/locales/it.yml
index da5e388dd0cae..9e6b2bd99fef5 100644
--- a/decidim-comments/config/locales/it.yml
+++ b/decidim-comments/config/locales/it.yml
@@ -109,12 +109,10 @@ it:
           email_intro: "%{author_name} ha lasciato un commento in %{resource_title}. Puoi leggerlo in questa pagina:"
           email_outro: Hai ricevuto questa notifica perché stai seguendo %{author_name}. Puoi smettere di seguire questo utente dalla pagina del profilo.
           email_subject: C'è un nuovo commento di %{author_name} in %{resource_title}
-          notification_title: C'è un nuovo commento di <a href="%{author_path}">%{author_name} %{author_nickname}</a> in <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} è stato commentato. Puoi leggere il commento in questa pagina:"
           email_outro: Hai ricevuto questa notifica perché stai seguendo "%{resource_title}" o il suo autore. Puoi smettere di seguirlo dal link precedente.
           email_subject: C'è un nuovo commento da %{author_name} in %{resource_title}
-          notification_title: C'è un nuovo commento da <a href="%{author_path}">%{author_name} %{author_nickname}</a> in <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Il tuo commento in "%{resource_title}" ha ricevuto un voto negativo. Ora ha un totale di %{upvotes} voti positivi e %{downvotes} voti negativi.
           email_outro: Hai ricevuto questa notifica perché sei l'autore di questo commento.
@@ -129,9 +127,7 @@ it:
           email_intro: "%{author_name} ha risposto il tuo commento in %{resource_title}. Puoi leggerlo in questa pagina:"
           email_outro: Hai ricevuto questa notifica perché il tuo commento è stato risposto.
           email_subject: "%{author_name} ha risposto il tuo commento in %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha risposto il tuo commento in <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Sei stato menzionato
           email_outro: Hai ricevuto questa notifica perché sei stato citato in %{resource_title}.
           email_subject: Sei stato menzionato in %{resource_title}
-          notification_title: Sei stato citato in <a href="%{resource_path}">%{resource_title}</a> di <a href="%{author_path}">%{author_name} %{author_nickname}</a>
diff --git a/decidim-comments/config/locales/ja.yml b/decidim-comments/config/locales/ja.yml
index cd756fe4b7909..f33b4314274f7 100644
--- a/decidim-comments/config/locales/ja.yml
+++ b/decidim-comments/config/locales/ja.yml
@@ -158,12 +158,12 @@ ja:
           email_intro: "%{author_name} は %{resource_title}にコメントを残しました。このページで読むことができます:"
           email_outro: '%{author_name}をフォローしているため、この通知を受け取りました。プロフィールページからこのユーザーのフォローを解除することができます。'
           email_subject: '%{author_name} から %{resource_title} に対して新しいコメントがあります'
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> より <a href="%{resource_path}">%{resource_title} に対して新しいコメントがあります</a>.
+          notification_title: <a href="%{author_path}">%{author_name}</a> が<a href="%{resource_path}">%{resource_title}</a> にコメントしました。
         comment_created:
           email_intro: "%{resource_title} にコメントがありました。このページでコメントを読むことができます："
           email_outro: '"%{resource_title}" 、またはその参加者をフォローしているためこの通知を受け取りました。前のリンクからフォローを解除することができます。'
           email_subject: '%{author_name} から %{resource_title} に対して新しいコメントがあります'
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> から <a href="%{resource_path}">%{resource_title} に対して新しいコメントがあります</a>
+          notification_title: <a href="%{author_path}">%{author_name}</a> が<a href="%{resource_path}">%{resource_title}</a> にコメントしました
         comment_downvoted:
           email_intro: '"%{resource_title}" でのあなたの意見への反対票がありました。現在の合計は、賛成票が %{upvotes} 件、反対票が %{downvotes} 件です。'
           email_outro: このコメントの作成者であるため、この通知を受け取りました。
@@ -178,12 +178,12 @@ ja:
           email_intro: "%{author_name} は %{resource_title}であなたのコメントを返信しました。このページで読むことができます:"
           email_outro: コメントが返信されたため、この通知を受信しました。
           email_subject: "%{author_name} が %{resource_title} であなたのコメントに返信しました"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> が <a href="%{resource_path}">%{resource_title}</a> であなたのコメントに返信しました
+          notification_title: <a href="%{author_path}">%{author_name}</a> が<a href="%{resource_path}">%{resource_title}</a> でのあなたのコメントに返答しました
         user_mentioned:
           email_intro: あなたはメンションされています
           email_outro: あなたが %{resource_title}でメンションされたため、この通知を受け取りました。
           email_subject: あなたは %{resource_title} でメンションされました
-          notification_title: あなたは <a href="%{resource_path}">%{resource_title}</a> で <a href="%{author_path}">%{author_name} %{author_nickname}によってメンションされました</a>
+          notification_title: <a href="%{author_path}">%{author_name}</a> が<a href="%{resource_path}">%{resource_title}</a> でのコメントであなたに言及しました
   errors:
     messages:
       cannot_have_comments: コメントを持つことはできません
diff --git a/decidim-comments/config/locales/lb.yml b/decidim-comments/config/locales/lb.yml
index 392f2beb05fc1..e7b20246d4156 100644
--- a/decidim-comments/config/locales/lb.yml
+++ b/decidim-comments/config/locales/lb.yml
@@ -101,12 +101,10 @@ lb:
           email_intro: "%{author_name} hat einen Kommentar zu %{resource_title} hinterlassen. Sie können diesen auf dieser Seite lesen:"
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie %{author_name} folgen. Falls Sie keine solchen Benachrichtigungen mehr erhalten möchten, besuchen Sie die Profil-Seite dieses Benutzers.
           email_subject: Neuer Kommentar von %{author_name} zu %{resource_title}
-          notification_title: Es gibt einen neuen Kommentar von <a href="%{author_path}">%{author_name} %{author_nickname}</a> zu <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} wurde kommentiert. Sie können den Kommentar auf dieser Seite lesen:"
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie "%{resource_title}" oder seinem Autor folgen. Falls Sie keine solchen Benachrichtigungen mehr erhalten möchten, besuchen Sie den obigen Link.
           email_subject: Neuer Kommentar von %{author_name} zu %{resource_title}
-          notification_title: Es gibt einen neuen Kommentar von <a href="%{author_path}">%{author_name} %{author_nickname}</a> zu <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Ihr Kommentar in "%{resource_title}" wurde negativ bewertet. Er hat nun insgesamt %{upvotes} positive und %{downvotes} negative Stimmen.
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie der Autor des Vorschlags sind.
@@ -121,9 +119,7 @@ lb:
           email_intro: "%{author_name} hat auf Ihren Kommentar zu %{resource_title} geantwortet. Sie können das auf dieser Seite lesen:"
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Ihr Kommentar beantwortet wurde.
           email_subject: "%{author_name} hat auf Ihren Kommentar zu %{resource_title} geantwortet"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> hat auf Ihren Kommentar in <a href="%{resource_path}">%{resource_title}</a> geantwortet
         user_mentioned:
           email_intro: Sie wurden erwähnt
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie in %{resource_title} erwähnt wurden.
           email_subject: Sie wurden in %{resource_title} erwähnt
-          notification_title: Sie wurden in <a href="%{resource_path}">%{resource_title}</a> von <a href="%{author_path}">%{author_name} %{author_nickname}</a> erwähnt
diff --git a/decidim-comments/config/locales/lt.yml b/decidim-comments/config/locales/lt.yml
index 005741749ad0a..9e8958cb8fd90 100644
--- a/decidim-comments/config/locales/lt.yml
+++ b/decidim-comments/config/locales/lt.yml
@@ -131,12 +131,10 @@ lt:
           email_intro: "%{author_name} pakomentavo %{resource_title}. Komentarą galite perskaityti:"
           email_outro: Gavote šį pranešimą nes sekate %{author_name}. Galite pasirinkti nebesekti šio naudotojo jo profilio puslapyje.
           email_subject: Naujas komentaras %{resource_title} iš %{author_name}
-          notification_title: Naujas komentaras <a href="%{resource_path}">%{resource_title}</a> iš <a href="%{author_path}">%{author_name}%{author_nickname}</a>.
         comment_created:
           email_intro: "%{resource_title} pateiktas komentaras. Komentarą galite perskaityti šiame puslapyje:"
           email_outro: Šį pranešimą gavote dėl to, kad sekate „%{resource_title}“ arba jo autorių. Jūs galite jo nebesekti spustelėdami aukščiau esančią nuorodą.
           email_subject: '%{author_name} paliko naują komentarą %{resource_title}'
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> paliko naują komentarą <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Jūsų komentaras %{resource_title} buvo nepakaikyas. Komentaras dabar turi %{upvotes} palaikymus ir %{downvotes} nepalaikymus.
           email_outro: Šį pranešimą gavote dėl to, kad esate pasiūlymo autorius.
@@ -151,12 +149,10 @@ lt:
           email_intro: "%{author_name} atsakė į komentarą %{resource_title}. Galite jį perskaityti:"
           email_outro: Gavote šį pranešimą nes į Jūsų komentarą buvo atsakyta.
           email_subject: "%{author_name} atsakė į komentarą %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name}%{author_nickname}</a> atsakė į komentarą <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Buvote paminėta(-s)
           email_outro: Gavote šį pranešimą nes buvote paminėta(-s) %{resource_title}.
           email_subject: Buvote paminėta(-s) %{resource_title}
-          notification_title: Buvote paminėta(-s) <a href="%{resource_path}"> %{resource_title}</a><a href="%{author_path}">%{author_name}%{author_nickname}</a>
   errors:
     messages:
       cannot_have_comments: negali turėti komentarų
diff --git a/decidim-comments/config/locales/lv.yml b/decidim-comments/config/locales/lv.yml
index 6d84a2784b68c..fde112fc1cda8 100644
--- a/decidim-comments/config/locales/lv.yml
+++ b/decidim-comments/config/locales/lv.yml
@@ -69,19 +69,15 @@ lv:
           email_intro: "%{author_name} ir atstājis komentāru %{resource_title}. Jūs to varat izlasīt šajā lapā:"
           email_outro: Jūs saņēmāt šo paziņojumu, jo sekojat %{author_name}. Jūs varat atsekot šim lietotājam viņa profila lapā.
           email_subject: '%{resource_title} ir jauns%{author_name} komentārs'
-          notification_title: <a href="%{author_path}">%{author_name}%{author_nickname}</a> ir jauns komentārs <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} ir komentēts. Jūs varat izlasīt komentāru šajā lapā:"
           email_outro: Jūs saņēmāt šo paziņojumu, jo sekojat "%{resource_title}" vai tā autoram. Jūs varat atsekot tam no iepriekšējās saites.
           email_subject: '%{resource_title} ir jauns %{author_name} komentārs'
-          notification_title: <a href="%{author_path}">%{author_name}%{author_nickname}</a> ir jauns komentārs <a href="%{resource_path}">%{resource_title}</a>
         reply_created:
           email_intro: "%{author_name} atbildēja uz jūsu komentāru %{resource_title}. Jūs to varat izlasīt šajā lapā:"
           email_outro: Jūs saņēmāt šo paziņojumu, jo kāds atbildēja uz jūsu komentāru.
           email_subject: "%{author_name} atbildēja uz jūsu komentāru %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> atbildēja uz jūsu komentāru <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Jūs esat pieminēts
           email_outro: Jūs saņēmāt šo paziņojumu, jo esat pieminēts %{resource_title}.
           email_subject: Jūs esat pieminēts %{resource_title}
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> jūs pieminēja <a href="%{author_path}">%{author_name} %{author_nickname}</a>
diff --git a/decidim-comments/config/locales/nl.yml b/decidim-comments/config/locales/nl.yml
index e2d1d916e6cb6..19446a09b9cdb 100644
--- a/decidim-comments/config/locales/nl.yml
+++ b/decidim-comments/config/locales/nl.yml
@@ -110,12 +110,10 @@ nl:
           email_intro: "%{author_name} heeft een reactie achtergelaten in %{resource_title}. Je kan het lezen op deze pagina:"
           email_outro: Je hebt deze melding ontvangen omdat je %{author_name}volgt. Je kan deze gebruiker ontvolgen via zijn profielpagina.
           email_subject: Er is een nieuwe reactie van %{author_name} in %{resource_title}
-          notification_title: Er is een nieuwe reactie van <a href="%{author_path}">%{author_name} %{author_nickname}</a> in <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} heeft een reactie ontvangen. Je kan de opmerking op deze pagina lezen:"
           email_outro: Je hebt deze melding ontvangen omdat je '%{resource_title}' of de auteur ervan volgt. Ontvolgen kan door te klikken op de vorige link.
           email_subject: Er is een nieuwe reactie van %{author_name} in %{resource_title}
-          notification_title: Er is een nieuwe reactie van <a href="%{author_path}">%{author_name} %{author_nickname}</a> in <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Je reactie in "%{resource_title}" kreeg een tegenstem. Het heeft nu een totaal van %{upvotes} stemmen 'voor' en %{downvotes} stemmen 'tegen'.
           email_outro: Je hebt deze melding ontvangen omdat je de auteur bent van deze reactie.
@@ -130,9 +128,7 @@ nl:
           email_intro: "%{author_name} heeft gereageerd op jouw opmerking in %{resource_title}. Lees het via deze link:"
           email_outro: Je hebt deze melding ontvangen omdat je reactie beantwoord is.
           email_subject: "%{author_name} heeft op je comment gereageerd in %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> heeft gereageerd op je opmerking in <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Iemand heeft je getagd
           email_outro: Je hebt deze melding ontvangen omdat je bent getagd in %{resource_title}.
           email_subject: Je bent getagd in %{resource_title}
-          notification_title: Je bent getagd in <a href="%{resource_path}">%{resource_title}</a> door <a href="%{author_path}">%{author_name} %{author_nickname}</a>
diff --git a/decidim-comments/config/locales/no.yml b/decidim-comments/config/locales/no.yml
index 141047a49485b..98f455b3d04f6 100644
--- a/decidim-comments/config/locales/no.yml
+++ b/decidim-comments/config/locales/no.yml
@@ -108,12 +108,10 @@
           email_intro: "%{author_name} har lagt igjen en kommentar i %{resource_title}. Du kan lese den på denne siden:"
           email_outro: Du har mottatt denne varslingen fordi du følger %{author_name}. Du kan slutte å følge denne brukeren fra dems profil side.
           email_subject: Det er en ny kommentar av %{author_name} i %{resource_title}
-          notification_title: Det er en ny kommentar av <a href="%{author_path}">%{author_name} %{author_nickname}</a> i <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} har blitt kommentert. Du kan lese kommentaren på denne siden:"
           email_outro: Du har mottatt denne varslingen fordi du følger "%{resource_title}" eller dens forfatter. Du kan slutte å følge den fra den forrige lenken.
           email_subject: Det er en ny kommentar fra %{author_name} i %{resource_title}
-          notification_title: Det er en ny kommentar fra <a href="%{author_path}">%{author_name} %{author_nickname}</a> i <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Din kommentar i "%{resource_title}" har blitt stemt ned. Den har nå totalt %{upvotes} stemmer opp og %{downvotes} stemmer ned.
           email_outro: Du har mottatt dette varselet fordi du er forfatteren av denne kommentaren.
@@ -128,9 +126,7 @@
           email_intro: "%{author_name} har svart kommentaren din i %{resource_title}. Du kan lese den på denne siden:"
           email_outro: Du har mottatt denne varslingen fordi din kommentar er besvart.
           email_subject: "%{author_name} har svart kommentaren din i %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> har svart kommentaren din i <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Du har blitt nevnt
           email_outro: Du har mottatt denne varslingen fordi du er nevnt i %{resource_title}.
           email_subject: Du har blitt nevnt i %{resource_title}
-          notification_title: Du har blitt nevnt i <a href="%{resource_path}">%{resource_title}</a> av <a href="%{author_path}">%{author_name} %{author_nickname}</a>
diff --git a/decidim-comments/config/locales/pl.yml b/decidim-comments/config/locales/pl.yml
index ffd3b2c454fb5..9e4aaf2ee5be3 100644
--- a/decidim-comments/config/locales/pl.yml
+++ b/decidim-comments/config/locales/pl.yml
@@ -134,12 +134,10 @@ pl:
           email_intro: "%{author_name} dodał(a) komentarz do %{resource_title}. Możesz przeczytać go na tej stronie:"
           email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz %{author_name}. Możesz usunąć użytkownika z obserwowanych na jego stronie profilowej.
           email_subject: Jest nowy komentarz dodany przez %{author_name} do %{resource_title}
-          notification_title: Pojawił się nowy komentarz dodany przez <a href="%{author_path}">%{author_name} %{author_nickname}</a> do <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "Nowy komentarz: %{resource_title}. Możesz go przeczytać na tej stronie:"
           email_outro: Otrzymujesz to powiadomienie, ponieważ obserwujesz "%{resource_title}" lub jego autora. Możesz przestać go obserwować po kliknięciu w poprzedni link.
           email_subject: Jest nowy komentarz od %{author_name} do %{resource_title}
-          notification_title: Pojawił się nowy komentarz <a href="%{author_path}">%{author_name} %{author_nickname}</a> do <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Twój komentarz do "%{resource_title}" dostał głos przeciw. Teraz ma %{upvotes} głosów za i %{downvotes} głosów przeciw.
           email_outro: Otrzymałeś to powiadomienie, ponieważ jesteś autorem komentarza.
@@ -154,12 +152,10 @@ pl:
           email_intro: "%{author_name} odpowiedział na Twój komentarz do %{resource_title}. Możesz przeczytać go na tej stronie:"
           email_outro: Otrzymałeś to powiadomienie, ponieważ odpowiedziano na Twój komentarz.
           email_subject: "%{author_name} odpowiedział(a) na Twój komentarz do %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> odpowiedział(a) na Twój komentarz do <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Wspomniano o Tobie
           email_outro: Otrzymałeś to powiadomienie, ponieważ wspomniano o Tobie w %{resource_title}.
           email_subject: Wspomniano o Tobie w %{resource_title}
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> wspomniał(a) o Tobie w <a href="%{resource_path}">%{resource_title}</a>
   errors:
     messages:
       cannot_have_comments: nie może mieć komentarzy
diff --git a/decidim-comments/config/locales/pt-BR.yml b/decidim-comments/config/locales/pt-BR.yml
index a9853f9b2495b..a23e8ffbbf47e 100644
--- a/decidim-comments/config/locales/pt-BR.yml
+++ b/decidim-comments/config/locales/pt-BR.yml
@@ -166,12 +166,10 @@ pt-BR:
           email_intro: "%{author_name} deixou um comentário em %{resource_title}. Você pode lê-lo nesta página:"
           email_outro: Você recebeu esta notificação porque está seguindo %{author_name}. Você pode deixar de seguir esse usuário em sua página de perfil.
           email_subject: Há um novo comentário por %{author_name} em %{resource_title}
-          notification_title: Há um novo comentário por <a href="%{author_path}">%{author_name} %{author_nickname}</a> em <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} foi comentado. Você pode ler o comentário nesta página:"
           email_outro: Você recebeu esta notificação porque você está seguindo "%{resource_title}" ou seu autor. Você pode ignorá-lo do link anterior.
           email_subject: Há um novo comentário de %{author_name} em %{resource_title}
-          notification_title: Há um novo comentário de <a href="%{author_path}">%{author_name} %{author_nickname}</a> em <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Seu comentário em%{resource_title}" foi negado. Agora tem um total de %{upvotes} votos positivos e %{downvotes} votos negativos.
           email_outro: Você recebeu esta notificação porque é o autor deste comentário.
@@ -186,12 +184,10 @@ pt-BR:
           email_intro: "%{author_name} respondeu seu comentário em %{resource_title}. Você pode lê-lo nesta página:"
           email_outro: Você recebeu esta notificação porque o seu comentário foi respondido.
           email_subject: "%{author_name} respondeu seu comentário em %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> respondeu seu comentário em <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Você foi mencionado
           email_outro: Você recebeu esta notificação porque você foi mencionado em %{resource_title}.
           email_subject: Você foi mencionado em %{resource_title}
-          notification_title: Você foi mencionado em <a href="%{resource_path}">%{resource_title}</a> por <a href="%{author_path}">%{author_name} %{author_nickname}</a>
   errors:
     messages:
       cannot_have_comments: não pode ter comentários
diff --git a/decidim-comments/config/locales/pt.yml b/decidim-comments/config/locales/pt.yml
index 1ea9bbef8f17f..5541416c12964 100644
--- a/decidim-comments/config/locales/pt.yml
+++ b/decidim-comments/config/locales/pt.yml
@@ -108,12 +108,10 @@ pt:
           email_intro: "%{author_name} deixou um comentário em %{resource_title}. Pode lê-lo nesta página:"
           email_outro: Recebeu esta notificação porque segue %{author_name}. pode deixar de seguir este utilizador a partir da respetiva página de perfil.
           email_subject: Há um novo comentário por %{author_name} em %{resource_title}
-          notification_title: Há um novo comentário por <a href="%{author_path}">%{author_name} %{author_nickname}</a> em <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} foi comentado. Você pode ler o comentário nesta página:"
           email_outro: Recebeu esta notificação porque segue "%{resource_title}" ou o seu autor. Pode deixar de segui-lo a partir da ligação anterior.
           email_subject: Há um novo comentário de %{author_name} em %{resource_title}
-          notification_title: Há um novo comentário de <a href="%{author_path}">%{author_name} %{author_nickname}</a> em <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: O seu comentário em "%{resource_title}” foi desvalorizado. Tem agora um total de %{upvotes} valorizações e %{downvotes} desvalorizações.
           email_outro: Recebeu esta notificação porque é o autor deste comentário.
@@ -128,9 +126,7 @@ pt:
           email_intro: "%{author_name} respondeu ao seu comentário em %{resource_title}. Pode lê-lo nesta página:"
           email_outro: Recebeu esta notificação porque responderam ao seu comentário.
           email_subject: "%{author_name} respondeu ao seu comentário em %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> respondeu ao seu comentário em <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Foi mencionado(a)
           email_outro: Recebeu esta notificação porque foi mencionado(a) em %{resource_title}.
           email_subject: Foi mencionado(a) em %{resource_title}
-          notification_title: Você foi mencionado em <a href="%{resource_path}">%{resource_title}</a> por <a href="%{author_path}">%{author_name} %{author_nickname}</a>
diff --git a/decidim-comments/config/locales/ro-RO.yml b/decidim-comments/config/locales/ro-RO.yml
index fe554b523ab3b..de053d3bf306e 100644
--- a/decidim-comments/config/locales/ro-RO.yml
+++ b/decidim-comments/config/locales/ro-RO.yml
@@ -174,12 +174,10 @@ ro:
           email_intro: "%{author_name} a lăsat un comentariu în %{resource_title}. Îl puteți citi pe această pagină:"
           email_outro: Ați primit această notificare deoarece urmăriți activitatea lui %{author_name}. Puteți să nu urmăriți acest utilizator de pe pagina lui de profil.
           email_subject: Există un nou comentariu de la %{author_name} pentru %{resource_title}
-          notification_title: Există un comentariu nou de la <a href="%{author_path}">%{author_name} %{author_nickname}</a> pentru <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} a primit un comentariu. Poți citi comentariul pe această pagină:"
           email_outro: Ați primit această notificare deoarece urmăriți „%{resource_title}” sau pe autorii săi. Puteți anula abonarea de la link-ul anterior.
           email_subject: Există un comentariu nou de la %{author_name} pentru %{resource_title}
-          notification_title: Există un comentariu nou de la <a href="%{author_path}">%{author_name} %{author_nickname}</a> pentru <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Comentariul dumneavoastră pentru "%{resource_title}" a primit un vot nefavorabil. Acesta are acum un total de %{upvotes} voturi favorabile și %{downvotes} voturi nefavorabile.
           email_outro: Ați primit această notificare deoarece sunteți autorul acestui comentariu.
@@ -194,12 +192,10 @@ ro:
           email_intro: "%{author_name} a răspuns la comentariul dumneavoastră pentru %{resource_title}. Îl poți citi în această pagină:"
           email_outro: Ați primit această notificare deoarece comentariul dumneavoastră a fost răspuns.
           email_subject: "%{author_name} a răspuns la comentariul dumneavoastră pentru %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> a răspuns la comentariul dumneavoastră pentru <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Ați fost menționat(ă)
           email_outro: Ați primit această notificare deoarece ați fost menționat(ă) în %{resource_title}.
           email_subject: Ați fost menționat(ă) în %{resource_title}
-          notification_title: Ați fost menționat(ă) în <a href="%{resource_path}">%{resource_title}</a> de către <a href="%{author_path}">%{author_name} %{author_nickname}</a>
   errors:
     messages:
       cannot_have_comments: nu poate avea comentarii
diff --git a/decidim-comments/config/locales/ru.yml b/decidim-comments/config/locales/ru.yml
index 1df6b707d2032..18e7a32da63c6 100644
--- a/decidim-comments/config/locales/ru.yml
+++ b/decidim-comments/config/locales/ru.yml
@@ -69,19 +69,15 @@ ru:
           email_intro: "%{author_name} оставил комментарий в %{resource_title}. Вы можете прочитать его на странице:"
           email_outro: Вы получили это уведомление, потому что вы следите за %{author_name}. Вы можете отписаться от таких уведомлений, перейдя на страницу профиля этого участника.
           email_subject: В %{resource_title} появился новый комментарий от %{author_name}
-          notification_title: В <a href="%{resource_path}">%{resource_title}</a> появился новый комментарий от <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         comment_created:
           email_intro: "%{resource_title} прокомментировали. Вы можете прочитать комментарий на странице:"
           email_outro: Вы получили это уведомление, потому что вы следите за «%{resource_title}». Вы можете перестать за ним следить, перейдя по приведенной выше ссылке.
           email_subject: В %{resource_title} появился новый комментарий от %{author_name}
-          notification_title: В <a href="%{resource_path}">%{resource_title}</a> появился новый комментарий от <a href="%{author_path}">%{author_name} %{author_nickname}</a>
         reply_created:
           email_intro: "%{author_name} ответил на ваш комментарий в %{resource_title}. Вы можете прочитать его на странице:"
           email_outro: Вы получили это уведомление, потому что на ваш комментарий был дан ответ.
           email_subject: "%{author_name} ответил на ваш комментарий в %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ответил на ваш комментарий в <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Вы были упомянуты
           email_outro: Вы получили это уведомление, потому что вы были упомянуты в %{resource_title}.
           email_subject: Вы были упомянуты в %{resource_title}
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> упомянул вас в <a href="%{resource_path}">%{resource_title}</a>
diff --git a/decidim-comments/config/locales/sk.yml b/decidim-comments/config/locales/sk.yml
index 4743f6531fa1c..1cb3212e7a7ac 100644
--- a/decidim-comments/config/locales/sk.yml
+++ b/decidim-comments/config/locales/sk.yml
@@ -182,12 +182,10 @@ sk:
           email_intro: "%{author_name} komentoval na %{resource_title}. Môžete si to prečítať na stránke:"
           email_outro: Túto notifikáciu ste dostali, pretože sledujete autora "%{author_name}". Notifikácie môžete zrušiť po kliknutí na predchádzajúci odkaz.
           email_subject: Je nový komentár od %{author_name} na %{resource_title}
-          notification_title: Je nový komentár od <a href="%{author_path}">%{author_name}%{author_nickname}</a> na <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} bol okomentovaný. Komentár si môžete prečítať na stránke:"
           email_outro: Túto notifikáciu ste dostali, pretože sledujete "%{resource_title}" alebo autora. Notifikácie môžete zrušiť po kliknutí na predchádzajúci odkaz.
           email_subject: Je nový komentár od %{author_name} na %{resource_title}
-          notification_title: Je nový komentár od <a href="%{author_path}">%{author_name}%{author_nickname}</a> na <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Váš komentár v „%{resource_title}“ získal negatívny hlas. Teraz má celkovo %{upvotes} pozitívnych hlasov a %{downvotes} negatívnych hlasov.
           email_outro: Toto upozornenie ste dostali, pretože ste autorom tohto komentára.
@@ -202,12 +200,10 @@ sk:
           email_intro: "%{author_name} odpovedal na váš komentár na %{resource_title}. Môžete si to prečítať na stránke:"
           email_outro: Túto notifikáciu ste dostali, pretože niekto odpovedal na Váš komentár.
           email_subject: "%{author_name} odpovedal na Váš komentár na %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name}%{author_nickname}</a> odpovedal na váš komentár na <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Niekto vás spomenul
           email_outro: Túto notifikáciu ste dostali, pretože ste boli spomenutí na %{resource_title}.
           email_subject: Boli ste spomenutí na %{resource_title}
-          notification_title: Boli ste spomenutí <a href="%{author_path}">%{author_name}%{author_nickname}</a> na <a href="%{resource_path}">%{resource_title}</a>
   errors:
     messages:
       cannot_have_comments: nemôže mať komentáre
diff --git a/decidim-comments/config/locales/sv.yml b/decidim-comments/config/locales/sv.yml
index 1afde3b57dfeb..4bd842908c214 100644
--- a/decidim-comments/config/locales/sv.yml
+++ b/decidim-comments/config/locales/sv.yml
@@ -166,12 +166,12 @@ sv:
           email_intro: "%{author_name} har lämnat en kommentar i %{resource_title}. Du kan läsa den på den här sidan:"
           email_outro: Du har fått den här notisen eftersom du följer %{author_name}. Du kan avfölja den här användaren från deras profilsida.
           email_subject: Det finns en ny kommentar av %{author_name} i %{resource_title}
-          notification_title: Det finns en ny kommentar av <a href="%{author_path}">%{author_name} %{author_nickname}</a> i <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: Det finns en ny kommentar av <a href="%{author_path}">%{author_name}</a> i <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} har kommenterats. Du kan läsa kommentaren på den här sidan:"
           email_outro: Du har fått det här meddelandet eftersom du följer "%{resource_title}" eller dess författare. Du kan avfölja det från föregående länk.
           email_subject: Det finns en ny kommentar från %{author_name} i %{resource_title}
-          notification_title: Det finns en ny kommentar från <a href="%{author_path}">%{author_name} %{author_nickname}</a> i <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: Det finns en ny kommentar från <a href="%{author_path}">%{author_name}</a> i <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Din kommentar i "%{resource_title}" har blivit nedröstad. Den har nu totalt %{upvotes} uppröster och %{downvotes} nedröster.
           email_outro: Du har fått det här meddelandet eftersom du är författare till denna kommentar.
@@ -186,12 +186,12 @@ sv:
           email_intro: "%{author_name} har svarat din kommentar i %{resource_title}. Du kan läsa den på den här sidan:"
           email_outro: Du har fått denna notis eftersom din kommentar blev besvarad.
           email_subject: "%{author_name} har svarat din kommentar i %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> har svarat din kommentar i <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: <a href="%{author_path}">%{author_name}</a> besvarade din kommentar i <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Du har nämnts
           email_outro: Du har fått denna notis eftersom du har nämnts i %{resource_title}.
           email_subject: Du har nämnts i %{resource_title}
-          notification_title: Du har nämnts i <a href="%{resource_path}">%{resource_title}</a> av <a href="%{author_path}">%{author_name} %{author_nickname}</a>
+          notification_title: Du har nämnts i <a href="%{resource_path}">%{resource_title}</a> av <a href="%{author_path}">%{author_name}</a>
   errors:
     messages:
       cannot_have_comments: kan inte ha kommentarer
diff --git a/decidim-comments/config/locales/tr-TR.yml b/decidim-comments/config/locales/tr-TR.yml
index e9a58de9904d6..5f0b63ef52039 100644
--- a/decidim-comments/config/locales/tr-TR.yml
+++ b/decidim-comments/config/locales/tr-TR.yml
@@ -82,19 +82,15 @@ tr:
           email_intro: "%{author_name} grubu %{resource_title} alanında bir yorum bıraktı. Bu sayfada okuyabilirsiniz:"
           email_outro: Bu bildirimi %{author_name} adlı yazarı takip ettiğiniz için aldınız. Bu grubu profil sayfasından takip etmeyi bırakabilirsiniz.
           email_subject: '%{author_name} %{resource_title} alanında yeni bir yorum yaptı'
-          notification_title: <a href="%{resource_path}">%{resource_title} </a> içinde <a href="%{author_path}">%{author_name} %{author_nickname} </a> tarafından yeni bir yorum var.
         comment_created:
           email_intro: "%{resource_title} alanında yorum yapıldı. Bu sayfadaki yorumu okuyabilirsiniz:"
           email_outro: '"%{resource_title}" alanında veya yazarı takip ettiğiniz için bu bildirimi aldınız. Bunu önceki linkten takip edebilirsiniz.'
           email_subject: '%{author_name}, %{resource_title} alanında yeni bir yorum yaptı'
-          notification_title: <a href="%{resource_path}">%{resource_title} </a> içinde <a href="%{author_path}">%{author_name} %{author_nickname} </a> tarafından yeni bir yorum var
         reply_created:
           email_intro: "%{author_name}, yorumunuzu %{resource_title} alanında yanıtladı. Bu sayfada okuyabilirsiniz:"
           email_outro: Yorumunuz yanıtlandığı için bu bildirimi aldınız.
           email_subject: "%{author_name}, yorumunuzu %{resource_title} alanında yanıtladı"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <a href="%{resource_path}">%{resource_title}</a> alanında yorumunuzu yanıtladı
         user_mentioned:
           email_intro: Sen bahsedildin
           email_outro: Bu bildirimi, sizden %{resource_title} alanında bahsedildiği için aldınız.
           email_subject: '%{resource_title} alanında bahsedildiniz'
-          notification_title: <a href="%{resource_path}">%{resource_title} </a> alanında <a href="%{author_path}">%{author_name} %{author_nickname} </a> tarafından bahsedildi
diff --git a/decidim-comments/config/locales/uk.yml b/decidim-comments/config/locales/uk.yml
index c04966696aacb..b7e8ad3cc80c2 100644
--- a/decidim-comments/config/locales/uk.yml
+++ b/decidim-comments/config/locales/uk.yml
@@ -64,19 +64,15 @@ uk:
           email_intro: "%{author_name} залишив коментар у %{resource_title}. Ви можете прочитати його на сторінці:"
           email_outro: Ви отримали це сповіщення, тому що ви стежите за %{author_name}. Ви можете припинити стежити за ним на сторінці його профілю.
           email_subject: У %{resource_title} з'явився новий коментар від %{author_name}
-          notification_title: У <a href="%{resource_path}">%{resource_title}</a> з'явився новий коментар від <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         comment_created:
           email_intro: "%{resource_title} прокоментували. Ви можете прочитати коментар на сторінці:"
           email_outro: Ви отримали це сповіщення, тому що ви стежите за "%{resource_title}". Ви можете припинити стежити за ним, перейшовши за наведеним вище посиланням.
           email_subject: У %{resource_title} з'явився новий коментар від %{author_name}
-          notification_title: У <a href="%{resource_path}">%{resource_title}</a> з'явився новий коментар від <a href="%{author_path}">%{author_name} %{author_nickname}</a>
         reply_created:
           email_intro: "%{author_name} відповів на ваш коментар у %{resource_title}. Ви можете прочитати його на сторінці:"
           email_outro: Ви отримали це сповіщення, оскільки на ваш коментар відповіли.
           email_subject: "%{author_name} відповів на ваш коментар у %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> відповів на ваш коментар у <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Вас згадали
           email_outro: Ви отримали це сповіщення, оскільки вас згадали в %{resource_title}.
           email_subject: Вас згадали у %{resource_title}
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> згадав вас у <a href="%{resource_path}">%{resource_title}</a>
diff --git a/decidim-comments/config/locales/zh-CN.yml b/decidim-comments/config/locales/zh-CN.yml
index 46135b9a3213d..f31df3c8ef66e 100644
--- a/decidim-comments/config/locales/zh-CN.yml
+++ b/decidim-comments/config/locales/zh-CN.yml
@@ -70,19 +70,15 @@ zh-CN:
           email_intro: "%{author_name} 在 %{resource_title}留下了一条评论。您可以在这个页面阅读："
           email_outro: 您收到此通知是因为您正在关注 %{author_name}。您可以从其个人资料页面取消关注此用户。
           email_subject: '%{author_name} 在 %{resource_title} 有一个新评论'
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> 在 <a href="%{resource_path}">%{resource_title}</a> 有新的评论。
         comment_created:
           email_intro: "%{resource_title} 已被评论。您可以阅读此页面中的评论："
           email_outro: 您收到此通知是因为您正在关注"%{resource_title}"或其作者。您可以从上一个链接取消关注它。
           email_subject: '%{author_name} 在 %{resource_title} 有一个新评论'
-          notification_title: 来自 <a href="%{author_path}">%{author_name} %{author_nickname}</a> 的新评论 <a href="%{resource_path}">%{resource_title}</a>
         reply_created:
           email_intro: "%{author_name} 在 %{resource_title}回复了您的评论。您可以在这个页面阅读："
           email_outro: 您收到此通知是因为您的评论已被回复。
           email_subject: "%{author_name} 在 %{resource_title} 回复了您的评论"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> 回复了您在 <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: 您已被提到。
           email_outro: 您收到此通知是因为您已在 %{resource_title} 中被提及。
           email_subject: 您已在 %{resource_title} 中被提及了
-          notification_title: 您在 <a href="%{resource_path}">%{resource_title}中提到</a> <a href="%{author_path}">%{author_name} %{author_nickname}</a>
diff --git a/decidim-comments/config/locales/zh-TW.yml b/decidim-comments/config/locales/zh-TW.yml
index 5dedceaba11aa..32834b5a6d4d6 100644
--- a/decidim-comments/config/locales/zh-TW.yml
+++ b/decidim-comments/config/locales/zh-TW.yml
@@ -114,12 +114,10 @@ zh-TW:
           email_intro: "%{author_name} 在%{resource_title} 留下了一則評論。您可以在此頁面上閱讀它:"
           email_outro: 您收到此通知是因為您正在關注%{author_name}。您可以從他們的個人資料頁面取消關注該用戶。
           email_subject: '%{author_name} 在%{resource_title} 發表了一則新的評論'
-          notification_title: 在<a href="%{resource_path}">%{resource_title}</a>中，<a href="%{author_path}">%{author_name} %{author_nickname}</a>有了一個新的評論。
         comment_created:
           email_intro: "%{resource_title} 已被評論。您可以在此頁面中閱讀評論:"
           email_outro: 您收到此通知是因為您正在關注「%{resource_title}」或其作者。您可以從上面的連結取消關注。
           email_subject: '%{resource_title}」有新的評論來自 %{author_name}'
-          notification_title: 在 <a href="%{resource_path}">%{resource_title}</a>有新的評論來自 <a href="%{author_path}">%{author_name} %{author_nickname}</a>
         comment_downvoted:
           email_intro: 您在「%{resource_title}」的評論已經倒讚。它現在的評分是 %{upvotes} 個讚和 %{downvotes} 個倒讚。
           email_outro: 您收到此通知是因為您是此評論的作者。
@@ -134,12 +132,10 @@ zh-TW:
           email_intro: "%{author_name} 已回覆你在%{resource_title} 中的評論。你可以在此頁面上閱讀:"
           email_outro: 你收到此通知是因為有人回覆了你的評論。
           email_subject: "%{author_name} 回覆了你在 %{resource_title} 中的評論。"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> 在 <a href="%{resource_path}">%{resource_title}</a> 中回覆了你的評論。
         user_mentioned:
           email_intro: 您已被提及
           email_outro: 您收到了此通知，因為您被提及在 %{resource_title} 中。
           email_subject: 您被提及在 %{resource_title} 中
-          notification_title: 您被 <a href="%{author_path}">%{author_name} %{author_nickname}</a> 在 <a href="%{resource_path}">%{resource_title}</a> 中提及。
   errors:
     messages:
       cannot_have_comments: 無法評論
diff --git a/decidim-core/config/locales/ar.yml b/decidim-core/config/locales/ar.yml
index 958045c433968..fd6ef61a2ae9d 100644
--- a/decidim-core/config/locales/ar.yml
+++ b/decidim-core/config/locales/ar.yml
@@ -544,13 +544,9 @@ ar:
           affected_user:
             email_intro: 'تم قبول التعديل لمدة %{amendable_title}. يمكنك أن ترى ذلك من هذه الصفحة:'
             email_outro: لقد تلقيت هذا الإشعار لأنك مؤلف برقم %{amendable_title}.
-            email_subject: تم قبول التعديل من %{amendable_title} من %{emendation_author_nickname}
-            notification_title: تم قبول التعديل <a href="%{emendation_path}"></a> تم إنشاؤه بواسطة <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> لمدة <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'تم قبول التعديل لمدة %{amendable_title}. يمكنك أن ترى ذلك من هذه الصفحة:'
             email_outro: لقد تلقيت هذا الإشعار لأنك تتابع %{amendable_title}. يمكنك إيقاف تلقي الإخطارات باتباع الرابط السابق.
-            email_subject: تم قبول التعديل من %{amendable_title} من %{emendation_author_nickname}
-            notification_title: تم قبول التعديل <a href="%{emendation_path}"></a> تم إنشاؤه بواسطة <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> لمدة <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'تم إنشاء تعديل جديد لـ %{amendable_title}. يمكنك أن ترى ذلك من هذه الصفحة:'
@@ -566,29 +562,20 @@ ar:
           affected_user:
             email_intro: 'تم نشر تعديل مرفوض لـ %{amendable_title} باعتباره %{amendable_type}جديد. يمكنك أن ترى ذلك من هذه الصفحة:'
             email_outro: لقد تلقيت هذا الإشعار لأنك مؤلف برقم %{amendable_title}.
-            email_subject: تم نشر تعديل من %{emendation_author_nickname} كـ %{amendable_type}جديد
-            notification_title: A <a href="%{emendation_path}">رفض التعديل</a> لل <a href="%{amendable_path}">%{amendable_title}</a> تم نشره باعتباره الجديدة %{amendable_type} من <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
           follower:
             email_intro: 'تم نشر تعديل مرفوض لـ %{amendable_title} باعتباره %{amendable_type}جديد. يمكنك أن ترى ذلك من هذه الصفحة:'
             email_outro: لقد تلقيت هذا الإشعار لأنك تتابع %{amendable_title}. يمكنك إيقاف تلقي الإخطارات باتباع الرابط السابق.
-            email_subject: تم نشر تعديل من %{emendation_author_nickname} كـ %{amendable_type}جديد
-            notification_title: A <a href="%{emendation_path}">رفض التعديل</a> لل <a href="%{amendable_path}">%{amendable_title}</a> تم نشره باعتباره الجديدة %{amendable_type} من <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'تم رفض التعديل لمدة %{amendable_title}. يمكنك أن ترى ذلك من هذه الصفحة:'
             email_outro: لقد تلقيت هذا الإشعار لأنك مؤلف برقم %{amendable_title}.
-            email_subject: تم رفض التعديل لـ %{amendable_title} من %{emendation_author_nickname}
-            notification_title: تم رفض التعديل <a href="%{emendation_path}"></a> تم إنشاؤه بواسطة <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> لـ <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'تم رفض التعديل لمدة %{amendable_title}. يمكنك أن ترى ذلك من هذه الصفحة:'
             email_outro: لقد تلقيت هذا الإشعار لأنك تتابع %{amendable_title}. يمكنك إيقاف تلقي الإخطارات باتباع الرابط السابق.
-            email_subject: تم رفض التعديل لـ %{amendable_title} من %{emendation_author_nickname}
-            notification_title: تم رفض التعديل <a href="%{emendation_path}"></a> تم إنشاؤه بواسطة <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> لـ <a href="%{amendable_path}">%{amendable_title}</a>.
         emendation_promoted:
           follower:
             email_intro: 'تم نشر تعديل لـ %{amendable_title}. يمكنك رؤيته من هذه الصفحة:'
             email_outro: لقد تلقيت هذا الإشعار لأنك مؤلف %{amendable_title}.
-            email_subject: تم نشر تعديل من قبل %{emendation_author_nickname} كـ %{amendable_type} جديد
       attachments:
         attachment_created:
           email_intro: 'تمت إضافة مستند جديد إلى %{resource_title}. يمكنك أن ترى ذلك من هذه الصفحة:'
@@ -619,16 +606,9 @@ ar:
           notification_title: |-
             قام مسؤول بإزالة %{resource_type} لأنه تم الإبلاغ عنه كـ %{report_reasons}.</br><i>%{resource_content}</i>
       users:
-        profile_updated:
-          email_intro: و <a href="%{resource_url}">صفحة الملف الشخصي</a> من %{name} (%{nickname})، الذي كنت التالية، وقد تم تحديثها.
-          email_outro: لقد تلقيت هذا الإشعار لأنك تتابع %{nickname}. يمكنك إيقاف تلقي الإخطارات باتباع الرابط السابق.
-          email_subject: "%{nickname} تحديث ملفهم الشخصي"
-          notification_title: و <a href="%{resource_path}">صفحة الملف الشخصي</a> من %{name} (%{nickname})، الذي كنت التالية، وقد تم تحديثها.
         user_officialized:
-          email_intro: تم إضفاء الطابع الرسمي على المشارك %{name} (%{nickname}).
           email_outro: تلقيت هذا الإشعار لأنك مدير في هذه المنظمة.
           email_subject: "تم إضفاء الطابع الرسمي على %{name}"
-          notification_title: تم إضفاء الطابع الرسمي على المشارك %{name} (%{nickname}).
     export_mailer:
       download_your_data_export:
         download: تحميل
diff --git a/decidim-core/config/locales/bg.yml b/decidim-core/config/locales/bg.yml
index f4d41513289a4..5d1e63e7bfe62 100644
--- a/decidim-core/config/locales/bg.yml
+++ b/decidim-core/config/locales/bg.yml
@@ -643,13 +643,9 @@ bg:
           affected_user:
             email_intro: 'Приета е поправка в %{amendable_title}. Можете да я видите на тази страница:'
             email_outro: Получавате това известие, защото сте автор на %{amendable_title}.
-            email_subject: Приета е поправка в %{amendable_title} от %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">Поправката</a> направена от <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> е приета за <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Приета е поправка в %{amendable_title}. Можете да я видите на тази страница:'
             email_outro: Получавате това известие, защото следвате %{amendable_title}. Може да прекратите известията чрез предната връзка.
-            email_subject: Приета е поправка в %{amendable_title} от %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">Поправката</a> направена от <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> е приета за <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'Нова поправка е създадена в %{amendable_title}. Можете да я видите на тази страница:'
@@ -665,24 +661,16 @@ bg:
           affected_user:
             email_intro: 'Отхвърлена поправка в %{amendable_title} е публикувана като нов %{amendable_type}. Можете да видите на тази страница:'
             email_outro: Получавате това известие, защото сте автор на %{amendable_title}.
-            email_subject: Поправка на %{emendation_author_nickname} е публикувана като нов %{amendable_type}
-            notification_title: Отхвърлената <a href="%{emendation_path}">поправка</a> в <a href="%{amendable_path}">%{amendable_title}</a> беше публикувана като нов %{amendable_type} от <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
           follower:
             email_intro: 'Отхвърлена поправка в %{amendable_title} е публикувана като нов %{amendable_type}. Можете да видите на тази страница:'
             email_outro: Получавате това известие, защото следвате %{amendable_title}. Може да прекратите известията чрез предната връзка.
-            email_subject: Поправка на %{emendation_author_nickname} е публикувана като нов %{amendable_type}
-            notification_title: Отхвърлената <a href="%{emendation_path}">поправка</a> в <a href="%{amendable_path}">%{amendable_title}</a> беше публикувана като нов %{amendable_type} от <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'Поправка е отхвърлена в %{amendable_title}. Можете да я видите на тази страница:'
             email_outro: Получавате това известие, защото сте автор на %{amendable_title}.
-            email_subject: Отхвърлена е поправка в %{amendable_title} от %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">Поправката</a> направена от <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> е отхвърлена за <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Поправка е отхвърлена в %{amendable_title}. Можете да я видите на тази страница:'
             email_outro: Получавате това известие, защото следвате %{amendable_title}. Може да прекратите известията чрез предната връзка.
-            email_subject: Отхвърлена е поправка в %{amendable_title} от %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">Поправката</a> направена от <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> е отхвърлена за <a href="%{amendable_path}">%{amendable_title}</a>.
       attachments:
         attachment_created:
           email_intro: 'Нов документ е създаден в %{resource_title}. Можете да го видите на тази страница:'
@@ -724,16 +712,9 @@ bg:
             Администратор премахна вашия %{resource_type}, защото е докладван като %{report_reasons}.</br>
             <i>%{resource_content}</i>
       users:
-        profile_updated:
-          email_intro: Профилната <a href="%{resource_url}">страница</a> на %{name} (%{nickname}), който следвате е обновена.
-          email_outro: Получавате това известие, защото следвате %{nickname}. Може да прекратите известията чрез предната връзка.
-          email_subject: "%{nickname} обнови своя профил"
-          notification_title: Профилната <a href="%{resource_path}">страница</a> на %{name} (%{nickname}), който следвате е обновена.
         user_officialized:
-          email_intro: Участник %{name} (%{nickname}) е официален.
           email_outro: Получихте това известие, защото сте администратор на организацията.
           email_subject: "%{name} е официализиран"
-          notification_title: Участник %{name} (%{nickname}) е официализиран.
     export_mailer:
       download_your_data_export:
         download: Сваляне
diff --git a/decidim-core/config/locales/ca-IT.yml b/decidim-core/config/locales/ca-IT.yml
index 2f4a09914b36c..66ac2c66cee95 100644
--- a/decidim-core/config/locales/ca-IT.yml
+++ b/decidim-core/config/locales/ca-IT.yml
@@ -881,13 +881,13 @@ ca-IT:
           affected_user:
             email_intro: 'S''ha acceptat una esmena per %{amendable_title}. Pots veure-ho des d''aquesta pàgina:'
             email_outro: Has rebut aquesta notificació perquè s'ha acceptat una esmena presentada a l'apartat "%{amendable_title}" que administres.
-            email_subject: Esmena acceptada per %{amendable_title} a %{emendation_author_nickname}
-            notification_title: L'<a href="%{emendation_path}">esmena</a> creada per <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> ha estat acceptada per <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Esmena acceptada de %{emendation_author_name} per a %{amendable_title}
+            notification_title: L'<a href="%{emendation_path}">esmena</a> creada per <a href="%{emendation_author_path}">%{emendation_author_name}</a> ha estat acceptada per <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'S''ha acceptat una esmena per %{amendable_title}. Pots veure-ho en aquesta pàgina:'
             email_outro: Has rebut aquesta notificació perquè estàs seguint l'esmena "%{amendable_title}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
-            email_subject: Esmena acceptada per %{amendable_title} de %{emendation_author_nickname}
-            notification_title: L'<a href="%{emendation_path}">esmena</a> creada per <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> ha estat acceptada per <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Esmena de %{emendation_author_name} acceptada per a %{amendable_title}
+            notification_title: L'<a href="%{emendation_path}">esmena</a> creada per <a href="%{emendation_author_path}">%{emendation_author_name}</a> ha estat acceptada per <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'S''ha creat una nova esmena per a %{amendable_title}. La pots veure des d''aquesta pàgina:'
@@ -903,29 +903,29 @@ ca-IT:
           affected_user:
             email_intro: 'Una esmena rebutjada per %{amendable_title} ha estat publicada com una nova %{amendable_type}. La pots veure des d''aquesta pàgina:'
             email_outro: Has rebut aquesta notificació perquè s'ha promogut una esmena a l'apartat "%{amendable_title}" que administres.
-            email_subject: Una nova esmena feta per %{emendation_author_nickname} s'ha publicat com a nova %{amendable_type}
-            notification_title: Una <a href="%{emendation_path}">esmena rebutjada</a> per <a href="%{amendable_path}">%{amendable_title}</a> ha estat publicada com un nou %{amendable_type} per <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
+            email_subject: Una nova esmena feta per %{emendation_author_name} s'ha publicat com a nova %{amendable_type}
+            notification_title: Una <a href="%{emendation_path}">esmena rebutjada</a> per <a href="%{amendable_path}">%{amendable_title}</a> ha estat publicada com un nou %{amendable_type} per <a href="%{emendation_author_path}">%{emendation_author_name}</a>.
           follower:
             email_intro: 'Una esmena rebutjada per %{amendable_title} ha estat publicada com una nova %{amendable_type}. Pots veure-ho des d''aquesta pàgina:'
             email_outro: Has rebut aquesta notificació perquè estàs seguint %{amendable_title}. Pots deixar de rebre notificacions seguint l'enllaç anterior.
-            email_subject: S'ha publicat una esmena feta per %{emendation_author_nickname} com a nova %{amendable_type}
-            notification_title: Una <a href="%{emendation_path}">esmena rebutjada</a> per <a href="%{amendable_path}">%{amendable_title}</a> ha estat publicada com un nou %{amendable_type} per <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
+            email_subject: S'ha publicat una esmena feta per %{emendation_author_name} com a nova %{amendable_type}
+            notification_title: Una <a href="%{emendation_path}">esmena rebutjada</a> per <a href="%{amendable_path}">%{amendable_title}</a> ha estat publicada com un nou %{amendable_type} per <a href="%{emendation_author_path}">%{emendation_author_name}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'Una esmena s''ha rebutjat per %{amendable_title}. La pots veure des d''aquesta pàgina:'
             email_outro: Has rebut aquesta notificació perquè s'ha rebutjat una esmena a l'apartat "%{amendable_title}" que administres.
-            email_subject: Esmena rebutjada per %{amendable_title} a %{emendation_author_nickname}
-            notification_title: L'<a href="%{emendation_path}">esmena</a> creada per <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> ha estat rebutjada per <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: L'esmena de %{emendation_author_name} a %{amendable_title} s'ha rebutjat
+            notification_title: S'ha rebutjat l'<a href="%{emendation_path}">esmena</a> creada per <a href="%{emendation_author_path}">%{emendation_author_name}</a> per <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'S''ha rebutjat una esmena per %{amendable_title}. La pots veure des d''aquesta pàgina:'
             email_outro: Has rebut aquesta notificació perquè estàs seguint %{amendable_title}. Pots deixar de rebre notificacions seguint l'enllaç anterior.
-            email_subject: Esmena rebutjada per %{amendable_title} a %{emendation_author_nickname}
-            notification_title: L'<a href="%{emendation_path}">esmena</a> creada per <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> ha estat rebutjada per <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: L'esmena de %{emendation_author_name} a %{amendable_title} s'ha rebutjat
+            notification_title: S'ha rebutjat l'<a href="%{emendation_path}">esmena</a> creada per <a href="%{emendation_author_path}">%{emendation_author_name}</a> per <a href="%{amendable_path}">%{amendable_title}</a>.
         emendation_promoted:
           follower:
             email_intro: 'S''ha publicat una esmena per a %{amendable_title}. La pots veure en aquesta pàgina:'
             email_outro: Has rebut aquesta notificació perquè és autora de %{amendable_title}.
-            email_subject: Una esmena de %{emendation_author_nickname} s'ha publicat com un nou %{amendable_type}
+            email_subject: Una esmena de %{emendation_author_name} s'ha publicat com un nou %{amendable_type}
       attachments:
         attachment_created:
           email_intro: 'S''ha afegit un nou document a %{resource_title}. Pots veure''l des d''aquesta pàgina:'
@@ -977,24 +977,24 @@ ca-IT:
             Una administradora ha eliminat el teu %{resource_type} degut a que has estat reportada com a %{report_reasons}..</br>
             <i>%{resource_content}</i>
       resource_liked:
-        email_intro: '%{liker_name} %{liker_nickname}, a qui segueixes, li acaba d''agradar: "%{resource_title}", que et pot resultar interessant, revisa-la i contribueix:'
-        email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{liker_nickname}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
-        email_subject: "%{liker_nickname} ha realitzat un nou \"m'agrada\""
-        notification_title: <a href="%{resource_path}">%{resource_title}</a> %{resource_type} li ha agradat a <a href="%{liker_path}">%{liker_name} %{liker_nickname}</a>.
+        email_intro: '%{liker_name}, a qui segueixes, li acaba d''agradar: "%{resource_title}", que et pot resultar interessant. Revisa-la i contribueix:'
+        email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{liker_name}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
+        email_subject: "%{liker_name} ha realitzat un nou \"m'agrada\""
+        notification_title: 'A <a href="%{liker_path}">%{liker_name}</a> li ha agradat la %{resource_type}: <a href="%{resource_path}">%{resource_title}</a>.'
       resources:
         soft_deleted:
           notification_title: 'Una administradora ha eliminado tu %{resource_type}: "%{resource_title}".'
       users:
         profile_updated:
-          email_intro: La pàgina <a href="%{resource_url}"> de perfil </a> de %{name} (%{nickname}), a qui estàs seguint, s'ha actualitzat.
-          email_outro: Has rebut aquesta notificació perquè estàs seguint a "%{nickname}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
-          email_subject: "%{nickname} ha actualitzat el seu perfil"
-          notification_title: El <a href="%{resource_path}"> perfi l</a> de %{name} (%{nickname}), a qui estàs seguint, s'ha actualitzat.
+          email_intro: La <a href="%{resource_url}">pàgina de perfil</a> de %{name}, a qui estàs seguint, s'ha actualitzat.
+          email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{name}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
+          email_subject: "En/na %{name} ha actualitzat el seu perfil"
+          notification_title: La <a href="%{resource_path}">pàgina de perfil</a> de %{name}, a qui estàs seguint, s'ha actualitzat.
         user_officialized:
-          email_intro: La participant %{name} (%{nickname}) ha estat oficialitzada.
+          email_intro: En/na participant %{name} ha estat oficialitzada.
           email_outro: Has rebut aquesta notificació perquè administres la plataforma.
           email_subject: "S'ha oficialitzat a %{name}"
-          notification_title: La participant %{name} (%{nickname}) ha estat oficialitzada.
+          notification_title: En/na participant %{name} ha estat oficialitzada.
     export_mailer:
       download_your_data_export:
         click_button_html: Clica a l'enllaç següent per a descarregar les teves dades.<br/>El fitxer estarà disponible per a la seva descàrrega fins al %{date}.
diff --git a/decidim-core/config/locales/ca.yml b/decidim-core/config/locales/ca.yml
index f8b6cd4d2f8a5..c43ed6f76e919 100644
--- a/decidim-core/config/locales/ca.yml
+++ b/decidim-core/config/locales/ca.yml
@@ -881,13 +881,13 @@ ca:
           affected_user:
             email_intro: 'S''ha acceptat una esmena per %{amendable_title}. Pots veure-ho des d''aquesta pàgina:'
             email_outro: Has rebut aquesta notificació perquè s'ha acceptat una esmena presentada a l'apartat "%{amendable_title}" que administres.
-            email_subject: Esmena acceptada per %{amendable_title} a %{emendation_author_nickname}
-            notification_title: L'<a href="%{emendation_path}">esmena</a> creada per <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> ha estat acceptada per <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Esmena acceptada de %{emendation_author_name} per a %{amendable_title}
+            notification_title: L'<a href="%{emendation_path}">esmena</a> creada per <a href="%{emendation_author_path}">%{emendation_author_name}</a> ha estat acceptada per <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'S''ha acceptat una esmena per %{amendable_title}. Pots veure-ho en aquesta pàgina:'
             email_outro: Has rebut aquesta notificació perquè estàs seguint l'esmena "%{amendable_title}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
-            email_subject: Esmena acceptada per %{amendable_title} de %{emendation_author_nickname}
-            notification_title: L'<a href="%{emendation_path}">esmena</a> creada per <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> ha estat acceptada per <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Esmena de %{emendation_author_name} acceptada per a %{amendable_title}
+            notification_title: L'<a href="%{emendation_path}">esmena</a> creada per <a href="%{emendation_author_path}">%{emendation_author_name}</a> ha estat acceptada per <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'S''ha creat una nova esmena per a %{amendable_title}. La pots veure des d''aquesta pàgina:'
@@ -903,29 +903,29 @@ ca:
           affected_user:
             email_intro: 'Una esmena rebutjada per %{amendable_title} ha estat publicada com una nova %{amendable_type}. La pots veure des d''aquesta pàgina:'
             email_outro: Has rebut aquesta notificació perquè s'ha promogut una esmena a l'apartat "%{amendable_title}" que administres.
-            email_subject: Una nova esmena feta per %{emendation_author_nickname} s'ha publicat com a nova %{amendable_type}
-            notification_title: Una <a href="%{emendation_path}">esmena rebutjada</a> per <a href="%{amendable_path}">%{amendable_title}</a> ha estat publicada com un nou %{amendable_type} per <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
+            email_subject: Una nova esmena feta per %{emendation_author_name} s'ha publicat com a nova %{amendable_type}
+            notification_title: Una <a href="%{emendation_path}">esmena rebutjada</a> per <a href="%{amendable_path}">%{amendable_title}</a> ha estat publicada com un nou %{amendable_type} per <a href="%{emendation_author_path}">%{emendation_author_name}</a>.
           follower:
             email_intro: 'Una esmena rebutjada per %{amendable_title} ha estat publicada com una nova %{amendable_type}. Pots veure-ho des d''aquesta pàgina:'
             email_outro: Has rebut aquesta notificació perquè estàs seguint %{amendable_title}. Pots deixar de rebre notificacions seguint l'enllaç anterior.
-            email_subject: S'ha publicat una esmena feta per %{emendation_author_nickname} com a nova %{amendable_type}
-            notification_title: Una <a href="%{emendation_path}">esmena rebutjada</a> per <a href="%{amendable_path}">%{amendable_title}</a> ha estat publicada com un nou %{amendable_type} per <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
+            email_subject: S'ha publicat una esmena feta per %{emendation_author_name} com a nova %{amendable_type}
+            notification_title: Una <a href="%{emendation_path}">esmena rebutjada</a> per <a href="%{amendable_path}">%{amendable_title}</a> ha estat publicada com un nou %{amendable_type} per <a href="%{emendation_author_path}">%{emendation_author_name}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'Una esmena s''ha rebutjat per %{amendable_title}. La pots veure des d''aquesta pàgina:'
             email_outro: Has rebut aquesta notificació perquè s'ha rebutjat una esmena a l'apartat "%{amendable_title}" que administres.
-            email_subject: Esmena rebutjada per %{amendable_title} a %{emendation_author_nickname}
-            notification_title: L'<a href="%{emendation_path}">esmena</a> creada per <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> ha estat rebutjada per <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: L'esmena de %{emendation_author_name} a %{amendable_title} s'ha rebutjat
+            notification_title: S'ha rebutjat l'<a href="%{emendation_path}">esmena</a> creada per <a href="%{emendation_author_path}">%{emendation_author_name}</a> per <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'S''ha rebutjat una esmena per %{amendable_title}. La pots veure des d''aquesta pàgina:'
             email_outro: Has rebut aquesta notificació perquè estàs seguint %{amendable_title}. Pots deixar de rebre notificacions seguint l'enllaç anterior.
-            email_subject: Esmena rebutjada per %{amendable_title} a %{emendation_author_nickname}
-            notification_title: L'<a href="%{emendation_path}">esmena</a> creada per <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> ha estat rebutjada per <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: L'esmena de %{emendation_author_name} a %{amendable_title} s'ha rebutjat
+            notification_title: S'ha rebutjat l'<a href="%{emendation_path}">esmena</a> creada per <a href="%{emendation_author_path}">%{emendation_author_name}</a> per <a href="%{amendable_path}">%{amendable_title}</a>.
         emendation_promoted:
           follower:
             email_intro: 'S''ha publicat una esmena per a %{amendable_title}. La pots veure en aquesta pàgina:'
             email_outro: Has rebut aquesta notificació perquè és autora de %{amendable_title}.
-            email_subject: Una esmena de %{emendation_author_nickname} s'ha publicat com un nou %{amendable_type}
+            email_subject: Una esmena de %{emendation_author_name} s'ha publicat com un nou %{amendable_type}
       attachments:
         attachment_created:
           email_intro: 'S''ha afegit un nou document a %{resource_title}. Pots veure''l des d''aquesta pàgina:'
@@ -977,24 +977,24 @@ ca:
             Una administradora ha eliminat el teu %{resource_type} degut a que has estat reportada com a %{report_reasons}..</br>
             <i>%{resource_content}</i>
       resource_liked:
-        email_intro: '%{liker_name} %{liker_nickname}, a qui segueixes, li acaba d''agradar: "%{resource_title}", que et pot resultar interessant, revisa-la i contribueix:'
-        email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{liker_nickname}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
-        email_subject: "%{liker_nickname} ha realitzat un nou \"m'agrada\""
-        notification_title: <a href="%{resource_path}">%{resource_title}</a> %{resource_type} li ha agradat a <a href="%{liker_path}">%{liker_name} %{liker_nickname}</a>.
+        email_intro: '%{liker_name}, a qui segueixes, li acaba d''agradar: "%{resource_title}", que et pot resultar interessant. Revisa-la i contribueix:'
+        email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{liker_name}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
+        email_subject: "%{liker_name} ha realitzat un nou \"m'agrada\""
+        notification_title: 'A <a href="%{liker_path}">%{liker_name}</a> li ha agradat la %{resource_type}: <a href="%{resource_path}">%{resource_title}</a>.'
       resources:
         soft_deleted:
           notification_title: 'Una administradora ha eliminado tu %{resource_type}: "%{resource_title}".'
       users:
         profile_updated:
-          email_intro: La pàgina <a href="%{resource_url}"> de perfil </a> de %{name} (%{nickname}), a qui estàs seguint, s'ha actualitzat.
-          email_outro: Has rebut aquesta notificació perquè estàs seguint a "%{nickname}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
-          email_subject: "%{nickname} ha actualitzat el seu perfil"
-          notification_title: El <a href="%{resource_path}"> perfi l</a> de %{name} (%{nickname}), a qui estàs seguint, s'ha actualitzat.
+          email_intro: La <a href="%{resource_url}">pàgina de perfil</a> de %{name}, a qui estàs seguint, s'ha actualitzat.
+          email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{name}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
+          email_subject: "En/na %{name} ha actualitzat el seu perfil"
+          notification_title: La <a href="%{resource_path}">pàgina de perfil</a> de %{name}, a qui estàs seguint, s'ha actualitzat.
         user_officialized:
-          email_intro: La participant %{name} (%{nickname}) ha estat oficialitzada.
+          email_intro: En/na participant %{name} ha estat oficialitzada.
           email_outro: Has rebut aquesta notificació perquè administres la plataforma.
           email_subject: "S'ha oficialitzat a %{name}"
-          notification_title: La participant %{name} (%{nickname}) ha estat oficialitzada.
+          notification_title: En/na participant %{name} ha estat oficialitzada.
     export_mailer:
       download_your_data_export:
         click_button_html: Clica a l'enllaç següent per a descarregar les teves dades.<br/>El fitxer estarà disponible per a la seva descàrrega fins al %{date}.
diff --git a/decidim-core/config/locales/cs.yml b/decidim-core/config/locales/cs.yml
index b48ae9d9357ef..8189f2b495767 100644
--- a/decidim-core/config/locales/cs.yml
+++ b/decidim-core/config/locales/cs.yml
@@ -447,6 +447,10 @@ cs:
       withdraw:
         error: Při stahování pozměňovacího návrhu došlo k chybě.
         success: Pozměňovací návrh byl úspěšně stažen.
+      wizard_step_form:
+        steps:
+          '1': Vytvořit svůj pozměňovací návrh
+          '2': Publikovat svůj pozměňovací návrh
     anonymous_user: Anonymní
     application:
       document:
@@ -692,6 +696,13 @@ cs:
           all: Vše
         filter_taxonomy_values:
           all: Vše
+    delete_user_mailer:
+      delete:
+        body_1: Váš účet byl deaktivován a již není dostupný. Vaše osobní údaje jsou naplánovány na trvalé smazání v souladu s našimi pravidly pro uchovávání údajů.
+        body_2: Z bezpečnostních důvodů budou uchovávány některé údaje týkající se autorizace; pokud vytvoříte nový účet a znovu jej autorizujete, může být propojen s vaším novým účtem.
+        greetings_html: S pozdravem,<br/><a href="%{organization_url}">%{organization_name}</a>
+        hello: Dobrý den %{username},
+      subject: Váš účet byl smazán
     devise:
       omniauth_registrations:
         create:
@@ -911,13 +922,9 @@ cs:
           affected_user:
             email_intro: 'Změna byla přijata pro %{amendable_title}. Můžete ji vidět z této stránky:'
             email_outro: Toto oznámení jste obdrželi, protože jste autorem %{amendable_title}.
-            email_subject: Pozměňovací návrh přijatý pro %{amendable_title} od %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">pozměňovací návrh</a> vytvořený <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> byl přijat <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Změna byla přijata pro %{amendable_title}. Můžete ji vidět z této stránky:'
             email_outro: Toto oznámení jste obdrželi, protože jste sledovali %{amendable_title}. Po kliknutí na předchozí odkaz můžete přestat přijímat oznámení.
-            email_subject: Pozměňovací návrh přijatý k %{amendable_title} od %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">Pozměňovací návrh</a> vytvořený od <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> k <a href="%{amendable_path}">%{amendable_title}</a> byl přijat.
         amendment_created:
           affected_user:
             email_intro: 'Nová změna byla vytvořena pro %{amendable_title}. Můžete ji vidět z této stránky:'
@@ -933,29 +940,20 @@ cs:
           affected_user:
             email_intro: 'Zamítnutý pozměňovací návrh pro %{amendable_title} byl publikován jako nový %{amendable_type}. Můžete ho vidět z této stránky:'
             email_outro: Toto oznámení jste obdrželi, protože jste autorem %{amendable_title}.
-            email_subject: Pozměňovací návrh od %{emendation_author_nickname} byl zveřejněn jako nový %{amendable_type}
-            notification_title: <a href="%{emendation_path}">Odmítnutý pozměňovací návrh</a> k <a href="%{amendable_path}">%{amendable_title}</a> byl publikován jako nový %{amendable_type} od <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
           follower:
             email_intro: 'Označení odmítnuté pro číslo %{amendable_title} bylo povýšeno na nezávislý %{amendable_type}. Můžete ji vidět z této stránky:'
             email_outro: Toto oznámení jste obdrželi, protože jste sledovali %{amendable_title}. Po předchozím propojení můžete přestat přijímat oznámení.
-            email_subject: Pozměňovací návrh od %{emendation_author_nickname} byl zveřejněn jako nový %{amendable_type}
-            notification_title: <a href="%{emendation_path}">Odmítnutý pozměňovací návrh</a> k <a href="%{amendable_path}">%{amendable_title}</a> byla publikován jako nový %{amendable_type} od <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'Oznámení bylo zamítnuto za %{amendable_title}. Můžete ji vidět z této stránky:'
             email_outro: Toto oznámení jste obdrželi, protože jste autorem %{amendable_title}.
-            email_subject: Pozměňovací návrh k %{amendable_title} byl zamítnut od %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">Pozměňovací návrh</a> vytvořen od <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> k <a href="%{amendable_path}">%{amendable_title}</a> byl odmítnut.
           follower:
             email_intro: 'Oznámení bylo zamítnuto za %{amendable_title}. Můžete ji vidět z této stránky:'
             email_outro: Toto oznámení jste obdrželi, protože jste sledovali %{amendable_title}. Po předchozím propojení můžete přestat přijímat oznámení.
-            email_subject: Pozměňovací návrh k %{amendable_title} byl zamítnut od %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">Pozměňovací návrh</a> vytvořen od <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> k <a href="%{amendable_path}">%{amendable_title}</a> byl odmítnut.
         emendation_promoted:
           follower:
             email_intro: 'Byla zveřejněna oprava pro %{amendable_title}. Můžete si ji prohlédnout na této stránce:'
             email_outro: Toto oznámení jste obdrželi, protože jste autorem %{amendable_title}.
-            email_subject: Doplněk z %{emendation_author_nickname} byl zveřejněn jako nový %{amendable_type}
       attachments:
         attachment_created:
           email_intro: 'Do dokumentu %{resource_title} byl přidán nový dokument. Můžete jej vidět z této stránky:'
@@ -999,22 +997,15 @@ cs:
           notification_title: |-
             Administrátor odstranil váš %{resource_type}, protože byl nahlášen jako %{report_reasons}.</br>
             <i>%{resource_content}</i>
-      resource_liked:
-        email_outro: Toto oznámení jste obdrželi, protože sledujete %{liker_nickname}. Můžete přestat přijímat oznámení na předchozím odkazu.
       resources:
         soft_deleted:
           notification_title: Administrátor odstranil váš "%{resource_type}" "%{resource_title}".
       users:
         profile_updated:
-          email_intro: <a href="%{resource_url}">Profilová stránka</a> od %{name} (%{nickname}), kterého sledujete, byla aktualizována.
-          email_outro: Toto oznámení jste obdrželi, protože jste sledovali %{nickname}. Na předchozím odkazu můžete přestat přijímat oznámení.
-          email_subject: "%{nickname} aktualizoval svůj profil"
-          notification_title: <a href="%{resource_path}">Profilová stránka</a> od %{name} (%{nickname}), kterou sledujete, byla aktualizována.
+          email_subject: "%{name} aktualizoval svůj profil"
         user_officialized:
-          email_intro: Uživatel %{name} (%{nickname}) byl oficiálně zveřejněn.
           email_outro: Obdrželi jste toto oznámení, protože jste správcem organizace.
           email_subject: "%{name} byl oficializován"
-          notification_title: Uživatel %{name} (%{nickname}) byl oficiálně zveřejněn.
     export_mailer:
       download_your_data_export:
         click_button_html: Klikněte na následující odkaz pro stažení vašich dat.<br/>Soubor bude k dispozici ke stažení do %{date}.
@@ -1363,6 +1354,7 @@ cs:
         own_activity: Moje vlastní činnost, jako kdyby někdo komentoval ve svém návrhu nebo mě zmínil
         push_notifications: Push oznámení
         push_notifications_reminder: Chcete-li dostávat oznámení z platformy, musíte je nejdříve povolit v nastavení prohlížeče.
+        push_notifications_unsupported_browser: Váš prohlížeč není podporován.
         receive_notifications_about: Chci dostávat oznámení
         update_notifications_settings: Uložit změny
       update:
diff --git a/decidim-core/config/locales/de.yml b/decidim-core/config/locales/de.yml
index 866791e274761..ff484b69ae112 100644
--- a/decidim-core/config/locales/de.yml
+++ b/decidim-core/config/locales/de.yml
@@ -869,13 +869,9 @@ de:
           affected_user:
             email_intro: 'Eine Änderung an %{amendable_title} wurde akzeptiert. Sehen Sie es sich auf dieser Seite an:'
             email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie ein Autor von %{amendable_title} sind.
-            email_subject: Akzeptierte Änderung für %{amendable_title} von %{emendation_author_nickname}
-            notification_title: Die <a href="%{emendation_path}">Änderung</a> von <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> für <a href="%{amendable_path}">%{amendable_title}</a> wurde angenommen.
           follower:
             email_intro: 'Eine Änderung für %{amendable_title} wurde akzeptiert. Sehen Sie es sich auf dieser Seite an:'
             email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie %{amendable_title} folgen. Falls Sie keine solchen Benachrichtigungen mehr erhalten möchten, besuchen Sie den obigen Link.
-            email_subject: Akzeptierte Änderung für %{amendable_title} von %{emendation_author_nickname}
-            notification_title: Die <a href="%{emendation_path}">Änderung</a> von <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> für <a href="%{amendable_path}">%{amendable_title}</a> wurde akzeptiert.
         amendment_created:
           affected_user:
             email_intro: 'Eine neue Änderung wurde für %{amendable_title} vorgeschlagen. Sehen Sie es sich auf dieser Seite an:'
@@ -891,29 +887,20 @@ de:
           affected_user:
             email_intro: 'Eine abgelehnte Änderung an %{amendable_title} wurde als neue/n %{amendable_type} veröffentlicht. Sehen Sie es sich auf dieser Seite an:'
             email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie ein Autor von %{amendable_title} sind.
-            email_subject: Eine Änderung von %{emendation_author_nickname} wurde als neue/n %{amendable_type} veröffentlicht
-            notification_title: Die <a href="%{emendation_path}">abgelehnte Änderung</a> für <a href="%{amendable_path}">%{amendable_title}</a> wurde von <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> als neue/n %{amendable_type} veröffentlicht.
           follower:
             email_intro: 'Eine abgelehnte Änderung für %{amendable_title} wurde als neue/n %{amendable_type} veröffentlicht. Sehen Sie es sich auf dieser Seite an:'
             email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie %{amendable_title} folgen. Falls Sie keine solchen Benachrichtigungen mehr erhalten möchten, besuchen Sie den obigen Link.
-            email_subject: Eine Änderung von %{emendation_author_nickname} wurde als neue/n/s %{amendable_type} veröffentlicht
-            notification_title: Eine <a href="%{emendation_path}">abgelehnte Änderung</a> für <a href="%{amendable_path}">%{amendable_title}</a> wurde von <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> als neue/n/s %{amendable_type} veröffentlicht.
         amendment_rejected:
           affected_user:
             email_intro: 'Eine Änderung an %{amendable_title} wurde abgelehnt. Sehen Sie es sich auf dieser Seite an:'
             email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie ein Autor von %{amendable_title} sind.
-            email_subject: Abgelehnter Änderungsantrag für %{amendable_title} von %{emendation_author_nickname}
-            notification_title: Die <a href="%{emendation_path}">Änderung</a> von <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> für <a href="%{amendable_path}">%{amendable_title}</a> wurde abgelehnt.
           follower:
             email_intro: 'Eine Änderung für %{amendable_title} wurde abgelehnt. Sehen Sie es sich auf dieser Seite an:'
             email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie %{amendable_title}. Falls Sie keine solchen Benachrichtigungen mehr erhalten möchten, besuchen Sie den obigen Link.
-            email_subject: Abgelehnte Änderung für %{amendable_title} von %{emendation_author_nickname}
-            notification_title: Die <a href="%{emendation_path}">Änderung</a> für <a href="%{amendable_path}">%{amendable_title}</a> von <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> wurde abgelehnt.
         emendation_promoted:
           follower:
             email_intro: 'Eine Änderung wurde für %{amendable_title} abgelehnt. Sehen Sie es sich auf dieser Seite an:'
             email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie %{amendable_title} mitverfasst haben.
-            email_subject: Eine Änderung von %{emendation_author_nickname} ist als neuer %{amendable_type} veröffentlicht worden
       attachments:
         attachment_created:
           email_intro: 'Ein neues Dokument wurde zu %{resource_title} hinzugefügt. Sehen Sie es sich auf dieser Seite an:'
@@ -964,25 +951,13 @@ de:
           notification_title: |-
             Ein Administrator hat Ihr/e %{resource_type} entfernt, weil es als %{report_reasons} gemeldet wurde.</br>
             <i>%{resource_content}</i>
-      resource_liked:
-        email_intro: '%{liker_name} %{liker_nickname}, dem Sie folgen, hat gerade "%{resource_title}" unterstützt. Wir denken, das könnte interessant für Sie sein. Jetzt anschauen und mitreden:'
-        email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie %{liker_nickname} folgen. Falls Sie keine solchen Benachrichtigungen mehr erhalten möchten, besuchen Sie den angegebenen Link.
-        email_subject: "%{liker_nickname} etwas Neues unterstützt"
-        notification_title: <a href="%{resource_path}">%{resource_title}</a> %{resource_type} wurde von <a href="%{liker_path}">%{liker_name} %{liker_nickname}</a> unterstützt.
       resources:
         soft_deleted:
           notification_title: Ein Admin hat Ihre "%{resource_type}" "%{resource_title} " gelöscht.
       users:
-        profile_updated:
-          email_intro: Die <a href="%{resource_url}">Profilseite</a> von %{name} (%{nickname}), der Sie folgen, wurde aktualisiert.
-          email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie %{nickname} folgen. Falls Sie keine solchen Benachrichtigungen mehr erhalten möchten, besuchen Sie den obigen Link.
-          email_subject: "%{nickname} hat ihr Profil aktualisiert"
-          notification_title: Die <a href="%{resource_path}">Profilseite</a> von %{name} (%{nickname}), der Sie folgen, wurde aktualisiert.
         user_officialized:
-          email_intro: Teilnehmer %{name} (%{nickname}) wurde offiziell bestätigt.
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie ein Administrator der Organisation sind.
           email_subject: "%{name} wurde offiziell bestätigt"
-          notification_title: Teilnehmer %{name} (%{nickname}) wurde offiziell bestätigt.
     export_mailer:
       download_your_data_export:
         click_button_html: Klicken Sie auf den nächsten Link, um Ihre Daten herunterzuladen.<br/>Die Datei steht bis %{date} zum Download zur Verfügung.
diff --git a/decidim-core/config/locales/el.yml b/decidim-core/config/locales/el.yml
index 9b3330fd9579c..336c9e5c4a52d 100644
--- a/decidim-core/config/locales/el.yml
+++ b/decidim-core/config/locales/el.yml
@@ -493,13 +493,9 @@ el:
           affected_user:
             email_intro: 'Μια τροποποίηση έγινε δεκτή για %{amendable_title}. Μπορείτε να την δείτε από αυτήν τη σελίδα:'
             email_outro: Λάβατε αυτήν την ειδοποίηση επειδή είστε συντάκτης της τροποποίησης %{amendable_title}.
-            email_subject: Αποδεκτή τροποποίηση για %{amendable_title} από τον συντάκτη %{emendation_author_nickname}
-            notification_title: Η <a href="%{emendation_path}">τροποποίηση</a> που δημιουργήθηκε από τον συντάκτη <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> έγινε δεκτή για την τροποποίηση <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Μια τροποποίηση έγινε δεκτή για %{amendable_title}. Μπορείτε να την δείτε από αυτήν τη σελίδα:'
             email_outro: Λάβατε αυτήν την ειδοποίηση επειδή ακολουθείτε την πρόταση %{amendable_title}. Μπορείτε να διακόψετε τη λήψη ειδοποιήσεων ακολουθώντας τον προηγούμενο σύνδεσμο.
-            email_subject: Αποδεκτή τροποποίηση για %{amendable_title} από τον συντάκτη %{emendation_author_nickname}
-            notification_title: Η <a href="%{emendation_path}">τροποποίηση</a> που δημιουργήθηκε από τον συντάκτη <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> έγινε δεκτή για την τροποποίηση <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'Μια νέα τροποποίηση δημιουργήθηκε για %{amendable_title}. Μπορείτε να την δείτε από αυτήν τη σελίδα:'
@@ -515,24 +511,16 @@ el:
           affected_user:
             email_intro: 'Μια τροποποίηση που απορρίφθηκε για %{amendable_title} δημοσιεύτηκε ως νέος τύπος τροποποίησης %{amendable_type}. Μπορείτε να την δείτε από αυτήν τη σελίδα:'
             email_outro: Λάβατε αυτήν την ειδοποίηση επειδή είστε συντάκτης της τροποποίησης %{amendable_title}.
-            email_subject: Μια τροποποίηση από τον συντάκτη %{emendation_author_nickname} δημοσιεύτηκε ως νέος τύπος τροποποίησης %{amendable_type}
-            notification_title: Μια <a href="%{emendation_path}">τροποποίηση που απορρίφθηκε</a> για <a href="%{amendable_path}">%{amendable_title}</a> δημοσιεύτηκε ως νέος τύπος τροποποίησης %{amendable_type} από τον συντάκτη <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
           follower:
             email_intro: 'Μια τροποποίηση που απορρίφθηκε για %{amendable_title} δημοσιεύτηκε ως νέος τύπος τροποποίησης %{amendable_type}. Μπορείτε να την δείτε από αυτήν τη σελίδα:'
             email_outro: Λάβατε αυτήν την ειδοποίηση επειδή ακολουθείτε την πρόταση %{amendable_title}. Μπορείτε να διακόψετε τη λήψη ειδοποιήσεων ακολουθώντας τον προηγούμενο σύνδεσμο.
-            email_subject: Μια τροποποίηση από τον συντάκτη %{emendation_author_nickname} δημοσιεύτηκε ως νέος τύπος τροποποίησης %{amendable_type}
-            notification_title: Μια <a href="%{emendation_path}">τροποποίηση που απορρίφθηκε</a> για <a href="%{amendable_path}">%{amendable_title}</a> δημοσιεύτηκε ως νέος τύπος τροποποίησης %{amendable_type} από τον συντάκτη <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'Μια τροποποίηση απορρίφθηκε για %{amendable_title}. Μπορείτε να την δείτε από αυτήν τη σελίδα:'
             email_outro: Λάβατε αυτήν την ειδοποίηση επειδή είστε συντάκτης της τροποποίησης %{amendable_title}.
-            email_subject: Η τροποποίηση απορρίφθηκε για %{amendable_title} από τον συντάκτη %{emendation_author_nickname}
-            notification_title: Η <a href="%{emendation_path}">τροποποίηση</a> που δημιουργήθηκε από τον συντάκτη <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> απορρίφθηκε για την τροποποίηση <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Μια τροποποίηση απορρίφθηκε για %{amendable_title}. Μπορείτε να την δείτε από αυτήν τη σελίδα:'
             email_outro: Λάβατε αυτήν την ειδοποίηση επειδή ακολουθείτε την πρόταση %{amendable_title}. Μπορείτε να διακόψετε τη λήψη ειδοποιήσεων ακολουθώντας τον προηγούμενο σύνδεσμο.
-            email_subject: Η τροποποίηση απορρίφθηκε για %{amendable_title} από τον συντάκτη %{emendation_author_nickname}
-            notification_title: Η <a href="%{emendation_path}">τροποποίηση</a> που δημιουργήθηκε από τον συντάκτη <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> απορρίφθηκε για την τροποποίηση <a href="%{amendable_path}">%{amendable_title}</a>.
       attachments:
         attachment_created:
           email_intro: 'Ένα νέο έγγραφο προστέθηκε στο στοιχείο %{resource_title}. Μπορείτε να το δείτε από αυτήν τη σελίδα:'
@@ -555,12 +543,6 @@ el:
           email_outro: Λάβατε αυτήν την ειδοποίηση επειδή κάνατε μια δραστηριότητα στον ιστότοπό μας.
         level_up:
           email_outro: Λάβατε αυτήν την ειδοποίηση επειδή κάνατε μια δραστηριότητα στον ιστότοπό μας.
-      users:
-        profile_updated:
-          email_intro: Η <a href="%{resource_url}">σελίδα προφίλ</a> του υποστηρικτή %{name} (%{nickname}), τον οποίο ακολουθείτε, έχει ενημερωθεί.
-          email_outro: Λάβατε αυτήν την ειδοποίηση επειδή ακολουθείτε τον/την %{nickname}. Μπορείτε να διακόψετε τη λήψη ειδοποιήσεων ακολουθώντας τον προηγούμενο σύνδεσμο.
-          email_subject: "Ο/η %{nickname} ενημέρωσε το προφίλ του/της"
-          notification_title: Η <a href="%{resource_path}">σελίδα προφίλ</a> του υποστηρικτή %{name} (%{nickname}), τον οποίο ακολουθείτε, έχει ενημερωθεί.
     export_mailer:
       download_your_data_export:
         download: Λήψη
diff --git a/decidim-core/config/locales/es-MX.yml b/decidim-core/config/locales/es-MX.yml
index 41806ebf715c8..fcfd1409bf6b3 100644
--- a/decidim-core/config/locales/es-MX.yml
+++ b/decidim-core/config/locales/es-MX.yml
@@ -884,13 +884,13 @@ es-MX:
           affected_user:
             email_intro: 'Se ha aceptado una enmienda para %{amendable_title}. Puedes verlo desde esta página:'
             email_outro: Has recibido esta notificación porque eres un autor de %{amendable_title}.
-            email_subject: Una enmienda aceptada para %{amendable_title} de %{emendation_author_nickname}
-            notification_title: El <a href="%{emendation_path}">enmienda</a> creado por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> ha sido aceptado para <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Enmienda aceptada de %{emendation_author_name} para %{amendable_title}
+            notification_title: La <a href="%{emendation_path}">enmienda</a> creada por <a href="%{emendation_author_path}">%{emendation_author_name}</a> ha sido aceptada para <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Se ha aceptado una enmienda para %{amendable_title}. Puedes verlo desde esta página:'
             email_outro: Has recibido esta notificación porque estás siguiendo a %{amendable_title}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-            email_subject: Una enmienda aceptada para %{amendable_title} de %{emendation_author_nickname}
-            notification_title: El <a href="%{emendation_path}">enmienda</a> creado por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> ha sido aceptado para <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Enmienda de %{emendation_author_name} aceptada para %{amendable_title}
+            notification_title: La <a href="%{emendation_path}">enmienda</a> creada por <a href="%{emendation_author_path}">%{emendation_author_name}</a> ha sido aceptada para <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'Se ha creado una nueva enmienda para %{amendable_title}. Puedes verlo desde esta página:'
@@ -906,29 +906,29 @@ es-MX:
           affected_user:
             email_intro: 'Una enmienda rechazada por %{amendable_title} ha sido promovida a %{amendable_type}independiente. Puedes verlo desde esta página:'
             email_outro: Has recibido esta notificación porque eres un autor de %{amendable_title}.
-            email_subject: Se ha publicado una enmienda de %{emendation_author_nickname} como nuevo %{amendable_type}
-            notification_title: Un <a href="%{emendation_path}">rechazó la enmienda</a> para <a href="%{amendable_path}">%{amendable_title}</a> se ha publicado como un nuevo %{amendable_type} por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
+            email_subject: Se ha publicado una modificación de %{emendation_author_name} como nuevo %{amendable_type}
+            notification_title: Un <a href="%{emendation_path}">rechazó la enmienda</a> para <a href="%{amendable_path}">%{amendable_title}</a> se ha publicado como un nuevo %{amendable_type} por <a href="%{emendation_author_path}">%{emendation_author_name}</a>.
           follower:
             email_intro: 'Una enmienda rechazada por %{amendable_title} ha sido promovida a %{amendable_type}independiente. Puedes verlo desde esta página:'
             email_outro: Has recibido esta notificación porque estás siguiendo a %{amendable_title}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-            email_subject: Se ha publicado una enmienda de %{emendation_author_nickname} como nuevo %{amendable_type}
-            notification_title: Un <a href="%{emendation_path}">rechazó la enmienda</a> para <a href="%{amendable_path}">%{amendable_title}</a> se ha publicado como un nuevo %{amendable_type} por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
+            email_subject: Se ha publicado una enmienda hecha por %{emendation_author_name} como nuevo %{amendable_type}
+            notification_title: Un <a href="%{emendation_path}">rechazó la enmienda</a> para <a href="%{amendable_path}">%{amendable_title}</a> se ha publicado como un nuevo %{amendable_type} por <a href="%{emendation_author_path}">%{emendation_author_name}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'Una enmienda ha sido rechazada por %{amendable_title}. Puedes verlo desde esta página:'
             email_outro: Has recibido esta notificación porque eres un autor de %{amendable_title}.
-            email_subject: Una enmienda rechazada por %{amendable_title} de %{emendation_author_nickname}
-            notification_title: El <a href="%{emendation_path}">enmienda</a> creado por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> ha sido rechazada por <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: La enmienda de %{emendation_author_name} a %{amendable_title} se ha rechazado
+            notification_title: Se ha rechazado la <a href="%{emendation_path}">enmienda</a> creada por <a href="%{emendation_author_path}">%{emendation_author_name}</a> para <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Una enmienda ha sido rechazada por %{amendable_title}. Puedes verlo desde esta página:'
             email_outro: Has recibido esta notificación porque estás siguiendo a %{amendable_title}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-            email_subject: Una enmienda rechazada por %{amendable_title} de %{emendation_author_nickname}
-            notification_title: El <a href="%{emendation_path}">enmienda</a> creado por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> ha sido rechazada por <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: La enmienda de %{emendation_author_name} a %{amendable_title} se ha rechazado
+            notification_title: Se ha rechazado la <a href="%{emendation_path}">enmienda</a> creada por <a href="%{emendation_author_path}">%{emendation_author_name}</a> para <a href="%{amendable_path}">%{amendable_title}</a>.
         emendation_promoted:
           follower:
             email_intro: 'Se ha publicado una enmienda para %{amendable_title}. Puedes verla en esta página:'
             email_outro: Has recibido esta notificación porque es autora de %{amendable_title}.
-            email_subject: Una enmienda de %{emendation_author_nickname} se ha publicado como un nuevo %{amendable_type}
+            email_subject: Una enmienda de %{emendation_author_name} se ha publicado como un nuevo %{amendable_type}
       attachments:
         attachment_created:
           email_intro: 'Se ha agregado un nuevo documento a %{resource_title}. Puedes verlo desde esta página:'
@@ -980,24 +980,24 @@ es-MX:
             Una administradora eliminó tu %{resource_type} porque ha sido reportado como %{report_reasons}.</br>
             <i>%{resource_content}</i>
       resource_liked:
-        email_intro: '%{liker_name} %{liker_nickname}, a quien sigues, le acaba de gustar: "%{resource_title}", que puede ser interesante para ti, compruébalo y contribuye:'
-        email_outro: Has recibido esta notificación porque estás siguiendo la iniciativa "%{liker_nickname}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-        email_subject: "%{liker_nickname} ha realizado un nuevo \"me gusta\""
-        notification_title: <a href="%{resource_path}">%{resource_title}</a> %{resource_type} le ha gustado a <a href="%{liker_path}">%{liker_name} %{liker_nickname}</a>.
+        email_intro: '%{liker_name}, a quien sigues, le acaba de gustar: "%{resource_title}", que puede ser interesante para ti. Revisala y contribuye:'
+        email_outro: Has recibido esta notificación porque estás siguiendo la iniciativa "%{liker_name}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
+        email_subject: "%{liker_name} ha realizado un nuevo \"me gusta\""
+        notification_title: 'A <a href="%{liker_path}">%{liker_name}</a> le ha gustado la %{resource_type}: <a href="%{resource_path}">%{resource_title}</a>.'
       resources:
         soft_deleted:
           notification_title: 'Una administradora ha eliminado tu %{resource_type}: "%{resource_title}".'
       users:
         profile_updated:
-          email_intro: La página <a href="%{resource_url}">de perfil</a> de %{name} (%{nickname}), a quien estás siguiendo, se ha actualizado.
-          email_outro: Has recibido esta notificación porque estás siguiendo a %{nickname}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-          email_subject: "%{nickname} ha actualizado su perfil"
-          notification_title: La página <a href="%{resource_path}">de perfil</a> de %{name} (%{nickname}), a quien estás siguiendo, se ha actualizado.
+          email_intro: La <a href="%{resource_url}">página de perfil</a> de %{name}, a quien estás siguiendo, se ha actualizado.
+          email_outro: Has recibido esta notificación porque estás siguiendo "%{name}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
+          email_subject: "%{name} actualizó su perfil"
+          notification_title: La <a href="%{resource_path}">página de perfil</a> de %{name}, a quien estás siguiendo, se ha actualizado.
         user_officialized:
-          email_intro: La participante %{name} (%{nickname}) ha sido oficializada.
+          email_intro: El/la participante %{name} ha sido oficializada.
           email_outro: Has recibido esta notificación porque eres una de las administradoras de la plataforma.
           email_subject: "Se ha oficializado a %{name}"
-          notification_title: La participante %{name} (%{nickname}) ha sido oficializada.
+          notification_title: El/la participante %{name} ha sido oficializada.
     export_mailer:
       download_your_data_export:
         click_button_html: Haz clic en el siguiente enlace para descargar tus datos.<br/>El archivo estará disponible para su descarga hasta el %{date}.
diff --git a/decidim-core/config/locales/es-PY.yml b/decidim-core/config/locales/es-PY.yml
index bdc303d86b1c7..73342c9df89d4 100644
--- a/decidim-core/config/locales/es-PY.yml
+++ b/decidim-core/config/locales/es-PY.yml
@@ -884,13 +884,13 @@ es-PY:
           affected_user:
             email_intro: 'Se ha aceptado una enmienda para %{amendable_title}. Puedes verlo desde esta página:'
             email_outro: Has recibido esta notificación porque eres un autor de %{amendable_title}.
-            email_subject: Una enmienda aceptada para %{amendable_title} de %{emendation_author_nickname}
-            notification_title: El <a href="%{emendation_path}">enmienda</a> creado por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> ha sido aceptado para <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Enmienda aceptada de %{emendation_author_name} para %{amendable_title}
+            notification_title: La <a href="%{emendation_path}">enmienda</a> creada por <a href="%{emendation_author_path}">%{emendation_author_name}</a> ha sido aceptada para <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Se ha aceptado una enmienda para %{amendable_title}. Puedes verlo desde esta página:'
             email_outro: Has recibido esta notificación porque estás siguiendo a %{amendable_title}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-            email_subject: Una enmienda aceptada para %{amendable_title} de %{emendation_author_nickname}
-            notification_title: El <a href="%{emendation_path}">enmienda</a> creado por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> ha sido aceptado para <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Enmienda de %{emendation_author_name} aceptada para %{amendable_title}
+            notification_title: La <a href="%{emendation_path}">enmienda</a> creada por <a href="%{emendation_author_path}">%{emendation_author_name}</a> ha sido aceptada para <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'Se ha creado una nueva enmienda para %{amendable_title}. Puedes verlo desde esta página:'
@@ -906,29 +906,29 @@ es-PY:
           affected_user:
             email_intro: 'Una enmienda rechazada por %{amendable_title} ha sido promovida a %{amendable_type}independiente. Puedes verlo desde esta página:'
             email_outro: Has recibido esta notificación porque eres un autor de %{amendable_title}.
-            email_subject: Se ha publicado una enmienda de %{emendation_author_nickname} como nuevo %{amendable_type}
-            notification_title: Un <a href="%{emendation_path}">rechazó la enmienda</a> para <a href="%{amendable_path}">%{amendable_title}</a> se ha publicado como un nuevo %{amendable_type} por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
+            email_subject: Se ha publicado una modificación de %{emendation_author_name} como nuevo %{amendable_type}
+            notification_title: Un <a href="%{emendation_path}">rechazó la enmienda</a> para <a href="%{amendable_path}">%{amendable_title}</a> se ha publicado como un nuevo %{amendable_type} por <a href="%{emendation_author_path}">%{emendation_author_name}</a>.
           follower:
             email_intro: 'Una enmienda rechazada por %{amendable_title} ha sido promovida a %{amendable_type}independiente. Puedes verlo desde esta página:'
             email_outro: Has recibido esta notificación porque estás siguiendo a %{amendable_title}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-            email_subject: Se ha publicado una enmienda de %{emendation_author_nickname} como nuevo %{amendable_type}
-            notification_title: Un <a href="%{emendation_path}">rechazó la enmienda</a> para <a href="%{amendable_path}">%{amendable_title}</a> se ha publicado como un nuevo %{amendable_type} por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
+            email_subject: Se ha publicado una enmienda hecha por %{emendation_author_name} como nuevo %{amendable_type}
+            notification_title: Un <a href="%{emendation_path}">rechazó la enmienda</a> para <a href="%{amendable_path}">%{amendable_title}</a> se ha publicado como un nuevo %{amendable_type} por <a href="%{emendation_author_path}">%{emendation_author_name}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'Una enmienda ha sido rechazada por %{amendable_title}. Puedes verlo desde esta página:'
             email_outro: Has recibido esta notificación porque eres un autor de %{amendable_title}.
-            email_subject: Una enmienda rechazada por %{amendable_title} de %{emendation_author_nickname}
-            notification_title: El <a href="%{emendation_path}">enmienda</a> creado por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> ha sido rechazada por <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: La enmienda de %{emendation_author_name} a %{amendable_title} se ha rechazado
+            notification_title: Se ha rechazado la <a href="%{emendation_path}">enmienda</a> creada por <a href="%{emendation_author_path}">%{emendation_author_name}</a> para <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Una enmienda ha sido rechazada por %{amendable_title}. Puedes verlo desde esta página:'
             email_outro: Has recibido esta notificación porque estás siguiendo a %{amendable_title}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-            email_subject: Una enmienda rechazada por %{amendable_title} de %{emendation_author_nickname}
-            notification_title: El <a href="%{emendation_path}">enmienda</a> creado por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> ha sido rechazada por <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: La enmienda de %{emendation_author_name} a %{amendable_title} se ha rechazado
+            notification_title: Se ha rechazado la <a href="%{emendation_path}">enmienda</a> creada por <a href="%{emendation_author_path}">%{emendation_author_name}</a> para <a href="%{amendable_path}">%{amendable_title}</a>.
         emendation_promoted:
           follower:
             email_intro: 'Se ha publicado una enmienda para %{amendable_title}. Puedes verla en esta página:'
             email_outro: Has recibido esta notificación porque es autora de %{amendable_title}.
-            email_subject: Una enmienda de %{emendation_author_nickname} se ha publicado como un nuevo %{amendable_type}
+            email_subject: Una enmienda de %{emendation_author_name} se ha publicado como un nuevo %{amendable_type}
       attachments:
         attachment_created:
           email_intro: 'Se ha agregado un nuevo documento a %{resource_title}. Puedes verlo desde esta página:'
@@ -980,24 +980,24 @@ es-PY:
             Una administradora eliminó tu %{resource_type} porque ha sido reportado como %{report_reasons}.</br>
             <i>%{resource_content}</i>
       resource_liked:
-        email_intro: '%{liker_name} %{liker_nickname}, a quien sigues, le acaba de gustar: "%{resource_title}", que puede ser interesante para ti, compruébalo y contribuye:'
-        email_outro: Has recibido esta notificación porque estás siguiendo la iniciativa "%{liker_nickname}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-        email_subject: "%{liker_nickname} ha realizado un nuevo \"me gusta\""
-        notification_title: <a href="%{resource_path}">%{resource_title}</a> %{resource_type} le ha gustado a <a href="%{liker_path}">%{liker_name} %{liker_nickname}</a>.
+        email_intro: '%{liker_name}, a quien sigues, le acaba de gustar: "%{resource_title}", que puede ser interesante para ti. Revisala y contribuye:'
+        email_outro: Has recibido esta notificación porque estás siguiendo la iniciativa "%{liker_name}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
+        email_subject: "%{liker_name} ha realizado un nuevo \"me gusta\""
+        notification_title: 'A <a href="%{liker_path}">%{liker_name}</a> le ha gustado la %{resource_type}: <a href="%{resource_path}">%{resource_title}</a>.'
       resources:
         soft_deleted:
           notification_title: 'Una administradora ha eliminado tu %{resource_type}: "%{resource_title}".'
       users:
         profile_updated:
-          email_intro: La página <a href="%{resource_url}">de perfil</a> de %{name} (%{nickname}), a quien estás siguiendo, se ha actualizado.
-          email_outro: Has recibido esta notificación porque estás siguiendo a %{nickname}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-          email_subject: "%{nickname} ha actualizado su perfil"
-          notification_title: La página <a href="%{resource_path}">de perfil</a> de %{name} (%{nickname}), a quien estás siguiendo, se ha actualizado.
+          email_intro: La <a href="%{resource_url}">página de perfil</a> de %{name}, a quien estás siguiendo, se ha actualizado.
+          email_outro: Has recibido esta notificación porque estás siguiendo "%{name}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
+          email_subject: "%{name} actualizó su perfil"
+          notification_title: La <a href="%{resource_path}">página de perfil</a> de %{name}, a quien estás siguiendo, se ha actualizado.
         user_officialized:
-          email_intro: La participante %{name} (%{nickname}) ha sido oficializada.
+          email_intro: El/la participante %{name} ha sido oficializada.
           email_outro: Has recibido esta notificación porque eres una de las administradoras de la plataforma.
           email_subject: "Se ha oficializado a %{name}"
-          notification_title: La participante %{name} (%{nickname}) ha sido oficializada.
+          notification_title: El/la participante %{name} ha sido oficializada.
     export_mailer:
       download_your_data_export:
         click_button_html: Haz clic en el siguiente enlace para descargar tus datos.<br/>El archivo estará disponible para su descarga hasta el %{date}.
diff --git a/decidim-core/config/locales/es.yml b/decidim-core/config/locales/es.yml
index d75626885c959..daa0197086e8d 100644
--- a/decidim-core/config/locales/es.yml
+++ b/decidim-core/config/locales/es.yml
@@ -881,13 +881,13 @@ es:
           affected_user:
             email_intro: 'Se ha aceptado una enmienda para %{amendable_title}. Puedes verla desde esta página:'
             email_outro: Has recibido esta notificación porque se ha aceptado una enmienda al apartado "%{amendable_title}" que administras.
-            email_subject: Enmienda aceptada para %{amendable_title} de %{emendation_author_nickname}
-            notification_title: La <a href="%{emendation_path}">enmienda</a> creada por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> ha sido aceptada para <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Enmienda aceptada de %{emendation_author_name} para %{amendable_title}
+            notification_title: La <a href="%{emendation_path}">enmienda</a> creada por <a href="%{emendation_author_path}">%{emendation_author_name}</a> ha sido aceptada para <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Se ha aceptado una enmienda para %{amendable_title}. Puedes verla desde esta página:'
             email_outro: Has recibido esta notificación porque estás siguiendo la enmienda "%{amendable_title}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-            email_subject: Enmienda aceptada para %{amendable_title} de %{emendation_author_nickname}
-            notification_title: La <a href="%{emendation_path}">enmienda</a> creada por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> ha sido aceptada para <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Enmienda de %{emendation_author_name} aceptada para %{amendable_title}
+            notification_title: La <a href="%{emendation_path}">enmienda</a> creada por <a href="%{emendation_author_path}">%{emendation_author_name}</a> ha sido aceptada para <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'Se ha creado una nueva enmienda para %{amendable_title}. Puedes verla desde esta página:'
@@ -903,29 +903,29 @@ es:
           affected_user:
             email_intro: 'Una enmienda rechazada para %{amendable_title} ha sido publicada como una nueva %{amendable_type}. Puedes verla desde esta página:'
             email_outro: Has recibido esta notificación porque se ha promocionado una esmena al apartado "%{amendable_title}" que administras.
-            email_subject: Se ha publicado una enmienda de %{emendation_author_nickname} como nuevo %{amendable_type}
-            notification_title: Un <a href="%{emendation_path}">rechazó la enmienda</a> para <a href="%{amendable_path}">%{amendable_title}</a> se ha publicado como un nuevo %{amendable_type} por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
+            email_subject: Se ha publicado una modificación de %{emendation_author_name} como nuevo %{amendable_type}
+            notification_title: Un <a href="%{emendation_path}">rechazó la enmienda</a> para <a href="%{amendable_path}">%{amendable_title}</a> se ha publicado como un nuevo %{amendable_type} por <a href="%{emendation_author_path}">%{emendation_author_name}</a>.
           follower:
             email_intro: 'Una enmienda rechazada para %{amendable_title} ha sido publicada como nueva %{amendable_type}. Puedes verla desde esta página:'
             email_outro: Has recibido esta notificación porque estás siguiendo la enmienda "%{amendable_title}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-            email_subject: Se ha publicado una enmienda de %{emendation_author_nickname} como nuevo %{amendable_type}
-            notification_title: Un <a href="%{emendation_path}">rechazó la enmienda</a> para <a href="%{amendable_path}">%{amendable_title}</a> se ha publicado como un nuevo %{amendable_type} por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
+            email_subject: Se ha publicado una enmienda hecha por %{emendation_author_name} como nuevo %{amendable_type}
+            notification_title: Un <a href="%{emendation_path}">rechazó la enmienda</a> para <a href="%{amendable_path}">%{amendable_title}</a> se ha publicado como un nuevo %{amendable_type} por <a href="%{emendation_author_path}">%{emendation_author_name}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'Una enmienda ha sido rechazada por %{amendable_title}. Puedes verla desde esta página:'
             email_outro: Has recibido esta notificación porque se ha rechazado una enmienda al apartado "%{amendable_title}" que administras.
-            email_subject: Enmienda rechazada por %{amendable_title} de %{emendation_author_nickname}
-            notification_title: La <a href="%{emendation_path}">enmienda</a> creada por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> ha sido rechazada por <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: La enmienda de %{emendation_author_name} a %{amendable_title} se ha rechazado
+            notification_title: Se ha rechazado la <a href="%{emendation_path}">enmienda</a> creada por <a href="%{emendation_author_path}">%{emendation_author_name}</a> para <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Una enmienda ha sido rechazada por %{amendable_title}. Puedes verla desde esta página:'
             email_outro: Has recibido esta notificación porque estás siguiendo la enmienda "%{amendable_title}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-            email_subject: Una enmienda rechazada por %{amendable_title} de %{emendation_author_nickname}
-            notification_title: La <a href="%{emendation_path}">enmienda</a> creada por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> ha sido rechazada por <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: La enmienda de %{emendation_author_name} a %{amendable_title} se ha rechazado
+            notification_title: Se ha rechazado la <a href="%{emendation_path}">enmienda</a> creada por <a href="%{emendation_author_path}">%{emendation_author_name}</a> para <a href="%{amendable_path}">%{amendable_title}</a>.
         emendation_promoted:
           follower:
             email_intro: 'Se ha publicado una enmienda para %{amendable_title}. Puedes verla en esta página:'
             email_outro: Has recibido esta notificación porque es autora de %{amendable_title}.
-            email_subject: Una enmienda de %{emendation_author_nickname} se ha publicado como un nuevo %{amendable_type}
+            email_subject: Una enmienda de %{emendation_author_name} se ha publicado como un nuevo %{amendable_type}
       attachments:
         attachment_created:
           email_intro: 'Se ha añadido un nuevo documento a %{resource_title}. Puedes verlo desde esta página:'
@@ -977,24 +977,24 @@ es:
             Una administradora eliminó tu %{resource_type} porque ha sido reportado como %{report_reasons}.</br>
             <i>%{resource_content}</i>
       resource_liked:
-        email_intro: '%{liker_name} %{liker_nickname}, a quien sigues, le acaba de gustar: "%{resource_title}", que puede ser interesante para ti, compruébalo y contribuye:'
-        email_outro: Has recibido esta notificación porque estás siguiendo la iniciativa "%{liker_nickname}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-        email_subject: "%{liker_nickname} ha realizado un nuevo \"me gusta\""
-        notification_title: <a href="%{resource_path}">%{resource_title}</a> %{resource_type} le ha gustado a <a href="%{liker_path}">%{liker_name} %{liker_nickname}</a>.
+        email_intro: '%{liker_name}, a quien sigues, le acaba de gustar: "%{resource_title}", que puede ser interesante para ti. Revisala y contribuye:'
+        email_outro: Has recibido esta notificación porque estás siguiendo la iniciativa "%{liker_name}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
+        email_subject: "%{liker_name} ha realizado un nuevo \"me gusta\""
+        notification_title: 'A <a href="%{liker_path}">%{liker_name}</a> le ha gustado la %{resource_type}: <a href="%{resource_path}">%{resource_title}</a>.'
       resources:
         soft_deleted:
           notification_title: 'Una administradora ha eliminado tu %{resource_type}: "%{resource_title}".'
       users:
         profile_updated:
-          email_intro: La página <a href="%{resource_url}"> de perfil </a> de %{name} (%{nickname}), a quien estás siguiendo, se ha actualizado.
-          email_outro: Has recibido esta notificación porque estás siguiendo a "%{nickname}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-          email_subject: "%{nickname} ha actualizado su perfil"
-          notification_title: La página <a href="%{resource_path}"> de perfil </a> de %{name} (%{nickname}), a quien estás siguiendo, se ha actualizado.
+          email_intro: La <a href="%{resource_url}">página de perfil</a> de %{name}, a quien estás siguiendo, se ha actualizado.
+          email_outro: Has recibido esta notificación porque estás siguiendo "%{name}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
+          email_subject: "%{name} actualizó su perfil"
+          notification_title: La <a href="%{resource_path}">página de perfil</a> de %{name}, a quien estás siguiendo, se ha actualizado.
         user_officialized:
-          email_intro: La participante %{name} (%{nickname}) ha sido oficializada.
+          email_intro: El/la participante %{name} ha sido oficializada.
           email_outro: Has recibido esta notificación porque administras la plataforma.
           email_subject: "Se ha oficializado a %{name}"
-          notification_title: La participante %{name} (%{nickname}) ha sido oficializada.
+          notification_title: El/la participante %{name} ha sido oficializada.
     export_mailer:
       download_your_data_export:
         click_button_html: Haz clic en el siguiente enlace para descargar tus datos.<br/>El archivo estará disponible para su descarga hasta el %{date}.
diff --git a/decidim-core/config/locales/eu.yml b/decidim-core/config/locales/eu.yml
index 49a1a7602e653..b19b32798f582 100644
--- a/decidim-core/config/locales/eu.yml
+++ b/decidim-core/config/locales/eu.yml
@@ -882,13 +882,13 @@ eu:
           affected_user:
             email_intro: 'Zuzenketa bat onartu da honako: %{amendable_title}. Orrialde honetatik ikusi dezakezu:'
             email_outro: 'Jakinarazpen hau jaso duzu honen egilea zarelako: %{amendable_title}.'
-            email_subject: Onartu da %{emendation_author_nickname} ren %{amendable_title} zuzenketa
-            notification_title: '<a href="%{emendation_author_path}">%{emendation_author_nickname} egileak sortutako </a><a href="% emendation_path}">zuzenketa onartu da honetarako: <a href="%{amendable_path}">%{amendable_title}</a>.'
+            email_subject: 'Onartu da %{emendation_author_name} parte-hartzailearen aldaketa honetarako: %{amendable_title}'
+            notification_title: 'Onartu da <a href="%{emendation_author_path}">%{emendation_author_name} parte-hartzaileak sortutako <a href="%{emendation_path}">aldaketa honetarako: <a href="%{amendable_path}">%{amendable_title}</a>.'
           follower:
             email_intro: 'Zuzenketa bat onartu honetarako %{amendable_title}. Orrialde honetatik ikus dezakezu:'
             email_outro: Jakinarazpen hau jaso duzu %{amendable_title} jarraitzen duzulako. Aurreko estekan sartu jakinarazpenak jasotzeari utzi nahi badiozu.
-            email_subject: '%{emendation_author_nickname} ren aldaketa onartuta honetarako: %{amendable_title}'
-            notification_title: '<a href="%{emendation_author_path}">%{emendation_author_nickname}</a> k sortutako <a href="%{emendation_path}"></a> zuzenketa onartu da honetarako: <a href="%{amendable_path}">%{amendable_title}</a>.'
+            email_subject: 'Onartu da %{emendation_author_name} parte-hartzailearen aldaketa honetarako: %{amendable_title}'
+            notification_title: 'Onartu da </a> <a href="%{emendation_author_path}">%{emendation_author_name}</a> parte-hartzaileek sortutako <a href="%{emendation_path}">aldaketa honetarako: <a href="%{amendable_path}">%{amendable_title}</a>.'
         amendment_created:
           affected_user:
             email_intro: 'Beste zuzenketa bat sortu da honetarako: %{amendable_title}. Orrialde honetatik ikusi dezakezu:'
@@ -904,29 +904,29 @@ eu:
           affected_user:
             email_intro: ' %{amendable_title} rako ukatutako zuzenketa bat %{amendable_type} berri gisa argitaratu da. Orrialde honetatik ikus dezakezu:'
             email_outro: 'Jakinarazpen hau jaso duzu honen egilea zarelako: %{amendable_title}.'
-            email_subject: 'Hemendik: %{emendation_author_nickname} zuzenketa bat argitaratu da %{amendable_type} berri gisa'
-            notification_title: <a href="%{emendation_path}">k ukatu du zuzenketa</a> honetarako <a href="%{amendable_path}">%{amendable_title}</a> argitaratu du %{amendable_type} berri gisa honek <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
+            email_subject: '%{emendation_author_name} parte-hartzailearen aldaketa bat argitaratu da %{amendable_type} berri gisa'
+            notification_title: <a href="%{emendation_path}"> k ukatu du </a> zuzenketa honetarako <a href="%{amendable_path}">%{amendable_title}</a> argitaratu du %{amendable_type} berri gisa honek <a href="%{emendation_author_path}">%{emendation_author_name}</a>.
           follower:
             email_intro: '%{amendable_title} rako zuzenketa %{amendable_type} berri gisa argitaratu da. Orrialde honetan ikusi dezakezu:'
             email_outro: Jakinarazpen hau jaso duzu %{amendable_title} jarraitzen duzulako. Aurreko esteka jarraituz jakinarazpenak jasotzeari uztea erabaki dezakezu.
-            email_subject: 'Hemendik: %{emendation_author_nickname} zuzenketa bat argitaratu da %{amendable_type} berri gisa'
-            notification_title: <a href="%{emendation_path}"> k ukatu du </a> zuzenketa honetarako <a href="%{amendable_path}">%{amendable_title}</a> argitaratu du %{amendable_type} berri gisa honek <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
+            email_subject: '%{emendation_author_name} parte-hartzailearen zuzenketa bat argitaratu da %{amendable_type} berri gisa'
+            notification_title: ' <a href="%{emendation_path}">ukatutako zuzenketa bat honetarako </a> for <a href="%{amendable_path}">%{amendable_title}</a> argitaratu du berri gisa %{amendable_type} <a href="%{emendation_author_path}">%{emendation_author_name}</a> parte-hartzaileak.'
         amendment_rejected:
           affected_user:
             email_intro: '%{amendable_title} k zuzenketa ukatu egin du. Orrialde honetan ikus dezakezu:'
             email_outro: 'Jakinarazpen hau jaso duzu honen egilea zarelako: %{amendable_title}.'
-            email_subject: Aldaketa %{amendable_title} %{emendation_author_nickname} egileak ukatua
-            notification_title: <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> k egindako <a href="%{emendation_path}">zuzenketa <a href="%{amendable_path}">%{amendable_title}</a> k ukatu du.
+            email_subject: '%{emendation_author_name} parte-hartzaileak %{amendable_title} zuzenketa ukatu du'
+            notification_title: <a href="%{emendation_author_path}">%{emendation_author_name}</a> egileak sortu duen <a href="%{emendation_path}"> </a>zuzenketa honetarako ukatu da <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Aldaketa ukatu egin da %{amendable_title}. Orrialde honetatik ikus dezakezu:'
             email_outro: Jakinarazpen hau jaso duzu %{amendable_title} jarraitzen duzulako. Aurreko estekan jakinarazpenak jasotzeari utzi ahal diozu.
-            email_subject: '%{emendation_author_nickname} egileak baztertu du %{amendable_title} aldaketa'
-            notification_title: <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> k sortutako <a href="%{emendation_path}">zuzenketa </a> <a href="%{amendable_path}">%{amendable_title}</a> k ukatu du.
+            email_subject: '%{emendation_author_name} parte-hartzaileak %{amendable_title} zuzenketa ukatu du'
+            notification_title: <a href="%{emendation_author_path}">%{emendation_author_name}</a> egileak sortu duen <a href="%{emendation_path}"> </a>zuzenketa honetarako ukatu da <a href="%{amendable_path}">%{amendable_title}</a>.
         emendation_promoted:
           follower:
             email_intro: 'Zuzenketa bat argitaratu da honetarako: %{amendable_title}. Orrialde honetatik ikus dezakezu:'
             email_outro: 'Jakinarazpen hau jaso duzu honen egilea zarelako: %{amendable_title}.'
-            email_subject: 'Hemendik: %{emendation_author_nickname} zuzenketa bat argitaratu da %{amendable_type} berri gisa'
+            email_subject: '%{emendation_author_name} parte-hartzailearen zuzenketa bat argitaratu da %{amendable_type} berri gisa'
       attachments:
         attachment_created:
           email_intro: 'Dokumentu berri bat gehitu zaio %{resource_title}-ri. Orrialde honetan ikusi dezakezu:'
@@ -977,24 +977,24 @@ eu:
           notification_title: |-
             Administratzaile batek zure %{resource_type} ezabatu du salatua izan delako arrazoi honengatik %{report_reasons}.</br><i>%{resource_content}</i>
       resource_liked:
-        email_intro: '%{liker_name} %{liker_nickname}, jarraitzen ari zaren horri "%{resource_title}" gustatu zaio, eta zuretzat interesgarria izan daitekeela uste dugu. Kontsultatu eta ekarri:'
-        email_outro: Jakinarazpen hau jaso duzu %{liker_nickname} jarraitzen duzulako. Ondorengo estekan sartu jakinarazpenak jasotzeari uzteko.
-        email_subject: "%{liker_nickname}(e) k like berri bat egin du"
-        notification_title: <a href="%{liker_path}">%{liker_name} %{liker_nickname}</a> -k <a href="%{resource_path}">%{resource_title}</a> %{resource_type} ategin du.
+        email_intro: '%{liker_name} parte-hartzaileari, jarraitzen ari zarenari, %{resource_title}" gustatu zaio, eta zuretzat interesgarria izan daitekeela uste dugu. Egiaztatu eta lagundu:'
+        email_outro: Jakinarazpen hau jaso duzu %{liker_name} jarraitzen ari zarelako. Aurreko estekan jarraitzeari utzi ahal diozu.
+        email_subject: "%{liker_name} parte-hartzaileak like berri bat egin du"
+        notification_title: <a href="%{liker_path}">%{liker_name} </a> -k <a href="%{resource_path}">%{resource_title}</a> %{resource_type} atsegin du.
       resources:
         soft_deleted:
           notification_title: Administratzaile batek ezabatu du zure "%{resource_type}" "%{resource_title}".
       users:
         profile_updated:
-          email_intro: </a> de %{name} (%{nickname}) profilaren <a href="%{resource_url}"> orria, jarraitzen ari zarena, eguneratu egin da.
-          email_outro: Jakinarazpen hau jaso duzu %{nickname} jarraitzen ari zarelako. Aurreko estekan sartu jakinarazpenak jasotzeari uzteko.
-          email_subject: "%{nickname} k bere profila eguneratu du"
-          notification_title: </a> de %{name} (%{nickname}) profilaren <a href="%{resource_path}"> orria, jarraitzen ari zarena, eguneratu egin da.
+          email_intro: '%{name} erabiltzailearen <a href="%{resource_url}">profilaren orria</a>, jarraitzen ari zarena, eguneratu egin da.'
+          email_outro: Jakinarazpen hau jaso duzu %{name} jarraitzen ari zarelako. Aurreko estekan jarraitzeari utzi ahal diozu.
+          email_subject: "%{name} parte-hartzaileak bere profila eguneratu du"
+          notification_title: </a> de %{name} profilaren <a href="%{resource_path}"> orria, jarraitzen ari zarena, eguneratu egin da.
         user_officialized:
-          email_intro: '%{name} (%{nickname}) parte-hartzailea ofizializatu egin da.'
+          email_intro: '%{name} parte-hartzailea ofizializatu egin da.'
           email_outro: Jakinarazpen hau jaso duzu erakundearen administratzailea zarelako.
           email_subject: "%{name} ofizializatu egin da"
-          notification_title: '%{name} (%{nickname}) parte-hartzailea ofizializatu egin da.'
+          notification_title: '%{name} parte-hartzailea ofizializatu egin da.'
     export_mailer:
       download_your_data_export:
         click_button_html: Sakatu hurrengo estekan zure datuak deskargatzeko. <br/> fitxategia eskuragarri egongo da %{date} arte.
diff --git a/decidim-core/config/locales/fi-plain.yml b/decidim-core/config/locales/fi-plain.yml
index a0dd6857b1ce7..00274a47967b6 100644
--- a/decidim-core/config/locales/fi-plain.yml
+++ b/decidim-core/config/locales/fi-plain.yml
@@ -884,13 +884,13 @@ fi-pl:
           affected_user:
             email_intro: 'Kohdetta %{amendable_title} koskeva muutos on hyväksytty. Näet sen tältä sivulta:'
             email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet luonut kohteen %{amendable_title}.
-            email_subject: Kohdetta %{amendable_title} koskeva muutos on hyväksytty käyttäjältä %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> luomalla <a href="%{emendation_path}">tarkistuksella</a> hyväksyttiin <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Muutos hyväksytty kohteelle %{amendable_title} osallistujalta %{emendation_author_name}
+            notification_title: Osallistujan <a href="%{emendation_author_path}">%{emendation_author_name}</a> luoma <a href="%{emendation_path}">muutos</a> hyväksyttiin kohteelle <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Kohdetta %{amendable_title} koskeva muutos on hyväksytty. Näet sen tältä sivulta:'
             email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat %{amendable_title}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
-            email_subject: Kohdetta %{amendable_title} koskeva muutos on hyväksytty käyttäjältä %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> luomalla <a href="%{emendation_path}">tarkistuksella</a> hyväksyttiin <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Muutos hyväksytty kohteelle %{amendable_title} osallistujalta %{emendation_author_name}
+            notification_title: Osallistujan <a href="%{emendation_author_path}">%{emendation_author_name}</a> luoma <a href="%{emendation_path}">muutos</a> hyväksyttiin kohteelle <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'Uusi muutos on luotu kohteelle %{amendable_title}. Näet sen tältä sivulta:'
@@ -906,29 +906,29 @@ fi-pl:
           affected_user:
             email_intro: 'Kohdetta %{amendable_title} koskeva muutos on korostettu omaksi %{amendable_type} -kohteeksi. Näet sen tältä sivulta:'
             email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet luonut kohteen %{amendable_title}.
-            email_subject: Muutos %{emendation_author_nickname} on julkaistu uutena %{amendable_type}
-            notification_title: 'A <a href="%{emendation_path}">hylätty tarkistus</a> <a href="%{amendable_path}">%{amendable_title}</a> on julkaistu uudella %{amendable_type} : llä <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.'
+            email_subject: Osallistujan %{emendation_author_name} laatima muutos on julkaistu uutena %{amendable_type} -kohteena
+            notification_title: <a href="%{emendation_path}">Hylätty muutos</a> kohteelle <a href="%{amendable_path}">%{amendable_title}</a> on julkaistu uutena %{amendable_type} -kohteena osallistujan <a href="%{emendation_author_path}">%{emendation_author_name}</a> toimesta.
           follower:
             email_intro: 'Kohdetta %{amendable_title} koskeva muutos on korostettu omaksi %{amendable_type} -kohteeksi. Näet sen tältä sivulta:'
             email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta %{amendable_title}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
-            email_subject: Muutos %{emendation_author_nickname} on julkaistu uutena %{amendable_type}
-            notification_title: 'A <a href="%{emendation_path}">hylätty tarkistus</a> <a href="%{amendable_path}">%{amendable_title}</a> on julkaistu uudella %{amendable_type} : llä <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.'
+            email_subject: Osallistujan %{emendation_author_name} laatima muutos on julkaistu uutena %{amendable_type} -kohteena
+            notification_title: <a href="%{emendation_path}">Hylätty muutos</a> kohteelle <a href="%{amendable_path}">%{amendable_title}</a> on julkaistu uutena %{amendable_type} -kohteena osallistujan <a href="%{emendation_author_path}">%{emendation_author_name}</a> toimesta.
         amendment_rejected:
           affected_user:
             email_intro: 'Kohdetta %{amendable_title} koskeva muutos on hylätty. Näet sen tältä sivulta:'
             email_outro: Olet saanut tämän ilmoituksen, koska olet kirjailija %{amendable_title}.
-            email_subject: Kohdetta %{amendable_title} koskeva muutos on hylätty käyttäjältä %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> llä luotu <a href="%{emendation_path}">tarkistusta</a> hylättiin <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Kohdetta %{amendable_title} koskeva muutos on hylätty käyttäjältä %{emendation_author_name}
+            notification_title: Osallistujan <a href="%{emendation_author_path}">%{emendation_author_name}</a> laatima <a href="%{emendation_path}">muutos</a> hylättiin kohteelle <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Kohdetta %{amendable_title} koskeva muutos on hylätty. Näet sen tältä sivulta:'
             email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta %{amendable_title}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
-            email_subject: Kohdetta %{amendable_title} koskeva muutos on hylätty käyttäjältä %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> llä luotu <a href="%{emendation_path}">tarkistusta</a> hylättiin <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Kohdetta %{amendable_title} koskeva muutos on hylätty osallistujalta %{emendation_author_name}
+            notification_title: Osallistujan <a href="%{emendation_author_path}">%{emendation_author_name}</a> laatima <a href="%{emendation_path}">muutos</a> hylättiin kohteelle <a href="%{amendable_path}">%{amendable_title}</a>.
         emendation_promoted:
           follower:
             email_intro: 'Muutos on julkaistu kohteelle %{amendable_title}. Näet sen tältä sivulta:'
             email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet laatinut kohteen %{amendable_title}.
-            email_subject: Laatijan %{emendation_author_nickname} muutos on julkaistu uutena kohteena %{amendable_type}
+            email_subject: Osallistujan %{emendation_author_name} laatima muutos on julkaistu uutena %{amendable_type} -kohteena
       attachments:
         attachment_created:
           email_intro: 'Uusi asiakirja on lisätty kohteeseen %{resource_title}. Voit nähdä sen täältä:'
@@ -979,24 +979,24 @@ fi-pl:
           notification_title: |-
             Hallintakäyttäjä poisti luomasi kohteen %{resource_type}, koska se on ilmoitettu asiattomana syyllä "%{report_reasons}".</br><i>%{resource_content}</i>
       resource_liked:
-        email_intro: '%{liker_name} %{liker_nickname}, jota seuraat, on juuri tykännyt kohteesta "%{resource_title}" ja uskomme, että tämä voi kiinnostaa sinua. Tutustu tykättyyn kohteeseen ja osallistu:'
-        email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet seuraat käyttäjää %{liker_nickname}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
-        email_subject: "%{liker_nickname} teki uuden tykkäyksen"
-        notification_title: <a href="%{liker_path}">%{liker_name} %{liker_nickname}</a> tykkäsi kohteesta <a href="%{resource_path}">%{resource_title}</a> (%{resource_type}).
+        email_intro: 'Seuraamasi osallistuja %{liker_name} tykkäsi kohteesta "%{resource_title}" ja uskomme, että tämä voi kiinnostaa sinua. Tutustu tykättyyn asiaan ja osallistu:'
+        email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet seuraat käyttäjää %{liker_name}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
+        email_subject: "%{liker_name} lisäsi uuden tykkäyksen"
+        notification_title: <a href="%{liker_path}">%{liker_name} </a> tykkäsi kohteesta <a href="%{resource_path}">%{resource_title}</a> %{resource_type}.
       resources:
         soft_deleted:
           notification_title: Ylläpitäjä poisti kohteen "%{resource_type}" "%{resource_title}".
       users:
         profile_updated:
-          email_intro: Seuraamasi käyttäjän %{name} (%{nickname}) <a href="%{resource_url}">profiilisivua</a> on päivitetty.
-          email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat käyttäjää %{nickname}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
-          email_subject: "%{nickname} päivitti profiiliaan"
-          notification_title: Seuraamasi käyttäjän %{name} (%{nickname}) <a href="%{resource_path}">profiilisivua</a> on päivitetty.
+          email_intro: Seuraamasi osallistujan %{name} <a href="%{resource_url}">profiilisivua</a> on päivitetty.
+          email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet seuraat osallistujaa %{name}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
+          email_subject: "%{name} päivitti profiiliaan"
+          notification_title: Seuraamasi osallistujan %{name} <a href="%{resource_path}">profiilisivua</a> on päivitetty.
         user_officialized:
-          email_intro: Osallistuja %{name} (%{nickname}) on virallistettu.
+          email_intro: Osallistuja %{name} on virallistettu.
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet tämän organisaation hallintakäyttäjä.
           email_subject: "%{name} on virallistettu"
-          notification_title: Osallistuja %{name} (%{nickname}) on virallistettu.
+          notification_title: Osallistuja %{name} on virallistettu.
     export_mailer:
       download_your_data_export:
         click_button_html: Napsauta seuraavaa linkkiä ladataksesi tietosi.<br/>Tiedosto on ladattavissa %{date} saakka.
diff --git a/decidim-core/config/locales/fi.yml b/decidim-core/config/locales/fi.yml
index ecb28b6949bbe..4728e12f2c3f2 100644
--- a/decidim-core/config/locales/fi.yml
+++ b/decidim-core/config/locales/fi.yml
@@ -884,13 +884,13 @@ fi:
           affected_user:
             email_intro: 'Kohdetta %{amendable_title} koskeva muutos on hyväksytty. Voit tutustua siihen sivulta:'
             email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet laatinut kohteen %{amendable_title}.
-            email_subject: Kohdetta %{amendable_title} koskeva muutos on hyväksytty käyttäjältä %{emendation_author_nickname}
-            notification_title: Käyttäjän <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> luoma <a href="%{emendation_path}">muutos</a> hyväksyttiin kohteelle <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Muutos hyväksytty kohteelle %{amendable_title} osallistujalta %{emendation_author_name}
+            notification_title: Osallistujan <a href="%{emendation_author_path}">%{emendation_author_name}</a> luoma <a href="%{emendation_path}">muutos</a> hyväksyttiin kohteelle <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Kohdetta %{amendable_title} koskeva muutos on hyväksytty. Voit tutustua siihen sivulta:'
             email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat %{amendable_title}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
-            email_subject: Kohdetta %{amendable_title} koskeva muutos on hyväksytty käyttäjältä %{emendation_author_nickname}
-            notification_title: Käyttäjän <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> luoma <a href="%{emendation_path}">muutos</a> hyväksyttiin kohteelle <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Muutos hyväksytty kohteelle %{amendable_title} osallistujalta %{emendation_author_name}
+            notification_title: Osallistujan <a href="%{emendation_author_path}">%{emendation_author_name}</a> luoma <a href="%{emendation_path}">muutos</a> hyväksyttiin kohteelle <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'Uusi muutos on luotu kohteelle %{amendable_title}. Voit tutustua siihen sivulta:'
@@ -906,29 +906,29 @@ fi:
           affected_user:
             email_intro: 'Kohdetta %{amendable_title} koskeva muutos on julkaistu uutena kohteena %{amendable_type}. Voit tutustua siihen sivulta:'
             email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet laatinut kohteen %{amendable_title}.
-            email_subject: Käyttäjän %{emendation_author_nickname} laatima muutos on julkaistu uutena %{amendable_type} -kohteena
-            notification_title: <a href="%{emendation_path}">Hylätty muutos</a> kohteelle <a href="%{amendable_path}">%{amendable_title}</a> on julkaistu uutena %{amendable_type} -kohteena käyttäjän <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> toimesta.
+            email_subject: Osallistujan %{emendation_author_name} laatima muutos on julkaistu uutena %{amendable_type} -kohteena
+            notification_title: <a href="%{emendation_path}">Hylätty muutos</a> kohteelle <a href="%{amendable_path}">%{amendable_title}</a> on julkaistu uutena %{amendable_type} -kohteena osallistujan <a href="%{emendation_author_path}">%{emendation_author_name}</a> toimesta.
           follower:
             email_intro: 'Kohdetta %{amendable_title} koskeva muutos on julkaistu uutena kohteena %{amendable_type}. Voit tutustua siihen sivulta:'
             email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta %{amendable_title}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
-            email_subject: Muutos %{emendation_author_nickname} on julkaistu uutena %{amendable_type} -kohteena
-            notification_title: <a href="%{emendation_path}">Hylätty muutos</a> kohteelle <a href="%{amendable_path}">%{amendable_title}</a> on julkaistu uutena %{amendable_type} -kohteena käyttäjän <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> toimesta.
+            email_subject: Osallistujan %{emendation_author_name} laatima muutos on julkaistu uutena %{amendable_type} -kohteena
+            notification_title: <a href="%{emendation_path}">Hylätty muutos</a> kohteelle <a href="%{amendable_path}">%{amendable_title}</a> on julkaistu uutena %{amendable_type} -kohteena osallistujan <a href="%{emendation_author_path}">%{emendation_author_name}</a> toimesta.
         amendment_rejected:
           affected_user:
             email_intro: 'Kohdetta %{amendable_title} koskeva muutos on hylätty. Voit tutustua siihen sivulta:'
             email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet laatinut kohteen %{amendable_title}.
-            email_subject: Kohdetta %{amendable_title} koskeva muutos on hylätty käyttäjältä %{emendation_author_nickname}
-            notification_title: Käyttäjän <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> laatima <a href="%{emendation_path}">muutos</a> hylättiin kohteelle <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Kohdetta %{amendable_title} koskeva muutos on hylätty käyttäjältä %{emendation_author_name}
+            notification_title: Osallistujan <a href="%{emendation_author_path}">%{emendation_author_name}</a> laatima <a href="%{emendation_path}">muutos</a> hylättiin kohteelle <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Kohdetta %{amendable_title} koskeva muutos on hylätty. Voit tutustua siihen sivulta:'
             email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta %{amendable_title}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
-            email_subject: Kohdetta %{amendable_title} koskeva muutos on hylätty käyttäjältä %{emendation_author_nickname}
-            notification_title: Käyttäjän <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> laatima <a href="%{emendation_path}">muutos</a> hylättiin kohteelle <a href="%{amendable_path}">%{amendable_title}</a>.
+            email_subject: Kohdetta %{amendable_title} koskeva muutos on hylätty osallistujalta %{emendation_author_name}
+            notification_title: Osallistujan <a href="%{emendation_author_path}">%{emendation_author_name}</a> laatima <a href="%{emendation_path}">muutos</a> hylättiin kohteelle <a href="%{amendable_path}">%{amendable_title}</a>.
         emendation_promoted:
           follower:
             email_intro: 'Muutos on julkaistu kohteelle %{amendable_title}. Näet sen tältä sivulta:'
             email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet laatinut kohteen %{amendable_title}.
-            email_subject: Laatijan %{emendation_author_nickname} muutos on julkaistu uutena kohteena %{amendable_type}
+            email_subject: Osallistujan %{emendation_author_name} laatima muutos on julkaistu uutena %{amendable_type} -kohteena
       attachments:
         attachment_created:
           email_intro: 'Uusi asiakirja on lisätty kohteeseen %{resource_title}. Voit tutustua siihen sivulta:'
@@ -979,24 +979,24 @@ fi:
           notification_title: |-
             Hallintakäyttäjä poisti luomasi kohteen %{resource_type}, koska se on ilmoitettu asiattomana syyllä "%{report_reasons}".</br><i>%{resource_content}</i>
       resource_liked:
-        email_intro: '%{liker_name} %{liker_nickname}, jota seuraat, on juuri tykännyt kohteesta "%{resource_title}" ja uskomme, että tämä voi kiinnostaa sinua. Tutustu tykättyyn kohteeseen ja osallistu:'
-        email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet seuraat käyttäjää %{liker_nickname}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
-        email_subject: "%{liker_nickname} teki uuden tykkäyksen"
-        notification_title: <a href="%{liker_path}">%{liker_name} %{liker_nickname}</a> tykkäsi kohteesta <a href="%{resource_path}">%{resource_title}</a> (%{resource_type}).
+        email_intro: 'Seuraamasi osallistuja %{liker_name} tykkäsi kohteesta "%{resource_title}" ja uskomme, että tämä voi kiinnostaa sinua. Tutustu tykättyyn asiaan ja osallistu:'
+        email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet seuraat käyttäjää %{liker_name}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
+        email_subject: "%{liker_name} lisäsi uuden tykkäyksen"
+        notification_title: <a href="%{liker_path}">%{liker_name} </a> tykkäsi kohteesta <a href="%{resource_path}">%{resource_title}</a> %{resource_type}.
       resources:
         soft_deleted:
           notification_title: Ylläpitäjä poisti kohteen "%{resource_type}" "%{resource_title}".
       users:
         profile_updated:
-          email_intro: Seuraamasi käyttäjän %{name} (%{nickname}) <a href="%{resource_url}">profiilisivua</a> on päivitetty.
-          email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat käyttäjää %{nickname}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
-          email_subject: "%{nickname} päivitti profiiliaan"
-          notification_title: Seuraamasi käyttäjän %{name} (%{nickname}) <a href="%{resource_path}">profiilisivua</a> on päivitetty.
+          email_intro: Seuraamasi osallistujan %{name} <a href="%{resource_url}">profiilisivua</a> on päivitetty.
+          email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet seuraat osallistujaa %{name}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
+          email_subject: "%{name} päivitti profiiliaan"
+          notification_title: Seuraamasi osallistujan %{name} <a href="%{resource_path}">profiilisivua</a> on päivitetty.
         user_officialized:
-          email_intro: Osallistuja %{name} (%{nickname}) on virallistettu.
+          email_intro: Osallistuja %{name} on virallistettu.
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet tämän organisaation hallintakäyttäjä.
           email_subject: "%{name} on virallistettu"
-          notification_title: Osallistuja %{name} (%{nickname}) on virallistettu.
+          notification_title: Osallistuja %{name} on virallistettu.
     export_mailer:
       download_your_data_export:
         click_button_html: Napsauta seuraavaa linkkiä ladataksesi tietosi.<br/>Tiedosto on ladattavissa %{date} saakka.
diff --git a/decidim-core/config/locales/fr-CA.yml b/decidim-core/config/locales/fr-CA.yml
index c4782e10beb84..dcce1e44e33fc 100644
--- a/decidim-core/config/locales/fr-CA.yml
+++ b/decidim-core/config/locales/fr-CA.yml
@@ -791,13 +791,9 @@ fr-CA:
           affected_user:
             email_intro: 'Une modification a été acceptée pour %{amendable_title}. Vous pouvez le voir sur cette page:'
             email_outro: Vous avez reçu cette notification parce que vous êtes l'auteur de %{amendable_title}.
-            email_subject: Un amendement accepté pour %{amendable_title} du %{emendation_author_nickname}
-            notification_title: Le <a href="%{emendation_path}">amendement</a> créé par <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> a été accepté pour <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Une modification a été acceptée pour %{amendable_title}. Vous pouvez le voir sur cette page:'
             email_outro: Vous avez reçu cette notification parce que vous suivez %{amendable_title}. Vous pouvez cesser de recevoir des notifications en suivant le lien précédent.
-            email_subject: Un amendement accepté pour %{amendable_title} du %{emendation_author_nickname}
-            notification_title: Le <a href="%{emendation_path}">amendement</a> créé par <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> a été accepté pour <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'Une nouvelle modification a été créée pour %{amendable_title}. Vous pouvez le voir sur cette page:'
@@ -813,29 +809,20 @@ fr-CA:
           affected_user:
             email_intro: 'Une modification rejetée pour %{amendable_title} a été promue en %{amendable_type}indépendante. Vous pouvez le voir sur cette page:'
             email_outro: Vous avez reçu cette notification parce que vous êtes l'auteur de %{amendable_title}.
-            email_subject: Un amendement de %{emendation_author_nickname} a été publié en tant que nouveau %{amendable_type}
-            notification_title: A <a href="%{emendation_path}">a rejeté l' amendement</a> pour <a href="%{amendable_path}">%{amendable_title}</a> a été publiée en tant que nouveau %{amendable_type} par <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
           follower:
             email_intro: 'Une modification rejetée pour %{amendable_title} a été promue en %{amendable_type}indépendante. Vous pouvez le voir sur cette page:'
             email_outro: Vous avez reçu cette notification parce que vous suivez %{amendable_title}. Vous pouvez cesser de recevoir des notifications en suivant le lien précédent.
-            email_subject: Un amendement de %{emendation_author_nickname} a été publié en tant que nouveau %{amendable_type}
-            notification_title: A <a href="%{emendation_path}">a rejeté l' amendement</a> pour <a href="%{amendable_path}">%{amendable_title}</a> a été publiée en tant que nouveau %{amendable_type} par <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'Une modification a été rejetée pour %{amendable_title}. Vous pouvez le voir sur cette page:'
             email_outro: Vous avez reçu cette notification parce que vous êtes l'auteur de %{amendable_title}.
-            email_subject: Un amendement rejeté pour %{amendable_title} à %{emendation_author_nickname}
-            notification_title: Le <a href="%{emendation_path}">amendement</a> créé par <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> a été rejetée pour <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Une modification a été rejetée pour %{amendable_title}. Vous pouvez le voir sur cette page:'
             email_outro: Vous avez reçu cette notification parce que vous suivez %{amendable_title}. Vous pouvez cesser de recevoir des notifications en suivant le lien précédent.
-            email_subject: Un amendement rejeté pour %{amendable_title} à %{emendation_author_nickname}
-            notification_title: Le <a href="%{emendation_path}">amendement</a> créé par <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> a été rejetée pour <a href="%{amendable_path}">%{amendable_title}</a>.
         emendation_promoted:
           follower:
             email_intro: 'Une correction a été publiée pour %{amendable_title}. Vous pouvez la voir sur cette page :'
             email_outro: Vous avez reçu cette notification parce que vous êtes un(e) auteur/trice de %{amendable_title}.
-            email_subject: Une correction réalisée par %{emendation_author_nickname} a été publiée en tant que nouvelle %{amendable_type}
       attachments:
         attachment_created:
           email_intro: 'Un nouveau document a été ajouté à %{resource_title}. Vous pouvez le voir sur cette page :'
@@ -878,15 +865,10 @@ fr-CA:
             <i>%{resource_content}</i>
       users:
         profile_updated:
-          email_intro: Le <a href="%{resource_url}">profil public</a> de %{name} (%{nickname}), que vous suivez, a été mis à jour.
-          email_outro: Vous recevez cette notification car vous suivez « %{nickname} ». Vous pouvez cesser de le suivre à partir du lien précédent.
-          email_subject: "%{nickname} a mis à jour son profil public"
-          notification_title: Le <a href="%{resource_path}">profil public</a> de %{name} (%{nickname}), que vous suivez, a été mis à jour.
+          email_subject: "%{name} a mis à jour son profil"
         user_officialized:
-          email_intro: Le participant %{name} (%{nickname}) a été officialisé.
           email_outro: Vous avez reçu cette notification parce que vous êtes un administrateur de l'organisation. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
           email_subject: "%{name} a été officialisé"
-          notification_title: Le participant %{name} (%{nickname}) a été officialisé.
     export_mailer:
       download_your_data_export:
         click_button_html: Cliquez sur le lien suivant pour télécharger vos données.<br/>Le fichier sera disponible au téléchargement jusqu'à %{date}.
diff --git a/decidim-core/config/locales/fr.yml b/decidim-core/config/locales/fr.yml
index 219922a375d71..85d2a06e99b4c 100644
--- a/decidim-core/config/locales/fr.yml
+++ b/decidim-core/config/locales/fr.yml
@@ -791,13 +791,9 @@ fr:
           affected_user:
             email_intro: 'Une modification a été acceptée pour %{amendable_title}. Vous pouvez le voir sur cette page:'
             email_outro: Vous avez reçu cette notification parce que vous êtes l'auteur de %{amendable_title}. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
-            email_subject: Un amendement accepté pour %{amendable_title} du %{emendation_author_nickname}
-            notification_title: Le <a href="%{emendation_path}">amendement</a> créé par <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> a été accepté pour <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Une modification a été acceptée pour %{amendable_title}. Vous pouvez le voir sur cette page:'
             email_outro: Vous avez reçu cette notification parce que vous suivez %{amendable_title}. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
-            email_subject: Un amendement accepté pour %{amendable_title} du %{emendation_author_nickname}
-            notification_title: Le <a href="%{emendation_path}">amendement</a> créé par <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> a été accepté pour <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'Une nouvelle modification a été créée pour %{amendable_title}. Vous pouvez le voir sur cette page:'
@@ -813,29 +809,20 @@ fr:
           affected_user:
             email_intro: 'Une modification rejetée pour %{amendable_title} a été promue en %{amendable_type}indépendante. Vous pouvez le voir sur cette page:'
             email_outro: Vous avez reçu cette notification parce que vous êtes l'auteur de %{amendable_title}. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
-            email_subject: Un amendement de %{emendation_author_nickname} a été publié en tant que nouveau %{amendable_type}
-            notification_title: A <a href="%{emendation_path}">a rejeté l' amendement</a> pour <a href="%{amendable_path}">%{amendable_title}</a> a été publiée en tant que nouveau %{amendable_type} par <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
           follower:
             email_intro: 'Une modification rejetée pour %{amendable_title} a été promue en %{amendable_type}indépendante. Vous pouvez le voir sur cette page:'
             email_outro: Vous avez reçu cette notification parce que vous suivez %{amendable_title}. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
-            email_subject: Un amendement de %{emendation_author_nickname} a été publié en tant que nouveau %{amendable_type}
-            notification_title: A <a href="%{emendation_path}">a rejeté l' amendement</a> pour <a href="%{amendable_path}">%{amendable_title}</a> a été publiée en tant que nouveau %{amendable_type} par <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'Une modification a été rejetée pour %{amendable_title}. Vous pouvez le voir sur cette page:'
             email_outro: Vous avez reçu cette notification parce que vous êtes l'auteur de %{amendable_title}. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
-            email_subject: Un amendement rejeté pour %{amendable_title} à %{emendation_author_nickname}
-            notification_title: Le <a href="%{emendation_path}">amendement</a> créé par <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> a été rejetée pour <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Une modification a été rejetée pour %{amendable_title}. Vous pouvez le voir sur cette page:'
             email_outro: Vous avez reçu cette notification parce que vous suivez %{amendable_title}. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
-            email_subject: Un amendement rejeté pour %{amendable_title} à %{emendation_author_nickname}
-            notification_title: Le <a href="%{emendation_path}">amendement</a> créé par <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> a été rejetée pour <a href="%{amendable_path}">%{amendable_title}</a>.
         emendation_promoted:
           follower:
             email_intro: 'Une correction a été publiée pour %{amendable_title}. Vous pouvez la voir sur cette page :'
             email_outro: Vous avez reçu cette notification parce que vous êtes un(e) auteur/trice de %{amendable_title}.
-            email_subject: Une correction réalisée par %{emendation_author_nickname} a été publiée en tant que nouvelle %{amendable_type}
       attachments:
         attachment_created:
           email_intro: 'Un nouveau document a été ajouté à %{resource_title}. Vous pouvez le voir sur cette page :'
@@ -878,15 +865,10 @@ fr:
             <i>%{resource_content}</i>
       users:
         profile_updated:
-          email_intro: Le <a href="%{resource_url}">profil public</a> de %{name} (%{nickname}), que vous suivez, a été mis à jour.
-          email_outro: Vous recevez cette notification car vous suivez « %{nickname} ». Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
-          email_subject: "%{nickname} a mis à jour son profil public"
-          notification_title: Le <a href="%{resource_path}">profil public</a> de %{name} (%{nickname}), que vous suivez, a été mis à jour.
+          email_subject: "%{name} a mis à jour son profil"
         user_officialized:
-          email_intro: Le participant %{name} (%{nickname}) a été officialisé.
           email_outro: Vous avez reçu cette notification parce que vous êtes un administrateur de l'organisation. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
           email_subject: "%{name} a été officialisé"
-          notification_title: Le participant %{name} (%{nickname}) a été officialisé.
     export_mailer:
       download_your_data_export:
         click_button_html: Cliquez sur le lien suivant pour télécharger vos données.<br/>Le fichier sera disponible au téléchargement jusqu'à %{date}.
diff --git a/decidim-core/config/locales/gl.yml b/decidim-core/config/locales/gl.yml
index 53b973e249d63..4d45aca54ef0f 100644
--- a/decidim-core/config/locales/gl.yml
+++ b/decidim-core/config/locales/gl.yml
@@ -316,13 +316,9 @@ gl:
           affected_user:
             email_intro: 'A emenda foi aceptada para %{amendable_title}. Podes velo desde esta páxina:'
             email_outro: Recibiches esta notificación porque es un autor de %{amendable_title}.
-            email_subject: Unha enmenda aceptada para %{amendable_title} de %{emendation_author_nickname}
-            notification_title: A <a href="%{emendation_path}">cambio</a> creado por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> foi aceptado para <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'A emenda foi aceptada para %{amendable_title}. Podes velo desde esta páxina:'
             email_outro: Recibiches esta notificación porque estás seguindo %{amendable_title}. Podes deixar de recibir notificacións seguindo a ligazón anterior.
-            email_subject: Unha enmenda aceptada para %{amendable_title} de %{emendation_author_nickname}
-            notification_title: A <a href="%{emendation_path}">cambio</a> creado por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> foi aceptado para <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'Creouse unha nova emenda para %{amendable_title}. Podes velo desde esta páxina:'
@@ -338,24 +334,16 @@ gl:
           affected_user:
             email_intro: 'Unha enmenda rexeitada para %{amendable_title} foi promovida a unha independente %{amendable_type}. Podes velo desde esta páxina:'
             email_outro: Recibiches esta notificación porque es un autor de %{amendable_title}.
-            email_subject: Unha emenda de %{emendation_author_nickname} publicouse como un novo %{amendable_type}
-            notification_title: Un <a href="%{emendation_path}">rexeitado cambio</a> para <a href="%{amendable_path}">%{amendable_title}</a> publicouse como unha nova %{amendable_type} por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
           follower:
             email_intro: 'Unha enmenda rexeitada para %{amendable_title} foi promovida a unha independente %{amendable_type}. Podes velo desde esta páxina:'
             email_outro: Recibiches esta notificación porque estás seguindo %{amendable_title}. Podes deixar de recibir notificacións seguindo a ligazón anterior.
-            email_subject: Unha emenda de %{emendation_author_nickname} publicouse como un novo %{amendable_type}
-            notification_title: Un <a href="%{emendation_path}">rexeitado cambio</a> para <a href="%{amendable_path}">%{amendable_title}</a> publicouse como unha nova %{amendable_type} por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'Rexeitouse unha modificación para %{amendable_title}. Podes velo desde esta páxina:'
             email_outro: Recibiches esta notificación porque es un autor de %{amendable_title}.
-            email_subject: Unha enmenda rexeitada para %{amendable_title} de %{emendation_author_nickname}
-            notification_title: A <a href="%{emendation_path}">cambio</a> creado por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> foi rexeitado por <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Rexeitouse unha modificación para %{amendable_title}. Podes velo desde esta páxina:'
             email_outro: Recibiches esta notificación porque estás seguindo %{amendable_title}. Podes deixar de recibir notificacións seguindo a ligazón anterior.
-            email_subject: Unha enmenda rexeitada para %{amendable_title} de %{emendation_author_nickname}
-            notification_title: A <a href="%{emendation_path}">cambio</a> creado por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> foi rexeitado por <a href="%{amendable_path}">%{amendable_title}</a>.
       attachments:
         attachment_created:
           email_intro: 'Engadiuse un novo documento a %{resource_title}. Podes velo desde esta páxina:'
@@ -379,16 +367,9 @@ gl:
         level_up:
           email_outro: Recibiches esta notificación porque realizaches actividade no noso sitio web.
       users:
-        profile_updated:
-          email_intro: O <a href="%{resource_url}">profile páxina</a> de %{name} (%{nickname}), quen está a seguir, foi actualizado.
-          email_outro: Recibiches esta notificación porque estás seguindo %{nickname}. Podes deixar de recibir notificacións seguindo a ligazón anterior.
-          email_subject: "%{nickname} actualizou o seu perfil"
-          notification_title: O <a href="%{resource_path}">profile páxina</a> de %{name} (%{nickname}), quen está a seguir, foi actualizado.
         user_officialized:
-          email_intro: O participante %{name} (%{nickname}) foi oficializado.
           email_outro: Recibiches esta notificación por que es administrador da organización.
           email_subject: "%{name} foi oficializado"
-          notification_title: O participante %{name} (%{nickname}) foi oficializado.
     export_mailer:
       download_your_data_export:
         download: Descarga
diff --git a/decidim-core/config/locales/hu.yml b/decidim-core/config/locales/hu.yml
index 682842cb52be5..c03e3badd96a7 100644
--- a/decidim-core/config/locales/hu.yml
+++ b/decidim-core/config/locales/hu.yml
@@ -583,13 +583,9 @@ hu:
           affected_user:
             email_intro: 'Módosítást fogadtak el %{amendable_title}. Láthatja ezt erről az oldalról:'
             email_outro: Ezt az értesítést megkaptuk, mert Ön szerzője a %{amendable_title}.
-            email_subject: Egy módosítás elfogadva %{amendable_title} innen %{emendation_author_nickname}
-            notification_title: A <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> által létrehozott <a href="%{emendation_path}"></a> módosítás elfogadott <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Módosítást fogadtak el %{amendable_title}. Láthatja ezt az oldalról:'
             email_outro: Ezt az értesítést megkapta, mert %{amendable_title} követi. Leállíthatja az értesítések fogadását az előző link segítségével.
-            email_subject: Egy módosítás elfogadva %{amendable_title} -ra %{emendation_author_nickname}-tól
-            notification_title: A <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> által létrehozott <a href="%{emendation_path}"></a> módosítás elfogadásra került. <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'Új módosítási javaslat érkezett - %{amendable_title}. Erről az oldalról tudod megnézni:'
@@ -605,24 +601,16 @@ hu:
           affected_user:
             email_intro: 'Ezt az elutasított módosítást %{amendable_title} önálló módosítássá %{amendable_type} emelték. Láthatja ezt az oldalról:'
             email_outro: Ezt az értesítést azért kapta, mert Ön szerzője a %{amendable_title} dokumentumnak.
-            email_subject: A %{emendation_author_nickname} ból származó módosítást új szövegként tették közzé %{amendable_type}
-            notification_title: A <a href="%{emendation_path}">elutasított módosítás </a> erre<a href="%{amendable_path}">%{amendable_title}</a> újként %{amendable_type} került közzétételre <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
           follower:
             email_intro: 'A %{amendable_title} című elutasított módosítást önálló %{amendable_type} módosításra emelték. Láthatja ezt az oldalról:'
             email_outro: Ezt az értesítést azért kapta, mert a %{amendable_title} követi. Leállíthatja az értesítések fogadását az előző link segítségével.
-            email_subject: A %{emendation_author_nickname} tól származó módosítást új szövegként tették közzé %{amendable_type}
-            notification_title: A <a href="%{emendation_path}">elutasított módosítása </a> a <a href="%{amendable_path}">%{amendable_title}</a> re vonatkozóan újként került közzétételre %{amendable_type} <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'Egy módosítást elutasítottunk %{amendable_title}. Láthatja ezt az oldalról:'
             email_outro: Ezt az értesítést azért kapta, mert Ön szerzője a %{amendable_title} dokumentumnak.
-            email_subject: Egy módosítás elutasítva %{amendable_title} melynek szerzője %{emendation_author_nickname}
-            notification_title: A <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> által létrehozott <a href="%{emendation_path}"></a> módosítást elutasították <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Egy módosítást elutasítottunk %{amendable_title}. Látható ez az oldalról:'
             email_outro: Ezt az értesítést azért kapta, mert a %{amendable_title}-t követi. Leállíthatja az értesítések fogadását az előző link segítségével.
-            email_subject: "A %{emendation_author_nickname} által létrehozott módosítás itt \n%{amendable_title} elutasításra került"
-            notification_title: A <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> által létrehozott <a href="%{emendation_path}"></a> módosítás elutasításra került <a href="%{amendable_path}">%{amendable_title}</a>.
       attachments:
         attachment_created:
           email_intro: 'Új dokumentumot adtak hozzá a következőhöz: %{resource_title}. Innen érheted el:'
@@ -664,11 +652,6 @@ hu:
             Egy adminisztrátor eltávolította a %{resource_type} -ját mert %{report_reasons}-ként jelentették </br>
             <i>%{resource_content}</i>
       users:
-        profile_updated:
-          email_intro: '%{name} (%{nickname}) (akit követsz) <a href="%{resource_url}">profil oldala</a> frissült.'
-          email_outro: 'Ezt az értesítést azért kaptad, mert őt követed: "%{nickname}". Az értesítéseket a következő linkre kattintva kapcsolhatod ki.'
-          email_subject: "%{nickname} frissítette profilját"
-          notification_title: '%{name} (%{nickname}) (akit egyébként követsz) <a href="%{resource_path}">profil oldala</a> frissült.'
         user_officialized:
           email_outro: Azért kapta ezt az értesítést, mert Ön a szervezet adminisztrátora.
           email_subject: "%{name} regisztrációja hivatalossá lett téva"
diff --git a/decidim-core/config/locales/id-ID.yml b/decidim-core/config/locales/id-ID.yml
index 752167635d9b9..3b200959972b0 100644
--- a/decidim-core/config/locales/id-ID.yml
+++ b/decidim-core/config/locales/id-ID.yml
@@ -298,13 +298,9 @@ id:
           affected_user:
             email_intro: 'Amendemen telah diterima untuk %{amendable_title}. Anda dapat melihatnya dari halaman ini:'
             email_outro: Anda telah menerima pemberitahuan ini karena Anda adalah seorang pengarang %{amendable_title}.
-            email_subject: Amandemen diterima untuk %{amendable_title} dari %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">amendemen</a> dibuat oleh <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> telah diterima untuk <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Amendemen telah diterima untuk %{amendable_title}. Anda dapat melihatnya dari halaman ini:'
             email_outro: Anda telah menerima pemberitahuan ini karena Anda mengikuti %{amendable_title}. Anda dapat berhenti menerima notifikasi mengikuti tautan sebelumnya.
-            email_subject: Amandemen diterima untuk %{amendable_title} dari %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">amendemen</a> dibuat oleh <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> telah diterima untuk <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'Sebuah perubahan baru telah dibuat untuk %{amendable_title}. Anda dapat melihatnya dari halaman ini:'
@@ -320,24 +316,16 @@ id:
           affected_user:
             email_intro: 'Suatu emendasi yang ditolak untuk %{amendable_title} telah dipromosikan menjadi independen %{amendable_type}. Anda dapat melihatnya dari halaman ini:'
             email_outro: Anda telah menerima pemberitahuan ini karena Anda adalah seorang pengarang %{amendable_title}.
-            email_subject: Amandemen dari %{emendation_author_nickname} telah diterbitkan sebagai %{amendable_type}baru
-            notification_title: Amandemen</a> <a href="%{emendation_path}">ditolak untuk <a href="%{amendable_path}">%{amendable_title}</a> telah dipublikasikan sebagai %{amendable_type} baru oleh <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>
           follower:
             email_intro: 'Suatu emendasi yang ditolak untuk %{amendable_title} telah dipromosikan menjadi independen %{amendable_type}. Anda dapat melihatnya dari halaman ini:'
             email_outro: Anda telah menerima pemberitahuan ini karena Anda mengikuti %{amendable_title}. Anda dapat berhenti menerima notifikasi mengikuti tautan sebelumnya.
-            email_subject: Amandemen dari %{emendation_author_nickname} telah diterbitkan sebagai %{amendable_type}baru
-            notification_title: Amandemen</a> <a href="%{emendation_path}">ditolak untuk <a href="%{amendable_path}">%{amendable_title}</a> telah dipublikasikan sebagai %{amendable_type} baru oleh <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>
         amendment_rejected:
           affected_user:
             email_intro: 'Amendemen telah ditolak untuk %{amendable_title}. Anda dapat melihatnya dari halaman ini:'
             email_outro: Anda telah menerima pemberitahuan ini karena Anda adalah seorang pengarang %{amendable_title}.
-            email_subject: Amandemen ditolak untuk %{amendable_title} dari %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">amendemen</a> dibuat oleh <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> telah ditolak untuk <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Amendemen telah ditolak untuk %{amendable_title}. Anda dapat melihatnya dari halaman ini:'
             email_outro: Anda telah menerima pemberitahuan ini karena Anda mengikuti %{amendable_title}. Anda dapat berhenti menerima notifikasi mengikuti tautan sebelumnya.
-            email_subject: Amandemen ditolak untuk %{amendable_title} dari %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">amendemen</a> dibuat oleh <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> telah ditolak untuk <a href="%{amendable_path}">%{amendable_title}</a>.
       attachments:
         attachment_created:
           email_intro: 'Dokumen baru telah ditambahkan ke %{resource_title}. Anda dapat melihatnya dari halaman ini:'
@@ -360,12 +348,6 @@ id:
           email_outro: Anda telah menerima pemberitahuan ini karena Anda melakukan aktivitas di situs web kami.
         level_up:
           email_outro: Anda telah menerima pemberitahuan ini karena Anda melakukan aktivitas di situs web kami.
-      users:
-        profile_updated:
-          email_intro: Halaman <a href="%{resource_url}">profil</a> dari %{name} (%{nickname}), yang Anda ikuti, telah diperbarui.
-          email_outro: Anda telah menerima pemberitahuan ini karena Anda mengikuti %{nickname}. Anda dapat berhenti menerima notifikasi mengikuti tautan sebelumnya.
-          email_subject: "%{nickname} memperbarui profil mereka"
-          notification_title: Halaman <a href="%{resource_path}">profil</a> dari %{name} (%{nickname}), yang Anda ikuti, telah diperbarui.
     export_mailer:
       download_your_data_export:
         download: Unduh
diff --git a/decidim-core/config/locales/is-IS.yml b/decidim-core/config/locales/is-IS.yml
index d384132d0bd6f..53196b754db7a 100644
--- a/decidim-core/config/locales/is-IS.yml
+++ b/decidim-core/config/locales/is-IS.yml
@@ -172,12 +172,6 @@ is:
         email_intro: 'Það hefur verið uppfært í "%{resource_title}". Þú getur séð það frá þessari síðu:'
         email_outro: Þú hefur fengið þessa tilkynningu vegna þess að þú fylgist með "%{resource_title}". Þú getur sleppt því frá fyrri tengilinn.
         email_subject: Uppfærsla á %{resource_title}
-      users:
-        profile_updated:
-          email_intro: <a href="%{resource_url}">prófíl síðu</a> af %{name} (%{nickname}), sem þú fylgist með, hefur verið uppfærð.
-          email_outro: Þú hefur fengið þessa tilkynningu vegna þess að þú fylgist með %{nickname}. Þú getur hætt við að fá tilkynningar eftir fyrri tengilinn.
-          email_subject: "%{nickname} uppfærði prófílinn sinn"
-          notification_title: <a href="%{resource_path}">prófíl síðu</a> af %{name} (%{nickname}), sem þú fylgist með, hefur verið uppfærð.
     export_mailer:
       subject: Útflutningur þinn "%{name}" er tilbúinn
     filters:
diff --git a/decidim-core/config/locales/it.yml b/decidim-core/config/locales/it.yml
index 4f75aa55b001b..d4b115c352276 100644
--- a/decidim-core/config/locales/it.yml
+++ b/decidim-core/config/locales/it.yml
@@ -541,13 +541,9 @@ it:
           affected_user:
             email_intro: 'Un''emendamento è stato accettato per %{amendable_title}. Puoi vederlo da questa pagina:'
             email_outro: Hai ricevuto questa notifica perché sei un autore di %{amendable_title}.
-            email_subject: Un emendamento accettato per %{amendable_title} %{emendation_author_nickname}
-            notification_title: Il <a href="%{emendation_path}">modifica</a> creato da <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> è stato accettato per <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Un''emendamento è stato accettato per %{amendable_title}. Puoi vederlo da questa pagina:'
             email_outro: Hai ricevuto questa notifica perché stai seguendo %{amendable_title}. È possibile interrompere la ricezione di notifiche facendo click su pulsante Smetti di seguire nella pagina del processo o del contenuto che stai seguendo.
-            email_subject: Un emendamento accettato per %{amendable_title} %{emendation_author_nickname}
-            notification_title: Il <a href="%{emendation_path}">modifica</a> creato da <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> è stato accettato per <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'Una nuova emendazione è stata creata per %{amendable_title}. Puoi vederlo da questa pagina:'
@@ -563,24 +559,16 @@ it:
           affected_user:
             email_intro: 'Un emendamento respinto per %{amendable_title} è stato promosso a un indipendente %{amendable_type}. Puoi vederlo da questa pagina:'
             email_outro: Hai ricevuto questa notifica perché sei un autore di %{amendable_title}.
-            email_subject: Un emendamento da %{emendation_author_nickname} è stato pubblicato come nuovo %{amendable_type}
-            notification_title: A <a href="%{emendation_path}">respinto modifica</a> per <a href="%{amendable_path}">%{amendable_title}</a> è stato pubblicato come nuovo %{amendable_type} da <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
           follower:
             email_intro: 'Un emendamento respinto per %{amendable_title} è stato promosso a un indipendente %{amendable_type}. Puoi vederlo da questa pagina:'
             email_outro: Hai ricevuto questa notifica perché stai seguendo %{amendable_title}. È possibile interrompere la ricezione di notifiche facendo click su pulsante Smetti di seguire nella pagina del processo o del contenuto che stai seguendo.
-            email_subject: Un emendamento da %{emendation_author_nickname} è stato pubblicato come nuovo %{amendable_type}
-            notification_title: A <a href="%{emendation_path}">respinto modifica</a> per <a href="%{amendable_path}">%{amendable_title}</a> è stato pubblicato come nuovo %{amendable_type} da <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'Un''emissione è stata rifiutata per %{amendable_title}. Puoi vederlo da questa pagina:'
             email_outro: Hai ricevuto questa notifica perché sei un autore di %{amendable_title}.
-            email_subject: Un emendamento respinto per %{amendable_title} %{emendation_author_nickname}
-            notification_title: Il <a href="%{emendation_path}">modifica</a> creato da <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> è stata rifiutata per <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Un''emissione è stata rifiutata per %{amendable_title}. Puoi vederlo da questa pagina:'
             email_outro: Hai ricevuto questa notifica perché stai seguendo %{amendable_title}. È possibile interrompere la ricezione di notifiche facendo click su pulsante Smetti di seguire nella pagina del processo o del contenuto che stai seguendo.
-            email_subject: Un emendamento respinto per %{amendable_title} %{emendation_author_nickname}
-            notification_title: Il <a href="%{emendation_path}">modifica</a> creato da <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> è stata rifiutata per <a href="%{amendable_path}">%{amendable_title}</a>.
       attachments:
         attachment_created:
           email_intro: 'Un nuovo documento è stato aggiunto a %{resource_title}. Puoi vederlo da questa pagina:'
@@ -612,11 +600,6 @@ it:
             Un amministratore ha rimosso il tuo %{resource_type} perché è stato segnalato come %{report_reasons}.</br>
             <i>%{resource_content}</i>
       users:
-        profile_updated:
-          email_intro: La pagina <a href="%{resource_url}">profilo</a> di %{name} (%{nickname}), che stai seguendo, è stata aggiornata.
-          email_outro: Hai ricevuto questa notifica perché stai seguendo %{nickname}. È possibile interrompere la ricezione di notifiche seguendo il collegamento precedente.
-          email_subject: "%{nickname} ha aggiornato il proprio profilo"
-          notification_title: La pagina <a href="%{resource_path}">profilo</a> di %{name} (%{nickname}), che stai seguendo, è stata aggiornata.
         user_officialized:
           email_subject: ""
     export_mailer:
diff --git a/decidim-core/config/locales/ja.yml b/decidim-core/config/locales/ja.yml
index 2d314ba4a4f15..d33919e192958 100644
--- a/decidim-core/config/locales/ja.yml
+++ b/decidim-core/config/locales/ja.yml
@@ -866,13 +866,13 @@ ja:
           affected_user:
             email_intro: '%{amendable_title}の修正が承認されました。このページから確認できます:'
             email_outro: あなたは %{amendable_title} の作成者であるため、この通知を受け取りました。
-            email_subject: '%{amendable_title} から %{emendation_author_nickname} の修正を承認しました'
-            notification_title: <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> が作成した <a href="%{emendation_path}">修正</a> が <a href="%{amendable_path}">%{amendable_title}</a> に採用されました。
+            email_subject: '%{amendable_title} に対する %{emendation_author_name} からの修正内容を承認しました'
+            notification_title: <a href="%{emendation_author_path}">%{emendation_author_name}</a> によって作成された<a href="%{emendation_path}">修正案</a>が、<a href="%{amendable_path}">%{amendable_title}</a> に対して承認されました。
           follower:
             email_intro: '%{amendable_title}の修正が承認されました。このページから確認できます:'
             email_outro: '%{amendable_title}をフォローしているため、この通知を受け取りました。上記のリンクから通知の受信を停止することができます。'
-            email_subject: '%{amendable_title} から %{emendation_author_nickname} の修正を承認しました'
-            notification_title: <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> が作成した <a href="%{emendation_path}">修正</a> が <a href="%{amendable_path}">%{amendable_title}</a> に採用されました。
+            email_subject: '%{amendable_title} に対する %{emendation_author_name} からの修正内容を承認しました'
+            notification_title: <a href="%{emendation_author_path}">%{emendation_author_name}</a> が作成した <a href="%{emendation_path}">修正内容</a> が <a href="%{amendable_path}">%{amendable_title}</a> に採用されました。
         amendment_created:
           affected_user:
             email_intro: '%{amendable_title}の新しい修正が作成されました。このページから確認できます:'
@@ -888,29 +888,29 @@ ja:
           affected_user:
             email_intro: '%{amendable_title} の修正が却下されました。新しい %{amendable_type}として公開されました。このページから見ることができます:'
             email_outro: あなたは %{amendable_title} の作成者であるため、この通知を受け取りました。
-            email_subject: '%{emendation_author_nickname} からの修正が新しい %{amendable_type} として公開されました'
-            notification_title: <a href="%{amendable_path}">%{amendable_title}</a>についての<a href="%{emendation_path}">却下された修正</a> が新しい %{amendable_type} として <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>によって公開されました.
+            email_subject: '%{emendation_author_name}による修正が新しい%{amendable_type}として公開されました'
+            notification_title: <a href="%{amendable_path}">%{amendable_title}</a>に対する<a href="%{emendation_path}">却下された修正案</a>が、<a href="%{emendation_author_path}">%{emendation_author_name}</a>によって新しい%{amendable_type}として公開されました。
           follower:
             email_intro: '%{amendable_title} の修正が却下されました。新しい %{amendable_type}として公開されました。このページから見ることができます:'
             email_outro: '%{amendable_title}をフォローしているため、この通知を受け取りました。上記のリンクから通知の受信を停止することができます。'
-            email_subject: '%{emendation_author_nickname} からの修正が新しい %{amendable_type} として公開されました'
-            notification_title: <a href="%{amendable_path}">%{amendable_title}</a>についての<a href="%{emendation_path}">却下された修正</a>が新しい%{amendable_type} として <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>によって公開されました.
+            email_subject: '%{emendation_author_name} による修正が新しい %{amendable_type} として公開されました'
+            notification_title: <a href="%{amendable_path}">%{amendable_title}</a>に対する<a href="%{emendation_path}">却下された修正案</a>が、<a href="%{emendation_author_path}">%{emendation_author_name}</a>によって新しい%{amendable_type}として公開されました。
         amendment_rejected:
           affected_user:
             email_intro: '%{amendable_title}の修正が拒否されました。このページから確認できます:'
             email_outro: あなたは %{amendable_title} の作成者であるため、この通知を受け取りました。
-            email_subject: '%{amendable_title} から %{emendation_author_nickname} の修正が却下されました'
-            notification_title: <a href="%{emendation_path}">修正</a> <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> によって作成された <a href="%{amendable_path}">%{amendable_title}</a> は拒否されました。
+            email_subject: '%{amendable_title}に対する修正案が %{emendation_author_name} によって却下されました'
+            notification_title: <a href="%{emendation_author_path}">%{emendation_author_name}</a> が作成した<a href="%{emendation_path}">修正案</a>が、<a href="%{amendable_path}">%{amendable_title}</a> に対して承認されました。
           follower:
             email_intro: '%{amendable_title}の修正が拒否されました。このページから確認できます:'
             email_outro: '%{amendable_title}をフォローしているため、この通知を受け取りました。上記のリンクから通知の受信を停止することができます。'
-            email_subject: '%{amendable_title} から %{emendation_author_nickname} の修正が却下されました'
-            notification_title: <a href="%{emendation_path}">修正</a> <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> によって作成された <a href="%{amendable_path}">%{amendable_title}</a> は拒否されました。
+            email_subject: '%{amendable_title}に対する修正案が %{emendation_author_name} によって却下されました'
+            notification_title: <a href="%{emendation_author_path}">%{emendation_author_name}</a> が作成した<a href="%{emendation_path}">修正案</a>が、<a href="%{amendable_path}">%{amendable_title}</a> に対して承認されました。
         emendation_promoted:
           follower:
             email_intro: '%{amendable_title}に対する修正案が公開されました。このページから確認できます：'
             email_outro: あなたは %{amendable_title}の作者であるため、この通知を受け取りました。
-            email_subject: '%{emendation_author_nickname}による修正案が新しい%{amendable_type}として公開されました'
+            email_subject: '%{emendation_author_name}による修正案が新しい%{amendable_type}として公開されました'
       attachments:
         attachment_created:
           email_intro: '%{resource_title}に新しいドキュメントが追加されました。このページから見ることができます：'
@@ -964,24 +964,24 @@ ja:
             %{resource_type} として報告されたため、管理者が %{report_reasons} を削除しました。</br>
             <i>%{resource_content}</i>
       resource_liked:
-        email_intro: 'あなたがフォローしている%{liker_name} %{liker_nickname}が「%{resource_title}」をいいねしました。興味深いかもしれないので、ぜひチェックしてご参加ください：'
-        email_outro: '%{liker_nickname}をフォローしているため、この通知を受信しました。前のリンク先から、通知の受信を停止できます。'
-        email_subject: "%{liker_nickname} が新しいいいねを実行しました"
-        notification_title: <a href="%{resource_path}">%{resource_title}</a> %{resource_type} は <a href="%{liker_path}">%{liker_name} %{liker_nickname}</a>によっていいねされました。
+        email_intro: 'あなたがフォローしている%{liker_name} が「%{resource_title}」をいいねしました。興味深いかもしれないので、ぜひチェックしてご参加ください：'
+        email_outro: '%{liker_name} をフォローしているため、この通知が届きました。上記のリンクから通知の受信を停止できます。'
+        email_subject: "%{liker_name} が新しいいいねを行いました"
+        notification_title: <a href="%{resource_path}">%{resource_title}</a> %{resource_type} を <a href="%{liker_path}">%{liker_name} </a>さんがいいねしました。
       resources:
         soft_deleted:
           notification_title: 管理者があなたの "%{resource_type}" " "%{resource_title}" を削除しました。
       users:
         profile_updated:
-          email_intro: あなたがフォロー中の %{name} (%{nickname}) さんの <a href="%{resource_url}">プロフィールページ</a> が更新されました。
-          email_outro: '%{nickname}をフォローしているため、この通知を受け取りました。前のリンクに続く通知の受信を停止することができます。'
-          email_subject: "%{nickname} がプロフィールを更新しました"
-          notification_title: あなたがフォロー中の %{name} (%{nickname}) さんの <a href="%{resource_path}">プロフィールページ</a> が更新されました。
+          email_intro: あなたがフォローしている %{name} さんの <a href="%{resource_url}">プロフィールページ</a>が更新されました。
+          email_outro: '%{name}をフォローしているため、この通知を受け取りました。上記のリンクから通知の受信を停止することができます。'
+          email_subject: "%{name} はプロフィールを更新しました"
+          notification_title: あなたがフォローしている %{name} さんの <a href="%{resource_path}">プロフィールページ</a>が更新されました。
         user_officialized:
-          email_intro: 参加者 %{name} (%{nickname}) が公式化されました。
+          email_intro: 参加者 %{name} が公式化されました。
           email_outro: あなたは組織の管理者であるため、この通知を受け取りました。
           email_subject: "%{name} が公式化されました"
-          notification_title: 参加者 %{name} (%{nickname}) が公式化されました。
+          notification_title: 参加者 %{name} が公式化されました。
     export_mailer:
       download_your_data_export:
         click_button_html: 次のリンクをクリックしてデータをダウンロードしてください。<br/>ファイルは %{date} までダウンロードできます。
diff --git a/decidim-core/config/locales/lb.yml b/decidim-core/config/locales/lb.yml
index 87c7da1ea9b75..766db6d880a04 100644
--- a/decidim-core/config/locales/lb.yml
+++ b/decidim-core/config/locales/lb.yml
@@ -403,13 +403,9 @@ lb:
           affected_user:
             email_intro: 'Eng Ännerung gouf %{amendable_title} akzeptéiert. Du kanns dat op dëser Säit gesinn:'
             email_outro: Du hues dës Noriicht kritt well s'du en Auteur vum%{amendable_title} bass.
-            email_subject: Akzeptéiert Ännerung %{amendable_title} vum %{emendation_author_nickname}
-            notification_title: D' <a href="%{emendation_path}">Ännerung</a> erstallt vun <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> fir <a href="%{amendable_path}">%{amendable_title}</a> gouf ugeholl.
           follower:
             email_intro: 'Eng Ännerung gouf %{amendable_title} akzeptéiert. Du kanns dat op dëser Säit gesinn:'
             email_outro: Du hues dës Noriicht kritt, well s'du dem %{amendable_title} nogees. Falls du esou Noriichten net méi wëlls kréien, géi op den Link uewen.
-            email_subject: Akzeptéiert Ännerung fir %{amendable_title} vum %{emendation_author_nickname}
-            notification_title: D' <a href="%{emendation_path}">Ännerung</a> erstallt vun <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> fir <a href="%{amendable_path}">%{amendable_title}</a> gouf ugeholl.
         amendment_created:
           affected_user:
             email_intro: 'Eng Ännerung fir %{amendable_title} gouf erstallt. Du kanns dat op dëser Säit gesinn:'
@@ -425,24 +421,16 @@ lb:
           affected_user:
             email_intro: 'Eng refuséiert Ännerung am %{amendable_title} gouf als eng nei ënner %{amendable_type} verëffentlecht. Du kanns dat op dëser Säit gesinn:'
             email_outro: Du hues dës Noriicht kritt well s'du en Auteur vum %{amendable_title} bass.
-            email_subject: Eng Ännerung vun %{emendation_author_nickname} gouf als nei /n %{amendable_type} verëffentlecht
-            notification_title: D' <a href="%{emendation_path}">refuséiert Ännerung </a> fir <a href="%{amendable_path}">%{amendable_title}</a> gouf als nei verëffentlecht %{amendable_type} duerch <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
           follower:
             email_intro: 'Eng refuséiert Ännerung am %{amendable_title} gouf als eng nei ënner %{amendable_type} verëffentlecht. Du kanns dat op dëser Säit gesinn:'
             email_outro: Du hues dës Noriicht kritt, well s'du dem %{amendable_title} nogees. Falls du esou Noriichten net méi wëlls kréien, géi op den Link uewen.
-            email_subject: Eng Ännerung vun %{emendation_author_nickname} gouf als nei /n %{amendable_type} verëffentlecht
-            notification_title: D' <a href="%{emendation_path}">refuséiert Ännerung </a> fir <a href="%{amendable_path}">%{amendable_title}</a> gouf als nei verëffentlecht %{amendable_type} duerch <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'Eng Ännerung fir %{amendable_title} gouf refuséiert. Du kanns dat op dëser Säit gesinn:'
             email_outro: Du hues dës Noriicht kritt well s'du en Auteur vum%{amendable_title} bass.
-            email_subject: Refuséiert Ännerung fir %{amendable_title} vum %{emendation_author_nickname}
-            notification_title: D' <a href="%{emendation_path}">Ännerung</a> erstallt vun <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> fir <a href="%{amendable_path}">%{amendable_title}</a> gouf refuséiert.
           follower:
             email_intro: 'Eng Ännerung fir %{amendable_title} gouf refuséiert. Du kanns dat op dëser Säit gesinn:'
             email_outro: Du hues dës Noriicht kritt, well s'du dem %{amendable_title} nogees. Falls du esou Noriichten net méi wëlls kréien, géi op den Link uewen.
-            email_subject: Refuséiert Ännerung fir %{amendable_title} vum %{emendation_author_nickname}
-            notification_title: D' <a href="%{emendation_path}">Ännerung</a> erstallt vun <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> fir <a href="%{amendable_path}">%{amendable_title}</a> gouf refuséiert.
       attachments:
         attachment_created:
           email_intro: 'En neit Dokument fir %{resource_title} gouf dru gehaange. Du kanns dat op dëser Säit gesinn:'
@@ -472,12 +460,6 @@ lb:
           email_subject: Deng %{resource_type} gouf geläscht
           notification_title: |-
             En Admin huet däin %{resource_type} geläscht, well en als %{report_reasons}.</br><i>%{resource_content}</i> gemellt gouf
-      users:
-        profile_updated:
-          email_intro: D' <a href="%{resource_url}">Profil-Säit</a> vum </a>%{name} (%{nickname}), där s'du nogees, gouf aktualiséiert.
-          email_outro: Du hues dës Noriicht kritt, well s'du dem %{nickname} nogees. Falls du esou Noriichten net méi wëlls kréien, géi op den Link uewen.
-          email_subject: "%{nickname} huet säin Profil aktualiséiert"
-          notification_title: D' <a href="%{resource_path}">Profil-Säit</a> vum </a>%{name} (%{nickname}), där s'du nogees, gouf aktualiséiert.
     export_mailer:
       download_your_data_export:
         download: Eroflueden
diff --git a/decidim-core/config/locales/lt.yml b/decidim-core/config/locales/lt.yml
index caf00526d10c1..a30ab2dab6e6e 100644
--- a/decidim-core/config/locales/lt.yml
+++ b/decidim-core/config/locales/lt.yml
@@ -641,13 +641,9 @@ lt:
           affected_user:
             email_intro: 'Pataisa %{amendable_title} buvo priimta. Galite tai pamatyti:'
             email_outro: Šį pranešimą gavote dėl to, kad esate %{amendable_title} autorius(-ė).
-            email_subject: '%{amendable_title} pataisa priimta iš %{emendation_author_nickname}'
-            notification_title: <a href="%{emendation_path}"><a href="%{emendation_path}">Pataisa</a> sukurta <a href="%{emendation_author_path}"><a href="%{emendation_author_path}">%{emendation_author_nickname}</a> buvo priimta <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Pataisa %{amendable_title} buvo priimta. Galite tai pamatyti:'
             email_outro: Šį pranešimą gavote dėl to, kad sekate %{amendable_title}. Jeigu nebenorite gauti pranešimų, spustelėkite aukščiau esančią nuorodą.
-            email_subject: '%{amendable_title} pataisa priimta iš %{emendation_author_nickname}'
-            notification_title: <a href="%{emendation_path}"><a href="%{emendation_path}">Pataisa</a> sukurta <a href="%{emendation_author_path}"><a href="%{emendation_author_path}">%{emendation_author_nickname}</a> buvo priimta <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'Nauja pataisa buvo sukurta %{amendable_title}. Galite ją pamatyti šiame puslapyje:'
@@ -663,24 +659,16 @@ lt:
           affected_user:
             email_intro: 'Atmesta pataisa %{amendable_title} buvo paskelbta kaip nauja %{amendable_type}. Galite tai pamatyti šiame puslapyje:'
             email_outro: Šį pranešimą gavote dėl to, kad esate %{amendable_title} autorius(-ė).
-            email_subject: '%{emendation_author_nickname} parengtas pakeitimas paskelbtas kaip naujas %{amendable_type}'
-            notification_title: <a href="%{emendation_path}">Atmesta pataisa</a>dėl<a href="%{amendable_path}">%{amendable_title} buvo publikuota kaip nauja%{amendable_type}<a href="%{emendation_author_path}">%{emendation_author_nickname}.
           follower:
             email_intro: 'Atmesta pataisa %{amendable_title} buvo paskelbta kaip nauja %{amendable_type}. Galite tai pamatyti šiame puslapyje:'
             email_outro: Šį pranešimą gavote dėl to, kad sekate %{amendable_title}. Jeigu nebenorite gauti pranešimų, spustelėkite aukščiau esančią nuorodą.
-            email_subject: '%{emendation_author_nickname} publikavo naują pataisą kaip %{amendable_type}'
-            notification_title: <a href="%{emendation_path}">Atmesta pataisa</a>dėl<a href="%{amendable_path}">%{amendable_title} buvo publikuota kaip nauja%{amendable_type}<a href="%{emendation_author_path}">%{emendation_author_nickname}.
         amendment_rejected:
           affected_user:
             email_intro: 'Atmesta %{amendable_title} pataisa. Ją galite pamatyti šiame puslapyje:'
             email_outro: Šį pranešimą gavote dėl to, kad esate %{amendable_title} autorius(-ė).
-            email_subject: Atmesta %{emendation_author_nickname} parengta %{amendable_title} pataisa
-            notification_title: <a href="%{emendation_path}">Pataisa</a>sukurta<a href="%{emendation_author_path}">%{emendation_author_nickname}</a>buvo atmesta dėl<a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Atmesta %{amendable_title} pataisa. Ją galite pamatyti šiame puslapyje:'
             email_outro: Šį pranešimą gavote dėl to, kad sekate %{amendable_title}. Jeigu nebenorite gauti pranešimų, spustelėkite aukščiau esančią nuorodą.
-            email_subject: Atmesta %{emendation_author_nickname} parengta %{amendable_title} pataisa
-            notification_title: <a href="%{emendation_path}">Pataisa</a>sukurta<a href="%{emendation_author_path}">%{emendation_author_nickname}</a>buvo atmesta dėl<a href="%{amendable_path}">%{amendable_title}</a>.
       attachments:
         attachment_created:
           email_intro: 'Prie %{resource_title} pridėtas naujas dokumentas. Jį galite pamatyti šiame puslapyje:'
@@ -719,16 +707,9 @@ lt:
             </br>
             <i>%{resource_content}</i>
       users:
-        profile_updated:
-          email_intro: '%{name} (%{nickname}), profilio puslapis, <a href="%{resource_url}">, kurį sekate</a> buvo atnaujintas.'
-          email_outro: Šį pranešimą gavote dėl to, kad sekate %{nickname}. Jeigu nebenorite gauti pranešimų, spustelėkite ankstesnę nuorodą.
-          email_subject: "%{nickname} atnaujino savo profilį"
-          notification_title: '%{name} (%{nickname}) profilio puslapis, <a href="%{resource_path}">, kurį sekate</a> buvo atnaujintas.'
         user_officialized:
-          email_intro: Dalyvis %{name} (%{nickname}) buvo oficializuotas.
           email_outro: Šį pranešimą gavote dėl to, kad esate organizacijos administratorius.
           email_subject: "%{name} buvo oficializuotas"
-          notification_title: Dalyvis %{name} (%{nickname}) buvo oficializuotas.
     export_mailer:
       download_your_data_export:
         download: Atsisiųsti
diff --git a/decidim-core/config/locales/lv.yml b/decidim-core/config/locales/lv.yml
index ca535e01f6ee6..f95ba3b2cbc80 100644
--- a/decidim-core/config/locales/lv.yml
+++ b/decidim-core/config/locales/lv.yml
@@ -353,13 +353,9 @@ lv:
           affected_user:
             email_intro: '%{amendable_title} ir pieņemts grozījums. To var redzēt šajā lapā:'
             email_outro: Jūs saņēmāt šo paziņojumu, jo esat %{amendable_title} autors.
-            email_subject: Pieņemts grozījums %{amendable_title} no %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}"> Grozījums </a>, ko izveidoja <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>, ir pieņemts <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: '%{amendable_title} ir pieņemts grozījums. To var redzēt šajā lapā:'
             email_outro: Jūs saņēmāt šo paziņojumu, jo sekojat %{amendable_title}. Jūs varat atteikties no paziņojumu saņemšanas, sekojot iepriekšējai saitei.
-            email_subject: Pieņemts grozījums %{amendable_title} no %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}"> Grozījums </a>, ko izveidoja <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>, ir pieņemts <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: '%{amendable_title} ir izveidots jauns grozījums. To var redzēt šajā lapā.'
@@ -375,24 +371,16 @@ lv:
           affected_user:
             email_intro: 'Noraidītais %{amendable_title} grozījums ir publicēts kā jauns %{amendable_type}. To var redzēt šajā lapā:'
             email_outro: Jūs saņēmāt šo paziņojumu, jo esat %{amendable_title} autors.
-            email_subject: '%{emendation_author_nickname} grozījums ir publicēts kā jauns %{amendable_type}'
-            notification_title: <a href="%{emendation_path}">noraidītais grozījums<a href="%{amendable_path}">%{amendable_title}</a> ir publicēts kā jauns %{amendable_type}, to publicēja <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
           follower:
             email_intro: 'Noraidītais %{amendable_title} grozījums ir publicēts kā jauns %{amendable_type}. To var redzēt šajā lapā:'
             email_outro: Jūs saņēmāt šo paziņojumu, jo sekojat %{amendable_title}. Jūs varat atteikties no paziņojumu saņemšanas, sekojot iepriekšējai saitei.
-            email_subject: '%{emendation_author_nickname} grozījums ir publicēts kā jauns %{amendable_type}'
-            notification_title: <a href="%{emendation_path}">noraidītais grozījums<a href="%{amendable_path}">%{amendable_title}</a> ir publicēts kā jauns %{amendable_type}, to publicēja <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
         amendment_rejected:
           affected_user:
             email_intro: '%{amendable_title} ir noraidīts grozījums. To var redzēt šajā lapā:'
             email_outro: Jūs saņēmāt šo paziņojumu, jo esat %{amendable_title} autors.
-            email_subject: Noraidīts grozījums %{amendable_title} no %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}"> grozījums </a>, ko izveidoja <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>, ir noraidīts <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: '%{amendable_title} ir noraidīts grozījums. To var redzēt šajā lapā:'
             email_outro: Jūs saņēmāt šo paziņojumu, jo sekojat %{amendable_title}. Jūs varat atteikties no paziņojumu saņemšanas, sekojot iepriekšējai saitei.
-            email_subject: Noraidīts grozījums %{amendable_title} no %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}"> grozījums </a>, ko izveidoja <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>, ir noraidīts <a href="%{amendable_path}">%{amendable_title}</a>.
       attachments:
         attachment_created:
           email_intro: '%{resource_title} ir pievienots jauns dokuments. Jūs to varat redzēt šajā lapā:'
@@ -415,12 +403,6 @@ lv:
           email_outro: Jūs saņēmāt šo paziņojumu, jo veicāt darbību mūsu tīmekļvietnē.
         level_up:
           email_outro: Jūs saņēmāt šo paziņojumu, jo veicāt darbību mūsu tīmekļvietnē.
-      users:
-        profile_updated:
-          email_intro: '%{name} (%{nickname}) <a href="%{resource_url}">profila lapa</a>, kam jūs sekojat, ir atjaunināta.'
-          email_outro: Jūs saņēmāt šo paziņojumu, jo sekojat %{nickname}. Jūs varat atteikties no paziņojumu saņemšanas, sekojot iepriekšējai saitei.
-          email_subject: "%{nickname} atjaunināja savu profilu"
-          notification_title: '%{name} (%{nickname}) <a href="%{resource_path}">profila lapa</a>, kam jūs sekojat, ir atjaunināta.'
     export_mailer:
       download_your_data_export:
         download: Lejupielādēt
diff --git a/decidim-core/config/locales/nl.yml b/decidim-core/config/locales/nl.yml
index 841e045e20c0a..b93a869c7a03c 100644
--- a/decidim-core/config/locales/nl.yml
+++ b/decidim-core/config/locales/nl.yml
@@ -406,13 +406,9 @@ nl:
           affected_user:
             email_intro: 'Een eervolle vermelding is geaccepteerd voor %{amendable_title}. Je kunt het vanaf deze pagina bekijken:'
             email_outro: U hebt deze melding ontvangen omdat u een auteur bent van %{amendable_title}.
-            email_subject: Geaccepteerd amendement voor %{amendable_title} van %{emendation_author_nickname}
-            notification_title: De <a href="%{emendation_path}">amendement</a> door <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> is aanvaard voor <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Een eervolle vermelding is geaccepteerd voor %{amendable_title}. Je kunt het vanaf deze pagina bekijken:'
             email_outro: U hebt deze melding ontvangen omdat u %{amendable_title} volgt. Je kunt de meldingen stoppen door de vorige link te volgen.
-            email_subject: Geaccepteerd amendement voor %{amendable_title} van %{emendation_author_nickname}
-            notification_title: De <a href="%{emendation_path}">amendement</a> door <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> is aanvaard voor <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'Er is een nieuwe eervolle vermelding gemaakt voor %{amendable_title}. Je kunt het vanaf deze pagina bekijken:'
@@ -428,24 +424,16 @@ nl:
           affected_user:
             email_intro: 'Een afgewezen amendement voor %{amendable_title} is als nieuw gepubliceerd %{amendable_type}. U kunt het vanaf deze pagina bekijken:'
             email_outro: U hebt deze melding ontvangen omdat u een auteur bent van %{amendable_title}.
-            email_subject: Een amendement van %{emendation_author_nickname} is als nieuw gepubliceerd %{amendable_type}
-            notification_title: Een <a href="%{emendation_path}">afgewezen amendement</a> voor <a href="%{amendable_path}">%{amendable_title}</a> is gepubliceerd als een nieuwe %{amendable_type} bij <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
           follower:
             email_intro: 'Een amendement afgewezen voor %{amendable_title} is gepubliceerd als een nieuw %{amendable_type}. Je kunt het op deze pagina bekijken:'
             email_outro: U heeft deze melding ontvangen omdat u %{amendable_title} volgt. Je kunt stoppen met het ontvangen van meldingen door de vorige link te volgen.
-            email_subject: Een amendement van %{emendation_author_nickname} is gepubliceerd als %{amendable_type}
-            notification_title: Een <a href="%{emendation_path}">afgewezen amendement</a> voor <a href="%{amendable_path}">%{amendable_title}</a> is gepubliceerd als een nieuwe %{amendable_type} bij <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'Een amendement is afgewezen door %{amendable_title}. Je kunt het op deze pagina bekijken:'
             email_outro: U heeft deze melding ontvangen omdat u een auteur bent van %{amendable_title}.
-            email_subject: Een amendement afgewezen voor %{amendable_title} van %{emendation_author_nickname}
-            notification_title: De <a href="%{emendation_path}">amendement</a> door <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> is afgekeurd door <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Een amendement is afgewezen voor %{amendable_title}. Je kunt het op deze pagina bekijken:'
             email_outro: U heeft deze melding ontvangen omdat u %{amendable_title} volgt. U kunt stoppen met het ontvangen van meldingen via de vorige link.
-            email_subject: Een amendement afgewezen voor %{amendable_title} van %{emendation_author_nickname}
-            notification_title: De <a href="%{emendation_path}">amendement</a> door <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> is afgekeurde <a href="%{amendable_path}">%{amendable_title}</a>.
       attachments:
         attachment_created:
           email_intro: 'Een nieuw document we’d toegevoegd aan %{resource_title}. Je kan het via deze link bekijken:'
@@ -468,12 +456,6 @@ nl:
           email_outro: U heeft deze melding ontvangen omdat u activiteiten op onze website heeft uitgevoerd.
         level_up:
           email_outro: U heeft deze melding ontvangen omdat u activiteiten op onze website heeft uitgevoerd.
-      users:
-        profile_updated:
-          email_intro: De <a href="%{resource_url}">profile page</a> of %{name} (%{nickname}), die je volgt, is bijgewerkt.
-          email_outro: Je hebt deze melding ontvangen omdat je %{nickname} volgt. Je kan de meldingen uitschakelen door te klikken op de vorige link.
-          email_subject: "%{nickname} heeft zijn/haar profiel bijgewerkt"
-          notification_title: De <a href="%{resource_path}">profile page</a> van %{name} (%{nickname}), die je volgt, is bijgewerkt.
     export_mailer:
       download_your_data_export:
         download: Download
diff --git a/decidim-core/config/locales/no.yml b/decidim-core/config/locales/no.yml
index 7c8f7e081bee6..e540e76ada1af 100644
--- a/decidim-core/config/locales/no.yml
+++ b/decidim-core/config/locales/no.yml
@@ -412,13 +412,9 @@
           affected_user:
             email_intro: 'En endring har blitt akseptert for %{amendable_title}. Du kan se den fra denne siden:'
             email_outro: Du har mottatt denne varslingen fordi du er en forfatter av %{amendable_title}.
-            email_subject: Aksepterte ending til %{amendable_title} fra %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">Endingen</a> opprettet av <a href="%{emendation_author_path}">%{emendation_author_nickname}%</a> har blitt godtatt for <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'En endring har blitt akseptert for %{amendable_title}. Du kan se den fra denne siden:'
             email_outro: Du har mottatt denne varslingen fordi du følger %{amendable_title}. Du kan slutte å motta varsler hvis du følger den forrige lenken.
-            email_subject: Aksepterte ending til %{amendable_title} fra %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">Endingen</a> opprettet av <a href="%{emendation_author_path}">%{emendation_author_nickname}%</a> har blitt godtatt for <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'En ny endring er blitt opprettet for%{amendable_title}. Du kan se den fra denne siden:'
@@ -434,24 +430,16 @@
           affected_user:
             email_intro: 'En avslått ending for %{amendable_title} er blitt publisert som en ny %{amendable_type}. Du kan se den fra denne siden:'
             email_outro: Du har mottatt denne varslingen fordi du er en forfatter av %{amendable_title}.
-            email_subject: En endring fra %{emendation_author_nickname} er blitt publisert som en ny %{amendable_type}
-            notification_title: En <a href="%{emendation_path}">avvist endring</a> til <a href="%{amendable_path}">%{amendable_title}</a> har blitt publisert som et nytt %{amendable_type} av <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
           follower:
             email_intro: 'En avslått ending for %{amendable_title} er blitt publisert som en ny %{amendable_type}. Du kan se den fra denne siden:'
             email_outro: Du har mottatt denne varslingen fordi du følger %{amendable_title}. Du kan slutte å motta varsler hvis du følger den forrige lenken.
-            email_subject: En endring fra %{emendation_author_nickname} er blitt publisert som en ny %{amendable_type}
-            notification_title: En <a href="%{emendation_path}">avvist endring</a> til <a href="%{amendable_path}">%{amendable_title}</a> har blitt publisert som et nytt %{amendable_type} av <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'En endring har blitt avvist for %{amendable_title}. Du kan se den fra denne siden:'
             email_outro: Du har mottatt denne varslingen fordi du er en forfatter av %{amendable_title}.
-            email_subject: Endring avvist for %{amendable_title} fra %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">Endingen</a> opprettet av <a href="%{emendation_author_path}">%{emendation_author_nickname}%</a> har blitt avvist for <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'En endring har blitt avvist for %{amendable_title}. Du kan se den fra denne siden:'
             email_outro: Du har mottatt denne varslingen fordi du følger %{amendable_title}. Du kan slutte å motta varsler hvis du følger den forrige lenken.
-            email_subject: Endring avvist for %{amendable_title} fra %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">Endingen</a> opprettet av <a href="%{emendation_author_path}">%{emendation_author_nickname}%</a> har blitt avvist for <a href="%{amendable_path}">%{amendable_title}</a>.
       attachments:
         attachment_created:
           email_intro: 'Et nytt dokument er blitt lagt til %{resource_title}. Du kan se den fra denne siden:'
@@ -482,12 +470,6 @@
           notification_title: |-
             En administrator har fjernet din %{resource_type} fordi den er rapportert som %{report_reasons}.</br>
             <i>%{resource_content}</i>
-      users:
-        profile_updated:
-          email_intro: <a href="%{resource_url}">Profilsiden</a> til %{name} (%{nickname}), som du følger er blitt oppdatert.
-          email_outro: Du har mottatt denne varslingen fordi du følger %{nickname}. Du kan slutte å motta varsler hvis du følger den forrige lenken.
-          email_subject: "%{nickname} oppdaterte profilens sin"
-          notification_title: <a href="%{resource_path}">Profilsiden</a> til %{name} (%{nickname}), som du følger er blitt oppdatert.
     export_mailer:
       download_your_data_export:
         download: Last ned
diff --git a/decidim-core/config/locales/pl.yml b/decidim-core/config/locales/pl.yml
index 0b44b9e7f6a9a..cdbaebf308a02 100644
--- a/decidim-core/config/locales/pl.yml
+++ b/decidim-core/config/locales/pl.yml
@@ -641,13 +641,9 @@ pl:
           affected_user:
             email_intro: 'Poprawka została zaakceptowana dla %{amendable_title}. Możesz ją zobaczyć na tej stronie:'
             email_outro: Otrzymałeś to powiadomienie, ponieważ jesteś autorem %{amendable_title}.
-            email_subject: Poprawka przyjęta dla %{amendable_title} z %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">Poprawka</a> utworzona przez <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> została przyjęta w <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Poprawka została zaakceptowana dla %{amendable_title}. Możesz ją zobaczyć na tej stronie:'
             email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz %{amendable_title}. Możesz przestać otrzymywać powiadomienia klikając poprzedni link.
-            email_subject: Poprawka przyjęta w %{amendable_title} od %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">Poprawka</a> utworzona przez <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> została przyjęta w <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'Nowa poprawka została utworzona do %{amendable_title}. Możesz ją zobaczyć na tej stronie:'
@@ -663,24 +659,16 @@ pl:
           affected_user:
             email_intro: 'Odrzucona poprawka do %{amendable_title} została opublikowana jako %{amendable_type}. Możesz ją zobaczyć na tej stronie:'
             email_outro: Otrzymałeś to powiadomienie, ponieważ jesteś autorem %{amendable_title}.
-            email_subject: Poprawka od %{emendation_author_nickname} została opublikowana jako %{amendable_type}
-            notification_title: <a href="%{emendation_path}">Odrzucona poprawka</a> do <a href="%{amendable_path}">%{amendable_title}</a> została opublikowana jako %{amendable_type} przez <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
           follower:
             email_intro: 'Odrzucona poprawka do %{amendable_title} została opublikowana jako %{amendable_type}. Możesz ją zobaczyć na tej stronie:'
             email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz %{amendable_title}. Możesz przestać otrzymywać powiadomienia klikając w poprzedni link.
-            email_subject: Poprawka od %{emendation_author_nickname} została opublikowana jako %{amendable_type}
-            notification_title: <a href="%{emendation_path}">Odrzucona poprawka</a> do <a href="%{amendable_path}">%{amendable_title}</a> została opublikowana jako %{amendable_type} przez <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'Poprawka do %{amendable_title} została odrzucona. Możesz ją zobaczyć na tej stronie:'
             email_outro: Otrzymałeś to powiadomienie, ponieważ jesteś autorem %{amendable_title}.
-            email_subject: Poprawka użytkownika %{emendation_author_nickname} do %{amendable_title} została odrzucona
-            notification_title: <a href="%{emendation_path}">Poprawka</a> utworzona przez <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> została odrzucona w <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Poprawka do %{amendable_title} została odrzucona. Możesz ją zobaczyć na tej stronie:'
             email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz %{amendable_title}. Możesz przestać otrzymywać powiadomienia po kliknięciu w poprzedni link.
-            email_subject: Poprawka użytkownika %{emendation_author_nickname} do %{amendable_title} została odrzucona
-            notification_title: <a href="%{emendation_path}">Poprawka</a> do <a href="%{amendable_path}">%{amendable_title}</a> utworzona przez <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> została odrzucona.
       attachments:
         attachment_created:
           email_intro: 'Nowy dokument został dodany do %{resource_title}. Możesz go zobaczyć na tej stronie:'
@@ -722,16 +710,9 @@ pl:
             Administrator usunął %{resource_type}, ponieważ treść została zgłoszona jako %{report_reasons}.</br>
             <i>%{resource_content}</i>
       users:
-        profile_updated:
-          email_intro: Zaktualizowano <a href="%{resource_url}">stronę profilową</a> użytkownika %{name} (%{nickname}), którego obserwujesz.
-          email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz %{nickname}. Możesz przestać otrzymywać powiadomienia klikając w poprzedni link.
-          email_subject: "%{nickname} zaktualizował(a) swój profil"
-          notification_title: Zaktualizowano <a href="%{resource_path}">stronę profilową</a> użytkownika %{name} (%{nickname}), którego obserwujesz.
         user_officialized:
-          email_intro: Uczestnik %{name} (%{nickname}) został oficjalnie zarejestrowany.
           email_outro: Otrzymujesz to powiadomienie, ponieważ jesteś administratorem platformy.
           email_subject: "%{name} zostało oficjalnie zarejestrowane"
-          notification_title: Uczestnik %{name} (%{nickname}) został oficjalnie zarejestrowany.
     export_mailer:
       download_your_data_export:
         download: Pobieranie
diff --git a/decidim-core/config/locales/pt-BR.yml b/decidim-core/config/locales/pt-BR.yml
index 7b3d7d494d5a4..5f343f3d6a158 100644
--- a/decidim-core/config/locales/pt-BR.yml
+++ b/decidim-core/config/locales/pt-BR.yml
@@ -875,13 +875,9 @@ pt-BR:
           affected_user:
             email_intro: 'Uma emendação foi aceita para %{amendable_title}. Você pode ver a partir desta página:'
             email_outro: Você recebeu esta notificação porque é um autor de %{amendable_title}.
-            email_subject: Uma emenda aceita para %{amendable_title} partir de %{emendation_author_nickname}
-            notification_title: A <a href="%{emendation_path}">alteração</a> criado por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> tem sido aceite para <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Uma emendação foi aceita para %{amendable_title}. Você pode ver a partir desta página:'
             email_outro: Você recebeu esta notificação porque está seguindo %{amendable_title}. Você pode parar de receber notificações após o link anterior.
-            email_subject: Uma emenda aceita para %{amendable_title} partir de %{emendation_author_nickname}
-            notification_title: A <a href="%{emendation_path}">alteração</a> criado por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> tem sido aceite para <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'Uma nova emendação foi criada para %{amendable_title}. Você pode ver a partir desta página:'
@@ -897,29 +893,20 @@ pt-BR:
           affected_user:
             email_intro: 'Uma emenda rejeitada por %{amendable_title} foi promovida a um independente %{amendable_type}. Você pode ver a partir desta página:'
             email_outro: Você recebeu esta notificação porque é um autor de %{amendable_title}.
-            email_subject: Uma emenda de %{emendation_author_nickname} foi publicada como um novo %{amendable_type}
-            notification_title: Um <a href="%{emendation_path}">rejeitado alteração</a> para <a href="%{amendable_path}">%{amendable_title}</a> foi publicado como uma nova %{amendable_type} por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
           follower:
             email_intro: 'Uma emenda rejeitada por %{amendable_title} foi promovida a um independente %{amendable_type}. Você pode ver a partir desta página:'
             email_outro: Você recebeu esta notificação porque está seguindo %{amendable_title}. Você pode parar de receber notificações após o link anterior.
-            email_subject: Uma emenda de %{emendation_author_nickname} foi publicada como um novo %{amendable_type}
-            notification_title: Um <a href="%{emendation_path}">rejeitado alteração</a> para <a href="%{amendable_path}">%{amendable_title}</a> foi publicado como uma nova %{amendable_type} por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'Uma emenda foi rejeitada por %{amendable_title}. Você pode ver a partir desta página:'
             email_outro: Você recebeu esta notificação porque é um autor de %{amendable_title}.
-            email_subject: Uma alteração rejeitada por %{amendable_title} %{emendation_author_nickname}
-            notification_title: A <a href="%{emendation_path}">alteração</a> criado por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> foi rejeitado por <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Uma emenda foi rejeitada por %{amendable_title}. Você pode ver a partir desta página:'
             email_outro: Você recebeu esta notificação porque está seguindo %{amendable_title}. Você pode parar de receber notificações após o link anterior.
-            email_subject: Uma alteração rejeitada por %{amendable_title} %{emendation_author_nickname}
-            notification_title: A <a href="%{emendation_path}">alteração</a> criado por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> foi rejeitado por <a href="%{amendable_path}">%{amendable_title}</a>.
         emendation_promoted:
           follower:
             email_intro: 'Uma emenda foi publicada para %{amendable_title}. Você pode ver a partir desta página:'
             email_outro: Você recebeu essa notificação porque você é autor de %{amendable_title}.
-            email_subject: Uma emenda de %{emendation_author_nickname} foi publicada como um novo %{amendable_type}
       attachments:
         attachment_created:
           email_intro: 'Um novo documento foi adicionado a %{resource_title}. Você pode vê-lo a partir desta página:'
@@ -968,25 +955,13 @@ pt-BR:
           notification_title: |-
             Um administrador removeu seu %{resource_type} porque ele foi reportado como %{report_reasons}.</br>
             <i>%{resource_content}</i>
-      resource_liked:
-        email_intro: '%{liker_name} %{liker_nickname}, que você está seguindo, acabou de curtir "%{resource_title}" e pensamos que pode interessar você. Confira e contribua:'
-        email_outro: Você recebeu está notificação porque está seguindo %{liker_nickname}. Você pode parar de receber notificações após o link anterior.
-        email_subject: "%{liker_nickname} Realizou uma nova curtida"
-        notification_title: O <a href="%{resource_path}">%{resource_title}</a> %{resource_type} foi curtido por <a href="%{liker_path}">%{liker_name} %{liker_nickname}</a>.
       resources:
         soft_deleted:
           notification_title: Um administrador excluiu seu "%{resource_type}" "%{resource_title}".
       users:
-        profile_updated:
-          email_intro: O <a href="%{resource_url}">profile page</a> de %{name} (%{nickname}), quem você está seguindo, foi atualizado.
-          email_outro: Você recebeu esta notificação porque está seguindo %{nickname}. Você pode parar de receber notificações após o link anterior.
-          email_subject: "%{nickname} atualizaram seu perfil"
-          notification_title: O <a href="%{resource_path}">profile page</a> de %{name} (%{nickname}), quem você está seguindo, foi atualizado.
         user_officialized:
-          email_intro: O participante %{name} (%{nickname}) foi oficializado.
           email_outro: Você recebeu esta notificação porque é um administrador da organização.
           email_subject: "%{name} foi oficializada"
-          notification_title: O participante %{name} (%{nickname}) foi oficializado.
     export_mailer:
       download_your_data_export:
         click_button_html: Clique no link a seguir para baixar seus dados.<br/>O arquivo estará disponível para baixar até %{date}.
diff --git a/decidim-core/config/locales/pt.yml b/decidim-core/config/locales/pt.yml
index 2d842381f6997..87925c1dba8cf 100644
--- a/decidim-core/config/locales/pt.yml
+++ b/decidim-core/config/locales/pt.yml
@@ -403,13 +403,9 @@ pt:
           affected_user:
             email_intro: 'Uma modificação foi aceite para %{amendable_title}. Pode vê-la a partir desta página:'
             email_outro: Recebeu esta notificação por ser um autor de %{amendable_title}.
-            email_subject: Modificação aceite para %{amendable_title} de %{emendation_author_nickname}
-            notification_title: A <a href="%{emendation_path}">emenda</a> criada por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> foi aceite para <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Uma modificação foi aceite para %{amendable_title}. Pode vê-la a partir desta página:'
             email_outro: Recebeu esta notificação porque segue %{amendable_title}. Pode parar de receber notificações a partir da hiperligação anterior.
-            email_subject: Modificação aceite para %{amendable_title} por %{emendation_author_nickname}
-            notification_title: A <a href="%{emendation_path}">modificação</a> criada por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> foi aceite para <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'Uma nova modificação foi criada para %{amendable_title}. Pode vê-la a partir desta página:'
@@ -425,24 +421,16 @@ pt:
           affected_user:
             email_intro: 'Uma modificação rejeitada por %{amendable_title} foi publicada como um novo %{amendable_type}. Pode vê-la a partir desta página:'
             email_outro: Recebeu esta notificação por ser um autor de %{amendable_title}.
-            email_subject: Uma modificação de %{emendation_author_nickname} foi publicada como um novo %{amendable_type}
-            notification_title: Uma <a href="%{emendation_path}">modificação rejeitada</a> para <a href="%{amendable_path}">%{amendable_title}</a> foi publicada como um novo %{amendable_type} por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
           follower:
             email_intro: 'Uma modificação rejeitada de %{amendable_title} foi publicada como um novo %{amendable_type}. Pode vê-la a partir desta página:'
             email_outro: Recebeu esta notificação porque segue %{amendable_title}. Pode parar de receber notificações seguindo a hiperligação anterior.
-            email_subject: Uma modificação de %{emendation_author_nickname} foi publicada como um novo %{amendable_type}
-            notification_title: Uma <a href="%{emendation_path}">modificação rejeitada</a> de <a href="%{amendable_path}">%{amendable_title}</a> foi publicada como um novo %{amendable_type} por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'Uma modificação foi rejeitada por %{amendable_title}. Pode vê-la a partir desta página:'
             email_outro: Recebeu esta notificação por ser um autor de %{amendable_title}.
-            email_subject: Modificação de %{amendable_title} rejeitada por %{emendation_author_nickname}
-            notification_title: A <a href="%{emendation_path}">modificação</a> criada por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> foi rejeitada por <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Uma modificação foi rejeitada por %{amendable_title}. Pode vê-la a partir desta página:'
             email_outro: Recebeu esta notificação porque segue %{amendable_title}. Pode parar de receber notificações seguindo a hiperligação anterior.
-            email_subject: Modificação de %{amendable_title} rejeitada por %{emendation_author_nickname}
-            notification_title: A <a href="%{emendation_path}">modificação</a> criada por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> foi rejeitada por <a href="%{amendable_path}">%{amendable_title}</a>.
       attachments:
         attachment_created:
           email_intro: 'Um novo documento foi adicionado a %{resource_title}. Pode vê-lo a partir desta página:'
@@ -473,12 +461,6 @@ pt:
           notification_title: |-
             Um administrador removeu o seu %{resource_type} porque foi denunciado como %{report_reasons}.</br>
             <i>%{resource_content}</i>
-      users:
-        profile_updated:
-          email_intro: A <a href="%{resource_url}">página de perfil</a> de %{name} (%{nickname}), que você segue, foi atualizada.
-          email_outro: Recebeu esta notificação porque segue %{nickname}. Pode parar de receber notificações seguindo a hiperligação anterior.
-          email_subject: "%{nickname} atualizaram seu perfil"
-          notification_title: A <a href="%{resource_path}">página de perfil</a> de %{name} (%{nickname}), que você segue, foi atualizada.
     export_mailer:
       download_your_data_export:
         download: Transferir
diff --git a/decidim-core/config/locales/ro-RO.yml b/decidim-core/config/locales/ro-RO.yml
index 807ccb0666fa7..15cde55868d5e 100644
--- a/decidim-core/config/locales/ro-RO.yml
+++ b/decidim-core/config/locales/ro-RO.yml
@@ -877,13 +877,9 @@ ro:
           affected_user:
             email_intro: 'A fost acceptat un amendament pentru %{amendable_title}. Îl puteți vedea de pe această pagină:'
             email_outro: Ați primit această notificare deoarece sunteți un autor al %{amendable_title}.
-            email_subject: Amendamentul acceptat pentru %{amendable_title} de la %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">Amendamentul</a> creat de <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> a fost acceptat pentru <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Un amendament a fost acceptat pentru %{amendable_title}. Îl poți vedea de pe această pagină:'
             email_outro: Ați primit această notificare deoarece urmăriți %{amendable_title}. Puteți înceta să primiți notificări urmând linkul anterior.
-            email_subject: Amendament acceptat pentru %{amendable_title} de la %{emendation_author_nickname}
-            notification_title: Amendamentul <a href="%{emendation_path}"></a> creat de <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> a fost acceptat pentru <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'A fost creat un nou amendament pentru %{amendable_title}. Îl poți vedea de pe această pagină:'
@@ -899,24 +895,16 @@ ro:
           affected_user:
             email_intro: 'Un amendament respins pentru %{amendable_title} a fost publicat ca un nou %{amendable_type}. Îl poți vedea de pe această pagină:'
             email_outro: Ați primit această notificare deoarece sunteți autorul amendamentului %{amendable_title}.
-            email_subject: Un amendament primit de la %{emendation_author_nickname} a fost publicat ca un nou %{amendable_type}
-            notification_title: Un <a href="%{emendation_path}">amendament respins</a> pentru <a href="%{amendable_path}">%{amendable_title}</a> a fost publicat ca un nou %{amendable_type} de <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
           follower:
             email_intro: 'Un amendament respins pentru %{amendable_title} a fost publicat ca un nou %{amendable_type}. Îl poți vedea de pe această pagină:'
             email_outro: Ai primit această notificare deoarece urmărești %{amendable_title}. Poți înceta să primești notificări urmând linkul anterior.
-            email_subject: Un amendament primit de la %{emendation_author_nickname} a fost publicat ca un nou %{amendable_type}
-            notification_title: Un <a href="%{emendation_path}">amendament respins</a> pentru <a href="%{amendable_path}">%{amendable_title}</a> a fost publicat ca un nou %{amendable_type} de <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'Un amendament al %{amendable_title} a fost respins. Îl puteți vedea de pe această pagină:'
             email_outro: Ați primit această notificare deoarece sunteți un autor al %{amendable_title}.
-            email_subject: Amendament respins pentru %{amendable_title} de la %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">Amendamentul</a> creat de <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> a fost respins pentru <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Un amendament a fost respins pentru %{amendable_title}. Îl poți vedea de pe această pagină:'
             email_outro: Ai primit această notificare deoarece urmărești %{amendable_title}. Poți înceta să primești notificări urmând linkul anterior.
-            email_subject: Amendament respins pentru %{amendable_title} de la %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">Amendamentul</a> creat de <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> a fost respins pentru <a href="%{amendable_path}">%{amendable_title}</a>.
         emendation_promoted:
           follower:
             email_outro: Ai primit această notificare deoarece ești autor al propunerii "%{amendable_title}.
@@ -969,13 +957,7 @@ ro:
         soft_deleted:
           notification_title: Un administrator a șters "%{resource_type}" "%{resource_title}".
       users:
-        profile_updated:
-          email_intro: <a href="%{resource_url}">Pagina de profil</a> din %{name} (%{nickname}), pe care o urmăriți, a fost actualizată.
-          email_outro: Ați primit această notificare deoarece urmăriți activitatea lui %{endorser_nickname}. Puteți înceta să primiți notificări urmând linkul anterior.
-          email_subject: "%{nickname} și-a actualizat profilul"
-          notification_title: Pagina de profil <a href="%{resource_path}"></a> din %{name} (%{nickname}), pe care o urmărești, a fost actualizată.
         user_officialized:
-          email_intro: Participantul %{name} (%{nickname}) a fost oficializat.
           email_outro: Ați primit această notificare deoarece sunteți un administrator al organizației.
           email_subject: "%{name} a fost oficializat"
     export_mailer:
diff --git a/decidim-core/config/locales/ru.yml b/decidim-core/config/locales/ru.yml
index 8c07400be2b95..fa1c6988c18c1 100644
--- a/decidim-core/config/locales/ru.yml
+++ b/decidim-core/config/locales/ru.yml
@@ -290,8 +290,6 @@ ru:
           affected_user:
             email_intro: 'Для %{amendable_title} была принята поправка. Вы можете увидеть ее на этой странице:'
             email_outro: Вы получили это уведомление, потому что вы автор %{amendable_title}.
-            email_subject: Принята поправка для %{amendable_title} от %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">Эта поправка</a> создана <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> была принята для <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Для %{amendable_title} была принята поправка. Вы можете увидеть ее на этой странице:'
             email_outro: Вы получили это уведомление, потому что вы следите за «%{amendable_title}». Вы можете отписаться от уведомлений, перейдя по приведенной выше ссылке.
@@ -312,12 +310,6 @@ ru:
         email_intro: '«%{resource_title}» обновили. Вы можете посмотреть его на странице:'
         email_outro: Вы получили это уведомление, потому что вы следите за «%{resource_title}». Вы можете перестать за ним следить, перейдя по приведенной выше ссылке.
         email_subject: Обновление %{resource_title}
-      users:
-        profile_updated:
-          email_intro: Страница <a href="%{resource_url}">профиля</a> участника %{name} (%{nickname}), за которым вы следите, была обновлена.
-          email_outro: Вы получили это уведомление, потому что вы следите за «%{nickname}». Вы можете отписаться от уведомлений, перейдя по приведенной выше ссылке.
-          email_subject: "%{nickname} обновил свой профиль"
-          notification_title: Страница <a href="%{resource_path}">профиля</a> участника %{name} (%{nickname}), за которым вы следите, была обновлена.
     export_mailer:
       download_your_data_export:
         download: Скачать
diff --git a/decidim-core/config/locales/sk.yml b/decidim-core/config/locales/sk.yml
index 086346d775a71..b3f13cdd42297 100644
--- a/decidim-core/config/locales/sk.yml
+++ b/decidim-core/config/locales/sk.yml
@@ -909,13 +909,9 @@ sk:
           affected_user:
             email_intro: 'Zmena bola prijatá pre %{amendable_title}. Môžete ju vidieť z tejto stránky: '
             email_outro: Toto oznámenie ste dostali, pretože ste autorom %{amendable_title}.
-            email_subject: doplňujúci návrh prijatý pre %{amendable_title} od%{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}"> zmena </a> vytvorené <a href="%{emendation_author_path}">%{emendation_author_nickname} </a> bol prijatý <a href = "%{amendable_path}" >%{amendable_title} </a>.
           follower:
             email_intro: 'Zmena bola prijatá pre %{amendable_title}. Môžete ju vidieť z tejto stránky: '
             email_outro: Toto oznámenie ste dostali, pretože sledujete %{amendable_title}. Po kliknutí na predchádzajúcu odkaz môžete prestať prijímať oznámenia.
-            email_subject: doplňujúci návrh prijatý pre %{amendable_title} od%{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}"> zmena </a> vytvorené <a href="%{emendation_author_path}">%{emendation_author_nickname} </a> bol prijatý <a href = "%{amendable_path}" >%{amendable_title} </a>.
         amendment_created:
           affected_user:
             email_intro: 'Nová zmena bola vytvorená pre hodnotu%{amendable_title}. Môžete ju vidieť z tejto stránky: '
@@ -931,29 +927,20 @@ sk:
           affected_user:
             email_intro: 'Zamietnutý pozmeňovací návrh pre %{amendable_title} bol publikovaný ako nový %{amendable_type}. Môžete ho vidieť z tejto stránky: '
             email_outro: Toto oznámenie ste dostali, pretože ste autorom %{amendable_title}.
-            email_subject: doplňujúci návrh z%{emendation_author_nickname} bol zverejnený ako nový%{amendable_type}
-            notification_title: <a href="%{emendation_path}"> zamietnuť zmenu </a> pre <a href="%{amendable_path}">%{amendable_title} </a> bola publikovaná ako nový%{amendable_type} od <a href = "%{emendation_author_path}">%{emendation_author_nickname} </a>.
           follower:
             email_intro: 'Označenie odmietnutej pre číslo %{amendable_title} bolo povýšené na nezávislý%{amendable_type}. Môžete ju vidieť z tejto stránky: '
             email_outro: Toto oznámenie ste dostali, pretože sledujete %{amendable_title}. Notifikácie môžete zrušiť po kliknutí na predchádzajúci odkaz.
-            email_subject: Zmena z%{emendation_author_nickname} bola uverejnená ako nová%{amendable_type}
-            notification_title: <a href="%{emendation_path}"> zamietnuť zmenu </a> pre <a href="%{amendable_path}">%{amendable_title} </a> bola publikovaná ako nový%{amendable_type} od <a href = "%{emendation_author_path}">%{emendation_author_nickname} </a>.
         amendment_rejected:
           affected_user:
             email_intro: 'Oznámenie bolo zamietnuté za %{amendable_title}. Môžete ju vidieť z tejto stránky: '
             email_outro: Toto oznámenie ste dostali, pretože ste autorom %{amendable_title}.
-            email_subject: Zmena bola zamietnutá pre %{amendable_title} od%{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}"> zmena </a> vytvorené <a href="%{emendation_author_path}">%{emendation_author_nickname} </a> bola odmietnutá <a href = "%{amendable_path}" >%{amendable_title} </a>.
           follower:
             email_intro: 'Oznámenie bolo zamietnuté za %{amendable_title}. Môžete ju vidieť z tejto stránky: '
             email_outro: Toto oznámenie ste dostali, pretože sledujete %{amendable_title}. Notifikácie môžete zrušiť po kliknutí na predchádzajúci odkaz.
-            email_subject: Zmena bola zamietnutá pre %{amendable_title} od%{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}"> zmena </a> vytvorené <a href="%{emendation_author_path}">%{emendation_author_nickname} </a> bola odmietnutá <a href = "%{amendable_path}" >%{amendable_title} </a>.
         emendation_promoted:
           follower:
             email_intro: 'Pre %{amendable_title} bola zverejnená úprava. Môžete si ju pozrieť na tejto stránke:'
             email_outro: Toto upozornenie ste dostali, pretože ste autorom %{amendable_title}.
-            email_subject: Úprava od %{emendation_author_nickname} bola zverejnená ako nový %{amendable_type}
       attachments:
         attachment_created:
           email_intro: 'Do dokumentu%{resource_title} bol pridaný nový dokument. Môžete ho vidieť z tejto stránky: '
@@ -1004,25 +991,13 @@ sk:
           notification_title: |-
             Administrátor odstránil váš %{resource_type}, pretože bol nahlásený ako %{report_reasons}.</br>
             <i>%{resource_content}</i>
-      resource_liked:
-        email_intro: '%{liker_name} %{liker_nickname}, ktorého sledujete, práve označil/a, že sa mu/jej páči „%{resource_title}“, a myslíme si, že by to mohlo zaujímať aj vás. Pozrite si to a prispejte:'
-        email_outro: Toto upozornenie ste dostali, pretože sledujete %{liker_nickname}. Prijímanie upozornení môžete zrušiť pomocou predchádzajúceho odkazu.
-        email_subject: "%{liker_nickname} pridal/a nové označenie páči sa mi to"
-        notification_title: <a href="%{resource_path}">%{resource_title}</a> (%{resource_type}) sa páči používateľovi <a href="%{liker_path}">%{liker_name} %{liker_nickname}</a>.
       resources:
         soft_deleted:
           notification_title: Administrátor odstránil váš „%{resource_type}“ „%{resource_title}“.
       users:
-        profile_updated:
-          email_intro: <a href="%{resource_url}"> profilová stránka </a> zo %{name} (%{nickname}), ktorú sledujete, bola aktualizovaná.
-          email_outro: Toto oznámenie ste dostali, pretože sledujete %{nickname}. Notifikácie môžete zrušiť po kliknutí na predchádzajúci odkaz.
-          email_subject: "%{nickname} aktualizoval svoj profil"
-          notification_title: <a href="%{resource_path}"> profilová stránka </a> od%{name} (%{nickname}), ktorú sledujete, bola aktualizovaná.
         user_officialized:
-          email_intro: Účastník %{name} (%{nickname}) bol oficializovaný.
           email_outro: Toto upozornenie ste dostali, pretože ste administrátorom organizácie.
           email_subject: "%{name} bol/a oficializovaný/á"
-          notification_title: Účastník %{name} (%{nickname}) bol oficializovaný.
     export_mailer:
       download_your_data_export:
         click_button_html: Kliknutím na nasledujúci odkaz si stiahnete svoje údaje.<br/>Súbor bude k dispozícii na stiahnutie do %{date}.
diff --git a/decidim-core/config/locales/sv.yml b/decidim-core/config/locales/sv.yml
index 0730822155a96..dd6308b8c7904 100644
--- a/decidim-core/config/locales/sv.yml
+++ b/decidim-core/config/locales/sv.yml
@@ -875,13 +875,13 @@ sv:
           affected_user:
             email_intro: 'Ett ändringsförslag har godkänts för %{amendable_title}. Visa det från den här sidan:'
             email_outro: Du har fått det här meddelandet eftersom du är en författare av %{amendable_title}.
-            email_subject: Bifallet ändringsförslag till %{amendable_title} från %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">Ändringsförslaget</a> från av <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> till <a href="%{amendable_path}">%{amendable_title}</a> har bifallits.
+            email_subject: Accepterad förbättring av %{amendable_title} från %{emendation_author_name}
+            notification_title: <a href="%{emendation_path}">Förbättringen</a> gjord av <a href="%{emendation_author_path}">%{emendation_author_name}</a> accepterades för <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Ett ändringsförslag har bifallits för %{amendable_title}. Läs det på den här sidan:'
             email_outro: Du har fått det här meddelandet eftersom du följer %{amendable_title}. Du kan sluta att ta emot meddelanden genom att följa föregående länk.
-            email_subject: Bifallet ändringsförslag till %{amendable_title} från %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">Ändringsförslaget</a> från av <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> till <a href="%{amendable_path}">%{amendable_title}</a> har bifallits.
+            email_subject: Accepterad förbättring av %{amendable_title} från %{emendation_author_name}
+            notification_title: <a href="%{emendation_path}">Förbättringen</a> gjord av <a href="%{emendation_author_path}">%{emendation_author_name}</a> accepterades för <a href="%{amendable_path}">%{amendable_title}</a>.
         amendment_created:
           affected_user:
             email_intro: 'Ett nytt ändringsförslag har skapats för %{amendable_title}. Du kan se det från den här sidan:'
@@ -897,29 +897,20 @@ sv:
           affected_user:
             email_intro: 'Ett avslaget ändringsförslag till %{amendable_title} har publicerats som en ny %{amendable_type}. Du kan se det på den här sidan:'
             email_outro: Du har fått det här meddelandet eftersom du är en författare av %{amendable_title}.
-            email_subject: Ett ändringsförslag från %{emendation_author_nickname} har publicerats som ett nytt %{amendable_type}
-            notification_title: Ett <a href="%{emendation_path}">avslaget ändringsförslag</a> till <a href="%{amendable_path}">%{amendable_title}</a> har publicerats som ett nytt %{amendable_type} av <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
           follower:
             email_intro: 'En avslaget ändringsförslag till %{amendable_title} har lagts fram som ett nytt %{amendable_type}. Du kan se det på den här sidan:'
             email_outro: Du har fått det här meddelandet eftersom du följer %{amendable_title}. Du kan sluta att ta emot meddelanden via föregående länk.
-            email_subject: Ett ändringsförslag från %{emendation_author_nickname} har lagts fram som ett nytt %{amendable_type}
-            notification_title: Ett <a href="%{emendation_path}">avslaget ändringsförslag</a> till <a href="%{amendable_path}">%{amendable_title}</a> har lagts fram som ett nytt %{amendable_type} av <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'En ändringsförslag till %{amendable_title} har avslagits. Du kan se det från den här sidan:'
             email_outro: Du har fått det här meddelandet eftersom du är en författare till %{amendable_title}.
-            email_subject: Avslaget ändringsförslag till %{amendable_title} från %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">Ändringsförslaget</a> för <a href="%{amendable_path}">%{amendable_title}</a> skapat av <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> har avslagits.
           follower:
             email_intro: 'Ett ändringsförslag till %{amendable_title} har avslagits. Du kan se det från den här sidan:'
             email_outro: Du har fått det här meddelandet eftersom du följer %{amendable_title}. Du kan sluta ta emot meddelanden via föregående länk.
-            email_subject: Ändringsförslaget till %{amendable_title} från %{emendation_author_nickname} avslogs
-            notification_title: <a href="%{emendation_path}">Ändringsförslaget</a> till <a href="%{amendable_path}">%{amendable_title}</a> skapat av <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> har avslagits.
         emendation_promoted:
           follower:
             email_intro: 'Ett ändringsförslag till %{amendable_title} har avslagits. Du kan se det från den här sidan:'
             email_outro: Du har fått det här meddelandet eftersom du är en författare till %{amendable_title}.
-            email_subject: Ett ändringsförslag från %{emendation_author_nickname} har publicerats som ett nytt %{amendable_type}
       attachments:
         attachment_created:
           email_intro: 'Ett nytt dokument har lagts till i %{resource_title}. Du kan se det från den här sidan:'
@@ -971,25 +962,13 @@ sv:
             En administratör tog bort din %{resource_type} eftersom den har rapporterats som %{report_reasons}.
             </br>
             <i>%{resource_content}</i>
-      resource_liked:
-        email_intro: '%{liker_name} %{liker_nickname}, som du följer, gillar "%{resource_title}" och vi tror att du kan vara intresserad. Ta en titt och bidra:'
-        email_outro: Du har fått det här meddelandet eftersom du följer %{liker_nickname}. Du kan sluta att ta emot meddelanden via föregående länk.
-        email_subject: "%{liker_nickname} har gillat något"
-        notification_title: <a href="%{liker_path}">%{liker_name} %{liker_nickname}</a> gillar %{resource_type} <a href="%{resource_path}">%{resource_title}</a>.
       resources:
         soft_deleted:
           notification_title: En administratör har tagit bort ditt "%{resource_type}" "%{resource_title}".
       users:
-        profile_updated:
-          email_intro: <a href="%{resource_url}">Profilsidan</a> för %{name} (%{nickname}), som du följer, har uppdaterats.
-          email_outro: Du har fått det här meddelandet eftersom du följer %{nickname}. Du kan sluta att ta emot meddelanden genom att följa föregående länk.
-          email_subject: "%{nickname} uppdaterade sin profil"
-          notification_title: <a href="%{resource_path}">Profilsidan</a> för %{name} (%{nickname}), som du följer, har uppdaterats.
         user_officialized:
-          email_intro: Deltagaren %{name} (%{nickname}) har fått officiell status.
           email_outro: Du har fått detta meddelande eftersom du är administratör i organisationen.
           email_subject: "%{name} har fått officiell status"
-          notification_title: Deltagaren %{name} (%{nickname}) har fått officiell status.
     export_mailer:
       download_your_data_export:
         click_button_html: Klicka på nästa länk för att ladda ner dina data.<br/>Filen kommer att finnas tillgänglig för nedladdning fram till %{date}.
diff --git a/decidim-core/config/locales/tr-TR.yml b/decidim-core/config/locales/tr-TR.yml
index 9c186caf0ffea..d54a3cee258a3 100644
--- a/decidim-core/config/locales/tr-TR.yml
+++ b/decidim-core/config/locales/tr-TR.yml
@@ -419,13 +419,9 @@ tr:
           affected_user:
             email_intro: '%{amendable_title}için bir ödeme kabul edildi. Bu sayfadan görebilirsiniz:'
             email_outro: Bu bildirimi aldınız, çünkü %{amendable_title}yazarı sizsiniz.
-            email_subject: '%{emendation_author_nickname}%{amendable_title} bir değişiklik kabul edildi'
-            notification_title: <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> tarafından yaratılan <a href="%{emendation_path}">değişiklik</a> <a href="%{amendable_path}">%{amendable_title}</a>için kabul edilmiştir.
           follower:
             email_intro: '%{amendable_title}için bir ödeme kabul edildi. Bu sayfadan görebilirsiniz:'
             email_outro: Bu bildirimi, %{amendable_title}izlediğiniz için aldınız. Önceki bağlantıyı takip ederek bildirimleri almayı durdurabilirsiniz.
-            email_subject: '%{emendation_author_nickname}%{amendable_title} bir değişiklik kabul edildi'
-            notification_title: <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> tarafından yaratılan <a href="%{emendation_path}">değişiklik</a> <a href="%{amendable_path}">%{amendable_title}</a>için kabul edilmiştir.
         amendment_created:
           affected_user:
             email_intro: '%{amendable_title}için yeni bir emendation oluşturuldu. Bu sayfadan görebilirsiniz:'
@@ -441,24 +437,16 @@ tr:
           affected_user:
             email_intro: '%{amendable_title} için reddedilen bir tahliye, bağımsız %{amendable_type} yükseltilmiştir. Bu sayfadan görebilirsiniz:'
             email_outro: Bu bildirimi aldınız, çünkü %{amendable_title} yazarı sizsiniz.
-            email_subject: '%{emendation_author_nickname} bir değişiklik yeni olarak yayınlandı %{amendable_type}'
-            notification_title: Bir <a href="%{emendation_path}">değişikliğini reddetmiştir</a> için <a href="%{amendable_path}">%{amendable_title}</a>, yeni olarak yayınlanmış %{amendable_type} ile <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
           follower:
             email_intro: '%{amendable_title} için reddedilen bir tahliye, bağımsız %{amendable_type} yükseltilmiştir. Bu sayfadan görebilirsiniz:'
             email_outro: Bu bildirimi, %{amendable_title} izlediğiniz için aldınız. Önceki bağlantıyı takip ederek bildirimleri almayı durdurabilirsiniz.
-            email_subject: '%{emendation_author_nickname} bir değişiklik yeni olarak yayınlandı %{amendable_type}'
-            notification_title: Bir <a href="%{emendation_path}">değişikliğini reddetmiştir</a> için <a href="%{amendable_path}">%{amendable_title}</a>, yeni olarak yayınlanmış %{amendable_type} ile <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
         amendment_rejected:
           affected_user:
             email_intro: 'Bir emendation %{amendable_title} için reddedildi. Bu sayfadan görebilirsiniz:'
             email_outro: Bu bildirimi aldınız, çünkü %{amendable_title} yazarı sizsiniz.
-            email_subject: Bir değişiklik %{emendation_author_nickname}%{amendable_title} için reddedildi
-            notification_title: <a href="%{emendation_path}">değişiklik</a> tarafından oluşturulan <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> reddedildi <a href="%{amendable_path}">%{amendable_title}</a>.
           follower:
             email_intro: 'Bir emendation %{amendable_title} için reddedildi. Bu sayfadan görebilirsiniz:'
             email_outro: Bu bildirimi, %{amendable_title} izlediğiniz için aldınız. Önceki bağlantıyı takip ederek bildirimleri almayı durdurabilirsiniz.
-            email_subject: Bir değişiklik %{emendation_author_nickname}%{amendable_title} için reddedildi
-            notification_title: <a href="%{emendation_path}">değişiklik</a> tarafından oluşturulan <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> reddedildi <a href="%{amendable_path}">%{amendable_title}</a>.
       attachments:
         attachment_created:
           email_intro: '%{resource_title} yeni bir belge eklendi. Bu sayfadan görebilirsiniz:'
@@ -489,12 +477,6 @@ tr:
           notification_title: |-
             Bir yönetici, %{resource_type}'nizi %{report_reasons} olarak bildirildiği için kaldırdı. </br>
             <i>%{resource_content} </i>
-      users:
-        profile_updated:
-          email_intro: <a href="%{resource_url}">profil sayfası</a> arasında %{name} (%{nickname} izlediğiniz), güncellendi.
-          email_outro: Bu bildirimi, %{nickname} izlediğiniz için aldınız. Önceki bağlantıyı takip ederek bildirimleri almayı durdurabilirsiniz.
-          email_subject: "%{nickname} profilini güncelledi"
-          notification_title: <a href="%{resource_path}">profil sayfası</a> arasında %{name} (%{nickname} izlediğiniz), güncellendi.
     export_mailer:
       download_your_data_export:
         download: İndir
diff --git a/decidim-core/config/locales/uk.yml b/decidim-core/config/locales/uk.yml
index 19210e85e30fe..a99053dbfb59a 100644
--- a/decidim-core/config/locales/uk.yml
+++ b/decidim-core/config/locales/uk.yml
@@ -250,12 +250,6 @@ uk:
         email_intro: '"%{resource_title}" було оновлено. Ви можете переглянути його на сторінці:'
         email_outro: Ви отримали це сповіщення, тому що ви стежите за "%{resource_title}". Ви можете припинити стежити за ним, перейшовши за наведеним вище посиланням.
         email_subject: Оновлення до %{resource_title}
-      users:
-        profile_updated:
-          email_intro: Сторінка <a href="%{resource_url}">профілю</a> учасника %{name} (%{nickname}), за яким ви стежите, була оновлена.
-          email_outro: Ви отримали це сповіщення, тому що ви стежите за %{nickname}. Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
-          email_subject: "%{nickname} оновив свій профіль"
-          notification_title: Сторінка <a href="%{resource_path}">профілю</a> учасника %{name} (%{nickname}), за яким ви стежите, була оновлена.
     export_mailer:
       download_your_data_export:
         download: Завантажити
diff --git a/decidim-core/config/locales/zh-CN.yml b/decidim-core/config/locales/zh-CN.yml
index 4eddb73e88181..654fb23f4c1ec 100644
--- a/decidim-core/config/locales/zh-CN.yml
+++ b/decidim-core/config/locales/zh-CN.yml
@@ -351,13 +351,9 @@ zh-CN:
           affected_user:
             email_intro: '%{amendable_title}的修改已被接受。您可以从这个页面查看：'
             email_outro: 您收到此通知是因为您是 %{amendable_title} 的作者。
-            email_subject: 接受来自 %{amendable_title} 的 %{emendation_author_nickname} 修正案
-            notification_title: 由 <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> 创建的 <a href="%{emendation_path}">修正</a> 已被接受 <a href="%{amendable_path}">%{amendable_title}</a>。
           follower:
             email_intro: '%{amendable_title}的修改已被接受。您可以从这个页面查看：'
             email_outro: 您收到此通知是因为您正在关注 %{amendable_title}。您可以停止收到跟随上一个链接的通知。
-            email_subject: 接受来自 %{amendable_title} 的 %{emendation_author_nickname} 修正案
-            notification_title: 由 <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> 创建的 <a href="%{emendation_path}">修正</a> 已被接受 <a href="%{amendable_path}">%{amendable_title}</a>。
         amendment_created:
           affected_user:
             email_intro: '已经为 %{amendable_title}创建了一个新的版本。您可以从这个页面查看它：'
@@ -373,22 +369,16 @@ zh-CN:
           affected_user:
             email_intro: '%{amendable_title} 的被拒绝的修订已经发布为新的 %{amendable_type}。您可以从这个页面查看：'
             email_outro: 您收到此通知是因为您是 %{amendable_title} 的作者。
-            email_subject: 来自 %{emendation_author_nickname} 的修订已经发布为新的 %{amendable_type}
           follower:
             email_intro: '%{amendable_title} 的被拒绝的修订已经发布为新的 %{amendable_type}。您可以从这个页面查看：'
             email_outro: 您收到此通知是因为您正在关注 %{amendable_title}。您可以停止收到跟随上一个链接的通知。
-            email_subject: 来自 %{emendation_author_nickname} 的修订已经发布为新的 %{amendable_type}
         amendment_rejected:
           affected_user:
             email_intro: '%{amendable_title}的修订已被拒绝。您可以从这个页面查看：'
             email_outro: 您收到此通知是因为您是 %{amendable_title} 的作者。
-            email_subject: '%{amendable_title} 的 %{emendation_author_nickname} 修正案被拒绝'
-            notification_title: 由 <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> 创建的 <a href="%{emendation_path}">项修正</a> 已被 <a href="%{amendable_path}">%{amendable_title}</a> 拒绝。
           follower:
             email_intro: '%{amendable_title}的修订已被拒绝。您可以从这个页面查看：'
             email_outro: 您收到此通知是因为您正在关注 %{amendable_title}。您可以停止收到跟随上一个链接的通知。
-            email_subject: '%{amendable_title} 的 %{emendation_author_nickname} 修正案被拒绝'
-            notification_title: 由 <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> 创建的 <a href="%{emendation_path}">项修正</a> 已被 <a href="%{amendable_path}">%{amendable_title}</a> 拒绝。
       attachments:
         attachment_created:
           email_intro: '一个新文档已添加到 %{resource_title}。您可以从这个页面查看：'
@@ -411,12 +401,6 @@ zh-CN:
           email_outro: 您收到此通知是因为您在我们的网站上进行了活动。
         level_up:
           email_outro: 您收到此通知是因为您在我们的网站上进行了活动。
-      users:
-        profile_updated:
-          email_intro: 您关注的 %{name} (%{nickname}) 的 <a href="%{resource_url}">个人资料页面</a> 已经更新。
-          email_outro: 您收到此通知是因为您正在关注 %{nickname}。您可以停止收到跟随上一个链接的通知。
-          email_subject: "%{nickname} 更新了他们的个人资料"
-          notification_title: 您关注的 %{name} (%{nickname}) 的 <a href="%{resource_path}">个人资料页面</a> 已经更新。
     export_mailer:
       download_your_data_export:
         download: 下载
diff --git a/decidim-core/config/locales/zh-TW.yml b/decidim-core/config/locales/zh-TW.yml
index 8812f196738cf..2e641365f5428 100644
--- a/decidim-core/config/locales/zh-TW.yml
+++ b/decidim-core/config/locales/zh-TW.yml
@@ -550,13 +550,9 @@ zh-TW:
           affected_user:
             email_intro: '已接受對於 %{amendable_title} 的修正案。您可以從此頁面中查看：'
             email_outro: 你收到此通知，是因為你是%{amendable_title} 的作者。
-            email_subject: 已接受對於 %{amendable_title} 的修正案，來自於 %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">修正案</a>由<a href="%{emendation_author_path}">%{emendation_author_nickname}</a>創建，已被接受適用於<a href="%{amendable_path}">%{amendable_title}</a>。
           follower:
             email_intro: '已接受對於 %{amendable_title} 的修正案。您可以從此頁面中查看：'
             email_outro: 您收到此通知，是因為您正在關注 %{amendable_title}。您可以使用上面的連結停止接收通知。
-            email_subject: 已接受對於 %{amendable_title} 的修正案，來自於 %{emendation_author_nickname}
-            notification_title: <a href="%{emendation_path}">修正案</a>由<a href="%{emendation_author_path}">%{emendation_author_nickname}</a>創建，已被接受適用於<a href="%{amendable_path}">%{amendable_title}</a>。
         amendment_created:
           affected_user:
             email_intro: '已為 %{amendable_title} 創建一個新的修正案。您可以從此頁面查看：'
@@ -572,24 +568,16 @@ zh-TW:
           affected_user:
             email_intro: '一個被拒絕的修正案已被發佈為新的 %{amendable_type}，針對 %{amendable_title}。您可以從此頁面查看：'
             email_outro: 你收到此通知，是因為你是%{amendable_title} 的作者。
-            email_subject: 來自 %{emendation_author_nickname} 的修正案已被發佈為新的 %{amendable_type}
-            notification_title: 一個<a href="%{emendation_path}">被拒絕的修正案</a>已由<a href="%{emendation_author_path}">%{emendation_author_nickname}</a>發佈為新的 %{amendable_type}，針對<a href="%{amendable_path}">%{amendable_title}</a>。
           follower:
             email_intro: '一個被拒絕的修正案已被發佈為新的 %{amendable_type}，針對 %{amendable_title}。您可以從此頁面查看：'
             email_outro: 您收到此通知，是因為您正在關注 %{amendable_title}。您可以使用上面的連結停止接收通知。
-            email_subject: 來自 %{emendation_author_nickname} 的修正案已被發佈為新的 %{amendable_type}
-            notification_title: 一個<a href="%{emendation_path}">被拒絕的修正案</a>已由<a href="%{emendation_author_path}">%{emendation_author_nickname}</a>發佈為新的 %{amendable_type}，針對<a href="%{amendable_path}">%{amendable_title}</a>。
         amendment_rejected:
           affected_user:
             email_intro: '一個修正案已被拒絕，針對 %{amendable_title}。您可以從此頁面查看：'
             email_outro: 你收到此通知，是因為你是%{amendable_title} 的作者。
-            email_subject: 修正案由 %{emendation_author_nickname} 提交，針對 %{amendable_title}，已被拒絕。
-            notification_title: <a href="%{emendation_path}">%{emendation_author_nickname}</a>創建的<a href="%{emendation_path}">修正案</a>已被拒絕，針對<a href="%{amendable_path}">%{amendable_title}</a>。
           follower:
             email_intro: '一個修正案已被拒絕，針對 %{amendable_title}。您可以從此頁面查看：'
             email_outro: 您收到此通知，是因為您正在關注 %{amendable_title}。您可以使用上面的連結停止接收通知。
-            email_subject: 修正案由 %{emendation_author_nickname} 提交，針對 %{amendable_title}，已被拒絕。
-            notification_title: <a href="%{emendation_path}">%{emendation_author_nickname}</a>創建的<a href="%{emendation_path}">修正案</a>已被拒絕，針對<a href="%{amendable_path}">%{amendable_title}</a>。
       attachments:
         attachment_created:
           email_intro: '已新增一個文件至 %{resource_title}。您可以從此頁面查看：'
@@ -626,16 +614,9 @@ zh-TW:
           notification_title: |-
             一位管理員因為 %{report_reasons} 的舉報，移除了您的%{resource_type}。</br> <i>%{resource_content}</i>
       users:
-        profile_updated:
-          email_intro: 你正在追蹤的 %{name}(%{nickname}) 的<a href="%{resource_path}">個人資料頁面</a>已被更新。
-          email_outro: 您收到此通知是因為您正在關注 %{nickname}。您可以點擊上方的連結停止接收通知。
-          email_subject: "%{nickname} 更新了他們的個人資料。"
-          notification_title: 你正在追蹤的 %{name}(%{nickname}) 的<a href="%{resource_path}">個人資料頁面</a>已被更新。
         user_officialized:
-          email_intro: 參與者 %{name} (%{nickname}) 已被官方認證。
           email_outro: 您收到此通知是因為您是該組織的管理員。
           email_subject: "%{name} 已被官方認證。"
-          notification_title: 參與者 %{name} (%{nickname}) 已被官方認證。
     export_mailer:
       download_your_data_export:
         download: 下載
diff --git a/decidim-debates/config/locales/ar.yml b/decidim-debates/config/locales/ar.yml
index 6b13644c35e11..1503a85cac533 100644
--- a/decidim-debates/config/locales/ar.yml
+++ b/decidim-debates/config/locales/ar.yml
@@ -103,14 +103,6 @@ ar:
             title: عنوان
     events:
       debates:
-        create_debate_event:
-          user_followers:
-            email_intro: |-
-              مرحبًا ،
-              %{author_name} %{author_nickname}، الذي تتابعه ، أنشأ نقاشًا جديدًا "%{resource_title}". التحقق من ذلك والمساهمة:
-            email_outro: لقد تلقيت هذا الإشعار لأنك تتابع %{author_nickname}. يمكنك إيقاف تلقي الإخطارات باتباع الرابط السابق.
-            email_subject: نقاش جديد "%{resource_title}" بنسبة %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> أنشأ النقاش <a href="%{resource_path}">%{resource_title}</a>.
         creation_disabled:
           email_intro: 'إنشاء النقاش لم يعد نشطًا في %{participatory_space_title}. لا يزال بإمكانك المشاركة في المناقشات المفتوحة من هذه الصفحة:'
           email_outro: لقد تلقيت هذا الإشعار لأنك تتابع %{participatory_space_title}. يمكنك إيقاف تلقي الإخطارات باتباع الرابط السابق.
diff --git a/decidim-debates/config/locales/bg.yml b/decidim-debates/config/locales/bg.yml
index 66a1f29a24a13..eda3692c83b9f 100644
--- a/decidim-debates/config/locales/bg.yml
+++ b/decidim-debates/config/locales/bg.yml
@@ -147,13 +147,6 @@ bg:
             email_outro: Получихте това известие, защото следвате %{participatory_space_title} пространство за участие. Можете да спрете да получавате известия, като следвате предишната връзка.
             email_subject: Нов дебат „%{resource_title}“ на %{participatory_space_title}
             notification_title: Дебатът <a href="%{resource_path}">%{resource_title}</a> беше създаден на <a href="%{participatory_space_url}">%{participatory_space_title}</a>.
-          user_followers:
-            email_intro: |-
-              Здравейте,
-              участниът %{author_name} %{author_nickname}, когото следвате, създаде нов дебат „%{resource_title}“. Вижте го и допринесете:
-            email_outro: Получихте това известие, защото следвате %{author_nickname}. Можете да спрете да получавате известия, като последвате предходния линк.
-            email_subject: Нов дебат „%{resource_title}“ от %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> създаде дебата <a href="%{resource_path}">%{resource_title}</a>.
         creation_disabled:
           email_intro: 'Създаването на дебати вече не е активно в(ъв) %{participatory_space_title}. Все още можете да участвате в отворени дебати от следната страница:'
           email_outro: Получавате това известие, защото следвате %{participatory_space_title}. Може да прекратите известията чрез предходния линк.
diff --git a/decidim-debates/config/locales/ca-IT.yml b/decidim-debates/config/locales/ca-IT.yml
index 9d1ab03472e76..cfa0ab62f389a 100644
--- a/decidim-debates/config/locales/ca-IT.yml
+++ b/decidim-debates/config/locales/ca-IT.yml
@@ -205,10 +205,10 @@ ca-IT:
           user_followers:
             email_intro: |-
               Hola,
-              %{author_name} %{author_nickname}, a qui segueixes, ha creat un nou debat "%{resource_title}". Consulta i contribueix:
-            email_outro: Has rebut aquesta notificació perquè estàs seguint a "%{author_nickname}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
-            email_subject: Nou debat "%{resource_title}" de %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha creat el debat <a href="%{resource_path}">%{resource_title}</a>.
+              %{author_name}, a qui segueixes, ha creat un nou debat "%{resource_title}". Consulta i contribueix:
+            email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{author_name}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
+            email_subject: Nou debat "%{resource_title}" creat per %{author_name}
+            notification_title: <a href="%{author_path}">%{author_name}</a> ha creat el debat <a href="%{resource_path}">%{resource_title}</a>.
         creation_disabled:
           email_intro: 'La creació de debats ja no està activa a %{participatory_space_title}. Encara pots participar en debats oberts des d''aquesta pàgina:'
           email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{participatory_space_title}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
diff --git a/decidim-debates/config/locales/ca.yml b/decidim-debates/config/locales/ca.yml
index 6349e37d26540..366112f6ce679 100644
--- a/decidim-debates/config/locales/ca.yml
+++ b/decidim-debates/config/locales/ca.yml
@@ -205,10 +205,10 @@ ca:
           user_followers:
             email_intro: |-
               Hola,
-              %{author_name} %{author_nickname}, a qui segueixes, ha creat un nou debat "%{resource_title}". Consulta i contribueix:
-            email_outro: Has rebut aquesta notificació perquè estàs seguint a "%{author_nickname}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
-            email_subject: Nou debat "%{resource_title}" de %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha creat el debat <a href="%{resource_path}">%{resource_title}</a>.
+              %{author_name}, a qui segueixes, ha creat un nou debat "%{resource_title}". Consulta i contribueix:
+            email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{author_name}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
+            email_subject: Nou debat "%{resource_title}" creat per %{author_name}
+            notification_title: <a href="%{author_path}">%{author_name}</a> ha creat el debat <a href="%{resource_path}">%{resource_title}</a>.
         creation_disabled:
           email_intro: 'La creació de debats ja no està activa a %{participatory_space_title}. Encara pots participar en debats oberts des d''aquesta pàgina:'
           email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{participatory_space_title}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
diff --git a/decidim-debates/config/locales/cs.yml b/decidim-debates/config/locales/cs.yml
index cc3f0a543114f..b063af8c0a902 100644
--- a/decidim-debates/config/locales/cs.yml
+++ b/decidim-debates/config/locales/cs.yml
@@ -207,9 +207,7 @@ cs:
             email_intro: |-
               Ahoj,
               %{author_name} %{author_nickname}, kterého sledujete, vytvořil novou debatu "%{resource_title}". Omrkněte ji a přispějte:
-            email_outro: Toto oznámení jste obdrželi, protože sledujete %{author_nickname}. Na předchozím odkazu můžete zrušit přijem oznámení.
-            email_subject: Nová debata "%{resource_title}" od %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> vytvořil <a href="%{resource_path}">%{resource_title}</a> debatu.
+            email_subject: Nová debata "%{resource_title}" od %{author_name}
         creation_disabled:
           email_intro: 'Tvorba debaty již není aktivní v %{participatory_space_title}. Na otevřených debatách se můžete stále účastnit z této stránky:'
           email_outro: Toto oznámení jste obdrželi, protože jste sledovali %{participatory_space_title}. Na předchozím odkazu můžete přestat přijímat oznámení.
diff --git a/decidim-debates/config/locales/de.yml b/decidim-debates/config/locales/de.yml
index 3dcc77936d94a..e5d38ab804366 100644
--- a/decidim-debates/config/locales/de.yml
+++ b/decidim-debates/config/locales/de.yml
@@ -197,13 +197,6 @@ de:
             email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie %{participatory_space_title} folgen. Falls Sie keine solchen Benachrichtigungen mehr erhalten möchten, besuchen Sie den obigen Link.
             email_subject: Neue Debatte "%{resource_title}" in %{participatory_space_title}
             notification_title: Die Debatte <a href="%{resource_path}">%{resource_title}</a> wurde auf <a href="%{participatory_space_url}">%{participatory_space_title}</a> erstellt.
-          user_followers:
-            email_intro: |-
-              Hallo,
-              %{author_name} %{author_nickname}, dem Sie folgen, hat eine neue Debatte "%{resource_title}" erstellt. Sehen Sie es sich an und reden Sie mit:
-            email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie %{author_nickname} folgen. Falls Sie keine solchen Benachrichtigungen mehr erhalten möchten, besuchen Sie den obigen Link.
-            email_subject: Neue Debatte "%{resource_title}" von %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> hat die Debatte <a href="%{resource_path}">%{resource_title}</a> erstellt.
         creation_disabled:
           email_intro: 'Die Erstellung von Debatten ist in %{participatory_space_title} nicht mehr aktiviert. Sie können weiterhin an offenen Debatten teilnehmen:'
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie %{participatory_space_title} folgen. Falls Sie keine solchen Benachrichtigungen mehr erhalten möchten, besuchen Sie den obigen Link.
diff --git a/decidim-debates/config/locales/el.yml b/decidim-debates/config/locales/el.yml
index 565e0532941a5..156165272bac8 100644
--- a/decidim-debates/config/locales/el.yml
+++ b/decidim-debates/config/locales/el.yml
@@ -132,14 +132,6 @@ el:
             title: Τίτλος
     events:
       debates:
-        create_debate_event:
-          user_followers:
-            email_intro: |-
-              Γεια σας,
-              Ο συντάκτης %{author_name} %{author_nickname}, τον οποίο ακολουθείτε, δημιούργησε μια νέα συζήτηση «%{resource_title}». Δείτε την και συνεισφέρετε:
-            email_outro: Λάβατε αυτήν την ειδοποίηση επειδή ακολουθείτε τον συντάκτη %{author_nickname}. Μπορείτε να διακόψετε τη λήψη ειδοποιήσεων ακολουθώντας τον προηγούμενο σύνδεσμο.
-            email_subject: Νέα συζήτηση «%{resource_title}» από τον συντάκτη %{author_nickname}
-            notification_title: Ο συντάκτης <a href="%{author_path}">%{author_name} %{author_nickname}</a> δημιούργησε τη συζήτηση <a href="%{resource_path}">%{resource_title}</a>.
         creation_disabled:
           email_intro: 'Η δημιουργία συζήτησης δεν είναι πλέον ενεργή στον χώρο συμμετοχής %{participatory_space_title}. Μπορείτε ακόμα να συμμετέχετε σε ανοιχτές συζητήσεις από αυτήν τη σελίδα:'
           email_outro: Λάβατε αυτήν την ειδοποίηση επειδή ακολουθείτε τον χώρο συμμετοχής %{participatory_space_title}. Μπορείτε να διακόψετε τη λήψη ειδοποιήσεων ακολουθώντας τον προηγούμενο σύνδεσμο.
diff --git a/decidim-debates/config/locales/es-MX.yml b/decidim-debates/config/locales/es-MX.yml
index 74df0194e023e..7841e8a9c91fb 100644
--- a/decidim-debates/config/locales/es-MX.yml
+++ b/decidim-debates/config/locales/es-MX.yml
@@ -205,10 +205,10 @@ es-MX:
           user_followers:
             email_intro: |-
               Hola,
-              %{author_name} %{author_nickname}, a quien estás siguiendo, ha creado un nuevo debate "%{resource_title}". Échale un vistazo y contribuye:
-            email_outro: Has recibido esta notificación porque estás siguiendo a %{author_nickname}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-            email_subject: Nuevo debate "%{resource_title}" de %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> creó el debate <a href="%{resource_path}">%{resource_title}</a>.
+              %{author_name}, a quien estás siguiendo, ha creado un nuevo debate "%{resource_title}". Échale un vistazo y contribuye:
+            email_outro: Has recibido esta notificación porque estás siguiendo la iniciativa "%{author_name}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
+            email_subject: Nuevo debate "%{resource_title}" creado por %{author_name}
+            notification_title: <a href="%{author_path}">%{author_name}</a> creó el debate <a href="%{resource_path}">%{resource_title}</a>.
         creation_disabled:
           email_intro: 'La creación de debate ya no está activa en %{participatory_space_title}. Aún puede participar en debates abiertos desde esta página:'
           email_outro: Has recibido esta notificación porque estás siguiendo %{participatory_space_title}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
diff --git a/decidim-debates/config/locales/es-PY.yml b/decidim-debates/config/locales/es-PY.yml
index bf9016c1d9de7..bed3f4b2aa149 100644
--- a/decidim-debates/config/locales/es-PY.yml
+++ b/decidim-debates/config/locales/es-PY.yml
@@ -201,10 +201,10 @@ es-PY:
           user_followers:
             email_intro: |-
               Hola,
-              %{author_name} %{author_nickname}, a quien está siguiendo, ha creado un nuevo debate "%{resource_title}". Échale un vistazo y contribuye:
-            email_outro: Has recibido esta notificación porque estás siguiendo a %{author_nickname}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-            email_subject: Nuevo debate "%{resource_title}" por %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> creó el debate <a href="%{resource_path}">%{resource_title}</a>.
+              %{author_name}, a quien estás siguiendo, ha creado un nuevo debate "%{resource_title}". Échale un vistazo y contribuye:
+            email_outro: Has recibido esta notificación porque estás siguiendo la iniciativa "%{author_name}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
+            email_subject: Nuevo debate "%{resource_title}" creado por %{author_name}
+            notification_title: <a href="%{author_path}">%{author_name}</a> creó el debate <a href="%{resource_path}">%{resource_title}</a>.
         creation_disabled:
           email_intro: 'La creación de debate ya no está activa en %{participatory_space_title}. Aún puede participar en debates abiertos desde esta página:'
           email_outro: Has recibido esta notificación porque estás siguiendo %{participatory_space_title}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
diff --git a/decidim-debates/config/locales/es.yml b/decidim-debates/config/locales/es.yml
index d56a9120497e4..2ff73132d836b 100644
--- a/decidim-debates/config/locales/es.yml
+++ b/decidim-debates/config/locales/es.yml
@@ -205,10 +205,10 @@ es:
           user_followers:
             email_intro: |-
               Hola,
-              %{author_name} %{author_nickname}, a quien estás siguiendo, ha creado un nuevo debate "%{resource_title}". Échale un vistazo y contribuye:
-            email_outro: Has recibido esta notificación porque estás siguiendo a "%{author_nickname}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-            email_subject: Nuevo debate "%{resource_title}" de %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> creó el debate <a href="%{resource_path}">%{resource_title}</a>.
+              %{author_name}, a quien estás siguiendo, ha creado un nuevo debate "%{resource_title}". Échale un vistazo y contribuye:
+            email_outro: Has recibido esta notificación porque estás siguiendo la iniciativa "%{author_name}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
+            email_subject: Nuevo debate "%{resource_title}" creado por %{author_name}
+            notification_title: <a href="%{author_path}">%{author_name}</a> creó el debate <a href="%{resource_path}">%{resource_title}</a>.
         creation_disabled:
           email_intro: 'La creación de debates ya no está activa en %{participatory_space_title}. Aún puedes participar en debates abiertos desde esta página:'
           email_outro: Has recibido esta notificación porque estás siguiendo el espacio "%{participatory_space_title}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
diff --git a/decidim-debates/config/locales/eu.yml b/decidim-debates/config/locales/eu.yml
index 075ae252bf549..470626c69efb3 100644
--- a/decidim-debates/config/locales/eu.yml
+++ b/decidim-debates/config/locales/eu.yml
@@ -206,8 +206,8 @@ eu:
             email_intro: |-
               Kaixo,
               Jarraitzen ari zaren %{author_name} %{author_nickname} parte-hartzaileak "%{resource_title}" beste eztabaida bat sortu du. Sartu eztabaidan eta zure ekarpena egin:
-            email_outro: Jakinarazpena jaso duzu %{author_nickname} jarraitzen ari zarelako. Aurreko estekan jakinarazpenak jasotzeari utzi ahal diozu.
-            email_subject: '%{author_nickname} parte-hartzaileak beste eztabaida bat sortu du hemen: "%{resource_title}"'
+            email_outro: Jakinarazpen hau jaso duzu %{author_name} jarraitzen ari zarelako. Aurreko estekan jarraitzeari utzi ahal diozu.
+            email_subject: '%{author_name} parte-hartzaileak beste eztabaida bat sortu du hemen: "%{resource_title}"'
             notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> parte-hartzaileak <a href="%{resource_path}">%{resource_title}</a> eztabaida sortu du.
         creation_disabled:
           email_intro: 'Eztabaida sortzea dagoeneko ez dago aktibo %{participatory_space_title}. Oraindik irekita dauden eztabaidetan parte har dezakezu orri honetatik:'
diff --git a/decidim-debates/config/locales/fi-plain.yml b/decidim-debates/config/locales/fi-plain.yml
index 61a27c2c61b57..28d3860c99e3b 100644
--- a/decidim-debates/config/locales/fi-plain.yml
+++ b/decidim-debates/config/locales/fi-plain.yml
@@ -205,10 +205,10 @@ fi-pl:
           user_followers:
             email_intro: |-
               Hei,
-              %{author_name} %{author_nickname}, jota seuraat, on luonut uuden keskustelun "%{resource_title}". Tutustu siihen ja osallistu:
-            email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat käyttäjää %{author_nickname}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
-            email_subject: Uusi keskustelu "%{resource_title}" käyttäjältä %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> loi keskustelun <a href="%{resource_path}">%{resource_title}</a>.
+              Seuraamasi osallistuja %{author_name} on laatinut uuden keskustelun "%{resource_title}". Tutustu siihen ja osallistu:
+            email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet seuraat käyttäjää %{author_name}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
+            email_subject: Uusi keskustelu "%{resource_title}" osallistujalta %{author_name}
+            notification_title: <a href="%{author_path}">%{author_name}</a> loi keskustelun <a href="%{resource_path}">%{resource_title}</a>.
         creation_disabled:
           email_intro: 'Keskustelujen luominen ei ole enää käytössä kohteessa %{participatory_space_title}. Voit silti osallistua avattuihin keskusteluihin tämän sivun kautta:'
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta %{participatory_space_title}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
diff --git a/decidim-debates/config/locales/fi.yml b/decidim-debates/config/locales/fi.yml
index a60f47ba621f8..cd832a37b0442 100644
--- a/decidim-debates/config/locales/fi.yml
+++ b/decidim-debates/config/locales/fi.yml
@@ -205,10 +205,10 @@ fi:
           user_followers:
             email_intro: |-
               Hei,
-              %{author_name} %{author_nickname}, jota seuraat, on laatinut uuden keskustelun "%{resource_title}". Tutustu siihen ja osallistu:
-            email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat käyttäjää %{author_nickname}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
-            email_subject: Uusi keskustelu "%{resource_title}" käyttäjältä %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> loi keskustelun <a href="%{resource_path}">%{resource_title}</a>.
+              Seuraamasi osallistuja %{author_name} on laatinut uuden keskustelun "%{resource_title}". Tutustu siihen ja osallistu:
+            email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet seuraat käyttäjää %{author_name}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
+            email_subject: Uusi keskustelu "%{resource_title}" osallistujalta %{author_name}
+            notification_title: <a href="%{author_path}">%{author_name}</a> loi keskustelun <a href="%{resource_path}">%{resource_title}</a>.
         creation_disabled:
           email_intro: 'Keskustelujen luominen ei ole enää käytössä kohteessa %{participatory_space_title}. Voit silti osallistua avattuihin keskusteluihin sivulta:'
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta %{participatory_space_title}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
diff --git a/decidim-debates/config/locales/fr-CA.yml b/decidim-debates/config/locales/fr-CA.yml
index b1f9b7c907a72..1ffe97cf4501e 100644
--- a/decidim-debates/config/locales/fr-CA.yml
+++ b/decidim-debates/config/locales/fr-CA.yml
@@ -190,12 +190,7 @@ fr-CA:
             email_subject: Nouveau débat "%{resource_title}" sur %{participatory_space_title}
             notification_title: Le débat <a href="%{resource_path}">%{resource_title}</a> a été créé sur <a href="%{participatory_space_url}">%{participatory_space_title}</a>.
           user_followers:
-            email_intro: |-
-              Bonjour,
-              %{author_name} %{author_nickname}, qui vous suivez, a créé un nouveau débat "%{resource_title}". Découvrez-le et contribuez:
-            email_outro: Vous avez reçu cette notification, car vous suivez %{author_nickname}. Vous pouvez cesser de recevoir des notifications à partir du lien précédent.
-            email_subject: Nouveau débat "%{resource_title}" par %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> créé le débat <a href="%{resource_path}">%{resource_title}</a>.
+            email_subject: Nouveau débat "%{resource_title}" par %{author_name}
         creation_disabled:
           email_intro: 'La création de débat n''est plus possible dans %{participatory_space_title}. Vous pouvez toujours participer aux débats ouverts depuis cette page :'
           email_outro: Vous avez reçu cette notification parce que vous suivez %{participatory_space_title}. Vous pouvez arrêter de recevoir des notifications à partir du lien précédent.
diff --git a/decidim-debates/config/locales/fr.yml b/decidim-debates/config/locales/fr.yml
index b9858c7c554f2..f132d351abe19 100644
--- a/decidim-debates/config/locales/fr.yml
+++ b/decidim-debates/config/locales/fr.yml
@@ -190,12 +190,7 @@ fr:
             email_subject: Nouveau débat "%{resource_title}" sur %{participatory_space_title}
             notification_title: Le débat <a href="%{resource_path}">%{resource_title}</a> a été créé sur <a href="%{participatory_space_url}">%{participatory_space_title}</a>.
           user_followers:
-            email_intro: |-
-              Bonjour,
-              %{author_name} %{author_nickname}, qui vous suivez, a créé un nouveau débat "%{resource_title}". Découvrez-le et contribuez:
-            email_outro: Vous avez reçu cette notification, car vous suivez %{author_nickname}. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
-            email_subject: Nouveau débat "%{resource_title}" par %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> créé le débat <a href="%{resource_path}">%{resource_title}</a>.
+            email_subject: Nouveau débat "%{resource_title}" par %{author_name}
         creation_disabled:
           email_intro: 'La création de débat n''est plus possible dans %{participatory_space_title}. Vous pouvez toujours participer aux débats ouverts depuis cette page :'
           email_outro: Vous avez reçu cette notification parce que vous suivez %{participatory_space_title}. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
diff --git a/decidim-debates/config/locales/gl.yml b/decidim-debates/config/locales/gl.yml
index 09f7a444f5ebc..dd02eca2a3409 100644
--- a/decidim-debates/config/locales/gl.yml
+++ b/decidim-debates/config/locales/gl.yml
@@ -84,14 +84,6 @@ gl:
             title: Título
     events:
       debates:
-        create_debate_event:
-          user_followers:
-            email_intro: |-
-              Ola,
-              %{author_name} %{author_nickname}, a quen estás seguindo, creou un novo debate "%{resource_title}". Consulte e contribúa:
-            email_outro: Recibiches esta notificación porque estás seguindo %{author_nickname}. Podes deixar de recibir notificacións seguindo a ligazón anterior.
-            email_subject: Novo debate "%{resource_title}" por %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> creou o debate <a href="%{resource_path}">%{resource_title}</a>.
         creation_disabled:
           email_intro: 'A creación de debates xa non está activa en %{participatory_space_title}. Aínda podes participar nos debates abertos desta páxina:'
           email_outro: Recibiches esta notificación porque estás seguindo %{participatory_space_title}. Podes deixar de recibir notificacións seguindo a ligazón anterior.
diff --git a/decidim-debates/config/locales/hu.yml b/decidim-debates/config/locales/hu.yml
index f2d6c91e7d075..2f8a8747022ea 100644
--- a/decidim-debates/config/locales/hu.yml
+++ b/decidim-debates/config/locales/hu.yml
@@ -132,14 +132,6 @@ hu:
             title: Cím
     events:
       debates:
-        create_debate_event:
-          user_followers:
-            email_intro: |-
-              Szia,
-              %{author_name} %{author_nickname}, akit kötvetsz, új vitát hozott létre "%{resource_title}" címmel. Nézzed meg és vegyél részt benne:
-            email_outro: 'Ezt az értesítést azért kaptad, mert őt követed: "%{author_nickname}". Az értesítéseket a következő linkre kattintva kapcsolhatod ki.'
-            email_subject: Új vitát hozott létre "%{resource_title}" címmel %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> létrehozta a <a href="%{resource_path}">%{resource_title}</a> vitát.
         creation_disabled:
           email_intro: 'Vita létrehozása már nem lehetséges itt: %{participatory_space_title}. A nyitott vitákban azonban továbbra is részt vehetsz itt:'
           email_outro: 'Ezt az értesítést azért kaptad, mert ezt követed: "%{participatory_space_title}". Az értesítéseket a következő linkre kattintva kapcsolhatod ki.'
diff --git a/decidim-debates/config/locales/id-ID.yml b/decidim-debates/config/locales/id-ID.yml
index fd8786daead59..c778ea0010a7a 100644
--- a/decidim-debates/config/locales/id-ID.yml
+++ b/decidim-debates/config/locales/id-ID.yml
@@ -79,14 +79,6 @@ id:
             title: Judul
     events:
       debates:
-        create_debate_event:
-          user_followers:
-            email_intro: |-
-              Hai,
-              %{author_name} %{author_nickname}, yang Anda ikuti, telah membuat debat baru "%{resource_title}". Lihat dan berkontribusi:
-            email_outro: Anda telah menerima pemberitahuan ini karena Anda mengikuti %{author_nickname}. Anda dapat berhenti menerima pemberitahuan setelah tautan sebelumnya.
-            email_subject: Perdebatan baru "%{resource_title}" oleh %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> menciptakan debat <a href="%{resource_path}">%{resource_title}</a>.
         creation_disabled:
           email_intro: 'Pembuatan debat tidak lagi aktif dalam %{participatory_space_title}. Anda masih dapat berpartisipasi dalam debat terbuka dari halaman ini:'
           email_outro: Anda telah menerima pemberitahuan ini karena Anda mengikuti %{participatory_space_title}. Anda dapat berhenti menerima pemberitahuan setelah tautan sebelumnya.
diff --git a/decidim-debates/config/locales/is-IS.yml b/decidim-debates/config/locales/is-IS.yml
index 68aeecea68de0..48af436f3b382 100644
--- a/decidim-debates/config/locales/is-IS.yml
+++ b/decidim-debates/config/locales/is-IS.yml
@@ -64,9 +64,6 @@ is:
             title: Titill
     events:
       debates:
-        create_debate_event:
-          user_followers:
-            email_outro: Þú hefur fengið þessa tilkynningu vegna þess að þú fylgist með %{author_nickname}. Þú getur hætt við að fá tilkynningar eftir fyrri tengilinn.
         creation_disabled:
           email_outro: Þú hefur fengið þessa tilkynningu vegna þess að þú fylgist með %{participatory_space_title}. Þú getur hætt við að fá tilkynningar eftir fyrri tengilinn.
           email_subject: Umræða um stofnun fatlaður í %{participatory_space_title}
diff --git a/decidim-debates/config/locales/it.yml b/decidim-debates/config/locales/it.yml
index d594d18eefc46..5326623a79b2b 100644
--- a/decidim-debates/config/locales/it.yml
+++ b/decidim-debates/config/locales/it.yml
@@ -129,14 +129,6 @@ it:
             title: Titolo
     events:
       debates:
-        create_debate_event:
-          user_followers:
-            email_intro: |-
-              Ciao,
-              %{author_name} %{author_nickname}, chi stai seguendo, ha creato un nuovo dibattito "%{resource_title}". Dai un'occhiata e dai:
-            email_outro: Hai ricevuto questa notifica perché stai seguendo %{author_nickname}. È possibile interrompere la ricezione di notifiche seguendo il collegamento precedente.
-            email_subject: Nuovo dibattito "%{resource_title}" di %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> creato il dibattito <a href="%{resource_path}">%{resource_title}</a>.
         creation_disabled:
           email_intro: 'La creazione del dibattito non è più attiva in %{participatory_space_title}. Puoi ancora partecipare ai dibattiti aperti da questa pagina:'
           email_outro: Hai ricevuto questa notifica perché stai seguendo %{participatory_space_title}. È possibile interrompere la ricezione di notifiche seguendo il collegamento precedente.
diff --git a/decidim-debates/config/locales/ja.yml b/decidim-debates/config/locales/ja.yml
index e3ca9a4a64ec5..1051eb82a330a 100644
--- a/decidim-debates/config/locales/ja.yml
+++ b/decidim-debates/config/locales/ja.yml
@@ -203,10 +203,10 @@ ja:
           user_followers:
             email_intro: |-
               こんにちは、
-              %{author_name} %{author_nickname}さん、あなたがフォローしている人が新しいディベート「%{resource_title}」を作成しました。チェックして貢献してください：
-            email_outro: '%{author_nickname}をフォローしているため、この通知を受け取りました。前のリンクに続く通知の受信を停止することができます。'
-            email_subject: '%{resource_title}による新しいディベート " %{author_nickname}"'
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> が <a href="%{resource_path}">%{resource_title}</a> ディベートを作成しました。
+              あなたがフォローしている %{author_name} さんが新しいディベート「%{resource_title}」を作成しました。ぜひ内容を確認し、意見をお寄せください：
+            email_outro: '%{author_name} さんをフォローしているため、この通知が届きました。前のリンクからフォローを解除することで、通知の受信を停止できます。'
+            email_subject: '%{resource_title}による新しいディベート " %{author_name}"'
+            notification_title: <a href="%{author_path}">%{author_name}</a> さんが <a href="%{resource_path}">%{resource_title}</a> ディベートを作成しました。
         creation_disabled:
           email_intro: 'ディベートの作成は %{participatory_space_title}で行われなくなりました。このページからまだディベートに参加できます：'
           email_outro: '%{participatory_space_title}をフォローしているため、この通知を受け取りました。前のリンクに続く通知の受信を停止することができます。'
diff --git a/decidim-debates/config/locales/lb.yml b/decidim-debates/config/locales/lb.yml
index 78821661d63df..a1246240de30e 100644
--- a/decidim-debates/config/locales/lb.yml
+++ b/decidim-debates/config/locales/lb.yml
@@ -68,16 +68,6 @@ lb:
             official_debate: Offizielle Debatte
             start_time: Anfangsdatum
             title: Titel
-    events:
-      debates:
-        create_debate_event:
-          user_followers:
-            email_intro: |-
-              Hallo,
-              %{author_name} %{author_nickname}, dem Sie folgen, hat eine neue Debatte "%{resource_title}" erstellt. Sehen Sie es sich an und reden Sie mit:
-            email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie %{author_nickname} folgen. Falls Sie keine solchen Benachrichtigungen mehr erhalten möchten, besuchen Sie den obigen Link.
-            email_subject: Neue Debatte "%{resource_title}" von %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> hat die Debatte <a href="%{resource_path}">%{resource_title}</a> erstellt.
     gamification:
       badges:
         commented_debates:
diff --git a/decidim-debates/config/locales/lt.yml b/decidim-debates/config/locales/lt.yml
index 65031b9569ebb..786b4d973bdba 100644
--- a/decidim-debates/config/locales/lt.yml
+++ b/decidim-debates/config/locales/lt.yml
@@ -139,14 +139,6 @@ lt:
             title: Pavadinimas
     events:
       debates:
-        create_debate_event:
-          user_followers:
-            email_intro: |-
-              Sveiki,
-              %{author_name} %{author_nickname}, kurį(-ią) sekate, sukūrė naują diskusiją „%{resource_title}“. Peržiūrėkite ir prisidėkite:
-            email_outro: Šį pranešimą gavote dėl to, kad sekate %{author_nickname}. Jeigu nebenorite gauti pranešimų, spustelėkite aukščiau esančią nuorodą.
-            email_subject: Nauja %{author_nickname} diskusija "%{resource_title}"
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> sukūrė <a href="%{resource_path}">%{resource_title}</a> diskusiją.
         creation_disabled:
           email_intro: 'Diskusijos kūrimas %{participatory_space_title} nebėra aktyvus. Vis dar galite dalyvauti atvirose diskusijose iš šio puslapio:'
           email_outro: Šį pranešimą gavote dėl to, kad sekate %{participatory_space_title}. Jeigu nebenorite gauti pranešimų, spustelėkite ankstesnę nuorodą.
diff --git a/decidim-debates/config/locales/lv.yml b/decidim-debates/config/locales/lv.yml
index 0f33e39cde30f..5b6190cf25696 100644
--- a/decidim-debates/config/locales/lv.yml
+++ b/decidim-debates/config/locales/lv.yml
@@ -69,13 +69,6 @@ lv:
             title: Nosaukums
     events:
       debates:
-        create_debate_event:
-          user_followers:
-            email_intro: |-
-              Sveiki,%{author_name}%{author_nickname}, kam jūs sekojat, ir izveidojis jaunas debates "%{resource_title}". Aplūkojiet tās un piedalieties:
-            email_outro: Jūs saņēmāt šo paziņojumu, jo sekojat %{author_nickname}. Jūs varat atteikties no paziņojumu saņemšanas, sekojot iepriekšējai saitei.
-            email_subject: Jaunas debates "%{resource_title}", ko iesniedza %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> izveidoja <a href="%{resource_path}">%{resource_title}</a> debates.
         creation_disabled:
           email_intro: 'Debašu izveidošana vairs nav pieejama telpā %{participatory_space_title}. Jūs joprojām varat piedalīties atklātajās debatēs šajā lapā:'
           email_outro: Jūs saņēmāt šo paziņojumu, jo sekojat %{participatory_space_title}. Jūs varat atteikties no paziņojumu saņemšanas, sekojot iepriekšējai saitei.
diff --git a/decidim-debates/config/locales/nl.yml b/decidim-debates/config/locales/nl.yml
index b02eb533c7ae9..bb7803a8c7042 100644
--- a/decidim-debates/config/locales/nl.yml
+++ b/decidim-debates/config/locales/nl.yml
@@ -114,14 +114,6 @@ nl:
             title: Titel
     events:
       debates:
-        create_debate_event:
-          user_followers:
-            email_intro: |-
-              Hallo,
-              %{author_name} %{author_nickname}, wie je volgt, heeft een nieuw debat "%{resource_title}" gemaakt. Bekijk het en draag bij:
-            email_outro: Je hebt deze melding ontvangen omdat je %{author_nickname} volgt. Je kan deze meldingen uitschakelen door te klikken op de voorgaande link.
-            email_subject: Nieuw debat "%{resource_title}" met %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> creëerde het debat <a href="%{resource_path}">%{resource_title}</a>.
         creation_disabled:
           email_intro: 'Het is niet langer mogelijk een debat aan te maken in %{participatory_space_title}. Je kan nog steeds deelnemen aan lopende debatten op deze pagina:'
           email_outro: Je hebt deze melding ontvangen omdat je %{participatory_space_title}volgt. Je kan de meldingen uitschakelen door te klikken op de voorgaande link.
diff --git a/decidim-debates/config/locales/no.yml b/decidim-debates/config/locales/no.yml
index 8134e60054fc0..d9dd724b15655 100644
--- a/decidim-debates/config/locales/no.yml
+++ b/decidim-debates/config/locales/no.yml
@@ -129,14 +129,6 @@
             title: Innlegg
     events:
       debates:
-        create_debate_event:
-          user_followers:
-            email_intro: |-
-              Hei,
-              %{author_name} %{author_nickname}, som du følger, har opprettet en ny innspillstråd "%{resource_title}". Sjekk det ut og bidra:
-            email_outro: Du har mottatt denne varslingen fordi du følger %{author_nickname}. Du kan slutte å motta varsler hvis du følger den vedlagte lenken.
-            email_subject: Ny innspillstråd "%{resource_title}" av %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> opprettet innspillstråden <a href="%{resource_path}">%{resource_title}</a>.
         creation_disabled:
           email_intro: 'Opprettelse av innspillstråder er ikke lenger aktivt i %{participatory_space_title} Du kan fortsatt delta i åpne innspillstråder på denne siden:'
           email_outro: Du har mottatt denne varslingen fordi du følger %{participatory_space_title}. Du kan slutte å motta varsler hvis du følger den vedlagte lenken.
diff --git a/decidim-debates/config/locales/pl.yml b/decidim-debates/config/locales/pl.yml
index b426d585717a7..0cc843957e73e 100644
--- a/decidim-debates/config/locales/pl.yml
+++ b/decidim-debates/config/locales/pl.yml
@@ -151,13 +151,6 @@ pl:
             email_outro: Otrzymujesz to powiadomienie, ponieważ obserwujesz przestrzeń partycypacyjną %{participatory_space_title}. Możesz wyłączyć powiadomienia, klikając poprzedni link.
             email_subject: Nowa debata "%{resource_title}" w %{participatory_space_title}
             notification_title: Debata <a href="%{resource_path}">%{resource_title}</a> została utworzona w <a href="%{participatory_space_url}">%{participatory_space_title}</a>.
-          user_followers:
-            email_intro: |-
-              Cześć,
-              %{author_name} %{author_nickname}, którego/którą obserwujesz, utworzył(a) nową debatę "%{resource_title}". Sprawdź i dołącz:
-            email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz %{author_nickname}. Możesz przestać otrzymywać powiadomienia po kliknięciu w poprzedni link.
-            email_subject: Nowa debata "%{resource_title}" utworzona przez %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> utworzył(a) debatę <a href="%{resource_path}">%{resource_title}</a>.
         creation_disabled:
           email_intro: 'Tworzenie debaty nie jest już aktywne w %{participatory_space_title}. Nadal możesz uczestniczyć w otwartych debatach na tej stronie:'
           email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz %{participatory_space_title}. Możesz przestać otrzymywać powiadomienia po kliknięciu w poprzedni link.
diff --git a/decidim-debates/config/locales/pt-BR.yml b/decidim-debates/config/locales/pt-BR.yml
index f23efd864111c..dd42623ca5876 100644
--- a/decidim-debates/config/locales/pt-BR.yml
+++ b/decidim-debates/config/locales/pt-BR.yml
@@ -198,13 +198,6 @@ pt-BR:
             email_outro: Você recebeu esta notificação porque está seguindo o espaço participativo %{participatory_space_title}. Você pode parar de receber notificações após o link anterior.
             email_subject: Novo debate "%{resource_title}" em %{participatory_space_title}
             notification_title: O <a href="%{resource_path}">%{resource_title}</a> debate foi criado em <a href="%{participatory_space_url}">%{participatory_space_title}</a>.
-          user_followers:
-            email_intro: |-
-              Olá,
-              %{author_name} %{author_nickname}, quem você está seguindo, criou um novo debate "%{resource_title}". Confira e contribua:
-            email_outro: Você recebeu esta notificação porque está seguindo %{author_nickname}. Você pode parar de receber notificações após o link anterior.
-            email_subject: Novo debate "%{resource_title}" por %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> criou o debate <a href="%{resource_path}">%{resource_title}</a>.
         creation_disabled:
           email_intro: 'A criação do debate não está mais ativa em %{participatory_space_title}. Você ainda pode participar de debates abertos nesta página:'
           email_outro: Você recebeu esta notificação porque está seguindo %{participatory_space_title}. Você pode parar de receber notificações após o link anterior.
diff --git a/decidim-debates/config/locales/pt.yml b/decidim-debates/config/locales/pt.yml
index 785ea71717fa7..9b4d9aad8ad9f 100644
--- a/decidim-debates/config/locales/pt.yml
+++ b/decidim-debates/config/locales/pt.yml
@@ -186,13 +186,6 @@ pt:
             email_outro: Recebeu esta notificação porque segue o espaço de participação %{participatory_space_title}. Pode parar de receber notificações seguindo a hiperligação anterior.
             email_subject: Novo debate "%{resource_title}" no %{participatory_space_title}
             notification_title: O <a href="%{resource_path}">%{resource_title}</a> debate fou criado em <a href="%{participatory_space_url}">%{participatory_space_title}</a>.
-          user_followers:
-            email_intro: |-
-              Olá,
-              %{author_name} %{author_nickname}, que você segue, criou um novo debate "%{resource_title}". Confira e contribua:
-            email_outro: Recebeu esta notificação porque segue %{author_nickname}. Pode parar de receber notificações seguindo a hiperligação anterior.
-            email_subject: Novo debate "%{resource_title}" por %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> criou o debate <a href="%{resource_path}">%{resource_title}</a>.
         creation_disabled:
           email_intro: 'A criação de debate já não está ativa em %{participatory_space_title}. Ainda pode participar nos debates abertos nesta página:'
           email_outro: Recebeu esta notificação porque segue %{participatory_space_title}. Pode parar de receber notificações seguindo a hiperligação anterior.
diff --git a/decidim-debates/config/locales/ro-RO.yml b/decidim-debates/config/locales/ro-RO.yml
index a3bfe6b1e00a0..32509ae755bc8 100644
--- a/decidim-debates/config/locales/ro-RO.yml
+++ b/decidim-debates/config/locales/ro-RO.yml
@@ -152,14 +152,6 @@ ro:
             title: Titlu
     events:
       debates:
-        create_debate_event:
-          user_followers:
-            email_intro: |-
-              Bună,
-              %{author_name} %{author_nickname}, pe care îl urmărești, a creat o nouă dezbatere "%{resource_title}". Uită-te peste și contribuie:
-            email_outro: Ai primit această notificare deoarece urmărești %{author_nickname}. Poți opri notificările accesând linkul anterior.
-            email_subject: Dezbatere nouă "%{resource_title}" - autor %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> a creat dezbaterea <a href="%{resource_path}">%{resource_title}</a>.
         creation_disabled:
           email_intro: 'Crearea de dezbateri nu mai este activă în %{participatory_space_title}. Poți participa în continuare la dezbaterile deschise de pe această pagină:'
           email_outro: Aii primit această notificare deoarece urmărești %{participatory_space_title}. Poți opri notificările accesând linkul anterior.
diff --git a/decidim-debates/config/locales/ru.yml b/decidim-debates/config/locales/ru.yml
index 4cbac9605f737..cf5315756de2e 100644
--- a/decidim-debates/config/locales/ru.yml
+++ b/decidim-debates/config/locales/ru.yml
@@ -85,9 +85,6 @@ ru:
             title: Заголовок
     events:
       debates:
-        create_debate_event:
-          user_followers:
-            email_outro: Вы получили это уведомление, потому что вы следите за «%{author_nickname}». Вы можете отписаться от уведомлений, перейдя по приведенной выше ссылке.
         creation_disabled:
           email_intro: 'В %{participatory_space_title} уже нельзя начинать обсуждения. Вы можете принять участие в уже начатых обсуждениях на странице:'
           email_outro: Вы получили это уведомление, потому что вы следите за «%{participatory_space_title}». Вы можете отписаться от уведомлений, перейдя по приведенной выше ссылке.
diff --git a/decidim-debates/config/locales/sk.yml b/decidim-debates/config/locales/sk.yml
index 4e7411bc2cd11..dc5ec1c28a320 100644
--- a/decidim-debates/config/locales/sk.yml
+++ b/decidim-debates/config/locales/sk.yml
@@ -202,13 +202,6 @@ sk:
             email_outro: Toto upozornenie ste dostali, pretože sledujete participatívny priestor %{participatory_space_title}. Prijímanie upozornení môžete zrušiť kliknutím na predchádzajúci odkaz.
             email_subject: Nová debata „%{resource_title}“ v priestore %{participatory_space_title}
             notification_title: Debata <a href="%{resource_path}">%{resource_title}</a> bola vytvorená v priestore <a href="%{participatory_space_url}">%{participatory_space_title}</a>.
-          user_followers:
-            email_intro: |-
-              Dobrý deň,
-              %{author_name} %{author_nickname}, ktorého sledujete, vytvoril novú debatu "%{resource_title}". Pozrite sa na ňu a prispejte:
-            email_outro: Toto oznámenie ste dostali, pretože sledujete %{author_nickname}. Notifikácie môžete zrušiť po kliknutí na predchádzajúci odkaz.
-            email_subject: Nová debata "%{resource_title}" od %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname} </a> vytvoril debatu <a href="%{resource_path}">% {resource_title} </a>.
         creation_disabled:
           email_intro: 'Tvorba debát v priestore %{participatory_space_title} už nie je možná. Môžete sa zúčastniť otvorených debát na tejto stránke:'
           email_outro: Toto oznámenie ste dostali, pretože sledujete %{participatory_space_title}. Notifikácie môžete zrušiť po kliknutí na predchádzajúci odkaz.
diff --git a/decidim-debates/config/locales/sv.yml b/decidim-debates/config/locales/sv.yml
index f669e5295c9b9..add765d5acd57 100644
--- a/decidim-debates/config/locales/sv.yml
+++ b/decidim-debates/config/locales/sv.yml
@@ -198,13 +198,6 @@ sv:
             email_outro: Du har fått detta meddelande eftersom du följer %{participatory_space_title}. Du kan sluta att ta emot meddelanden via föregående länk.
             email_subject: Ny debatt "%{resource_title}" i %{participatory_space_title}
             notification_title: Debatten <a href="%{resource_path}">%{resource_title}</a> skapades i <a href="%{participatory_space_url}">%{participatory_space_title}</a>.
-          user_followers:
-            email_intro: |-
-              Hej,
-              %{author_name} %{author_nickname}, som du följer, har skapat den nya debatten "%{resource_title}". Ta en titt och bidra med:
-            email_outro: Du har fått det här meddelandet eftersom du följer %{author_nickname}. Du kan sluta att ta emot meddelanden via föregående länk.
-            email_subject: Ny debatt "%{resource_title}" med %{author_nickname}
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> skapade debatten <a href="%{resource_path}">%{resource_title}</a>.
         creation_disabled:
           email_intro: 'Att skapa debatter är inte längre aktivt i %{participatory_space_title}. Du kan fortfarande delta i öppna debatter via den här sidan:'
           email_outro: Du har fått det här meddelandet eftersom du följer %{participatory_space_title}. Du kan sluta att ta emot meddelanden via föregående länk.
diff --git a/decidim-debates/config/locales/tr-TR.yml b/decidim-debates/config/locales/tr-TR.yml
index 4027a82cda27b..0fe9cbcb09ddb 100644
--- a/decidim-debates/config/locales/tr-TR.yml
+++ b/decidim-debates/config/locales/tr-TR.yml
@@ -142,13 +142,6 @@ tr:
             email_outro: Bu bildirimi %{participatory_space_title} katılımcılık Başlıklı alanını takip ettiğiniz için aldınız. Bildirim almayı önceki bağlantı linkini izleyerek durdurabilirsiniz.
             email_subject: '%{participatory_space_title} başlıpı ile ilgili yeni tartışma "%{resource_title}"'
             notification_title: <a href="%{resource_path}">%{resource_title</a> tartışması <a href="%{participatory_space_url}">%{participatory_space_title</a> tarihinde oluşturuldu.
-          user_followers:
-            email_intro: |-
-              Merhaba,
-              Takip ettiğiniz %{author_name} %{author_nickname}, "%{resource_title}" adlı yeni bir tartışma yarattı. Kontrol edin ve katkıda bulunun:
-            email_outro: Bu bildirimi %{author_nickname} adlı kişiyi takip ettiğiniz için aldınız. Önceki bağlantıyı izleyerek bildirim almayı durdurabilirsiniz.
-            email_subject: '%{author_nickname} tarafından "%{resource_title}" adlı yeni tartışma'
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname} </a>, <a href="%{resource_path}">%{resource_title} </a> tartışmasını oluşturdu.
         creation_disabled:
           email_intro: 'Tartışma oluşturma artık %{participatory_space_title} içinde aktif değil. Bu sayfadan hala açık tartışmalara katılabilirsiniz:'
           email_outro: Bu bildirimi, %{participatory_space_title} adlı kişiyi takip ettiğiniz için aldınız. Önceki bağlantıyı izleyerek bildirim almayı durdurabilirsiniz.
diff --git a/decidim-debates/config/locales/uk.yml b/decidim-debates/config/locales/uk.yml
index a1b08f813df03..fec4f7262bc48 100644
--- a/decidim-debates/config/locales/uk.yml
+++ b/decidim-debates/config/locales/uk.yml
@@ -85,9 +85,6 @@ uk:
             title: Назва
     events:
       debates:
-        create_debate_event:
-          user_followers:
-            email_outro: Ви отримали це сповіщення, тому що ви стежите за %{author_nickname}. Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
         creation_disabled:
           email_intro: 'В %{participatory_space_title} вже не можна починати обговорення. Ви можете взяти участь у вже започаткованих обговореннях на сторінці:'
           email_outro: Ви отримали це сповіщення, тому що ви стежите за %{participatory_space_title}. Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
diff --git a/decidim-debates/config/locales/zh-CN.yml b/decidim-debates/config/locales/zh-CN.yml
index 73bbcf51de761..af9ee52580492 100644
--- a/decidim-debates/config/locales/zh-CN.yml
+++ b/decidim-debates/config/locales/zh-CN.yml
@@ -118,14 +118,6 @@ zh-CN:
             title: 标题
     events:
       debates:
-        create_debate_event:
-          user_followers:
-            email_intro: |-
-              你好，
-              %{author_name} %{author_nickname}, 你关注的人已经创建了一个新的辩论"%{resource_title}"。看看它并做出贡献：
-            email_outro: 您收到此通知是因为您正在关注 %{author_nickname}。您可以停止收到跟随上一个链接的通知。
-            email_subject: '%{resource_title}的 %{author_nickname} 新辩论'
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> 创建了 <a href="%{resource_path}">%{resource_title}</a> 辩论。
         creation_disabled:
           email_intro: '辩论创建在 %{participatory_space_title}已不再活跃。您仍然可以从这个页面参与公开辩论：'
           email_outro: 您收到此通知是因为您正在关注 %{participatory_space_title}。您可以停止收到跟随上一个链接的通知。
diff --git a/decidim-debates/config/locales/zh-TW.yml b/decidim-debates/config/locales/zh-TW.yml
index 61eaeb9968ece..ce793e5aa6111 100644
--- a/decidim-debates/config/locales/zh-TW.yml
+++ b/decidim-debates/config/locales/zh-TW.yml
@@ -130,14 +130,6 @@ zh-TW:
             title: 標題
     events:
       debates:
-        create_debate_event:
-          user_followers:
-            email_intro: |-
-              嗨，
-              你正在追蹤的 %{author_name} %{author_nickname} 創建了一個新辯論主題 "%{resource_title}"。點擊下方連結查看並參與辯論：
-            email_outro: 您收到此通知，是因為您正在關注 %{author_nickname}。您可以使用上面的連結停止接收通知。
-            email_subject: 新辯論主題「%{resource_title}」，由 %{author_nickname} 建立
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> 建立了 <a href="%{resource_path}">%{resource_title}</a> 辯論。
         creation_disabled:
           email_intro: '在 %{participatory_space_title} 中不再開放建立辯論。您仍可在此頁面參與開放辯論：'
           email_outro: 你收到此通知是因為你正在追蹤 %{participatory_space_title}。你可以透過前面的連結停止接收通知。
diff --git a/decidim-elections/config/locales/cs.yml b/decidim-elections/config/locales/cs.yml
index 374abeaa44d1a..3ab3df860cef3 100644
--- a/decidim-elections/config/locales/cs.yml
+++ b/decidim-elections/config/locales/cs.yml
@@ -34,15 +34,18 @@ cs:
     elections:
       actions:
         confirm_delete_election: Opravdu chcete odstranit tuto volbu?
+        confirm_unpublish_election: Opravdu chcete zrušit zveřejnění těchto voleb?
         deleted_election_info: Smazané volby nejsou zobrazeny v seznamu. Můžete je zobrazit kliknutím na tlačítko níže.
         edit: Upravit volby
         new: Nové volby
         preview: Náhled
         title: Akce
+        view: Zobrazit volby
         view_deleted_elections: Zobrazit odstraněné volby
       admin:
         census:
           edit:
+            choose_census: Vyberte typ seznamu voličů, který chcete použít pro tyto volby
             created_at: Vytvořeno v
             identifier: Identifikátor uživatele
         dashboard:
@@ -113,6 +116,8 @@ cs:
             publish: Publikovat
             results_availability:
               after_end: Po ukončení voleb
+              per_question: Otázka po otázce
+              per_question_help: ručně zpracovat hlasování a publikovat výsledky pro každou otázku
               real_time: V reálném čase
               title: Dostupnost výsledků
             save: Uložit a pokračovat
@@ -149,11 +154,13 @@ cs:
             success: Hlasování bylo úspěšně aktivováno.
           end:
             invalid: Vyskytl se problém s ukončením voleb.
+            success: Volba byla úspěšně ukončena.
           publish_results:
             invalid: Při publikování výsledků došlo k chybě.
             success: Výsledky byly úspěšně zveřejněny.
           start:
             invalid: Vyskytl se problém při zahájení voleb.
+            success: Volba byla úspěšně zahájena.
           unknown: Neznámý stav
       admin_log:
         election:
@@ -253,12 +260,14 @@ cs:
           failed: Vaši identitu nelze ověřit. Zkontrolujte zadané informace a zkuste to znovu.
           form_title: Ověřte svou identitu
         confirm:
+          cast_vote: Odevzdat hlas
           edit_vote: Upravte svůj hlas
           not_answered: Na tuto otázku jste neodpověděl.
           title: Potvrďte svůj hlas
         not_authorized: V těchto volbách nemáte oprávnění volit.
         question:
           back: Zpět
+          cast_vote: Odevzdat hlas
           next: Další
     statistics:
       elections_count: Volby
diff --git a/decidim-initiatives/config/locales/ar.yml b/decidim-initiatives/config/locales/ar.yml
index 86d7a37d06b05..a46f69e7026bf 100644
--- a/decidim-initiatives/config/locales/ar.yml
+++ b/decidim-initiatives/config/locales/ar.yml
@@ -225,12 +225,6 @@ ar:
           choose_html: أريد إنشاء <strong>%{title}</strong>
           more_information: (معلومات اكثر)
           select: أريد أن أشجع هذه المبادرة
-      events:
-        create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}، الذي تتابعه ، بإنشاء مبادرة جديدة والتحقق منها والمساهمة فيها:"
-          email_outro: لقد تلقيت هذا الإشعار لأنك تتابع %{author_nickname}. يمكنك إيقاف تلقي الإخطارات باتباع الرابط السابق.
-          email_subject: مبادرة جديدة بنسبة %{author_nickname}
-          notification_title: تم إنشاء مبادرة <a href="%{resource_path}">%{resource_title}</a> بواسطة <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
       form:
         add_attachments: إضافة مرفقات
         attachment_legend: إضافة مستند أو صورة
diff --git a/decidim-initiatives/config/locales/bg.yml b/decidim-initiatives/config/locales/bg.yml
index a3ee884db20fb..a6c0207d30299 100644
--- a/decidim-initiatives/config/locales/bg.yml
+++ b/decidim-initiatives/config/locales/bg.yml
@@ -359,25 +359,11 @@ bg:
         update: Актуализация
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} прие вашата кандидатура да станете част от промоторския комитет за инициативата %{resource_title}."
           email_outro: 'Получихте това известие, защото кандидатствахте за тази инициатива: %{resource_title}'
-          email_subject: "%{author_nickname} прие кандидатурата ви в комитета на промоутъра"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> прие вашата кандидатура да бъде част от комитета на промоторите за следната инициатива <a href="%{resource_url}">%{resource_title}</a>.
-        create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, когото следвате, създаде нова инициатива, разгледайте я и допринесете:"
-          email_outro: Получихте това известие, защото следвате %{author_nickname}. Можете да спрете да получавате известия, като последвате предходния линк.
-          email_subject: Нова инициатива на %{author_nickname}
-          notification_title: Инициативата <a href="%{resource_path}">%{resource_title}</a> беше създадена от <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         revoke_membership_request:
-          email_intro: "%{author_nickname} отхвърли кандидатурата ви да станете част от комитета на промоторите за следната инициатива %{resource_title}."
           email_outro: 'Получихте това известие, защото кандидатствахте за тази инициатива: %{resource_title}.'
-          email_subject: "%{author_nickname} отхвърли кандидатурата ви до промоутърската комисия"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> отхвърли кандидатурата ви да бъде част от комитета на промоторите за следната инициатива <a href="%{resource_url}">%{resource_title}</a>.
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} кандидатства за промоторския комитет на вашата инициатива %{resource_title}. За да приемете или отхвърлите кандидатурата, отидете на формата за редактиране на вашата инициатива."
           email_outro: 'Получихте това известие, защото сте авторът на тази инициатива: %{resource_title}'
-          email_subject: "%{applicant_nickname} иска да се присъедини към вашата инициатива"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> кандидатства за промоторския комитет на вашата инициатива <a href="%{resource_url}">%{resource_title}</a>. За да приемете или отхвърлите, щракнете <a href="%{resource_url}/edit">тук</a>.
       form:
         add_image: Добавяне на изображение
         edit_image: Редактиране на изображение
diff --git a/decidim-initiatives/config/locales/ca-IT.yml b/decidim-initiatives/config/locales/ca-IT.yml
index 1ec371189230b..f1b14b469296c 100644
--- a/decidim-initiatives/config/locales/ca-IT.yml
+++ b/decidim-initiatives/config/locales/ca-IT.yml
@@ -437,25 +437,25 @@ ca-IT:
         update: Actualitzar
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} ha acceptat la teva sol·licitud per formar part de la comissió promotora de la iniciativa %{resource_title}."
+          email_intro: "%{author_name} ha acceptat la teva sol·licitud per formar part de la comissió promotora de la iniciativa %{resource_title}."
           email_outro: 'Has rebut aquesta notificació perquè has sol·licitat formar part de la iniciativa: "%{resource_title}"'
-          email_subject: "%{author_nickname} ha acceptat la teva sol·licitud per formar part de la comissió promotora"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> ha acceptat la teva sol·licitud per formar part de la comissió promotora per la següent iniciativa <a href="%{resource_url}">%{resource_title}</a>.
+          email_subject: "%{author_name} ha acceptat la teva sol·licitud per formar part de la comissió promotora"
+          notification_title: <a href="%{author_profile_url}">%{author_name}</a> ha acceptat la teva sol·licitud per formar part de la comissió promotora per la següent iniciativa <a href="%{resource_url}">%{resource_title}</a>.
         create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, a qui segueixes, ha creat una nova iniciativa. Comprova-la i contribueix:"
-          email_outro: Has rebut aquesta notificació perquè estàs seguint a "%{author_nickname}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
-          email_subject: Nova iniciativa de %{author_nickname}
-          notification_title: La iniciativa <a href="%{resource_path}">%{resource_title}</a> va ser creada per <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+          email_intro: "%{author_name}, a qui segueixes, ha creat una nova iniciativa, comprova-la i contribueix-hi:"
+          email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{author_name}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
+          email_subject: Nova iniciativa creada per %{author_name}
+          notification_title: <a href="%{author_path}">%{author_name}</a> ha creat la iniciativa "<a href="%{resource_path}">%{resource_title}</a>".
         revoke_membership_request:
-          email_intro: "%{author_nickname} ha rebutjat la teva sol·licitud per formar part de la comissió promotora per la iniciativa %{resource_title}."
+          email_intro: "%{author_name} ha rebutjat la teva sol·licitud per formar part de la comissió promotora per la iniciativa %{resource_title}."
           email_outro: 'Has rebut aquesta notificació perquè has sol·licitat formar part de la iniciativa: "%{resource_title}".'
-          email_subject: "%{author_nickname} ha rebutjat la teva sol·licitud per formar part de la comissió promotora"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> ha rebutjat la teva sol·licitud per formar part de la comissió promotora per la següent iniciativa <a href="%{resource_url}">%{resource_title}</a>.
+          email_subject: "%{author_name} ha rebutjat la teva sol·licitud per formar part de la comissió promotora de la iniciativa"
+          notification_title: '<a href="%{author_profile_url}">%{author_name}</a> ha rebutjat la teva sol·licitud per formar part de la comissió promotora per la següent iniciativa: <a href="%{resource_url}">%{resource_title}</a>.'
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} ha sol·licitat formar part de la comissió promotora de la teva iniciativa %{resource_title}. Per a acceptar o rebutjar la sol·licitud, vés al formulari d'edició de la teva iniciativa."
+          email_intro: "%{applicant_name} ha sol·licitat formar part de la comissió promotora de la teva iniciativa: \"%{resource_title}\". Per a acceptar o rebutjar la sol·licitud, vés al formulari d'edició de la teva iniciativa."
           email_outro: 'Has rebut aquesta notificació perquè promous la iniciativa: "%{resource_title}"'
-          email_subject: "%{applicant_nickname} vol unir-se a la teva iniciativa"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> ha sol·licitat formar part de la comissió promotora de la teva iniciativa <a href="%{resource_url}">%{resource_title}</a>. Per acceptar-ho o rebutjar-ho fes clic <a href="%{resource_url}/edit">aquí</a>.
+          email_subject: "%{applicant_name} vol unir-se a la teva iniciativa"
+          notification_title: <a href="%{applicant_profile_url}">%{applicant_name}</a> ha sol·licitat formar part de la comissió promotora de la teva iniciativa <a href="%{resource_url}">%{resource_title}</a>. <a href="%{resource_url}/edit">Accepta o rebutja la sol·licitud</a>.
       form:
         add_attachments: Afegir fitxer(s) adjunt(s)
         add_image: Afegir imatge
diff --git a/decidim-initiatives/config/locales/ca.yml b/decidim-initiatives/config/locales/ca.yml
index cfcd6914cf432..1d447846d3ddd 100644
--- a/decidim-initiatives/config/locales/ca.yml
+++ b/decidim-initiatives/config/locales/ca.yml
@@ -440,25 +440,25 @@ ca:
         update: Actualitzar
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} ha acceptat la teva sol·licitud per formar part de la comissió promotora de la iniciativa %{resource_title}."
+          email_intro: "%{author_name} ha acceptat la teva sol·licitud per formar part de la comissió promotora de la iniciativa %{resource_title}."
           email_outro: 'Has rebut aquesta notificació perquè has sol·licitat formar part de la iniciativa: "%{resource_title}"'
-          email_subject: "%{author_nickname} ha acceptat la teva sol·licitud per formar part de la comissió promotora"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> ha acceptat la teva sol·licitud per formar part de la comissió promotora per la següent iniciativa <a href="%{resource_url}">%{resource_title}</a>.
+          email_subject: "%{author_name} ha acceptat la teva sol·licitud per formar part de la comissió promotora"
+          notification_title: <a href="%{author_profile_url}">%{author_name}</a> ha acceptat la teva sol·licitud per formar part de la comissió promotora per la següent iniciativa <a href="%{resource_url}">%{resource_title}</a>.
         create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, a qui segueixes, ha creat una nova iniciativa. Comprova-la i contribueix:"
-          email_outro: Has rebut aquesta notificació perquè estàs seguint a "%{author_nickname}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
-          email_subject: Nova iniciativa de %{author_nickname}
-          notification_title: La iniciativa <a href="%{resource_path}">%{resource_title}</a> va ser creada per <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+          email_intro: "%{author_name}, a qui segueixes, ha creat una nova iniciativa, comprova-la i contribueix-hi:"
+          email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{author_name}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
+          email_subject: Nova iniciativa creada per %{author_name}
+          notification_title: <a href="%{author_path}">%{author_name}</a> ha creat la iniciativa "<a href="%{resource_path}">%{resource_title}</a>".
         revoke_membership_request:
-          email_intro: "%{author_nickname} ha rebutjat la teva sol·licitud per formar part de la comissió promotora per la iniciativa %{resource_title}."
+          email_intro: "%{author_name} ha rebutjat la teva sol·licitud per formar part de la comissió promotora per la iniciativa %{resource_title}."
           email_outro: 'Has rebut aquesta notificació perquè has sol·licitat formar part de la iniciativa: "%{resource_title}".'
-          email_subject: "%{author_nickname} ha rebutjat la teva sol·licitud per formar part de la comissió promotora"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> ha rebutjat la teva sol·licitud per formar part de la comissió promotora per la següent iniciativa <a href="%{resource_url}">%{resource_title}</a>.
+          email_subject: "%{author_name} ha rebutjat la teva sol·licitud per formar part de la comissió promotora de la iniciativa"
+          notification_title: '<a href="%{author_profile_url}">%{author_name}</a> ha rebutjat la teva sol·licitud per formar part de la comissió promotora per la següent iniciativa: <a href="%{resource_url}">%{resource_title}</a>.'
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} ha sol·licitat formar part de la comissió promotora de la teva iniciativa %{resource_title}. Per a acceptar o rebutjar la sol·licitud, vés al formulari d'edició de la teva iniciativa."
+          email_intro: "%{applicant_name} ha sol·licitat formar part de la comissió promotora de la teva iniciativa: \"%{resource_title}\". Per a acceptar o rebutjar la sol·licitud, vés al formulari d'edició de la teva iniciativa."
           email_outro: 'Has rebut aquesta notificació perquè promous la iniciativa: "%{resource_title}"'
-          email_subject: "%{applicant_nickname} vol unir-se a la teva iniciativa"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> ha sol·licitat formar part de la comissió promotora de la teva iniciativa <a href="%{resource_url}">%{resource_title}</a>. Per acceptar-ho o rebutjar-ho fes clic <a href="%{resource_url}/edit">aquí</a>.
+          email_subject: "%{applicant_name} vol unir-se a la teva iniciativa"
+          notification_title: <a href="%{applicant_profile_url}">%{applicant_name}</a> ha sol·licitat formar part de la comissió promotora de la teva iniciativa <a href="%{resource_url}">%{resource_title}</a>. <a href="%{resource_url}/edit">Accepta o rebutja la sol·licitud</a>.
       form:
         add_attachments: Afegir fitxer(s) adjunt(s)
         add_image: Afegir imatge
diff --git a/decidim-initiatives/config/locales/cs.yml b/decidim-initiatives/config/locales/cs.yml
index ad1f13b98fde3..48c1e14cdd09c 100644
--- a/decidim-initiatives/config/locales/cs.yml
+++ b/decidim-initiatives/config/locales/cs.yml
@@ -446,25 +446,14 @@ cs:
         update: Aktualizovat
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} přijal vaši žádost, aby se stal součástí propagačního výboru pro iniciativu %{resource_title}."
+          email_intro: "%{author_name} přijal vaši žádost, abyste se stal součástí propagačního výboru pro iniciativu %{resource_title}."
           email_outro: 'Obdrželi jste toto oznámení, protože jste podali žádost o tuto iniciativu: %{resource_title}'
-          email_subject: "Uživatel %{author_nickname} přijal vaši nabídku k propagačnímu výboru"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> přijal vaši nabídku k členství v propagačním výboru pro iniciativu <a href="%{resource_url}">%{resource_title}</a>.
         create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, kterého sledujete, vytvořil novou iniciativu, omrkněte ji a přispějte:"
-          email_outro: Toto oznámení jste obdrželi, protože jste sledovali %{author_nickname}. Po předchozím propojení můžete přestat přijímat oznámení.
-          email_subject: Nová iniciativa od %{author_nickname}
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> vytvořil Iniciativu <a href="%{resource_path}">%{resource_title}</a>.
+          email_subject: Nová iniciativa od %{author_name}
         revoke_membership_request:
-          email_intro: "%{author_nickname} odmítl vaši nabídku k členství funkcionáře ve výboru propagace pro tuto iniciativu %{resource_title}."
           email_outro: 'Obdrželi jste toto oznámení, protože jste podali žádost o tuto iniciativu: %{resource_title}.'
-          email_subject: "%{author_nickname} odmítl vaši nabídku na funkcionáře výboru propagace"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> odmítl vaši nabídku k členství v propagačním výboru pro následující iniciativu <a href="%{resource_url}">%{resource_title}</a>.
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} požádal o funkci ve výboru vaší iniciativy %{resource_title}. Chcete-li přijmout nebo zamítnout žádost, přejděte na editační formulář vaší iniciativy."
           email_outro: 'Obdrželi jste toto oznámení, protože jste autorem této iniciativy: %{resource_title}'
-          email_subject: "%{applicant_nickname} se chce připojit k vaší iniciativě"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> požádal o funkci ve výboru vaší iniciativy <a href="%{resource_url}">%{resource_title}</a>. Chcete-li přijmout nebo odmítnout <a href="%{resource_url}/edit">, klepněte zde</a>.
       form:
         add_attachments: Přidat přílohy
         add_image: Přidat obrázek
diff --git a/decidim-initiatives/config/locales/de.yml b/decidim-initiatives/config/locales/de.yml
index 02e8fc1589118..614768c681125 100644
--- a/decidim-initiatives/config/locales/de.yml
+++ b/decidim-initiatives/config/locales/de.yml
@@ -438,25 +438,11 @@ de:
         update: Aktualisieren
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} hat Ihre Anfrage fürs Promoter-Komittee der Initiative %{resource_title} akzeptiert."
           email_outro: 'Sie haben diese Benachrichtigung erhalten, weil Sie sich bei dieser Initiative beworben haben: %{resource_title}'
-          email_subject: "%{author_nickname} hat Ihre Anfrage fürs Promoter-Komittee akzeptiert"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> hat Ihre Anfrage fürs Promoter-Komittee der Initiative <a href="%{resource_url}">%{resource_title}</a> akzeptiert.
-        create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, dem du folgst, hat eine neue Initiative erstellt, sehen Sie es sich an und reden Sie mit:"
-          email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie %{author_nickname} folgen. Falls Sie keine solchen Benachrichtigungen mehr erhalten möchten, besuchen Sie den obigen Link.
-          email_subject: Neue Initiative von %{author_nickname}
-          notification_title: Die Initiative <a href="%{resource_path}">%{resource_title}</a> wurde von <a href="%{author_path}">%{author_name} %{author_nickname}</a> erstellt.
         revoke_membership_request:
-          email_intro: "%{author_nickname} hat Ihre Anfrage fürs Promoter-Komittee der Initiative %{resource_title} abgelehnt."
           email_outro: 'Sie haben diese Benachrichtigung erhalten, weil Sie sich bei dieser Initiative beworben haben: %{resource_title}.'
-          email_subject: "%{author_nickname} hat Ihre Anfrage fürs Promoter-Komittee abgelehnt"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> hat Ihre Anfrage für das Promoter-Komittee der Initiative <a href="%{resource_url}">%{resource_title}</a> abgelehnt.
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} hat sich fürs Promoter-Komittee Ihrer Initiative %{resource_title} beworben. Um die Anfrage zu akzeptieren oder abzulehnen, besuchen Sie das Bearbeitungsformular Ihrer Initiative."
           email_outro: 'Sie haben diese Benachrichtigung erhalten, weil Sie der Autor der Initiative %{resource_title} sind'
-          email_subject: "%{applicant_nickname} möchte Ihrer Initiative beitreten"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> hat sich für das Promoter-Komittee Ihrer Initiative <a href="%{resource_url}">%{resource_title}</a> beworben. Um anzunehmen oder abzulehnen, klicken Sie <a href="%{resource_url}/edit">hier</a>.
       form:
         add_attachments: Anhänge hinzufügen
         add_image: Bild hinzufügen
diff --git a/decidim-initiatives/config/locales/el.yml b/decidim-initiatives/config/locales/el.yml
index 8f37c7a814e0a..04245b85898fe 100644
--- a/decidim-initiatives/config/locales/el.yml
+++ b/decidim-initiatives/config/locales/el.yml
@@ -245,12 +245,6 @@ el:
           choose_html: Θέλω να δημιουργήσω μια πρωτοβουλία <strong>%{title}</strong>
           more_information: (Περισσότερες πληροφορίες)
           select: Θέλω να προωθήσω αυτήν την πρωτοβουλία
-      events:
-        create_initiative_event:
-          email_intro: "Ο συντάκτης %{author_name} %{author_nickname}, τον οποίο ακολουθείτε, δημιούργησε μια νέα πρωτοβουλία. Δείτε την και συνεισφέρετε:"
-          email_outro: Λάβατε αυτήν την ειδοποίηση επειδή ακολουθείτε τον συντάκτη %{author_nickname}. Μπορείτε να διακόψετε τη λήψη ειδοποιήσεων ακολουθώντας τον προηγούμενο σύνδεσμο.
-          email_subject: Νέα πρωτοβουλία από τον συντάκτη %{author_nickname}
-          notification_title: Η <a href="%{resource_path}">%{resource_title}</a> πρωτοβουλία δημιουργήθηκε από τον συντάκτη <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
       initiative_signatures:
         finish:
           back_to_initiative: Επιστροφή στην πρωτοβουλία
diff --git a/decidim-initiatives/config/locales/es-MX.yml b/decidim-initiatives/config/locales/es-MX.yml
index ee5a63f4b6cae..329afa7d7a880 100644
--- a/decidim-initiatives/config/locales/es-MX.yml
+++ b/decidim-initiatives/config/locales/es-MX.yml
@@ -440,25 +440,25 @@ es-MX:
         update: Actualizar
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} ha aceptado tu solicitud para formar parte del comité promotor de la iniciativa %{resource_title}."
+          email_intro: "%{author_name} ha aceptado tu solicitud para formar parte del comité promotor de la iniciativa %{resource_title}."
           email_outro: 'Has recibido esta notificación porque has solicitado unirte a esta iniciativa: %{resource_title}'
-          email_subject: "%{author_nickname} aceptó tu solicitud para unirte al comité promotor"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> aceptó tu solicitud para formar parte del comité promotor de la siguiente iniciativa <a href="%{resource_url}">%{resource_title}</a>.
+          email_subject: "%{author_name} aceptó tu solicitud para unirte al comité promotor"
+          notification_title: <a href="%{author_profile_url}">%{author_name}</a> aceptó tu solicitud para formar parte del comité promotor de la siguiente iniciativa <a href="%{resource_url}">%{resource_title}</a>.
         create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, a quien sigues, ha creado una nueva iniciativa, compruébalo y contribuye:"
-          email_outro: Recibiste esta notificación porque estás siguiendo %{author_nickname}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-          email_subject: Nueva iniciativa por %{author_nickname}
-          notification_title: La iniciativa <a href="%{resource_path}">%{resource_title}</a> fue creada por <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+          email_intro: "%{author_name}, a quien sigues, ha creado una nueva iniciativa, compruébala y contribuye:"
+          email_outro: Has recibido esta notificación porque estás siguiendo la iniciativa "%{author_name}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
+          email_subject: Nueva iniciativa creada por %{author_name}
+          notification_title: <a href="%{author_path}">%{author_name}</a> ha creado la iniciativa "<a href="%{resource_path}">%{resource_title}</a>".
         revoke_membership_request:
-          email_intro: "%{author_nickname} rechazó tu solicitud para formar parte del comité promotor de la siguiente iniciativa %{resource_title}."
+          email_intro: "%{author_name} rechazó tu solicitud para formar parte del comité promotor de la siguiente iniciativa %{resource_title}."
           email_outro: 'Has recibido esta notificación porque has solicitado unirte a esta iniciativa: %{resource_title}.'
-          email_subject: "%{author_nickname} rechazó tu solicitud para unirte al comité promotor"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> rechazó tu solicitud para formar parte del comité promotor de la siguiente iniciativa <a href="%{resource_url}">%{resource_title}</a>.
+          email_subject: "%{author_name} rechazó tu solicitud para unirte al comité promotor de la iniciativa"
+          notification_title: '<a href="%{author_profile_url}">%{author_name}</a> rechazó tu solicitud para formar parte del comité promotor de la siguiente iniciativa: <a href="%{resource_url}">%{resource_title}</a>.'
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} ha solicitado unirse al comité promotor de tu iniciativa %{resource_title}. Para aceptar o rechazar la solicitud, ve al formulario de edición de tu iniciativa."
+          email_intro: "%{applicant_name} ha solicitado unirse al comité promotor de tu iniciativa: \"%{resource_title}\". Para aceptar o rechazar la solicitud, ve al formulario de edición de tu iniciativa."
           email_outro: 'Has recibido esta notificación porque eres la autora de la iniciativa %{resource_title}'
-          email_subject: "%{applicant_nickname} quiere unirse a tu iniciativa"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> ha solicitado unirse al comité promotor de tu iniciativa <a href="%{resource_url}">%{resource_title}</a>. Para aceptar o rechazar la solicitud haz clic <a href="%{resource_url}/edit">aquí</a>.
+          email_subject: "%{applicant_name} quiere unirse a tu iniciativa"
+          notification_title: <a href="%{applicant_profile_url}">%{applicant_name}</a> ha solicitado unirse al comité promotor de tu iniciativa <a href="%{resource_url}">%{resource_title}</a>. <a href="%{resource_url}/edit">Acepta o rechaza la solicitud</a>.
       form:
         add_attachments: Agregar archivo(s) adjunto(s)
         add_image: Añadir imagen
diff --git a/decidim-initiatives/config/locales/es-PY.yml b/decidim-initiatives/config/locales/es-PY.yml
index 062e8ca2e9c35..4951cddcd4da2 100644
--- a/decidim-initiatives/config/locales/es-PY.yml
+++ b/decidim-initiatives/config/locales/es-PY.yml
@@ -440,25 +440,25 @@ es-PY:
         update: Actualizar
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} ha aceptado tu solicitud para formar parte del comité promotor de la iniciativa %{resource_title}."
+          email_intro: "%{author_name} ha aceptado tu solicitud para formar parte del comité promotor de la iniciativa %{resource_title}."
           email_outro: 'Has recibido esta notificación porque has solicitado unirte a esta iniciativa: %{resource_title}'
-          email_subject: "%{author_nickname} aceptó tu solicitud para unirte al comité promotor"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> aceptó tu solicitud para formar parte del comité promotor de la siguiente iniciativa <a href="%{resource_url}">%{resource_title}</a>.
+          email_subject: "%{author_name} aceptó tu solicitud para unirte al comité promotor"
+          notification_title: <a href="%{author_profile_url}">%{author_name}</a> aceptó tu solicitud para formar parte del comité promotor de la siguiente iniciativa <a href="%{resource_url}">%{resource_title}</a>.
         create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, a quien sigues, ha creado una nueva iniciativa, compruébalo y contribuye:"
-          email_outro: Recibiste esta notificación porque estás siguiendo %{author_nickname}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-          email_subject: Nueva iniciativa por %{author_nickname}
-          notification_title: La iniciativa <a href="%{resource_path}">%{resource_title}</a> fue creada por <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+          email_intro: "%{author_name}, a quien sigues, ha creado una nueva iniciativa, compruébala y contribuye:"
+          email_outro: Has recibido esta notificación porque estás siguiendo la iniciativa "%{author_name}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
+          email_subject: Nueva iniciativa creada por %{author_name}
+          notification_title: <a href="%{author_path}">%{author_name}</a> ha creado la iniciativa "<a href="%{resource_path}">%{resource_title}</a>".
         revoke_membership_request:
-          email_intro: "%{author_nickname} rechazó tu solicitud para formar parte del comité promotor de la siguiente iniciativa %{resource_title}."
+          email_intro: "%{author_name} rechazó tu solicitud para formar parte del comité promotor de la siguiente iniciativa %{resource_title}."
           email_outro: 'Has recibido esta notificación porque has solicitado unirte a esta iniciativa: %{resource_title}.'
-          email_subject: "%{author_nickname} rechazó tu solicitud para unirte al comité promotor"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> rechazó tu solicitud para formar parte del comité promotor de la siguiente iniciativa <a href="%{resource_url}">%{resource_title}</a>.
+          email_subject: "%{author_name} rechazó tu solicitud para unirte al comité promotor de la iniciativa"
+          notification_title: '<a href="%{author_profile_url}">%{author_name}</a> rechazó tu solicitud para formar parte del comité promotor de la siguiente iniciativa: <a href="%{resource_url}">%{resource_title}</a>.'
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} ha solicitado unirse al comité promotor de tu iniciativa %{resource_title}. Para aceptar o rechazar la solicitud, ve al formulario de edición de tu iniciativa."
+          email_intro: "%{applicant_name} ha solicitado unirse al comité promotor de tu iniciativa: \"%{resource_title}\". Para aceptar o rechazar la solicitud, ve al formulario de edición de tu iniciativa."
           email_outro: 'Has recibido esta notificación porque eres la autora de la iniciativa %{resource_title}'
-          email_subject: "%{applicant_nickname} quiere unirse a tu iniciativa"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> ha solicitado unirse al comité promotor de tu iniciativa <a href="%{resource_url}">%{resource_title}</a>. Para aceptar o rechazar la solicitud haz clic <a href="%{resource_url}/edit">aquí</a>.
+          email_subject: "%{applicant_name} quiere unirse a tu iniciativa"
+          notification_title: <a href="%{applicant_profile_url}">%{applicant_name}</a> ha solicitado unirse al comité promotor de tu iniciativa <a href="%{resource_url}">%{resource_title}</a>. <a href="%{resource_url}/edit">Acepta o rechaza la solicitud</a>.
       form:
         add_attachments: Agregar archivo(s) adjunto(s)
         add_image: Añadir imagen
diff --git a/decidim-initiatives/config/locales/es.yml b/decidim-initiatives/config/locales/es.yml
index b3f02ae08b747..daeea3c3b2b04 100644
--- a/decidim-initiatives/config/locales/es.yml
+++ b/decidim-initiatives/config/locales/es.yml
@@ -440,25 +440,25 @@ es:
         update: Actualizar
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} ha aceptado tu solicitud para formar parte del comité promotor de la iniciativa %{resource_title}."
+          email_intro: "%{author_name} ha aceptado tu solicitud para formar parte del comité promotor de la iniciativa %{resource_title}."
           email_outro: 'Has recibido esta notificación porque has solicitado unirte a esta iniciativa: %{resource_title}'
-          email_subject: "%{author_nickname} aceptó tu solicitud para unirte al comité promotor"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> aceptó tu solicitud para formar parte del comité promotor de la siguiente iniciativa <a href="%{resource_url}">%{resource_title}</a>.
+          email_subject: "%{author_name} aceptó tu solicitud para unirte al comité promotor"
+          notification_title: <a href="%{author_profile_url}">%{author_name}</a> aceptó tu solicitud para formar parte del comité promotor de la siguiente iniciativa <a href="%{resource_url}">%{resource_title}</a>.
         create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, a quien sigues, ha creado una nueva iniciativa, compruébalo y contribuye:"
-          email_outro: Has recibido esta notificación porque estás siguiendo %{author_nickname}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-          email_subject: Nueva iniciativa de %{author_nickname}
-          notification_title: La iniciativa <a href="%{resource_path}">%{resource_title}</a> fue creada por <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+          email_intro: "%{author_name}, a quien sigues, ha creado una nueva iniciativa, compruébala y contribuye:"
+          email_outro: Has recibido esta notificación porque estás siguiendo la iniciativa "%{author_name}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
+          email_subject: Nueva iniciativa creada por %{author_name}
+          notification_title: <a href="%{author_path}">%{author_name}</a> ha creado la iniciativa "<a href="%{resource_path}">%{resource_title}</a>".
         revoke_membership_request:
-          email_intro: "%{author_nickname} rechazó tu solicitud para formar parte del comité promotor de la siguiente iniciativa %{resource_title}."
+          email_intro: "%{author_name} rechazó tu solicitud para formar parte del comité promotor de la siguiente iniciativa %{resource_title}."
           email_outro: 'Has recibido esta notificación porque has solicitado unirte a esta iniciativa: "%{resource_title}".'
-          email_subject: "%{author_nickname} rechazó tu solicitud para unirte al comité promotor"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> rechazó tu solicitud para formar parte del comité promotor de la siguiente iniciativa <a href="%{resource_url}">%{resource_title}</a>.
+          email_subject: "%{author_name} rechazó tu solicitud para unirte al comité promotor de la iniciativa"
+          notification_title: '<a href="%{author_profile_url}">%{author_name}</a> rechazó tu solicitud para formar parte del comité promotor de la siguiente iniciativa: <a href="%{resource_url}">%{resource_title}</a>.'
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} ha solicitado unirse al comité promotor de tu iniciativa %{resource_title}. Para aceptar o rechazar la solicitud, ve al formulario de edición de tu iniciativa."
+          email_intro: "%{applicant_name} ha solicitado unirse al comité promotor de tu iniciativa: \"%{resource_title}\". Para aceptar o rechazar la solicitud, ve al formulario de edición de tu iniciativa."
           email_outro: 'Has recibido esta notificación porque promueves esta iniciativa: "%{resource_title}"'
-          email_subject: "%{applicant_nickname} quiere unirse a tu iniciativa"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> ha solicitado unirse al comité promotor de tu iniciativa <a href="%{resource_url}">%{resource_title}</a>. Para aceptar o rechazar la solicitud haz clic <a href="%{resource_url}/edit">aquí</a>.
+          email_subject: "%{applicant_name} quiere unirse a tu iniciativa"
+          notification_title: <a href="%{applicant_profile_url}">%{applicant_name}</a> ha solicitado unirse al comité promotor de tu iniciativa <a href="%{resource_url}">%{resource_title}</a>. <a href="%{resource_url}/edit">Acepta o rechaza la solicitud</a>.
       form:
         add_attachments: Agregar archivo(s) adjunto(s)
         add_image: Añadir imagen
diff --git a/decidim-initiatives/config/locales/eu.yml b/decidim-initiatives/config/locales/eu.yml
index 77700ee6a8409..023f883dde3e7 100644
--- a/decidim-initiatives/config/locales/eu.yml
+++ b/decidim-initiatives/config/locales/eu.yml
@@ -440,25 +440,25 @@ eu:
         update: Eguneratu
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} k onartu du zure eskaera %{resource_title} ekimenaren batzorde bultzatzailean parte hartzeko."
+          email_intro: "%{author_name} parte-hartzaileak onartu du zure eskaera %{resource_title} ekimenaren batzorde bultzatzailean parte hartzeko."
           email_outro: 'Jakinarazpen hau jaso duzu %{resource_title} ekimenarekin bat egitea eskatu duzulako'
-          email_subject: "%{author_nickname} k onartu du zure eskaera batzorde bultzatzailean parte hartzeko"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> k onartu du zure eskaera <a href="%{resource_url}">%{resource_title}</a> ekimenaren batzorde bultzatzailean parte hartzeko.
+          email_subject: "%{author_name} parte-hartzaileak onartu du zure eskaera batzorde bultzatzailean parte hartzeko"
+          notification_title: <a href="%{author_profile_url}">%{author_name}</a> parte-hartzaileak onartu du zure eskaera <a href="%{resource_url}">%{resource_title}</a> ekimenaren batzorde bultzatzailean parte hartzeko.
         create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname} k, jarraitzen ari zarenak, beste ekimen bat sortu du, egiaztatu eta lagundu:"
-          email_outro: Jakinarazpen hau jaso duzu %{author_nickname} jarraitzen ari zarelako. Aurreko estekan sartu jakinarazpenak jasotzeari uzteko.
-          email_subject: '%{author_nickname} ren bete ekimen bat'
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> ekimena <a href="%{author_path}">%{author_name} %{author_nickname}</a> sortu zen.
+          email_intro: "%{author_name} parte-hartzaileak, jarraitzen ari zarenak, beste ekimen bat sortu du, egiaztatu eta lagundu:"
+          email_outro: Jakinarazpen hau jaso duzu %{author_name} jarraitzen ari zarelako. Aurreko estekan jarraitzeari utzi ahal diozu.
+          email_subject: '%{author_name} parte-hartzailearen bete ekimen bat'
+          notification_title: '<a href="%{resource_path}">%{resource_title}</a> eztabaida sortu da hemen: <a href="%{author_path}">%{author_name}</a>.'
         revoke_membership_request:
-          email_intro: "%{author_nickname} k ukatu egin du zure eskaera %{resource_title} ekimenaren batzorde bultzatzailean parte hartzeko."
+          email_intro: "%{author_name} parte-hartzaileak ukatu egin du zure eskaera %{resource_title} ekimenaren batzorde bultzatzailean parte hartzeko."
           email_outro: 'Jakinarazpen hau jaso duzu eskatu duzulako parte hartzea %{resource_title} ekimenean.'
-          email_subject: "%{author_nickname} k ukatu egin du zure eskaera batzorde bultzatzailean parte hartzeko"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> k ukatu du zure eskaera <a href="%{resource_url}">%{resource_title}</a> ekimenaren batzorde bultzatzailean parte hartzeko.
+          email_subject: "%{author_name} parte-hartzaileak ukatu egin du zure eskaera batzorde bultzatzailean parte hartzeko"
+          notification_title: <a href="%{author_profile_url}">%{author_name}</a> parte-hartzaileak ukatu du zure eskaera <a href="%{resource_url}">%{resource_title}</a> ekimenaren batzorde bultzatzailean parte hartzeko.
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} k eskatu du %{resource_title} zure ekimenaren batzorde bultzatzailean parte hartzeko. Eskaera onartzeko edo ukatzeko, zoaz zure ekimenaren edizio-galdetegira."
+          email_intro: "%{applicant_name} parte-hartzaileak eskatu du %{resource_title} zure ekimenaren batzorde bultzatzailean parte hartzeko. Eskaera onartzeko edo ukatzeko, zoaz zure ekimenaren edizio-galdetegira."
           email_outro: 'Jakinarazpen hau jaso duzu %{resource_title} ekimenaren egilea zarelako'
-          email_subject: "%{applicant_nickname} k zure ekimenarekin bat egin nahi du"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> k eskatu du <a href="%{resource_url}">%{resource_title}</a> zure ekimenaren batzorde bultzatzailearekin bat egitea. Eskaera onartzeko edo ukatzeko, egin klik hemen <a href="%{resource_url}/edit">aquí</a>.
+          email_subject: "%{applicant_name} parte-hartzaileak zure ekimenarekin bat egin nahi du"
+          notification_title: <a href="%{applicant_profile_url}">%{applicant_name}</a> parte-hartzaileak eskatu du <a href="%{resource_url}">%{resource_title}</a> zure ekimenaren batzorde bultzatzailearekin bat egitea. Eskaera onartzeko edo ukatzeko, egin klik hemen <a href="%{resource_url}/edit">aquí</a>.
       form:
         add_attachments: Eranskinak gehitu
         add_image: Irudia gehitu
diff --git a/decidim-initiatives/config/locales/fi-plain.yml b/decidim-initiatives/config/locales/fi-plain.yml
index b3bdf7e546b13..55dfc47f2aecb 100644
--- a/decidim-initiatives/config/locales/fi-plain.yml
+++ b/decidim-initiatives/config/locales/fi-plain.yml
@@ -440,25 +440,25 @@ fi-pl:
         update: Päivitä
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} hyväksyi hakemuksesi kannatuskomitean jäseneksi aloitteelle %{resource_title}."
+          email_intro: "%{author_name} hyväksyi hakemuksesi kannatuskomitean jäseneksi aloitteelle %{resource_title}."
           email_outro: 'Tämä ilmoitus on lähetetty sinulle, koska olet tehnyt hakemuksen aloitteelle: %{resource_title}'
-          email_subject: "%{author_nickname} hyväksyi hakemuksesi kannatuskomitean jäseneksi"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> hyväksyi hakemuksesi kannatuskomitean jäseneksi aloitteelle <a href="%{resource_url}">%{resource_title}</a>.
+          email_subject: "%{author_name} hyväksyi hakemuksesi kannatuskomitean jäseneksi"
+          notification_title: <a href="%{author_profile_url}">%{author_name}</a> hyväksyi hakemuksesi kannatuskomitean jäseneksi aloitteelle <a href="%{resource_url}">%{resource_title}</a>.
         create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, jota seuraat, on luonut uuden aloitteen. Tutustu siihen ja osallistu:"
-          email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat käyttäjää %{author_nickname}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
-          email_subject: Uusi aloite käyttäjältä %{author_nickname}
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> on luonut aloitteen <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: "Seuraamasi osallistuja %{author_name} on laatinut uuden aloitteen. Tutustu siihen ja osallistu:"
+          email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet seuraat käyttäjää %{author_name}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
+          email_subject: Uusi aloite käyttäjältä %{author_name}
+          notification_title: <a href="%{author_path}">%{author_name}</a> loi aloiteen <a href="%{resource_path}">%{resource_title}</a>.
         revoke_membership_request:
-          email_intro: "%{author_nickname} hylkäsi hakemuksesi kannatuskomitean jäseneksi aloitteelle %{resource_title}."
+          email_intro: "%{author_name} hylkäsi hakemuksesi kannatuskomitean jäseneksi aloitteelle %{resource_title}."
           email_outro: 'Tämä ilmoitus on lähetetty sinulle, koska olet tehnyt hakemuksen aloitteelle: %{resource_title}.'
-          email_subject: "%{author_nickname} hylkäsi hakemuksesi kannatuskomitean jäseneksi"
-          notification_title: '<a href="%{author_profile_url}">%{author_nickname}</a> hylkäsi hakemuksesi kannatuskomitean jäseneksi aloitteelle: <a href="%{resource_url}">%{resource_title}</a>.'
+          email_subject: "%{author_name} hylkäsi hakemuksesi kannatuskomitean jäseneksi"
+          notification_title: <a href="%{author_profile_url}">%{author_name}</a> hylkäsi hakemuksesi kannatuskomitean jäseneksi aloitteelle <a href="%{resource_url}">%{resource_title}</a>.
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} hakee jäseneksi kannatuskomiteaan aloitteellesi %{resource_title}. Voit hyväksyä tai hylätä hakemuksen aloitteen muokkauslomakkeen kautta."
+          email_intro: "%{applicant_name} hakee kannatuskomitean jäseneksi aloitteellesi %{resource_title}. Voit hyväksyä tai hylätä hakemuksen aloitteen muokkauslomakkeen kautta."
           email_outro: 'Tämä ilmoitus on lähetetty sinulle, koska olet luonut aloitteen %{resource_title}'
-          email_subject: "%{applicant_nickname} haluaa liittyä mukaan aloitteeseesi"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> haki jäseneksi aloitteesi <a href="%{resource_url}">%{resource_title}</a> kannatuskomiteaan. Voit hyväksyä tai hylätä pyynnön <a href="%{resource_url}/edit">aloitteen muokkaussivulta</a>.
+          email_subject: "%{applicant_name} haluaa liittyä mukaan aloitteeseesi"
+          notification_title: <a href="%{applicant_profile_url}">%{applicant_name}</a> haki kannatuskomiteaan aloitteellesi <a href="%{resource_url}">%{resource_title}</a>. Voit hyväksyä tai hylätä hakemuksen <a href="%{resource_url}/edit">täältä</a>.
       form:
         add_attachments: Lisää liitteitä
         add_image: Lisää kuva
diff --git a/decidim-initiatives/config/locales/fi.yml b/decidim-initiatives/config/locales/fi.yml
index 96090e81dae33..a1cbe8f890b85 100644
--- a/decidim-initiatives/config/locales/fi.yml
+++ b/decidim-initiatives/config/locales/fi.yml
@@ -440,25 +440,25 @@ fi:
         update: Päivitä
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} hyväksyi hakemuksesi kannatuskomitean jäseneksi aloitteelle %{resource_title}."
+          email_intro: "%{author_name} hyväksyi hakemuksesi kannatuskomitean jäseneksi aloitteelle %{resource_title}."
           email_outro: 'Tämä ilmoitus on lähetetty sinulle, koska olet tehnyt hakemuksen aloitteelle: %{resource_title}'
-          email_subject: "%{author_nickname} hyväksyi hakemuksesi kannatuskomitean jäseneksi"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> hyväksyi hakemuksesi kannatuskomitean jäseneksi aloitteelle <a href="%{resource_url}">%{resource_title}</a>.
+          email_subject: "%{author_name} hyväksyi hakemuksesi kannatuskomitean jäseneksi"
+          notification_title: <a href="%{author_profile_url}">%{author_name}</a> hyväksyi hakemuksesi kannatuskomitean jäseneksi aloitteelle <a href="%{resource_url}">%{resource_title}</a>.
         create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, jota seuraat, on laatinut uuden aloitteen. Tutustu siihen ja osallistu:"
-          email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat käyttäjää %{author_nickname}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
-          email_subject: Uusi aloite käyttäjältä %{author_nickname}
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> on laatinut aloitteen <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: "Seuraamasi osallistuja %{author_name} on laatinut uuden aloitteen. Tutustu siihen ja osallistu:"
+          email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet seuraat käyttäjää %{author_name}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
+          email_subject: Uusi aloite käyttäjältä %{author_name}
+          notification_title: <a href="%{author_path}">%{author_name}</a> loi aloiteen <a href="%{resource_path}">%{resource_title}</a>.
         revoke_membership_request:
-          email_intro: "%{author_nickname} hylkäsi hakemuksesi kannatuskomitean jäseneksi aloitteelle %{resource_title}."
+          email_intro: "%{author_name} hylkäsi hakemuksesi kannatuskomitean jäseneksi aloitteelle %{resource_title}."
           email_outro: 'Tämä ilmoitus on lähetetty sinulle, koska olet tehnyt hakemuksen aloitteelle: %{resource_title}.'
-          email_subject: "%{author_nickname} hylkäsi hakemuksesi kannatuskomitean jäseneksi"
-          notification_title: '<a href="%{author_profile_url}">%{author_nickname}</a> hylkäsi hakemuksesi kannatuskomitean jäseneksi aloitteelle: <a href="%{resource_url}">%{resource_title}</a>.'
+          email_subject: "%{author_name} hylkäsi hakemuksesi kannatuskomitean jäseneksi"
+          notification_title: <a href="%{author_profile_url}">%{author_name}</a> hylkäsi hakemuksesi kannatuskomitean jäseneksi aloitteelle <a href="%{resource_url}">%{resource_title}</a>.
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} hakee jäseneksi kannatuskomiteaan aloitteellesi %{resource_title}. Voit hyväksyä tai hylätä hakemuksen aloitteen muokkauslomakkeen kautta."
+          email_intro: "%{applicant_name} hakee kannatuskomitean jäseneksi aloitteellesi %{resource_title}. Voit hyväksyä tai hylätä hakemuksen aloitteen muokkauslomakkeen kautta."
           email_outro: 'Tämä ilmoitus on lähetetty sinulle, koska olet laatinut aloitteen %{resource_title}'
-          email_subject: "%{applicant_nickname} haluaa liittyä mukaan aloitteeseesi"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> haki jäseneksi aloitteesi <a href="%{resource_url}">%{resource_title}</a> kannatuskomiteaan. Voit hyväksyä tai hylätä pyynnön <a href="%{resource_url}/edit">aloitteen muokkaussivulta</a>.
+          email_subject: "%{applicant_name} haluaa liittyä mukaan aloitteeseesi"
+          notification_title: <a href="%{applicant_profile_url}">%{applicant_name}</a> haki kannatuskomiteaan aloitteellesi <a href="%{resource_url}">%{resource_title}</a>. Voit hyväksyä tai hylätä hakemuksen <a href="%{resource_url}/edit">täältä</a>.
       form:
         add_attachments: Lisää liitteitä
         add_image: Lisää kuva
diff --git a/decidim-initiatives/config/locales/fr-CA.yml b/decidim-initiatives/config/locales/fr-CA.yml
index 3536865f038df..9061f832550c1 100644
--- a/decidim-initiatives/config/locales/fr-CA.yml
+++ b/decidim-initiatives/config/locales/fr-CA.yml
@@ -401,25 +401,11 @@ fr-CA:
         update: Mettre à jour
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} a accepté votre candidature pour faire partie du comité de promotion de la pétition %{resource_title}."
           email_outro: 'Vous avez reçu cette notification parce que vous avez demandé à faire partie du comité de promotion de cette pétition: %{resource_title}'
-          email_subject: "%{author_nickname} a accepté votre demande de rejoindre le comité de promotion"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> a accepté votre candidature pour faire partie du comité de promotion de la pétition suivante <a href="%{resource_url}">%{resource_title}</a>.
-        create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, que vous suivez, a créé une nouvelle initiative, lisez -la et contribuez :"
-          email_outro: Vous avez reçu cette notification, car vous suivez %{author_nickname}. Vous pouvez arrêter de recevoir des notifications à partir du lien précédent.
-          email_subject: Nouvelle initiative de %{author_nickname}
-          notification_title: L'initiative <a href="%{resource_path}">%{resource_title}</a> a été créée par <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         revoke_membership_request:
-          email_intro: "%{author_nickname} a accepté votre candidature pour faire partie du comité de promotion de la pétition %{resource_title}."
           email_outro: 'Vous avez reçu cette notification parce que vous avez demandé à rejoindre cette pétition : %{resource_title}.'
-          email_subject: "%{author_nickname} a rejeté votre candidature au comité de promotion"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> a rejeté votre candidature pour faire partie du comité de promotion de la pétition suivante <a href="%{resource_url}">%{resource_title}</a>.
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} a postulé pour faire partie du comité de promotion de votre pétition %{resource_title}. Pour accepter ou rejeter la demande, allez dans le formulaire de modification de votre initiative."
           email_outro: 'Vous avez reçu cette notification car vous êtes l''auteur de cette pétition : %{resource_title}'
-          email_subject: "%{applicant_nickname} veut rejoindre le comité de promotion de votre pétition"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> a postulé pour faire partie du comité de promotion de votre pétition <a href="%{resource_url}">%{resource_title}</a>. Pour accepter ou rejeter la demande, cliquez <a href="%{resource_url}/edit">ici</a>.
       form:
         add_attachments: Ajouter des pièces jointes
         add_image: Ajouter une image
diff --git a/decidim-initiatives/config/locales/fr.yml b/decidim-initiatives/config/locales/fr.yml
index f1a62f9ecba10..8a7f724207699 100644
--- a/decidim-initiatives/config/locales/fr.yml
+++ b/decidim-initiatives/config/locales/fr.yml
@@ -401,25 +401,11 @@ fr:
         update: Mettre à jour
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} a accepté votre candidature pour faire partie du comité de promotion de la pétition %{resource_title}."
           email_outro: 'Vous avez reçu cette notification parce que vous avez demandé à faire partie du comité de promotion de cette pétition: %{resource_title}. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l''onglet “Mon compte” > “Paramètres des notifications”.'
-          email_subject: "%{author_nickname} a accepté votre demande de rejoindre le comité de promotion"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> a accepté votre candidature pour faire partie du comité de promotion de la pétition suivante <a href="%{resource_url}">%{resource_title}</a>.
-        create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, que vous suivez, a créé une nouvelle pétition, lisez -la et contribuez :"
-          email_outro: Vous avez reçu cette notification, car vous suivez %{author_nickname}. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
-          email_subject: Nouvelle pétition de %{author_nickname}
-          notification_title: La pétition <a href="%{resource_path}">%{resource_title}</a> a été créée par <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         revoke_membership_request:
-          email_intro: "%{author_nickname} a rejeté votre candidature pour faire partie du comité de promotion de la pétition %{resource_title}."
           email_outro: 'Vous avez reçu cette notification parce que vous avez demandé à rejoindre cette pétition : %{resource_title}. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l''onglet “Mon compte” > “Paramètres des notifications”.'
-          email_subject: "%{author_nickname} a rejeté votre candidature au comité de promotion"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> a rejeté votre candidature pour faire partie du comité de promotion de la pétition suivante <a href="%{resource_url}">%{resource_title}</a>.
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} a postulé pour faire partie du comité de promotion de votre pétition %{resource_title}. Pour accepter ou rejeter la demande, allez dans le formulaire de modification de votre pétition."
           email_outro: 'Vous avez reçu cette notification car vous êtes l''auteur de cette pétition : %{resource_title}. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l''onglet “Mon compte” > “Paramètres des notifications”.'
-          email_subject: "%{applicant_nickname} veut rejoindre le comité de promotion de votre pétition"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> a postulé pour faire partie du comité de promotion de votre pétition <a href="%{resource_url}">%{resource_title}</a>. Pour accepter ou rejeter la demande, cliquez <a href="%{resource_url}/edit">ici</a>.
       form:
         add_attachments: Ajouter des pièces jointes
         add_image: Ajouter une image
diff --git a/decidim-initiatives/config/locales/gl.yml b/decidim-initiatives/config/locales/gl.yml
index fe575ed145c80..483b6fa212422 100644
--- a/decidim-initiatives/config/locales/gl.yml
+++ b/decidim-initiatives/config/locales/gl.yml
@@ -212,12 +212,6 @@ gl:
           choose_html: Quero crear un <strong>%{title}</strong>
           more_information: (Máis información)
           select: Quero promocionar esta iniciativa
-      events:
-        create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, quen está seguindo, creou unha nova iniciativa, revisa e contribúe:"
-          email_outro: Recibiches esta notificación porque estás seguindo %{author_nickname}. Podes deixar de recibir notificacións seguindo a ligazón anterior.
-          email_subject: Nova iniciativa por %{author_nickname}
-          notification_title: A <a href="%{resource_path}">%{resource_title}</a> iniciativa foi creada por <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
       initiative_signatures:
         finish:
           back_to_initiative: Volver á iniciativa
diff --git a/decidim-initiatives/config/locales/hu.yml b/decidim-initiatives/config/locales/hu.yml
index f75468c70c4c7..f7ca8d63cde35 100644
--- a/decidim-initiatives/config/locales/hu.yml
+++ b/decidim-initiatives/config/locales/hu.yml
@@ -349,25 +349,11 @@ hu:
         update: Frissítés
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} elfogadta a jelentkezésedet, hogy részt vegyen a %{resource_title} kezdeményezést előterjesztő bizottságban."
           email_outro: 'Ezt az értesítést azért kaptad, mert jelentkeztél a %{resource_title} kezdeményezéshez'
-          email_subject: "%{author_nickname} elfogadta a jelentkezésedet az előterjesztő bizottságba"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> elfogadta a jelentkezésedet a <a href="%{resource_url}">%{resource_title}</a> kezdeményezés előterjesztő bizottságába.
-        create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname} (akit követsz) új kezdeményezést hozott létre, nézd meg és tegyél hozzá valamit:"
-          email_outro: 'Ezt az értesítést azért kaptad, mert őt követed: "%{author_nickname}". Az értesítéseket a következő linkre kattintva kapcsolhatod ki.'
-          email_subject: '%{author_nickname} új kezdeményezést indított'
-          notification_title: 'A(z) <a href="%{resource_path}">%{resource_title}</a>kezdeményezés létrejött itt, általa: <a href="%{author_path}">%{author_name} %{author_nickname}</a>.'
         revoke_membership_request:
-          email_intro: "%{author_nickname} visszautasította a jelentkezésedet, hogy részt vegyél a %{resource_title} kezdeményezést előterjesztő bizottságban."
           email_outro: 'Ezt az értesítést azért kaptad, mert jelentkeztél a %{resource_title} kezdeményezéshez.'
-          email_subject: "%{author_nickname} visszautasította a jelentkezésedet az előterjesztő bizottságba"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> visszautasította a jelentkezésedet a <a href="%{resource_url}">%{resource_title}</a> kezdeményezés előterjesztő bizottságába.
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} a %{resource_title} kezdeményezésed előterjesztő bizottságába jelentkezett. Az elfogadást vagy visszautasítását a kezdeményezésed szerkesztésénél teheted meg."
           email_outro: 'Ezt az értesítést azért kaptad, mert Te vagy a %{resource_title} kezdeményezés elindítója.'
-          email_subject: "%{applicant_nickname} szeretne csatlakozni a kezdeményezésedhez"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> a <a href="%{resource_url}"> %{resource_title}</a> kezdeményezésed előterjesztő bizottságába jelentkezett. Az elfogadáshoz vagy elutasításhoz kattints <a href="%{resource_url}/edit">ide</a>.
       initiative_signatures:
         finish:
           back_to_initiative: Vissza a kezdeményezéshez
diff --git a/decidim-initiatives/config/locales/id-ID.yml b/decidim-initiatives/config/locales/id-ID.yml
index 9cffafa8cf5b1..49f96936e68eb 100644
--- a/decidim-initiatives/config/locales/id-ID.yml
+++ b/decidim-initiatives/config/locales/id-ID.yml
@@ -207,12 +207,6 @@ id:
           choose_html: Saya ingin membuat <strong>%{title}</strong>
           more_information: (Informasi lebih lanjut)
           select: Saya ingin mempromosikan inisiatif ini
-      events:
-        create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, siapa yang Anda ikuti, telah membuat inisiatif baru, lihat dan sumbangkan:"
-          email_outro: Anda telah menerima pemberitahuan ini karena Anda mengikuti %{author_nickname}. Anda dapat berhenti menerima notifikasi mengikuti tautan sebelumnya.
-          email_subject: Inisiatif baru dengan %{author_nickname}
-          notification_title: Inisiatif <a href="%{resource_path}">%{resource_title}</a> dibuat oleh <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
       initiative_signatures:
         finish:
           back_to_initiative: Kembali ke inisiatif
diff --git a/decidim-initiatives/config/locales/is-IS.yml b/decidim-initiatives/config/locales/is-IS.yml
index 2b3586bd48f99..ec6153be1ab11 100644
--- a/decidim-initiatives/config/locales/is-IS.yml
+++ b/decidim-initiatives/config/locales/is-IS.yml
@@ -109,12 +109,6 @@ is:
         select_initiative_type:
           back: Til baka
           more_information: (Meiri upplýsingar)
-      events:
-        create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, sem þú fylgist með, hefur búið til nýtt frumkvæði, athugaðu það og stuðlað að:"
-          email_outro: Þú hefur fengið þessa tilkynningu vegna þess að þú fylgist með %{author_nickname}. Þú getur hætt við að fá tilkynningar eftir fyrri tengilinn.
-          email_subject: Nýtt frumkvæði með %{author_nickname}
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> frumkvöðull var búin til af <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
       initiatives:
         count:
           title:
diff --git a/decidim-initiatives/config/locales/it.yml b/decidim-initiatives/config/locales/it.yml
index 4aba6366ad47f..bd21b22455997 100644
--- a/decidim-initiatives/config/locales/it.yml
+++ b/decidim-initiatives/config/locales/it.yml
@@ -300,25 +300,11 @@ it:
         update: Modifica
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} ha respinto la tua richiesta di far parte del comitato promotore per la seguente iniziativa %{resource_title}."
           email_outro: 'Hai ricevuto questa notifica perché sei l''autore di questa iniziativa: %{resource_title}'
-          email_subject: "%{author_nickname} ha accettato la tua candidatura al comitato promoter"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> ha respinto la tua richiesta di far parte del comitato di promozione per la seguente iniziativa <a href="%{resource_url}">%{resource_title}</a>.
-        create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, che stai seguendo, ha creato una nuova iniziativa, dai un'occhiata e dai il tuo contributo:"
-          email_outro: Hai ricevuto questa notifica perché stai seguendo %{author_nickname}. È possibile interrompere la ricezione di notifiche seguendo il collegamento precedente.
-          email_subject: Nuova iniziativa di %{author_nickname}
-          notification_title: L'iniziativa <a href="%{resource_path}">%{resource_title}</a> è stata creata da <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         revoke_membership_request:
-          email_intro: "%{author_nickname} ha respinto la tua richiesta di far parte del comitato promoter per la seguente iniziativa %{resource_title}."
           email_outro: 'Hai ricevuto questa notifica perché sei l''autore di questa iniziativa: %{resource_title}.'
-          email_subject: "%{author_nickname} ha respinto la tua richiesta per il comitato promoter"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> ha respinto la tua richiesta di far parte del comitato di promozione per la seguente iniziativa <a href="%{resource_url}">%{resource_title}</a>.
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} ha fatto domanda per il comitato promoter della tua iniziativa %{resource_title}. Per accettare o respingere l'applicazione, vai al modulo di modifica della tua iniziativa."
           email_outro: 'Hai ricevuto questa notifica perché sei l''autore di questa iniziativa: %{resource_title}'
-          email_subject: "%{applicant_nickname} vuole unirsi alla tua iniziativa"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> ha fatto domanda per il comitato promoter della tua iniziativa <a href="%{resource_url}">%{resource_title}</a>. Per accettare o rifiutare clicca <a href="%{resource_url}/edit">qui</a>.
       initiative_signatures:
         finish:
           back_to_initiative: Ritorno all'iniziativa
diff --git a/decidim-initiatives/config/locales/ja.yml b/decidim-initiatives/config/locales/ja.yml
index 15f7a4e04f06a..f766c98da1790 100644
--- a/decidim-initiatives/config/locales/ja.yml
+++ b/decidim-initiatives/config/locales/ja.yml
@@ -437,25 +437,25 @@ ja:
         update: 更新する
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} は、%{resource_title} イニシアチブの推進委員会に参加するあなたの申請を承認しました。"
+          email_intro: "%{author_name} は、イニシアチブ %{resource_title} の推進委員会メンバーとなるためのあなたの申請を承認しました。"
           email_outro: 'この通知を受け取ったのは、イニシアチブ %{resource_title} に応募したためです。'
-          email_subject: "%{author_nickname} が推進委員会への申請を承認しました"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> は、以下のイニシアチブ <a href="%{resource_url}">%{resource_title}</a> のための推進委員会の一員となるためのあなたの申請を承認しました。
+          email_subject: "%{author_name} が推進委員会へのあなたの申請を承認しました"
+          notification_title: <a href="%{author_profile_url}">%{author_name}</a> は、以下のイニシアチブ <a href="%{resource_url}">%{resource_title}</a> の推進委員会のメンバーとなるためのあなたの申請を承認しました。
         create_initiative_event:
-          email_intro: "あなたがフォローしている%{author_name} %{author_nickname}が新しいイニシアチブを作成しました。チェックして貢献してください："
-          email_outro: '%{author_nickname}をフォローしているため、この通知を受け取りました。前のリンクに続く通知の受信を停止することができます。'
-          email_subject: '%{author_nickname} による新しいイニシアチブの作成'
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> イニシアチブは、 <a href="%{author_path}">%{author_name} %{author_nickname}</a> によって作成されました。
+          email_intro: "フォロー中の %{author_name} が新しいイニシアチブを作成しました。ぜひ内容を確認し、ご協力ください："
+          email_outro: '%{author_name} をフォローしているため、この通知が届きました。前のリンクからフォローを解除することで、通知の受信を停止できます。'
+          email_subject: '%{author_name} による新しいイニシアチブ'
+          notification_title: <a href="%{resource_path}">%{resource_title}</a> イニシアチブは <a href="%{author_path}">%{author_name}</a> によって作成されました。
         revoke_membership_request:
-          email_intro: "%{author_nickname} は、以下のイニシアチブ %{resource_title} の推進委員会に参加する申請を拒否しました。"
+          email_intro: "%{author_name} により、以下のイニシアチブ %{resource_title} の推進委員会メンバーとなるための申請が却下されました。"
           email_outro: 'この通知を受け取ったのは、イニシアチブ %{resource_title} に応募したためです。'
-          email_subject: "%{author_nickname} が推進委員会への申請を拒否しました"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> は、以下のイニシアチブ <a href="%{resource_url}">%{resource_title}</a> のための推進委員会の一員となるためのあなたの申請を拒否しました。
+          email_subject: "%{author_name} があなたからの推進委員会への申請を却下しました"
+          notification_title: <a href="%{author_profile_url}">%{author_name}</a> は、以下のイニシアチブ <a href="%{resource_url}">%{resource_title}</a> の推進委員会メンバーとしての申請を却下しました。
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} は、あなたのイニシアチブの推進委員会 %{resource_title} への参加を希望しました。リクエストを承認または拒否するには、イニシアチブの編集フォームに進んでください。"
+          email_intro: "%{applicant_name} がイニシアチブ %{resource_title} の推進委員会に応募しました。承認または却下するには、イニシアチブの編集フォームにアクセスしてください。"
           email_outro: 'この通知を受け取ったのは、イニシアチブ %{resource_title} の作成者だからです。'
-          email_subject: "%{applicant_nickname} があなたのイニシアチブに参加しようとしています"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> があなたのイニシアチブの推進委員会に申請しました <a href="%{resource_url}">%{resource_title}</a>. 受け入れるか拒否するには <a href="%{resource_url}/edit">ここ</a>をクリックしてください。
+          email_subject: "%{applicant_name} はあなたのイニシアチブへの参加を希望しています"
+          notification_title: <a href="%{applicant_profile_url}">%{applicant_name}</a> がイニシアチブ <a href="%{resource_url}">%{resource_title}</a> の推進委員会に応募しました。承認または拒否するには、<a href="%{resource_url}/edit">こちらをクリック</a>してください。
       form:
         add_attachments: 添付ファイルを追加
         add_image: 画像を追加
diff --git a/decidim-initiatives/config/locales/lb.yml b/decidim-initiatives/config/locales/lb.yml
index a545e9e157c5b..cb857daf9770d 100644
--- a/decidim-initiatives/config/locales/lb.yml
+++ b/decidim-initiatives/config/locales/lb.yml
@@ -254,25 +254,11 @@ lb:
         update: Aktualiséieren
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} hat Ihre Anfrage fürs Promoter-Komittee der Initiative %{resource_title} akzeptiert."
           email_outro: 'Sie haben diese Benachrichtigung erhalten, weil Sie sich bei dieser Initiative beworben haben: %{resource_title}'
-          email_subject: "%{author_nickname} hat Ihre Anfrage fürs Promoter-Komittee akzeptiert"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> hat Ihre Anfrage fürs Promoter-Komittee der Initiative <a href="%{resource_url}">%{resource_title}</a> akzeptiert.
-        create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, dem du folgst, hat eine neue Initiative erstellt, sehen Sie es sich an und reden Sie mit:"
-          email_outro: Du hues dës Noriicht kritt, well s'du dem %{author_nickname} nogees. Falls du esou Noriichten net méi wëlls kréien, géi op den Link uewen.
-          email_subject: Neue Initiative von %{author_nickname}
-          notification_title: Die Initiative <a href="%{resource_path}">%{resource_title}</a> wurde von <a href="%{author_path}">%{author_name} %{author_nickname}</a> erstellt.
         revoke_membership_request:
-          email_intro: "%{author_nickname} hat Ihre Anfrage fürs Promoter-Komittee der Initiative %{resource_title} abgelehnt."
           email_outro: 'Sie haben diese Benachrichtigung erhalten, weil Sie sich bei dieser Initiative beworben haben: %{resource_title}.'
-          email_subject: "%{author_nickname} hat Ihre Anfrage fürs Promoter-Komittee abgelehnt"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> hat Ihre Anfrage für das Promoter-Komittee der Initiative <a href="%{resource_url}">%{resource_title}</a> abgelehnt.
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} hat sich fürs Promoter-Komittee Ihrer Initiative %{resource_title} beworben. Um die Anfrage zu akzeptieren oder abzulehnen, besuchen Sie das Bearbeitungsformular Ihrer Initiative."
           email_outro: 'Sie haben diese Benachrichtigung erhalten, weil Sie der Autor der Initiative %{resource_title} sind'
-          email_subject: "%{applicant_nickname} möchte Ihrer Initiative beitreten"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> hat sich für das Promoter-Komittee Ihrer Initiative <a href="%{resource_url}">%{resource_title}</a> beworben. Um anzunehmen oder abzulehnen, klicken Sie <a href="%{resource_url}/edit">hier</a>.
       initiative_signatures:
         finish:
           back_to_initiative: Zurück zur Initiative
diff --git a/decidim-initiatives/config/locales/lt.yml b/decidim-initiatives/config/locales/lt.yml
index 81801c789d01e..6ce55c5c51ad8 100644
--- a/decidim-initiatives/config/locales/lt.yml
+++ b/decidim-initiatives/config/locales/lt.yml
@@ -359,25 +359,11 @@ lt:
         update: Atnaujinti
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} priėmė aplikaciją tapti remėjų komiteto dalimi %{resource_title} iniciatyvai."
           email_outro: 'Ši pranešimą gavote nes aplikavote į iniciatyvą: %{resource_title}'
-          email_subject: "%{author_nickname} priėmė Jūsų aplikaciją į remėjų komitetą"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname} priėmė Jūsų aplikaciją tapti remėjų komiteto dalimi šiai iniciatyvai:<a href="%{resource_url}">%{resource_title}</a>.
-        create_initiative_event:
-          email_intro: "%{author_name}%{author_nickname} kurį sekate sukūrė naują iniciatyvą. Ją rasite čia:"
-          email_outro: Šį pranešimą gavote dėl to, kad sekate %{author_nickname}. Jeigu nebenorite gauti pranešimų, spustelėkite aukščiau esančią nuorodą.
-          email_subject: Nauja %{author_nickname} iniciatyva
-          notification_title: Iniciatyvą <a href="%{resource_path}">%{resource_title}</a> sukūrė <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         revoke_membership_request:
-          email_intro: "%{author_nickname} atmetė Jūsų aplikaciją tapti remėjų komiteto nariu %{resource_title} iniciatyvai."
           email_outro: 'Ši pranešimą gavote nes aplikavote į iniciatyvą: %{resource_title}.'
-          email_subject: "%{author_nickname} priėmė Jūsų aplikaciją į remėjų komitetą"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> atmetė Jūsų aplikaciją tapti remėjų komiteto dalimi šiai iniciatyvai:<a href="%{resource_url}">%{resource_title}</a>.
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} pateikė paraišką prisijungti prie %{resource_title} iniciatyvos remėjų komiteto. Norėdami priimti ar atmesti paraišką, eikite į iniciatyvos redagavimo formą."
           email_outro: 'Šį pranešimą gavote dėl to, kad esate %{resource_title} iniciatyvos autorius'
-          email_subject: "%{applicant_nickname} nori prisijungti prie Jūsų iniciatyvos"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> pateikė paraišką prisijungti prie <a href="%{resource_url}">%{resource_title}</a> iniciatyvos remėjų komiteto. Norėdami priimti ar atmesti paraišką, spauskite <a href="%{resource_url}/edit">čia</a>.
       form:
         add_image: Pridėti paveikslėlį
         edit_image: Redaguoti paveikslėlį
diff --git a/decidim-initiatives/config/locales/lv.yml b/decidim-initiatives/config/locales/lv.yml
index 789958bbec4ac..1fddec18a0de9 100644
--- a/decidim-initiatives/config/locales/lv.yml
+++ b/decidim-initiatives/config/locales/lv.yml
@@ -245,12 +245,6 @@ lv:
           choose_html: Es vēlos izveidot <strong>%{title}</strong>
           more_information: (Papildu informācija)
           select: Es vēlos veicināt šo iniciatīvu
-      events:
-        create_initiative_event:
-          email_intro: "{author_name}%{author_nickname}, kam jūs sekojat, ir izveidojis jaunu iniciatīvu \"%{resource_title}\". Aplūkojiet to un piedalieties:"
-          email_outro: Jūs saņēmāt šo paziņojumu, jo sekojat %{author_nickname}. Jūs varat atteikties no paziņojumu saņemšanas, sekojot iepriekšējai saitei.
-          email_subject: '%{author_nickname} ir jauna iniciatīva'
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> izveidoja iniciatīvu <a href="%{resource_path}">%{resource_title}</a>.
       initiative_signatures:
         finish:
           back_to_initiative: Atpakaļ pie iniciatīvas
diff --git a/decidim-initiatives/config/locales/nl.yml b/decidim-initiatives/config/locales/nl.yml
index 9233db3f391c3..d1b2dc9b50df7 100644
--- a/decidim-initiatives/config/locales/nl.yml
+++ b/decidim-initiatives/config/locales/nl.yml
@@ -262,24 +262,8 @@ nl:
           more_information: (Meer informatie)
           select: Ik wil dit initiatief promoten
       events:
-        approve_membership_request:
-          email_intro: "%{author_nickname} heeft je aanvraag om deel uit te maken van het promotiecomité %{resource_title} aanvaard."
-          email_subject: "%{author_nickname} heeft je aanvraag voor de promotiecommissie geaccepteerd"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> heeft je aanvraag om deel uit te maken van de promotiecommissie voor het volgende initiatief <a href="%{resource_url}">%{resource_title}</a> aanvaard.
-        create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, die je volgt, heeft een nieuw initiatief gemaakt, bekijk het en draag bij:"
-          email_outro: Je hebt deze melding ontvangen omdat je %{author_nickname} volgt. Je kunt stoppen met het ontvangen van notificaties door te klikken op de voorgaande link.
-          email_subject: Nieuw initiatief van %{author_nickname}
-          notification_title: Het <a href="%{resource_path}">%{resource_title}</a> initiatief is gemaakt door <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
-        revoke_membership_request:
-          email_intro: "%{author_nickname} heeft je aanvraag om deel uit te maken van de promotiecommissie voor het volgende initiatief %{resource_title} aanvaard."
-          email_subject: "%{author_nickname} heeft je aanvraag voor de promotiecommissie afgewezen"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> heeft je aanvraag om deel uit te maken van de promotiecommissie voor het volgende initiatief <a href="%{resource_url}">%{resource_title}</a> afgewezen.
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} wil graag toetreden tot de promotiecommissie van je initiatief %{resource_title}. Om de aanvraag te accepteren of af te wijzen, bewerk je je initiatief."
           email_outro: 'Je hebt deze melding ontvangen omdat je de auteur bent van het initiatief %{resource_title}'
-          email_subject: "%{applicant_nickname} wil deelnemen aan je initiatief"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> wil graag deel uitmaken van de promotiecommissie voor jouw initiatief <a href="%{resource_url}">%{resource_title}</a>. Om te accepteren of te weigeren, klik <a href="%{resource_url}/edit">hier</a>.
       initiative_signatures:
         finish:
           back_to_initiative: Terug naar initiatief
diff --git a/decidim-initiatives/config/locales/no.yml b/decidim-initiatives/config/locales/no.yml
index 5781b4fe473c2..1a4518be09eab 100644
--- a/decidim-initiatives/config/locales/no.yml
+++ b/decidim-initiatives/config/locales/no.yml
@@ -310,18 +310,9 @@
         update: Oppdater
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} aksepterte din søknad om å være en del av promotørutvalget for initiativ %{resource_title}."
           email_outro: 'Du mottok dette varselet fordi du søkte på dette initiativet: %{resource_title}'
-          email_subject: "%{author_nickname} aksepterte din søknad til promotørkomiteen"
-        create_initiative_event:
-          email_intro: "%{author_name}%{author_nickname}, som du følger, har opprettet et nytt initiativ, sjekk det ut og bidra:"
-          email_outro: Du har mottatt denne varslingen fordi du følger %{author_nickname}. Du kan slutte å motta varsler hvis du følger den forrige lenken.
-          email_subject: Nytt initiativ av %{author_nickname}
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> initiativet ble opprettet av <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         revoke_membership_request:
           email_outro: 'Du mottok dette varselet fordi du søkte på dette initiativet: %{resource_title}.'
-          email_subject: "%{author_nickname} avviste din søknad til promotørkomiteen"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> avviste søknaden din om å være en del av promotørutvalget i følgende initiativ <a href="%{resource_url}">%{resource_title}</a>.
       initiative_signatures:
         finish:
           back_to_initiative: Tilbake til initiativ
diff --git a/decidim-initiatives/config/locales/pl.yml b/decidim-initiatives/config/locales/pl.yml
index e0c4b273af659..f68c78d724718 100644
--- a/decidim-initiatives/config/locales/pl.yml
+++ b/decidim-initiatives/config/locales/pl.yml
@@ -371,25 +371,11 @@ pl:
         update: Aktualizuj
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} zaakceptował Twoje zgłoszenie na członka komitetu organizacyjnego inicjatywy %{resource_title}."
           email_outro: 'Otrzymałeś to powiadomienie, ponieważ zgłosiłeś się do inicjatywy %{resource_title}'
-          email_subject: "%{author_nickname} zaakceptował Twoje zgłoszenie na członka komitetu organizacyjnego"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> zaakceptował Twoje zgłoszenie na członka komitetu organizacyjnego inicjatywy <a href="%{resource_url}">%{resource_title}</a>.
-        create_initiative_event:
-          email_intro: "Użytkownik %{author_name} %{author_nickname}, którego obserwujesz, utworzył nową inicjatywę, sprawdź ją i przyłącz się:"
-          email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz %{author_nickname}. Możesz przestać otrzymywać powiadomienia po kliknięciu w poprzedni link.
-          email_subject: Nowa inicjatywa autorstwa %{author_nickname}
-          notification_title: Inicjatywa <a href="%{resource_path}">%{resource_title}</a> została utworzona przez <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         revoke_membership_request:
-          email_intro: "%{author_nickname} odrzucił Twoje zgłoszenie na członka komitetu organizacyjnego inicjatywy %{resource_title}."
           email_outro: 'Otrzymałeś to powiadomienie, ponieważ zgłosiłeś się do inicjatywy %{resource_title}.'
-          email_subject: "%{author_nickname} odrzucił Twoje zgłoszenie na członka komitetu organizacyjnego"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> odrzucił Twoje zgłoszenie na członka komitetu organizacyjnego inicjatywy <a href="%{resource_url}">%{resource_title}</a>.
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} złożył wniosek na członka komitetu organizacyjnego Twojej inicjatywy %{resource_title}. Aby zaakceptować lub odrzucić zgłoszenie przejdź do formularza edycji swojej inicjatywy."
           email_outro: 'Otrzymałeś to powiadomienie, ponieważ jesteś autorem inicjatywy %{resource_title}'
-          email_subject: "%{applicant_nickname} chce dołączyć do Twojej inicjatywy"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> złożył wniosek na członka komitetu organizacyjnego Twojej inicjatywy <a href="%{resource_url}">%{resource_title}</a>. Aby zaakceptować lub odrzucić kliknij <a href="%{resource_url}/edit">tutaj</a>.
       form:
         add_image: Dodaj obraz
         edit_image: Edytuj obraz
diff --git a/decidim-initiatives/config/locales/pt-BR.yml b/decidim-initiatives/config/locales/pt-BR.yml
index 5f0d865cf1188..ea616ced18fb7 100644
--- a/decidim-initiatives/config/locales/pt-BR.yml
+++ b/decidim-initiatives/config/locales/pt-BR.yml
@@ -355,25 +355,11 @@ pt-BR:
         update: Atualizar
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} aceitou seu pedido para fazer parte do comitê de promotores da iniciativa %{resource_title}."
           email_outro: 'Você recebeu esta notificação porque você aplicou nesta iniciativa: %{resource_title}'
-          email_subject: "%{author_nickname} aceitou seu pedido ao comitê de promotores"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> aceitou seu pedido como parte do comitê de promotores da seguinte iniciativa <a href="%{resource_url}">%{resource_title}</a>.
-        create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, que você está seguindo, criou uma nova iniciativa, confira e contribua:"
-          email_outro: Você recebeu esta notificação porque está seguindo %{author_nickname}. Você pode parar de receber notificações após o link anterior.
-          email_subject: Nova iniciativa de %{author_nickname}
-          notification_title: A <a href="%{resource_path}">%{resource_title}</a> iniciativa foi criada por <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         revoke_membership_request:
-          email_intro: "%{author_nickname} rejeitou sua solicitação para fazer parte do comitê de promotores para a seguinte iniciativa %{resource_title}."
           email_outro: 'Você recebeu esta notificação porque você aplicou nesta iniciativa: %{resource_title}.'
-          email_subject: "%{author_nickname} rejeitou seu pedido ao comitê de promotores"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> rejeitou seu pedido de adesão por fazer parte do comitê de promotores da seguinte iniciativa <a href="%{resource_url}">%{resource_title}</a>.
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} candidatou-se ao comitê de promotores da sua iniciativa %{resource_title}. Para aceitar ou rejeitar a solicitação, vá ao formulário de edição da sua iniciativa."
           email_outro: 'Você recebeu esta notificação porque você é o autor desta iniciativa: %{resource_title}'
-          email_subject: "%{applicant_nickname} quer participar de sua iniciativa"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> se candidatou ao comitê de promotores da sua iniciativa <a href="%{resource_url}">%{resource_title}</a>. Para aceitar ou rejeitar, clique <a href="%{resource_url}/edit">aqui</a>.
       form:
         add_image: Adicionar imagem
         edit_image: Editar imagem
diff --git a/decidim-initiatives/config/locales/pt.yml b/decidim-initiatives/config/locales/pt.yml
index 1234ecd785351..a7e13610c19a8 100644
--- a/decidim-initiatives/config/locales/pt.yml
+++ b/decidim-initiatives/config/locales/pt.yml
@@ -297,25 +297,11 @@ pt:
         update: Actualizar
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} aceitou a sua candidatura para ser parte da comissão promotora da iniciativa %{resource_title}."
           email_outro: 'Recebeu esta notificação porque se candidatou esta iniciativa: %{resource_title}'
-          email_subject: "%{author_nickname} aceitou a sua candidatura para a comissão promotora"
-          notification_title: <a href=“%{author_profile_url}”>%{author_nickname}</a> aceitou a sua candidatura para ser parte da comissão promotora para a iniciativa seguinte <a href="%{resource_url}">%{resource_title}</a>.
-        create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, que você segue, criou uma nova iniciativa, confira e contribua:"
-          email_outro: Recebeu esta notificação porque segue %{author_nickname}. Pode parar de receber notificações seguindo a hiperligação anterior.
-          email_subject: Nova iniciativa de %{author_nickname}
-          notification_title: A iniciativa <a href="%{resource_path}">%{resource_title}</a> foi criada por <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         revoke_membership_request:
-          email_intro: "%{author_nickname} aceitou a sua candidatura para fazer parte da comissão promotora da iniciativa %{resource_title}."
           email_outro: 'Recebeu esta notificação porque se candidatou esta iniciativa: %{resource_title}'
-          email_subject: "%{author_nickname} aceitou a sua candidatura para a comissão promotora"
-          notification_title: <a href=“%{author_profile_url}”>%{author_nickname}</a> rejeitou a sua candidatura para fazer parte da comissão promotora da iniciativa seguinte <a href="%{resource_url}">%{resource_title}</a>.
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} Candidatou-se para a comissão promotora da sua iniciativa %{resource_title}. Para aceitar ou rejeitar a aplicação vá ao formulário de edição da iniciativa."
           email_outro: 'Recebeu esta notificação porque é o autor desta iniciativa: %{resource_title}'
-          email_subject: "%{applicant_nickname} quer juntar-se à sua iniciativa"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a>  candidatou-se para a comissão promotora da sua iniciativa <a href="%{resource_url}">%{resource_title}</a>. Para aceitar ou rejeitar clique <a href="%{resource_url}/edit">aqui</a>.
       initiative_signatures:
         finish:
           back_to_initiative: Retroceder para a iniciativa
diff --git a/decidim-initiatives/config/locales/ro-RO.yml b/decidim-initiatives/config/locales/ro-RO.yml
index 93952a379bb51..0809bb93987da 100644
--- a/decidim-initiatives/config/locales/ro-RO.yml
+++ b/decidim-initiatives/config/locales/ro-RO.yml
@@ -376,25 +376,11 @@ ro:
         update: Actualizare
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} a acceptat cererea ta de a face parte din comitetul promotorilor pentru inițiativa %{resource_title}."
           email_outro: 'Ai primit această notificare deoarece ai aplicat pentru a face parte din comitetul promotor pentru această inițiativă: %{resource_title}'
-          email_subject: "%{author_nickname} a acceptat cererea ta de a intra în comitetul de promovare"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> a acceptat cererea tade a face parte din comitetul de promovare pentru următoarea inițiativă <a href="%{resource_url}">%{resource_title}</a>.
-        create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, pe care îl urmărești, a creat o nouă inițiativă, verifică și contribuie:"
-          email_outro: Ai primit această notificare deoarece urmărești%{author_nickname}. Poți opri notificările accesând linkul anterior.
-          email_subject: O nouă inițiativă a %{author_nickname}
-          notification_title: Inițiativa <a href="%{resource_path}">%{resource_title}</a> a fost creată de <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         revoke_membership_request:
-          email_intro: "%{author_nickname} a respins cererea tapentru a face parte din comitetul de promovare pentru inițiativa următoare %{resource_title}."
           email_outro: 'Ai primit această notificare deoarece ai cerut să iei parte la această inițiativă: %{resource_title}.'
-          email_subject: "%{author_nickname} a respins cererea ta la comitetul de promovare"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> a respins cererea ta de a face parte din comitetul de promovare pentru următoarea inițiativă <a href="%{resource_url}">%{resource_title}</a>.
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} a aplicat pentru comitetul de promovare al inițiativei tale %{resource_title}. Pentru a accepta sau respinge cererea, accesează formularul de editare al inițiativei ta."
           email_outro: 'Ai primit această notificare deoarece ești autorul acestei inițiative: %{resource_title}'
-          email_subject: "%{applicant_nickname} vrea să se alăture inițiativei tale"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> a depus cerere pentru comitetul de promovare al inițiativa tale <a href="%{resource_url}">%{resource_title}</a>. Pentru a accepta sau respinge apasă <a href="%{resource_url}/edit">aici</a>.
       initiative_signatures:
         dummy_signature:
           form:
diff --git a/decidim-initiatives/config/locales/ru.yml b/decidim-initiatives/config/locales/ru.yml
index 34ef4c2197178..40c26fb9a2e8a 100644
--- a/decidim-initiatives/config/locales/ru.yml
+++ b/decidim-initiatives/config/locales/ru.yml
@@ -154,12 +154,6 @@ ru:
         select_initiative_type:
           back: Вернуться
           more_information: (Дополнительные сведения)
-      events:
-        create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, за которым вы следите, создал новый почин. Прочитайте его и внесите свой вклад:"
-          email_outro: Вы получили это уведомление, потому что вы следите за «%{author_nickname}». Вы можете отписаться от уведомлений, перейдя по приведенной выше ссылке.
-          email_subject: Новый почин от %{author_nickname}
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> предложил почин <a href="%{resource_path}">%{resource_title}</a>.
       initiative_votes:
         create:
           error: При попытке подписаться за этот почин произошли ошибки.
diff --git a/decidim-initiatives/config/locales/sk.yml b/decidim-initiatives/config/locales/sk.yml
index e7e21b813a9e3..cf367fae65a4c 100644
--- a/decidim-initiatives/config/locales/sk.yml
+++ b/decidim-initiatives/config/locales/sk.yml
@@ -446,25 +446,11 @@ sk:
         update: Aktualizovať
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} prijal/a vašu žiadosť o členstvo vo výbore navrhovateľov pre iniciatívu %{resource_title}."
           email_outro: 'Toto upozornenie ste dostali, pretože ste sa prihlásili do tejto iniciatívy: %{resource_title}'
-          email_subject: "%{author_nickname} prijal/a vašu žiadosť do výboru navrhovateľov"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> prijal/a vašu žiadosť o členstvo vo výbore navrhovateľov pre nasledujúcu iniciatívu <a href="%{resource_url}">%{resource_title}</a>.
-        create_initiative_event:
-          email_intro: "% {AUTHOR_NAME}% {author_nickname}, ktorého sledujete, vytvoril novú iniciatívu, skontroloval ju a prispel:"
-          email_outro: Toto oznámenie ste dostali, pretože sledujete %{author_nickname}. Notifikácie môžete zrušiť po kliknutí na predchádzajúci odkaz.
-          email_subject: Nová iniciatíva od%{author_nickname}
-          notification_title: Iniciatíva <a href="%{resource_path}">% {resource_title} </a> bola vytvorená <a href="%{author_path}">% {AUTHOR_NAME}% {author_nickname} </a>.
         revoke_membership_request:
-          email_intro: "%{author_nickname} zamietol/a vašu žiadosť o členstvo vo výbore navrhovateľov pre nasledujúcu iniciatívu %{resource_title}."
           email_outro: 'Toto upozornenie ste dostali, pretože ste sa prihlásili do tejto iniciatívy: %{resource_title}.'
-          email_subject: "%{author_nickname} zamietol/a vašu žiadosť do výboru navrhovateľov"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> zamietol/a vašu žiadosť o členstvo vo výbore navrhovateľov pre nasledujúcu iniciatívu <a href="%{resource_url}">%{resource_title}</a>.
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} požiadal/a o členstvo vo výbore navrhovateľov vašej iniciatívy %{resource_title}. Ak chcete žiadosť prijať alebo zamietnuť, prejdite do formulára na úpravu vašej iniciatívy."
           email_outro: 'Toto upozornenie ste dostali, pretože ste autorom tejto iniciatívy: %{resource_title}'
-          email_subject: "%{applicant_nickname} sa chce pripojiť k vašej iniciatíve"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> požiadal/a o členstvo vo výbore navrhovateľov vašej iniciatívy <a href="%{resource_url}">%{resource_title}</a>. Ak chcete prijať alebo zamietnuť, kliknite <a href="%{resource_url}/edit">sem</a>.
       form:
         add_attachments: Pridať prílohy
         add_image: Pridať obrázok
diff --git a/decidim-initiatives/config/locales/sv.yml b/decidim-initiatives/config/locales/sv.yml
index d0c56398b3f99..828e13aa9d8f5 100644
--- a/decidim-initiatives/config/locales/sv.yml
+++ b/decidim-initiatives/config/locales/sv.yml
@@ -438,25 +438,11 @@ sv:
         update: Uppdatera
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} accepterade din ansökan att ingå i kampanjgruppen för initiativet %{resource_title}."
           email_outro: 'Du har fått det här meddelandet eftersom du är författaren av initiativet %{resource_title}'
-          email_subject: "%{author_nickname} godkände din ansökan till kampanjgruppen"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> godkände din ansökan att ingå i kampanjgruppen för följande initiativ <a href="%{resource_url}">%{resource_title}</a>.
-        create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, som du följer, har skapat ett nytt initiativ. Ta en titt och bidra:"
-          email_outro: Du har fått det här meddelandet eftersom du följer %{author_nickname}. Du kan sluta ta att emot meddelanden via föregående länk.
-          email_subject: Nytt initiativ från %{author_nickname}
-          notification_title: Initiativet <a href="%{resource_path}">%{resource_title}</a> skapades av <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         revoke_membership_request:
-          email_intro: "%{author_nickname} avslog din ansökan om att ingå i kampanjgruppen för följande initiativ %{resource_title}."
           email_outro: 'Du har fått det här meddelandet eftersom du är författaren av initiativet %{resource_title}.'
-          email_subject: "%{author_nickname} avvisade din ansökan till kampanjgruppen"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> avvisade din ansökan att ingå i kampanjgruppen för följande initiativ <a href="%{resource_url}">%{resource_title}</a>.
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} ansökte om att bli kampanjmedlem för %{resource_title}. För att acceptera eller avvisa ansökan går du till redigeringsformuläret för ditt initiativ."
           email_outro: 'Du fick detta meddelande eftersom du är författare till detta initiativ: %{resource_title}'
-          email_subject: "%{applicant_nickname} vill gå med i ditt initiativ"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> ansökte om att gå med i kampanjgruppen för ditt initiativ <a href="%{resource_url}">%{resource_title}</a>. För att acceptera eller avvisa klickar du <a href="%{resource_url}/edit">här</a>.
       form:
         add_attachments: Lägg till bilagor
         add_image: Lägg till bild
diff --git a/decidim-initiatives/config/locales/tr-TR.yml b/decidim-initiatives/config/locales/tr-TR.yml
index 8f750e7485961..af11873329179 100644
--- a/decidim-initiatives/config/locales/tr-TR.yml
+++ b/decidim-initiatives/config/locales/tr-TR.yml
@@ -284,12 +284,6 @@ tr:
         reject: Girişimi reddet
         title: Girişimi düzenle
         update: Güncelle
-      events:
-        create_initiative_event:
-          email_intro: "Takip ettiğiniz %{author_name} %{author_nickname} yeni bir girişim oluşturdu, inceleyin ve katkıda bulunun:"
-          email_outro: Bu bildirimi, %{author_nickname}izlediğiniz için aldınız. Önceki bağlantıyı takip ederek bildirimleri almayı durdurabilirsiniz.
-          email_subject: '%{author_nickname} tarafından yeni girişim'
-          notification_title: <a href="%{resource_path}">%{resource_title} </a> girişimi <a href="%{author_path}">%{author_name} %{author_nickname} </a> tarafından oluşturuldu.
       initiative_signatures:
         finish:
           back_to_initiative: Girişime geri dön
diff --git a/decidim-initiatives/config/locales/uk.yml b/decidim-initiatives/config/locales/uk.yml
index c666307f88ac0..80ad4e9675bce 100644
--- a/decidim-initiatives/config/locales/uk.yml
+++ b/decidim-initiatives/config/locales/uk.yml
@@ -151,12 +151,6 @@ uk:
         select_initiative_type:
           back: Повернутись
           more_information: (Додаткові відомості)
-      events:
-        create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}, за яким ви стежите, зробив новий почин. Прочитайте його та зробіть свій внесок:"
-          email_outro: Ви отримали це сповіщення, тому що ви стежите за %{author_nickname}. Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
-          email_subject: Новий почин, започаткований %{author_nickname}
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> створив почин <a href="%{resource_path}">%{resource_title}</a>.
       initiative_votes:
         create:
           error: При підписанні цього почину сталися помилки.
diff --git a/decidim-initiatives/config/locales/zh-CN.yml b/decidim-initiatives/config/locales/zh-CN.yml
index b3a93e2174235..8a3b4ceb58a21 100644
--- a/decidim-initiatives/config/locales/zh-CN.yml
+++ b/decidim-initiatives/config/locales/zh-CN.yml
@@ -262,12 +262,6 @@ zh-CN:
           choose_html: 我想要创建 <strong>%{title}</strong>
           more_information: (更多信息)
           select: 我想促进这项倡议
-      events:
-        create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}，您正在关注这个问题，已经创建了一个新的倡议，查看它并做出贡献："
-          email_outro: 您收到此通知是因为您正在关注 %{author_nickname}。您可以停止收到跟随上一个链接的通知。
-          email_subject: '%{author_nickname} 的新举措'
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> 倡议是由 <a href="%{author_path}">%{author_name} %{author_nickname}</a> 创建的。
       initiative_signatures:
         finish:
           back_to_initiative: 回到倡议
diff --git a/decidim-initiatives/config/locales/zh-TW.yml b/decidim-initiatives/config/locales/zh-TW.yml
index 2d89c0b4366d8..3e33a7cbb0605 100644
--- a/decidim-initiatives/config/locales/zh-TW.yml
+++ b/decidim-initiatives/config/locales/zh-TW.yml
@@ -349,25 +349,11 @@ zh-TW:
         update: 更新
       events:
         approve_membership_request:
-          email_intro: "%{author_nickname} 同意您加入 %{resource_title} 倡議的推動委員會。"
           email_outro: '這是您收到的通知，因為您申請參與這個倡議：%{resource_title}。'
-          email_subject: "%{author_nickname} 同意您加入推動委員會。"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> 同意您加入以下倡議的推動委員會：<a href="%{resource_url}">%{resource_title}</a>。
-        create_initiative_event:
-          email_intro: "%{author_name} %{author_nickname}，您正在追蹤的用戶，創建了一個新的倡議，請查看並做出貢獻："
-          email_outro: 您收到此通知，是因為您正在關注 %{author_nickname}。您可以使用上面的連結停止接收通知。
-          email_subject: 由 %{author_nickname} 提出的新倡議
-          notification_title: 倡議 <a href="%{resource_path}">%{resource_title}</a> 由 <a href="%{author_path}">%{author_name} %{author_nickname}</a> 提出。
         revoke_membership_request:
-          email_intro: "%{author_nickname} 拒絕了您加入 %{resource_title} 倡議發起委員會的申請。"
           email_outro: '這是您收到的通知，因為您申請參與這個倡議：%{resource_title}。'
-          email_subject: "%{author_nickname} 拒絕了你加入推廣委員會的申請"
-          notification_title: <a href="%{author_profile_url}">%{author_nickname}</a> 拒絕了您加入 %{resource_title} 倡議的推廣委員會成員的申請。
         spawn_committee_request_event:
-          email_intro: "%{applicant_nickname} 申請加入您的倡議 %{resource_title} 推廣委員會。要接受或拒絕申請，請前往您的倡議編輯表單。"
           email_outro: '你收到這個通知是因為你是該倡議 %{resource_title} 的作者。'
-          email_subject: "%{applicant_nickname} 想加入你的倡議"
-          notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> 申請加入你的倡議 <a href="%{resource_url}">%{resource_title}</a> 的推動委員會。點擊<a href="%{resource_url}/edit">這裡</a>接受或拒絕申請。
       index:
         uninitialized: 尚未由管理員設置倡議。
       initiative_signatures:
diff --git a/decidim-meetings/config/locales/cs.yml b/decidim-meetings/config/locales/cs.yml
index 6d48d13b08bee..25a42ce0d4961 100644
--- a/decidim-meetings/config/locales/cs.yml
+++ b/decidim-meetings/config/locales/cs.yml
@@ -173,6 +173,7 @@ cs:
             announcement: Oznámení
             clear_all: Vymazat vše
             comments_enabled: Komentáře povoleny
+            comments_max_length: Maximální počet znaků na komentář (ponechte 0 pro výchozí hodnotu)
             creation_enabled_for_participants: Účastníci mohou vytvářet schůzky
             default_registration_terms: Výchozí podmínky registrace
             define_taxonomy_filters: Před použitím tohoto nastavení prosím definujte některé filtry pro tento participační prostor.
diff --git a/decidim-participatory_processes/config/locales/cs.yml b/decidim-participatory_processes/config/locales/cs.yml
index 666174b2663e3..e1f161d5e2faf 100644
--- a/decidim-participatory_processes/config/locales/cs.yml
+++ b/decidim-participatory_processes/config/locales/cs.yml
@@ -225,6 +225,7 @@ cs:
           steps_title: Kroky
         new:
           create: Vytvořit
+          title: Nová fáze participativního procesu
         ordering:
           error: Došlo k chybě při novém uspořádání těchto kroků procesu participace.
         update:
@@ -641,6 +642,187 @@ cs:
         related_processes: Související procesy
       static_pages:
         democratic_quality_indicators:
+          content: |-
+            <h2>Systém indikátorů na měření indikátoru kvality v Decidim.</h2>
+
+            <h3>Úvod</h3>
+            <p>Demokratická kvalita je základním principem Decidim. Na její udržení jsme vyvinuli systém indikátorů, které pomáhají hodnotit kvalitu participativních procesů na platformě. Tento článek vysvětluje, jak se tyto indikátory počítají.</p>
+
+            <h3>Jak se počítají indikátory?</h3>
+            <p>Definovali jsme dvě metody sběru indikátorů kvality:</p>
+
+            <ol>
+            <li><strong>Automatické metriky:</strong> Tyto se počítají přímo z údajů platformy Decidim.</li>
+            <li><strong>Otázky sebehodnocení:</strong> Tyto jsou založeny na formuláři, který vyplní administrátor.</li>
+            </ol>
+
+            <p>Každý indikátor je vyjádřen v procentech (n/celkem). Toto procento se pak převede na skóre na stupnici od 1 do 5:</p>
+
+            <ul>
+            <li>1 = 0–20%</li>
+            <li>2 = 20–40%</li>
+            <li>3 = 40–60%</li>
+            <li>4 = 60–80%</li>
+            <li>5 = 80–100%</li>
+            </ul>
+
+            <br><br>
+            <h3>Automatické metriky</h3>
+            <p>Tyto metriky se automaticky počítají z údajů dostupných v Decidim. Hodnotí se pro každý participativní proces a administrátoři je mohou zveřejnit, aby k nim měli přístup všichni účastníci.</p>
+
+            <p>Definovali jsme čtyři hlavní indikátory: Dopad občanů, Hybridizace, Reakceschopnost a Sledovatelnost:</p>
+
+            <h3>Vliv občanů</h3>
+
+            <p>Tento indikátor měří úroveň dopadu občanů na přijaté návrhy a výsledky procesu.</p>
+
+            <ul>
+            <li>
+            Vliv občanů na návrhy
+            <ul>
+            <li>Procento přijatých návrhů (n/celkem)</li>
+            <li>Procento schválených <em>občanských</em> návrhů z celkového počtu občanských návrhů (celkový dopad občanů na schválené návrhy)</li>
+            <li>Procento schválených občanských návrhů z celkového počtu schválených návrhů (relativní dopad občanů na schválený návrh)</li>
+            </ul>
+            </li>
+            <li>
+            Vliv občanů na výstupy/výsledky
+            <ul>
+            <li>Procento výsledků spojených s občanskými návrhy z celkového počtu výsledků (celkový dopad občanů na výstupy)</li>
+            </ul>
+            </li>
+            </ul>
+
+            <h3>Hybridizace</h3>
+
+            <p>Tento indikátor měří úroveň kombinace mezi online a offline prostory během procesu.</p>
+
+            <ul>
+            <li>Je aktivní komponenta setkání? (Ano=5, Ne=0)</li>
+            <li>Konají se osobní schůzky? (Ano=5, Ne=0)</li>
+            <li>Konají se online schůzky? (Ano=5, Ne=0)</li>
+            <li>Konají se hybridní schůzky? (Ano=5, Ne=0)</li>
+            <li>Jsou vytvořeny návrhy ze setkání? (Ano=5, Ne=0)</li>
+            </ul>
+
+            <h3>Reakceschopnost</h3>
+
+            <p>Tento indikátor měří úroveň reakceschopnosti organizace na podněty účastníků. Odráží jejich zapojení prostřednictvím oficiálních odpovědí a implementovaných rozhodnutí.</p>
+
+            <ul>
+            <li>Procento návrhů s odpověďmi (n/celkem) – Institucionální reakceschopnost na návrhy</li>
+            <li>Procento výsledků dokončených na 100 % (n/celkem)</li>
+            </ul>
+
+            <h3>Sledovatelnost</h3>
+
+            <p>Tento indikátor měří transparentnost a sledovatelnost participativního procesu. Odráží, jak snadno mohou účastníci sledovat vývoj návrhů a ověřovat institucionální kroky prostřednictvím zveřejněných záznamů.</p>
+
+            <ul>
+            <li>Počet návrhů s historií (n/celkem)</li>
+            <li>Procento výsledků spojených s návrhy (n/celkem)</li>
+            <li>Procento uzavřených schůzek se zveřejněným zápisem (n/celkem)</li>
+            <li>Aktivace modulu otevřených dat (dichotomické: 0 nebo 5)</li>
+            <li>Procento návrhů souvisejících s rozpočty (n/celkem)</li>
+            </ul>
+
+            <br><br>
+            <h3>Metriky sebehodnocení</h3>
+
+            <p>Kromě automatických metrik navrhujeme použít <strong>formulář sebehodnocení</strong> k posouzení kvalitativních dimenzí každého participativního procesu. Tento formulář vyplní administrátoři platformy na konci každého procesu a odpovědi se veřejně zobrazí v bloku obsahu indikátorů.</p>
+
+            <p>Tyto otázky mají za cíl zachytit aspekty demokratické kvality, které nelze posoudit pouze prostřednictvím kvantitativních údajů. Je důležité poznamenat, že odpovědi na tento průzkum jsou ovlivněny názorem administrátorů platformy.</p>
+
+            <br><br>
+            <h3>Otázky sebehodnocení</h3>
+
+            <p>Otázky, které tvoří formulář sebehodnocení, na které odpovídají administrátoři, jakož i hodnoty spojené s každou odpovědí, jsou uvedeny níže.</p>
+
+            <h4>Informativnost</h4>
+
+            <ol>
+            <li>Poskytují zveřejněné informace jasnost o mechanismech rozhodování (např. hlasování, konsensus, přímá jednání)?
+            <ul>
+            <li>Žádná jasnost = 0</li>
+            <li>Nízká jasnost = 1</li>
+            <li>Dostatečná jasnost = 2,5</li>
+            <li>Úplná jasnost = 5</li>
+            </ul>
+            </li>
+            <li>Byly poskytnuty informace týkající se schopnosti účastníků ovlivnit diskutované téma (jak v komunikaci procesu a pozvánkách, tak i na začátku každé diskuse)?
+            <ul>
+            <li>Nikdy = 0</li>
+            <li>Téměř nikdy = 1</li>
+            <li>Obvykle = 2,5</li>
+            <li>Vždy = 5</li>
+            </ul>
+            </li>
+            </ol>
+
+            <h4>Vliv občanů</h4>
+
+            <ol>
+            <li>Hodnocení stupně účasti v procesu
+            <ul>
+            <li>Účastníci obdrželi informace od organizace. = 1</li>
+            <li>Účastníci byli požádáni konzultativním způsobem nebo poskytli zpětnou vazbu organizaci. = 2</li>
+            <li>Účastníci byli zapojeni do sdílení rozhodovací pravomoci. = 3</li>
+            <li>Účastníci byli rozhodujícím způsobem zapojeni do rozhodování. = 4</li>
+            <li>Účastníci byli zapojeni do rozhodování a řízení zdrojů nebo implementace. = 5</li>
+            </ul>
+            </li>
+            <li>Procento fází s 0-5 rozhodovacím zásahem občanů.
+            <p>Z celkového počtu fází v procesu (od výběru problémů po dohled nad realizací), v kolika má veřejnost možnost přijímat rozhodnutí nebo provádět exekutivní kroky?</p>
+            <ul>
+            <li>0-20% = 1</li>
+            <li>20-40% = 2</li>
+            <li>40-60% = 3</li>
+            <li>60-80% = 4</li>
+            <li>80-100% = 5</li>
+            </ul>
+            </li>
+            </ol>
+
+            <h4>Inkluzivnost</h4>
+
+            <ol>
+            <li>Jak se hodnotí stupeň rozmanitosti aktérů a účastníků vzhledem k referenční populaci v procesu?
+            <ul>
+            <li>Žádný = 0</li>
+            <li>Nízký = 1</li>
+            <li>Dostatečný = 2,5</li>
+            <li>Dobrý = 5</li>
+            </ul>
+            </li>
+            <li>V kolika jazycích byl proces komunikován?
+            <ul>
+            <li>Jeden jazyk = 1</li>
+            <li>Méně než polovina jazyků, kterými se hovoří v komunitě = 2,5</li>
+            <li>Více než polovina jazyků, kterými se mluví v komunitě = 5</li>
+            </ul>
+            </li>
+            <li>Byla místa osobních setkání přístupná pro osoby se sníženou pohyblivostí?
+            <ul>
+            <li>Ne = 0</li>
+            <li>Částečně = 2,5</li>
+            <li>Ano = 5</li>
+            </ul>
+            </li>
+            <li>Zasedání s účastí byla naplánována na různé časy (ráno, v poledne, odpoledne, večer a o víkendech).
+            <ul>
+            <li>Ne = 0</li>
+            <li>Částečně = 2,5</li>
+            <li>Ano = 5</li>
+            </ul>
+            </li>
+            <li>Byla účastníkům nabídnuta digitální podpora?
+            <ul>
+            <li>Ne = 0</li>
+            <li>Částečně = 2,5</li>
+            <li>Ano = 5</li>
+            </ul>
+            </li>
+            </ol>
           title: Ukazatele kvality demokracie
     statistics:
       processes_count: Procesy
diff --git a/decidim-proposals/config/locales/ar.yml b/decidim-proposals/config/locales/ar.yml
index d365ee529f7ef..de178db00d94f 100644
--- a/decidim-proposals/config/locales/ar.yml
+++ b/decidim-proposals/config/locales/ar.yml
@@ -182,17 +182,14 @@ ar:
           email_intro: 'تم قبول %{requester_name} لأن يكون مسجلاً كمساهم في المسودة التعاونية <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: لقد تلقيت هذا الإشعار لأنك مساهم مع <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "تم قبول %{requester_name} للوصول كمساهم في %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> كان <strong>مقبولة للوصول كمساهم</strong> من <a href="%{resource_path}">%{resource_title}</a> مشروع تعاوني.
         collaborative_draft_access_rejected:
           email_intro: 'تم رفض %{requester_name} لأن يكون مسجلاً كمساهم في المسودة التعاونية <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: لقد تلقيت هذا الإشعار لأنك مساهم مع <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "تم رفض %{requester_name} للوصول كمساهم في المسودة التعاونية %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> تم رفض الوصول إلى <strong>كمساهم</strong> في المسودة التعاونية <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requested:
           email_intro: 'طلب %{requester_name} إمكانية المشاركة كمساهم. يمكنك <strong>قبول أو رفض الطلب</strong> من صفحة المسودة التعاونية <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: لقد تلقيت هذا الإشعار لأنك مساهم مع <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} طلب الوصول للمساهمة في %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> طلب الوصول للمساهمة في المسودة التعاونية <a href="%{resource_path}">%{resource_title}</a> . يرجى <strong>قبول أو رفض الطلب</strong>.
         collaborative_draft_access_requester_accepted:
           email_intro: تم قبول طلبك للمشاركة كمساهم في المسودة التعاونية <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: لقد تلقيت هذا الإشعار لأنك طلبت أن تصبح مساهماً مع <a href="%{resource_url}">%{resource_title}</a>.
@@ -204,10 +201,7 @@ ar:
           email_subject: لقد تم رفضك كمساهم بـ %{resource_title}.
           notification_title: لقد تم رفض دخولك <strong>كمساهم</strong> في المسودة التعاونية <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> سحب <a href="%{resource_url}">%{resource_title}</a> المسودة التعاونية.
           email_outro: لقد تلقيت هذا الإشعار لأنك مساهم مع <a href="%{resource_url}">%{resource_title}</a>.
-          email_subject: "%{author_name} %{author_nickname} سحب المشروع %{resource_title} التعاوني."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>سحبت</strong> مشروع <a href="%{resource_path}">%{resource_title}</a> التعاوني.
         creation_enabled:
           email_intro: 'يمكنك الآن إنشاء مقترحات جديدة في %{participatory_space_title}! ابدأ المشاركة في هذه الصفحة:'
           email_outro: لقد تلقيت هذا الإشعار لأنك تتابع %{participatory_space_title}. يمكنك إيقاف تلقي الإخطارات باتباع الرابط السابق.
@@ -217,11 +211,6 @@ ar:
           email_outro: لقد تلقيت هذا الإشعار لأنك مؤلف "%{resource_title}".
           email_subject: تم ذكر اقتراحك "%{mentioned_proposal_title}"
           notification_title: لقد تم ذكر اقتراحك "%{mentioned_proposal_title}" <a href="%{resource_path}">في هذه المساحة</a> في التعليقات.
-        proposal_published:
-          email_intro: '%{author_name} %{author_nickname}، الذي تتابعه ، بنشر اقتراح جديد يسمى "%{resource_title}". التحقق من ذلك والمساهمة:'
-          email_outro: لقد تلقيت هذا الإشعار لأنك تتابع %{author_nickname}. يمكنك إيقاف تلقي الإخطارات باتباع الرابط السابق.
-          email_subject: اقتراح جديد "%{resource_title}" من %{author_nickname}
-          notification_title: تم نشر مقترح <a href="%{resource_path}">%{resource_title}</a> بواسطة <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         proposal_published_for_space:
           email_intro: تمت إضافة الاقتراح "%{resource_title}" إلى "%{participatory_space_title}" الذي تتابعه.
           email_outro: لقد تلقيت هذا الإشعار لأنك تتابع "%{participatory_space_title}". يمكنك إيقاف تلقي الإخطارات باتباع الرابط السابق.
diff --git a/decidim-proposals/config/locales/bg.yml b/decidim-proposals/config/locales/bg.yml
index 2db5382a35b03..75270d89c1711 100644
--- a/decidim-proposals/config/locales/bg.yml
+++ b/decidim-proposals/config/locales/bg.yml
@@ -204,17 +204,14 @@ bg:
           email_intro: '%{requester_name} получи достъп като сътрудник в съвместната чернова <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Получихте известие, защото сте сътрудник в <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} получи достъп като сътрудник в %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> <strong>получи достъп като сътрудник</strong> в съвместната чернова <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_rejected:
           email_intro: '%{requester_name} е отхвърлен като сътрудник в съвместната чернова <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Получихте известие, защото сте сътрудник в <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} е отхвърлен като сътрудник в съвместната чернова %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> <strong>е отхвърлен като сътрудник</strong> в съвместната чернова <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} заяви достъп като сътрудник. Можете да <strong>приемете или отхвърлите</strong> от сраницата на колективната чернова <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Получихте известие, защото сте сътрудник в <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} заяви достъп като сътрудник в %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> заяви достъп като сътрудник в колективната чернова <a href="%{resource_path}">%{resource_title}</a>. Моля, <strong>приемете или отхвърлете заявката</strong>.
         collaborative_draft_access_requester_accepted:
           email_intro: Получихте достъп като сътрудник в колективната чернова <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Получихте известие, защото заявихте да бъдете сътрудник в <a href="%{resource_url}">%{resource_title}</a>.
@@ -226,10 +223,7 @@ bg:
           email_subject: Отхвърлен сте като сътрудник в %{resource_title}.
           notification_title: <strong>Отказан Ви е достъп като сътрудник</strong> в колективната чернова <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> оттегли колективната чернова <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Получихте известие, защото сте сътрудник в <a href="%{resource_url}">%{resource_title}</a>.
-          email_subject: "%{author_name} %{author_nickname} оттегли колективната чернова %{resource_title}."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>оттегли</strong> колективната чернова <a href="%{resource_path}">%{resource_title}</a>.
         creation_enabled:
           email_intro: 'Вече може да създавате предложения в %{participatory_space_title}! Участвайте в тази страница:'
           email_outro: Получавате това известие, защото следвате %{participatory_space_title}. Може да прекратите известията чрез предната връзка.
@@ -240,11 +234,6 @@ bg:
           email_outro: Получавате това известие, защото сте автор на %{resource_title}".
           email_subject: Вашето предложение %{mentioned_proposal_title} е споменато
           notification_title: Вашето предложение "%{mentioned_proposal_title}" беше споменато в коментарите <a href="%{resource_path}">на това пространство</a>.
-        proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, което следвате, има публикувано ново предложение "%{resource_title}". Разгледайте го и допринасяйте:'
-          email_outro: Получавате това известие, защото следвате %{author_nickname}. Може да прекратите известията чрез предната връзка.
-          email_subject: Ново предложение "%{resource_title}" от %{author_nickname}
-          notification_title: Предложението <a href="%{resource_path}">%{resource_title}</a> беше публикувано от <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         proposal_published_for_space:
           email_intro: Предложението "%{resource_title}" беше добавено в "%{participatory_space_title}", което следвате.
           email_outro: Получавате това известие, защото следвате "%{participatory_space_title}". Може да прекратите известията чрез предната връзка.
diff --git a/decidim-proposals/config/locales/ca-IT.yml b/decidim-proposals/config/locales/ca-IT.yml
index 0580fd3e84f5b..9bf07980ab9e9 100644
--- a/decidim-proposals/config/locales/ca-IT.yml
+++ b/decidim-proposals/config/locales/ca-IT.yml
@@ -273,17 +273,17 @@ ca-IT:
             email_intro: '%{author_name} ha creat una nota privada a %{resource_title}. La pots veure al <a href="%{admin_proposal_info_url}">taulell d''administració</a>.'
             email_outro: Reps aquesta notificació perquè pots avaluar la proposta.
             email_subject: Algú ha deixat una nota a la proposta %{resource_title}.
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha creat una nota privada a <a href="%{resource_path}">%{resource_title}</a>. La pots veure al <a href="%{admin_proposal_info_path}">taulell d'administració</a>.
+            notification_title: <a href="%{author_path}">%{author_name}</a> ha creat una nota privada a <a href="%{resource_path}">%{resource_title}</a>. La pots veure al <a href="%{admin_proposal_info_path}">taulell d'administració</a>.
           proposal_note_mentioned:
-            email_intro: '"%{author_name}" "%{author_nickname}" t''ha esmentat a una nota privada a "%{resource_title}". La pots veure al <a href="%{admin_proposal_info_url}">taulell d''administració</a>.'
+            email_intro: '"%{author_name}" t''ha esmentat a una nota privada a "%{resource_title}". <a href="%{admin_proposal_info_url}">La pots veure al taulell d''administració</a>.'
             email_outro: Has rebut aquesta notificació perquè t'han esmentat a una nota privada.
             email_subject: Algú ha deixat una nota a la proposta %{resource_title}.
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> t'ha esmentat a una nota privada a <a href="%{resource_path}">%{resource_title}</a>. La pots veure al <a href="%{admin_proposal_info_path}">taulell d'administració</a>.
+            notification_title: <a href="%{author_path}">%{author_name}</a> t'ha esmentat a una nota privada a "<a href="%{resource_path}">%{resource_title}</a>". <a href="%{admin_proposal_info_path}">La pots veure al taulell d'administració</a>.
           proposal_note_replied:
             email_intro: '%{author_name} ha respost la teva nota privada a %{resource_title}. Ho pots veure al <a href="%{admin_proposal_info_url}">taulell d''administració</a>.'
             email_outro: Has rebut aquesta notificació perquè ets l'autora de la nota privada.
             email_subject: "%{author_name} ha respost a la teva nota privada a %{resource_title}."
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha respost a la teva nota privada a <a href="%{resource_path}">%{resource_title}</a>. Ho pots veure al <a href="%{admin_proposal_info_path}">taulell d'administració</a>.
+            notification_title: <a href="%{author_path}">%{author_name}</a> ha respost a la teva nota privada a <a href="%{resource_path}">%{resource_title}</a>. <a href="%{admin_proposal_info_path}">Pots veure la resposta des del taulell d'administració</a>.
         coauthor_accepted_invite:
           notification_title: <a href="%{coauthor_path}">%{coauthor_name}</a> ha acceptat la teva invitació per a ser coautora de la proposta "<a href="%{resource_path}">%{resource_title}</a>".
         coauthor_invited:
@@ -300,17 +300,17 @@ ca-IT:
           email_intro: 'S''ha acceptat %{requester_name} per accedir com a contribuidora de l''esborrany col·laboratiu <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Has rebut aquesta notificació perquè vas contribuir a la proposta "<a href="%{resource_url}">%{resource_title}</a>".
           email_subject: "S'ha acceptat %{requester_name} per accedir com a contribuidora del %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> ha estat <strong>acceptat per accedir com a contribuidora</strong> de l'esborrany col·laboratiu <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: <a href="%{requester_path}">%{requester_name}</a> ha estat <strong>acceptada per accedir com a contribuïdora</strong> de l'esborrany col·laboratiu <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_rejected:
           email_intro: 'S''ha rebutjat que %{requester_name} accedeixi com a contribuidora de l''esborrany col·laboratiu <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Has rebut aquesta notificació perquè vas contribuir a la proposta "<a href="%{resource_url}">%{resource_title}</a>".
           email_subject: "S'ha rebutjat %{requester_name} per accedir com a contribuïdora de l'esborrany col·laboratiu %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a><strong> ha estat rebutjat per accedir com a contribuïdora</strong> de l'esborrany col·laboratiu <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: '<strong>S''ha rebutjat que <a href="%{requester_path}">%{requester_name}</a> accedeixi com a contribuïdora de l''esborrany col·laboratiu<strong>: <a href="%{resource_path}">%{resource_title}</a>.'
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} ha sol·licitat accés com a contribuïdora. Pots <strong>acceptar o rebutjar la sol·licitud</strong> de l''esborrany col·laboratiu <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Has rebut aquesta notificació perquè vas contribuir a la proposta "<a href="%{resource_url}">%{resource_title}</a>".
           email_subject: "%{requester_name} ha demanat accés per contribuir a %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> ha sol·licitat accés per contribuir a l'esborrany col·laboratiu de <a href="%{resource_path}">%{resource_title}</a>. Si us plau, <strong>accepta o rebutja la sol·licitud</strong>.
+          notification_title: <a href="%{requester_path}">%{requester_name}</a> ha sol·licitat accés per contribuir a l'esborrany col·laboratiu de <a href="%{resource_path}">%{resource_title}</a>. Si us plau, <strong>accepta o rebutja la sol·licitud</strong>.
         collaborative_draft_access_requester_accepted:
           email_intro: Has estat acceptada com a contribuïdora de l'esborrany col·laboratiu <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Has rebut aquesta notificació perquè has sol·licitat poder contribuïr a la proposta "<a href="%{resource_url}">%{resource_title}</a>".
@@ -322,10 +322,10 @@ ca-IT:
           email_subject: Has estat rebutjada com a contribuïdora de %{resource_title}.
           notification_title: Has estat rebutjada <strong>per accedir com a contribuïdora</strong> de l'esborrany col·laboratiu <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> ha retirat l'esborrany col·laboratiu <a href="%{resource_url}">%{resource_title}</a>.
+          email_intro: '<a href="%{author_url}">%{author_name}</a> ha retirat l''esborrany col·laboratiu: <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Has rebut aquesta notificació perquè vas contribuir a la proposta "<a href="%{resource_url}">%{resource_title}</a>".
-          email_subject: "%{author_name} %{author_nickname} ha retirat l'esborrany col·laboratiu %{resource_title}."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>ha retirat</strong> l'esborrany col·laboratiu <a href="%{resource_path}">%{resource_title}</a>.
+          email_subject: "%{author_name} ha retirat l'esborrany col·laboratiu: %{resource_title}."
+          notification_title: '<a href="%{author_path}">%{author_name}</a> <strong>ha retirat l''esborrany col·laboratiu</strong>: <a href="%{resource_path}">%{resource_title}</a>.'
         creation_enabled:
           email_intro: 'Ara pots crear noves propostes a %{participatory_space_title}! Comença a participar a aquesta pàgina:'
           email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{participatory_space_title}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
@@ -347,10 +347,10 @@ ca-IT:
           email_subject: La proposta "%{resource_title}" s'ha fusionat amb una altra
           notification_title: Una administradora ha fusionat la proposta "<a href="%{resource_path}">%{resource_title}</a> amb una altra.
         proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, a qui segueixes, ha publicat una nova proposta anomenada "%{resource_title}". Consulta i contribueix:'
-          email_outro: Has rebut aquesta notificació perquè estàs seguint a "%{author_nickname}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
-          email_subject: Nova proposta "%{resource_title}" de %{author_nickname}
-          notification_title: La proposta <a href="%{resource_path}">%{resource_title}</a> ha estat publicada per <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+          email_intro: '%{author_name}, a qui segueixes, ha publicat una nova proposta anomenada "%{resource_title}". Consulta i contribueix:'
+          email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai %{author_name}. Pots deixar de rebre notificacions seguint l'enllaç anterior.
+          email_subject: Nova proposta "%{resource_title}" de %{author_name}
+          notification_title: La proposta "<a href="%{resource_path}">%{resource_title}</a>" va ser publicada per <a href="%{author_path}">%{author_name} </a>.
         proposal_published_for_space:
           email_intro: La proposta "%{resource_title}" s'ha afegit a l'espai "%{participatory_space_title}", que segueixes.
           email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{participatory_space_title}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
diff --git a/decidim-proposals/config/locales/ca.yml b/decidim-proposals/config/locales/ca.yml
index 308305981fc86..e7dca27258c9e 100644
--- a/decidim-proposals/config/locales/ca.yml
+++ b/decidim-proposals/config/locales/ca.yml
@@ -276,17 +276,17 @@ ca:
             email_intro: '%{author_name} ha creat una nota privada a %{resource_title}. La pots veure al <a href="%{admin_proposal_info_url}">taulell d''administració</a>.'
             email_outro: Reps aquesta notificació perquè pots avaluar la proposta.
             email_subject: Algú ha deixat una nota a la proposta %{resource_title}.
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha creat una nota privada a <a href="%{resource_path}">%{resource_title}</a>. La pots veure al <a href="%{admin_proposal_info_path}">taulell d'administració</a>.
+            notification_title: <a href="%{author_path}">%{author_name}</a> ha creat una nota privada a <a href="%{resource_path}">%{resource_title}</a>. La pots veure al <a href="%{admin_proposal_info_path}">taulell d'administració</a>.
           proposal_note_mentioned:
-            email_intro: '"%{author_name}" "%{author_nickname}" t''ha esmentat a una nota privada a "%{resource_title}". La pots veure al <a href="%{admin_proposal_info_url}">taulell d''administració</a>.'
+            email_intro: '"%{author_name}" t''ha esmentat a una nota privada a "%{resource_title}". <a href="%{admin_proposal_info_url}">La pots veure al taulell d''administració</a>.'
             email_outro: Has rebut aquesta notificació perquè t'han esmentat a una nota privada.
             email_subject: Algú ha deixat una nota a la proposta %{resource_title}.
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> t'ha esmentat a una nota privada a <a href="%{resource_path}">%{resource_title}</a>. La pots veure al <a href="%{admin_proposal_info_path}">taulell d'administració</a>.
+            notification_title: <a href="%{author_path}">%{author_name}</a> t'ha esmentat a una nota privada a "<a href="%{resource_path}">%{resource_title}</a>". <a href="%{admin_proposal_info_path}">La pots veure al taulell d'administració</a>.
           proposal_note_replied:
             email_intro: '%{author_name} ha respost la teva nota privada a %{resource_title}. Ho pots veure al <a href="%{admin_proposal_info_url}">taulell d''administració</a>.'
             email_outro: Has rebut aquesta notificació perquè ets l'autora de la nota privada.
             email_subject: "%{author_name} ha respost a la teva nota privada a %{resource_title}."
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha respost a la teva nota privada a <a href="%{resource_path}">%{resource_title}</a>. Ho pots veure al <a href="%{admin_proposal_info_path}">taulell d'administració</a>.
+            notification_title: <a href="%{author_path}">%{author_name}</a> ha respost a la teva nota privada a <a href="%{resource_path}">%{resource_title}</a>. <a href="%{admin_proposal_info_path}">Pots veure la resposta des del taulell d'administració</a>.
         coauthor_accepted_invite:
           notification_title: <a href="%{coauthor_path}">%{coauthor_name}</a> ha acceptat la teva invitació per a ser coautora de la proposta "<a href="%{resource_path}">%{resource_title}</a>".
         coauthor_invited:
@@ -303,17 +303,17 @@ ca:
           email_intro: 'S''ha acceptat %{requester_name} per accedir com a contribuidora de l''esborrany col·laboratiu <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Has rebut aquesta notificació perquè vas contribuir a la proposta "<a href="%{resource_url}">%{resource_title}</a>".
           email_subject: "S'ha acceptat %{requester_name} per accedir com a contribuidora del %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> ha estat <strong>acceptat per accedir com a contribuidora</strong> de l'esborrany col·laboratiu <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: <a href="%{requester_path}">%{requester_name}</a> ha estat <strong>acceptada per accedir com a contribuïdora</strong> de l'esborrany col·laboratiu <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_rejected:
           email_intro: 'S''ha rebutjat que %{requester_name} accedeixi com a contribuidora de l''esborrany col·laboratiu <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Has rebut aquesta notificació perquè vas contribuir a la proposta "<a href="%{resource_url}">%{resource_title}</a>".
           email_subject: "S'ha rebutjat %{requester_name} per accedir com a contribuïdora de l'esborrany col·laboratiu %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a><strong> ha estat rebutjat per accedir com a contribuïdora</strong> de l'esborrany col·laboratiu <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: '<strong>S''ha rebutjat que <a href="%{requester_path}">%{requester_name}</a> accedeixi com a contribuïdora de l''esborrany col·laboratiu<strong>: <a href="%{resource_path}">%{resource_title}</a>.'
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} ha sol·licitat accés com a contribuïdora. Pots <strong>acceptar o rebutjar la sol·licitud</strong> de l''esborrany col·laboratiu <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Has rebut aquesta notificació perquè vas contribuir a la proposta "<a href="%{resource_url}">%{resource_title}</a>".
           email_subject: "%{requester_name} ha demanat accés per contribuir a %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> ha sol·licitat accés per contribuir a l'esborrany col·laboratiu de <a href="%{resource_path}">%{resource_title}</a>. Si us plau, <strong>accepta o rebutja la sol·licitud</strong>.
+          notification_title: <a href="%{requester_path}">%{requester_name}</a> ha sol·licitat accés per contribuir a l'esborrany col·laboratiu de <a href="%{resource_path}">%{resource_title}</a>. Si us plau, <strong>accepta o rebutja la sol·licitud</strong>.
         collaborative_draft_access_requester_accepted:
           email_intro: Has estat acceptada com a contribuïdora de l'esborrany col·laboratiu <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Has rebut aquesta notificació perquè has sol·licitat poder contribuïr a la proposta "<a href="%{resource_url}">%{resource_title}</a>".
@@ -325,10 +325,10 @@ ca:
           email_subject: Has estat rebutjada com a contribuïdora de %{resource_title}.
           notification_title: Has estat rebutjada <strong>per accedir com a contribuïdora</strong> de l'esborrany col·laboratiu <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> ha retirat l'esborrany col·laboratiu <a href="%{resource_url}">%{resource_title}</a>.
+          email_intro: '<a href="%{author_url}">%{author_name}</a> ha retirat l''esborrany col·laboratiu: <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Has rebut aquesta notificació perquè vas contribuir a la proposta "<a href="%{resource_url}">%{resource_title}</a>".
-          email_subject: "%{author_name} %{author_nickname} ha retirat l'esborrany col·laboratiu %{resource_title}."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>ha retirat</strong> l'esborrany col·laboratiu <a href="%{resource_path}">%{resource_title}</a>.
+          email_subject: "%{author_name} ha retirat l'esborrany col·laboratiu: %{resource_title}."
+          notification_title: '<a href="%{author_path}">%{author_name}</a> <strong>ha retirat l''esborrany col·laboratiu</strong>: <a href="%{resource_path}">%{resource_title}</a>.'
         creation_enabled:
           email_intro: 'Ara pots crear noves propostes a %{participatory_space_title}! Comença a participar a aquesta pàgina:'
           email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{participatory_space_title}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
@@ -350,10 +350,10 @@ ca:
           email_subject: La proposta "%{resource_title}" s'ha fusionat amb una altra
           notification_title: Una administradora ha fusionat la proposta "<a href="%{resource_path}">%{resource_title}</a> amb una altra.
         proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, a qui segueixes, ha publicat una nova proposta anomenada "%{resource_title}". Consulta i contribueix:'
-          email_outro: Has rebut aquesta notificació perquè estàs seguint a "%{author_nickname}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
-          email_subject: Nova proposta "%{resource_title}" de %{author_nickname}
-          notification_title: La proposta <a href="%{resource_path}">%{resource_title}</a> ha estat publicada per <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+          email_intro: '%{author_name}, a qui segueixes, ha publicat una nova proposta anomenada "%{resource_title}". Consulta i contribueix:'
+          email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai %{author_name}. Pots deixar de rebre notificacions seguint l'enllaç anterior.
+          email_subject: Nova proposta "%{resource_title}" de %{author_name}
+          notification_title: La proposta "<a href="%{resource_path}">%{resource_title}</a>" va ser publicada per <a href="%{author_path}">%{author_name} </a>.
         proposal_published_for_space:
           email_intro: La proposta "%{resource_title}" s'ha afegit a l'espai "%{participatory_space_title}", que segueixes.
           email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{participatory_space_title}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
diff --git a/decidim-proposals/config/locales/cs.yml b/decidim-proposals/config/locales/cs.yml
index 43af1fa506966..fb9a5157e7969 100644
--- a/decidim-proposals/config/locales/cs.yml
+++ b/decidim-proposals/config/locales/cs.yml
@@ -63,6 +63,8 @@ cs:
               allowed_file_content_types: 'Neplatný typ dokumentu. Jsou povoleny pouze soubory s následujícími příponami: %{types}'
         proposal:
           attributes:
+            add_attachments:
+              needs_to_be_reattached: Vyžaduje být znovu připojen
             body:
               cant_be_equal_to_template: nelze se rovnat šabloně
               identical: A název nemůže být totožný
@@ -182,6 +184,7 @@ cs:
             collaborative_drafts_enabled: Společné koncepty povoleny
             collaborative_drafts_enabled_help: Funkce „Spolunávrhy“ bude odstraněna v Decidim v0.32. Organizace, které ji používají, mohou přejít na novou funkci spoluautorství.
             comments_enabled: Komentáře povoleny
+            comments_max_length: Maximální počet znaků na komentář (ponechte 0 pro výchozí hodnotu)
             default_sort_order: Výchozí řazení návrhu
             default_sort_order_help: Automaticky znamená, že pokud je hlasování povoleno, návrhy se zobrazují seřazené náhodně, a pokud je hlasování zablokováno, pak se zobrazují seřazené podle počtu hlasů.
             default_sort_order_options:
@@ -280,17 +283,13 @@ cs:
             email_intro: '%{author_name} vytvořil soukromou poznámku v %{resource_title}. Podívejte se na <a href="%{admin_proposal_info_url}">administrátorský panel</a>.'
             email_outro: Obdrželi jste toto oznámení, protože můžete návrh vyhodnotit.
             email_subject: Někdo zanechal poznámku na návrh %{resource_title}.
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> vytvořil soukromou poznámku v <a href="%{resource_path}">%{resource_title}</a>. Podívejte se na <a href="%{admin_proposal_info_path}">administrátorský panel</a>.
           proposal_note_mentioned:
-            email_intro: Byli jste zmíněni v soukromé poznámce v "%{resource_title}" od "%{author_name}"%{author_nickname}". Podívejte se na <a href="%{admin_proposal_info_url}">administrátorský panel</a>.
             email_outro: Obdrželi jste toto oznámení, protože jste byli zmíněni v soukromé poznámce.
             email_subject: Někdo vás zmínil v poznámce k návrhu %{resource_title}.
-            notification_title: Byl jste zmíněn v soukromé poznámce v <a href="%{resource_path}">%{resource_title}</a> od <a href="%{author_path}">%{author_name} %{author_nickname}</a>. Podívejte se na <a href="%{admin_proposal_info_path}">administrátorský panel</a>.
           proposal_note_replied:
             email_intro: '%{author_name} odpověděl na vaši soukromou poznámku v %{resource_title}. Podívejte se na <a href="%{admin_proposal_info_url}">admin panel</a>.'
             email_outro: Obdrželi jste toto oznámení, protože jste autorem poznámky.
             email_subject: "%{author_name} odpověděl na vaši soukromou poznámku v %{resource_title}."
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> odpověděl na vaši soukromou poznámku v <a href="%{resource_path}">%{resource_title}</a>. Podívejte se na <a href="%{admin_proposal_info_path}">administrátorský panel</a>.
         coauthor_accepted_invite:
           notification_title: <a href="%{coauthor_path}">%{coauthor_name}</a> přijal vaši pozvánku, aby se stal spoluautorem návrhu <a href="%{resource_path}">%{resource_title}</a>.
         coauthor_invited:
@@ -307,17 +306,14 @@ cs:
           email_intro: '%{requester_name} byl přijat k přístupu jako přispěvatel konceptu spolupráce <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Obdrželi jste toto oznámení, protože jste spolupracovníkem <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} byl přijat k přístupu jako přispěvatel %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> je <strong>přijat k přístupu jako přispěvatel</strong> ke společnému návrhu <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_rejected:
           email_intro: '%{requester_name} byl odmítnut přístup jako přispěvatel konceptu spolupráce <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Obdrželi jste toto oznámení, protože jste spolupracovníkem <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} byl odmítnut pro přístup jako přispěvatel k %{resource_title} kolektivnímu návrhu."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> byl <strong>odmítnut k přístupu jako přispěvatel</strong> ke společnému návrhu <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} požádal o přístup jako přispěvatel. Můžete <strong>přijmout nebo odmítnout požadavek</strong> ze stránky společného konceptu <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Obdrželi jste toto oznámení, protože jste spolupracovníkem <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} požádal o přístup k příspěvku na %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> požádal o přístup k přispění ke společnému návrhu <a href="%{resource_path}">%{resource_title}</a>. Prosím, <strong>přijměte nebo odmítněte žádost</strong>.
         collaborative_draft_access_requester_accepted:
           email_intro: Byl jste přijat k přístupu jako přispěvatel konceptu spolupráce <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Obdrželi jste toto oznámení, protože jste požádali o spolupráci <a href="%{resource_url}">%{resource_title}</a>.
@@ -329,10 +325,7 @@ cs:
           email_subject: Byl jste odmítnut jako přispěvatel %{resource_title}.
           notification_title: Byl jsi <strong>odmítnut přístup jako přispěvatel</strong> na <a href="%{resource_path}">%{resource_title}</a> společném návrhu.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> stáhl <a href="%{resource_url}">%{resource_title}</a> společný koncept.
           email_outro: Obdrželi jste toto oznámení, protože jste spolupracovníkem <a href="%{resource_url}">%{resource_title}</a>.
-          email_subject: "%{author_name} %{author_nickname} stáhl společný koncept %{resource_title}."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>stáhl</strong> <a href="%{resource_path}">%{resource_title}</a> společný koncept.
         creation_enabled:
           email_intro: 'Nyní můžete vytvořit nové návrhy v %{participatory_space_title}! Začněte se účastnit této stránky:'
           email_outro: Toto oznámení jste obdrželi, protože jste sledovali %{participatory_space_title}. Po předchozím propojení můžete přestat přijímat oznámení.
@@ -353,11 +346,6 @@ cs:
           email_outro: Obdrželi jste toto oznámení, protože jste autorem návrhu.
           email_subject: Návrh %{resource_title} byl sloučen
           notification_title: Návrh <a href="%{resource_path}">%{resource_title}</a> byl sloučen administrátorem.
-        proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, kterého sledujete, zveřejnil nový návrh nazvaný "%{resource_title}". Omrkněte ho a přispějte:'
-          email_outro: Toto oznámení jste obdrželi, protože sledujete %{author_nickname}. Na předchozím odkazu můžete přestat přijímat oznámení.
-          email_subject: Nový návrh "%{resource_title}" od %{author_nickname}
-          notification_title: Byl zveřejněn návrh <a href="%{resource_path}">%{resource_title}</a> od <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         proposal_published_for_space:
           email_intro: Návrh "%{resource_title}" byl přidán k "%{participatory_space_title}", který sledujete.
           email_outro: Toto oznámení jste obdrželi, protože jste sledovali "%{participatory_space_title}". Můžete jej odhlásit od předchozího odkazu.
diff --git a/decidim-proposals/config/locales/de.yml b/decidim-proposals/config/locales/de.yml
index 903c34f9d0f0f..22f099a639b9b 100644
--- a/decidim-proposals/config/locales/de.yml
+++ b/decidim-proposals/config/locales/de.yml
@@ -271,17 +271,13 @@ de:
             email_intro: '%{author_name} hat eine private Notiz unter %{resource_title} erstellt. Jetzt im <a href="%{admin_proposal_info_url}">Admin-Panel</a> anzeigen.'
             email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie den Vorschlag bewerten können.
             email_subject: Jemand hat eine Notiz für Vorschlag %{resource_title} erstellt.
-            notification_title: <a href="%{author_path}">%{author_name}</a> hat eine private Notiz unter <a href="%{resource_path}">%{resource_title}</a> erstellt. Jetzt im <a href="%{admin_proposal_info_path">Admin-Panel</a> anzeigen.
           proposal_note_mentioned:
-            email_intro: Sie wurden in einer privaten Notiz in "%{resource_title}" von "%{author_name}" "%{author_nickname}" erwähnt. Jetzt im <a href="%{admin_proposal_info_url}">Admin-Panel</a> anzeigen.
             email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie in einer privaten Notiz erwähnt wurden.
             email_subject: Jemand hat Sie in einer Notiz zum Vorschlag "%{resource_title}" erwähnt.
-            notification_title: Sie wurden in einer privaten Notiz unter <a href="%{resource_path}">"%{resource_title}"</a> von <a href="%{author_path}">%{author_name} %{author_nickname}</a> erwähnt. Jetzt im <a href="%{admin_proposal_info_path}">Admin-Panel</a> anzeigen.
           proposal_note_replied:
             email_intro: '%{author_name} hat deine private Notiz unter %{resource_title} beantwortet. Jetzt im <a href="%{admin_proposal_info_url}">Admin-Panel</a> anzeigen.'
             email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie der Autor der Noitz sind.
             email_subject: "%{author_name} hat auf Ihre private Notiz unter %{resource_title} geantwortet."
-            notification_title: <a href="%{author_path}">%{author_name}</a> hat Ihre private Notiz unter <a href="%{resource_path}">%{resource_title}</a> beantworter. Jetzt im <a href="%{admin_proposal_info_path">Admin-Panel</a> anzeigen.
         coauthor_accepted_invite:
           notification_title: <a href="%{coauthor_path}">%{coauthor_name}</a> hat Ihre Einladung angenommen, mitverfassende Person des Vorschlags <a href="%{resource_path}">%{resource_title}</a> zu werden.
         coauthor_invited:
@@ -298,17 +294,14 @@ de:
           email_intro: '%{requester_name} wurde zur Mitwirkung am kollaborativen Entwurf <a href="%{resource_url}">%{resource_title}</a> akzeptiert.'
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie bei <a href="%{resource_url}">%{resource_title}</a> mitwirken.
           email_subject: "%{requester_name} wurde zur Mitwirkung an %{resource_title} akzeptiert."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> wurde zur Mitwirkung am kollaborativen Entwurf <a href="%{resource_path}">%{resource_title}</a> <strong>angenommen</strong>.
         collaborative_draft_access_rejected:
           email_intro: '%{requester_name} wurde als Mitwirkender des kollaborativen Entwurfs <a href="%{resource_url}">%{resource_title}</a> abgelehnt.'
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie bei <a href="%{resource_url}">%{resource_title}</a> mitwirken.
           email_subject: "%{requester_name} wurde als Mitwirkender des kollaborativen Entwurfs %{resource_title} abgelehnt."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> wurde als Mitwirkender beim kollaborativen Entwurf <a href="%{resource_path}">%{resource_title}</a> <strong>abgelehnt</strong>.
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} hat um Zugriff auf Ihren kollaborativen Entwurf angefragt. Sie können den Antrag auf der Seite des kollaborativen Entwurfs <a href="%{resource_url}">%{resource_title}</a> <strong>annehmen oder ablehnen</strong>.'
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie bei <a href="%{resource_url}">%{resource_title}</a> mitwirken.
           email_subject: "%{requester_name} hat um Zugang zur Mitwirkung bei %{resource_title} angefragt."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> hat Zugriff beantragt, um beim kollaborativen Entwurf <a href="%{resource_path}">%{resource_title}</a> mitzuwirken. Bitte <strong>den Antrag akzeptieren oder ablehnen</strong>.
         collaborative_draft_access_requester_accepted:
           email_intro: Sie wurden zur Mitwirkung am kollaborativen Entwurf <a href="%{resource_url}">%{resource_title}</a> akzeptiert.
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie angefragt haben, bei <a href="%{resource_url}">%{resource_title}</a> mitzuwirken.
@@ -320,10 +313,7 @@ de:
           email_subject: Sie wurden als Mitwirkender von %{resource_title} abgelehnt.
           notification_title: Sie wurden als Mitwirkender beim kollaborativen Entwurf <a href="%{resource_path}">%{resource_title}</a> <strong>abgelehnt</strong>.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> hat den kollaborativen Entwurf <a href="%{resource_url}">%{resource_title}</a> zurückgezogen.
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie bei <a href="%{resource_url}">%{resource_title}</a> mitwirken.
-          email_subject: "%{author_name} %{author_nickname} hat den kollaborativen Entwurf %{resource_title} zurückgezogen."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> hat den kollaborativen Entwurf <a href="%{resource_path}">%{resource_title}</a> <strong>zurückgezogen</strong>.
         creation_enabled:
           email_intro: 'Sie können jetzt neue Vorschläge in %{participatory_space_title} erstellen! Beteiligen Sie sich auf dieser Seite:'
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie %{participatory_space_title} folgen. Falls Sie keine solchen Benachrichtigungen mehr erhalten möchten, besuchen Sie den obigen Link.
@@ -343,11 +333,6 @@ de:
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie diesen Vorschlag verfasst haben.
           email_subject: Der Vorschlag %{resource_title} wurde zusammengeführt
           notification_title: Der Vorschlag <a href="%{resource_path}">%{resource_title}</a> wurde von einem Admin zusammengeführt.
-        proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, dem Sie folgen, hat einen neuen Vorschlag mit dem Namen "%{resource_title}" veröffentlicht. Sehen Sie es sich an und reden Sie mit:'
-          email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie %{author_nickname} folgen. Falls Sie keine solchen Benachrichtigungen mehr erhalten möchten, besuchen Sie den obigen Link.
-          email_subject: Neuer Vorschlag "%{resource_title}" von %{author_nickname}
-          notification_title: Der Vorschlag <a href="%{resource_path}">%{resource_title}</a> wurde von <a href="%{author_path}">%{author_name} %{author_nickname}</a> veröffentlicht.
         proposal_published_for_space:
           email_intro: Der Vorschlag "%{resource_title}" wurde zu "%{participatory_space_title}" hinzugefügt, welchem Sie folgen.
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie "%{participatory_space_title}" folgen. Sie können den Erhalt von Benachrichtigungen über den vorherigen Link beenden.
diff --git a/decidim-proposals/config/locales/el.yml b/decidim-proposals/config/locales/el.yml
index 0b2eeedb5bb8a..322eb07cb6986 100644
--- a/decidim-proposals/config/locales/el.yml
+++ b/decidim-proposals/config/locales/el.yml
@@ -171,17 +171,14 @@ el:
           email_intro: '%{requester_name} έχει γίνει δεκτή η πρόσβαση ως συνεισφέρων του <a href="%{resource_url}">%{resource_title}</a> συνεργατικού σχεδίου.'
           email_outro: Έχετε λάβει αυτήν την ειδοποίηση επειδή είστε συνεργάτης του <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "Ο αιτών %{requester_name} έγινε δεκτός για πρόσβαση ως συμβάλλων για το στοιχείο %{resource_title}."
-          notification_title: Ο αιτών <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> έγινε <strong>δεκτός για πρόσβαση ως συμβάλλων</strong> στο <a href="%{resource_path}">%{resource_title}</a> προσχέδιο συνεργασίας.
         collaborative_draft_access_rejected:
           email_intro: '%{requester_name} έχει απορριφθεί για πρόσβαση ως συνεισφέρων του <a href="%{resource_url}">%{resource_title}</a> συνεργατικού σχεδίου.'
           email_outro: Έχετε λάβει αυτήν την ειδοποίηση επειδή είστε συνεργάτης του <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "Ο αιτών %{requester_name} απορρίφθηκε για πρόσβαση ως συμβάλλων στο προσχέδιο συνεργασίας %{resource_title}."
-          notification_title: Ο αιτών <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> <strong>απορρίφθηκε για πρόσβαση ως συμβάλλων</strong> στο προσχέδιο συνεργασίας <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requested:
           email_intro: 'Ο/Η %{requester_name} ζήτησε πρόσβαση ως συνεισφέρων. Μπορείτε να <strong>αποδεχτείτε ή να απορρίψετε το αίτημα</strong> από τη σελίδα του συνεργατικού προσχεδίου <a href="%{resource_path}">%{resource_title}</a>.'
           email_outro: Έχετε λάβει αυτήν την ειδοποίηση επειδή είστε συνεργάτης του <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "Ο αιτών %{requester_name} ζήτησε πρόσβαση για να συνεισφέρει στο στοιχείο %{resource_title}."
-          notification_title: Ο αιτών <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> ζήτησε πρόσβαση για να συνεισφέρει στο προσχέδιο συνεργασίας <a href="%{resource_path}">%{resource_title}</a>. <strong>Αποδεχτείτε ή απορρίψτε το αίτημα</strong>.
         collaborative_draft_access_requester_accepted:
           email_intro: Έχετε γίνει δεκτός να έχετε πρόσβαση ως συνεισφέρων του συνεργατικού σχεδίου <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Έχετε λάβει αυτήν την ειδοποίηση επειδή ζητήσατε να γίνετε συνεργάτης του <a href="%{resource_url}">%{resource_title}</a>.
@@ -193,10 +190,7 @@ el:
           email_subject: Απορριφθήκατε ως συμβάλλων για το στοιχείο %{resource_title}.
           notification_title: <strong>Απορριφθήκατε για πρόσβαση ως συμβάλλων</strong> στο προσχέδιο συνεργασίας <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> απέσυρε το <a href="%{resource_url}">%{resource_title}</a> συνεργατικό προσχέδιο.
           email_outro: Έχετε λάβει αυτήν την ειδοποίηση επειδή είστε συνεργάτης του <a href="%{resource_url}">%{resource_title}</a>.
-          email_subject: "Ο συντάκτης %{author_name} %{author_nickname} απέσυρε το προσχέδιο συνεργασίας %{resource_title}."
-          notification_title: Ο συντάκτης <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>απέσυρε</strong> το προσχέδιο συνεργασίας <a href="%{resource_path}">%{resource_title}</a>.
         creation_enabled:
           email_intro: 'Τώρα μπορείτε να δημιουργήσετε νέες προτάσεις στον χώρο συμμετοχής %{participatory_space_title}! Ξεκινήστε να συμμετέχετε σε αυτήν τη σελίδα:'
           email_outro: Λάβατε αυτήν την ειδοποίηση επειδή ακολουθείτε τον χώρο συμμετοχής %{participatory_space_title}. Μπορείτε να διακόψετε τη λήψη ειδοποιήσεων ακολουθώντας τον προηγούμενο σύνδεσμο.
@@ -207,11 +201,6 @@ el:
           email_outro: Λάβατε αυτήν την ειδοποίηση επειδή είστε συντάκτης του στοιχείου «%{resource_title}».
           email_subject: Έγινε αναφορά στην πρότασή σας «%{mentioned_proposal_title}»
           notification_title: Η πρότασή σας «%{mentioned_proposal_title}» αναφέρθηκε <a href="%{resource_path}">σε αυτόν τον χώρο</a> στα σχόλια.
-        proposal_published:
-          email_intro: 'Ο συντάκτης %{author_name} %{author_nickname}, τον οποίο ακολουθείτε, δημοσίευση μια νέα πρόταση με τον τίτλο «%{resource_title}». Δείτε την και συνεισφέρετε:'
-          email_outro: Λάβατε αυτήν την ειδοποίηση επειδή ακολουθείτε τον συντάκτη %{author_nickname}. Μπορείτε να διακόψετε τη λήψη ειδοποιήσεων ακολουθώντας τον προηγούμενο σύνδεσμο.
-          email_subject: Νέα πρόταση «%{resource_title}» από τον συντάκτη %{author_nickname}
-          notification_title: Η πρόταση <a href="%{resource_path}">%{resource_title}</a> δημοσιεύτηκε από τον συντάκτη <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         proposal_published_for_space:
           email_intro: Η πρόταση «%{resource_title}» προστέθηκε στον χώρο συμμετοχής «%{participatory_space_title}» που ακολουθείτε.
           email_outro: Λάβατε αυτήν την ειδοποίηση επειδή ακολουθείτε τον χώρο συμμετοχής «%{participatory_space_title}». Μπορείτε να διακόψετε τη λήψη ειδοποιήσεων ακολουθώντας τον προηγούμενο σύνδεσμο.
diff --git a/decidim-proposals/config/locales/es-MX.yml b/decidim-proposals/config/locales/es-MX.yml
index 8d370291de73d..738b9e4ee82a4 100644
--- a/decidim-proposals/config/locales/es-MX.yml
+++ b/decidim-proposals/config/locales/es-MX.yml
@@ -276,17 +276,17 @@ es-MX:
             email_intro: '%{author_name} ha creado una nota privada en %{resource_title}. Puedes verlo en el <a href="%{admin_proposal_info_url}">panel de administración</a>.'
             email_outro: Has recibido esta notificación porque puedes valorar la propuesta.
             email_subject: Alguien dejó una nota en la propuesta %{resource_title}.
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha creado una nota privada en <a href="%{resource_path}">%{resource_title}</a>. Puedes verla en el <a href="%{admin_proposal_info_path}">panel de administración</a>.
+            notification_title: <a href="%{author_path}">%{author_name}</a> ha creado una nota privada en <a href="%{resource_path}">%{resource_title}</a>. Puedes verla en el <a href="%{admin_proposal_info_path}">panel de administración</a>.
           proposal_note_mentioned:
-            email_intro: '"%{author_name}" "%{author_nickname}" te ha mencionado en una nota privada en "%{resource_title}". Puedes verla en el <a href="%{admin_proposal_info_url}">panel de administración</a>.'
+            email_intro: '"%{author_name}" te ha mencionado en una nota privada en "%{resource_title}". <a href="%{admin_proposal_info_url}">Puedes verla en el panel de administración</a>.'
             email_outro: Has recibido esta notificación porque se te ha mencionado en una nota privada.
             email_subject: Alguien dejó una nota en la propuesta %{resource_title}.
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> te ha mencionado en una nota privada en <a href="%{resource_path}">%{resource_title}</a>. Puedes verla en el <a href="%{admin_proposal_info_path}">panel de administración</a>.
+            notification_title: <a href="%{author_path}">%{author_name}</a> te ha mencionado en una nota privada en <a href="%{resource_path}">%{resource_title}</a>. <a href="%{admin_proposal_info_path}">Puedes verla en el panel de administración</a>.
           proposal_note_replied:
             email_intro: '%{author_name} ha respondido a tu nota privada en %{resource_title}. Puedes verlo en el <a href="%{admin_proposal_info_url}">panel de administración</a>.'
             email_outro: Has recibido esta notificación porque eres el autor de la nota privada.
             email_subject: "%{author_name} ha respondido a tu nota privada en %{resource_title}."
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha respondido a tu nota privada en <a href="%{resource_path}">%{resource_title}</a>. Puedes verlo en el <a href="%{admin_proposal_info_path}">panel de administración</a>.
+            notification_title: <a href="%{author_path}">%{author_name}</a> ha respondido a tu nota privada en <a href="%{resource_path}">%{resource_title}</a>. <a href="%{admin_proposal_info_path}">Puedes ver la respuesta desde el panel de administración</a>.
         coauthor_accepted_invite:
           notification_title: <a href="%{coauthor_path}">%{coauthor_name}</a> ha aceptado tu invitación para ser coautora de la propuesta "<a href="%{resource_path}">%{resource_title}</a>".
         coauthor_invited:
@@ -303,17 +303,17 @@ es-MX:
           email_intro: '%{requester_name} ha sido aceptada para acceder como contribuidora del borrador colaborativo <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Has recibido esta notificación porque eres una contribuidora de <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} ha sido aceptado para acceder como contribuidor de %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> ha sido <strong>aceptado para acceder como colaborador</strong> del borrador colaborativo <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: <a href="%{requester_path}">%{requester_name}</a> ha sido <strong>aceptada para acceder como contribuidora</strong> del borrador colaborativo <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_rejected:
           email_intro: 'Se ha denegado que %{requester_name} acceda como contribuidora del borrador colaborativo <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Has recibido esta notificación porque eres una contribuidora de <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} ha sido rechazado para acceder como contribuidor del borrador colaborativo %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> ha sido <strong>rechazado para acceder como contribuidor</strong> del borrador colaborativo <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: '<strong>Se ha rechazado que <a href="%{requester_path}">%{requester_name}</a> acceda como contribuidora del borrador colaborativo<strong>: <a href="%{resource_path}">%{resource_title}</a>.'
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} ha solicitado acceso como contribuidora. Puede <strong>aceptar o rechazar la solicitud</strong> de la página de borrador colaborativo de <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Has recibido esta notificación porque eres contribuidora de <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} solicitó acceso para contribuir a %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> solicitó acceso para contribuir al borrador de colaboración <a href="%{resource_path}">%{resource_title}</a>. Por favor <strong>aceptar o rechazar la solicitud</strong>.
+          notification_title: <a href="%{requester_path}">%{requester_name}</a> ha solicitado acceso para contribuir al borrador colaborativo <a href="%{resource_path}">%{resource_title}</a>. <strong>Acepta o deniega la solicitud</strong>.
         collaborative_draft_access_requester_accepted:
           email_intro: Has sido aceptada para acceder como contribuidora del borrador colaborativo <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Has recibido esta notificación porque has solicitado ser contribuidora de <a href="%{resource_url}">%{resource_title}</a>.
@@ -325,10 +325,10 @@ es-MX:
           email_subject: Has sido rechazado como contribuidor de %{resource_title}.
           notification_title: Has sido <strong>rechazado para acceder como contribuidor</strong> al borrador colaborativo <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> ha retirado el borrador colaborativo <a href="%{resource_url}">%{resource_title}</a>.
+          email_intro: '<a href="%{author_url}">%{author_name}</a> ha retirado el borrador colaborativo: <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Has recibido esta notificación porque eres contribuidora de <a href="%{resource_url}">%{resource_title}</a>.
-          email_subject: "%{author_name} %{author_nickname} ha retirado el borrador colaborativo %{resource_title}."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>ha retirado</strong> el borrador colaborativo <a href="%{resource_path}">%{resource_title}</a>.
+          email_subject: "%{author_name} ha retirado el borrador colaborativo: %{resource_title}."
+          notification_title: '<a href="%{author_path}">%{author_name}</a> <strong>ha retirado el borrador colaborativo</strong>: <a href="%{resource_path}">%{resource_title}</a>.'
         creation_enabled:
           email_intro: '¡Ahora puedes crear nuevas propuestas en %{participatory_space_title}! Empieza a participar en esta página:'
           email_outro: Recibiste esta notificación porque estás siguiendo %{participatory_space_title}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
@@ -350,10 +350,10 @@ es-MX:
           email_subject: La propuesta "%{resource_title}" se ha fusionado con otra
           notification_title: Una administradora ha fusionado la propouesta "<a href="%{resource_path}">%{resource_title}</a>" con otra.
         proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, a quien sigues, ha publicado una nueva propuesta llamada "%{resource_title}". Échale un vistazo y contribuye:'
-          email_outro: Recibiste esta notificación porque estás siguiendo a %{author_nickname}. Puedes dejar de recibir notificaciones desde el enlace anterior.
-          email_subject: Nueva propuesta "%{resource_title}" por %{author_nickname}
-          notification_title: La propuesta <a href="%{resource_path}">%{resource_title}</a> fue publicada por <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+          email_intro: '%{author_name}, a quien sigues, ha publicado una nueva propuesta llamada: "%{resource_title}". Échale un vistazo y contribuye:'
+          email_outro: Has recibido esta notificación porque estás siguiendo la iniciativa %{author_name}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
+          email_subject: Nueva propuesta "%{resource_title}" de %{author_name}
+          notification_title: La propuesta <a href="%{resource_path}">%{resource_title}</a> fue publicada por <a href="%{author_path}">%{author_name} </a>.
         proposal_published_for_space:
           email_intro: La propuesta "%{resource_title}" se ha añadido a "%{participatory_space_title}" que estás siguiendo.
           email_outro: Recibiste esta notificación porque estás siguiendo "%{participatory_space_title}". Puedes dejar de seguirlo desde el enlace anterior.
diff --git a/decidim-proposals/config/locales/es-PY.yml b/decidim-proposals/config/locales/es-PY.yml
index 10e29d3f30aae..0fff5cd26227f 100644
--- a/decidim-proposals/config/locales/es-PY.yml
+++ b/decidim-proposals/config/locales/es-PY.yml
@@ -276,17 +276,17 @@ es-PY:
             email_intro: '%{author_name} ha creado una nota privada en %{resource_title}. Puedes verlo en el <a href="%{admin_proposal_info_url}">panel de administración</a>.'
             email_outro: Has recibido esta notificación porque puedes valorar la propuesta.
             email_subject: Alguien dejó una nota en la propuesta %{resource_title}.
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha creado una nota privada en <a href="%{resource_path}">%{resource_title}</a>. Puedes verla en el <a href="%{admin_proposal_info_path}">panel de administración</a>.
+            notification_title: <a href="%{author_path}">%{author_name}</a> ha creado una nota privada en <a href="%{resource_path}">%{resource_title}</a>. Puedes verla en el <a href="%{admin_proposal_info_path}">panel de administración</a>.
           proposal_note_mentioned:
-            email_intro: '"%{author_name}" "%{author_nickname}" te ha mencionado en una nota privada en "%{resource_title}". Puedes verla en el <a href="%{admin_proposal_info_url}">panel de administración</a>.'
+            email_intro: '"%{author_name}" te ha mencionado en una nota privada en "%{resource_title}". <a href="%{admin_proposal_info_url}">Puedes verla en el panel de administración</a>.'
             email_outro: Has recibido esta notificación porque se te ha mencionado en una nota privada.
             email_subject: Alguien dejó una nota en la propuesta %{resource_title}.
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> te ha mencionado en una nota privada en <a href="%{resource_path}">%{resource_title}</a>. Puedes verla en el <a href="%{admin_proposal_info_path}">panel de administración</a>.
+            notification_title: <a href="%{author_path}">%{author_name}</a> te ha mencionado en una nota privada en <a href="%{resource_path}">%{resource_title}</a>. <a href="%{admin_proposal_info_path}">Puedes verla en el panel de administración</a>.
           proposal_note_replied:
             email_intro: '%{author_name} ha respondido a tu nota privada en %{resource_title}. Puedes verlo en el <a href="%{admin_proposal_info_url}">panel de administración</a>.'
             email_outro: Has recibido esta notificación porque eres el autor de la nota privada.
             email_subject: "%{author_name} ha respondido a tu nota privada en %{resource_title}."
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha respondido a tu nota privada en <a href="%{resource_path}">%{resource_title}</a>. Puedes verlo en el <a href="%{admin_proposal_info_path}">panel de administración</a>.
+            notification_title: <a href="%{author_path}">%{author_name}</a> ha respondido a tu nota privada en <a href="%{resource_path}">%{resource_title}</a>. <a href="%{admin_proposal_info_path}">Puedes ver la respuesta desde el panel de administración</a>.
         coauthor_accepted_invite:
           notification_title: <a href="%{coauthor_path}">%{coauthor_name}</a> ha aceptado tu invitación para ser coautora de la propuesta "<a href="%{resource_path}">%{resource_title}</a>".
         coauthor_invited:
@@ -303,17 +303,17 @@ es-PY:
           email_intro: '%{requester_name} ha sido aceptada para acceder como contribuidora del borrador colaborativo <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Has recibido esta notificación porque eres una contribuidora de <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} ha sido aceptado para acceder como contribuidor de %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> ha sido <strong>aceptado para acceder como colaborador</strong> del borrador colaborativo <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: <a href="%{requester_path}">%{requester_name}</a> ha sido <strong>aceptada para acceder como contribuidora</strong> del borrador colaborativo <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_rejected:
           email_intro: 'Se ha denegado que %{requester_name} acceda como contribuidora del borrador colaborativo <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Has recibido esta notificación porque eres una contribuidora de <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} ha sido rechazado para acceder como contribuidor del borrador colaborativo %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> ha sido <strong>rechazado para acceder como contribuidor</strong> del borrador colaborativo <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: '<strong>Se ha rechazado que <a href="%{requester_path}">%{requester_name}</a> acceda como contribuidora del borrador colaborativo<strong>: <a href="%{resource_path}">%{resource_title}</a>.'
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} ha solicitado acceso como contribuidora. Puede <strong>aceptar o rechazar la solicitud</strong> de la página de borrador colaborativo de <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Has recibido esta notificación porque eres contribuidora de <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} solicitó acceso para contribuir a %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> solicitó acceso para contribuir al borrador de colaboración <a href="%{resource_path}">%{resource_title}</a>. Por favor <strong>aceptar o rechazar la solicitud</strong>.
+          notification_title: <a href="%{requester_path}">%{requester_name}</a> ha solicitado acceso para contribuir al borrador colaborativo <a href="%{resource_path}">%{resource_title}</a>. <strong>Acepta o deniega la solicitud</strong>.
         collaborative_draft_access_requester_accepted:
           email_intro: Has sido aceptada para acceder como contribuidora del borrador colaborativo <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Has recibido esta notificación porque has solicitado ser contribuidora de <a href="%{resource_url}">%{resource_title}</a>.
@@ -325,10 +325,10 @@ es-PY:
           email_subject: Has sido rechazado como contribuidor de %{resource_title}.
           notification_title: Has sido <strong>rechazado para acceder como contribuidor</strong> al borrador colaborativo <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> ha retirado el borrador colaborativo <a href="%{resource_url}">%{resource_title}</a>.
+          email_intro: '<a href="%{author_url}">%{author_name}</a> ha retirado el borrador colaborativo: <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Has recibido esta notificación porque eres contribuidora de <a href="%{resource_url}">%{resource_title}</a>.
-          email_subject: "%{author_name} %{author_nickname} ha retirado el borrador colaborativo %{resource_title}."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>ha retirado</strong> el borrador colaborativo <a href="%{resource_path}">%{resource_title}</a>.
+          email_subject: "%{author_name} ha retirado el borrador colaborativo: %{resource_title}."
+          notification_title: '<a href="%{author_path}">%{author_name}</a> <strong>ha retirado el borrador colaborativo</strong>: <a href="%{resource_path}">%{resource_title}</a>.'
         creation_enabled:
           email_intro: '¡Ahora puedes crear nuevas propuestas en %{participatory_space_title}! Comienza a participar en esta página:'
           email_outro: Recibiste esta notificación porque estás siguiendo %{participatory_space_title}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
@@ -350,10 +350,10 @@ es-PY:
           email_subject: La propuesta "%{resource_title}" se ha fusionado con otra
           notification_title: Una administradora ha fusionado la propouesta "<a href="%{resource_path}">%{resource_title}</a>" con otra.
         proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, a quien sigues, ha publicado una nueva propuesta llamada "%{resource_title}". Échale un vistazo y contribuye:'
-          email_outro: Recibiste esta notificación porque estás siguiendo %{author_nickname}. Puedes dejar de recibir notificaciones desde el enlace anterior.
-          email_subject: Nueva propuesta "%{resource_title}" por %{author_nickname}
-          notification_title: La propuesta <a href="%{resource_path}">%{resource_title}</a> fue publicada por <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+          email_intro: '%{author_name}, a quien sigues, ha publicado una nueva propuesta llamada: "%{resource_title}". Échale un vistazo y contribuye:'
+          email_outro: Has recibido esta notificación porque estás siguiendo la iniciativa %{author_name}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
+          email_subject: Nueva propuesta "%{resource_title}" de %{author_name}
+          notification_title: La propuesta <a href="%{resource_path}">%{resource_title}</a> fue publicada por <a href="%{author_path}">%{author_name} </a>.
         proposal_published_for_space:
           email_intro: La propuesta "%{resource_title}" se ha añadido a "%{participatory_space_title}" que estás siguiendo.
           email_outro: Recibiste esta notificación porque estás siguiendo "%{participatory_space_title}". Puedes dejar de seguirlo desde el enlace anterior.
diff --git a/decidim-proposals/config/locales/es.yml b/decidim-proposals/config/locales/es.yml
index 2223deca51d98..eb6e3e645738a 100644
--- a/decidim-proposals/config/locales/es.yml
+++ b/decidim-proposals/config/locales/es.yml
@@ -276,17 +276,17 @@ es:
             email_intro: '%{author_name} ha creado una nota privada en %{resource_title}. Puedes verlo en el <a href="%{admin_proposal_info_url}">panel de administración</a>.'
             email_outro: Has recibido esta notificación porque puedes valorar la propuesta.
             email_subject: Alguien dejó una nota en la propuesta %{resource_title}.
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha creado una nota privada en <a href="%{resource_path}">%{resource_title}</a>. Puedes verla en el <a href="%{admin_proposal_info_path}">panel de administración</a>.
+            notification_title: <a href="%{author_path}">%{author_name}</a> ha creado una nota privada en <a href="%{resource_path}">%{resource_title}</a>. Puedes verla en el <a href="%{admin_proposal_info_path}">panel de administración</a>.
           proposal_note_mentioned:
-            email_intro: '"%{author_name}" "%{author_nickname}" te ha mencionado en una nota privada en "%{resource_title}". Puedes verla en el <a href="%{admin_proposal_info_url}">panel de administración</a>.'
+            email_intro: '"%{author_name}" te ha mencionado en una nota privada en "%{resource_title}". <a href="%{admin_proposal_info_url}">Puedes verla en el panel de administración</a>.'
             email_outro: Has recibido esta notificación porque se te ha mencionado en una nota privada.
             email_subject: Alguien dejó una nota en la propuesta %{resource_title}.
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> te ha mencionado en una nota privada en <a href="%{resource_path}">%{resource_title}</a>. Puedes verla en el <a href="%{admin_proposal_info_path}">panel de administración</a>.
+            notification_title: <a href="%{author_path}">%{author_name}</a> te ha mencionado en una nota privada en <a href="%{resource_path}">%{resource_title}</a>. <a href="%{admin_proposal_info_path}">Puedes verla en el panel de administración</a>.
           proposal_note_replied:
             email_intro: '%{author_name} ha respondido a tu nota privada en %{resource_title}. Puedes verlo en el <a href="%{admin_proposal_info_url}">panel de administración</a>.'
             email_outro: Has recibido esta notificación porque eres el autor de la nota privada.
             email_subject: "%{author_name} ha respondido a tu nota privada en %{resource_title}."
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha respondido a tu nota privada en <a href="%{resource_path}">%{resource_title}</a>. Puedes verlo en el <a href="%{admin_proposal_info_path}">panel de administración</a>.
+            notification_title: <a href="%{author_path}">%{author_name}</a> ha respondido a tu nota privada en <a href="%{resource_path}">%{resource_title}</a>. <a href="%{admin_proposal_info_path}">Puedes ver la respuesta desde el panel de administración</a>.
         coauthor_accepted_invite:
           notification_title: <a href="%{coauthor_path}">%{coauthor_name}</a> ha aceptado tu invitación para ser coautora de la propuesta "<a href="%{resource_path}">%{resource_title}</a>".
         coauthor_invited:
@@ -303,17 +303,17 @@ es:
           email_intro: '%{requester_name} ha sido aceptada para acceder como contribuidora del borrador colaborativo <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Has recibido esta notificación porque eres una contribuidora de <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} ha sido aceptada para acceder como contribuidora de %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> ha sido <strong>aceptada para acceder como contribuidora</strong> del borrador colaborativo <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: <a href="%{requester_path}">%{requester_name}</a> ha sido <strong>aceptada para acceder como contribuidora</strong> del borrador colaborativo <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_rejected:
           email_intro: 'Se ha denegado que %{requester_name} acceda como contribuidora del borrador colaborativo <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Has recibido esta notificación porque has contribuido en la propuesta "<a href="%{resource_url}">%{resource_title}</a>".
           email_subject: "%{requester_name} ha sido rechazado para acceder como contribuidora del borrador colaborativo %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> ha sido <strong>rechazado para acceder como contribuidora</strong> del borrador colaborativo <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: '<strong>Se ha rechazado que <a href="%{requester_path}">%{requester_name}</a> acceda como contribuidora del borrador colaborativo<strong>: <a href="%{resource_path}">%{resource_title}</a>.'
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} ha solicitado acceso como contribuidora. Puede <strong>aceptar o rechazar la solicitud</strong> de la página de borrador colaborativo de <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Has recibido esta notificación porque has contribuido en la propuesta "<a href="%{resource_url}">%{resource_title}</a>".
           email_subject: "%{requester_name} ha solicitado acceso para contribuir a %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> solicitó acceso para contribuir al borrador colaborativo <a href="%{resource_path}">%{resource_title}</a>. Por favor, <strong>acepta o rechaza la solicitud</strong>.
+          notification_title: <a href="%{requester_path}">%{requester_name}</a> ha solicitado acceso para contribuir al borrador colaborativo <a href="%{resource_path}">%{resource_title}</a>. <strong>Acepta o deniega la solicitud</strong>.
         collaborative_draft_access_requester_accepted:
           email_intro: Has sido aceptada para acceder como contribuidora del borrador colaborativo <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Has recibido esta notificación porque has solicitado contribuir en la propuesta "<a href="%{resource_url}">%{resource_title}</a>".
@@ -325,10 +325,10 @@ es:
           email_subject: Has sido rechazada como contribuidora de %{resource_title}.
           notification_title: Has sido <strong>rechazada como contribuidora</strong> del borrador colaborativo <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> ha retirado el borrador colaborativo <a href="%{resource_url}">%{resource_title}</a>.
+          email_intro: '<a href="%{author_url}">%{author_name}</a> ha retirado el borrador colaborativo: <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Has recibido esta notificación porque eres contribuidora de <a href="%{resource_url}">%{resource_title}</a>.
-          email_subject: "%{author_name} %{author_nickname} ha retirado el borrador colaborativo %{resource_title}."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>ha retirado</strong> el borrador colaborativo <a href="%{resource_path}">%{resource_title}</a>.
+          email_subject: "%{author_name} ha retirado el borrador colaborativo: %{resource_title}."
+          notification_title: '<a href="%{author_path}">%{author_name}</a> <strong>ha retirado el borrador colaborativo</strong>: <a href="%{resource_path}">%{resource_title}</a>.'
         creation_enabled:
           email_intro: '¡Ahora puedes crear nuevas propuestas en %{participatory_space_title}! Empieza a participar en esta página:'
           email_outro: Recibiste esta notificación porque estás siguiendo %{participatory_space_title}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
@@ -350,10 +350,10 @@ es:
           email_subject: La propuesta "%{resource_title}" se ha fusionado con otra
           notification_title: Una administradora ha fusionado la propouesta "<a href="%{resource_path}">%{resource_title}</a>" con otra.
         proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, a quien sigues, ha publicado una nueva propuesta llamada "%{resource_title}". Échale un vistazo y contribuye:'
-          email_outro: Recibiste esta notificación porque estás siguiendo a %{author_nickname}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-          email_subject: Nueva propuesta "%{resource_title}" de %{author_nickname}
-          notification_title: La propuesta <a href="%{resource_path}">%{resource_title}</a> ha sido publicada por <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+          email_intro: '%{author_name}, a quien sigues, ha publicado una nueva propuesta llamada: "%{resource_title}". Échale un vistazo y contribuye:'
+          email_outro: Has recibido esta notificación porque estás siguiendo la iniciativa %{author_name}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
+          email_subject: Nueva propuesta "%{resource_title}" de %{author_name}
+          notification_title: La propuesta <a href="%{resource_path}">%{resource_title}</a> fue publicada por <a href="%{author_path}">%{author_name} </a>.
         proposal_published_for_space:
           email_intro: La propuesta "%{resource_title}" se ha añadido en el espacio "%{participatory_space_title}", que estás siguiendo.
           email_outro: Recibiste esta notificación porque estás siguiendo el espacio "%{participatory_space_title}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
diff --git a/decidim-proposals/config/locales/eu.yml b/decidim-proposals/config/locales/eu.yml
index ca2a765ec7fd7..731483ede9d0e 100644
--- a/decidim-proposals/config/locales/eu.yml
+++ b/decidim-proposals/config/locales/eu.yml
@@ -276,17 +276,17 @@ eu:
             email_intro: '%{author_name} parte-hartzaileak ohar pribatu bat jarri du hemen: %{resources ce_title}. Ikusi hemen <a href="%{admin_proposal_info_url}">admin panelean</a>.'
             email_outro: Jakinarazpen hau jaso duzu proposamena ebaluatu ahal duzulako.
             email_subject: Norbaitek ohar bat utzi du %{resource_title} proposamenean.
-            notification_title: '<a href="%{author_path}">%{author_name} %{author_nickname}</a> parte-hartzaileak ohar pribatu bat sortu du hemen: <a href="%{resource_path}">%{resource_title}</a>. Ikusi hemen <a href="%{admin_proposal_info_path}"> admin. panelean</a>.'
+            notification_title: '%{author_name} parte-hartzaileak ohar pribatu bat jarri du hemen: %{resources ce_title}</a>. Egiaztatu hemen <a href="%{admin_proposal_info_url}">admin panelean</a>.'
           proposal_note_mentioned:
             email_intro: '"%{author_name}" "%{author_nickname}" parte-hartzaileak ohar pribatu batean aipatu zaitu hemen "%{resource_title}". Ikusi hemen <a href="%{admin_proposal_info_url}"> admin. panelean</a>.'
             email_outro: Jakinarazpen hau jaso duzu ohar pribatu batean aipatu zaituztelako.
             email_subject: Norbaitek aipatu zaitu ohar batean %{resource_title} proposamenean.
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> parte-hartzaileak ohar pribatu batean aipatu zaitu, hemen <a href="%{resource_path}">%{resource_title}</a>. Ikusi hemen <a href="%{admin_proposal_info_url}"> admin. panelean</a>.
+            notification_title: '"%{author_name}" "%{author_nickname}" parte-hartzaileak ohar pribatu batean aipatu zaitu hemen "%{resource_title}". Ikusi hemen <a href="%{admin_proposal_info_url}"> admin. panelean</a>.'
           proposal_note_replied:
             email_intro: '%{author_name} parte-hartzaileak zure ohar pribatua erantzun du hemen: %{resource_title}. Ikusi hemen <a href="%{admin_proposal_info_url}">admin panelean</a>.'
             email_outro: Jakinarazpen hau jaso duzu oharraren egilea zarelako.
             email_subject: "%{author_name} parte-hartzaileak zure ohar pribatua erantzun du hemen: %{resource_title}."
-            notification_title: '<a href="%{author_path}">%{author_name} %{author_nickname}</a> parte-hartzaileak zure ohar pribatua erantzun du hemen: <a href="%{resource_path}">%{resource_title}</a>. Ikusi hemen <a href="%{admin_proposal_info_path}">admin. panelean</a>.'
+            notification_title: '%{author_name} parte-hartzaileak ohar pribatu bat jarri du hemen: %{resources ce_title}</a>. Egiaztatu hemen <a href="%{admin_proposal_info_url}">admin panelean</a>.'
         coauthor_accepted_invite:
           notification_title: <a href="%{coauthor_path}">%{coauthor_name}</a> parte-hartzaileak onartu egin du zure gonbidapena <a href="%{resource_path}">%{resource_title}</a> proposamenaren egilekidea izateko.
         coauthor_invited:
@@ -303,12 +303,12 @@ eu:
           email_intro: '%{requester_name} onartu da <a href="%{resource_url}">%{resource_title}</a> zirriborro koloboratiboan laguntzaile gisa sartzeko.'
           email_outro: Jakinarazpen hau jaso duzu <a href="%{resource_url}">%{resource_title}</a>-ko kolaboratzailea zarelako.
           email_subject: "%{requester_name} onartu egin da %{resource_title}-an laguntzaile gisa sartezko."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a>kolaboratzaile <strong>gisa onartua izan da</strong> <a href="%{resource_path}">%{resource_title}</a> ziriborro kolaboratiboan.
+          notification_title: '%{requester_name} onartu da <a href="%{resource_url}">%{resource_title}</a> zirriborro koloboratiboan laguntzaile gisa sartzeko.'
         collaborative_draft_access_rejected:
           email_intro: '%{requester_name} baztertu egin da <a href="%{resource_url}">%{resource_title}</a>-an laguntzaile gisa sartzeko.'
           email_outro: Jakinarazpen hau jaso duzu<a href="%{resource_url}">%{resource_title}</a>-ko kolaboratzailea zarelako.
           email_subject: "%{requester_name} ez da onartu du kolaboratzaile gisa sartzeko %{resource_title} ziriborro kolaboratiboan."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a>baztertu egin da < <a href="%{resource_path}">%{resource_title}</a> ziriborro kolaboratiboan.
+          notification_title: '%{requester_name} onartu da <a href="%{resource_url}">%{resource_title}</a> zirriborro koloboratiboan laguntzaile gisa sartzeko.'
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} -k eskatu du laguntzaile gisa sartzeko. <strong>onartu edo baztertu egin dezakezu </strong> <a href="%{resource_url}">%{resource_title}</a> testu kolaboratibo ziriborroan.'
           email_outro: Jakinarazpen hau jaso duzu <a href="%{resource_url}">%{resource_title}</a>-ko kolaboratzailea zarelako.
@@ -325,10 +325,10 @@ eu:
           email_subject: Baztertu egin zaituzte laguntzaile gisa hemen %{resource_title}.
           notification_title: '<strong>Baztertu egin zaituzte, kolaboratzaile gisa, hemen sartzeko: </strong> <a href="%{resource_path}">%{resource_title}</a>.'
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a>-k kendu du <a href="%{resource_url}">%{resource_title}</a> testu kolaboraboaren zirriborroa.
+          email_intro: <a href="%{author_path}">%{author_name}</a> egileak kendu du <a href="%{resource_path}">%{resource_title}</a> zirriborro kolaboratiboa.
           email_outro: Jakinarazpen hau jaso duzu <a href="%{resource_url}">%{resource_title}</a> ko kolaboratzailea zarelako.
-          email_subject: "%{author_name} %{author_nickname} egileak %{resource_title} zirriborroa kendu du."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname} egileak</a> kendu du <a href="%{resource_path}">%{resource_title}</strong> zirriborro kolaboratiboa.
+          email_subject: "%{author_name} egileak %{resource_title} zirriborroa kendu du."
+          notification_title: <a href="%{author_path}">%{author_name}</a> egileak kendu du <a href="%{resource_path}">%{resource_title}</a> zirriborro kolaboratiboa.
         creation_enabled:
           email_intro: 'Orain %{participatory_space_title} proposamen berriak sor ditzakezu! Hasi parte hartzen orri honetan:'
           email_outro: Jakinarazpen hau jaso duzu %{participatory_space_title} jarraitzen ari zarelako. Jakinarazpenak jasotzeari utzi ahal diozu aurreko estekan.
@@ -350,10 +350,10 @@ eu:
           email_subject: '%{resource_title} proposamena beste batekin batu da'
           notification_title: Administratzaile batek <a href="%{resource_path}">%{resource_title}</a> proposamena beste batekin batu du.
         proposal_published:
-          email_intro: 'Jarraitzen ari zaren %{author_name} %{author_nickname} parte-hartzaileak beste proposamen bat argitaratu du, "%{resource_title}" izenekoa. Begiratu eta lagundu hobetzen:'
-          email_outro: Jakinarazpen hau jaso duzu %{author_nickname} jarraitzen duzulako. Aurreko estekan jakinarazpenak jasotzeari utzi ahal diozu.
-          email_subject: '%{author_nickname} parte-hartzaileak proposamen berria egin du: "%{resource_title}"'
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> parte-hartzaileak <a href="%{resource_path}">%{resource_title}</a> proposamena argitaratu du.
+          email_intro: '%{author_name} egileak, jarraitzen ari zarenak,"%{resource_title}" izeneko proposamena argitaratu du. Begiratu eta lagundu hobetzen:'
+          email_outro: Jakinarazpen hau jaso duzu %{author_name} jarraitzen ari zarelako. Aurreko estekan jarraitzeari utzi ahal diozu.
+          email_subject: '%{author_name} parte-hartzaileak proposamen berria egin du: "%{resource_title}"'
+          notification_title: <a href="%{resource_path}">%{resource_title}</a> proposamena <a href="%{author_path}">%{author_name}</a> parte-hartzaileak argitaratu zuen.
         proposal_published_for_space:
           email_intro: '"%{resource_title}" proposamena jarraizten ari zaren ondorengo "%{participatory_space_title}" espazioan erantsi zaizu.'
           email_outro: Jakinarazpen hau jaso duzu "%{participatory_space_title}" jarraitzen ari zarelako. Jarraitzeari uzti ahal diozu aurreko estekan.
diff --git a/decidim-proposals/config/locales/fi-plain.yml b/decidim-proposals/config/locales/fi-plain.yml
index fa42762589fdc..da149bdfb1e77 100644
--- a/decidim-proposals/config/locales/fi-plain.yml
+++ b/decidim-proposals/config/locales/fi-plain.yml
@@ -276,17 +276,17 @@ fi-pl:
             email_intro: '%{author_name} on luonut yksityisen muistiinpanon kohteeseen %{resource_title}. Tarkasta muistiinpano <a href="%{admin_proposal_info_path}">hallintapaneelin</a> kautta.'
             email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet ehdotuksen arvioija.
             email_subject: Joku on jättänyt huomion ehdotukseen %{resource_title}.
-            notification_title: <a href="%{author_path}">%{author_name}</a> on luonut yksityisen muistiinpanon kohteeseen <a href="%{resource_path}">%{resource_title}</a>. Tarkasta muistiinpano <a href="%{admin_proposal_info_path}">hallintapaneelin</a> kautta.
+            notification_title: <a href="%{author_path}">%{author_name}</a> loi yksityisen muistiinpanon kohteeseen <a href="%{resource_path}">%{resource_title}</a>. Tarkasta muistiinpano <a href="%{admin_proposal_info_path}">hallintapaneelin</a> kautta.
           proposal_note_mentioned:
-            email_intro: Sinut on mainittu yksityisessä muistiinpanossa "%{resource_title}" henkilön "%{author_name}" "%{author_nickname}" toimesta. Tarkista muistiinpano <a href="%{admin_proposal_info_url}">hallintapaneelin</a> kautta.
+            email_intro: '"%{author_name}" mainitsi sinut yksityisessä muistiinpanossa "%{resource_title}". Tarkista muistiinpano <a href="%{admin_proposal_info_url}">hallintapaneelin</a> kautta.'
             email_outro: Tämä ilmoitus on lähetetty sinulle, koska sinut on mainittu yksityisessä muistiinpanossa.
             email_subject: Sinut on mainittu ehdotuksen %{resource_title} muistiinpanossa.
-            notification_title: Sinut on mainittu yksityisessä muistiinpanossa <a href="%{resource_path}">%{resource_title}</a> henkilön <a href="%{author_path}">%{author_name} %{author_nickname}</a> toimesta. Tarkista se <a href="%{admin_proposal_info_path}">hallintapaneelin</a> kautta.
+            notification_title: <a href="%{author_path}">%{author_name}</a> mainitsi sinut yksityisessä muistiinpanossa <a href="%{resource_path}">%{resource_title}</a>. Tarkista muistiinpano <a href="%{admin_proposal_info_path}">hallintapaneelin</a> kautta.
           proposal_note_replied:
             email_intro: '%{author_name} on vastannut yksityiseen muistiinpanoon kohteessa %{resource_title}. Tarkasta muistiinpano <a href="%{admin_proposal_info_url}">hallintapaneelin</a> kautta.'
             email_outro: Sait tämän ilmoituksen, koska olet muistiinpanon laatija.
             email_subject: "%{author_name} on vastannut yksityiseen muistiinpanoon kohteessa %{resource_title}."
-            notification_title: <a href="%{author_path}">%{author_name}%{author_nickname}</a> on vastannut yksityiseen muistiinpanoosi kohteessa <a href="%{resource_path}">%{resource_title}</a>. Tarkasta muistiinpano <a href="%{admin_proposal_info_path}">hallintapaneelin</a> kautta.
+            notification_title: <a href="%{author_path}">%{author_name}</a> vastasi yksityiseen muistiinpanoon kohteessa <a href="%{resource_path}">%{resource_title}</a>. Tarkasta muistiinpano <a href="%{admin_proposal_info_path}">hallintapaneelin</a> kautta.
         coauthor_accepted_invite:
           notification_title: <a href="%{coauthor_path}">%{coauthor_name}</a> on hyväksynyt kutsusi ehdotuksen <a href="%{resource_path}">%{resource_title}</a> laatijaksi.
         coauthor_invited:
@@ -303,17 +303,17 @@ fi-pl:
           email_intro: '%{requester_name} on hyväksytty osallistujaksi yhteistyöluonnokseen <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet osallistujana kohteessa <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} on hyväksytty osallistujaksi kohtaan %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> on <strong>hyväksytty osallistujaksi</strong> yheistyöluonnokseen <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: <a href="%{requester_path}">%{requester_name}</a> <strong>hyväksyttiin osallistujaksi</strong> yheistyöluonnokseen <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_rejected:
           email_intro: 'Käyttäjän %{requester_name} pyyntö päästä yhteistyöluonnoksen <a href="%{resource_url}">%{resource_title}</a> osallistujaksi on hylätty.'
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet osallistujana kohteessa <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} on hylätty, jotta hän voi osallistua %{resource_title} yhteistyöhankkeeseen."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> <strong>avustajaoikeudet on hylätty</strong> yhteistyöluonnoksesta <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: <a href="%{requester_path}">%{requester_name}</a> <strong>pyyntö liittyä osallistujaksi hylättiin</strong> yhteistyöluonnokselle <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} pyysi pääsyä osallistujaksi. Voit <strong>hyväksyä tai hylätä pyynnön</strong> yhteistyöluonnoksen <a href="%{resource_url}">%{resource_title}</a> sivulta.'
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet osallistujana kohteessa <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} pyysi osallistumisoikeutta kohteeseen %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> pyysi saada osallistua yhteistyöluonnokseen<a href="%{resource_path}">%{resource_title}</a>. <strong>Hyväksy tai hylkää pyyntö</strong>.
+          notification_title: <a href="%{requester_path}">%{requester_name}</a> pyysi päästä osallistujaksi yhteistyöluonnokseen <a href="%{resource_path}">%{resource_title}</a>. <strong>Hyväksy tai hylkää pyyntö</strong>.
         collaborative_draft_access_requester_accepted:
           email_intro: Sinut on hyväksytty osallistujaksi yhteistyöluonnokseen <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet pyytänyt pääsyä osallistujaksi yhteistyöluonnokseen <a href="%{resource_url}">%{resource_title}</a>.
@@ -325,10 +325,10 @@ fi-pl:
           email_subject: Sinua ei ole hyväksytty osallistujaksi yhteistyöluonnokseen %{resource_title}.
           notification_title: Sinua <strong>ei ole hyväksytty osallistujaksi</strong> yhteistyöluonnokseen <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> perui yhteistyöluonnoksen <a href="%{resource_url}">%{resource_title}</a>.
+          email_intro: <a href="%{author_url}">%{author_name}</a> perui yhteistyöluonnoksen <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet osallistujana kohteessa <a href="%{resource_url}">%{resource_title}</a>.
-          email_subject: "%{author_name} %{author_nickname} perunut yhteistyöluonnoksen %{resource_title}."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>perunut</strong>yhteistyöluonnoksen <a href="%{resource_path}">%{resource_title}</a>.
+          email_subject: "%{author_name} perui yhteistyöluonnoksen %{resource_title}."
+          notification_title: <a href="%{author_path}">%{author_name}</a> <strong>perui</strong> yhteistyöluonnoksen <a href="%{resource_path}">%{resource_title}</strong>.
         creation_enabled:
           email_intro: 'Voit nyt luoda uusia ehdotuksia kohteessa %{participatory_space_title}! Aloita osallistuminen tällä sivulla:'
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta %{participatory_space_title}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
@@ -350,10 +350,10 @@ fi-pl:
           email_subject: Ehdotus %{resource_title} on yhdistetty
           notification_title: Hallintakäyttäjä on yhdistänyt ehdotuksen <a href="%{resource_path}">%{resource_title}</a>.
         proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, jota seuraat, on julkaissut uuden ehdotuksen "%{resource_title}". Tutustu ehdotukseen ja osallistu:'
-          email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat %{author_nickname}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
-          email_subject: Uusi ehdotus "%{resource_title}", jonka on luonut %{author_nickname}
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> ehdotus julkaistiin tekijän <a href="%{author_path}">%{author_name} %{author_nickname}</a> toimesta.
+          email_intro: 'Seuraamasi osallistuja %{author_name} on julkaissut uuden ehdotuksen "%{resource_title}". Tutustu ehdotukseen ja osallistu:'
+          email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet seuraat käyttäjää %{author_name}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
+          email_subject: Uusi ehdotus "%{resource_title}" osallistujalta %{author_name}
+          notification_title: Osallistuja <a href="%{author_path}">%{author_name} </a> julkaisi uuden ehdotuksen <a href="%{resource_path}">%{resource_title}</a>.
         proposal_published_for_space:
           email_intro: Ehdotus "%{resource_title}", jota seuraat, on lisätty kohteeseen "%{participatory_space_title}".
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta "%{participatory_space_title}". Voit lopettaa seuraamisen edellä esitetyn linkin kautta.
diff --git a/decidim-proposals/config/locales/fi.yml b/decidim-proposals/config/locales/fi.yml
index 79f01b92b12fa..d5cdbd27a7fa2 100644
--- a/decidim-proposals/config/locales/fi.yml
+++ b/decidim-proposals/config/locales/fi.yml
@@ -276,17 +276,17 @@ fi:
             email_intro: '%{author_name} on luonut yksityisen muistiinpanon kohteeseen %{resource_title}. Tarkasta muistiinpano <a href="%{admin_proposal_info_path}">hallintapaneelin</a> kautta.'
             email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet ehdotuksen arvioija.
             email_subject: Joku on jättänyt huomion ehdotukseen %{resource_title}.
-            notification_title: <a href="%{author_path}">%{author_name}</a> on luonut yksityisen muistiinpanon kohteeseen <a href="%{resource_path}">%{resource_title}</a>. Tarkasta muistiinpano <a href="%{admin_proposal_info_path}">hallintapaneelin</a> kautta.
+            notification_title: <a href="%{author_path}">%{author_name}</a> loi yksityisen muistiinpanon kohteeseen <a href="%{resource_path}">%{resource_title}</a>. Tarkasta muistiinpano <a href="%{admin_proposal_info_path}">hallintapaneelin</a> kautta.
           proposal_note_mentioned:
-            email_intro: Sinut on mainittu yksityisessä muistiinpanossa "%{resource_title}" henkilön "%{author_name}" "%{author_nickname}" toimesta. Tarkista muistiinpano <a href="%{admin_proposal_info_url}">hallintapaneelin</a> kautta.
+            email_intro: '"%{author_name}" mainitsi sinut yksityisessä muistiinpanossa "%{resource_title}". Tarkista muistiinpano <a href="%{admin_proposal_info_url}">hallintapaneelin</a> kautta.'
             email_outro: Tämä ilmoitus on lähetetty sinulle, koska sinut on mainittu yksityisessä muistiinpanossa.
             email_subject: Sinut on mainittu ehdotuksen %{resource_title} muistiinpanossa.
-            notification_title: Sinut on mainittu yksityisessä muistiinpanossa <a href="%{resource_path}">%{resource_title}</a> henkilön <a href="%{author_path}">%{author_name} %{author_nickname}</a> toimesta. Tarkista se <a href="%{admin_proposal_info_path}">hallintapaneelin</a> kautta.
+            notification_title: <a href="%{author_path}">%{author_name}</a> mainitsi sinut yksityisessä muistiinpanossa <a href="%{resource_path}">%{resource_title}</a>. Tarkista muistiinpano <a href="%{admin_proposal_info_path}">hallintapaneelin</a> kautta.
           proposal_note_replied:
             email_intro: '%{author_name} on vastannut yksityiseen muistiinpanoon kohteessa %{resource_title}. Tarkasta muistiinpano <a href="%{admin_proposal_info_url}">hallintapaneelin</a> kautta.'
             email_outro: Sait tämän ilmoituksen, koska olet muistiinpanon laatija.
             email_subject: "%{author_name} on vastannut yksityiseen muistiinpanoon kohteessa %{resource_title}."
-            notification_title: <a href="%{author_path}">%{author_name}%{author_nickname}</a> on vastannut yksityiseen muistiinpanoosi kohteessa <a href="%{resource_path}">%{resource_title}</a>. Tarkasta muistiinpano <a href="%{admin_proposal_info_path}">hallintapaneelin</a> kautta.
+            notification_title: <a href="%{author_path}">%{author_name}</a> vastasi yksityiseen muistiinpanoon kohteessa <a href="%{resource_path}">%{resource_title}</a>. Tarkasta muistiinpano <a href="%{admin_proposal_info_path}">hallintapaneelin</a> kautta.
         coauthor_accepted_invite:
           notification_title: <a href="%{coauthor_path}">%{coauthor_name}</a> on hyväksynyt kutsusi ehdotuksen <a href="%{resource_path}">%{resource_title}</a> laatijaksi.
         coauthor_invited:
@@ -303,17 +303,17 @@ fi:
           email_intro: '%{requester_name} on hyväksytty osallistujaksi yhteistyöluonnokseen <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet osallistujana kohteessa <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} on hyväksytty osallistujaksi kohtaan %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> on <strong>hyväksytty osallistujaksi</strong> yheistyöluonnokseen <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: <a href="%{requester_path}">%{requester_name}</a> <strong>hyväksyttiin osallistujaksi</strong> yheistyöluonnokseen <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_rejected:
           email_intro: 'Käyttäjän %{requester_name} pyyntö päästä yhteistyöluonnoksen <a href="%{resource_url}">%{resource_title}</a> osallistujaksi on hylätty.'
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet osallistujana kohteessa <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} on hylätty, jotta hän voi osallistua %{resource_title} yhteistyöhankkeeseen."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> <strong>avustajaoikeudet on hylätty</strong> yhteistyöluonnoksesta <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: <a href="%{requester_path}">%{requester_name}</a> <strong>pyyntö liittyä osallistujaksi hylättiin</strong> yhteistyöluonnokselle <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} pyysi pääsyä osallistujaksi. Voit <strong>hyväksyä tai hylätä pyynnön</strong> yhteistyöluonnoksen <a href="%{resource_url}">%{resource_title}</a> sivulta.'
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet osallistujana kohteessa <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} pyysi osallistumisoikeutta kohteeseen %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> pyysi saada osallistua yhteistyöluonnokseen<a href="%{resource_path}">%{resource_title}</a>. <strong>Hyväksy tai hylkää pyyntö</strong>.
+          notification_title: <a href="%{requester_path}">%{requester_name}</a> pyysi päästä osallistujaksi yhteistyöluonnokseen <a href="%{resource_path}">%{resource_title}</a>. <strong>Hyväksy tai hylkää pyyntö</strong>.
         collaborative_draft_access_requester_accepted:
           email_intro: Sinut on hyväksytty osallistujaksi yhteistyöluonnokseen <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet pyytänyt pääsyä osallistujaksi yhteistyöluonnokseen <a href="%{resource_url}">%{resource_title}</a>.
@@ -325,10 +325,10 @@ fi:
           email_subject: Sinua ei ole hyväksytty osallistujaksi yhteistyöluonnokseen %{resource_title}.
           notification_title: Sinua <strong>ei ole hyväksytty osallistujaksi</strong> yhteistyöluonnokseen <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> perui yhteistyöluonnoksen <a href="%{resource_url}">%{resource_title}</a>.
+          email_intro: <a href="%{author_url}">%{author_name}</a> perui yhteistyöluonnoksen <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet osallistujana kohteessa <a href="%{resource_url}">%{resource_title}</a>.
-          email_subject: "%{author_name} %{author_nickname} perunut yhteistyöluonnoksen %{resource_title}."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>perunut</strong>yhteistyöluonnoksen <a href="%{resource_path}">%{resource_title}</a>.
+          email_subject: "%{author_name} perui yhteistyöluonnoksen %{resource_title}."
+          notification_title: <a href="%{author_path}">%{author_name}</a> <strong>perui</strong> yhteistyöluonnoksen <a href="%{resource_path}">%{resource_title}</a>.
         creation_enabled:
           email_intro: 'Voit nyt luoda uusia ehdotuksia osallistumistilassa %{participatory_space_title}! Aloita osallistuminen sivulta:'
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta %{participatory_space_title}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
@@ -350,10 +350,10 @@ fi:
           email_subject: Ehdotus %{resource_title} on yhdistetty
           notification_title: Hallintakäyttäjä on yhdistänyt ehdotuksen <a href="%{resource_path}">%{resource_title}</a>.
         proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, jota seuraat, on julkaissut uuden ehdotuksen "%{resource_title}". Tutustu ehdotukseen ja osallistu:'
-          email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat %{author_nickname}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
-          email_subject: Uusi ehdotus "%{resource_title}", jonka on luonut %{author_nickname}
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> ehdotus julkaistiin tekijän <a href="%{author_path}">%{author_name} %{author_nickname}</a> toimesta.
+          email_intro: 'Seuraamasi osallistuja %{author_name} on julkaissut uuden ehdotuksen "%{resource_title}". Tutustu ehdotukseen ja osallistu:'
+          email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet seuraat käyttäjää %{author_name}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
+          email_subject: Uusi ehdotus "%{resource_title}" osallistujalta %{author_name}
+          notification_title: Osallistuja <a href="%{author_path}">%{author_name} </a> julkaisi uuden ehdotuksen <a href="%{resource_path}">%{resource_title}</a>.
         proposal_published_for_space:
           email_intro: Ehdotus "%{resource_title}", jota seuraat, on lisätty kohteeseen "%{participatory_space_title}".
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta "%{participatory_space_title}". Voit lopettaa seuraamisen edellä esitetyn linkin kautta.
diff --git a/decidim-proposals/config/locales/fr-CA.yml b/decidim-proposals/config/locales/fr-CA.yml
index 01c52442befca..debf80a39f3f7 100644
--- a/decidim-proposals/config/locales/fr-CA.yml
+++ b/decidim-proposals/config/locales/fr-CA.yml
@@ -273,17 +273,13 @@ fr-CA:
             email_intro: '%{author_name} a créé une note privée dans %{resource_title}. Consultez-la sur <a href="%{admin_proposal_info_url}">le panneau d''administration</a>.'
             email_outro: Vous avez reçu cette notification parce que vous pouvez évaluer la proposition.
             email_subject: Quelqu'un a laissé une note sur la proposition %{resource_title}.
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> a créé une note privée dans <a href="%{resource_path}">%{resource_title}</a>. Consultez-la sur <a href="%{admin_proposal_info_path}">le panneau d'administration</a>.
           proposal_note_mentioned:
-            email_intro: Vous avez été mentionné(e) dans une note privée dans «%{resource_title}» par «%{author_name}» «%{author_nickname}». Jetez-y un coup d'œil dans <a href="%{admin_proposal_info_url}">le panneau d'administration</a>.
             email_outro: Vous avez reçu cette notification parce que vous avez été mentionné(e) dans une note privée.
             email_subject: Quelqu'un vous a mentionné(e) dans une note sur la proposition %{resource_title}.
-            notification_title: Vous avez été mentionné(e) dans une note privée dans <a href="%{resource_path}">%{resource_title}</a> par <a href="%{author_path}">%{author_name} %{author_nickname}</a>. Jetez-y un coup d'œil dans <a href="%{admin_proposal_info_path}">le panneau d'administration</a>.
           proposal_note_replied:
             email_intro: '%{author_name} a répondu à votre note privée dans %{resource_title}. Consultez-la sur <a href="%{admin_proposal_info_url}">le panneau d''administration</a>.'
             email_outro: Vous avez reçu cette notification parce que vous êtes l'auteur/autrice de la note.
             email_subject: "%{author_name} a répondu à votre note privée dans %{resource_title}."
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> a répondu à votre note privée dans <a href="%{resource_path}">%{resource_title}</a>. Consultez-la sur <a href="%{admin_proposal_info_path}">le panneau d'administration</a>.
         coauthor_accepted_invite:
           notification_title: <a href="%{coauthor_path}">%{coauthor_name}</a> a accepté votre invitation à devenir co-auteur de la proposition <a href="%{resource_path}">%{resource_title}</a>.
         coauthor_invited:
@@ -300,17 +296,14 @@ fr-CA:
           email_intro: '%{requester_name} a été accepté en tant que contributeur du brouillon collaboratif <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Vous avez reçu cette notification car vous êtes collaborateur de <a href="%{resource_url}">%{resource_title}</a>. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
           email_subject: "%{requester_name} a été accepté pour accéder en tant que contributeur du %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> a été <strong>admis à l' accès en tant que contributeur</strong> du <a href="%{resource_path}">%{resource_title}</a> projet de collaboration.
         collaborative_draft_access_rejected:
           email_intro: '%{requester_name} a été refusé d''accès en tant que contributeur du brouillpn collaboratif <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Vous avez reçu cette notification car vous êtes collaborateur de <a href="%{resource_url}">%{resource_title}</a>. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
           email_subject: "%{requester_name} a été rejetée pour accéder en tant que contributeur du %{resource_title} projet de collaboration."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> a été <strong>rejeté pour accéder en tant que contributeur</strong> du <a href="%{resource_path}">%{resource_title}</a> projet de collaboration.
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} a demandé à contribuer au brouillon. Vous pouvez <strong>accepter ou rejeter la demande</strong> depuis la page du brouillon collaboratif <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Vous avez reçu cette notification car vous êtes collaborateur de <a href="%{resource_url}">%{resource_title}</a>. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
           email_subject: "%{requester_name} demandé un accès pour contribuer à %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> demandé un accès pour contribuer au projet de collaboration <a href="%{resource_path}">%{resource_title}</a> . S'il vous plaît <strong>accepter ou rejeter la demande</strong>.
         collaborative_draft_access_requester_accepted:
           email_intro: Vous avez été accepté pour accéder en tant que contributeur du brouillon collaboratif <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Vous avez reçu cette notification car vous avez demandé à devenir contributeur de <a href="%{resource_url}">%{resource_title}</a>. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
@@ -322,10 +315,7 @@ fr-CA:
           email_subject: Vous avez été rejeté en tant que contributeur de %{resource_title}.
           notification_title: Vous avez été <strong>rejeté pour accéder en tant que contributeur</strong> du <a href="%{resource_path}">%{resource_title}</a> projet de collaboration.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> a retiré le brouillon collaboratif <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Vous avez reçu cette notification car vous êtes collaborateur de <a href="%{resource_url}">%{resource_title}</a>. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
-          email_subject: "%{author_name} %{author_nickname} retiré le %{resource_title} projet de collaboration."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>retiré</strong> le <a href="%{resource_path}">%{resource_title}</a> projet de collaboration.
         creation_enabled:
           email_intro: 'Vous pouvez maintenant créer de nouvelles propositions dans %{participatory_space_title} ! Commencez à participer sur cette page :'
           email_outro: Vous avez reçu cette notification car vous suivez %{participatory_space_title}. Vous pouvez arrêter de recevoir des notifications en cliquant sur le lien précédent.
@@ -345,10 +335,7 @@ fr-CA:
           email_subject: La proposition %{resource_title} a été fusionnée
           notification_title: La proposition <a href="%{resource_path}">%{resource_title}</a> a été fusionnée par un administrateur.
         proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, que vous suivez, a publié une nouvelle proposition appelée "%{resource_title}". Découvrez-le et contribuez:'
-          email_outro: Vous avez reçu cette notification car vous suivez %{author_nickname}. Vous pouvez cesser de recevoir des notifications en suivant le lien précédent.
-          email_subject: Nouvelle proposition "%{resource_title}" par %{author_nickname}
-          notification_title: La proposition <a href="%{resource_path}">%{resource_title}</a> a été publiée par <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+          email_subject: Nouvelle proposition "%{resource_title}" par %{author_name}
         proposal_published_for_space:
           email_intro: La proposition "%{resource_title}" a été publiée dans "%{participatory_space_title}" que vous suivez.
           email_outro: Vous avez reçu cette notification parce que vous suivez "%{participatory_space_title}". Vous pouvez cesser de le suivre en cliquant sur le lien précédent.
diff --git a/decidim-proposals/config/locales/fr.yml b/decidim-proposals/config/locales/fr.yml
index b48e152ef7e18..318bfae60aa09 100644
--- a/decidim-proposals/config/locales/fr.yml
+++ b/decidim-proposals/config/locales/fr.yml
@@ -273,17 +273,13 @@ fr:
             email_intro: '%{author_name} a créé une note privée dans %{resource_title}. Consultez-la sur <a href="%{admin_proposal_info_url}">le panneau d''administration</a>.'
             email_outro: Vous avez reçu cette notification parce que vous pouvez évaluer la proposition.
             email_subject: Quelqu'un a laissé une note sur la proposition %{resource_title}.
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> a créé une note privée dans <a href="%{resource_path}">%{resource_title}</a>. Consultez-la sur <a href="%{admin_proposal_info_path}">le panneau d'administration</a>.
           proposal_note_mentioned:
-            email_intro: Vous avez été mentionné(e) dans une note privée dans «%{resource_title}» par «%{author_name}» «%{author_nickname}». Jetez-y un coup d'œil dans <a href="%{admin_proposal_info_url}">le panneau d'administration</a>.
             email_outro: Vous avez reçu cette notification parce que vous avez été mentionné(e) dans une note privée.
             email_subject: Quelqu'un vous a mentionné(e) dans une note sur la proposition %{resource_title}.
-            notification_title: Vous avez été mentionné(e) dans une note privée dans <a href="%{resource_path}">%{resource_title}</a> par <a href="%{author_path}">%{author_name} %{author_nickname}</a>. Jetez-y un coup d'œil dans <a href="%{admin_proposal_info_path}">le panneau d'administration</a>.
           proposal_note_replied:
             email_intro: '%{author_name} a répondu à votre note privée dans %{resource_title}. Consultez-la sur <a href="%{admin_proposal_info_url}">le panneau d''administration</a>.'
             email_outro: Vous avez reçu cette notification parce que vous êtes l'auteur/autrice de la note.
             email_subject: "%{author_name} a répondu à votre note privée dans %{resource_title}."
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> a répondu à votre note privée dans <a href="%{resource_path}">%{resource_title}</a>. Consultez-la sur <a href="%{admin_proposal_info_path}">le panneau d'administration</a>.
         coauthor_accepted_invite:
           notification_title: <a href="%{coauthor_path}">%{coauthor_name}</a> a accepté votre invitation à devenir co-auteur de la proposition <a href="%{resource_path}">%{resource_title}</a>.
         coauthor_invited:
@@ -300,17 +296,14 @@ fr:
           email_intro: '%{requester_name} a été accepté en tant que contributeur du brouillon collaboratif <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Vous avez reçu cette notification car vous êtes collaborateur de <a href="%{resource_url}">%{resource_title}</a>. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
           email_subject: "%{requester_name} a été accepté pour accéder en tant que contributeur du %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> a été <strong>admis à l' accès en tant que contributeur</strong> du <a href="%{resource_path}">%{resource_title}</a> projet de collaboration.
         collaborative_draft_access_rejected:
           email_intro: '%{requester_name} a été refusé d''accès en tant que contributeur du brouillpn collaboratif <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Vous avez reçu cette notification car vous êtes collaborateur de <a href="%{resource_url}">%{resource_title}</a>. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
           email_subject: "%{requester_name} a été rejetée pour accéder en tant que contributeur du %{resource_title} projet de collaboration."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> a été <strong>rejeté pour accéder en tant que contributeur</strong> du <a href="%{resource_path}">%{resource_title}</a> projet de collaboration.
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} a demandé à contribuer au brouillon. Vous pouvez <strong>accepter ou rejeter la demande</strong> depuis la page du brouillon collaboratif <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Vous avez reçu cette notification car vous êtes collaborateur de <a href="%{resource_url}">%{resource_title}</a>. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
           email_subject: "%{requester_name} demandé un accès pour contribuer à %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> demandé un accès pour contribuer au projet de collaboration <a href="%{resource_path}">%{resource_title}</a> . S'il vous plaît <strong>accepter ou rejeter la demande</strong>.
         collaborative_draft_access_requester_accepted:
           email_intro: Vous avez été accepté pour accéder en tant que contributeur du brouillon collaboratif <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Vous avez reçu cette notification car vous avez demandé à devenir contributeur de <a href="%{resource_url}">%{resource_title}</a>. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
@@ -322,10 +315,7 @@ fr:
           email_subject: Vous avez été rejeté en tant que contributeur de %{resource_title}.
           notification_title: Vous avez été <strong>rejeté pour accéder en tant que contributeur</strong> du <a href="%{resource_path}">%{resource_title}</a> projet de collaboration.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> a retiré le brouillon collaboratif <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Vous avez reçu cette notification car vous êtes collaborateur de <a href="%{resource_url}">%{resource_title}</a>. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
-          email_subject: "%{author_name} %{author_nickname} retiré le %{resource_title} projet de collaboration."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>retiré</strong> le <a href="%{resource_path}">%{resource_title}</a> projet de collaboration.
         creation_enabled:
           email_intro: 'Vous pouvez maintenant créer de nouvelles propositions dans %{participatory_space_title} ! Commencez à participer sur cette page :'
           email_outro: Vous avez reçu cette notification car vous suivez %{participatory_space_title}. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
@@ -345,10 +335,7 @@ fr:
           email_subject: La proposition %{resource_title} a été fusionnée
           notification_title: La proposition <a href="%{resource_path}">%{resource_title}</a> a été fusionnée par un administrateur.
         proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, que vous suivez, a publié une nouvelle proposition appelée "%{resource_title}". Découvrez-le et contribuez:'
-          email_outro: Vous avez reçu cette notification car vous suivez %{author_nickname}. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
-          email_subject: Nouvelle proposition "%{resource_title}" par %{author_nickname}
-          notification_title: La proposition <a href="%{resource_path}">%{resource_title}</a> a été publiée par <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+          email_subject: Nouvelle proposition "%{resource_title}" par %{author_name}
         proposal_published_for_space:
           email_intro: La proposition "%{resource_title}" a été publiée dans "%{participatory_space_title}" que vous suivez.
           email_outro: Vous avez reçu cette notification parce que vous suivez "%{participatory_space_title}". Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
diff --git a/decidim-proposals/config/locales/gl.yml b/decidim-proposals/config/locales/gl.yml
index fdfa9e1b71c1a..37c4f3c26afac 100644
--- a/decidim-proposals/config/locales/gl.yml
+++ b/decidim-proposals/config/locales/gl.yml
@@ -131,22 +131,16 @@ gl:
             accept: Aceptar
         collaborative_draft_access_accepted:
           email_subject: "%{requester_name} foi aceptado para acceder como colaborador do %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> foi aceptado <strong>para acceder como contribuínte</strong> do borrador colaborativo de <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_rejected:
           email_subject: "%{requester_name} foi rexeitado para acceder como colaborador do %{resource_title} borrador colaborativo."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> foi rexeitado <strong>para acceder como contribuínte</strong> do borrador colaborativo de <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requested:
           email_subject: "%{requester_name} solicitou acceso para contribuír a %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> solicitou acceso para contribuír ao proxecto colaborativo de <a href="%{resource_path}">%{resource_title}</a> . <strong>acepta ou rexeita a solicitude</strong>.
         collaborative_draft_access_requester_accepted:
           email_subject: Recibiches como colaborador de %{resource_title}.
           notification_title: Recibiches <strong>para acceder como colaborador</strong> do borrador colaborativo <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requester_rejected:
           email_subject: Foi rexeitado como colaborador de %{resource_title}.
           notification_title: Quedaches <strong>rexeitado a acceder como colaborador</strong> do borrador colaborativo <a href="%{resource_path}">%{resource_title}</a>.
-        collaborative_draft_withdrawn:
-          email_subject: "%{author_name} %{author_nickname} retirouse o %{resource_title} borrador colaborativo."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>retirado</strong> o <a href="%{resource_path}">%{resource_title}</a> borrador de colaboración.
         creation_enabled:
           email_intro: 'Agora podes crear novas propostas en %{participatory_space_title}. Comezar a participar nesta páxina:'
           email_outro: Recibiches esta notificación porque estás seguindo %{participatory_space_title}. Podes deixar de recibir notificacións seguindo a ligazón anterior.
@@ -155,11 +149,6 @@ gl:
           email_outro: Recibiches esta notificación porque es un autor de "%{resource_title}".
           email_subject: Enviouse a súa proposta "%{mentioned_proposal_title}"
           notification_title: A túa proposta "%{mentioned_proposal_title}" foi mencionada <a href="%{resource_path}">neste espazo</a> nos comentarios.
-        proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, quen está seguindo, publicou unha nova proposta chamada "%{resource_title}". Consulte e contribúa:'
-          email_outro: Recibiches esta notificación porque estás seguindo %{author_nickname}. Podes deixar de recibir notificacións seguindo a ligazón anterior.
-          email_subject: Nova proposta "%{resource_title}" por %{author_nickname}
-          notification_title: A <a href="%{resource_path}">%{resource_title}</a> proposta foi publicada por <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         proposal_published_for_space:
           email_intro: A proposta "%{resource_title}" engadiuse a "%{participatory_space_title}" que estás seguindo.
           email_outro: Recibiches esta notificación porque estás seguindo "%{participatory_space_title}". Podes deixar de seguir desde a ligazón anterior.
diff --git a/decidim-proposals/config/locales/hu.yml b/decidim-proposals/config/locales/hu.yml
index 1a84ad4629811..6441c741b2be7 100644
--- a/decidim-proposals/config/locales/hu.yml
+++ b/decidim-proposals/config/locales/hu.yml
@@ -147,22 +147,16 @@ hu:
             accept: Elfogad
         collaborative_draft_access_accepted:
           email_subject: "%{requester_name} jóváhagyva, mint közreműködő ebben: %{resource_title}."
-          notification_title: '<a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> jóváhagyva, <strong>mint a közreműködő</strong> ebben a közös vázlatban: <a href="%{resource_path}">%{resource_title}</a>.'
         collaborative_draft_access_rejected:
           email_subject: "%{requester_name} elutasítva, mint közreműködő ebben a közösen szerkesztett vázlatban: %{resource_title}."
-          notification_title: '<a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> elutasítva, <strong>mint a közreműködő</strong> ebben a közös vázlatban: <a href="%{resource_path}">%{resource_title}</a>.'
         collaborative_draft_access_requested:
           email_subject: "%{requester_name} közreműködési hozzáférést kért ehhez: %{resource_title}."
-          notification_title: '<a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> közreműködése hozzáférést kért a következő közös vázlathoz: <a href="%{resource_path}">%{resource_title}</a>. Kérlek, <strong>fogadd el vagy utasítsd el a kérelmet</strong>.'
         collaborative_draft_access_requester_accepted:
           email_subject: 'Jóváhagyták közreműködési kérelmedet itt: %{resource_title}.'
           notification_title: 'Közreműködési kérelmedet <strong>jóváhagyták</strong> ebben a közös vázlatban: <a href="%{resource_path}">%{resource_title}</a>.'
         collaborative_draft_access_requester_rejected:
           email_subject: 'Közreműködési kérelmedet elutasították itt: %{resource_title}.'
           notification_title: 'Közreműködési kérelmedet <strong>elutasították</strong> ebben a közös vázlatban: <a href="%{resource_path}">%{resource_title}</a>.'
-        collaborative_draft_withdrawn:
-          email_subject: "%{author_name} %{author_nickname} visszavonta a(z) %{resource_title} közös vázlatot."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>visszavonta</strong> a(z) <a href="%{resource_path}">%{resource_title}</a> közös vázlatot.
         creation_enabled:
           email_intro: 'Mostantól új javaslatokat készíthetsz itt: %{participatory_space_title}! Láss munkának ezen az oldalon:'
           email_outro: 'Ezt az értesítést azért kaptad, mert ezt követed: "%{participatory_space_title}". Az értesítéseket a következő linkre kattintva kapcsolhatod ki.'
@@ -173,11 +167,6 @@ hu:
           email_outro: Ezt az értesítést megkapta, mert a "%{resource_title}" szerzője.
           email_subject: '"%{mentioned_proposal_title}" című javaslatod említésre került'
           notification_title: '"%{mentioned_proposal_title}" című javaslatodat említette valaki <a href="%{resource_path}">egy megjegyzésben</a>.'
-        proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, aki követi, egy új javaslatot tett közzé a "%{resource_title}" -nek. Nézze meg és járuljon hozzá:'
-          email_outro: 'Ezt az értesítést azért kaptad, mert őt követed: "%{author_nickname}". Az értesítéseket a következő linkre kattintva kapcsolhatod ki.'
-          email_subject: Új javaslat "%{resource_title}" szerint %{author_nickname}
-          notification_title: 'A(z) <a href="%{resource_path}">%{resource_title}</a> című javaslat közzétéve általa: <a href="%{author_path}">%{author_name} %{author_nickname}</a>.'
         proposal_published_for_space:
           email_intro: 'A(z) "%{resource_title}" című javaslatot hozzáadtuk ehhez: "%{participatory_space_title}" (követed).'
           email_outro: 'Ezt az értesítést azért kaptad, mert ezt követed: "%{participatory_space_title}". Leiratkozás az előző link segítségével.'
diff --git a/decidim-proposals/config/locales/id-ID.yml b/decidim-proposals/config/locales/id-ID.yml
index 88c426382adc6..867182e8d45f4 100644
--- a/decidim-proposals/config/locales/id-ID.yml
+++ b/decidim-proposals/config/locales/id-ID.yml
@@ -78,22 +78,16 @@ id:
             accept: Menerima
         collaborative_draft_access_accepted:
           email_subject: "%{requester_name} telah diterima untuk diakses sebagai kontributor dari %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> telah <strong>diterima untuk mengakses sebagai kontributor</strong> dari <a href="%{resource_path}">%{resource_title}</a> draf kolaboratif.
         collaborative_draft_access_rejected:
           email_subject: "%{requester_name} telah ditolak untuk diakses sebagai kontributor dari %{resource_title} draf kolaboratif."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> telah ditolak <strong>sebagai kontributor</strong> dari <a href="%{resource_path}">%{resource_title}</a> draf kolaboratif.
         collaborative_draft_access_requested:
           email_subject: "%{requester_name} akses yang diminta untuk berkontribusi ke %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> meminta akses untuk berkontribusi</a> draf kolaboratif <a href="%{resource_path}">%{resource_title}</a> . Harap <strong>menerima atau menolak permintaan</strong>.
         collaborative_draft_access_requester_accepted:
           email_subject: Anda telah diterima sebagai kontributor %{resource_title}.
           notification_title: Anda telah <strong>diterima untuk mengakses sebagai kontributor</strong> dari draf kolaboratif <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requester_rejected:
           email_subject: Anda telah ditolak sebagai kontributor %{resource_title}.
           notification_title: Anda telah ditolak <strong>untuk mengakses sebagai kontributor</strong> dari draf kolaboratif <a href="%{resource_path}">%{resource_title}</a>.
-        collaborative_draft_withdrawn:
-          email_subject: "%{author_name} %{author_nickname} menarik %{resource_title} draf kolaboratif."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>menarik</strong> dari <a href="%{resource_path}">%{resource_title}</a> draft kolaboratif.
         creation_enabled:
           email_intro: 'Anda sekarang dapat membuat proposal baru di %{participatory_space_title}! Mulai berpartisipasi di halaman ini:'
           email_outro: Anda telah menerima pemberitahuan ini karena Anda mengikuti %{participatory_space_title}. Anda dapat berhenti menerima notifikasi mengikuti tautan sebelumnya.
@@ -102,11 +96,6 @@ id:
           email_outro: Anda telah menerima pemberitahuan ini karena Anda adalah pengarang "%{resource_title}".
           email_subject: Proposal Anda "%{mentioned_proposal_title}" telah disebutkan
           notification_title: Proposal Anda "%{mentioned_proposal_title}" telah disebutkan <a href="%{resource_path}">dalam ruang</a> di komentar.
-        proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, siapa yang Anda ikuti, telah menerbitkan proposal baru yang disebut "%{resource_title}". Lihat dan sumbangkan:'
-          email_outro: Anda telah menerima pemberitahuan ini karena Anda mengikuti %{author_nickname}. Anda dapat berhenti menerima notifikasi mengikuti tautan sebelumnya.
-          email_subject: Proposal baru "%{resource_title}" oleh %{author_nickname}
-          notification_title: Proposal <a href="%{resource_path}">%{resource_title}</a> diterbitkan oleh <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         proposal_published_for_space:
           email_intro: Proposal "%{resource_title}" telah ditambahkan ke "%{participatory_space_title}" yang Anda ikuti.
           email_outro: Anda telah menerima pemberitahuan ini karena Anda mengikuti "%{participatory_space_title}". Anda dapat berhenti mengikutinya dari tautan sebelumnya.
diff --git a/decidim-proposals/config/locales/is-IS.yml b/decidim-proposals/config/locales/is-IS.yml
index d36c77714a084..02000350711a4 100644
--- a/decidim-proposals/config/locales/is-IS.yml
+++ b/decidim-proposals/config/locales/is-IS.yml
@@ -43,9 +43,6 @@ is:
         proposal_mentioned:
           email_subject: Tillagan þín "%{mentioned_proposal_title}" hefur verið minnst
           notification_title: Tillaga þín "%{mentioned_proposal_title}" hefur verið nefnd <a href="%{resource_path}">í þessu rými</a> í athugasemdunum.
-        proposal_published:
-          email_outro: Þú hefur fengið þessa tilkynningu vegna þess að þú fylgist með %{author_nickname}. Þú getur hætt við að fá tilkynningar eftir fyrri tengilinn.
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> tillöguna var gefin út af <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         proposal_published_for_space:
           email_intro: Tillagan "%{resource_title}" hefur verið bætt við "%{participatory_space_title}" sem þú fylgist með.
         voting_enabled:
diff --git a/decidim-proposals/config/locales/it.yml b/decidim-proposals/config/locales/it.yml
index db47d47a4c76e..09b64b954547a 100644
--- a/decidim-proposals/config/locales/it.yml
+++ b/decidim-proposals/config/locales/it.yml
@@ -147,22 +147,16 @@ it:
             accept: Accettare
         collaborative_draft_access_accepted:
           email_subject: "%{requester_name} è stato accettato per accedere come contributore del %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> è stato accettato <strong>come contributore</strong> del progetto collaborativo <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_rejected:
           email_subject: "%{requester_name} è stato rifiutato per accedere come contributore della %{resource_title} bozza collaborativa."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> è stato rifiutato <strong>per accedere come contributore</strong> del progetto collaborativo <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requested:
           email_subject: "%{requester_name} accesso richiesto per contribuire a %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> richiesto accesso per contribuire alla stesura di collaborazione <a href="%{resource_path}">%{resource_title}</a> . Si prega di <strong>accettare o rifiutare la richiesta</strong>.
         collaborative_draft_access_requester_accepted:
           email_subject: Sei stato accettato come contributore di %{resource_title}.
           notification_title: Sei stato accettato a <strong>come collaboratore</strong> del progetto collaborativo <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requester_rejected:
           email_subject: Sei stato rifiutato come contributore di %{resource_title}.
           notification_title: Sei stato <strong>respinto per accedere come contributore</strong> alla bozza collaborativa <a href="%{resource_path}">%{resource_title}</a>.
-        collaborative_draft_withdrawn:
-          email_subject: "%{author_name} %{author_nickname} ritirato il %{resource_title} progetto di collaborazione."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>ritirato</strong> il <a href="%{resource_path}">%{resource_title}</a> progetto collaborativo.
         creation_enabled:
           email_intro: 'Ora puoi creare nuove proposte in %{participatory_space_title}! Inizia a partecipare a questa pagina:'
           email_outro: Hai ricevuto questa notifica perché stai seguendo %{participatory_space_title}. È possibile interrompere la ricezione di notifiche facendo click su pulsante Smetti di seguire nella pagina del processo che stai seguendo.
@@ -172,11 +166,6 @@ it:
           email_outro: Hai ricevuto questa notifica perché sei un autore di "%{resource_title}".
           email_subject: La tua proposta "%{mentioned_proposal_title}" è stata menzionata
           notification_title: La tua proposta "%{mentioned_proposal_title}" è stata menzionata <a href="%{resource_path}">in questo spazio</a> nei commenti.
-        proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, chi stai seguendo, ha pubblicato una nuova proposta denominata "%{resource_title}". Dai un''occhiata e dai:'
-          email_outro: Hai ricevuto questa notifica perché stai seguendo %{author_nickname}. È possibile interrompere la ricezione di notifiche seguendo il collegamento precedente.
-          email_subject: Nuova proposta "%{resource_title}" di %{author_nickname}
-          notification_title: La <a href="%{resource_path}">%{resource_title}</a> proposta è stata pubblicata da <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         proposal_published_for_space:
           email_intro: La proposta "%{resource_title}" è stata aggiunta a "%{participatory_space_title}" che stai seguendo.
           email_outro: Hai ricevuto questa notifica perché stai seguendo "%{participatory_space_title}". Puoi smettere di seguirlo dal link precedente.
diff --git a/decidim-proposals/config/locales/ja.yml b/decidim-proposals/config/locales/ja.yml
index c0240ae59b4ac..9e7b0b5c17ea1 100644
--- a/decidim-proposals/config/locales/ja.yml
+++ b/decidim-proposals/config/locales/ja.yml
@@ -272,17 +272,17 @@ ja:
             email_intro: '%{author_name} は %{resource_title} でプライベートノートを作成しました。 <a href="%{admin_proposal_info_url}">管理パネル</a> で確認してください。'
             email_outro: 提案を評価できるため、この通知を受け取りました。
             email_subject: 誰かが提案 %{resource_title} にメモを残しました。
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> が <a href="%{resource_path}">%{resource_title}</a>にプライベートノートを作成しました。 <a href="%{admin_proposal_info_path}">管理者パネル</a> で確認してください。
+            notification_title: <a href="%{author_path}">%{author_name}</a> が <a href="%{resource_path}">%{resource_title}</a>にプライベートノートを作成しました。 <a href="%{admin_proposal_info_path}">管理者パネル</a> で確認してください。
           proposal_note_mentioned:
             email_intro: '"%{resource_title}" 内の "%{author_name}" "%{author_nickname}" によるプライベートノートで言及されました。<a href="%{admin_proposal_info_url}">管理パネル</a>で確認してください。'
             email_outro: プライベートノートで言及されているため、この通知を受信しました。
             email_subject: 誰かが提案 %{resource_title} のメモであなたをメンションしました。
-            notification_title: <a href="%{resource_path}">%{resource_title}"</a> 内の<a href="%{author_path}">%{author_name} %{author_nickname}</a> によるプライベートノートで言及されました。<a href="%{admin_proposal_info_path}">管理パネル</a>で確認してください。
+            notification_title: <a href="%{resource_path}">%{resource_title}</a> において、<a href="%{author_path}">%{author_name}</a> からの非公開ノートで言及されました。<a href="%{admin_proposal_info_path}">管理者パネル</a>でご確認ください。
           proposal_note_replied:
             email_intro: '%{author_name} は %{resource_title} のプライベートノートに返信しました。 <a href="%{admin_proposal_info_url}">管理パネル</a> で確認してください。'
             email_outro: あなたがノートの作成者であるため、この通知を受信しました。
             email_subject: "%{author_name} が %{resource_title} 内のあなたのプライベートノートに返信しました。"
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> が <a href="%{resource_path}">%{resource_title}</a>内のあなたのプライベートノートに返信しました。 <a href="%{admin_proposal_info_path}">管理者パネル</a> で確認してください。
+            notification_title: <a href="%{author_path}">%{author_name}</a> が <a href="%{resource_path}">%{resource_title}</a> 内のあなたの非公開ノートに返信しました。<a href="%{admin_proposal_info_path}">管理者パネル</a>でご確認ください。
         coauthor_accepted_invite:
           notification_title: <a href="%{coauthor_path}">%{coauthor_name}</a> は提案 <a href="%{resource_path}">%{resource_title}</a> の共著者になるための招待を承諾しました。
         coauthor_invited:
@@ -299,17 +299,17 @@ ja:
           email_intro: '%{requester_name} は、 <a href="%{resource_url}">%{resource_title}</a> の共同草案のコントリビューターとして承認されました。'
           email_outro: <a href="%{resource_url}">%{resource_title}</a> のコラボレーターであるため、この通知を受け取りました。
           email_subject: "%{requester_name} は %{resource_title} の貢献者としてアクセスできるようになりました。"
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> は、 <strong>コントリビューターとして</strong> <a href="%{resource_path}">%{resource_title}</a> 共同草案のコントリビューターとしてアクセスできるようになりました。
+          notification_title: <a href="%{resource_path}">%{resource_title}</a> の共同ドラフトについて、<a href="%{requester_path}">%{requester_name}</a> が <strong>協力者としてアクセスを承認されました</strong>。
         collaborative_draft_access_rejected:
           email_intro: '%{requester_name} は、 <a href="%{resource_url}">%{resource_title}</a> の共同草案のコントリビューターとしてのアクセスを拒否されました。'
           email_outro: <a href="%{resource_url}">%{resource_title}</a> のコラボレーターであるため、この通知を受け取りました。
           email_subject: "%{requester_name} は、 %{resource_title} の共同草案の貢献者としてアクセスするために拒否されました。"
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> が <strong>コントリビューターとしてアクセスを拒否されました <a href="%{resource_path}">%{resource_title}</a> 共同草案のコントリビューター</strong>
+          notification_title: <a href="%{requester_path}">%{requester_name}</a> は <a href="%{resource_path}">%{resource_title}</a> の共同ドラフトの <strong>寄稿者としてのアクセスを却下されました</strong>。
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} がコントリビューターとしてアクセスをリクエストしました。 <strong></strong> <a href="%{resource_url}">%{resource_title}</a> の共同草案ページからリクエストを承認または拒否できます。'
           email_outro: <a href="%{resource_url}">%{resource_title}</a> のコラボレーターであるため、この通知を受け取りました。
           email_subject: "%{requester_name} が %{resource_title} に貢献するためにアクセスをリクエストしました。"
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> は、 <a href="%{resource_path}">%{resource_title}</a> の共同草案にアクセスをリクエストしました。 <strong>リクエストを承認または拒否してください</strong>。
+          notification_title: <a href="%{requester_path}">%{requester_name}</a> が <a href="%{resource_path}">%{resource_title}</a> の共同ドラフトに協力するためのアクセスをリクエストしました。<strong>このリクエストを承認または拒否してください</strong>。
         collaborative_draft_access_requester_accepted:
           email_intro: <a href="%{resource_url}">%{resource_title}</a> の共同草案のコントリビューターとして承認されました。
           email_outro: <a href="%{resource_url}">%{resource_title}</a> のコラボレーターになることをリクエストしたため、この通知を受け取りました。
@@ -321,10 +321,10 @@ ja:
           email_subject: '%{resource_title} の貢献者として拒否されました。'
           notification_title: 共同草稿<a href="%{resource_path}">%{resource_title}</a>の<strong>投稿者としてのアクセスを拒否</strong>されました。
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> は、 <a href="%{resource_url}">%{resource_title}</a> の共同草案を撤回しました。
+          email_intro: <a href="%{author_url}">%{author_name}</a> が <a href="%{resource_url}">%{resource_title}</a> の共同ドラフトを撤回しました。
           email_outro: <a href="%{resource_url}">%{resource_title}</a> のコラボレーターであるため、この通知を受け取りました。
-          email_subject: "%{author_name} %{author_nickname} は %{resource_title} の共同草案を撤回しました。"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> が、共同草稿 <a href="%{resource_path}">%{resource_title}</a> を<strong>撤回しました。</strong>
+          email_subject: "%{author_name} が %{resource_title} の共同ドラフトを撤回しました。"
+          notification_title: <a href="%{author_path}">%{author_name}</a> が <a href="%{resource_path}">%{resource_title}</a> の共同ドラフトを <strong>取り下げました</strong>。
         creation_enabled:
           email_intro: '%{participatory_space_title}で新しい提案を作成できるようになりました! このページに参加してください:'
           email_outro: '%{participatory_space_title}をフォローしているため、この通知を受け取りました。前のリンクに続く通知の受信を停止することができます。'
@@ -346,10 +346,10 @@ ja:
           email_subject: 提案 %{resource_title} がマージされました
           notification_title: 提案 <a href="%{resource_path}">%{resource_title}</a> は管理者によってマージされました。
         proposal_published:
-          email_intro: 'あなたがフォローしている%{author_name} %{author_nickname}は、「%{resource_title}」という新しい提案を公開しました。チェックして貢献してください：'
-          email_outro: '%{author_nickname}をフォローしているため、この通知を受け取りました。前のリンクに続く通知の受信を停止することができます。'
-          email_subject: '%{resource_title}による新しい提案 " %{author_nickname}"'
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> の提案は <a href="%{author_path}">%{author_name} %{author_nickname}</a> によって公表されました。
+          email_intro: 'あなたがフォローしている %{author_name} さんが新しい提案「%{resource_title}」を作成しました。ぜひ内容を確認し、ご意見をお寄せください：'
+          email_outro: '%{author_name} をフォローしているため、この通知が届きました。上記のリンクから通知の受信を停止できます。'
+          email_subject: '" %{author_name}"による新しい提案%{resource_title}'
+          notification_title: <a href="%{resource_path}">%{resource_title}</a> 提案を <a href="%{author_path}">%{author_name}</a> が公開しました。
         proposal_published_for_space:
           email_intro: あなたがフォローしている提案「%{resource_title}」が「%{participatory_space_title}」に追加されました。
           email_outro: '「%{participatory_space_title}」をフォローしているため、この通知を受け取りました。前のリンクに続く通知の受信を停止できます。'
diff --git a/decidim-proposals/config/locales/lt.yml b/decidim-proposals/config/locales/lt.yml
index 288ec0abffbab..51388f6ffb84b 100644
--- a/decidim-proposals/config/locales/lt.yml
+++ b/decidim-proposals/config/locales/lt.yml
@@ -177,17 +177,14 @@ lt:
           email_intro: '%{requester_name} buvo priimtas kaip <a href="%{resource_url}">%{resource_title}</a> bendradarbiavimo juodraščio bendradarbis.'
           email_outro: Šį pranešimą gavote dėl to, kad esate <a href="%{resource_path}">%{resource_title}</a> bendraautorius.
           email_subject: "%{requester_name}, kaip %{resource_title} bendraautoriui, suteikta prieiga."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a>, <strong>, kaip </strong> bendro juodraščio <a href="%{resource_path}">%{resource_title}</a> bendraautoriui, suteikta prieiga.
         collaborative_draft_access_rejected:
           email_intro: '%{requester_name} buvo atmestas kaip <a href="%{resource_url}">%{resource_title}</a> bendradarbiavimo juodraščio bendradarbis.'
           email_outro: Šį pranešimą gavote dėl to, kad esate <a href="%{resource_path}">%{resource_title}</a> bendraautorius.
           email_subject: "%{requester_name} nesuteikta prieigos prie bendro juodraščio %{resource_title} kaip bendraautoriui."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> nesuteikta <strong>prieigos kaip </strong> juodraščio <a href="%{resource_path}">%{resource_title}</a> bendraautoriui.
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} paprašė prieigos kaip bendraautorius. Galite <strong>priimti arba atmesti užklausą</strong> iš bendro juodraščio <a href="%{resource_path}">%{resource_title}</a> puslapio.'
           email_outro: Šį pranešimą gavote dėl to, kad esate <a href="%{resource_path}">%{resource_title}</a> bendraautorius.
           email_subject: "%{requester_name} paprašė prieigos, kad galėtų prisidėti prie %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> paprašė prieigos, kad galėtų prisidėti prie bendro juodraščio <a href="%{resource_path}">%{resource_title}</a>. Užklausą <strong>priimkite arba atmeskite</strong>.
         collaborative_draft_access_requester_accepted:
           email_intro: Jums suteikta prieiga kaip bendro juodraščio <a href="%{resource_url}">%{resource_title}</a> bendraautoriui.
           email_outro: Šį pranešimą gavote dėl to, kad pateikėte prašymą tapti <a href="%{resource_url}">%{resource_title}</a> bendraautoriumi.
@@ -199,10 +196,7 @@ lt:
           email_subject: Jūs prašymas tapti %{resource_title} bendraautoriumi atmestas.
           notification_title: Jums <strong>nesuteikta prieiga prie </strong> juodraščio <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> atsiėmė <a href="%{resource_url}">%{resource_title}</a> juodraštį.
           email_outro: Šį pranešimą gavote dėl to, kad esate <a href="%{resource_url}">%{resource_title}</a> bendraautorius.
-          email_subject: "%{author_name} %{author_nickname} atsiėmė juodraštį %{resource_title}."
-          notification_title: <a href="%{author_path}">%{author_nickname}</a><strong> atsiėmė</strong><a href="%{resource_path}">%{resource_title}</a> juodraštį.
         creation_enabled:
           email_intro: 'Dabar galite kurti naujus pasiūlymus %{participatory_space_title}! Pradėti dalyvauti šiame puslapyje:'
           email_outro: Šį pranešimą gavote dėl to, kad sekate %{participatory_space_title}. Jeigu nebenorite gauti pranešimų, spustelėkite ankstesnę nuorodą.
@@ -213,11 +207,6 @@ lt:
           email_outro: Šį pranešimą gavote dėl to, kad esate „%{resource_title}“ autorius.
           email_subject: Jūsų pasiūlymas „%{mentioned_proposal_title}“ buvo paminėtas
           notification_title: Jūsų pasiūlymas „%{mentioned_proposal_title}“ buvo paminėtas <a href="%{resource_path}">šioje erdvėje</a> komentaruose.
-        proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, kurį sekate, paskelbė naują pasiūlymą, pavadintą „%{resource_title}“. Peržiūrėkite ir prisidėkite:'
-          email_outro: Šį pranešimą gavote dėl to, kad sekate %{author_nickname}. Jeigu nebenorite gauti pranešimų, spustelėkite aukščiau esančią nuorodą.
-          email_subject: '%{author_nickname} pateikė naują pasiūlymą "%{resource_title}"'
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> paskelbė pasiūlymą <a href="%{resource_path}">%{resource_title}</a>.
         proposal_published_for_space:
           email_intro: Erdvėje „%{participatory_space_title}“, kurią sekate, pridėtas pasiūlymas „%{resource_title}“.
           email_outro: Šį pranešimą gavote dėl to, kad sekate „%{participatory_space_title}“. Jeigu nebenorite gauti pranešimų, spustelėkite ankstesnę nuorodą.
diff --git a/decidim-proposals/config/locales/lv.yml b/decidim-proposals/config/locales/lv.yml
index 21ad011410db7..8e0154ae158ea 100644
--- a/decidim-proposals/config/locales/lv.yml
+++ b/decidim-proposals/config/locales/lv.yml
@@ -108,22 +108,16 @@ lv:
             accept: Pieņemt
         collaborative_draft_access_accepted:
           email_subject: "%{requester_name} ir pieņemts, lai piekļūtu kā līdzautors %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> ir <strong> pieņemts, lai piekļūtu kā līdzautors</strong> <a href="%{resource_path}">%{resource_title}</a> sadarbības projektā.
         collaborative_draft_access_rejected:
           email_subject: "%{requester_name} ir atteikta piekļuve kā līdzautoram %{resource_title} sadarbības projektā."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> ir <strong> atteikta piekļuve, kā līdzautoram</strong><a href= "%{resource_path}">%{resource_title}</a> sadarbības projektā.
         collaborative_draft_access_requested:
           email_subject: "%{requester_name} pieprasīja piekļuvi, lai līdzdarbotos %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> pieprasīja piekļuvi, lai līdzdarbotos <a href="%{resource_path}"> %{resource_title}</a> sadarbības projektā. Lūdzu, <strong>pieņemiet vai noraidiet pieprasījumu</strong>.
         collaborative_draft_access_requester_accepted:
           email_subject: Jūs pieņēma par %{resource_title} līdzautoru.
           notification_title: Jums <strong>piešķirta piekļuve kā līdzautoram</strong> <a href="%{resource_path}">%{resource_title}</a> sadarbības projektā.
         collaborative_draft_access_requester_rejected:
           email_subject: Jūsu pieteikums kļūt par %{resource_title} līdzautoru ir atteikts.
           notification_title: Jums <strong>atteikta iespēja piekļūt kā līdzautoram</strong> <a href="%{resource_path}">%{resource_title}</a> sadarbības projektā.
-        collaborative_draft_withdrawn:
-          email_subject: "%{author_name} %{author_nickname} atsauca %{resource_title} sadarbības projektu."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a><strong> atsauca </strong><a href="%{resource_path}">%{resource_title}</a> sadarbības projektu.
         creation_enabled:
           email_intro: 'Tagad jūs varat izveidot jaunu priekšlikumu telpā %{participatory_space_title}! Sāciet piedalīties šajā lapā:'
           email_outro: Jūs saņēmāt šo paziņojumu, jo sekojat %{participatory_space_title}. Jūs varat atteikties no paziņojumu saņemšanas, sekojot iepriekšējai saitei.
@@ -133,11 +127,6 @@ lv:
           email_outro: Jūs saņēmāt šo paziņojumu, jo esat "%{resource_title}" autors.
           email_subject: Jūsu priekšlikums "%{mentioned_proposal_title}" ir pieminēts
           notification_title: Jūsu priekšlikums "%{mentioned_proposal_title}" ir pieminēts <a href="%{resource_path}"> šajā telpā </a> komentāros.
-        proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, kam jūs sekojat, ir publicējis jaunu priekšlikumu ar nosaukumu "%{resource_title}". Aplūkojiet to un piedalieties:'
-          email_outro: Jūs saņēmāt šo paziņojumu, jo sekojat %{author_nickname}. Jūs varat atteikties no paziņojumu saņemšanas, sekojot iepriekšējai saitei.
-          email_subject: Jauns %{author_nickname} priekšlikums "%{resource_title}"
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> iniciatīvu publicēja<a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         proposal_published_for_space:
           email_intro: Priekšlikums "%{resource_title}" ir pievienots "%{participatory_space_title}", kam jūs sekojat.
           email_outro: Jūs saņēmāt šo paziņojumu, jo sekojat "%{participatory_space_title}". Jūs varat atteikties no paziņojumu saņemšanas, sekojot iepriekšējai saitei.
diff --git a/decidim-proposals/config/locales/nl.yml b/decidim-proposals/config/locales/nl.yml
index dffa4e8745002..1079acf60b714 100644
--- a/decidim-proposals/config/locales/nl.yml
+++ b/decidim-proposals/config/locales/nl.yml
@@ -142,22 +142,16 @@ nl:
             accept: Aanvaarden
         collaborative_draft_access_accepted:
           email_subject: "%{requester_name} is geaccepteerd om toegang te krijgen als een bijdrager van de %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> is <strong> aanvaard om als bijdrager</strong> van de <a href="%{resource_path}">%{resource_title}</a> gezamenlijk ontwerp toegang te krijgen.
         collaborative_draft_access_rejected:
           email_subject: "%{requester_name} is afgewezen om toegang te krijgen als bijdrager van de %{resource_title} gezamenlijk ontwerp."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> is <strong>afgewezen om toegang te krijgen als bijdrager</strong> van de <a href="%{resource_path}">%{resource_title}</a> gezamenlijk ontwerp.
         collaborative_draft_access_requested:
           email_subject: "%{requester_name} vroeg om toegang om bij te dragen aan %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> verzocht om toegang om bij te dragen aan de <a href="%{resource_path}">%{resource_title}</a> gezamenlijk ontwerp. Gelieve <strong>accepteren of het verzoek af te wijzen</strong>.
         collaborative_draft_access_requester_accepted:
           email_subject: Je bent geaccepteerd als een bijdrager van %{resource_title}.
           notification_title: U bent <strong>geaccepteerd om als bijdrager</strong> van de <a href="%{resource_path}">%{resource_title}</a> gezamenlijk ontwerp toegang te krijgen.
         collaborative_draft_access_requester_rejected:
           email_subject: Je bent afgewezen als een bijdrager van %{resource_title}.
           notification_title: U bent <strong>afgewezen om toegang te krijgen als bijdrager</strong> van de <a href="%{resource_path}">%{resource_title}</a> gezamenlijke ontwerp.
-        collaborative_draft_withdrawn:
-          email_subject: "%{author_name} %{author_nickname} de %{resource_title} gezamenlijk ontwerp ingetrokken."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>teruggetrokken</strong> de <a href="%{resource_path}">%{resource_title}</a> gezamenlijk ontwerp.
         creation_enabled:
           email_intro: 'Je kan nu nieuwe voorstellen maken in %{participatory_space_title}! Neem deel via deze link:'
           email_outro: Je hebt deze melding ontvangen omdat je %{participatory_space_title} volgt. Schakel de meldingen uit door te klikken op de voorgaande link.
@@ -167,11 +161,6 @@ nl:
           email_outro: U hebt deze melding ontvangen omdat u een auteur bent van "%{resource_title}".
           email_subject: Jouw voorstel "%{mentioned_proposal_title}" is vernoemd
           notification_title: Je voorstel '%{mentioned_proposal_title}' werd in de reacties van <a href="%{resource_path}"> deze </a> vernoemd.
-        proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, wie u volgt, heeft een nieuw voorstel gepubliceerd met de naam "%{resource_title}". Bekijk het en draag bij:'
-          email_outro: Je hebt deze melding ontvangen omdat je %{author_nickname}volgt. Je kan de meldingen uitschakelen door te klikken op de voorgaande link.
-          email_subject: Nieuw voorstel "%{resource_title}" door %{author_nickname}
-          notification_title: Het <a href="%{resource_path}">%{resource_title}</a> voorstel werd gepubliceerd door <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         proposal_published_for_space:
           email_intro: Het voorstel "%{resource_title}" is toegevoegd aan "%{participatory_space_title}" dat je volgt.
           email_outro: Je hebt deze melding ontvangen omdat je "%{participatory_space_title}" volgt. Schakel de meldingen uit door op bovenstaande link te klikken en te stoppen met volgen.
diff --git a/decidim-proposals/config/locales/no.yml b/decidim-proposals/config/locales/no.yml
index a5372c24213c5..d95ff760ae293 100644
--- a/decidim-proposals/config/locales/no.yml
+++ b/decidim-proposals/config/locales/no.yml
@@ -153,22 +153,16 @@
             accept: Aksepter
         collaborative_draft_access_accepted:
           email_subject: "%{requester_name} har blitt akseptert tilgang som bidragsyter til %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> har blitt <strong>akseptert tilgang som bidragsyter</strong> av <a href="%{resource_path}">%{resource_title}</a> samarbeids utkastet.
         collaborative_draft_access_rejected:
           email_subject: "%{requester_name} har blitt avslått tilgang som bidragsyter til %{resource_title} samarbeids utkastet."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> har blitt <strong>avvist tilgang som bidragsyter</strong> av <a href="%{resource_path}">%{resource_title}</a> samarbeids utkastet.
         collaborative_draft_access_requested:
           email_subject: "%{requester_name} ba om tilgang som bidragsyter til %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> forespurte om tilgang til å bidra til <a href="%{resource_path}">%{resource_title}</a> samarbeids utkastet. Vennligst <strong>godta eller avslå forespørselen</strong>.
         collaborative_draft_access_requester_accepted:
           email_subject: Du er blitt akseptert som en bidragsgiver av %{resource_title}.
           notification_title: Du har blitt <strong>akseptert tilgang som bidragsgiver</strong> av <a href="%{resource_path}">%{resource_title}</a> samarbeids utkastet.
         collaborative_draft_access_requester_rejected:
           email_subject: Du er blitt avvist som en bidragsgiver av %{resource_title}.
           notification_title: Du har blitt <strong>avvist tilgang som bidragsgiver</strong> av <a href="%{resource_path}">%{resource_title}</a> samarbeids utkastet.
-        collaborative_draft_withdrawn:
-          email_subject: "%{author_name}%{author_nickname} trukket tilbake %{resource_title} samarbeids utkast."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>trakk</strong> <a href="%{resource_path}">%{resource_title}</a> samarbeids utkastet.
         creation_enabled:
           email_intro: 'Du kan nå lage nye forslag i %{participatory_space_title}! Begynn å delta på denne siden:'
           email_outro: Du har mottatt denne varslingen fordi du følger %{participatory_space_title}. Du kan slutte å motta varsler hvis du følger den forrige lenken.
@@ -177,11 +171,6 @@
           email_outro: Du har mottatt denne varslingen fordi du er en forfatter av "%{resource_title}".
           email_subject: Forslaget ditt "%{mentioned_proposal_title}" er blitt nevnt
           notification_title: Forslaget ditt "%{mentioned_proposal_title}" har blitt nevnt <a href="%{resource_path}">i dette området</a> i kommentarene.
-        proposal_published:
-          email_intro: '%{author_name}%{author_nickname}, som du følger, har publisert et nytt forslag kalt "%{resource_title}". Sjekk det ut og bidra:'
-          email_outro: Du har mottatt denne varslingen fordi du følger %{author_nickname}. Du kan slutte å motta varsler hvis du følger den forrige lenken.
-          email_subject: Nytt forslag "%{resource_title}" av %{author_nickname}
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> forslaget var publisert av <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         proposal_published_for_space:
           email_intro: Forslaget "%{resource_title}" er blitt lagt til "%{participatory_space_title}" som du følger.
           email_outro: Du har mottatt denne varslingen fordi du følger "%{participatory_space_title}". Du kan slutte å motta varsler hvis du følger den forrige lenken.
diff --git a/decidim-proposals/config/locales/pl.yml b/decidim-proposals/config/locales/pl.yml
index af7bc6fefe9f1..da8a15a866172 100644
--- a/decidim-proposals/config/locales/pl.yml
+++ b/decidim-proposals/config/locales/pl.yml
@@ -207,17 +207,14 @@ pl:
           email_intro: '%{requester_name} otrzymał(a) dostęp jako współtwórca wspólnego szkicu <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Otrzymujesz to powiadomienie, ponieważ współpracujesz przy dokumencie <a href="%{resource_path}">%{resource_title}</a>.
           email_subject: "%{requester_name} otrzymał(a) dostęp jako współtwórca %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> otrzymał(a) <strong>dostęp jako współtwórca</strong> wspólnego szkicu <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_rejected:
           email_intro: 'Nie przyznano Ci dostępu jako osobie uczestniczącej w tworzeniu wspólnego projektu dokumentu <a href="%{resource_path}">%{resource_title}</a>.'
           email_outro: Otrzymujesz to powiadomienie, ponieważ współpracujesz przy dokumencie <a href="%{resource_path}">%{resource_title}</a>.
           email_subject: "%{requester_name} nie otrzymał(a) dostępu jako współtwórca wspólnego szkicu %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> <strong>nie otrzymał(a) dostępu jako współtwórca</strong> wspólnego szkicu <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} poprosił(a) o dostęp jako współtwórca. Możesz <strong>zaakceptować lub odrzucić prośbę</strong> na stronie wspólnego szkicu <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Otrzymujesz to powiadomienie, ponieważ współpracujesz przy dokumencie <a href="%{resource_path}">%{resource_title}</a>.
           email_subject: "%{requester_name} prosi o dostęp do współtworzenia %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> prosi o dostęp do współtworzenia wspólnego szkicu <a href="%{resource_path}">%{resource_title}</a>. <strong>Zaakceptuj lub odrzuć prośbę</strong>.
         collaborative_draft_access_requester_accepted:
           email_intro: Zostałeś zaakceptowany(a) jako współtwórca wspólnego szkicu <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Otrzymujesz to powiadomienie, ponieważ chcesz współpracować przy <a href="%{resource_path}">%{resource_title}</a>.
@@ -229,10 +226,7 @@ pl:
           email_subject: Zostałeś odrzucony jako współtwórca %{resource_title}.
           notification_title: <strong>Nie otrzymałeś dostępu jako współtwórca</strong> wspólnego szkicu <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> wycofał(a) wspólny szkic <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Otrzymujesz to powiadomienie, ponieważ współpracujesz przy dokumencie <a href="%{resource_path}">%{resource_title}</a>.
-          email_subject: "%{author_name} %{author_nickname} wycofał(a) wspólny szkic %{resource_title}."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>wycofał(a)</strong> wspólny szkic <a href="%{resource_path}">%{resource_title}</a>.
         creation_enabled:
           email_intro: 'Możesz teraz tworzyć nowe propozycje w %{participatory_space_title}! Dołącz na tej stronie:'
           email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz %{participatory_space_title}. Możesz przestać otrzymywać powiadomienia po kliknięciu w poprzedni link.
@@ -243,11 +237,6 @@ pl:
           email_outro: Otrzymałeś to powiadomienie, ponieważ jesteś autorem "%{resource_title}".
           email_subject: Twoja propozycja "%{mentioned_proposal_title}" została wspomniana
           notification_title: Twoja propozycja "%{mentioned_proposal_title}" została wspomniana <a href="%{resource_path}">w tej przestrzeni</a> w komentarzach.
-        proposal_published:
-          email_intro: 'Użytkownik %{author_name} %{author_nickname}, którego obserwujesz, opublikował nową propozycję o nazwie "%{resource_title}". Sprawdź i poprzyj:'
-          email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz %{author_nickname}. Możesz przestać otrzymywać powiadomienia po kliknięciu w poprzedni link.
-          email_subject: Nowa propozycja "%{resource_title}" autorstwa %{author_nickname}
-          notification_title: Propozycja <a href="%{resource_path}">%{resource_title}</a> została opublikowana przez <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         proposal_published_for_space:
           email_intro: Propozycja "%{resource_title}" została dodana do przestrzeni "%{participatory_space_title}", którą obserwujesz.
           email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz "%{participatory_space_title}". Aby przestać otrzymywać powiadomienia kliknij w powyższy link, a następnie na stronie kliknij w przycisk obserwowania.
diff --git a/decidim-proposals/config/locales/pt-BR.yml b/decidim-proposals/config/locales/pt-BR.yml
index c618970f874d4..c8bbf4b3d8c3f 100644
--- a/decidim-proposals/config/locales/pt-BR.yml
+++ b/decidim-proposals/config/locales/pt-BR.yml
@@ -272,17 +272,13 @@ pt-BR:
             email_intro: '%{author_name} criou uma nota privada em %{resource_title}. Confira no <a href="%{admin_proposal_info_url}">painel de administração</a>.'
             email_outro: Você recebeu esta notificação porque pode avaliar a proposta.
             email_subject: Alguém deixou uma nota na proposta %{resource_title}.
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> criou uma nota privada em <a href="%{resource_path}">%{resource_title}</a>. Confira em <a href="%{admin_proposal_info_path}">o painel de administração</a>.
           proposal_note_mentioned:
-            email_intro: Você foi mencionado em uma nota privada em"%{resource_title}" por "%{author_name}"%{author_nickname}". Confira a <a href="%{admin_proposal_info_url}">painel de administração</a>.
             email_outro: Você recebeu esta notificação porque você foi mencionado em uma nota privada.
             email_subject: Alguém mencionou você numa nota sobre a proposta %{resource_title}.
-            notification_title: Você foi mencionado em uma nota privada em <a href="%{resource_path}">%{resource_title}</a> por <a href="%{author_path}">%{author_name} %{author_nickname}</a>. Confira a <a href="%{admin_proposal_info_path}">o painel de administração</a>.
           proposal_note_replied:
             email_intro: '%{author_name} respondeu sua nota privada em %{resource_title}. Confira a <a href="%{admin_proposal_info_url}">painel de administração</a>.'
             email_outro: Você recebeu esta notificação porque você é o autor da nota.
             email_subject: "%{author_name} respondeu a sua publicação privada em %{resource_title}."
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> respondeu a sua nota privada em <a href="%{resource_path}">%{resource_title}</a>. Confira a <a href="%{admin_proposal_info_path}">o painel de administração</a>.
         coauthor_accepted_invite:
           notification_title: <a href="%{coauthor_path}">%{coauthor_name}</a> aceitou seu convite para se tornar um co-autor da proposta <a href="%{resource_path}">%{resource_title}</a>.
         coauthor_invited:
@@ -299,17 +295,14 @@ pt-BR:
           email_intro: '%{requester_name} foi aceito para acessar como colaborador do rascunho colaborativo <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Você recebeu esta notificação porque é colaborador de <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} foi aceito para acessar como contribuidor %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> foi aceito <strong>para acessar como colaborador</strong> do projeto colaborativo <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_rejected:
           email_intro: '%{requester_name} foi rejeitado para acessar como colaborador do projeto colaborativo <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Você recebeu esta notificação porque é colaborador de <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} foi rejeitado para acessar como colaborador do %{resource_title} esboço colaborativo."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> foi <strong>rejeitado para acessar como colaborador</strong> do projeto colaborativo <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} solicitou acesso como colaborador. Você pode <strong>aceitar ou rejeitar a solicitação</strong> da página do projeto colaborativo <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Você recebeu esta notificação porque é colaborador de <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} solicitou acesso para contribuir com %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> solicitou acesso para contribuir para o projeto de colaboração <a href="%{resource_path}">%{resource_title}</a> . Por favor, <strong>aceite ou rejeite o pedido</strong>.
         collaborative_draft_access_requester_accepted:
           email_intro: Você foi aceito para acessar como colaborador do projeto colaborativo <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Você recebeu esta notificação porque pediu para se tornar um colaborador de <a href="%{resource_url}">%{resource_title}</a>.
@@ -321,10 +314,7 @@ pt-BR:
           email_subject: Você foi rejeitado como colaborador de %{resource_title}.
           notification_title: Você foi <strong>rejeitado para acessar como colaborador</strong> do projeto colaborativo <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> retirou o projeto de colaboração <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Você recebeu esta notificação porque é colaborador de <a href="%{resource_url}">%{resource_title}</a>.
-          email_subject: "%{author_name} %{author_nickname} retirou o %{resource_title} rascunho colaborativo."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>retirado</strong> o <a href="%{resource_path}">%{resource_title}</a> rascunho colaborativo.
         creation_enabled:
           email_intro: 'Agora você pode criar novas propostas em %{participatory_space_title}! Comece a participar nesta página:'
           email_outro: Você recebeu esta notificação porque está seguindo %{participatory_space_title}. Você pode parar de receber notificações após o link anterior.
@@ -345,11 +335,6 @@ pt-BR:
           email_outro: Você recebeu esta notificação porque você é o autor da proposta.
           email_subject: A proposta %{resource_title} foi mesclada
           notification_title: A proposta <a href="%{resource_path}">%{resource_title}</a> foi mesclada por um administrador.
-        proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, que você está seguindo, publicou uma nova proposta chamada "%{resource_title}". Confira e contribua:'
-          email_outro: Você recebeu esta notificação porque está seguindo %{author_nickname}. Você pode parar de receber notificações após o link anterior.
-          email_subject: Nova proposta "%{resource_title}" por %{author_nickname}
-          notification_title: A <a href="%{resource_path}">%{resource_title}</a> proposta foi publicada por <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         proposal_published_for_space:
           email_intro: A proposta "%{resource_title}" foi adicionada a "%{participatory_space_title}" que você está seguindo.
           email_outro: Você recebeu esta notificação porque está seguindo "%{participatory_space_title}". Você pode deixar de segui-lo no link anterior.
diff --git a/decidim-proposals/config/locales/pt.yml b/decidim-proposals/config/locales/pt.yml
index ef6475630e751..c833ee4aeb50e 100644
--- a/decidim-proposals/config/locales/pt.yml
+++ b/decidim-proposals/config/locales/pt.yml
@@ -157,22 +157,16 @@ pt:
             accept: Aceitar
         collaborative_draft_access_accepted:
           email_subject: "%{requester_name} foi aceite para aceder como contribuidor de %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> foi aceite <strong>para aceder como colaborador</strong> do projeto colaborativo <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_rejected:
           email_subject: "%{requester_name} foi rejeitado para aceder como colaborador do rascunho colaborativo %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> foi <strong>rejeitado para aceder como colaborador</strong> do rascunho colaborativo <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requested:
           email_subject: "%{requester_name} solicitou acesso para contribuir em %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> solicitou acesso para contribuir no rascunho colaborativo <a href="%{resource_path}">%{resource_title}</a>. Por favor, <strong>aceite ou rejeite o pedido</strong>.
         collaborative_draft_access_requester_accepted:
           email_subject: Foi aceite como colaborador de %{resource_title}.
           notification_title: Foi <strong>aceite para aceder como colaborador</strong> do rascunho colaborativo <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requester_rejected:
           email_subject: Foi rejeitado como colaborador de %{resource_title}.
           notification_title: Foi <strong>rejeitado para aceder como colaborador</strong> do rascunho colaborativo <a href="%{resource_path}">%{resource_title}</a>.
-        collaborative_draft_withdrawn:
-          email_subject: "%{author_name} %{author_nickname} retirou o %{resource_title} rascunho colaborativo."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>retirou</strong> o rascunho colaborativo <a href="%{resource_path}">%{resource_title}</a>.
         creation_enabled:
           email_intro: 'Agora pode criar novas propostas em %{participatory_space_title}! Comece a participar nesta página:'
           email_outro: Recebeu esta notificação porque segue %{participatory_space_title}. Pode parar de receber notificações seguindo a hiperligação anterior.
@@ -182,11 +176,6 @@ pt:
           email_outro: Recebeu esta notificação porque é um autor de "%{resource_title}".
           email_subject: A sua proposta "%{mentioned_proposal_title}" foi mencionada
           notification_title: A sua proposta "%{mentioned_proposal_title}" foi mencionada <a href="%{resource_path}">neste espaço</a> nos comentários.
-        proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, que você segue, publicou uma nova proposta chamada "%{resource_title}". Verifique e contribua:'
-          email_outro: Recebeu esta notificação porque segue %{author_nickname}. Pode parar de receber notificações seguindo a hiperligação anterior.
-          email_subject: Nova proposta "%{resource_title}" por %{author_nickname}
-          notification_title: A proposta <a href="%{resource_path}">%{resource_title}</a> foi publicada por <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         proposal_published_for_space:
           email_intro: A proposta "%{resource_title}" foi adicionada a "%{participatory_space_title}" que você segue.
           email_outro: Recebeu esta notificação porque segue "%{participatory_space_title}". Pode deixar de receber notificações seguindo a hiperligação anterior.
diff --git a/decidim-proposals/config/locales/ro-RO.yml b/decidim-proposals/config/locales/ro-RO.yml
index 24f2f3d18141e..4cb7e5f8fc323 100644
--- a/decidim-proposals/config/locales/ro-RO.yml
+++ b/decidim-proposals/config/locales/ro-RO.yml
@@ -177,22 +177,16 @@ ro:
             accept: Acceptă
         collaborative_draft_access_accepted:
           email_subject: "Utilizatorul %{requester_name} a fost acceptat drept colaborator pentru %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> a fost <strong>acceptat drept colaborator</strong> pentru ciorna colaborativă <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_rejected:
           email_subject: "%{requester_name} a fost respins drept colaborator pentru ciorna colaborativă %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> a fost <strong>respins drept colaborator</strong> pentru ciorna colaborativă <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requested:
           email_subject: "%{requester_name} a solicitat acces pentru a contribui la %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> a solicitat acces pentru a contribui la ciorna colaborativă <a href="%{resource_path}">%{resource_title}</a>. Te rugăm <strong>acceptă sau respinge cererea</strong>.
         collaborative_draft_access_requester_accepted:
           email_subject: Ai fost acceptat drept colaborator pentru %{resource_title}.
           notification_title: Ai fost <strong>acceptat drept colaborator</strong> pentru ciorna colaborativă <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requester_rejected:
           email_subject: Ai fost respins drept colaborator pentru %{resource_title}.
           notification_title: Ai fost <strong>respins drept colaborator</strong> pentru ciorna colaborativă <a href="%{resource_path}">%{resource_title}</a>.
-        collaborative_draft_withdrawn:
-          email_subject: "%{author_name} %{author_nickname} a retras ciorna colaborativă %{resource_title}."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>a retras</strong> ciorna colaborativă <a href="%{resource_path}">%{resource_title}</a>.
         creation_enabled:
           email_intro: 'Acum poți crea propuneri noi pentru %{participatory_space_title}! Participă acum la această pagină:'
           email_outro: Ai primit această notificare deoarece urmărești %{participatory_space_title}. Poți anula aceste notificări de la link-ul anterior.
@@ -207,11 +201,6 @@ ro:
           email_outro: Ați primit această notificare deoarece sunteți autorul propunerii.
           email_subject: Propunerea %{resource_title} a fost fuzionată
           notification_title: Propunerea <a href="%{resource_path}">%{resource_title}</a> a fost fuzionată de un administrator.
-        proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, pe care îl urmărești, a publicat o nouă propunere denumită "%{resource_title}". Verifică propunerea și colaborează:'
-          email_outro: Ai primit această notificare deoarece urmărești %{author_nickname}. Poți înceta să primești notificări urmând linkul anterior.
-          email_subject: O nouă propunere "%{resource_title}" de la %{author_nickname}
-          notification_title: Propunerea <a href="%{resource_path}">%{resource_title}</a> a fost publicată de <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         proposal_published_for_space:
           email_intro: Propunerea "%{resource_title}" a fost adăugată la "%{participatory_space_title}", spațiu participativ pe care îl urmărești.
           email_outro: Ai primit această notificare deoarece urmărești „%{participatory_space_title}”. Poți anula aceste notificări de la link-ul anterior.
diff --git a/decidim-proposals/config/locales/ru.yml b/decidim-proposals/config/locales/ru.yml
index 7c79e214f37d5..d49d4249fb2b9 100644
--- a/decidim-proposals/config/locales/ru.yml
+++ b/decidim-proposals/config/locales/ru.yml
@@ -76,9 +76,6 @@ ru:
         proposal_mentioned:
           email_subject: Ваше предложение "%{mentioned_proposal_title}"было упомянуто
           notification_title: Ваше предложение «%{mentioned_proposal_title}» было упомянуто в комментариях <a href="%{resource_path}">в этом пространстве</a>.
-        proposal_published:
-          email_outro: Вы получили это уведомление, потому что вы следите за «%{author_nickname}». Вы можете отписаться от уведомлений, перейдя по приведенной выше ссылке.
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> обнародовал предложение <a href="%{resource_path}">%{resource_title}</a>.
         proposal_published_for_space:
           email_intro: В "%{participatory_space_title}", за которым вы следите, добавлено предложение "%{resource_title}".
           email_outro: Вы получили это уведомление, потому что вы следите за «%{participatory_space_title}». Вы можете перестать за ним следить, перейдя по приведенной выше ссылке.
diff --git a/decidim-proposals/config/locales/sk.yml b/decidim-proposals/config/locales/sk.yml
index 19f73e4078180..d7940c924ca63 100644
--- a/decidim-proposals/config/locales/sk.yml
+++ b/decidim-proposals/config/locales/sk.yml
@@ -281,17 +281,13 @@ sk:
             email_intro: '%{author_name} vytvoril/a súkromnú poznámku v %{resource_title}. Pozrite si to v <a href="%{admin_proposal_info_url}">paneli administrátora</a>.'
             email_outro: Toto upozornenie ste dostali, pretože môžete hodnotiť návrh.
             email_subject: Niekto zanechal poznámku k návrhu %{resource_title}.
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> vytvoril/a súkromnú poznámku v <a href="%{resource_path}">%{resource_title}</a>. Pozrite si to v <a href="%{admin_proposal_info_path}">paneli administrátora</a>.
           proposal_note_mentioned:
-            email_intro: Boli ste spomenutý/á v súkromnej poznámke v „%{resource_title}“ používateľom „%{author_name}“ „%{author_nickname}“. Pozrite si to v <a href="%{admin_proposal_info_url}">paneli administrátora</a>.
             email_outro: Toto upozornenie ste dostali, pretože ste boli spomenutý/á v súkromnej poznámke.
             email_subject: Niekto vás spomenul v poznámke k návrhu %{resource_title}.
-            notification_title: Boli ste spomenutý/á v súkromnej poznámke v <a href="%{resource_path}">%{resource_title}</a> používateľom <a href="%{author_path}">%{author_name} %{author_nickname}</a>. Pozrite si to v <a href="%{admin_proposal_info_path}">paneli administrátora</a>.
           proposal_note_replied:
             email_intro: '%{author_name} odpovedal/a na vašu súkromnú poznámku v %{resource_title}. Pozrite si to v <a href="%{admin_proposal_info_url}">paneli administrátora</a>.'
             email_outro: Toto upozornenie ste dostali, pretože ste autorom poznámky.
             email_subject: "%{author_name} odpovedal/a na vašu súkromnú poznámku v %{resource_title}."
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> odpovedal/a na vašu súkromnú poznámku v <a href="%{resource_path}">%{resource_title}</a>. Pozrite si to v <a href="%{admin_proposal_info_path}">paneli administrátora</a>.
         coauthor_accepted_invite:
           notification_title: <a href="%{coauthor_path}">%{coauthor_name}</a> prijal/a vašu pozvánku stať sa spoluautorom návrhu <a href="%{resource_path}">%{resource_title}</a>.
         coauthor_invited:
@@ -308,17 +304,14 @@ sk:
           email_intro: '%{requester_name} bol/a prijatý/á ako prispievateľ do spoločného konceptu <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Toto upozornenie ste dostali, pretože ste spolupracovníkom <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} bol prijatý k prístupu ako prispievateľ %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname} </a> je <strong> má prístup ako prispievateľ </strong> v spoločnom návrhu <a href="%{resource_path}">%{resource_title} </a>.
         collaborative_draft_access_rejected:
           email_intro: '%{requester_name} bol/a odmietnutý/á ako prispievateľ do spoločného konceptu <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Toto upozornenie ste dostali, pretože ste spolupracovníkom <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} mal odmietnutý pre prístup ako prispievateľ ku %{resource_title} kolektívnemu návrhu."
-          notification_title: <a href="%{requester_path}">%{requester_name}%{requester_nickname} </a><strong> mal odmietnutý prístup ako prispievateľ </strong>ku spoločnému návrhu <a href = "%{resource_path}" >%{resource_title} </a>.
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} požiadal/a o prístup ako prispievateľ. Žiadosť môžete <strong>prijať alebo odmietnuť</strong> na stránke spoločného konceptu <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Toto upozornenie ste dostali, pretože ste spolupracovníkom <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} požiadal o prístup ku spolupráci na %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name}%{requester_nickname} </a> požiadal o prístup ku spolupráci na <a href="%{resource_path}">%{resource_title} </a>. Prosíme <strong> prijmite alebo odmietnite žiadosť </strong>.
         collaborative_draft_access_requester_accepted:
           email_intro: Boli ste prijatý/á ako prispievateľ do spoločného konceptu <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Toto upozornenie ste dostali, pretože ste požiadali o to, aby ste sa stali spolupracovníkom <a href="%{resource_url}">%{resource_title}</a>.
@@ -330,10 +323,7 @@ sk:
           email_subject: Bol ste odmietnutý ako prispievateľ ku %{resource_title}.
           notification_title: Boli ste <strong> odmietnutý ako prispievateľ ku </strong> spoločnému návrhu <a href="%{resource_path}">%{resource_title} </a>.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> stiahol/stiahla spoločný koncept <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Toto upozornenie ste dostali, pretože ste spolupracovníkom <a href="%{resource_url}">%{resource_title}</a>.
-          email_subject: "% {AUTHOR_NAME}% {author_nickname} stiahol% {resource_title} návrh spolupráce."
-          notification_title: <a href="%{author_path}">% {AUTHOR_NAME}% {author_nickname} </a> <strong> stiahnuté </ strong> <a href="%{resource_path}">% {resource_title} </ a> návrh spolupráce.
         creation_enabled:
           email_intro: 'Teraz môžete vytvoriť nové návrhy v %{participatory_space_title}! Zúčastnite sa na tejto stránke: '
           email_outro: Toto oznámenie ste dostali, pretože sledujete %{participatory_space_title}. Notifikácie môžete zrušiť po kliknutí na predchádzajúci odkaz.
@@ -354,11 +344,6 @@ sk:
           email_outro: Toto upozornenie ste dostali, pretože ste autorom návrhu.
           email_subject: Návrh %{resource_title} bol zlúčený
           notification_title: Návrh <a href="%{resource_path}">%{resource_title}</a> bol zlúčený administrátorom.
-        proposal_published:
-          email_intro: '% {AUTHOR_NAME}% {author_nickname}, ktorý sledujete, zverejnil nový návrh nazvaný "% {resource_title}". Vyskúšajte to a prispejte: '
-          email_outro: Toto oznámenie ste dostali, pretože sledujete %{author_nickname}. Notifikácie môžete zrušiť po kliknutí na predchádzajúci odkaz.
-          email_subject: Nový návrh "%{resource_title}" o%{author_nickname}
-          notification_title: Návrh <a href="%{resource_path}">% {resource_title} </a> bol zverejnený <a href="%{author_path}">% {AUTHOR_NAME}% {author_nickname} </a>.
         proposal_published_for_space:
           email_intro: Návrh "%{resource_title}" bol pridaný k "%{participatory_space_title}", ktorý sledujete.
           email_outro: Toto oznámenie ste dostali, pretože sledujete "%{participatory_space_title}". Môžete ho odhlásiť od predchádzajúceho odkazu.
diff --git a/decidim-proposals/config/locales/sv.yml b/decidim-proposals/config/locales/sv.yml
index 2f78b0d28b810..eab20ab9c740b 100644
--- a/decidim-proposals/config/locales/sv.yml
+++ b/decidim-proposals/config/locales/sv.yml
@@ -273,17 +273,13 @@ sv:
             email_intro: '%{author_name} har skapat en privat anteckning till %{resource_title}. Kolla in den i <a href="%{admin_proposal_info_url}">adminpanelen</a>.'
             email_outro: Du har fått det här meddelandet eftersom du kan utvärdera förslaget.
             email_subject: Någon skrev en anteckning till förslaget %{resource_title}.
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> har gjort en privat anteckning till <a href="%{resource_path}">%{resource_title}</a>. Kolla in den i <a href="%{admin_proposal_info_path}">adminpanelen</a>.
           proposal_note_mentioned:
-            email_intro: Du har nämnts i en privat anteckning till "%{resource_title}" av "%{author_name}" "%{author_nickname}". Kolla in det i <a href="%{admin_proposal_info_url}">adminpanelen</a>.
             email_outro: Du har fått den här meddelandet eftersom du har nämnts i en privat anteckning.
             email_subject: Någon nämnde dig i en anteckning till förslaget %{resource_title}.
-            notification_title: Du har nämnts i en privat anteckning i <a href="%{resource_path}">%{resource_title}</a> av <a href="%{author_path}">%{author_name} %{author_nickname}</a>. Kolla in det i <a href="%{admin_proposal_info_path}">adminpanelen</a>.
           proposal_note_replied:
             email_intro: '%{author_name} har svarat på din privata anteckning i %{resource_title}. Kolla in den i <a href="%{admin_proposal_info_url}">adminpanelen</a>.'
             email_outro: Du har fått det här meddelandet eftersom du är skrivit anteckningen.
             email_subject: "%{author_name} har svarat på din privata anteckning i %{resource_title}."
-            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> har svarat din privata anteckning i <a href="%{resource_path}">%{resource_title}</a>. Kolla in den i <a href="%{admin_proposal_info_path}">adminpanelen</a>.
         coauthor_accepted_invite:
           notification_title: <a href="%{coauthor_path}">%{coauthor_name}</a> har accepterat din inbjudan att bli medförfattare till förslaget <a href="%{resource_path}">%{resource_title}</a>.
         coauthor_invited:
@@ -300,17 +296,14 @@ sv:
           email_intro: '%{requester_name} har blivit godkänd som medförfattare till det gemensamma utkastet <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Du har fått det här meddelandet eftersom du är författare till <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} har fått tillgång till och är accepterad som medskapare till %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> har <strong>fått tillgång till och accepterats som medskapare till</strong> det gemensamma utkastet <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_rejected:
           email_intro: '%{requester_name} har avvisats som medförfattare till <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Du har fått det här meddelandet eftersom du är en medskapare av <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} har avvisats från att få tillgång till det gemensamma utkastet %{resource_title} som medskapare."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> har <strong>avvisats från att få tillgång till</strong> det gemensamma utkastet <a href="%{resource_path}">%{resource_title}</a> som medskapare.
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} har begärt att bli medförfattare. Du kan <strong>acceptera eller avvisa begäran</strong> från sidan för det gemensamma utkastet, <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: Du har fått det här meddelandet eftersom du är en medskapare av <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} begärde tillgång att bidra till %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> begärde tillgång för att få bidra till det gemensamma utkastet <a href="%{resource_path}">%{resource_title}</a>. <strong>Godkänn eller avvisa begäran</strong>.
         collaborative_draft_access_requester_accepted:
           email_intro: Du har godkänts som medskapare av det gemensamma utkastet <a href="%{resource_path}">%{resource_title}</a>.
           email_outro: Du har fått det här meddelandet eftersom du bad om att bli medskapare av <a href="%{resource_url}">%{resource_title}</a>.
@@ -322,10 +315,7 @@ sv:
           email_subject: Du har blivit avvisad som medskapare till %{resource_title}.
           notification_title: Du har blivit <strong>avvisad tillgång till </strong> det gemensamma utkastet <a href="%{resource_path}">%{resource_title}</a> som medskapare.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> drog tillbaka det gemensamma utkastet <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: Du har fått det här meddelandet eftersom du är en medskapare av <a href="%{resource_url}">%{resource_title}</a>.
-          email_subject: "%{author_name} %{author_nickname} drog tillbaka det gemensamma utkastet %{resource_title}."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>drog tillbaka</strong> det gemensamma utkastet <a href="%{resource_path}">%{resource_title}</a>.
         creation_enabled:
           email_intro: 'Nu kan du skapa nya förslag på %{participatory_space_title}! Börja delta på den här sidan:'
           email_outro: Du har fått det här meddelandet eftersom du följer %{participatory_space_title}. Du kan sluta att ta emot meddelanden via föregående länk.
@@ -346,11 +336,6 @@ sv:
           email_outro: Du har fått det här meddelandet eftersom du har skrivit förslaget.
           email_subject: Förslaget %{resource_title} har slagits samman
           notification_title: Förslaget <a href="%{resource_path}">%{resource_title}</a> har slagits samman av en administratör.
-        proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, som du följer, har publicerat ett nytt förslag som heter "%{resource_title}". Ta en titt och bidra:'
-          email_outro: Du har fått den här notifikationen eftersom du följer %{author_nickname}. Du kan sluta ta emot notifikationer från föregående länken.
-          email_subject: Nytt förslag "%{resource_title}" av %{author_nickname}
-          notification_title: Förslaget <a href="%{resource_path}">%{resource_title}</a> publicerades av <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         proposal_published_for_space:
           email_intro: Förslaget "%{resource_title}" har lagts till i "%{participatory_space_title}" som du följer.
           email_outro: Du har fått det här meddelandet eftersom du följer "%{participatory_space_title}". Du kan sluta att ta emot meddelanden genom att följa föregående länk.
diff --git a/decidim-proposals/config/locales/tr-TR.yml b/decidim-proposals/config/locales/tr-TR.yml
index 9289126c7ba44..e7f70b8358103 100644
--- a/decidim-proposals/config/locales/tr-TR.yml
+++ b/decidim-proposals/config/locales/tr-TR.yml
@@ -144,22 +144,16 @@ tr:
             accept: Kabul Et
         collaborative_draft_access_accepted:
           email_subject: "%{requester_name}, %{resource_title} katkı sağlayıcısı olarak erişim için kabul edildi."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname} </a> için <strong> katkıda bulunan </strong> olarak erişim için kabul edildi <a href = "%{resource_path}">%{resource_title} </a> ortak çalışma taslağı.
         collaborative_draft_access_rejected:
           email_subject: "%{requester_name}, %{resource_title} ortak çalışma taslağına katkıda bulunan kişi olarak erişimi reddedildi."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> , <a href="%{resource_path}">%{resource_title}</a> işbirlikçi taslağın bir katkıcısı</strong> olarak erişmek için <strong>reddedilmiştir.
         collaborative_draft_access_requested:
           email_subject: "%{requester_name}, %{resource_title} kaynağına katkıda bulunmak için erişim istedi."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname} </a>, <a href="%{resource_path}">%{resource_title} </a> ortak çalışma taslağına katkıda bulunmak için erişim istedi. Lütfen <strong> isteği kabul edin veya reddedin </strong>.
         collaborative_draft_access_requester_accepted:
           email_subject: '%{resource_title} katılımcısı olarak kabul edildiniz.'
           notification_title: <a href="%{resource_path}">%{resource_title} </a> ortak çalışma taslağına <strong> katkıda bulunan kişi olarak erişmeniz kabul edildi </strong>.
         collaborative_draft_access_requester_rejected:
           email_subject: '%{resource_title} katılımcısı olarak reddedildiniz.'
           notification_title: <a href="%{resource_path}">%{resource_title} </a> ortak çalışma taslağına <strong> katkıda bulunan olarak erişiminiz reddedildi </strong>.
-        collaborative_draft_withdrawn:
-          email_subject: "%{author_name} %{author_nickname}, %{resource_title} ortak çalışma taslağını geri çekti."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname} </a> <a href="%{resource_path}">%{resource_title} </a> işbirlikçi taslak öğesini <strong> geri çekti </strong>.
         creation_enabled:
           email_intro: 'Artık %{participatory_space_title} içinde yeni teklifler oluşturabilirsiniz! Bu sayfaya katılmaya başlayın:'
           email_outro: Bu bildirimi, %{participatory_space_title} adlı kişiyi takip ettiğiniz için aldınız. Önceki bağlantıyı izleyerek bildirim almayı durdurabilirsiniz.
@@ -169,11 +163,6 @@ tr:
           email_outro: Bu bildirimi, "%{resource_title}" ın bir yazarı olduğunuz için aldınız.
           email_subject: '"%{mentioned_proposal_title}" adlı teklifinizden bahsedildi'
           notification_title: <a href="%{resource_path}"> Bu alanda </a> yorumlarda "%{mentioned_proposal_title}" önerinizden bahsedildi.
-        proposal_published:
-          email_intro: 'Takip ettiğiniz %{author_name} %{author_nickname}, "%{resource_title}" adlı yeni bir teklif yayınladı. Kontrol edin ve katkıda bulunun:'
-          email_outro: Bu bildirimi %{author_nickname} adlı kişiyi takip ettiğiniz için aldınız. Önceki bağlantıyı izleyerek bildirim almayı durdurabilirsiniz.
-          email_subject: Yeni teklif "%{resource_title}" %{author_nickname}
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> teklif <a href="%{author_path}">%{author_name} %{author_nickname}</a>tarafından yayınlandı.
         proposal_published_for_space:
           email_intro: '"%{resource_title}" teklifi takip ettiğiniz "%{participatory_space_title}" listesine eklendi.'
           email_outro: Bu bildirimi, "%{participatory_space_title}" takip ettiğiniz için aldınız. Bir önceki bağlantıdan takip etmeyi bırakabilirsiniz.
diff --git a/decidim-proposals/config/locales/uk.yml b/decidim-proposals/config/locales/uk.yml
index cedc6eefae9f5..f0a586837efd5 100644
--- a/decidim-proposals/config/locales/uk.yml
+++ b/decidim-proposals/config/locales/uk.yml
@@ -72,9 +72,6 @@ uk:
         proposal_mentioned:
           email_subject: Вашу пропозицію "%{mentioned_proposal_title}" було згадано
           notification_title: Вашу пропозицію "%{mentioned_proposal_title}" було згадано в коментарях <a href="%{resource_path}">в цьому просторі</a>.
-        proposal_published:
-          email_outro: Ви отримали це сповіщення, тому що ви стежите за %{author_nickname}. Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> оприлюднив пропозицію <a href="%{resource_path}">%{resource_title}</a>.
         proposal_published_for_space:
           email_intro: До "%{participatory_space_title}", за яким ви стежите, була додана пропозиція "%{resource_title}".
           email_outro: Ви отримали це сповіщення, тому що ви стежите за "%{participatory_space_title}". Ви можете припинити стежити за ним, перейшовши за наведеним вище посиланням.
diff --git a/decidim-proposals/config/locales/zh-CN.yml b/decidim-proposals/config/locales/zh-CN.yml
index 964049e490186..cbf779f0f9dfc 100644
--- a/decidim-proposals/config/locales/zh-CN.yml
+++ b/decidim-proposals/config/locales/zh-CN.yml
@@ -123,18 +123,13 @@ zh-CN:
           email_subject: "%{requester_name} 已被接受作为贡献者访问 %{resource_title}。"
         collaborative_draft_access_rejected:
           email_subject: "%{requester_name} 在 %{resource_title} 协作草稿中的贡献者被拒绝访问。"
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> 已被 <strong>拒绝以贡献者身份访问</strong> <a href="%{resource_path}">%{resource_title}</a> 合作草稿。
         collaborative_draft_access_requested:
           email_subject: "%{requester_name} 请求访问权限为 %{resource_title} 捐款。"
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> 请求访问权限以便为 <a href="%{resource_path}">%{resource_title}</a> 协作草稿。请 <strong>接受或拒绝请求</strong>
         collaborative_draft_access_requester_accepted:
           email_subject: 您已被接受为 %{resource_title} 的贡献者。
         collaborative_draft_access_requester_rejected:
           email_subject: 您已被拒绝为 %{resource_title} 的贡献者。
           notification_title: 您在 <a href="%{resource_path}">%{resource_title}</a> 协作草稿中的 <strong>被拒绝作为贡献者</strong> 访问。
-        collaborative_draft_withdrawn:
-          email_subject: "%{author_name} %{author_nickname} 撤销了 %{resource_title} 协作草稿。"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>撤回</strong> <a href="%{resource_path}">%{resource_title}</a> 协作草稿。
         creation_enabled:
           email_intro: '您现在可以在 %{participatory_space_title}中创建新的建议 ！开始参与这个页面：'
           email_outro: 您收到此通知是因为您正在关注 %{participatory_space_title}。您可以停止收到跟随上一个链接的通知。
@@ -142,11 +137,6 @@ zh-CN:
         proposal_mentioned:
           email_outro: 您收到此通知是因为您是"%{resource_title} "的作者。
           email_subject: 您的提议 "%{mentioned_proposal_title}" 已被提到了
-        proposal_published:
-          email_intro: '%{author_name} %{author_nickname}, 你关注的人已经发布了一个叫做"%{resource_title}"的新建议。查看它并做出贡献：'
-          email_outro: 您收到此通知是因为您正在关注 %{author_nickname}。您可以停止收到跟随上一个链接的通知。
-          email_subject: '%{resource_title}的 %{author_nickname} 新提案'
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> 提议由 <a href="%{author_path}">%{author_name} %{author_nickname}</a> 发布。
         proposal_published_for_space:
           email_intro: 提议 "%{resource_title}" 已被添加到"%{participatory_space_title}"，您正在关注它。
           email_outro: 您收到此通知是因为您正在关注 "%{participatory_space_title}"。您可以停止收到跟随上一个链接的通知。
diff --git a/decidim-proposals/config/locales/zh-TW.yml b/decidim-proposals/config/locales/zh-TW.yml
index 30b13af2dd0c4..f36daae06bcc9 100644
--- a/decidim-proposals/config/locales/zh-TW.yml
+++ b/decidim-proposals/config/locales/zh-TW.yml
@@ -162,17 +162,14 @@ zh-TW:
           email_intro: '%{requester_name} 已經被接受成為 <a href="%{resource_url}">%{resource_title}</a> 協作草稿的貢獻者。'
           email_outro: 您收到此通知，是因為您是 <a href="%{resource_url}">%{resource_title}</a> 的協作者。
           email_subject: "%{requester_name} 已被接受為 %{resource_title} 的貢獻者。"
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> 已被<strong>接受為共同編輯者</strong>，可存取<a href="%{resource_path}">%{resource_title}</a>的共同協作草稿。
         collaborative_draft_access_rejected:
           email_intro: '%{requester_name} 已被拒絕加入<a href="%{resource_url}">%{resource_title}</a>協作草稿的貢獻者名單。'
           email_outro: 您收到此通知，是因為您是 <a href="%{resource_url}">%{resource_title}</a> 的協作者。
           email_subject: "%{requester_name} 已被拒絕加入 %{resource_title} 協作草稿的貢獻者名單。"
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> 被拒絕成為<a href="%{resource_path}">%{resource_title}</a>協作草稿的貢獻者。
         collaborative_draft_access_requested:
           email_intro: '%{requester_name} 提出了成為貢獻者的請求。您可以在 <a href="%{resource_url}">%{resource_title}</a> 協作草稿頁面中<strong>接受或拒絕該請求</strong>。'
           email_outro: 您收到此通知，是因為您是 <a href="%{resource_url}">%{resource_title}</a> 的協作者。
           email_subject: "%{requester_name} 要求加入以貢獻至 %{resource_title}。"
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> 要求加入以貢獻協作草稿 <a href="%{resource_path}">%{resource_title}</a>，請 <strong>接受或拒絕該請求</strong>。
         collaborative_draft_access_requester_accepted:
           email_intro: 您已被允許訪問<a href="%{resource_url}">%{resource_title}</a>協作草稿，以作為貢獻者。
           email_outro: 您收到此通知是因為您請求成為<a href="%{resource_url}">%{resource_title}</a>的協作者。
@@ -184,10 +181,7 @@ zh-TW:
           email_subject: 你的協作者申請已被拒絕，無法成為 %{resource_title} 的貢獻者。
           notification_title: 你的<a href="%{resource_path}">%{resource_title}</a>協作草稿的貢獻者申請已被拒絕。
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a>已撤回<a href="%{resource_url}">%{resource_title}</a>協作草稿。
           email_outro: 您收到此通知，是因為您是 <a href="%{resource_url}">%{resource_title}</a> 的協作者。
-          email_subject: "%{author_name} %{author_nickname} 撤回了 %{resource_title} 的協作草稿。"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>撤回了</strong> <a href="%{resource_path}">%{resource_title}</a> 的協作草稿。
         creation_enabled:
           email_intro: '你現在可以在 %{participatory_space_title} 中建立新的提案了！開始參與此頁面：'
           email_outro: 你收到此通知是因為你正在追蹤 %{participatory_space_title}。你可以透過前面的連結停止接收通知。
@@ -198,11 +192,6 @@ zh-TW:
           email_outro: 你收到此通知，是因為你是「%{resource_title}」的作者。
           email_subject: 你的提案「%{mentioned_proposal_title}」已被提及。
           notification_title: 你的提案「%{mentioned_proposal_title}」在評論中被提及，<a href="%{resource_path}">請至此空間查看</a>。
-        proposal_published:
-          email_intro: '%{author_name} %{author_nickname}，你正在關注的用戶，已經發布了一個名為“%{resource_title}”的新提案。快去看看並參與：'
-          email_outro: 您收到此通知，是因為您正在關注 %{author_nickname}。您可以使用上面的連結停止接收通知。
-          email_subject: 新提案「%{resource_title}」由 %{author_nickname} 提交
-          notification_title: 提案 <a href="%{resource_path}">%{resource_title}</a> 由 <a href="%{author_path}">%{author_name} %{author_nickname}</a> 提出。
         proposal_published_for_space:
           email_intro: 您正在追蹤的「%{participatory_space_title}」中新增了提案「%{resource_title}」。
           email_outro: 收到這個提醒是因為訂閱了 "%{participatory_space_title}" ，透過上面連結可以停止訂閱。
diff --git a/decidim-system/config/locales/cs.yml b/decidim-system/config/locales/cs.yml
index 83cc81e5379ec..db8e601be503a 100644
--- a/decidim-system/config/locales/cs.yml
+++ b/decidim-system/config/locales/cs.yml
@@ -47,6 +47,7 @@ cs:
     system:
       actions:
         api_user:
+          hidden_secret: Tajný klíč je skrytý
           hide_secret: Skrýt tajný klíč
           secret_can_not_be_shown: API secret může být zobrazeno nebo zkopírováno pouze po vytvoření
           show_secret: Zobrazit tajný klíč
@@ -187,6 +188,7 @@ cs:
               explanation: Aplikace, které nemohou používat registrované zákaznické tajemství, jako jsou aplikace běžící v prohlížeči nebo na mobilním zařízení.
               name: Veřejné
           application_type_help_html: 'Typ OAuth klienta definovaný <a href="%{client_type_link}" target="_blank">RFC 6749 Oddíl 2.1</a>. Veřejní klienti musí realizovat tok PKCE definovaný <a href="%{pkce_link}" target="_blank">RFC 7636</a>. '
+          refresh_tokens_help_html: 'Aktualizovat tokeny je užitečné v případě, že token potřebuje delší životnost, než je přiděleno pro přístupový token. Všimněte si, že <strong>obnovovací tokeny by měly být používány pečlivě</strong>, protože mohou oslabit bezpečnost vašich uživatelů. '
           select_organization: Vybrat organizaci
         index:
           confirm_delete: Jste si jisti, že chcete odstranit tuto žádost?

From e28a48f3786c3fd472162d7ab931e43bfc46d496 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Wed, 29 Jul 2026 23:16:42 +0200
Subject: [PATCH 126/131] Update Crowdin configuration file

[ci skip]
---
 crowdin.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crowdin.yaml b/crowdin.yaml
index c8ec1bce62c2f..1050580e75c0c 100644
--- a/crowdin.yaml
+++ b/crowdin.yaml
@@ -34,7 +34,7 @@ files:
         lv: lv
         mt: mt
         nl: nl
-        no: no
+        'no': 'no'
         pl: pl
         pt: pt
         pt-PT: pt

From a065c4d2b98e675dbc333862e30becb3712d5372 Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Wed, 29 Jul 2026 23:55:12 +0200
Subject: [PATCH 127/131] New Crowdin updates (#17389)

* New translations en.yml (Polish)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (Turkish)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (Spanish)

[ci skip]

* New translations en.yml (Catalan)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Polish)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (French)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (French, Canada)

[ci skip]

* New translations en.yml (Spanish)

[ci skip]

* New translations en.yml (Catalan)

[ci skip]

* New translations en.yml (Basque)

[ci skip]

* New translations en.yml (Finnish)

[ci skip]

* New translations en.yml (Japanese)

[ci skip]

* New translations en.yml (Spanish, Mexico)

[ci skip]

* New translations en.yml (Spanish, Paraguay)

[ci skip]

* New translations en.yml (Finnish (plain))

[ci skip]

* New translations en.yml (Catalan, Algherese)

[ci skip]
---
 decidim-accountability/config/locales/pl.yml  |  3 ++
 decidim-admin/config/locales/fr-CA.yml        |  3 ++
 decidim-admin/config/locales/fr.yml           |  3 ++
 decidim-admin/config/locales/tr-TR.yml        | 28 ++++++++++++++++
 decidim-assemblies/config/locales/fr-CA.yml   |  2 ++
 decidim-assemblies/config/locales/fr.yml      |  2 ++
 decidim-budgets/config/locales/fr-CA.yml      |  1 +
 decidim-budgets/config/locales/fr.yml         |  1 +
 .../config/locales/fr-CA.yml                  |  7 ++++
 .../config/locales/fr.yml                     |  7 ++++
 decidim-core/config/locales/ca-IT.yml         |  5 +++
 decidim-core/config/locales/ca.yml            |  5 +++
 decidim-core/config/locales/es-MX.yml         |  5 +++
 decidim-core/config/locales/es-PY.yml         |  5 +++
 decidim-core/config/locales/es.yml            |  5 +++
 decidim-core/config/locales/eu.yml            |  5 ++-
 decidim-core/config/locales/fi-plain.yml      |  5 +++
 decidim-core/config/locales/fi.yml            |  5 +++
 decidim-core/config/locales/fr-CA.yml         |  6 ++++
 decidim-core/config/locales/fr.yml            |  6 ++++
 decidim-core/config/locales/ja.yml            |  5 +++
 decidim-core/config/locales/pl.yml            |  2 ++
 decidim-elections/config/locales/fr-CA.yml    |  1 +
 decidim-elections/config/locales/fr.yml       |  1 +
 decidim-forms/config/locales/fr-CA.yml        |  2 ++
 decidim-forms/config/locales/fr.yml           |  2 ++
 decidim-initiatives/config/locales/fi.yml     |  2 +-
 decidim-initiatives/config/locales/fr-CA.yml  | 32 +++++++++++++++++++
 decidim-initiatives/config/locales/fr.yml     | 32 +++++++++++++++++++
 decidim-proposals/config/locales/ca-IT.yml    |  1 +
 decidim-proposals/config/locales/ca.yml       |  1 +
 decidim-proposals/config/locales/es-MX.yml    |  1 +
 decidim-proposals/config/locales/es-PY.yml    |  1 +
 decidim-proposals/config/locales/es.yml       |  1 +
 decidim-proposals/config/locales/eu.yml       |  1 +
 decidim-proposals/config/locales/fi-plain.yml |  1 +
 decidim-proposals/config/locales/fi.yml       |  1 +
 decidim-proposals/config/locales/ja.yml       |  1 +
 38 files changed, 195 insertions(+), 2 deletions(-)

diff --git a/decidim-accountability/config/locales/pl.yml b/decidim-accountability/config/locales/pl.yml
index 84eba6b62320b..0bc8435871f89 100644
--- a/decidim-accountability/config/locales/pl.yml
+++ b/decidim-accountability/config/locales/pl.yml
@@ -2,6 +2,9 @@
 pl:
   activemodel:
     attributes:
+      milestone:
+        description: Opis
+        entry_date: Data
       result:
         decidim_accountability_status_id: Status
         decidim_category_id: Kategoria
diff --git a/decidim-admin/config/locales/fr-CA.yml b/decidim-admin/config/locales/fr-CA.yml
index 46783f47e9342..20257fc792420 100644
--- a/decidim-admin/config/locales/fr-CA.yml
+++ b/decidim-admin/config/locales/fr-CA.yml
@@ -1202,6 +1202,8 @@ fr-CA:
           confirm_destroy: 'Êtes-vous sûr de vouloir supprimer le filtre %{name}? NOTE : Les ressources qui utilisent ce filtre ne seront pas affectées, mais elles perdront la référence à ce filtre.'
           destroy: Supprimer
           edit: Modifier
+          internal_name: Identifiant interne
+          name: Identifiant
         update:
           error: Il y a eu un problème lors de la mise à jour de ce filtre de taxonomie.
           success: Filtre de taxonomie mis à jour avec succès.
@@ -1320,6 +1322,7 @@ fr-CA:
             unreport:
               failed: 'Un problème a été rencontré lors du dé-signalement de certaines ressources %{errored}'
               invalid: Aucune modération sélectionnée.
+              success: Signalement des ressources annulé succès.
           hide:
             invalid: Il y a eu un problème au moment de masquer le contenu.
             success: Contenu masqué avec succès.
diff --git a/decidim-admin/config/locales/fr.yml b/decidim-admin/config/locales/fr.yml
index 13af5289b4f80..e0bbbc92595f8 100644
--- a/decidim-admin/config/locales/fr.yml
+++ b/decidim-admin/config/locales/fr.yml
@@ -1202,6 +1202,8 @@ fr:
           confirm_destroy: 'Êtes-vous sûr de vouloir supprimer le filtre %{name}? NOTE : Les ressources qui utilisent ce filtre ne seront pas affectées, mais elles perdront la référence à ce filtre.'
           destroy: Supprimer
           edit: Modifier
+          internal_name: Identifiant interne
+          name: Identifiant
         update:
           error: Il y a eu un problème lors de la mise à jour de ce filtre de taxonomie.
           success: Filtre de taxonomie mis à jour avec succès.
@@ -1320,6 +1322,7 @@ fr:
             unreport:
               failed: 'Un problème a été rencontré lors du dé-signalement de certaines ressources %{errored}'
               invalid: Aucune modération sélectionnée.
+              success: Signalement des ressources annulé succès.
           hide:
             invalid: Il y a eu un problème au moment de masquer le contenu.
             success: Contenu masqué avec succès.
diff --git a/decidim-admin/config/locales/tr-TR.yml b/decidim-admin/config/locales/tr-TR.yml
index 55e4e49a3f11a..92549553f5226 100644
--- a/decidim-admin/config/locales/tr-TR.yml
+++ b/decidim-admin/config/locales/tr-TR.yml
@@ -12,6 +12,7 @@ tr:
         plural: Çoğul
       attachment:
         attachment_collection_id: Klasör
+        attachments: Ekler
         description: Açıklama
         file: Dosya
         title: Ek veya resim adı
@@ -45,6 +46,7 @@ tr:
         alert_color: Alarm
         available_authorizations: Uygun yetkilendirmeler
         badges_enabled: Rozetleri etkinleştir
+        comments_max_length: Yorum başına en fazla karakter sayısı (varsayılan değer için 0 bırakın)
         customize_welcome_notification: Karşılama bildirimlerini özelleştir
         default_locale: Varsayılan yerel ayar
         description: Açıklama
@@ -127,6 +129,7 @@ tr:
         weight: Sıra numarası
       taxonomy:
         item_name: Öge adı
+        parent_id: Üst öge
       user_group_csv_verification:
         file: Dosya
     errors:
@@ -179,6 +182,7 @@ tr:
         attachment_collections: Klasör ekle
         attachments: Eklenti ekle
         browse: Araştır
+        configure: Yapılandır
         confirm_delete_component: |
           Bu bileşeni silmek istediğinizden emin misiniz? <br>
 
@@ -187,17 +191,23 @@ tr:
            <li class="font-bold"> %{resources_count} kaynakları </li>
           </ul>
           Fikrinizi değiştirirseniz daha sonra yeniden yükleyebilirsiniz.
+        export: Dışa aktar
         export_all: Tümünü dışa aktar
+        export_selection: Seçimi dışa aktar
         import: İçe aktar
         menu_hidden: Menüden gizle
+        moderate: İçerik denetimlerini yönet
         newsletter:
           new: Yeni bülten
         participatory_space_private_user:
           new: Yeni katılımcı alanı özel kullanıcısı
         per_page: Sayfa başına
+        permissions: İzinleri yönet
         restore: Geri yükle
         send_me_a_test_email: Bana bir test e-postası gönder
         share: Paylaş
+        share_tokens: Bağlantıyı paylaş
+        soft_delete: Çöp kutusuna taşı
         user:
           new: Yeni yönetici
         view_deleted_components: Silinmiş bileşenleri görüntüle
@@ -257,6 +267,8 @@ tr:
         edit:
           title: Klasörü düzenle
           update: Güncelleştirme
+        index:
+          attachment_collections_title: Ek klasörleri
         new:
           create: yaratmak
           title: Yeni dosya
@@ -272,6 +284,8 @@ tr:
         edit:
           title: Eki düzenle
           update: Güncelleştirme
+        index:
+          attachments_title: Ekler
         new:
           create: Ek oluştur
           title: Yeni ek
@@ -292,6 +306,7 @@ tr:
           title: Kullanıcıları engelle
         new:
           action: Hesabı engelle ve uyarı mesjı gönder
+          already_reported_html: Bu işleme devam ederseniz katılımcının tüm içeriklerini de gizleyeceksiniz.
           description: Bir kullanıcının engellenmesi, hesabının kullanılamaz hale gelmesine neden olur, gerekçenizde ve kullanıcının engellemesini kaldırmayı düşündüğünüz yollarla ilgili yönergeler sağlayabilirsiniz.
           justification: Gerekçe
           title: '%{name} Kullanıcısını Engelle'
@@ -337,13 +352,17 @@ tr:
           error: Bu bileşeni güncellerken bir hata oluştu.
           success: Bileşen başarıyla güncellendi.
         visibility_label:
+          menu_hidden: Menü gizli
           published: Yayınlanmış
           unpublished: Yayınlanmamış
       conflicts:
         attempts: Girişimler
         'false': 'Hayır'
+        index:
+          text: Mevcut kullanıcının e posta adresi, adı veya kullanıcı adıyla ara
         managed_user_name: Yönetilen Kullanıcı
         solved: Çözüldü
+        title: Doğrulama çakışmaları
         transfer:
           email: E-Posta
           error: Mevcut katılımcıyı yönetilen katılımcıya aktarırken bir sorun oluştu.
@@ -419,9 +438,13 @@ tr:
             'false': resmileştirilmiş
             'true': Resmi değil
         participatory_space_private_users:
+          user_invitation_accepted_at_not_null:
+            label: Davet kabul edildi
           user_invitation_sent_at_not_null:
+            label: Davet gönderildi
             values:
               'false': Gönderilmedi
+              'true': Gönderildi
         private_space_eq:
           label: Kişisel
           values:
@@ -436,6 +459,8 @@ tr:
         search_label: Arama
         search_placeholder:
           name_or_nickname_or_email_cont: '%{collection}''da e-posta, isim veya takma ad ile ara'
+          report_count_eq: Rapor sayısı eşittir
+          title_cont: '%{collection} içinde başlığa göre ara'
           user_name_or_user_nickname_or_user_email_cont: '%{collection}''da e-posta, isim veya takma ad ile ara'
         state_eq:
           label: Durum
@@ -545,6 +570,7 @@ tr:
         promotions:
           new:
             explanation: Yönetilen kullanıcılar standart kullanıcılara yükseltilebilir. Bu, uygulamaya davet edilecekleri anlamına gelir ve onları tekrar taklit edemezsiniz. Davet edilen kullanıcı davetinizi kabul etmek için bir e-posta alacak.
+            new_managed_user_promotion: Yeni yönetilen katılımcı yükseltme işlemi
             promote: Desteklemek
       menu:
         admin_log: Yönetici etkinlik günlüğü
@@ -1095,6 +1121,8 @@ tr:
         area_types: Alan türleri
         areas: alanlar
         authorization_workflows: Doğrulama yöntemleri
+        dashboard: Gösterge paneli
+        impersonatable_users: Yönetilebilir katılımcılar
         impersonations: Kullanıcılar yönetimi
         page_topics: Konular
         pages: Sayfalar
diff --git a/decidim-assemblies/config/locales/fr-CA.yml b/decidim-assemblies/config/locales/fr-CA.yml
index 8d5f4b5a6bda1..13747726e571e 100644
--- a/decidim-assemblies/config/locales/fr-CA.yml
+++ b/decidim-assemblies/config/locales/fr-CA.yml
@@ -408,6 +408,8 @@ fr-CA:
           internal_organisation: L'organisation interne de cette assemblée
           is_transparent: Si l'assemblée est transparente ou non
           local_area: La zone locale de cette assemblée
+          participatory_scope: La portée participative de l'assemblée
+          participatory_structure: La structure participative de l'assemblée
           promoted: Si l'assemblée est promue ou non
           published_at: La date à laquelle cet espace a été publié
           purpose_of_action: Le but de l'action de l'assemblée
diff --git a/decidim-assemblies/config/locales/fr.yml b/decidim-assemblies/config/locales/fr.yml
index cf540d1713a06..86faae596467d 100644
--- a/decidim-assemblies/config/locales/fr.yml
+++ b/decidim-assemblies/config/locales/fr.yml
@@ -408,6 +408,8 @@ fr:
           internal_organisation: L'organisation interne de cette assemblée
           is_transparent: Si l'assemblée est transparente ou non
           local_area: La zone locale de cette assemblée
+          participatory_scope: La portée participative de l'assemblée
+          participatory_structure: La structure participative de l'assemblée
           promoted: Si l'assemblée est promue ou non
           published_at: La date à laquelle cet espace a été publié
           purpose_of_action: Le but de l'action de l'assemblée
diff --git a/decidim-budgets/config/locales/fr-CA.yml b/decidim-budgets/config/locales/fr-CA.yml
index a8e95d2f60415..79276049e8a75 100644
--- a/decidim-budgets/config/locales/fr-CA.yml
+++ b/decidim-budgets/config/locales/fr-CA.yml
@@ -336,6 +336,7 @@ fr-CA:
         settings:
           global:
             announcement: Annonce
+            clear_all: Tout effacer
             comments_enabled: Activer le module de commentaire
             comments_max_length: Nombre maximum de caractères par commentaire (Laisser 0 pour la valeur par défaut)
             define_taxonomy_filters: Veuillez définir des filtres pour cet espace participatif avant d'utiliser ce paramètre.
diff --git a/decidim-budgets/config/locales/fr.yml b/decidim-budgets/config/locales/fr.yml
index 22281e453adc8..5792fd5957747 100644
--- a/decidim-budgets/config/locales/fr.yml
+++ b/decidim-budgets/config/locales/fr.yml
@@ -336,6 +336,7 @@ fr:
         settings:
           global:
             announcement: Annonce
+            clear_all: Tout effacer
             comments_enabled: Activer le module de commentaire
             comments_max_length: Nombre maximum de caractères par commentaire (Laisser 0 pour la valeur par défaut)
             define_taxonomy_filters: Veuillez définir des filtres pour cet espace participatif avant d'utiliser ce paramètre.
diff --git a/decidim-collaborative_texts/config/locales/fr-CA.yml b/decidim-collaborative_texts/config/locales/fr-CA.yml
index 9c62bbcfdb1ef..abebd37e0f12b 100644
--- a/decidim-collaborative_texts/config/locales/fr-CA.yml
+++ b/decidim-collaborative_texts/config/locales/fr-CA.yml
@@ -41,7 +41,9 @@ fr-CA:
           draft_options:
             accepting_suggestions: Activer les suggestions dans la prochaine version
             accepting_suggestions_help: Activer les suggestions démarrera une nouvelle série de suggestions pour ce document. Les suggestions actuelles ne seront pas visibles dans la nouvelle version.
+            draft: Version préliminaire
           edit:
+            draft: Version préliminaire
             previous_versions: Versions précédentes
             public_version: Version publique
             title: Modifier les textes collaboratifs
@@ -97,6 +99,7 @@ fr-CA:
         save: Suggérer des modifications
         status:
           accepting_suggestions: Pour suggérer des modifications, sélectionnez ou double-cliquez sur le texte que vous souhaitez modifier, puis cliquez sur le bouton « Suggérer des modifications ».
+          draft: Ce document est actuellement en cours d'examen par les administrateurs. Il n'est pas possible de proposer des suggestions pour le moment, mais vous pouvez consulter celles formulées par d'autres participants.
           not_accepting_suggestions: Les suggestions ne sont pas autorisées pour le moment.
           selection_active: Une sélection est active. Veuillez annuler la sélection actuelle pour en faire une nouvelle.
         suggestions_count: "%{count} suggestions"
@@ -115,6 +118,10 @@ fr-CA:
             published: Publié
             suggestions: Accepter les suggestions
             title: Titre
+      suggestion:
+        add_html: <span class="type">Ajouter :</span> <span class="text">%{text}</span>
+        remove_html: <span class="type">Supprimer :</span> <span class="text">%{text}</span>
+        replace_html: <span class="type">Remplacer :</span> <span class="text">%{text}</span>
       suggestions:
         create:
           invalid: Il y a eu un problème lors de la création de la suggestion.
diff --git a/decidim-collaborative_texts/config/locales/fr.yml b/decidim-collaborative_texts/config/locales/fr.yml
index 43610fe02dfdd..539c1875758a2 100644
--- a/decidim-collaborative_texts/config/locales/fr.yml
+++ b/decidim-collaborative_texts/config/locales/fr.yml
@@ -41,7 +41,9 @@ fr:
           draft_options:
             accepting_suggestions: Activer les suggestions dans la prochaine version
             accepting_suggestions_help: Activer les suggestions démarrera une nouvelle série de suggestions pour ce document. Les suggestions actuelles ne seront pas visibles dans la nouvelle version.
+            draft: Version préliminaire
           edit:
+            draft: Version préliminaire
             previous_versions: Versions précédentes
             public_version: Version publique
             title: Modifier les textes collaboratifs
@@ -97,6 +99,7 @@ fr:
         save: Suggérer des modifications
         status:
           accepting_suggestions: Pour suggérer des modifications, sélectionnez ou double-cliquez sur le texte que vous souhaitez modifier, puis cliquez sur le bouton « Suggérer des modifications ».
+          draft: Ce document est actuellement en cours d'examen par les administrateurs. Il n'est pas possible de proposer des suggestions pour le moment, mais vous pouvez consulter celles formulées par d'autres participants.
           not_accepting_suggestions: Les suggestions ne sont pas autorisées pour le moment.
           selection_active: Une sélection est active. Veuillez annuler la sélection actuelle pour en faire une nouvelle.
         suggestions_count: "%{count} suggestions"
@@ -115,6 +118,10 @@ fr:
             published: Publié
             suggestions: Accepter les suggestions
             title: Titre
+      suggestion:
+        add_html: <span class="type">Ajouter :</span> <span class="text">%{text}</span>
+        remove_html: <span class="type">Supprimer :</span> <span class="text">%{text}</span>
+        replace_html: <span class="type">Remplacer :</span> <span class="text">%{text}</span>
       suggestions:
         create:
           invalid: Il y a eu un problème lors de la création de la suggestion.
diff --git a/decidim-core/config/locales/ca-IT.yml b/decidim-core/config/locales/ca-IT.yml
index 66ac2c66cee95..fbd3e579cac13 100644
--- a/decidim-core/config/locales/ca-IT.yml
+++ b/decidim-core/config/locales/ca-IT.yml
@@ -1189,6 +1189,8 @@ ca-IT:
       dynamic:
         screen_reader_explanation: El següent element és un mapa que presenta els components d'aquesta pàgina com a punts al mapa. L'element es pot fer servir amb un lector de pantalla però pot ser difícil d'entendre.
         skip_button: Saltar el mapa
+        zoom_in: Ampliar
+        zoom_out: Allunyar
       static:
         latlng_text: 'latitud: %{latitude}, longitud: %{longitude}'
         map_service_brand: OpenStreetMap
@@ -1530,6 +1532,9 @@ ca-IT:
         log_in: entra
         never_logged_in: mai ha iniciat sessió
         subject: Avís de compte inactiu
+    participatory_space:
+      labels:
+        reference: Referència de l'espai de participació
     passwords:
       update:
         error: Hi ha hagut un problema en actualitzar la contrasenya.
diff --git a/decidim-core/config/locales/ca.yml b/decidim-core/config/locales/ca.yml
index c43ed6f76e919..d4702c69bc11f 100644
--- a/decidim-core/config/locales/ca.yml
+++ b/decidim-core/config/locales/ca.yml
@@ -1189,6 +1189,8 @@ ca:
       dynamic:
         screen_reader_explanation: El següent element és un mapa que presenta els components d'aquesta pàgina com a punts al mapa. L'element es pot fer servir amb un lector de pantalla però pot ser difícil d'entendre.
         skip_button: Saltar el mapa
+        zoom_in: Ampliar
+        zoom_out: Allunyar
       static:
         latlng_text: 'latitud: %{latitude}, longitud: %{longitude}'
         map_service_brand: OpenStreetMap
@@ -1530,6 +1532,9 @@ ca:
         log_in: entra
         never_logged_in: mai ha iniciat sessió
         subject: Avís de compte inactiu
+    participatory_space:
+      labels:
+        reference: Referència de l'espai de participació
     passwords:
       update:
         error: Hi ha hagut un problema en actualitzar la contrasenya.
diff --git a/decidim-core/config/locales/es-MX.yml b/decidim-core/config/locales/es-MX.yml
index fcfd1409bf6b3..a6bbf9386045a 100644
--- a/decidim-core/config/locales/es-MX.yml
+++ b/decidim-core/config/locales/es-MX.yml
@@ -1192,6 +1192,8 @@ es-MX:
       dynamic:
         screen_reader_explanation: El siguiente elemento es un mapa que presenta los componentes de esta página como puntos en el mapa. El elemento se puede utilizar con un lector de pantalla pero puede ser difícil de entender.
         skip_button: Saltar el mapa
+        zoom_in: Ampliar
+        zoom_out: Alejar
       static:
         latlng_text: 'latitud: %{latitude}, longitud: %{longitude}'
         map_service_brand: OpenStreetMap
@@ -1533,6 +1535,9 @@ es-MX:
         log_in: entra
         never_logged_in: nunca ha iniciado sesión
         subject: Aviso de cuenta inactiva
+    participatory_space:
+      labels:
+        reference: Referencia del espacio de participación
     passwords:
       update:
         error: Ha habido un problema al actualizar la contraseña.
diff --git a/decidim-core/config/locales/es-PY.yml b/decidim-core/config/locales/es-PY.yml
index 73342c9df89d4..3569eb6cee449 100644
--- a/decidim-core/config/locales/es-PY.yml
+++ b/decidim-core/config/locales/es-PY.yml
@@ -1192,6 +1192,8 @@ es-PY:
       dynamic:
         screen_reader_explanation: El siguiente elemento es un mapa que presenta los componentes de esta página como puntos en el mapa. El elemento se puede utilizar con un lector de pantalla pero puede ser difícil de entender.
         skip_button: Saltar el mapa
+        zoom_in: Ampliar
+        zoom_out: Alejar
       static:
         latlng_text: 'latitud: %{latitude}, longitud: %{longitude}'
         map_service_brand: OpenStreetMap
@@ -1533,6 +1535,9 @@ es-PY:
         log_in: entra
         never_logged_in: nunca ha iniciado sesión
         subject: Aviso de cuenta inactiva
+    participatory_space:
+      labels:
+        reference: Referencia del espacio de participación
     passwords:
       update:
         error: Ha habido un problema al actualizar la contraseña.
diff --git a/decidim-core/config/locales/es.yml b/decidim-core/config/locales/es.yml
index daa0197086e8d..109592312963e 100644
--- a/decidim-core/config/locales/es.yml
+++ b/decidim-core/config/locales/es.yml
@@ -1189,6 +1189,8 @@ es:
       dynamic:
         screen_reader_explanation: El siguiente elemento es un mapa que presenta los componentes de esta página como puntos en el mapa. El elemento se puede utilizar con un lector de pantalla pero puede ser difícil de entender.
         skip_button: Saltar el mapa
+        zoom_in: Ampliar
+        zoom_out: Alejar
       static:
         latlng_text: 'latitud: %{latitude}, longitud: %{longitude}'
         map_service_brand: OpenStreetMap
@@ -1530,6 +1532,9 @@ es:
         log_in: entra
         never_logged_in: nunca ha iniciado sesión
         subject: Aviso de cuenta inactiva
+    participatory_space:
+      labels:
+        reference: Referencia del espacio de participación
     passwords:
       update:
         error: Se ha producido un error al actualizar la contraseña.
diff --git a/decidim-core/config/locales/eu.yml b/decidim-core/config/locales/eu.yml
index b19b32798f582..eeb5d32af09fb 100644
--- a/decidim-core/config/locales/eu.yml
+++ b/decidim-core/config/locales/eu.yml
@@ -209,7 +209,7 @@ eu:
         cancel_error: Ezin izan da ezeztatu helbide elektronikoaren aldaketa.
         cancel_successfully: Posta elektronikoaren aldaketa zuzen ezeztatua.
         resend_error: Ezin izan da birbidali berresteko helbide elektronikoa.
-        resend_successfully: Correo de confirmación reenviado con éxito a %{unconfirmed_email}.
+        resend_successfully: 'Berresteko posta elektronikoa zuzen birbidalia hona: %{unconfirmed_email}.'
         send_again: Bidali berriro
         title: Posta elektronikoaren aldaketak egiaztatzea
       show:
@@ -1530,6 +1530,9 @@ eu:
         log_in: hasi saioa
         never_logged_in: inoiz ez konektatua
         subject: Kontu inaktiboaren abisua
+    participatory_space:
+      labels:
+        reference: Espazioaren erreferentzia
     passwords:
       update:
         error: Arazo bat egon da pasahitza eguneratzean.
diff --git a/decidim-core/config/locales/fi-plain.yml b/decidim-core/config/locales/fi-plain.yml
index 00274a47967b6..c6e364484d7e0 100644
--- a/decidim-core/config/locales/fi-plain.yml
+++ b/decidim-core/config/locales/fi-plain.yml
@@ -1191,6 +1191,8 @@ fi-pl:
       dynamic:
         screen_reader_explanation: Seuraavassa elementissä on kartta, joka esittää tämän sivun tietueet karttapisteinä. Elementtiä voi käyttää ruudunlukijalla, mutta se voi olla vaikeaselkoinen.
         skip_button: Ohita kartta
+        zoom_in: Lähennä
+        zoom_out: Loitonna
       static:
         latlng_text: 'leveysaste: %{latitude}, pituusaste: %{longitude}'
         map_service_brand: OpenStreetMap
@@ -1532,6 +1534,9 @@ fi-pl:
         log_in: kirjaudu sisään
         never_logged_in: et ole koskaan kirjautunut palveluun
         subject: Varoitus passiivisesta käyttäjätilistä
+    participatory_space:
+      labels:
+        reference: Tilan viite
     passwords:
       update:
         error: Salasanan päivitys epäonnistui.
diff --git a/decidim-core/config/locales/fi.yml b/decidim-core/config/locales/fi.yml
index 4728e12f2c3f2..becbb706be488 100644
--- a/decidim-core/config/locales/fi.yml
+++ b/decidim-core/config/locales/fi.yml
@@ -1191,6 +1191,8 @@ fi:
       dynamic:
         screen_reader_explanation: Seuraavassa elementissä on kartta, joka esittää tämän sivun tietueet karttapisteinä. Elementtiä voi käyttää ruudunlukijalla, mutta se voi olla vaikeaselkoinen.
         skip_button: Ohita kartta
+        zoom_in: Lähennä
+        zoom_out: Loitonna
       static:
         latlng_text: 'leveysaste: %{latitude}, pituusaste: %{longitude}'
         map_service_brand: OpenStreetMap
@@ -1532,6 +1534,9 @@ fi:
         log_in: kirjaudu sisään
         never_logged_in: et ole koskaan kirjautunut palveluun
         subject: Varoitus passiivisesta käyttäjätilistä
+    participatory_space:
+      labels:
+        reference: Tilan viite
     passwords:
       update:
         error: Salasanan päivitys epäonnistui.
diff --git a/decidim-core/config/locales/fr-CA.yml b/decidim-core/config/locales/fr-CA.yml
index dcce1e44e33fc..ce0b19ee361b2 100644
--- a/decidim-core/config/locales/fr-CA.yml
+++ b/decidim-core/config/locales/fr-CA.yml
@@ -1050,6 +1050,8 @@ fr-CA:
       dynamic:
         screen_reader_explanation: L'élément suivant est une carte qui présente les éléments de cette page comme des points de carte. L'élément peut être utilisé avec un lecteur d'écran, mais il peut être difficile à comprendre.
         skip_button: Passer la carte
+        zoom_in: Zoomer
+        zoom_out: Dézoomer
       static:
         latlng_text: 'latitude : %{latitude}, longitude : %{longitude}'
         map_service_brand: OpenStreetMap
@@ -1258,6 +1260,7 @@ fr-CA:
           badge: Le badge de l'utilisateur
           groups: L'identifiant et le nom du groupe d'utilisateurs
           id: L'identifiant unique de l'utilisateur
+          name: Le nom d'affichage de l'utilisateur
           nickname: Le pseudonyme de l'utilisateur
           profile_url: L'url du profil
       index:
@@ -1366,6 +1369,9 @@ fr-CA:
         log_in: se connecter
         never_logged_in: jamais connecté
         subject: Avertissement de compte inactif
+    participatory_space:
+      labels:
+        reference: Référence de l'espace
     passwords:
       update:
         error: Il y a eu un problème lors de la mise à jour de votre mot de passe.
diff --git a/decidim-core/config/locales/fr.yml b/decidim-core/config/locales/fr.yml
index 85d2a06e99b4c..806da27bb1b8a 100644
--- a/decidim-core/config/locales/fr.yml
+++ b/decidim-core/config/locales/fr.yml
@@ -1050,6 +1050,8 @@ fr:
       dynamic:
         screen_reader_explanation: L'élément suivant est une carte qui présente les éléments de cette page comme des points de carte. L'élément peut être utilisé avec un lecteur d'écran, mais il peut être difficile à comprendre.
         skip_button: Passer la carte
+        zoom_in: Zoomer
+        zoom_out: Dézoomer
       static:
         latlng_text: 'latitude : %{latitude}, longitude : %{longitude}'
         map_service_brand: OpenStreetMap
@@ -1258,6 +1260,7 @@ fr:
           badge: Le badge de l'utilisateur
           groups: L'identifiant et le nom du groupe d'utilisateurs
           id: L'identifiant unique de l'utilisateur
+          name: Le nom d'affichage de l'utilisateur
           nickname: Le pseudonyme de l'utilisateur
           profile_url: L'url du profil
       index:
@@ -1366,6 +1369,9 @@ fr:
         log_in: se connecter
         never_logged_in: jamais connecté
         subject: Avertissement de compte inactif
+    participatory_space:
+      labels:
+        reference: Référence de l'espace
     passwords:
       update:
         error: Il y a eu un problème lors de la mise à jour de votre mot de passe.
diff --git a/decidim-core/config/locales/ja.yml b/decidim-core/config/locales/ja.yml
index d33919e192958..82a14981fc5be 100644
--- a/decidim-core/config/locales/ja.yml
+++ b/decidim-core/config/locales/ja.yml
@@ -1173,6 +1173,8 @@ ja:
       dynamic:
         screen_reader_explanation: 以下の要素は、このページ上のアイテムを地図上のポイントとして表示するマップです。 この要素はスクリーンリーダーで使用することができますが、理解しにくいかもしれません。
         skip_button: 地図をスキップ
+        zoom_in: 拡大
+        zoom_out: 縮小
       static:
         latlng_text: '緯度: %{latitude}, 経度: %{longitude}'
         map_service_brand: OpenStreetMap
@@ -1512,6 +1514,9 @@ ja:
         log_in: ログイン
         never_logged_in: ログインしたことがない
         subject: 非アクティブなアカウントの警告
+    participatory_space:
+      labels:
+        reference: スペースの参照
     passwords:
       update:
         error: パスワードの更新中に問題が発生しました。
diff --git a/decidim-core/config/locales/pl.yml b/decidim-core/config/locales/pl.yml
index cdbaebf308a02..94e286f75651e 100644
--- a/decidim-core/config/locales/pl.yml
+++ b/decidim-core/config/locales/pl.yml
@@ -880,6 +880,8 @@ pl:
       dynamic:
         screen_reader_explanation: Poniższy element to mapa, która przedstawia elementy na tej stronie jako punkty mapy. Element może być użyty z czytnikiem ekranu, ale może być trudny do zrozumienia.
         skip_button: Pomiń mapę
+        zoom_in: Przybliż
+        zoom_out: Oddal
       static:
         latlng_text: 'szerokość geograficzna: %{latitude}, długość geograficzna: %{longitude}'
         map_service_brand: OpenStreetMap
diff --git a/decidim-elections/config/locales/fr-CA.yml b/decidim-elections/config/locales/fr-CA.yml
index a611c8bf34c9d..053a69b5e92db 100644
--- a/decidim-elections/config/locales/fr-CA.yml
+++ b/decidim-elections/config/locales/fr-CA.yml
@@ -150,6 +150,7 @@ fr-CA:
         statuses:
           publish_results:
             invalid: Un problème est survenu lors de la publication des résultats.
+            success: Résultats publiés avec succès.
           unknown: État Inconnu
       admin_log:
         election:
diff --git a/decidim-elections/config/locales/fr.yml b/decidim-elections/config/locales/fr.yml
index 1760bf989b82e..a6ab6702592eb 100644
--- a/decidim-elections/config/locales/fr.yml
+++ b/decidim-elections/config/locales/fr.yml
@@ -150,6 +150,7 @@ fr:
         statuses:
           publish_results:
             invalid: Un problème est survenu lors de la publication des résultats.
+            success: Résultats publiés avec succès.
           unknown: État Inconnu
       admin_log:
         election:
diff --git a/decidim-forms/config/locales/fr-CA.yml b/decidim-forms/config/locales/fr-CA.yml
index aab6fdff3d7be..890ffa3fc968b 100644
--- a/decidim-forms/config/locales/fr-CA.yml
+++ b/decidim-forms/config/locales/fr-CA.yml
@@ -177,7 +177,9 @@ fr-CA:
         question:
           max_choices: 'Choix maximum: %{n}'
         response:
+          invalid: Une erreur s'est produite lors de l'envoi du formulaire.
           max_choices_alert: Il y a trop de choix sélectionnés
+          success: Le formulaire a bien été envoyé.
         show:
           current_step: Étape %{step}
           empty: Aucune question configurée pour ce formulaire pour le moment.
diff --git a/decidim-forms/config/locales/fr.yml b/decidim-forms/config/locales/fr.yml
index 0c3cc7d4cd85a..e531fcb3c20db 100644
--- a/decidim-forms/config/locales/fr.yml
+++ b/decidim-forms/config/locales/fr.yml
@@ -177,7 +177,9 @@ fr:
         question:
           max_choices: 'Choix maximum: %{n}'
         response:
+          invalid: Une erreur s'est produite lors de l'envoi du formulaire.
           max_choices_alert: Il y a trop de choix sélectionnés
+          success: Le formulaire a bien été envoyé.
         show:
           current_step: Étape %{step}
           empty: Aucune question configurée pour ce formulaire pour le moment.
diff --git a/decidim-initiatives/config/locales/fi.yml b/decidim-initiatives/config/locales/fi.yml
index a1cbe8f890b85..da71bc197fd7c 100644
--- a/decidim-initiatives/config/locales/fi.yml
+++ b/decidim-initiatives/config/locales/fi.yml
@@ -245,7 +245,7 @@ fi:
             order:
               default: Oletus (vanhin ensin)
               label: 'Järjestä elementit:'
-              most_recent: Uusimmat
+              most_recent: Viimeisimmät
         exports:
           initiatives: Aloitteet
         index:
diff --git a/decidim-initiatives/config/locales/fr-CA.yml b/decidim-initiatives/config/locales/fr-CA.yml
index 9061f832550c1..833dbcbc49013 100644
--- a/decidim-initiatives/config/locales/fr-CA.yml
+++ b/decidim-initiatives/config/locales/fr-CA.yml
@@ -111,6 +111,8 @@ fr-CA:
         initiatives_menu:
           see_initiative: Voir la pétition
         initiatives_settings: Paramètres
+        initiatives_submenu:
+          info: À propos de cette pétition
         initiatives_types: Types d'initiatives
         moderations: Modérations
       models:
@@ -330,6 +332,7 @@ fr-CA:
             create: Créer
             title: Nouveau type d'initiative
           update:
+            error: Une erreur s'est produite lors de la mise à jour du type de pétition.
             success: Le type de pétition a été mis à jour avec succès.
       admin_log:
         initiative:
@@ -373,8 +376,14 @@ fr-CA:
         highlighted_initiatives:
           name: Initiatives mises en avant
       create_initiative:
+        committee_member:
+          confirm_approve: Êtes-vous sûr de vouloir approuver ce membre ?
+          confirm_revoke: Êtes-vous sûr de vouloir retirer ce membre ?
+          revoke: Retirer
         fill_data:
+          confirm_discard: Êtes-vous sûr de vouloir abandonner cette pétition ?
           continue: Continuer
+          discard: Abandonner la pétition
           fill_data_help: "<ul> <li>Vérifier le contenu de votre pétition : le titre est-il facile à comprendre ? L'objectif de votre pétition est-il clair ?</li> <li>Vous devez choisir le type de signature : en présentiel, en ligne ou une combinaison des deux</li> <li>Quelle est le secteur géographique de l'initiative ?</li> </ul>"
           select_area: Sélectionnez une zone
           select_scope: Sélectionnez une portée
@@ -389,6 +398,12 @@ fr-CA:
           new: Créer une nouvelle pétition
           select: Créer une initiative
           verification_required: Vérifiez votre compte pour créer une pétition
+        send_to_technical_validation_button:
+          button: Envoyer pour validation technique
+          confirm: Vous êtes sur le point d'envoyer cette pétition à un administrateur afin qu'il l'examine et la publie. Une fois publiée, vous ne pourrez plus la modifier. Êtes-vous sûr de vouloir continuer ?
+        share_committee_link:
+          invite_to_committee_help: Lien d'invitation pour les personnes qui feront partie du comité de promotion.
+          more_information: Plus d'informations
       edit:
         accept: Accepter la pétition
         back: Retour
@@ -496,6 +511,8 @@ fr-CA:
           random: Aléatoire
           recent: Les plus récentes
           recently_published: Plus récemment publié
+        pending_initiatives:
+          title: Versions préliminaires et propositions en attente
         print:
           address: Adresse
           author_title: Auteur de la pétition
@@ -568,6 +585,7 @@ fr-CA:
       show:
         badge_name:
           accepted: Assez de signatures
+          created: Rédigé
           discarded: Abandonné
           open: Ouverte
           rejected: Pas assez de signatures
@@ -581,9 +599,23 @@ fr-CA:
         expired: Expirées
       unavailable_scope: Portée indisponible
       update:
+        error: Un problème est survenu lors de la mise à jour de la pétition.
         success: La pétition a été mise à jour avec succès.
     menu:
       initiatives: Pétitions
+    open_data:
+      help:
+        initiatives:
+          answer: La suite donnée à cette pétition (le cas échéant)
+          authors: Les auteurs de cette pétition
+          comments_count: Le nombre de commentaires suscités par cette pétition
+          description: La description de cette pétition
+          first_progress_notification_at: La date à laquelle la première notification de progrès a été envoyée
+          offline_votes: Le nombre de signatures récoltées par cette pétition en dehors de la plateforme
+          online_votes: Le nombre de signatures récoltées en ligne par cette pétition (directement via la plateforme)
+          scope: La portée de cette pétition
+          second_progress_notification_at: La date à laquelle la deuxième notification de progrès a été envoyée
+          signature_end_date: La date à laquelle la période de collecte des signatures prend fin
     resources:
       initiative:
         actions:
diff --git a/decidim-initiatives/config/locales/fr.yml b/decidim-initiatives/config/locales/fr.yml
index 8a7f724207699..b740c1d2cf1c8 100644
--- a/decidim-initiatives/config/locales/fr.yml
+++ b/decidim-initiatives/config/locales/fr.yml
@@ -111,6 +111,8 @@ fr:
         initiatives_menu:
           see_initiative: Voir la pétition
         initiatives_settings: Paramètres
+        initiatives_submenu:
+          info: À propos de cette pétition
         initiatives_types: Types de pétitions
         moderations: Modérations
       models:
@@ -330,6 +332,7 @@ fr:
             create: Créer
             title: Nouveau type de pétition
           update:
+            error: Une erreur s'est produite lors de la mise à jour du type de pétition.
             success: Le type de pétition a été mis à jour avec succès.
       admin_log:
         initiative:
@@ -373,8 +376,14 @@ fr:
         highlighted_initiatives:
           name: Pétitions mises en avant
       create_initiative:
+        committee_member:
+          confirm_approve: Êtes-vous sûr de vouloir approuver ce membre ?
+          confirm_revoke: Êtes-vous sûr de vouloir retirer ce membre ?
+          revoke: Retirer
         fill_data:
+          confirm_discard: Êtes-vous sûr de vouloir abandonner cette pétition ?
           continue: Continuer
+          discard: Abandonner la pétition
           fill_data_help: "<ul> <li>Vérifier le contenu de votre pétition : le titre est-il facile à comprendre ? L'objectif de votre pétition est-il clair ?</li> <li>Vous devez choisir le type de signature : en présentiel, en ligne ou une combinaison des deux</li> <li>Quelle est le secteur géographique de l'initiative ?</li> </ul>"
           select_area: Sélectionnez une zone
           select_scope: Sélectionnez une portée
@@ -389,6 +398,12 @@ fr:
           new: Créer une nouvelle pétition
           select: Créer une pétition
           verification_required: Vérifiez votre compte pour créer une pétition
+        send_to_technical_validation_button:
+          button: Envoyer pour validation technique
+          confirm: Vous êtes sur le point d'envoyer cette pétition à un administrateur afin qu'il l'examine et la publie. Une fois publiée, vous ne pourrez plus la modifier. Êtes-vous sûr de vouloir continuer ?
+        share_committee_link:
+          invite_to_committee_help: Lien d'invitation pour les personnes qui feront partie du comité de promotion.
+          more_information: Plus d'informations
       edit:
         accept: Accepter la pétition
         back: Retour
@@ -496,6 +511,8 @@ fr:
           random: Aléatoire
           recent: Les plus récentes
           recently_published: Plus récemment publié
+        pending_initiatives:
+          title: Versions préliminaires et propositions en attente
         print:
           address: Adresse
           author_title: Auteur de la pétition
@@ -568,6 +585,7 @@ fr:
       show:
         badge_name:
           accepted: Assez de signatures
+          created: Rédigé
           discarded: Retirée
           open: Ouverte
           rejected: Pas assez de signatures
@@ -581,9 +599,23 @@ fr:
         expired: Expirées
       unavailable_scope: Portée indisponible
       update:
+        error: Un problème est survenu lors de la mise à jour de la pétition.
         success: La pétition a été mise à jour avec succès.
     menu:
       initiatives: Pétitions
+    open_data:
+      help:
+        initiatives:
+          answer: La suite donnée à cette pétition (le cas échéant)
+          authors: Les auteurs de cette pétition
+          comments_count: Le nombre de commentaires suscités par cette pétition
+          description: La description de cette pétition
+          first_progress_notification_at: La date à laquelle la première notification de progrès a été envoyée
+          offline_votes: Le nombre de signatures récoltées par cette pétition en dehors de la plateforme
+          online_votes: Le nombre de signatures récoltées en ligne par cette pétition (directement via la plateforme)
+          scope: La portée de cette pétition
+          second_progress_notification_at: La date à laquelle la deuxième notification de progrès a été envoyée
+          signature_end_date: La date à laquelle la période de collecte des signatures prend fin
     resources:
       initiative:
         actions:
diff --git a/decidim-proposals/config/locales/ca-IT.yml b/decidim-proposals/config/locales/ca-IT.yml
index 9bf07980ab9e9..718679e71c70d 100644
--- a/decidim-proposals/config/locales/ca-IT.yml
+++ b/decidim-proposals/config/locales/ca-IT.yml
@@ -656,6 +656,7 @@ ca-IT:
             number_of_proposals: Es publicaran les respostes a %{number} propostes
             select_a_proposal: Si us plau, selecciona una proposta.
           show:
+            address: Adreça
             amendments_count: Número d'esmenes
             assigned_evaluators: Avaluadores assignades
             body: Cos
diff --git a/decidim-proposals/config/locales/ca.yml b/decidim-proposals/config/locales/ca.yml
index e7dca27258c9e..35853cd0cde42 100644
--- a/decidim-proposals/config/locales/ca.yml
+++ b/decidim-proposals/config/locales/ca.yml
@@ -659,6 +659,7 @@ ca:
             number_of_proposals: Es publicaran les respostes a %{number} propostes
             select_a_proposal: Si us plau, selecciona una proposta.
           show:
+            address: Adreça
             amendments_count: Número d'esmenes
             assigned_evaluators: Avaluadores assignades
             body: Cos
diff --git a/decidim-proposals/config/locales/es-MX.yml b/decidim-proposals/config/locales/es-MX.yml
index 738b9e4ee82a4..782ac7d1cb118 100644
--- a/decidim-proposals/config/locales/es-MX.yml
+++ b/decidim-proposals/config/locales/es-MX.yml
@@ -659,6 +659,7 @@ es-MX:
             number_of_proposals: Se publicarán las respuestas a %{number} propuestas
             select_a_proposal: Por favor, selecciona una propuesta.
           show:
+            address: Dirección
             amendments_count: Número de enmiendas
             assigned_evaluators: Evaluadoras asignadas
             body: Cuerpo
diff --git a/decidim-proposals/config/locales/es-PY.yml b/decidim-proposals/config/locales/es-PY.yml
index 0fff5cd26227f..574e2582d2fd6 100644
--- a/decidim-proposals/config/locales/es-PY.yml
+++ b/decidim-proposals/config/locales/es-PY.yml
@@ -659,6 +659,7 @@ es-PY:
             number_of_proposals: Se publicarán las respuestas a %{number} propuestas
             select_a_proposal: Por favor, selecciona una propuesta.
           show:
+            address: Dirección
             amendments_count: Número de enmiendas
             assigned_evaluators: Evaluadoras asignadas
             body: Cuerpo
diff --git a/decidim-proposals/config/locales/es.yml b/decidim-proposals/config/locales/es.yml
index eb6e3e645738a..82c6340a8df44 100644
--- a/decidim-proposals/config/locales/es.yml
+++ b/decidim-proposals/config/locales/es.yml
@@ -659,6 +659,7 @@ es:
             number_of_proposals: Se publicarán las respuestas a %{number} propuestas
             select_a_proposal: Por favor, selecciona una propuesta.
           show:
+            address: Dirección
             amendments_count: Número de enmiendas
             assigned_evaluators: Evaluadoras asignadas
             body: Cuerpo
diff --git a/decidim-proposals/config/locales/eu.yml b/decidim-proposals/config/locales/eu.yml
index 731483ede9d0e..5e8c5ccef5635 100644
--- a/decidim-proposals/config/locales/eu.yml
+++ b/decidim-proposals/config/locales/eu.yml
@@ -659,6 +659,7 @@ eu:
             number_of_proposals: '%{number} proposamenetarako erantzunak argitaratuko dira?'
             select_a_proposal: Mesedez, hautatu proposamen bat.
           show:
+            address: Helbidea
             amendments_count: Zuzenketa kopurua
             assigned_evaluators: Ebaluatzaileak esleituta
             body: Testua
diff --git a/decidim-proposals/config/locales/fi-plain.yml b/decidim-proposals/config/locales/fi-plain.yml
index da149bdfb1e77..2db8b96a036c6 100644
--- a/decidim-proposals/config/locales/fi-plain.yml
+++ b/decidim-proposals/config/locales/fi-plain.yml
@@ -659,6 +659,7 @@ fi-pl:
             number_of_proposals: Haluatko varmasti julkaista %{number} ehdotusten vastausta?
             select_a_proposal: Valitse ehdotus.
           show:
+            address: Osoite
             amendments_count: Muutosten lukumäärä
             assigned_evaluators: Annettu tehtäväksi arvioijalle
             body: Ehdotuksen kuvaus
diff --git a/decidim-proposals/config/locales/fi.yml b/decidim-proposals/config/locales/fi.yml
index d5cdbd27a7fa2..696b0d4d4317c 100644
--- a/decidim-proposals/config/locales/fi.yml
+++ b/decidim-proposals/config/locales/fi.yml
@@ -659,6 +659,7 @@ fi:
             number_of_proposals: Haluatko varmasti julkaista %{number} ehdotusten vastausta?
             select_a_proposal: Valitse ehdotus.
           show:
+            address: Osoite
             amendments_count: Muutosten lukumäärä
             assigned_evaluators: Annettu tehtäväksi arvioijalle
             body: Ehdotuksen kuvaus
diff --git a/decidim-proposals/config/locales/ja.yml b/decidim-proposals/config/locales/ja.yml
index 9e7b0b5c17ea1..b7ea1363a5c8e 100644
--- a/decidim-proposals/config/locales/ja.yml
+++ b/decidim-proposals/config/locales/ja.yml
@@ -652,6 +652,7 @@ ja:
             number_of_proposals: '%{number} 件の提案に対する回答が公開されますか？'
             select_a_proposal: 提案を選択してください。
           show:
+            address: 住所
             amendments_count: 修正数
             assigned_evaluators: 評価者に割り当てられました
             body: 本文

From 2266e0cc2ad2602188f48152c14843513ee5a9db Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Thu, 30 Jul 2026 09:20:33 +0300
Subject: [PATCH 128/131] Backport 'Fix flaky specs on edit attachments
 examples' to v0.31 (#17318)

---
 .../spec/system/admin_manages_projects_spec.rb   | 11 +++++++++--
 .../src/decidim/direct_uploads/upload_modal.js   |  3 ++-
 .../system/admin/admin_manages_elections_spec.rb | 12 ++++++++----
 .../admin/admin_manages_initiatives_spec.rb      | 12 +++++++++---
 .../system/admin/admin_edits_proposal_spec.rb    | 16 +++++++++++++---
 .../spec/system/edit_proposal_spec.rb            |  6 +++---
 6 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/decidim-budgets/spec/system/admin_manages_projects_spec.rb b/decidim-budgets/spec/system/admin_manages_projects_spec.rb
index ac10fcb8fcc70..38a7ef2bd5d85 100644
--- a/decidim-budgets/spec/system/admin_manages_projects_spec.rb
+++ b/decidim-budgets/spec/system/admin_manages_projects_spec.rb
@@ -166,11 +166,18 @@
 
       click_on("Edit attachments")
 
+      filename = attachment.file.blob.filename.to_s
       within ".upload-modal" do
-        find("input[type='file']", visible: :all).attach_file(Decidim::Dev.asset(attachment.file.blob.filename.to_s))
+        find("input[type='file']", visible: :all).attach_file(Decidim::Dev.asset(filename))
+        within "li[data-filename='#{filename}']:not([data-attachment-id])" do
+          expect(page).to have_css("progress[value='100']")
+        end
+        expect(page).to have_css("button[data-dropzone-save]:not([disabled])")
+        click_on("Save")
       end
 
-      click_on("Save")
+      expect(page).to have_no_css(".upload-modal")
+
       click_on("Update")
 
       expect(page).to have_text("Project successfully updated.")
diff --git a/decidim-core/app/packs/src/decidim/direct_uploads/upload_modal.js b/decidim-core/app/packs/src/decidim/direct_uploads/upload_modal.js
index eab5f467a2049..340e44d9e753e 100644
--- a/decidim-core/app/packs/src/decidim/direct_uploads/upload_modal.js
+++ b/decidim-core/app/packs/src/decidim/direct_uploads/upload_modal.js
@@ -253,7 +253,8 @@ export default class UploadModal {
   }
 
   setProgressBar(name, value) {
-    const item = Array.from(this.uploadItems.querySelectorAll("[data-filename]")).find((el) => el.dataset.filename === name);
+    const items = Array.from(this.uploadItems.querySelectorAll("[data-filename]"));
+    const item = items.filter((el) => el.dataset.filename === name).pop();
     if (item) {
       item.querySelector("progress").value = value;
     }
diff --git a/decidim-elections/spec/system/admin/admin_manages_elections_spec.rb b/decidim-elections/spec/system/admin/admin_manages_elections_spec.rb
index 6d7599ba9522d..01efd6b7249ad 100644
--- a/decidim-elections/spec/system/admin/admin_manages_elections_spec.rb
+++ b/decidim-elections/spec/system/admin/admin_manages_elections_spec.rb
@@ -336,13 +336,17 @@
 
       click_on("Edit attachments")
 
+      filename = document.file.blob.filename.to_s
       within ".upload-modal" do
-        find("input[type='file']", visible: :all).attach_file(Decidim::Dev.asset(document.file.blob.filename.to_s))
+        find("input[type='file']", visible: :all).attach_file(Decidim::Dev.asset(filename))
+        within "li[data-filename='#{filename}']:not([data-attachment-id])" do
+          expect(page).to have_css("progress[value='100']")
+        end
+        expect(page).to have_css("button[data-dropzone-save]:not([disabled])")
+        click_on("Save")
       end
 
-      click_on("Save")
-
-      sleep 1
+      expect(page).to have_no_css(".upload-modal")
 
       click_on("Save and continue")
       expect(page).to have_text("Election updated successfully")
diff --git a/decidim-initiatives/spec/system/admin/admin_manages_initiatives_spec.rb b/decidim-initiatives/spec/system/admin/admin_manages_initiatives_spec.rb
index 619be04ad22e3..408bf03e05ef1 100644
--- a/decidim-initiatives/spec/system/admin/admin_manages_initiatives_spec.rb
+++ b/decidim-initiatives/spec/system/admin/admin_manages_initiatives_spec.rb
@@ -174,12 +174,18 @@ def initiative_without_area(area)
 
       click_on("Add file")
 
-      within(".upload-modal") do
-        find("input[type='file']", visible: :all).attach_file(Decidim::Dev.asset("city3.jpeg"))
-        sleep(1)
+      filename = "city3.jpeg"
+      within ".upload-modal" do
+        find("input[type='file']", visible: :all).attach_file(Decidim::Dev.asset(filename))
+        within "li[data-filename='#{filename}']:not([data-attachment-id])" do
+          expect(page).to have_css("progress[value='100']")
+        end
+        expect(page).to have_css("button[data-dropzone-save]:not([disabled])")
         click_on("Save")
       end
 
+      expect(page).to have_no_css(".upload-modal")
+
       click_on("Create attachment")
 
       expect(page).to have_text("Super city!")
diff --git a/decidim-proposals/spec/system/admin/admin_edits_proposal_spec.rb b/decidim-proposals/spec/system/admin/admin_edits_proposal_spec.rb
index b40218f36a106..0c9c267da23de 100644
--- a/decidim-proposals/spec/system/admin/admin_edits_proposal_spec.rb
+++ b/decidim-proposals/spec/system/admin/admin_edits_proposal_spec.rb
@@ -150,19 +150,29 @@
 
         click_on("Edit attachments")
 
+        filename = "Exampledocument.pdf"
         within ".upload-modal" do
-          find("input[type='file']", visible: :all).attach_file(Decidim::Dev.asset("Exampledocument.pdf"))
+          find("input[type='file']", visible: :all).attach_file(Decidim::Dev.asset(filename))
+          within "li[data-filename='#{filename}']:not([data-attachment-id])" do
+            expect(page).to have_css("progress[value='100']")
+          end
+          expect(page).to have_css("button[data-dropzone-save]:not([disabled])")
+          click_on("Save")
         end
 
-        click_on("Save")
+        expect(page).to have_no_css(".upload-modal")
+
         click_on("Update")
 
+        expect(page).to have_text("Proposal successfully updated.")
+
         within "tr", text: translated_attribute(proposal.title) do
           find("button[data-controller='dropdown']").click
           click_on "Edit proposal"
         end
 
-        expect(page).to have_no_content("Exampledocument.pdf")
+        click_on "Edit attachments"
+        expect(page).to have_content(filename)
       end
 
       it "can edit a proposal with an attachment" do
diff --git a/decidim-proposals/spec/system/edit_proposal_spec.rb b/decidim-proposals/spec/system/edit_proposal_spec.rb
index 7c5aa81c1f4ba..bad51c52dd4c3 100644
--- a/decidim-proposals/spec/system/edit_proposal_spec.rb
+++ b/decidim-proposals/spec/system/edit_proposal_spec.rb
@@ -445,10 +445,10 @@
           click_on("Remove")
         end
         find("input[type='file']", visible: :all).attach_file(Decidim::Dev.asset("Exampledocument.pdf"))
-        within "[data-filename='Exampledocument.pdf']" do
-          expect(page).to have_css("li progress[value='100']")
+        within "li[data-filename='Exampledocument.pdf']:not([data-attachment-id])" do
+          expect(page).to have_css("progress[value='100']")
         end
-        expect(page).to have_button("Save", disabled: false)
+        expect(page).to have_css("button[data-dropzone-save]:not([disabled])")
         click_on "Save"
       end
       click_on("Send")

From 039c2102b117573d122404a7642daf8301408595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?=
 <andreslucena@users.noreply.github.com>
Date: Thu, 30 Jul 2026 08:31:24 +0200
Subject: [PATCH 129/131] Fix translation issue in maps (#17392)

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
---
 .../spec/lib/map/provider/dynamic_map/here_spec.rb        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/decidim-core/spec/lib/map/provider/dynamic_map/here_spec.rb b/decidim-core/spec/lib/map/provider/dynamic_map/here_spec.rb
index 8f62881c74457..021d81b31b804 100644
--- a/decidim-core/spec/lib/map/provider/dynamic_map/here_spec.rb
+++ b/decidim-core/spec/lib/map/provider/dynamic_map/here_spec.rb
@@ -54,8 +54,8 @@ module DynamicMap
                   tile_layer: {
                     api_key: "key1234", foo: "bar", language: "ca"
                   },
-                  zoom_in_text: "Zoom in",
-                  zoom_out_text: "Zoom out"
+                  zoom_in_text: "Ampliar",
+                  zoom_out_text: "Allunyar"
                 )
               end
 
@@ -66,8 +66,8 @@ module DynamicMap
                   tile_layer: {
                     api_key: "key1234", foo: "bar", language: "es"
                   },
-                  zoom_in_text: "Zoom in",
-                  zoom_out_text: "Zoom out"
+                  zoom_in_text: "Ampliar",
+                  zoom_out_text: "Alejar"
                 )
               end
             end

From dd3677b288e829fdf0db3dd0685020238fada72f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?=
 <andreslucena@users.noreply.github.com>
Date: Thu, 30 Jul 2026 11:15:05 +0200
Subject: [PATCH 130/131] Bump to v0.31.7 version (#17395)

---
 .decidim-version                              |   2 +-
 CHANGELOG.md                                  |  51 +++++
 Gemfile.lock                                  | 198 +++++++++---------
 .../lib/decidim/accountability/version.rb     |   2 +-
 decidim-admin/lib/decidim/admin/version.rb    |   2 +-
 decidim-ai/lib/decidim/ai/version.rb          |   2 +-
 decidim-api/lib/decidim/api/version.rb        |   2 +-
 .../lib/decidim/assemblies/version.rb         |   2 +-
 decidim-blogs/lib/decidim/blogs/version.rb    |   2 +-
 .../lib/decidim/budgets/version.rb            |   2 +-
 .../decidim/collaborative_texts/version.rb    |   2 +-
 .../lib/decidim/comments/version.rb           |   2 +-
 .../lib/decidim/conferences/version.rb        |   2 +-
 decidim-core/lib/decidim/core/version.rb      |   2 +-
 .../lib/decidim/debates/version.rb            |   2 +-
 .../lib/decidim/demographics/version.rb       |   2 +-
 decidim-design/lib/decidim/design/version.rb  |   2 +-
 decidim-dev/lib/decidim/dev/version.rb        |   2 +-
 .../lib/decidim/elections/version.rb          |   2 +-
 decidim-forms/lib/decidim/forms/version.rb    |   2 +-
 decidim-generators/Gemfile.lock               | 198 +++++++++---------
 .../component_templates/Gemfile.erb           |   4 +-
 .../lib/decidim/generators/version.rb         |   2 +-
 .../lib/decidim/initiatives/version.rb        |   2 +-
 .../lib/decidim/meetings/version.rb           |   2 +-
 decidim-pages/lib/decidim/pages/version.rb    |   2 +-
 .../participatory_processes/version.rb        |   2 +-
 .../lib/decidim/proposals/version.rb          |   2 +-
 .../lib/decidim/sortitions/version.rb         |   2 +-
 .../lib/decidim/surveys/version.rb            |   2 +-
 decidim-system/lib/decidim/system/version.rb  |   2 +-
 .../lib/decidim/templates/version.rb          |   2 +-
 .../lib/decidim/verifications/version.rb      |   2 +-
 lib/decidim/version.rb                        |   2 +-
 package-lock.json                             |  14 +-
 packages/browserslist-config/package.json     |   2 +-
 packages/core/package.json                    |   2 +-
 packages/dev/package.json                     |   2 +-
 packages/eslint-config/package.json           |   2 +-
 packages/prettier-config/package.json         |   2 +-
 packages/stylelint-config/package.json        |   2 +-
 packages/webpacker/package.json               |   2 +-
 42 files changed, 295 insertions(+), 244 deletions(-)

diff --git a/.decidim-version b/.decidim-version
index 1866f2628c30a..1027842b9f261 100644
--- a/.decidim-version
+++ b/.decidim-version
@@ -1 +1 @@
-0.31.6
\ No newline at end of file
+0.31.7
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b52d5b62eb9d..5549d6582ee37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,56 @@
 # Changelog
 
+## [0.31.7](https://github.com/decidim/decidim/tree/0.31.7)
+
+### Added
+
+Nothing.
+
+### Changed
+
+Nothing.
+
+### Fixed
+
+- **decidim-dev**: Backport 'Add ARIA role for the accessibility report button' to v0.31 [\#17260](https://github.com/decidim/decidim/pull/17260)
+- **decidim-comments**, **decidim-core**, **decidim-debates**, **decidim-initiatives**, **decidim-proposals**: Backport 'Remove user's nickname from notifications and emails' to v0.31 [\#17225](https://github.com/decidim/decidim/pull/17225)
+- **decidim-collaborative_texts**, **decidim-dev**: Backport 'Fix flaky spec at admin publishes and unpublishes document' to v0.31 [\#17264](https://github.com/decidim/decidim/pull/17264)
+- **decidim-assemblies**, **decidim-conferences**, **decidim-core**, **decidim-initiatives**, **decidim-meetings**, **decidim-participatory processes**: Backport 'Fix double-escaping of component names in participatory space nav links and card' to v0.31 [\#16965](https://github.com/decidim/decidim/pull/16965)
+- **decidim-core**: Backport 'Fix ENV var for setting inactive users deletion period' to v0.31 [\#17276](https://github.com/decidim/decidim/pull/17276)
+- **decidim-comments**, **decidim-core**: Backport 'Fix comments `loginModal` for non-logged in users' to v0.31 [\#17285](https://github.com/decidim/decidim/pull/17285)
+- **decidim-core**, **decidim-meetings**: Backport 'Fix meeting social share image preview not displaying description image' to v0.31 [\#17297](https://github.com/decidim/decidim/pull/17297)
+- **decidim-surveys**: Backport 'Fix inverted survey response pagination' to v0.31 [\#17300](https://github.com/decidim/decidim/pull/17300)
+- **decidim-meetings**: Backport 'Exclude removed items from total agenda duration calculation' to v0.31 [\#17312](https://github.com/decidim/decidim/pull/17312)
+- **decidim-comments**: Backport 'Fix focus when changing the "Sort by" in comments' to v0.31 [\#17327](https://github.com/decidim/decidim/pull/17327)
+- **decidim-proposals**: Backport 'Make the proposal official when importing' to v0.31 [\#17303](https://github.com/decidim/decidim/pull/17303)
+- **decidim-core**: Backport 'Convert to a proper table the cookies information' to v0.31 [\#17324](https://github.com/decidim/decidim/pull/17324)
+- **decidim-assemblies**, **decidim-core**, **decidim-participatory processes**: Backport 'Fix space visibility announcement' to v0.31 [\#17320](https://github.com/decidim/decidim/pull/17320)
+- **decidim-core**: Backport 'Fix responsiveness in "Related documents" content block' to v0.31 [\#17334](https://github.com/decidim/decidim/pull/17334)
+- **decidim-core**, **decidim-system**: Backport 'Make idempotent the "show password" toggle' to v0.31 [\#17336](https://github.com/decidim/decidim/pull/17336)
+- **decidim-system**: Backport 'Add validation for password confirmation mismatch in admin system form' to v0.31 [\#17341](https://github.com/decidim/decidim/pull/17341)
+- **decidim-api**, **decidim-core**: Backport 'Ensure JWT secret exists for `devise-jwt`' to v0.31 [\#17346](https://github.com/decidim/decidim/pull/17346)
+- **decidim-proposals**: Backport 'Add address in proposals' answer page' to v0.31 [\#17356](https://github.com/decidim/decidim/pull/17356)
+- **decidim-core**, **decidim-meetings**: Backport 'Fix the focus guard in the "QR code" modal' to v0.31 [\#17366](https://github.com/decidim/decidim/pull/17366)
+- **decidim-core**: Backport 'Fix email update order for converting groups to user' to v0.31 [\#17368](https://github.com/decidim/decidim/pull/17368)
+- **decidim-core**, **decidim-participatory processes**: Backport 'Show elements on footer with accordion on mobile viewports ' to v0.31 [\#17381](https://github.com/decidim/decidim/pull/17381)
+- **decidim-core**, **decidim-generators**: Backport 'Pin rack-proxy to a version compatible with shakapacker' to v0.31 [\#17375](https://github.com/decidim/decidim/pull/17375)
+- **decidim-core**: Backport 'Add the `aria-expanded="false"` attribute when loading the Dropdowns' to v0.31 [\#17378](https://github.com/decidim/decidim/pull/17378)
+- **decidim-core**: Backport 'Add maps controls ('Zoom in/Zoom out') to i18n' to v0.31 [\#17377](https://github.com/decidim/decidim/pull/17377)
+- **decidim-budgets**, **decidim-core**, **decidim-elections**, **decidim-initiatives**, **decidim-proposals**: Backport 'Fix flaky specs on edit attachments examples' to v0.31 [\#17318](https://github.com/decidim/decidim/pull/17318)
+- **decidim-core**: Backport 'Fix translation issue in maps' to v0.31 [\#17392](https://github.com/decidim/decidim/pull/17392)
+
+### Removed
+
+Nothing.
+
+### Developer improvements
+
+Nothing.
+
+### Internal
+
+- **decidim-core**: Backport 'Fix translation issue in maps' to v0.31 [\#17392](https://github.com/decidim/decidim/pull/17392)
+
 ## [0.31.6](https://github.com/decidim/decidim/tree/0.31.6)
 
 ### Added
diff --git a/Gemfile.lock b/Gemfile.lock
index 737de6ca905e5..e5a6eacfd77e7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,62 +1,62 @@
 PATH
   remote: .
   specs:
-    decidim (0.31.6)
-      decidim-accountability (= 0.31.6)
-      decidim-admin (= 0.31.6)
-      decidim-api (= 0.31.6)
-      decidim-assemblies (= 0.31.6)
-      decidim-blogs (= 0.31.6)
-      decidim-budgets (= 0.31.6)
-      decidim-comments (= 0.31.6)
-      decidim-core (= 0.31.6)
-      decidim-debates (= 0.31.6)
-      decidim-forms (= 0.31.6)
-      decidim-generators (= 0.31.6)
-      decidim-meetings (= 0.31.6)
-      decidim-pages (= 0.31.6)
-      decidim-participatory_processes (= 0.31.6)
-      decidim-proposals (= 0.31.6)
-      decidim-sortitions (= 0.31.6)
-      decidim-surveys (= 0.31.6)
-      decidim-system (= 0.31.6)
-      decidim-verifications (= 0.31.6)
-    decidim-accountability (0.31.6)
-      decidim-comments (= 0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-admin (0.31.6)
+    decidim (0.31.7)
+      decidim-accountability (= 0.31.7)
+      decidim-admin (= 0.31.7)
+      decidim-api (= 0.31.7)
+      decidim-assemblies (= 0.31.7)
+      decidim-blogs (= 0.31.7)
+      decidim-budgets (= 0.31.7)
+      decidim-comments (= 0.31.7)
+      decidim-core (= 0.31.7)
+      decidim-debates (= 0.31.7)
+      decidim-forms (= 0.31.7)
+      decidim-generators (= 0.31.7)
+      decidim-meetings (= 0.31.7)
+      decidim-pages (= 0.31.7)
+      decidim-participatory_processes (= 0.31.7)
+      decidim-proposals (= 0.31.7)
+      decidim-sortitions (= 0.31.7)
+      decidim-surveys (= 0.31.7)
+      decidim-system (= 0.31.7)
+      decidim-verifications (= 0.31.7)
+    decidim-accountability (0.31.7)
+      decidim-comments (= 0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-admin (0.31.7)
       active_link_to (~> 1.0)
-      decidim-core (= 0.31.6)
+      decidim-core (= 0.31.7)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0, >= 2.0.9)
-    decidim-ai (0.31.6)
+    decidim-ai (0.31.7)
       classifier-reborn (~> 2.3.0)
-      decidim-core (= 0.31.6)
-    decidim-api (0.31.6)
-      decidim-core (= 0.31.6)
+      decidim-core (= 0.31.7)
+    decidim-api (0.31.7)
+      decidim-core (= 0.31.7)
       devise-jwt (~> 0.12.1)
       graphql (~> 2.4.0, >= 2.4.17)
       graphql-docs (~> 5.0)
       rack-cors (~> 1.0)
-    decidim-assemblies (0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-blogs (0.31.6)
-      decidim-admin (= 0.31.6)
-      decidim-comments (= 0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-budgets (0.31.6)
-      decidim-comments (= 0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-collaborative_texts (0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-comments (0.31.6)
-      decidim-core (= 0.31.6)
+    decidim-assemblies (0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-blogs (0.31.7)
+      decidim-admin (= 0.31.7)
+      decidim-comments (= 0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-budgets (0.31.7)
+      decidim-comments (= 0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-collaborative_texts (0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-comments (0.31.7)
+      decidim-core (= 0.31.7)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-conferences (0.31.6)
-      decidim-core (= 0.31.6)
-      decidim-meetings (= 0.31.6)
-    decidim-core (0.31.6)
+    decidim-conferences (0.31.7)
+      decidim-core (= 0.31.7)
+      decidim-meetings (= 0.31.7)
+    decidim-core (0.31.7)
       active_link_to (~> 1.0)
       acts_as_list (~> 1.0)
       batch-loader (~> 2.0)
@@ -112,24 +112,24 @@ PATH
       valid_email2 (~> 7.0)
       web-push (~> 3.0)
       wisper (~> 3.0)
-    decidim-debates (0.31.6)
-      decidim-comments (= 0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-demographics (0.31.6)
-      decidim-core (= 0.31.6)
-      decidim-forms (= 0.31.6)
-    decidim-design (0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-dev (0.31.6)
+    decidim-debates (0.31.7)
+      decidim-comments (= 0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-demographics (0.31.7)
+      decidim-core (= 0.31.7)
+      decidim-forms (= 0.31.7)
+    decidim-design (0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-dev (0.31.7)
       bullet (~> 8.0.0)
       byebug (~> 11.0)
       capybara (~> 3.39)
-      decidim-admin (= 0.31.6)
-      decidim-api (= 0.31.6)
-      decidim-comments (= 0.31.6)
-      decidim-core (= 0.31.6)
-      decidim-generators (= 0.31.6)
-      decidim-verifications (= 0.31.6)
+      decidim-admin (= 0.31.7)
+      decidim-api (= 0.31.7)
+      decidim-comments (= 0.31.7)
+      decidim-core (= 0.31.7)
+      decidim-generators (= 0.31.7)
+      decidim-verifications (= 0.31.7)
       erb_lint (~> 0.8.0)
       factory_bot_rails (~> 6.2)
       faker (~> 3.2)
@@ -162,51 +162,51 @@ PATH
       w3c_rspec_validators (~> 0.3.0)
       webmock (~> 3.18)
       wisper-rspec (~> 1.0)
-    decidim-elections (0.31.6)
-      decidim-admin (= 0.31.6)
-      decidim-core (= 0.31.6)
-      decidim-forms (= 0.31.6)
-    decidim-forms (0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-generators (0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-initiatives (0.31.6)
-      decidim-admin (= 0.31.6)
-      decidim-comments (= 0.31.6)
-      decidim-core (= 0.31.6)
-      decidim-verifications (= 0.31.6)
-    decidim-meetings (0.31.6)
-      decidim-core (= 0.31.6)
-      decidim-forms (= 0.31.6)
+    decidim-elections (0.31.7)
+      decidim-admin (= 0.31.7)
+      decidim-core (= 0.31.7)
+      decidim-forms (= 0.31.7)
+    decidim-forms (0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-generators (0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-initiatives (0.31.7)
+      decidim-admin (= 0.31.7)
+      decidim-comments (= 0.31.7)
+      decidim-core (= 0.31.7)
+      decidim-verifications (= 0.31.7)
+    decidim-meetings (0.31.7)
+      decidim-core (= 0.31.7)
+      decidim-forms (= 0.31.7)
       icalendar (~> 2.5)
-    decidim-pages (0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-participatory_processes (0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-proposals (0.31.6)
-      decidim-comments (= 0.31.6)
-      decidim-core (= 0.31.6)
+    decidim-pages (0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-participatory_processes (0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-proposals (0.31.7)
+      decidim-comments (= 0.31.7)
+      decidim-core (= 0.31.7)
       doc2text (~> 0.4.0, >= 0.4.8)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-sortitions (0.31.6)
-      decidim-admin (= 0.31.6)
-      decidim-comments (= 0.31.6)
-      decidim-core (= 0.31.6)
-      decidim-proposals (= 0.31.6)
-    decidim-surveys (0.31.6)
-      decidim-core (= 0.31.6)
-      decidim-forms (= 0.31.6)
-    decidim-system (0.31.6)
+    decidim-sortitions (0.31.7)
+      decidim-admin (= 0.31.7)
+      decidim-comments (= 0.31.7)
+      decidim-core (= 0.31.7)
+      decidim-proposals (= 0.31.7)
+    decidim-surveys (0.31.7)
+      decidim-core (= 0.31.7)
+      decidim-forms (= 0.31.7)
+    decidim-system (0.31.7)
       active_link_to (~> 1.0)
-      decidim-core (= 0.31.6)
+      decidim-core (= 0.31.7)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0, >= 2.0.9)
-    decidim-templates (0.31.6)
-      decidim-core (= 0.31.6)
-      decidim-forms (= 0.31.6)
-    decidim-verifications (0.31.6)
-      decidim-core (= 0.31.6)
+    decidim-templates (0.31.7)
+      decidim-core (= 0.31.7)
+      decidim-forms (= 0.31.7)
+    decidim-verifications (0.31.7)
+      decidim-core (= 0.31.7)
 
 GEM
   remote: https://rubygems.org/
diff --git a/decidim-accountability/lib/decidim/accountability/version.rb b/decidim-accountability/lib/decidim/accountability/version.rb
index a00a05f80626b..2ae5c1e1eff32 100644
--- a/decidim-accountability/lib/decidim/accountability/version.rb
+++ b/decidim-accountability/lib/decidim/accountability/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-accountability version.
   module Accountability
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-admin/lib/decidim/admin/version.rb b/decidim-admin/lib/decidim/admin/version.rb
index 4c4574a0f8397..13dea8e1b64b1 100644
--- a/decidim-admin/lib/decidim/admin/version.rb
+++ b/decidim-admin/lib/decidim/admin/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-admin version.
   module Admin
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-ai/lib/decidim/ai/version.rb b/decidim-ai/lib/decidim/ai/version.rb
index 903594c159b82..da8c7e2689265 100644
--- a/decidim-ai/lib/decidim/ai/version.rb
+++ b/decidim-ai/lib/decidim/ai/version.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Ai
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-api/lib/decidim/api/version.rb b/decidim-api/lib/decidim/api/version.rb
index 5a83fa7e1a000..43d5f2fa4c67e 100644
--- a/decidim-api/lib/decidim/api/version.rb
+++ b/decidim-api/lib/decidim/api/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-api version.
   module Api
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-assemblies/lib/decidim/assemblies/version.rb b/decidim-assemblies/lib/decidim/assemblies/version.rb
index f47c81efd02c5..64dee5a254d48 100644
--- a/decidim-assemblies/lib/decidim/assemblies/version.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-assemblies version.
   module Assemblies
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-blogs/lib/decidim/blogs/version.rb b/decidim-blogs/lib/decidim/blogs/version.rb
index d3144d59b443a..6490832cf2d4f 100644
--- a/decidim-blogs/lib/decidim/blogs/version.rb
+++ b/decidim-blogs/lib/decidim/blogs/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-pages version.
   module Blogs
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-budgets/lib/decidim/budgets/version.rb b/decidim-budgets/lib/decidim/budgets/version.rb
index 6400ef4f812b2..0eab77753e10a 100644
--- a/decidim-budgets/lib/decidim/budgets/version.rb
+++ b/decidim-budgets/lib/decidim/budgets/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-budgets version.
   module Budgets
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-collaborative_texts/lib/decidim/collaborative_texts/version.rb b/decidim-collaborative_texts/lib/decidim/collaborative_texts/version.rb
index 82a702073b2d3..ab6a977aebd76 100644
--- a/decidim-collaborative_texts/lib/decidim/collaborative_texts/version.rb
+++ b/decidim-collaborative_texts/lib/decidim/collaborative_texts/version.rb
@@ -3,7 +3,7 @@
 module Decidim
   module CollaborativeTexts
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-comments/lib/decidim/comments/version.rb b/decidim-comments/lib/decidim/comments/version.rb
index 4f7763da2de16..cc6c8accfc11c 100644
--- a/decidim-comments/lib/decidim/comments/version.rb
+++ b/decidim-comments/lib/decidim/comments/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-comments version.
   module Comments
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-conferences/lib/decidim/conferences/version.rb b/decidim-conferences/lib/decidim/conferences/version.rb
index 2e5b60f9c1800..9069854c9a332 100644
--- a/decidim-conferences/lib/decidim/conferences/version.rb
+++ b/decidim-conferences/lib/decidim/conferences/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-conferences version.
   module Conferences
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-core/lib/decidim/core/version.rb b/decidim-core/lib/decidim/core/version.rb
index 4007a8dc78c42..42b91b8af23ae 100644
--- a/decidim-core/lib/decidim/core/version.rb
+++ b/decidim-core/lib/decidim/core/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-debates/lib/decidim/debates/version.rb b/decidim-debates/lib/decidim/debates/version.rb
index d1af65af5b0b2..af6e1a9d81706 100644
--- a/decidim-debates/lib/decidim/debates/version.rb
+++ b/decidim-debates/lib/decidim/debates/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-debates version.
   module Debates
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-demographics/lib/decidim/demographics/version.rb b/decidim-demographics/lib/decidim/demographics/version.rb
index 08ceab66a456a..b3e4c4125157b 100644
--- a/decidim-demographics/lib/decidim/demographics/version.rb
+++ b/decidim-demographics/lib/decidim/demographics/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-demographics version.
   module Demographics
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-design/lib/decidim/design/version.rb b/decidim-design/lib/decidim/design/version.rb
index 11a82b12877c2..5392d190a3696 100644
--- a/decidim-design/lib/decidim/design/version.rb
+++ b/decidim-design/lib/decidim/design/version.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Design
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-dev/lib/decidim/dev/version.rb b/decidim-dev/lib/decidim/dev/version.rb
index 52cd0f57e1b1e..cc68c98fa84d4 100644
--- a/decidim-dev/lib/decidim/dev/version.rb
+++ b/decidim-dev/lib/decidim/dev/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-dev version.
   module Dev
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-elections/lib/decidim/elections/version.rb b/decidim-elections/lib/decidim/elections/version.rb
index 3ca9eabc3e765..22728adc7df45 100644
--- a/decidim-elections/lib/decidim/elections/version.rb
+++ b/decidim-elections/lib/decidim/elections/version.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Elections
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-forms/lib/decidim/forms/version.rb b/decidim-forms/lib/decidim/forms/version.rb
index 649b9f2757b4a..58a4de9110f80 100644
--- a/decidim-forms/lib/decidim/forms/version.rb
+++ b/decidim-forms/lib/decidim/forms/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-forms version.
   module Forms
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-generators/Gemfile.lock b/decidim-generators/Gemfile.lock
index 73dde4adad9c8..8cf7d7e9d9549 100644
--- a/decidim-generators/Gemfile.lock
+++ b/decidim-generators/Gemfile.lock
@@ -1,62 +1,62 @@
 PATH
   remote: ..
   specs:
-    decidim (0.31.6)
-      decidim-accountability (= 0.31.6)
-      decidim-admin (= 0.31.6)
-      decidim-api (= 0.31.6)
-      decidim-assemblies (= 0.31.6)
-      decidim-blogs (= 0.31.6)
-      decidim-budgets (= 0.31.6)
-      decidim-comments (= 0.31.6)
-      decidim-core (= 0.31.6)
-      decidim-debates (= 0.31.6)
-      decidim-forms (= 0.31.6)
-      decidim-generators (= 0.31.6)
-      decidim-meetings (= 0.31.6)
-      decidim-pages (= 0.31.6)
-      decidim-participatory_processes (= 0.31.6)
-      decidim-proposals (= 0.31.6)
-      decidim-sortitions (= 0.31.6)
-      decidim-surveys (= 0.31.6)
-      decidim-system (= 0.31.6)
-      decidim-verifications (= 0.31.6)
-    decidim-accountability (0.31.6)
-      decidim-comments (= 0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-admin (0.31.6)
+    decidim (0.31.7)
+      decidim-accountability (= 0.31.7)
+      decidim-admin (= 0.31.7)
+      decidim-api (= 0.31.7)
+      decidim-assemblies (= 0.31.7)
+      decidim-blogs (= 0.31.7)
+      decidim-budgets (= 0.31.7)
+      decidim-comments (= 0.31.7)
+      decidim-core (= 0.31.7)
+      decidim-debates (= 0.31.7)
+      decidim-forms (= 0.31.7)
+      decidim-generators (= 0.31.7)
+      decidim-meetings (= 0.31.7)
+      decidim-pages (= 0.31.7)
+      decidim-participatory_processes (= 0.31.7)
+      decidim-proposals (= 0.31.7)
+      decidim-sortitions (= 0.31.7)
+      decidim-surveys (= 0.31.7)
+      decidim-system (= 0.31.7)
+      decidim-verifications (= 0.31.7)
+    decidim-accountability (0.31.7)
+      decidim-comments (= 0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-admin (0.31.7)
       active_link_to (~> 1.0)
-      decidim-core (= 0.31.6)
+      decidim-core (= 0.31.7)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0, >= 2.0.9)
-    decidim-ai (0.31.6)
+    decidim-ai (0.31.7)
       classifier-reborn (~> 2.3.0)
-      decidim-core (= 0.31.6)
-    decidim-api (0.31.6)
-      decidim-core (= 0.31.6)
+      decidim-core (= 0.31.7)
+    decidim-api (0.31.7)
+      decidim-core (= 0.31.7)
       devise-jwt (~> 0.12.1)
       graphql (~> 2.4.0, >= 2.4.17)
       graphql-docs (~> 5.0)
       rack-cors (~> 1.0)
-    decidim-assemblies (0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-blogs (0.31.6)
-      decidim-admin (= 0.31.6)
-      decidim-comments (= 0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-budgets (0.31.6)
-      decidim-comments (= 0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-collaborative_texts (0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-comments (0.31.6)
-      decidim-core (= 0.31.6)
+    decidim-assemblies (0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-blogs (0.31.7)
+      decidim-admin (= 0.31.7)
+      decidim-comments (= 0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-budgets (0.31.7)
+      decidim-comments (= 0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-collaborative_texts (0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-comments (0.31.7)
+      decidim-core (= 0.31.7)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-conferences (0.31.6)
-      decidim-core (= 0.31.6)
-      decidim-meetings (= 0.31.6)
-    decidim-core (0.31.6)
+    decidim-conferences (0.31.7)
+      decidim-core (= 0.31.7)
+      decidim-meetings (= 0.31.7)
+    decidim-core (0.31.7)
       active_link_to (~> 1.0)
       acts_as_list (~> 1.0)
       batch-loader (~> 2.0)
@@ -112,24 +112,24 @@ PATH
       valid_email2 (~> 7.0)
       web-push (~> 3.0)
       wisper (~> 3.0)
-    decidim-debates (0.31.6)
-      decidim-comments (= 0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-demographics (0.31.6)
-      decidim-core (= 0.31.6)
-      decidim-forms (= 0.31.6)
-    decidim-design (0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-dev (0.31.6)
+    decidim-debates (0.31.7)
+      decidim-comments (= 0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-demographics (0.31.7)
+      decidim-core (= 0.31.7)
+      decidim-forms (= 0.31.7)
+    decidim-design (0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-dev (0.31.7)
       bullet (~> 8.0.0)
       byebug (~> 11.0)
       capybara (~> 3.39)
-      decidim-admin (= 0.31.6)
-      decidim-api (= 0.31.6)
-      decidim-comments (= 0.31.6)
-      decidim-core (= 0.31.6)
-      decidim-generators (= 0.31.6)
-      decidim-verifications (= 0.31.6)
+      decidim-admin (= 0.31.7)
+      decidim-api (= 0.31.7)
+      decidim-comments (= 0.31.7)
+      decidim-core (= 0.31.7)
+      decidim-generators (= 0.31.7)
+      decidim-verifications (= 0.31.7)
       erb_lint (~> 0.8.0)
       factory_bot_rails (~> 6.2)
       faker (~> 3.2)
@@ -162,51 +162,51 @@ PATH
       w3c_rspec_validators (~> 0.3.0)
       webmock (~> 3.18)
       wisper-rspec (~> 1.0)
-    decidim-elections (0.31.6)
-      decidim-admin (= 0.31.6)
-      decidim-core (= 0.31.6)
-      decidim-forms (= 0.31.6)
-    decidim-forms (0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-generators (0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-initiatives (0.31.6)
-      decidim-admin (= 0.31.6)
-      decidim-comments (= 0.31.6)
-      decidim-core (= 0.31.6)
-      decidim-verifications (= 0.31.6)
-    decidim-meetings (0.31.6)
-      decidim-core (= 0.31.6)
-      decidim-forms (= 0.31.6)
+    decidim-elections (0.31.7)
+      decidim-admin (= 0.31.7)
+      decidim-core (= 0.31.7)
+      decidim-forms (= 0.31.7)
+    decidim-forms (0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-generators (0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-initiatives (0.31.7)
+      decidim-admin (= 0.31.7)
+      decidim-comments (= 0.31.7)
+      decidim-core (= 0.31.7)
+      decidim-verifications (= 0.31.7)
+    decidim-meetings (0.31.7)
+      decidim-core (= 0.31.7)
+      decidim-forms (= 0.31.7)
       icalendar (~> 2.5)
-    decidim-pages (0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-participatory_processes (0.31.6)
-      decidim-core (= 0.31.6)
-    decidim-proposals (0.31.6)
-      decidim-comments (= 0.31.6)
-      decidim-core (= 0.31.6)
+    decidim-pages (0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-participatory_processes (0.31.7)
+      decidim-core (= 0.31.7)
+    decidim-proposals (0.31.7)
+      decidim-comments (= 0.31.7)
+      decidim-core (= 0.31.7)
       doc2text (~> 0.4.0, >= 0.4.8)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-sortitions (0.31.6)
-      decidim-admin (= 0.31.6)
-      decidim-comments (= 0.31.6)
-      decidim-core (= 0.31.6)
-      decidim-proposals (= 0.31.6)
-    decidim-surveys (0.31.6)
-      decidim-core (= 0.31.6)
-      decidim-forms (= 0.31.6)
-    decidim-system (0.31.6)
+    decidim-sortitions (0.31.7)
+      decidim-admin (= 0.31.7)
+      decidim-comments (= 0.31.7)
+      decidim-core (= 0.31.7)
+      decidim-proposals (= 0.31.7)
+    decidim-surveys (0.31.7)
+      decidim-core (= 0.31.7)
+      decidim-forms (= 0.31.7)
+    decidim-system (0.31.7)
       active_link_to (~> 1.0)
-      decidim-core (= 0.31.6)
+      decidim-core (= 0.31.7)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0, >= 2.0.9)
-    decidim-templates (0.31.6)
-      decidim-core (= 0.31.6)
-      decidim-forms (= 0.31.6)
-    decidim-verifications (0.31.6)
-      decidim-core (= 0.31.6)
+    decidim-templates (0.31.7)
+      decidim-core (= 0.31.7)
+      decidim-forms (= 0.31.7)
+    decidim-verifications (0.31.7)
+      decidim-core (= 0.31.7)
 
 GEM
   remote: https://rubygems.org/
diff --git a/decidim-generators/lib/decidim/generators/component_templates/Gemfile.erb b/decidim-generators/lib/decidim/generators/component_templates/Gemfile.erb
index c9444ed2ea822..7032138bed10e 100644
--- a/decidim-generators/lib/decidim/generators/component_templates/Gemfile.erb
+++ b/decidim-generators/lib/decidim/generators/component_templates/Gemfile.erb
@@ -5,7 +5,7 @@ source "https://rubygems.org"
 
 ruby RUBY_VERSION
 
-gem "decidim", "~> 0.31.6"
+gem "decidim", "~> 0.31.7"
 gem "decidim-<%= component_name %>", path: "."
 
 gem "puma", ">= 6.3.1"
@@ -14,7 +14,7 @@ gem "bootsnap", "~> 1.4"
 group :development, :test do
   gem "byebug", "~> 11.0", platform: :mri
 
-  gem "decidim-dev", "~> 0.31.6"
+  gem "decidim-dev", "~> 0.31.7"
 end
 
 group :development do
diff --git a/decidim-generators/lib/decidim/generators/version.rb b/decidim-generators/lib/decidim/generators/version.rb
index cbd87fec8ed76..234879f3a7816 100644
--- a/decidim-generators/lib/decidim/generators/version.rb
+++ b/decidim-generators/lib/decidim/generators/version.rb
@@ -4,7 +4,7 @@
 module Decidim
   module Generators
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-initiatives/lib/decidim/initiatives/version.rb b/decidim-initiatives/lib/decidim/initiatives/version.rb
index d8a290e9ccc6b..744ea3dafc729 100644
--- a/decidim-initiatives/lib/decidim/initiatives/version.rb
+++ b/decidim-initiatives/lib/decidim/initiatives/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-initiatives version.
   module Initiatives
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-meetings/lib/decidim/meetings/version.rb b/decidim-meetings/lib/decidim/meetings/version.rb
index cc457fe6e5189..f7282fb65114f 100644
--- a/decidim-meetings/lib/decidim/meetings/version.rb
+++ b/decidim-meetings/lib/decidim/meetings/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Meetings
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-pages/lib/decidim/pages/version.rb b/decidim-pages/lib/decidim/pages/version.rb
index ebb5845c29523..0f49413f233f5 100644
--- a/decidim-pages/lib/decidim/pages/version.rb
+++ b/decidim-pages/lib/decidim/pages/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-pages version.
   module Pages
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/version.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/version.rb
index e5af1b84399f9..55f9cc0ef199f 100644
--- a/decidim-participatory_processes/lib/decidim/participatory_processes/version.rb
+++ b/decidim-participatory_processes/lib/decidim/participatory_processes/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-participatory_processes version.
   module ParticipatoryProcesses
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-proposals/lib/decidim/proposals/version.rb b/decidim-proposals/lib/decidim/proposals/version.rb
index 7e8f31e4d3326..af288d2c93c2b 100644
--- a/decidim-proposals/lib/decidim/proposals/version.rb
+++ b/decidim-proposals/lib/decidim/proposals/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-sortitions/lib/decidim/sortitions/version.rb b/decidim-sortitions/lib/decidim/sortitions/version.rb
index 163ec2b199cc2..1e4457e05db10 100644
--- a/decidim-sortitions/lib/decidim/sortitions/version.rb
+++ b/decidim-sortitions/lib/decidim/sortitions/version.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Sortitions
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-surveys/lib/decidim/surveys/version.rb b/decidim-surveys/lib/decidim/surveys/version.rb
index 986083f947b68..f54ea7f997b3e 100644
--- a/decidim-surveys/lib/decidim/surveys/version.rb
+++ b/decidim-surveys/lib/decidim/surveys/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-surveys version.
   module Surveys
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-system/lib/decidim/system/version.rb b/decidim-system/lib/decidim/system/version.rb
index e5d327c69382d..0a88901afbdd7 100644
--- a/decidim-system/lib/decidim/system/version.rb
+++ b/decidim-system/lib/decidim/system/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-system version.
   module System
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-templates/lib/decidim/templates/version.rb b/decidim-templates/lib/decidim/templates/version.rb
index 8e9a5b6f9e383..65da82d438a6c 100644
--- a/decidim-templates/lib/decidim/templates/version.rb
+++ b/decidim-templates/lib/decidim/templates/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-templates version.
   module Templates
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/decidim-verifications/lib/decidim/verifications/version.rb b/decidim-verifications/lib/decidim/verifications/version.rb
index 873b91637c200..bf8d5b8010e7d 100644
--- a/decidim-verifications/lib/decidim/verifications/version.rb
+++ b/decidim-verifications/lib/decidim/verifications/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-verifications version.
   module Verifications
     def self.version
-      "0.31.6"
+      "0.31.7"
     end
   end
 end
diff --git a/lib/decidim/version.rb b/lib/decidim/version.rb
index e53b9e78ded5b..7043c1dd4f578 100644
--- a/lib/decidim/version.rb
+++ b/lib/decidim/version.rb
@@ -3,6 +3,6 @@
 # This holds the decidim version and the faker version it uses.
 module Decidim
   def self.version
-    "0.31.6"
+    "0.31.7"
   end
 end
diff --git a/package-lock.json b/package-lock.json
index 8dbaa4e038b7a..5278f0b50ac17 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20990,12 +20990,12 @@
     },
     "packages/browserslist-config": {
       "name": "@decidim/browserslist-config",
-      "version": "0.31.6",
+      "version": "0.31.7",
       "license": "AGPL-3.0-or-later"
     },
     "packages/core": {
       "name": "@decidim/core",
-      "version": "0.31.6",
+      "version": "0.31.7",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "@emoji-mart/data": "^1.1.2",
@@ -21073,7 +21073,7 @@
     },
     "packages/dev": {
       "name": "@decidim/dev",
-      "version": "0.31.6",
+      "version": "0.31.7",
       "dev": true,
       "license": "AGPL-3.0-or-later",
       "dependencies": {
@@ -21084,7 +21084,7 @@
     },
     "packages/eslint-config": {
       "name": "@decidim/eslint-config",
-      "version": "0.31.6",
+      "version": "0.31.7",
       "dev": true,
       "license": "AGPL-3.0-or-later",
       "peerDependencies": {
@@ -21102,7 +21102,7 @@
     },
     "packages/prettier-config": {
       "name": "@decidim/prettier-config",
-      "version": "0.31.6",
+      "version": "0.31.7",
       "dev": true,
       "license": "AGPL-3.0-or-later",
       "peerDependencies": {
@@ -21111,7 +21111,7 @@
     },
     "packages/stylelint-config": {
       "name": "@decidim/stylelint-config",
-      "version": "0.31.6",
+      "version": "0.31.7",
       "dev": true,
       "license": "AGPL-3.0-or-later",
       "peerDependencies": {
@@ -21121,7 +21121,7 @@
     },
     "packages/webpacker": {
       "name": "@decidim/webpacker",
-      "version": "0.31.6",
+      "version": "0.31.7",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "@hotwired/stimulus": "^3.2.2",
diff --git a/packages/browserslist-config/package.json b/packages/browserslist-config/package.json
index 8a0d3a22748c7..64d6696c22eaa 100644
--- a/packages/browserslist-config/package.json
+++ b/packages/browserslist-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/browserslist-config",
   "description": "The Browserslist configuration for Decidim",
-  "version": "0.31.6",
+  "version": "0.31.7",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/core/package.json b/packages/core/package.json
index 368e8cfb1ca41..865554a750ab2 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/core",
   "description": "The core dependencies for Decidim",
-  "version": "0.31.6",
+  "version": "0.31.7",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/dev/package.json b/packages/dev/package.json
index 254414f4f7c66..b05fc8d4937f4 100644
--- a/packages/dev/package.json
+++ b/packages/dev/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/dev",
   "description": "The dev dependencies for Decidim",
-  "version": "0.31.6",
+  "version": "0.31.7",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
index ceb9af165af85..27febe4742428 100644
--- a/packages/eslint-config/package.json
+++ b/packages/eslint-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/eslint-config",
   "description": "The eslint configuration for Decidim",
-  "version": "0.31.6",
+  "version": "0.31.7",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json
index 162e1ca3a5039..d7bbe3510edc2 100644
--- a/packages/prettier-config/package.json
+++ b/packages/prettier-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/prettier-config",
   "description": "The prettier configuration for Decidim",
-  "version": "0.31.6",
+  "version": "0.31.7",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/stylelint-config/package.json b/packages/stylelint-config/package.json
index 3b118beb0de07..2cc8595ebdb69 100644
--- a/packages/stylelint-config/package.json
+++ b/packages/stylelint-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/stylelint-config",
   "description": "The stylelint configuration for Decidim",
-  "version": "0.31.6",
+  "version": "0.31.7",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/webpacker/package.json b/packages/webpacker/package.json
index 455ab2810ca42..d0c9f95da8be8 100644
--- a/packages/webpacker/package.json
+++ b/packages/webpacker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/webpacker",
   "description": "The webpacker dependencies for Decidim",
-  "version": "0.31.6",
+  "version": "0.31.7",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",

From cde0f448ff308113635d1f8e06700245dbba340a Mon Sep 17 00:00:00 2001
From: decidim-bot <decidim-bot@users.noreply.github.com>
Date: Sun, 2 Aug 2026 00:45:49 +0200
Subject: [PATCH 131/131] Backport 'Use Ubuntu 24.04 in github actions' to
 v0.31 (#17399)

* Use Ubuntu 24.04 in github actions

* Addional fix for ubuntu 24

* Fix performance workflow

---------

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
---
 .github/workflows/check_locale_completeness.yml             | 2 +-
 .github/workflows/ci_backporter.yml                         | 2 +-
 .github/workflows/ci_generators.yml                         | 2 +-
 .github/workflows/ci_javascript.yml                         | 2 +-
 .github/workflows/ci_main.yml                               | 2 +-
 .github/workflows/ci_performance_metrics_monitoring.yml     | 6 +++++-
 .github/workflows/ci_production_check.yml                   | 2 +-
 .github/workflows/codeql.yml                                | 2 +-
 .github/workflows/lint_code.yml                             | 2 +-
 .github/workflows/lint_pr_format.yml                        | 6 +++---
 .github/workflows/on_docs_update.yml                        | 2 +-
 .github/workflows/on_release.yml                            | 2 +-
 .github/workflows/test_app.yml                              | 6 +++++-
 .../generators/component_templates/github/ci.yml.erb        | 2 +-
 14 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/check_locale_completeness.yml b/.github/workflows/check_locale_completeness.yml
index ef6da9d03599c..aa0e6eb83dc99 100644
--- a/.github/workflows/check_locale_completeness.yml
+++ b/.github/workflows/check_locale_completeness.yml
@@ -15,7 +15,7 @@ concurrency:
 jobs:
   check-locale:
     name: Check locale completeness
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v6
 
diff --git a/.github/workflows/ci_backporter.yml b/.github/workflows/ci_backporter.yml
index ea00977417fff..3029a9a320d2a 100644
--- a/.github/workflows/ci_backporter.yml
+++ b/.github/workflows/ci_backporter.yml
@@ -14,7 +14,7 @@ env:
 jobs:
   backport:
     name: "Backporter"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 60
     # the below IF structure checks:
     #  - PR repository must be the official Decidim repository ( decidim/decidim )
diff --git a/.github/workflows/ci_generators.yml b/.github/workflows/ci_generators.yml
index 02028669d5824..6b7d88e3f9bfc 100644
--- a/.github/workflows/ci_generators.yml
+++ b/.github/workflows/ci_generators.yml
@@ -56,7 +56,7 @@ jobs:
           - command: bundle exec parallel_test --type rspec --pattern spec/lib/
             name: Lib
     name: ${{ matrix.test.name }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: "!startsWith(github.head_ref, 'chore/l10n')"
     timeout-minutes: 90
     services:
diff --git a/.github/workflows/ci_javascript.yml b/.github/workflows/ci_javascript.yml
index ee6d704ae79d0..85890d9be0eb9 100644
--- a/.github/workflows/ci_javascript.yml
+++ b/.github/workflows/ci_javascript.yml
@@ -33,7 +33,7 @@ concurrency:
 jobs:
   main:
     name: Tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: "!startsWith(github.head_ref, 'chore/l10n')"
     timeout-minutes: 60
     steps:
diff --git a/.github/workflows/ci_main.yml b/.github/workflows/ci_main.yml
index 83cbb40e11148..f276fc16af470 100644
--- a/.github/workflows/ci_main.yml
+++ b/.github/workflows/ci_main.yml
@@ -26,7 +26,7 @@ concurrency:
 jobs:
   main:
     name: Tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/ci_performance_metrics_monitoring.yml b/.github/workflows/ci_performance_metrics_monitoring.yml
index 77e95a5752253..7cca7520b8b68 100644
--- a/.github/workflows/ci_performance_metrics_monitoring.yml
+++ b/.github/workflows/ci_performance_metrics_monitoring.yml
@@ -34,7 +34,7 @@ concurrency:
 jobs:
   main:
     name: Tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: "!startsWith(github.head_ref, 'chore/l10n')"
     timeout-minutes: 60
     services:
@@ -64,6 +64,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 1
+      - run: |
+          sudo apt-get update && sudo apt-get install imagemagick
+        name: Install libvips
+        shell: "bash"
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ env.RUBY_VERSION }}
diff --git a/.github/workflows/ci_production_check.yml b/.github/workflows/ci_production_check.yml
index c2d810b51b646..863d856572d78 100644
--- a/.github/workflows/ci_production_check.yml
+++ b/.github/workflows/ci_production_check.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   main:
     name: Tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: "!startsWith(github.head_ref, 'chore/l10n')"
     timeout-minutes: 60
     services:
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index c0a1c8774c489..062b8723a2a2b 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -23,7 +23,7 @@ on:
 jobs:
   analyze:
     name: Analyze (${{ matrix.language }})
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 60
     concurrency:
       group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}-${{ matrix.language }}
diff --git a/.github/workflows/lint_code.yml b/.github/workflows/lint_code.yml
index 5e23627de491f..e2f79f31dfd67 100644
--- a/.github/workflows/lint_code.yml
+++ b/.github/workflows/lint_code.yml
@@ -37,7 +37,7 @@ jobs:
           - ./.github/run_spelling_check.sh
           - npm run linthtml
     name: Lint code
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: "!startsWith(github.head_ref, 'chore/l10n')"
     timeout-minutes: 60
     steps:
diff --git a/.github/workflows/lint_pr_format.yml b/.github/workflows/lint_pr_format.yml
index 499a5ffe5f538..6717998478d0b 100644
--- a/.github/workflows/lint_pr_format.yml
+++ b/.github/workflows/lint_pr_format.yml
@@ -23,7 +23,7 @@ permissions:
 jobs:
   check_title:
     name: Check PR title
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: deepakputhraya/action-pr-title@master
         with:
@@ -38,7 +38,7 @@ jobs:
     permissions:
       contents: read
       pull-requests: write
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/labeler@v5
@@ -48,7 +48,7 @@ jobs:
   check_label:
     needs: labeler
     name: Check PR labels
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: jesusvasquez333/verify-pr-label-action@v1.4.0
         with:
diff --git a/.github/workflows/on_docs_update.yml b/.github/workflows/on_docs_update.yml
index 2bf96cbc4fdbb..e094e6f6ac9af 100644
--- a/.github/workflows/on_docs_update.yml
+++ b/.github/workflows/on_docs_update.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   trigger_documentation_build:
     name: Trigger decidim/documentation build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 60
     steps:
     - name: Send dispatch for trigger_build workflow
diff --git a/.github/workflows/on_release.yml b/.github/workflows/on_release.yml
index 22c0ffc754d2f..040aa26d38bb0 100644
--- a/.github/workflows/on_release.yml
+++ b/.github/workflows/on_release.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   trigger_docker_build:
     name: Trigger decidim/docker build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 60
     steps:
     - name: Send dispatch for Docker Hub build
diff --git a/.github/workflows/test_app.yml b/.github/workflows/test_app.yml
index f9a292fafe840..b74bc2e77aad3 100644
--- a/.github/workflows/test_app.yml
+++ b/.github/workflows/test_app.yml
@@ -42,7 +42,7 @@ on:
 jobs:
   build_app:
     name: Test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: "!startsWith(github.head_ref, 'chore/l10n')"
     timeout-minutes: 60
     env:
@@ -70,6 +70,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 1
+      - run: |
+          sudo apt-get update && sudo apt-get install imagemagick
+        name: Install libvips
+        shell: "bash"
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ inputs.ruby_version }}
diff --git a/decidim-generators/lib/decidim/generators/component_templates/github/ci.yml.erb b/decidim-generators/lib/decidim/generators/component_templates/github/ci.yml.erb
index e068b31191b8d..0b829d4d4294c 100644
--- a/decidim-generators/lib/decidim/generators/component_templates/github/ci.yml.erb
+++ b/decidim-generators/lib/decidim/generators/component_templates/github/ci.yml.erb
@@ -21,7 +21,7 @@ concurrency:
 jobs:
   main:
     name: Tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 30
     services:
       postgres: