diff --git a/.ai/app-directories.md b/.ai/app-directories.md
new file mode 100644
index 0000000000000..c7cab2055a6cd
--- /dev/null
+++ b/.ai/app-directories.md
@@ -0,0 +1,47 @@
+# App directories
+
+As decidim is a gem for Ruby on Rails you may find the usual rails directories: controllers, models, etc. but we also have other kind of directories.
+
+## Standard Rails
+
+| Directory    | Description                      | Technology             |
+|--------------|----------------------------------|------------------------|
+| controllers/ | HTTP request handlers            | Rails ActionController |
+| models/      | ActiveRecord models and entities | Rails ActiveRecord     |
+| views/       | ERB templates for rendering      | Rails ERB              |
+| helpers/     | View helper methods              | Rails ActionView       |
+| mailers/     | Email sending classes            | Rails ActionMailer     |
+| jobs/        | Background job classes           | Rails ActiveJob        |
+
+## Beyond Standard Rails
+
+| Directory    | Description                                                 | Technology                                                        |
+|--------------|-------------------------------------------------------------|-------------------------------------------------------------------|
+| commands/    | Business logic encapsulating use cases (Command Pattern)    | Custom Decidim base class (inspired by Rectify gem).              |
+| forms/       | Form objects for data validation and transformation         | Custom Form base class with Decidim::Attributes                   |
+| cells/       | Reusable view components                                    | Trailblazer::Cells gem                                            |
+| events/      | Activity logging, notifications, event triggering           | Custom Event classes (SimpleEvent, NotificationEvent, EmailEvent) |
+| permissions/ | Authorization and permission checking logic                 | Custom Decidim permission system                                  |
+| queries/     | Database query objects for complex queries                  | Custom Query base class                                           |
+| presenters/  | Decorator classes for view-specific formatting              | SimpleDelegator-based                                             |
+| services/    | Stateless utility and business service classes              | Plain Ruby classes                                                |
+| validators/  | Custom validation classes                                   | Rails Custom Validators                                           |
+| serializers/ | JSON/XML serialization for API responses                    | Custom serializers                                                |
+| uploaders/   | File upload handling                                        | Custom validations for ActiveStorage                              |
+| constraints/ | Rails routing constraints                                   | Custom constraint classes                                         |
+| resolvers/   | GraphQL data resolution                                     | Custom resolver classes                                           |
+| scrubbers/   | HTML content sanitization                                   | Rails::HTML::Scrubber                                             |
+| packs/       | JavaScript/CSS entry points and assets                      | Shakapacker                                                       |
+| assets/      | Static assets (some modules)                                | Asset pipeline                                                    |
+
+## Key Architectural Patterns
+
+**IMPORTANT: You must follow the existing patterns.**
+
+1. **Command Pattern**: Commands in `app/commands/` encapsulate single use cases and broadcast events
+2. **Form Objects**: Forms in `app/forms/` handle validation separately from models
+3. **Cells**: Component-based views using `Trailblazer::Cells` for reusable UI
+4. **Query Objects**: Complex database queries isolated in `app/queries/`
+5. **Events**: Events trigger notifications, logs, and side effects
+6. **Permission System**: Scope-based authorization with action/subject model
+7. **Content Block System**: Customizable page sections via manifests
diff --git a/.ai/build-pipeline-integration.md b/.ai/build-pipeline-integration.md
new file mode 100644
index 0000000000000..4e06c35cf7ffb
--- /dev/null
+++ b/.ai/build-pipeline-integration.md
@@ -0,0 +1,113 @@
+# Build Pipeline Integration
+
+**CI Requirements:** The `.github/workflows/` contain the production CI setup:
+
+- Tests run on Ubuntu
+- Requires PostgreSQL and Redis services
+- Uses specific Ruby and Node versions
+- Runs parallel tests across multiple modules
+- **Each module CI can timeout at 30-60 minutes - NEVER CANCEL**
+
+## Pre-Commit Checklist
+
+Before committing, ALWAYS run:
+
+```bash
+npm run lint
+bundle exec rubocop
+bundle exec erblint --lint-all
+bundle exec i18n-tasks normalize --locales en
+bundle exec rspec
+npm run test
+```
+
+## Troubleshooting
+
+### JavaScript Lint Failures
+
+```bash
+# View errors
+npm run lint
+
+# Auto-fix what can be fixed
+npm run lint -- --fix
+```
+
+### Ruby Lint Failures (RuboCop)
+
+```bash
+# View errors with details
+bundle exec rubocop
+
+# Auto-fix safe corrections
+bundle exec rubocop -a
+
+# Auto-fix including unsafe corrections (review changes afterward)
+bundle exec rubocop -A
+```
+
+### ERB Lint Failures
+
+```bash
+# View errors
+bundle exec erblint --lint-all
+
+# Auto-fix
+bundle exec erblint --lint-all --autocorrect
+```
+
+### CSS/SCSS Formatting Issues
+
+```bash
+# Check issues
+npm run stylelint
+npm run prettier
+
+# Auto-fix
+npm run prettify
+```
+
+### Translation Key Issues
+
+```bash
+# Normalize and sort keys (only English)
+bundle exec i18n-tasks normalize --locales en
+
+# Find missing keys
+bundle exec i18n-tasks missing
+
+# Find unused keys
+bundle exec i18n-tasks unused
+```
+
+### Test Failures
+
+**IMPORTANT:** When a test fails, always ask the user whether you should fix the test or fix the code that the test is validating. Do not assume which approach is correct.
+
+1. **Read the error message carefully** - RSpec provides detailed failure information
+
+2. **Run the specific failing test** to iterate faster:
+
+```bash
+cd decidim-<module>
+bundle exec rspec spec/path/to/failing_spec.rb:LINE_NUMBER
+```
+
+- You can pass multiple line numbers: file.rb:12:34
+- For failures in shared contexts/examples, always run the concrete example using its file:line from the failure output.
+- Alternatively, run by example description:
+
+```bash
+bundle exec rspec spec/path/to/failing_spec.rb -e "example description"
+```
+
+1. **Check for flaky tests** - If a test passes when run individually but fails in the suite, it may be a test isolation issue
+
+2. **Reset the test database** if you suspect data issues:
+
+```bash
+cd spec/decidim_dummy_app
+bin/rails db:reset RAILS_ENV=test
+```
+
+1. **Check for missing dependencies** - Run `bundle install` and `npm install` if tests fail with load errors
diff --git a/.ai/development-workflow.md b/.ai/development-workflow.md
new file mode 100644
index 0000000000000..7f5831174c65a
--- /dev/null
+++ b/.ai/development-workflow.md
@@ -0,0 +1,206 @@
+# Development Workflow
+
+## Creating a Development App
+
+As decidim is a gem, we need to create a rails application to test it. That's why we have the `development_app`. When you generate it, you create a rails application with the decidim gem using the local files. You only need to generate it once. So if the directory already exists you don't need to generate it again unless a reset is required.
+
+You should not change anything inside this development app as it's a local directory that won't be persisted.
+
+```bash
+# Install dependencies first (if not already done)
+bundle install
+npm install
+
+# Create development app for active development
+bundle exec rake development_app
+cd development_app
+bin/dev  # Starts Rails server with webpack dev server
+```
+
+## Key Development Files and Locations
+
+**Gem Structure:** Each `decidim-*` directory is a separate gem:
+
+- `decidim-core/` - Main framework and shared components
+- `decidim-admin/` - Administrative interface  
+- `decidim-proposals/` - Proposal management component
+- `decidim-participatory_processes/` - Process management
+- `decidim-assemblies/` - Assembly management
+- `decidim-meetings/` - Meeting management
+- `decidim-surveys/` - Survey component
+- And many more...
+
+**Important Files:**
+
+- `Rakefile` - Main build tasks and gem management
+- `Gemfile` - Root dependency specification
+- `package.json` - JavaScript dependencies and scripts
+- `.github/workflows/` - CI/CD pipeline definitions
+- `docs/` - Comprehensive documentation in AsciiDoc format
+
+**JavaScript Assets:** Located in each gem's `app/packs/` directory
+**Stylesheets:** Located in each gem's `app/packs/stylesheets/` directory
+
+## Common Development Tasks
+
+Running the development server:
+
+```bash
+cd development_app
+bin/dev  # Starts Rails + webpack dev server
+# Access at http://localhost:3000
+# Admin panel: http://localhost:3000/admin (after creating admin user)
+```
+
+Database operations:
+
+```bash
+cd development_app
+bin/rails db:drop       # Drop database
+bin/rails db:create     # Create database
+bin/rails db:migrate    # Run migrations
+bin/rails db:seed       # Load sample data
+bin/rails db:reset      # Reset and reseed database
+```
+
+Asset compilation:
+
+```bash
+cd development_app
+bin/rails assets:precompile
+```
+
+## Database Migrations
+
+When creating new features that require database changes, migrations belong in the appropriate `decidim-*` module, not in the development app.
+
+### Creating a Migration
+
+```bash
+cd decidim-<module>
+bin/rails generate migration AddFieldToTableName field_name:type
+```
+
+### Migration File Location
+
+Migrations are stored in each gem's `db/migrate/` directory:
+
+```text
+decidim-<module>/
+└── db/
+    └── migrate/
+        └── YYYYMMDDHHMMSS_migration_name.rb
+```
+
+### Applying Migrations
+
+After creating a migration, regenerate the development or test app to apply it:
+
+```bash
+# For development
+bundle exec rake development_app
+
+# For testing
+bundle exec rake test_app
+```
+
+Or apply migrations directly in an existing app:
+
+```bash
+cd development_app  # or spec/decidim_dummy_app
+bin/rails decidim:upgrade
+bin/rails db:migrate
+```
+
+### Migration Best Practices
+
+- Use reversible migrations when possible
+- Add indexes for foreign keys and frequently queried columns
+- Use `change_column_null` with a default value for non-nullable columns
+- Test migrations in both directions: `bin/rails db:migrate` and `bin/rails db:rollback`
+
+## Data Migrations (data-migrate)
+
+Decidim uses the `data-migrate` gem for data changes that should not live in schema migrations (e.g. backfilling data, transforming existing records, one-off fixes).
+
+Use data migrations when:
+
+- Modifying existing data
+- Backfilling new columns
+- Migrating values between columns or tables
+- Fixing production data inconsistencies
+
+Do **not** use schema migrations for these cases.
+
+### Creating a Data Migration
+
+From the appropriate decidim-* module:
+
+```bash
+cd decidim-<module> bin/rails generate data_migration BackfillSomething
+```
+
+This creates a file under:
+
+```text
+decidim-<module>/
+└── db/
+    └── data/
+        └── YYYYMMDDHHMMSS_backfill_something.rb
+```
+
+### Running Data Migrations
+
+In a development or test app:
+
+```bash
+bin/rails data:migrate
+```
+
+To check status:
+
+```bash
+bin/rails data:migrate:status
+```
+
+### Data Migration Best Practices
+
+- Never reference application models directly.
+- Define a minimal ActiveRecord::Base class inside the migration.
+- Always pin the table name to avoid breakage if models change:
+
+```ruby
+class LegacyProposal < ActiveRecord::Base
+  self.table_name = "decidim_proposals_proposals"
+end
+```
+
+- Avoid callbacks, validations, and scopes.
+- Make migrations idempotent (safe to re-run).
+- Prefer find_each for large datasets.
+- Keep data migrations small and focused.
+
+### Example Pattern
+
+```ruby
+class BackfillPublishedAt < ActiveRecord::Migration[6.1]
+  class Proposal < ActiveRecord::Base
+    self.table_name = "decidim_proposals_proposals"
+  end
+
+  def up
+    Proposal.where(published_at: nil).find_each do |proposal|
+      proposal.update_column(:published_at, proposal.created_at)
+    end
+  end
+
+  def down
+    # no-op (data migrations are usually irreversible)
+  end
+end
+```
+
+### When in Doubt
+
+- Schema change? → regular migration
+- Data change? → data-migrate
diff --git a/.ai/documentation.md b/.ai/documentation.md
new file mode 100644
index 0000000000000..6125e15926ac1
--- /dev/null
+++ b/.ai/documentation.md
@@ -0,0 +1,109 @@
+# Documentation
+
+We have comprehensive documentation in `docs/` using AsciiDoc format. When making changes, check if related documentation needs updating.
+
+## When to Read Which Docs
+
+### `docs/modules/install/` - Installation Guide
+
+**Read when:** Setting up Decidim, troubleshooting installation, updating versions, deploying to production.
+
+| File                  | Content                                               |
+|-----------------------|-------------------------------------------------------|
+| `index.adoc`          | Overview, creating apps, scheduled tasks, seed data   |
+| `manual.adoc`         | Step-by-step installation (Ruby, PostgreSQL, Node.js) |
+| `checklist.adoc`      | Production deployment checklist                       |
+| `update.adoc`         | Updating Decidim versions, compatibility matrix       |
+| `empty-database.adoc` | Setup without seed data                               |
+
+### `docs/modules/develop/` - Developer Guide
+
+**Read when:** Developing features, understanding architecture, writing tests, contributing to core.
+
+| File                         | Content                                            |
+|------------------------------|----------------------------------------------------|
+| `guide.adoc`                 | Entry point for development                        |
+| `guide_architecture.adoc`    | C4 diagrams, system architecture                   |
+| `guide_conventions.adoc`     | GitFlow, branch naming, commit messages            |
+| `modules.adoc`               | Creating external modules                          |
+| `components.adoc`            | Creating components (manifests, settings, exports) |
+| `testing.adoc`               | RSpec, Jest, parallel testing                      |
+| `permissions.adoc`           | Permission system, adding actions                  |
+| `notifications.adoc`         | Events, email/notification generation              |
+| `content_blocks.adoc`        | Registering content blocks                         |
+| `api.adoc`                   | GraphQL API                                        |
+| `view_models_aka_cells.adoc` | Cells pattern                                      |
+
+**`docs/modules/develop/pages/classes/`** - Class patterns:
+
+| File               | Pattern                                         |
+|--------------------|-------------------------------------------------|
+| `commands.adoc`    | Command pattern (Create/Update/DestroyResource) |
+| `forms.adoc`       | Form objects (Decidim::Form)                    |
+| `cells.adoc`       | View components (Decidim::ViewModel)            |
+| `events.adoc`      | Event classes for notifications                 |
+| `permissions.adoc` | Permission classes                              |
+| `queries.adoc`     | Query objects                                   |
+| `presenters.adoc`  | ResourcePresenter, AdminLogPresenter            |
+| `jobs.adoc`        | ActiveJob background jobs                       |
+| `mailers.adoc`     | Mailers with locale handling                    |
+| `controllers.adoc` | Controller patterns                             |
+| `models.adoc`      | ActiveRecord models and concerns                |
+
+### `docs/modules/configure/` - Configuration Guide
+
+**Read when:** Configuring Decidim options, environment variables, system panel.
+
+| File                         | Content                                  |
+|------------------------------|------------------------------------------|
+| `index.adoc`                 | Configuration overview, CLI flags        |
+| `initializer.adoc`           | All Decidim.configure options            |
+| `system.adoc`                | System panel, multi-tenant organizations |
+| `environment_variables.adoc` | Environment variable reference           |
+
+### `docs/modules/services/` - External Services
+
+**Read when:** Integrating maps, email, storage, or other external services.
+
+| File                     | Content                               |
+|--------------------------|---------------------------------------|
+| `activejob.adoc`         | Background jobs (Sidekiq, DelayedJob) |
+| `activestorage.adoc`     | File storage (S3, GCS, Azure)         |
+| `maps.adoc`              | Maps/geocoding (HERE Maps, OSM)       |
+| `smtp.adoc`              | Email server configuration            |
+| `sms.adoc`               | SMS gateway for verification          |
+| `social_providers.adoc`  | OAuth providers                       |
+| `etherpad.adoc`          | Real-time collaborative editing       |
+| `aitools.adoc`           | AI tools integration                  |
+
+### `docs/modules/customize/` - Customization Guide
+
+**Read when:** Customizing appearance, overriding behavior, extending functionality.
+
+| File                 | Content                                           |
+|----------------------|---------------------------------------------------|
+| `code.adoc`          | Monkey patching, decorators, modules              |
+| `views.adoc`         | Overriding views (filename method, Deface, cells) |
+| `styles.adoc`        | CSS (Tailwind, SCSS, organization colors)         |
+| `javascript.adoc`    | Custom JavaScript                                 |
+| `authorizations.adoc`| Custom verification handlers                      |
+| `menu.adoc`          | Navigation menu customization                     |
+| `localization.adoc`  | Translations                                      |
+
+## Quick Reference by Task
+
+| Task                         | Read                                                                 |
+|------------------------------|----------------------------------------------------------------------|
+| Creating a new command       | `develop/pages/classes/commands.adoc`                                |
+| Creating a new form          | `develop/pages/classes/forms.adoc`                                   |
+| Adding a new cell            | `develop/pages/classes/cells.adoc`                                   |
+| Adding notifications/events  | `develop/notifications.adoc`, `develop/pages/classes/events.adoc`    |
+| Adding permissions           | `develop/permissions.adoc`, `develop/pages/classes/permissions.adoc` |
+| Creating a module            | `develop/modules.adoc`                                               |
+| Creating a component         | `develop/components.adoc`                                            |
+| Overriding views             | `customize/views.adoc`                                               |
+| Customizing styles           | `customize/styles.adoc`                                              |
+| Running tests                | `develop/testing.adoc`                                               |
+| Configuring maps             | `services/maps.adoc`                                                 |
+| Configuring storage          | `services/activestorage.adoc`                                        |
+| Production deployment        | `install/checklist.adoc`                                             |
diff --git a/.ai/important-notes.md b/.ai/important-notes.md
new file mode 100644
index 0000000000000..9fb1c4ce3e9f7
--- /dev/null
+++ b/.ai/important-notes.md
@@ -0,0 +1,9 @@
+# Important Notes
+
+- **NEVER CANCEL** builds or tests that take more than 2 minutes - builds can take 3+ minutes, full test suites for a module 60+ minutes
+- Always use the exact Ruby and Node versions specified in `.ruby-version` and `.node-version`.
+- The development app (`rake development_app`) is the primary way to create a working Decidim application for development
+- Each `decidim-*` directory is an independent gem with its own tests and dependencies
+- Always run full validation scenarios after making changes to ensure functionality works end-to-end
+- **Changes to decidim-generators**: When making changes to `decidim-generators` that affect application configuration (files like `config/application.rb`, `config/environments/*`, etc) or other generated files, also document these changes in `RELEASE_NOTES.md`
+- Read more about testing (like how to run parallel tests) at @docs/modules/develop/pages/testing.adoc
diff --git a/.ai/introduction.md b/.ai/introduction.md
new file mode 100644
index 0000000000000..0557e7a648cdd
--- /dev/null
+++ b/.ai/introduction.md
@@ -0,0 +1,20 @@
+# Introduction
+
+[Decidim](https://decidim.org) is a free/libre, open-source digital platform for citizen participation and democratic governance. It enables citizens, organizations, and public institutions to self-organize democratically at any scale.
+
+## Key Features
+
+- Strategic planning
+- Participatory processes
+- Assemblies
+- Initiatives and citizen consultations
+- Participatory budgeting
+- Networked communication
+
+## Who Uses Decidim
+
+Hundreds of organizations globally use Decidim, including city governments (Barcelona, NYC, Helsinki), the European Commission, the French Senate and National Assembly, Mexico City, the Brazilian federal government, and universities.
+
+## Technical Overview
+
+Decidim is a Ruby on Rails application with JavaScript frontend components. The codebase consists of multiple gem modules (`decidim-core`, `decidim-admin`, `decidim-proposals`, etc.), each handling specific functionality. The platform prioritizes transparency, traceability, security, and privacy.
diff --git a/.ai/linting.md b/.ai/linting.md
new file mode 100644
index 0000000000000..3ef6e245954e4
--- /dev/null
+++ b/.ai/linting.md
@@ -0,0 +1,39 @@
+# Linting
+
+- JavaScript linting:
+
+```bash
+npm run lint
+# Expected time: ~6 seconds
+# May show warnings about React version and import paths - this is normal
+```
+
+- Ruby linting:
+
+```bash
+bundle exec rubocop
+# Expected time: ~1.5 seconds
+# Use --parallel for faster execution
+# Use -a flag for auto-correction
+```
+
+- ERB linting:
+
+```bash
+bundle exec erblint --lint-all
+# use --autocorrect flag for auto-correction
+```
+
+- CSS/SCSS linting:
+
+```bash
+npm run stylelint
+npm run prettier
+# Use npm run prettify to fix formatting
+```
+
+- Normalize and sort translation keys:
+
+```bash
+bundle exec i18n-tasks normalize --locales en
+```
diff --git a/.ai/locales.md b/.ai/locales.md
new file mode 100644
index 0000000000000..17e7b0b1f2481
--- /dev/null
+++ b/.ai/locales.md
@@ -0,0 +1,3 @@
+# Locales
+
+The locales are managed by Crowdin. When you are developing you must only take care of the `en.yml` files, do not change the other locales.
diff --git a/.ai/requirements.md b/.ai/requirements.md
new file mode 100644
index 0000000000000..ece4c484c3b80
--- /dev/null
+++ b/.ai/requirements.md
@@ -0,0 +1,11 @@
+# Requirements
+
+In order to run this project locally we need:
+
+- Ruby (you can check the version in the `.ruby-version` file)
+- Node.js (you can check in `.node-version` file)
+- PostgreSQL (any recent version)
+- Redis server (required for background jobs)
+- Google Chrome (required for system tests using Capybara)
+
+If any of these requirements is not installed, refer to the official installation guide: <https://docs.decidim.org/en/develop/install/manual>
diff --git a/.ai/testing.md b/.ai/testing.md
new file mode 100644
index 0000000000000..7d052a552779c
--- /dev/null
+++ b/.ai/testing.md
@@ -0,0 +1,80 @@
+# Testing
+
+We use RSpec as technology for testing.
+
+## Creating the Test App
+
+As decidim is a gem, we need to create a rails application to run the tests. That's why we have the `spec/decidim_dummy_app`. When you generate it, you create a rails application with the decidim gem using the local files. You only need to generate it once. So if the directory already exists you don't need to generate it again unless a reset is required.
+
+You should not change anything inside this test app as it's a local directory that won't be persisted.
+
+```bash
+# Install dependencies first (if not already done)
+bundle install
+npm install
+
+# Create test app (generates spec/decidim_dummy_app)
+bundle exec rake test_app
+```
+
+## Running tests
+
+**NEVER CANCEL TESTS** - They may take several minutes to complete.
+
+- Main test suite (1 minute 49 seconds - NEVER CANCEL):
+
+```bash
+bundle exec rspec
+# Expected time: ~109 seconds - NEVER CANCEL
+# Set timeout to 300+ seconds
+```
+
+- JavaScript tests (13 seconds):
+
+```bash
+npm run test
+# Expected time: ~13 seconds
+# Some vendor test failures are expected (shakapacker dependencies)
+```
+
+- Individual module tests:
+
+```bash
+bundle exec rake test_core        # Test decidim-core
+bundle exec rake test_admin       # Test decidim-admin
+bundle exec rake test_proposals   # Test decidim-proposals
+# Each module test can take 10-30 minutes - NEVER CANCEL
+```
+
+- Individual test:
+
+```bash
+# You need to access the module where the test belong
+# and run the rspec from there. For example:
+cd decidim-core
+bundle exec rspec spec/system/account_spec.rb
+```
+
+## Creating or updating tests
+
+When you create or update any of the components described in `.ai/app-directories.md` you should create or update unit tests for them.
+
+We also have `system` specs for integration specs. We shouldn't test all the scenarios there. Only the most relevant ones.
+
+You can make use of the `shared_examples`, `shared_context`, etc. directives to avoid repeating code in your test files.
+
+## System Tests Requirements
+
+Some specs (especially `spec/system`) use Capybara with a real browser.
+
+Requirements for running system tests locally:
+
+- Google Chrome must be installed and available in `PATH`
+- Google ChromeDriver should also be available
+- ChromeDriver should have the same version number as Google Chrome
+- The test app must be generated (`spec/decidim_dummy_app`)
+- Tests are executed against the dummy app; do not modify it manually
+
+If Chrome is missing, system specs will fail with driver or browser-related errors.
+
+Chrome is required both locally and in CI for running system tests.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index bde812b3c811a..c6203667f3dd5 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,8 +1,11 @@
-FROM decidim/decidim:0.22.0-dev
+ARG RUBY_VERSION=3.4.7
+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..ed22d700847e3
--- /dev/null
+++ b/.devcontainer/compose.yaml
@@ -0,0 +1,41 @@
+name: "decidim"
+
+services:
+  rails-app:
+    build:
+      context: ..
+      dockerfile: .devcontainer/Dockerfile
+    volumes:
+    - ../:/workspaces/decidim:cached
+    - bundle-cache:/usr/local/bundle
+    - node-modules-cache:/workspaces/decidim/node_modules
+    ports:
+      - "${DEVCONTAINER_APP_PORT:-3000}:3000"
+    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:
+  bundle-cache:
+  node-modules-cache:
+
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 4544c22e09232..bceb49495bd92 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,21 +1,32 @@
-// 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": {},
+    "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/excludes.txt b/.github/actions/spelling/excludes.txt
index 28c5f8f988d94..9801f099f9e43 100644
--- a/.github/actions/spelling/excludes.txt
+++ b/.github/actions/spelling/excludes.txt
@@ -101,6 +101,7 @@
 ^\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/empty_file.csv\E$
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index 66d3cf4d9aa30..81873d492bbd3 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -139,6 +139,7 @@ cobertura
 codecov
 codefor
 CODEOWNERS
+codespace
 codeql
 coditramuntana
 commentables
@@ -175,6 +176,7 @@ cuenta
 Cugat
 customise
 Customising
+CVEs
 cweek
 cyclomatic
 danline
@@ -222,10 +224,12 @@ doesnot
 doggotrainer
 Dokku
 Dota
+dotfiles
 douban
 downvoted
 downvotes
 downvoting
+DPG
 draggables
 dragula
 drinkform
@@ -281,6 +285,8 @@ evanfuture
 evt
 Exampledocument
 exitstatus
+Existente
+EXISTINGCITY
 faketoken
 Fal
 fcell
@@ -417,6 +423,7 @@ isbn
 iseq
 isready
 Italiano
+itemabcd
 ivan
 Jaskolski
 Jaume
@@ -465,6 +472,7 @@ libpq
 libreadline
 libreoffice
 libretranslate
+libvips
 libyaml
 Liddel
 lighthouserc
@@ -530,6 +538,7 @@ misogi
 mlat
 mlon
 Mobi
+moby
 modals
 modernizrrc
 modestbranding
@@ -547,6 +556,7 @@ msword
 multichoice
 multifield
 multitenant
+mycity
 myengine
 mypass
 myprovider
@@ -639,7 +649,7 @@ pamplona
 pandoc
 paramxx
 partcipatory
-participatoryspaceprivateusers
+participatoryspace
 patrimonigracia
 Peguera
 pepito
@@ -654,6 +664,7 @@ PGVERSION
 Phargo
 phoe
 pinterest
+pids
 Placeholdit
 plantuml
 plataforma
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 404bc5482f75b..6e330aa87f69a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -72,4 +72,3 @@ updates:
       - "dependencies"
       - "type: internal"
       - "decidim-generators"
-
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index 6b4064b6a917f..d011956bcd854 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -1,46 +1,41 @@
 # Decidim GitHub Actions workflows
 
-We use GitHub Actions as CI.
-
-- `lint_code.yml`: runs the linters for Ruby, JS and ERB files.
-- `ci_main.yml`: runs the tests for the main folder
-- `ci_core.yml`: runs the tests for the `decidim-core` module. The remaining workflows (except noted) are based on this one.
-
-Individual workflows with changes:
-
-- `ci_generators.yml`: `decidim-generators` does not need to create the test_app, so this command is removed. Screenshots uploads and chromedriver setup steps are also not needed for this module and thus removed. We also customize the gems path after running `bundle install`:
-
-```yml
-# ci_generators.yml
-- run: bundle install --path vendor/bundle --jobs 4 --retry 3
-  name: Install Ruby deps
-- run: cp -R vendor/bundle decidim-generators
-- run: bundle exec rspec
-  name: RSpec
-  working-directory: ${{ env.DECIDIM_MODULE }}
-```
-
-- `ci_javascript.yml`: Runs tests for the JS files. Tests must run from the project root folder. You will need to install NodeJS and the JS dependencies:
-
-```yml
-- uses: actions/setup-node@v4
-  with:
-    node-version: ${{ env.NODE_VERSION }}
-- run: npm ci
-  name: Install JS deps
-- run: npm run test
-  name: Test JS files
-```
-
-- Some specs are split in three workflows, so if we need to retry this particular workflow we do not need to retry all the module suite. For instance proposals:
-
-  - `ci_proposals_system_admin.yml`: Runs the system specs for the admin section
-  - `ci_proposals_system_public.yml`: Runs the system specs for the public section
-  - `ci_proposals_unit_tests.yml`: Runs the unit tests
-
-- `ci_performance_metrics_monitoring.yml`: Runs Lighthouse metrics expectations against the app to detect any performance regression. The expectations can be found in `lighthouse_budget.json`, where a time is defined for each metric:
-
-  - [First Contentful Paint](https://web.dev/first-contentful-paint/): 2 seconds
-  - [Speed Index](https://web.dev/speed-index/): 4 seconds
-  - [Time to Interactive](https://web.dev/interactive/): 5 seconds
-  - [Largest Contentful Paint](https://web.dev/lcp/): 2.5 seconds
+We use GitHub Actions as CI with two key optimizations: **workflow splitting** and **composite actions**.
+
+## Architecture
+
+### Composite Actions
+
+- `test_app.yml`: [Reusable workflow](https://docs.github.com/en/actions/using-workflows/reusing-workflows) that provides all common CI setup (Ruby, Node.js, database, Chrome, etc.)
+- All `ci_*.yml` workflows use this composite action via `uses: ./.github/workflows/test_app.yml`
+- Reduces duplication and simplifies maintenance
+
+### Workflow Splitting
+
+Large test suites are split into [parallel workflows](https://docs.github.com/en/actions/using-jobs/using-jobs-in-a-workflow) to reduce execution time:
+
+## Core Workflows
+
+- `lint_code.yml`: Lints Ruby, JS, and ERB files
+- `ci_main.yml`: Tests for main folder
+- `ci_core.yml`: Base template for module testing using `test_app.yml`
+
+## Special Cases
+
+- `ci_generators.yml`: No test app needed, uses custom gem path setup
+- `ci_javascript.yml`: Runs JS tests from project root with Node.js setup
+
+## Split Workflows (Parallel Execution)
+
+Modules with large test suites are split across multiple workflows:
+
+- Proposals: `ci_proposals_system_admin.yml`, `ci_proposals_system_public.yml`, `ci_proposals_unit_tests.yml`
+- Similar patterns for other large modules
+
+## Performance Monitoring
+
+- `ci_performance_metrics_monitoring.yml`: Lighthouse CI with budgets:
+  - [First Contentful Paint](https://web.dev/first-contentful-paint/): 2s
+  - [Speed Index](https://web.dev/speed-index/): 4s
+  - [Time to Interactive](https://web.dev/interactive/): 5s
+  - [Largest Contentful Paint](https://web.dev/lcp/): 2.5s
diff --git a/.github/workflows/ci_api.yml b/.github/workflows/ci_api.yml
index 855c44d3fac4e..e7f078c2a2175 100644
--- a/.github/workflows/ci_api.yml
+++ b/.github/workflows/ci_api.yml
@@ -33,5 +33,6 @@ jobs:
     with:
       working-directory: "decidim-api"
       test_command: bundle exec parallel_test --type rspec --pattern spec/
+      bullet_enabled: true
       bullet_n_plus_one: true
       bullet_unused_eager_loading: true
diff --git a/.github/workflows/ci_generators.yml b/.github/workflows/ci_generators.yml
index 47a62c64943e7..18dcb36985c0a 100644
--- a/.github/workflows/ci_generators.yml
+++ b/.github/workflows/ci_generators.yml
@@ -80,6 +80,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 1
+      - run: |
+          sudo apt-get update && sudo apt-get install libvips libvips-tools
+        name: Install libvips
+        shell: "bash"
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ env.RUBY_VERSION }}
@@ -90,14 +94,14 @@ jobs:
       - name: Get npm cache directory path
         id: npm-cache-dir-path
         run: echo "dir=$(npm get cache)-${{ env.DECIDIM_MODULE }}" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         id: npm-cache
         with:
           path: ${{ steps.npm-cache-dir-path.outputs.dir }}
           key: npm-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             npm-
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         id: app-cache
         with:
           path: ./Gemfile.lock
@@ -111,7 +115,7 @@ jobs:
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
           SIMPLECOV: "true"
-      - uses: qltysh/qlty-action/coverage@v1
+      - uses: qltysh/qlty-action/coverage@v2
         with:
           token: ${{secrets.QLTY_COVERAGE_TOKEN}}
           verbose: true
diff --git a/.github/workflows/ci_javascript.yml b/.github/workflows/ci_javascript.yml
index ee6d704ae79d0..d97f85a23e4c9 100644
--- a/.github/workflows/ci_javascript.yml
+++ b/.github/workflows/ci_javascript.yml
@@ -46,7 +46,7 @@ jobs:
       - name: Get npm cache directory path
         id: npm-cache-dir-path
         run: echo "dir=$(npm get cache)-javascript" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         id: npm-cache
         with:
           path: ${{ steps.npm-cache-dir-path.outputs.dir }}
diff --git a/.github/workflows/ci_main.yml b/.github/workflows/ci_main.yml
index a06f3b490fc81..2c9f3299dd88c 100644
--- a/.github/workflows/ci_main.yml
+++ b/.github/workflows/ci_main.yml
@@ -42,7 +42,7 @@ jobs:
       - name: Get npm cache directory path
         id: npm-cache-dir-path
         run: echo "dir=$(npm get cache)-main" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         id: npm-cache
         with:
           path: ${{ steps.npm-cache-dir-path.outputs.dir }}
diff --git a/.github/workflows/ci_performance_metrics_monitoring.yml b/.github/workflows/ci_performance_metrics_monitoring.yml
index 0374d66465636..d452c89bf1b7b 100644
--- a/.github/workflows/ci_performance_metrics_monitoring.yml
+++ b/.github/workflows/ci_performance_metrics_monitoring.yml
@@ -64,6 +64,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 1
+      - run: |
+          sudo apt-get update && sudo apt-get install libvips libvips-tools
+        name: Install libvips
+        shell: "bash"
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ env.RUBY_VERSION }}
@@ -74,7 +78,7 @@ jobs:
       - name: Get npm cache directory path
         id: npm-cache-dir-path
         run: echo "dir=$(npm get cache)-${{ env.DECIDIM_MODULE }}" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         id: npm-cache
         with:
           path: ${{ steps.npm-cache-dir-path.outputs.dir }}
diff --git a/.github/workflows/ci_production_check.yml b/.github/workflows/ci_production_check.yml
index cd151012b8923..edd4d73a3a39d 100644
--- a/.github/workflows/ci_production_check.yml
+++ b/.github/workflows/ci_production_check.yml
@@ -54,6 +54,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 1
+      - run: |
+          sudo apt-get update && sudo apt-get install libvips libvips-tools
+        name: Install libvips
+        shell: "bash"
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ env.RUBY_VERSION }}
@@ -64,7 +68,7 @@ jobs:
       - name: Get npm cache directory path
         id: npm-cache-dir-path
         run: echo "dir=$(npm get cache)-${{ env.DECIDIM_MODULE }}" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         id: npm-cache
         with:
           path: ${{ steps.npm-cache-dir-path.outputs.dir }}
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index febf5cfff946e..1221c447454b5 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -58,11 +58,11 @@ jobs:
       name: Tune NPM configuration
       shell: "bash"
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/lint_code.yml b/.github/workflows/lint_code.yml
index 2cf9e5e939cde..1877404000630 100644
--- a/.github/workflows/lint_code.yml
+++ b/.github/workflows/lint_code.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Get npm cache directory path
         id: npm-cache-dir-path
         run: echo "dir=$(npm get cache)-lint" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         id: npm-cache
         with:
           path: ${{ steps.npm-cache-dir-path.outputs.dir }}
diff --git a/.github/workflows/lint_pr_format.yml b/.github/workflows/lint_pr_format.yml
index 499a5ffe5f538..56d7e6c359f80 100644
--- a/.github/workflows/lint_pr_format.yml
+++ b/.github/workflows/lint_pr_format.yml
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/labeler@v5
+      - uses: actions/labeler@v6
         with:
           dot: 'true'
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/test_app.yml b/.github/workflows/test_app.yml
index 58132b6431b16..3ca1e3be37b10 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: ghcr.io/validator/validator@sha256:7667b0ffa6d395c27aa8f9e21db1cfe6b66549245a3972e9397d255de5ef0ec6
         ports: ["8888:8888"]
       postgres:
         image: postgres:14
@@ -70,6 +70,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 1
+      - run: |
+          sudo apt-get update && sudo apt-get install libvips libvips-tools
+        name: Install libvips
+        shell: "bash"
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ inputs.ruby_version }}
@@ -126,7 +130,7 @@ jobs:
           SIMPLECOV: "true"
           SHAKAPACKER_RUNTIME_COMPILE: "false"
           NODE_ENV: "test"
-      - uses: qltysh/qlty-action/coverage@v1
+      - uses: qltysh/qlty-action/coverage@v2
         with:
           token: ${{secrets.QLTY_COVERAGE_TOKEN}}
           files: coverage/coverage.xml
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/.gitpod.Dockerfile b/.gitpod.Dockerfile
deleted file mode 100644
index bf356c10a5ec4..0000000000000
--- a/.gitpod.Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM gitpod/workspace-base:latest
-USER root
-
-# Install PostgreSQL
-ENV PGVERSION=14
-RUN apt-get update \
-  && apt-get install -y postgresql postgresql-client postgresql-server-dev-${PGVERSION} libpq-dev
-
-# Setup the database user env vars, drop the default database cluster and change the folders to the workspace
-# This makes it possible to persist the database within the workspace
-ENV DATABASE_USERNAME=decidim
-ENV DATABASE_PASSWORD=development
-RUN pg_dropcluster $PGVERSION main \
-  && rm -rf /etc/postgresql /var/lib/postgresql \
-  && ln -s /workspace/etc/postgresql /etc/postgresql \
-  && ln -s /workspace/var/lib/postgresql /var/lib/postgresql \
-  && chown -h postgres:postgres /etc/postgresql /var/lib/postgresql
-
-#### User space ####
-USER gitpod
-
-# Install nvm and Node
-ENV NODE_VERSION=22.14.0
-RUN curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | PROFILE=/dev/null bash \
-    && bash -c ". .nvm/nvm.sh \
-        && nvm install v${NODE_VERSION} \
-        && nvm alias default v${NODE_VERSION} \
-        && npm install -g npm yarn node-gyp" \
-    && echo ". ~/.nvm/nvm.sh"  >> ~/.bashrc.d/50-node
-
-# Install rbenv and Ruby
-ENV RUBY_VERSION=3.4.7
-ENV WORKSPACE_GEM_HOME=/workspace/.gem
-RUN sudo apt-get install -y build-essential curl git zlib1g-dev libssl-dev \
-  libreadline-dev libyaml-dev libxml2-dev libxslt-dev
-RUN git clone https://github.com/rbenv/rbenv.git ~/.rbenv \
-  && echo 'eval "$(~/.rbenv/bin/rbenv init - sh)"' >> ~/.bashrc.d/60-ruby \
-  && eval "$(~/.rbenv/bin/rbenv init - sh)" \
-  && git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build \
-  && git clone https://github.com/rbenv/rbenv-vars.git "$(rbenv root)"/plugins/rbenv-vars \
-  && rbenv install $RUBY_VERSION && rbenv global $RUBY_VERSION \
-  && echo "export GEM_PATH=\"${WORKSPACE_GEM_HOME}:$(gem env home)\"" >> ~/.bashrc.d/60-ruby \
-  && echo "export GEM_HOME=\"${WORKSPACE_GEM_HOME}\"" >> ~/.bashrc.d/60-ruby \
-  && echo 'export RAILS_DEVELOPMENT_HOST=${RAILS_DEVELOPMENT_HOST:-"3000-${GITPOD_WORKSPACE_ID}.${GITPOD_WORKSPACE_CLUSTER_HOST}"}' >> ~/.bashrc.d/70-decidim \
-  && echo 'export DECIDIM_FORCE_SSL=${DECIDIM_FORCE_SSL:-true}' >> ~/.bashrc.d/70-decidim \
-  && echo 'export DECIDIM_SERVICE_WORKER_ENABLED=${DECIDIM_SERVICE_WORKER_ENABLED:-true}' >> ~/.bashrc.d/70-decidim
diff --git a/.gitpod.yml b/.gitpod.yml
deleted file mode 100644
index 3c2fb03e8cb46..0000000000000
--- a/.gitpod.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-image:
-  file: .gitpod.Dockerfile
-
-tasks:
-  - name: Development app
-    init: |
-      (
-        [ $(sudo pg_lsclusters -h | wc -l) -eq 0 ] && (
-          sudo mkdir -p /workspace/etc/postgresql /workspace/var/lib/postgresql &&
-          sudo chown -R postgres:postgres /workspace/etc/postgresql /workspace/var/lib/postgresql &&
-          sudo pg_createcluster $PGVERSION main
-        ) || echo "Database exists"
-      ) &&
-      sudo service postgresql start &&
-      (
-        [ $(sudo su postgres -c "psql -At -c \"SELECT COUNT(usename) FROM pg_user WHERE usename = '${DATABASE_USERNAME}'\"") -eq 0 ] && (
-          sudo su postgres -c "psql -c 'CREATE USER $DATABASE_USERNAME SUPERUSER'" &&
-          sudo su postgres -c "psql -c \"ALTER ROLE $DATABASE_USERNAME WITH PASSWORD '${DATABASE_PASSWORD}'\""
-        ) || echo "Database user exists"
-      ) &&
-      mkdir -p .vscode &&
-      echo '{"workbench.startupEditor": "none"}' > .vscode/settings.json &&
-      bundle install --jobs 4 &&
-      bundle exec rake development_app &&
-      echo 'Rails.application.config.hosts << ENV.fetch("RAILS_DEVELOPMENT_HOST", "")' > development_app/config/initializers/gitpod.rb &&
-      echo 'Rails.application.config.action_mailer.default_url_options = { protocol: "https" }' >> development_app/config/initializers/gitpod.rb &&
-      cd development_app &&
-      ./bin/rails decidim:pwa:generate_vapid_keys | grep VAPID_ >> ../.rbenv-vars &&
-      echo "Compiling assets, please wait a moment..." &&
-      ./bin/shakapacker
-    command: |
-      sudo service postgresql start &&
-      { [ $(basename $PWD) == "development_app" ] || cd development_app ; } &&
-      ./bin/rails runner 'Decidim::Organization.first.update!(host: ENV.fetch("RAILS_DEVELOPMENT_HOST", "localhost"))' &&
-      ./bin/rails s -b 0.0.0.0
-
-ports:
-  - name: Web App
-    description: The main application web server
-    port: 3000
-    onOpen: open-preview
-    visibility: public
-  - name: Shakapacker
-    description: The shakapacker dev server for asset reloading
-    port: 3035
-    onOpen: ignore
-    visibility: public
-  - name: Database
-    description: PostgreSQL database server
-    port: 5432
-    onOpen: ignore
-    visibility: private
-
-github:
-  prebuilds:
-    addCheck: true
-    master: false
-    pullRequests: true
-    pullRequestsFromForks: true
diff --git a/.inch.yml b/.inch.yml
deleted file mode 100644
index c1392d007c695..0000000000000
--- a/.inch.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-files:
-  included:
-    - lib/**/*.rb
-    - decidim-*/{app,lib}/**/*.rb
-    - decidim-*/{app,lib}/**/*.js
diff --git a/.qlty/qlty.toml b/.qlty/qlty.toml
index f4c56c8aad8d3..31baa2e234a5b 100644
--- a/.qlty/qlty.toml
+++ b/.qlty/qlty.toml
@@ -102,9 +102,12 @@ name = "markdownlint"
 
 [[plugin]]
 name = "rubocop"
+version = "1.78.0"
+mode = "disabled"
 
 [[plugin]]
 name = "osv-scanner"
 
 [[plugin]]
 name = "stylelint"
+mode = "disabled"
diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 0000000000000..4ecee6f1ca310
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,3 @@
+**MANDATORY**: At the start of every session, you MUST read ALL `*.md` files in the `.ai` directory before proceeding with any task.
+
+**ALWAYS reference these instructions first and fallback to search or bash commands only when you encounter unexpected information that does not match the info here.**
diff --git a/Gemfile.lock b/Gemfile.lock
index fcc840f633463..f45053a0bb009 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -83,7 +83,6 @@ PATH
       kaminari (~> 1.2, >= 1.2.1)
       loofah (~> 2.19, >= 2.19.1)
       mime-types (>= 1.16, < 4.0)
-      mini_magick (~> 4.9)
       net-smtp (~> 0.5.0)
       nokogiri (~> 1.16, >= 1.16.2)
       omniauth (~> 2.0)
@@ -104,6 +103,7 @@ PATH
       redis (~> 4.1)
       request_store (~> 1.7.0)
       rqrcode (~> 2.2.0)
+      ruby-vips (~> 2.2)
       rubyXL (~> 3.4)
       rubyzip (~> 2.0)
       shakapacker (~> 8.3.0)
@@ -492,8 +492,8 @@ GEM
       ice_cube (~> 0.16)
       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)
@@ -547,7 +547,8 @@ GEM
       logger
       mime-types-data (~> 3.2015)
     mime-types-data (3.2025.0722)
-    mini_magick (4.13.2)
+    mini_magick (5.3.1)
+      logger
     mini_mime (1.1.5)
     minitest (5.25.5)
     msgpack (1.8.0)
@@ -808,7 +809,7 @@ GEM
       rubocop (~> 1.72)
       yard
     ruby-progressbar (1.13.0)
-    ruby-vips (2.2.4)
+    ruby-vips (2.2.5)
       ffi (~> 1.12)
       logger
     rubyXL (3.4.33)
@@ -914,6 +915,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-23
+  arm64-darwin-25
   x86_64-linux
 
 DEPENDENCIES
diff --git a/README.adoc b/README.adoc
index 5dee4a70c07ed..d3e03cccf3fcb 100644
--- a/README.adoc
+++ b/README.adoc
@@ -29,10 +29,10 @@ image:https://img.shields.io/gem/dt/decidim.svg[Gem,link=https://rubygems.org/ge
 image:https://img.shields.io/github/contributors/decidim/decidim.svg[GitHub contributors,link=https://github.com/decidim/decidim/graphs/contributors]
 image:https://img.shields.io/matrix/decidimdevs:matrix.org[Matrix,link=https://matrix.to/#/#decidimdevs:matrix.org]
 image:https://codecov.io/gh/decidim/decidim/branch/develop/graph/badge.svg[codecov,link=https://codecov.io/gh/decidim/decidim]
-image:https://api.codeclimate.com/v1/badges/ad8fa445086e491486b6/maintainability[Maintainability,link=https://codeclimate.com/github/decidim/decidim/maintainability]
-image:https://d322cqt584bo4o.cloudfront.net/decidim/localized.svg[Crowdin,link=https://crowdin.com/project/decidim]
+image:https://qlty.sh/gh/decidim/projects/decidim/maintainability.svg[Maintainability,link=https://qlty.sh/gh/decidim/projects/decidim]
 image:https://opencollective.com/decidim/tiers/badge.svg[https://opencollective.com/decidim]
 image:http://img.shields.io/badge/yard-docs-blue.svg[Yard Docs,link=http://rubydoc.info/github/decidim/decidim/develop]
+image:https://img.shields.io/badge/Verified-DPG-3333AB?logo=data:image/svg%2bxml;base64,PHN2ZyB3aWR0aD0iMzEiIGhlaWdodD0iMzMiIHZpZXdCb3g9IjAgMCAzMSAzMyIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTE0LjIwMDggMjEuMzY3OEwxMC4xNzM2IDE4LjAxMjRMMTEuNTIxOSAxNi40MDAzTDEzLjk5MjggMTguNDU5TDE5LjYyNjkgMTIuMjExMUwyMS4xOTA5IDEzLjYxNkwxNC4yMDA4IDIxLjM2NzhaTTI0LjYyNDEgOS4zNTEyN0wyNC44MDcxIDMuMDcyOTdMMTguODgxIDUuMTg2NjJMMTUuMzMxNCAtMi4zMzA4MmUtMDVMMTEuNzgyMSA1LjE4NjYyTDUuODU2MDEgMy4wNzI5N0w2LjAzOTA2IDkuMzUxMjdMMCAxMS4xMTc3TDMuODQ1MjEgMTYuMDg5NUwwIDIxLjA2MTJMNi4wMzkwNiAyMi44Mjc3TDUuODU2MDEgMjkuMTA2TDExLjc4MjEgMjYuOTkyM0wxNS4zMzE0IDMyLjE3OUwxOC44ODEgMjYuOTkyM0wyNC44MDcxIDI5LjEwNkwyNC42MjQxIDIyLjgyNzdMMzAuNjYzMSAyMS4wNjEyTDI2LjgxNzYgMTYuMDg5NUwzMC42NjMxIDExLjExNzdMMjQuNjI0MSA5LjM1MTI3WiIgZmlsbD0id2hpdGUiLz4KPC9zdmc+Cg==[DPG Badge,link=https://digitalpublicgoods.net/r/decidim]
 
 ++++
 <p align="center">
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index f116a7bea1227..63207c34cd006 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -32,6 +32,7 @@ gem "decidim-dev", github: "decidim/decidim"
 ### 1.3. Run these commands
 
 ```console
+sudo apt install libvips libvips-tools # or the alternative installation process for your operating system. See "3.5. Replace image processing with imagemagick to libvips"
 bundle update decidim
 bin/rails decidim:upgrade
 bin/rails db:migrate
@@ -94,7 +95,7 @@ At the moment we are adding this gem so we can start doing data migrations for f
 
 You can read more about this change on PR [#15501](https://github.com/decidim/decidim/pull/15501).
 
-#### 2.4. Fix gitignore for ServiceWorker related files
+### 2.4. Fix gitignore for ServiceWorker related files
 
 We detected a bug where some dynamic files are not added to the gitignore, so they could be committed to the repository. For fixing it, you need to add them to your gitignore file:
 
@@ -104,7 +105,17 @@ echo "/public/sw.js*" >> .gitignore
 
 You can read more about this change on PR [#15601](https://github.com/decidim/decidim/pull/15601).
 
-### 2.5. Add locale to the url
+### 2.5. Data migration for organization short_name
+
+A new data migration has been added to populate the `short_name` field for existing organizations. This field is required for the PWA (Progressive Web App) manifest to properly display the application name on mobile devices' home screens.
+
+The migration automatically generates a short_name for each organization based on its name by removing spaces and truncating to 12 characters maximum. Organizations with names that result in less than 3 characters after processing will not have a short_name set and will need to be configured manually through the admin panel.
+
+This migration runs automatically when executing `bin/rails data:migrate` as part of the upgrade process.
+
+You can read more about this change on PR [#15729](https://github.com/decidim/decidim/pull/15729).
+
+### 2.6. Add locale to the url
 
 For a long time Decidim has been using internally the user browser to detect the language of the user. This has been changed to use the locale of the url instead.
 
@@ -119,7 +130,7 @@ It also enables the users of multi language platforms to share the links to the
 
 You can read more about this change on PR [#14432](https://github.com/decidim/decidim/pull/14432).
 
-### 2.6. [[TITLE OF THE ACTION]]
+### 2.7. [[TITLE OF THE ACTION]]
 
 You can read more about this change on PR [#XXXX](https://github.com/decidim/decidim/pull/XXXX).
 
@@ -165,7 +176,23 @@ Back in [#15534](https://github.com/decidim/decidim/pull/15534) we upgraded webp
 
 You can read more about this change on PR [#15534](https://github.com/decidim/decidim/pull/15534), [#15674](https://github.com/decidim/decidim/pull/15674).
 
-### 3.5. [[TITLE OF THE ACTION]]
+### 3.5. Replace ImageMagick with libvips for image processing
+
+We have upgraded our image processor within the application to libvips for speed and low memory usage.
+
+Support for `.ico` favicon files has been removed. Applications that relied on ICO favicons must migrate to one of the supported Libvips image formats.
+
+In order to install please run the following command:
+
+```bash
+sudo apt install libvips libvips-tools
+```
+
+This works for Ubuntu Linux, other operating systems would need to do other command/package.
+
+You can read more about this change on PR [#15670](https://github.com/decidim/decidim/pull/15670).
+
+### 3.6. [[TITLE OF THE ACTION]]
 
 You can read more about this change on PR [#XXXX](https://github.com/decidim/decidim/pull/XXXX).
 
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
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 6dfc3ce28997c..12d2dfe08cd78 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -70,7 +70,7 @@ search:
   ##   %w(*.jpg *.png *.gif *.svg *.ico *.eot *.otf *.ttf *.woff *.woff2 *.pdf *.css *.sass *.scss *.less *.yml *.json)
   exclude:
     - decidim-dev/lib/decidim/dev/assets/iso-8859-15.md
-    - decidim-dev/lib/decidim/dev/assets/import_participatory_space_private_users_iso8859-1.csv
+    - decidim-dev/lib/decidim/dev/assets/import_members_iso8859-1.csv
     - decidim-comments/app/assets/javascripts/decidim/comments/bundle.js
     - decidim-comments/app/assets/javascripts/decidim/comments/bundle.js.map
     - "*.jpeg"
diff --git a/decidim-accountability/app/models/decidim/accountability/result.rb b/decidim-accountability/app/models/decidim/accountability/result.rb
index 5a70742441e0a..a0ecbd20993a0 100644
--- a/decidim-accountability/app/models/decidim/accountability/result.rb
+++ b/decidim-accountability/app/models/decidim/accountability/result.rb
@@ -39,13 +39,15 @@ class Result < Accountability::ApplicationRecord
 
       after_save :update_parent_progress, if: -> { parent_id.present? }
 
-      searchable_fields(
-        scope_id: :decidim_scope_id,
-        participatory_space: { component: :participatory_space },
-        A: :title,
-        D: :description,
-        datetime: :start_date
-      )
+      searchable_fields({
+                          scope_id: :decidim_scope_id,
+                          participatory_space: { component: :participatory_space },
+                          A: :title,
+                          D: :description,
+                          datetime: :start_date
+                        },
+                        index_on_create: ->(result) { result.visible? },
+                        index_on_update: ->(result) { result.visible? })
 
       geocoded_by :address
 
@@ -110,9 +112,7 @@ def self.ransackable_attributes(auth_object = nil)
         base + %w(created_at progress)
       end
 
-      def self.ransackable_associations(auth_object = nil)
-        return [] unless auth_object&.admin?
-
+      def self.ransackable_associations(_auth_object = nil)
         %w(taxonomies status)
       end
 
diff --git a/decidim-accountability/config/locales/eu.yml b/decidim-accountability/config/locales/eu.yml
index ce4b3076b7fc3..6cb8ecdf900b6 100644
--- a/decidim-accountability/config/locales/eu.yml
+++ b/decidim-accountability/config/locales/eu.yml
@@ -270,7 +270,7 @@ eu:
             one: Emaitza 1
             other: "%{count} emaitza"
         home_header:
-          global_status: Exekuzio-egoera orokorra
+          global_status: Helburuen betetze-maila
         milestones:
           title: Mugarriak
         no_results: Ez dago proiekturik
diff --git a/decidim-accountability/config/locales/ja.yml b/decidim-accountability/config/locales/ja.yml
index ad00838eb53c7..8c0904651f9e3 100644
--- a/decidim-accountability/config/locales/ja.yml
+++ b/decidim-accountability/config/locales/ja.yml
@@ -287,6 +287,7 @@ ja:
       accountability:
         actions:
           comment: コメント
+          vote_comment: コメントに投票
         name: アカウンタビリティ
         settings:
           global:
@@ -357,7 +358,7 @@ ja:
           url: この結果が見つかるURL
     participatory_spaces:
       highlighted_results:
-        see_all: すべての結果を見る (%{count})
+        see_all: すべての結果を見る
     resource_links:
       included_projects:
         result_project: この結果に含まれるプロジェクト
diff --git a/decidim-accountability/config/locales/ro-RO.yml b/decidim-accountability/config/locales/ro-RO.yml
index 9745c775239be..44bfcafae8beb 100644
--- a/decidim-accountability/config/locales/ro-RO.yml
+++ b/decidim-accountability/config/locales/ro-RO.yml
@@ -1,6 +1,10 @@
 ro:
   activemodel:
     attributes:
+      milestone:
+        description: Descriere
+        entry_date: Data
+        title: Titlu
       result:
         decidim_accountability_status_id: Stare
         decidim_category_id: Categorie
@@ -9,7 +13,7 @@ ro:
         end_date: Data de sfârșit
         progress: Progres
         start_date: Data de început
-        subresults: Subrezultate
+        subresults: Rezultate
         title: Titlu
         updated_at: Ultima actualizare
       status:
@@ -25,7 +29,11 @@ ro:
       decidim:
         accountability:
           result:
-            budget_text: Acest rezultat %{link} a fost inclus
+            budget_text: Rezultatul %{link} a fost inclus
+            meetings_ids: 'În cadrul acestei ședințe: %{link}'
+            project_ids: 'A fost inclus în acest proiect: %{link}'
+            proposal_ids: 'A fost adăugat la această propunere: %{link}'
+            text: 'A fost adăugat la acest rezultat: %{link}'
       decidim/accountability/result:
         one: Rezultat
         few: Rezultate
@@ -33,46 +41,147 @@ ro:
   decidim:
     accountability:
       actions:
+        add_milestone: Adaugați obiectiv nou
+        add_result: Adăugați rezultat
+        confirm_delete_result: Sunteți sigur că doriți să eliminați acest rezultat?
         confirm_destroy: Sunteți sigur că doriți să ștergeți %{name}?
+        deleted_results_info: Rezultatele șterse pot fi restaurate din gunoi.
         destroy: Ștergeți
-        edit: Actualizare
+        edit: Modificați
+        import: Importați rezultate dintr-o altă componentă
         import_csv: Importați rezultate dintr-un fișier CSV
+        new_milestone: Reper nou
         new_result: Rezultat nou
         new_status: Stare nouă
         preview: Previzualizare
         title: Acțiuni
+        view_deleted_results: Vizualizați rezultatele eliminate
       admin:
         exports:
           result_comments: Comentarii
           results: Rezultate
+        import_components:
+          create:
+            invalid: A apărut o problemă la importul rezultatelor, vă rugăm să urmați instrucțiunile cu atenție și să vă asigurați că ați selectat proiecte pentru implementare.
+          filters:
+            new_items_projects:
+              one: Va fi importat 1 proiect selectat
+              few: "Vor fi importate %{count} proiecte selectate"
+              other: "Vor fi importate %{count} proiecte selectate"
+            new_items_proposals:
+              one: O propunere va fi importată
+              few: "Vor fi importate %{count} propuneri"
+              other: "Vor fi importate %{count} propuneri"
+            proposal_state: Starea propunerilor
+            select_state: Selectați starea
+          form:
+            create: Import
+            no_components: Nu există componente în acest spațiu participativ de importat.
+            origin_component_id: Componenta de origine
+            select_component: Selectează o componentă
+          new:
+            success:
+              one: 1 rezultat în așteptare pentru a fi importat. Veți fi notificat prin e-mail, odată ce importul a fost finalizat.
+              few: "%{count} rezultate în așteptare pentru a fi importate. Veți fi notificat prin e-mail, odată ce importul a fost finalizat."
+              other: "%{count} rezultate în așteptare pentru a fi importate. Veți fi notificat prin e-mail, odată ce importul a fost finalizat."
+            title: Importați rezultate dintr-o altă componentă
         import_results:
           new:
             download_export: Descărcați Exportul în format CSV
             import: Importați
+            info: |
+              <p>Vă recomandăm să urmați acești pași:</p>
+              <ol>
+              <li><a href='%{link_new_status}' target='_blank'>Creați stările pentru rezultatele</a> pe care doriți să le adăugați</li>
+              <li><a href='%{link_new_result}' target='_blank'>Creați cel puțin un rezultat manual</a> prin intermediul acestui panou de administrare înainte de a utiliza Importul, pentru a înțelege mai bine formatul și ce trebuie să completați.</li>
+              <li>%{link_export_csv}</li>
+              <li>Efectuați modificările local. Puteți modifica doar următoarele coloane ale fișierului CSV (restul vor fi ignorate):</li>
+              <ul>
+              <li><b>taxonomii/id-uri:</b> ID-uri pentru taxonomii (dacă sunt mai multe, separați-le prin virgulă)</li>
+              <li><b>parent/id:</b> ID-ul părintelui (pentru rezultatele corelate). Opțional</li>
+              <li><b>title/en:</b> Titlu în limba engleză. Acesta va depinde de configurația lingvistică a platformei dvs.</li>
+              <li><b>description/en:</b> Descriere în limba engleză. Aceasta va depinde de configurația lingvistică a platformei dvs.</li>
+              <li><b>start_date:</b> data la care rezultatul începe execuția (format AAAA-LL-ZZ)</li>
+              <li><b>end_date:</b> data la care rezultatul se termină execuția (format AAAA-LL-ZZ)</li>
+              <li><b>status/id:</b> ID-ul stării pentru acest rezultat</li>
+              <li><b>progress:</b> Procentul (de la 0 la 100) al execuției</li>
+              <li><b>proposals_ids:</b> ID-ul intern al propunerilor aferente (separate prin virgulă). Se convertește automat în <span class='attribute-name'>proposal_url</span></li>
+              </ul>
+              </li>
+              </ol>
             title: Importați rezultate dintr-un fișier CSV
         imports:
           create:
             invalid: A apărut o problemă la importul rezultatelor.
+            success: Importarea fișierului a început. În câteva minute veți primi un e-mail cu rezultatul importului.
+        milestones:
+          create:
+            invalid: A apărut o problemă la crearea acestui reper.
+            success: Reperul a fost creat cu succes.
+          destroy:
+            success: Reperul a fost eliminat cu succes.
+          edit:
+            title: Modificați obiectivul
+            update: Actualizați reperul
+          index:
+            title: Repere
+          new:
+            create: Creați un reper
+            title: Reper nou
+          update:
+            invalid: A apărut o problemă la actualizarea acestui reper.
+            success: Reperul a fost actualizat cu succes.
         models:
           result:
             name: Rezultat
           status:
             name: Stare
         results:
+          bulk_actions:
+            dates_form:
+              change_dates: Schimbați data
+              end_date: Dată de sfârșit
+              start_date: Dată de începere
+            dropdown:
+              actions: Acțiuni
+              change_dates: Schimbați datele
+              change_status: Schimbați starea
+              change_taxonomies: Schimbați taxonomia
+            status_form:
+              change_status: Schimbați starea
+              status: Stare
+            submit_buttons:
+              cancel: Anulați
+            taxonomies_form:
+              change_taxonomies: Schimbați taxonomia
           create:
             invalid: A apărut o problemă la crearea acestui rezultat.
             success: Rezultatul a fost creat.
           edit:
-            title: Actualizare rezultat
-            update: Actualizare rezultat
+            title: Modificați rezultatul
+            update: Actualizați rezultatul
           index:
+            selected: Selectat
             title: Rezultate
+          manage_trash:
+            title: Rezultate eliminate
           new:
             create: Creați un rezultat nou
             title: Rezultat nou
           update:
             invalid: A apărut o eroare la actualizarea acestui rezultat.
             success: Rezultatul a fost actualizat.
+          update_dates:
+            invalid: A apărut o eroare la actualizarea datelor acestui rezultat
+            success: Datele rezultatului actualizate cu succes
+          update_status:
+            invalid: A apărut o eroare la actualizarea stării rezultatelor
+            success: Starea rezultatelor a fost actualizată
+          update_taxonomies:
+            invalid: Nu s-au putut actualiza taxonomiile %{taxonomies} pentru rezultatele %{results}
+            select_a_result: Selectați un rezultat
+            select_a_taxonomy: Selectați o taxonomie
+            success: Actualizare cu succes a taxonomiilor %{taxonomies} pentru rezultatele %{results}
         shared:
           subnav:
             statuses: Stări
@@ -83,55 +192,77 @@ ro:
           destroy:
             success: Starea a fost ștearsă.
           edit:
-            title: Actualizare stare
-            update: Actualizare stare
+            title: Modificați stare
+            update: Actualizați stare
           index:
             title: Stări
           new:
-            create: Creează stare
+            create: Creați stare
             title: Stare nouă
           update:
             invalid: A apărut o eroare la actualizarea acestei stări.
             success: Starea a fost actualizată.
       admin_log:
+        milestones:
+          create: "%{user_name} a creat reperul %{resource_name}"
+          delete: "%{user_name} a eliminat reperul %{resource_name}"
+          update: "%{user_name} a actualizat reperul %{resource_name}"
         result:
           create: "%{user_name} a creat rezultatul %{resource_name} în %{space_name}"
           delete: "%{user_name} a șters rezultatul %{resource_name} din %{space_name}"
+          restore: "%{user_name} a restaurat rezultatul %{resource_name} din %{space_name}"
+          soft_delete: "%{user_name} a mutat la gunoi rezultatul %{resource_name} din %{space_name}"
           update: "%{user_name} a actualizat rezultatul %{resource_name} din %{space_name}"
         status:
-          create: "%{user_name} a creat starea resursei %{resource_name}"
-          delete: "%{user_name} a șters starea resursei %{resource_name}"
-          update: "%{user_name} a actualizat starea %{resource_name}"
+          create: "%{user_name} a creat o stare %{resource_name}"
+          delete: "%{user_name} a eliminat starea resursei %{resource_name}"
+          update: "%{user_name} a actualizat starea resursei %{resource_name}"
         value_types:
           parent_presenter:
-            not_found: 'Elementul-părinte nu a fost găsit în baza de date (ID: %{id})'
+            not_found: 'Elementul părinte nu a fost găsit în baza de date (ID: %{id})'
       content_blocks:
         highlighted_results:
           results: Rezultate
+      creation:
+        text: Rezultatul a fost creat
       import_mailer:
         import:
           errors: Erori
           errors_present: A apărut o problemă la importul rezultatelor.
           row_number: Rând
-          subject: Importare cu succes a rezultatelor
+          subject: Import cu succes a rezultatelor
           success: Rezultate importate. Puteți revizui rezultatele în interfața de administrare.
       import_projects_mailer:
         import:
           added_projects:
             one: Un rezultat a fost importat din proiecte.
-            few: "Rezultatele au fost importate din proiecte."
+            few: "%{count} rezultate au fost importate din proiecte."
             other: "%{count} rezultate au fost importate din proiecte."
           subject: Importul de proiecte a avut succes
+          success: Proiecte importate cu succes ca rezultate în componenta %{component_name}. Puteți analiza rezultatele în interfața de administrare.
+      import_proposals_mailer:
+        import:
+          added_proposals:
+            one: Un rezultat a fost importat din propuneri
+            few: "%{count} rezultate au fost importate din propuneri."
+            other: "%{count} rezultate au fost importate din propuneri."
+          subject: Propunerile au fost importate cu succes
+          success: Propuneri importate cu succes ca rezultate în componenta %{component_name}. Puteți analiza rezultatele în interfața de administrare.
       last_activity:
         new_result: 'Rezultat nou:'
       models:
+        milestone:
+          fields:
+            entry_date: Data
+            title: Titlu
         result:
           fields:
             created_at: Creat
-            end_date: Data de sfârșit
+            end_date: Dată de sfârșit
             progress: Progres
-            start_date: Data de început
+            start_date: Dată de începere
             status: Stare
+            taxonomies: Taxonomii
             title: Titlu
         status:
           fields:
@@ -146,12 +277,14 @@ ro:
             few: "%{count} rezultate"
             other: "%{count} rezultate"
         home_header:
-          global_status: Stare execuție globală
+          global_status: Stare globală de execuție
+        milestones:
+          title: Repere
         no_results: Nu există proiecte
         root_taxonomies:
           title: 'Vizualizare după:'
         search:
-          search: Caută acțiuni
+          search: Cautați acțiuni
         show:
           stats:
             back_to_resource: Înapoi la rezultat
@@ -160,37 +293,86 @@ ro:
         results:
           status_id_eq:
             label: Stare
+          taxonomies_part_of_contains:
+            label: Taxonomie
+      tooltips:
+        deleted_results_info: Nu puteți elimina acest rezultat
     components:
       accountability:
         actions:
           comment: Comentariu
+          vote_comment: Votați comentariul
         name: Responsabilitate
         settings:
           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ă.
-            display_progress_enabled: Afișare progres
+            define_taxonomy_filters: Vă rugăm să definiți niște filtre pentru acest spațiu participativ înainte de a utiliza această setare.
+            display_progress_enabled: Afișați progres
+            geocoding_enabled: Hărți activate
             intro: Introducere
+            no_taxonomy_filters_found: Nu am găsit nici un filtru de taxonomie.
+            taxonomy_filters: Selectați filtrele pentru componentă
+            taxonomy_filters_add: Adaugați filtru
           step:
             comments_blocked: Comentarii blocate
           visualization: Vizualizare
+    download_your_data:
+      show:
+        result_comments: Export al comentariilor rezultatelor
+        results: Export rezultate
     events:
       accountability:
         proposal_linked:
           email_intro: 'Propunerea "%{proposal_title}" a fost inclusă într-un rezultat. O puteți vedea de pe această pagină:'
-          email_outro: Ați primit această notificare deoarece urmați "%{proposal_title}". Puteți înceta să primiți notificări urmând linkul anterior.
-          email_subject: O actualizare la %{proposal_title}
+          email_outro: Ați primit această notificare deoarece urmăriți "%{proposal_title}". Puteți înceta să primiți notificări urmând linkul anterior.
+          email_subject: O actualizare a %{proposal_title}
           notification_title: Propunerea <a href="%{proposal_path}">%{proposal_title}</a> a fost inclusă în rezultatul <a href="%{resource_path}">%{resource_title}</a>.
         result_progress_updated:
           email_intro: 'Rezultatul "%{resource_title}", care include propunerea "%{proposal_title}", este acum %{progress}% complet. Îl puteți vedea de pe această pagină:'
-          email_outro: Ai primit această notificare deoarece urmărești „%{proposal_title}” și această propunere este inclusă în rezultatul „%{resource_title}”. Poți înceta să primești notificări urmând link-ul anterior.
-          email_subject: O actualizare la progresul %{resource_title}
+          email_outro: Ați primit această notificare deoarece urmăriți „%{proposal_title}”, iar această propunere este inclusă în rezultatul „%{resource_title}”. Puteți înceta să primiți notificări urmând link-ul anterior.
+          email_subject: O actualizare privind progresul a %{resource_title}
           notification_title: Rezultatul <a href="%{resource_path}">%{resource_title}</a>, care include propunerea <a href="%{proposal_path}">%{proposal_title}</a>, este acum %{progress}% complet.
+    open_data:
+      help:
+        result_comments:
+          alignment: În cazul în care acest comentariu a fost favorabil, contrar sau neutru
+          author: Numele participantului care a făcut acest comentariu
+          body: Comentariul în sine
+          commentable_id: Id-ul unic al comentariului
+          commentable_type: Tipul resursei comentate (dacă este întâlnire, propunere etc.)
+          created_at: Data când acest comentariu a fost creat
+          depth: Locul în care acest comentariu este în arborele de comentarii (dacă este un răspuns sau un răspuns la un răspuns)
+          id: Id-ul unic al comentariului
+          locale: Localizarea (limba) pe care participantul a folosit-o atunci când a lăsat acest comentariu
+          root_commentable_url: URL-ul resursei unde a fost lăsat acest comentariu
+        results:
+          address: Adresa rezultatului (dacă există)
+          children_count: Numărul rezultatelor copii
+          comments_count: Numărul de comentarii pe care le are acest rezultat
+          component: Componenta căreia îi aparține rezultatul
+          created_at: Data când acest rezultat a fost creat
+          description: Descrierea rezultatului
+          end_date: Data la care încetează este terminat rezultatul și execuția încetează
+          id: Identificatorul unic al acestui rezultat
+          latitude: Latitudinea rezultatului în cazul în care acesta are o localizare fizică
+          longitude: Longitudinea rezultatului în cazul în care are o localizare fizică
+          parent: Rezultatul părinte (dacă există) al rezultatului
+          progress: Procentul de execuție al rezultatului
+          proposal_urls: URL-urile propunerilor care sunt incluse în acest rezultat
+          reference: Referința unică a rezultatului
+          start_date: Data la care începe execuția rezultatului
+          status: Starea actuală a acestui rezultat
+          taxonomies: Taxonomiile rezultatului
+          title: Titlul rezultatului
+          updated_at: Ultima dată când acest rezultat a fost actualizat
+          url: URL-ul unde acest rezultat poate fi găsit
     participatory_spaces:
       highlighted_results:
-        see_all: Vezi toate rezultatele
+        see_all: Vedeți toate rezultatele
     resource_links:
       included_projects:
         result_project: Proiecte incluse în acest rezultat
diff --git a/decidim-accountability/config/locales/tr-TR.yml b/decidim-accountability/config/locales/tr-TR.yml
index 6f722b4ce4d98..129985b4ef9ae 100644
--- a/decidim-accountability/config/locales/tr-TR.yml
+++ b/decidim-accountability/config/locales/tr-TR.yml
@@ -1,6 +1,10 @@
 tr:
   activemodel:
     attributes:
+      milestone:
+        description: Açıklama
+        entry_date: Tarih
+        title: Başlık
       result:
         decidim_accountability_status_id: Durum
         decidim_category_id: Kategori
@@ -36,6 +40,7 @@ tr:
   decidim:
     accountability:
       actions:
+        add_milestone: Aşama ekle
         confirm_delete_result: Bu sonucu silmek istediğinizden emin misiniz?
         confirm_destroy: Bu %{name}silmek istediğinize emin misiniz?
         deleted_results_info: Silinen sonuçlar çöp kutusundan geri yüklenebilir.
@@ -43,6 +48,7 @@ tr:
         edit: Düzenle
         import: Sonuçları başka bir bileşenden içe aktar
         import_csv: Sonuçları CSV dosyasından içe aktarın
+        new_milestone: Yeni aşama
         new_result: Yeni sonuç
         new_status: Yeni Durum
         preview: Ön izleme
@@ -83,6 +89,20 @@ tr:
           create:
             invalid: Sonuçlar içe aktarılırken bir sorun oluştu.
             success: Dosya aktarımı başladı. Birkaç dakika içinde içe aktarma işleminin sonucunu içeren bir e-posta alacaksınız.
+        milestones:
+          create:
+            invalid: Bu aşama oluşturulurken bir hata oluştu.
+            success: Aşama başarıyla oluşturuldu.
+          destroy:
+            success: Aşama başarıyla silindi.
+          edit:
+            title: Aşamayı düzenle
+            update: Aşamayı güncelle
+          new:
+            create: Aşama oluştur
+          update:
+            invalid: Bu aşama güncellenirken bir hata oluştu.
+            success: Aşama başarıyla güncellendi.
         models:
           result:
             name: Sonuç
@@ -133,6 +153,7 @@ tr:
             invalid: Sonuçlar %{results} için sınıflandırmalar %{taxonomies} seçilemiyor
             select_a_result: Bir sonuç seç
             select_a_taxonomy: Bir sınıflandırma seç
+            success: '%{results} için sınıflandırmalar %{taxonomies} başarıyla güncellendi'
         shared:
           subnav:
             statuses: durumlar
@@ -157,6 +178,7 @@ tr:
         result:
           create: "%{user_name} sonuç yaratmıştır %{resource_name} içinde %{space_name}"
           delete: "%{user_name} %{resource_name} sonuçtan %{space_name}sildi"
+          restore: "%{user_name}, %{space_name}'deki %{resource_name} sonucunu geri yükledi"
           update: "%{user_name} güncellenen sonuç %{resource_name} in %{space_name}"
         status:
           create: "48 / 5.000\nÇeviri sonuçları\nÇeviri sonucu\n%{user_name}, %{resource_name} kaydını oluşturdu"
@@ -168,6 +190,8 @@ tr:
       content_blocks:
         highlighted_results:
           results: Sonuç
+      creation:
+        text: Bu sonuç eklendi
       import_mailer:
         import:
           errors: Hatalar
@@ -177,8 +201,18 @@ tr:
           success: Sonuçların içe aktarılması başarılı. Sonuçları yönetim arayüzünde inceleyebilirsiniz.
       import_projects_mailer:
         import:
+          added_projects:
+            one: Projelerden bir sonuç içe aktarıldı.
+            other: "%{count} sonuç projelerden içe aktarıldı."
           subject: Projeler başarıyla aktarılmıştır
           success: '%{component_name} bileşenindekiprojeler başarıyla aktarılmıştır. Sonuçları yönetim arayüzünde inceleyebilirsiniz.'
+      import_proposals_mailer:
+        import:
+          added_proposals:
+            one: Tekliflerden bir sonuç içe aktarıldı
+            other: "%{count} sonuç tekliflerden içe aktarıldı."
+          subject: Tekliflerin içe aktarımı başarılı
+          success: Teklifler %{component_name} bileşenindeki sonuçlara başarıyla aktarılmıştır. Sonuçları yönetim arayüzünde inceleyebilirsiniz.
       last_activity:
         new_result: 'Yeni sonuç:'
       models:
@@ -203,6 +237,8 @@ tr:
             other: "%{count} sonuç"
         home_header:
           global_status: Genel yürütme durumu
+        milestones:
+          title: Aşamalar
         no_results: Proje Bulunamadı
         search:
           search: İşlemleri ara
@@ -214,19 +250,32 @@ tr:
         results:
           status_id_eq:
             label: Durum
+      tooltips:
+        deleted_results_info: Bu sonuç silinemiyor
     components:
       accountability:
         actions:
           comment: Yorum
+          vote_comment: Yorumu oyla
         name: Sorumluluk
         settings:
           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.
             display_progress_enabled: İlerlemeyi göster
             intro: Tanıtım
+            no_taxonomy_filters_found: Sınıflandırma filtresi bulunamadı.
+            taxonomy_filters_add: Filtre ekle
           step:
             comments_blocked: Yorumlar engellendi
+    download_your_data:
+      show:
+        result_comments: Sonuç yorumlarını dışa aktar
+        results: Sonuçları içe aktar
     events:
       accountability:
         proposal_linked:
@@ -241,8 +290,15 @@ tr:
           notification_title: '<a href="%{proposal_path}">%{proposal_title}</a> teklifini içeren <a href="%{resource_path}">%{resource_title}</a> sonucu: %{progress} tamamlandı.'
     open_data:
       help:
+        result_comments:
+          author: Bu yorumu yapan katılımcının adı
+          body: Yorumun kendisi
+          created_at: Bu yorumun oluşturulduğu tarih
+          root_commentable_url: Bu yoruma bağlı kaynağın URL bağlantısı
         results:
+          address: Sonucun adresi (varsa)
           created_at: Sonucun oluşturulma tarihi
+          taxonomies:
     participatory_spaces:
       highlighted_results:
         see_all: Tüm sonuçları gör (%{count})
diff --git a/decidim-accountability/db/data/20260113140600_reindex_results.rb b/decidim-accountability/db/data/20260113140600_reindex_results.rb
new file mode 100644
index 0000000000000..297b7f6eb7695
--- /dev/null
+++ b/decidim-accountability/db/data/20260113140600_reindex_results.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class ReindexResults < ActiveRecord::Migration[7.2]
+  def up
+    Decidim::Component.where(manifest_name: :accountability).find_each do |component|
+      component.manifest.run_hooks(:publish, component)
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/decidim-accountability/lib/decidim/accountability/component.rb b/decidim-accountability/lib/decidim/accountability/component.rb
index f07e7c87126d7..848db42b5443c 100644
--- a/decidim-accountability/lib/decidim/accountability/component.rb
+++ b/decidim-accountability/lib/decidim/accountability/component.rb
@@ -11,8 +11,16 @@
   component.permissions_class_name = "Decidim::Accountability::Permissions"
   component.query_type = "Decidim::Accountability::AccountabilityType"
 
-  component.on(:before_destroy) do |instance|
-    raise StandardError, "Cannot remove this component" if Decidim::Accountability::Result.where(component: instance).any?
+  component.on(:publish) do |instance|
+    Decidim::Accountability::Result.where(component: instance).find_in_batches(batch_size: 10) do |batch|
+      Decidim::UpdateSearchIndexesJob.perform_later(batch)
+    end
+  end
+
+  component.on(:unpublish) do |instance|
+    Decidim::Accountability::Result.where(component: instance).find_in_batches(batch_size: 10) do |batch|
+      Decidim::RemoveSearchIndexesJob.perform_later(batch)
+    end
   end
 
   # These actions permissions can be configured in the admin panel
@@ -22,7 +30,7 @@
     resource.model_class_name = "Decidim::Accountability::Result"
     resource.template = "decidim/accountability/results/linked_results"
     resource.card = "decidim/accountability/result"
-    resource.searchable = false
+    resource.searchable = true
     resource.actions = %w(comment vote_comment)
   end
 
diff --git a/decidim-accountability/lib/decidim/accountability/seeds.rb b/decidim-accountability/lib/decidim/accountability/seeds.rb
index 74974e0da6435..8fdabcb570a42 100644
--- a/decidim-accountability/lib/decidim/accountability/seeds.rb
+++ b/decidim-accountability/lib/decidim/accountability/seeds.rb
@@ -43,7 +43,7 @@ def create_component!
       end
 
       def create_statuses!(component:)
-        5.times do |i|
+        config_value(:accountability_statuses_count).times do |i|
           Decidim::Accountability::Status.create!(
             component:,
             name: Decidim::Faker::Localized.word,
@@ -61,7 +61,7 @@ def create_taxonomies!
         parent_taxonomy = root_taxonomy.children.sample || create_taxonomy!(name: ::Faker::Lorem.sentence(word_count: 5), parent: root_taxonomy)
         taxonomies = [parent_taxonomy]
 
-        2.times do
+        config_value(:accountability_taxonomies_count).times do
           taxonomies << if parent_taxonomy.children.count > 1
                           parent_taxonomy.children.sample
                         else
diff --git a/decidim-accountability/lib/decidim/api/accountability_type.rb b/decidim-accountability/lib/decidim/api/accountability_type.rb
index 7a583baf55fed..8a33b085c37ea 100644
--- a/decidim-accountability/lib/decidim/api/accountability_type.rb
+++ b/decidim-accountability/lib/decidim/api/accountability_type.rb
@@ -19,8 +19,8 @@ def results
         Result.where(component: object).includes(:component)
       end
 
-      def result(**args)
-        Result.where(component: object).find_by(id: args[:id])
+      def result(id:)
+        Result.where(component: object).find(id)
       end
 
       def statuses
@@ -28,7 +28,7 @@ def statuses
       end
 
       def status(id:)
-        Status.where(component: object).find_by(id:)
+        Status.where(component: object).find(id)
       end
     end
   end
diff --git a/decidim-accountability/spec/db/data/reindex_results_spec.rb b/decidim-accountability/spec/db/data/reindex_results_spec.rb
new file mode 100644
index 0000000000000..c331052df5090
--- /dev/null
+++ b/decidim-accountability/spec/db/data/reindex_results_spec.rb
@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "./db/data/20260113140600_reindex_results"
+
+describe ReindexResults do
+  let(:migrator) do
+    described_class.new.tap do |m|
+      m.verbose = false
+    end
+  end
+
+  before do
+    clear_enqueued_jobs
+  end
+
+  describe "#up" do
+    context "when the component is published" do
+      let(:component) { create(:accountability_component, published_at: Time.zone.now) }
+
+      context "and there are results" do
+        let!(:results) { create_list(:result, 2, component:) }
+
+        it "those are added to index" do
+          Decidim::SearchableResource.delete_all
+          clear_enqueued_jobs
+
+          expect(Decidim::SearchableResource.where(resource: results)).to be_empty
+          expect { migrator.migrate(:up) }.to have_enqueued_job(Decidim::UpdateSearchIndexesJob).at_least(1).times
+
+          perform_enqueued_jobs(only: Decidim::UpdateSearchIndexesJob)
+          expect(Decidim::SearchableResource.where(resource: results)).not_to be_empty
+          # 3 languages multiplied by 2 results
+          expect(Decidim::SearchableResource.where(resource: results).count).to eq(6)
+        end
+      end
+
+      context "and there are deleted results" do
+        let!(:results) { create_list(:result, 2, component:) }
+
+        it "those are added to index" do
+          results.map(&:destroy)
+          Decidim::SearchableResource.delete_all
+
+          expect(Decidim::SearchableResource.where(resource: results)).to be_empty
+          perform_enqueued_jobs(only: Decidim::UpdateSearchIndexesJob) { migrator.migrate(:up) }
+          expect(Decidim::SearchableResource.where(resource: results)).to be_empty
+        end
+      end
+
+      context "and there are no results" do
+        let!(:results) { [] }
+
+        it "does not reindex the results" do
+          Decidim::SearchableResource.delete_all
+
+          expect(Decidim::SearchableResource.where(resource: results)).to be_empty
+          perform_enqueued_jobs(only: Decidim::UpdateSearchIndexesJob) { migrator.migrate(:up) }
+          expect(Decidim::SearchableResource.where(resource: results)).to be_empty
+        end
+      end
+    end
+
+    context "when the component is not published" do
+      let(:component) { create(:accountability_component, published_at: nil) }
+      let!(:results) { create_list(:result, 2, component:) }
+
+      it "does not reindex the results" do
+        Decidim::SearchableResource.delete_all
+
+        expect(Decidim::SearchableResource.where(resource: results)).to be_empty
+        perform_enqueued_jobs(only: Decidim::UpdateSearchIndexesJob) { migrator.migrate(:up) }
+        expect(Decidim::SearchableResource.where(resource: results)).to be_empty
+      end
+    end
+
+    context "when the component is deleted" do
+      let(:component) { create(:accountability_component, published_at: Time.zone.now, deleted_at: Time.zone.now) }
+      let!(:results) { create_list(:result, 2, component:) }
+
+      it "does not reindex the results" do
+        Decidim::SearchableResource.delete_all
+
+        expect(Decidim::SearchableResource.where(resource: results)).to be_empty
+        perform_enqueued_jobs(only: Decidim::UpdateSearchIndexesJob) { migrator.migrate(:up) }
+        expect(Decidim::SearchableResource.where(resource: results)).to be_empty
+      end
+    end
+  end
+end
diff --git a/decidim-accountability/spec/lib/decidim/accountability/component_spec.rb b/decidim-accountability/spec/lib/decidim/accountability/component_spec.rb
index bde48b30bc2d3..f8f2b0f6e0d4c 100644
--- a/decidim-accountability/spec/lib/decidim/accountability/component_spec.rb
+++ b/decidim-accountability/spec/lib/decidim/accountability/component_spec.rb
@@ -21,4 +21,44 @@
       it_behaves_like "has mandatory config setting", :comments_max_length
     end
   end
+
+  describe "hooks" do
+    let!(:results) { create_list(:result, 5, component:) }
+
+    before do
+      clear_enqueued_jobs
+    end
+
+    describe "publish" do
+      let(:component) { create(:accountability_component, published_at: nil) }
+
+      it "adds the results to search index" do
+        expect(Decidim::SearchableResource.where(resource: results)).to be_empty
+        component.publish!
+
+        perform_enqueued_jobs(only: Decidim::UpdateSearchIndexesJob) do
+          component.manifest.run_hooks(:publish, component)
+        end
+
+        expect(Decidim::SearchableResource.where(resource: results)).to be_present
+        # 3 languages multiplied by 5 results
+        expect(Decidim::SearchableResource.where(resource: results).count).to eq(15)
+      end
+    end
+
+    describe "unpublish" do
+      it "removes the results from search index" do
+        # 3 languages multiplied by 5 results
+        expect(Decidim::SearchableResource.where(resource: results).count).to eq(15)
+        expect(Decidim::SearchableResource.where(resource: results)).to be_present
+        component.unpublish!
+
+        perform_enqueued_jobs(only: Decidim::UpdateSearchIndexesJob) do
+          component.manifest.run_hooks(:publish, component)
+        end
+
+        expect(Decidim::SearchableResource.where(resource: results)).to be_empty
+      end
+    end
+  end
 end
diff --git a/decidim-accountability/spec/requests/result_search_spec.rb b/decidim-accountability/spec/requests/result_search_spec.rb
index 7a2b8480245c4..efb508835efd6 100644
--- a/decidim-accountability/spec/requests/result_search_spec.rb
+++ b/decidim-accountability/spec/requests/result_search_spec.rb
@@ -113,5 +113,23 @@
         expect(subject).to contain_exactly(result1, result2)
       end
     end
+
+    context "when filtering by taxonomy" do
+      context "when filtering by taxonomy1" do
+        let(:filter_params) { { taxonomies_part_of_contains: taxonomy1.id } }
+
+        it "returns results with that taxonomy directly assigned" do
+          expect(subject).to contain_exactly(result1)
+        end
+      end
+
+      context "when filtering by taxonomy2" do
+        let(:filter_params) { { taxonomies_part_of_contains: taxonomy2.id } }
+
+        it "returns results with that taxonomy and results with its child taxonomies" do
+          expect(subject).to contain_exactly(result2, result4)
+        end
+      end
+    end
   end
 end
diff --git a/decidim-accountability/spec/system/accountability_breadcrumbs_spec.rb b/decidim-accountability/spec/system/accountability_breadcrumbs_spec.rb
new file mode 100644
index 0000000000000..61b89ac754456
--- /dev/null
+++ b/decidim-accountability/spec/system/accountability_breadcrumbs_spec.rb
@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Accountability Breadcrumb" do
+  include_context "with a component"
+
+  let(:manifest_name) { "accountability" }
+  let!(:results) { create_list(:result, 5, component:) }
+
+  describe "index" do
+    let(:path) { decidim_participatory_process_accountability.results_path(participatory_process_slug: participatory_process.slug, component_id: component.id, locale: I18n.locale) }
+
+    before do
+      visit path
+    end
+
+    it "shows the correct information in breadcrumb (space, component)" do
+      within(".menu-bar") do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+      end
+    end
+  end
+
+  describe "show" do
+    let(:path) { decidim_participatory_process_accountability.result_path(id: result.id, participatory_process_slug: participatory_process.slug, component_id: component.id, locale: I18n.locale) }
+    let(:results_count) { 1 }
+    let(:result) { results.first }
+
+    before do
+      visit path
+    end
+
+    it "shows the correct information in breadcrumb (space, component, result)" do
+      within(".menu-bar") do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+        expect(page).to have_content(translated(result.title))
+      end
+    end
+
+    context "with subresults" do
+      let!(:subresults) { create_list(:result, 3, component:, parent: result) }
+      let(:first_subresult) { subresults.first }
+
+      before do
+        visit current_path
+      end
+
+      it "shows the correct information in breadcrumb (space, component, result, subresult)" do
+        click_on translated(first_subresult.title)
+        within(".menu-bar") do
+          expect(page).to have_content(translated(component.participatory_space.title))
+          expect(page).to have_content(translated(component.name))
+          expect(page).to have_content(translated(result.title))
+          expect(page).to have_content(translated(first_subresult.title))
+        end
+      end
+    end
+  end
+
+  describe "versions", versioning: true do
+    let!(:result) { create(:result, progress: 25.0, component:) }
+    let(:path) { decidim_participatory_process_accountability.result_path(id: result.id, participatory_process_slug: participatory_process.slug, component_id: component.id, locale: I18n.locale) }
+
+    before do
+      Decidim.traceability.update!(
+        result,
+        "test suite",
+        progress: 50.0
+      )
+      visit path
+
+      click_on "see other versions"
+    end
+
+    it "shows the correct information in breadcrumb (space, component, result)" do
+      within(".menu-bar") do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+        expect(page).to have_content(translated(result.title))
+      end
+    end
+  end
+end
diff --git a/decidim-accountability/spec/system/explore_results_spec.rb b/decidim-accountability/spec/system/explore_results_spec.rb
index 78df1e1ab6f97..eeaf643e24aba 100644
--- a/decidim-accountability/spec/system/explore_results_spec.rb
+++ b/decidim-accountability/spec/system/explore_results_spec.rb
@@ -155,10 +155,6 @@
       end
 
       it "shows all results for the given process and taxonomy" do
-        within(".menu-bar") do
-          expect(page).to have_content(translated(component.name))
-        end
-
         within("#results") do
           expect(page).to have_css(".card__list", count: results_count)
 
@@ -179,10 +175,6 @@
       end
 
       it "shows all result info" do
-        within(".menu-bar") do
-          expect(page).to have_content(translated(component.name))
-          expect(page).to have_content(translated(result.title))
-        end
         expect(page).to have_i18n_content(result.title)
         expect(page).to have_i18n_content(result.description, strip_tags: true)
         expect(page).to have_content(result.reference)
@@ -278,12 +270,6 @@
         it "the result is mentioned in the subresult page" do
           click_on translated(first_subresult.title)
           expect(page).to have_i18n_content(result.title)
-
-          within(".menu-bar") do
-            expect(page).to have_content(translated(component.name))
-            expect(page).to have_content(translated(result.title))
-            expect(page).to have_content(translated(first_subresult.title))
-          end
         end
 
         it "a banner links back to the result" do
diff --git a/decidim-accountability/spec/system/explore_versions_spec.rb b/decidim-accountability/spec/system/explore_versions_spec.rb
index bdaf47efd7817..c2feb05e51c1e 100644
--- a/decidim-accountability/spec/system/explore_versions_spec.rb
+++ b/decidim-accountability/spec/system/explore_versions_spec.rb
@@ -37,10 +37,6 @@
     end
 
     it "lists all versions" do
-      within(".menu-bar") do
-        expect(page).to have_content(translated(component.name))
-        expect(page).to have_content(translated(result.title))
-      end
       expect(page).to have_link("Version 1 of 2")
       expect(page).to have_link("Version 2 of 2")
     end
diff --git a/decidim-accountability/spec/types/accountability_type_spec.rb b/decidim-accountability/spec/types/accountability_type_spec.rb
index ca3d338b2424e..0b53ecb8412ff 100644
--- a/decidim-accountability/spec/types/accountability_type_spec.rb
+++ b/decidim-accountability/spec/types/accountability_type_spec.rb
@@ -43,8 +43,8 @@ module Accountability
         context "when the result does not belong to the component" do
           let!(:result) { create(:result, component: create(:accountability_component)) }
 
-          it "returns null" do
-            expect(response["result"]).to be_nil
+          it "raises error" do
+            expect { response }.to raise_error(Decidim::Api::Errors::NotFoundError, "Result not found")
           end
         end
       end
@@ -97,8 +97,8 @@ module Accountability
         context "when the status does not belong to the component" do
           let!(:status) { create(:status, component: create(:accountability_component)) }
 
-          it "returns null" do
-            expect(response["status"]).to be_nil
+          it "raises error" do
+            expect { response }.to raise_error(Decidim::Api::Errors::NotFoundError, "Status not found")
           end
         end
       end
diff --git a/decidim-accountability/spec/types/result_type_spec.rb b/decidim-accountability/spec/types/result_type_spec.rb
index 72836f3725d35..480003db3518c 100644
--- a/decidim-accountability/spec/types/result_type_spec.rb
+++ b/decidim-accountability/spec/types/result_type_spec.rb
@@ -20,6 +20,12 @@ module Accountability
       include_examples "localizable interface"
       include_examples "referable interface"
 
+      shared_examples "unauthorized Result" do
+        it "throws Decidim::Api::Errors::UnauthorizedObjectError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::UnauthorizedObjectError, "You cannot view or edit this Result because you do not have permissions")
+        end
+      end
+
       describe "id" do
         let(:query) { "{ id }" }
 
@@ -97,9 +103,7 @@ module Accountability
         let(:model) { create(:result, component: current_component) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Result"
       end
 
       context "when participatory space is private but transparent" do
@@ -119,9 +123,7 @@ module Accountability
         let(:model) { create(:result, component: current_component) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Result"
       end
 
       context "when component is not published" do
@@ -129,9 +131,7 @@ module Accountability
         let(:model) { create(:result, component: current_component) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Result"
       end
     end
   end
diff --git a/decidim-admin/app/commands/decidim/admin/content_blocks/update_content_block.rb b/decidim-admin/app/commands/decidim/admin/content_blocks/update_content_block.rb
index 3d4921ed17c2b..33b2867d990da 100644
--- a/decidim-admin/app/commands/decidim/admin/content_blocks/update_content_block.rb
+++ b/decidim-admin/app/commands/decidim/admin/content_blocks/update_content_block.rb
@@ -6,7 +6,7 @@ module ContentBlocks
       # This command gets called when a content block is updated from the admin
       # panel.
       class UpdateContentBlock < Decidim::Command
-        attr_reader :form, :content_block, :scope
+        attr_reader :form, :content_block, :scope, :attachments_to_purge
 
         # Public: Initializes the command.
         #
@@ -17,6 +17,7 @@ def initialize(form, content_block, scope)
           @form = form
           @content_block = content_block
           @scope = scope
+          @attachments_to_purge = []
         end
 
         # Public: Updates the content block settings and its attachments.
@@ -55,6 +56,8 @@ def call
 
           return broadcast(:invalid) unless images_valid
 
+          purge_attachment
+
           broadcast(:ok, content_block)
         end
 
@@ -67,14 +70,20 @@ def update_content_block_settings
         def update_content_block_images
           content_block.manifest.images.each do |image_config|
             image_name = image_config[:name]
-
             if form.images[image_name]
               content_block.images_container.send("#{image_name}=", form.images[image_name])
-            elsif form.images[:"remove_#{image_name}"] == "1"
+            elsif form.images[:"remove_#{image_name}"]
+              @attachments_to_purge << content_block.images_container.send(image_name.to_s)
               content_block.images_container.send("#{image_name}=", nil)
             end
           end
         end
+
+        def purge_attachment
+          attachments_to_purge.each do |attachment_to_purge|
+            attachment_to_purge.purge if attachment_to_purge.respond_to?(:purge)
+          end
+        end
       end
     end
   end
diff --git a/decidim-admin/app/commands/decidim/admin/create_participatory_space_private_user.rb b/decidim-admin/app/commands/decidim/admin/create_participatory_space_private_user.rb
deleted file mode 100644
index f95c1da6588cc..0000000000000
--- a/decidim-admin/app/commands/decidim/admin/create_participatory_space_private_user.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    # A command with all the business logic when creating a new participatory space
-    # private user in the system.
-    class CreateParticipatorySpacePrivateUser < Decidim::Command
-      delegate :current_user, to: :form
-      # Public: Initializes the command.
-      #
-      # form - A form object with the params.
-      # private_user_to - The private_user_to that will hold the
-      #   user role
-      def initialize(form, private_user_to, via_csv: false)
-        @form = form
-        @private_user_to = private_user_to
-        @via_csv = via_csv
-      end
-
-      # Executes the command. Broadcasts these events:
-      #
-      # - :ok when everything is valid.
-      # - :invalid if the form was not valid and we could not proceed.
-      #
-      # Returns nothing.
-      def call
-        return broadcast(:invalid) if form.invalid?
-
-        ActiveRecord::Base.transaction do
-          @user ||= existing_user || new_user
-          create_private_user
-        end
-
-        broadcast(:ok)
-      rescue ActiveRecord::RecordInvalid
-        form.errors.add(:email, :taken)
-        broadcast(:invalid)
-      end
-
-      private
-
-      attr_reader :form, :private_user_to, :user
-
-      def create_private_user
-        action = @via_csv ? "create_via_csv" : "create"
-        Decidim.traceability.perform_action!(
-          action,
-          Decidim::ParticipatorySpacePrivateUser,
-          current_user,
-          resource: {
-            title: user.name
-          }
-        ) do
-          Decidim::ParticipatorySpacePrivateUser.find_or_create_by!(
-            user:,
-            privatable_to: @private_user_to,
-            role: form.role,
-            published: form.published
-          )
-        end
-      end
-
-      def existing_user
-        return @existing_user if defined?(@existing_user)
-
-        @existing_user = User.find_by(
-          email: form.email.downcase,
-          organization: private_user_to.organization
-        )
-
-        InviteUserAgain.call(@existing_user, invitation_instructions) if @existing_user&.invitation_pending?
-
-        @existing_user
-      end
-
-      def new_user
-        @new_user ||= InviteUser.call(user_form) do
-          on(:ok) do |user|
-            return user
-          end
-        end
-      end
-
-      def user_form
-        OpenStruct.new(name: form.name,
-                       email: form.email.downcase,
-                       organization: private_user_to.organization,
-                       admin: false,
-                       invited_by: current_user,
-                       invitation_instructions:)
-      end
-
-      def invitation_instructions
-        "invite_private_user"
-      end
-    end
-  end
-end
diff --git a/decidim-admin/app/commands/decidim/admin/destroy_participatory_space_private_user.rb b/decidim-admin/app/commands/decidim/admin/destroy_participatory_space_private_user.rb
deleted file mode 100644
index 6b15e2a84b796..0000000000000
--- a/decidim-admin/app/commands/decidim/admin/destroy_participatory_space_private_user.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    # A command with all the business logic to destroy a participatory space private user.
-    class DestroyParticipatorySpacePrivateUser < Decidim::Commands::DestroyResource
-      private
-
-      def extra_params
-        {
-          resource: {
-            title: resource.user.name
-          }
-        }
-      end
-
-      def run_after_hooks
-        return unless resource.privatable_to.respond_to?(:private_space?)
-        return unless resource.privatable_to.private_space?
-        return if resource.privatable_to.respond_to?(:is_transparent) && resource.privatable_to.is_transparent?
-
-        # When private user is destroyed, a hook to destroy the follows of user on private non-transparent assembly
-        # or private participatory process and the follows of their children
-        DestroyPrivateUsersFollowsJob.perform_later(resource.decidim_user_id, resource.privatable_to)
-      end
-    end
-  end
-end
diff --git a/decidim-admin/app/commands/decidim/admin/participatory_space/create_member.rb b/decidim-admin/app/commands/decidim/admin/participatory_space/create_member.rb
new file mode 100644
index 0000000000000..32ad418fa1f7f
--- /dev/null
+++ b/decidim-admin/app/commands/decidim/admin/participatory_space/create_member.rb
@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      # A command with all the business logic when creating a new participatory space
+      # member in the system.
+      class CreateMember < Decidim::Command
+        delegate :current_user, to: :form
+        # Public: Initializes the command.
+        #
+        # form - A form object with the params.
+        # member_to - The member_to that will hold the
+        #   user role
+        def initialize(form, member_to, via_csv: false)
+          @form = form
+          @member_to = member_to
+          @via_csv = via_csv
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form was not valid and we could not proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          ActiveRecord::Base.transaction do
+            @user ||= existing_user || new_user
+            create_member
+          end
+
+          broadcast(:ok)
+        rescue ActiveRecord::RecordInvalid
+          form.errors.add(:email, :taken)
+          broadcast(:invalid)
+        end
+
+        private
+
+        attr_reader :form, :member_to, :user
+
+        def create_member
+          action = @via_csv ? "create_via_csv" : "create"
+          Decidim.traceability.perform_action!(
+            action,
+            Decidim::ParticipatorySpace::Member,
+            current_user,
+            resource: {
+              title: user.name
+            }
+          ) do
+            Decidim::ParticipatorySpace::Member.find_or_create_by!(
+              user:,
+              participatory_space: @member_to,
+              role: form.role,
+              published: form.published
+            )
+          end
+        end
+
+        def existing_user
+          return @existing_user if defined?(@existing_user)
+
+          @existing_user = User.find_by(
+            email: form.email.downcase,
+            organization: member_to.organization
+          )
+
+          InviteUserAgain.call(@existing_user, invitation_instructions) if @existing_user&.invitation_pending?
+
+          @existing_user
+        end
+
+        def new_user
+          @new_user ||= InviteUser.call(user_form) do
+            on(:ok) do |user|
+              return user
+            end
+          end
+        end
+
+        def user_form
+          OpenStruct.new(name: form.name,
+                         email: form.email.downcase,
+                         organization: member_to.organization,
+                         admin: false,
+                         invited_by: current_user,
+                         invitation_instructions:)
+        end
+
+        def invitation_instructions
+          "invite_member"
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-admin/app/commands/decidim/admin/participatory_space/destroy_member.rb b/decidim-admin/app/commands/decidim/admin/participatory_space/destroy_member.rb
new file mode 100644
index 0000000000000..4bcf5ac44fa43
--- /dev/null
+++ b/decidim-admin/app/commands/decidim/admin/participatory_space/destroy_member.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      # A command with all the business logic to destroy a member.
+      class DestroyMember < Decidim::Commands::DestroyResource
+        private
+
+        def extra_params
+          {
+            resource: {
+              title: resource.user.name
+            }
+          }
+        end
+
+        def run_after_hooks
+          return unless resource.participatory_space.respond_to?(:private_space?)
+          return unless resource.participatory_space.private_space?
+          return if resource.participatory_space.respond_to?(:is_transparent) && resource.participatory_space.is_transparent?
+
+          # When member is destroyed, a hook to destroy the follows of user on private non-transparent assembly
+          # or private participatory process and the follows of their children
+          DestroyMembersFollowsJob.perform_later(resource.decidim_user_id, resource.participatory_space)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-admin/app/commands/decidim/admin/participatory_space/import_member_csv.rb b/decidim-admin/app/commands/decidim/admin/participatory_space/import_member_csv.rb
new file mode 100644
index 0000000000000..d9ce06ea98eda
--- /dev/null
+++ b/decidim-admin/app/commands/decidim/admin/participatory_space/import_member_csv.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require "csv"
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      class ImportMemberCsv < Decidim::Command
+        include Decidim::Admin::CustomImport
+
+        delegate :current_user, to: :form
+        # Public: Initializes the command.
+        #
+        # form - the form object containing the uploaded file
+        # members_to - The members_to that will hold the user role
+        def initialize(form, members_to)
+          @form = form
+          @members_to = members_to
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form was not valid and we could not proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) unless @form.valid?
+
+          process_csv
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :form
+
+        def process_csv
+          process_import_file(@form.file) do |(email, user_name)|
+            ImportMemberCsvJob.perform_later(email, user_name, @members_to, current_user) if email.present? && user_name.present?
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-admin/app/commands/decidim/admin/participatory_space/publish_all_members.rb b/decidim-admin/app/commands/decidim/admin/participatory_space/publish_all_members.rb
new file mode 100644
index 0000000000000..ef0a037976127
--- /dev/null
+++ b/decidim-admin/app/commands/decidim/admin/participatory_space/publish_all_members.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      class PublishAllMembers < Decidim::Command
+        # Public: Initializes the command.
+        #
+        # participatory_space - the participatory space
+        # current_user - the current user
+        def initialize(participatory_space, current_user)
+          @participatory_space = participatory_space
+          @current_user = current_user
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form was not valid and we could not proceed.
+        #
+        # Returns nothing.
+        def call
+          publish_all
+          create_action_log
+          broadcast(:ok)
+        rescue ActiveRecord::RecordInvalid
+          broadcast(:invalid)
+        end
+
+        private
+
+        attr_reader :participatory_space, :current_user
+
+        def publish_all
+          # rubocop:disable Rails/SkipsModelValidations
+          # Using update_all for performance reasons
+          participatory_space.members.update_all(published: true)
+          # rubocop:enable Rails/SkipsModelValidations
+        end
+
+        def create_action_log
+          Decidim.traceability.perform_action!(
+            "publish_all_members",
+            participatory_space,
+            current_user,
+            members_ids: participatory_space.members.pluck(:id)
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-admin/app/commands/decidim/admin/participatory_space/unpublish_all_members.rb b/decidim-admin/app/commands/decidim/admin/participatory_space/unpublish_all_members.rb
new file mode 100644
index 0000000000000..128e0edfaefa8
--- /dev/null
+++ b/decidim-admin/app/commands/decidim/admin/participatory_space/unpublish_all_members.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      class UnpublishAllMembers < Decidim::Command
+        # Public: Initializes the command.
+        #
+        # participatory_space - the participatory space
+        # current_user - the current user
+        def initialize(participatory_space, current_user)
+          @participatory_space = participatory_space
+          @current_user = current_user
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form was not valid and we could not proceed.
+        #
+        # Returns nothing.
+        def call
+          unpublish_all
+          create_action_log
+          broadcast(:ok)
+        rescue ActiveRecord::RecordInvalid
+          broadcast(:invalid)
+        end
+
+        private
+
+        attr_reader :participatory_space, :current_user
+
+        def unpublish_all
+          # rubocop:disable Rails/SkipsModelValidations
+          # Using update_all for performance reasons
+          participatory_space.members.update_all(published: false)
+          # rubocop:enable Rails/SkipsModelValidations
+        end
+
+        def create_action_log
+          Decidim.traceability.perform_action!(
+            "unpublish_all_members",
+            participatory_space,
+            current_user,
+            members_ids: participatory_space.members.pluck(:id)
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-admin/app/commands/decidim/admin/participatory_space/update_member.rb b/decidim-admin/app/commands/decidim/admin/participatory_space/update_member.rb
new file mode 100644
index 0000000000000..7f235a06c756e
--- /dev/null
+++ b/decidim-admin/app/commands/decidim/admin/participatory_space/update_member.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      # A command with all the business logic when updating a participatory space
+      # member.
+      class UpdateMember < Decidim::Commands::UpdateResource
+        fetch_form_attributes :role, :published
+      end
+    end
+  end
+end
diff --git a/decidim-admin/app/commands/decidim/admin/process_participatory_space_private_user_import_csv.rb b/decidim-admin/app/commands/decidim/admin/process_participatory_space_private_user_import_csv.rb
deleted file mode 100644
index 3f49c5f14924d..0000000000000
--- a/decidim-admin/app/commands/decidim/admin/process_participatory_space_private_user_import_csv.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require "csv"
-
-module Decidim
-  module Admin
-    class ProcessParticipatorySpacePrivateUserImportCsv < Decidim::Command
-      include Decidim::Admin::CustomImport
-
-      delegate :current_user, to: :form
-      # Public: Initializes the command.
-      #
-      # form - the form object containing the uploaded file
-      # private_users_to - The private_users_to that will hold the user role
-      def initialize(form, private_users_to)
-        @form = form
-        @private_users_to = private_users_to
-      end
-
-      # Executes the command. Broadcasts these events:
-      #
-      # - :ok when everything is valid.
-      # - :invalid if the form was not valid and we could not proceed.
-      #
-      # Returns nothing.
-      def call
-        return broadcast(:invalid) unless @form.valid?
-
-        process_csv
-        broadcast(:ok)
-      end
-
-      private
-
-      attr_reader :form
-
-      def process_csv
-        process_import_file(@form.file) do |(email, user_name)|
-          ImportParticipatorySpacePrivateUserCsvJob.perform_later(email, user_name, @private_users_to, current_user) if email.present? && user_name.present?
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-admin/app/commands/decidim/admin/publish_all_participatory_space_private_users.rb b/decidim-admin/app/commands/decidim/admin/publish_all_participatory_space_private_users.rb
deleted file mode 100644
index 38abcc5c7a0f6..0000000000000
--- a/decidim-admin/app/commands/decidim/admin/publish_all_participatory_space_private_users.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    class PublishAllParticipatorySpacePrivateUsers < Decidim::Command
-      # Public: Initializes the command.
-      #
-      # participatory_space - the participatory space
-      # current_user - the current user
-      def initialize(participatory_space, current_user)
-        @participatory_space = participatory_space
-        @current_user = current_user
-      end
-
-      # Executes the command. Broadcasts these events:
-      #
-      # - :ok when everything is valid.
-      # - :invalid if the form was not valid and we could not proceed.
-      #
-      # Returns nothing.
-      def call
-        publish_all
-        create_action_log
-        broadcast(:ok)
-      rescue ActiveRecord::RecordInvalid
-        broadcast(:invalid)
-      end
-
-      private
-
-      attr_reader :participatory_space, :current_user
-
-      def publish_all
-        # rubocop:disable Rails/SkipsModelValidations
-        # Using update_all for performance reasons
-        participatory_space.participatory_space_private_users.update_all(published: true)
-        # rubocop:enable Rails/SkipsModelValidations
-      end
-
-      def create_action_log
-        Decidim.traceability.perform_action!(
-          "publish_all_members",
-          participatory_space,
-          current_user,
-          private_users_ids: participatory_space.participatory_space_private_users.pluck(:id)
-        )
-      end
-    end
-  end
-end
diff --git a/decidim-admin/app/commands/decidim/admin/unpublish_all_participatory_space_private_users.rb b/decidim-admin/app/commands/decidim/admin/unpublish_all_participatory_space_private_users.rb
deleted file mode 100644
index f32c2274e1fc4..0000000000000
--- a/decidim-admin/app/commands/decidim/admin/unpublish_all_participatory_space_private_users.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    class UnpublishAllParticipatorySpacePrivateUsers < Decidim::Command
-      # Public: Initializes the command.
-      #
-      # participatory_space - the participatory space
-      # current_user - the current user
-      def initialize(participatory_space, current_user)
-        @participatory_space = participatory_space
-        @current_user = current_user
-      end
-
-      # Executes the command. Broadcasts these events:
-      #
-      # - :ok when everything is valid.
-      # - :invalid if the form was not valid and we could not proceed.
-      #
-      # Returns nothing.
-      def call
-        unpublish_all
-        create_action_log
-        broadcast(:ok)
-      rescue ActiveRecord::RecordInvalid
-        broadcast(:invalid)
-      end
-
-      private
-
-      attr_reader :participatory_space, :current_user
-
-      def unpublish_all
-        # rubocop:disable Rails/SkipsModelValidations
-        # Using update_all for performance reasons
-        participatory_space.participatory_space_private_users.update_all(published: false)
-        # rubocop:enable Rails/SkipsModelValidations
-      end
-
-      def create_action_log
-        Decidim.traceability.perform_action!(
-          "unpublish_all_members",
-          participatory_space,
-          current_user,
-          private_users_ids: participatory_space.participatory_space_private_users.pluck(:id)
-        )
-      end
-    end
-  end
-end
diff --git a/decidim-admin/app/commands/decidim/admin/update_participatory_space_private_user.rb b/decidim-admin/app/commands/decidim/admin/update_participatory_space_private_user.rb
deleted file mode 100644
index 96f0c4923fb1d..0000000000000
--- a/decidim-admin/app/commands/decidim/admin/update_participatory_space_private_user.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    # A command with all the business logic when updating a participatory space
-    # private user.
-    class UpdateParticipatorySpacePrivateUser < Decidim::Commands::UpdateResource
-      fetch_form_attributes :role, :published
-    end
-  end
-end
diff --git a/decidim-admin/app/controllers/concerns/decidim/participatory_space_private_users/admin/filterable.rb b/decidim-admin/app/controllers/concerns/decidim/participatory_space_private_users/admin/filterable.rb
deleted file mode 100644
index 1fc1b13edac48..0000000000000
--- a/decidim-admin/app/controllers/concerns/decidim/participatory_space_private_users/admin/filterable.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require "active_support/concern"
-
-module Decidim
-  module ParticipatorySpacePrivateUsers
-    module Admin
-      module Filterable
-        extend ActiveSupport::Concern
-
-        included do
-          include Decidim::Admin::Filterable
-
-          private
-
-          def base_query
-            collection
-          end
-
-          def filters
-            [
-              :user_invitation_sent_at_not_null,
-              :user_invitation_accepted_at_not_null
-            ]
-          end
-
-          def search_field_predicate
-            :user_name_or_user_email_cont
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-admin/app/controllers/decidim/admin/components/base_controller.rb b/decidim-admin/app/controllers/decidim/admin/components/base_controller.rb
index faf46a8ba2e07..eaff40b1f4161 100644
--- a/decidim-admin/app/controllers/decidim/admin/components/base_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/components/base_controller.rb
@@ -31,7 +31,7 @@ class BaseController < Decidim::Admin::ApplicationController
           enforce_permission_to :read, :component, component: current_component
         end
 
-        before_action :set_component_breadcrumb_item
+        before_action :set_breadcrumb_items
 
         def permissions_context
           super.merge(
@@ -68,7 +68,7 @@ def skip_manage_component_permission
           false
         end
 
-        def set_component_breadcrumb_item
+        def set_breadcrumb_items
           context_breadcrumb_items << {
             label: t("components", scope: "decidim.admin.menu"),
             url: parent_path,
diff --git a/decidim-admin/app/controllers/decidim/admin/concerns/has_private_users.rb b/decidim-admin/app/controllers/decidim/admin/concerns/has_private_users.rb
deleted file mode 100644
index d44c4998fe8c3..0000000000000
--- a/decidim-admin/app/controllers/decidim/admin/concerns/has_private_users.rb
+++ /dev/null
@@ -1,169 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    module Concerns
-      # PrivateUsers can be related to any ParticipatorySpace, in order to
-      # manage the private users for a given type, you should create a new
-      # controller and include this concern.
-      #
-      # The only requirement is to define a `privatable_to` method that
-      # returns an instance of the model to relate the private_user to.
-      module HasPrivateUsers
-        extend ActiveSupport::Concern
-
-        included do
-          include Decidim::ParticipatorySpacePrivateUsers::Admin::Filterable
-          helper PaginateHelper
-          helper_method :privatable_to, :participatory_space_private_users
-
-          # rubocop:disable Rails/LexicallyScopedActionFilter
-          before_action :set_private_user, only: [:edit, :update, :destroy, :resend_invitation]
-          # rubocop:enable Rails/LexicallyScopedActionFilter
-
-          def index
-            enforce_permission_to :read, :space_private_user
-
-            render template: "decidim/admin/participatory_space_private_users/index"
-          end
-
-          def new
-            enforce_permission_to :create, :space_private_user
-            @form = form(ParticipatorySpacePrivateUserForm).from_params({}, privatable_to:)
-            render template: "decidim/admin/participatory_space_private_users/new"
-          end
-
-          def edit
-            enforce_permission_to :update, :space_private_user, private_user: @private_user
-            @form = form(ParticipatorySpacePrivateUserForm).from_model(@private_user)
-            render template: "decidim/admin/participatory_space_private_users/edit"
-          end
-
-          def update
-            enforce_permission_to :update, :space_private_user, private_user: @private_user
-            @form = form(ParticipatorySpacePrivateUserForm).from_params(params, privatable_to:)
-
-            UpdateParticipatorySpacePrivateUser.call(@form, @private_user) do
-              on(:ok) do
-                flash[:notice] = I18n.t("participatory_space_private_users.update.success", scope: "decidim.admin")
-                redirect_to action: :index
-              end
-
-              on(:invalid) do
-                flash.now[:alert] = I18n.t("participatory_space_private_users.update.error", scope: "decidim.admin")
-                render template: "decidim/admin/participatory_space_private_users/edit", status: :unprocessable_entity
-              end
-            end
-          end
-
-          def create
-            enforce_permission_to :create, :space_private_user
-            @form = form(ParticipatorySpacePrivateUserForm).from_params(params, privatable_to:)
-
-            CreateParticipatorySpacePrivateUser.call(@form, current_participatory_space) do
-              on(:ok) do
-                flash[:notice] = I18n.t("participatory_space_private_users.create.success", scope: "decidim.admin")
-                redirect_to action: :index
-              end
-
-              on(:invalid) do
-                flash.now[:alert] = I18n.t("participatory_space_private_users.create.error", scope: "decidim.admin")
-                render template: "decidim/admin/participatory_space_private_users/new", status: :unprocessable_entity
-              end
-            end
-          end
-
-          def destroy
-            enforce_permission_to :destroy, :space_private_user, private_user: @private_user
-
-            DestroyParticipatorySpacePrivateUser.call(@private_user, current_user) do
-              on(:ok) do
-                flash[:notice] = I18n.t("participatory_space_private_users.destroy.success", scope: "decidim.admin")
-                redirect_to after_destroy_path
-              end
-
-              on(:invalid) do
-                flash.now[:alert] = I18n.t("participatory_space_private_users.destroy.error", scope: "decidim.admin")
-                render template: "decidim/admin/participatory_space_private_users/index", status: :unprocessable_entity
-              end
-            end
-          end
-
-          def resend_invitation
-            enforce_permission_to :invite, :space_private_user, private_user: @private_user
-            InviteUserAgain.call(@private_user.user, "invite_private_user") do
-              on(:ok) do
-                flash[:notice] = I18n.t("users.resend_invitation.success", scope: "decidim.admin")
-              end
-
-              on(:invalid) do
-                flash[:alert] = I18n.t("users.resend_invitation.error", scope: "decidim.admin")
-              end
-            end
-
-            redirect_to after_destroy_path
-          end
-
-          def publish_all
-            PublishAllParticipatorySpacePrivateUsers.call(current_participatory_space, current_user) do
-              on(:ok) do
-                flash[:notice] = I18n.t("participatory_space_private_users.publish_all.success", scope: "decidim.admin")
-                redirect_to action: :index
-              end
-
-              on(:invalid) do
-                flash[:alert] = I18n.t("participatory_space_private_users.publish_all.error", scope: "decidim.admin")
-                redirect_to action: :index
-              end
-            end
-          end
-
-          def unpublish_all
-            UnpublishAllParticipatorySpacePrivateUsers.call(current_participatory_space, current_user) do
-              on(:ok) do
-                flash[:notice] = I18n.t("participatory_space_private_users.unpublish_all.success", scope: "decidim.admin")
-                redirect_to action: :index
-              end
-
-              on(:invalid) do
-                flash[:alert] = I18n.t("participatory_space_private_users.unpublish_all.error", scope: "decidim.admin")
-                redirect_to action: :index
-              end
-            end
-          end
-
-          # Public: Returns a String or Object that will be passed to `redirect_to` after
-          # destroying a private user. By default it redirects to the privatable_to.
-          #
-          # It can be redefined at controller level if you need to redirect elsewhere.
-          def after_destroy_path
-            privatable_to
-          end
-
-          # Public: The only method to be implemented at the controller. You need to
-          # return the object where the attachment will be attached to.
-          def privatable_to
-            raise NotImplementedError
-          end
-
-          def collection
-            # there is an unidentified corner case where Decidim::User
-            # may have been destroyed, but the related ParticipatorySpacePrivateUser
-            # remains in the database. That is why filtering by not null users
-            @collection ||= privatable_to
-                            .participatory_space_private_users
-                            .includes(:user).where.not("decidim_users.id" => nil)
-          end
-
-          def participatory_space_private_users
-            filtered_collection
-          end
-
-          def set_private_user
-            @private_user = collection.find(params[:id])
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-admin/app/controllers/decidim/admin/concerns/has_private_users_csv_import.rb b/decidim-admin/app/controllers/decidim/admin/concerns/has_private_users_csv_import.rb
deleted file mode 100644
index e9940d1b0c8bc..0000000000000
--- a/decidim-admin/app/controllers/decidim/admin/concerns/has_private_users_csv_import.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    module Concerns
-      # PrivateUsers can be related to any ParticipatorySpace, in order to
-      # import private users from csv for a given type, you should create a new
-      # controller and include this concern.
-      #
-      # The only requirement is to define a `privatable_to` method that
-      # returns an instance of the model to relate the private_user to.
-      module HasPrivateUsersCsvImport
-        extend ActiveSupport::Concern
-
-        included do
-          helper_method :privatable_to
-
-          def new
-            enforce_permission_to :csv_import, :space_private_user
-            @form = form(ParticipatorySpacePrivateUserCsvImportForm).from_params({}, privatable_to:)
-            @count = Decidim::ParticipatorySpacePrivateUser.by_participatory_space(privatable_to).count
-            render template: "decidim/admin/participatory_space_private_users_csv_imports/new"
-          end
-
-          def create
-            enforce_permission_to :csv_import, :space_private_user
-            @form = form(ParticipatorySpacePrivateUserCsvImportForm).from_params(params, privatable_to:)
-
-            ProcessParticipatorySpacePrivateUserImportCsv.call(@form, current_participatory_space) do
-              on(:ok) do
-                flash[:notice] = I18n.t("participatory_space_private_users_csv_imports.create.success", scope: "decidim.admin")
-                redirect_to after_import_path
-              end
-
-              on(:invalid) do
-                flash[:alert] = I18n.t("participatory_space_private_users_csv_imports.create.invalid", scope: "decidim.admin")
-                render template: "decidim/admin/participatory_space_private_users_csv_imports/new", status: :unprocessable_entity
-              end
-            end
-          end
-
-          def destroy_all
-            enforce_permission_to :csv_import, :space_private_user
-            Decidim::ParticipatorySpacePrivateUser.by_participatory_space(privatable_to).delete_all
-            redirect_to new_participatory_space_private_users_csv_imports_path
-          end
-
-          # Public: Returns a String or Object that will be passed to `redirect_to` after
-          # importing private users. By default it redirects to the privatable_to.
-          #
-          # It can be redefined at controller level if you need to redirect elsewhere.
-          def after_import_path
-            privatable_to
-          end
-
-          # Public: The only method to be implemented at the controller. You need to
-          # return the object where the attachment will be attached to.
-          def privatable_to
-            raise NotImplementedError
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-admin/app/controllers/decidim/admin/participatory_space/concerns/has_members.rb b/decidim-admin/app/controllers/decidim/admin/participatory_space/concerns/has_members.rb
new file mode 100644
index 0000000000000..4d0e713998dd4
--- /dev/null
+++ b/decidim-admin/app/controllers/decidim/admin/participatory_space/concerns/has_members.rb
@@ -0,0 +1,165 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      module Concerns
+        # Members can be related to any ParticipatorySpace, in order to
+        # manage the members for a given type, you should create a new
+        # controller and include this concern.
+        #
+        # It takes the current_participatory_space that is defined
+        # in the controller, so there is no need to define any method
+        module HasMembers
+          extend ActiveSupport::Concern
+
+          included do
+            include Decidim::Admin::ParticipatorySpace::Concerns::MembersFilterable
+            helper PaginateHelper
+            helper_method :members
+
+            # rubocop:disable Rails/LexicallyScopedActionFilter
+            before_action :set_member, only: [:edit, :update, :destroy, :resend_invitation]
+            # rubocop:enable Rails/LexicallyScopedActionFilter
+
+            def index
+              enforce_permission_to :read, :space_member
+
+              render template: "decidim/admin/members/index"
+            end
+
+            def new
+              enforce_permission_to :create, :space_member
+              @form = form(MemberForm).from_params({})
+              render template: "decidim/admin/members/new"
+            end
+
+            def edit
+              enforce_permission_to :update, :space_member, member: @member
+              @form = form(MemberForm).from_model(@member)
+              render template: "decidim/admin/members/edit"
+            end
+
+            def update
+              enforce_permission_to :update, :space_member, member: @member
+              @form = form(MemberForm).from_params(params)
+
+              UpdateMember.call(@form, @member) do
+                on(:ok) do
+                  flash[:notice] = I18n.t("members.update.success", scope: "decidim.admin")
+                  redirect_to action: :index
+                end
+
+                on(:invalid) do
+                  flash.now[:alert] = I18n.t("members.update.error", scope: "decidim.admin")
+                  render template: "decidim/admin/members/edit", status: :unprocessable_entity
+                end
+              end
+            end
+
+            def create
+              enforce_permission_to :create, :space_member
+              @form = form(MemberForm).from_params(params)
+
+              CreateMember.call(@form, current_participatory_space) do
+                on(:ok) do
+                  flash[:notice] = I18n.t("members.create.success", scope: "decidim.admin")
+                  redirect_to action: :index
+                end
+
+                on(:invalid) do
+                  flash.now[:alert] = I18n.t("members.create.error", scope: "decidim.admin")
+                  render template: "decidim/admin/members/new", status: :unprocessable_entity
+                end
+              end
+            end
+
+            def destroy
+              enforce_permission_to :destroy, :space_member, member: @member
+
+              DestroyMember.call(@member, current_user) do
+                on(:ok) do
+                  flash[:notice] = I18n.t("members.destroy.success", scope: "decidim.admin")
+                  redirect_to after_destroy_path
+                end
+
+                on(:invalid) do
+                  flash.now[:alert] = I18n.t("members.destroy.error", scope: "decidim.admin")
+                  render template: "decidim/admin/members/index", status: :unprocessable_entity
+                end
+              end
+            end
+
+            def resend_invitation
+              enforce_permission_to :invite, :space_member, member: @member
+              InviteUserAgain.call(@member.user, "invite_member") do
+                on(:ok) do
+                  flash[:notice] = I18n.t("users.resend_invitation.success", scope: "decidim.admin")
+                end
+
+                on(:invalid) do
+                  flash[:alert] = I18n.t("users.resend_invitation.error", scope: "decidim.admin")
+                end
+              end
+
+              redirect_to after_destroy_path
+            end
+
+            def publish_all
+              PublishAllMembers.call(current_participatory_space, current_user) do
+                on(:ok) do
+                  flash[:notice] = I18n.t("members.publish_all.success", scope: "decidim.admin")
+                  redirect_to action: :index
+                end
+
+                on(:invalid) do
+                  flash[:alert] = I18n.t("members.publish_all.error", scope: "decidim.admin")
+                  redirect_to action: :index
+                end
+              end
+            end
+
+            def unpublish_all
+              UnpublishAllMembers.call(current_participatory_space, current_user) do
+                on(:ok) do
+                  flash[:notice] = I18n.t("members.unpublish_all.success", scope: "decidim.admin")
+                  redirect_to action: :index
+                end
+
+                on(:invalid) do
+                  flash[:alert] = I18n.t("members.unpublish_all.error", scope: "decidim.admin")
+                  redirect_to action: :index
+                end
+              end
+            end
+
+            # Public: Returns a String or Object that will be passed to `redirect_to` after
+            # destroying a member. By default it redirects to the participatory_space.
+            #
+            # It can be redefined at controller level if you need to redirect elsewhere.
+            def after_destroy_path
+              members_path(current_participatory_space)
+            end
+
+            def collection
+              # there is an unidentified corner case where Decidim::User
+              # may have been destroyed, but the related Member
+              # remains in the database. That is why filtering by not null users
+              @collection ||= current_participatory_space
+                              .members
+                              .includes(:user).where.not("decidim_users.id" => nil)
+            end
+
+            def members
+              filtered_collection
+            end
+
+            def set_member
+              @member = collection.find(params[:id])
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-admin/app/controllers/decidim/admin/participatory_space/concerns/has_members_csv_import.rb b/decidim-admin/app/controllers/decidim/admin/participatory_space/concerns/has_members_csv_import.rb
new file mode 100644
index 0000000000000..f8e2e45f0bdb5
--- /dev/null
+++ b/decidim-admin/app/controllers/decidim/admin/participatory_space/concerns/has_members_csv_import.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      module Concerns
+        # Members can be related to any ParticipatorySpace, in order to
+        # import members from csv for a given type, you should create a new
+        # controller and include this concern.
+        #
+        # The only requirement is to define a `participatory_space` method that
+        # returns an instance of the model to relate the member to.
+        module HasMembersCsvImport
+          extend ActiveSupport::Concern
+
+          included do
+            helper_method :participatory_space
+
+            def new
+              enforce_permission_to :csv_import, :space_member
+              @form = form(MemberCsvImportForm).from_params({}, participatory_space:)
+              @count = Decidim::ParticipatorySpace::Member.by_participatory_space(participatory_space).count
+              render template: "decidim/admin/members_csv_imports/new"
+            end
+
+            def create
+              enforce_permission_to :csv_import, :space_member
+              @form = form(MemberCsvImportForm).from_params(params, participatory_space:)
+
+              ImportMemberCsv.call(@form, current_participatory_space) do
+                on(:ok) do
+                  flash[:notice] = I18n.t("members_csv_imports.create.success", scope: "decidim.admin")
+                  redirect_to after_import_path
+                end
+
+                on(:invalid) do
+                  flash[:alert] = I18n.t("members_csv_imports.create.invalid", scope: "decidim.admin")
+                  render template: "decidim/admin/members_csv_imports/new", status: :unprocessable_entity
+                end
+              end
+            end
+
+            def destroy_all
+              enforce_permission_to :csv_import, :space_member
+              Decidim::ParticipatorySpace::Member.by_participatory_space(participatory_space).delete_all
+              redirect_to new_members_csv_imports_path
+            end
+
+            # Public: Returns a String or Object that will be passed to `redirect_to` after
+            # importing members. By default it redirects to the participatory_space.
+            #
+            # It can be redefined at controller level if you need to redirect elsewhere.
+            def after_import_path
+              participatory_space
+            end
+
+            # Public: The only method to be implemented at the controller. You need to
+            # return the object where the attachment will be attached to.
+            def participatory_space
+              raise NotImplementedError
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-admin/app/controllers/decidim/admin/participatory_space/concerns/members_filterable.rb b/decidim-admin/app/controllers/decidim/admin/participatory_space/concerns/members_filterable.rb
new file mode 100644
index 0000000000000..a1af45aa7e282
--- /dev/null
+++ b/decidim-admin/app/controllers/decidim/admin/participatory_space/concerns/members_filterable.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      module Concerns
+        module MembersFilterable
+          extend ActiveSupport::Concern
+
+          included do
+            include Decidim::Admin::Filterable
+
+            private
+
+            def base_query
+              collection
+            end
+
+            def filters
+              [
+                :user_invitation_sent_at_not_null,
+                :user_invitation_accepted_at_not_null
+              ]
+            end
+
+            def search_field_predicate
+              :user_name_or_user_email_cont
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-admin/app/forms/decidim/admin/participatory_space/member_csv_import_form.rb b/decidim-admin/app/forms/decidim/admin/participatory_space/member_csv_import_form.rb
new file mode 100644
index 0000000000000..14efbcbca108c
--- /dev/null
+++ b/decidim-admin/app/forms/decidim/admin/participatory_space/member_csv_import_form.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "csv"
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      # A form object used to upload CSV to batch members.
+      #
+      class MemberCsvImportForm < Form
+        include Decidim::HasUploadValidations
+        include Decidim::Admin::CustomImport
+
+        attribute :file, Decidim::Attributes::Blob
+        attribute :user_name, String
+        attribute :email, String
+
+        validates :file, presence: true, file_content_type: { allow: ["text/csv"] }
+        validate :validate_csv
+
+        def validate_csv
+          return if file.blank?
+
+          process_import_file(file) do |(_email, user_name)|
+            errors.add(:user_name, :invalid) if user_name.blank? || !user_name.match?(UserBaseEntity::REGEXP_NAME)
+          end
+        rescue CSV::MalformedCSVError
+          errors.add(:file, :malformed)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-admin/app/forms/decidim/admin/participatory_space/member_form.rb b/decidim-admin/app/forms/decidim/admin/participatory_space/member_form.rb
new file mode 100644
index 0000000000000..ddc8665d8e211
--- /dev/null
+++ b/decidim-admin/app/forms/decidim/admin/participatory_space/member_form.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      # A form object used to create members from the
+      # admin dashboard.
+      #
+      class MemberForm < Form
+        include TranslatableAttributes
+
+        mimic :member
+
+        attribute :name, String
+        attribute :email, String
+        attribute :published, Boolean
+
+        translatable_attribute :role, String
+
+        validates :name, :email, presence: true
+
+        validates :name, format: { with: UserBaseEntity::REGEXP_NAME }
+      end
+    end
+  end
+end
diff --git a/decidim-admin/app/forms/decidim/admin/participatory_space_admin_user_form.rb b/decidim-admin/app/forms/decidim/admin/participatory_space_admin_user_form.rb
index 79118d1e44a5b..bd38aa416be28 100644
--- a/decidim-admin/app/forms/decidim/admin/participatory_space_admin_user_form.rb
+++ b/decidim-admin/app/forms/decidim/admin/participatory_space_admin_user_form.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   module Admin
-    class ParticipatorySpaceAdminUserForm < ParticipatorySpacePrivateUserForm
+    class ParticipatorySpaceAdminUserForm < Decidim::Admin::ParticipatorySpace::MemberForm
       attribute :role, String
 
       validates :role, presence: true
diff --git a/decidim-admin/app/forms/decidim/admin/participatory_space_private_user_csv_import_form.rb b/decidim-admin/app/forms/decidim/admin/participatory_space_private_user_csv_import_form.rb
deleted file mode 100644
index 5a09652fdb59d..0000000000000
--- a/decidim-admin/app/forms/decidim/admin/participatory_space_private_user_csv_import_form.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require "csv"
-
-module Decidim
-  module Admin
-    # A form object used to upload CSV to batch participatory space private users.
-    #
-    class ParticipatorySpacePrivateUserCsvImportForm < Form
-      include Decidim::HasUploadValidations
-      include Decidim::Admin::CustomImport
-
-      attribute :file, Decidim::Attributes::Blob
-      attribute :user_name, String
-      attribute :email, String
-
-      validates :file, presence: true, file_content_type: { allow: ["text/csv"] }
-      validate :validate_csv
-
-      def validate_csv
-        return if file.blank?
-
-        process_import_file(file) do |(_email, user_name)|
-          errors.add(:user_name, :invalid) if user_name.blank? || !user_name.match?(UserBaseEntity::REGEXP_NAME)
-        end
-      rescue CSV::MalformedCSVError
-        errors.add(:file, :malformed)
-      end
-    end
-  end
-end
diff --git a/decidim-admin/app/forms/decidim/admin/participatory_space_private_user_form.rb b/decidim-admin/app/forms/decidim/admin/participatory_space_private_user_form.rb
deleted file mode 100644
index d92ee013d51c4..0000000000000
--- a/decidim-admin/app/forms/decidim/admin/participatory_space_private_user_form.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    # A form object used to create participatory space private users from the
-    # admin dashboard.
-    #
-    class ParticipatorySpacePrivateUserForm < Form
-      include TranslatableAttributes
-
-      mimic :participatory_space_private_user
-
-      attribute :name, String
-      attribute :email, String
-      attribute :published, Boolean
-
-      translatable_attribute :role, String
-
-      validates :name, :email, presence: true
-
-      validates :name, format: { with: UserBaseEntity::REGEXP_NAME }
-    end
-  end
-end
diff --git a/decidim-admin/app/helpers/decidim/admin/moderations/reports_helper.rb b/decidim-admin/app/helpers/decidim/admin/moderations/reports_helper.rb
index ba7b387487108..eec346b0f4fff 100644
--- a/decidim-admin/app/helpers/decidim/admin/moderations/reports_helper.rb
+++ b/decidim-admin/app/helpers/decidim/admin/moderations/reports_helper.rb
@@ -19,7 +19,7 @@ def reportable_author_name(reportable)
               when User
                 content_tag :li do
                   link_to current_or_new_conversation_path_with(author), target: "_blank", rel: "noopener" do
-                    "#{author.name} #{icon "mail-send-line"}".html_safe
+                    "#{author.presenter.name} #{icon "mail-send-line"}".html_safe
                   end
                 end
               when Decidim::Meetings::Meeting
diff --git a/decidim-admin/app/jobs/decidim/admin/destroy_private_users_follows_job.rb b/decidim-admin/app/jobs/decidim/admin/destroy_private_users_follows_job.rb
deleted file mode 100644
index 04265cb72d121..0000000000000
--- a/decidim-admin/app/jobs/decidim/admin/destroy_private_users_follows_job.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    class DestroyPrivateUsersFollowsJob < ApplicationJob
-      queue_as :default
-
-      def perform(decidim_user_id, space)
-        return unless space.respond_to?(:private_space?)
-
-        return unless space.private_space?
-
-        return if space.respond_to?(:is_transparent) && space.is_transparent?
-
-        user = Decidim::User.find_by(id: decidim_user_id)
-
-        return if user.blank?
-
-        return if space.respond_to?(:can_participate?) && space.can_participate?(user)
-
-        follows = Decidim::Follow.where(user: user)
-        follows.where(followable: space).destroy_all
-
-        destroy_children_follows(follows, space)
-      end
-
-      def destroy_children_follows(follows, space)
-        follows.map do |follow|
-          object = follow.followable.presence
-          next unless object.respond_to?(:decidim_component_id)
-
-          follow.destroy if space.component_ids.include?(object.decidim_component_id)
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-admin/app/jobs/decidim/admin/import_participatory_space_private_user_csv_job.rb b/decidim-admin/app/jobs/decidim/admin/import_participatory_space_private_user_csv_job.rb
deleted file mode 100644
index adaeabfc294c8..0000000000000
--- a/decidim-admin/app/jobs/decidim/admin/import_participatory_space_private_user_csv_job.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    # Custom ApplicationJob scoped to the admin panel.
-    #
-    class ImportParticipatorySpacePrivateUserCsvJob < ApplicationJob
-      queue_as :exports
-
-      def perform(email, user_name, privatable_to, current_user)
-        return if email.blank? || user_name.blank?
-
-        params = {
-          name: user_name,
-          email: email.downcase.strip
-        }
-        private_user_form = ParticipatorySpacePrivateUserForm.from_params(params, privatable_to:)
-                                                             .with_context(
-                                                               current_user:,
-                                                               current_participatory_space: privatable_to
-                                                             )
-
-        Decidim::Admin::CreateParticipatorySpacePrivateUser.call(private_user_form, privatable_to, via_csv: true)
-      end
-    end
-  end
-end
diff --git a/decidim-admin/app/jobs/decidim/admin/participatory_space/destroy_members_follows_job.rb b/decidim-admin/app/jobs/decidim/admin/participatory_space/destroy_members_follows_job.rb
new file mode 100644
index 0000000000000..efc40670a36db
--- /dev/null
+++ b/decidim-admin/app/jobs/decidim/admin/participatory_space/destroy_members_follows_job.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      class DestroyMembersFollowsJob < ApplicationJob
+        queue_as :default
+
+        def perform(decidim_user_id, space)
+          return unless space.respond_to?(:private_space?)
+
+          return unless space.private_space?
+
+          return if space.respond_to?(:is_transparent) && space.is_transparent?
+
+          user = Decidim::User.find_by(id: decidim_user_id)
+
+          return if user.blank?
+
+          return if space.respond_to?(:can_participate?) && space.can_participate?(user)
+
+          follows = Decidim::Follow.where(user:)
+          follows.where(followable: space).destroy_all
+
+          destroy_children_follows(follows, space)
+        end
+
+        def destroy_children_follows(follows, space)
+          follows.map do |follow|
+            object = follow.followable.presence
+            next unless object.respond_to?(:decidim_component_id)
+
+            follow.destroy if space.component_ids.include?(object.decidim_component_id)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-admin/app/jobs/decidim/admin/participatory_space/import_member_csv_job.rb b/decidim-admin/app/jobs/decidim/admin/participatory_space/import_member_csv_job.rb
new file mode 100644
index 0000000000000..efb86b4084475
--- /dev/null
+++ b/decidim-admin/app/jobs/decidim/admin/participatory_space/import_member_csv_job.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      # Custom ApplicationJob scoped to the admin panel.
+      #
+      class ImportMemberCsvJob < ApplicationJob
+        queue_as :exports
+
+        def perform(email, user_name, participatory_space, current_user)
+          return if email.blank? || user_name.blank?
+
+          params = {
+            name: user_name,
+            email: email.downcase.strip
+          }
+          member_form = MemberForm.from_params(params, participatory_space:)
+                                  .with_context(
+                                    current_user:,
+                                    current_participatory_space: participatory_space
+                                  )
+
+          CreateMember.call(member_form, participatory_space, via_csv: true)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-admin/app/queries/decidim/admin/newsletter_recipients.rb b/decidim-admin/app/queries/decidim/admin/newsletter_recipients.rb
index 697ce9f9bf04c..e74b6c589a422 100644
--- a/decidim-admin/app/queries/decidim/admin/newsletter_recipients.rb
+++ b/decidim-admin/app/queries/decidim/admin/newsletter_recipients.rb
@@ -129,7 +129,7 @@ def private_member_ids
         return unless @form.send_to_private_members
         return [] if private_spaces.blank?
 
-        Decidim::ParticipatorySpacePrivateUser.private_user_ids_for_participatory_spaces(private_spaces)
+        Decidim::ParticipatorySpace::Member.member_ids_for_participatory_spaces(private_spaces)
       end
     end
   end
diff --git a/decidim-admin/app/views/decidim/admin/participatory_space_private_users/_form.html.erb b/decidim-admin/app/views/decidim/admin/members/_form.html.erb
similarity index 100%
rename from decidim-admin/app/views/decidim/admin/participatory_space_private_users/_form.html.erb
rename to decidim-admin/app/views/decidim/admin/members/_form.html.erb
diff --git a/decidim-admin/app/views/decidim/admin/participatory_space_private_users/edit.html.erb b/decidim-admin/app/views/decidim/admin/members/edit.html.erb
similarity index 60%
rename from decidim-admin/app/views/decidim/admin/participatory_space_private_users/edit.html.erb
rename to decidim-admin/app/views/decidim/admin/members/edit.html.erb
index c3bfd1492cf1f..494738f61b422 100644
--- a/decidim-admin/app/views/decidim/admin/participatory_space_private_users/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/members/edit.html.erb
@@ -7,8 +7,8 @@
 
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">
-    <%= decidim_form_for(@form, url: participatory_space_private_user_path(current_participatory_space, @private_user), html: { class: "form-defaults form edit_participatory_space_private_user" }) do |f| %>
-      <%= render partial: "decidim/admin/participatory_space_private_users/form", object: f %>
+    <%= decidim_form_for(@form, url: member_path(current_participatory_space, @member), html: { class: "form-defaults form edit_member" }) do |f| %>
+      <%= render partial: "decidim/admin/members/form", object: f %>
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">
           <%= f.submit t(".update"), class: "button button__sm button__secondary" %>
diff --git a/decidim-admin/app/views/decidim/admin/participatory_space_private_users/index.html.erb b/decidim-admin/app/views/decidim/admin/members/index.html.erb
similarity index 55%
rename from decidim-admin/app/views/decidim/admin/participatory_space_private_users/index.html.erb
rename to decidim-admin/app/views/decidim/admin/members/index.html.erb
index ee68d751bde8b..bfb33b5d93305 100644
--- a/decidim-admin/app/views/decidim/admin/participatory_space_private_users/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/members/index.html.erb
@@ -1,18 +1,18 @@
 <% add_decidim_page_title(t(".title")) %>
-<div class="card" id="private_users">
+<div class="card" id="members">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
       <%= t(".title") %>
-      <% if allowed_to? :create, :space_private_user %>
-        <%= link_to t(".publish_all"), publish_all_participatory_space_private_users_path(current_participatory_space), class: "button button__sm button__transparent-secondary publish-all", method: :post %>
-        <%= link_to t(".unpublish_all"), unpublish_all_participatory_space_private_users_path(current_participatory_space), class: "button button__sm button__transparent-secondary unpublish-all", method: :post %>
-        <%= link_to t(".import_via_csv"), new_participatory_space_private_users_csv_imports_path, class: "button button__sm button__transparent-secondary import" %>
-        <%= link_to t("actions.participatory_space_private_user.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
+      <% if allowed_to? :create, :space_member %>
+        <%= link_to t(".publish_all"), publish_all_members_path(current_participatory_space), class: "button button__sm button__transparent-secondary publish-all", method: :post %>
+        <%= link_to t(".unpublish_all"), unpublish_all_members_path(current_participatory_space), class: "button button__sm button__transparent-secondary unpublish-all", method: :post %>
+        <%= link_to t(".import_via_csv"), new_members_csv_imports_path, class: "button button__sm button__transparent-secondary import" %>
+        <%= link_to t("actions.member.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
       <% end %>
     </h1>
   </div>
-  <%= admin_filter_selector(:participatory_space_private_users) %>
-  <% if participatory_space_private_users.any? %>
+  <%= admin_filter_selector(:members) %>
+  <% if members.any? %>
     <div class="table-stacked mt-4">
       <table class="table-list">
         <thead>
@@ -36,39 +36,39 @@
           </tr>
         </thead>
         <tbody>
-          <% participatory_space_private_users.each do |private_user| %>
+          <% members.each do |member| %>
             <tr>
               <td data-label="<%= t("models.user.fields.name", scope: "decidim.admin") %>">
-                <%= private_user.user.name %>
+                <%= member.user.name %>
               </td>
               <td data-label="<%= t("models.user.fields.email", scope: "decidim.admin") %>">
-                <%= private_user.user.email %>
+                <%= member.user.email %>
               </td>
               <td data-label="<%= t("models.user.fields.published", scope: "decidim.admin") %>">
-                <% if private_user.published %>
+                <% if member.published %>
                   <%= icon "check-line", class: "text-success" %>
                 <% end %>
               </td>
               <td data-label="<%= t("models.user.fields.invitation_sent_at", scope: "decidim.admin") %>">
-                <% if private_user.user.invitation_sent_at %>
-                  <%= l private_user.user.invitation_sent_at, format: :short %>
+                <% if member.user.invitation_sent_at %>
+                  <%= l member.user.invitation_sent_at, format: :short %>
                 <% end %>
               </td>
               <td data-label="<%= t("models.user.fields.invitation_accepted_at", scope: "decidim.admin") %>">
-                <% if private_user.user.invitation_accepted_at %>
-                  <%= l private_user.user.invitation_accepted_at, format: :short %>
+                <% if member.user.invitation_accepted_at %>
+                  <%= l member.user.invitation_accepted_at, format: :short %>
                 <% end %>
               </td>
               <td data-label="<%= t("decidim.admin.actions.actions") %>" class="table-list__actions">
-                <button type="button" data-controller="dropdown" data-target="actions-private-user-<%= private_user.id %>" aria-label="<%= t("decidim.admin.actions.actions_label", resource: private_user.user.name) %>">
+                <button type="button" data-controller="dropdown" data-target="actions-private-user-<%= member.id %>" aria-label="<%= t("decidim.admin.actions.actions_label", resource: member.user.name) %>">
                   <%= icon "more-fill", class: "text-secondary" %>
                 </button>
 
                 <div class="inline-block relative">
-                  <ul id="actions-private-user-<%= private_user.id %>" class="dropdown dropdown__action" aria-hidden="true">
-                    <% if allowed_to?(:edit, :space_private_user, private_user: private_user) %>
+                  <ul id="actions-private-user-<%= member.id %>" class="dropdown dropdown__action" aria-hidden="true">
+                    <% if allowed_to?(:edit, :space_member, member: member) %>
                       <li class="dropdown__item">
-                        <%= link_to edit_participatory_space_private_user_path(current_participatory_space, private_user), class: "dropdown__button" do %>
+                        <%= link_to edit_member_path(current_participatory_space, member), class: "dropdown__button" do %>
                           <%= icon "pencil-line" %>
                           <%= t("actions.edit", scope: "decidim.admin") %>
                         <% end %>
@@ -77,9 +77,9 @@
                       <hr>
                     <% end %>
 
-                    <% if allowed_to?(:invite, :space_private_user, private_user: private_user) && private_user.user.invited_to_sign_up? %>
+                    <% if allowed_to?(:invite, :space_member, member: member) && member.user.invited_to_sign_up? %>
                       <li class="dropdown__item">
-                        <%= link_to resend_invitation_participatory_space_private_user_path(current_participatory_space, private_user), method: :post, class: "dropdown__button" do %>
+                        <%= link_to resend_invitation_member_path(current_participatory_space, member), method: :post, class: "dropdown__button" do %>
                           <%= icon "refresh-line" %>
                           <%= t("actions.resend_invitation", scope: "decidim.admin") %>
                         <% end %>
@@ -88,9 +88,9 @@
                       <hr>
                     <% end %>
 
-                    <% if allowed_to?(:destroy, :space_private_user, private_user: private_user) %>
+                    <% if allowed_to?(:destroy, :space_member, member: member) %>
                       <li class="dropdown__item">
-                        <%= link_to participatory_space_private_user_path(current_participatory_space, private_user), method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") }, class: "dropdown__button" do %>
+                        <%= link_to member_path(current_participatory_space, member), method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") }, class: "dropdown__button" do %>
                           <%= icon "delete-bin-line" %>
                           <%= t("actions.destroy", scope: "decidim.admin") %>
                         <% end %>
@@ -104,6 +104,6 @@
         </tbody>
       </table>
     </div>
-    <%= decidim_paginate participatory_space_private_users %>
+    <%= decidim_paginate members %>
   <% end %>
 </div>
diff --git a/decidim-admin/app/views/decidim/admin/participatory_space_private_users/new.html.erb b/decidim-admin/app/views/decidim/admin/members/new.html.erb
similarity index 61%
rename from decidim-admin/app/views/decidim/admin/participatory_space_private_users/new.html.erb
rename to decidim-admin/app/views/decidim/admin/members/new.html.erb
index 703a2ad0890fe..aebdfd6551717 100644
--- a/decidim-admin/app/views/decidim/admin/participatory_space_private_users/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/members/new.html.erb
@@ -7,8 +7,8 @@
 
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">
-    <%= decidim_form_for(@form, url: participatory_space_private_users_path(current_participatory_space), html: { class: "form-defaults form new_participatory_space_private_user" }) do |f| %>
-      <%= render partial: "decidim/admin/participatory_space_private_users/form", object: f %>
+    <%= decidim_form_for(@form, url: members_path(current_participatory_space), html: { class: "form-defaults form new_member" }) do |f| %>
+      <%= render partial: "decidim/admin/members/form", object: f %>
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">
           <%= f.submit t(".create"), class: "button button__sm button__secondary" %>
diff --git a/decidim-admin/app/views/decidim/admin/participatory_space_private_users_csv_imports/new.html.erb b/decidim-admin/app/views/decidim/admin/members_csv_imports/new.html.erb
similarity index 86%
rename from decidim-admin/app/views/decidim/admin/participatory_space_private_users_csv_imports/new.html.erb
rename to decidim-admin/app/views/decidim/admin/members_csv_imports/new.html.erb
index 6aa33b05e379e..959c24ebedeea 100644
--- a/decidim-admin/app/views/decidim/admin/participatory_space_private_users_csv_imports/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/members_csv_imports/new.html.erb
@@ -18,7 +18,7 @@
     <% if @count != 0 %>
       <p><%= t(".destroy.explanation", count: @count) %></p>
       <%= link_to t(".destroy.button"),
-                  destroy_all_participatory_space_private_users_csv_imports_path,
+                  destroy_all_members_csv_imports_path,
                   method: :delete,
                   class: "button button__sm button__secondary alert",
                   data: { confirm: t(".destroy.confirm") } %>
@@ -35,7 +35,7 @@
     </h2>
   </div>
   <div class="card-section p-4">
-    <%= decidim_form_for(@form, url: participatory_space_private_users_csv_imports_path, html: { class: "form form-defaults" }) do |form| %>
+    <%= decidim_form_for(@form, url: members_csv_imports_path, html: { class: "form form-defaults" }) do |form| %>
       <div>
         <p><%= t(".explanation") %></p>
         <p><%= t(".example_file") %></p>
diff --git a/decidim-admin/config/locales/ar.yml b/decidim-admin/config/locales/ar.yml
index 78e1e1258300e..0a35f31dd02b2 100644
--- a/decidim-admin/config/locales/ar.yml
+++ b/decidim-admin/config/locales/ar.yml
@@ -89,11 +89,6 @@ ar:
         welcome_notification_body: محتوى إشعار الترحيب
         welcome_notification_subject: موضوع إشعار الترحيب
         youtube_handler: مُعرّف حساب يوتيوب
-      participatory_space_private_user:
-        email: البريد الإلكتروني
-        name: الإسم
-      participatory_space_private_user_csv_import:
-        file: ملف
       scope:
         code: الشفرة
         name: الاسم
@@ -135,10 +130,6 @@ ar:
           attributes:
             official_img_footer:
               allowed_file_content_types: ملف صورة غير صالح
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: خطأ في ملفّ الاستيراد، يرجى قراءة التعليمات بعناية والتأكد من أن ترميز الملف هو UTF-8.
         user_group_csv_verification:
           attributes:
             file:
@@ -342,17 +333,6 @@ ar:
           values:
             'false': Officialized
             'true': غير رسمي
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: تم قبول الدعوة
-            values:
-              'false': لم يتم القبول
-              'true': تم قبوله
-          user_invitation_sent_at_not_null:
-            label: تم إرسال الدعوة
-            values:
-              'false': لم يتم الارسال
-              'true': تم الإرسال
         private_space_eq:
           label: خاص
           values:
@@ -444,6 +424,10 @@ ar:
             explanation: يمكن ترقية المشاركين المدارين إلى مشاركين عاديين. يعني ذلك أنه سيتم دعوتهم إلى التطبيق ولن تتمكن من إدارته مرة أخرى. سيتلقى المشارك المدعو رسالة بريد إلكتروني لقبول دعوتك.
             new_managed_user_promotion: ترويج مشارك جديد مُدار
             promote: تروج \ يشجع \ يعزز \ ينمى \ يطور
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: قم بتحميل ملف CSV الخاص بك
       menu:
         admin_log: سجل نشاط المسؤول
         admins: المدراء
@@ -498,8 +482,6 @@ ar:
             sent_to: أُرسِلت إلى
             subject: موضوع
           name: النشرة الإخبارية
-        participatory_space_private_user:
-          name: المشاركة الفضاء المشارك الخاص
         scope:
           fields:
             name: اسم
@@ -657,28 +639,6 @@ ar:
         update:
           error: حدثت مشكلة أثناء تحديث هذه المؤسسة.
           success: تم تحديث المنظمة بنجاح.
-      participatory_space_private_users:
-        create:
-          error: حدثت مشكلة أثناء إضافة مشارك خاص لهذه المساحة التشاركية.
-          success: المشاركة الفضاء الفضاء المشترك وصول خلق بنجاح.
-        destroy:
-          error: حدثت مشكلة في حذف مشارك خاص لهذه المساحة التشاركية.
-          success: المشاركة الفضاء الفضاء وصول المشاركين دمرت بنجاح.
-        index:
-          title: المشاركة الفضاء المشارك الخاص
-        new:
-          create: إنشاء
-          title: مشارك جديد الفضاء الخاص المشارك.
-      participatory_space_private_users_csv_imports:
-        new:
-          csv_upload:
-            title: قم بتحميل ملف CSV الخاص بك
-          destroy:
-            button: حذف جميع المشاركين الخاصين
-            empty: ليس لديك أي مشاركين خاصين.
-            explanation: لديك %{count} مشاركين خاصين.
-            title: حذف جميع المشاركين الخاصين
-          upload: حمّل
       reminders:
         new:
           submit: إرسال
diff --git a/decidim-admin/config/locales/bg.yml b/decidim-admin/config/locales/bg.yml
index 7a99b1d115ed6..f7fe5d100f773 100644
--- a/decidim-admin/config/locales/bg.yml
+++ b/decidim-admin/config/locales/bg.yml
@@ -89,9 +89,6 @@ bg:
         welcome_notification_body: Тяло на приветствието
         welcome_notification_subject: Тема на приветствието
         youtube_handler: Манипулатор на YouTube
-      participatory_space_private_user:
-        email: Имейл
-        name: Име
       scope:
         code: Код
         name: Име
@@ -133,10 +130,6 @@ bg:
           attributes:
             official_img_footer:
               allowed_file_content_types: Невалиден файл на изображението
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Неправилен файл за импортиране, моля, прочетете внимателно инструкциите и се уверете, че файлът е UTF-8 кодиран.
         user_group_csv_verification:
           attributes:
             file:
@@ -174,8 +167,6 @@ bg:
         import: Импортиране
         newsletter:
           new: Нов бюлетин
-        participatory_space_private_user:
-          new: Нов частен потребител на пространство за участие
         per_page: За страница
         send_me_a_test_email: Изпратете ми тестов e-mail
         share: Сподели
@@ -394,17 +385,6 @@ bg:
           values:
             'false': Официализирано
             'true': Неофициализирано
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Поканата е приета
-            values:
-              'false': Не се приема
-              'true': Прието
-          user_invitation_sent_at_not_null:
-            label: Поканата е изпратена
-            values:
-              'false': Не е изпратено
-              'true': Изпратено
         private_space_eq:
           label: Частни
           values:
@@ -526,6 +506,10 @@ bg:
             explanation: Управляваните участници могат да бъдат повишавани до стандартни участници. Това означава, че ще бъдат поканени в приложението и повече няма да можете да ги управлявате. Поканеният участник ще получи имейл, за да приеме поканата Ви.
             new_managed_user_promotion: Ново повишение на управляван участник
             promote: Повишаване
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: Качете своя CSV файл
       menu:
         admin_log: Регистър на дейността на администраторите
         admins: Администратори
@@ -588,8 +572,6 @@ bg:
             sent_to: Изпратено до
             subject: Относно
           name: Бюлетин
-        participatory_space_private_user:
-          name: Пространство за участие на частен участник
         scope:
           fields:
             name: Име
@@ -784,39 +766,6 @@ bg:
         form:
           add: Добави в листа с позволени
           title: Лист с позволени външни домейни
-      participatory_space_private_users:
-        create:
-          error: Възникна проблем при добавянето на частен участник за това пространство за участие.
-          success: Достъпът на частния участник до пространството за участие беше създаден успешно.
-        destroy:
-          error: Възникна проблем при изтриването на частен участник за това пространство за участие.
-          success: Достъпът на частния участник до пространството за участие беше премахнат успешно.
-        index:
-          import_via_csv: Импортиране чрез CSV
-          title: Пространство за участие на частен участник
-        new:
-          create: Създаване
-          title: Ново пространство за участие на частен участник.
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: Възникна проблем при четенето на CSV файла. Моля, уверете се, че сте следвали инструкциите.
-          success: Файлът във формат CSV беше качен успешно; изпращаме имейл с покана на участниците. Това може да отнеме известно време.
-        new:
-          csv_upload:
-            title: Качете своя файл във формат CSV
-          destroy:
-            button: Изтрийте всички частни участници
-            confirm: Сигурни ли сте, че искате да изтриете всички частни участници? Това действие е необратимо, няма да можете да ги възстановите.
-            empty: Нямате частни участници.
-            explanation: Имате %{count} частни участници.
-            title: Изтрийте частни участници
-          example_file: 'Примерен файл:'
-          explanation: Качете своя файл във формат CSV. Трябва да съдържа две колони — електронната поща в първата колона и името в последната колона от файла (електронна поща, име) — за потребителите, които искате да добавите в пространството за участие, без заглавки.
-          explanation_example: |
-            john.doe@example.org%{csv_col_sep}John Doe
-            jane.doe@example.org%{csv_col_sep}Jane Doe
-          title: Импортирайте частни участници чрез CSV
-          upload: Качване
       reminders:
         create:
           error: Възникна проблем при създаването на напомняния.
diff --git a/decidim-admin/config/locales/bs-BA.yml b/decidim-admin/config/locales/bs-BA.yml
index cdba8743d5763..83991e50e9b21 100644
--- a/decidim-admin/config/locales/bs-BA.yml
+++ b/decidim-admin/config/locales/bs-BA.yml
@@ -324,8 +324,6 @@ bs:
             sent_to: Poslato
             subject: Naslov
           name: Bilten
-        participatory_space_private_user:
-          name: Privatni učesnik prostora za diskusiju
         scope:
           fields:
             name: Ime
diff --git a/decidim-admin/config/locales/ca-IT.yml b/decidim-admin/config/locales/ca-IT.yml
index 214daf8c77306..8a6f091817dda 100644
--- a/decidim-admin/config/locales/ca-IT.yml
+++ b/decidim-admin/config/locales/ca-IT.yml
@@ -33,6 +33,11 @@ ca-IT:
       help_section:
         content: Contingut
       id: ID
+      member:
+        email: Correu electrònic
+        name: Nom
+      member_csv_import:
+        file: Arxiu
       newsletter:
         body: Cos
         send_to_all_users: Envia a totes les participants
@@ -91,11 +96,6 @@ ca-IT:
         welcome_notification_body: Cos de la notificació de benvinguda
         welcome_notification_subject: Assumpte de la notificació de benvinguda
         youtube_handler: Nom d'usuària de YouTube
-      participatory_space_private_user:
-        email: Correu electrònic
-        name: Nom
-      participatory_space_private_user_csv_import:
-        file: Arxiu
       scope:
         code: Codi
         name: Nom
@@ -125,10 +125,17 @@ ca-IT:
         show_in_footer: Mostra al peu de pàgina
         title: Títol
         weight: Ordre de posició
+      taxonomy:
+        item_name: Nom de l'element
+        parent_id: Taxonomia mare
       user_group_csv_verification:
         file: Fitxer
     errors:
       models:
+        member_csv_import:
+          attributes:
+            file:
+              malformed: Arxiu d'importació mal formatat, si us plau, llegeix les instruccions curosament i assegura't que l'arxiu està codificat en UTF-8.
         newsletter:
           attributes:
             base:
@@ -137,10 +144,6 @@ ca-IT:
           attributes:
             official_img_footer:
               allowed_file_content_types: Fitxer d'imatge no vàlid
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Arxiu d'importació mal formatat, si us plau, llegeix les instruccions curosament i assegura't que l'arxiu està codificat en UTF-8.
         user_group_csv_verification:
           attributes:
             file:
@@ -188,12 +191,12 @@ ca-IT:
         export: Exporta
         export-selection: Exportar selecció
         import: Importar
+        member:
+          new: Nova membre
         menu_hidden: Amaga del menú
         moderate: Gestionar les moderacions
         newsletter:
           new: Nou butlletí
-        participatory_space_private_user:
-          new: Nou usuari privat de l'espai participatiu
         per_page: Per pàgina
         permissions: Gestionar els permisos
         restore: Restaurar
@@ -415,6 +418,17 @@ ca-IT:
           values:
             'false': 'No'
             'true': 'Sí'
+        members:
+          user_invitation_accepted_at_not_null:
+            label: Invitació acceptada
+            values:
+              'false': No acceptada
+              'true': Acceptada
+          user_invitation_sent_at_not_null:
+            label: Invitació enviada
+            values:
+              'false': No enviada
+              'true': Enviada
         moderated_users:
           reports_reason_eq:
             label: Motiu de l'informe
@@ -430,17 +444,6 @@ ca-IT:
           values:
             'false': Oficialitzada
             'true': No oficialitzada
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Invitació acceptada
-            values:
-              'false': No acceptada
-              'true': Acceptada
-          user_invitation_sent_at_not_null:
-            label: S'ha enviat la invitació
-            values:
-              'false': No enviada
-              'true': Enviada
         private_space_eq:
           label: Privat
           values:
@@ -573,6 +576,53 @@ ca-IT:
             explanation: Les participants gestionades es poden promocionar a participants estàndard. Significa que seran convidades al sistema i no podràs tornar a administrar-les. La participant convidada rebrà un correu electrònic per acceptar la vostra invitació.
             new_managed_user_promotion: Nova promoció de participant
             promote: Promocionar
+      members:
+        create:
+          error: S'ha produït un error en actualitzar una administradora per a aquest procés participatiu.
+          success: Accés com a membre creat correctament.
+        destroy:
+          error: S'ha produït un error en eliminar una participant participada d'aquest espai participació.
+          success: Accés com a membre eliminat correctament.
+        edit:
+          title: Editar membre
+          update: Actualizar
+        index:
+          import_via_csv: Importar des de CSV
+          publish_all: Publicar totes
+          title: Membre
+          unpublish_all: Despublicar totes
+        new:
+          create: Crear
+          title: Nova membre
+        publish_all:
+          error: S'ha produït un error en publicar totes les membres d'aquest espai de participació.
+          success: S'han publicat correctament totes les membres d'aquest espai de participació
+        unpublish_all:
+          error: S'ha produït un error en despublicar totes les membres d'aquest espai de participació.
+          success: S'han despublicat correctament totes les membres d'aquest espai de participació
+        update:
+          error: S'ha produït un error en actualitzar la membre per a aquest espai de participació.
+          success: Membre actualitzada correctament
+      members_csv_imports:
+        create:
+          invalid: S'ha produït un error llegint el fitxer CSV. Si us plau, assegura't d'haver seguit les instruccions.
+          success: L'arxiu CSV s'ha carregat amb èxit, estem enviant un correu d'invitació a les participants. Això pot trigar una estona.
+        new:
+          csv_upload:
+            title: Puja el fitxer CSV
+          destroy:
+            button: Esborrar totes les membres
+            confirm: Segur que vols esborrar totes les membres? Aquesta acció no es pot desfer, no podràs recuperar-les.
+            empty: No hi ha membres.
+            explanation: Hi ha %{count} membres.
+            title: Elimina membres
+          example_file: 'Fitxer d''exemple:'
+          explanation: 'Carrega el teu arxiu CSV. Ha de tenir dues columnes amb l''adreça de correu electrònic a la primera columna i el nom a la segona de les participants que vulguis afegir a l''espai de participació, sense capçaleres. Evita emprar caràcters invàlids com `<>?%&^*#@()[]=+:;"{}\|` al nom d''usuària.'
+          explanation_example: |
+            john.doe@example.org%{csv_col_sep}John Doe
+            jane.doe@example.org%{csv_col_sep}Jane Doe
+          title: Importar membres via CSV
+          upload: Carregar
       menu:
         admin_log: Registre d'activitat d'administració
         admins: Administradores
@@ -631,6 +681,8 @@ ca-IT:
             reason: Raó
             started_at: Va començar el
             user: Participant
+        member:
+          name: Membre
         newsletter:
           fields:
             created_at: Data de creació
@@ -639,8 +691,6 @@ ca-IT:
             sent_to: Enviat a
             subject: Assumpte
           name: Butlletí
-        participatory_space_private_user:
-          name: Participant d'espai de participació privat
         scope:
           fields:
             name: Nom
@@ -915,53 +965,6 @@ ca-IT:
         form:
           add: Afegeix a la llista de permesos
           title: Llistat de dominis externs permesos
-      participatory_space_private_users:
-        create:
-          error: S'ha produït un error en afegir una participant privada a aquest espai de participació.
-          success: L'accés de la participant a l'espai de participació privat s'ha creat correctament.
-        destroy:
-          error: S'ha produït un error en eliminar una participant participada d'aquest espai participatiu.
-          success: L'accés de la participant a l'espai de participació privat s'ha eliminat correctament.
-        edit:
-          title: Editar participant privada de l'espai de participació.
-          update: Actualitzar
-        index:
-          import_via_csv: Importar des de CSV
-          publish_all: Publicar tot
-          title: Participant de l'espai participatiu privat
-          unpublish_all: Despublicar tot
-        new:
-          create: Crear
-          title: Nova participant de l'espai privat.
-        publish_all:
-          error: S'ha produït un error en publicar totes les participants privades d'aquest espai de participació.
-          success: S'han publicat correctament totes les participants privades d'aquest espai de participació
-        unpublish_all:
-          error: S'ha produït un error en despublicar totes les participants privades d'aquest espai de participació.
-          success: S'han despublicat correctament totes les participants privades d'aquest espai de participació
-        update:
-          error: S'ha produït un error en actualitzar una participant participada d'aquest espai de participació.
-          success: S'ha actualitzat correctament l'espai de participació privat
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: S'ha produït un error llegint el fitxer CSV. Si us plau, assegura't d'haver seguit les instruccions.
-          success: L'arxiu CSV s'ha carregat amb èxit, estem enviant un correu d'invitació a les participants. Això pot trigar una estona.
-        new:
-          csv_upload:
-            title: Puja el teu fitxer CSV
-          destroy:
-            button: Esborrar totes les participants privades
-            confirm: Segur que vols esborrar totes les participants privades? Aquesta acció no es pot desfer, no podràs recuperar-les.
-            empty: No hi ha participants privades.
-            explanation: Hi ha %{count} participant/s privada/ades.
-            title: Esborrar les participants privades
-          example_file: 'Fitxer d''exemple:'
-          explanation: 'Carrega el teu arxiu CSV. Ha de tenir dues columnes amb l''adreça de correu electrònic a la primera columna i el nom a la segona de les participants que vulguis afegir a l''espai de participació, sense capçaleres. Evita emprar caràcters invàlids com `<>?%&^*#@()[]=+:;"{}\|` al nom d''usuària.'
-          explanation_example: |
-            john.doe@example.org%{csv_col_sep}John Doe
-            jane.doe@example.org%{csv_col_sep}Jane Doe
-          title: Importar participant privades via CSV
-          upload: Carrega
       reminders:
         create:
           error: Hi ha hagut un problema en crear els recordatoris.
diff --git a/decidim-admin/config/locales/ca.yml b/decidim-admin/config/locales/ca.yml
index 660ecbdc5bfcd..911639283ebbc 100644
--- a/decidim-admin/config/locales/ca.yml
+++ b/decidim-admin/config/locales/ca.yml
@@ -33,6 +33,11 @@ ca:
       help_section:
         content: Contingut
       id: ID
+      member:
+        email: Correu electrònic
+        name: Nom
+      member_csv_import:
+        file: Arxiu
       newsletter:
         body: Cos
         send_to_all_users: Envia a totes les participants
@@ -91,11 +96,6 @@ ca:
         welcome_notification_body: Cos de la notificació de benvinguda
         welcome_notification_subject: Assumpte de la notificació de benvinguda
         youtube_handler: Nom d'usuària de YouTube
-      participatory_space_private_user:
-        email: Correu electrònic
-        name: Nom
-      participatory_space_private_user_csv_import:
-        file: Arxiu
       scope:
         code: Codi
         name: Nom
@@ -125,10 +125,17 @@ ca:
         show_in_footer: Mostra al peu de pàgina
         title: Títol
         weight: Ordre de posició
+      taxonomy:
+        item_name: Nom de l'element
+        parent_id: Taxonomia mare
       user_group_csv_verification:
         file: Fitxer
     errors:
       models:
+        member_csv_import:
+          attributes:
+            file:
+              malformed: Arxiu d'importació mal formatat, si us plau, llegeix les instruccions curosament i assegura't que l'arxiu està codificat en UTF-8.
         newsletter:
           attributes:
             base:
@@ -137,10 +144,6 @@ ca:
           attributes:
             official_img_footer:
               allowed_file_content_types: Fitxer d'imatge no vàlid
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Arxiu d'importació mal formatat, si us plau, llegeix les instruccions curosament i assegura't que l'arxiu està codificat en UTF-8.
         user_group_csv_verification:
           attributes:
             file:
@@ -188,12 +191,12 @@ ca:
         export: Exporta
         export-selection: Exportar selecció
         import: Importar
+        member:
+          new: Nova membre
         menu_hidden: Amaga del menú
         moderate: Gestionar les moderacions
         newsletter:
           new: Nou butlletí
-        participatory_space_private_user:
-          new: Nou usuari privat de l'espai participatiu
         per_page: Per pàgina
         permissions: Gestionar els permisos
         restore: Restaurar
@@ -415,6 +418,17 @@ ca:
           values:
             'false': 'No'
             'true': 'Sí'
+        members:
+          user_invitation_accepted_at_not_null:
+            label: Invitació acceptada
+            values:
+              'false': No acceptada
+              'true': Acceptada
+          user_invitation_sent_at_not_null:
+            label: Invitació enviada
+            values:
+              'false': No enviada
+              'true': Enviada
         moderated_users:
           reports_reason_eq:
             label: Motiu de l'informe
@@ -430,17 +444,6 @@ ca:
           values:
             'false': Oficialitzada
             'true': No oficialitzada
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Invitació acceptada
-            values:
-              'false': No acceptada
-              'true': Acceptada
-          user_invitation_sent_at_not_null:
-            label: S'ha enviat la invitació
-            values:
-              'false': No enviada
-              'true': Enviada
         private_space_eq:
           label: Privat
           values:
@@ -573,6 +576,53 @@ ca:
             explanation: Les participants gestionades es poden promocionar a participants estàndard. Significa que seran convidades al sistema i no podràs tornar a administrar-les. La participant convidada rebrà un correu electrònic per acceptar la vostra invitació.
             new_managed_user_promotion: Nova promoció de participant
             promote: Promocionar
+      members:
+        create:
+          error: S'ha produït un error en actualitzar una administradora per a aquest procés participatiu.
+          success: Accés com a membre creat correctament.
+        destroy:
+          error: S'ha produït un error en eliminar una participant participada d'aquest espai participació.
+          success: Accés com a membre eliminat correctament.
+        edit:
+          title: Editar membre
+          update: Actualizar
+        index:
+          import_via_csv: Importar des de CSV
+          publish_all: Publicar totes
+          title: Membre
+          unpublish_all: Despublicar totes
+        new:
+          create: Crear
+          title: Nova membre
+        publish_all:
+          error: S'ha produït un error en publicar totes les membres d'aquest espai de participació.
+          success: S'han publicat correctament totes les membres d'aquest espai de participació
+        unpublish_all:
+          error: S'ha produït un error en despublicar totes les membres d'aquest espai de participació.
+          success: S'han despublicat correctament totes les membres d'aquest espai de participació
+        update:
+          error: S'ha produït un error en actualitzar la membre per a aquest espai de participació.
+          success: Membre actualitzada correctament
+      members_csv_imports:
+        create:
+          invalid: S'ha produït un error llegint el fitxer CSV. Si us plau, assegura't d'haver seguit les instruccions.
+          success: L'arxiu CSV s'ha carregat amb èxit, estem enviant un correu d'invitació a les participants. Això pot trigar una estona.
+        new:
+          csv_upload:
+            title: Puja el fitxer CSV
+          destroy:
+            button: Esborrar totes les membres
+            confirm: Segur que vols esborrar totes les membres? Aquesta acció no es pot desfer, no podràs recuperar-les.
+            empty: No hi ha membres.
+            explanation: Hi ha %{count} membres.
+            title: Elimina membres
+          example_file: 'Fitxer d''exemple:'
+          explanation: 'Carrega el teu arxiu CSV. Ha de tenir dues columnes amb l''adreça de correu electrònic a la primera columna i el nom a la segona de les participants que vulguis afegir a l''espai de participació, sense capçaleres. Evita emprar caràcters invàlids com `<>?%&^*#@()[]=+:;"{}\|` al nom d''usuària.'
+          explanation_example: |
+            john.doe@example.org%{csv_col_sep}John Doe
+            jane.doe@example.org%{csv_col_sep}Jane Doe
+          title: Importar membres via CSV
+          upload: Carregar
       menu:
         admin_log: Registre d'activitat d'administració
         admins: Administradores
@@ -631,6 +681,8 @@ ca:
             reason: Raó
             started_at: Va començar el
             user: Participant
+        member:
+          name: Membre
         newsletter:
           fields:
             created_at: Data de creació
@@ -639,8 +691,6 @@ ca:
             sent_to: Enviat a
             subject: Assumpte
           name: Butlletí
-        participatory_space_private_user:
-          name: Participant d'espai de participació privat
         scope:
           fields:
             name: Nom
@@ -915,53 +965,6 @@ ca:
         form:
           add: Afegeix a la llista de permesos
           title: Llistat de dominis externs permesos
-      participatory_space_private_users:
-        create:
-          error: S'ha produït un error en afegir una participant privada a aquest espai de participació.
-          success: L'accés de la participant a l'espai de participació privat s'ha creat correctament.
-        destroy:
-          error: S'ha produït un error en eliminar una participant participada d'aquest espai participatiu.
-          success: L'accés de la participant a l'espai de participació privat s'ha eliminat correctament.
-        edit:
-          title: Editar participant privada de l'espai de participació.
-          update: Actualitzar
-        index:
-          import_via_csv: Importar des de CSV
-          publish_all: Publicar tot
-          title: Participant de l'espai participatiu privat
-          unpublish_all: Despublicar tot
-        new:
-          create: Crear
-          title: Nova participant de l'espai privat.
-        publish_all:
-          error: S'ha produït un error en publicar totes les participants privades d'aquest espai de participació.
-          success: S'han publicat correctament totes les participants privades d'aquest espai de participació
-        unpublish_all:
-          error: S'ha produït un error en despublicar totes les participants privades d'aquest espai de participació.
-          success: S'han despublicat correctament totes les participants privades d'aquest espai de participació
-        update:
-          error: S'ha produït un error en actualitzar una participant participada d'aquest espai de participació.
-          success: S'ha actualitzat correctament l'espai de participació privat
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: S'ha produït un error llegint el fitxer CSV. Si us plau, assegura't d'haver seguit les instruccions.
-          success: L'arxiu CSV s'ha carregat amb èxit, estem enviant un correu d'invitació a les participants. Això pot trigar una estona.
-        new:
-          csv_upload:
-            title: Puja el teu fitxer CSV
-          destroy:
-            button: Esborrar totes les participants privades
-            confirm: Segur que vols esborrar totes les participants privades? Aquesta acció no es pot desfer, no podràs recuperar-les.
-            empty: No hi ha participants privades.
-            explanation: Hi ha %{count} participant/s privada/ades.
-            title: Esborrar les participants privades
-          example_file: 'Fitxer d''exemple:'
-          explanation: 'Carrega el teu arxiu CSV. Ha de tenir dues columnes amb l''adreça de correu electrònic a la primera columna i el nom a la segona de les participants que vulguis afegir a l''espai de participació, sense capçaleres. Evita emprar caràcters invàlids com `<>?%&^*#@()[]=+:;"{}\|` al nom d''usuària.'
-          explanation_example: |
-            john.doe@example.org%{csv_col_sep}John Doe
-            jane.doe@example.org%{csv_col_sep}Jane Doe
-          title: Importar participant privades via CSV
-          upload: Carrega
       reminders:
         create:
           error: Hi ha hagut un problema en crear els recordatoris.
diff --git a/decidim-admin/config/locales/cs.yml b/decidim-admin/config/locales/cs.yml
index a5966825647b8..42b53cba8a5db 100644
--- a/decidim-admin/config/locales/cs.yml
+++ b/decidim-admin/config/locales/cs.yml
@@ -33,8 +33,14 @@ cs:
       help_section:
         content: Obsah
       id: ID
+      member:
+        email: E-mail
+        name: Název
+      member_csv_import:
+        file: Soubor
       newsletter:
         body: Tělo
+        send_to_all_users: Poslat všem účastníkům
         send_to_followers: Odeslat sledujícím
         send_to_participants: Odeslat účastníkům
         subject: Předmět
@@ -90,11 +96,6 @@ cs:
         welcome_notification_body: Tělo uvítacího oznámení
         welcome_notification_subject: Předmět uvítacího oznámení
         youtube_handler: YouTube handler
-      participatory_space_private_user:
-        email: E-mail
-        name: Název
-      participatory_space_private_user_csv_import:
-        file: Soubor
       scope:
         code: Kód
         name: Název
@@ -124,10 +125,17 @@ cs:
         show_in_footer: Zobrazit v zápatí
         title: Titul
         weight: Pozice v řazení
+      taxonomy:
+        item_name: Název položky
+        parent_id: Nadřazený
       user_group_csv_verification:
         file: Soubor
     errors:
       models:
+        member_csv_import:
+          attributes:
+            file:
+              malformed: Chybný importní soubor, přečtěte si pozorně pokyny a ujistěte se, že soubor je kódovaný UTF-8.
         newsletter:
           attributes:
             base:
@@ -136,10 +144,6 @@ cs:
           attributes:
             official_img_footer:
               allowed_file_content_types: Neplatný soubor s obrázkem
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Chybný importní soubor, přečtěte si pozorně pokyny a ujistěte se, že soubor je kódovaný UTF-8.
         user_group_csv_verification:
           attributes:
             file:
@@ -187,12 +191,12 @@ cs:
         export: Exportovat
         export-selection: Exportovat výběr
         import: Importovat
+        member:
+          new: Nový člen
         menu_hidden: Skrýt v menu
         moderate: Spravovat moderace
         newsletter:
           new: Nový zpravodaj
-        participatory_space_private_user:
-          new: Nový soukromý uživatel participačního prostoru
         per_page: Na stránku
         permissions: Správa oprávnění
         restore: Obnovit
@@ -292,11 +296,13 @@ cs:
       block_user:
         bulk_new:
           action: Zablokovat účty a odeslat zdůvodnění
+          already_reported_html: Pokračováním v této akci také skryjete veškerý obsah účastníků.
           description: Blokováním uživatele bude jejich účet nepoužitelný. Ve svém zdůvodnění můžete uvést veškerá pravidla pro způsob, jakým byste uvažovali o odblokování uživatele.
           justification: Odůvodnění
           title: Zablokovat uživatele
         new:
           action: Blokovat účet a odeslat odůvodnění
+          already_reported_html: Pokračováním v této akci také skryjete veškerý obsah účastníků.
           description: Blokováním uživatele bude jejich účet nepoužitelný. Ve svém zdůvodnění můžete uvést veškerá pravidla pro způsob, jakým byste uvažovali o odblokování uživatele.
           justification: Odůvodnění
           title: Blokovat uživatele %{name}
@@ -392,6 +398,7 @@ cs:
         form:
           domain_too_short: Doména je příliš krátká
         update:
+          error: Nepodařilo se aktualizovat seznam povolených externích domén.
           success: Seznam povolených externích domén byl úspěšně aktualizován.
       exports:
         export_as: "%{name} jako %{export_format}"
@@ -413,6 +420,17 @@ cs:
           values:
             'false': 'Ne'
             'true': 'Ano'
+        members:
+          user_invitation_accepted_at_not_null:
+            label: Pozvánka přijata
+            values:
+              'false': Nepřijato
+              'true': Přijato
+          user_invitation_sent_at_not_null:
+            label: Pozvánka odeslána
+            values:
+              'false': Neodesláno
+              'true': Odesláno
         moderated_users:
           reports_reason_eq:
             label: Důvod hlášení
@@ -428,17 +446,6 @@ cs:
           values:
             'false': Ověřeno
             'true': Neověřeno
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Pozvánka přijata
-            values:
-              'false': Nepřijato
-              'true': Přijato
-          user_invitation_sent_at_not_null:
-            label: Pozvánka odeslána
-            values:
-              'false': Neodesláno
-              'true': Odesláno
         private_space_eq:
           label: Soukromé
           values:
@@ -454,6 +461,9 @@ cs:
         search_placeholder:
           name_or_nickname_or_email_cont: Hledat %{collection} podle e-mailu, jména nebo přezdívky
           report_count_eq: Počet nahlášení
+          reported_id_string_or_reported_content_cont: Hledat %{collection} podle nahlášeného Id nebo obsahu
+          title_cont: Hledat %{collection} podle názvu
+          user_name_or_user_nickname_or_user_email_cont: Hledat %{collection} podle e-mailu, jména nebo přezdívky
         state_eq:
           label: Stav
           values:
@@ -473,6 +483,7 @@ cs:
           import_csv:
             explanation: 'Pokyny pro soubor:'
             message_1: CSV soubory jsou podporovány
+            message_2: ".csv soubor s daty e-mailu"
       help_sections:
         error: Při aktualizaci sekcí nápovědy došlo k chybě.
         form:
@@ -559,6 +570,7 @@ cs:
       logs:
         filters:
           participatory_space: Najít participační prostor
+          text: Hledat podle e-mailu, jména nebo přezdívky
           user: Uživatel
         logs_list:
           no_logs_yet: Zatím nejsou žádné logy.
@@ -574,6 +586,37 @@ cs:
             explanation: Spravovaní uživatelé mohou být povýšeni na standardní uživatele. Znamená to, že budou pozváni do aplikace a nebudete je moci znovu předstírat. Pozvaný uživatel obdrží e-mail, ve kterém přijme vaši pozvánku.
             new_managed_user_promotion: Nová spravovaná podpora pro uživatele
             promote: Podporovat
+      members:
+        create:
+          error: Při přidávání člena do tohoto participačního prostoru došlo k chybě.
+          success: Přístup člena byl úspěšně vytvořen.
+        destroy:
+          error: Při mazání člena pro tento participační prostor došlo k chybě.
+        edit:
+          title: Upravit člena
+          update: Aktualizovat
+        index:
+          import_via_csv: Importovat přes CSV
+          publish_all: Publikovat vše
+          title: Člen
+          unpublish_all: Zrušit publikování všech
+        new:
+          create: Vytvořit
+          title: Nový člen
+        publish_all:
+          error: Při publikování všech členů tohoto participačního prostoru došlo k chybě.
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: Nahrát soubor CSV
+          destroy:
+            button: Odstranit všechny členy
+            confirm: Opravdu chcete odstranit všechny členy? Tuto akci nelze vrátit zpět, nebudete ji moci obnovit.
+            empty: Nemáte žádné členy.
+            title: Smazat členy
+          example_file: 'Příklad souboru:'
+          title: Importovat členy přes CSV
+          upload: Nahrát
       menu:
         admin_log: Protokol aktivity správce
         admins: Administrátoři
@@ -632,6 +675,8 @@ cs:
             reason: Důvod
             started_at: Začalo v
             user: Účastník
+        member:
+          name: Člen
         newsletter:
           fields:
             created_at: Vytvořeno v
@@ -640,8 +685,6 @@ cs:
             sent_to: Odeslána
             subject: Předmět
           name: Zpravodaj
-        participatory_space_private_user:
-          name: Participační prostor soukromého účastníka
         scope:
           fields:
             name: Název
@@ -690,6 +733,7 @@ cs:
               update_moderated_user_button: Zrušit nahlášení uživatelů
             title: Akce
             unblock: Odblokovat uživatele
+            unreport: Zpět hlášení
           cancel: Zrušit
           name: Jméno
           nickname: Přezdívka
@@ -716,6 +760,7 @@ cs:
               title: Vrátit skrytí
               update_moderation_button: Odkrýt vybrané zdroje
             unreport:
+              title: Zpět hlášení
               update_moderation_button: Zrušit nahlášení vybraných zdrojů
           cancel: Zrušit
           selected: vybráno
@@ -914,53 +959,6 @@ cs:
         form:
           add: Přidat na Seznam povolených
           title: Seznam povolených externích domén
-      participatory_space_private_users:
-        create:
-          error: Při přidávání soukromého uživatele pro tento participační prostor došlo k chybě.
-          success: Přístup soukromého účastníka do participativního prostoru byl úspěšně vytvořen.
-        destroy:
-          error: Při odstraňování soukromého uživatele tohoto participačního prostoru došlo k chybě.
-          success: Přístup soukromého účastníka do participativního prostoru byl úspěšně zrušen.
-        edit:
-          title: Upravit participační prostor soukromého účastníka.
-          update: Aktualizovat
-        index:
-          import_via_csv: Importovat přes CSV
-          publish_all: Publikovat vše
-          title: Participační prostor soukromého účastníka
-          unpublish_all: Zrušit publikování všech
-        new:
-          create: Vytvořit
-          title: Nový participační prostor soukromého účastníka.
-        publish_all:
-          error: U tohoto participativního prostoru byl problém se zveřejněním všech soukromých účastníků.
-          success: Úspěšné zveřejnění všech soukromých účastníků tohoto participativního prostoru
-        unpublish_all:
-          error: U tohoto participativního prostoru byl problém se zrušením zveřejnění všech soukromých účastníků.
-          success: Úspěšně zneveřejněni všichni soukromí účastníci tohoto participativního prostoru
-        update:
-          error: U tohoto participativního prostoru se vyskytl problém s aktualizací soukromého účastníka.
-          success: Soukromý účastník participativního prostoru úspěšně aktualizován
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: Při čtení souboru CSV se vyskytl problém. Ujistěte se, že jste dodrželi pokyny.
-          success: CSV soubor byl úspěšně nahrán, posíláme účastníkům e-mail s pozvánkou. To může chvíli trvat.
-        new:
-          csv_upload:
-            title: Nahrát soubor CSV
-          destroy:
-            button: Odstranit všechny soukromé účastníky
-            confirm: Jste si jisti, že chcete odstranit všechny soukromé účastníky? Tuto akci nelze vrátit zpět, nebudete je moci obnovit.
-            empty: Nemáte žádné soukromé účastníky.
-            explanation: Máte %{count} soukromých účastníků.
-            title: Odstranit soukromé účastníky
-          example_file: 'Příklad souboru:'
-          explanation: 'Nahrajte soubor CSV. Musí mít dva sloupce s e-mailem v prvním sloupci souboru a jméno v posledním sloupci souboru uživatelů, které chcete přidat do participačního prostoru, bez hlaviček. Vyhněte se používání neplatných znaků jako `<>?%&^*#@()[]=+:;"{}\|` v uživatelském jméně.'
-          explanation_example: |
-            john.doe@example.org%{csv_col_sep}John Doe
-            jane.doe@example.org%{csv_col_sep}Jane Doe
-          title: Importovat soukromé účastníky přes CSV
-          upload: Nahrát
       reminders:
         create:
           error: Při vytváření připomenutí došlo k chybě.
@@ -1242,6 +1240,9 @@ cs:
         taxonomy_filters: Filtry taxonomie pro "%{taxonomy}"
         users: Administrátoři
       tooltips:
+        cannot_destroy_taxonomy_filter: Nelze zničit tento filtr taxonomie
+        cannot_edit_taxonomy_filter: Nelze upravit tento filtr taxonomie
+        deleted_attachment_collections_info: Tuto složku nelze odstranit, protože obsahuje přílohy.
         deleted_component_info: Tato komponenta může být odstraněna pouze v případě, že je stav 'Nezveřejněno'.
       trash_management:
         restore:
@@ -1270,6 +1271,7 @@ cs:
           last_day: Poslední den
           last_month: Minulý měsíc
           last_week: Minulý týden
+          no_users_count_statistics_yet: Zatím nejsou žádné statistiky počtu účastníků.
           participants: Účastníci
     forms:
       errors:
@@ -1284,6 +1286,7 @@ cs:
         parent_hidden: Nelze odkrýt tento zdroj, protože jeho nadřazená položka je stále skrytá.
         title: Akce
         unhide: Vrátit skrytí
+        unreport: Zpět hlášení
       admin:
         reportable:
           bulk_action:
diff --git a/decidim-admin/config/locales/de.yml b/decidim-admin/config/locales/de.yml
index aec907a9c4969..5970fd6cb3893 100644
--- a/decidim-admin/config/locales/de.yml
+++ b/decidim-admin/config/locales/de.yml
@@ -33,8 +33,14 @@ de:
       help_section:
         content: Inhalt
       id: ID
+      member:
+        email: E-Mail
+        name: Name
+      member_csv_import:
+        file: Datei
       newsletter:
         body: Haupttext
+        send_to_all_users: An alle Teilnehmende senden
         send_to_followers: An Follower senden
         send_to_participants: An Teilnehmende senden
         subject: Betreff
@@ -90,11 +96,6 @@ de:
         welcome_notification_body: Text der Willkommens-Benachrichtigung
         welcome_notification_subject: Betreff der Willkommens-Benachrichtigung
         youtube_handler: YouTube-Handler
-      participatory_space_private_user:
-        email: E-Mail
-        name: Name
-      participatory_space_private_user_csv_import:
-        file: Datei
       scope:
         code: Code
         name: Name
@@ -124,10 +125,17 @@ de:
         show_in_footer: In der Fußzeile anzeigen
         title: Titel
         weight: Reihenfolge
+      taxonomy:
+        item_name: Elementbezeichnung
+        parent_id: Übergeordnetes Element
       user_group_csv_verification:
         file: Datei
     errors:
       models:
+        member_csv_import:
+          attributes:
+            file:
+              malformed: Fehlerhafte Importdatei. Bitte lesen Sie die Anweisungen sorgfältig durch und stellen Sie sicher, dass die Datei UTF-8 kodiert ist.
         newsletter:
           attributes:
             base:
@@ -136,10 +144,6 @@ de:
           attributes:
             official_img_footer:
               allowed_file_content_types: Ungültige Bilddatei
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Fehlerhafte Importdatei. Bitte lesen Sie die Anweisungen sorgfältig durch und stellen Sie sicher, dass die Datei UTF-8 kodiert ist.
         user_group_csv_verification:
           attributes:
             file:
@@ -187,12 +191,12 @@ de:
         export: Exportieren
         export-selection: Auswahl exportieren
         import: Importieren
+        member:
+          new: Neues Mitglied
         menu_hidden: Im Menü ausblenden
         moderate: Moderationen verwalten
         newsletter:
           new: Neuer Newsletter
-        participatory_space_private_user:
-          new: Neuer privater Benutzer
         per_page: Pro Seite
         permissions: Berechtigungen verwalten
         restore: Wiederherstellen
@@ -292,11 +296,13 @@ de:
       block_user:
         bulk_new:
           action: Konten sperren und Begründung senden
+          already_reported_html: Wenn Sie diese Aktion fortsetzen, werden Sie auch alle Inhalte der Teilnehmenden ausblenden.
           description: Das Blockieren eines Teilnehmenden wird das verknüpfte Konto unbrauchbar machen. Sie können dies begründen und Richtlinien dafür bieten, wie der Teilnehmende vorgehen kann, damit das Konto wieder entsperrt wird.
           justification: Begründung
           title: Teilnehmende blockieren
         new:
           action: Konto sperren und Begründung senden
+          already_reported_html: Wenn Sie diese Aktion fortsetzen, werden Sie auch alle Inhalte der Teilnehmenden ausblenden.
           description: Das Blockieren eines Benutzers wird sein Konto unbrauchbar machen. Sie können begründen und Richtlinien dafür bieten, wie der Benutzer vorgehen könnte, damit Sie in Betracht ziehen, die Blockierung wieder aufzuheben.
           justification: Begründung
           title: Benutzer %{name} blockieren
@@ -390,6 +396,7 @@ de:
         form:
           domain_too_short: Domain zu kurz
         update:
+          error: Das Aktualisieren der Liste der zulässigen externen Domains ist fehlgeschlagen.
           success: Die Liste der zulässigen externen Domains wurde erfolgreich aktualisiert.
       exports:
         export_as: "%{name} als %{export_format}"
@@ -411,6 +418,17 @@ de:
           values:
             'false': 'Nein'
             'true': 'Ja'
+        members:
+          user_invitation_accepted_at_not_null:
+            label: Einladung akzeptiert
+            values:
+              'false': Nicht akzeptiert
+              'true': Akzeptiert
+          user_invitation_sent_at_not_null:
+            label: Einladung versendet
+            values:
+              'false': Nicht versendet
+              'true': Versendet
         moderated_users:
           reports_reason_eq:
             label: Grund der Meldung
@@ -426,17 +444,6 @@ de:
           values:
             'false': Offizialisiert
             'true': Nicht offiziell
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Einladung akzeptiert
-            values:
-              'false': Nicht akzeptiert
-              'true': Akzeptiert
-          user_invitation_sent_at_not_null:
-            label: Einladung versendet
-            values:
-              'false': Nicht versendet
-              'true': Versendet
         private_space_eq:
           label: Privat
           values:
@@ -474,6 +481,7 @@ de:
           import_csv:
             explanation: 'Hinweise für die Datei:'
             message_1: CSV-Dateien werden unterstützt
+            message_2: "CSV-Datei mit E-Mail-Daten"
       help_sections:
         error: Beim Aktualisieren der Hilfeabschnitte ist ein Fehler aufgetreten.
         form:
@@ -568,6 +576,53 @@ de:
             explanation: Verwaltete Benutzer können zu Standardbenutzern heraufgestuft werden. Das bedeutet, dass sie zu der Anwendung eingeladen werden und nicht in der Lage sind, sie erneut zu repräsentieren. Der eingeladene Benutzer erhält eine E-Mail, um Ihre Einladung anzunehmen.
             new_managed_user_promotion: Neue verwaltete Benutzerwerbung
             promote: Fördern
+      members:
+        create:
+          error: Beim Hinzufügen eines Mitglieds zu diesem partizipativen Bereich ist ein Fehler aufgetreten.
+          success: Zugriff für das Mitglied erfolgreich erstellt.
+        destroy:
+          error: Beim Entfernen eines Mitglieds zu diesem partizipativen Bereich ist ein Fehler aufgetreten.
+          success: Zugriff für das Mitglied erfolgreich gelöscht.
+        edit:
+          title: Mitglied bearbeiten
+          update: Aktualisieren
+        index:
+          import_via_csv: Aus CSV importieren
+          publish_all: Alle veröffentlichen
+          title: Mitglied
+          unpublish_all: Alle Veröffentlichungen aufheben
+        new:
+          create: Erstellen
+          title: Neues Mitglied
+        publish_all:
+          error: Beim Veröffentlichen der Mitglieder in diesem partizipativen Bereich ist ein Fehler aufgetreten.
+          success: Alle Mitglieder für diesen partizipativen Bereich erfolgreich veröffentlicht
+        unpublish_all:
+          error: Beim Aufheben der Veröffentlichen der Mitglieder in diesem partizipativen Bereich ist ein Fehler aufgetreten.
+          success: Die Veröffentlichung der Mitglieder für diesen partizipativen Bereich wurde erfolgreich aufgehoben
+        update:
+          error: Beim Aktualisieren eines Mitglieds in diesem partizipativen Bereich ist ein Fehler aufgetreten.
+          success: Mitglied wurde erfolgreich aktualisiert
+      members_csv_imports:
+        create:
+          invalid: Beim Lesen der CSV-Datei ist ein Problem aufgetreten. Bitte stellen Sie sicher, dass Sie den Anweisungen korrekt gefolgt sind.
+          success: CSV-Datei wurde erfolgreich hochgeladen. Wir senden eine Einladungs-E-Mail an die Teilnehmenden. Dies kann eine Weile dauern.
+        new:
+          csv_upload:
+            title: Laden Sie Ihre CSV-Datei hoch
+          destroy:
+            button: Alle Mitglieder löschen
+            confirm: Sind Sie sicher, dass Sie alle Mitglieder entfernen möchten? Diese Aktion kann nicht rückgängig gemacht werden. Sie werden sie nicht wiederherstellen können.
+            empty: Sie haben noch keine Mitglieder.
+            explanation: Sie haben %{count} Mitglieder.
+            title: Mitglieder löschen
+          example_file: 'Beispieldatei:'
+          explanation: 'Laden Sie Ihre CSV-Datei mit den Teilnehmenden, die Sie zum Prozess hinzufügen möchten, hoch. Sie muss zwei Spalten (ohne Kopfzeile) haben, mit der E-Mail-Adresse in der ersten Spalte und dem Namen in der zweiten Spalte der Datei. Verwenden Sie keine ungültige Zeichen wie `<>?%&^*#@()[]=+:;"{}\|` im Namen der Teilnehmenden.'
+          explanation_example: |
+            john.doe@example.org%{csv_col_sep}John Doe
+            jane.doe@example.org%{csv_col_sep}Jane Doe
+          title: Mitglieder via CSV importieren
+          upload: Hochladen
       menu:
         admin_log: Admin-Aktivitätsprotokoll
         admins: Admins
@@ -626,6 +681,8 @@ de:
             reason: Grund
             started_at: Fing an bei
             user: Benutzer
+        member:
+          name: Mitglied
         newsletter:
           fields:
             created_at: Erstellt am
@@ -634,8 +691,6 @@ de:
             sent_to: Gesendet an
             subject: Gegenstand
           name: Newsletter
-        participatory_space_private_user:
-          name: Participatory Space privater Benutzer
         scope:
           fields:
             name: Name
@@ -910,53 +965,6 @@ de:
         form:
           add: Zur erlaubten Liste hinzufügen
           title: Liste erlaubter externer Domains
-      participatory_space_private_users:
-        create:
-          error: Beim Hinzufügen eines privaten Benutzers für diesen partizipativen Bereich ist ein Fehler aufgetreten.
-          success: Ein privater Zugriff für diesen Beteiligungsbereich wurde erfolgreich für das Konto erstellt.
-        destroy:
-          error: Beim Löschen eines privaten Benutzers für diesen partizipativen Bereich ist ein Fehler aufgetreten.
-          success: Privater Zugriff zum partizipativen Raum erfolgreich gelöscht.
-        edit:
-          title: Privates Mitglied des partiziaptiven Bereichs bearbeiten.
-          update: Aktualisieren
-        index:
-          import_via_csv: Aus CSV-Datein importieren
-          publish_all: Alle veröffentlichen
-          title: Participatory Space privater Benutzer
-          unpublish_all: Alle Veröffentlichungen aufheben
-        new:
-          create: Erstellen
-          title: Neuer privater Benutzer des Participatory Space.
-        publish_all:
-          error: Es gab ein Problem bei der Veröffentlichung aller privaten Teilnehmenden für diesen partizipativen Bereich.
-          success: Alle privaten Teilnehmenden erfolgreich für diesen partizipativen Bereich veröffentlicht
-        unpublish_all:
-          error: Es gab ein Problem beim Entfernen aller privaten Teilnehmenden für diesen partizipativen Bereich.
-          success: Alle privaten Teilnehmenden für diesen teilnehmenden Raum erfolgreich zurückgezogen
-        update:
-          error: Beim Aktualisieren des privaten Teilnehmenden für diesen Beteiligungsbereich ist ein Problem aufgetreten.
-          success: Privater Teilnehmende für diesen partizipativen Raum erfolgreich erstellt
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: Beim Lesen der CSV-Datei ist ein Problem aufgetreten. Bitte stellen Sie sicher, dass Sie den Anweisungen korrekt gefolgt sind.
-          success: CSV-Datei wurde erfolgreich hochgeladen, wir senden eine Einladungs-E-Mail an die Teilnehmenden. Dies kann eine Weile dauern.
-        new:
-          csv_upload:
-            title: CSV-Datei hochladen
-          destroy:
-            button: Alle private Teilnehmende auswählen
-            confirm: Sind Sie sicher, dass Sie alle private Teilnehmende entfernen möchten? Diese Aktion kann nicht rückgängig gemacht werden. Sie werden sie nicht wiederherstellen können.
-            empty: Sie haben keine private Teilnehmende.
-            explanation: Sie haben %{count} private Teilnehmende.
-            title: Alle private Teilnehmende entfernen
-          example_file: 'Beispieldatei:'
-          explanation: 'Laden Sie Ihre CSV-Datei mit den Teilnehmenden, die Sie zum Prozess hinzufügen möchten, hoch. Sie muss zwei Spalten (ohne Kopfzeile) haben, mit der E-Mail-Adresse in der ersten Spalte und dem Namen in der zweiten Spalte der Datei. Verwenden Sie keine ungültige Zeichen wie `<>?%&^*#@()[]=+:;"{}\|` im Namen der Teilnehmenden.'
-          explanation_example: |
-            john.doe@example.org%{csv_col_sep}John Doe
-            jane.doe@example.org%{csv_col_sep}Jane Doe
-          title: Private Teilnehmende via CSV importieren
-          upload: Hochladen
       reminders:
         create:
           error: Beim Erstellen dieser Erinnerungen ist ein Problem aufgetreten.
@@ -967,7 +975,7 @@ de:
           submit: Senden
       resource_permissions:
         edit:
-          submit: einreichen
+          submit: Absenden
           title: Berechtigungen bearbeiten
         options_form:
           ephemeral_warning: Um diese Autorisierungsmethode zu aktivieren, müssen Sie alle bestehenden Autorisierungen <a href="%{path}“>zurücknehmen</a>. Dadurch wird das Risiko von Überprüfungskonflikten minimiert. Alle Berechtigungen dieses Typs werden in der Organisation automatisch entzogen, wenn Sie Änderungen einreichen, die diese Methode hinzufügen oder ihre Konfiguration verändern, nachdem sie hinzugefügt wurde.
@@ -1265,6 +1273,7 @@ de:
           last_day: Letzter Tag
           last_month: Letzter Monat
           last_week: Letzte Woche
+          no_users_count_statistics_yet: Es gibt noch keine Statistiken über die Teilnehmenden.
           participants: Teilnehmer
     forms:
       errors:
diff --git a/decidim-admin/config/locales/el.yml b/decidim-admin/config/locales/el.yml
index a47652aa8ffbd..34cfb3c19e248 100644
--- a/decidim-admin/config/locales/el.yml
+++ b/decidim-admin/config/locales/el.yml
@@ -86,9 +86,6 @@ el:
         welcome_notification_body: Σώμα ειδοποίησης καλωσορίσματος
         welcome_notification_subject: Θέμα ειδοποίησης καλωσορίσματος
         youtube_handler: Πρόγραμμα χειρισμού YouTube
-      participatory_space_private_user:
-        email: Email
-        name: Όνομα
       scope:
         code: Κωδικός
         name: Όνομα
@@ -129,10 +126,6 @@ el:
           attributes:
             official_img_footer:
               allowed_file_content_types: Μη έγκυρο αρχείο εικόνας
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Λάθος στο αρχείο εισαγωγής, παρακαλούμε διαβάστε προσεκτικά τις οδηγίες και βεβαιωθείτε ότι το αρχείο είναι κωδικοποιημένο σε UTF-8.
         user_group_csv_verification:
           attributes:
             file:
@@ -171,8 +164,6 @@ el:
         import: Εισαγωγή
         newsletter:
           new: Νέο ενημερωτικό δελτίο
-        participatory_space_private_user:
-          new: Νέος ιδιωτικός χρήστης συμμετοχικού χώρου
         per_page: Ανά σελίδα
         share: Κοινοποίηση
         user:
@@ -357,17 +348,6 @@ el:
           values:
             'false': Επισημοποιήθηκε
             'true': Δεν επισημοποιήθηκε
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Πρόσκληση αποδεκτή
-            values:
-              'false': Δεν γίνεται δεκτό
-              'true': Αποδοχή
-          user_invitation_sent_at_not_null:
-            label: Πρόσκλησης εστάλει
-            values:
-              'false': Δεν έχει σταλεί
-              'true': Απεστάλλει
         private_space_eq:
           label: Ιδιωτικό
           values:
@@ -485,6 +465,10 @@ el:
             explanation: Οι διαχειριζόμενοι συμμετέχοντες μπορούν να αναβαθμιστούν σε τυπικούς συμμετέχοντες. Αυτό σημαίνει ότι θα προσκληθούν στην εφαρμογή και δεν θα μπορείτε να τους διαχειριστείτε ξανά. Ο προσκεκλημένος συμμετέχων θα λάβει email για να αποδεχτεί την πρόσκλησή σας.
             new_managed_user_promotion: Προώθηση νέου διαχειριζόμενου συμμετέχοντα
             promote: Αναβάθμιση
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: Αποστολή του αρχείου σας CSV
       menu:
         admin_log: Αρχείο καταγραφής δραστηριοτήτων διαχειριστή
         admins: Διαχειριστές
@@ -541,8 +525,6 @@ el:
             sent_to: Στάλθηκε σε
             subject: Θέμα
           name: Ενημερωτικό δελτίο
-        participatory_space_private_user:
-          name: Ιδιωτικός συμμετέχων χώρου συμμετοχής
         scope:
           fields:
             name: Όνομα
@@ -720,27 +702,6 @@ el:
         update:
           error: Υπήρξε ένα πρόβλημα κατά την ενημέρωση αυτού του οργανισμού.
           success: Ο οργανισμός ενημερώθηκε με επιτυχία.
-      participatory_space_private_users:
-        create:
-          error: Υπήρξε ένα πρόβλημα κατά την προσθήκη ενός ιδιωτικού συμμετέχοντα για αυτόν τον χώρο συμμετοχής.
-          success: Η πρόσβαση του ιδιωτικού συμμετέχοντα στον χώρο συμμετοχής δημιουργήθηκε με επιτυχία.
-        destroy:
-          error: Υπήρξε ένα πρόβλημα κατά τη διαγραφή ενός ιδιωτικού συμμετέχοντα για αυτόν τον χώρο συμμετοχής.
-          success: Η πρόσβαση του ιδιωτικού συμμετέχοντα στον χώρο συμμετοχής καταστράφηκε με επιτυχία.
-        index:
-          import_via_csv: Εισαγωγή μέσω CSV
-          title: Ιδιωτικός συμμετέχων χώρου συμμετοχής
-        new:
-          create: Δημιουργία
-          title: Νέο ιδιωτικός συμμετέχων χώρου συμμετοχής.
-      participatory_space_private_users_csv_imports:
-        create:
-          success: Το αρχείο CSV μεταφορτώθηκε με επιτυχία. Στέλνουμε πρόσκληση στους συμμετέχοντες μέσω email. Αυτή η διαδικασία μπορεί να χρειαστεί λίγη ώρα.
-        new:
-          csv_upload:
-            title: Αποστολή του αρχείου σας CSV
-          example_file: 'Παράδειγμα αρχείου:'
-          upload: Αποστολή
       reminders:
         new:
           submit: Αποστολή
diff --git a/decidim-admin/config/locales/en.yml b/decidim-admin/config/locales/en.yml
index c3331fed510df..18dd01eba4fd3 100644
--- a/decidim-admin/config/locales/en.yml
+++ b/decidim-admin/config/locales/en.yml
@@ -34,6 +34,11 @@ en:
       help_section:
         content: Content
       id: ID
+      member:
+        email: Email
+        name: Name
+      member_csv_import:
+        file: File
       newsletter:
         body: Body
         send_to_all_users: Send to all participants
@@ -92,11 +97,6 @@ en:
         welcome_notification_body: Welcome notification body
         welcome_notification_subject: Welcome notification subject
         youtube_handler: YouTube handler
-      participatory_space_private_user:
-        email: Email
-        name: Name
-      participatory_space_private_user_csv_import:
-        file: File
       scope:
         code: Code
         name: Name
@@ -133,6 +133,10 @@ en:
         file: File
     errors:
       models:
+        member_csv_import:
+          attributes:
+            file:
+              malformed: Malformed import file, please read through the instructions carefully and make sure the file is UTF-8 encoded.
         newsletter:
           attributes:
             base:
@@ -141,10 +145,6 @@ en:
           attributes:
             official_img_footer:
               allowed_file_content_types: Invalid image file
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Malformed import file, please read through the instructions carefully and make sure the file is UTF-8 encoded.
         user_group_csv_verification:
           attributes:
             file:
@@ -192,12 +192,12 @@ en:
         export: Export
         export-selection: Export selection
         import: Import
+        member:
+          new: New member
         menu_hidden: Hide from menu
         moderate: Manage moderations
         newsletter:
           new: New newsletter
-        participatory_space_private_user:
-          new: New participatory space private user
         per_page: Per page
         permissions: Manage permissions
         restore: Restore
@@ -419,6 +419,17 @@ en:
           values:
             'false': 'No'
             'true': 'Yes'
+        members:
+          user_invitation_accepted_at_not_null:
+            label: Invitation accepted
+            values:
+              'false': Not accepted
+              'true': Accepted
+          user_invitation_sent_at_not_null:
+            label: Invitation sent
+            values:
+              'false': Not sent
+              'true': Sent
         moderated_users:
           reports_reason_eq:
             label: Report reason
@@ -434,17 +445,6 @@ en:
           values:
             'false': Officialized
             'true': Not officialized
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Invitation accepted
-            values:
-              'false': Not accepted
-              'true': Accepted
-          user_invitation_sent_at_not_null:
-            label: Invitation sent
-            values:
-              'false': Not sent
-              'true': Sent
         private_space_eq:
           label: Private
           values:
@@ -577,6 +577,53 @@ en:
             explanation: Managed participants can be promoted to standard participants. It means they will be invited to the application and you will not be able to manage them again. The invited participant will receive an email to accept your invitation.
             new_managed_user_promotion: New managed participant promotion
             promote: Promote
+      members:
+        create:
+          error: There was a problem adding a member for this participatory space.
+          success: Member access successfully created.
+        destroy:
+          error: There was a problem deleting a member for this participatory space.
+          success: Member access successfully destroyed.
+        edit:
+          title: Edit member
+          update: Update
+        index:
+          import_via_csv: Import via CSV
+          publish_all: Publish all
+          title: Member
+          unpublish_all: Unpublish all
+        new:
+          create: Create
+          title: New member
+        publish_all:
+          error: There was a problem publishing all the members for this participatory space.
+          success: Successfully published all members for this participatory space
+        unpublish_all:
+          error: There was a problem unpublishing all the members for this participatory space.
+          success: Successfully unpublished all members for this participatory space
+        update:
+          error: There was a problem updating the member for this participatory space.
+          success: Member successfully updated
+      members_csv_imports:
+        create:
+          invalid: There was a problem reading the CSV file. Please make sure you have followed the instructions.
+          success: CSV file uploaded successfully, we are sending an invitation email to participants. This might take a while.
+        new:
+          csv_upload:
+            title: Upload your CSV file
+          destroy:
+            button: Delete all members
+            confirm: Are you sure you want to delete all members? This action cannot be undone, you will not be able to recover them.
+            empty: You have no members.
+            explanation: You have %{count} members.
+            title: Delete members
+          example_file: 'Example file:'
+          explanation: Upload your CSV file. It must have two columns with email in the first column of the file and name in the last column of the file of the users that you want to add to the participatory space, without headers. Avoid using invalid chars like `<>?%&^*#@()[]=+:;"{}\|` in user name.
+          explanation_example: |
+            john.doe@example.org%{csv_col_sep}John Doe
+            jane.doe@example.org%{csv_col_sep}Jane Doe
+          title: Import members via CSV
+          upload: Upload
       menu:
         admin_log: Admin activity log
         admins: Admins
@@ -635,6 +682,8 @@ en:
             reason: Reason
             started_at: Started at
             user: Participant
+        member:
+          name: Member
         newsletter:
           fields:
             created_at: Created at
@@ -643,8 +692,6 @@ en:
             sent_to: Sent to
             subject: Subject
           name: Newsletter
-        participatory_space_private_user:
-          name: Participatory space private participant
         scope:
           fields:
             name: Name
@@ -919,53 +966,6 @@ en:
         form:
           add: Add to allowed list
           title: Allowed list of external domains
-      participatory_space_private_users:
-        create:
-          error: There was a problem adding a private participant for this participatory space.
-          success: Participatory space private participant access successfully created.
-        destroy:
-          error: There was a problem deleting a private participant for this participatory space.
-          success: Participatory space private participant access successfully destroyed.
-        edit:
-          title: Edit Participatory Space private participant.
-          update: Update
-        index:
-          import_via_csv: Import via CSV
-          publish_all: Publish all
-          title: Participatory space private participant
-          unpublish_all: Unpublish all
-        new:
-          create: Create
-          title: New Participatory Space private participant.
-        publish_all:
-          error: There was a problem publishing all the private participants for this participatory space.
-          success: Successfully published all private participants for this participatory space
-        unpublish_all:
-          error: There was a problem unpublishing all the private participants for this participatory space.
-          success: Successfully unpublished all private participants for this participatory space
-        update:
-          error: There was a problem updating the private participant for this participatory space.
-          success: Participatory space private participant successfully updated
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: There was a problem reading the CSV file. Please make sure you have followed the instructions.
-          success: CSV file uploaded successfully, we are sending an invitation email to participants. This might take a while.
-        new:
-          csv_upload:
-            title: Upload your CSV file
-          destroy:
-            button: Delete all private participants
-            confirm: Are you sure you want to delete all private participants? This action cannot be undone, you will not be able to recover them.
-            empty: You have no private participants.
-            explanation: You have %{count} private participants.
-            title: Delete private participants
-          example_file: 'Example file:'
-          explanation: Upload your CSV file. It must have two columns with email in the first column of the file and name in the last column of the file of the users that you want to add to the participatory space, without headers. Avoid using invalid chars like `<>?%&^*#@()[]=+:;"{}\|` in user name.
-          explanation_example: |
-            john.doe@example.org%{csv_col_sep}John Doe
-            jane.doe@example.org%{csv_col_sep}Jane Doe
-          title: Import private participants via CSV
-          upload: Upload
       reminders:
         create:
           error: There was a problem creating reminders.
diff --git a/decidim-admin/config/locales/eo.yml b/decidim-admin/config/locales/eo.yml
index 72441adca2308..c7822411b652b 100644
--- a/decidim-admin/config/locales/eo.yml
+++ b/decidim-admin/config/locales/eo.yml
@@ -38,8 +38,6 @@ eo:
         impersonation_log:
           fields:
             ended_at: Finita je
-        participatory_space_private_user:
-          name: Privata partoprenanto
       newsletters:
         select_recipients_to_deliver:
           all_users_help: Sendu la informilon al ĉiuj konfirmitaj partoprenantoj.
diff --git a/decidim-admin/config/locales/es-MX.yml b/decidim-admin/config/locales/es-MX.yml
index bf9df930afd23..3d8948dffba26 100644
--- a/decidim-admin/config/locales/es-MX.yml
+++ b/decidim-admin/config/locales/es-MX.yml
@@ -33,6 +33,11 @@ es-MX:
       help_section:
         content: Contenido
       id: ID
+      member:
+        email: Correo electrónico
+        name: Nombre
+      member_csv_import:
+        file: Archivo
       newsletter:
         body: Cuerpo
         send_to_all_users: Enviar a todas las participantes
@@ -91,11 +96,6 @@ es-MX:
         welcome_notification_body: Cuerpo del mensaje de notificación de bienvenida
         welcome_notification_subject: Asunto del mensaje de notificación de bienvenida
         youtube_handler: Nombre de YouTube
-      participatory_space_private_user:
-        email: Correo electrónico
-        name: Nombre
-      participatory_space_private_user_csv_import:
-        file: Archivo
       scope:
         code: Código
         name: Nombre
@@ -125,10 +125,17 @@ es-MX:
         show_in_footer: Mostrar en el pie de página
         title: Título
         weight: Orden de posición
+      taxonomy:
+        item_name: Nombre del elemento
+        parent_id: Taxonomía madre
       user_group_csv_verification:
         file: Expediente
     errors:
       models:
+        member_csv_import:
+          attributes:
+            file:
+              malformed: Archivo de importación mal formateado, por favor lea las instrucciones cuidadosamente y asegúrese de que el archivo está codificado en UTF-8.
         newsletter:
           attributes:
             base:
@@ -137,10 +144,6 @@ es-MX:
           attributes:
             official_img_footer:
               allowed_file_content_types: Archivo de imagen no válido
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Archivo de importación mal formateado, por favor lea las instrucciones cuidadosamente y asegúrese de que el archivo está codificado en UTF-8.
         user_group_csv_verification:
           attributes:
             file:
@@ -188,12 +191,12 @@ es-MX:
         export: Exportar
         export-selection: Exportar selección
         import: Importar
+        member:
+          new: Nueva miembro
         menu_hidden: Ocultar del menú
         moderate: Gestionar las moderaciones
         newsletter:
           new: Nuevo boletín
-        participatory_space_private_user:
-          new: Nuevo usuario privado del espacio participativo
         per_page: Por página
         permissions: Gestionar los permisos
         restore: Restaurar
@@ -415,6 +418,17 @@ es-MX:
           values:
             'false': 'No'
             'true': 'Sí'
+        members:
+          user_invitation_accepted_at_not_null:
+            label: Invitación aceptada
+            values:
+              'false': No aceptada
+              'true': Aceptada
+          user_invitation_sent_at_not_null:
+            label: Invitación enviada
+            values:
+              'false': No enviada
+              'true': Enviada
         moderated_users:
           reports_reason_eq:
             label: Motivo de la denuncia
@@ -430,17 +444,6 @@ es-MX:
           values:
             'false': Oficializado
             'true': No oficializado
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Invitación aceptada
-            values:
-              'false': No aceptada
-              'true': Aceptada
-          user_invitation_sent_at_not_null:
-            label: Invitación enviada
-            values:
-              'false': No enviada
-              'true': Enviada
         private_space_eq:
           label: Privado
           values:
@@ -573,6 +576,53 @@ es-MX:
             explanation: Los usuarios gestionados pueden ser promovidos a usuarios estándar. Esto significa que serán invitados a la aplicación y no será capaz de suplantarlos de nuevo. El usuario invitado recibirá un correo electrónico para aceptar su invitación.
             new_managed_user_promotion: Nueva promoción de usuarios gestionados
             promote: Promocionar
+      members:
+        create:
+          error: Se ha producido un error al agregar una participante privada a este espacio participativo.
+          success: Acceso como miembro creado correctamente.
+        destroy:
+          error: Se ha producido un error al eliminar a una participante privada para este espacio de participación.
+          success: Acceso como miembro eliminado correctamente.
+        edit:
+          title: Editar miembro
+          update: Actualizar
+        index:
+          import_via_csv: Importar vía csv
+          publish_all: Publicar todas
+          title: Miembro
+          unpublish_all: Despublicar todas
+        new:
+          create: Crear
+          title: Nueva miembro
+        publish_all:
+          error: Se ha producido un error al publicar todas las miembros de este espacio de participación.
+          success: Se han publicado correctamente todas las miembros de este espacio de participación
+        unpublish_all:
+          error: Se ha producido un error al despublicar todas las miembros de este espacio de participación.
+          success: Se han despublicado correctamente todas las miembros de este espacio de participación
+        update:
+          error: Se ha producido un error al actualizar la miembro para este espacio de participación.
+          success: Miembro actualizada correctamente
+      members_csv_imports:
+        create:
+          invalid: Hubo un problema al leer el archivo CSV. Por favor, asegúrate de haber seguido las instrucciones.
+          success: El archivo CSV se ha cargado correctamente, estamos enviando un correo de invitación a las participantes. Este proceso puede tardar un poco.
+        new:
+          csv_upload:
+            title: Sube tu archivo CSV
+          destroy:
+            button: Borrar todas las miembros
+            confirm: '¿Seguro que quieres eliminar todas las miembros? Esta acción no se puede deshacer, no podrás recuperarlas.'
+            empty: No hay miembros.
+            explanation: Hay %{count} miembros.
+            title: Eliminar miembros
+          example_file: 'Archivo de ejemplo:'
+          explanation: 'Sube tu archivo CSV. Debe tener dos columnas con correo electrónico en la primera columna del archivo y el nombre en la última columna del archivo de las participantes que deseas añadir al espacio participativo, sin encabezados. Evita usar caracteres no válidos como `<>?%&^*#@()[]=+:;"{}\|` en el nombre de usuaria.'
+          explanation_example: |
+            john.doe@example.org%{csv_col_sep}John Doe
+            jane.doe@example.org%{csv_col_sep}Jane Doe
+          title: Importar miembros mediante CSV
+          upload: Cargar
       menu:
         admin_log: Registro de actividad de administrador
         admins: Administradores
@@ -631,6 +681,8 @@ es-MX:
             reason: Razón
             started_at: Empezó a las
             user: Usuario
+        member:
+          name: Miembro
         newsletter:
           fields:
             created_at: Fecha de creación
@@ -639,8 +691,6 @@ es-MX:
             sent_to: Enviado a
             subject: Asunto
           name: Boletín
-        participatory_space_private_user:
-          name: Usuario privado de espacio participativo
         scope:
           fields:
             name: Nombre
@@ -915,53 +965,6 @@ es-MX:
         form:
           add: Añadir a la lista de direcciones permitidas
           title: Lista de dominios externos permitidos
-      participatory_space_private_users:
-        create:
-          error: Hubo un error al agregar un usuario privado para este espacio participativo.
-          success: El acceso a usuarios privados de espacio participativo creado con éxito.
-        destroy:
-          error: Se ha producido un error al eliminar un usuario privado para este espacio participativo.
-          success: El acceso de usuarios privados del espacio participativo se eliminado con éxito.
-        edit:
-          title: Editar participante privada del espacio de participación.
-          update: Actualizar
-        index:
-          import_via_csv: Importar vía csv
-          publish_all: Publicar todo
-          title: Usuario privado de espacio participativo.
-          unpublish_all: Despublicar todo
-        new:
-          create: Crear
-          title: Nuevo usuario privado en el espacio participativo.
-        publish_all:
-          error: Se ha producido un error al publicar todas las participantes privadas de este espacio de participación.
-          success: Se han publicado correctamente todas las participantes privadas de este espacio de participación
-        unpublish_all:
-          error: Se ha producido un error al despublicar todas las participantes privadas de este espacio de participación.
-          success: Se han despublicado correctamente todas las participantes privadas de este espacio de participación
-        update:
-          error: Se ha producido un error actualizando una participante privada de este espacio de participación.
-          success: Se ha actualizado correctamente el espacio de participación privado
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: Hubo un problema al leer el archivo CSV. Por favor, asegúrate de haber seguido las instrucciones.
-          success: El archivo CSV se ha cargado correctamente, estamos enviando un correo de invitación a las participantes. Este proceso puede tardar un poco.
-        new:
-          csv_upload:
-            title: Sube tu archivo CSV
-          destroy:
-            button: Borrar todas las participantes privadas
-            confirm: '¿Seguro que quieres eliminar todas las participantes privadas? Esta acción no se puede deshacer, no podrás recuperarlas.'
-            empty: No hay participantes privadas.
-            explanation: Hay %{count} participante/s privada/s.
-            title: Borrar las participantes privadas
-          example_file: 'Fichero de ejemplo:'
-          explanation: 'Sube tu archivo CSV. Debe tener dos columnas con correo electrónico en la primera columna del archivo y el nombre en la última columna del archivo de las participantes que deseas añadir al espacio participativo, sin encabezados. Evita usar caracteres no válidos como `<>?%&^*#@()[]=+:;"{}\|` en el nombre de usuaria.'
-          explanation_example: |
-            john.doe@example.org%{csv_col_sep}John Doe
-            jane.doe@example.org%{csv_col_sep}Jane Doe
-          title: Importar participantes privadas vía CSV
-          upload: Subir
       reminders:
         create:
           error: Se ha producido un error al crear los recordatorios.
diff --git a/decidim-admin/config/locales/es-PY.yml b/decidim-admin/config/locales/es-PY.yml
index a600e0380bba1..79c14842467f1 100644
--- a/decidim-admin/config/locales/es-PY.yml
+++ b/decidim-admin/config/locales/es-PY.yml
@@ -33,6 +33,11 @@ es-PY:
       help_section:
         content: Contenido
       id: ID
+      member:
+        email: Correo electrónico
+        name: Nombre
+      member_csv_import:
+        file: Archivo
       newsletter:
         body: Cuerpo
         send_to_all_users: Enviar a todas las participantes
@@ -91,11 +96,6 @@ es-PY:
         welcome_notification_body: Cuerpo del mensaje de notificación de bienvenida
         welcome_notification_subject: Asunto del mensaje de notificación de bienvenida
         youtube_handler: Nombre de YouTube
-      participatory_space_private_user:
-        email: Correo electrónico
-        name: Nombre
-      participatory_space_private_user_csv_import:
-        file: Archivo
       scope:
         code: Código
         name: Nombre
@@ -125,10 +125,17 @@ es-PY:
         show_in_footer: Mostrar en el pie de página
         title: Título
         weight: Orden de posición
+      taxonomy:
+        item_name: Nombre del elemento
+        parent_id: Taxonomía madre
       user_group_csv_verification:
         file: Expediente
     errors:
       models:
+        member_csv_import:
+          attributes:
+            file:
+              malformed: Archivo de importación mal formateado, por favor lea las instrucciones cuidadosamente y asegúrese de que el archivo está codificado en UTF-8.
         newsletter:
           attributes:
             base:
@@ -137,10 +144,6 @@ es-PY:
           attributes:
             official_img_footer:
               allowed_file_content_types: Archivo de imagen no válido
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Archivo de importación mal formateado, por favor lea las instrucciones cuidadosamente y asegúrese de que el archivo está codificado en UTF-8.
         user_group_csv_verification:
           attributes:
             file:
@@ -188,12 +191,12 @@ es-PY:
         export: Exportar
         export-selection: Exportar selección
         import: Importar
+        member:
+          new: Nueva miembro
         menu_hidden: Ocultar del menú
         moderate: Gestionar las moderaciones
         newsletter:
           new: Nuevo boletín
-        participatory_space_private_user:
-          new: Nuevo usuario privado del espacio participativo
         per_page: Por página
         permissions: Gestionar los permisos
         restore: Restaurar
@@ -415,6 +418,17 @@ es-PY:
           values:
             'false': 'No'
             'true': 'Sí'
+        members:
+          user_invitation_accepted_at_not_null:
+            label: Invitación aceptada
+            values:
+              'false': No aceptada
+              'true': Aceptada
+          user_invitation_sent_at_not_null:
+            label: Invitación enviada
+            values:
+              'false': No enviada
+              'true': Enviada
         moderated_users:
           reports_reason_eq:
             label: Motivo de la denuncia
@@ -430,17 +444,6 @@ es-PY:
           values:
             'false': Oficializado
             'true': No oficializado
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Invitación aceptada
-            values:
-              'false': No aceptada
-              'true': Aceptada
-          user_invitation_sent_at_not_null:
-            label: Invitación enviada
-            values:
-              'false': No enviada
-              'true': Enviada
         private_space_eq:
           label: Privado
           values:
@@ -573,6 +576,53 @@ es-PY:
             explanation: Los usuarios gestionados pueden ser promovidos a usuarios estándar. Esto significa que serán invitados a la aplicación y no será capaz de suplantarlos de nuevo. El usuario invitado recibirá un correo electrónico para aceptar su invitación.
             new_managed_user_promotion: Nueva promoción de usuarios gestionados
             promote: Promocionar
+      members:
+        create:
+          error: Se ha producido un error al agregar una participante privada a este espacio participativo.
+          success: Acceso como miembro creado correctamente.
+        destroy:
+          error: Se ha producido un error al eliminar a una participante privada para este espacio de participación.
+          success: Acceso como miembro eliminado correctamente.
+        edit:
+          title: Editar miembro
+          update: Actualizar
+        index:
+          import_via_csv: Importar vía csv
+          publish_all: Publicar todas
+          title: Miembro
+          unpublish_all: Despublicar todas
+        new:
+          create: Crear
+          title: Nueva miembro
+        publish_all:
+          error: Se ha producido un error al publicar todas las miembros de este espacio de participación.
+          success: Se han publicado correctamente todas las miembros de este espacio de participación
+        unpublish_all:
+          error: Se ha producido un error al despublicar todas las miembros de este espacio de participación.
+          success: Se han despublicado correctamente todas las miembros de este espacio de participación
+        update:
+          error: Se ha producido un error al actualizar la miembro para este espacio de participación.
+          success: Miembro actualizada correctamente
+      members_csv_imports:
+        create:
+          invalid: Hubo un problema al leer el archivo CSV. Por favor, asegúrate de haber seguido las instrucciones.
+          success: El archivo CSV se ha cargado correctamente, estamos enviando un correo de invitación a las participantes. Este proceso puede tardar un poco.
+        new:
+          csv_upload:
+            title: Sube tu archivo CSV
+          destroy:
+            button: Borrar todas las miembros
+            confirm: '¿Seguro que quieres eliminar todas las miembros? Esta acción no se puede deshacer, no podrás recuperarlas.'
+            empty: No hay miembros.
+            explanation: Hay %{count} miembros.
+            title: Eliminar miembros
+          example_file: 'Archivo de ejemplo:'
+          explanation: 'Sube tu archivo CSV. Debe tener dos columnas con correo electrónico en la primera columna del archivo y el nombre en la última columna del archivo de las participantes que deseas añadir al espacio participativo, sin encabezados. Evita usar caracteres no válidos como `<>?%&^*#@()[]=+:;"{}\|` en el nombre de usuaria.'
+          explanation_example: |
+            john.doe@example.org%{csv_col_sep}John Doe
+            jane.doe@example.org%{csv_col_sep}Jane Doe
+          title: Importar miembros mediante CSV
+          upload: Cargar
       menu:
         admin_log: Registro de actividad de administrador
         admins: Administradores
@@ -631,6 +681,8 @@ es-PY:
             reason: Razón
             started_at: Empezó a las
             user: Usuario
+        member:
+          name: Miembro
         newsletter:
           fields:
             created_at: Fecha de creación
@@ -639,8 +691,6 @@ es-PY:
             sent_to: Enviado a
             subject: Asunto
           name: Boletín
-        participatory_space_private_user:
-          name: Usuario privado de espacio participativo
         scope:
           fields:
             name: Nombre
@@ -915,53 +965,6 @@ es-PY:
         form:
           add: Añadir a la lista de direcciones permitidas
           title: Lista de dominios externos permitidos
-      participatory_space_private_users:
-        create:
-          error: Hubo un error al agregar un usuario privado para este espacio participativo.
-          success: El acceso a usuarios privados de espacio participativo creado con éxito.
-        destroy:
-          error: Se ha producido un error al eliminar un usuario privado para este espacio participativo.
-          success: El acceso de usuarios privados del espacio participativo se eliminado con éxito.
-        edit:
-          title: Editar participante privada del espacio de participación.
-          update: Actualizar
-        index:
-          import_via_csv: Importar vía csv
-          publish_all: Publicar todo
-          title: Usuario privado de espacio participativo.
-          unpublish_all: Despublicar todo
-        new:
-          create: Crear
-          title: Nuevo usuario privado en el espacio participativo.
-        publish_all:
-          error: Se ha producido un error al publicar todas las participantes privadas de este espacio de participación.
-          success: Se han publicado correctamente todas las participantes privadas de este espacio de participación
-        unpublish_all:
-          error: Se ha producido un error al despublicar todas las participantes privadas de este espacio de participación.
-          success: Se han despublicado correctamente todas las participantes privadas de este espacio de participación
-        update:
-          error: Se ha producido un error actualizando una participante privada de este espacio de participación.
-          success: Se ha actualizado correctamente el espacio de participación privado
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: Hubo un problema al leer el archivo CSV. Por favor, asegúrate de haber seguido las instrucciones.
-          success: El archivo CSV se ha cargado correctamente, estamos enviando un correo de invitación a las participantes. Este proceso puede tardar un poco.
-        new:
-          csv_upload:
-            title: Sube tu archivo CSV
-          destroy:
-            button: Borrar todas las participantes privadas
-            confirm: '¿Seguro que quieres eliminar todas las participantes privadas? Esta acción no se puede deshacer, no podrás recuperarlas.'
-            empty: No hay participantes privadas.
-            explanation: Hay %{count} participante/s privada/s.
-            title: Borrar las participantes privadas
-          example_file: 'Fichero de ejemplo:'
-          explanation: 'Sube tu archivo CSV. Debe tener dos columnas con correo electrónico en la primera columna del archivo y el nombre en la última columna del archivo de las participantes que deseas añadir al espacio participativo, sin encabezados. Evita usar caracteres no válidos como `<>?%&^*#@()[]=+:;"{}\|` en el nombre de usuaria.'
-          explanation_example: |
-            john.doe@example.org%{csv_col_sep}John Doe
-            jane.doe@example.org%{csv_col_sep}Jane Doe
-          title: Importar participantes privadas vía CSV
-          upload: Subir
       reminders:
         create:
           error: Se ha producido un error al crear los recordatorios.
diff --git a/decidim-admin/config/locales/es.yml b/decidim-admin/config/locales/es.yml
index fc007682585c5..7af7a77c7c0a5 100644
--- a/decidim-admin/config/locales/es.yml
+++ b/decidim-admin/config/locales/es.yml
@@ -33,6 +33,11 @@ es:
       help_section:
         content: Contenido
       id: ID
+      member:
+        email: Correo electrónico
+        name: Nombre
+      member_csv_import:
+        file: Archivo
       newsletter:
         body: Cuerpo
         send_to_all_users: Enviar a todas las participantes
@@ -91,11 +96,6 @@ es:
         welcome_notification_body: Cuerpo del mensaje de notificación de bienvenida
         welcome_notification_subject: Asunto del mensaje de notificación de bienvenida
         youtube_handler: Nombre de YouTube
-      participatory_space_private_user:
-        email: Correo electrónico
-        name: Nombre
-      participatory_space_private_user_csv_import:
-        file: Archivo
       scope:
         code: Código
         name: Nombre
@@ -125,10 +125,17 @@ es:
         show_in_footer: Mostrar en el pie de página
         title: Título
         weight: Orden de posición
+      taxonomy:
+        item_name: Nombre del elemento
+        parent_id: Taxonomía madre
       user_group_csv_verification:
         file: Archivo
     errors:
       models:
+        member_csv_import:
+          attributes:
+            file:
+              malformed: Archivo de importación mal formateado, por favor lea las instrucciones cuidadosamente y asegúrese de que el archivo está codificado en UTF-8.
         newsletter:
           attributes:
             base:
@@ -137,10 +144,6 @@ es:
           attributes:
             official_img_footer:
               allowed_file_content_types: Archivo de imagen no válido
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Archivo de importación mal formateado, por favor lea las instrucciones cuidadosamente y asegúrese de que el archivo está codificado en UTF-8.
         user_group_csv_verification:
           attributes:
             file:
@@ -188,12 +191,12 @@ es:
         export: Exportar
         export-selection: Exportar selección
         import: Importar
+        member:
+          new: Nueva miembro
         menu_hidden: Ocultar del menú
         moderate: Gestionar las moderaciones
         newsletter:
           new: Nuevo boletín
-        participatory_space_private_user:
-          new: Nuevo usuario privado del espacio participativo
         per_page: Por página
         permissions: Gestionar los permisos
         restore: Restaurar
@@ -415,6 +418,17 @@ es:
           values:
             'false': 'No'
             'true': 'Sí'
+        members:
+          user_invitation_accepted_at_not_null:
+            label: Invitación aceptada
+            values:
+              'false': No aceptada
+              'true': Aceptada
+          user_invitation_sent_at_not_null:
+            label: Invitación enviada
+            values:
+              'false': No enviada
+              'true': Enviada
         moderated_users:
           reports_reason_eq:
             label: Motivo de la denuncia
@@ -430,17 +444,6 @@ es:
           values:
             'false': Oficializada
             'true': No oficializada
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Invitación aceptada
-            values:
-              'false': No aceptada
-              'true': Aceptada
-          user_invitation_sent_at_not_null:
-            label: Invitación enviada
-            values:
-              'false': No enviada
-              'true': Enviada
         private_space_eq:
           label: Privado
           values:
@@ -573,6 +576,53 @@ es:
             explanation: Las participantes gestionadas se pueden promocionar a participantes estándar. Significa que serán invitadas al sistema y no podrás volver a administrarlas. La participante invitada recibirá un correo electrónico para aceptar tu invitación.
             new_managed_user_promotion: Nueva promoción de participante
             promote: Promocionar
+      members:
+        create:
+          error: Se ha producido un error al agregar una participante privada a este espacio participativo.
+          success: Acceso como miembro creado correctamente.
+        destroy:
+          error: Se ha producido un error al eliminar a una participante privada para este espacio de participación.
+          success: Acceso como miembro eliminado correctamente.
+        edit:
+          title: Editar miembro
+          update: Actualizar
+        index:
+          import_via_csv: Importar vía csv
+          publish_all: Publicar todas
+          title: Miembro
+          unpublish_all: Despublicar todas
+        new:
+          create: Crear
+          title: Nueva miembro
+        publish_all:
+          error: Se ha producido un error al publicar todas las miembros de este espacio de participación.
+          success: Se han publicado correctamente todas las miembros de este espacio de participación
+        unpublish_all:
+          error: Se ha producido un error al despublicar todas las miembros de este espacio de participación.
+          success: Se han despublicado correctamente todas las miembros de este espacio de participación
+        update:
+          error: Se ha producido un error al actualizar la miembro para este espacio de participación.
+          success: Miembro actualizada correctamente
+      members_csv_imports:
+        create:
+          invalid: Hubo un problema al leer el archivo CSV. Por favor, asegúrate de haber seguido las instrucciones.
+          success: El archivo CSV se ha cargado correctamente, estamos enviando un correo de invitación a las participantes. Este proceso puede tardar un poco.
+        new:
+          csv_upload:
+            title: Sube tu archivo CSV
+          destroy:
+            button: Borrar todas las miembros
+            confirm: '¿Seguro que quieres eliminar todas las miembros? Esta acción no se puede deshacer, no podrás recuperarlas.'
+            empty: No hay miembros.
+            explanation: Hay %{count} miembros.
+            title: Eliminar miembros
+          example_file: 'Archivo de ejemplo:'
+          explanation: 'Sube tu archivo CSV. Debe tener dos columnas con correo electrónico en la primera columna del archivo y el nombre en la última columna del archivo de las participantes que deseas añadir al espacio participativo, sin encabezados. Evita usar caracteres no válidos como `<>?%&^*#@()[]=+:;"{}\|` en el nombre de usuaria.'
+          explanation_example: |
+            john.doe@example.org%{csv_col_sep}John Doe
+            jane.doe@example.org%{csv_col_sep}Jane Doe
+          title: Importar miembros mediante CSV
+          upload: Cargar
       menu:
         admin_log: Registro de actividad de administración
         admins: Administradoras
@@ -631,6 +681,8 @@ es:
             reason: Razón
             started_at: Empezó a las
             user: Participante
+        member:
+          name: Miembro
         newsletter:
           fields:
             created_at: Fecha de creación
@@ -639,8 +691,6 @@ es:
             sent_to: Enviado a
             subject: Asunto
           name: Boletín
-        participatory_space_private_user:
-          name: Participante de espacio de participación privado
         scope:
           fields:
             name: Nombre
@@ -915,53 +965,6 @@ es:
         form:
           add: Añadir a la lista de direcciones permitidas
           title: Lista de dominios externos permitidos
-      participatory_space_private_users:
-        create:
-          error: Se ha producido un error al agregar una participante privada a este espacio participativo.
-          success: Acceso privado a participantes del espacio participativo creado correctamente.
-        destroy:
-          error: Se ha producido un error al eliminar a una participante privada para este espacio participativo.
-          success: El acceso de la participante al espacio de participación privado se ha eliminado correctamente.
-        edit:
-          title: Editar participante privada del espacio de participación.
-          update: Actualizar
-        index:
-          import_via_csv: Importar vía csv
-          publish_all: Publicar todo
-          title: Participante de espacio de participación privado
-          unpublish_all: Despublicar todo
-        new:
-          create: Crear
-          title: Nueva participante del espacio privado.
-        publish_all:
-          error: Se ha producido un error al publicar todas las participantes privadas de este espacio de participación.
-          success: Se han publicado correctamente todas las participantes privadas de este espacio de participación
-        unpublish_all:
-          error: Se ha producido un error al despublicar todas las participantes privadas de este espacio de participación.
-          success: Se han despublicado correctamente todas las participantes privadas de este espacio de participación
-        update:
-          error: Se ha producido un error actualizando una participante privada de este espacio de participación.
-          success: Se ha actualizado correctamente el espacio de participación privado
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: Hubo un problema al leer el archivo CSV. Por favor, asegúrate de haber seguido las instrucciones.
-          success: El archivo CSV se ha cargado correctamente, estamos enviando un correo de invitación a las participantes. Este proceso puede tardar un poco.
-        new:
-          csv_upload:
-            title: Sube tu archivo CSV
-          destroy:
-            button: Borrar todas las participantes privadas
-            confirm: '¿Seguro que quieres eliminar todas las participantes privadas? Esta acción no se puede deshacer, no podrás recuperarlas.'
-            empty: No hay participantes privadas.
-            explanation: Hay %{count} participante/s privada/s.
-            title: Borrar las participantes privadas
-          example_file: 'Fichero de ejemplo:'
-          explanation: 'Sube tu archivo CSV. Debe tener dos columnas con correo electrónico en la primera columna del archivo y el nombre en la última columna del archivo de las participantes que deseas añadir al espacio participativo, sin encabezados. Evita usar caracteres no válidos como `<>?%&^*#@()[]=+:;"{}\|` en el nombre de usuaria.'
-          explanation_example: |
-            john.doe@example.org%{csv_col_sep}John Doe
-            jane.doe@example.org%{csv_col_sep}Jane Doe
-          title: Importar participantes privadas vía CSV
-          upload: Subir
       reminders:
         create:
           error: Se ha producido un error al crear los recordatorios.
diff --git a/decidim-admin/config/locales/eu.yml b/decidim-admin/config/locales/eu.yml
index 8bb5f29f864c1..819cb98d72fb8 100644
--- a/decidim-admin/config/locales/eu.yml
+++ b/decidim-admin/config/locales/eu.yml
@@ -33,6 +33,11 @@ eu:
       help_section:
         content: Edukia
       id: ID
+      member:
+        email: Helbide elektronikoa
+        name: Izena
+      member_csv_import:
+        file: Fitxategia
       newsletter:
         body: Testua
         send_to_all_users: Bidali parte-hartzaile guztiei
@@ -91,11 +96,6 @@ eu:
         welcome_notification_body: Ongietorri-jakinarazpenaren testua
         welcome_notification_subject: Ongi etorri jakinarazpenaren mezuaren gaia
         youtube_handler: YouTubeko kudeatzailea
-      participatory_space_private_user:
-        email: Helbide elektronikoa
-        name: Izena
-      participatory_space_private_user_csv_import:
-        file: Fitxategia
       scope:
         code: Kodea
         name: Izena
@@ -125,10 +125,17 @@ eu:
         show_in_footer: Erakutsi orri-oinean
         title: Izenburua
         weight: Kokapenaren hurrenkera
+      taxonomy:
+        item_name: Elementuaren izena
+        parent_id: Nagusia
       user_group_csv_verification:
         file: Fitxategia
     errors:
       models:
+        member_csv_import:
+          attributes:
+            file:
+              malformed: Gaizki osatutako inportazio-fitxategia. Mesedez, irakurri arretaz jarraibideen bidez, eta ziurtatu fitxategia UTF-8 kodetuta dagoela.
         newsletter:
           attributes:
             base:
@@ -137,10 +144,6 @@ eu:
           attributes:
             official_img_footer:
               allowed_file_content_types: Irudi-fitxategi baliogabea
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Fitxategia akastuna da. Irakurri arretaz jarraibideak eta ziurtatu fitxategia UTF-8an kodifikatuta dagoela.
         user_group_csv_verification:
           attributes:
             file:
@@ -188,12 +191,12 @@ eu:
         export: Esportatu
         export-selection: Esportatu hautaketa
         import: Inportatu
+        member:
+          new: Beste kide bat
         menu_hidden: Ezkutatu menutik
         moderate: Kudeatu moderazioak
         newsletter:
           new: Beste buletin bat
-        participatory_space_private_user:
-          new: Partaidetza-espazio berria, erabiltzaile pribatua
         per_page: Orrialdeko
         permissions: Kudeatu baimenak
         restore: Berreskuratu
@@ -415,6 +418,17 @@ eu:
           values:
             'false': 'Ez'
             'true': 'Bai'
+        members:
+          user_invitation_accepted_at_not_null:
+            label: Gonbidapena onartua
+            values:
+              'false': Ez onartua
+              'true': Onartua
+          user_invitation_sent_at_not_null:
+            label: Gonbidapena bidalita
+            values:
+              'false': Ez da bidali
+              'true': Bidalia
         moderated_users:
           reports_reason_eq:
             label: Arrazoiaren berri eman
@@ -430,17 +444,6 @@ eu:
           values:
             'false': Ofizializatua
             'true': Ez ofizializatua
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Gonbidapena onartua
-            values:
-              'false': Ez onartuta
-              'true': Onartuta
-          user_invitation_sent_at_not_null:
-            label: Gonbidapena bidali da
-            values:
-              'false': Ez da bidali
-              'true': Bidalia
         private_space_eq:
           label: Pribatua
           values:
@@ -573,6 +576,53 @@ eu:
             explanation: Kudeatutako parte-hartzaileak parte-hartzaile estandar mailara igo daitezke. Horrek esan nahi du aplikaziora gonbidatuak izanen direla eta ezingo direla berriro ere ordeztu. Parte-hartzaile gonbidatuak mezu elektroniko bat jasoko du gonbita onartzeko.
             new_managed_user_promotion: Kudeatutako parte-hartzaileen beste maila-igoera bat
             promote: Sustatu
+      members:
+        create:
+          error: Arazo bat izan da partaidetza-espazio horretarako kide bat gehitzeko.
+          success: Kideen sarbidea behar bezala sortu da.
+        destroy:
+          error: Arazo bat dago partaidetza-espazio horretarako kide bat ezabatzeko.
+          success: Kidearen sarbidea behar bezala suntsitu da.
+        edit:
+          title: Kidea aldatu
+          update: Egunaratu
+        index:
+          import_via_csv: CSV fitxategi baten bidez inportatu
+          publish_all: Denak argitaratu
+          title: Kidea
+          unpublish_all: Desargitaratu guztiak
+        new:
+          create: Sortu
+          title: Beste kide bat
+        publish_all:
+          error: Arazo bat izan da partaidetza-espazio horretarako kide bat gehitzeko.
+          success: Partaidetza-espazio honetarako kide guztiak arrakastaz argitaratu dira
+        unpublish_all:
+          error: Arazo bat dago partaidetza-espazio horretarako kide guztiak desargitaratzeko.
+          success: Partaidetza-espazio honetako kide guztiak behar bezala ezabatu dira
+        update:
+          error: Arazo bat izan da partaidetza-espazio horretarako kidea eguneratzeko.
+          success: Kidea behar bezala eguneratu da
+      members_csv_imports:
+        create:
+          invalid: Arazo bat izan da CSV fitxategia irakurtzean. Egiaztatu jarraibideak bete dituzula.
+          success: CSV fitxategia ondo igo da, gonbidapen-mezu elektroniko bat bidaltzen ari gara parte-hartzaileei. Horrek denbora pixka bat iraun dezake.
+        new:
+          csv_upload:
+            title: Igo zure CSV fitxategia
+          destroy:
+            button: Kide guztiak ezabatu
+            confirm: Ziur zaude kide guztiak ezabatu nahi dituzula? Ekintza hori ezin da desegin, ezingo dituzu berreskuratu.
+            empty: Ez duzu kiderik.
+            explanation: '%{count} kide dituzu.'
+            title: Kideak ezabatu
+          example_file: 'Adibide-fitxategia:'
+          explanation: 'Igo zure CSV fitxategia. Bi zutabe izan behar ditu, fitxategiko lehen zutabean posta elektronikoa eta parte-hartze gunera gehitu nahi dituzun parte-hartzaileen fitxategiaren azken zutabean izena jarrita, goibururik gabe. Ez erabili baliozko ez diren karaktereak erabiltzaile-izenean, hala nola, "sim"<>?%&^*#@()[]=+:;"{}\|`.'
+          explanation_example: |
+            john.doe@example.org%{csv_col_sep}John Doe
+            jane.doe@example.org%{csv_col_sep}Jane Doe
+          title: Kidek CSV fitxategi baten bidez
+          upload: Igo
       menu:
         admin_log: Administratzaile jarduera-erregistroa
         admins: Administratzaileak
@@ -631,6 +681,8 @@ eu:
             reason: Arrazoia
             started_at: 'Hasiera-ordua:'
             user: Parte-hartzaileak
+        member:
+          name: Kidea
         newsletter:
           fields:
             created_at: Noiz sortua
@@ -639,8 +691,6 @@ eu:
             sent_to: Hona bidalia
             subject: Gaia
           name: Buletina
-        participatory_space_private_user:
-          name: Partaidetza-espazio pribatuko parte-hartzailea
         scope:
           fields:
             name: Izena
@@ -915,53 +965,6 @@ eu:
         form:
           add: Gehitu baimendutako helbideen zerrendara
           title: Baimendutako kanpoko domeinuen zerrenda
-      participatory_space_private_users:
-        create:
-          error: Arazo bat egon da parte-hartzaile pribatu bat gehitzean partaidetza-espazio honetarako.
-          success: Zuzen sortu da sarbide pribatua partaidetza-espazioko partaideentzat.
-        destroy:
-          error: Arazo bat egon da parte-hartzaile pribatu bat ezabatzean partaidetza-espazio honetarako.
-          success: Behar bezala ezabatua parte-hartzailearen sarbidea partaidetza-espazio pribaturako.
-        edit:
-          title: Editatu espazio parte-hartzailea parte-hartzaile pribatua.
-          update: Eguneratu
-        index:
-          import_via_csv: Inportatu CSV bidetik
-          publish_all: Argitaratu guztiak
-          title: Partaidetza-espazio pribatuko parte-hartzailea
-          unpublish_all: Desargitaratu guztiak
-        new:
-          create: Sortu
-          title: Partaidetza-espazio pribatuko parte-hartzaile berria.
-        publish_all:
-          error: Arazo bat egon da parte-hartzaile pribatu guztiak argitaratzean partaidetza-espazio honetarako.
-          success: Parte-hartzaile pribatu guztiak zuzen argitaratu dira partaidetza-espazio honetarako
-        unpublish_all:
-          error: Arazo bat egon da parte-hartzaile pribatu guztiak desargiratzean partaidetza-espazio honetarako.
-          success: Parte-hartzaile pribatu guztiak zuzen desargitaratu dira partaidetza-espazio honetarako
-        update:
-          error: Arazo bat egon da parte-hartzaile pribatua partaidetza-espazio horretarako eguneratzean.
-          success: Partaidetza-espazioa, parte-hartzaile pribatua, arrakastaz eguneratua
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: Arazo bat egon da CSV fitxategia irakurtzean. Mesedez, ziurtatu jarraibideei kasu egin diezula.
-          success: CSV fitxategia zuzen igo da, eta parte-hartzaileei gonbidapen-mezu elektroniko bat bidaltzen ari gara. Prozesu horrek denbora behar du.
-        new:
-          csv_upload:
-            title: Igo zure CSV fitxategia
-          destroy:
-            button: Ezabatu parte-hartzaile pribatu guztiak
-            confirm: Ziur zaude parte-hartzaile pribatu guztiak ezabatu nahi dituzula? Ekintza hau ezin da desegin, ezin izango dituzu berreskuratu.
-            empty: Ez duzu parte-hartzaile pribaturik.
-            explanation: '%{count} parte-hartzaile pribatu dituzu.'
-            title: Ezabatu parte-hartzaile pribatuak
-          example_file: 'Fitxategi eredua:'
-          explanation: 'Igo zure CSV fitxategia. Bi zutabe izan behar ditu. Lehenengo zutabean posta elektronikoa jarri behar da, eta azken zutabean partaidetza-prozesura gehitu nahi dituzun parte-hartzaileen izena, goibururik gabe. Ez erabili holako karaktererik erabiltzaileen izenetan: `<>?%&^*#@()[]=+:;"{}\|`.'
-          explanation_example: |
-            john.doe@example.org%{csv_col_sep}John Doe
-            jane.doe@example.org%{csv_col_sep}Jane Doe
-          title: Inportatu parte-hartzaile pribatuak CSV bidez
-          upload: Igo
       reminders:
         create:
           error: Arazo bat egon da ohartarazpenak sortzean.
diff --git a/decidim-admin/config/locales/fi-plain.yml b/decidim-admin/config/locales/fi-plain.yml
index ad15d7a023ba4..edd11acd16219 100644
--- a/decidim-admin/config/locales/fi-plain.yml
+++ b/decidim-admin/config/locales/fi-plain.yml
@@ -33,8 +33,14 @@ fi-pl:
       help_section:
         content: Sisältö
       id: ID
+      member:
+        email: Sähköpostiosoite
+        name: Nimi
+      member_csv_import:
+        file: Tiedosto
       newsletter:
         body: Runko
+        send_to_all_users: Lähetä kaikille osallistujille
         send_to_followers: Lähetä seuraajille
         send_to_participants: Lähetä osallistujille
         subject: Otsikko
@@ -90,11 +96,6 @@ fi-pl:
         welcome_notification_body: Tervetuloilmoituksen runko
         welcome_notification_subject: Tervetuloilmoituksen otsikko
         youtube_handler: YouTube-käsittelijä
-      participatory_space_private_user:
-        email: Sähköpostiosoite
-        name: Nimi
-      participatory_space_private_user_csv_import:
-        file: Tiedosto
       scope:
         code: Koodi
         name: Nimi
@@ -124,10 +125,17 @@ fi-pl:
         show_in_footer: Näytä alatunnisteessa
         title: Otsikko
         weight: Järjestysnumero
+      taxonomy:
+        item_name: Asian nimi
+        parent_id: Vanhempi
       user_group_csv_verification:
         file: Tiedosto
     errors:
       models:
+        member_csv_import:
+          attributes:
+            file:
+              malformed: Virheellinen tuontitiedosto, lue ohjeet huolellisesti ja varmista, että tiedosto on UTF-8 muodossa.
         newsletter:
           attributes:
             base:
@@ -136,10 +144,6 @@ fi-pl:
           attributes:
             official_img_footer:
               allowed_file_content_types: Virheellinen kuvatiedosto
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Virheellinen tuontitiedosto, lue ohjeet huolellisesti ja varmista, että tiedosto on UTF-8 muodossa.
         user_group_csv_verification:
           attributes:
             file:
@@ -187,12 +191,12 @@ fi-pl:
         export: Vie
         export-selection: Vie valitut
         import: Tuo
+        member:
+          new: Uusi jäsen
         menu_hidden: Piilota valikosta
         moderate: Moderointien hallinta
         newsletter:
           new: Uusi uutiskirje
-        participatory_space_private_user:
-          new: Uusi osallistumistilan yksityinen käyttäjä
         per_page: Per sivu
         permissions: Käyttöoikeuksien hallinta
         restore: Palauta
@@ -292,11 +296,13 @@ fi-pl:
       block_user:
         bulk_new:
           action: Estä tilit ja lähetä perustelut
+          already_reported_html: Tämä toiminto piilottaa myös kaiken sisällön, jonka kyseinen osallistuja on luonut.
           description: Käyttäjätilien estäminen estää kyseisten käyttäjien pääsyn omalle tililleen. Voit antaa perusteluissasi ja ohjeistuksissasi tietoa siitä, mitä käyttäjät voivat tehdä palauttaakseen pääsyn tileilleen.
           justification: Perustelut
           title: Estä käyttäjät
         new:
           action: Estä tili ja lähetä perustelut
+          already_reported_html: Tämä toiminto piilottaa myös kaiken sisällön, jonka kyseinen osallistuja on luonut.
           description: Estämällä käyttäjän estät kyseisen käyttäjän pääsyn hänen omalle tililleen. Voit antaa perusteluissasi ja ohjeistuksissasi tietoa siitä, mitä kyseinen käyttäjä voi tehdä palauttaakseen pääsyn tililleen.
           justification: Perustelut
           title: Estä käyttäjä %{name}
@@ -390,6 +396,7 @@ fi-pl:
         form:
           domain_too_short: Verkkotunnus on liian lyhyt
         update:
+          error: Sallittujen ulkoisten verkkotunnusten luettelon päivittäminen epäonnistui.
           success: Sallittujen ulkoisten verkkotunnusten luettelon päivittäminen onnistui.
       exports:
         export_as: "%{name} muodossa %{export_format}"
@@ -411,6 +418,17 @@ fi-pl:
           values:
             'false': 'Ei'
             'true': 'Kyllä'
+        members:
+          user_invitation_accepted_at_not_null:
+            label: Kutsu hyväksytty
+            values:
+              'false': Ei hyäksytty
+              'true': Hyväksytty
+          user_invitation_sent_at_not_null:
+            label: Kutsu lähetetty
+            values:
+              'false': Ei lähetetty
+              'true': Lähetetty
         moderated_users:
           reports_reason_eq:
             label: Ilmoituksen syy
@@ -426,17 +444,6 @@ fi-pl:
           values:
             'false': Virallistettu
             'true': Ei virallistettu
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Kutsu hyväksytty
-            values:
-              'false': Ei hyäksytty
-              'true': Hyväksytty
-          user_invitation_sent_at_not_null:
-            label: Kutsu lähetetty
-            values:
-              'false': Ei lähetetty
-              'true': Lähetetty
         private_space_eq:
           label: Yksityinen
           values:
@@ -474,6 +481,7 @@ fi-pl:
           import_csv:
             explanation: 'Tiedoston ohjeistus:'
             message_1: CSV-tiedostomuotoa tuetaan
+            message_2: "sähköpostiosoitteet sisältävä .csv-tiedosto"
       help_sections:
         error: Ohjeosioiden päivitys epäonnistui.
         form:
@@ -568,6 +576,53 @@ fi-pl:
             explanation: Hallituille käyttäjille voidaan myöntää normaalien käyttäjien oikeudet. Tämä tarkoittaa, että heille lähetetään kutsu hakemusprosessiin ja tämän jälkeen kyseisinä tileinä ei voi enää esiintyä. Kutsutulle käyttäjälle lähetetään sähköposti, jonka avulla hän voi hyväksyä kutsusi.
             new_managed_user_promotion: Uusi käyttäjätason korotus hallinnoidulle käyttäjälle
             promote: Korota oikeudet
+      members:
+        create:
+          error: Jäsenen lisääminen tähän osallistumistilaan epäonnistui.
+          success: Jäsenen pääsyoikeuden lisäys onnistui.
+        destroy:
+          error: Osallistumistilan jäsenen poistaminen epäonnistui.
+          success: Jäsenen pääsyoikeuden poistaminen onnistui.
+        edit:
+          title: Muokkaa jäsentä
+          update: Päivitä
+        index:
+          import_via_csv: Tuo CSV-tiedostosta
+          publish_all: Julkaise kaikki
+          title: Jäsen
+          unpublish_all: Lopeta kaikkien julkaisu
+        new:
+          create: Luo
+          title: Uusi jäsen
+        publish_all:
+          error: Osallistumistilan jäsenten julkaiseminen epäonnistui.
+          success: Osallistumistilan jäsenten julkaiseminen onnistui
+        unpublish_all:
+          error: Osallistumistilan jäsenten julkaisun peruminen epäonnistui.
+          success: Osallistumistilan jäsenten julkaisun peruminen onnistui.
+        update:
+          error: Osallistumistilan jäsenen päivittäminen epäonnistui.
+          success: Osallistumistilan jäsenen päivittäminen onnistui.
+      members_csv_imports:
+        create:
+          invalid: CSV-tiedoston lukeminen epäonnistui. Tarkasta, että olet seurannut esitettyjä ohjeita.
+          success: CSV-tiedoston lataus onnistui. Lähetämme kutsusähköpostin osallistujille. Tämä voi kestää hetken.
+        new:
+          csv_upload:
+            title: Lataa CSV-tiedosto
+          destroy:
+            button: Poista kaikki jäsenet
+            confirm: Haluatko varmasti poistaa kaikki jäsenet? Tätä toimintoa ei voi perua ja poistettuja jäseniä ei voi palauttaa.
+            empty: Jäseniä ei ole määritetty.
+            explanation: '%{count} jäsentä.'
+            title: Poista jäsenet
+          example_file: 'Esimerkkitiedosto:'
+          explanation: 'Lataa CSV-tiedosto. Tiedostossa on oltava kaksi saraketta ilman otsikkoriviä. Ensimmäiseen sarakkeeseen määritetään käyttäjän sähköpostiosoite ja toiseen sarakkeeseen käyttäjän nimi, alkaen ensimmäiseltä riviltä. Jokaisesta rivistä luodaan uusi osallistumistilan käyttäjä. Vältä erikoismerkkejä nimessä, kuten `<>?%&^*#@()[]=+:;"{}\|`.'
+          explanation_example: |
+            matti.meikalainen@esimerkki.fi%{csv_col_sep}Matti Meikäläinen
+            minna.meikalainen@esimerkki.fi%{csv_col_sep}Minna Meikäläinen
+          title: Tuo jäseniä CSV-tiedostosta
+          upload: Lataa
       menu:
         admin_log: Hallintatoimintojen tapahtumaloki
         admins: Ylläpitäjät
@@ -626,6 +681,8 @@ fi-pl:
             reason: Syy
             started_at: Aloitettu
             user: Käyttäjä
+        member:
+          name: Jäsen
         newsletter:
           fields:
             created_at: Luonnin ajankohta
@@ -634,8 +691,6 @@ fi-pl:
             sent_to: Vastaanottajat
             subject: Otsikko
           name: Uutiskirje
-        participatory_space_private_user:
-          name: Osallisuustilan yksityinen käyttäjä
         scope:
           fields:
             name: Nimi
@@ -910,53 +965,6 @@ fi-pl:
         form:
           add: Lisää sallittujen listalle
           title: Sallitut ulkoiset verkko-osoitteet
-      participatory_space_private_users:
-        create:
-          error: Yksityisen käyttäjän lisäämisessä tähän osallisuustilaan tapahtui virhe.
-          success: Osallisuustilaa koskeva yksityisen käyttäjän käyttöoikeus lisätty onnistuneesti.
-        destroy:
-          error: Tapahtui virhe poistettaessa osallisuustilan yksityistä käyttäjää.
-          success: Osallisuustilaa koskeva yksityisen käyttäjän käyttöoikeus tuhottu onnistuneesti.
-        edit:
-          title: Muokkaa osallistumistilan yksityistä käyttäjää.
-          update: Päivitä
-        index:
-          import_via_csv: Tuo CSV-tiedostosta
-          publish_all: Julkaise kaikki
-          title: Osallisuustilan yksityinen käyttäjä
-          unpublish_all: Lopeta kaikkien julkaisu
-        new:
-          create: Luo
-          title: Uusi osallisuustilan yksityinen käyttäjä.
-        publish_all:
-          error: Osallistumistilan yksityisten käyttäjien julkaiseminen epäonnistui.
-          success: Osallistumistilan yksityisten käyttäjien julkaiseminen onnistui
-        unpublish_all:
-          error: Osallistumistilan yksityisten käyttäjien julkaisun peruminen epäonnistui.
-          success: Osallistumistilan yksityisten käyttäjien julkaisun peruminen onnistui.
-        update:
-          error: Osallistumistilan yksityisen käyttäjän päivittäminen epäonnistui.
-          success: Osallistumistilan yksityisen käyttäjän päivittäminen onnistui.
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: CSV-tiedoston lukeminen epäonnistui. Tarkasta, että olet seurannut esitettyjä ohjeita.
-          success: CSV-tiedosto ladattu onnistuneesti. Lähetämme kutsusähköpostin osallistujille. Tämä voi kestää hetken.
-        new:
-          csv_upload:
-            title: Lataa CSV-tiedosto
-          destroy:
-            button: Poista kaikki yksityiset osallistujat
-            confirm: Oletko varma, että haluat poistaa kaikki yksityiset osallistujat? Tätä toimintoa ei voi peruuttaa ja poistettuja osallistujia ei voi palauttaa.
-            empty: Tässä osallistumistilassa ei ole yksityisiä osallistujia.
-            explanation: Tässä osallistumistilassa on %{count} yksityistä osallistujaa.
-            title: Poista kaikki yksityiset osallistujat
-          example_file: 'Esimerkkitiedosto:'
-          explanation: 'Lataa CSV-tiedosto. Tiedostossa on oltava kaksi saraketta ilman otsikkoriviä. Ensimmäiseen sarakkeeseen asetetaan käyttäjän sähköpostiosoite ja toiseen sarakkeeseen käyttäjän nimi, alkaen ensimmäiseltä riviltä. Jokaisesta rivistä luodaan uusi osallistumistilan käyttäjä. Vältä erikoismerkkejä nimessä, kuten `<>?%&^*#@()[]=+:;"{}\|`.'
-          explanation_example: |
-            matti.meikalainen@esimerkki.fi%{csv_col_sep}Matti Meikäläinen
-            minna.meikalainen@esimerkki.fi%{csv_col_sep}Minna Meikäläinen
-          title: Tuo yksityisiä osallistujia CSV-tiedostosta
-          upload: Lataa
       reminders:
         create:
           error: Muistutusten luonti epäonnistui.
@@ -1265,6 +1273,7 @@ fi-pl:
           last_day: Viimeinen päivä
           last_month: Viimeinen kuukausi
           last_week: Viimeinen viikko
+          no_users_count_statistics_yet: Käyttäjämäärätilastoja ei vielä ole.
           participants: Osallistujat
     forms:
       errors:
diff --git a/decidim-admin/config/locales/fi.yml b/decidim-admin/config/locales/fi.yml
index c23852d5a88de..bf8594d49d631 100644
--- a/decidim-admin/config/locales/fi.yml
+++ b/decidim-admin/config/locales/fi.yml
@@ -33,8 +33,14 @@ fi:
       help_section:
         content: Sisältö
       id: ID
+      member:
+        email: Sähköpostiosoite
+        name: Nimi
+      member_csv_import:
+        file: Tiedosto
       newsletter:
         body: Runko
+        send_to_all_users: Lähetä kaikille osallistujille
         send_to_followers: Lähetä seuraajille
         send_to_participants: Lähetä osallistujille
         subject: Otsikko
@@ -90,11 +96,6 @@ fi:
         welcome_notification_body: Tervetuloilmoituksen runko
         welcome_notification_subject: Tervetuloilmoituksen otsikko
         youtube_handler: YouTube-käsittelijä
-      participatory_space_private_user:
-        email: Sähköpostiosoite
-        name: Nimi
-      participatory_space_private_user_csv_import:
-        file: Tiedosto
       scope:
         code: Koodi
         name: Nimi
@@ -124,10 +125,17 @@ fi:
         show_in_footer: Näytä alatunnisteessa
         title: Otsikko
         weight: Järjestysnumero
+      taxonomy:
+        item_name: Asian nimi
+        parent_id: Vanhempi
       user_group_csv_verification:
         file: Tiedosto
     errors:
       models:
+        member_csv_import:
+          attributes:
+            file:
+              malformed: Virheellinen tuontitiedosto, lue ohjeet huolellisesti ja varmista, että tiedosto on UTF-8 muodossa.
         newsletter:
           attributes:
             base:
@@ -136,10 +144,6 @@ fi:
           attributes:
             official_img_footer:
               allowed_file_content_types: Virheellinen kuvatiedosto
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Virheellinen tuontitiedosto, lue ohjeet huolellisesti ja varmista, että tiedosto on UTF-8 muodossa.
         user_group_csv_verification:
           attributes:
             file:
@@ -187,12 +191,12 @@ fi:
         export: Vie
         export-selection: Vie valitut
         import: Tuo
+        member:
+          new: Uusi jäsen
         menu_hidden: Piilota valikosta
         moderate: Moderointien hallinta
         newsletter:
           new: Uusi uutiskirje
-        participatory_space_private_user:
-          new: Uusi osallistumistilan yksityinen käyttäjä
         per_page: Per sivu
         permissions: Käyttöoikeuksien hallinta
         restore: Palauta
@@ -292,11 +296,13 @@ fi:
       block_user:
         bulk_new:
           action: Estä tilit ja lähetä perustelut
+          already_reported_html: Tämä toiminto piilottaa myös kaiken sisällön, jonka kyseinen osallistuja on luonut.
           description: Käyttäjätilien estäminen estää kyseisten käyttäjien pääsyn omalle tililleen. Voit antaa perusteluissasi ja ohjeistuksissasi tietoa siitä, mitä käyttäjät voivat tehdä palauttaakseen pääsyn tileilleen.
           justification: Perustelut
           title: Estä käyttäjät
         new:
           action: Estä tili ja lähetä perustelut
+          already_reported_html: Tämä toiminto piilottaa myös kaiken sisällön, jonka kyseinen osallistuja on luonut.
           description: Estämällä käyttäjän estät kyseisen käyttäjän pääsyn hänen omalle tililleen. Voit antaa perusteluissasi ja ohjeistuksissasi tietoa siitä, mitä kyseinen käyttäjä voi tehdä palauttaakseen pääsyn tililleen.
           justification: Perustelut
           title: Estä käyttäjä %{name}
@@ -390,6 +396,7 @@ fi:
         form:
           domain_too_short: Verkkotunnus on liian lyhyt
         update:
+          error: Sallittujen ulkoisten verkkotunnusten luettelon päivittäminen epäonnistui.
           success: Sallittujen ulkoisten verkkotunnusten luettelon päivittäminen onnistui.
       exports:
         export_as: "%{name} muodossa %{export_format}"
@@ -411,6 +418,17 @@ fi:
           values:
             'false': 'Ei'
             'true': 'Kyllä'
+        members:
+          user_invitation_accepted_at_not_null:
+            label: Kutsu hyväksytty
+            values:
+              'false': Ei hyäksytty
+              'true': Hyväksytty
+          user_invitation_sent_at_not_null:
+            label: Kutsu lähetetty
+            values:
+              'false': Ei lähetetty
+              'true': Lähetetty
         moderated_users:
           reports_reason_eq:
             label: Ilmoituksen syy
@@ -426,17 +444,6 @@ fi:
           values:
             'false': Virallistettu
             'true': Ei virallistettu
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Kutsu hyväksytty
-            values:
-              'false': Ei hyäksytty
-              'true': Hyväksytty
-          user_invitation_sent_at_not_null:
-            label: Kutsu lähetetty
-            values:
-              'false': Ei lähetetty
-              'true': Lähetetty
         private_space_eq:
           label: Yksityinen
           values:
@@ -474,6 +481,7 @@ fi:
           import_csv:
             explanation: 'Tiedoston ohjeistus:'
             message_1: CSV-tiedostomuotoa tuetaan
+            message_2: "sähköpostiosoitteet sisältävä .csv-tiedosto"
       help_sections:
         error: Ohjeosioiden päivitys epäonnistui.
         form:
@@ -568,6 +576,53 @@ fi:
             explanation: Hallituille käyttäjille voidaan myöntää normaalien käyttäjien oikeudet. Tämä tarkoittaa, että heille lähetetään rekisteröitymiskutsu alustalle ja rekisteröitymisen jälkeen kyseisinä käyttäjinä ei voi enää esiintyä. Kutsutulle käyttäjälle lähetetään sähköposti, jonka avulla he voivat hyväksyä kutsusi.
             new_managed_user_promotion: Uusi käyttäjätason korotus hallinnoidulle käyttäjälle
             promote: Korota oikeudet
+      members:
+        create:
+          error: Jäsenen lisääminen tähän osallistumistilaan epäonnistui.
+          success: Jäsenen pääsyoikeuden lisäys onnistui.
+        destroy:
+          error: Osallistumistilan jäsenen poistaminen epäonnistui.
+          success: Jäsenen pääsyoikeuden poistaminen onnistui.
+        edit:
+          title: Muokkaa jäsentä
+          update: Päivitä
+        index:
+          import_via_csv: Tuo CSV-tiedostosta
+          publish_all: Julkaise kaikki
+          title: Jäsen
+          unpublish_all: Lopeta kaikkien julkaisu
+        new:
+          create: Luo
+          title: Uusi jäsen
+        publish_all:
+          error: Osallistumistilan jäsenten julkaiseminen epäonnistui.
+          success: Osallistumistilan jäsenten julkaiseminen onnistui
+        unpublish_all:
+          error: Osallistumistilan jäsenten julkaisun peruminen epäonnistui.
+          success: Osallistumistilan jäsenten julkaisun peruminen onnistui.
+        update:
+          error: Osallistumistilan jäsenen päivittäminen epäonnistui.
+          success: Osallistumistilan jäsenen päivittäminen onnistui.
+      members_csv_imports:
+        create:
+          invalid: CSV-tiedoston lukeminen epäonnistui. Tarkasta, että olet seurannut esitettyjä ohjeita.
+          success: CSV-tiedoston lataus onnistui. Lähetämme kutsusähköpostin osallistujille. Tämä voi kestää hetken.
+        new:
+          csv_upload:
+            title: Lataa CSV-tiedosto
+          destroy:
+            button: Poista kaikki jäsenet
+            confirm: Haluatko varmasti poistaa kaikki jäsenet? Tätä toimintoa ei voi perua ja poistettuja jäseniä ei voi palauttaa.
+            empty: Jäseniä ei ole määritetty.
+            explanation: '%{count} jäsentä.'
+            title: Poista jäsenet
+          example_file: 'Esimerkkitiedosto:'
+          explanation: 'Lataa CSV-tiedosto. Tiedostossa on oltava kaksi saraketta ilman otsikkoriviä. Ensimmäiseen sarakkeeseen määritetään käyttäjän sähköpostiosoite ja toiseen sarakkeeseen käyttäjän nimi, alkaen ensimmäiseltä riviltä. Jokaisesta rivistä luodaan uusi osallistumistilan käyttäjä. Vältä erikoismerkkejä nimessä, kuten `<>?%&^*#@()[]=+:;"{}\|`.'
+          explanation_example: |
+            matti.meikalainen@esimerkki.fi%{csv_col_sep}Matti Meikäläinen
+            minna.meikalainen@esimerkki.fi%{csv_col_sep}Minna Meikäläinen
+          title: Tuo jäseniä CSV-tiedostosta
+          upload: Lataa
       menu:
         admin_log: Hallintatoimintojen tapahtumaloki
         admins: Ylläpitäjät
@@ -626,6 +681,8 @@ fi:
             reason: Syy
             started_at: Aloitettu
             user: Käyttäjä
+        member:
+          name: Jäsen
         newsletter:
           fields:
             created_at: Luonnin ajankohta
@@ -634,8 +691,6 @@ fi:
             sent_to: Vastaanottajat
             subject: Otsikko
           name: Uutiskirje
-        participatory_space_private_user:
-          name: Osallistumistilan yksityinen käyttäjä
         scope:
           fields:
             name: Nimi
@@ -910,53 +965,6 @@ fi:
         form:
           add: Lisää sallittujen listalle
           title: Sallitut ulkoiset verkko-osoitteet
-      participatory_space_private_users:
-        create:
-          error: Yksityisen käyttäjän lisääminen tähän osallistumistilaan epäonnistui.
-          success: Osallistumistilaa koskeva yksityisen käyttäjän käyttöoikeuden lisäys onnistui.
-        destroy:
-          error: Osallistumistilan yksityisen käyttäjän poistaminen epäonnistui.
-          success: Osallistumistilaa koskeva yksityisen käyttäjän käyttöoikeuden poistaminen onnistui.
-        edit:
-          title: Muokkaa osallistumistilan yksityistä käyttäjää.
-          update: Päivitä
-        index:
-          import_via_csv: Tuo CSV-tiedostosta
-          publish_all: Julkaise kaikki
-          title: Osallistumistilan yksityinen käyttäjä
-          unpublish_all: Lopeta kaikkien julkaisu
-        new:
-          create: Luo
-          title: Uusi osallistumistilan yksityinen käyttäjä.
-        publish_all:
-          error: Osallistumistilan yksityisten käyttäjien julkaiseminen epäonnistui.
-          success: Osallistumistilan yksityisten käyttäjien julkaiseminen onnistui
-        unpublish_all:
-          error: Osallistumistilan yksityisten käyttäjien julkaisun peruminen epäonnistui.
-          success: Osallistumistilan yksityisten käyttäjien julkaisun peruminen onnistui.
-        update:
-          error: Osallistumistilan yksityisen käyttäjän päivittäminen epäonnistui.
-          success: Osallistumistilan yksityisen käyttäjän päivittäminen onnistui.
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: CSV-tiedoston lukeminen epäonnistui. Tarkasta, että olet seurannut esitettyjä ohjeita.
-          success: CSV-tiedoston lataus onnistui. Lähetämme kutsusähköpostin osallistujille. Tämä voi kestää hetken.
-        new:
-          csv_upload:
-            title: Lataa CSV-tiedosto
-          destroy:
-            button: Poista kaikki yksityiset osallistujat
-            confirm: Oletko varma, että haluat poistaa kaikki yksityiset osallistujat? Tätä toimintoa ei voi perua ja poistettuja osallistujia ei voi palauttaa.
-            empty: Tässä osallistumistilassa ei ole yksityisiä osallistujia.
-            explanation: Tässä osallistumistilassa on %{count} yksityistä osallistujaa.
-            title: Poista kaikki yksityiset osallistujat
-          example_file: 'Esimerkkitiedosto:'
-          explanation: 'Lataa CSV-tiedosto. Tiedostossa on oltava kaksi saraketta ilman otsikkoriviä. Ensimmäiseen sarakkeeseen asetetaan käyttäjän sähköpostiosoite ja toiseen sarakkeeseen käyttäjän nimi, alkaen ensimmäiseltä riviltä. Jokaisesta rivistä luodaan uusi osallistumistilan käyttäjä. Vältä erikoismerkkejä nimessä, kuten `<>?%&^*#@()[]=+:;"{}\|`.'
-          explanation_example: |
-            matti.meikalainen@esimerkki.fi%{csv_col_sep}Matti Meikäläinen
-            minna.meikalainen@esimerkki.fi%{csv_col_sep}Minna Meikäläinen
-          title: Tuo yksityisiä osallistujia CSV-tiedostosta
-          upload: Lataa
       reminders:
         create:
           error: Muistutusten luonti epäonnistui.
@@ -1265,6 +1273,7 @@ fi:
           last_day: Viimeinen päivä
           last_month: Viimeinen kuukausi
           last_week: Viimeinen viikko
+          no_users_count_statistics_yet: Käyttäjämäärätilastoja ei vielä ole.
           participants: Osallistujat
     forms:
       errors:
diff --git a/decidim-admin/config/locales/fr-CA.yml b/decidim-admin/config/locales/fr-CA.yml
index 1116d7962e3be..e73a751c9ebf1 100644
--- a/decidim-admin/config/locales/fr-CA.yml
+++ b/decidim-admin/config/locales/fr-CA.yml
@@ -33,6 +33,11 @@ fr-CA:
       help_section:
         content: Contenu
       id: ID
+      member:
+        email: Email
+        name: Nom
+      member_csv_import:
+        file: Fichier
       newsletter:
         body: Corps de texte
         send_to_all_users: Envoyer à tous les participants
@@ -90,11 +95,6 @@ fr-CA:
         welcome_notification_body: Corps du mail de bienvenue
         welcome_notification_subject: Objet du mail de bienvenue
         youtube_handler: Gestionnaire YouTube
-      participatory_space_private_user:
-        email: Email
-        name: Nom
-      participatory_space_private_user_csv_import:
-        file: Fichier
       scope:
         code: Code
         name: Titre
@@ -124,10 +124,17 @@ fr-CA:
         show_in_footer: Montrer dans le pied de page
         title: Titre
         weight: Rang
+      taxonomy:
+        item_name: Nom de l’élément
+        parent_id: Parent
       user_group_csv_verification:
         file: Fichier
     errors:
       models:
+        member_csv_import:
+          attributes:
+            file:
+              malformed: Fichier d'importation mal formé, veuillez lire attentivement les instructions et assurez-vous que le fichier est encodé en UTF-8.
         newsletter:
           attributes:
             base:
@@ -136,10 +143,6 @@ fr-CA:
           attributes:
             official_img_footer:
               allowed_file_content_types: Fichier image invalide
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Fichier d'importation mal formé, veuillez lire attentivement les instructions et assurez-vous que le fichier est encodé en UTF-8.
         user_group_csv_verification:
           attributes:
             file:
@@ -187,12 +190,12 @@ fr-CA:
         export: Exporter
         export-selection: Exporter la sélection
         import: Importer
+        member:
+          new: Nouveau membre
         menu_hidden: Masquer dans le menu
         moderate: Gérer les modérations
         newsletter:
           new: Nouvelle newsletter
-        participatory_space_private_user:
-          new: Nouvel utilisateur privé de l'espace participatif
         per_page: Par page
         permissions: Gérer les permissions
         restore: Restaurer
@@ -413,6 +416,17 @@ fr-CA:
           values:
             'false': 'Non'
             'true': 'Oui'
+        members:
+          user_invitation_accepted_at_not_null:
+            label: Invitation acceptée
+            values:
+              'false': Non acceptée
+              'true': Acceptée
+          user_invitation_sent_at_not_null:
+            label: Invitation envoyée
+            values:
+              'false': Non envoyée
+              'true': Envoyée
         moderated_users:
           reports_reason_eq:
             label: Raison du signalement
@@ -428,17 +442,6 @@ fr-CA:
           values:
             'false': Validé
             'true': Non validé
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Invitation acceptée
-            values:
-              'false': Non acceptée
-              'true': Acceptée
-          user_invitation_sent_at_not_null:
-            label: Invitation envoyée
-            values:
-              'false': Non envoyée
-              'true': Envoyée
         private_space_eq:
           label: Privé
           values:
@@ -571,6 +574,53 @@ fr-CA:
             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: Promouvoir un utilisateur représenté en utilisateur standard
             promote: Promouvoir
+      members:
+        create:
+          error: Une erreur s'est produite lors de l'ajout d'un membre pour cet espace participatif.
+          success: Accès membre créé avec succès.
+        destroy:
+          error: Un problème est survenu lors de la suppression d'un membre pour cet espace participatif.
+          success: Accès membre supprimé avec succès.
+        edit:
+          title: Modifier le membre
+          update: Mettre à jour
+        index:
+          import_via_csv: Importer via CSV
+          publish_all: Tout publier
+          title: Membre
+          unpublish_all: Tout dépublier
+        new:
+          create: Créer
+          title: Nouveau membre
+        publish_all:
+          error: Un problème est survenu lors de la publication de tous les membres de cet espace participatif.
+          success: Tous les membres ont été publiés avec succès pour cet espace participatif
+        unpublish_all:
+          error: Une erreur s'est produite lors de la dépublication de tous les membres de cet espace participatif.
+          success: Tous les membres de cet espace participatif ont été dépubliés avec succès
+        update:
+          error: Un problème est survenu lors de la mise à jour du membre pour cet espace participatif.
+          success: Membre mis à jour avec succès
+      members_csv_imports:
+        create:
+          invalid: Un problème est survenu lors de la lecture du fichier CSV. Veuillez vous assurer que vous avez suivi les instructions.
+          success: Fichier CSV transféré avec succès, nous envoyons un courriel d'invitation aux participants. Cela peut prendre un certain temps.
+        new:
+          csv_upload:
+            title: Téléchargez votre fichier CSV
+          destroy:
+            button: Supprimer tous les membres
+            confirm: Êtes-vous sûr(e) de vouloir supprimer tous les membres ? Cette action ne peut pas être annulée, vous ne pourrez pas les récupérer.
+            empty: Vous n'avez aucun membre.
+            explanation: Vus avez %{count} membres.
+            title: Supprimer les membres
+          example_file: 'Fichier d''exemple :'
+          explanation: 'Téléchargez votre fichier CSV. Il doit comporter deux colonnes, sans en-têtes, avec l''email dans la première colonne et le nom dans la dernière colonne du fichier des utilisateurs que vous voulez ajouter à l''espace participatif. Évitez d''utiliser des caractères invalides comme `<>?%&^*#@()[]=+:;"{}\|` dans le nom d''utilisateur.'
+          explanation_example: |
+            john.doe@example.org%{csv_col_sep}John Doe
+            jane.doe@example.org%{csv_col_sep}Jane Doe
+          title: Importer des membres via CSV
+          upload: Charger
       menu:
         admin_log: Journal d'activité personnel
         admins: Administrateurs
@@ -629,6 +679,8 @@ fr-CA:
             reason: Raison
             started_at: Commencé le
             user: Utilisateur
+        member:
+          name: Membre
         newsletter:
           fields:
             created_at: Créée le
@@ -637,8 +689,6 @@ fr-CA:
             sent_to: Envoyé à
             subject: Objet
           name: Bulletin d'information (newsletter)
-        participatory_space_private_user:
-          name: Utilisateur de l'espace participatif
         scope:
           fields:
             name: Titre
@@ -913,53 +963,6 @@ fr-CA:
         form:
           add: Ajouter à la liste autorisée
           title: Liste des domaines externes autorisés
-      participatory_space_private_users:
-        create:
-          error: Une erreur s'est produite lors de l'ajout d'un utilisateur pour cet espace participatif.
-          success: L'accès utilisateur à l'espace participatif privé a été créé avec succès.
-        destroy:
-          error: Une erreur s'est produite lors de la suppression d'un utilisateur privé pour cet espace participatif.
-          success: L'accès utilisateur à l'espace participatif privé a été supprimé avec succès.
-        edit:
-          title: Modifier le participant privé de l'espace participatif.
-          update: Mettre à jour
-        index:
-          import_via_csv: Importer via csv
-          publish_all: Tout publier
-          title: Utilisateur privé de l'espace participatif
-          unpublish_all: Tout dépublier
-        new:
-          create: Créer
-          title: Nouvel utilisateur privé de l'espace participatif.
-        publish_all:
-          error: Une erreur s'est produite lors de la publication de tous les participants privés pour cet espace participatif.
-          success: Tous les participants privés ont été publiés avec succès pour cet espace participatif
-        unpublish_all:
-          error: Une erreur s'est produite lors de la dépublication de tous les participants privés pour cet espace participatif.
-          success: Tous les participants privés ont été dépubliés avec succès pour cet espace participatif
-        update:
-          error: Une erreur s'est produite lors de la mise à jour du participant privé pour cet espace participatif.
-          success: Participant privé de l'espace participatif mis à jour avec succès
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: Un problème est survenu lors de la lecture du fichier CSV. Veuillez vous assurer que vous avez suivi les instructions.
-          success: Le fichier CSV a été téléchargé avec succès. Une invitation par courriel sera envoyée sous peu à chaque participant. Cela peut prendre quelques instants.
-        new:
-          csv_upload:
-            title: Téléchargez votre fichier CSV
-          destroy:
-            button: Supprimer tous les utilisateurs privés
-            confirm: Êtes-vous sûr de vouloir supprimer tous les utilisateurs privés ? Cette action est irréversible, vous ne pourrez pas les récupérer.
-            empty: Vous n'avez aucun utilisateur privé.
-            explanation: Vous avez %{count} utilisateurs privés.
-            title: Supprimer les utilisateurs privés
-          example_file: 'Fichier d''exemple :'
-          explanation: 'Téléchargez votre fichier CSV. Il doit avoir deux colonnes avec les emails dans la première colonne, et dans la seconde colonne les noms des utilisateurs que vous souhaitez ajouter à l''espace participatif, sans en-tête. Évitez les caractères spéciaux comme `<>?%&^*#@()[]=+:;"{}\|` dans les noms des utilisateurs.'
-          explanation_example: |
-            john.doe@example.org%{csv_col_sep}Jean Doe
-            jane.doe@example.org%{csv_col_sep}Jane Doe
-          title: Importer des participants privés via CSV
-          upload: Télécharger
       reminders:
         create:
           error: Il y a eu un problème lors de la création des rappels.
diff --git a/decidim-admin/config/locales/fr.yml b/decidim-admin/config/locales/fr.yml
index 45583581c9155..b5f72f245b03f 100644
--- a/decidim-admin/config/locales/fr.yml
+++ b/decidim-admin/config/locales/fr.yml
@@ -33,6 +33,11 @@ fr:
       help_section:
         content: Contenu
       id: ID
+      member:
+        email: Email
+        name: Nom
+      member_csv_import:
+        file: Fichier
       newsletter:
         body: Corps de texte
         send_to_all_users: Envoyer à tous les participants
@@ -90,11 +95,6 @@ fr:
         welcome_notification_body: Corps du mail de bienvenue
         welcome_notification_subject: Objet du mail de bienvenue
         youtube_handler: Gestionnaire YouTube
-      participatory_space_private_user:
-        email: Email
-        name: Nom
-      participatory_space_private_user_csv_import:
-        file: Fichier
       scope:
         code: Code
         name: Titre
@@ -124,10 +124,17 @@ fr:
         show_in_footer: Montrer dans le pied de page
         title: Titre
         weight: Rang d'affichage
+      taxonomy:
+        item_name: Nom de l’élément
+        parent_id: Parent
       user_group_csv_verification:
         file: Fichier
     errors:
       models:
+        member_csv_import:
+          attributes:
+            file:
+              malformed: Fichier d'importation mal formé, veuillez lire attentivement les instructions et assurez-vous que le fichier est encodé en UTF-8.
         newsletter:
           attributes:
             base:
@@ -136,10 +143,6 @@ fr:
           attributes:
             official_img_footer:
               allowed_file_content_types: Fichier image invalide
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Fichier d'importation mal formé, veuillez lire attentivement les instructions et assurez-vous que le fichier est encodé en UTF-8.
         user_group_csv_verification:
           attributes:
             file:
@@ -187,12 +190,12 @@ fr:
         export: Exporter
         export-selection: Exporter la sélection
         import: Importer
+        member:
+          new: Nouveau membre
         menu_hidden: Masquer dans le menu
         moderate: Gérer les modérations
         newsletter:
           new: Nouvelle newsletter
-        participatory_space_private_user:
-          new: Nouvel utilisateur privé de l'espace participatif
         per_page: Par page
         permissions: Gérer les permissions
         restore: Restaurer
@@ -413,6 +416,17 @@ fr:
           values:
             'false': 'Non'
             'true': 'Oui'
+        members:
+          user_invitation_accepted_at_not_null:
+            label: Invitation acceptée
+            values:
+              'false': Non acceptée
+              'true': Acceptée
+          user_invitation_sent_at_not_null:
+            label: Invitation envoyée
+            values:
+              'false': Non envoyée
+              'true': Envoyée
         moderated_users:
           reports_reason_eq:
             label: Raison du signalement
@@ -428,17 +442,6 @@ fr:
           values:
             'false': Validé
             'true': Non validé
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Invitation acceptée
-            values:
-              'false': Non acceptée
-              'true': Acceptée
-          user_invitation_sent_at_not_null:
-            label: Invitation envoyée
-            values:
-              'false': Non envoyée
-              'true': Envoyée
         private_space_eq:
           label: Privé
           values:
@@ -571,6 +574,53 @@ fr:
             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: Promouvoir un utilisateur représenté en utilisateur standard
             promote: Promouvoir
+      members:
+        create:
+          error: Une erreur s'est produite lors de l'ajout d'un membre pour cet espace participatif.
+          success: Accès membre créé avec succès.
+        destroy:
+          error: Un problème est survenu lors de la suppression d'un membre pour cet espace participatif.
+          success: Accès membre supprimé avec succès.
+        edit:
+          title: Modifier le membre
+          update: Mettre à jour
+        index:
+          import_via_csv: Importer via CSV
+          publish_all: Tout publier
+          title: Membre
+          unpublish_all: Tout dépublier
+        new:
+          create: Créer
+          title: Nouveau membre
+        publish_all:
+          error: Un problème est survenu lors de la publication de tous les membres de cet espace participatif.
+          success: Tous les membres ont été publiés avec succès pour cet espace participatif
+        unpublish_all:
+          error: Une erreur s'est produite lors de la dépublication de tous les membres de cet espace participatif.
+          success: Tous les membres de cet espace participatif ont été dépubliés avec succès
+        update:
+          error: Un problème est survenu lors de la mise à jour du membre pour cet espace participatif.
+          success: Membre mis à jour avec succès
+      members_csv_imports:
+        create:
+          invalid: Un problème est survenu lors de la lecture du fichier CSV. Veuillez vous assurer que vous avez suivi les instructions.
+          success: Fichier CSV transféré avec succès, nous envoyons un courriel d'invitation aux participants. Cela peut prendre un certain temps.
+        new:
+          csv_upload:
+            title: Téléchargez votre fichier CSV
+          destroy:
+            button: Supprimer tous les membres
+            confirm: Êtes-vous sûr(e) de vouloir supprimer tous les membres ? Cette action ne peut pas être annulée, vous ne pourrez pas les récupérer.
+            empty: Vous n'avez aucun membre.
+            explanation: Vus avez %{count} membres.
+            title: Supprimer les membres
+          example_file: 'Fichier d''exemple :'
+          explanation: 'Téléchargez votre fichier CSV. Il doit comporter deux colonnes, sans en-têtes, avec l''email dans la première colonne et le nom dans la dernière colonne du fichier des utilisateurs que vous voulez ajouter à l''espace participatif. Évitez d''utiliser des caractères invalides comme `<>?%&^*#@()[]=+:;"{}\|` dans le nom d''utilisateur.'
+          explanation_example: |
+            john.doe@example.org%{csv_col_sep}John Doe
+            jane.doe@example.org%{csv_col_sep}Jane Doe
+          title: Importer des membres via CSV
+          upload: Charger
       menu:
         admin_log: Journal d'activité personnel
         admins: Administrateurs
@@ -629,6 +679,8 @@ fr:
             reason: Raison
             started_at: Commencé le
             user: Utilisateur
+        member:
+          name: Membre
         newsletter:
           fields:
             created_at: Créée le
@@ -637,8 +689,6 @@ fr:
             sent_to: Envoyé à
             subject: Objet
           name: Bulletin d'information (newsletter)
-        participatory_space_private_user:
-          name: Utilisateur de l'espace participatif
         scope:
           fields:
             name: Titre
@@ -913,53 +963,6 @@ fr:
         form:
           add: Ajouter à la liste autorisée
           title: Liste des domaines externes autorisés
-      participatory_space_private_users:
-        create:
-          error: Une erreur s'est produite lors de l'ajout d'un utilisateur pour cet espace participatif.
-          success: L'accès utilisateur à l'espace participatif privé a été créé avec succès.
-        destroy:
-          error: Une erreur s'est produite lors de la suppression d'un utilisateur privé pour cet espace participatif.
-          success: L'accès utilisateur à l'espace participatif privé a été supprimé avec succès.
-        edit:
-          title: Modifier le participant privé de l'espace participatif.
-          update: Mettre à jour
-        index:
-          import_via_csv: Importer via csv
-          publish_all: Tout publier
-          title: Utilisateur privé de l'espace participatif
-          unpublish_all: Tout dépublier
-        new:
-          create: Créer
-          title: Nouvel utilisateur privé de l'espace participatif.
-        publish_all:
-          error: Une erreur s'est produite lors de la publication de tous les participants privés pour cet espace participatif.
-          success: Tous les participants privés ont été publiés avec succès pour cet espace participatif
-        unpublish_all:
-          error: Une erreur s'est produite lors de la dépublication de tous les participants privés pour cet espace participatif.
-          success: Tous les participants privés ont été dépubliés avec succès pour cet espace participatif
-        update:
-          error: Une erreur s'est produite lors de la mise à jour du participant privé pour cet espace participatif.
-          success: Participant privé de l'espace participatif mis à jour avec succès
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: Un problème est survenu lors de la lecture du fichier CSV. Veuillez vous assurer que vous avez suivi les instructions.
-          success: Le fichier CSV a été téléchargé avec succès. Une invitation par courriel sera envoyée sous peu à chaque participant. Cela peut prendre quelques instants. 
-        new:
-          csv_upload:
-            title: Téléchargez votre fichier CSV
-          destroy:
-            button: Supprimer tous les utilisateurs privés
-            confirm: Êtes-vous sûr de vouloir supprimer tous les utilisateurs privés ? Cette action est irréversible, vous ne pourrez pas les récupérer.
-            empty: Vous n'avez aucun utilisateur privé.
-            explanation: Vous avez %{count} utilisateurs privés.
-            title: Supprimer les utilisateurs privés
-          example_file: 'Fichier d''exemple :'
-          explanation: 'Téléchargez votre fichier CSV. Il doit avoir deux colonnes avec les emails dans la première colonne, et dans la seconde colonne les noms des utilisateurs que vous souhaitez ajouter à l''espace participatif, sans en-tête. Évitez les caractères spéciaux comme `<>?%&^*#@()[]=+:;"{}\|` dans les noms des utilisateurs.'
-          explanation_example: |
-            john.doe@example.org%{csv_col_sep}Jean Doe
-            jane.doe@example.org%{csv_col_sep}Jane Doe
-          title: Importer des participants privés via CSV
-          upload: Télécharger
       reminders:
         create:
           error: Il y a eu un problème lors de la création des rappels.
diff --git a/decidim-admin/config/locales/ga-IE.yml b/decidim-admin/config/locales/ga-IE.yml
index 9fb5d2f081afa..094e97afd281c 100644
--- a/decidim-admin/config/locales/ga-IE.yml
+++ b/decidim-admin/config/locales/ga-IE.yml
@@ -125,13 +125,6 @@ ga:
             label: Cineál
         officialized_at_null:
           label: Staid
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            values:
-              'true': Glactha
-          user_invitation_sent_at_not_null:
-            values:
-              'true': Seolta
         private_space_eq:
           label: Príobháideach
           values:
@@ -280,12 +273,6 @@ ga:
           social_handlers: Sóisialta
           url: URL
           youtube: YouTube
-      participatory_space_private_users:
-        new:
-          create: Cruthaigh
-      participatory_space_private_users_csv_imports:
-        new:
-          upload: Uaslódáil
       resource_permissions:
         edit:
           submit: Deimhnigh
diff --git a/decidim-admin/config/locales/gl.yml b/decidim-admin/config/locales/gl.yml
index 6c6eae640f101..0bf5b472bccac 100644
--- a/decidim-admin/config/locales/gl.yml
+++ b/decidim-admin/config/locales/gl.yml
@@ -136,8 +136,6 @@ gl:
         import: Importar
         newsletter:
           new: Novo boletín
-        participatory_space_private_user:
-          new: Novo usuario privado do espazo participativo
         per_page: Por páxina
         share: Compartir
         user:
@@ -295,17 +293,6 @@ gl:
           values:
             'false': Oficializado
             'true': Non oficializado
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Invitación aceptada
-            values:
-              'false': Non aceptada
-              'true': Aceptada
-          user_invitation_sent_at_not_null:
-            label: Invitación enviada
-            values:
-              'false': Sen enviar
-              'true': Enviada
         private_space_eq:
           label: Privado
           values:
@@ -411,6 +398,10 @@ gl:
             explanation: Os usuarios xestionados poden ser promocionados a usuarios estándar. Isto significa que serán invitados á aplicación e non poderás suplantarlles de novo. O usuario invitado recibirá un correo electrónico para aceptar a túa invitación.
             new_managed_user_promotion: Nova promoción de usuarios xestionados
             promote: Promover
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: Carga o teu ficheiro CSV
       menu:
         admin_log: Rexistro de actividade do administrador
         admins: Administradores
@@ -465,8 +456,6 @@ gl:
             sent_to: Enviado a
             subject: Asunto
           name: Boletín informativo
-        participatory_space_private_user:
-          name: Espazo participativo usuario privado
         scope:
           fields:
             name: Nome
@@ -627,24 +616,6 @@ gl:
         update:
           error: Produciuse un erro ao actualizar esta organización.
           success: A organización actualizouse con éxito.
-      participatory_space_private_users:
-        create:
-          error: Produciuse un erro engadindo un usuario privado a este espazo participativo.
-          success: O acceso ao usuario privado do espazo participativo creouse con éxito.
-        destroy:
-          error: Produciuse un erro ao eliminar un usuario privado deste espazo participativo.
-          success: O acceso ao usuario privado do espazo participativo foi destruído con éxito.
-        index:
-          import_via_csv: Importar a través de CSV
-          title: Espazo participativo usuario privado
-        new:
-          create: Crear
-          title: Novo usuario privado do espazo participativo.
-      participatory_space_private_users_csv_imports:
-        new:
-          csv_upload:
-            title: Carga o teu ficheiro CSV
-          upload: Subir
       reminders:
         create:
           error: Produciuse un problema ao crear os recordatorios.
diff --git a/decidim-admin/config/locales/hu.yml b/decidim-admin/config/locales/hu.yml
index a2c7d600bcda1..9ce2a0b95bb0d 100644
--- a/decidim-admin/config/locales/hu.yml
+++ b/decidim-admin/config/locales/hu.yml
@@ -89,9 +89,6 @@ hu:
         welcome_notification_body: Üdvözlő értesítés szövegtörzse
         welcome_notification_subject: Üdvözlő üzenet tárgya
         youtube_handler: YouTube kezelő
-      participatory_space_private_user:
-        email: Email
-        name: Név
       scope:
         code: Kód
         name: Név
@@ -133,10 +130,6 @@ hu:
           attributes:
             official_img_footer:
               allowed_file_content_types: Érvénytelen képfájl
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Hibás importfájl, kérjük, olvassa el figyelmesen az utasításokat, és győződjön meg róla, hogy a fájl UTF-8 kódolású.
         user_group_csv_verification:
           attributes:
             file:
@@ -175,8 +168,6 @@ hu:
         import: Import
         newsletter:
           new: Új hírlevél
-        participatory_space_private_user:
-          new: Új privát felhasználó a részvételi térben
         per_page: Oldalanként
         send_me_a_test_email: Teszt e-mail küldése
         share: Megosztás
@@ -382,17 +373,6 @@ hu:
           values:
             'false': Hivatalos
             'true': Nem hivatalos
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Meghívás elfogadva
-            values:
-              'false': Nincs elfogadva
-              'true': Elfogadva
-          user_invitation_sent_at_not_null:
-            label: Meghívó kiküldve
-            values:
-              'false': Nincs elküldve
-              'true': Elküldve
         private_space_eq:
           label: Magán
           values:
@@ -510,6 +490,10 @@ hu:
             explanation: A kezelt résztvevők sztenderd résztvevőkké alakíthatóak. Ez azt jelenti, hogy meghívást kapnak az alkalmazáshoz és nem lehet őket újra kezelni. Erről emailben kapnak értesítést.
             new_managed_user_promotion: Új résztvevő előléptetése
             promote: Előléptetés
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: Töltse fel a CSV fájlját
       menu:
         admin_log: Admin tevékenységnapló
         admins: Adminok
@@ -569,8 +553,6 @@ hu:
             sent_to: Címzett
             subject: Tárgy
           name: Hírlevél
-        participatory_space_private_user:
-          name: Részvételi tér privát felhasználó
         scope:
           fields:
             name: Név
@@ -764,38 +746,6 @@ hu:
         form:
           add: Hozzáadás az engedélyezett listához
           title: Engedélyezett külső domainek listája
-      participatory_space_private_users:
-        create:
-          error: Hiba történt egy privát felhasználó hozzáadása során a részvételi helyhez.
-          success: Magán résztvevő részvételi helyhez való hozzáférése biztosítva.
-        destroy:
-          error: Hiba történt egy privát felhasználó törlésével a részvételi helyen.
-          success: Privát felhasználó részvételi helyhez való hozzáférése törölve.
-        index:
-          import_via_csv: Importálás CSV -ből
-          title: Részvételi tér privát felhasználója
-        new:
-          create: Létrehozás
-          title: Új részvételi tér privát felhasználója.
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: Probléma adódott a CSV fájl beolvasásával. Kérjük, győződjön meg róla, hogy követte az utasításokat.
-          success: A CSV fájl sikeresen feltöltődött, meghívó e-mailt küldünk a résztvevőknek. Ez eltarthat egy ideig.
-        new:
-          csv_upload:
-            title: Töltse fel a CSV fájlját
-          destroy:
-            button: Az összes privát felhasználó törlése
-            confirm: Biztos, hogy törölni szeretné az összes privát résztvevőt? Ezt a műveletet nem lehet visszacsinálni, nem tudja majd visszaállítani őket.
-            empty: Nincsenek privát résztvevők.
-            explanation: '%{count} privát résztvevője van.'
-            title: Privát felhasználók törlése
-          example_file: 'Példa fájl:'
-          explanation: 'Töltse fel a CSV-fájlt. Két oszlopnak kell lennie, a fájl első oszlopában az e-mail címmel, a fájl utolsó oszlopában pedig a nevével azoknak a felhasználóknak, akiket hozzá szeretne adni a részvételi térhez, fejlécek nélkül. Kerülje az olyan érvénytelen karakterek használatát, mint a `<>?%&^*#@()[]=+:;"{}\|` a felhasználói névben.'
-          explanation_example: |
-            ohn.doe@example.org%{csv_col_sep}John Doe
-            jane.doe@example.org%{csv_col_sep}Jane Doe
-          upload: Feltölt
       reminders:
         create:
           error: Hiba történt a bejegyzés létrehozása során.
diff --git a/decidim-admin/config/locales/id-ID.yml b/decidim-admin/config/locales/id-ID.yml
index f8ba11fe5883b..b14eae5265078 100644
--- a/decidim-admin/config/locales/id-ID.yml
+++ b/decidim-admin/config/locales/id-ID.yml
@@ -252,6 +252,10 @@ id:
             explanation: Pengguna yang dikelola dapat dipromosikan ke pengguna standar. Ini berarti mereka akan diundang ke aplikasi dan Anda tidak akan dapat meniru mereka lagi. Pengguna yang diundang akan menerima email untuk menerima undangan Anda.
             new_managed_user_promotion: Promosi pengguna terkelola baru
             promote: Memajukan
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: Unggah file CSV Anda
       menu:
         admin_log: Log aktivitas admin
         admins: Admin
@@ -304,8 +308,6 @@ id:
             sent_at: Dikirim pada
             subject: Subyek
           name: Newsletter
-        participatory_space_private_user:
-          name: Ruang partisipatif pengguna pribadi
         scope:
           fields:
             name: Nama
@@ -394,22 +396,6 @@ id:
         update:
           error: Terjadi kesalahan saat memperbarui organisasi ini.
           success: Organisasi berhasil diperbarui.
-      participatory_space_private_users:
-        create:
-          error: Terjadi kesalahan saat menambahkan pengguna pribadi untuk ruang partisipatif ini.
-          success: Ruang partisipatif akses pengguna pribadi berhasil dibuat.
-        destroy:
-          error: Terjadi kesalahan saat menghapus pengguna pribadi untuk ruang partisipatif ini.
-          success: Akses pribadi pengguna ruang partisipatif berhasil dihancurkan.
-        index:
-          title: Ruang partisipatif pengguna pribadi
-        new:
-          create: Membuat
-          title: Pengguna Pribadi Ruang Partisipatif Baru.
-      participatory_space_private_users_csv_imports:
-        new:
-          csv_upload:
-            title: Unggah file CSV Anda
       resource_permissions:
         edit:
           submit: Menyerahkan
diff --git a/decidim-admin/config/locales/is-IS.yml b/decidim-admin/config/locales/is-IS.yml
index 4c018a35817b4..47a18659a6241 100644
--- a/decidim-admin/config/locales/is-IS.yml
+++ b/decidim-admin/config/locales/is-IS.yml
@@ -359,9 +359,6 @@ is-IS:
           youtube: Youtube
         update:
           success: Skipulag uppfærður með góðum árangri.
-      participatory_space_private_users:
-        new:
-          create: Búa til
       resource_permissions:
         edit:
           title: Breyta heimildum
diff --git a/decidim-admin/config/locales/it.yml b/decidim-admin/config/locales/it.yml
index 798fa3ebc83b2..ff9989aa948f8 100644
--- a/decidim-admin/config/locales/it.yml
+++ b/decidim-admin/config/locales/it.yml
@@ -89,11 +89,6 @@ it:
         welcome_notification_body: Testo del messaggio di Benvenuto
         welcome_notification_subject: Oggetto della mail con messaggio di Benvenuto
         youtube_handler: Gestore di YouTube
-      participatory_space_private_user:
-        email: Email
-        name: Nome
-      participatory_space_private_user_csv_import:
-        file: File
       scope:
         code: Codice
         name: Nome
@@ -135,10 +130,6 @@ it:
           attributes:
             official_img_footer:
               allowed_file_content_types: File immagine non valido
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: File di importazione malformato, leggere attentamente le istruzioni e assicurarsi che il file sia codificato UTF-8.
         user_group_csv_verification:
           attributes:
             file:
@@ -186,8 +177,6 @@ it:
         import: Importazione
         newsletter:
           new: Nuova newsletter
-        participatory_space_private_user:
-          new: Nuovo utente dello spazio partecipativo privato
         per_page: Per pagina
         restore: Ripristina
         send_me_a_test_email: Inviami una email di prova
@@ -418,17 +407,6 @@ it:
           values:
             'false': Ufficializzato
             'true': Non ufficializzato
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Invito accettato
-            values:
-              'false': Non accettato
-              'true': Accettato
-          user_invitation_sent_at_not_null:
-            label: Invito inviato
-            values:
-              'false': Non inviato
-              'true': Inviato
         private_space_eq:
           label: Privato
           values:
@@ -560,6 +538,10 @@ it:
             explanation: I partecipanti gestiti possono essere promossi a partecipanti standard. Significa che saranno invitati ad effettuare la richiesta e non sarai in grado di gestirli di nuovo. Il partecipante invitato riceverà un'email per accettare il tuo invito.
             new_managed_user_promotion: Nuova promozione di partecipanti gestiti
             promote: Promuovere
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: Carica il tuo file CSV
       menu:
         admin_log: Registro delle attività di amministrazione
         admins: Amministratori
@@ -626,8 +608,6 @@ it:
             sent_to: Inviato a
             subject: Oggetto
           name: Newsletter
-        participatory_space_private_user:
-          name: Partecipante privato allo spazio partecipativo
         scope:
           fields:
             name: Nome
@@ -895,53 +875,6 @@ it:
         form:
           add: Aggiungi alla lista consentita
           title: Elenco di domini esterni consentiti
-      participatory_space_private_users:
-        create:
-          error: Si è verificato un errore durante l'aggiunta di un utente privato per questo spazio partecipativo.
-          success: Accesso utente privato spazio partecipativo creato con successo.
-        destroy:
-          error: Si è verificato un errore durante l'eliminazione di un utente privato per questo spazio partecipativo.
-          success: Accesso utente privato spazio distruttivo distrutto con successo.
-        edit:
-          title: Modifica partecipante privato allo spazio partecipativo.
-          update: Aggiorna
-        index:
-          import_via_csv: Importa da CSV
-          publish_all: Pubblica tutto
-          title: Utente privato dello spazio partecipativo
-          unpublish_all: Annulla la pubblicazione di tutto
-        new:
-          create: Creare
-          title: Nuovo utente privato dello spazio partecipativo.
-        publish_all:
-          error: Si è verificato un errore durante l'aggiunta degli utenti privati per questo spazio partecipativo.
-          success: Ha pubblicato con successo tutti i partecipanti privati per questo spazio partecipativo
-        unpublish_all:
-          error: Si è verificato un problema di annullamento della pubblicazione di tutti i partecipanti privati per questo spazio partecipativo.
-          success: Tutti i partecipanti privati per questo spazio partecipativo sono stati rimossi dalla pubblicazione con successo
-        update:
-          error: Si è verificato un errore durante l'aggiornamento dell'utente privato per questo spazio partecipativo.
-          success: Utente privato dello spazio partecipativo aggiornato con successo
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: Si è verificato un problema durante la lettura del file CSV. Assicurati di aver seguito le istruzioni.
-          success: File CSV caricato con successo, stiamo inviando un'email di invito ai partecipanti. Potrebbe richiedere un po' di tempo.
-        new:
-          csv_upload:
-            title: Carica il tuo file CSV
-          destroy:
-            button: Elimina tutti i partecipanti privati
-            confirm: Sei sicuro di voler eliminare tutti i partecipanti privati? Questa azione non può essere annullata, non sarai in grado di recuperarli.
-            empty: Non hai partecipanti privati.
-            explanation: Hai %{count} partecipanti privati.
-            title: Elimina tutti i partecipanti privati
-          example_file: 'File di esempio:'
-          explanation: 'Carica il file CSV. Il file deve contenere due colonne (e-mail e nome) senza intestazioni: nella prima sono elencati gli indirizzi e-mail degli utenti che si desidera aggiungere allo spazio partecipativo, nella seconda i loro nomi. Evita di usare caratteri non validi come `<>?%&^*#@()[]=+:;"{}\|` nella colonna dei nomi.'
-          explanation_example: |
-            john.doe@example.org%{csv_col_sep}John Doe
-            jane.doe@example.org%{csv_col_sep}Jane Doe
-          title: Importa partecipanti privati tramite CSV
-          upload: Carica File
       reminders:
         create:
           error: Si è verificato un errore durante la creazione dei promemoria.
diff --git a/decidim-admin/config/locales/ja.yml b/decidim-admin/config/locales/ja.yml
index 4b8dcfef4ca01..61c0034ee41e5 100644
--- a/decidim-admin/config/locales/ja.yml
+++ b/decidim-admin/config/locales/ja.yml
@@ -33,8 +33,14 @@ ja:
       help_section:
         content: 内容
       id: ID
+      member:
+        email: メールアドレス
+        name: 名前
+      member_csv_import:
+        file: ファイル
       newsletter:
         body: 本文
+        send_to_all_users: 全参加者に送信
         send_to_followers: フォロワーに送信
         send_to_participants: 参加者に送信
         subject: 件名
@@ -90,11 +96,6 @@ ja:
         welcome_notification_body: ウェルカム通知本文
         welcome_notification_subject: ウェルカム通知の件名
         youtube_handler: YouTube ハンドラー
-      participatory_space_private_user:
-        email: Eメールアドレス
-        name: 名前
-      participatory_space_private_user_csv_import:
-        file: ファイル
       scope:
         code: コード
         name: 名前
@@ -124,10 +125,17 @@ ja:
         show_in_footer: フッターに表示
         title: タイトル
         weight: 順番の位置
+      taxonomy:
+        item_name: アイテム名
+        parent_id: 親
       user_group_csv_verification:
         file: ファイル
     errors:
       models:
+        member_csv_import:
+          attributes:
+            file:
+              malformed: インポートファイルの形式が正しくありません。指示内容をよく読み、ファイルがUTF-8でエンコードされていることを確認してください。
         newsletter:
           attributes:
             base:
@@ -136,10 +144,6 @@ ja:
           attributes:
             official_img_footer:
               allowed_file_content_types: 無効な画像ファイル
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: インポートファイルの形式が正しくありません。手順を見直して、ファイルがUTF-8でエンコードされていることを確認してください。
         user_group_csv_verification:
           attributes:
             file:
@@ -187,12 +191,12 @@ ja:
         export: エクスポート
         export-selection: 選択したものをエクスポート
         import: インポート
+        member:
+          new: 新規メンバー
         menu_hidden: メニューから隠す
         moderate: モデレーションの管理
         newsletter:
           new: 新しいニュースレター
-        participatory_space_private_user:
-          new: 新しい参加型スペースのプライベートユーザー
         per_page: ページごと
         permissions: 権限の管理
         restore: 復元
@@ -292,11 +296,13 @@ ja:
       block_user:
         bulk_new:
           action: アカウントをブロックして理由を送信
+          already_reported_html: この操作を続行すると、参加者のコンテンツもすべて非表示になります。
           description: ユーザーをブロックすると、そのアカウントは利用できなくなります。ユーザーのブロックを解除することを検討する方法に関するガイドラインを判定通知に含めることができます。
           justification: 判定理由
           title: ユーザーをブロック
         new:
           action: アカウントをブロックして理由を送信
+          already_reported_html: この操作を続行すると、参加者のコンテンツもすべて非表示になります。
           description: ユーザーをブロックすると、そのアカウントは利用できなくなります。ユーザーのブロックを解除することを検討する方法に関するガイドラインを判定通知に含めることができます。
           justification: 判定理由
           title: ユーザー %{name} をブロックする
@@ -389,6 +395,7 @@ ja:
         form:
           domain_too_short: ドメインが短すぎます
         update:
+          error: 許可された外部ドメインのリストを更新できませんでした。
           success: 許可された外部ドメインのリストを更新しました。
       exports:
         export_as: "%{name} を %{export_format} 形式で取得"
@@ -410,6 +417,17 @@ ja:
           values:
             'false': 'いいえ'
             'true': 'はい'
+        members:
+          user_invitation_accepted_at_not_null:
+            label: 招待が承認されました
+            values:
+              'false': 未承認
+              'true': 承認済み
+          user_invitation_sent_at_not_null:
+            label: 招待状を送信しました
+            values:
+              'false': 未送信
+              'true': 送信済み
         moderated_users:
           reports_reason_eq:
             label: 理由を報告
@@ -425,17 +443,6 @@ ja:
           values:
             'false': 公式化済み
             'true': 公式化されていない
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: 招待が承認されました
-            values:
-              'false': 未承認
-              'true': 承認済み
-          user_invitation_sent_at_not_null:
-            label: 招待状の送信
-            values:
-              'false': 未送信
-              'true': 送信済み
         private_space_eq:
           label: プライベート
           values:
@@ -473,6 +480,7 @@ ja:
           import_csv:
             explanation: 'ファイルのガイダンス:'
             message_1: CSVファイルがサポートされています
+            message_2: "電子メールデータを含む.csvファイル"
       help_sections:
         error: ヘルプセクションの更新中に問題が発生しました。
         form:
@@ -563,6 +571,53 @@ ja:
             explanation: 管理対象参加者は通常の参加者に昇格することができます。 その場合、彼らはアプリケーションに招待され、あなたはそれらを再び管理することはできなくなります。 招待された参加者は、招待を承諾するためのメールを受け取ります。
             new_managed_user_promotion: 新しい管理対象参加者の昇格
             promote: プロモート
+      members:
+        create:
+          error: 参加型スペースにメンバーを追加する際に問題が発生しました。
+          success: メンバーを作成しました。
+        destroy:
+          error: 参加型スペースのメンバーの削除中に問題が発生しました。
+          success: メンバーを削除しました。
+        edit:
+          title: メンバーを編集
+          update: 更新
+        index:
+          import_via_csv: CSV形式でインポート
+          publish_all: すべて公開
+          title: メンバー
+          unpublish_all: すべて非公開
+        new:
+          create: 作成
+          title: 新規メンバー
+        publish_all:
+          error: 参加スペースのすべてのメンバーを公開する際に問題が発生しました。
+          success: 参加スペースのすべてのメンバーを公開しました
+        unpublish_all:
+          error: 参加スペースのすべてのメンバーを非公開にする際に問題が発生しました。
+          success: 参加スペースのすべてのメンバーを非公開にしました
+        update:
+          error: 参加スペースのメンバーを更新する際に問題がありました。
+          success: メンバーを更新しました
+      members_csv_imports:
+        create:
+          invalid: CSVファイルの読み込み中に問題が発生しました。指示に従って正しく操作されているかご確認ください。
+          success: CSVファイルのアップロードが完了しました。参加者に招待メールを送信中です。完了までしばらくお待ちください。
+        new:
+          csv_upload:
+            title: CSVファイルをアップロード
+          destroy:
+            button: すべてのメンバーを削除
+            confirm: すべてのメンバーを削除してもよろしいですか？この操作は元に戻せません。復元することはできません。
+            empty: メンバーがいません。
+            explanation: '%{count} 名のメンバーがいます。'
+            title: メンバーを削除
+          example_file: 'サンプルファイル：'
+          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
+          title: CSV形式でメンバーをインポート
+          upload: アップロード
       menu:
         admin_log: 管理者アクティビティログ
         admins: 管理者
@@ -621,6 +676,8 @@ ja:
             reason: 理由：
             started_at: 開始日時
             user: 参加者
+        member:
+          name: メンバー
         newsletter:
           fields:
             created_at: 作成日時
@@ -629,8 +686,6 @@ ja:
             sent_to: '送信先:'
             subject: 件名
           name: ニュースレター
-        participatory_space_private_user:
-          name: 参加型スペースプライベート参加者
         scope:
           fields:
             name: 名前
@@ -905,53 +960,6 @@ ja:
         form:
           add: 許可されたリストに追加
           title: 許可された外部ドメインのリスト
-      participatory_space_private_users:
-        create:
-          error: この参加型スペースにプライベート参加者を追加する際に問題が発生しました。
-          success: 参加型スペースのプライベート参加者アクセスが正常に作成されました。
-        destroy:
-          error: この参加型スペースのプライベート参加者を削除する際に問題が発生しました。
-          success: 参加型スペースのプライベート参加者アクセスが正常に破棄されました。
-        edit:
-          title: 参加スペースの非公開参加者を編集します。
-          update: 更新
-        index:
-          import_via_csv: CSV形式でインポート
-          publish_all: すべて公開
-          title: 参加型スペースプライベート参加者
-          unpublish_all: すべて非公開
-        new:
-          create: 作成
-          title: 新しい参加型スペースのプライベート参加者。
-        publish_all:
-          error: この参加型スペースのすべてのプライベート参加者を公開する際に問題が発生しました。
-          success: この参加型スペースのすべてのプライベート参加者を公開しました
-        unpublish_all:
-          error: この参加型スペースのすべてのプライベート参加者を非公開にする際に問題が発生しました。
-          success: この参加型スペースのすべてのプライベート参加者を非公開にしました
-        update:
-          error: この参加型スペースのプライベート参加者の更新中に問題が発生しました。
-          success: 参加型スペースのプライベート参加者を更新しました
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: CSVファイルの読み込み中に問題が発生しました。手順を確認してください。
-          success: CSVファイルは正常にアップロードされました。参加者に招待メールを送信しています。しばらくお待ちください。
-        new:
-          csv_upload:
-            title: CSVファイルをアップロード
-          destroy:
-            button: すべてのプライベート参加者を削除
-            confirm: すべてのプライベート参加者を削除してもよろしいですか？この操作は元に戻せず、削除された方を復元することはできません。
-            empty: プライベートの参加者はいません。
-            explanation: '%{count} 人のプライベート参加者がいます。'
-            title: プライベート参加者を削除
-          example_file: 'サンプルファイル:'
-          explanation: 'CSV ファイルをアップロードします。 CSVにはヘッダをつけず、最初のカラムにはメールアドレスを、次のカラムにはユーザー名を入れた2カラムのCSVとして、参加スペースに追加したいユーザーの情報を並べてください。 ユーザー名には `<>?%&^*#@()[]=+:;"{}\|`のような無効な文字を使用しないでください。'
-          explanation_example: |
-            john.doe@example.org%{csv_col_sep}John Doe
-            jane.doe@example.org%{csv_col_sep}Jane Doe
-          title: プライベート参加者をCSV形式でインポート
-          upload: アップロード
       reminders:
         create:
           error: リマインダー作成中に問題が発生しました。
@@ -1257,6 +1265,7 @@ ja:
           last_day: 直近24時間
           last_month: 直近1ヶ月間
           last_week: 直近1週間
+          no_users_count_statistics_yet: 参加者数の統計データはまだありません。
           participants: 参加者
     forms:
       errors:
diff --git a/decidim-admin/config/locales/kaa.yml b/decidim-admin/config/locales/kaa.yml
index 0b3071af7cc60..5426820b34eef 100644
--- a/decidim-admin/config/locales/kaa.yml
+++ b/decidim-admin/config/locales/kaa.yml
@@ -12,8 +12,6 @@ kaa:
         name: Ataması
       organization:
         name: Ataması
-      participatory_space_private_user:
-        email: Elektron pochta
       user_group_csv_verification:
         file: Fayl
   activerecord:
@@ -144,12 +142,6 @@ kaa:
           instagram: Instagram
           url: URL
           youtube: YouTube
-      participatory_space_private_users:
-        new:
-          create: Jaratıw
-      participatory_space_private_users_csv_imports:
-        new:
-          upload: Júklew
       reminders:
         new:
           submit: Jiberiw
diff --git a/decidim-admin/config/locales/ko.yml b/decidim-admin/config/locales/ko.yml
index 51900de0a8190..f5487f68cdb53 100644
--- a/decidim-admin/config/locales/ko.yml
+++ b/decidim-admin/config/locales/ko.yml
@@ -66,9 +66,6 @@ ko:
         twitter_handler: X handler
         warning_color: 경고
         youtube_handler: YouTube handler
-      participatory_space_private_user:
-        email: 이메일
-        name: 이름
       scope:
         code: 코드
         name: 이름
@@ -106,10 +103,6 @@ ko:
           attributes:
             official_img_footer:
               allowed_file_content_types: 잘못된 이미지 파일
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: 잘못된 형식의 가져오기 파일입니다. 설명서를 잘 읽고 UTF-8이 인코딩되었는지 확인하십시오.
         user_group_csv_verification:
           attributes:
             file:
@@ -145,8 +138,6 @@ ko:
         import: 가져오기
         newsletter:
           new: 새 뉴스레터
-        participatory_space_private_user:
-          new: 새 참여 공간 비공개 사용자
         per_page: 페이지 당
         send_me_a_test_email: 나에게 테스트 메일 보내기
         share: 공유
@@ -306,10 +297,6 @@ ko:
             label: 유형
         officialized_at_null:
           label: 상태
-        participatory_space_private_users:
-          user_invitation_sent_at_not_null:
-            values:
-              'true': 전송됨
         private_space_eq:
           label: 비공개
           values:
@@ -429,8 +416,6 @@ ko:
             sent_to: 다음에 전송하였습니다
             subject: 주제
           name: 뉴스 레터
-        participatory_space_private_user:
-          name: 참여공간 비공개참여
         scope:
           fields:
             name: 이름
@@ -531,20 +516,6 @@ ko:
           hidden: 숨겨짐
           show: 표시
           title: 참가자의 이메일 주소 보기
-      participatory_space_private_users:
-        new:
-          create: 생성
-      participatory_space_private_users_csv_imports:
-        new:
-          csv_upload:
-            title: CSV 파일 업로드
-          destroy:
-            button: 모든 비공개 참가자 삭제
-            confirm: 모든 비공개 참가자를 삭제하시겠습니까? 이 작업은 취소할 수 없습니다. 복구할 수 없습니다.
-            empty: 비공개 참가자가 없습니다.
-            explanation: '%{count} 개의 비공개 참가자가 있습니다.'
-            title: 비공개 참가자 삭제
-          example_file: '예제 파일:'
       reminders:
         create:
           error: 리마인더를 만드는 중 문제가 발생했습니다.
diff --git a/decidim-admin/config/locales/lb.yml b/decidim-admin/config/locales/lb.yml
index ef1b121a60f0b..3bae6f46848b3 100644
--- a/decidim-admin/config/locales/lb.yml
+++ b/decidim-admin/config/locales/lb.yml
@@ -139,8 +139,6 @@ lb:
         import: Importieren
         newsletter:
           new: Neuer Newsletter
-        participatory_space_private_user:
-          new: Neuer privater Benutzer
         per_page: Pro Seite
         share: Teilen
       area_types:
@@ -291,17 +289,6 @@ lb:
           values:
             'false': Offizialisiert
             'true': Nicht offiziell
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Einladung akzeptiert
-            values:
-              'false': Nicht akzeptiert
-              'true': Akzeptiert
-          user_invitation_sent_at_not_null:
-            label: Einladung versendet
-            values:
-              'false': Nicht versendet
-              'true': Versendet
         private_space_eq:
           label: Privat
           values:
@@ -378,6 +365,10 @@ lb:
             explanation: Verwaltete Benutzer können zu Standardbenutzern heraufgestuft werden. Das bedeutet, dass sie zu der Anwendung eingeladen werden und nicht in der Lage sind, sie erneut zu repräsentieren. Der eingeladene Benutzer erhält eine E-Mail, um Ihre Einladung anzunehmen.
             new_managed_user_promotion: Neue verwaltete Benutzerwerbung
             promote: Fördern
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: Laden Sie Ihre CSV-Datei hoch
       menu:
         admin_log: Admin-Aktivitätsprotokoll
         admins: Admins
@@ -432,8 +423,6 @@ lb:
             sent_to: Gesendet an
             subject: Gegenstand
           name: Newsletter
-        participatory_space_private_user:
-          name: Participatory Space privater Benutzer
         scope:
           fields:
             name: Name
@@ -597,24 +586,6 @@ lb:
         update:
           error: Beim Aktualisieren dieser Organisation ist ein Fehler aufgetreten.
           success: Die Organisation wurde erfolgreich aktualisiert.
-      participatory_space_private_users:
-        create:
-          error: Beim Hinzufügen eines privaten Benutzers für diesen partizipativen Bereich ist ein Fehler aufgetreten.
-          success: Participatory Space Privater Benutzerzugriff erfolgreich erstellt.
-        destroy:
-          error: Beim Löschen eines privaten Benutzers für diesen partizipativen Bereich ist ein Fehler aufgetreten.
-          success: Participatory Space Privater Benutzerzugriff wurde erfolgreich zerstört.
-        index:
-          import_via_csv: Aus CSV-Datein importieren
-          title: Participatory Space privater Benutzer
-        new:
-          create: Erstellen
-          title: Neuer privater Benutzer des Participatory Space.
-      participatory_space_private_users_csv_imports:
-        new:
-          csv_upload:
-            title: Laden Sie Ihre CSV-Datei hoch
-          upload: Hochladen
       resource_permissions:
         edit:
           submit: einreichen
diff --git a/decidim-admin/config/locales/lt.yml b/decidim-admin/config/locales/lt.yml
index 36d9e2c2459e5..b16095b138b4b 100644
--- a/decidim-admin/config/locales/lt.yml
+++ b/decidim-admin/config/locales/lt.yml
@@ -86,9 +86,6 @@ lt:
         welcome_notification_body: Pasisveikinimo pranešimo tekstas
         welcome_notification_subject: Pasisveikinimo pranešimo antraštė
         youtube_handler: '„YouTube“ tvarkyklė'
-      participatory_space_private_user:
-        email: El. paštas
-        name: Pavadinimas
       scope:
         code: Kodas
         name: Pavadinimas
@@ -129,10 +126,6 @@ lt:
           attributes:
             official_img_footer:
               allowed_file_content_types: Netinkama vaizdo rinkmena
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Blogai suformuotas importo failas, prašome atidžiai perskaityti instrukcijas ir įsitikinkite, kad failas yra UTF-8 koduotėje.
         user_group_csv_verification:
           attributes:
             file:
@@ -170,8 +163,6 @@ lt:
         import: Importuoti
         newsletter:
           new: Naujas naujienlaiškis
-        participatory_space_private_user:
-          new: Naujas dalyvaujamosios erdvės privatus naudotojas
         per_page: Per puslapį
         send_me_a_test_email: Siųsti man bandomąjį el. laišką
         share: Dalintis
@@ -358,17 +349,6 @@ lt:
           values:
             'false': Oficializuota
             'true': Neoficializuota
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Pakvietimas priimtas
-            values:
-              'false': Nepriimtas
-              'true': Priimtas
-          user_invitation_sent_at_not_null:
-            label: Pakvietimas išsiųstas
-            values:
-              'false': Neišsiųstas
-              'true': Išsiųstas
         private_space_eq:
           label: Privatus
           values:
@@ -494,6 +474,10 @@ lt:
             explanation: Tvarkomi dalyviai gali būti paaukštinti į standartinius dalyvius. Tai reiškia, kad jie bus pakviesti į platformą ir nebegalėsite jų tvarkyti. Pakviesti naudotojai gaus kvietimą prisijungti el. paštu.
             new_managed_user_promotion: Naujas tvarkomo naudotojo paaukštinimas
             promote: Paaukštinti
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: Įkelkite savo CSV rinkmeną
       menu:
         admin_log: Administratoriaus veiklos žurnalas
         admins: Administratoriai
@@ -551,8 +535,6 @@ lt:
             sent_to: Išsiųsta
             subject: Tema
           name: Naujienlaiškis
-        participatory_space_private_user:
-          name: Dalivaujamosios erdvės privatus dalyvis
         scope:
           fields:
             name: Vardas
@@ -733,38 +715,6 @@ lt:
         update:
           error: Atnaujinant šią organizaciją iškilo problema.
           success: Organizacija atnaujinta.
-      participatory_space_private_users:
-        create:
-          error: Pridedant privatų dalyvį į šia dalyvaujamają erdvę kilo problema.
-          success: Dalyvaujamosios erdvės privataus dalyvio prieiga buvo sukurta sėkmingai.
-        destroy:
-          error: Ištrinant privatų dalyvį iš dalyvaujamosios erdvės kilo problema.
-          success: Dalyvaujamojo proceso erdvės privataus dalyvio prieiga panaikinta.
-        index:
-          import_via_csv: Importuoti iš CSV
-          title: Dalyvaujamosios erdvės privatus dalyvis
-        new:
-          create: Sukurti
-          title: Naujas dalyvaujamosios erdvės privatus dalyvis.
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: Skaitant CSV failą kilo problema. Prašau įsitikinkite kad sekėte instrukcijas.
-          success: CSV rinkmena įkelta, dalyviams siunčiame kvietimą e. laišku. Tai gali užtrukti.
-        new:
-          csv_upload:
-            title: Įkelkite savo CSV rinkmeną
-          destroy:
-            button: Ištrinti visus privačius dalyvius
-            confirm: Ar tikrai norite ištrinti visus privačius dalyvius? Atlikus šį veiksmą nebebus įmanoma sugražinti šių dalyvių į platformą.
-            empty: Neturite privačių dalyvių.
-            explanation: Turite %{count} privačių dalyvių.
-            title: Ištrinti privačius dalyvius
-          example_file: 'Pavyzdinė rinkmena:'
-          explanation: 'Įkelkite CSV dokumentą. Jis turi turėti du stulpelius su naudotojų el. paštu pirmajame ir vardu paskutiniąjame. Dokumente neturėtų būti laukų pavadinimų ir šių simbolių naudotojų varduose "<>?%&^*#@()[]=+:;"{}\|".'
-          explanation_example: |
-            john.doe@example.org%{csv_col_sep}John Doe
-            jane.doe@example.org%{csv_col_sep}Jane Doe
-          upload: Įkelti
       reminders:
         create:
           error: Kuriant priminimus iškilo problema.
diff --git a/decidim-admin/config/locales/lv.yml b/decidim-admin/config/locales/lv.yml
index dab5bfd694b3d..acb955ed562d1 100644
--- a/decidim-admin/config/locales/lv.yml
+++ b/decidim-admin/config/locales/lv.yml
@@ -274,6 +274,10 @@ lv:
             explanation: Pārvaldītos dalībniekus var paaugstināt par standarta dalībniekiem. Tas nozīmē, ka viņi tiks uzaicināti uz lietojumprogrammu un jūs viņus vairs nevarēsiet pārvaldīt. Uzaicinātais dalībnieks saņems e-pastu ar jūsu ielūgumu.
             new_managed_user_promotion: Jauna pārvaldīta dalībnieka paaugstināšana
             promote: Paaugstināt
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: Augšupielādējiet savu CSV failu
       menu:
         admin_log: Administratora darbību žurnāls
         admins: Administratori
@@ -326,8 +330,6 @@ lv:
             sent_to: Nosūtīts
             subject: Temats
           name: Informatīvais biļetens
-        participatory_space_private_user:
-          name: Līdzdalības telpas privāts dalībnieks
         scope:
           fields:
             name: Nosaukums
@@ -442,23 +444,6 @@ lv:
         update:
           error: Šīs organizācijas atjaunināšanas laikā radās problēma.
           success: Organizācija ir veiksmīgi atjaunināta.
-      participatory_space_private_users:
-        create:
-          error: Pievienojot privāto dalībnieku šai līdzdalības telpai, radās problēma.
-          success: Privāto dalībnieku piekļuve līdzdalības telpai ir veiksmīgi izveidota.
-        destroy:
-          error: Dzēšot privāto dalībnieku no šīs līdzdalības telpas, radās problēma.
-          success: Privāto dalībnieku piekļuve līdzdalības telpai ir veiksmīgi dzēsta.
-        index:
-          title: Līdzdalības telpas privāts dalībnieks
-        new:
-          create: Izveidot
-          title: Jauns līdzdalības telpas privāts dalībnieks
-      participatory_space_private_users_csv_imports:
-        new:
-          csv_upload:
-            title: Augšupielādējiet savu CSV failu
-          upload: Augšupielādēt
       resource_permissions:
         edit:
           submit: Iesniegt
diff --git a/decidim-admin/config/locales/nl.yml b/decidim-admin/config/locales/nl.yml
index ad6d30bc45549..21ed0d536ba28 100644
--- a/decidim-admin/config/locales/nl.yml
+++ b/decidim-admin/config/locales/nl.yml
@@ -139,8 +139,6 @@ nl:
         import: Importeren
         newsletter:
           new: Nieuwe nieuwsbrief
-        participatory_space_private_user:
-          new: Nieuwe privégebruiker van de inspraakruimte
         per_page: Per pagina
         share: Deel
         user:
@@ -302,17 +300,6 @@ nl:
           values:
             'false': Gevalideerd
             'true': Niet gevalideerd
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Uitnodiging geaccepteerd
-            values:
-              'false': Niet geaccepteerd
-              'true': Geaccepteerd
-          user_invitation_sent_at_not_null:
-            label: Uitnodiging verzonden
-            values:
-              'false': Niet verzonden
-              'true': Verzonden
         private_space_eq:
           label: Privé
           values:
@@ -425,6 +412,10 @@ nl:
             explanation: Beheerde deelnemers kunnen worden gepromoveerd tot standaarddeelnemers. Dit betekent dat ze worden uitgenodigd voor de toepassing en dat u ze niet meer kunt beheren. De uitgenodigde deelnemer ontvangt een e-mail om uw uitnodiging te accepteren.
             new_managed_user_promotion: Nieuwe promotie voor beheerde deelnemers
             promote: Promoten
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: Upload uw CSV-bestand
       menu:
         admin_log: Admin activiteitenlogboek
         admins: Admins
@@ -479,8 +470,6 @@ nl:
             sent_to: Verzonden aan
             subject: Onderwerp
           name: Nieuwsbrief
-        participatory_space_private_user:
-          name: Participerende ruimte privé deelnemer
         scope:
           fields:
             name: Naam
@@ -644,29 +633,6 @@ nl:
         update:
           error: Er is een fout opgetreden bij het bijwerken van deze organisatie.
           success: Organisatie is succesvol bijgewerkt.
-      participatory_space_private_users:
-        create:
-          error: Er is een probleem opgetreden bij het toevoegen van een privédeelnemer aan deze deelruimte.
-          success: De toegang van de privé deelnemer voor de burgerinspraak is succesvol aangemaakt.
-        destroy:
-          error: Er was een probleem met het verwijderen van een privé-deelnemer voor deze participatieruimte.
-          success: De toegang van de privé deelnemer voor burgerinspraak is met succes verwijderd.
-        index:
-          import_via_csv: Importeren via csv
-          title: Participerende ruimte voor privé deelnemer
-        new:
-          create: creëren
-          title: Nieuwe privé deelnemer burgerinspraak.
-      participatory_space_private_users_csv_imports:
-        new:
-          csv_upload:
-            title: Upload uw CSV-bestand
-          destroy:
-            button: Verwijder alle privé deelnemers
-            empty: Je hebt geen privé deelnemers.
-            explanation: Je hebt %{count} privédeelnemers.
-            title: Verwijder privé deelnemer
-          upload: Upload
       reminders:
         create:
           error: Er is een probleem opgetreden bij het maken van herinneringen.
diff --git a/decidim-admin/config/locales/no.yml b/decidim-admin/config/locales/no.yml
index afe2affff2bff..e5e3f5871cea1 100644
--- a/decidim-admin/config/locales/no.yml
+++ b/decidim-admin/config/locales/no.yml
@@ -139,8 +139,6 @@
         import: Importer
         newsletter:
           new: Nytt nyhetsbrev
-        participatory_space_private_user:
-          new: Nytt deltakerområde for privat bruker
         per_page: Per side
         share: Del
         user:
@@ -314,17 +312,6 @@
           values:
             'false': Offisialisert
             'true': Ikke offisialisert
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Invitasjon godtatt
-            values:
-              'false': Ikke akseptert
-              'true': Godkjent
-          user_invitation_sent_at_not_null:
-            label: Invitasjon sendt
-            values:
-              'false': Ikke sendt
-              'true': Sendt
         private_space_eq:
           label: Privat
           values:
@@ -430,6 +417,10 @@
             explanation: Styrte deltakere kan bli promotert til standard deltakere. Dette betyr at de vil bli invitert til applikasjonen og du vil ikke kunne administrere dem lenger. De inviterte deltakerene vil motta en email så de kan akseptere invitasjonen.
             new_managed_user_promotion: Ny administrert deltaker forfremmelse
             promote: Promoter
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: Last opp din CSV fil
       menu:
         admin_log: Admin aktivitet logg
         admins: Adminer
@@ -484,8 +475,6 @@
             sent_to: Send til
             subject: Emne
           name: Nyhetsbrev
-        participatory_space_private_user:
-          name: Deltakerområdets private deltaker
         scope:
           fields:
             name: Navn
@@ -649,29 +638,6 @@
         update:
           error: Det oppstod et problem med å oppdatere denne organisasjon.
           success: Organisasjonen ble oppdatert.
-      participatory_space_private_users:
-        create:
-          error: Det oppstod et problem med å legge til en privat deltaker for dette deltakerområdet.
-          success: Deltakerområde privat deltaker tilgang opprettet.
-        destroy:
-          error: Det oppstod et problem med å slette en privat deltaker for dette deltakerområdet.
-          success: Deltakerområde privat deltaker tilgang ødelagt.
-        index:
-          import_via_csv: Importer fra CSV
-          title: Deltakerområdets private deltaker
-        new:
-          create: Opprett
-          title: Ny deltaker område privat deltaker.
-      participatory_space_private_users_csv_imports:
-        new:
-          csv_upload:
-            title: Last opp din CSV fil
-          destroy:
-            button: Slett alle private deltakere
-            empty: Du har ingen private deltakere.
-            explanation: Du har %{count} private deltakere.
-            title: Slett private deltakere
-          upload: Last opp
       reminders:
         create:
           error: Det oppsto et problem med å opprette påminnelser.
diff --git a/decidim-admin/config/locales/pl.yml b/decidim-admin/config/locales/pl.yml
index dceff2ab830ee..48761c99868cd 100644
--- a/decidim-admin/config/locales/pl.yml
+++ b/decidim-admin/config/locales/pl.yml
@@ -90,9 +90,6 @@ pl:
         welcome_notification_body: Treść komunikatu powitalnego
         welcome_notification_subject: Tytuł komunikatu powitalnego
         youtube_handler: Handler YouTube
-      participatory_space_private_user:
-        email: E-mail
-        name: Nazwa
       scope:
         code: Kod
         name: Nazwa
@@ -134,10 +131,6 @@ pl:
           attributes:
             official_img_footer:
               allowed_file_content_types: Nieprawidłowy plik obrazu
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Nieprawidłowy plik importu, przeczytaj uważnie instrukcję i upewnij się, że plik jest kodowany w UTF-8.
         user_group_csv_verification:
           attributes:
             file:
@@ -176,8 +169,6 @@ pl:
         import: Importuj
         newsletter:
           new: Nowy newsletter
-        participatory_space_private_user:
-          new: Nowy użytkownik prywatny
         per_page: Na stronę
         send_me_a_test_email: Wyślij mi testowego e-maila
         share: Udostępnij
@@ -388,17 +379,6 @@ pl:
           values:
             'false': Oficjalny
             'true': Nieoficjalny
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Zaakceptowano zaproszenie
-            values:
-              'false': Nie zaakceptowano
-              'true': Zaakceptowano
-          user_invitation_sent_at_not_null:
-            label: Wysłano zaproszenie
-            values:
-              'false': Nie wysłano
-              'true': Wysłano
         private_space_eq:
           label: Prywatny
           values:
@@ -527,6 +507,10 @@ pl:
             explanation: Zarządzani użytkownicy mogą być promowani do standardowych użytkowników. Oznacza to, że zostaną zaproszeni do udziału w aplikacji i nie będą mogli podszywać się pod inne osoby. Zaproszony użytkownik otrzyma wiadomość e-mail, aby zaakceptować zaproszenie.
             new_managed_user_promotion: Nowa zarządzana promocja użytkowników
             promote: Awansuj
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: Prześlij swój plik CSV
       menu:
         admin_log: Logi aktywności administratora
         admins: Administratorzy
@@ -587,8 +571,6 @@ pl:
             sent_to: Wysłano do
             subject: Temat
           name: Newsletter
-        participatory_space_private_user:
-          name: Użytkownik prywatnej przestrzeni partycypacyjnej
         scope:
           fields:
             name: Nazwa
@@ -782,39 +764,6 @@ pl:
         form:
           add: Dodaj do listy dozwolonych
           title: Dozwolone domeny zewnętrzne
-      participatory_space_private_users:
-        create:
-          error: Wystąpił błąd podczas dodawania użytkownika prywatnego do tej przestrzeni partycypacyjnej.
-          success: Dodano dostęp dla prywatnego użytkownika przestrzeni partycypacyjnej.
-        destroy:
-          error: Wystąpił błąd podczas usuwania użytkownika prywatnego z tej przestrzeni partycypacyjnej.
-          success: Usunięto dostęp dla prywatnego użytkownika w tej przestrzeni partycypacyjnej.
-        index:
-          import_via_csv: Importuj z CSV
-          title: Prywatny użytkownik przestrzeni partycypacyjnej
-        new:
-          create: Utwórz
-          title: Nowy prywatny użytkownik przestrzeni partycypacyjnej.
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: Wystąpił problem podczas odczytu pliku CSV. Upewnij się, że postępowałeś zgodnie z instrukcjami.
-          success: Załadowanie pliku CSV powiodło się, wysyłamy e-mail z zaproszeniem do uczestników. To może chwilę potrwać.
-        new:
-          csv_upload:
-            title: Załaduj swój plik CSV
-          destroy:
-            button: Usuń wszystkich prywatnych uczestników
-            confirm: Czy na pewno chcesz usunąć wszystkich uczestników prywatnych? Tej akcji nie można cofnąć, nie będziesz w stanie odzyskać danych.
-            empty: Nie masz żadnych uczestników prywatnych.
-            explanation: Masz %{count} uczestników prywatnych.
-            title: Usuń prywatnych uczestników
-          example_file: 'Przykładowy plik:'
-          explanation: 'Załaduj swój plik CSV. Plik musi składać się z dwóch kolumn: w pierwszej kolumnie adresy e-mail, a w ostatniej nazwy użytkowników, których chcesz dodać do przestrzeni dla uczestników. Nie dodawaj nagłówków. Unikaj niepoprawnych znaków, takich jak `<>?%&^*#@()[]=+:;"{}\|` w nazwie użytkownika.'
-          explanation_example: |
-            jan.kowalski@przyklad.org%{csv_col_sep}Jan Kowalski
-            anna.kowalska@przyklad.org%{csv_col_sep}Anna Kowalska
-          title: Importuj uczestników prywatnych przez CSV
-          upload: Prześlij
       reminders:
         create:
           error: Wystąpił błąd podczas tworzenia przypomnień.
diff --git a/decidim-admin/config/locales/pt-BR.yml b/decidim-admin/config/locales/pt-BR.yml
index 10220e1f636ec..3af647846f8a5 100644
--- a/decidim-admin/config/locales/pt-BR.yml
+++ b/decidim-admin/config/locales/pt-BR.yml
@@ -33,8 +33,14 @@ pt-BR:
       help_section:
         content: Conteúdo
       id: ID
+      member:
+        email: Email
+        name: Nome
+      member_csv_import:
+        file: Arquivo
       newsletter:
         body: Corpo
+        send_to_all_users: Enviar para todos os participantes
         send_to_followers: Enviar para seguidores
         send_to_participants: Enviar para participantes
         subject: Assunto
@@ -47,7 +53,8 @@ pt-BR:
         customize_welcome_notification: Personalizar notificação de boas-vindas
         default_locale: Idioma padrão
         description: Descrição
-        enable_omnipresent_banner: Mostrar bandeira omnipresente
+        enable_machine_translations: Ativar traduções automáticas
+        enable_omnipresent_banner: Mostrar bandeira onipresente
         enable_participatory_space_filters: Habilitar filtros do espaço participativo
         facebook_handler: Manipulador do Facebook
         favicon: Ícone
@@ -89,9 +96,6 @@ pt-BR:
         welcome_notification_body: Corpo de notificação de boas-vindas
         welcome_notification_subject: Corpo de notificação de boas-vindas
         youtube_handler: Manipulador do YouTube
-      participatory_space_private_user:
-        email: E-mail
-        name: Nome
       scope:
         code: Código
         name: Nome
@@ -121,10 +125,17 @@ pt-BR:
         show_in_footer: Mostrar no rodapé
         title: Título
         weight: Posição do pedido
+      taxonomy:
+        item_name: Nome do item
+        parent_id: Parente
       user_group_csv_verification:
         file: Arquivo
     errors:
       models:
+        member_csv_import:
+          attributes:
+            file:
+              malformed: Arquivo de importação malformado, por favor leia as instruções cuidadosamente e certifique-se de que o arquivo é codificado em UTF-8.
         newsletter:
           attributes:
             base:
@@ -133,10 +144,6 @@ pt-BR:
           attributes:
             official_img_footer:
               allowed_file_content_types: Arquivo de imagem inválido
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Arquivo de importação malformado, por favor leia as instruções cuidadosamente e certifique-se de que o arquivo é codificado em UTF-8.
         user_group_csv_verification:
           attributes:
             file:
@@ -163,25 +170,43 @@ pt-BR:
   decidim:
     admin:
       actions:
+        actions: Ações
+        actions_label: Ações para %{resource}
         add: Adicionar
         attachment:
           new: Novo anexo
         attachment_collection:
           new: Nova pasta de anexos
+        attachment_collections: Adicionar pasta
+        attachments: Adicionar anexo
         browse: Navegar
         configure: Configurar
+        confirm_delete_component: |
+          Você tem certeza que quer  excluir esse componente?<br>
+           Este componente contém:<br>
+          <ul class="list-disc ml-6 my-2">
+            <li class="font-bold">%{resources_count} recurso</li>
+          </ul>
+          Se você trocar de ideia, pode restaurar-lá mais tarde.
         export: Exportar
         export-selection: Exportar selecionado
         import: Importar
+        member:
+          new: Novo membro
+        menu_hidden: Ocultar do menu
+        moderate: Gerenciar moderações
         newsletter:
           new: Novo Boletim Informativo
-        participatory_space_private_user:
-          new: Novo espaço participativo de usuário privado
         per_page: Por página
+        permissions: Gerenciar permissões
+        restore: Restaurar
         send_me_a_test_email: Enviar um e-mail de teste
         share: Compartilhar
+        share_tokens: Compartilhar link
+        soft_delete: Mover para a lixeira
         user:
           new: Novo administrador
+        view_deleted_components: Ver componentes excluídos
       admin_terms_of_service:
         accept:
           error: Houve um erro ao aceitar os termos de serviço de administrador. 
@@ -215,6 +240,7 @@ pt-BR:
         create:
           error: Ocorreu um erro ao criar uma nova área.
           success: Área criada com sucesso.
+        deprecated: Lembre-se de que as áreas estão obsoletas e serão removidas em versões futuras. Por favor, use taxonomias em vez disso. O único módulo atualmente usando áreas é o módulo de iniciativas.
         destroy:
           has_spaces: Essa área tem espaços dependentes. Por favor, certifique-se de que nenhum Espaço Participativo referencia essa área antes de excluí-lo.
           success: Área excluída com sucesso.
@@ -268,8 +294,15 @@ pt-BR:
         no_results: Nenhum resultado encontrado
         search_prompt: Digite, no mínimo, três caracteres para pesquisar.
       block_user:
+        bulk_new:
+          action: Bloquear conta e enviar justificativa
+          already_reported_html: Ao continuar com esta ação, você também ocultará o conteúdo de todos os participantes.
+          description: Bloquear um usuário irá tornar sua conta inutilizável. Você pode fornecer em sua justificação quaisquer diretrizes sobre como você poderia considerar desbloquear o usuário.
+          justification: Justificativa
+          title: Bloquear usuários
         new:
           action: Bloquear conta e enviar justificativa
+          already_reported_html: Ao continuar com esta ação, você também ocultará o conteúdo de todos os participantes.
           description: Bloquear um usuário irá tornar sua conta inutilizável. Você pode fornecer em sua justificação quaisquer diretrizes sobre como você poderia considerar desbloquear o usuário.
           justification: Justificativa
           title: Bloquear usuário %{name}
@@ -301,6 +334,8 @@ pt-BR:
             name: Nome do componente
             type: Tipo de componente
             visibility: Visibilidade
+        manage_trash:
+          title: Componentes excluídos
         new:
           add: Adicionar componente
           title: 'Adicionar componente: %{name}'
@@ -319,11 +354,14 @@ pt-BR:
       conflicts:
         attempts: Tentativas
         'false': 'Não'
+        index:
+          text: Pesquisar por email, nome ou apelido do usuário atual
         managed_user_name: Usuário gerenciado
         solved: Resolvido
         title: Conflitos de verificação
         transfer:
           email: E-mail
+          error: Ocorreu um erro ao transferir o participante atual para o participante gerenciado.
           name: Nome
           reason: Motivo
           success: A transferência atual foi concluída com sucesso.
@@ -332,6 +370,7 @@ pt-BR:
         user_name: Usuário
       content_blocks:
         create:
+          error: Ocorreu um problema ao criar o bloco de conteúdo.
           success: Bloco de conteúdo criado com sucesso.
         destroy:
           error: Ocorreu um problema ao tentar excluir esse bloco de conteúdo.
@@ -345,6 +384,9 @@ pt-BR:
           update: Atualizar
       dashboard:
         pending_moderations:
+          announcement:
+            one: Existem %{count} moderações pendentes
+            other: Existem %{count} moderações pendentes
           goto_moderation: Ir para moderações globais
           title: Moderações pendentes
         show:
@@ -354,6 +396,7 @@ pt-BR:
         form:
           domain_too_short: Domínio muito curto
         update:
+          error: Falha ao atualizar lista de domínios externos permitidos.
           success: Lista do domínio externo permitido atualizada com sucesso.
       exports:
         export_as: "%{name} como %{export_format}"
@@ -375,6 +418,17 @@ pt-BR:
           values:
             'false': 'Não'
             'true': 'Sim'
+        members:
+          user_invitation_accepted_at_not_null:
+            label: Convite aceito
+            values:
+              'false': Não aceito
+              'true': Aceito
+          user_invitation_sent_at_not_null:
+            label: Convite enviado
+            values:
+              'false': Não enviado
+              'true': Enviado
         moderated_users:
           reports_reason_eq:
             label: Razão da denúncia
@@ -390,17 +444,6 @@ pt-BR:
           values:
             'false': Oficializado
             'true': Não oficializado
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Convite aceito
-            values:
-              'false': Não aceito
-              'true': Aceito
-          user_invitation_sent_at_not_null:
-            label: Envio de convite
-            values:
-              'false': Não enviado
-              'true': Enviado
         private_space_eq:
           label: Privado
           values:
@@ -411,9 +454,14 @@ pt-BR:
           values:
             'false': Publicado
             'true': Não publicado
+        remove_all: Apagar tudo
         search_label: Buscar
         search_placeholder:
+          name_or_nickname_or_email_cont: Pesquise %{collection} por email, nome ou apelido
           report_count_eq: Número de denúncias
+          reported_id_string_or_reported_content_cont: Pesquisar %{collection} por identificação reportável ou conteúdo
+          title_cont: Pesquisar %{collection} por título
+          user_name_or_user_nickname_or_user_email_cont: Pesquise %{collection} por email, nome ou apelido
         state_eq:
           label: Estado
           values:
@@ -421,12 +469,19 @@ pt-BR:
             pending: Pendente
             rejected: Rejeitado
             verified: Verificado
+        taxonomies:
+          taxonomy_id_eq:
+            label: Taxonomia
       forms:
         file_help:
           import:
             explanation: 'Orientação para o arquivo:'
             message_1: Arquivos CSV, JSON e Excel (xlsx) são suportados
             message_2: Para arquivos CSV, o separador entre colunas deve ser um ponto e vírgula (";")
+          import_csv:
+            explanation: 'Orientação para o arquivo:'
+            message_1: Arquivos CSV são suportados
+            message_2: "Arquivo.csv com dados de email"
       help_sections:
         error: Houve um erro ao atualizar as seções de ajuda.
         form:
@@ -485,6 +540,9 @@ pt-BR:
                 other: Encontrado um erro no arquivo de importação para registros com os números de ordem %{indexes}.
           missing_headers:
             detail: Por favor, verifique se o arquivo contém colunas obrigatórias.
+            message:
+              one: 'Faltam as seguintes colunas: %{columns}.'
+              other: Faltam colunas %{columns}.
         error: Houve um problema durante a importação.
         example_error: Ocorreu um erro ao criar um exemplo para o tipo fornecido.
         new:
@@ -502,10 +560,13 @@ pt-BR:
       logs:
         filters:
           participatory_space: Pesquisar espaço participativo
+          text: Pesquisar por email, nome ou apelido do usuário
           user: Usuário
         logs_list:
           no_logs_yet: Ainda não há registros.
           no_matching_logs: Não há nenhum registro com os filtros da pesquisa fornecidos. Tente alterá-los e tente novamente.
+      manage_trash:
+        deleted_items_warning: Você está visualizando itens excluídos no momento. Para fazer qualquer edição ou alterações, você deve primeiro restaurá-los.
       managed_users:
         promotion:
           error: Ocorreu um erro ao promover o usuário gerenciado.
@@ -515,17 +576,67 @@ pt-BR:
             explanation: Os usuários gerenciados podem ser promovidos para usuários padrão. Isso significa que eles serão convidados para o aplicativo e você não poderá representá-los novamente. O usuário convidado receberá um e-mail para aceitar seu convite.
             new_managed_user_promotion: Nova promoção de usuário gerenciado
             promote: Promover
+      members:
+        create:
+          error: Ocorreu um erro ao adicionar um membro neste espaço participativo.
+          success: Acesso de membro criado com sucesso.
+        destroy:
+          error: Ocorreu um erro ao excluir um membro deste espaço participativo.
+          success: Acesso de membro destruído com sucesso.
+        edit:
+          title: Editar membro
+          update: Atualizar
+        index:
+          import_via_csv: Importar via CSV
+          publish_all: Publicar tudo
+          title: Membro
+          unpublish_all: Despublicar tudo
+        new:
+          create: Criar
+          title: Novo membro
+        publish_all:
+          error: Ocorreu um erro ao publicar todos os membros para este espaço participativo.
+          success: Todos os membros desta comunidade participativa foram publicados com sucesso
+        unpublish_all:
+          error: Ocorreu um erro ao cancelar a publicação de todos os membros para este espaço participativo.
+          success: Todos os membros desta comunidade participativa foram despublicados com sucesso
+        update:
+          error: Ocorreu um erro ao atualizar o membro para este espaço participativo.
+          success: Membro atualizado com sucesso
+      members_csv_imports:
+        create:
+          invalid: Houve um problema ao ler o arquivo CSV. Por favor, certifique-se de ter seguido as instruções.
+          success: Arquivo CSV carregado com sucesso, estamos enviando um email de convite para os participantes. Isso pode demorar um pouco.
+        new:
+          csv_upload:
+            title: Envie seu arquivo CSV
+          destroy:
+            button: Excluir todos os membros
+            confirm: Tem certeza que deseja apagar todos os membros? Esta ação não pode ser desfeita. Não poderá recuperá-los.
+            empty: Você não tem membros.
+            explanation: Você tem %{count} membros.
+            title: Apagar membros
+          example_file: 'Arquivo de exemplo:'
+          explanation: 'Envie seu arquivo CSV. Deve ter duas colunas com email na primeira coluna do arquivo e nome na última coluna do arquivo dos usuários que você deseja adicionar ao espaço participativo, sem cabeçalhos. Evite usar caracteres inválidos como `<>?%&^*#@()[]=+:;"{}\├` no nome de usuário.'
+          explanation_example: |
+            joao.silva@exemplo.org%{csv_col_sep}João da Silva
+            joana.silva@exemplo.org%{csv_col_sep}Joana da Silva
+          title: Importar membros via CSV
+          upload: Carregar
       menu:
         admin_log: Log de atividade de administração
         admins: Admins
         appearance: Aparência
         area_types: Tipos de área
         areas: Áreas
+        components: Componentes
         configuration: Configuração
         content: Conteúdo relatado
         external_domain_allowlist: Domínios externos permitidos
         help_sections: Seções de ajuda
+        homepage: Layout da página inicial
         impersonations: Imitações
+        insights: Insights
         manage: Gerenciar
         moderation: Moderadores globais
         newsletters: Newsletters
@@ -535,8 +646,12 @@ pt-BR:
         scopes: Âmbitos
         see_site: Ver site
         settings: Configurações
+        share_tokens: Acessar links
         static_page_topics: Tópicos
         static_pages: Páginas
+        statistics: Estatísticas
+        taxonomies: Taxonomias
+        taxonomy_filters: Filtros de taxonomia
         users: Usuários
       models:
         area:
@@ -566,6 +681,8 @@ pt-BR:
             reason: Motivo
             started_at: Começou em
             user: Usuário
+        member:
+          name: Membro
         newsletter:
           fields:
             created_at: Criado em
@@ -574,8 +691,6 @@ pt-BR:
             sent_to: Enviado para
             subject: Assunto
           name: Newsletter
-        participatory_space_private_user:
-          name: Espaço participativo usuário particular
         scope:
           fields:
             name: Nome
@@ -624,6 +739,7 @@ pt-BR:
               update_moderated_user_button: Anular denúncias de usuários
             title: Ações
             unblock: Desbloquear usuário
+            unreport: Desfazer a denúncia
           cancel: Cancelar
           name: Nome
           nickname: Apelido
@@ -647,8 +763,10 @@ pt-BR:
               title: Ocultar
               update_moderation_button: Ocultar os recursos selecionados
             unhide:
+              title: Desfazer o ocultar
               update_moderation_button: Desocultar os recursos selecionados
             unreport:
+              title: Desfazer a denúncia
               update_moderation_button: Anular denúncia dos recursos selecionados
           cancel: Cancelar
           selected: selecionado
@@ -776,6 +894,7 @@ pt-BR:
         index:
           actions: Ações
           badge: Selo
+          block: Bloquear
           created_at: Criado em
           name: Nome
           nickname: Apelido
@@ -784,7 +903,10 @@ pt-BR:
           officialized: Oficializado
           reofficialize: Reorientar
           reports: Denúncias
+          send_message: Enviar mensagem
+          show_email: Mostrar email
           status: Status
+          unblock: Desbloquear
           unofficialize: Não oficializar
         new:
           badge: Emblema de oficialização
@@ -807,13 +929,27 @@ pt-BR:
         form:
           admin_terms_of_service: Termos de serviço do administrador
           basic_configuration: Configuração básica
+          colors:
+            choose_color: Escolha a cor primária
+            colors_title: Cores da organização
+            colors_warning_html: Atenção! Mudar estas cores pode quebrar contrastes de acessibilidade. Você pode verificar o contraste da sua escolha com <a href="https://webaim.org/resources/contrastchecker">verificador de contraste WebAIM</a> ou outras ferramentas similares.
+            explanation: Esta ferramenta ajuda você a escolher um esquema de cores, composto de tons igualmente espaçados ao redor da roda de cor que será usado no site da organização.
+            legend_html: Cores principais da aplicação, com base no <a href="https://www.color-meanings.com/triadic-colors/">algoritmo Triadic</a>. A cor <i>secundária</i> é auto-calculada a partir da cor primária e da saturação que você escolheu.
+            saturation: Saturação
+            title: Seletor de cores
+            update_suggested_colors: Atualizar cores sugeridas
+          extra_features: Recursos adicionais
           facebook: Facebook
           github: GitHub
           instagram: Instagram
+          logos:
+            organization_logos: Logotipos da organização
+            preview: Pré-visualização
           rich_text_editor_in_public_views_help: Em algumas áreas de texto, os participantes poderão inserir algumas tags HTML usando o editor de texto rico.
           social_handlers: Social
           twitter: X
           url: URL
+          welcome_notification: Notificações de Boas-Vindas
           youtube: YouTube
         update:
           error: Ocorreu um erro ao atualizar essa organização.
@@ -829,39 +965,6 @@ pt-BR:
         form:
           add: Adicionar na lista de permitidos
           title: Lista de domínios externos permitidos
-      participatory_space_private_users:
-        create:
-          error: Ocorreu um erro ao adicionar um usuário privado para este espaço participativo.
-          success: Espaço participativo acesso de usuário privado criado com sucesso.
-        destroy:
-          error: Houve um erro ao excluir um usuário particular desse espaço participativo.
-          success: Espaço participativo acesso de usuário privado excluído com sucesso.
-        index:
-          import_via_csv: Importar via CSV
-          title: Espaço participativo usuário particular
-        new:
-          create: Criar
-          title: Novo usuário particular do Espaço Participativo.
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: Ocorreu um problema ao ler o arquivo CSV. Por favor, certifique-se de ter seguido as instruções.
-          success: Arquivo CSV enviado com sucesso, estamos enviando um e-mail de convite para os participantes. Isso pode demorar um pouco.
-        new:
-          csv_upload:
-            title: Envie seu arquivo CSV
-          destroy:
-            button: Excluir todos os participantes privados
-            confirm: Tem certeza que deseja excluir todos os participantes privados? Esta ação não pode ser desfeita, não será possível recuperá-los.
-            empty: Você não tem participantes privados.
-            explanation: Você tem %{count} participantes privados.
-            title: Excluir participantes privados
-          example_file: 'Arquivo de exemplo:'
-          explanation: 'Envie seu arquivo CSV. Deve ter duas colunas com e-mail na primeira coluna do arquivo e nome na última coluna do arquivo dos usuários que você deseja adicionar ao espaço participativo, sem cabeçalhos. Evite usar caracteres inválidos como `<>?%&^*#@()[]=+:;"{}\├` no nome de usuário.'
-          explanation_example: |
-            joao.silva@examplo.org%{csv_col_sep}João da Silva
-            maria.silva@examplo.org%{csv_col_sep}Maria da Silva
-          title: Importar participantes privados via CSV
-          upload: Upload
       reminders:
         create:
           error: Ocorreu um problema ao criar lembretes.
@@ -874,6 +977,8 @@ pt-BR:
         edit:
           submit: Enviar
           title: Editar permissões
+        options_form:
+          ephemeral_warning: Para habilitar este método de autorização, você precisa <a href="%{path}">revogar</a> todas as autorizações existentes. Isto minimiza o risco de conflitos de verificação. Todas as autorizações deste tipo serão revogadas automaticamente na organização se você enviar alterações adicionando este método ou modifiyng sua configuração depois de adicionada.
         update:
           success: Permissões atualizadas com sucesso.
       scope_types:
@@ -895,6 +1000,7 @@ pt-BR:
         create:
           error: Ocorreu um erro ao criar um novo âmbito.
           success: Âmbito criado com sucesso.
+        deprecated: Lembre-se de que os escopos são obsoletos e serão removidos em versões futuras. Por favor use taxonomias em vez disso. O único módulo que usa escopos atualmente é o módulo de iniciativas.
         destroy:
           success: Âmbito excluído com sucesso.
         edit:
@@ -909,8 +1015,38 @@ pt-BR:
           success: Âmbito atualizado com sucesso
       share_tokens:
         actions:
+          confirm_destroy: Tem certeza de que deseja excluir este acesso?
+          copy_link: Copiar o link
           destroy: Excluir
+          edit: Editar
+          preview: Pré-visualização
+        create:
+          invalid: Ocorreu um erro ao gerar o link de acesso.
+          success: Link de acesso criado com sucesso.
+        destroy:
+          error: Ocorreu um erro ao destruir o link de acesso.
+          success: Link de acesso excluído com sucesso.
+        edit:
+          title: 'Editar links de acesso para: %{name}'
+          update: Atualizar
+        form:
+          automatic: Automático
+          custom: Personalizar
+          custom_expiration: Expiração personalizada
+          custom_token: Palavra customizada
+          expires_at: Válido até
+          'false': 'Não'
+          never_expire: Nunca
+          registered_only: Apenas registrado?
+          token: Chave de acesso
+          'true': 'Sim'
         index:
+          back_to_share_tokens: Voltar aos links de acesso
+          copied: Link de acesso copiado!
+          copy_message: O texto foi copiado com sucesso para área de transferência.
+          create_new_token: Crie seu primeiro link de acesso!
+          empty_html: Não há nenhum link de acesso ativo. %{new_token_link}
+          never: Nunca
           new_share_token_button: Novo link de acesso
           share_tokens_help_html: |
             Crie e compartilhe um link de acesso para permitir que outros visualizem este recurso não publicado.
@@ -949,6 +1085,8 @@ pt-BR:
           error: Houve um erro ao atualizar este tópico.
           success: Tópico atualizado com sucesso
       static_pages:
+        actions:
+          view: Visualizar
         create:
           error: Ocorreu um erro ao criar uma nova página.
           success: Página criada com sucesso.
@@ -976,6 +1114,9 @@ pt-BR:
       taxonomies:
         actions:
           actions: Ações
+          destroy: Excluir
+          edit: Editar
+          filters: Aplicar filtros
         breadcrumb:
           edit: Editar taxonomia
           new: Nova taxonomia
@@ -1032,15 +1173,46 @@ pt-BR:
           back: Retornar
           title: Editar filtro de taxonomia
           update: Atualizar filtro de taxonomia
+        form:
+          all: Tudo
+          items:
+            one: "Item %{count} selecionado"
+            other: "Itens %{count} selecionados"
+          name_help: O título do filtro a ser exibido no frontend.
+          no_items: Não há itens disponíveis para esta taxonomia. Você pode criar itens nas configurações de configuração da taxonomia.
+          space_filter: Disponível como filtro para
+        index:
+          description: Um filtro taxonômico permite aos administradores ordenar e filtrar espaços participativos com base em uma taxonomia. Por exemplo, adicione um filtro de taxonomia aos processos de classificação por âmbito geográfico.
+          empty: Atualmente não há filtros de taxonomia. Crie uma lista de filtros de taxonomia aqui para classificar e filtrar espaços participativos com base em uma taxonomia.
+          new_filter: Novo filtro
         new:
           back: Voltar
           create: Criar filtro de taxonomia
           title: Novo filtro de taxonomia
         table:
           actions: Ações
+          components_count: Componentes usando isto
+          confirm_destroy: 'Tem certeza que deseja excluir o filtro %{name}? NOTA: Recursos que estão usando este filtro não serão afetados, mas eles perderão a referência a este filtro.'
           destroy: Deletar
           edit: Editar
+          internal_name: Rótulo Interno
           name:
+        update:
+          error: Ocorreu um erro ao atualizar este filtro de taxonomia.
+          success: Filtro de taxonomia atualizado com sucesso.
+      taxonomy_filters_selector:
+        new:
+          add_new_items_html: Se você precisa definir um novo filtro ou item, faça isso através das configurações ou clicando <a href="%{url}">aqui</a>.
+          items_count: "{count} itens"
+          save: Salvar
+        show:
+          items_count: "{count} itens"
+          remove: Excluir
+        taxonomies_select:
+          filters: Filtros
+          select_filter: Selecione um filtro
+          select_taxonomy: Selecione uma taxonomia
+          taxonomies: Taxonomias
       taxonomy_items:
         edit:
           title: Editar item em %{taxonomy}
@@ -1065,8 +1237,19 @@ pt-BR:
         participants: Comercial
         scope_types: Tipos de âmbito
         scopes: Âmbitos
+        statistics: Estatísticas
+        taxonomies: Taxonomias
+        taxonomy_filters: Filtros de taxonomia para "%{taxonomy}"
         users: Administradores
+      tooltips:
+        cannot_destroy_taxonomy_filter: Não é possível destruir este filtro de taxonomia
+        cannot_edit_taxonomy_filter: Não é possível editar este filtro de taxonomia
+        deleted_attachment_collections_info: Não é possível excluir esta pasta porque ela possui anexos.
+        deleted_component_info: Este componente só pode ser excluído se o status for 'Não publicado'.
       trash_management:
+        restore:
+          invalid: Houve um problema ao restaurar %{resource_name}.
+          success: "%{resource_name} restaurado com sucesso."
         soft_delete:
           invalid: Houve um problema ao remover %{resource_name}.
           success: "%{resource_name} removido com sucesso."
@@ -1090,6 +1273,7 @@ pt-BR:
           last_day: Último dia
           last_month: Último mês
           last_week: Última semana
+          no_users_count_statistics_yet: Ainda não há nenhuma estatística de participantes.
           participants: Participantes
     forms:
       errors:
@@ -1101,14 +1285,34 @@ pt-BR:
         hidden: Oculto
         hide: Ocultar
         not_hidden: Não oculto
+        parent_hidden: Você não pode exibir este recurso porque seu pai ainda está oculto.
         title: Ações
+        unhide: Desfazer o ocultar
+        unreport: Desfazer a denúncia
       admin:
         reportable:
+          bulk_action:
+            hide:
+              failed: 'Houve um problema ao esconder alguns recursos: %{errored}'
+              invalid: Nenhuma moderação selecionada.
+              success: Recursos ocultos com sucesso.
+            ignore:
+              invalid: Nenhuma moderação de usuários selecionada.
+              success: Participantes não reportados com sucesso.
+            unhide:
+              failed: 'Houve um problema ao exibir alguns recursos: %{errored}'
+              invalid: Nenhuma moderação selecionada.
+              success: Recursos desocultados com sucesso.
+            unreport:
+              failed: 'Houve um problema não reportando alguns recursos: %{errored}'
+              invalid: Nenhuma moderação selecionada.
+              success: Recursos não reportados com sucesso.
           hide:
             invalid: Ocorreu um problema ao ocultar o recurso.
             success: O recurso foi ocultado com sucesso.
           unhide:
             invalid: Houve um problema ao exibir o recurso.
+            parent_invalid: Ocorreu um problema ao exibir o recurso. O pai não está visível.
             success: Recurso com sucesso exibido.
           unreport:
             invalid: Tem havido um problema não relatando o recurso.
@@ -1139,5 +1343,7 @@ pt-BR:
       admin:
         global_moderations:
           title: Moderações globais
+        insights:
+          title: Insights
         taxonomy_filters_selector:
           title: Filtros
diff --git a/decidim-admin/config/locales/pt.yml b/decidim-admin/config/locales/pt.yml
index 22814903cf5ab..e17d7510df691 100644
--- a/decidim-admin/config/locales/pt.yml
+++ b/decidim-admin/config/locales/pt.yml
@@ -139,8 +139,6 @@ pt:
         import: Importar
         newsletter:
           new: Novo boletim informativo
-        participatory_space_private_user:
-          new: Novo utilizador privado do espaço participativo
         per_page: Por página
         share: Partilhar
       area_types:
@@ -296,17 +294,6 @@ pt:
           values:
             'false': Oficializado
             'true': Não oficializado
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Convite aceite
-            values:
-              'false': Não aceite
-              'true': Aceite
-          user_invitation_sent_at_not_null:
-            label: Convite enviado
-            values:
-              'false': Não enviado
-              'true': Enviado
         private_space_eq:
           label: Privado
           values:
@@ -390,6 +377,10 @@ pt:
             explanation: Os participantes geridos podem ser promovidos para participantes padrão. Isto significa que eles serão convidados para a aplicação e não poderá geri-los novamente. O participante convidado receberá um e-mail para aceitar o seu convite.
             new_managed_user_promotion: Nova promoção de usuário participante gerido
             promote: Destacar
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: Envie o seu ficheiro CSV
       menu:
         admin_log: Registo de atividade de administração
         admins: Administradores
@@ -446,8 +437,6 @@ pt:
             sent_to: Enviado para
             subject: Assunto
           name: Boletim Informativo
-        participatory_space_private_user:
-          name: Participante privado de espaço participativo
         scope:
           fields:
             name: Nome
@@ -622,24 +611,6 @@ pt:
         update:
           error: Ocorreu um problema ao atualizar esta organização.
           success: Organização atualizada corretamente.
-      participatory_space_private_users:
-        create:
-          error: Ocorreu um problema ao adicionar um participante privado neste espaço participativo.
-          success: Acesso ao espaço participativo de participante privado criado corretamente.
-        destroy:
-          error: Houve um problema ao eliminar um participante privado deste espaço participativo.
-          success: Espaço participativo acesso de usuário privado destruído com sucesso.
-        index:
-          import_via_csv: Importar via CSV
-          title: Espaço participativo de participante privado
-        new:
-          create: Criar
-          title: Novo participante privado do Espaço Participativo.
-      participatory_space_private_users_csv_imports:
-        new:
-          csv_upload:
-            title: Envie o seu ficheiro CSV
-          upload: Carregar
       resource_permissions:
         edit:
           submit: Submeter
diff --git a/decidim-admin/config/locales/ro-RO.yml b/decidim-admin/config/locales/ro-RO.yml
index 53722ea7f4527..619598822962c 100644
--- a/decidim-admin/config/locales/ro-RO.yml
+++ b/decidim-admin/config/locales/ro-RO.yml
@@ -87,9 +87,6 @@ ro:
         welcome_notification_body: Conținutul notificării de bun venit
         welcome_notification_subject: Subiectul notificării de bun venit
         youtube_handler: Responsabil YouTube
-      participatory_space_private_user:
-        email: E-mail
-        name: Nume
       scope:
         code: Cod
         name: Nume
@@ -131,14 +128,10 @@ ro:
           attributes:
             official_img_footer:
               allowed_file_content_types: Fișier invalid
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Fișier de import malformat, vă rugăm să citiți instrucțiunile cu atenție și asigurați-vă că fișierul este codificat UTF-8.
         user_group_csv_verification:
           attributes:
             file:
-              malformed: Fişier de import malformat, vă rugăm să citiţi instrucţiunile cu atenţie şi asiguraţi-vă că fişierul este codificat UTF-8.
+              malformed: Fișier de import malformat, vă rugăm să citiți instrucțiunile cu atenție și asigurați-vă că fișierul este codificat UTF-8.
       new_import:
         attributes:
           file:
@@ -172,8 +165,6 @@ ro:
         import: Importă
         newsletter:
           new: Buletin informativ nou
-        participatory_space_private_user:
-          new: Nou utilizator privat al spațiului participativ
         per_page: Pe pagină
         send_me_a_test_email: Trimite-mi un e-mail de test
         share: Distribuie
@@ -363,17 +354,6 @@ ro:
           values:
             'false': Verificat
             'true': Neverificat
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Invitație acceptată
-            values:
-              'false': Neacceptat
-              'true': Acceptat
-          user_invitation_sent_at_not_null:
-            label: Invitaţie trimisă
-            values:
-              'false': Nu s-a trimis
-              'true': Trimis
         private_space_eq:
           label: Privat
           values:
@@ -497,6 +477,15 @@ ro:
             explanation: Participanții gestionați pot fi promovați drept participanți standard. Înseamnă că vor fi invitați în aplicație și nu vei mai putea să îi gestionezi din nou. Participantul invitat va primi un e-mail pentru a accepta invitația ta.
             new_managed_user_promotion: Promovarea unui nou participant gestionat
             promote: Promovează
+      members:
+        edit:
+          title: Editare membru
+        new:
+          title: Membru nou
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: Încarcă fișierul tău CSV
       menu:
         admin_log: Jurnal activitate admin
         admins: Administratori
@@ -556,8 +545,6 @@ ro:
             sent_to: Trimis către
             subject: Subiect
           name: Buletin Informativ
-        participatory_space_private_user:
-          name: Participant privat pentru spațiul participativ
         scope:
           fields:
             name: Nume
@@ -633,7 +620,7 @@ ro:
             title: Detalii raportare
       newsletter_templates:
         index:
-          preview_template: Previzualizează
+          preview_template: Previzualizați
           title: Modele de buletine informative
           use_template: Utilizează acest model
         show:
@@ -682,7 +669,7 @@ ro:
         send:
           no_recipients: Niciun destinatar pentru această selecție.
         show:
-          preview: Previzualizează
+          preview: Previzualizați
           select_recipients_to_deliver: Selectează destinatarii pentru trimitere
           subject: Subiect
         update:
@@ -736,38 +723,6 @@ ro:
         update:
           error: A apărut o eroare la actualizarea acestei organizații.
           success: Organizația a fost actualizată cu succes.
-      participatory_space_private_users:
-        create:
-          error: A apărut o problemă la adăugarea unui participant privat pentru acest spațiu participativ.
-          success: Accesul la spațiul participativ a participantului privat a fost creat cu succes.
-        destroy:
-          error: A apărut o eroare la ștergerea unui participant privat pentru acest spațiu participativ.
-          success: Accesul la spațiul participativ a participantului privat a fost șters cu succes.
-        index:
-          import_via_csv: Importă din fișier CSV
-          title: Participant privat pentru spațiul participativ
-        new:
-          create: Crează
-          title: Participant privat nou pentru spațiul participativ.
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: A apărut o eroare la citirea fișierului CSV. Vă rugăm să vă asigurați că ați urmat instrucțiunile.
-          success: Fișier-ul CSV a fost încărcat cu succes, trimitem câte un e-mail participanților cu invitația. Acest lucru ar putea dura puțin timp.
-        new:
-          csv_upload:
-            title: Încarcă fișierul tău CSV
-          destroy:
-            button: Șterge toți participanții privați
-            confirm: Sunteți sigur că doriți să ștergeți toți participanții privați? Această acțiune nu poate fi anulată, și nu îi veți putea recupera.
-            empty: Nu aveți niciun participant privat.
-            explanation: Aveți %{count} participanți privați.
-            title: Ștergere participanți privați
-          example_file: 'Exemplu de fişier:'
-          explanation: 'Încărcă fişierul tău CSV. Trebuie să aibă două coloane cu e-mail în prima coloană a fișierului și numele în ultima coloană (e-mail, numele) pentru utilizatorii pe care doriţi să îi adăugaţi în spaţiul participativ, fără antet. Evită folosirea caracterelor invalide, cum ar fi `<>?%&^*#@()[]=+:;"{}\<unk> ` în numele utilizatorului.'
-          explanation_example: |
-            ion.popescu@example.org%{csv_col_sep}Ion Popescu
-            maria.popescu@example.org%{csv_col_sep}Maria Popescu
-          upload: Încarcă
       reminders:
         create:
           error: A apărut o eroare la crearea de memento-uri.
@@ -899,6 +854,7 @@ ro:
         dashboard: Panou de administrare
         impersonatable_users: Participanți gestionabili
         impersonations: Gestionarea participanților
+        menu: Meniu
         panel: Administrator
         participants: Participanți
         scope_types: Tipuri de domeniu
diff --git a/decidim-admin/config/locales/ru.yml b/decidim-admin/config/locales/ru.yml
index 498957aabbba1..0129817d608d8 100644
--- a/decidim-admin/config/locales/ru.yml
+++ b/decidim-admin/config/locales/ru.yml
@@ -258,6 +258,10 @@ ru:
             explanation: Управляемых участников можно повышать до обычных участников. Это означает, что они будут приглашены в приложение, и вы не сможете выступать в их роли их снова. Приглашенный участник получит электронное письмо, чтобы принять ваше приглашение.
             new_managed_user_promotion: Повысить управляемого участника в статусе
             promote: Повысить
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: Загрузите ваш CSV файл
       menu:
         admin_log: Журнал деятельности администратора
         admins: Администраторы
@@ -311,8 +315,6 @@ ru:
             sent_to: Отправлено
             subject: Тема
           name: Рассылка новостей
-        participatory_space_private_user:
-          name: Частный участник пространства соучастия
         scope:
           fields:
             name: Имя
@@ -410,21 +412,6 @@ ru:
         update:
           error: При попытке обновить эту организацию произошла ошибка.
           success: Организация успешно обновлена.
-      participatory_space_private_users:
-        create:
-          error: При попытке добавить частного участника в это пространство соучастия произошла ошибка.
-          success: Частным участникам успешно предоставлен доступ к пространству соучастия.
-        destroy:
-          success: Успешно отменен доступ частных участников к пространству соучастия.
-        index:
-          title: Частный участник пространства соучастия
-        new:
-          create: Добавить
-          title: Добавить частного участника пространства соучастия.
-      participatory_space_private_users_csv_imports:
-        new:
-          csv_upload:
-            title: Загрузите ваш CSV файл
       resource_permissions:
         edit:
           title: Редактировать права доступа
diff --git a/decidim-admin/config/locales/sk.yml b/decidim-admin/config/locales/sk.yml
index 1170b1aa5f4e1..6b4deeeb2ff46 100644
--- a/decidim-admin/config/locales/sk.yml
+++ b/decidim-admin/config/locales/sk.yml
@@ -273,6 +273,10 @@ sk:
             explanation: Spravovaní účastníci môžu byť povýšení na štandardných účastníkov. To znamená, že budú pozvaní do aplikácie, a už ich nebudete môcť spravovať. Pozvaný účastník obdrží e-mail s Vašou pozvánkou.
             new_managed_user_promotion: Povýšenie nového spravovaného účastníka
             promote: Povýšiť
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: Nahrať súbor CSV
       menu:
         admin_log: Záznam aktivity administrátora
         admins: Administrátori
@@ -326,8 +330,6 @@ sk:
             sent_to: Odoslané
             subject: Predmet
           name: Spravodaj
-        participatory_space_private_user:
-          name: Účastníci participatívnych procesov
         scope:
           fields:
             name: Meno
@@ -446,23 +448,6 @@ sk:
         update:
           error: Pri aktualizácii organizácie došlo k chybe.
           success: Organizácia úspešne aktualizovaná.
-      participatory_space_private_users:
-        create:
-          error: Pri pridávaní súkromného používateľa pre tento participačný priestor došlo k chybe.
-          success: Participatívny priestor bol sprístupnený súkromnému užívateľovi.
-        destroy:
-          error: Pri vymazaní súkromného používateľa pre tento participačný priestor došlo k chybe.
-          success: Participatívny priestor bol zneprístupnený súkromnému užívateľovi.
-        index:
-          title: Súkromný účastník participatívneho priestoru
-        new:
-          create: Vytvoriť
-          title: Nový súkromný účastník participatívneho priestoru.
-      participatory_space_private_users_csv_imports:
-        new:
-          csv_upload:
-            title: Nahrať súbor CSV
-          upload: Nahrať
       resource_permissions:
         edit:
           submit: Potvrdiť
diff --git a/decidim-admin/config/locales/sq-AL.yml b/decidim-admin/config/locales/sq-AL.yml
index 703095d7e3956..cb3a3d11ded78 100644
--- a/decidim-admin/config/locales/sq-AL.yml
+++ b/decidim-admin/config/locales/sq-AL.yml
@@ -84,9 +84,6 @@ sq:
         welcome_notification_body: Përmbajtja e njoftimit të mirëseardhjes
         welcome_notification_subject: Tema e njoftimit të mirëseardhjes
         youtube_handler: Emri i përdoruesit Youtube
-      participatory_space_private_user:
-        email: Email
-        name: Emri
       scope:
         code: Kodi
         name: Emri
@@ -238,17 +235,6 @@ sq:
             label: Tipi
         officialized_at_null:
           label: Gjendja
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Ftesa u pranua
-            values:
-              'false': E papranuar
-              'true': Pranuar
-          user_invitation_sent_at_not_null:
-            label: Ftesa u dërguan
-            values:
-              'false': Nuk është dërguar
-              'true': Dërguar
         private_space_eq:
           label: Private
           values:
diff --git a/decidim-admin/config/locales/sr-CS.yml b/decidim-admin/config/locales/sr-CS.yml
index 6624b183b1be9..cd7e6b4394d85 100644
--- a/decidim-admin/config/locales/sr-CS.yml
+++ b/decidim-admin/config/locales/sr-CS.yml
@@ -325,8 +325,6 @@ sr:
             sent_to: Poslato
             subject: Naslov
           name: Bilten
-        participatory_space_private_user:
-          name: Privatni učesnik prostora za diskusiju
         scope:
           fields:
             name: Ime
diff --git a/decidim-admin/config/locales/sv.yml b/decidim-admin/config/locales/sv.yml
index 69100c45997e5..e6ded36e21757 100644
--- a/decidim-admin/config/locales/sv.yml
+++ b/decidim-admin/config/locales/sv.yml
@@ -33,6 +33,11 @@ sv:
       help_section:
         content: Innehåll
       id: ID
+      member:
+        email: E-post
+        name: Namn
+      member_csv_import:
+        file: Fil
       newsletter:
         body: Innehåll
         send_to_all_users: Skicka till alla deltagare
@@ -90,11 +95,6 @@ sv:
         welcome_notification_body: Välkomstmeddelande
         welcome_notification_subject: Välkomstmeddelandets ämnesrad
         youtube_handler: YouTube-namn
-      participatory_space_private_user:
-        email: E-post
-        name: Namn
-      participatory_space_private_user_csv_import:
-        file: Fil
       scope:
         code: Kod
         name: Namn
@@ -124,10 +124,17 @@ sv:
         show_in_footer: Visa i sidfoten
         title: Titel
         weight: Position i listan
+      taxonomy:
+        item_name: Objektnamn
+        parent_id: Överordnad
       user_group_csv_verification:
         file: Fil
     errors:
       models:
+        member_csv_import:
+          attributes:
+            file:
+              malformed: Felaktig importfil, läs igenom anvisningarna noga och se till att filen är UTF-8 kodad.
         newsletter:
           attributes:
             base:
@@ -136,10 +143,6 @@ sv:
           attributes:
             official_img_footer:
               allowed_file_content_types: Ogiltig bildfil
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Fel format, läs igenom instruktionerna noga och se till att filen är UTF-8 kodad.
         user_group_csv_verification:
           attributes:
             file:
@@ -187,12 +190,12 @@ sv:
         export: Exportera
         export-selection: Exportera markerade
         import: Importera
+        member:
+          new: Ny medlem
         menu_hidden: Dölj från menyn
         moderate: Hantera modereringar
         newsletter:
           new: Nytt nyhetsbrev
-        participatory_space_private_user:
-          new: Ny privat deltagare i deltagarutrymme
         per_page: Per sida
         permissions: Hantera behörigheter
         restore: Återställ
@@ -414,6 +417,17 @@ sv:
           values:
             'false': 'Nej'
             'true': 'Ja'
+        members:
+          user_invitation_accepted_at_not_null:
+            label: Inbjudan accepterades
+            values:
+              'false': Inte tackat ja
+              'true': Tackat ja
+          user_invitation_sent_at_not_null:
+            label: Inbjudan har skickats
+            values:
+              'false': Inte skickat
+              'true': Skickad
         moderated_users:
           reports_reason_eq:
             label: Anledning till anmälan
@@ -429,17 +443,6 @@ sv:
           values:
             'false': Har officiell status
             'true': Ej gjord officiell
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Inbjudan accepterades
-            values:
-              'false': Ej godkänd
-              'true': Godkänd
-          user_invitation_sent_at_not_null:
-            label: Inbjudan skickad
-            values:
-              'false': Ej skickad
-              'true': Skickad
         private_space_eq:
           label: Privat
           values:
@@ -572,6 +575,13 @@ sv:
             explanation: Hanterade deltagare kan befordras till vanliga deltagare. Det innebär att de kommer att bli inbjudna till programmet och du kommer inte att kunna hantera dem igen. Den inbjudna deltagaren får ett e-brev om att godkänna inbjudan.
             new_managed_user_promotion: Befordra ny hanterad användare
             promote: Befordra
+      members:
+        create:
+          error: Det gick inte att lägga till en deltagare till processen.
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: Skicka CSV-fil
       menu:
         admin_log: Aktivitetslogg
         admins: Administratörer
@@ -637,8 +647,6 @@ sv:
             sent_to: Skickat till
             subject: Ämne
           name: Nyhetsbrev
-        participatory_space_private_user:
-          name: Deltagare i privat deltagarutrymme
         scope:
           fields:
             name: Namn
@@ -913,53 +921,6 @@ sv:
         form:
           add: Lägg till i lista över tillåtna domännamn
           title: Tillåtna externa domäner
-      participatory_space_private_users:
-        create:
-          error: Det gick inte att lägga till en privat deltagare i deltagarutrymmet.
-          success: Åtkomst för privat deltagare till deltagarutrymmet har skapats.
-        destroy:
-          error: Det gick inte att ta bort en privat deltagare från deltagarutrymmet.
-          success: Åtkomsten för privat deltagare till deltagarutrymmet har tagits bort.
-        edit:
-          title: Redigera privat deltagare i deltagarutrymme.
-          update: Uppdatera
-        index:
-          import_via_csv: Importera via CSV
-          publish_all: Publicera alla
-          title: Privat deltagare i deltagarutrymme
-          unpublish_all: Avpublicera alla
-        new:
-          create: Skapa
-          title: Ny privat deltagare i deltagarutrymme.
-        publish_all:
-          error: Det gick inte att publicera alla privata deltagare i deltagarutrymmet.
-          success: Publicerade alla privata deltagare för deltagarutrymmet
-        unpublish_all:
-          error: Det gick inte att avpublicera alla privata deltagare i deltagarutrymmet.
-          success: Avpublicerade alla privata deltagare för deltagarutrymmet
-        update:
-          error: Det gick inte att uppdatera den privata deltagaren i deltagarutrymmet.
-          success: Privat deltagare i deltagarutrymmet har uppdaterats
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: Det gick inte att läsa CSV-filen. Kontrollera att du har följt instruktionerna.
-          success: CSV-filen har laddats upp och vi skickar en inbjudan med e-post till deltagarna. Det kan ta en stund.
-        new:
-          csv_upload:
-            title: Ladda upp din CSV-fil
-          destroy:
-            button: Radera alla privata deltagare
-            confirm: Är du säker på att du vill radera alla privata deltagare? Den här åtgärden kan inte ångras.
-            empty: Det finns inga privata deltagare.
-            explanation: Det finns %{count} privata deltagare.
-            title: Radera privata deltagare
-          example_file: 'Exempelfil:'
-          explanation: 'Skicka din CSV-fil. Den behöver ha två kolumner för användare som du vill lägga till, utan rubriker, med e-postadressen i den första kolumnen och namnet i den sista kolumnen. Undvik specialtecken som `<>?%&^*#@()[]=+:;"{}\|` i användarnamn.'
-          explanation_example: |
-            jon.andersson@example.org%{csv_col_sep}Jon Andersson
-            jenny.andersson@example.org%{csv_col_sep}Jenny Andersson
-          title: Importera privata deltagare från en CSV-fil
-          upload: Skicka
       reminders:
         create:
           error: Det gick inte att skapa påminnelser.
diff --git a/decidim-admin/config/locales/th-TH.yml b/decidim-admin/config/locales/th-TH.yml
index 0bd1df7874978..1f8fb82a154a2 100644
--- a/decidim-admin/config/locales/th-TH.yml
+++ b/decidim-admin/config/locales/th-TH.yml
@@ -45,9 +45,6 @@ th:
         welcome_notification_body: ยินดีต้อนรับเนื้อหาการแจ้งเตือน
         welcome_notification_subject: ยินดีต้อนรับเรื่องการแจ้งเตือน
         youtube_handler: ตัวจัดการ YouTube
-      participatory_space_private_user:
-        email: อีเมล
-        name: ชื่อ
       scope:
         code: รหัส
         name: ชื่อ
diff --git a/decidim-admin/config/locales/tr-TR.yml b/decidim-admin/config/locales/tr-TR.yml
index 70d22c1a67775..7ffdcf0fb0e27 100644
--- a/decidim-admin/config/locales/tr-TR.yml
+++ b/decidim-admin/config/locales/tr-TR.yml
@@ -35,6 +35,7 @@ tr:
       id: İD
       newsletter:
         body: Vücut
+        send_to_all_users: Bütün katılımcılara gönder
         send_to_followers: Takipçilere gönder
         send_to_participants: Katılımcılara gönder
         subject: konu
@@ -89,11 +90,6 @@ tr:
         welcome_notification_body: Karşılama bildirimi gövdesi
         welcome_notification_subject: Karşılama bildirimi konusu
         youtube_handler: YouTube işleyici
-      participatory_space_private_user:
-        email: E-Posta
-        name: Adı
-      participatory_space_private_user_csv_import:
-        file: Dosya
       scope:
         code: kod
         name: isim
@@ -135,10 +131,6 @@ tr:
           attributes:
             official_img_footer:
               allowed_file_content_types: Geçersiz resim dosyası
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: Bozuk içe aktarım dosyası, lütfen yönergeleri dikkatlice gözden geçirin ve dosyanın UTF-8 ile kodlandığından emin olun.
         user_group_csv_verification:
           attributes:
             file:
@@ -165,6 +157,7 @@ tr:
   decidim:
     admin:
       actions:
+        actions_label: '%{resource} için işlemler'
         add: Eklemek
         attachment:
           new: Yeni ek
@@ -181,10 +174,9 @@ tr:
           Fikrinizi değiştirirseniz daha sonra yeniden yükleyebilirsiniz.
         export-selection: Seçimi dışa aktar
         import: İçe aktar
+        menu_hidden: Menüden gizle
         newsletter:
           new: Yeni bülten
-        participatory_space_private_user:
-          new: Yeni katılımcı alanı özel kullanıcısı
         per_page: Sayfa başına
         restore: Geri yükle
         send_me_a_test_email: Bana bir test e-postası gönder
@@ -281,6 +273,7 @@ tr:
       block_user:
         bulk_new:
           action: Hesapları engelle ve gerekçe gönder.
+          already_reported_html: Bu işleme devam ederek katılımcının tüm içeriklerini de gizleyeceksiniz.
           description: Bir kullanıcıyı engellemek, kullanıcının hesabını kullanılamaz hale getirir. Gerekçenizde engeli kaldırmak için gereken yönergeleri ekleyebilirsiniz.
           justification: Gerekçe
           title: Kullanıcıları engelle
@@ -300,6 +293,7 @@ tr:
         create:
           error: Bu bileşeni oluştururken bir hata oluştu.
           success: Bileşen başarıyla oluşturuldu.
+          success_landing_page: Bileşen başarıyla oluşturuldu. Alanın ana sayfasına bu bileşen için bir içerik engeli ekleyebilirsiniz. Yapılandırmak için <a href="%{landing_page_path}">Ana sayfaya</a> gidiniz.
         edit:
           title: Bileşeni düzenle
           update: Güncelleştirme
@@ -375,6 +369,7 @@ tr:
         form:
           domain_too_short: Alan adı çok kısa
         update:
+          error: İzin verilen harici alan adı listesi güncellenemedi.
           success: İzin verilen harici alan adı listesi başarıyla güncellendi.
       exports:
         export_as: "%{name} olarak %{export_format}"
@@ -392,6 +387,7 @@ tr:
             'false': 'Hayır'
             'true': 'Evet'
         last_sign_in_at_present:
+          label: Daha önce giriş yaptınız mı
           values:
             'false': 'Hayır'
             'true': 'Evet'
@@ -410,17 +406,6 @@ tr:
           values:
             'false': resmileştirilmiş
             'true': Resmi değil
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: Davet kabul edildi
-            values:
-              'false': Kabul edilmedi
-              'true': 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:
@@ -433,6 +418,9 @@ tr:
             'true': Yayından kaldırıldı
         remove_all: Tümünü kaldır
         search_label: Arama
+        search_placeholder:
+          name_or_nickname_or_email_cont: '%{collection}''da e-posta, isim veya takma ad ile ara'
+          user_name_or_user_nickname_or_user_email_cont: '%{collection}''da e-posta, isim veya takma ad ile ara'
         state_eq:
           label: Durum
           values:
@@ -452,6 +440,7 @@ tr:
           import_csv:
             explanation: 'Dosya kılavuzu:'
             message_1: CSV dosyaları desteklenmektedir.
+            message_2: "e-posta verileri içeren .csv dosyası"
       help_sections:
         error: Yardım bölümleri güncellenirken bir hata oluştu.
         form:
@@ -506,6 +495,7 @@ tr:
             records:
               detail: Lütfen satırların doğru biçimlendirildiğinden ve geçerli kayıtlar içerdiğinden emin olun.
           missing_headers:
+            detail: Lütfen dosyanın istenen sütunlara sahip olduğundan emin olunuz.
             message:
               one: Eksik sütun %{columns}.
               other: Eksik sütunlar %{columns}.
@@ -518,12 +508,14 @@ tr:
           actions:
             back: Geri
           download_example: Örneği indir
+          download_example_format:
           file_legend: Ayrıştırılmak üzere bir içe aktarma dosyası ekleyin.
           import: İçe aktar
         notice: "%{count} %{resource_name} başarıyla içe aktarıldı."
       logs:
         filters:
           participatory_space: Katılımcı alanı bul
+          text: Kullanıcı e-postası, isim veya kullanıcı adı ile ara
           user: Kullanıcı
         logs_list:
           no_logs_yet: Henüz kayıt yok.
@@ -539,6 +531,15 @@ tr:
             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 kullanıcı tanıtımı
             promote: Desteklemek
+      members:
+        create:
+          error: Bu katılımcı alan için bir üye eklenirken hata oluştu.
+        update:
+          error: Bu katılımcı alan için bir üyeyi güncellerken bir hata oluştu.
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: CSV dosyanızı yükleyin
       menu:
         admin_log: Yönetici etkinlik günlüğü
         admins: Yöneticiler
@@ -550,6 +551,7 @@ tr:
         content: Şikayet edilmiş içerik
         external_domain_allowlist: İzin verilen harici alan adları
         help_sections: Yardım bölümleri
+        homepage: Ana sayfa düzeni
         impersonations: impersonations
         manage: yönetme
         moderation: Küresel denetimler
@@ -603,8 +605,6 @@ tr:
             sent_to: Gönderilen
             subject: konu
           name: Bülten
-        participatory_space_private_user:
-          name: Katılımcı alan özel kullanıcısı
         scope:
           fields:
             name: isim
@@ -683,6 +683,10 @@ tr:
             report_language: Rapor dili
             report_reason: Nedeni
             title: Rapor ayrıntıları
+      new_import:
+        accepted_mime_types:
+          json: JSON
+          xlsx: XLSX
       newsletter_templates:
         index:
           preview_template: Ön izleme
@@ -692,6 +696,8 @@ tr:
           preview: 'Şablon özizlemesi: %{template_name}'
           use_template: Bu şablonu kullan
       newsletters:
+        confirm_recipients:
+          title: Alıcıları doğrula
         create:
           error: Bu bülteni oluştururken bir hata oluştu.
         deliver:
@@ -726,6 +732,7 @@ tr:
           followers_help: Listede seçili herhangi bir katılımcı süreci takip eden bütün onaylanmış kullanıcılara haber bülteni gönderir.
           participants_help: Listede seçili herhangi bir katılımcı sürece katılmış olan bütün onaylanmış kullanıcılara haber bülteni gönderir.
           recipients_count: Bu haber bülteni <strong id='recipients_count'>%{count}</strong> kullanıcıya gönderilecektir.
+          select_participatory_processes: Katılımcı süreçleri seç
           select_spaces: Haber bültenini bölmek için alanları seçin
           send_to_all_users: Tüm kullanıcılara gönder
           title: Teslim etmek için alıcıları seçiniz
@@ -768,6 +775,7 @@ tr:
           officialized: resmileştirilmiş
           reofficialize: Reofficialize
           reports: Raporlar
+          send_message: Mesaj Gönder
           status: durum
           unofficialize: Unofficialize
         new:
@@ -789,9 +797,17 @@ tr:
           title: Kuruluş düzenle
           update: Güncelleştirme
         form:
+          admin_terms_of_service: Yönetici kullanım koşulları
+          colors:
+            colors_title: Organizasyon renkleri
+            colors_warning_html: Uyarı! Bu renkleri değiştirmek renk kontrastını bozabilir. Seçtiğiniz kontrastı veya diğer benzer araçları <a href="https://webaim.org/resources/contrastchecker">WebAIM Contrast Checker</a>'dan kontrol edebilirsiniz.
+            explanation: Bu araç organizasyonun web sitesinde kullanılacak renk paletinde eşit aralıklarla yerleştirilmiş tonlardan oluşan bir renk düzeni seçmenize yardımcı olur.
+          extra_features: İlave özellikler
           facebook: Facebook
           github: GitHub
           instagram: Instagram
+          logos:
+            organization_logos: Organizasyon logoları
           rich_text_editor_in_public_views_help: Bazı metin alanlarında, katılımcılar zengin metin düzenleyicisini kullanarak HTML etiketleri ekleyebilecekler.
           social_handlers: Sosyal
           twitter: x
@@ -811,32 +827,6 @@ tr:
         form:
           add: İzin verilenler listesine ekle
           title: İzin verilen harici alan adları
-      participatory_space_private_users:
-        create:
-          error: Bu katılımcı alan için özel bir kullanıcı eklenirken bir hata oluştu.
-          success: Katılımcı alan özel kullanıcı erişimi başarıyla oluşturuldu.
-        destroy:
-          error: Bu katılımcı alan için özel bir kullanıcı silinirken bir hata oluştu.
-          success: Katılımcı alan özel kullanıcı erişimi başarıyla yok edildi.
-        edit:
-          title: Katılımcı alanı özel katılımcılarını düzenle.
-          update: Güncelle
-        index:
-          import_via_csv: CSV'den içe aktar
-          publish_all: Tümünü yayımla
-          title: Katılımcı alan özel kullanıcısı
-          unpublish_all: Tümünü yayımdan kaldır
-        new:
-          create: yaratmak
-          title: Yeni Katılımcı Uzay özel kullanıcısı.
-      participatory_space_private_users_csv_imports:
-        new:
-          csv_upload:
-            title: CSV dosyanızı yükleyin
-          destroy:
-            title: Özel Kullanıcıları kaldır
-          example_file: 'Örnek dosya:'
-          upload: Yükle
       reminders:
         new:
           submit: Gönder
@@ -877,14 +867,19 @@ tr:
           success: Kapsam başarıyla güncellendi
       share_tokens:
         actions:
+          confirm_destroy: Bu erişimi silmek istediğinizden emin misiniz?
           destroy: Sil
           edit: Düzenle
           preview: Ön İzleme
+        create:
+          invalid: Erişim linki üretilirken bir hata oluştu.
         edit:
+          title: '%{name} için yeni erişim linki'
           update: Güncelle
         form:
           automatic: Otomatik
           custom: Özel
+          custom_token: Kelimeyi özelleştir
           expires_at: Son Geçerlilik Tarihi
           'false': 'Hayır'
           never_expire: Asla
@@ -893,6 +888,19 @@ tr:
           'true': 'Evet'
         index:
           copied: Erişim bağlantısı kopyalandı!
+          copy_message: Metin başarıyla panoya kopyalandı.
+          create_new_token: İlk erişim linkini oluştur!
+          empty_html: Şu an aktif olan bir erişim linki yok. %{new_token_link}
+          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. 
+            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:
+          create: Oluştur
+          title: '%{name} için yeni erişim linki'
       shared:
         gallery:
           add_images: Resim ekle
@@ -916,18 +924,45 @@ tr:
         destroy:
           success: Sayfa başarıyla yok edildi
         edit:
+          last_notable_change: 'Son önemli değişiklik: %{tos_version_formatted}'
           title: Sayfayı düzenle
           update: Güncelleştirme
         form:
           none: Yok
+          slug_help_html: 'Burada tam bağlantıları değil, kısmi yolları kullanınız. Harfleri, sayıları, kesik çizgileri, taksimleri kabul eder ve bir harf ile başlamak zorundadır. Örnek: %{url}'
         index:
           last_notable_change: Son önemli değişiklik
         new:
           title: Yeni sayfa
         topic:
+          empty: Bu konu altında hiçbir sayfa yok.
           without_topic: Konu olmayan sayfalar
         update:
           error: Bu sayfa güncellenirken bir hata oluştu.
+          success: Sayfa başarıyla güncellendi.
+      taxonomies:
+        destroy:
+          invalid: Bu sınıflandırmayı kaldırırken bir hata oluştu.
+          success: Sınıflandırma başarıyla kaldırıldı.
+        edit:
+          description: Bu kategorideki ögeler katılımcı alanları veya bileşenler gibi kaynakları sınıflandırmak veya filtrelemek için kullanılacaktır. Listeyi yeniden düzenlemek için ögeleri sürükleyerek bırakınız.
+        new:
+          title: Yeni kategori
+        update:
+          success: Kategori başarıyla güncellendi.
+      taxonomy_filters:
+        create:
+          error: Bu kategori filtresi oluşturulurken bir hata oluştu.
+        destroy:
+          success: Kategori filtresi başarıyla kaldırıldı.
+        form:
+          no_items: Bu kategori için herhangi bir öge mevcut değil. Kategori içindeki yapılandırma ayarlarından ögeler oluşturabilirsiniz.
+        table:
+          components_count: Bunu kullanan bileşenler
+          internal_name:
+      taxonomy_filters_selector:
+        new:
+          save:
       titles:
         admin_log: Yönetici günlüğü
         area_types: Alan türleri
@@ -941,6 +976,14 @@ tr:
         participants: Kullanıcılar
         scope_types: Kapsam türleri
         scopes: kapsamları
+        taxonomy_filters: '"%{taxonomy} için kategori filtreleri'
+      tooltips:
+        cannot_edit_taxonomy_filter: Bu kategori filtresi düzenlenemiyor
+        deleted_attachment_collections_info: Bu klasör ek dosyalar içerdiğinden silinemiyor.
+        deleted_component_info: Bu bileşen sadece durumu 'Yayınlanmamış' ise silinebilir.
+      trash_management:
+        restore:
+          invalid: '%{resource_name} geri yüklenirken bir hata oluştu.'
       users:
         create:
           error: Bu kullanıcıyı davet ederken bir hata oluştu.
@@ -954,13 +997,19 @@ tr:
           role: Rol
         new:
           create: Davet et
+          title: Yeni yönetici davet et
       users_statistics:
         users_count:
           admins: Yöneticiler
           last_day: Son gün
           last_month: Geçen ay
           last_week: Geçen hafta
+          no_users_count_statistics_yet: Henüz katılımcı sayısı istatistiği yok.
           participants: Katılımcılar
+    forms:
+      errors:
+        impersonate_user:
+          reason: Yönetilmeyen bir katılımcıyla ilgili bir işlem yaparken gerekçe belirtilmesi zorunludur.
     moderations:
       actions:
         expand: Genişlet
@@ -970,6 +1019,17 @@ tr:
         title: Eylemler
       admin:
         reportable:
+          bulk_action:
+            hide:
+              failed: 'Bazı kaynakları gizlerken bir hata oluştu: %{errored}'
+              invalid: Kolaylaştırıcı seçilmedi.
+              success: Kaynaklar başarıyla gizlendi.
+            ignore:
+              invalid: Kullanıcı kolaylaştırıcısı seçilmedi.
+              success: Katılımcıların bildirilmesi başarıyla kaldırıldı.
+            unreport:
+              failed: 'Bazı kaynakların bildirilmesini kaldırırken bir hata oluştu: %{errored}'
+              success: Kaynakların engellenmesi başarıyla kaldırıldı.
           hide:
             invalid: Kaynağı gizleyen bir sorun oluştu.
             success: Kaynak başarıyla gizlendi.
@@ -984,6 +1044,7 @@ tr:
           fields:
             hidden_at: Gizli
             participatory_space: Katılımcı alanı
+            report_count: Bildirilme sayısı
             reportable_type: Türü
             reported_content_url: Raporlanan içerik URL'si
             visit_url: URL'yi ziyaret et
diff --git a/decidim-admin/config/locales/uk.yml b/decidim-admin/config/locales/uk.yml
index 3067fc0780b3e..26c1405a55c2b 100644
--- a/decidim-admin/config/locales/uk.yml
+++ b/decidim-admin/config/locales/uk.yml
@@ -281,8 +281,6 @@ uk:
             sent_at: 'Надіслане:'
             subject: Тема
           name: Розсилання новин
-        participatory_space_private_user:
-          name: Приватний учасник простору співучасті
         scope:
           fields:
             name: Ім'я
@@ -371,17 +369,6 @@ uk:
         update:
           error: При спробі оновити цю організацію сталася помилка.
           success: Організацію успішно оновлено.
-      participatory_space_private_users:
-        create:
-          error: При спробі додати приватного учасника до цього простору співучасті сталася помилка.
-          success: Приватним учасникам успішно надано доступ до простору співучасті.
-        destroy:
-          success: Успішно скасовано доступ приватних учасників до простору співучасті.
-        index:
-          title: Приватний учасник простору співучасті
-        new:
-          create: Додати
-          title: Додати приватного учасника простору співучасті.
       resource_permissions:
         edit:
           title: Редагувати права доступу
diff --git a/decidim-admin/config/locales/zh-CN.yml b/decidim-admin/config/locales/zh-CN.yml
index 0ee57f734f51a..28028f6f19d77 100644
--- a/decidim-admin/config/locales/zh-CN.yml
+++ b/decidim-admin/config/locales/zh-CN.yml
@@ -286,6 +286,10 @@ zh-CN:
             explanation: 管理下的参与者可以提升到标准参与者。 这意味着他们将被邀请到应用程序中，您将无法再次管理他们。 邀请的参与者将收到一封电子邮件来接受您的邀请。
             new_managed_user_promotion: 新管理的参与者促销活动
             promote: 升级
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: 上传您的 CSV 文件
       menu:
         admin_log: 管理员活动日志
         admins: 管理员
@@ -339,8 +343,6 @@ zh-CN:
             sent_to: 发送至
             subject: 议 题
           name: 通讯
-        participatory_space_private_user:
-          name: 参与性空间私人参与者
         scope:
           fields:
             name: 名称
@@ -462,23 +464,6 @@ zh-CN:
         update:
           error: 更新这个组织时出现问题。
           success: 组织更新成功。
-      participatory_space_private_users:
-        create:
-          error: 在这种参与空间中添加私人参与者时出现了问题。
-          success: 参与性空间私人参与者访问成功创建。
-        destroy:
-          error: 删除这个参与空间的私人参与者时出错。
-          success: 参与性空间私人参与者访问成功被摧毁。
-        index:
-          title: 参与性空间私人参与者
-        new:
-          create: 创建
-          title: 新的参与性空间活动私人参与者。
-      participatory_space_private_users_csv_imports:
-        new:
-          csv_upload:
-            title: 上传您的 CSV 文件
-          upload: 上传
       resource_permissions:
         edit:
           submit: 提交
diff --git a/decidim-admin/config/locales/zh-TW.yml b/decidim-admin/config/locales/zh-TW.yml
index 485301629fb85..014fe190af880 100644
--- a/decidim-admin/config/locales/zh-TW.yml
+++ b/decidim-admin/config/locales/zh-TW.yml
@@ -85,9 +85,6 @@ zh-TW:
         welcome_notification_body: 歡迎通知內容
         welcome_notification_subject: 歡迎通知主旨
         youtube_handler: YouTube 處理器
-      participatory_space_private_user:
-        email: 電子郵件
-        name: 名稱
       scope:
         code: 代碼
         name: 名稱
@@ -128,10 +125,6 @@ zh-TW:
           attributes:
             official_img_footer:
               allowed_file_content_types: 圖片有誤
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: 匯入檔案格式有誤，請小心閱讀教學並且確認檔案是使用 UTF-8 編碼
         user_group_csv_verification:
           attributes:
             file:
@@ -169,8 +162,6 @@ zh-TW:
         import: 匯入
         newsletter:
           new: 新電子報
-        participatory_space_private_user:
-          new: 新參與空間私有使用者
         per_page: 每頁
         share: 分享
         user:
@@ -355,17 +346,6 @@ zh-TW:
           values:
             'false': 官方化
             'true': 非官方化
-        participatory_space_private_users:
-          user_invitation_accepted_at_not_null:
-            label: 邀請已接受
-            values:
-              'false': 未接受
-              'true': 已接受
-          user_invitation_sent_at_not_null:
-            label: 已發送邀請
-            values:
-              'false': 未發送
-              'true': 已送出
         private_space_eq:
           label: 私人的
           values:
@@ -479,6 +459,10 @@ zh-TW:
             explanation: 受管理的參與者可以晉升為標準參與者。這意味著他們將受邀加入應用程式，您將無法再對其進行管理。被邀請的參與者將收到一封電子郵件，以接受您的邀請。
             new_managed_user_promotion: 晉升新的受管理參與者
             promote: 推廣
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: 請上傳您的 CSV 檔案。
       menu:
         admin_log: 管理員活動日誌
         admins: 管理員
@@ -536,8 +520,6 @@ zh-TW:
             sent_to: 發送至
             subject: 主旨
           name: 電子報
-        participatory_space_private_user:
-          name: 參與空間私有參與者
         scope:
           fields:
             name: 名稱
@@ -715,38 +697,6 @@ zh-TW:
         update:
           error: 更新此組織時發生問題。
           success: 組織更新成功
-      participatory_space_private_users:
-        create:
-          error: 在此參與空間中添加私人參與者時出現問題。
-          success: 成功建立參與空間的私人參與者訪問權限。
-        destroy:
-          error: 刪除參與空間的私人參與者時發生問題。
-          success: 成功刪除參與空間的私人參與者訪問權限。
-        index:
-          import_via_csv: 透過 CSV 匯入
-          title: 參與空間私有參與者
-        new:
-          create: 建立
-          title: 新的參與空間私人參與者。
-      participatory_space_private_users_csv_imports:
-        create:
-          invalid: 讀取 CSV 檔案時發生問題。請確保您已按照指示進行操作。
-          success: CSV檔案上傳成功，我們正在發送邀請電子郵件給參與者。這可能需要一些時間。
-        new:
-          csv_upload:
-            title: 請上傳您的 CSV 檔案。
-          destroy:
-            button: 刪除所有私人參與者
-            confirm: 您確定要刪除所有私人參與者嗎？此操作無法撤銷，您將無法恢復它們。
-            empty: 您沒有私人參與者。
-            explanation: 您有 %{count} 位私人參與者。
-            title: 刪除私人參與者
-          example_file: '示例文件:'
-          explanation: '請上傳您的 CSV 檔案。檔案的第一欄應為電子郵件，最後一欄應為要添加到參與空間的使用者的名稱，檔案中不應包含標題。請避免在使用者名稱中使用無效字元，例如 <>?%&^*#@()[]=+:;"{}\|。'
-          explanation_example: |
-            john.doe@example.org%{csv_col_sep}John Doe
-            jane.doe@example.org%{csv_col_sep}Jane Doe
-          upload: 上傳
       reminders:
         create:
           error: 在創建提醒時遇到問題。
diff --git a/decidim-admin/lib/decidim/admin/engine.rb b/decidim-admin/lib/decidim/admin/engine.rb
index 9cf85b753ecc0..e80ed6aee9201 100644
--- a/decidim-admin/lib/decidim/admin/engine.rb
+++ b/decidim-admin/lib/decidim/admin/engine.rb
@@ -44,7 +44,6 @@ class Engine < ::Rails::Engine
         Decidim.icons.register(name: "earth-line", icon: "earth-line", category: "system", description: "Earth line", engine: :admin)
 
         Decidim.icons.register(name: "attachment-2", icon: "attachment-2", category: "system", description: "", engine: :admin)
-        Decidim.icons.register(name: "spy-line", icon: "spy-line", category: "system", description: "", engine: :admin)
         Decidim.icons.register(name: "refresh-line", icon: "refresh-line", category: "system", description: "", engine: :admin)
         Decidim.icons.register(name: "zoom-in-line", icon: "zoom-in-line", category: "system", description: "", engine: :admin)
         Decidim.icons.register(name: "add-line", icon: "add-line", category: "system", description: "", engine: :admin)
diff --git a/decidim-admin/lib/decidim/admin/test/admin_members_shared_examples.rb b/decidim-admin/lib/decidim/admin/test/admin_members_shared_examples.rb
new file mode 100644
index 0000000000000..302177142176f
--- /dev/null
+++ b/decidim-admin/lib/decidim/admin/test/admin_members_shared_examples.rb
@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+shared_examples "manage admin members examples" do
+  let(:other_user) { create(:user, organization:, email: "my_email@example.org") }
+
+  let!(:member) { create(:member, user:, participatory_space:) }
+
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+    visit participatory_space_edit_path
+    within_admin_sidebar_menu do
+      click_on "Members"
+    end
+  end
+
+  it "shows the member list" do
+    within "#members table" do
+      expect(page).to have_content(member.user.email)
+    end
+  end
+
+  it "creates a new member" do
+    click_on "New member"
+
+    within ".new_member" do
+      fill_in :member_name, with: "John Doe"
+      fill_in :member_email, with: other_user.email
+
+      find("*[type=submit]").click
+    end
+
+    expect(page).to have_admin_callout("successfully")
+
+    within "#members table" do
+      expect(page).to have_content(other_user.email)
+    end
+
+    visit decidim_admin.root_path
+    expect(page).to have_content("invited #{other_user.name} to be a member")
+  end
+
+  describe "when import a batch of members from csv" do
+    it "import a batch of members" do
+      click_on "Import via CSV"
+
+      # The CSV has no headers
+      expect(Decidim::Admin::ParticipatorySpace::ImportMemberCsvJob).to receive(:perform_later).once.ordered.with("john.doe@example.org", "John Doe", participatory_space, user)
+      expect(Decidim::Admin::ParticipatorySpace::ImportMemberCsvJob).to receive(:perform_later).once.ordered.with("jane.doe@example.org", "Jane Doe", participatory_space, user)
+      dynamically_attach_file(:member_csv_import_file, Decidim::Dev.asset("import_members.csv"))
+      perform_enqueued_jobs { click_on "Upload" }
+
+      expect(page).to have_content("CSV file uploaded successfully")
+    end
+  end
+
+  describe "when publishing all members" do
+    let!(:member) { create(:member, :unpublished, user:, participatory_space:) }
+
+    it "publishes all members" do
+      click_on "Publish all"
+
+      sleep(1)
+      expect(member.reload).to be_published
+    end
+
+    it "displays the correct log message" do
+      click_on "Publish all"
+      sleep(1)
+      visit decidim_admin.root_path
+      expect(page).to have_content("published all members of the #{translated(participatory_space.title)}")
+    end
+  end
+
+  describe "when managing different users" do
+    before do
+      create(:member, user: other_user, participatory_space:)
+      visit current_path
+    end
+
+    it "deletes a member" do
+      within "#members tr", text: other_user.email do
+        find("button[data-controller='dropdown']").click
+        accept_confirm { click_on "Delete" }
+      end
+
+      expect(page).to have_admin_callout("successfully")
+
+      within "#members table" do
+        expect(page).to have_no_content(other_user.email)
+      end
+    end
+
+    context "when the user has not accepted the invitation" do
+      before do
+        form = Decidim::Admin::ParticipatorySpace::MemberForm.from_params(
+          name: "test",
+          email: "test@example.org"
+        )
+
+        Decidim::Admin::ParticipatorySpace::CreateMember.call(
+          form,
+          participatory_space
+        )
+
+        visit current_path
+      end
+
+      it "resends the invitation to the user" do
+        within "#members tr", text: "test@example.org" do
+          find("button[data-controller='dropdown']").click
+          click_on "Resend invitation"
+        end
+
+        expect(page).to have_admin_callout("successfully")
+      end
+    end
+  end
+end
diff --git a/decidim-admin/lib/decidim/admin/test/filters_participatory_space_users_examples.rb b/decidim-admin/lib/decidim/admin/test/filters_participatory_space_users_examples.rb
index c6eb525ed6d95..dc43a289f55cb 100644
--- a/decidim-admin/lib/decidim/admin/test/filters_participatory_space_users_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/filters_participatory_space_users_examples.rb
@@ -5,7 +5,7 @@
     apply_filter(label, value)
 
     within ".table-list tbody" do
-      expect(page).to have_content(compare_with)
+      expect(page).to have_content(compare_with.gsub("\n", " "))
       expect(page).to have_css("tr", count: 1)
     end
   end
diff --git a/decidim-admin/lib/decidim/admin/test/invite_participatory_space_admins_shared_examples.rb b/decidim-admin/lib/decidim/admin/test/invite_participatory_space_admins_shared_examples.rb
index 706ad2f45c945..4a9c8f55317a6 100644
--- a/decidim-admin/lib/decidim/admin/test/invite_participatory_space_admins_shared_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/invite_participatory_space_admins_shared_examples.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-shared_examples "inviting participatory space admins" do |check_private_space: true, check_landing_page: true|
+shared_examples "inviting participatory space admins" do |check_members_page: true, check_landing_page: true|
   let(:role) { "Administrator" }
 
   before do
     switch_to_host organization.host
   end
 
-  shared_examples "sees public space menu" do
+  shared_examples "sees space without members menu" do
     it "can access all sections" do
       within_admin_sidebar_menu do
         expect(page).to have_content(about_this_space_label)
@@ -16,13 +16,13 @@
         expect(page).to have_content("Components")
         expect(page).to have_content("Attachments")
         expect(page).to have_content(space_admins_label)
-        expect(page).to have_no_content("Members") if participatory_space.respond_to?(:private_space)
+        expect(page).to have_no_content("Members") if participatory_space.respond_to?(:has_members)
         expect(page).to have_content("Moderations")
       end
     end
   end
 
-  shared_examples "sees private space menu" do
+  shared_examples "sees space with members menu" do
     it "can access all sections" do
       within_admin_sidebar_menu do
         expect(page).to have_content(about_this_space_label)
@@ -31,7 +31,7 @@
         expect(page).to have_content("Components")
         expect(page).to have_content("Attachments")
         expect(page).to have_content(space_admins_label)
-        expect(page).to have_content("Members") if participatory_space.respond_to?(:private_space)
+        expect(page).to have_content("Members") if participatory_space.respond_to?(:has_members)
         expect(page).to have_content("Moderations")
       end
     end
@@ -98,14 +98,14 @@
       end
 
       context "and is a public space" do
-        it_behaves_like "sees public space menu"
+        it_behaves_like "sees space without members menu"
       end
 
-      if check_private_space
-        context "and is a private space" do
-          let(:participatory_space) { private_participatory_space }
+      if check_members_page
+        context "and is a space with members" do
+          let(:participatory_space) { members_participatory_space }
 
-          it_behaves_like "sees private space menu"
+          it_behaves_like "sees space with members menu"
         end
       end
     end
@@ -163,14 +163,14 @@
       end
 
       context "and is a public space" do
-        it_behaves_like "sees public space menu"
+        it_behaves_like "sees space without members menu"
       end
 
-      if check_private_space
-        context "and is a private space" do
-          let(:participatory_space) { private_participatory_space }
+      if check_members_page
+        context "and is a space with members" do
+          let(:participatory_space) { members_participatory_space }
 
-          it_behaves_like "sees private space menu"
+          it_behaves_like "sees space with members menu"
         end
       end
     end
diff --git a/decidim-admin/lib/decidim/admin/test/manage_attachments_examples.rb b/decidim-admin/lib/decidim/admin/test/manage_attachments_examples.rb
index 10187414c7b9a..c83994d04ec39 100644
--- a/decidim-admin/lib/decidim/admin/test/manage_attachments_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/manage_attachments_examples.rb
@@ -3,6 +3,7 @@
 shared_examples "manage attachments examples" do
   context "when processing attachments" do
     let!(:attachment) { create(:attachment, attached_to:, attachment_collection:) }
+    let!(:attachment_with_link) { create(:attachment, :with_link, attached_to:, attachment_collection:) }
 
     before do
       visit current_path
@@ -182,6 +183,17 @@
       expect(page).to have_no_content(translated(attachment.title, locale: :en))
     end
 
+    it "can delete an attachment with a link" do
+      within "tr", text: translated(attachment_with_link.title) do
+        find("button[data-controller='dropdown']").click
+        accept_confirm { click_on "Delete" }
+      end
+
+      expect(page).to have_admin_callout("Attachment destroyed successfully")
+
+      expect(page).to have_no_content(translated(attachment_with_link.title, locale: :en))
+    end
+
     it "can update an attachment" do
       within "#attachments" do
         within "tr", text: translated(attachment.title) do
diff --git a/decidim-admin/spec/commands/decidim/admin/content_blocks/update_content_block_spec.rb b/decidim-admin/spec/commands/decidim/admin/content_blocks/update_content_block_spec.rb
index 0a574e82c1304..838028dcc2fdf 100644
--- a/decidim-admin/spec/commands/decidim/admin/content_blocks/update_content_block_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/content_blocks/update_content_block_spec.rb
@@ -116,6 +116,17 @@ module Decidim::Admin::ContentBlocks
             }.with_indifferent_access
           end
 
+          it "purges the background image attachment" do
+            attachment = content_block.images_container.background_image
+
+            expect(attachment).to receive(:purge).and_call_original
+
+            subject.call
+            content_block.reload
+
+            expect(content_block.images_container.background_image.attached?).to be false
+          end
+
           it "deletes the attachment" do
             expect do
               subject.call
diff --git a/decidim-admin/spec/commands/decidim/admin/deliver_newsletter_spec.rb b/decidim-admin/spec/commands/decidim/admin/deliver_newsletter_spec.rb
index 69ae26b33b841..8b6579a43008f 100644
--- a/decidim-admin/spec/commands/decidim/admin/deliver_newsletter_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/deliver_newsletter_spec.rb
@@ -315,11 +315,11 @@ def user_localized_body(user)
         context "when spaces selected" do
           let!(:participatory_process) { create(:participatory_process, organization:, private_space: true) }
           let!(:component) { create(:dummy_component, organization:, participatory_space: participatory_process) }
-          let!(:private_users) do
-            create_list(:participatory_space_private_user, 30) do |private_user|
-              private_user.user = create(:user, :confirmed, newsletter_notifications_at: Time.current, organization:)
-              private_user.privatable_to = participatory_process
-              private_user.save!
+          let!(:members) do
+            create_list(:member, 30) do |member|
+              member.user = create(:user, :confirmed, newsletter_notifications_at: Time.current, organization:)
+              member.participatory_space = participatory_process
+              member.save!
             end
           end
           let(:participatory_space_types) do
@@ -339,7 +339,7 @@ def user_localized_body(user)
             ]
           end
 
-          let!(:deliverable_users) { Decidim::User.where(id: private_users.map(&:decidim_user_id)) }
+          let!(:deliverable_users) { Decidim::User.where(id: members.map(&:decidim_user_id)) }
 
           let!(:undeliverable_users) do
             create_list(:user, rand(2..9), :confirmed, organization:, newsletter_notifications_at: Time.current)
diff --git a/decidim-admin/spec/commands/decidim/admin/create_participatory_space_private_user_spec.rb b/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb
similarity index 75%
rename from decidim-admin/spec/commands/decidim/admin/create_participatory_space_private_user_spec.rb
rename to decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb
index ef1602ab84e81..1ca15f31bb0c5 100644
--- a/decidim-admin/spec/commands/decidim/admin/create_participatory_space_private_user_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb
@@ -2,21 +2,21 @@
 
 require "spec_helper"
 
-module Decidim::Admin
-  describe CreateParticipatorySpacePrivateUser do
-    subject { described_class.new(form, privatable_to, via_csv:) }
+module Decidim::Admin::ParticipatorySpace
+  describe CreateMember do
+    subject { described_class.new(form, participatory_space, via_csv:) }
 
     let(:via_csv) { false }
-    let(:privatable_to) { create(:participatory_process) }
+    let(:participatory_space) { create(:participatory_process) }
     let!(:email) { "my_email@example.org" }
     let!(:name) { "Weird Guy" }
-    let!(:user) { create(:user, email: "my_email@example.org", organization: privatable_to.organization) }
-    let!(:current_user) { create(:user, email: "some_email@example.org", organization: privatable_to.organization) }
+    let!(:user) { create(:user, email: "my_email@example.org", organization: participatory_space.organization) }
+    let!(:current_user) { create(:user, email: "some_email@example.org", organization: participatory_space.organization) }
     let(:role) { generate_localized_title(:role) }
     let(:form) do
       double(
         invalid?: invalid,
-        delete_current_private_participants?: delete,
+        delete_current_members?: delete,
         email:,
         current_user:,
         name:,
@@ -37,12 +37,12 @@ module Decidim::Admin
     end
 
     context "when everything is ok" do
-      it "creates the private user" do
+      it "creates the member" do
         subject.call
 
-        participatory_space_private_users = Decidim::ParticipatorySpacePrivateUser.where(user:)
+        members = Decidim::ParticipatorySpace::Member.where(user:)
 
-        expect(participatory_space_private_users.count).to eq 1
+        expect(members.count).to eq 1
       end
 
       it "creates a new user with no application admin privileges" do
@@ -55,7 +55,7 @@ module Decidim::Admin
           .to receive(:perform_action!)
           .with(
             "create",
-            Decidim::ParticipatorySpacePrivateUser,
+            Decidim::ParticipatorySpace::Member,
             current_user,
             resource: { title: user.name }
           )
@@ -74,7 +74,7 @@ module Decidim::Admin
             .to receive(:perform_action!)
             .with(
               "create_via_csv",
-              Decidim::ParticipatorySpacePrivateUser,
+              Decidim::ParticipatorySpace::Member,
               current_user,
               resource: { title: user.name }
             )
@@ -104,7 +104,7 @@ module Decidim::Admin
         end
       end
 
-      context "when a private user exist" do
+      context "when a member exist" do
         before do
           subject.call
         end
@@ -112,23 +112,23 @@ module Decidim::Admin
         it "does not get created twice" do
           expect { subject.call }.to broadcast(:ok)
 
-          participatory_space_private_users = Decidim::ParticipatorySpacePrivateUser.where(user:)
+          members = Decidim::ParticipatorySpace::Member.where(user:)
 
-          expect(participatory_space_private_users.count).to eq 1
+          expect(members.count).to eq 1
         end
       end
 
       context "when email is input with case-insensitive letters" do
-        let!(:admin) { create(:user, :admin, email: "admin@example.org", organization: privatable_to.organization) }
+        let!(:admin) { create(:user, :admin, email: "admin@example.org", organization: participatory_space.organization) }
         let!(:email) { "Admin@example.org" }
 
         it "still finds the user" do
           expect { subject.call }.to broadcast(:ok)
 
-          participatory_space_private_users = Decidim::ParticipatorySpacePrivateUser.where(user: admin)
+          members = Decidim::ParticipatorySpace::Member.where(user: admin)
           participatory_space_admin = Decidim::User.where(email: "admin@example.org")
 
-          expect(participatory_space_private_users.count).to eq 1
+          expect(members.count).to eq 1
           expect(participatory_space_admin.first.admin?).to be true
         end
       end
diff --git a/decidim-admin/spec/commands/decidim/admin/destroy_participatory_space_private_user_spec.rb b/decidim-admin/spec/commands/decidim/admin/participatory_space/destroy_member_spec.rb
similarity index 68%
rename from decidim-admin/spec/commands/decidim/admin/destroy_participatory_space_private_user_spec.rb
rename to decidim-admin/spec/commands/decidim/admin/participatory_space/destroy_member_spec.rb
index 43ba90f553ff8..7859c4e7400d6 100644
--- a/decidim-admin/spec/commands/decidim/admin/destroy_participatory_space_private_user_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/participatory_space/destroy_member_spec.rb
@@ -2,17 +2,17 @@
 
 require "spec_helper"
 
-module Decidim::Admin
-  describe DestroyParticipatorySpacePrivateUser do
-    subject { described_class.new(participatory_space_private_user, user) }
+module Decidim::Admin::ParticipatorySpace
+  describe DestroyMember do
+    subject { described_class.new(member, user) }
 
     let(:organization) { create(:organization) }
     let(:user) { create(:user, :admin, :confirmed, organization:) }
-    let(:participatory_space_private_user) { create(:participatory_space_private_user, user:) }
+    let(:member) { create(:member, user:) }
 
-    it "destroys the participatory space private user" do
+    it "destroys the member" do
       subject.call
-      expect { participatory_space_private_user.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { member.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
     it "broadcasts ok" do
@@ -26,7 +26,7 @@ module Decidim::Admin
         .to receive(:perform_action!)
         .with(
           :delete,
-          participatory_space_private_user,
+          member,
           user,
           resource: { title: user.name }
         )
@@ -40,14 +40,14 @@ module Decidim::Admin
     context "when assembly is private and user follows assembly" do
       let(:normal_user) { create(:user, organization:) }
       let(:assembly) { create(:assembly, :private, :published, organization: user.organization) }
-      let!(:participatory_space_private_user) { create(:participatory_space_private_user, user: normal_user, privatable_to: assembly) }
+      let!(:member) { create(:member, user: normal_user, participatory_space: assembly) }
       let!(:follow) { create(:follow, followable: assembly, user: normal_user) }
 
       context "and assembly is transparent" do
         it "does not enqueue a job" do
           assembly.update(is_transparent: true)
           expect(Decidim::Follow.where(user: normal_user).count).to eq(1)
-          expect { subject.call }.not_to have_enqueued_job(DestroyPrivateUsersFollowsJob)
+          expect { subject.call }.not_to have_enqueued_job(DestroyMembersFollowsJob)
         end
       end
 
@@ -55,7 +55,7 @@ module Decidim::Admin
         it "enqueues a job" do
           assembly.update(is_transparent: false)
           expect(Decidim::Follow.where(user: normal_user).count).to eq(1)
-          expect { subject.call }.to have_enqueued_job(DestroyPrivateUsersFollowsJob)
+          expect { subject.call }.to have_enqueued_job(DestroyMembersFollowsJob)
         end
       end
     end
@@ -63,14 +63,14 @@ module Decidim::Admin
     context "when participatory process is private" do
       let(:normal_user) { create(:user, organization:) }
       let(:participatory_process) { create(:participatory_process, :private, :published, organization: user.organization) }
-      let!(:participatory_space_private_user) { create(:participatory_space_private_user, user: normal_user, privatable_to: participatory_process) }
+      let!(:member) { create(:member, user: normal_user, participatory_space: participatory_process) }
 
       context "and user follows process" do
         let!(:follow) { create(:follow, followable: participatory_process, user: normal_user) }
 
         it "enqueues a job" do
           expect(Decidim::Follow.where(user: normal_user).count).to eq(1)
-          expect { subject.call }.to have_enqueued_job(DestroyPrivateUsersFollowsJob)
+          expect { subject.call }.to have_enqueued_job(DestroyMembersFollowsJob)
         end
       end
     end
diff --git a/decidim-admin/spec/commands/decidim/admin/process_participatory_space_private_user_import_csv_spec.rb b/decidim-admin/spec/commands/decidim/admin/participatory_space/import_member_csv_spec.rb
similarity index 59%
rename from decidim-admin/spec/commands/decidim/admin/process_participatory_space_private_user_import_csv_spec.rb
rename to decidim-admin/spec/commands/decidim/admin/participatory_space/import_member_csv_spec.rb
index ff733c42aff8f..ab159b7bf823a 100644
--- a/decidim-admin/spec/commands/decidim/admin/process_participatory_space_private_user_import_csv_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/participatory_space/import_member_csv_spec.rb
@@ -2,20 +2,20 @@
 
 require "spec_helper"
 
-module Decidim::Admin
-  describe ProcessParticipatorySpacePrivateUserImportCsv do
-    subject { described_class.new(form, private_users_to) }
+module Decidim::Admin::ParticipatorySpace
+  describe ImportMemberCsv do
+    subject { described_class.new(form, members_to) }
 
     let(:current_user) { create(:user, :admin, organization:) }
     let(:organization) { create(:organization) }
-    let(:private_users_to) { create(:participatory_process, organization:) }
-    let(:file) { upload_test_file(Decidim::Dev.test_file("import_participatory_space_private_users.csv", "text/csv"), return_blob: true) }
+    let(:members_to) { create(:participatory_process, organization:) }
+    let(:file) { upload_test_file(Decidim::Dev.test_file("import_members.csv", "text/csv"), return_blob: true) }
     let(:validity) { true }
 
     let(:form) do
       double(
         current_user:,
-        private_users_to:,
+        members_to:,
         current_organization: organization,
         file:,
         valid?: validity
@@ -30,14 +30,14 @@ module Decidim::Admin
       end
 
       it "does not enqueue any job" do
-        expect(ImportParticipatorySpacePrivateUserCsvJob).not_to receive(:perform_later)
+        expect(ImportMemberCsvJob).not_to receive(:perform_later)
 
         subject.call
       end
     end
 
     context "when the CSV file has BOM" do
-      let(:file) { upload_test_file(Decidim::Dev.test_file("import_participatory_space_private_users_with_bom.csv", "text/csv"), return_blob: true) }
+      let(:file) { upload_test_file(Decidim::Dev.test_file("import_members_with_bom.csv", "text/csv"), return_blob: true) }
       let(:email) { "john.doe@example.org" }
 
       it "broadcasts ok" do
@@ -45,7 +45,7 @@ module Decidim::Admin
       end
 
       it "enqueues a job for each present value without BOM" do
-        expect(ImportParticipatorySpacePrivateUserCsvJob).to receive(:perform_later).with(email, kind_of(String), private_users_to, current_user)
+        expect(ImportMemberCsvJob).to receive(:perform_later).with(email, kind_of(String), members_to, current_user)
 
         subject.call
       end
@@ -56,7 +56,7 @@ module Decidim::Admin
     end
 
     it "enqueues a job for each present value" do
-      expect(ImportParticipatorySpacePrivateUserCsvJob).to receive(:perform_later).twice.with(kind_of(String), kind_of(String), private_users_to, current_user)
+      expect(ImportMemberCsvJob).to receive(:perform_later).twice.with(kind_of(String), kind_of(String), members_to, current_user)
 
       subject.call
     end
diff --git a/decidim-admin/spec/commands/decidim/admin/participatory_space/publish_all_members_spec.rb b/decidim-admin/spec/commands/decidim/admin/participatory_space/publish_all_members_spec.rb
new file mode 100644
index 0000000000000..d241c88dd6324
--- /dev/null
+++ b/decidim-admin/spec/commands/decidim/admin/participatory_space/publish_all_members_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::Admin::ParticipatorySpace
+  describe PublishAllMembers do
+    subject { described_class.new(participatory_space, current_user) }
+
+    let!(:participatory_space) { create(:participatory_process) }
+    let!(:user) { create(:user, email: "my_email@example.org", organization: participatory_space.organization) }
+    let!(:member) { create(:member, :unpublished, user:, participatory_space:, role:) }
+    let(:role) { generate_localized_title(:role) }
+    let(:current_user) { create(:user, email: "admin@example.org", organization: participatory_space.organization) }
+
+    it "updates the published attribute" do
+      subject.call
+
+      expect(member.reload.published).to be(true)
+    end
+
+    it "creates an action log" do
+      expect { subject.call }.to change(Decidim::ActionLog, :count).by(1)
+    end
+  end
+end
diff --git a/decidim-admin/spec/commands/decidim/admin/participatory_space/unpublish_all_members_spec.rb b/decidim-admin/spec/commands/decidim/admin/participatory_space/unpublish_all_members_spec.rb
new file mode 100644
index 0000000000000..8976dca26ad9d
--- /dev/null
+++ b/decidim-admin/spec/commands/decidim/admin/participatory_space/unpublish_all_members_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::Admin::ParticipatorySpace
+  describe UnpublishAllMembers do
+    subject { described_class.new(participatory_space, current_user) }
+
+    let!(:participatory_space) { create(:participatory_process) }
+    let!(:user) { create(:user, email: "my_email@example.org", organization: participatory_space.organization) }
+    let!(:member) { create(:member, :published, user:, participatory_space:, role:) }
+    let(:role) { generate_localized_title(:role) }
+    let(:current_user) { create(:user, email: "admin@example.org", organization: participatory_space.organization) }
+
+    it "updates the published attribute" do
+      subject.call
+
+      expect(member.reload.published).to be(false)
+    end
+
+    it "creates an action log" do
+      expect { subject.call }.to change(Decidim::ActionLog, :count).by(1)
+    end
+  end
+end
diff --git a/decidim-admin/spec/commands/decidim/admin/update_participatory_space_private_user_spec.rb b/decidim-admin/spec/commands/decidim/admin/participatory_space/update_member_spec.rb
similarity index 59%
rename from decidim-admin/spec/commands/decidim/admin/update_participatory_space_private_user_spec.rb
rename to decidim-admin/spec/commands/decidim/admin/participatory_space/update_member_spec.rb
index 8b2da3f6b99d3..6bb7c8f56c56c 100644
--- a/decidim-admin/spec/commands/decidim/admin/update_participatory_space_private_user_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/participatory_space/update_member_spec.rb
@@ -2,14 +2,14 @@
 
 require "spec_helper"
 
-module Decidim::Admin
-  describe UpdateParticipatorySpacePrivateUser do
-    subject { described_class.new(form, private_user) }
+module Decidim::Admin::ParticipatorySpace
+  describe UpdateMember do
+    subject { described_class.new(form, member) }
 
-    let!(:privatable_to) { create(:participatory_process) }
-    let!(:private_user) { create(:participatory_space_private_user, :unpublished, user:, role:) }
-    let!(:user) { create(:user, email: "my_email@example.org", organization: privatable_to.organization) }
-    let!(:current_user) { create(:user, email: "some_email@example.org", organization: privatable_to.organization) }
+    let!(:participatory_space) { create(:participatory_process) }
+    let!(:member) { create(:member, :unpublished, user:, role:) }
+    let!(:user) { create(:user, email: "my_email@example.org", organization: participatory_space.organization) }
+    let!(:current_user) { create(:user, email: "some_email@example.org", organization: participatory_space.organization) }
 
     let(:form) do
       double(
@@ -35,13 +35,13 @@ module Decidim::Admin
       it "updates the role" do
         subject.call
 
-        expect(translated(private_user.reload.role)).to eq(translated_attribute(role))
+        expect(translated(member.reload.role)).to eq(translated_attribute(role))
       end
 
       it "updates the published status" do
         subject.call
 
-        expect(private_user.reload.published).to eq(published)
+        expect(member.reload.published).to eq(published)
       end
     end
   end
diff --git a/decidim-admin/spec/commands/decidim/admin/publish_all_participatory_space_private_users_spec.rb b/decidim-admin/spec/commands/decidim/admin/publish_all_participatory_space_private_users_spec.rb
deleted file mode 100644
index 409887aee336e..0000000000000
--- a/decidim-admin/spec/commands/decidim/admin/publish_all_participatory_space_private_users_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim::Admin
-  describe PublishAllParticipatorySpacePrivateUsers do
-    subject { described_class.new(privatable_to, current_user) }
-
-    let!(:privatable_to) { create(:participatory_process) }
-    let!(:user) { create(:user, email: "my_email@example.org", organization: privatable_to.organization) }
-    let!(:private_user) { create(:participatory_space_private_user, :unpublished, user:, privatable_to:, role:) }
-    let(:role) { generate_localized_title(:role) }
-    let(:current_user) { create(:user, email: "admin@example.org", organization: privatable_to.organization) }
-
-    it "updates the published attribute" do
-      subject.call
-
-      expect(private_user.reload.published).to be(true)
-    end
-
-    it "creates an action log" do
-      expect { subject.call }.to change(Decidim::ActionLog, :count).by(1)
-    end
-  end
-end
diff --git a/decidim-admin/spec/commands/decidim/admin/unpublish_all_participatory_space_private_users_spec.rb b/decidim-admin/spec/commands/decidim/admin/unpublish_all_participatory_space_private_users_spec.rb
deleted file mode 100644
index dbe01ab48bb50..0000000000000
--- a/decidim-admin/spec/commands/decidim/admin/unpublish_all_participatory_space_private_users_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim::Admin
-  describe UnpublishAllParticipatorySpacePrivateUsers do
-    subject { described_class.new(privatable_to, current_user) }
-
-    let!(:privatable_to) { create(:participatory_process) }
-    let!(:user) { create(:user, email: "my_email@example.org", organization: privatable_to.organization) }
-    let!(:private_user) { create(:participatory_space_private_user, :published, user:, privatable_to:, role:) }
-    let(:role) { generate_localized_title(:role) }
-    let(:current_user) { create(:user, email: "admin@example.org", organization: privatable_to.organization) }
-
-    it "updates the published attribute" do
-      subject.call
-
-      expect(private_user.reload.published).to be(false)
-    end
-
-    it "creates an action log" do
-      expect { subject.call }.to change(Decidim::ActionLog, :count).by(1)
-    end
-  end
-end
diff --git a/decidim-admin/spec/forms/decidim/admin/participatory_space/member_csv_import_form_spec.rb b/decidim-admin/spec/forms/decidim/admin/participatory_space/member_csv_import_form_spec.rb
new file mode 100644
index 0000000000000..7d1ef2c5c00f1
--- /dev/null
+++ b/decidim-admin/spec/forms/decidim/admin/participatory_space/member_csv_import_form_spec.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      describe MemberCsvImportForm do
+        subject do
+          described_class.from_params(
+            attributes
+          ).with_context(
+            current_user:,
+            current_organization:
+          )
+        end
+
+        let(:current_organization) { create(:organization) }
+        let(:current_user) { create(:user, organization: current_organization) }
+
+        let(:attributes) do
+          {
+            "file" => file
+          }
+        end
+        let(:file) { upload_test_file(Decidim::Dev.asset("import_members.csv")) }
+
+        context "when everything is OK" do
+          it { is_expected.to be_valid }
+        end
+
+        context "when file is missing" do
+          let(:file) { nil }
+
+          it { is_expected.to be_invalid }
+        end
+
+        context "when user name contains invalid chars" do
+          let(:file) { upload_test_file(Decidim::Dev.asset("import_members_nok.csv")) }
+
+          it { is_expected.to be_invalid }
+        end
+
+        context "when the CSV separator is incorrect" do
+          let(:file) { upload_test_file(Decidim::Dev.asset("import_members_invalid_col_sep.csv")) }
+
+          it { is_expected.to be_invalid }
+        end
+
+        context "when the provided file is encoded with incorrect character set" do
+          let(:file) { upload_test_file(Decidim::Dev.asset("import_members_iso8859-1.csv")) }
+
+          it { is_expected.to be_invalid }
+
+          it "adds the correct error" do
+            subject.valid?
+            expect(subject.errors[:file].join).to eq("Malformed import file, please read through the instructions carefully and make sure the file is UTF-8 encoded.")
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-admin/spec/forms/decidim/admin/participatory_space/member_form_spec.rb b/decidim-admin/spec/forms/decidim/admin/participatory_space/member_form_spec.rb
new file mode 100644
index 0000000000000..b273724ea2d9c
--- /dev/null
+++ b/decidim-admin/spec/forms/decidim/admin/participatory_space/member_form_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      describe MemberForm do
+        subject { described_class.from_params(attributes) }
+
+        let(:email) { "my_email@example.org" }
+        let(:name) { "John Wayne" }
+        let(:attributes) do
+          {
+            "member" => {
+              "email" => email,
+              "name" => name
+            }
+          }
+        end
+
+        context "when everything is OK" do
+          it { is_expected.to be_valid }
+        end
+
+        context "when email is missing" do
+          let(:email) { nil }
+
+          it { is_expected.to be_invalid }
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-admin/spec/forms/participatory_space_private_user_csv_import_form_spec.rb b/decidim-admin/spec/forms/participatory_space_private_user_csv_import_form_spec.rb
deleted file mode 100644
index 0a99ef331870e..0000000000000
--- a/decidim-admin/spec/forms/participatory_space_private_user_csv_import_form_spec.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim
-  module Admin
-    describe ParticipatorySpacePrivateUserCsvImportForm do
-      subject do
-        described_class.from_params(
-          attributes
-        ).with_context(
-          current_user:,
-          current_organization:
-        )
-      end
-
-      let(:current_organization) { create(:organization) }
-      let(:current_user) { create(:user, organization: current_organization) }
-
-      let(:attributes) do
-        {
-          "file" => file
-        }
-      end
-      let(:file) { upload_test_file(Decidim::Dev.asset("import_participatory_space_private_users.csv")) }
-
-      context "when everything is OK" do
-        it { is_expected.to be_valid }
-      end
-
-      context "when file is missing" do
-        let(:file) { nil }
-
-        it { is_expected.to be_invalid }
-      end
-
-      context "when user name contains invalid chars" do
-        let(:file) { upload_test_file(Decidim::Dev.asset("import_participatory_space_private_users_nok.csv")) }
-
-        it { is_expected.to be_invalid }
-      end
-
-      context "when the CSV separator is incorrect" do
-        let(:file) { upload_test_file(Decidim::Dev.asset("import_participatory_space_private_users_invalid_col_sep.csv")) }
-
-        it { is_expected.to be_invalid }
-      end
-
-      context "when the provided file is encoded with incorrect character set" do
-        let(:file) { upload_test_file(Decidim::Dev.asset("import_participatory_space_private_users_iso8859-1.csv")) }
-
-        it { is_expected.to be_invalid }
-
-        it "adds the correct error" do
-          subject.valid?
-          expect(subject.errors[:file].join).to eq("Malformed import file, please read through the instructions carefully and make sure the file is UTF-8 encoded.")
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-admin/spec/forms/participatory_space_private_user_form_spec.rb b/decidim-admin/spec/forms/participatory_space_private_user_form_spec.rb
deleted file mode 100644
index 96c3fdd7df1a8..0000000000000
--- a/decidim-admin/spec/forms/participatory_space_private_user_form_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim
-  module Admin
-    describe ParticipatorySpacePrivateUserForm do
-      subject { described_class.from_params(attributes) }
-
-      let(:email) { "my_email@example.org" }
-      let(:name) { "John Wayne" }
-      let(:attributes) do
-        {
-          "participatory_space_private_user" => {
-            "email" => email,
-            "name" => name
-          }
-        }
-      end
-
-      context "when everything is OK" do
-        it { is_expected.to be_valid }
-      end
-
-      context "when email is missing" do
-        let(:email) { nil }
-
-        it { is_expected.to be_invalid }
-      end
-    end
-  end
-end
diff --git a/decidim-admin/spec/jobs/decidim/admin/participatory_space/destroy_members_follows_job_spec.rb b/decidim-admin/spec/jobs/decidim/admin/participatory_space/destroy_members_follows_job_spec.rb
new file mode 100644
index 0000000000000..c5de1536aea5e
--- /dev/null
+++ b/decidim-admin/spec/jobs/decidim/admin/participatory_space/destroy_members_follows_job_spec.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      describe DestroyMembersFollowsJob do
+        let(:organization) { create(:organization) }
+        let!(:user) { create(:user, :admin, :confirmed, organization:) }
+        let!(:normal_user) { create(:user, organization:) }
+        let!(:follow) { create(:follow, followable: participatory_space, user: normal_user) }
+        let(:component) { create(:dummy_component, participatory_space:) }
+        let(:resource) { create(:dummy_resource, component:, author: user) }
+        let!(:followed_resource) { create(:follow, followable: resource, user: normal_user) }
+
+        context "when assembly is private and non transparent" do
+          let(:participatory_space) { create(:assembly, :private, :published, :opaque, organization: user.organization) }
+
+          it "deletes follows of non members" do
+            # we have 2 follows, one for assembly, and one for a "child" resource
+            expect { described_class.perform_now(normal_user.id, participatory_space) }.to change(Decidim::Follow, :count).by(-2)
+          end
+        end
+
+        context "when assembly is private but transparent" do
+          let(:participatory_space) { create(:assembly, :private, :published, organization: user.organization) }
+
+          it "preserves follows of non members" do
+            # we have 2 follows, one for assembly, and one for a "child" resource
+            expect { described_class.perform_now(normal_user.id, participatory_space) }.not_to change(Decidim::Follow, :count)
+          end
+        end
+
+        context "when assembly is public" do
+          let(:participatory_space) { create(:assembly, :published, organization: user.organization) }
+
+          it "preserves follows of non members" do
+            # we have 2 follows, one for assembly, and one for a "child" resource
+            expect { described_class.perform_now(normal_user.id, participatory_space) }.not_to change(Decidim::Follow, :count)
+          end
+        end
+
+        context "when process is private" do
+          let(:participatory_space) { create(:participatory_process, :private, :published, organization: user.organization) }
+
+          it "deletes follows of non members" do
+            # we have 2 follows, one for process, and one for a "child" resource
+            expect { described_class.perform_now(normal_user.id, participatory_space) }.to change(Decidim::Follow, :count).by(-2)
+          end
+        end
+
+        context "when process is public" do
+          let(:participatory_space) { create(:participatory_process, :published, organization: user.organization) }
+
+          it "preserves follows of non members" do
+            expect { described_class.perform_now(normal_user.id, participatory_space) }.not_to change(Decidim::Follow, :count)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-admin/spec/jobs/decidim/admin/participatory_space/import_member_csv_job_spec.rb b/decidim-admin/spec/jobs/decidim/admin/participatory_space/import_member_csv_job_spec.rb
new file mode 100644
index 0000000000000..0a6a52c36d045
--- /dev/null
+++ b/decidim-admin/spec/jobs/decidim/admin/participatory_space/import_member_csv_job_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      describe ImportMemberCsvJob do
+        let!(:email) { "my_user@example.org" }
+        let!(:user_name) { "My User Name" }
+        let(:user) { create(:user, :admin, organization:) }
+        let(:organization) { create(:organization) }
+        let(:participatory_space) { create(:participatory_process, organization:) }
+
+        context "when the member not exists" do
+          it "delegates the work to a command" do
+            expect(Decidim::Admin::ParticipatorySpace::CreateMember).to receive(:call)
+            described_class.perform_now(email, user_name, participatory_space, user)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-admin/spec/jobs/destroy_private_users_follows_job_spec.rb b/decidim-admin/spec/jobs/destroy_private_users_follows_job_spec.rb
deleted file mode 100644
index 15ad1b33c7240..0000000000000
--- a/decidim-admin/spec/jobs/destroy_private_users_follows_job_spec.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim
-  module Admin
-    describe DestroyPrivateUsersFollowsJob do
-      let(:organization) { create(:organization) }
-      let!(:user) { create(:user, :admin, :confirmed, organization:) }
-      let!(:normal_user) { create(:user, organization:) }
-      let!(:follow) { create(:follow, followable: participatory_space, user: normal_user) }
-      let(:component) { create(:dummy_component, participatory_space:) }
-      let(:resource) { create(:dummy_resource, component: component, author: user) }
-      let!(:followed_resource) { create(:follow, followable: resource, user: normal_user) }
-
-      context "when assembly is private and non transparent" do
-        let(:participatory_space) { create(:assembly, :private, :published, :opaque, organization: user.organization) }
-
-        it "deletes follows of non private users" do
-          # we have 2 follows, one for assembly, and one for a "child" resource
-          expect { described_class.perform_now(normal_user.id, participatory_space) }.to change(Decidim::Follow, :count).by(-2)
-        end
-      end
-
-      context "when assembly is private but transparent" do
-        let(:participatory_space) { create(:assembly, :private, :published, organization: user.organization) }
-
-        it "preserves follows of non private users" do
-          # we have 2 follows, one for assembly, and one for a "child" resource
-          expect { described_class.perform_now(normal_user.id, participatory_space) }.not_to change(Decidim::Follow, :count)
-        end
-      end
-
-      context "when assembly is public" do
-        let(:participatory_space) { create(:assembly, :published, organization: user.organization) }
-
-        it "preserves follows of non private users" do
-          # we have 2 follows, one for assembly, and one for a "child" resource
-          expect { described_class.perform_now(normal_user.id, participatory_space) }.not_to change(Decidim::Follow, :count)
-        end
-      end
-
-      context "when process is private" do
-        let(:participatory_space) { create(:participatory_process, :private, :published, organization: user.organization) }
-
-        it "deletes follows of non private users" do
-          # we have 2 follows, one for process, and one for a "child" resource
-          expect { described_class.perform_now(normal_user.id, participatory_space) }.to change(Decidim::Follow, :count).by(-2)
-        end
-      end
-
-      context "when process is public" do
-        let(:participatory_space) { create(:participatory_process, :published, organization: user.organization) }
-
-        it "preserves follows of non private users" do
-          expect { described_class.perform_now(normal_user.id, participatory_space) }.not_to change(Decidim::Follow, :count)
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-admin/spec/jobs/import_participatory_space_private_user_csv_job_spec.rb b/decidim-admin/spec/jobs/import_participatory_space_private_user_csv_job_spec.rb
deleted file mode 100644
index 9b712c1527114..0000000000000
--- a/decidim-admin/spec/jobs/import_participatory_space_private_user_csv_job_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim
-  module Admin
-    describe ImportParticipatorySpacePrivateUserCsvJob do
-      let!(:email) { "my_user@example.org" }
-      let!(:user_name) { "My User Name" }
-      let(:user) { create(:user, :admin, organization:) }
-      let(:organization) { create(:organization) }
-      let(:privatable_to) { create(:participatory_process, organization:) }
-
-      context "when the participatory space private user not exists" do
-        it "delegates the work to a command" do
-          expect(Decidim::Admin::CreateParticipatorySpacePrivateUser).to receive(:call)
-          described_class.perform_now(email, user_name, privatable_to, user)
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-admin/spec/queries/newsletter_recipients_spec.rb b/decidim-admin/spec/queries/newsletter_recipients_spec.rb
index a52eeba563ecb..54d2970463561 100644
--- a/decidim-admin/spec/queries/newsletter_recipients_spec.rb
+++ b/decidim-admin/spec/queries/newsletter_recipients_spec.rb
@@ -163,7 +163,7 @@ module Decidim::Admin
 
         before do
           recipients.each do |member|
-            create(:participatory_space_private_user, privatable_to: participatory_process, user: member)
+            create(:member, participatory_space: participatory_process, user: member)
           end
         end
 
diff --git a/decidim-admin/spec/system/admin_invite_spec.rb b/decidim-admin/spec/system/admin_invite_spec.rb
index 7f920ad6d8daf..e37b3ead355f9 100644
--- a/decidim-admin/spec/system/admin_invite_spec.rb
+++ b/decidim-admin/spec/system/admin_invite_spec.rb
@@ -10,6 +10,7 @@
   let(:params) do
     {
       name: "Gotham City",
+      short_name: "GothamCity",
       reference_prefix: "JKR",
       host: "decide.lvh.me",
       organization_admin_name: "Fiorello Henry La Guardia",
diff --git a/decidim-admin/spec/system/admin_manages_attachments_spec.rb b/decidim-admin/spec/system/admin_manages_attachments_spec.rb
new file mode 100644
index 0000000000000..57879fc266b4e
--- /dev/null
+++ b/decidim-admin/spec/system/admin_manages_attachments_spec.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::Admin
+  describe "Admin manages attachments" do
+    let(:organization) { create(:organization) }
+    let!(:participatory_process) { create(:participatory_process, organization:) }
+    let!(:admin) { create(:user, :admin, :confirmed, organization:) }
+    let!(:attachment) { create(:attachment, attached_to: participatory_process) }
+
+    before do
+      switch_to_host(organization.host)
+      login_as admin, scope: :user
+      visit decidim_admin_participatory_processes.edit_participatory_process_path(participatory_process)
+    end
+
+    context "when managing attachments" do
+      it "will persist picture when error is present" do
+        within_admin_sidebar_menu do
+          click_on "Attachments"
+        end
+
+        within "#attachments" do
+          click_on "New attachment"
+        end
+
+        within ".new_attachment" do
+          fill_in_i18n(
+            :attachment_title,
+            "#attachment-title-tabs",
+            en: "",
+            es: "",
+            ca: ""
+          )
+        end
+
+        within ".new_attachment" do
+          find_by_id("trigger-file").click
+        end
+
+        dynamically_attach_file(:attachment_file, Decidim::Dev.asset("city.jpeg"))
+
+        within ".new_attachment" do
+          find("*[type=submit]").click
+        end
+
+        within ".new_attachment" do
+          find("*[type=submit]").click
+        end
+
+        expect(page).to have_css("img[src*='city.jpeg']")
+      end
+    end
+  end
+end
diff --git a/decidim-admin/spec/system/admin_manages_newsletters_spec.rb b/decidim-admin/spec/system/admin_manages_newsletters_spec.rb
index 04520b06392c1..d0c2e22c77878 100644
--- a/decidim-admin/spec/system/admin_manages_newsletters_spec.rb
+++ b/decidim-admin/spec/system/admin_manages_newsletters_spec.rb
@@ -472,15 +472,15 @@ def select_verification_type(types)
     context "when private members are selected" do
       context "with private members" do
         let!(:participatory_process) { create(:participatory_process, organization:, skip_injection: true, private_space: true) }
-        let!(:private_users) do
-          create_list(:participatory_space_private_user, 30) do |private_user|
-            private_user.user = create(:user, :confirmed, newsletter_notifications_at: Time.current, organization:)
-            private_user.privatable_to = participatory_process
-            private_user.save!
+        let!(:members) do
+          create_list(:member, 30) do |member|
+            member.user = create(:user, :confirmed, newsletter_notifications_at: Time.current, organization:)
+            member.participatory_space = participatory_process
+            member.save!
           end
         end
 
-        let(:recipients_count) { private_users.size }
+        let(:recipients_count) { members.size }
 
         it "sends to private members", :slow do
           visit decidim_admin.select_recipients_to_deliver_newsletter_path(newsletter)
diff --git a/decidim-admin/spec/system/admin_manages_organization_spec.rb b/decidim-admin/spec/system/admin_manages_organization_spec.rb
index 86293461ba9b3..efabd2af563e4 100644
--- a/decidim-admin/spec/system/admin_manages_organization_spec.rb
+++ b/decidim-admin/spec/system/admin_manages_organization_spec.rb
@@ -429,18 +429,18 @@
           )["innerHTML"]).to eq("#{terms_content}<p>Another paragraph</p>".gsub("\n", ""))
         end
 
-        it "deletes empty list item when pressing backspace and starts new paragraph" do
-          find('#organization_admin_terms_of_service_body_en div[contenteditable="true"].ProseMirror').native.send_keys [:enter, :backspace, :enter], "Another paragraph"
+        it "allows removing empty list item with backspace" do
+          find('#organization_admin_terms_of_service_body_en div[contenteditable="true"].ProseMirror').native.send_keys [:enter, "test", :left, :left, :left, :left, :backspace]
           expect(find(
             "#organization-admin_terms_of_service_body-tabs-admin_terms_of_service_body-panel-0 .editor .ProseMirror"
-          )["innerHTML"]).to eq("#{terms_content}<p>Another paragraph</p>".gsub("\n", ""))
+          )["innerHTML"]).to eq("<p>Paragraph</p><ul><li><p>List item 1</p></li><li><p>List item 2</p></li><li><p>List item 3test</p></li></ul>".gsub("\n", ""))
         end
 
         it "deletes linebreaks (and smartbreaks) using the backspace" do
           find('#organization_admin_terms_of_service_body_en div[contenteditable="true"].ProseMirror').native.send_keys [:enter, :enter, :enter, :backspace, :backspace, :backspace, :backspace]
           expect(find(
             "#organization-admin_terms_of_service_body-tabs-admin_terms_of_service_body-panel-0 .editor .ProseMirror"
-          )["innerHTML"]).to eq(terms_content.to_s.gsub("\n", ""))
+          )["innerHTML"]).to eq("<p>Paragraph</p><ul><li><p>List item 1</p></li><li><p>List item 2</p></li><li><p>List item</p></li></ul>".gsub("\n", ""))
         end
 
         it "keeps right cursor position when using the backspace" do
@@ -448,14 +448,14 @@
           find('#organization_admin_terms_of_service_body_en div[contenteditable="true"].ProseMirror').native.send_keys [:enter, :backspace, :backspace, "a"]
           expect(find(
             "#organization-admin_terms_of_service_body-tabs-admin_terms_of_service_body-panel-0 .editor .ProseMirror"
-          )["innerHTML"]).to eq("<p>Paragraph</p><ul><li><p>List item 1</p></li><li><p>List item 2</p></li><li><p>List item 3</p></li><li><p>abc</p></li></ul>".to_s.gsub("\n", ""))
+          )["innerHTML"]).to eq("<p>Paragraph</p><ul><li><p>List item 1</p></li><li><p>List item 2</p></li><li><p>List item 3abc</p></li></ul>".to_s.gsub("\n", ""))
         end
 
         it "keeps right format when using the backspace" do
           find('#organization_admin_terms_of_service_body_en div[contenteditable="true"].ProseMirror').native.send_keys [:enter, :backspace, "abc", :left, :left, :left, :backspace]
           expect(find(
             "#organization-admin_terms_of_service_body-tabs-admin_terms_of_service_body-panel-0 .editor .ProseMirror"
-          )["innerHTML"]).to eq("<p>Paragraph</p><ul><li><p>List item 1</p></li><li><p>List item 2</p></li><li><p>List item 3abc</p></li></ul>".to_s.gsub("\n", ""))
+          )["innerHTML"]).to eq("<p>Paragraph</p><ul><li><p>List item 1</p></li><li><p>List item 2</p></li><li><p>List item abc</p></li></ul>".to_s.gsub("\n", ""))
         end
 
         it "keeps right cursor position when using backspace after empty list item" do
@@ -463,7 +463,7 @@
           find('#organization_admin_terms_of_service_body_en div[contenteditable="true"].ProseMirror').native.send_keys [:enter, :enter, :enter, :backspace, :backspace, :backspace, :backspace, :backspace, :backspace, "a"]
           expect(find(
             "#organization-admin_terms_of_service_body-tabs-admin_terms_of_service_body-panel-0 .editor .ProseMirror"
-          )["innerHTML"]).to eq("<p>Paragraph</p><ul><li><p>List item 1</p></li><li><p>List item 2</p></li><li><p>List item 3</p></li><li><p>abcd</p></li></ul>".to_s.gsub("\n", ""))
+          )["innerHTML"]).to eq("<p>Paragraph</p><ul><li><p>List item 1</p></li><li><p>List item 2</p></li><li><p>List itemabcd</p></li></ul>".to_s.gsub("\n", ""))
         end
 
         it "keeps right cursor position when using backspace after list item with text" do
@@ -471,7 +471,7 @@
           find('#organization_admin_terms_of_service_body_en div[contenteditable="true"].ProseMirror').native.send_keys [:enter, :backspace, :backspace, :enter, :enter, :backspace, :backspace, :backspace, :backspace, "b"]
           expect(find(
             "#organization-admin_terms_of_service_body-tabs-admin_terms_of_service_body-panel-0 .editor .ProseMirror"
-          )["innerHTML"]).to eq("<p>Paragraph</p><ul><li><p>List item 1</p></li><li><p>List item 2</p></li><li><p>List item 3</p></li><li><p>abcd</p></li></ul>".to_s.gsub("\n", ""))
+          )["innerHTML"]).to eq("<p>Paragraph</p><ul><li><p>List item 1</p></li><li><p>List item 2</p></li><li><p>List item bcd</p></li></ul>".to_s.gsub("\n", ""))
         end
 
         it "does not delete characters below when pressing backspace" do
diff --git a/decidim-admin/spec/system/participatory_space_private_user_import_via_csv_spec.rb b/decidim-admin/spec/system/member_import_via_csv_spec.rb
similarity index 69%
rename from decidim-admin/spec/system/participatory_space_private_user_import_via_csv_spec.rb
rename to decidim-admin/spec/system/member_import_via_csv_spec.rb
index 7236ff8024a13..8be1fb11dfe3f 100644
--- a/decidim-admin/spec/system/participatory_space_private_user_import_via_csv_spec.rb
+++ b/decidim-admin/spec/system/member_import_via_csv_spec.rb
@@ -2,11 +2,11 @@
 
 require "spec_helper"
 
-describe "Admin manages participatory space private users via csv import" do
+describe "Admin manages members via csv import" do
   let(:organization) { create(:organization) }
 
   let!(:user) { create(:user, :admin, :confirmed, organization:) }
-  let(:assembly) { create(:assembly, organization:, private_space: true) }
+  let(:assembly) { create(:assembly, organization:, has_members: true) }
 
   before do
     switch_to_host(organization.host)
@@ -18,19 +18,19 @@
     click_on "Import via CSV"
   end
 
-  it "show the form to add some private users via csv" do
+  it "show the form to add some members via csv" do
     expect(page).to have_content("Upload your CSV file")
   end
 
   context "when there are no existing users" do
     it "does not propose to delete" do
-      expect(page).to have_content("You have no private participants.")
+      expect(page).to have_content("You have no members.")
     end
   end
 
   context "when there are existing users" do
     before do
-      create_list(:assembly_private_user, 3, privatable_to: assembly, user: create(:user, organization: assembly.organization))
+      create_list(:assembly_member, 3, participatory_space: assembly, user: create(:user, organization: assembly.organization))
       visit current_path
     end
 
@@ -41,11 +41,11 @@
     it "ask you for confirmation and delete existing users" do
       find(".alert").click
 
-      expect(page).to have_content("Are you sure you want to delete all private participants?")
+      expect(page).to have_content("Are you sure you want to delete all members?")
 
       click_on("OK")
 
-      expect(page).to have_content("You have no private participants")
+      expect(page).to have_content("You have no members")
     end
   end
 end
diff --git a/decidim-admin/spec/system/participatory_space_private_user_spec.rb b/decidim-admin/spec/system/member_spec.rb
similarity index 51%
rename from decidim-admin/spec/system/participatory_space_private_user_spec.rb
rename to decidim-admin/spec/system/member_spec.rb
index ac1babe7a3816..2afe0b3eec5e7 100644
--- a/decidim-admin/spec/system/participatory_space_private_user_spec.rb
+++ b/decidim-admin/spec/system/member_spec.rb
@@ -2,13 +2,13 @@
 
 require "spec_helper"
 
-describe "Admin checks pagination on participatory space private users" do
+describe "Admin checks pagination on members" do
   let(:organization) { create(:organization) }
 
   let!(:user) { create(:user, :admin, :confirmed, organization:) }
-  let(:assembly) { create(:assembly, organization:, private_space: true) }
+  let(:assembly) { create(:assembly, organization:, has_members: true) }
 
-  let!(:private_users) { create_list(:assembly_private_user, 26, privatable_to: assembly, user: create(:user, organization: assembly.organization)) }
+  let!(:members) { create_list(:assembly_member, 26, participatory_space: assembly, user: create(:user, organization: assembly.organization)) }
 
   before do
     switch_to_host(organization.host)
@@ -19,8 +19,8 @@
     end
   end
 
-  it "shows private users of the participatory space and changes page correctly" do
+  it "shows members of the participatory space and changes page correctly" do
     find("li a", text: "Next").click
-    expect(page).to have_current_path "#{decidim_admin_assemblies.participatory_space_private_users_path(assembly_slug: assembly.slug)}?page=2"
+    expect(page).to have_current_path "#{decidim_admin_assemblies.members_path(assembly_slug: assembly.slug)}?page=2"
   end
 end
diff --git a/decidim-api/app/controllers/decidim/api/queries_controller.rb b/decidim-api/app/controllers/decidim/api/queries_controller.rb
index cd9c810063808..1b7e2a5b38da9 100644
--- a/decidim-api/app/controllers/decidim/api/queries_controller.rb
+++ b/decidim-api/app/controllers/decidim/api/queries_controller.rb
@@ -30,7 +30,8 @@ def context
         {
           current_organization:,
           current_user: api_user,
-          scopes: api_scopes
+          scopes: api_scopes,
+          can_introspect: Decidim::Api.enable_anonymous_introspection || api_user&.admin?
         }
       end
 
diff --git a/decidim-api/app/models/decidim/api/api_user.rb b/decidim-api/app/models/decidim/api/api_user.rb
index 9f9cda8c8b76e..32b30df7fee5d 100644
--- a/decidim-api/app/models/decidim/api/api_user.rb
+++ b/decidim-api/app/models/decidim/api/api_user.rb
@@ -54,7 +54,7 @@ def confirmed?
       end
 
       def follows?(followable)
-        Decidim::Follow.where(user: self, followable: followable).any?
+        Decidim::Follow.where(user: self, followable:).any?
       end
 
       # Public: whether the user accepts direct messages from another
@@ -77,6 +77,10 @@ def admin_terms_accepted?
       def needs_password_update?
         false
       end
+
+      def ephemeral?
+        extended_data["ephemeral"]
+      end
     end
   end
 end
diff --git a/decidim-api/config/locales/am-ET.yml b/decidim-api/config/locales/am-ET.yml
new file mode 100644
index 0000000000000..9e7679c0df56d
--- /dev/null
+++ b/decidim-api/config/locales/am-ET.yml
@@ -0,0 +1 @@
+am:
diff --git a/decidim-api/config/locales/ar.yml b/decidim-api/config/locales/ar.yml
new file mode 100644
index 0000000000000..c257bc08a4aef
--- /dev/null
+++ b/decidim-api/config/locales/ar.yml
@@ -0,0 +1 @@
+ar:
diff --git a/decidim-api/config/locales/bg.yml b/decidim-api/config/locales/bg.yml
new file mode 100644
index 0000000000000..d0e375da96f10
--- /dev/null
+++ b/decidim-api/config/locales/bg.yml
@@ -0,0 +1 @@
+bg:
diff --git a/decidim-api/config/locales/bn-BD.yml b/decidim-api/config/locales/bn-BD.yml
new file mode 100644
index 0000000000000..152c698290639
--- /dev/null
+++ b/decidim-api/config/locales/bn-BD.yml
@@ -0,0 +1 @@
+bn:
diff --git a/decidim-api/config/locales/bs-BA.yml b/decidim-api/config/locales/bs-BA.yml
new file mode 100644
index 0000000000000..e9e174462a158
--- /dev/null
+++ b/decidim-api/config/locales/bs-BA.yml
@@ -0,0 +1 @@
+bs:
diff --git a/decidim-api/config/locales/ca-IT.yml b/decidim-api/config/locales/ca-IT.yml
new file mode 100644
index 0000000000000..d932361e33a01
--- /dev/null
+++ b/decidim-api/config/locales/ca-IT.yml
@@ -0,0 +1,15 @@
+---
+ca-IT:
+  decidim:
+    api:
+      errors:
+        introspection_disabled: La introspecció està desactivada per a aquesta sol·licitud
+        invalid_locale: La configuració regional que s'ha facilitat no és vàlida
+        locale_argument_error: S'ha produït un error mentre es gestionaven internament les dades i18n
+        not_found: "%{type} no trobat"
+        permission_not_set: No s'ha establert el permís per aquest %{type}
+        recursion_limit_exceeded_error: S'han detectat massa consultes recurrents
+        too_many_aliases_error: S'han fet servir massa àlies (nicknames). Has fet servir %{size} àlies, però es permet un màxim de %{limit}.
+        unauthorized_field: No pots veure o editar el camp %{field} a %{type} perquè no tens permisos per fer-ho
+        unauthorized_mutation: No tens permís per realitzar aquesta mutació
+        unauthorized_object: No pots veure i editar aquest %{type} perquè no tens permisos per fer-ho
diff --git a/decidim-api/config/locales/ca.yml b/decidim-api/config/locales/ca.yml
new file mode 100644
index 0000000000000..843d5a6d4122f
--- /dev/null
+++ b/decidim-api/config/locales/ca.yml
@@ -0,0 +1,15 @@
+---
+ca:
+  decidim:
+    api:
+      errors:
+        introspection_disabled: La introspecció està desactivada per a aquesta sol·licitud
+        invalid_locale: La configuració regional que s'ha facilitat no és vàlida
+        locale_argument_error: S'ha produït un error mentre es gestionaven internament les dades i18n
+        not_found: "%{type} no trobat"
+        permission_not_set: No s'ha establert el permís per aquest %{type}
+        recursion_limit_exceeded_error: S'han detectat massa consultes recurrents
+        too_many_aliases_error: S'han fet servir massa àlies (nicknames). Has fet servir %{size} àlies, però es permet un màxim de %{limit}.
+        unauthorized_field: No pots veure o editar el camp %{field} a %{type} perquè no tens permisos per fer-ho
+        unauthorized_mutation: No tens permís per realitzar aquesta mutació
+        unauthorized_object: No pots veure i editar aquest %{type} perquè no tens permisos per fer-ho
diff --git a/decidim-api/config/locales/cs.yml b/decidim-api/config/locales/cs.yml
new file mode 100644
index 0000000000000..4bdd973689027
--- /dev/null
+++ b/decidim-api/config/locales/cs.yml
@@ -0,0 +1,6 @@
+---
+cs:
+  decidim:
+    api:
+      errors:
+        unauthorized_mutation: Nemáte oprávnění k provedení této mutace
diff --git a/decidim-api/config/locales/da.yml b/decidim-api/config/locales/da.yml
new file mode 100644
index 0000000000000..347c94d5e3836
--- /dev/null
+++ b/decidim-api/config/locales/da.yml
@@ -0,0 +1 @@
+da:
diff --git a/decidim-api/config/locales/de.yml b/decidim-api/config/locales/de.yml
new file mode 100644
index 0000000000000..346523bb60ba7
--- /dev/null
+++ b/decidim-api/config/locales/de.yml
@@ -0,0 +1 @@
+de:
diff --git a/decidim-api/config/locales/el.yml b/decidim-api/config/locales/el.yml
new file mode 100644
index 0000000000000..419ec705c3e6d
--- /dev/null
+++ b/decidim-api/config/locales/el.yml
@@ -0,0 +1 @@
+el:
diff --git a/decidim-api/config/locales/en.yml b/decidim-api/config/locales/en.yml
new file mode 100644
index 0000000000000..547206d45b7f9
--- /dev/null
+++ b/decidim-api/config/locales/en.yml
@@ -0,0 +1,15 @@
+---
+en:
+  decidim:
+    api:
+      errors:
+        introspection_disabled: Introspection is disabled for this request
+        invalid_locale: Invalid locale provided
+        locale_argument_error: There was an error while internally handling i18n data
+        not_found: "%{type} not found"
+        permission_not_set: Permission has not been set for this %{type}
+        recursion_limit_exceeded_error: Too many recursions detected in query
+        too_many_aliases_error: Too many aliases used. You have used %{size} aliases, but %{limit} are allowed.
+        unauthorized_field: You cannot view or edit %{field} field on %{type} because you do not have permission
+        unauthorized_mutation: You do not have permission to perform this mutation
+        unauthorized_object: You cannot view or edit this %{type} because you do not have permissions
diff --git a/decidim-api/config/locales/eo.yml b/decidim-api/config/locales/eo.yml
new file mode 100644
index 0000000000000..7599814048735
--- /dev/null
+++ b/decidim-api/config/locales/eo.yml
@@ -0,0 +1 @@
+eo:
diff --git a/decidim-api/config/locales/es-MX.yml b/decidim-api/config/locales/es-MX.yml
new file mode 100644
index 0000000000000..f6f64603d886d
--- /dev/null
+++ b/decidim-api/config/locales/es-MX.yml
@@ -0,0 +1,15 @@
+---
+es-MX:
+  decidim:
+    api:
+      errors:
+        introspection_disabled: La introspección está desactivada para esta solicitud
+        invalid_locale: Se ha proporcionado una configuración regional no válida
+        locale_argument_error: Se ha producido un error mientras se gestionaban internamente los datos de i18n
+        not_found: "%{type} no encontrado"
+        permission_not_set: No se ha establecido el permiso para este %{type}
+        recursion_limit_exceeded_error: Se han detectado demasiadas consultas recurrentes
+        too_many_aliases_error: Has utilizado demasiados alias (nicknames). Has usado %{size} alias, pero se permite un máximo de %{limit}.
+        unauthorized_field: No puedes ver o editar el campo %{field} en %{type} porque no tienes permiso
+        unauthorized_mutation: No tienes permiso para realizar esta mutación
+        unauthorized_object: No puedes ver o editar este %{type} porque no tienes permisos
diff --git a/decidim-api/config/locales/es-PY.yml b/decidim-api/config/locales/es-PY.yml
new file mode 100644
index 0000000000000..6bfd67722d80b
--- /dev/null
+++ b/decidim-api/config/locales/es-PY.yml
@@ -0,0 +1,15 @@
+---
+es-PY:
+  decidim:
+    api:
+      errors:
+        introspection_disabled: La introspección está desactivada para esta solicitud
+        invalid_locale: Se ha proporcionado una configuración regional no válida
+        locale_argument_error: Se ha producido un error mientras se gestionaban internamente los datos de i18n
+        not_found: "%{type} no encontrado"
+        permission_not_set: No se ha establecido el permiso para este %{type}
+        recursion_limit_exceeded_error: Se han detectado demasiadas consultas recurrentes
+        too_many_aliases_error: Has utilizado demasiados alias (nicknames). Has usado %{size} alias, pero se permite un máximo de %{limit}.
+        unauthorized_field: No puedes ver o editar el campo %{field} en %{type} porque no tienes permiso
+        unauthorized_mutation: No tienes permiso para realizar esta mutación
+        unauthorized_object: No puedes ver o editar este %{type} porque no tienes permisos
diff --git a/decidim-api/config/locales/es.yml b/decidim-api/config/locales/es.yml
new file mode 100644
index 0000000000000..cadabfbf65857
--- /dev/null
+++ b/decidim-api/config/locales/es.yml
@@ -0,0 +1,15 @@
+---
+es:
+  decidim:
+    api:
+      errors:
+        introspection_disabled: La introspección está desactivada para esta solicitud
+        invalid_locale: Se ha proporcionado una configuración regional no válida
+        locale_argument_error: Se ha producido un error mientras se gestionaban internamente los datos de i18n
+        not_found: "%{type} no encontrado"
+        permission_not_set: No se ha establecido el permiso para este %{type}
+        recursion_limit_exceeded_error: Se han detectado demasiadas consultas recurrentes
+        too_many_aliases_error: Has utilizado demasiados alias (nicknames). Has usado %{size} alias, pero se permite un máximo de %{limit}.
+        unauthorized_field: No puedes ver o editar el campo %{field} en %{type} porque no tienes permiso
+        unauthorized_mutation: No tienes permiso para realizar esta mutación
+        unauthorized_object: No puedes ver o editar este %{type} porque no tienes permisos
diff --git a/decidim-api/config/locales/et.yml b/decidim-api/config/locales/et.yml
new file mode 100644
index 0000000000000..e020c4ffc443d
--- /dev/null
+++ b/decidim-api/config/locales/et.yml
@@ -0,0 +1 @@
+et:
diff --git a/decidim-api/config/locales/eu.yml b/decidim-api/config/locales/eu.yml
new file mode 100644
index 0000000000000..415c358e3dfd6
--- /dev/null
+++ b/decidim-api/config/locales/eu.yml
@@ -0,0 +1,13 @@
+---
+eu:
+  decidim:
+    api:
+      errors:
+        invalid_locale: Eskualde-konfigurazioa ez da baliozkoa
+        locale_argument_error: Akats bat bat gertatu da i18n datuak barnetik aldatzean
+        not_found: "%{type} ez da aurkitu"
+        permission_not_set: Ez da baimenik ezarri %{type} honetarako
+        too_many_aliases_error: Ezizen gehiegi erabiltzen dira. %{size} ezizen erabili dituzu, baina %{limit} onartuta daude.
+        unauthorized_field: Ezin da %{field} %{type} eremua %{type} motan ikusi edo editatu, baimenik ez duzulako
+        unauthorized_mutation: Aldaketa hau egiteko baimenik ez duzu
+        unauthorized_object: Ezin da %{type} hau ikusi edo editatu, baimenik ez duzulako
diff --git a/decidim-api/config/locales/fa-IR.yml b/decidim-api/config/locales/fa-IR.yml
new file mode 100644
index 0000000000000..88215f82cbd5d
--- /dev/null
+++ b/decidim-api/config/locales/fa-IR.yml
@@ -0,0 +1 @@
+fa:
diff --git a/decidim-api/config/locales/fi-plain.yml b/decidim-api/config/locales/fi-plain.yml
new file mode 100644
index 0000000000000..a7ac5699bfb5c
--- /dev/null
+++ b/decidim-api/config/locales/fi-plain.yml
@@ -0,0 +1,15 @@
+---
+fi-pl:
+  decidim:
+    api:
+      errors:
+        introspection_disabled: Rajapintamallin tarkastelu ei ole käytössä tälle pyynnölle
+        invalid_locale: Virheellinen kielivalinta
+        locale_argument_error: Lokalisointitietojen käsittelyssä tapahtui sisäinen virhetilanne
+        not_found: "%{type} ei löytynyt"
+        permission_not_set: Oikeuksia ei ole asetettu tyypille %{type}
+        recursion_limit_exceeded_error: Rajapintakyselyssä on liikaa rekursiivisia kyselyitä
+        too_many_aliases_error: Rajapintakysely käyttää liian monta alias-nimitystä. Kyselyssä on %{size} aliasta, mutta maksimissaan %{limit} on sallittu.
+        unauthorized_field: Sinulla ei ole oikeuksia tarkastella tai muokata kenttää %{field} tyypille %{type}
+        unauthorized_mutation: Sinulla ei ole oikeutta tämän muutospyynnön suorittamiseen
+        unauthorized_object: Sinulla ei ole oikeuksia tarkastella tai muokata tyyppiä %{type}
diff --git a/decidim-api/config/locales/fi.yml b/decidim-api/config/locales/fi.yml
new file mode 100644
index 0000000000000..228a7b95ab05d
--- /dev/null
+++ b/decidim-api/config/locales/fi.yml
@@ -0,0 +1,15 @@
+---
+fi:
+  decidim:
+    api:
+      errors:
+        introspection_disabled: Rajapintamallin tarkastelu ei ole käytössä tälle pyynnölle
+        invalid_locale: Virheellinen kielivalinta
+        locale_argument_error: Lokalisointitietojen käsittelyssä tapahtui sisäinen virhetilanne
+        not_found: "%{type} ei löytynyt"
+        permission_not_set: Oikeuksia ei ole asetettu tyypille %{type}
+        recursion_limit_exceeded_error: Rajapintakyselyssä on liikaa rekursiivisia kyselyitä
+        too_many_aliases_error: Rajapintakysely käyttää liian monta alias-nimitystä. Kyselyssä on %{size} aliasta, mutta maksimissaan %{limit} on sallittu.
+        unauthorized_field: Sinulla ei ole oikeuksia tarkastella tai muokata kenttää %{field} tyypille %{type}
+        unauthorized_mutation: Sinulla ei ole oikeutta tämän muutospyynnön suorittamiseen
+        unauthorized_object: Sinulla ei ole oikeuksia tarkastella tai muokata tyyppiä %{type}
diff --git a/decidim-api/config/locales/fr-CA.yml b/decidim-api/config/locales/fr-CA.yml
new file mode 100644
index 0000000000000..340e6dde27fed
--- /dev/null
+++ b/decidim-api/config/locales/fr-CA.yml
@@ -0,0 +1,12 @@
+---
+fr-CA:
+  decidim:
+    api:
+      errors:
+        introspection_disabled: L'introspection est désactivée pour cette requête
+        not_found: "%{type} introuvable"
+        permission_not_set: La permission n'a pas été définie pour ce %{type}
+        recursion_limit_exceeded_error: Trop de récursions détectées dans la requête
+        too_many_aliases_error: Trop d'alias utilisés. Vous avez utilisé %{size} alias, mais seulement %{limit} sont autorisés.
+        unauthorized_field: Vous ne pouvez pas afficher ou modifier le champ %{field} sur %{type} car vous n'avez pas la permission
+        unauthorized_object: Vous ne pouvez pas afficher ou modifier ce %{type} car vous n'avez pas les permissions requises
diff --git a/decidim-api/config/locales/fr.yml b/decidim-api/config/locales/fr.yml
new file mode 100644
index 0000000000000..3e1c4fff08919
--- /dev/null
+++ b/decidim-api/config/locales/fr.yml
@@ -0,0 +1,12 @@
+---
+fr:
+  decidim:
+    api:
+      errors:
+        introspection_disabled: L'introspection est désactivée pour cette requête
+        not_found: "%{type} introuvable"
+        permission_not_set: La permission n'a pas été définie pour ce %{type}
+        recursion_limit_exceeded_error: Trop de récursions détectées dans la requête
+        too_many_aliases_error: Trop d'alias utilisés. Vous avez utilisé %{size} alias, mais seulement %{limit} sont autorisés.
+        unauthorized_field: Vous ne pouvez pas afficher ou modifier le champ %{field} sur %{type} car vous n'avez pas la permission
+        unauthorized_object: Vous ne pouvez pas afficher ou modifier ce %{type} car vous n'avez pas les permissions requises
diff --git a/decidim-api/config/locales/ga-IE.yml b/decidim-api/config/locales/ga-IE.yml
new file mode 100644
index 0000000000000..20a9da24e96f1
--- /dev/null
+++ b/decidim-api/config/locales/ga-IE.yml
@@ -0,0 +1 @@
+ga:
diff --git a/decidim-api/config/locales/gl.yml b/decidim-api/config/locales/gl.yml
new file mode 100644
index 0000000000000..8ec5fc81c180b
--- /dev/null
+++ b/decidim-api/config/locales/gl.yml
@@ -0,0 +1 @@
+gl:
diff --git a/decidim-api/config/locales/gn-PY.yml b/decidim-api/config/locales/gn-PY.yml
new file mode 100644
index 0000000000000..bd442b0ad85de
--- /dev/null
+++ b/decidim-api/config/locales/gn-PY.yml
@@ -0,0 +1 @@
+gn:
diff --git a/decidim-api/config/locales/he-IL.yml b/decidim-api/config/locales/he-IL.yml
new file mode 100644
index 0000000000000..af6fa60a73f2c
--- /dev/null
+++ b/decidim-api/config/locales/he-IL.yml
@@ -0,0 +1 @@
+he:
diff --git a/decidim-api/config/locales/hr.yml b/decidim-api/config/locales/hr.yml
new file mode 100644
index 0000000000000..f67f33c7e0cfc
--- /dev/null
+++ b/decidim-api/config/locales/hr.yml
@@ -0,0 +1 @@
+hr:
diff --git a/decidim-api/config/locales/hu.yml b/decidim-api/config/locales/hu.yml
new file mode 100644
index 0000000000000..52314c50c979f
--- /dev/null
+++ b/decidim-api/config/locales/hu.yml
@@ -0,0 +1 @@
+hu:
diff --git a/decidim-api/config/locales/id-ID.yml b/decidim-api/config/locales/id-ID.yml
new file mode 100644
index 0000000000000..8446cbad90a58
--- /dev/null
+++ b/decidim-api/config/locales/id-ID.yml
@@ -0,0 +1 @@
+id:
diff --git a/decidim-api/config/locales/is-IS.yml b/decidim-api/config/locales/is-IS.yml
new file mode 100644
index 0000000000000..1fd0783ddf221
--- /dev/null
+++ b/decidim-api/config/locales/is-IS.yml
@@ -0,0 +1 @@
+is-IS:
diff --git a/decidim-api/config/locales/it.yml b/decidim-api/config/locales/it.yml
new file mode 100644
index 0000000000000..85830635a7b97
--- /dev/null
+++ b/decidim-api/config/locales/it.yml
@@ -0,0 +1 @@
+it:
diff --git a/decidim-api/config/locales/ja.yml b/decidim-api/config/locales/ja.yml
new file mode 100644
index 0000000000000..9fc6647b434a8
--- /dev/null
+++ b/decidim-api/config/locales/ja.yml
@@ -0,0 +1,15 @@
+---
+ja:
+  decidim:
+    api:
+      errors:
+        introspection_disabled: このリクエストのイントロスペクションは無効です
+        invalid_locale: 無効なロケールが指定されました
+        locale_argument_error: I18n データの内部処理中にエラーが発生しました
+        not_found: "%{type} が見つかりません"
+        permission_not_set: この %{type} の権限が設定されていません
+        recursion_limit_exceeded_error: クエリで再帰が検出された回数が多すぎます
+        too_many_aliases_error: エイリアスが多すぎます。 %{size} 件のエイリアスを使用していますが、許可されているのは %{limit} 件までです。
+        unauthorized_field: 権限がないため、 %{field} の %{type} フィールドを表示または編集することはできません
+        unauthorized_mutation: この変更を実行する権限がありません
+        unauthorized_object: 権限がないため、この %{type} を表示または編集できません
diff --git a/decidim-api/config/locales/ka-GE.yml b/decidim-api/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-api/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-api/config/locales/kaa.yml b/decidim-api/config/locales/kaa.yml
new file mode 100644
index 0000000000000..455cb565ea313
--- /dev/null
+++ b/decidim-api/config/locales/kaa.yml
@@ -0,0 +1 @@
+kaa:
diff --git a/decidim-api/config/locales/ko.yml b/decidim-api/config/locales/ko.yml
new file mode 100644
index 0000000000000..8a7b3b861deda
--- /dev/null
+++ b/decidim-api/config/locales/ko.yml
@@ -0,0 +1 @@
+ko:
diff --git a/decidim-api/config/locales/lb.yml b/decidim-api/config/locales/lb.yml
new file mode 100644
index 0000000000000..823df018114f4
--- /dev/null
+++ b/decidim-api/config/locales/lb.yml
@@ -0,0 +1 @@
+lb:
diff --git a/decidim-api/config/locales/lo-LA.yml b/decidim-api/config/locales/lo-LA.yml
new file mode 100644
index 0000000000000..27a02bfece429
--- /dev/null
+++ b/decidim-api/config/locales/lo-LA.yml
@@ -0,0 +1 @@
+lo:
diff --git a/decidim-api/config/locales/lt.yml b/decidim-api/config/locales/lt.yml
new file mode 100644
index 0000000000000..6c5cb837ac8c1
--- /dev/null
+++ b/decidim-api/config/locales/lt.yml
@@ -0,0 +1 @@
+lt:
diff --git a/decidim-api/config/locales/lv.yml b/decidim-api/config/locales/lv.yml
new file mode 100644
index 0000000000000..1be0eabc09156
--- /dev/null
+++ b/decidim-api/config/locales/lv.yml
@@ -0,0 +1 @@
+lv:
diff --git a/decidim-api/config/locales/mt.yml b/decidim-api/config/locales/mt.yml
new file mode 100644
index 0000000000000..f7aabc7149a9b
--- /dev/null
+++ b/decidim-api/config/locales/mt.yml
@@ -0,0 +1 @@
+mt:
diff --git a/decidim-api/config/locales/nl.yml b/decidim-api/config/locales/nl.yml
new file mode 100644
index 0000000000000..f009eadee5442
--- /dev/null
+++ b/decidim-api/config/locales/nl.yml
@@ -0,0 +1 @@
+nl:
diff --git a/decidim-api/config/locales/no.yml b/decidim-api/config/locales/no.yml
new file mode 100644
index 0000000000000..9296b1e8d48ee
--- /dev/null
+++ b/decidim-api/config/locales/no.yml
@@ -0,0 +1,7 @@
+---
+"no":
+  decidim:
+    api:
+      errors:
+        not_found: "%{type} ikke funnet"
+        recursion_limit_exceeded_error: For mange rekursjoner oppdaget i spørringen
diff --git a/decidim-api/config/locales/oc-FR.yml b/decidim-api/config/locales/oc-FR.yml
new file mode 100644
index 0000000000000..325b348894124
--- /dev/null
+++ b/decidim-api/config/locales/oc-FR.yml
@@ -0,0 +1 @@
+oc:
diff --git a/decidim-api/config/locales/om-ET.yml b/decidim-api/config/locales/om-ET.yml
new file mode 100644
index 0000000000000..05e2e89c3a879
--- /dev/null
+++ b/decidim-api/config/locales/om-ET.yml
@@ -0,0 +1 @@
+om:
diff --git a/decidim-api/config/locales/pl.yml b/decidim-api/config/locales/pl.yml
new file mode 100644
index 0000000000000..a8e4dde70d6fb
--- /dev/null
+++ b/decidim-api/config/locales/pl.yml
@@ -0,0 +1 @@
+pl:
diff --git a/decidim-api/config/locales/pt-BR.yml b/decidim-api/config/locales/pt-BR.yml
new file mode 100644
index 0000000000000..720068427f5e7
--- /dev/null
+++ b/decidim-api/config/locales/pt-BR.yml
@@ -0,0 +1,15 @@
+---
+pt-BR:
+  decidim:
+    api:
+      errors:
+        introspection_disabled: A inspeção está desabilitada para esta requisição
+        invalid_locale: Localidade fornecida inválida
+        locale_argument_error: Houve um erro ao lidar internamente com dados do i18n
+        not_found: "%{type} Não encontrado"
+        permission_not_set: A permissão não foi definida para este %{type}
+        recursion_limit_exceeded_error: Muitas recursões detectadas na consulta
+        too_many_aliases_error: Foram utilizados muitos aliases. Você usou %{size} aliases, mas são permitidos apenas %{limit}.
+        unauthorized_field: Você não pode visualizar ou editar o campo %{field} em %{type} porque não tem permissão
+        unauthorized_mutation: Você não tem permissão para realizar esta mutação
+        unauthorized_object: Você não pode visualizar ou editar este %{type} porque não possui permissões
diff --git a/decidim-api/config/locales/pt.yml b/decidim-api/config/locales/pt.yml
new file mode 100644
index 0000000000000..9cbe1f038722e
--- /dev/null
+++ b/decidim-api/config/locales/pt.yml
@@ -0,0 +1 @@
+pt:
diff --git a/decidim-api/config/locales/ro-RO.yml b/decidim-api/config/locales/ro-RO.yml
new file mode 100644
index 0000000000000..2d4c1838d1164
--- /dev/null
+++ b/decidim-api/config/locales/ro-RO.yml
@@ -0,0 +1,15 @@
+---
+ro:
+  decidim:
+    api:
+      errors:
+        introspection_disabled: Introspection este dezactivat pentru această solicitare
+        invalid_locale: Limba furnizată nu este validă
+        locale_argument_error: A apărut o eroare la procesarea datelor privind traducerea
+        not_found: "%{type} nu a fost găsit"
+        permission_not_set: Permisiunile nu au fost setate pentru acest %{type}
+        recursion_limit_exceeded_error: Prea multe recursii detectate în interogare
+        too_many_aliases_error: Prea multe aliasuri folosite. Ați folosit aliasuri %{size}, dar %{limit} sunt permise.
+        unauthorized_field: Nu puteți vizualiza sau actualiza câmpul %{field} pentru %{type} deoarece nu aveți permisiuni
+        unauthorized_mutation: Nu aveți permisiunile necesare pentru a efectua această acțiune
+        unauthorized_object: Nu puteți vizualiza sau actualiza %{type} deoarece nu aveți permisiuni
diff --git a/decidim-api/config/locales/ru.yml b/decidim-api/config/locales/ru.yml
new file mode 100644
index 0000000000000..ddc9d1e32c29b
--- /dev/null
+++ b/decidim-api/config/locales/ru.yml
@@ -0,0 +1 @@
+ru:
diff --git a/decidim-api/config/locales/si-LK.yml b/decidim-api/config/locales/si-LK.yml
new file mode 100644
index 0000000000000..b0b50956edd26
--- /dev/null
+++ b/decidim-api/config/locales/si-LK.yml
@@ -0,0 +1 @@
+si:
diff --git a/decidim-api/config/locales/sk.yml b/decidim-api/config/locales/sk.yml
new file mode 100644
index 0000000000000..f634a02824398
--- /dev/null
+++ b/decidim-api/config/locales/sk.yml
@@ -0,0 +1 @@
+sk:
diff --git a/decidim-api/config/locales/sl.yml b/decidim-api/config/locales/sl.yml
new file mode 100644
index 0000000000000..26c7ce2e31e0e
--- /dev/null
+++ b/decidim-api/config/locales/sl.yml
@@ -0,0 +1 @@
+sl:
diff --git a/decidim-api/config/locales/so-SO.yml b/decidim-api/config/locales/so-SO.yml
new file mode 100644
index 0000000000000..11720879bac3d
--- /dev/null
+++ b/decidim-api/config/locales/so-SO.yml
@@ -0,0 +1 @@
+so:
diff --git a/decidim-api/config/locales/sq-AL.yml b/decidim-api/config/locales/sq-AL.yml
new file mode 100644
index 0000000000000..44ddadc95a8f3
--- /dev/null
+++ b/decidim-api/config/locales/sq-AL.yml
@@ -0,0 +1 @@
+sq:
diff --git a/decidim-api/config/locales/sr-CS.yml b/decidim-api/config/locales/sr-CS.yml
new file mode 100644
index 0000000000000..9e26af81914fc
--- /dev/null
+++ b/decidim-api/config/locales/sr-CS.yml
@@ -0,0 +1 @@
+sr:
diff --git a/decidim-api/config/locales/sv.yml b/decidim-api/config/locales/sv.yml
new file mode 100644
index 0000000000000..6e4bfa32b1619
--- /dev/null
+++ b/decidim-api/config/locales/sv.yml
@@ -0,0 +1,12 @@
+---
+sv:
+  decidim:
+    api:
+      errors:
+        invalid_locale: Ogiltigt språk angivet
+        locale_argument_error: Ett fel uppstod när i18n data hanterades internt
+        not_found: "%{type} hittades inte"
+        permission_not_set: Behörigheten har inte satts för denna %{type}
+        unauthorized_field: Du kan inte visa eller redigera %{field} fältet på %{type} eftersom du inte har behörighet
+        unauthorized_mutation: Du har inte behörighet att utföra denna åtgärd
+        unauthorized_object: Du kan inte visa eller redigera detta %{type} eftersom du inte har behörigheter
diff --git a/decidim-api/config/locales/sw-KE.yml b/decidim-api/config/locales/sw-KE.yml
new file mode 100644
index 0000000000000..7bf73465b1380
--- /dev/null
+++ b/decidim-api/config/locales/sw-KE.yml
@@ -0,0 +1 @@
+sw:
diff --git a/decidim-api/config/locales/th-TH.yml b/decidim-api/config/locales/th-TH.yml
new file mode 100644
index 0000000000000..a4431912a8299
--- /dev/null
+++ b/decidim-api/config/locales/th-TH.yml
@@ -0,0 +1 @@
+th:
diff --git a/decidim-api/config/locales/ti-ER.yml b/decidim-api/config/locales/ti-ER.yml
new file mode 100644
index 0000000000000..39bcd22920e44
--- /dev/null
+++ b/decidim-api/config/locales/ti-ER.yml
@@ -0,0 +1 @@
+ti:
diff --git a/decidim-api/config/locales/tr-TR.yml b/decidim-api/config/locales/tr-TR.yml
new file mode 100644
index 0000000000000..077d41667ab93
--- /dev/null
+++ b/decidim-api/config/locales/tr-TR.yml
@@ -0,0 +1 @@
+tr:
diff --git a/decidim-api/config/locales/uk.yml b/decidim-api/config/locales/uk.yml
new file mode 100644
index 0000000000000..c256c3246c4a3
--- /dev/null
+++ b/decidim-api/config/locales/uk.yml
@@ -0,0 +1 @@
+uk:
diff --git a/decidim-api/config/locales/val-ES.yml b/decidim-api/config/locales/val-ES.yml
new file mode 100644
index 0000000000000..fa70518d04b9b
--- /dev/null
+++ b/decidim-api/config/locales/val-ES.yml
@@ -0,0 +1 @@
+val:
diff --git a/decidim-api/config/locales/vi.yml b/decidim-api/config/locales/vi.yml
new file mode 100644
index 0000000000000..326506f0b1a36
--- /dev/null
+++ b/decidim-api/config/locales/vi.yml
@@ -0,0 +1 @@
+vi:
diff --git a/decidim-api/config/locales/zh-CN.yml b/decidim-api/config/locales/zh-CN.yml
new file mode 100644
index 0000000000000..f0b698bf39eb2
--- /dev/null
+++ b/decidim-api/config/locales/zh-CN.yml
@@ -0,0 +1 @@
+zh-CN:
diff --git a/decidim-api/config/locales/zh-TW.yml b/decidim-api/config/locales/zh-TW.yml
new file mode 100644
index 0000000000000..cb82c0526113b
--- /dev/null
+++ b/decidim-api/config/locales/zh-TW.yml
@@ -0,0 +1 @@
+zh-TW:
diff --git a/decidim-api/docs/usage.md b/decidim-api/docs/usage.md
index f6ee207d54bbe..2a85a9acdeee5 100644
--- a/decidim-api/docs/usage.md
+++ b/decidim-api/docs/usage.md
@@ -52,637 +52,4 @@ Response (formatted) should look something like this:
 }
 ```
 
-The most practical way to experiment with GraphQL, however, is just to use the in-browser IDE GraphiQL. It provides access to the documentation and auto-complete (use CTRL-Space) for writing queries.
-
-From now on, we will skip the "query" keyword for the purpose of readability. You can skip it too if you are using GraphiQL, if you are querying directly (by using CURL for instance) you will need to include it.
-
-### Signing in to the API
-
-In case you want to use the API as a sign in user to perform mutations representing a user in Decidim, you have two available options for such integrations through the system administration panel:
-
-1. Creating an OAuth application and implementing the OAuth authentication flow for the users of your application. Use this option for participant-facing applications where the participants represent themselves in Decidim through the API.
-2. Creating API credentials and signing in to the API with these credentials to perform the operations as a signed in machine user. Use this option for machine-to-machine automations where there is no real end user interacting with Decidim.
-
-If you only want to test the GraphQL queries as a signed in user, you can use the normal Decidim authentication functionality to sign in and then use the GraphiQL IDE to perform these queries as a signed in user.
-
-#### OAuth flow for participant-facing applications
-
-Participant-facing applications where the participants need to interact with Decidim through GraphQL mutations can be integrated using OAuth applications. In order to configure such integration capability from the system administration panel, create a new OAuth application and provide the necessary details for your integration. Note that the "application type" for such applications would typically be "Public". For more information regarding the application types, refer to [RFC 6749 Section 2.1. (OAuth client types)](https://datatracker.ietf.org/doc/html/rfc6749#section-2.1).
-
-In order to use the OAuth access tokens to represent the user through the API, please select the following scopes as "Available" scopes for the application:
-
-* `user` - Authenticated users have the ability to represent a logged in user in Decidim
-* `api:read` - Authenticated users have the ability to read data from the API
-* `api:write` - Authenticated users have the ability to write data through the API (in case your external application needs to perform mutations over the API on behalf of the user)
-
-Once configured, you can now use any OAuth authentication library to perform the OAuth authentication flow with your application users and receive an access token to utilize the Decidim API representing the signed in user. Please note that with public OAuth clients especially (and recommended also for confidential clients), you have to use [PKCE](https://datatracker.ietf.org/doc/html/rfc7636) with the authorization flow.
-
-Once the OAuth application is created, you can authenticate against it with the following steps:
-
-1. Send the user to perform an OAuth authorization request at Decidim with the required API scopes (`user`, `api:read` and `api:write` if you want to perform mutations over the API). Along with the authorization request, also send the additional parameters required by PKCE (`code_challenge` and `code_challenge_method`).
-2. Receive an OAuth authorization code back to your application's configured redirect URI.
-3. Utilizing the received authorization code, request an OAuth access token from the OAuth token endpoint. Along with the token request, also send the additional parameter required by PKCE `code_verifier`.
-4. The issued token is a JSON Web Token (JWT) when the authorization request contains the defined scopes. This token can be now used to represent the user in further calls to the API by passing the token with its type (`Bearer`) within the HTTP Authorization header with the request to the API.
-
-When doing the requests to the API, you also need to pass the OAuth client ID within the `X-Jwt-Aud` header of the requests in order for the token to be recognized as a valid token for the issued client. Passing the bearer token to the `Authorization` header and the OAuth client ID to the `X-Jwt-Aud` header, you can send the following HTTP request to the API to validate that the token works and the user is recognized as signed in:
-
-```http
-POST /api HTTP/1.1
-Accept: application/json
-Authorization: Bearer token
-Content-Length: 53
-Content-Type: application/json
-Host: DOMAIN
-X-Jwt-Aud: OAUTH_CLIENT_ID
-
-{"query":"{ session { user { id name nickname } } }"}
-```
-
-You should see the user details in the response in case the token is valid and you have configured the API correctly. If the response does not contain the user details, please refer to the Decidim configuration documentation.
-
-Once the interaction with the API is completed, it is recommended to revoke the tokens, which is similar to the user signing out of the application. This can be done utilizing the OAuth revocation endpoint provided by Decidim. After the token is revoked, it is no longer valid and the user has to perform a re-authorization the next time they want to utilize the API.
-
-In case you need tokens with a longer life span, you can either look into the Decidim documentation to extend the validity period of the access tokens or enable refresh tokens for the OAuth application when configuring it. However, note that tokens with longer lifespan can weaken the security of your system and make your application users vulnerable to security threats. Such use cases should be carefully planned and the security concerns should be addressed seriously.
-
-#### API credentials flow for machine-to-machine automations
-
-The API credentials represent an administrative user in Decidim that performs administrative tasks on behalf of the end users. This type of integration flows should never live on devices that the participants have access to. These types of integrations are meant for different types of automations, such as transferring proposal answers or meeting reports back to Decidim from an external system automatically, e.g. once a day.
-
-Note that these credentials are highly sensitive and have elevated permissions, so take good care of the system security where you are planning to store these credentials. If these credentials end up in participants' hands, the whole system is compromised and no longer secure. You should always primarily create OAuth integrations where the end users will manually perform the authorization for the application to perform actions on behalf of them.
-
-Once you have validated that this is the correct way for your integration to operate, you can create the API credentials from the system administration panel. You will receive an API key and API secret after creating the credentials. These credentials should be also manually rotated on a regular basis to prevent unauthorized access to the system with these credentials in case they are leaked. The credentials have to be manually rotated in order to prevent external applications breaking because they cannot rotate the credentials themselves and they are typically statically configured for these applications.
-
-Given you have issued the API key and API secret, you can now send a sign in request to the API using these credentials as follows:
-
-```bash
-curl -s -i -H "Content-type: application/x-www-form-urlencoded" \
-  -d "api_user[key]=PASTE_API_KEY_HERE" \
-  -d "api_user[secret]=PASTE_API_SECRET_HERE" \
-  -X POST https://DOMAIN/api/sign_in | grep 'Authorization' | cut -d ' ' -f2-
-```
-
-After running this command, you should see the following string in the console, where `token` is replaced with the access token:
-
-```bash
-Bearer token
-```
-
-This string is passed to the following requests within the HTTP `Authorization` header to represent the user during API calls. You can use the following example query to test it out and confirm that signing in works as expected:
-
-```bash
-curl -w "\n" -H "Content-Type: application/json" \
-  -H "Authorization: Bearer token" \
-  -d '{"query":"{ session { user { id name nickname } } }"}' \
-  -X POST https://DOMAIN/api
-```
-
-You should see the user details in the response in case the token is valid and you have configured the API correctly. If the response does not contain the user details, please refer to the Decidim configuration documentation.
-
-Once the API interaction is done, you should always make an HTTP DELETE request to `/api/sign_out` with the same token in order to revoke the token from further access as follows:
-
-```bash
-curl -s -o /dev/null -w "HTTP %{http_code}\n" \
-  -H "Authorization: Bearer token" \
-  -X DELETE http://DOMAIN/api/sign_out
-```
-
-### Usage limits
-
-Decidim is just a Rails application, meaning that any particular installation may implement custom limits in order to access the API (and the application in general).
-
-By default (particular installations may change that), API uses the same limitations as the whole Decidim website, provided by the Gem [Rack::Attack](https://github.com/kickstarter/rack-attack). These are 100 maximum requests per minute per IP to prevent DoS attacks
-
-### Decidim structure, Types, collections and Polymorphism
-
-There are no endpoints in the GraphQL specification, instead objects are organized according to their "Type".
-
-These objects can be grouped in a single, complex query. Also, objects may accept parameters, which are "Types" as well.
-
-Each "Type" is just a pre-defined structure with fields, or just an Scalar (Strings, Integers, Booleans, ...).
-
-For instance, to obtain *all the participatory processes in a Decidim installation published since January 2018* and order them by published date, we could execute the next query:
-
-```graphql
-{
-  participatoryProcesses(filter: {publishedSince: "2018-01-01"}, order: {publishedAt: "asc"}) {
-    slug
-    title {
-      translation(locale: "en")
-    }
-  }
-}
-```
-
-Response should look like:
-
-```json
-{
-  "data": {
-    "participatoryProcesses": [
-      {
-        "slug": "consectetur-at",
-        "title": {
-          "translation": "Soluta consectetur quos fugit aut."
-        }
-      },
-      {
-        "slug": "nostrum-earum",
-        "title": {
-          "translation": "Porro hic ipsam cupiditate reiciendis."
-        }
-      }
-    ]
-  }
-}
-```
-
-#### What happened?
-
-In the former query, each keyword represents a type, the words `publishedSince`, `publishedAt`, `slug`, `locale` are scalars, all of them Strings.
-
-The other keywords however, are objects representing certain entities:
-
-* `participatoryProcesses` is a type that represents a collection of participatory spaces. It accepts arguments (`filter` and `order`), which are other object types as well. `slug` and `title` are the fields of the participatory process we are interested in, there are "Types" too.
-* `filter` is a [ParticipatoryProcessFilter](#ParticipatoryProcessFilter)\* input type, it has several properties that allows us to refine our search. One of them is the `publishedSince` property with the initial date from which to list entries.
-* `order` is a [ParticipatoryProcessSort](#ParticipatoryProcessSort) type, works the same way as the filter but with the goal of ordering the results.
-* `title` is a [TranslatedField](#TranslatedField) type, which allows us to deal with multi-language fields.
-
-Finally, note that the returned object is an array, each item of which is a representation of the object we requested.
-
-> \***About how filters and sorting are organized**
->
-> There are two types of objects to filter and ordering collections in Decidim, they all work in a similar fashion. The type involved in filtering always have the suffix "Filter", for ordering it has the suffix "Sort".
->
-> The types used to filter participatory spaces are: [ParticipatoryProcessFilter](#ParticipatoryProcessFilter), [AssemblyFilter](#AssemblyFilter), and so on.
->
-> Other collections (or connections) may have their own filters (i.e. [ComponentFilter](#ComponentFilter)).
->
-> Each filter has its own properties, you should check any object in particular for details. The way they work with multi-languages fields, however, is the same:
->
-> We can say we have some searchable object with a multi-language field called *title*, and we have a filter that allows us to search through this field. How should it work? Should we look up content for every language in the field? or should we stick to a specific language?
->
-> In our case, we have decided to search only one particular language of a multi-language field but we let you choose which language to search.
-> If no language is specified, the configured as default in the organization will be used. The keyword to specify the language is `locale`, and it should be provided in the 2 letters ISO 639-1 format (en = English, es = Spanish, ...).
->
-> Example (this is not a real Decidim query):
->
-> ```graphql
->  some_collection(filter: { locale: "en", title: "ideas"}) {
->    id
->  }
-> ```
->
-> The same applies to sorting ([ParticipatoryProcessSort](#ParticipatoryProcessSort), [AssemblySort](#AssemblySort), etc.)
->
-> In this case, the content of the field (*title*) only allows 2 values: *ASC* and *DESC*.
->
-> Example of ordering alphabetically by the title content in French language:
->
-> ```graphql
-> some_collection(order: { locale: "en", title: "asc"}) {
->   id
-> }
-> ```
->
-> Of course, you can combine both filter and order. Also remember to check availability of this type of behaviour for any particular filter/sort.
-
-#### Decidim main types
-
-Decidim has 2 main types of objects through which content is provided. These are Participatory Spaces and Components.
-
-A participatory space is the first level, currently there are 5 officially supported: *Participatory Processes*, *Assemblies*, *Conferences* and *Initiatives*. For each participatory process there will correspond a collection type and a "single item" type.
-
-The previous example uses the collection type for participatory processes. You can try `assemblies`, `conferences`, or `initiatives` for the others. Note that each collection can implement their own filter and order types with different properties.
-
-As an example for a single item query, you can run:
-
-```graphql
-{
-  participatoryProcess(slug: "consectetur-at") {
-    slug
-    title {
-      translation(locale: "en")
-    }
-  }
-}
-```
-
-And the response will be:
-
-```json
-{
-  "data": {
-    "participatoryProcess": {
-      "slug": "consectetur-at",
-      "title": {
-        "translation": "Soluta consectetur quos fugit aut."
-      }
-    }
-  }
-}
-```
-
-#### What is different?
-
-First, note that we are querying, in singular, the type `participatoryProcess`, with a different parameter, `slug`\*, (a String). We can use the `id` instead if we know it.
-
-Second, the response is not an Array, it is just the object we requested. We can expect to return `null` if the object is not found.
-
-> \* The `slug` is a convenient way to find a participatory space as is (usually) in the URL.
->
-> For instance, consider this real case from Barcelona:
->
-> https://www.decidim.barcelona/processes/patrimonigracia
->
-> The word `patrimonigracia` indicates the "slug".
-
-#### Components
-
-Every participatory space may (and should) have some components. There are 9 official components, these are `Proposals`, `Page`, `Meetings`, `Budgets`, `Surveys`, `Accountability`, `Debates` and `Blog`. Plugins may add their own components.
-
-If you know the `id`\* of a specific component you can obtain it by querying it directly:
-
-```graphql
-{
-  component(id:2) {
-    id
-    name {
-      translation(locale:"en")
-    }
-    __typename
-    participatorySpace {
-      id
-      type
-    }
-  }
-}
-```
-
-Response:
-
-```json
-{
-  "data": {
-    "component": {
-      "id": "2",
-      "name": {
-        "translation": "Meetings"
-      },
-      "__typename": "Meetings",
-      "participatorySpace": {
-        "id": "1",
-        "type": "Decidim::ParticipatoryProcess"
-      }
-    }
-  }
-}
-```
-
-The process is analogue as what has been explained in the case of searching for one specific participatory process.
-
-> \*Note that the `id` of a component is present also in the URL after the letter "f":
->
-> https://www.decidim.barcelona/processes/patrimonigracia/f/3257/
->
-> In this case, 3257.
-
-##### What about component's collections?
-
-Glad you asked, component's collections cannot be retrieved directly, the are available *in the context* of a participatory space.
-
-For instance, we can query all the components in an particular Assembly as follows:
-
-```graphql
-{
-  assembly(id: 3) {
-    components {
-      id
-      name {
-        translation(locale: "en")
-      }
-      __typename
-    }
-  }
-}
-```
-
-The response will be similar to:
-
-```json
-{
-  "data": {
-    "assembly": {
-      "components": [
-        {
-          "id": "42",
-          "name": {
-            "translation": "Accountability"
-          },
-          "__typename": "Component"
-        },
-        {
-          "id": "38",
-          "name": {
-            "translation": "Meetings"
-          },
-          "__typename": "Meetings"
-        },
-        {
-          "id": "37",
-          "name": {
-            "translation": "Page"
-          },
-          "__typename": "Pages"
-        },
-        {
-          "id": "39",
-          "name": {
-            "translation": "Proposals"
-          },
-          "__typename": "Proposals"
-        }
-      ]
-    }
-  }
-}
-```
-
-We can also apply some filters by using the [ComponentFilter](#ComponentFilter) type. In the next query we would like to *find all the components with geolocation enabled in the assembly with id=2*:
-
-```graphql
-{
-  assembly(id: 2) {
-    components(filter: {withGeolocationEnabled: true}) {
-      id
-      name {
-        translation(locale: "en")
-      }
-      __typename
-    }
-  }
-}
-```
-
-The response:
-
-```json
-{
-  "data": {
-    "assembly": {
-      "components": [
-        {
-          "id": "39",
-          "name": {
-            "translation": "Meetings"
-          },
-          "__typename": "Meetings"
-        }
-      ]
-    }
-  }
-}
-```
-
-Note that, in this case, there is only one component returned, "Meetings". In some cases Proposals can be geolocated too therefore would be returned in this query.
-
-### Polymorphism and connections
-
-Many relationships between tables in Decidim are polymorphic, this means that the related object can belong to different classes and share just a few properties in common.
-
-For instance, components in a participatory space are polymorphic, while the concept of component is generic and all of them share properties like *published date*, *name* or *weight*, they differ in the rest. *Proposals* have the *status* field while *Meetings* have an *agenda*.
-
-Another example are the case of linked resources, these are properties that may link objects of different nature between components or participatory spaces.
-
-In a very simplified way (to know more please refer to the official guide), GraphQL polymorphism is handled through the operator `... on`. You will know when a field is polymorphic because the property `__typename`, which tells you the type of that particular object, will change accordingly.
-
-In the previous examples we have queried for this property:
-
-Response fragment:
-
-```json
-      "components": [
-        {
-          "id": "38",
-          "name": {
-            "translation": "Meetings"
-          },
-          "__typename": "Meetings"
-        }
-```
-
-So, if we want to access the rest of the properties in a polymorphic object, we should do it through the `... on` operator as follows:
-
-```graphql
-{
-  assembly(id: 2) {
-    components {
-      id
-      ... on Proposals {
-
-      }
-    }
-  }
-}
-```
-
-Consider this query:
-
-```graphql
-{
-  assembly(id: 3) {
-    components(filter: {type: "Proposals"}) {
-      id
-      name {
-        translation(locale: "en")
-      }
-      ... on Proposals {
-        proposals(order: {likeCount: "desc"}, first: 2) {
-          edges {
-            node {
-              id
-              likes {
-                name
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-```
-
-The response:
-
-```json
-{
-  "data": {
-    "assembly": {
-      "components": [
-        {
-          "id": "39",
-          "name": {
-            "translation": "Proposals"
-          },
-          "proposals": {
-            "edges": [
-              {
-                "node": {
-                  "id": "35",
-                  "likes": [
-                    {
-                      "name": "Ms. Johnathon Schaefer"
-                    },
-                    {
-                      "name": "Linwood Lakin PhD 3 4 endr1"
-                    },
-                    {
-                      "name": "Gracie Emmerich"
-                    },
-                    {
-                      "name": "Randall Rath 3 4 endr3"
-                    },
-                    {
-                      "name": "Jolene Schmitt MD"
-                    },
-                    {
-                      "name": "Clarence Hammes IV 3 4 endr5"
-                    },
-                    {
-                      "name": "Omar Mayer"
-                    },
-                    {
-                      "name": "Raymundo Jaskolski 3 4 endr7"
-                    }
-                  ]
-                }
-              },
-              {
-                "node": {
-                  "id": "33",
-                  "likes": [
-                    {
-                      "name": "Spring Brakus"
-                    },
-                    {
-                      "name": "Reiko Simonis IV 3 2 endr1"
-                    },
-                    {
-                      "name": "Dr. Jim Denesik"
-                    },
-                    {
-                      "name": "Dr. Mack Schoen 3 2 endr3"
-                    }
-                  ]
-                }
-              }
-            ]
-          }
-        }
-      ]
-    }
-  }
-}
-```
-
-#### What is going on?
-
-Until the `... on Proposals` line, there is nothing new. We are requesting the *Assembly* participatory space identified by the `id=3`, then listing all its components with the type "Proposals". All the components share the *id* and *name* properties, so we can just add them at the query.
-
-After that, we want content specific from the *Proposals* type. In order to do that we must tell the server that the content we will request shall only be executed if the types matches *Proposals*. We do that by wrapping the rest of the query in the `... on Proposals` clause.
-
-The next line is just a property of the type *Proposals* which is a type of collection called a "connection". A connection works similar as normal collection (such as *components*) but it can handle more complex cases.
-
-Typically, a connection is used to paginate long results, for this purpose the results are not directly available but encapsulated inside the list *edges* in several *node* results. Also there are more arguments available in order to navigate between pages. This are the arguments:
-
-* `first`: Returns the first *n* elements from the list
-* `after`: Returns the elements in the list that come after the specified *cursor*
-* `last`: Returns the last *n* elements from the list
-* `before`: Returns the elements in the list that come before the specified *cursor*
-
-Example:
-
-```graphql
-{
-  assembly(id: 3) {
-    components(filter: {type: "Proposals"}) {
-      id
-      name {
-        translation(locale: "en")
-      }
-      ... on Proposals {
-        proposals(first:2,after:"Mg") {
-          pageInfo {
-            endCursor
-            startCursor
-            hasPreviousPage
-            hasNextPage
-          }
-          edges {
-            node {
-              id
-              likes {
-                name
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-```
-
-Being the response:
-
-```json
-{
-  "data": {
-    "assembly": {
-      "components": [
-        {
-          "id": "39",
-          "name": {
-            "translation": "Proposals"
-          },
-          "proposals": {
-            "pageInfo": {
-              "endCursor": "NA",
-              "startCursor": "Mw",
-              "hasPreviousPage": false,
-              "hasNextPage": true
-            },
-            "edges": [
-              {
-                "node": {
-                  "id": "32",
-                  "likes": []
-                }
-              },
-              {
-                "node": {
-                  "id": "31",
-                  "likes": [
-                    {
-                      "name": "Mr. Nicolas Raynor"
-                    },
-                    {
-                      "name": "Gerry Fritsch PhD 3 1 endr1"
-                    }
-                  ]
-                }
-              }
-            ]
-          }
-        }
-      ]
-    }
-  }
-}
-```
-
-As you can see, a part from the *edges* list, you can access to the object *pageInfo* which gives you the information needed to navigate through the different pages.
-
-For more info on how connections work, you can check the official guide:
-
-https://graphql.org/learn/pagination/
+For additional examples of queries and mutations, check the additional [GraphQL API documentation](https://docs.decidim.org/en/develop/develop/api/index.html) of Decidim.
diff --git a/decidim-api/lib/decidim/api.rb b/decidim-api/lib/decidim/api.rb
index 2cd1d429ce3d6..11f9beec80ec2 100644
--- a/decidim-api/lib/decidim/api.rb
+++ b/decidim-api/lib/decidim/api.rb
@@ -23,6 +23,11 @@ module Api
       Decidim::Env.new("API_SCHEMA_MAX_COMPLEXITY", 5000).to_i
     end
 
+    # defines how many aliases are permitted in a query
+    config_accessor :max_aliases do
+      Decidim::Env.new("API_SCHEMA_MAX_ALIASES", 5).to_i
+    end
+
     # defines the schema max_depth to configure GraphQL query max_depth
     config_accessor :schema_max_depth do
       Decidim::Env.new("API_SCHEMA_MAX_DEPTH", 15).to_i
@@ -32,12 +37,19 @@ module Api
       Decidim::Env.new("DECIDIM_API_DISCLOSE_SYSTEM_VERSION").present?
     end
 
-    # Public Setting that can make the API authentication necessary in order to
+    # makes the API authentication necessary in order to access it
     # access it.
     config_accessor :force_api_authentication do
       Decidim::Env.new("DECIDIM_API_FORCE_API_AUTHENTICATION", nil).present?
     end
 
+    # allows anonymous introspection queries
+    # If you are not sure, leave it set to false. In this way only administrator users will be able to access the introspection query.
+    # Otherwise, anyone can access it, causing security issues.
+    config_accessor :enable_anonymous_introspection do
+      Decidim::Env.new("DECIDIM_API_ENABLE_ANONYMOUS_INTROSPECTION", nil).present?
+    end
+
     # The expiration time of the JWT tokens, after which issued token will
     # expire. Recommended to match the value of
     # `DECIDIM_OAUTH_ACCESS_TOKEN_EXPIRES_IN`.
diff --git a/decidim-api/lib/decidim/api/alias_analyzer.rb b/decidim-api/lib/decidim/api/alias_analyzer.rb
new file mode 100644
index 0000000000000..c4d5a2c11103c
--- /dev/null
+++ b/decidim-api/lib/decidim/api/alias_analyzer.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Api
+    class AliasAnalyzer < GraphQL::Analysis::AST::Analyzer
+      def initialize(query)
+        super
+
+        @aliases = Set.new
+      end
+
+      def on_enter_field(node, _parent, _visitor)
+        @aliases.add(node.alias) if node.alias.present?
+      end
+
+      def result
+        if @aliases.size > Decidim::Api.max_aliases
+          Errors::TooManyAliasesError.new(I18n.t("decidim.api.errors.too_many_aliases_error", size: @aliases.size, limit: Decidim::Api.max_aliases))
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-api/lib/decidim/api/component_mutation_type.rb b/decidim-api/lib/decidim/api/component_mutation_type.rb
index b661cd0a1a30a..35bb10b2e7841 100644
--- a/decidim-api/lib/decidim/api/component_mutation_type.rb
+++ b/decidim-api/lib/decidim/api/component_mutation_type.rb
@@ -11,8 +11,7 @@ def self.resolve_type(obj, _ctx)
         mod = obj.manifest_name.camelize
         "Decidim::#{mod}::#{mod}MutationType".constantize
       rescue NameError
-        Rails.logger.warn("Mutation type not found for #{mod}: #{e.message}")
-        nil
+        raise GraphQL::ExecutionError, "Mutation type not found for #{mod}"
       end
     end
   end
diff --git a/decidim-api/lib/decidim/api/errors/attribute_validation_error.rb b/decidim-api/lib/decidim/api/errors/attribute_validation_error.rb
new file mode 100644
index 0000000000000..0225d6fde18b0
--- /dev/null
+++ b/decidim-api/lib/decidim/api/errors/attribute_validation_error.rb
@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Api
+    module Errors
+      class AttributeValidationError < GraphQL::ExecutionError
+        def initialize(messages, ast_node: nil, options: nil, extensions: nil)
+          @ast_node = ast_node
+          @options = options
+          @extensions = extensions
+
+          @messages = messages
+
+          message_str =
+            if messages.is_a?(ActiveModel::Errors)
+              messages.full_messages.join(", ")
+            elsif messages.is_a?(Array)
+              messages.map { |a| a[:message] }.join(", ")
+            else
+              messages.to_s
+            end
+          super(message_str)
+        end
+
+        def to_h
+          hash = {}
+          if @messages.is_a?(ActiveModel::Errors)
+            hash["message"] = @messages.map do |error|
+              # This is the GraphQL argument which corresponds to the validation error:
+              local_path = ["attributes", error.attribute.to_s.camelize(:lower)]
+              {
+                path: local_path,
+                message: error.message
+              }
+            end
+          end
+
+          hash["message"] = @messages if @messages.is_a?(Array)
+
+          if ast_node
+            hash["locations"] = [
+              {
+                "line" => ast_node.line,
+                "column" => ast_node.col
+              }
+            ]
+          end
+
+          hash["path"] = path if path
+
+          hash.merge!(options) if options
+
+          if extensions
+            hash["extensions"] = extensions.transform_keys do |(key, value), ext|
+              ext[key.to_s] = value
+            end
+          end
+
+          hash.merge!({ "extensions" => { "code" => "ATTRIBUTE_VALIDATION_ERROR" } })
+
+          hash
+        end
+
+        def message
+          return @messages.full_messages.join(", ") if @messages.is_a?(ActiveModel::Errors)
+          return @messages.map { |a| [a[:path].last, a[:message]].join(": ") }.join(", ") if @messages.is_a?(Array)
+
+          @messages.to_s
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-api/lib/decidim/api/errors/introspection_disabled_error.rb b/decidim-api/lib/decidim/api/errors/introspection_disabled_error.rb
new file mode 100644
index 0000000000000..13a497a194695
--- /dev/null
+++ b/decidim-api/lib/decidim/api/errors/introspection_disabled_error.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Api
+    module Errors
+      # i18n-tasks-use t("decidim.api.errors.introspection_disabled")
+      class IntrospectionDisabledError < GraphQL::ExecutionError
+        def to_h
+          super.merge({ "extensions" => { "code" => "INTROSPECTION_DISABLED_ERROR" } })
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-api/lib/decidim/api/errors/invalid_locale_error.rb b/decidim-api/lib/decidim/api/errors/invalid_locale_error.rb
new file mode 100644
index 0000000000000..3f7ed57395b5b
--- /dev/null
+++ b/decidim-api/lib/decidim/api/errors/invalid_locale_error.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Api
+    module Errors
+      # i18n-tasks-use t("decidim.api.errors.invalid_locale")
+      class InvalidLocaleError < GraphQL::ExecutionError
+        def to_h
+          super.merge({ "extensions" => { "code" => "INVALID_LOCALE_ERROR" } })
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-api/lib/decidim/api/errors/locale_error.rb b/decidim-api/lib/decidim/api/errors/locale_error.rb
new file mode 100644
index 0000000000000..8302aa2a485b1
--- /dev/null
+++ b/decidim-api/lib/decidim/api/errors/locale_error.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Api
+    module Errors
+      # i18n-tasks-use t("decidim.api.errors.locale_argument_error")
+      class LocaleError < GraphQL::ExecutionError
+        def to_h
+          super.merge({ "extensions" => { "code" => "LOCALE_ERROR" } })
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-api/lib/decidim/api/errors/mutation_not_authorized_error.rb b/decidim-api/lib/decidim/api/errors/mutation_not_authorized_error.rb
new file mode 100644
index 0000000000000..19c513f8a6c30
--- /dev/null
+++ b/decidim-api/lib/decidim/api/errors/mutation_not_authorized_error.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Api
+    module Errors
+      # i18n-tasks-use t("decidim.api.errors.unauthorized_mutation")
+      class MutationNotAuthorizedError < GraphQL::ExecutionError
+        def to_h
+          super.merge({ "extensions" => { "code" => "MUTATION_NOT_AUTHORIZED_ERROR" } })
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-api/lib/decidim/api/errors/not_found_error.rb b/decidim-api/lib/decidim/api/errors/not_found_error.rb
new file mode 100644
index 0000000000000..bca12968a291b
--- /dev/null
+++ b/decidim-api/lib/decidim/api/errors/not_found_error.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Api
+    module Errors
+      # i18n-tasks-use t("decidim.api.errors.not_found")
+      class NotFoundError < GraphQL::ExecutionError
+        def to_h
+          super.merge({ "extensions" => { "code" => "NOT_FOUND_ERROR" } })
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-api/lib/decidim/api/errors/permission_not_set_error.rb b/decidim-api/lib/decidim/api/errors/permission_not_set_error.rb
new file mode 100644
index 0000000000000..9242555a8e89f
--- /dev/null
+++ b/decidim-api/lib/decidim/api/errors/permission_not_set_error.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Api
+    module Errors
+      # i18n-tasks-use t("decidim.api.errors.permission_not_set")
+      class PermissionNotSetError < GraphQL::ExecutionError
+        def to_h
+          super.merge({ "extensions" => { "code" => "PERMISSION_NOT_SET_ERROR" } })
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-api/lib/decidim/api/errors/recursion_limit_exceeded_error.rb b/decidim-api/lib/decidim/api/errors/recursion_limit_exceeded_error.rb
new file mode 100644
index 0000000000000..37daaf161b4e6
--- /dev/null
+++ b/decidim-api/lib/decidim/api/errors/recursion_limit_exceeded_error.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Api
+    module Errors
+      # i18n-tasks-use t("decidim.api.errors.recursion_limit_exceeded_error")
+      class RecursionLimitExceededError < GraphQL::AnalysisError
+        def to_h
+          super.merge({ "extensions" => { "code" => "RECURSION_LIMIT_EXCEEDED_ERROR" } })
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-api/lib/decidim/api/errors/too_many_aliases_error.rb b/decidim-api/lib/decidim/api/errors/too_many_aliases_error.rb
new file mode 100644
index 0000000000000..167e0a7e285e5
--- /dev/null
+++ b/decidim-api/lib/decidim/api/errors/too_many_aliases_error.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Api
+    module Errors
+      # i18n-tasks-use t("decidim.api.errors.too_many_aliases_error")
+
+      class TooManyAliasesError < GraphQL::AnalysisError
+        def to_h
+          super.merge({ "extensions" => { "code" => "TOO_MANY_ALIASES_ERROR" } })
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-api/lib/decidim/api/errors/unauthorized_field_error.rb b/decidim-api/lib/decidim/api/errors/unauthorized_field_error.rb
new file mode 100644
index 0000000000000..713f5d4bde55c
--- /dev/null
+++ b/decidim-api/lib/decidim/api/errors/unauthorized_field_error.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Api
+    module Errors
+      # i18n-tasks-use t("decidim.api.errors.unauthorized_field")
+      class UnauthorizedFieldError < GraphQL::ExecutionError
+        def to_h
+          super.merge({ "extensions" => { "code" => "UNAUTHORIZED_FIELD_ERROR" } })
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-api/lib/decidim/api/errors/unauthorized_object_error.rb b/decidim-api/lib/decidim/api/errors/unauthorized_object_error.rb
new file mode 100644
index 0000000000000..8dff8305a6fc2
--- /dev/null
+++ b/decidim-api/lib/decidim/api/errors/unauthorized_object_error.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Api
+    module Errors
+      # i18n-tasks-use t("decidim.api.errors.unauthorized_object")
+      class UnauthorizedObjectError < GraphQL::ExecutionError
+        def to_h
+          super.merge({ "extensions" => { "code" => "UNAUTHORIZED_OBJECT_ERROR" } })
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-api/lib/decidim/api/errors/validation_error.rb b/decidim-api/lib/decidim/api/errors/validation_error.rb
new file mode 100644
index 0000000000000..ead1bb3239509
--- /dev/null
+++ b/decidim-api/lib/decidim/api/errors/validation_error.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Api
+    module Errors
+      class ValidationError < GraphQL::ExecutionError
+        def to_h
+          super.merge({ "extensions" => { "code" => "VALIDATION_ERROR" } })
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-api/lib/decidim/api/graphql_permissions.rb b/decidim-api/lib/decidim/api/graphql_permissions.rb
index 09c2c4bb2598e..a25f5e529b47e 100644
--- a/decidim-api/lib/decidim/api/graphql_permissions.rb
+++ b/decidim-api/lib/decidim/api/graphql_permissions.rb
@@ -44,12 +44,7 @@ def allowed_to?(action, subject, object, context, scope: :public)
           permission_action = Decidim::PermissionAction.new(scope:, action:, subject:)
 
           permission_chain(object).inject(permission_action) do |current_permission_action, permission_class|
-            permission_context =
-              if scope == :admin
-                local_admin_context(object, context)
-              else
-                local_context(object, context)
-              end
+            permission_context = local_user_context(object, context)
 
             permission_class.new(
               context[:current_user],
@@ -57,6 +52,8 @@ def allowed_to?(action, subject, object, context, scope: :public)
               permission_context
             ).permissions
           end.allowed?
+        rescue Decidim::PermissionAction::PermissionNotSetError
+          false
         end
 
         # Injects into context object current_participatory_space and current_component keys as they are needed
@@ -77,7 +74,7 @@ def local_context(object, context)
           context.to_h
         end
 
-        def local_admin_context(object, context)
+        def local_user_context(object, context)
           context = local_context(object, context)
 
           component = context[:current_component]
diff --git a/decidim-api/lib/decidim/api/introspection_analyzer.rb b/decidim-api/lib/decidim/api/introspection_analyzer.rb
new file mode 100644
index 0000000000000..bb71a209053bf
--- /dev/null
+++ b/decidim-api/lib/decidim/api/introspection_analyzer.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Api
+    module IntrospectionAnalyzer
+      module FieldVisibility
+        extend ActiveSupport::Concern
+
+        included do
+          def self.visible?(context)
+            raise Errors::IntrospectionDisabledError, I18n.t("decidim.api.errors.introspection_disabled") unless context[:can_introspect] == true
+
+            super
+          end
+        end
+      end
+
+      class SchemaType < GraphQL::Introspection::SchemaType
+        include FieldVisibility
+      end
+
+      class TypeType < GraphQL::Introspection::TypeType
+        include FieldVisibility
+      end
+
+      class DirectiveType < GraphQL::Introspection::DirectiveType
+        include FieldVisibility
+      end
+
+      class DirectiveLocationEnum < GraphQL::Introspection::DirectiveLocationEnum
+        include FieldVisibility
+      end
+
+      class EnumValueType < GraphQL::Introspection::EnumValueType
+        include FieldVisibility
+      end
+
+      class FieldType < GraphQL::Introspection::FieldType
+        include FieldVisibility
+      end
+
+      class InputValueType < GraphQL::Introspection::InputValueType
+        include FieldVisibility
+      end
+
+      class TypeKindEnum < GraphQL::Introspection::TypeKindEnum
+        include FieldVisibility
+      end
+    end
+  end
+end
diff --git a/decidim-api/lib/decidim/api/query_type.rb b/decidim-api/lib/decidim/api/query_type.rb
index cbce0ddee80a3..e037fd3f9eb70 100644
--- a/decidim-api/lib/decidim/api/query_type.rb
+++ b/decidim-api/lib/decidim/api/query_type.rb
@@ -5,6 +5,97 @@ module Api
     # This type represents the root query type of the whole API.
     class QueryType < Decidim::Api::Types::BaseObject
       description "The root query of this schema"
+
+      field :component, Decidim::Core::ComponentInterface, null: true do
+        description "Lists the components this space contains."
+        argument :id, GraphQL::Types::ID, required: true, description: "The ID of the component to be found"
+      end
+      field :decidim, Core::DecidimType, "Decidim's framework properties.", null: true
+      field :moderated_users, type: [Decidim::Core::UserModerationType], null: true,
+                              description: "The moderated users for the current organization"
+      field :moderations, type: [Decidim::Core::ModerationType], null: true,
+                          description: "The moderation for the current organization"
+      field :organization, Core::OrganizationType, "The current organization", null: true
+      field :participant_details, type: Decidim::Core::ParticipantDetailsType, null: true do
+        description "Participant details visible to admin users only"
+        argument :id, GraphQL::Types::ID, "The ID of the participant", required: true
+        argument :nickname, GraphQL::Types::String, "The @nickname of the participant", required: false
+      end
+      field :session, Core::SessionType, description: "Return's information about the logged in user", null: true
+      field :static_page_topics, type: [Decidim::Core::StaticPageTopicType], null: true,
+                                 description: "The static page topics for the current organization"
+      field :static_pages, type: [Decidim::Core::StaticPageType], null: true,
+                           description: "The static pages for the current organization"
+      field :user,
+            type: Core::UserType, null: true,
+            description: "A participant (user or group) in the current organization" do
+        argument :id, GraphQL::Types::ID, "The ID of the participant", required: false
+        argument :nickname, GraphQL::Types::String, "The @nickname of the participant", required: false
+      end
+      field :users,
+            type: [Core::UserType], null: true,
+            description: "The participants (users or groups) for the current organization" do
+        argument :filter, Decidim::Core::UserEntityInputFilter, "Provides several methods to filter the results", required: false
+        argument :order, Decidim::Core::UserEntityInputSort, "Provides several methods to order the results", required: false
+      end
+
+      def component(id: {})
+        component = Decidim::Component.published.find_by(id:)
+        component&.organization == context[:current_organization] ? component : nil
+      end
+
+      def session
+        context[:current_user]
+      end
+
+      def decidim
+        Decidim
+      end
+
+      def organization
+        context[:current_organization]
+      end
+
+      def user(id: nil, nickname: nil)
+        Core::UserEntityFinder.new.call(object, { id:, nickname: }, context)
+      end
+
+      def users(filter: {}, order: {})
+        Core::UserEntityList.new.call(object, { filter:, order: }, context)
+      end
+
+      def participant_details(id: nil, nickname: nil)
+        participant = Decidim::Core::UserEntityFinder.new.call(object, { id:, nickname: }, context)
+        return nil unless participant
+
+        return nil unless Decidim::Core::ParticipantDetailsType.authorized?(participant, context)
+
+        Decidim::ActionLogger.log(
+          "read",
+          context[:current_user],
+          participant,
+          nil,
+          {}
+        )
+
+        participant
+      end
+
+      def static_pages
+        Decidim::StaticPage.accessible_for(organization, context[:current_user])
+      end
+
+      def static_page_topics
+        static_pages.collect(&:topic).uniq.compact_blank
+      end
+
+      def moderated_users
+        Decidim::UserModeration.joins(:user).where(decidim_users: { decidim_organization_id: organization&.id }).where.not(decidim_users: { blocked_at: nil })
+      end
+
+      def moderations
+        Decidim::Moderation.where(participatory_space: organization.participatory_spaces).includes(:reports).hidden
+      end
     end
   end
 end
diff --git a/decidim-api/lib/decidim/api/recursion_analyzer.rb b/decidim-api/lib/decidim/api/recursion_analyzer.rb
new file mode 100644
index 0000000000000..471c7a9b9c18b
--- /dev/null
+++ b/decidim-api/lib/decidim/api/recursion_analyzer.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+# This analyzer checks for too many recursions in GraphQL queries.
+# Copyright (c) GitLab B.V.
+# License: MIT Expat license
+# This content of the class was copied from the GitLab repository
+# @see https://gitlab.com/gitlab-org/gitlab/-/blob/f59f7aa0d86f07496e68abf7172edd703669e7bd/lib/gitlab/graphql/query_analyzers/ast/recursion_analyzer.rb
+# To which I have modified the result format to be compatible with decidim-api.
+
+module Decidim
+  module Api
+    class RecursionAnalyzer < GraphQL::Analysis::AST::Analyzer
+      IGNORED_FIELDS = %w(node edges nodes ofType).freeze
+      RECURSION_THRESHOLD = 2
+
+      def initialize(query)
+        super
+
+        @node_visits = {}
+        @recurring_fields = {}
+      end
+
+      def on_enter_field(node, _parent, visitor)
+        return if skip_node?(node, visitor)
+
+        node_name = node.name
+        node_visits[node_name] ||= 0
+        node_visits[node_name] += 1
+
+        times_encountered = @node_visits[node_name]
+        recurring_fields[node_name] = times_encountered if recursion_too_deep?(node_name, times_encountered)
+      end
+
+      # Visitors are all defined on the AST::Analyzer base class
+      # We override them for custom analyzers.
+      def on_leave_field(node, _parent, visitor)
+        return if skip_node?(node, visitor)
+
+        node_name = node.name
+        node_visits[node_name] ||= 0
+        node_visits[node_name] -= 1
+      end
+
+      def result
+        @recurring_fields = @recurring_fields.select { |k, v| recursion_too_deep?(k, v) }
+
+        Decidim::Api::Errors::RecursionLimitExceededError.new I18n.t("decidim.api.errors.recursion_limit_exceeded_error") if @recurring_fields.any?
+      end
+
+      private
+
+      attr_reader :node_visits, :recurring_fields
+
+      def recursion_too_deep?(node_name, times_encountered)
+        return false if IGNORED_FIELDS.include?(node_name)
+
+        times_encountered > recursion_threshold
+      end
+
+      def skip_node?(node, visitor)
+        # We do not want to count skipped fields or fields
+        # inside fragment definitions
+        return false if visitor.skipping? || visitor.visiting_fragment_definition?
+
+        !node.is_a?(GraphQL::Language::Nodes::Field) || node.selections.empty?
+      end
+
+      # Separated into a method to allow overriding or customization of the recursion limit.
+      def recursion_threshold
+        RECURSION_THRESHOLD
+      end
+    end
+  end
+end
diff --git a/decidim-api/lib/decidim/api/schema.rb b/decidim-api/lib/decidim/api/schema.rb
index 8a0905419bece..1bed442722f2a 100644
--- a/decidim-api/lib/decidim/api/schema.rb
+++ b/decidim-api/lib/decidim/api/schema.rb
@@ -7,11 +7,41 @@ class Schema < GraphQL::Schema
       mutation(MutationType)
       query(QueryType)
 
+      introspection(IntrospectionAnalyzer)
+      query_analyzer RecursionAnalyzer
+      query_analyzer AliasAnalyzer
+
       default_max_page_size Decidim::Api.schema_max_per_page
       max_depth Decidim::Api.schema_max_depth
       max_complexity Decidim::Api.schema_max_complexity
 
       orphan_types(Api.orphan_types)
+
+      def self.unauthorized_object(error)
+        # Add a top-level error to the response instead of returning nil:
+        raise Decidim::Api::Errors::UnauthorizedObjectError, I18n.t("decidim.api.errors.unauthorized_object", type: error.type.graphql_name)
+      end
+
+      def self.unauthorized_field(error)
+        # Add a top-level error to the response instead of returning nil:
+        raise Decidim::Api::Errors::UnauthorizedFieldError, I18n.t("decidim.api.errors.unauthorized_field", type: error.type.graphql_name, field: error.field.graphql_name)
+      end
+
+      rescue_from(ActiveRecord::RecordNotFound) do |_err, _obj, _args, _ctx, field|
+        raise Decidim::Api::Errors::NotFoundError, I18n.t("decidim.api.errors.not_found", type: field.type.unwrap.graphql_name)
+      end
+
+      rescue_from(Decidim::PermissionAction::PermissionNotSetError) do |_err, _obj, _args, _ctx, field|
+        raise Decidim::Api::Errors::PermissionNotSetError, I18n.t("decidim.api.errors.permission_not_set", type: field.type.unwrap.graphql_name)
+      end
+
+      rescue_from(I18n::InvalidLocale) do |_err, _obj, _args, _ctx, _field|
+        raise Decidim::Api::Errors::InvalidLocaleError, I18n.t("decidim.api.errors.invalid_locale")
+      end
+
+      rescue_from(I18n::ArgumentError) do |err, _obj, _args, _ctx, _field|
+        raise Decidim::Api::Errors::LocaleError, I18n.t("decidim.api.errors.locale_argument_error", message: err.message)
+      end
     end
   end
 end
diff --git a/decidim-api/lib/decidim/api/test.rb b/decidim-api/lib/decidim/api/test.rb
index 580923a1dff95..e7c57f0b3f470 100644
--- a/decidim-api/lib/decidim/api/test.rb
+++ b/decidim-api/lib/decidim/api/test.rb
@@ -22,4 +22,5 @@
 require "decidim/api/test/shared_examples/taxonomizable_interface_examples"
 require "decidim/api/test/shared_examples/timestamps_interface_examples"
 require "decidim/api/test/shared_examples/traceable_interface_examples"
+require "decidim/api/test/shared_examples/mutation_context"
 require "decidim/api/test/type_context"
diff --git a/decidim-api/lib/decidim/api/test/component_context.rb b/decidim-api/lib/decidim/api/test/component_context.rb
index dd1ce779078b6..9a4b389b35342 100644
--- a/decidim-api/lib/decidim/api/test/component_context.rb
+++ b/decidim-api/lib/decidim/api/test/component_context.rb
@@ -2,6 +2,7 @@
 
 shared_context "with a graphql decidim component" do
   include_context "with a graphql class type"
+  include_examples "when the introspection is disabled"
 
   let(:schema) { Decidim::Api::Schema }
 
@@ -42,25 +43,33 @@
   end
 end
 
-shared_examples "with resource visibility" do
-  let(:process_space_factory) { :participatory_process }
+shared_examples "graphQL not found space" do
   let(:space_type) { "participatoryProcess" }
 
-  shared_examples "graphQL visible resource" do
-    it "is visible" do
-      expect(response[space_type]["components"].first[lookout_key]).to eq(query_result)
-    end
+  it "should not be visible" do
+    expect { response }.to raise_error(Decidim::Api::Errors::NotFoundError, "#{space_type.classify} not found")
   end
+end
 
-  shared_examples "graphQL hidden space" do
-    it "should not be visible" do
-      expect(response[space_type]).to be_nil
+shared_examples "with resource visibility" do
+  let(:process_space_factory) { :participatory_process }
+  let(:space_type) { "participatoryProcess" }
+
+  shared_examples "graphQL visible resource" do |visible: true|
+    if visible
+      it "should be visible" do
+        expect(response[space_type]["components"].first[lookout_key]).to eq(query_result)
+      end
+    else
+      it "should not be visible" do
+        expect(response[space_type]["components"]).to be_empty
+      end
     end
   end
 
   shared_examples "graphQL hidden component" do
     it "should not be visible" do
-      expect(response[space_type]["components"].first).to be_nil
+      expect(response[space_type]["components"]).to be_empty
     end
   end
 
@@ -75,7 +84,7 @@
   shared_examples "graphQL space hidden to visitor" do
     context "when user is visitor" do
       let!(:current_user) { nil }
-      it_behaves_like "graphQL hidden space"
+      it_behaves_like "graphQL not found space"
     end
   end
 
@@ -118,13 +127,13 @@
 
       context "when user is member" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
-        let!(:participatory_space_private_user) { create(:participatory_space_private_user, user: current_user, privatable_to: participatory_process) }
+        let!(:member) { create(:member, user: current_user, participatory_space: participatory_process) }
         it_behaves_like "graphQL visible resource"
       end
 
       context "when user is member" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
-        let!(:participatory_space_private_user) { create(:participatory_space_private_user, user: current_user, privatable_to: participatory_process) }
+        let!(:member) { create(:member, user: current_user, participatory_space: participatory_process) }
         it_behaves_like "graphQL visible resource"
       end
 
@@ -142,7 +151,7 @@
       context "when the user is space admin" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
         let!(:role) { create(:participatory_process_user_role, participatory_process:, user: current_user, role: "admin") }
-        it_behaves_like "graphQL visible resource"
+        it_behaves_like "graphQL visible resource", visible: false
       end
 
       context "when the user is space collaborator" do
@@ -160,7 +169,7 @@
       context "when the user is space evaluator" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
         let!(:role) { create(:participatory_process_user_role, participatory_process:, user: current_user, role: "evaluator") }
-        it_behaves_like "graphQL visible resource"
+        it_behaves_like "graphQL visible resource", visible: false
       end
 
       context "when user is visitor" do
@@ -176,7 +185,7 @@
 
       context "when user is member" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
-        let!(:participatory_space_private_user) { create(:participatory_space_private_user, user: current_user, privatable_to: participatory_process) }
+        let!(:member) { create(:member, user: current_user, participatory_space: participatory_process) }
         it_behaves_like "graphQL hidden component"
       end
     end
@@ -240,7 +249,7 @@
 
       context "when user is member" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
-        let!(:participatory_space_private_user) { create(:assembly_private_user, user: current_user, privatable_to: participatory_process) }
+        let!(:member) { create(:assembly_member, user: current_user, participatory_space: participatory_process) }
         it_behaves_like "graphQL visible resource"
       end
 
@@ -258,13 +267,13 @@
       context "when the user is space admin" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
         let!(:role) { create(:assembly_user_role, assembly: participatory_process, user: current_user, role: "admin") }
-        it_behaves_like "graphQL visible resource"
+        it_behaves_like "graphQL visible resource", visible: false
       end
 
       context "when the user is space collaborator" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
         let!(:role) { create(:assembly_user_role, assembly: participatory_process, user: current_user, role: "collaborator") }
-        it_behaves_like "graphQL visible resource"
+        it_behaves_like "graphQL visible resource", visible: false
       end
 
       context "when the user is space moderator" do
@@ -276,7 +285,7 @@
       context "when the user is space evaluator" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
         let!(:role) { create(:assembly_user_role, assembly: participatory_process, user: current_user, role: "evaluator") }
-        it_behaves_like "graphQL visible resource"
+        it_behaves_like "graphQL visible resource", visible: false
       end
 
       context "when user is visitor" do
@@ -291,7 +300,7 @@
 
       context "when user is member" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
-        let!(:participatory_space_private_user) { create(:assembly_private_user, user: current_user, privatable_to: participatory_process) }
+        let!(:member) { create(:assembly_member, user: current_user, participatory_space: participatory_process) }
         it_behaves_like "graphQL hidden component"
       end
     end
@@ -308,38 +317,38 @@
       context "when the user is space admin" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
         let!(:role) { create(:participatory_process_user_role, participatory_process:, user: current_user, role: "admin") }
-        it_behaves_like "graphQL hidden space"
+        it_behaves_like "graphQL not found space"
       end
 
       context "when the user is space collaborator" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
         let!(:role) { create(:participatory_process_user_role, participatory_process:, user: current_user, role: "collaborator") }
-        it_behaves_like "graphQL hidden space"
+        it_behaves_like "graphQL not found space"
       end
 
       context "when the user is space moderator" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
         let!(:role) { create(:participatory_process_user_role, participatory_process:, user: current_user, role: "moderator") }
 
-        it_behaves_like "graphQL hidden space"
+        it_behaves_like "graphQL not found space"
       end
 
       context "when the user is space evaluator" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
         let!(:role) { create(:participatory_process_user_role, participatory_process:, user: current_user, role: "evaluator") }
-        it_behaves_like "graphQL hidden space"
+        it_behaves_like "graphQL not found space"
       end
 
       it_behaves_like "graphQL space hidden to visitor"
 
       context "when user is normal user" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
-        it_behaves_like "graphQL hidden space"
+        it_behaves_like "graphQL not found space"
       end
 
       context "when user is member" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
-        let!(:participatory_space_private_user) { create(:participatory_space_private_user, user: current_user, privatable_to: participatory_process) }
+        let!(:member) { create(:member, user: current_user, participatory_space: participatory_process) }
         it_behaves_like "graphQL visible resource"
       end
     end
@@ -352,36 +361,36 @@
       context "when the user is space admin" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
         let!(:role) { create(:participatory_process_user_role, participatory_process:, user: current_user, role: "admin") }
-        it_behaves_like "graphQL hidden space"
+        it_behaves_like "graphQL not found space"
       end
 
       context "when the user is space collaborator" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
         let!(:role) { create(:participatory_process_user_role, participatory_process:, user: current_user, role: "collaborator") }
-        it_behaves_like "graphQL hidden space"
+        it_behaves_like "graphQL not found space"
       end
 
       context "when the user is space moderator" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
         let!(:role) { create(:participatory_process_user_role, participatory_process:, user: current_user, role: "moderator") }
-        it_behaves_like "graphQL hidden space"
+        it_behaves_like "graphQL not found space"
       end
 
       context "when the user is space evaluator" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
         let!(:role) { create(:participatory_process_user_role, participatory_process:, user: current_user, role: "evaluator") }
-        it_behaves_like "graphQL hidden space"
+        it_behaves_like "graphQL not found space"
       end
       it_behaves_like "graphQL space hidden to visitor"
 
       context "when user is member" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
-        let!(:participatory_space_private_user) { create(:participatory_space_private_user, user: current_user, privatable_to: participatory_process) }
+        let!(:member) { create(:member, user: current_user, participatory_space: participatory_process) }
         it_behaves_like "graphQL hidden component"
       end
       context "when user is normal user" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
-        it_behaves_like "graphQL hidden space"
+        it_behaves_like "graphQL not found space"
       end
     end
   end
@@ -397,38 +406,38 @@
       context "when the user is space admin" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
         let!(:role) { create(:participatory_process_user_role, participatory_process:, user: current_user, role: "admin") }
-        it_behaves_like "graphQL hidden space"
+        it_behaves_like "graphQL not found space"
       end
 
       context "when the user is space collaborator" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
         let!(:role) { create(:participatory_process_user_role, participatory_process:, user: current_user, role: "collaborator") }
-        it_behaves_like "graphQL hidden space"
+        it_behaves_like "graphQL not found space"
       end
 
       context "when the user is space moderator" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
         let!(:role) { create(:participatory_process_user_role, participatory_process:, user: current_user, role: "moderator") }
-        it_behaves_like "graphQL hidden space"
+        it_behaves_like "graphQL not found space"
       end
 
       context "when the user is space evaluator" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
         let!(:role) { create(:participatory_process_user_role, participatory_process:, user: current_user, role: "evaluator") }
-        it_behaves_like "graphQL hidden space"
+        it_behaves_like "graphQL not found space"
       end
 
       it_behaves_like "graphQL space hidden to visitor"
 
       context "when user is member" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
-        let!(:participatory_space_private_user) { create(:participatory_space_private_user, user: current_user, privatable_to: participatory_process) }
-        it_behaves_like "graphQL hidden space"
+        let!(:member) { create(:member, user: current_user, participatory_space: participatory_process) }
+        it_behaves_like "graphQL not found space"
       end
 
       context "when user is normal user" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
-        it_behaves_like "graphQL hidden space"
+        it_behaves_like "graphQL not found space"
       end
     end
 
@@ -440,38 +449,38 @@
       context "when the user is space admin" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
         let!(:role) { create(:participatory_process_user_role, participatory_process:, user: current_user, role: "admin") }
-        it_behaves_like "graphQL hidden space"
+        it_behaves_like "graphQL not found space"
       end
 
       context "when the user is space collaborator" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
         let!(:role) { create(:participatory_process_user_role, participatory_process:, user: current_user, role: "collaborator") }
-        it_behaves_like "graphQL hidden space"
+        it_behaves_like "graphQL not found space"
       end
 
       context "when the user is space moderator" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
         let!(:role) { create(:participatory_process_user_role, participatory_process:, user: current_user, role: "moderator") }
-        it_behaves_like "graphQL hidden space"
+        it_behaves_like "graphQL not found space"
       end
 
       context "when the user is space evaluator" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
         let!(:role) { create(:participatory_process_user_role, participatory_process:, user: current_user, role: "evaluator") }
-        it_behaves_like "graphQL hidden space"
+        it_behaves_like "graphQL not found space"
       end
       it_behaves_like "graphQL space hidden to visitor"
 
       context "when user is member" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
-        let!(:participatory_space_private_user) { create(:participatory_space_private_user, user: current_user, privatable_to: participatory_process) }
-        it_behaves_like "graphQL hidden space"
+        let!(:member) { create(:member, user: current_user, participatory_space: participatory_process) }
+        it_behaves_like "graphQL not found space"
       end
 
       context "when user is normal user" do
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
 
-        it_behaves_like "graphQL hidden space"
+        it_behaves_like "graphQL not found space"
       end
     end
   end
diff --git a/decidim-api/lib/decidim/api/test/mutation_context.rb b/decidim-api/lib/decidim/api/test/shared_examples/mutation_context.rb
similarity index 100%
rename from decidim-api/lib/decidim/api/test/mutation_context.rb
rename to decidim-api/lib/decidim/api/test/shared_examples/mutation_context.rb
diff --git a/decidim-api/lib/decidim/api/test/type_context.rb b/decidim-api/lib/decidim/api/test/type_context.rb
index dd1b52c7ddf7d..a25a4806733ad 100644
--- a/decidim-api/lib/decidim/api/test/type_context.rb
+++ b/decidim-api/lib/decidim/api/test/type_context.rb
@@ -15,6 +15,7 @@
   let(:type_class) { described_class }
   let(:variables) { {} }
   let(:root_value) { model }
+  let(:can_introspect) { Decidim::Api.enable_anonymous_introspection || current_user&.admin? }
 
   let(:schema) do
     klass = type_class
@@ -28,6 +29,29 @@
     execute_query query, variables.stringify_keys
   end
 
+  def raise_proper_error(error)
+    code = error.dig("extensions", "code")
+
+    # Matches the error code with the Error class
+    # For instance, if the error code is NOT_FOUND_ERROR then it will raise the "Decidim::Api::Errors::NotFoundError" class
+    raise "Decidim::Api::Errors::#{code.downcase.classify}".constantize, error["message"] if %w(
+      LOCALE_ERROR
+      NOT_FOUND_ERROR
+      INVALID_LOCALE_ERROR
+      PERMISSION_NOT_SET_ERROR
+      ATTRIBUTE_VALIDATION_ERROR
+      UNAUTHORIZED_FIELD_ERROR
+      UNAUTHORIZED_OBJECT_ERROR
+      MUTATION_NOT_AUTHORIZED_ERROR
+      VALIDATION_ERROR
+      TOO_MANY_ALIASES_ERROR
+      INTROSPECTION_DISABLED_ERROR
+      RECURSION_LIMIT_EXCEEDED_ERROR
+    ).include?(code)
+
+    raise GraphQL::ExecutionError, error["message"]
+  end
+
   def execute_query(query, variables)
     result = schema.execute(
       query,
@@ -36,17 +60,93 @@ def execute_query(query, variables)
         current_organization:,
         current_user:,
         current_component:,
-        scopes: api_scopes
+        scopes: api_scopes,
+        can_introspect:
       },
       variables:
     )
 
-    raise StandardError, result["errors"].map { |e| e["message"] }.join(", ") if result["errors"]
+    raise_proper_error(result["errors"].first) if result["errors"]
 
     result["data"]
   end
 end
 
+shared_examples "when the introspection is disabled" do
+  shared_examples "check introspection behavior" do
+    context "and the user is not authenticated" do
+      let!(:current_user) { nil }
+
+      it "raises an Decidim::Api::Errors::IntrospectionDisabledError" do
+        expect { response }.to raise_error(Decidim::Api::Errors::IntrospectionDisabledError, "Introspection is disabled for this request")
+      end
+    end
+
+    context "and the user is not an admin" do
+      let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
+
+      it "raises an Decidim::Api::Errors::IntrospectionDisabledError" do
+        expect { response }.to raise_error(Decidim::Api::Errors::IntrospectionDisabledError, "Introspection is disabled for this request")
+      end
+    end
+
+    context "and the user is an admin" do
+      let!(:current_user) { create(:user, :confirmed, :admin, organization: current_organization) }
+
+      it "runs successfully" do
+        expect { response }.not_to raise_error
+      end
+    end
+
+    context "and the setting is true" do
+      before do
+        allow(Decidim::Api).to receive(:enable_anonymous_introspection).and_return(true)
+      end
+
+      it "runs successfully" do
+        expect { response }.not_to raise_error
+      end
+    end
+
+    context "and the setting is false" do
+      before do
+        allow(Decidim::Api).to receive(:enable_anonymous_introspection).and_return(false)
+      end
+      it "raises an Decidim::Api::Errors::IntrospectionDisabledError" do
+        expect { response }.to raise_error(Decidim::Api::Errors::IntrospectionDisabledError, "Introspection is disabled for this request")
+      end
+    end
+  end
+
+  context "when requesting the schema introspection" do
+    let(:query) do
+      %( query { __schema { types { fields { type { fields { type { name } } } } } } } )
+    end
+
+    it_behaves_like "check introspection behavior"
+  end
+
+  context "when requesting the type introspection" do
+    let(:query) do
+      %( query CircularIntrospection {
+  __type(name: "User") {
+    fields {
+      type {
+        fields {
+          type {
+            name
+          }
+        }
+      }
+    }
+  }
+} )
+    end
+
+    it_behaves_like "check introspection behavior"
+  end
+end
+
 shared_context "with a graphql scalar class type" do
   include_context "with a graphql class type"
 
diff --git a/decidim-api/lib/decidim/api/types.rb b/decidim-api/lib/decidim/api/types.rb
index d179b78ccf7bc..74e5e0e9cd0d6 100644
--- a/decidim-api/lib/decidim/api/types.rb
+++ b/decidim-api/lib/decidim/api/types.rb
@@ -2,6 +2,9 @@
 
 module Decidim
   module Api
+    autoload :IntrospectionAnalyzer, "decidim/api/introspection_analyzer"
+    autoload :AliasAnalyzer, "decidim/api/alias_analyzer"
+    autoload :RecursionAnalyzer, "decidim/api/recursion_analyzer"
     autoload :QueryType, "decidim/api/query_type"
     autoload :MutationType, "decidim/api/mutation_type"
     autoload :Schema, "decidim/api/schema"
@@ -9,6 +12,21 @@ module Api
     autoload :GraphqlPermissions, "decidim/api/graphql_permissions"
     autoload :ComponentMutationType, "decidim/api/component_mutation_type"
 
+    module Errors
+      autoload :IntrospectionDisabledError, "decidim/api/errors/introspection_disabled_error"
+      autoload :LocaleError, "decidim/api/errors/locale_error"
+      autoload :TooManyAliasesError, "decidim/api/errors/too_many_aliases_error"
+      autoload :InvalidLocaleError, "decidim/api/errors/invalid_locale_error"
+      autoload :AttributeValidationError, "decidim/api/errors/attribute_validation_error"
+      autoload :MutationNotAuthorizedError, "decidim/api/errors/mutation_not_authorized_error"
+      autoload :NotFoundError, "decidim/api/errors/not_found_error"
+      autoload :PermissionNotSetError, "decidim/api/errors/permission_not_set_error"
+      autoload :UnauthorizedFieldError, "decidim/api/errors/unauthorized_field_error"
+      autoload :UnauthorizedObjectError, "decidim/api/errors/unauthorized_object_error"
+      autoload :ValidationError, "decidim/api/errors/validation_error"
+      autoload :RecursionLimitExceededError, "decidim/api/errors/recursion_limit_exceeded_error"
+    end
+
     module Types
       autoload :BaseArgument, "decidim/api/types/base_argument"
       autoload :BaseEnum, "decidim/api/types/base_enum"
diff --git a/decidim-api/lib/decidim/api/types/base_mutation.rb b/decidim-api/lib/decidim/api/types/base_mutation.rb
index 2a0d2a44588b3..a6970dc53dc04 100644
--- a/decidim-api/lib/decidim/api/types/base_mutation.rb
+++ b/decidim-api/lib/decidim/api/types/base_mutation.rb
@@ -5,12 +5,40 @@ module Api
     module Types
       class BaseMutation < GraphQL::Schema::RelayClassicMutation
         include Decidim::Api::GraphqlPermissions
+        include Decidim::FormFactory
 
         object_class BaseObject
         field_class Types::BaseField
         input_object_class BaseInputObject
 
         required_scopes "api:read", "api:write"
+
+        def set_locale(locale:, toggle_translations:)
+          raise I18n::InvalidLocale, "#{locale} is not a valid locale" unless available_locales.include?(locale)
+
+          I18n.locale = locale.presence
+          RequestStore.store[:toggle_machine_translations] = toggle_translations
+        end
+
+        def current_user
+          context[:current_user]
+        end
+
+        def current_component
+          context[:current_component]
+        end
+
+        def current_organization
+          context[:current_organization]
+        end
+
+        def available_locales
+          if current_organization.present?
+            current_organization.available_locales
+          else
+            I18n.available_locales.map(&:to_s)
+          end
+        end
       end
     end
   end
diff --git a/decidim-api/lib/decidim/api/types/base_object.rb b/decidim-api/lib/decidim/api/types/base_object.rb
index 96214353c8fd3..4fc315f8265af 100644
--- a/decidim-api/lib/decidim/api/types/base_object.rb
+++ b/decidim-api/lib/decidim/api/types/base_object.rb
@@ -10,6 +10,18 @@ class BaseObject < GraphQL::Schema::Object
         field_class Types::BaseField
 
         required_scopes "api:read"
+
+        def current_user
+          context[:current_user]
+        end
+
+        def current_component
+          context[:current_component]
+        end
+
+        def current_organization
+          context[:current_organization]
+        end
       end
     end
   end
diff --git a/decidim-api/spec/controllers/decidim/api/sessions_controller_spec.rb b/decidim-api/spec/controllers/decidim/api/sessions_controller_spec.rb
index 3487fa3dbd5a4..67c555669644c 100644
--- a/decidim-api/spec/controllers/decidim/api/sessions_controller_spec.rb
+++ b/decidim-api/spec/controllers/decidim/api/sessions_controller_spec.rb
@@ -9,7 +9,7 @@
   let(:organization) { create(:organization) }
   let(:api_key) { "user_key" }
   let(:api_secret) { "decidim123456789" }
-  let!(:user) { create(:api_user, organization: organization, api_key: api_key, api_secret: api_secret) }
+  let!(:user) { create(:api_user, organization:, api_key:, api_secret:) }
   let(:params) do
     {
       api_user: {
@@ -36,7 +36,7 @@
   describe "sign in" do
     it "returns JWT token when credentials are valid" do
       expect(request.env[Warden::JWTAuth::Hooks::PREPARED_TOKEN_ENV_KEY]).not_to be_present
-      post :create, params: params
+      post(:create, params:)
       expect(response).to have_http_status(:ok)
       token = request.env[Warden::JWTAuth::Hooks::PREPARED_TOKEN_ENV_KEY]
       expect(token).to be_present
@@ -53,7 +53,7 @@
 
     it "renders resource without JWT token in body when `Tokendispatcher::ENV_KEY` is nil" do
       request.env[Warden::JWTAuth::Middleware::TokenDispatcher::ENV_KEY] = nil
-      post :create, params: params
+      post(:create, params:)
       expect(request.env[Warden::JWTAuth::Hooks::PREPARED_TOKEN_ENV_KEY]).to be_present
       parsed_response_body = JSON.parse(response.body)
       expect(parsed_response_body.has_key?("jwt_token")).to be(false)
diff --git a/decidim-api/spec/controllers/queries_controller_spec.rb b/decidim-api/spec/controllers/queries_controller_spec.rb
index c872dce37154c..d2c2eb65fbf3a 100644
--- a/decidim-api/spec/controllers/queries_controller_spec.rb
+++ b/decidim-api/spec/controllers/queries_controller_spec.rb
@@ -29,10 +29,10 @@ module Api
       end
 
       it "executes a query" do
-        post :create, params: { query: "{ __schema { queryType { name } } }" }
+        post :create, params: { query: "{ organization { name { translations { locale text } } } }" }
 
         parsed_response = JSON.parse(response.body)["data"]
-        expect(parsed_response["__schema"]["queryType"]["name"]).to eq("Query")
+        expect(parsed_response["organization"]["name"]["translations"]).to include("locale" => "en", "text" => translated(organization.name))
       end
 
       context "with force sign in enabled" do
diff --git a/decidim-api/spec/lib/decidim/api/errors/attribute_validation_error_spec.rb b/decidim-api/spec/lib/decidim/api/errors/attribute_validation_error_spec.rb
new file mode 100644
index 0000000000000..c57f2155c3a23
--- /dev/null
+++ b/decidim-api/spec/lib/decidim/api/errors/attribute_validation_error_spec.rb
@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "active_model"
+
+module Decidim
+  module Api
+    module Errors
+      describe AttributeValidationError do
+        subject { described_class.new(messages) }
+        let(:messages) { [] }
+
+        context "when initialized with an Array of hashes" do
+          let(:messages) do
+            [
+              {
+                path: %w(attributes body),
+                message: "is too short (under 15 characters)"
+              },
+              {
+                path: %w(attributes title),
+                message: "is too long"
+              }
+            ]
+          end
+
+          describe "#to_h" do
+            it { expect(subject.to_h).to include("extensions" => { "code" => "ATTRIBUTE_VALIDATION_ERROR" }) }
+            it { expect(subject.to_h).to include("message" => messages) }
+          end
+
+          describe "#message" do
+            it { expect(subject.message).to eq("body: is too short (under 15 characters), title: is too long") }
+          end
+        end
+
+        context "when initialized with ActiveModel::Errors" do
+          let(:dummy_model_class) do
+            Class.new do
+              include ActiveModel::Model
+
+              attr_accessor :body, :title
+
+              validates :body, presence: true
+              validates :title, presence: true
+
+              def self.name
+                "DummyModel"
+              end
+            end
+          end
+          let(:messages) do
+            model = dummy_model_class.new
+            model.errors.add(:body, :too_short, count: 15)
+            model.errors.add(:title, :too_long, count: 1)
+            model.errors
+          end
+
+          describe "#to_h" do
+            it { expect(subject.to_h).to include("extensions" => { "code" => "ATTRIBUTE_VALIDATION_ERROR" }) }
+
+            it {
+              expect(subject.to_h).to include("message" => [
+                                                {
+                                                  path: %w(attributes body),
+                                                  message: "is too short (under 15 characters)"
+                                                },
+                                                {
+                                                  path: %w(attributes title),
+                                                  message: "is too long (maximum is 1 character)"
+                                                }
+                                              ])
+            }
+          end
+
+          describe "#message" do
+            it { expect(subject.message).to include("is too short (under 15 characters)") }
+            it { expect(subject.message).to include("is too long") }
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/lib/query_extensions_spec.rb b/decidim-api/spec/lib/decidim/api/query_type_spec.rb
similarity index 99%
rename from decidim-core/spec/lib/query_extensions_spec.rb
rename to decidim-api/spec/lib/decidim/api/query_type_spec.rb
index e271e2ed17746..de9e300ba03eb 100644
--- a/decidim-core/spec/lib/query_extensions_spec.rb
+++ b/decidim-api/spec/lib/decidim/api/query_type_spec.rb
@@ -4,8 +4,8 @@
 require "decidim/api/test"
 
 module Decidim
-  module Core
-    describe Decidim::Api::QueryType do
+  module Api
+    describe QueryType do
       include_context "with a graphql class type"
 
       describe "component" do
diff --git a/decidim-api/spec/lib/decidim/api/recursion_analyzer_spec.rb b/decidim-api/spec/lib/decidim/api/recursion_analyzer_spec.rb
new file mode 100644
index 0000000000000..33e8f3595c7e1
--- /dev/null
+++ b/decidim-api/spec/lib/decidim/api/recursion_analyzer_spec.rb
@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "decidim/api/test"
+
+module Decidim
+  module Api
+    module FooBar
+      class DummyModel
+        def initialize(id)
+          @id = id
+        end
+
+        attr_reader :id
+
+        def child
+          self.class.new(id + 1)
+        end
+
+        def parent
+          self.class.new(id + 1)
+        end
+      end
+
+      class DummyType < GraphQL::Schema::Object
+        description "Dummy type"
+        field :child, ::Decidim::Api::FooBar::DummyType, "Dummy child field"
+        field :id, Integer, "Dummy ID", null: false
+        field :parent, ::Decidim::Api::FooBar::DummyType, "Dummy parent field"
+      end
+
+      class Query < GraphQL::Schema::Object
+        description "The query root of this schema"
+        field :parent, ::Decidim::Api::FooBar::DummyType, "Dummy field", null: false
+
+        def parent
+          DummyModel.new(0)
+        end
+      end
+    end
+
+    describe RecursionAnalyzer do
+      include_context "with a graphql class type" do
+        let(:schema) do
+          Class.new(GraphQL::Schema) do
+            query ::Decidim::Api::FooBar::Query
+            query_analyzer Decidim::Api::RecursionAnalyzer
+          end
+        end
+      end
+
+      let(:model) do
+        Decidim::Api::FooBar::DummyModel
+      end
+
+      context "when a recursion is detected" do
+        let!(:query) do
+          %(
+            query {
+              parent { child { parent { child { parent { child { id } } } } } }
+            }
+          )
+        end
+
+        it "raises an error" do
+          expect { response }.to raise_error(Decidim::Api::Errors::RecursionLimitExceededError)
+        end
+      end
+
+      context "when a recursion is not detected" do
+        let!(:query) do
+          %(
+            query {
+              parent { child { parent { child { id } } } }
+            }
+          )
+        end
+
+        it "raises an error" do
+          expect { response }.not_to raise_error
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-api/spec/lib/decidim/api/schema_spec.rb b/decidim-api/spec/lib/decidim/api/schema_spec.rb
new file mode 100644
index 0000000000000..52be74e9e4b8a
--- /dev/null
+++ b/decidim-api/spec/lib/decidim/api/schema_spec.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "decidim/api/test"
+
+module Decidim
+  module Api
+    describe Schema do
+      include_context "with a graphql class type"
+      let(:type_class) { Decidim::Api::QueryType }
+
+      context "when restricting number of aliases" do
+        let!(:query) do
+          %({
+          invalidAlias0 : __typename
+          invalidAlias1 : __typename
+          invalidAlias2 : __typename
+          invalidAlias3 : __typename
+          invalidAlias4 : __typename
+          invalidAlias5 : __typename
+        })
+        end
+
+        it "raises an error" do
+          expect { response }.to raise_error(Errors::TooManyAliasesError, "Too many aliases used. You have used 6 aliases, but 5 are allowed.")
+        end
+
+        context "when using a custom value" do
+          around do |example|
+            aliases = Decidim::Api.max_aliases
+
+            # 5 is the default value, we have 6 aliases in the above query definition, and we just set a higher number
+            Decidim::Api.max_aliases = 10
+            example.run
+
+            Decidim::Api.max_aliases = aliases
+          end
+
+          it "runs successfully" do
+            expect(response).to include("invalidAlias0" => "Query")
+          end
+        end
+      end
+
+      context "when allowing number of aliases" do
+        let!(:query) do
+          %({
+          invalidAlias0 : __typename
+          invalidAlias1 : __typename
+          invalidAlias2 : __typename
+          invalidAlias3 : __typename
+          invalidAlias4 : __typename
+        })
+        end
+
+        it "runs successfully" do
+          expect(response).to include("invalidAlias0" => "Query")
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-api/spec/requests/apiauth_spec.rb b/decidim-api/spec/requests/apiauth_spec.rb
index a742445a9bb0b..98a47d99ffd13 100644
--- a/decidim-api/spec/requests/apiauth_spec.rb
+++ b/decidim-api/spec/requests/apiauth_spec.rb
@@ -15,12 +15,12 @@
   context "with api user" do
     let(:key) { "dummykey123456" }
     let(:secret) { "decidim123456789" }
-    let!(:user) { create(:api_user, organization: organization, api_key: key, api_secret: secret) }
+    let!(:user) { create(:api_user, organization:, api_key: key, api_secret: secret) }
     let(:params) do
       {
         api_user: {
-          key: key,
-          secret: secret
+          key:,
+          secret:
         }
       }
     end
@@ -35,7 +35,7 @@
     end
 
     it "signs in" do
-      post sign_in_path, params: params
+      post(sign_in_path, params:)
       expect(response.headers["Authorization"]).to be_present
       expect(response.body["jwt_token"]).to be_present
       parsed_response_body = JSON.parse(response.body)
@@ -51,7 +51,7 @@
     end
 
     it "signs out" do
-      post sign_in_path, params: params
+      post(sign_in_path, params:)
       expect(response).to have_http_status(:ok)
       authorization = response.headers["Authorization"]
       original_count = Decidim::Api::JwtDenylist.count
@@ -61,7 +61,7 @@
 
     context "when signed in" do
       before do
-        post sign_in_path, params: params
+        post sign_in_path, params:
       end
 
       it "can use token to post to api" do
@@ -78,7 +78,7 @@
 
     context "when not signed in" do
       it "does not return session details" do
-        post "/api", params: { query: query }
+        post "/api", params: { query: }
         parsed_response = JSON.parse(response.body)
         expect(parsed_response).to match("data" => { "session" => nil })
       end
@@ -87,7 +87,7 @@
 
   context "with normal user" do
     let(:password) { "decidim123456789" }
-    let!(:user) { create(:user, :confirmed, organization: organization, password:) }
+    let!(:user) { create(:user, :confirmed, organization:, password:) }
     let(:params) do
       {
         user: {
@@ -98,7 +98,7 @@
     end
 
     it "does not authenticate user" do
-      post sign_in_path, params: params
+      post(sign_in_path, params:)
 
       parsed_response = JSON.parse(response.body)
       anonymized_key = parsed_response["api_key"]
diff --git a/decidim-assemblies/app/cells/decidim/assemblies/assembly_dropdown_metadata_cell.rb b/decidim-assemblies/app/cells/decidim/assemblies/assembly_dropdown_metadata_cell.rb
deleted file mode 100644
index cbc110438f66a..0000000000000
--- a/decidim-assemblies/app/cells/decidim/assemblies/assembly_dropdown_metadata_cell.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    class AssemblyDropdownMetadataCell < Decidim::ParticipatorySpaceDropdownMetadataCell
-      include AssembliesHelper
-      include Decidim::ComponentPathHelper
-      include ActiveLinkTo
-
-      def decidim_assemblies
-        Decidim::Assemblies::Engine.routes.url_helpers
-      end
-
-      private
-
-      def nav_items_method = :assembly_nav_items
-    end
-  end
-end
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
index d201fe1f641ac..52cb80784de57 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
@@ -14,7 +14,7 @@ class CreateAssembly < Decidim::Commands::CreateResource
                               :participatory_structure, :meta_scope, :purpose_of_action,
                               :composition, :creation_date, :created_by, :created_by_other,
                               :duration, :included_at, :closing_date, :closing_date_reason, :internal_organisation,
-                              :is_transparent, :special_features, :twitter_handler, :facebook_handler,
+                              :has_members, :is_transparent, :special_features, :twitter_handler, :facebook_handler,
                               :instagram_handler, :youtube_handler, :github_handler
 
         protected
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
index c44489b8d440d..ed8eef471e827 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
@@ -13,7 +13,7 @@ class UpdateAssembly < Decidim::Commands::UpdateResource
                               :target, :participatory_scope, :participatory_structure, :meta_scope,
                               :purpose_of_action, :composition, :creation_date, :created_by,
                               :created_by_other, :duration, :included_at, :closing_date, :closing_date_reason,
-                              :internal_organisation, :is_transparent, :special_features, :twitter_handler, :announcement,
+                              :internal_organisation, :has_members, :is_transparent, :special_features, :twitter_handler, :announcement,
                               :facebook_handler, :instagram_handler, :youtube_handler, :github_handler, :weight
 
         private
diff --git a/decidim-assemblies/app/controllers/concerns/decidim/assemblies/assembly_breadcrumb.rb b/decidim-assemblies/app/controllers/concerns/decidim/assemblies/assembly_breadcrumb.rb
index fd41748d057e9..a6621e6232c28 100644
--- a/decidim-assemblies/app/controllers/concerns/decidim/assemblies/assembly_breadcrumb.rb
+++ b/decidim-assemblies/app/controllers/concerns/decidim/assemblies/assembly_breadcrumb.rb
@@ -12,14 +12,11 @@ def current_participatory_space_breadcrumb_item
         return {} if current_participatory_space.blank?
         return super unless current_participatory_space.is_a?(Decidim::Assembly)
 
-        dropdown_cell = current_participatory_space_manifest.breadcrumb_cell
-
         items = current_participatory_space.ancestors.map do |participatory_space|
           {
             label: participatory_space.title,
             url: Decidim::ResourceLocatorPresenter.new(participatory_space).path,
             active: false,
-            dropdown_cell:,
             resource: participatory_space
           }
         end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/members_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/members_controller.rb
new file mode 100644
index 0000000000000..1bea18136b568
--- /dev/null
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/members_controller.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # Controller that allows managing assembly members
+      # on assemblies
+      class MembersController < Decidim::Assemblies::Admin::ApplicationController
+        include Concerns::AssemblyAdmin
+        include Decidim::Admin::ParticipatorySpace::Concerns::HasMembers
+      end
+    end
+  end
+end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/members_csv_imports_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/members_csv_imports_controller.rb
new file mode 100644
index 0000000000000..58fc249e28433
--- /dev/null
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/members_csv_imports_controller.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # Controller that allows importing assembly members
+      # on assemblies
+      class MembersCsvImportsController < Decidim::Admin::ApplicationController
+        include Concerns::AssemblyAdmin
+        include Decidim::Admin::ParticipatorySpace::Concerns::HasMembersCsvImport
+
+        def after_import_path
+          members_path(current_assembly)
+        end
+
+        def participatory_space
+          current_assembly
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/participatory_space_private_users_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/participatory_space_private_users_controller.rb
deleted file mode 100644
index c852029aa5fc1..0000000000000
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/participatory_space_private_users_controller.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    module Admin
-      # Controller that allows managing assembly private users
-      # on assemblies
-      class ParticipatorySpacePrivateUsersController < Decidim::Assemblies::Admin::ApplicationController
-        include Concerns::AssemblyAdmin
-        include Decidim::Admin::Concerns::HasPrivateUsers
-
-        def after_destroy_path
-          participatory_space_private_users_path(current_assembly)
-        end
-
-        def privatable_to
-          current_assembly
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/participatory_space_private_users_csv_imports_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/participatory_space_private_users_csv_imports_controller.rb
deleted file mode 100644
index 7e2dbc07455fb..0000000000000
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/participatory_space_private_users_csv_imports_controller.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    module Admin
-      # Controller that allows importing assembly private users
-      # on assemblies
-      class ParticipatorySpacePrivateUsersCsvImportsController < Decidim::Admin::ApplicationController
-        include Concerns::AssemblyAdmin
-        include Decidim::Admin::Concerns::HasPrivateUsersCsvImport
-
-        def after_import_path
-          participatory_space_private_users_path(current_assembly)
-        end
-
-        def privatable_to
-          current_assembly
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/participatory_space_private_users_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/members_controller.rb
similarity index 85%
rename from decidim-assemblies/app/controllers/decidim/assemblies/participatory_space_private_users_controller.rb
rename to decidim-assemblies/app/controllers/decidim/assemblies/members_controller.rb
index 1420c746d03b9..4c9211e9929bd 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/participatory_space_private_users_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/members_controller.rb
@@ -2,9 +2,9 @@
 
 module Decidim
   module Assemblies
-    class ParticipatorySpacePrivateUsersController < Decidim::Assemblies::ApplicationController
+    class MembersController < Decidim::Assemblies::ApplicationController
       include ParticipatorySpaceContext
-      include Decidim::HasMembersPage
+      include Decidim::ParticipatorySpace::HasMembersPage
 
       def index
         raise ActionController::RoutingError, "No members for this assembly" if members.none?
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..87428d57fbbd6 100644
--- a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
+++ b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
@@ -45,6 +45,7 @@ class AssemblyForm < Form
         attribute :participatory_processes_ids, Array[Integer]
         attribute :weight, Integer, default: 0
 
+        attribute :has_members, Boolean
         attribute :is_transparent, Boolean
         attribute :promoted, Boolean
         attribute :private_space, Boolean
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 f3231df335986..4dc60fd62a8ed 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
@@ -31,6 +31,7 @@ class AssemblyImportForm < Form
         attribute :import_components, Boolean, default: true
         attribute :document, Decidim::Attributes::Blob
 
+        validates :document, presence: true
         validates :document, file_content_type: { allow: ACCEPTED_TYPES.values }
         validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
         validates :title, translatable_presence: true
diff --git a/decidim-assemblies/app/helpers/decidim/assemblies/assemblies_helper.rb b/decidim-assemblies/app/helpers/decidim/assemblies/assemblies_helper.rb
index 7cee36698de2d..643a3ae029a36 100644
--- a/decidim-assemblies/app/helpers/decidim/assemblies/assemblies_helper.rb
+++ b/decidim-assemblies/app/helpers/decidim/assemblies/assemblies_helper.rb
@@ -20,8 +20,8 @@ def assembly_nav_items(participatory_space)
           *(if participatory_space.members_public_page?
               [{
                 name: t("assembly_member_menu_item", scope: "layouts.decidim.assembly_navigation"),
-                url: decidim_assemblies.assembly_participatory_space_private_users_path(participatory_space, locale: current_locale),
-                active: is_active_link?(decidim_assemblies.assembly_participatory_space_private_users_path(participatory_space, locale: current_locale), :inclusive)
+                url: decidim_assemblies.assembly_members_path(participatory_space, locale: current_locale),
+                active: is_active_link?(decidim_assemblies.assembly_members_path(participatory_space, locale: current_locale), :inclusive)
               }]
             end
            )
diff --git a/decidim-assemblies/app/models/decidim/assembly.rb b/decidim-assemblies/app/models/decidim/assembly.rb
index 43f794a1a7b2e..208cc845bae6b 100644
--- a/decidim-assemblies/app/models/decidim/assembly.rb
+++ b/decidim-assemblies/app/models/decidim/assembly.rb
@@ -31,7 +31,7 @@ class Assembly < ApplicationRecord
     include Decidim::Traceable
     include Decidim::Loggable
     include Decidim::ParticipatorySpaceResourceable
-    include Decidim::HasPrivateUsers
+    include Decidim::ParticipatorySpace::HasMembers
     include Decidim::Searchable
     include Decidim::HasUploadValidations
     include Decidim::TranslatableResource
@@ -92,7 +92,7 @@ class Assembly < ApplicationRecord
                       index_on_create: ->(_assembly) { false },
                       index_on_update: ->(assembly) { assembly.visible? })
 
-    # Overwriting existing method Decidim::HasPrivateUsers.public_spaces
+    # Overwriting existing method Decidim::ParticipatorySpace::HasMembers.public_spaces
     def self.public_spaces
       where(private_space: false).or(where(private_space: true).where(is_transparent: true)).published
     end
@@ -169,7 +169,7 @@ def self.ransackable_attributes(auth_object = nil)
 
       return base unless auth_object&.admin?
 
-      base + %w(published_at private_space parent_id)
+      base + %w(published_at created_at private_space parent_id)
     end
 
     def self.ransackable_associations(_auth_object = nil)
diff --git a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js
index 12e5ed74c9a7a..0629e11cc3264 100644
--- a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js
+++ b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js
@@ -748,7 +748,7 @@ describe("AssemblyAdminController", () => {
               <label for="assembly_private_space">
                 <input name="assembly[private_space]" type="hidden" value="0" autocomplete="off">
                 <input type="checkbox" value="1" name="assembly[private_space]" id="assembly_private_space">Private space </label>
-              <p class="help-text">You will be able to manage private participants after setting it as private</p>
+              <p class="help-text">You will be able to manage members after setting it as private</p>
             </div>
             <div class="row column" id="is_transparent">
               <label for="assembly_is_transparent">
diff --git a/decidim-assemblies/app/permissions/decidim/assemblies/permissions.rb b/decidim-assemblies/app/permissions/decidim/assemblies/permissions.rb
index fe7df31d93a31..5838f92ba1825 100644
--- a/decidim-assemblies/app/permissions/decidim/assemblies/permissions.rb
+++ b/decidim-assemblies/app/permissions/decidim/assemblies/permissions.rb
@@ -41,7 +41,7 @@ def permissions
 
         return permission_action unless assembly
 
-        user_can_read_private_users?
+        user_can_read_members?
 
         moderator_action?
         collaborator_action?
@@ -53,9 +53,9 @@ def permissions
 
       private
 
-      def user_can_read_private_users?
-        return unless permission_action.subject == :space_private_user
-        return unless assembly.private_space?
+      def user_can_read_members?
+        return unless permission_action.subject == :space_member
+        return unless assembly.has_members?
 
         toggle_allow(user.admin? || can_manage_assembly?(role: :admin) || can_manage_assembly?(role: :collaborator))
       end
@@ -222,7 +222,7 @@ def moderator_action?
       # Collaborators can read/preview everything inside their assembly.
       def collaborator_action?
         return unless can_manage_assembly?(role: :collaborator)
-        return if permission_action.subject == :space_private_user
+        return if permission_action.subject == :space_member
 
         allow! if permission_action.action == :read || permission_action.action == :preview
       end
diff --git a/decidim-assemblies/app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb b/decidim-assemblies/app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb
index a5064b7e2e763..4d08e8b230271 100644
--- a/decidim-assemblies/app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb
+++ b/decidim-assemblies/app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb
@@ -59,9 +59,20 @@ def i18n_labels_scope
           "activemodel.attributes.assembly"
         end
 
+        # i18n-tasks-use t("decidim.admin_log.assembly.create")
+        # i18n-tasks-use t("decidim.admin_log.assembly.publish")
+        # i18n-tasks-use t("decidim.admin_log.assembly.unpublish")
+        # i18n-tasks-use t("decidim.admin_log.assembly.update")
+        # i18n-tasks-use t("decidim.admin_log.assembly.import")
+        # i18n-tasks-use t("decidim.admin_log.assembly.export")
+        # i18n-tasks-use t("decidim.admin_log.assembly.duplicate")
+        # i18n-tasks-use t("decidim.admin_log.assembly.soft_delete")
+        # i18n-tasks-use t("decidim.admin_log.assembly.restore")
+        # i18n-tasks-use t("decidim.admin_log.assembly.publish_all_members")
+        # i18n-tasks-use t("decidim.admin_log.assembly.unpublish_all_members")
         def action_string
           case action
-          when "create", "publish", "unpublish", "update", "duplicate", "export", "import", "soft_delete", "restore"
+          when "create", "publish", "unpublish", "update", "duplicate", "export", "import", "soft_delete", "restore", "publish_all_members", "unpublish_all_members"
             "decidim.admin_log.assembly.#{action}"
           else
             super
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
index 6e40b2cac221e..a0e8918baa9c6 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
@@ -201,6 +201,10 @@
         <%= form.check_box :promoted %>
       </div>
 
+      <div class="row column" id="has_members">
+        <%= form.check_box :has_members, help_text: t(".has_members_help") %>
+      </div>
+
       <div class="row column" id="private_space">
         <%= form.check_box :private_space %>
         <p class="help-text"><%= t(".private_notice") %></p>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/_form.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/_form.html.erb
index 186ef2fe2a463..b86fc95ee64e1 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/_form.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/_form.html.erb
@@ -1,34 +1,38 @@
-<%= append_javascript_pack_tag "decidim_assemblies_admin" %>
-
 <div class="form__wrapper">
   <div class="card pt-4" id="assemblies">
     <div class="card-section">
+      <div class="row column mb-4">
+        <%= cell("decidim/announcement", { body: t("decidim.assemblies.admin.new_import.help_html") }, callout_class: "info") %>
+      </div>
+
       <div class="row column">
         <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
       </div>
+
       <div class="row column">
         <%= form.text_field :slug, help_text: t(".slug_help_html", url: decidim_form_slug_url(:assemblies, form.object.slug)) %>
       </div>
+
       <div class="row column">
-        <%= form.upload :document, button_class: "button button__sm button__transparent-secondary" %>
+        <%= form.upload :document, label: t(".document_legend"), button_class: "button button__sm button__transparent-secondary", help_i18n_scope: "decidim.forms.file_help.import_file", help_i18n_messages: ["message_1"] %>
       </div>
-      <div class="row column">
-        <div class="card">
-          <div class="card-divider">
-            <legend><%= t("assembly_imports.new.select", scope: "decidim.admin") %></legend>
+
+      <div class="card-divider">
+        <div class="card-title">
+          <%= t("assembly_imports.new.select", scope: "decidim.admin") %>
+        </div>
+      </div>
+      <div class="card-section">
+        <div class="row">
+          <div class="columns">
+            <%= form.check_box :import_attachments %>
           </div>
-          <div class="card-section">
-            <div class="row">
-              <div class="columns">
-                <%= form.check_box :import_attachments %>
-              </div>
-              <div class="columns">
-                <%= form.check_box :import_components %>
-              </div>
-            </div>
+          <div class="columns">
+            <%= form.check_box :import_components %>
           </div>
         </div>
       </div>
+
     </div>
   </div>
 </div>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
index d2f911ad4dcc8..b5d593aa340de 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
@@ -1,4 +1,5 @@
 <% add_decidim_page_title(t("assembly_imports.new.title", scope: "decidim.admin")) %>
+
 <div class="item_show__header">
   <h1 class="item_show__header-title">
     <%= t("assembly_imports.new.title", scope: "decidim.admin") %>
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 6b9799c119e63..fbc902c147981 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb
@@ -34,6 +34,6 @@ edit_link(
   </div>
 
   <section class="participatory-space__block-reference">
-    <%= resource_reference(current_participatory_space) %>
+    <p><%= resource_reference(current_participatory_space) %></p>
   </section>
 </main>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/participatory_space_private_users/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb
similarity index 88%
rename from decidim-assemblies/app/views/decidim/assemblies/participatory_space_private_users/index.html.erb
rename to decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb
index 0709e746b3033..3fb3b7d068099 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/participatory_space_private_users/index.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb
@@ -4,7 +4,7 @@
      resource: current_participatory_space) %>
 <%
 edit_link(
-  decidim_admin_assemblies.participatory_space_private_users_path(current_participatory_space.slug),
+  decidim_admin_assemblies.members_path(current_participatory_space.slug),
   :update,
   :assembly,
   assembly: current_participatory_space
diff --git a/decidim-assemblies/config/locales/ca-IT.yml b/decidim-assemblies/config/locales/ca-IT.yml
index ddbd852fb876c..3c6b1551f8dcd 100644
--- a/decidim-assemblies/config/locales/ca-IT.yml
+++ b/decidim-assemblies/config/locales/ca-IT.yml
@@ -25,6 +25,7 @@ ca-IT:
         duration: Durada
         facebook: Facebook
         github: GitHub
+        has_members: Aquest espai de participació té membres
         hero_image: Imatge de portada
         import_attachments: Importar arxius adjunts
         import_categories: Importar categories
@@ -170,8 +171,8 @@ ca-IT:
           components: Components
           info: Quant a aquesta assemblea
           landing_page: Disposició de la pàgina de destinació
+          members: Membres
           moderations: Moderacions
-          private_users: Membres
           see_assembly: Veure l'assemblea
       models:
         assembly:
@@ -218,9 +219,11 @@ ca-IT:
         export: "%{user_name} ha exportat l'assemblea %{resource_name}"
         import: "%{user_name} ha importat l'assemblea %{resource_name}"
         publish: "%{user_name} ha publicat l'assemblea %{resource_name}"
+        publish_all_members: "%{user_name} va publicar a totes les membres de l'assemblea %{resource_name}"
         restore: "%{user_name} ha restaurat l'assemblea %{resource_name}"
         soft_delete: "%{user_name} ha mogut a la paperera l'assemblea %{resource_name}"
         unpublish: "%{user_name} ha despublicat l'assemblea %{resource_name}"
+        unpublish_all_members: "%{user_name} va despublicar a totes les membres de l'assemblea %{resource_name}"
         update: "%{user_name} ha actualitzat l'assemblea %{resource_name}"
       assembly_member:
         create: "%{user_name} ha afegit el membre %{resource_name} a l'assemblea %{space_name}"
@@ -246,12 +249,13 @@ ca-IT:
             define_taxonomy_filters: Si us plau, defineix algunes filtres per aquest espai de participació abans de fer servir aquesta configuració.
             duration: Durada
             duration_help: Si la durada d'aquesta assemblea és limitada, selecciona la data de finalització. En cas contrari, apareixerà com a indefinida.
+            has_members_help: Podràs crear i publicar membres
             images: Imatges
             included_at_help: Selecciona la data en què es va afegir aquesta assemblea a la plataforma. No necessàriament ha de ser la mateixa que la data de creació.
             metadata: Metadades
             no_taxonomy_filters_found: No s'han trobat filtres de taxonomia.
             other: Altre
-            private_notice: Podràs administrar les participants privades un cop haguis configurar l'espai com a privat
+            private_notice: Fa que l'espai de participació no sigui visible per a les visitants i només ho sigui per a les usuàries membre (a no ser que també sigui transparent)
             select_a_created_by: Selecciona una creadora
             select_parent_assembly: Selecciona una assemblea mare
             slug_help_html: 'Els noms curts d''URL s''utilitzen per generar les URL que apunten a aquesta assemblea. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
diff --git a/decidim-assemblies/config/locales/ca.yml b/decidim-assemblies/config/locales/ca.yml
index 2142843a6738b..6fb12f83ef8aa 100644
--- a/decidim-assemblies/config/locales/ca.yml
+++ b/decidim-assemblies/config/locales/ca.yml
@@ -25,6 +25,7 @@ ca:
         duration: Durada
         facebook: Facebook
         github: GitHub
+        has_members: Aquest espai de participació té membres
         hero_image: Imatge de portada
         import_attachments: Importar arxius adjunts
         import_categories: Importar categories
@@ -170,8 +171,8 @@ ca:
           components: Components
           info: Quant a aquesta assemblea
           landing_page: Disposició de la pàgina de destinació
+          members: Membres
           moderations: Moderacions
-          private_users: Membres
           see_assembly: Veure l'assemblea
       models:
         assembly:
@@ -218,9 +219,11 @@ ca:
         export: "%{user_name} ha exportat l'assemblea %{resource_name}"
         import: "%{user_name} ha importat l'assemblea %{resource_name}"
         publish: "%{user_name} ha publicat l'assemblea %{resource_name}"
+        publish_all_members: "%{user_name} va publicar a totes les membres de l'assemblea %{resource_name}"
         restore: "%{user_name} ha restaurat l'assemblea %{resource_name}"
         soft_delete: "%{user_name} ha mogut a la paperera l'assemblea %{resource_name}"
         unpublish: "%{user_name} ha despublicat l'assemblea %{resource_name}"
+        unpublish_all_members: "%{user_name} va despublicar a totes les membres de l'assemblea %{resource_name}"
         update: "%{user_name} ha actualitzat l'assemblea %{resource_name}"
       assembly_member:
         create: "%{user_name} ha afegit el membre %{resource_name} a l'assemblea %{space_name}"
@@ -246,12 +249,13 @@ ca:
             define_taxonomy_filters: Si us plau, defineix algunes filtres per aquest espai de participació abans de fer servir aquesta configuració.
             duration: Durada
             duration_help: Si la durada d'aquesta assemblea és limitada, selecciona la data de finalització. En cas contrari, apareixerà com a indefinida.
+            has_members_help: Podràs crear i publicar membres
             images: Imatges
             included_at_help: Selecciona la data en què es va afegir aquesta assemblea a la plataforma. No necessàriament ha de ser la mateixa que la data de creació.
             metadata: Metadades
             no_taxonomy_filters_found: No s'han trobat filtres de taxonomia.
             other: Altre
-            private_notice: Podràs administrar les participants privades un cop haguis configurar l'espai com a privat
+            private_notice: Fa que l'espai de participació no sigui visible per a les visitants i només ho sigui per a les usuàries membre (a no ser que també sigui transparent)
             select_a_created_by: Selecciona una creadora
             select_parent_assembly: Selecciona una assemblea mare
             slug_help_html: 'Els noms curts d''URL s''utilitzen per generar les URL que apunten a aquesta assemblea. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
diff --git a/decidim-assemblies/config/locales/cs.yml b/decidim-assemblies/config/locales/cs.yml
index 9888a825e1b3c..29e12336e2084 100644
--- a/decidim-assemblies/config/locales/cs.yml
+++ b/decidim-assemblies/config/locales/cs.yml
@@ -176,8 +176,8 @@ cs:
           components: Komponenty
           info: O tomto shromáždění
           landing_page: Rozložení vstupní strany
+          members: Členové
           moderations: Moderování
-          private_users: Členové
           see_assembly: Zobrazit shromáždění
       models:
         assembly:
@@ -257,7 +257,6 @@ cs:
             metadata: Metadata
             no_taxonomy_filters_found: Nebyly nalezeny žádné filtry taxonomie.
             other: Ostatní
-            private_notice: Budete moci spravovat soukromé účastníky po nastavení jako soukromé
             select_a_created_by: Vybrat vytvořeno od
             select_parent_assembly: Vybrat nadřazené shromáždění
             slug_help_html: 'URL slugy se používají ke generování adres URL, které odkazují na toto shromáždění. Povolená jsou pouze písmena, číslice a pomlčky a musí začínat písmenem. Příklad: %{url}'
@@ -390,6 +389,7 @@ cs:
           assembly_type: Typ shromáždění
           closing_date: Datum ukončení shromáždění
           closing_date_reason: Proč bylo shromáždění uzavřeno
+          component_settings: Nastavení komponenty shromáždění
           composition: Složení shromáždění
           created_at: Datum, kdy byl tento prostor vytvořen
           created_by: Kdo vytvořil toto shromáždění
diff --git a/decidim-assemblies/config/locales/de.yml b/decidim-assemblies/config/locales/de.yml
index 88b10dd7771f5..4e109b33e4b7e 100644
--- a/decidim-assemblies/config/locales/de.yml
+++ b/decidim-assemblies/config/locales/de.yml
@@ -25,6 +25,7 @@ de:
         duration: Aktiv bis
         facebook: Facebook
         github: GitHub
+        has_members: Dieser Bereich hat Mitglieder
         hero_image: Hauptbild
         import_attachments: Anhänge importieren
         import_categories: Kategorien importieren
@@ -170,8 +171,8 @@ de:
           components: Komponenten
           info: Über dieses Gremium
           landing_page: Startseiten-Layout
+          members: Mitglieder
           moderations: Moderationen
-          private_users: Mitglieder
           see_assembly: Gremium ansehen
       models:
         assembly:
@@ -218,9 +219,11 @@ de:
         export: "%{user_name} hat das Gremium %{resource_name} exportiert"
         import: "%{user_name} hat das Gremium %{resource_name} importiert"
         publish: "%{user_name} hat das Gremium %{resource_name} veröffentlicht"
+        publish_all_members: "%{user_name} hat alle Mitglieder des Gremiums %{resource_name} veröffentlicht"
         restore: "%{user_name} hat das Gremium %{resource_name} wiederhergestellt"
         soft_delete: "%{user_name} hat das Gremium %{resource_name} in den Papierkorb verschoben"
         unpublish: "%{user_name} hat das Gremium %{resource_name} auf \"unveröffentlicht\" gesetzt"
+        unpublish_all_members: "%{user_name} hat die Veröffentlichung aller Mitglieder des Gremiums %{resource_name} aufgehoben"
         update: "%{user_name} hat das Gremium %{resource_name} aktualisiert"
       assembly_member:
         create: "%{user_name} hat das Mitglied %{resource_name} im Gremium %{space_name} erstellt"
@@ -246,12 +249,12 @@ de:
             define_taxonomy_filters: Bitte definieren Sie einige Filter für diesen partizipativen Bereich, bevor Sie diese Einstellung verwenden.
             duration: Aktiv bis
             duration_help: Wenn die Dauer dieses Gremiums begrenzt ist, dann wählen Sie hier das Enddatum aus. Andernfalls wird das Datum als unbestimmt angezeigt.
+            has_members_help: Sie können Mitglieder erstellen und veröffentlichen
             images: Bilder
             included_at_help: Wählen Sie das Datum aus, an dem dieses Gremium zur Plattform hinzugefügt wurde. Das Datum muss nicht zwingend mit dem Gründungsdatum übereinstimmen.
             metadata: Metadaten
             no_taxonomy_filters_found: Keine Klassifizierungsfilter gefunden.
             other: Andere
-            private_notice: Sie werden in der Lage sein, private Teilnehmer zu verwalten, nachdem Sie das Gremium als privat festgelegt haben
             select_a_created_by: Wählen Sie eine erstellt von aus
             select_parent_assembly: Übergeordnetes Gremium auswählen
             slug_help_html: 'URL-Slugs werden zum Generieren der URLs verwendet, die auf dieses Gremium verweisen. Akzeptiert werden nur Buchstaben, Zahlen und Bindestriche und es muss mit einem Buchstaben beginnen. Beispiel: %{url}'
diff --git a/decidim-assemblies/config/locales/en.yml b/decidim-assemblies/config/locales/en.yml
index 4252a87199e40..32e03672f6ed0 100644
--- a/decidim-assemblies/config/locales/en.yml
+++ b/decidim-assemblies/config/locales/en.yml
@@ -26,6 +26,7 @@ en:
         duration: Duration
         facebook: Facebook
         github: GitHub
+        has_members: This space has members
         hero_image: Home image
         import_attachments: Import attachments
         import_categories: Import categories
@@ -171,8 +172,8 @@ en:
           components: Components
           info: About this assembly
           landing_page: Landing page layout
+          members: Members
           moderations: Moderations
-          private_users: Members
           see_assembly: See assembly
       models:
         assembly:
@@ -219,9 +220,11 @@ en:
         export: "%{user_name} exported the %{resource_name} assembly"
         import: "%{user_name} imported the %{resource_name} assembly"
         publish: "%{user_name} published the %{resource_name} assembly"
+        publish_all_members: "%{user_name} published all members of the %{resource_name} assembly"
         restore: "%{user_name} restored the %{resource_name} assembly"
         soft_delete: "%{user_name} moved to trash the %{resource_name} assembly"
         unpublish: "%{user_name} unpublished the %{resource_name} assembly"
+        unpublish_all_members: "%{user_name} unpublished all members of the %{resource_name} assembly"
         update: "%{user_name} updated the %{resource_name} assembly"
       assembly_member:
         create: "%{user_name} created the %{resource_name} member in the %{space_name} assembly"
@@ -247,12 +250,13 @@ en:
             define_taxonomy_filters: Please define some filters for this participatory space before using this setting.
             duration: Duration
             duration_help: If the duration of this assembly is limited, select the end date. Otherwise, it will appear as indefinite.
+            has_members_help: You will be able to create and publish members
             images: Images
             included_at_help: Select the date when this assembly was added to the platform. It does not necessarily have to be the same as the creation date.
             metadata: Metadata
             no_taxonomy_filters_found: No taxonomy filters found.
             other: Other
-            private_notice: You will be able to manage private participants after setting it as private
+            private_notice: Makes the space not visible for visitors and only for members (except if it is also transparent)
             select_a_created_by: Select a created by
             select_parent_assembly: Select parent assembly
             slug_help_html: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
@@ -265,6 +269,7 @@ en:
             slug_help_html: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
         assembly_imports:
           form:
+            document_legend: Add a document
             slug_help_html: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
         assembly_members:
           form:
@@ -277,6 +282,7 @@ en:
         new_import:
           accepted_types:
             json: JSON
+          help_html: This import feature allows you to create a new assembly from an exported JSON file. You can export an assembly from another organization or from this same organization. The imported assembly will include its settings, components, and attachments (if selected).
       assemblies:
         description:
           area_name: Area
diff --git a/decidim-assemblies/config/locales/es-MX.yml b/decidim-assemblies/config/locales/es-MX.yml
index 73a438add08fe..f9d5873461912 100644
--- a/decidim-assemblies/config/locales/es-MX.yml
+++ b/decidim-assemblies/config/locales/es-MX.yml
@@ -25,6 +25,7 @@ es-MX:
         duration: Duración
         facebook: Facebook
         github: GitHub
+        has_members: Este espacio de participación tiene miembros
         hero_image: Imagen de portada
         import_attachments: Importar archivos adjuntos
         import_categories: Importar categorias
@@ -170,8 +171,8 @@ es-MX:
           components: Componentes
           info: Acerca de esta asamblea
           landing_page: Disposición de la página de aterrizaje
+          members: Miembros
           moderations: Moderaciones
-          private_users: Miembros
           see_assembly: Ver la asamblea
       models:
         assembly:
@@ -218,9 +219,11 @@ es-MX:
         export: "%{user_name} exportó la asamblea %{resource_name}"
         import: "%{user_name} importó la asamblea %{resource_name}"
         publish: "%{user_name} publicó la asamblea %{resource_name}"
+        publish_all_members: "%{user_name} publicó todas las miembros de la asamblea %{resource_name}"
         restore: "%{user_name} ha restaurado la asamblea %{resource_name}"
         soft_delete: "%{user_name} ha movido a la papelera la asamblea %{resource_name}"
         unpublish: "%{user_name} despublicó la asamblea %{resource_name}"
+        unpublish_all_members: "%{user_name} despublicó a todas las miembros de la asamblea %{resource_name}"
         update: "%{user_name} actualizó la asamblea %{resource_name}"
       assembly_member:
         create: "%{user_name} creó el miembro %{resource_name} en la asamblea %{space_name}"
@@ -246,12 +249,13 @@ es-MX:
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
             duration: Duración
             duration_help: Si la duración de esta asamblea es limitada, selecciona la fecha de finalización. De lo contrario, aparecerá como indefinida.
+            has_members_help: Podrás crear y publicar miembros
             images: Imágenes
             included_at_help: Selecciona la fecha en la que se añadió esta asamblea a la plataforma. No es necesario que sea la misma que la fecha de creación.
             metadata: Metadatos
             no_taxonomy_filters_found: No se han encontrado filtros de taxonomía.
             other: Otro
-            private_notice: Podrás administrar las participantes privadas después de configurar el espacio como privado
+            private_notice: Hace que el espacio de participación no sea visible para las visitantes y sólo lo sea para las usuarias miembro (excepto si también es transparente)
             select_a_created_by: Selecciona creada por
             select_parent_assembly: Selecciona asamblea principal
             slug_help_html: 'Los textos cortos de URL se utilizan para generar las URL que apuntan a esta asamblea. Sólo acepta letras, números y guiones, y debe comenzar con una letra. Ejemplo: %{url}'
diff --git a/decidim-assemblies/config/locales/es-PY.yml b/decidim-assemblies/config/locales/es-PY.yml
index 53cf928f7b688..e5b7b98d5f0a3 100644
--- a/decidim-assemblies/config/locales/es-PY.yml
+++ b/decidim-assemblies/config/locales/es-PY.yml
@@ -25,6 +25,7 @@ es-PY:
         duration: Duración
         facebook: Facebook
         github: GitHub
+        has_members: Este espacio de participación tiene miembros
         hero_image: Imagen de portada
         import_attachments: Importar archivos adjuntos
         import_categories: Importar categorias
@@ -170,8 +171,8 @@ es-PY:
           components: Componentes
           info: Acerca de esta asamblea
           landing_page: Disposición de la página de aterrizaje
+          members: Miembros
           moderations: Moderaciones
-          private_users: Miembros
           see_assembly: Ver la asamblea
       models:
         assembly:
@@ -218,9 +219,11 @@ es-PY:
         export: "%{user_name} ha exportado la asamblea %{resource_name}"
         import: "%{user_name} ha importado la asamblea %{resource_name}"
         publish: "%{user_name} publicó la asamblea %{resource_name}"
+        publish_all_members: "%{user_name} publicó todas las miembros de la asamblea %{resource_name}"
         restore: "%{user_name} ha restaurado la asamblea %{resource_name}"
         soft_delete: "%{user_name} ha movido a la papelera la asamblea %{resource_name}"
         unpublish: "%{user_name} despublicó la asamblea %{resource_name}"
+        unpublish_all_members: "%{user_name} despublicó a todas las miembros de la asamblea %{resource_name}"
         update: "%{user_name} actualizó la asamblea %{resource_name}"
       assembly_member:
         create: "%{user_name} creó el miembro %{resource_name} en la asamblea %{space_name}"
@@ -246,12 +249,13 @@ es-PY:
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
             duration: Duración
             duration_help: Si la duración de esta asamblea es limitada, selecciona la fecha de finalización. De lo contrario, aparecerá como indefinida.
+            has_members_help: Podrás crear y publicar miembros
             images: Imágenes
             included_at_help: Selecciona la fecha en la que se añadió esta asamblea a la plataforma. No necesariamente tiene que ser la misma que la fecha de creación.
             metadata: Metadatos
             no_taxonomy_filters_found: No se han encontrado filtros de taxonomía.
             other: Otro
-            private_notice: Podrás administrar las participantes privadas después de configurar el espacio como privado
+            private_notice: Hace que el espacio de participación no sea visible para las visitantes y sólo lo sea para las usuarias miembro (excepto si también es transparente)
             select_a_created_by: Selecciona creada por
             select_parent_assembly: Seleccionar ensamblaje principal
             slug_help_html: 'Los textos cortos de URL se utilizan para generar las URL que apuntan a esta asamblea. Sólo acepta letras, números y guiones, y debe comenzar con una letra. Ejemplo: %{url}'
diff --git a/decidim-assemblies/config/locales/es.yml b/decidim-assemblies/config/locales/es.yml
index fff88fefca145..9b43b2f0e3f7b 100644
--- a/decidim-assemblies/config/locales/es.yml
+++ b/decidim-assemblies/config/locales/es.yml
@@ -25,6 +25,7 @@ es:
         duration: Duración
         facebook: Facebook
         github: GitHub
+        has_members: Este espacio de participación tiene miembros
         hero_image: Imagen de portada
         import_attachments: Importar archivos adjuntos
         import_categories: Importar categorias
@@ -170,8 +171,8 @@ es:
           components: Componentes
           info: Acerca de esta asamblea
           landing_page: Disposición de la página de aterrizaje
+          members: Miembros
           moderations: Moderaciones
-          private_users: Miembros
           see_assembly: Ver la asamblea
       models:
         assembly:
@@ -218,9 +219,11 @@ es:
         export: "%{user_name} ha exportado la asamblea %{resource_name}"
         import: "%{user_name} ha importado la asamblea %{resource_name}"
         publish: "%{user_name} publicó la asamblea %{resource_name}"
+        publish_all_members: "%{user_name} publicó todas las miembros de la asamblea %{resource_name}"
         restore: "%{user_name} ha restaurado la asamblea %{resource_name}"
         soft_delete: "%{user_name} ha movido a la papelera la asamblea %{resource_name}"
         unpublish: "%{user_name} despublicó la asamblea %{resource_name}"
+        unpublish_all_members: "%{user_name} despublicó a todas las miembros de la asamblea %{resource_name}"
         update: "%{user_name} actualizó la asamblea %{resource_name}"
       assembly_member:
         create: "%{user_name} creó el miembro %{resource_name} en la asamblea %{space_name}"
@@ -246,12 +249,13 @@ es:
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
             duration: Duración
             duration_help: Si la duración de esta asamblea es limitada, selecciona la fecha de finalización. De lo contrario, aparecerá como indefinida.
+            has_members_help: Podrás crear y publicar miembros
             images: Imágenes
             included_at_help: Selecciona la fecha en la que se añadió esta asamblea a la plataforma. No necesariamente tiene que ser la misma que la fecha de creación.
             metadata: Metadatos
             no_taxonomy_filters_found: No se han encontrado filtros de taxonomía.
             other: Otro
-            private_notice: Podrás administrar las participantes privadas después de configurar el espacio como privado
+            private_notice: Hace que el espacio de participación no sea visible para las visitantes y sólo lo sea para las usuarias miembro (excepto si también es transparente)
             select_a_created_by: Selecciona una creadora
             select_parent_assembly: Selecciona una asamblea madre
             slug_help_html: 'Los textos cortos de URL se utilizan para generar las URL que apuntan a esta asamblea. Sólo acepta letras, números y guiones, y debe comenzar con una letra. Ejemplo: %{url}'
diff --git a/decidim-assemblies/config/locales/eu.yml b/decidim-assemblies/config/locales/eu.yml
index a68548bdbeaec..beec6d7e9ce39 100644
--- a/decidim-assemblies/config/locales/eu.yml
+++ b/decidim-assemblies/config/locales/eu.yml
@@ -25,6 +25,7 @@ eu:
         duration: Iraupena
         facebook: Facebook
         github: GitHub
+        has_members: Partaidetza-espazio honek kideak ditu
         hero_image: Hasierako orriko irudia
         import_attachments: Inportatu erantsitako fitxategiak
         import_categories: Inportatu kategoriak
@@ -170,8 +171,8 @@ eu:
           components: Osagaiak
           info: Batzar honi buruz
           landing_page: Lurreratze-orrien antolaketa
+          members: Kideak
           moderations: Moderazioak
-          private_users: Kideak
           see_assembly: Ikusi batzarra
       models:
         assembly:
@@ -218,9 +219,11 @@ eu:
         export: "%{user_name} parte-hartzaileak %{resource_name} batzarra esportatu du"
         import: "%{user_name} parte-hartzaileak %{resource_name} batzarra inportatu du"
         publish: "%{user_name} parte-hartzaileak %{resource_name} batzarra argitaratu du"
+        publish_all_members: "%{user_name} parte-hartzaileak %{resource_name} batzarreko kide guztiak argitaratu ditu"
         restore: "%{user_name} parte-hartzaileak %{resource_name} batzarra berreskuratu du"
         soft_delete: "%{user_name} parte-hartzaileak %{resource_name} batzarra zaborrontzira eraman du"
         unpublish: "%{user_name} parte-hartzaileak %{resource_name} batzarra desargitaratu du"
+        unpublish_all_members: "%{user_name} parte-hartzaileak %{resource_name} batzarreko kide guztiak desargitaratu ditu"
         update: "%{user_name} parte-hartzaileak %{resource_name} batzarra eguneratu du"
       assembly_member:
         create: "%{user_name} parte-hartzaileak %{resource_name} kidea sortu du %{space_name} batzarrean"
@@ -246,12 +249,13 @@ eu:
             define_taxonomy_filters: Mesedez, eszenatoki hau erabili aurretik, zehaztu espazio parte-hartzaile honetarako iragazki batzuk.
             duration: Iraupena
             duration_help: Batzar honen iraupena mugatua bada, hautatu amaiera-data. Bestela, mugagabea izango da.
+            has_members_help: Kideak sortu eta argitaratu ahal izango dituzu
             images: Irudiak
             included_at_help: Hautatu zein egunetan gehitu zen batzar hori plataformara. Ez du zertan sortze-data bera izan.
             metadata: Metadata
             no_taxonomy_filters_found: Ez da taxonomia-iragazkirik aurkitu.
             other: Beste bat
-            private_notice: Parte hartzaile pribatuak kudeatu ahal izango dituzu pribatu gisa ezarri ondoren
+            private_notice: Bisitarientzat eta bazkideentzat solikik (gardena bada izan ezik) ez da partaidetza-espazioa ikusten
             select_a_created_by: Hautatu egilea
             select_parent_assembly: Hautatu batzar nagusia
             slug_help_html: 'URL-ren testu laburrak batzar honetara daramaten URL-ak sortzeko erabiltzen dira. Letrak, zenbakiak eta gidoiak soilik onartzen ditu, eta letra batez hasi behar du. Adibidea: %{url}'
diff --git a/decidim-assemblies/config/locales/fi-plain.yml b/decidim-assemblies/config/locales/fi-plain.yml
index 6daad0218b102..8966571717411 100644
--- a/decidim-assemblies/config/locales/fi-plain.yml
+++ b/decidim-assemblies/config/locales/fi-plain.yml
@@ -25,6 +25,7 @@ fi-pl:
         duration: Kesto
         facebook: Facebook
         github: GitHub
+        has_members: Tässä tilassa on jäseniä
         hero_image: Etusivun kuva
         import_attachments: Tuo liitteitä
         import_categories: Tuo aihepiirejä
@@ -170,8 +171,8 @@ fi-pl:
           components: Komponentit
           info: Tietoa tästä ryhmästä
           landing_page: Laskeutumissivun asettelu
+          members: Jäsenet
           moderations: Moderoinnit
-          private_users: Jäsenet
           see_assembly: Näytä ryhmä
       models:
         assembly:
@@ -218,9 +219,11 @@ fi-pl:
         export: "%{user_name} vei ryhmän %{resource_name}"
         import: "%{user_name} toi ryhmän %{resource_name}"
         publish: "%{user_name} julkaisi %{resource_name} ryhmän"
+        publish_all_members: "%{user_name} julkaisi ryhmän %{resource_name} jäsenet"
         restore: "%{user_name} palautti ryhmän %{resource_name}"
         soft_delete: "%{user_name} siirsi ryhmän %{resource_name} roskakoriin"
         unpublish: "%{user_name} lopetti %{resource_name} ryhmän julkaisemisen"
+        unpublish_all_members: "%{user_name} perui ryhmän %{resource_name} jäsenten julkaisun"
         update: "%{user_name} päivitti %{resource_name} ryhmän"
       assembly_member:
         create: "%{user_name} loi %{resource_name} jäsenen %{space_name} ryhmässä"
@@ -246,12 +249,13 @@ fi-pl:
             define_taxonomy_filters: Määritä osallistumistilalle suodattimia ennen kuin käytät tätä asetusta.
             duration: Kesto
             duration_help: Jos ryhmän kesto on rajoitettu, valitse päättymispäivä. Muussa tapauksessa se näkyy määrittelemättömänä.
+            has_members_help: Voit luoda ja julkaista jäseniä
             images: kuvat
             included_at_help: Valitse päivämäärä, jolloin tämä ryhmä lisättiin alustalle. Sen ei välttämättä tarvitse olla sama kuin luontipäivä.
             metadata: metadata
             no_taxonomy_filters_found: Luokittelusuodattimia ei löytynyt.
             other: muut
-            private_notice: Voit hallinnoida osallistumistilan yksityisiä käyttäjiä asettamalla osallistumistilan yksityiseksi
+            private_notice: Piilottaa osallistumistilan verkkosivuston vierailijoiden näkyvistä (ellei osallistumistila ole myös läpinäkyvä)
             select_a_created_by: Valitse luoja
             select_parent_assembly: Valitse pääryhmä
             slug_help_html: 'URL-tunnisteita käytetään tähän ryhmään osoittavien URL-osoitteiden luonnissa. Hyväksyy kirjaimet, numerot ja viivat. Ensimmäinen merkki on oltava kirjain. Esimerkiksi: %{url}'
@@ -384,6 +388,7 @@ fi-pl:
           assembly_type: Ryhmän tyyppi
           closing_date: Ryhmän sulkemispäivä
           closing_date_reason: Miksi tämä ryhmä suljettiin
+          component_settings: Ryhmän komponenttiasetukset
           composition: Ryhmän kokoonpano
           created_at: Tilan luontiaika
           created_by: Kuka tämän ryhmän on luonut
diff --git a/decidim-assemblies/config/locales/fi.yml b/decidim-assemblies/config/locales/fi.yml
index bff1b363cea02..637d900d6ab75 100644
--- a/decidim-assemblies/config/locales/fi.yml
+++ b/decidim-assemblies/config/locales/fi.yml
@@ -25,6 +25,7 @@ fi:
         duration: Kesto
         facebook: Facebook
         github: GitHub
+        has_members: Tässä tilassa on jäseniä
         hero_image: Etusivun kuva
         import_attachments: Tuo liitteitä
         import_categories: Tuo aihepiirejä
@@ -170,8 +171,8 @@ fi:
           components: Komponentit
           info: Tietoa tästä ryhmästä
           landing_page: Laskeutumissivun asettelu
+          members: Jäsenet
           moderations: Moderoinnit
-          private_users: Jäsenet
           see_assembly: Näytä ryhmä
       models:
         assembly:
@@ -218,9 +219,11 @@ fi:
         export: "%{user_name} vei ryhmän %{resource_name}"
         import: "%{user_name} toi ryhmän %{resource_name}"
         publish: "%{user_name} julkaisi %{resource_name} ryhmän"
+        publish_all_members: "%{user_name} julkaisi ryhmän %{resource_name} jäsenet"
         restore: "%{user_name} palautti ryhmän %{resource_name}"
         soft_delete: "%{user_name} siirsi ryhmän %{resource_name} roskakoriin"
         unpublish: "%{user_name} perui ryhmän %{resource_name} julkaisun"
+        unpublish_all_members: "%{user_name} perui ryhmän %{resource_name} jäsenten julkaisun"
         update: "%{user_name} päivitti %{resource_name} ryhmän"
       assembly_member:
         create: "%{user_name} loi %{resource_name} jäsenen %{space_name} ryhmässä"
@@ -246,12 +249,13 @@ fi:
             define_taxonomy_filters: Määritä osallistumistilalle suodattimia ennen kuin käytät tätä asetusta.
             duration: Kesto
             duration_help: Jos ryhmän kesto on rajoitettu, valitse päättymispäivä. Muussa tapauksessa se näkyy määrittelemättömänä.
+            has_members_help: Voit luoda ja julkaista jäseniä
             images: Kuvat
             included_at_help: Valitse päivämäärä, jolloin tämä ryhmä lisättiin alustalle. Sen ei välttämättä tarvitse olla sama kuin luontipäivä.
             metadata: Metatiedot
             no_taxonomy_filters_found: Luokittelusuodattimia ei löytynyt.
             other: Muut
-            private_notice: Voit hallinnoida osallistumistilan yksityisiä käyttäjiä asettamalla osallistumistilan yksityiseksi
+            private_notice: Piilottaa osallistumistilan verkkosivuston vierailijoiden näkyvistä (ellei osallistumistila ole myös läpinäkyvä)
             select_a_created_by: Valitse luoja
             select_parent_assembly: Valitse pääryhmä
             slug_help_html: 'URL-tunnisteita käytetään tähän ryhmään osoittavien URL-osoitteiden luonnissa. Hyväksyy kirjaimet, numerot ja viivat. Ensimmäinen merkki on oltava kirjain. Esimerkiksi: %{url}'
@@ -384,6 +388,7 @@ fi:
           assembly_type: Ryhmän tyyppi
           closing_date: Ryhmän sulkemispäivä
           closing_date_reason: Miksi tämä ryhmä suljettiin
+          component_settings: Ryhmän komponenttiasetukset
           composition: Ryhmän kokoonpano
           created_at: Tilan luontiaika
           created_by: Kuka tämän ryhmän on luonut
diff --git a/decidim-assemblies/config/locales/fr-CA.yml b/decidim-assemblies/config/locales/fr-CA.yml
index 5b7d3dd91aa70..aefd524c9818c 100644
--- a/decidim-assemblies/config/locales/fr-CA.yml
+++ b/decidim-assemblies/config/locales/fr-CA.yml
@@ -25,6 +25,7 @@ fr-CA:
         duration: Durée
         facebook: Facebook
         github: GitHub
+        has_members: Cet espace a des membres
         hero_image: Image de la page d'accueil
         import_attachments: Importer les pièces jointes
         import_categories: Importer les catégories
@@ -169,8 +170,8 @@ fr-CA:
           attachments: Documents liés
           components: Composants
           info: À propos de cette assemblée
+          members: Membres
           moderations: Modérations
-          private_users: Membres
           see_assembly: Voir l'assemblée
       models:
         assembly:
@@ -217,9 +218,11 @@ fr-CA:
         export: "%{user_name} a exporté l'assemblée %{resource_name}"
         import: "%{user_name} a importé l'assemblée %{resource_name}"
         publish: "%{user_name} a publié l'assemblée %{resource_name}"
+        publish_all_members: "%{user_name} a publié tous les membres de l'assemblée %{resource_name}"
         restore: "%{user_name} a restauré l'assemblée %{resource_name}"
         soft_delete: "%{user_name} a déplacé dans la corbeille l'assemblée %{resource_name}"
         unpublish: "%{user_name} a dépublié l'assemblée %{resource_name}"
+        unpublish_all_members: "%{user_name} a dépublié tous les membres de l'assemblée %{resource_name}"
         update: "%{user_name} a mis à jour l'assemblée %{resource_name}"
       assembly_member:
         create: "%{user_name} a créé le membre %{resource_name} membre dans l'assemblée %{space_name}"
@@ -245,12 +248,13 @@ fr-CA:
             define_taxonomy_filters: Veuillez définir des filtres pour cet espace participatif avant d'utiliser ce paramètre.
             duration: Durée
             duration_help: Si la durée de cette assemblée est limitée, sélectionnez la date de fin. Sinon sa durée ne sera pas limitée.
+            has_members_help: Vous pourrez créer et publier des membres
             images: Images
             included_at_help: Sélectionnez la date à laquelle cet assemblée a été ajoutée à la plateforme. Elle ne doit pas nécessairement être identique à la date de création.
             metadata: Métadonnées
             no_taxonomy_filters_found: Aucun filtre de taxonomie trouvé.
             other: Autre
-            private_notice: Vous serez en mesure de gérer les participants privés après l'avoir défini comme privé
+            private_notice: Rend l'espace non visible pour les visiteurs et visible seulement pour les membres (sauf s'il est également transparent)
             select_a_created_by: Sélectionnez un créateur
             select_parent_assembly: Sélectionnez l'assemblée parente
             slug_help_html: 'Les identifiants d''URL sont utilisés pour générer les URL qui pointent vers cette assemblée. N''accepte que des lettres, des chiffres et des tirets et doit commencer par une lettre. Exemple : %{url}'
diff --git a/decidim-assemblies/config/locales/fr.yml b/decidim-assemblies/config/locales/fr.yml
index 57698c891462b..98eca80ea2bdc 100644
--- a/decidim-assemblies/config/locales/fr.yml
+++ b/decidim-assemblies/config/locales/fr.yml
@@ -25,6 +25,7 @@ fr:
         duration: Durée
         facebook: Facebook
         github: GitHub
+        has_members: Cet espace a des membres
         hero_image: Image de la page d'accueil
         import_attachments: Importer les pièces jointes
         import_categories: Importer les catégories
@@ -169,8 +170,8 @@ fr:
           attachments: Documents liés
           components: Fonctionnalités
           info: À propos de cette assemblée
+          members: Membres
           moderations: Modérations
-          private_users: Membres
           see_assembly: Voir l'assemblée
       models:
         assembly:
@@ -217,9 +218,11 @@ fr:
         export: "%{user_name} a exporté l'assemblée %{resource_name}"
         import: "%{user_name} a importé l'assemblée %{resource_name}"
         publish: "%{user_name} a publié l'assemblée %{resource_name}"
+        publish_all_members: "%{user_name} a publié tous les membres de l'assemblée %{resource_name}"
         restore: "%{user_name} a restauré l'assemblée %{resource_name}"
         soft_delete: "%{user_name} a déplacé dans la corbeille l'assemblée %{resource_name}"
         unpublish: "%{user_name} a dépublié l'assemblée %{resource_name}"
+        unpublish_all_members: "%{user_name} a dépublié tous les membres de l'assemblée %{resource_name}"
         update: "%{user_name} a mis à jour l'assemblée %{resource_name}"
       assembly_member:
         create: "%{user_name} a créé le membre %{resource_name} membre dans l'assemblée %{space_name}"
@@ -245,12 +248,13 @@ fr:
             define_taxonomy_filters: Veuillez définir des filtres pour cet espace participatif avant d'utiliser ce paramètre.
             duration: Durée
             duration_help: Si la durée de cette assemblée est limitée, sélectionnez la date de fin. Sinon sa durée ne sera pas limitée.
+            has_members_help: Vous pourrez créer et publier des membres
             images: Images
             included_at_help: Sélectionnez la date à laquelle cet assemblée a été ajoutée à la plateforme. Elle ne doit pas nécessairement être identique à la date de création.
             metadata: Métadonnées
             no_taxonomy_filters_found: Aucun filtre de taxonomie trouvé.
             other: Autre
-            private_notice: Vous serez en mesure de gérer les participants privés après l'avoir défini comme privé
+            private_notice: Rend l'espace non visible pour les visiteurs et visible seulement pour les membres (sauf s'il est également transparent)
             select_a_created_by: Sélectionnez un créateur
             select_parent_assembly: Sélectionnez l'assemblée parente
             slug_help_html: 'Les identifiants d''URL sont utilisés pour générer les URL qui pointent vers cette assemblée. N''accepte que des lettres, des chiffres et des tirets et doit commencer par une lettre. Exemple : %{url}'
diff --git a/decidim-assemblies/config/locales/he-IL.yml b/decidim-assemblies/config/locales/he-IL.yml
index 566dfe31a7643..374c6374daeb8 100644
--- a/decidim-assemblies/config/locales/he-IL.yml
+++ b/decidim-assemblies/config/locales/he-IL.yml
@@ -151,7 +151,6 @@ he:
           components: רכיבים
           info: אודות האסיפה
           moderations: שינויים
-          private_users: חברים
           see_assembly: ראה אסיפה
       models:
         assembly:
diff --git a/decidim-assemblies/config/locales/it.yml b/decidim-assemblies/config/locales/it.yml
index 0ed12b0f96a16..e1e7d875516fb 100644
--- a/decidim-assemblies/config/locales/it.yml
+++ b/decidim-assemblies/config/locales/it.yml
@@ -159,7 +159,6 @@ it:
           info: Info su questo spazio
           landing_page: Layout della pagina di destinazione
           moderations: Moderazione
-          private_users: Membri
           see_assembly: Guarda l'assemblea
       models:
         assembly:
@@ -239,7 +238,6 @@ it:
             metadata: Metadati
             no_taxonomy_filters_found: Nessun filtro trovato.
             other: Altro
-            private_notice: Sarai in grado di gestire i partecipanti privati dopo aver impostato lo spazio come privato
             select_a_created_by: Seleziona un creatore
             select_parent_assembly: Seleziona l'assemblea madre
             slug_help_html: 'Gli slug URL vengono utilizzati per generare gli URL che puntano a questa assemblea. Accetta solo lettere, numeri e trattini, e deve iniziare con una lettera. Esempio: %{url}'
diff --git a/decidim-assemblies/config/locales/ja.yml b/decidim-assemblies/config/locales/ja.yml
index e85ef4440c259..65ed99b3b2ce9 100644
--- a/decidim-assemblies/config/locales/ja.yml
+++ b/decidim-assemblies/config/locales/ja.yml
@@ -25,6 +25,7 @@ ja:
         duration: 持続期間
         facebook: Facebook
         github: GitHub
+        has_members: このスペースにはメンバーがいます
         hero_image: ホーム画像
         import_attachments: 添付ファイルをインポート
         import_categories: カテゴリをインポート
@@ -167,8 +168,8 @@ ja:
           components: コンポーネント
           info: この参加スペースについて
           landing_page: ランディングページのレイアウト
+          members: メンバー
           moderations: モデレーション
-          private_users: メンバー
           see_assembly: 参加スペースを見る
       models:
         assembly:
@@ -215,9 +216,11 @@ ja:
         export: "%{user_name} は %{resource_name} 参加スペースをエクスポートしました"
         import: "%{user_name} が %{resource_name} 参加スペースをインポートしました"
         publish: "%{user_name} が %{resource_name} 参加スペースを公開しました"
+        publish_all_members: "%{user_name} が参加スペース %{resource_name} のすべてのメンバーを公開しました"
         restore: "%{user_name} が %{resource_name} 参加スペースを復元しました"
         soft_delete: "%{user_name} が %{resource_name} 参加スペースをゴミ箱に移動しました"
         unpublish: "%{user_name} が %{resource_name} 参加スペースを非公開にしました"
+        unpublish_all_members: "%{user_name} が参加スペース %{resource_name} のすべてのメンバーを非公開にしました"
         update: "%{user_name} が %{resource_name} 参加スペースを更新しました"
       assembly_member:
         create: "%{user_name} が %{resource_name} 参加スペースで %{space_name} メンバーを作成しました"
@@ -243,12 +246,13 @@ ja:
             define_taxonomy_filters: この設定を使用する前に、参加型スペースのフィルターをいくつか定義してください。
             duration: 持続期間
             duration_help: この参加スペースの持続時間が限られている場合は、終了日を選択します。それ以外の場合は、不定義として表示されます。
+            has_members_help: メンバーを作成し、公開することができます
             images: 画像
             included_at_help: この参加スペースがプラットフォームに追加された日付を選択します。必ずしも作成日と同じである必要はありません。
             metadata: メタデータ
             no_taxonomy_filters_found: タクソノミーフィルタが見つかりません。
             other: その他
-            private_notice: プライベートとして設定した後、プライベート参加者を管理することができます
+            private_notice: 訪問者にはスペースを非表示にし、メンバーのみ表示します（透明化している場合を除きます）
             select_a_created_by: 作成者を選択してください
             select_parent_assembly: 親参加スペースを選択
             slug_help_html: 'URLスラグは、この参加スペースを指すURLを生成するために使用されます。 英字、数字、ハイフンのみを受け付け、英字で始める必要があります。例: %{url}'
@@ -307,7 +311,7 @@ ja:
         extra_data:
           name: 種別と期間
         highlighted_assemblies:
-          name: ハイライトされた参加スペース
+          name: 注目の参加スペース
         related_assemblies:
           name: 関連する参加スペース
       created_by:
@@ -381,6 +385,7 @@ ja:
           assembly_type: 参加スペースの種別
           closing_date: 参加スペースの終了日
           closing_date_reason: 参加スペースが終了した理由
+          component_settings: 参加スペースのコンポーネント設定
           composition: 参加スペースの構成
           created_at: このスペースの作成日時
           created_by: この参加スペースの作成者
@@ -434,7 +439,7 @@ ja:
           more_info: 詳細情報
           take_part: 参加する
         index:
-          promoted_assemblies: ハイライトされた参加スペース
+          promoted_assemblies: 注目の参加スペース
         metadata:
           children_item:
             other: "%{count} 個の参加スペース"
diff --git a/decidim-assemblies/config/locales/pt-BR.yml b/decidim-assemblies/config/locales/pt-BR.yml
index 8f9425ec60f19..6edb2bb34a09c 100644
--- a/decidim-assemblies/config/locales/pt-BR.yml
+++ b/decidim-assemblies/config/locales/pt-BR.yml
@@ -19,15 +19,20 @@ pt-BR:
         developer_group: Grupo promotor
         document: Documento
         domain: Domínio
+        duplicate_categories: Categorias duplicadas
+        duplicate_components: Componentes duplicados
+        duplicate_features: Recursos duplicados
         duration: Duração
         facebook: Facebook
         github: GitHub
+        has_members: Este espaço tem membros
         hero_image: Imagem inicial
         import_attachments: Importar anexos
         import_categories: Importar categorias
         import_components: Importar componentes
         included_at: Incluído em
         instagram: Instagram
+        internal_organisation: Organização interna
         is_transparent: É transparente
         local_area: Área da organização
         meta_scope: Metadados do escopo
@@ -83,12 +88,15 @@ pt-BR:
   decidim:
     admin:
       actions:
+        confirm_delete_assembly: Tem certeza de que deseja excluir esta assembleia? Se mudar de ideia, você pode restaurá-lo mais tarde.
         import_assembly: Importar
         new_assembly: Nova assembleia
         new_assembly_user_role: Novo administrador da assembleia
+        view_deleted_assemblies: Ver assembleias excluídas
       assemblies:
         create:
           error: Ocorreu um erro ao criar uma nova assembleia.
+          success: Assembléia criada com sucesso. Agora você pode adicionar componentes e configurá-la.
         edit:
           update: Atualizar
         index:
@@ -96,12 +104,23 @@ pt-BR:
           public: Público
           published: Publicados
           unpublished: Despublicado
+        manage_trash:
+          title: Assembléias excluídas
         new:
           create: Criar
           title: Nova assembleia
         update:
           error: Ocorreu um erro ao atualizar esta assembleia.
           success: Assembleia atualizada com sucesso.
+      assemblies_duplicates:
+        create:
+          error: Ocorreu um erro ao duplicar esta assembleia.
+          success: Assembléia duplicada com sucesso.
+      assembly_duplicates:
+        new:
+          duplicate: Duplicado
+          select: Selecione quais dados você gostaria de duplicar
+          title: Duplicar assembléia
       assembly_imports:
         create:
           error: Ocorreu um erro ao importar esta assembleia.
@@ -151,6 +170,8 @@ pt-BR:
           attachments: Anexos
           components: Componentes
           info: Sobre essa assambleia
+          landing_page: Layout página principal
+          members: Membros
           moderations: Moderação
           see_assembly: Ver assembleia
       models:
@@ -172,6 +193,7 @@ pt-BR:
             vice_president: Vice presidente
         assembly_user_role:
           fields:
+            actions: Ações
             email: O email
             name: Nome
             role: Cargo
@@ -179,10 +201,17 @@ pt-BR:
           roles:
             admin: Administrador
             collaborator: Colaborador
+            evaluator: Avaliador
             moderator: Moderador
+      taxonomy_filters:
+        space_filter_for:
+          assemblies: Todas as assembléias
       titles:
         assemblies: Assembleias
+        assemblies_deleted: Assembleias excluídas
         assemblies_types: Tipos de assembleia
+      tooltips:
+        deleted_assemblies_info: Uma assembleia só pode ser excluída se o status for "Não publicada".
     admin_log:
       assembly:
         create: "%{user_name} criou a assembleia %{resource_name}"
@@ -190,7 +219,11 @@ pt-BR:
         export: "%{user_name} exportou a assembleia %{resource_name}"
         import: "%{user_name} importou a assembleia %{resource_name}"
         publish: "%{user_name} publicou a assembleia %{resource_name}"
+        publish_all_members: "%{user_name} publicou todos os membros da assembleia %{resource_name}"
+        restore: "%{user_name} restaurou a assembleia %{resource_name}"
+        soft_delete: "%{user_name} movido para a lixeira da assembleia %{resource_name}"
         unpublish: "%{user_name} não desplublicou a assembleia %{resource_name}"
+        unpublish_all_members: "%{user_name} não publicado todos os membros da assembleia %{resource_name}"
         update: "%{user_name} atualizou a assembleia %{resource_name}"
       assembly_member:
         create: "%{user_name} criou o membro %{resource_name} na assembleia %{space_name}"
@@ -213,23 +246,33 @@ pt-BR:
         assemblies:
           form:
             announcement_help: O texto que você inserir aqui será mostrado ao usuário logo abaixo das informações de assembleia.
+            define_taxonomy_filters: Por favor, defina alguns filtros para este espaço participativo antes de usar esta configuração.
             duration: Duração
             duration_help: Se a duração dessa assembleia for limitada, selecione a data final. Caso contrário, aparecerá como indefinido.
+            has_members_help: Você conseguirá criar e publicar membros
             images: Imagens
             included_at_help: Selecione a data em que a assambleia foi adicionada à plataforma. Não precisa necessariamente ser o mesmo que a data de criação.
             metadata: Metadados
+            no_taxonomy_filters_found: Nenhum filtro de taxonomia encontrado.
             other: De outros
+            private_notice: Torna o espaço invisível para visitantes e exclusivo para membros (exceto se também for transparente)
             select_a_created_by: Selecione um criado por
             select_parent_assembly: Selecione a assembleia mãe
             slug_help_html: 'Os slugs de URL são usados ​​para gerar os URLs que apontam para essa assembleia. Apenas aceita letras, números e traços, e deve começar com uma carta. Exemplo: %{url}'
             social_handlers: Social
+            taxonomies: Taxonomias
             title: Informação geral
+            visibility: Visibilidade
+        assembly_duplicates:
+          form:
+            slug_help_html: 'Os slugs de URL são usados para gerar os URLs que apontam para essa assembleia. Aceita apenas letras, números e traços e deve começar com uma letra. Exemplo: %{url}'
         assembly_imports:
           form:
             slug_help_html: 'Os slugs de URL são usados ​​para gerar os URLs que apontam para essa assembleia. Apenas aceita letras, números e traços, e deve começar com uma carta. Exemplo: %{url}'
         assembly_members:
           form:
             explanation: 'Orientação para a imagem:'
+            image_guide: Preferencialmente, uma imagem de retrato que não tem nenhum texto.
             non_user_avatar_help: Você deve receber o consentimento das pessoas antes de publicá-las como membro.
         content_blocks:
           highlighted_assemblies:
@@ -307,6 +350,9 @@ pt-BR:
     assembly_members:
       index:
         title: Membros
+    download_your_data:
+      show:
+        assemblies: Exportação de assembléias
     events:
       assemblies:
         create_assembly_member:
@@ -334,11 +380,61 @@ pt-BR:
           not_found: 'O tipo de assembleia não foi encontrado no banco de dados (ID: %{id})'
     menu:
       assemblies: Assembleias
+    open_data:
+      help:
+        assemblies:
+          announcement: A informação de anúncio (chamada)
+          area: A área da assembleia
+          assembly_type: O tipo de assembleia
+          closing_date: A data de fechamento da assembleia
+          closing_date_reason: Porque a assembleia foi fechada
+          component_settings: As configurações do componente da assembleia
+          composition: A composição da assembleia
+          created_at: A data em que este espaço foi criado
+          created_by: Quem criou esta assembleia
+          created_by_other: Outro criador da assembleia
+          creation_date: A data de criação desta assembleia
+          decidim_scope_id: O escopo da assembleia
+          description: Uma longa descrição da assembleia
+          developer_group: O grupo de desenvolvedores da assembleia
+          duration: A duração da assembleia
+          facebook_handler: Manipulador de mídia social para Facebook
+          follows_count: O número de usuário seguindo este espaço
+          github_handler: Manipulador de mídia social para GitHub
+          id: O identificador único desta assembleia
+          included_at: A data de quando a assembleia foi incluído
+          instagram_handler: Manipulador de mídia social para Instagram
+          internal_organisation: A organização interna desta assembleia
+          is_transparent: Onde a assembleia é transparente ou não
+          local_area: A área local da assembleia
+          meta_scope: Os metadados do escopo da assembleia
+          participatory_scope: O escopo participativo da assembleia
+          participatory_structure: A estrutura participativa da assembleia
+          promoted: Se a assembleia é promovida ou não
+          published_at: A data que esse espaço foi publicado
+          purpose_of_action: O propósito da ação da assembleia
+          reference: A referência única do espaço
+          remote_banner_image_url: A URL da imagem do banner da assembleia
+          remote_hero_image_url: URL da imagem do herói assembleia
+          scope: O escopo da assembleia
+          scopes_enabled: Se os escopos estão habilitados ou não
+          short_description: Uma breve descrição da assembleia
+          slug: O slug da assembleia(usado para fins de identificação, para a URL)
+          special_features: Quais características especiais esta assembleia tem
+          subtitle: O subtítulo da assembleia
+          target: O alvo da assembleia
+          taxonomies: As taxonomias do projeto
+          title: Título da assembleia
+          twitter_handler: Manipulador de mídia social para Twitter
+          updated_at: A última data em que este espaço foi atualizado
+          url: A URL do espaço
+          youtube_handler: Manipulador de mídia social para o YouTube
     participatory_processes:
       show:
         related_assemblies: Assembleias Relacionadas
     statistics:
       assemblies_count: Assembleias
+      assemblies_count_tooltip: O número de assembleias públicas onde são tomadas decisões colectivas.
   layouts:
     decidim:
       assemblies:
diff --git a/decidim-assemblies/config/locales/pt.yml b/decidim-assemblies/config/locales/pt.yml
index 3749893eb2c09..8481b03253dfe 100644
--- a/decidim-assemblies/config/locales/pt.yml
+++ b/decidim-assemblies/config/locales/pt.yml
@@ -158,7 +158,6 @@ pt:
           components: Componentes
           info: Sobre esta reunião
           moderations: Moderação
-          private_users: Membros
           see_assembly: Veja a reunião
       models:
         assembly:
@@ -236,7 +235,6 @@ pt:
             metadata: Metadados
             no_taxonomy_filters_found: Nenhum filtro de taxonomia encontrado.
             other: Outros
-            private_notice: Poderá gerir participantes privados depois de os definir como privados
             select_a_created_by: Selecione um criado por
             select_parent_assembly: Selecione a reunião pai
             slug_help_html: 'São usados slugs de URL para gerar URLs que apontam para esta reunião. Aceita apenas letras, números e traços, e deve começar com uma letra. Exemplo: %{url}'
diff --git a/decidim-assemblies/config/locales/ro-RO.yml b/decidim-assemblies/config/locales/ro-RO.yml
index 4940ce0d6dfc8..46f5fe2c5d500 100644
--- a/decidim-assemblies/config/locales/ro-RO.yml
+++ b/decidim-assemblies/config/locales/ro-RO.yml
@@ -22,6 +22,7 @@ ro:
         duration: Durată
         facebook: Facebook
         github: GitHub
+        has_members: Acest spațiu are membri
         hero_image: Imagine pentru pagina principală
         import_attachments: Importă atașamente
         import_categories: Importă categorii
@@ -203,10 +204,12 @@ ro:
             announcement_help: Textul pe care îl introduceți aici va fi prezentat utilizatorului sub informațiile despre grupul de lucru.
             duration: Durată
             duration_help: În cazul în care durata acestui grup de lucru este limitată, selectaţi data de încheiere. În caz contrar, va apărea ca nelimitată.
+            has_members_help: Veți putea crea și publica membri
             images: Imagini
             included_at_help: Selectați data la care acest grup de lucru a fost adăugat în platformă. Nu trebuie să fie neapărat aceeași dată cu data creării.
             metadata: Metadate
             other: Altul
+            private_notice: Face spațiul invizibil pentru vizitatori și vizibil doar pentru membri (cu excepția cazului în care este de asemenea transparent)
             select_a_created_by: Selectați după persoana care a creat
             select_parent_assembly: Selectați grupul de lucru părinte
             social_handlers: Rețele de socializare
@@ -321,6 +324,11 @@ ro:
           take_part: Participă
         index:
           promoted_assemblies: Grupuri de lucru evidențiate
+        metadata:
+          children_item:
+            one: "%{count} grup de lucru"
+            few: "%{count} grupuri de lucru"
+            other: "%{count} grup de lucru"
         order_by_assemblies:
           assemblies:
             one: "%{count} grup de lucru"
diff --git a/decidim-assemblies/config/locales/sv.yml b/decidim-assemblies/config/locales/sv.yml
index 00b214ff379dc..d61b6fef4f34b 100644
--- a/decidim-assemblies/config/locales/sv.yml
+++ b/decidim-assemblies/config/locales/sv.yml
@@ -170,7 +170,6 @@ sv:
           components: Komponenter
           info: Om samrådet
           moderations: Moderering
-          private_users: Medlemmar
           see_assembly: Visa samråd
       models:
         assembly:
@@ -217,9 +216,11 @@ sv:
         export: "%{user_name} exporterade samrådet %{resource_name}"
         import: "%{user_name} importerade samrådet %{resource_name}"
         publish: "%{user_name} publicerade samrådet %{resource_name}"
+        publish_all_members: "%{user_name} publicerade samrådet %{resource_name}"
         restore: "%{user_name} återställde samrådet %{resource_name}"
         soft_delete: "%{user_name} tog bort samrådet %{resource_name}"
         unpublish: "%{user_name} avpublicerade samrådet %{resource_name}"
+        unpublish_all_members: "%{user_name} avpublicerade samrådet %{resource_name}"
         update: "%{user_name} uppdaterade samrådet %{resource_name}"
       assembly_member:
         create: "%{user_name} skapade medlemmen %{resource_name} i samrådet %{space_name}"
@@ -250,7 +251,6 @@ sv:
             metadata: Metadata
             no_taxonomy_filters_found: Inga filter för kategorier hittades.
             other: Övrigt
-            private_notice: Du kommer att kunna hantera medlemmar om samrådet gjorts privat
             select_a_created_by: Välj en skapad av
             select_parent_assembly: Välj överordnat samråd
             slug_help_html: 'URL-slugs används till att generera URL:er till samrådet. Använd bara bokstäver, siffror och bindestreck, och de måste börja med en bokstav. Exempel: %{url}'
diff --git a/decidim-assemblies/config/locales/tr-TR.yml b/decidim-assemblies/config/locales/tr-TR.yml
index b7a91b2c30e00..a87b20af85fff 100644
--- a/decidim-assemblies/config/locales/tr-TR.yml
+++ b/decidim-assemblies/config/locales/tr-TR.yml
@@ -132,6 +132,8 @@ tr:
           attachment_files: Dosyalar
           attachments: Ekler
           components: Bileşenler
+          info: Bu meclis hakkında
+          landing_page:
           moderations: Yönetim
       models:
         assembly:
@@ -162,6 +164,8 @@ tr:
       titles:
         assemblies: Kurullar
         assemblies_types: Kurul türleri
+      tooltips:
+        deleted_assemblies_info: Bir meclis yalnızca eğer statüsü "Yayınlanmamış" ise silinebilir.
     admin_log:
       assembly:
         create: "%{user_name} %{resource_name} kurulu oluşturdu"
@@ -193,11 +197,17 @@ tr:
             duration_help: Bu kurulun süresi sınırlıysa, bitiş tarihini seçin. Aksi takdirde belirsiz görünecektir.
             images: Resimler
             metadata: Meta veri
+            no_taxonomy_filters_found: Kategori filtresi bulunamadı.
             other: Diğer
             select_a_created_by: tarafından oluşturulanı seçin
             select_parent_assembly: Bağlı olduğu kurulu seçin
             social_handlers: Sosyal
             title: Genel bilgi
+            visibility: Görünürlük
+        assembly_members:
+          form:
+            explanation: 'Görüntü kılavuzu:'
+            non_user_avatar_help: Üye olarak yayınlamadan önce kişilerin onayını almalısınız.
         content_blocks:
           highlighted_assemblies:
             max_results: Gösterilecek maksimum öğe miktarı
@@ -244,6 +254,7 @@ tr:
       assemblies:
         create_assembly_member:
           email_intro: <a href="%{resource_url}">%{resource_name} </a> kurulun bir yöneticisi sizi üyelerinden biri olarak ekledi.
+          email_outro: Bu bildirimi bir toplantıya davet edildiğiniz için aldınız. Katkıda bulunmak için <a href="%{resource_url}"> kurul sayfasını </a> kontrol edin!
           email_subject: '%{resource_name} kuruluna üye olmak için davet edildiniz!'
           notification_title: <a href="%{resource_path}">%{resource_name}</a> Kurulu üyesi olarak kaydoldunuz. Katkıda bulunmak için <a href="%{resource_path}">kurul sayfasını</a> kontrol edin!
       assembly:
@@ -266,6 +277,10 @@ tr:
           not_found: 'Kurul türü veritabanında bulunamadı (ID: %{id})'
     menu:
       assemblies: Kurullar
+    open_data:
+      help:
+        assemblies:
+          decidim_scope_id: Meclisin kapsamı
     participatory_processes:
       show:
         related_assemblies: İlgili kurullar
diff --git a/decidim-assemblies/db/migrate/20251205120000_add_has_members_to_decidim_assemblies.rb b/decidim-assemblies/db/migrate/20251205120000_add_has_members_to_decidim_assemblies.rb
new file mode 100644
index 0000000000000..02a313a9a5d78
--- /dev/null
+++ b/decidim-assemblies/db/migrate/20251205120000_add_has_members_to_decidim_assemblies.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddHasMembersToDecidimAssemblies < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_assemblies, :has_members, :boolean, default: false
+  end
+end
diff --git a/decidim-assemblies/lib/decidim/assemblies/admin_engine.rb b/decidim-assemblies/lib/decidim/assemblies/admin_engine.rb
index 966a16ce0a028..37537257603c2 100644
--- a/decidim-assemblies/lib/decidim/assemblies/admin_engine.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/admin_engine.rb
@@ -81,12 +81,12 @@ class AdminEngine < ::Rails::Engine
               resources :reports, controller: "moderations/reports", only: [:index, :show]
             end
 
-            resources :participatory_space_private_users, controller: "participatory_space_private_users" do
+            resources :members, controller: "members" do
               member do
-                post :resend_invitation, to: "participatory_space_private_users#resend_invitation"
+                post :resend_invitation, to: "members#resend_invitation"
               end
               collection do
-                resource :participatory_space_private_users_csv_imports, only: [:new, :create], path: "csv_import" do
+                resource :members_csv_imports, only: [:new, :create], path: "csv_import" do
                   delete :destroy_all
                 end
                 post :publish_all
diff --git a/decidim-assemblies/lib/decidim/assemblies/engine.rb b/decidim-assemblies/lib/decidim/assemblies/engine.rb
index ff6da75075f89..ebd08fba721d4 100644
--- a/decidim-assemblies/lib/decidim/assemblies/engine.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/engine.rb
@@ -27,7 +27,7 @@ class Engine < ::Rails::Engine
           }, constraints: { assembly_id: /[0-9]+/ }
 
           resources :assemblies, only: [:index, :show], param: :slug, path: "assemblies" do
-            resources :participatory_space_private_users, only: :index, path: "members"
+            resources :members, only: :index, path: "members"
           end
 
           scope "/assemblies/:assembly_slug/f/:component_id" do
@@ -96,8 +96,8 @@ class Engine < ::Rails::Engine
         Decidim.view_hooks.register(:user_profile_bottom, priority: Decidim::ViewHooks::MEDIUM_PRIORITY) do |view_context|
           assemblies = OrganizationPublishedAssemblies.new(view_context.current_organization, view_context.current_user)
                                                       .query.distinct
-                                                      .joins(:participatory_space_private_users)
-                                                      .merge(Decidim::ParticipatorySpacePrivateUser.where(user: view_context.profile_holder))
+                                                      .joins(:members)
+                                                      .merge(Decidim::ParticipatorySpace::Member.where(user: view_context.profile_holder))
                                                       .reorder(title: :asc)
 
           next unless assemblies.any?
diff --git a/decidim-assemblies/lib/decidim/assemblies/menu.rb b/decidim-assemblies/lib/decidim/assemblies/menu.rb
index d632409a09ae2..2ebbf1d1b54c1 100644
--- a/decidim-assemblies/lib/decidim/assemblies/menu.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/menu.rb
@@ -122,11 +122,11 @@ def self.register_admin_assembly_menu!
                         icon_name: "user-settings-line",
                         if: allowed_to?(:read, :assembly_user_role, assembly: current_participatory_space)
 
-          menu.add_item :participatory_space_private_users,
-                        I18n.t("private_users", scope: "decidim.admin.menu.assemblies_submenu"),
-                        decidim_admin_assemblies.participatory_space_private_users_path(current_participatory_space),
-                        icon_name: "spy-line",
-                        if: allowed_to?(:read, :space_private_user, current_participatory_space:)
+          menu.add_item :members,
+                        I18n.t("members", scope: "decidim.admin.menu.assemblies_submenu"),
+                        decidim_admin_assemblies.members_path(current_participatory_space),
+                        icon_name: "user-settings-line",
+                        if: allowed_to?(:read, :space_member, current_participatory_space:)
 
           menu.add_item :moderations,
                         I18n.t("moderations", scope: "decidim.admin.menu.assemblies_submenu"),
diff --git a/decidim-assemblies/lib/decidim/assemblies/participatory_space.rb b/decidim-assemblies/lib/decidim/assemblies/participatory_space.rb
index 140a4ea33bec8..b3b4248de2bb6 100644
--- a/decidim-assemblies/lib/decidim/assemblies/participatory_space.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/participatory_space.rb
@@ -13,8 +13,6 @@
 
   participatory_space.query_type = "Decidim::Assemblies::AssemblyType"
 
-  participatory_space.breadcrumb_cell = "decidim/assemblies/assembly_dropdown_metadata"
-
   participatory_space.register_resource(:assembly) do |resource|
     resource.model_class_name = "Decidim::Assembly"
     resource.card = "decidim/assemblies/assembly"
diff --git a/decidim-assemblies/lib/decidim/assemblies/test/factories.rb b/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
index ba2f11e6d8dab..cefe5ad3d9a55 100644
--- a/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
@@ -37,6 +37,7 @@
     participatory_scope { generate_localized_title(:assembly_participatory_scope, skip_injection:) }
     participatory_structure { generate_localized_title(:assembly_participatory_structure, skip_injection:) }
     private_space { false }
+    has_members { false }
     purpose_of_action { generate_localized_description(:assembly_purpose_of_action, skip_injection:) }
     composition { generate_localized_description(:assembly_composition, skip_injection:) }
     creation_date { 1.month.ago }
diff --git a/decidim-assemblies/spec/cells/decidim/assemblies/assembly_dropdown_metadata_cell_spec.rb b/decidim-assemblies/spec/cells/decidim/assemblies/assembly_dropdown_metadata_cell_spec.rb
deleted file mode 100644
index 4953a9f7ef426..0000000000000
--- a/decidim-assemblies/spec/cells/decidim/assemblies/assembly_dropdown_metadata_cell_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-require "decidim/core/test/shared_examples/participatory_space_dropdown_metadata_cell_examples"
-
-module Decidim::Assemblies
-  describe AssemblyDropdownMetadataCell, type: :cell do
-    controller Decidim::ApplicationController
-
-    subject { cell("decidim/assemblies/assembly_dropdown_metadata", model).call }
-
-    let(:model) { create(:assembly) }
-
-    include_examples "participatory space dropdown metadata cell"
-  end
-end
diff --git a/decidim-assemblies/spec/commands/create_assembly_spec.rb b/decidim-assemblies/spec/commands/create_assembly_spec.rb
index c9a899f4d67bd..2c1b8d4ec858d 100644
--- a/decidim-assemblies/spec/commands/create_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/create_assembly_spec.rb
@@ -46,6 +46,7 @@ module Decidim::Assemblies
         organization:,
         taxonomizations:,
         parent: nil,
+        has_members: false,
         private_space: false,
         errors:,
         participatory_processes_ids: related_process_ids,
diff --git a/decidim-assemblies/spec/controllers/participatory_space_private_users_controller_spec.rb b/decidim-assemblies/spec/controllers/members_controller_spec.rb
similarity index 80%
rename from decidim-assemblies/spec/controllers/participatory_space_private_users_controller_spec.rb
rename to decidim-assemblies/spec/controllers/members_controller_spec.rb
index fbb67ca018d62..ca92debb9a51b 100644
--- a/decidim-assemblies/spec/controllers/participatory_space_private_users_controller_spec.rb
+++ b/decidim-assemblies/spec/controllers/members_controller_spec.rb
@@ -5,7 +5,7 @@
 
 module Decidim
   module Assemblies
-    describe ParticipatorySpacePrivateUsersController do
+    describe MembersController do
       routes { Decidim::Assemblies::Engine.routes }
 
       def decidim_assemblies
@@ -14,7 +14,7 @@ def decidim_assemblies
 
       let(:organization) { create(:organization) }
 
-      let!(:privatable_to) do
+      let!(:participatory_space) do
         create(
           :assembly,
           :published,
@@ -23,10 +23,10 @@ def decidim_assemblies
         )
       end
 
-      let(:destination_path) { decidim_assemblies.assembly_path(privatable_to, locale: I18n.locale) }
+      let(:destination_path) { decidim_assemblies.assembly_path(participatory_space, locale: I18n.locale) }
 
       let(:slug_param) { "assembly_slug" }
-      let(:slug) { privatable_to.slug }
+      let(:slug) { participatory_space.slug }
 
       it_behaves_like "participatory space members page examples"
     end
diff --git a/decidim-assemblies/spec/forms/assembly_form_spec.rb b/decidim-assemblies/spec/forms/assembly_form_spec.rb
index 0097da852d875..0924b5b1705b0 100644
--- a/decidim-assemblies/spec/forms/assembly_form_spec.rb
+++ b/decidim-assemblies/spec/forms/assembly_form_spec.rb
@@ -42,6 +42,7 @@ module Admin
         let(:slug) { "slug" }
         let(:attachment) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
         let(:private_space) { true }
+        let(:has_members) { true }
         let(:purpose_of_action) do
           {
             en: "Purpose of action",
@@ -129,6 +130,7 @@ module Admin
               "banner_image" => attachment,
               "slug" => slug,
               "private_space" => private_space,
+              "has_members" => has_members,
               "purpose_of_action_en" => purpose_of_action[:en],
               "purpose_of_action_es" => purpose_of_action[:es],
               "purpose_of_action_ca" => purpose_of_action[:ca],
@@ -165,6 +167,18 @@ module Admin
           }
         end
 
+        context "when has_members is true" do
+          let(:has_members) { true }
+
+          it { is_expected.to be_valid }
+        end
+
+        context "when has_members is false" do
+          let(:has_members) { false }
+
+          it { is_expected.to be_valid }
+        end
+
         context "when everything is OK" do
           it { is_expected.to be_valid }
         end
diff --git a/decidim-assemblies/spec/forms/decidim/assemblies/admin/assembly_import_form_spec.rb b/decidim-assemblies/spec/forms/decidim/assemblies/admin/assembly_import_form_spec.rb
new file mode 100644
index 0000000000000..8c5d47ed2470d
--- /dev/null
+++ b/decidim-assemblies/spec/forms/decidim/assemblies/admin/assembly_import_form_spec.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Assemblies
+    module Admin
+      describe AssemblyImportForm do
+        subject { form }
+
+        let(:organization) { create(:organization) }
+        let(:document) { upload_test_file(Decidim::Dev.asset("assemblies.json"), content_type: "application/json", return_blob: true) }
+        let(:slug) { "imported-assembly-slug" }
+        let(:title) do
+          {
+            en: "Imported Assembly",
+            es: "Asamblea Importada",
+            ca: "Assemblea Importada"
+          }
+        end
+
+        let(:params) do
+          {
+            slug:,
+            title_en: title[:en],
+            title_es: title[:es],
+            title_ca: title[:ca],
+            document:,
+            import_steps: true,
+            import_attachments: true,
+            import_components: true
+          }
+        end
+
+        let(:form) do
+          described_class.from_params(params).with_context(
+            current_organization: organization
+          )
+        end
+
+        context "when everything is OK" do
+          it { is_expected.to be_valid }
+        end
+
+        context "when document is missing" do
+          let(:document) { nil }
+
+          it { is_expected.to be_invalid }
+
+          it "adds an error on document" do
+            form.valid?
+            expect(form.errors[:document]).not_to be_empty
+          end
+        end
+
+        context "when document content type is not valid" do
+          let(:document) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg"), return_blob: true) }
+
+          it { is_expected.to be_invalid }
+
+          it "adds an error on document" do
+            form.valid?
+            expect(form.errors[:document]).not_to be_empty
+          end
+        end
+
+        context "when slug is missing" do
+          let(:slug) { nil }
+
+          it { is_expected.to be_invalid }
+        end
+
+        context "when slug is not valid" do
+          let(:slug) { "123-invalid-slug" }
+
+          it { is_expected.to be_invalid }
+        end
+
+        context "when slug is not unique" do
+          before do
+            create(:assembly, slug:, organization:)
+          end
+
+          it { is_expected.to be_invalid }
+
+          it "adds an error on slug" do
+            form.valid?
+            expect(form.errors[:slug]).not_to be_empty
+          end
+        end
+
+        context "when default language in title is missing" do
+          let(:title) do
+            {
+              ca: "Assemblea Importada"
+            }
+          end
+
+          it { is_expected.to be_invalid }
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-assemblies/spec/lib/query_extensions_spec.rb b/decidim-assemblies/spec/lib/query_extensions_spec.rb
index 9262797848e0b..c412b88da37d6 100644
--- a/decidim-assemblies/spec/lib/query_extensions_spec.rb
+++ b/decidim-assemblies/spec/lib/query_extensions_spec.rb
@@ -38,8 +38,8 @@ module Core
           let!(:assembly) { create(:assembly) }
           let(:id) { assembly.id }
 
-          it "returns nil" do
-            expect(response["assembly"]).to be_nil
+          it_behaves_like "graphQL not found space" do
+            let(:space_type) { "assembly" }
           end
         end
       end
diff --git a/decidim-assemblies/spec/permissions/decidim/assemblies/permissions_spec.rb b/decidim-assemblies/spec/permissions/decidim/assemblies/permissions_spec.rb
index a7f93add8eec4..ca734f95813db 100644
--- a/decidim-assemblies/spec/permissions/decidim/assemblies/permissions_spec.rb
+++ b/decidim-assemblies/spec/permissions/decidim/assemblies/permissions_spec.rb
@@ -429,11 +429,11 @@
       it_behaves_like "allows any action on subject", :assembly
       it_behaves_like "allows any action on subject", :assembly_user_role
 
-      context "when private assembly" do
-        let(:assembly) { create(:assembly, organization:, private_space: true) }
+      context "when assembly has members" do
+        let(:assembly) { create(:assembly, organization:, has_members: true) }
         let!(:context) { { current_participatory_space: assembly } }
 
-        it_behaves_like "allows any action on subject", :space_private_user
+        it_behaves_like "allows any action on subject", :space_member
       end
     end
 
@@ -463,11 +463,11 @@
       it_behaves_like "allows any action on subject", :assembly
       it_behaves_like "allows any action on subject", :assembly_user_role
 
-      context "when private assembly" do
-        let(:assembly) { create(:assembly, organization:, private_space: true) }
+      context "when assembly has members" do
+        let(:assembly) { create(:assembly, organization:, has_members: true) }
         let!(:context) { { current_participatory_space: assembly } }
 
-        it_behaves_like "allows any action on subject", :space_private_user
+        it_behaves_like "allows any action on subject", :space_member
       end
     end
   end
diff --git a/decidim-assemblies/spec/shared/manage_assembly_private_users_examples.rb b/decidim-assemblies/spec/shared/manage_assembly_private_users_examples.rb
deleted file mode 100644
index 7810cc6a06cda..0000000000000
--- a/decidim-assemblies/spec/shared/manage_assembly_private_users_examples.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-# frozen_string_literal: true
-
-shared_examples "manage assembly private users examples" do
-  let(:other_user) { create(:user, organization:, email: "my_email@example.org") }
-
-  let!(:assembly_private_user) { create(:assembly_private_user, user:, privatable_to: assembly) }
-
-  before do
-    switch_to_host(organization.host)
-    login_as user, scope: :user
-    visit decidim_admin_assemblies.edit_assembly_path(assembly)
-    within_admin_sidebar_menu do
-      click_on "Members"
-    end
-  end
-
-  it "shows assembly private user list" do
-    within "#private_users table" do
-      expect(page).to have_content(assembly_private_user.user.email)
-    end
-  end
-
-  it "creates a new assembly private users" do
-    click_on "New participatory space private user"
-
-    within ".new_participatory_space_private_user" do
-      fill_in :participatory_space_private_user_name, with: "John Doe"
-      fill_in :participatory_space_private_user_email, with: other_user.email
-
-      find("*[type=submit]").click
-    end
-
-    expect(page).to have_admin_callout("successfully")
-
-    within "#private_users table" do
-      expect(page).to have_content(other_user.email)
-    end
-
-    visit decidim_admin.root_path
-    expect(page).to have_content("invited #{other_user.name} to be a private participant")
-  end
-
-  describe "when import a batch of private users from csv" do
-    it "import a batch of participatory space private users" do
-      click_on "Import via CSV"
-
-      # The CSV has no headers
-      expect(Decidim::Admin::ImportParticipatorySpacePrivateUserCsvJob).to receive(:perform_later).once.ordered.with("john.doe@example.org", "John Doe", assembly, user)
-      expect(Decidim::Admin::ImportParticipatorySpacePrivateUserCsvJob).to receive(:perform_later).once.ordered.with("jane.doe@example.org", "Jane Doe", assembly, user)
-      dynamically_attach_file(:participatory_space_private_user_csv_import_file, Decidim::Dev.asset("import_participatory_space_private_users.csv"))
-      perform_enqueued_jobs { click_on "Upload" }
-
-      expect(page).to have_content("CSV file uploaded successfully")
-    end
-  end
-
-  describe "when managing different users" do
-    before do
-      create(:assembly_private_user, user: other_user, privatable_to: assembly)
-      visit current_path
-    end
-
-    it "deletes an assembly_private_user" do
-      within "#private_users tr", text: other_user.email do
-        find("button[data-controller='dropdown']").click
-        accept_confirm { click_on "Delete" }
-      end
-
-      expect(page).to have_admin_callout("successfully")
-
-      within "#private_users table" do
-        expect(page).to have_no_content(other_user.email)
-      end
-    end
-
-    context "when the user has not accepted the invitation" do
-      before do
-        form = Decidim::Admin::ParticipatorySpacePrivateUserForm.from_params(
-          name: "test",
-          email: "test@example.org"
-        )
-
-        Decidim::Admin::CreateParticipatorySpacePrivateUser.call(
-          form,
-          assembly
-        )
-
-        visit current_path
-      end
-
-      it "resends the invitation to the user" do
-        within "#private_users tr", text: "test@example.org" do
-          find("button[data-controller='dropdown']").click
-          click_on "Resend invitation"
-        end
-
-        expect(page).to have_admin_callout("successfully")
-      end
-    end
-  end
-end
diff --git a/decidim-assemblies/spec/system/admin/admin_filters_assemblies_members_spec.rb b/decidim-assemblies/spec/system/admin/admin_filters_assemblies_members_spec.rb
new file mode 100644
index 0000000000000..42c8ee733c8bf
--- /dev/null
+++ b/decidim-assemblies/spec/system/admin/admin_filters_assemblies_members_spec.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin filters assemblies members" do
+  include_context "with filterable context"
+
+  let(:organization) { create(:organization) }
+  let!(:user) { create(:user, :admin, :confirmed, organization:) }
+  let(:assembly) { create(:assembly, organization:, has_members: true) }
+
+  let!(:invited_user1) { create(:user, name:, organization:, invitation_sent_at: 1.day.ago, invitation_accepted_at: Time.current) }
+  let!(:invited_member1) { create(:assembly_member, user: invited_user1, participatory_space: assembly) }
+  let!(:invited_user2) { create(:user, email:, organization:) }
+  let!(:invited_member2) { create(:assembly_member, user: invited_user2, participatory_space: assembly) }
+
+  let(:name) { "Dummy Name" }
+  let(:email) { "dummy_email@example.org" }
+
+  let(:resource_controller) { Decidim::Assemblies::Admin::MembersController }
+
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+    visit decidim_admin_assemblies.members_path(assembly_slug: assembly.slug)
+  end
+
+  context "when managing assembly with members" do
+    before do
+      switch_to_host(organization.host)
+      login_as user, scope: :user
+      visit decidim_admin_assemblies.edit_assembly_path(assembly)
+      within_admin_sidebar_menu do
+        click_on "Members"
+      end
+    end
+
+    include_examples "filterable participatory space users"
+    include_examples "searchable participatory space users"
+  end
+
+  context "when trying to manage members and the space does not have members" do
+    let(:assembly) { create(:assembly, organization:, has_members: false) }
+
+    it "restricts access" do
+      expect(page).to have_admin_callout("You are not authorized to perform this action.")
+    end
+  end
+
+  describe "when publishing all members" do
+    let!(:member) { create(:member, :unpublished, user:, participatory_space: assembly) }
+
+    it "publishes all members" do
+      click_on "Publish all"
+
+      sleep(1)
+      expect(member.reload).to be_published
+    end
+
+    it "displays the correct log message" do
+      click_on "Publish all"
+      sleep(1)
+      visit decidim_admin.root_path
+      expect(page).to have_content("published all members of the #{translated(assembly.title)} assembly")
+    end
+  end
+end
diff --git a/decidim-assemblies/spec/system/admin/admin_filters_assemblies_private_space_users_spec.rb b/decidim-assemblies/spec/system/admin/admin_filters_assemblies_private_space_users_spec.rb
deleted file mode 100644
index cdf0951924173..0000000000000
--- a/decidim-assemblies/spec/system/admin/admin_filters_assemblies_private_space_users_spec.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "Admin filters assemblies private space users" do
-  include_context "with filterable context"
-
-  let(:organization) { create(:organization) }
-  let!(:user) { create(:user, :admin, :confirmed, organization:) }
-  let(:assembly) { create(:assembly, organization:, private_space: true) }
-
-  let!(:invited_user1) { create(:user, name:, organization:) }
-  let!(:invited_private_user1) { create(:assembly_private_user, user: invited_user1, privatable_to: assembly) }
-  let!(:invited_user2) { create(:user, email:, organization:) }
-  let!(:invited_private_user2) { create(:assembly_private_user, user: invited_user2, privatable_to: assembly) }
-
-  let(:name) { "Dummy Name" }
-  let(:email) { "dummy_email@example.org" }
-
-  let(:resource_controller) { Decidim::Assemblies::Admin::ParticipatorySpacePrivateUsersController }
-
-  context "when managing private process" do
-    before do
-      invited_user1.update!(invitation_sent_at: 1.day.ago, invitation_accepted_at: Time.current)
-
-      switch_to_host(organization.host)
-      login_as user, scope: :user
-      visit decidim_admin_assemblies.edit_assembly_path(assembly)
-      within_admin_sidebar_menu do
-        click_on "Members"
-      end
-    end
-
-    include_examples "filterable participatory space users"
-    include_examples "searchable participatory space users"
-  end
-
-  context "when managing private users in a public process" do
-    let(:assembly) { create(:assembly, organization:, private_space: false) }
-
-    before do
-      invited_user1.update!(invitation_sent_at: 1.day.ago, invitation_accepted_at: Time.current)
-
-      switch_to_host(organization.host)
-      login_as user, scope: :user
-      visit decidim_admin_assemblies.participatory_space_private_users_path(assembly_slug: assembly.slug)
-    end
-
-    it "restricts access" do
-      expect(page).to have_admin_callout("You are not authorized to perform this action.")
-    end
-  end
-end
diff --git a/decidim-assemblies/spec/system/admin/admin_filters_assemblies_spec.rb b/decidim-assemblies/spec/system/admin/admin_filters_assemblies_spec.rb
new file mode 100644
index 0000000000000..a8c5ec0574306
--- /dev/null
+++ b/decidim-assemblies/spec/system/admin/admin_filters_assemblies_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin sorting assemblies" do
+  let(:organization) { create(:organization) }
+  let(:user) { create(:user, :admin, :confirmed, organization:) }
+
+  let!(:old_assembly) { create(:assembly, title: { en: "Old assembly" }, created_at: 3.weeks.ago, organization:) }
+  let!(:recent_assembly) { create(:assembly, title: { en: "Recent assembly" }, created_at: 1.day.ago, organization:) }
+  let!(:newest_assembly) { create(:assembly, title: { en: "Newest assembly" }, created_at: Time.current, organization:) }
+
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+    visit decidim_admin_assemblies.assemblies_path
+  end
+
+  context "when sorting assemblies by their creation" do
+    it "sorts by created_at descending by default" do
+      within "table thead" do
+        click_link "Created at"
+      end
+
+      titles = page.all("table tbody tr td:first-child")
+      expect(titles[0].text).to include("Newest assembly")
+      expect(titles[1].text).to include("Recent assembly")
+      expect(titles[2].text).to include("Old assembly")
+    end
+
+    it "sorts by created_at ascending when clicked again" do
+      within "table thead" do
+        click_link "Created at"
+        click_link "Created at"
+      end
+
+      titles = page.all("table tbody tr td:first-child")
+      expect(titles[0].text).to include("Old assembly")
+      expect(titles[1].text).to include("Recent assembly")
+      expect(titles[2].text).to include("Newest assembly")
+    end
+  end
+end
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 1103ea69c6537..1d4ca58eb7f2b 100644
--- a/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
@@ -11,6 +11,18 @@
     visit decidim_admin_assemblies.assemblies_path
   end
 
+  context "when viewing the import page" do
+    before do
+      within_admin_menu do
+        click_on "Import"
+      end
+    end
+
+    it "displays the import help text" do
+      expect(page).to have_content("This import feature allows you to create a new assembly from an exported JSON file")
+    end
+  end
+
   context "when importing the assembly with basic fields" do
     before do
       stub_get_request_with_format(
diff --git a/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb b/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
index 8335a9dd69ab0..36fdddf06558f 100644
--- a/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
@@ -11,8 +11,8 @@
   let(:resource_controller) { Decidim::Assemblies::Admin::AssembliesController }
   let(:model_name) { assembly.class.model_name }
 
-  context "when conditionally displaying private user menu entry" do
-    let!(:my_space) { create(:assembly, organization:, private_space:) }
+  context "when conditionally displaying member menu entry" do
+    let!(:my_space) { create(:assembly, organization:, has_members:) }
 
     before do
       switch_to_host(organization.host)
@@ -21,20 +21,20 @@
       click_on translated(my_space.title)
     end
 
-    context "when the participatory space is private" do
-      let(:private_space) { true }
+    context "when the participatory space has members" do
+      let(:has_members) { true }
 
-      it "hides the private user menu entry" do
+      it "shows the member menu entry" do
         within_admin_sidebar_menu do
           expect(page).to have_content("Members")
         end
       end
     end
 
-    context "when the participatory space is public" do
-      let(:private_space) { false }
+    context "when the participatory space has not members" do
+      let(:has_members) { false }
 
-      it "shows the private user menu entry" do
+      it "hides the member menu entry" do
         within_admin_sidebar_menu do
           expect(page).to have_no_content("Members")
         end
diff --git a/decidim-assemblies/spec/system/admin/admin_manages_assembly_attachments_spec.rb b/decidim-assemblies/spec/system/admin/admin_manages_assembly_attachments_spec.rb
index 50070178677bc..3eda2c02cf7f1 100644
--- a/decidim-assemblies/spec/system/admin/admin_manages_assembly_attachments_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_manages_assembly_attachments_spec.rb
@@ -17,5 +17,44 @@
     end
   end
 
-  it_behaves_like "manage attachments examples"
+  it_behaves_like "manage attachments examples" do
+    context "when checking notifications" do
+      it "successfully displays the notification" do
+        create(:follow, user:, followable: attached_to)
+
+        click_on "New attachment"
+
+        within ".new_attachment" do
+          fill_in_i18n(
+            :attachment_title,
+            "#attachment-title-tabs",
+            en: "Very Important Document",
+            es: "Documento Muy Importante",
+            ca: "Document Molt Important"
+          )
+
+          fill_in_i18n(
+            :attachment_description,
+            "#attachment-description-tabs",
+            en: "This document contains important information",
+            es: "Este documento contiene información importante",
+            ca: "Aquest document conté informació important"
+          )
+        end
+
+        dynamically_attach_file(:attachment_file, Decidim::Dev.asset("Exampledocument.pdf"))
+
+        within ".new_attachment" do
+          find("*[type=submit]").click
+        end
+
+        expect(page).to have_admin_callout("successfully")
+
+        wait_enqueued_jobs do
+          visit decidim.notifications_path
+          expect(page).to have_content("A new document has been added to")
+        end
+      end
+    end
+  end
 end
diff --git a/decidim-assemblies/spec/system/admin/admin_manages_assembly_members_spec.rb b/decidim-assemblies/spec/system/admin/admin_manages_assembly_members_spec.rb
new file mode 100644
index 0000000000000..c4d95865f735c
--- /dev/null
+++ b/decidim-assemblies/spec/system/admin/admin_manages_assembly_members_spec.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "decidim/admin/test/admin_members_shared_examples"
+
+describe "Admin manages assembly members" do
+  let!(:user) { create(:user, :admin, :confirmed, organization:) }
+  let(:organization) { create(:organization) }
+  let!(:participatory_space) { create(:assembly, organization:, has_members: true) }
+  let(:participatory_space_edit_path) { decidim_admin_assemblies.edit_assembly_path(participatory_space) }
+
+  it_behaves_like "manage admin members examples"
+end
diff --git a/decidim-assemblies/spec/system/admin/admin_manages_assembly_private_users_spec.rb b/decidim-assemblies/spec/system/admin/admin_manages_assembly_private_users_spec.rb
deleted file mode 100644
index 54a5d44ce98d4..0000000000000
--- a/decidim-assemblies/spec/system/admin/admin_manages_assembly_private_users_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "Admin manages assembly private users" do
-  let!(:user) { create(:user, :admin, :confirmed, organization:) }
-  let(:organization) { create(:organization) }
-  let!(:assembly) { create(:assembly, organization:, private_space: true) }
-
-  it_behaves_like "manage assembly private users examples"
-end
diff --git a/decidim-assemblies/spec/system/admin/admin_manages_assembly_soft_delete_spec.rb b/decidim-assemblies/spec/system/admin/admin_manages_assembly_soft_delete_spec.rb
index b5a22206c81e1..4bda80d5c7440 100644
--- a/decidim-assemblies/spec/system/admin/admin_manages_assembly_soft_delete_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_manages_assembly_soft_delete_spec.rb
@@ -14,12 +14,12 @@
   it_behaves_like "manage trashed resource", "assembly"
 
   context "when a user is collaborator" do
-    let!(:assembly) { create(:assembly, organization: organization) }
-    let!(:collaborator_user) { create(:user, :admin_terms_accepted, :confirmed, organization: organization) }
+    let!(:assembly) { create(:assembly, organization:) }
+    let!(:collaborator_user) { create(:user, :admin_terms_accepted, :confirmed, organization:) }
     let!(:collaborator_role) do
       create(:assembly_user_role,
              user: collaborator_user,
-             assembly: assembly,
+             assembly:,
              role: :collaborator)
     end
 
@@ -36,12 +36,12 @@
   end
 
   context "when a user is evaluator" do
-    let!(:assembly) { create(:assembly, organization: organization) }
-    let!(:evaluator_user) { create(:user, :admin_terms_accepted, :confirmed, organization: organization) }
+    let!(:assembly) { create(:assembly, organization:) }
+    let!(:evaluator_user) { create(:user, :admin_terms_accepted, :confirmed, organization:) }
     let!(:evaluator_role) do
       create(:assembly_user_role,
              user: evaluator_user,
-             assembly: assembly,
+             assembly:,
              role: :evaluator)
     end
 
@@ -58,12 +58,12 @@
   end
 
   context "when a user is moderator" do
-    let!(:assembly) { create(:assembly, organization: organization) }
-    let!(:moderator_user) { create(:user, :admin_terms_accepted, :confirmed, organization: organization) }
+    let!(:assembly) { create(:assembly, organization:) }
+    let!(:moderator_user) { create(:user, :admin_terms_accepted, :confirmed, organization:) }
     let!(:moderator_role) do
       create(:assembly_user_role,
              user: moderator_user,
-             assembly: assembly,
+             assembly:,
              role: :moderator)
     end
 
@@ -80,12 +80,12 @@
   end
 
   context "when a user is a space admin" do
-    let!(:assembly) { create(:assembly, organization: organization) }
-    let!(:admin_user) { create(:user, :admin_terms_accepted, :confirmed, organization: organization) }
+    let!(:assembly) { create(:assembly, organization:) }
+    let!(:admin_user) { create(:user, :admin_terms_accepted, :confirmed, organization:) }
     let!(:admin_role) do
       create(:assembly_user_role,
              user: admin_user,
-             assembly: assembly,
+             assembly:,
              role: :admin)
     end
 
diff --git a/decidim-assemblies/spec/system/admin/assembly_admin_accesses_admin_sections_spec.rb b/decidim-assemblies/spec/system/admin/assembly_admin_accesses_admin_sections_spec.rb
index 3f9cc23a29126..5231f9c8e3ab6 100644
--- a/decidim-assemblies/spec/system/admin/assembly_admin_accesses_admin_sections_spec.rb
+++ b/decidim-assemblies/spec/system/admin/assembly_admin_accesses_admin_sections_spec.rb
@@ -10,7 +10,7 @@
     login_as user, scope: :user
   end
 
-  shared_examples "sees public space menu" do
+  shared_examples "sees menu without members" do
     it "can access all sections" do
       expect(page).to have_content("Info")
       expect(page).to have_content("Components")
@@ -21,7 +21,7 @@
     end
   end
 
-  shared_examples "sees private space menu" do
+  shared_examples "sees menu with members" do
     it "can access all sections" do
       expect(page).to have_content("Info")
       expect(page).to have_content("Components")
@@ -41,14 +41,14 @@
       end
     end
 
-    context "when is a public assembly" do
-      it_behaves_like "sees public space menu"
+    context "when is an assembly without members" do
+      it_behaves_like "sees menu without members"
     end
 
-    context "when is a private assembly" do
-      let(:assembly) { create(:assembly, organization:, private_space: true) }
+    context "when is an assembly with members" do
+      let(:assembly) { create(:assembly, organization:, has_members: true) }
 
-      it_behaves_like "sees private space menu"
+      it_behaves_like "sees menu with members"
     end
   end
 
@@ -59,14 +59,14 @@
       visit decidim_admin_assemblies.edit_assembly_path(child_assembly)
     end
 
-    context "when is a public assembly" do
-      it_behaves_like "sees public space menu"
+    context "when is an assembly without" do
+      it_behaves_like "sees menu without members"
     end
 
-    context "when is a private assembly" do
-      let(:child_assembly) { create(:assembly, parent: assembly, organization:, private_space: true) }
+    context "when is an assembly with members" do
+      let(:child_assembly) { create(:assembly, parent: assembly, organization:, has_members: true) }
 
-      it_behaves_like "sees private space menu"
+      it_behaves_like "sees menu with members"
     end
 
     it_behaves_like "assembly admin manage assembly components"
diff --git a/decidim-assemblies/spec/system/admin/assembly_moderator_manages_assembly_moderations_spec.rb b/decidim-assemblies/spec/system/admin/assembly_moderator_manages_assembly_moderations_spec.rb
index a6e4c89791a8f..3dbf99e422e35 100644
--- a/decidim-assemblies/spec/system/admin/assembly_moderator_manages_assembly_moderations_spec.rb
+++ b/decidim-assemblies/spec/system/admin/assembly_moderator_manages_assembly_moderations_spec.rb
@@ -6,7 +6,8 @@
   include_context "when assembly moderator administrating an assembly"
 
   let(:current_component) { create(:component, participatory_space: assembly) }
-  let!(:reportables) { create_list(:dummy_resource, 2, component: current_component) }
+  let(:author) { create(:user, :malicious, :confirmed, organization: current_component.organization) }
+  let!(:reportables) { create_list(:dummy_resource, 2, author:, component: current_component) }
   let(:participatory_space_path) do
     decidim_admin_assemblies.moderations_path(assembly)
   end
diff --git a/decidim-assemblies/spec/system/admin/invite_assembly_admin_spec.rb b/decidim-assemblies/spec/system/admin/invite_assembly_admin_spec.rb
index 17459a1c34cd8..53c136fe1b77c 100644
--- a/decidim-assemblies/spec/system/admin/invite_assembly_admin_spec.rb
+++ b/decidim-assemblies/spec/system/admin/invite_assembly_admin_spec.rb
@@ -6,7 +6,7 @@
 
 describe "Invite assembly administrator" do
   let(:participatory_space) { create(:assembly) }
-  let(:private_participatory_space) { create(:assembly, private_space: true) }
+  let(:members_participatory_space) { create(:assembly, has_members: true) }
   let(:about_this_space_label) { "About this assembly" }
   let(:space_admins_label) { "Assembly admins" }
   let(:space_sidebar_label) { "Assemblies" }
diff --git a/decidim-assemblies/spec/system/assembly_breadcrumb_spec.rb b/decidim-assemblies/spec/system/assemblies_breadcrumbs_spec.rb
similarity index 99%
rename from decidim-assemblies/spec/system/assembly_breadcrumb_spec.rb
rename to decidim-assemblies/spec/system/assemblies_breadcrumbs_spec.rb
index bd826e5802827..491d5563bca50 100644
--- a/decidim-assemblies/spec/system/assembly_breadcrumb_spec.rb
+++ b/decidim-assemblies/spec/system/assemblies_breadcrumbs_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "Assembly Breadcrumb" do
+describe "Assemblies Breadcrumb" do
   let(:organization) { create(:organization) }
   let(:parent_assembly) { create(:assembly, :published, organization:) }
   let(:child_assembly) { create(:assembly, :published, organization:, parent: parent_assembly) }
diff --git a/decidim-assemblies/spec/system/members_spec.rb b/decidim-assemblies/spec/system/members_spec.rb
new file mode 100644
index 0000000000000..b91f69bd35337
--- /dev/null
+++ b/decidim-assemblies/spec/system/members_spec.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "decidim/core/test/shared_examples/participatory_space_members_shared_examples"
+
+describe "Assembly members" do
+  let(:assembly) { create(:assembly, :with_content_blocks, organization:, blocks_manifests:, has_members: true) }
+  let(:participatory_space) { assembly }
+  let(:participatory_space_homepage_path) { decidim_assemblies.assembly_path(participatory_space, locale: I18n.locale) }
+  let(:members_path) { decidim_assemblies.assembly_members_path(participatory_space, locale: I18n.locale) }
+  let(:unexisting_participatory_space_members_path) { decidim_assemblies.assembly_members_path(assembly_slug: 999_999_999, locale: I18n.locale) }
+
+  it_behaves_like "participatory space members"
+end
diff --git a/decidim-assemblies/spec/system/participatory_space_private_users_spec.rb b/decidim-assemblies/spec/system/participatory_space_private_users_spec.rb
deleted file mode 100644
index 17a026b5e0ec4..0000000000000
--- a/decidim-assemblies/spec/system/participatory_space_private_users_spec.rb
+++ /dev/null
@@ -1,123 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "Assembly private users" do
-  let(:organization) { create(:organization) }
-  let(:assembly) { create(:assembly, :with_content_blocks, organization:, blocks_manifests:, private_space: true) }
-  let(:privatable_to) { assembly }
-  let(:blocks_manifests) { [] }
-
-  let(:user) { create(:user, organization: privatable_to.organization) }
-  let(:ceased_user) { create(:user, organization: privatable_to.organization) }
-
-  before do
-    switch_to_host(organization.host)
-  end
-
-  context "when there are no assembly members and directly accessing from URL" do
-    it_behaves_like "a 404 page" do
-      let(:target_path) { decidim_assemblies.assembly_participatory_space_private_users_path(assembly, locale: I18n.locale) }
-    end
-  end
-
-  context "when there are no assembly members and accessing from the assembly homepage" do
-    context "and the main data content block is disabled" do
-      it "the menu nav is not shown" do
-        visit decidim_assemblies.assembly_path(assembly, locale: I18n.locale)
-
-        expect(page).to have_no_css(".participatory-space__nav-container")
-      end
-    end
-
-    context "and the main data content block is enabled" do
-      let(:blocks_manifests) { ["main_data"] }
-
-      it "the menu link is not shown" do
-        visit decidim_assemblies.assembly_path(assembly, locale: I18n.locale)
-
-        expect(page).to have_no_content("Members")
-      end
-    end
-  end
-
-  context "when the assembly does not exist" do
-    it_behaves_like "a 404 page" do
-      let(:target_path) { decidim_assemblies.assembly_participatory_space_private_users_path(assembly_slug: 999_999_999, locale: I18n.locale) }
-    end
-  end
-
-  context "when there are some assembly members and all are unpublished" do
-    before do
-      create(:participatory_space_private_user, user:, privatable_to:, published: false)
-    end
-
-    context "and directly accessing from URL" do
-      it_behaves_like "a 404 page" do
-        let(:target_path) { decidim_assemblies.assembly_participatory_space_private_users_path(assembly, locale: I18n.locale) }
-      end
-    end
-
-    context "and accessing from the homepage" do
-      context "and the main data content block is disabled" do
-        it "the menu nav is not shown" do
-          visit decidim_assemblies.assembly_path(assembly, locale: I18n.locale)
-
-          expect(page).to have_no_css(".participatory-space__nav-container")
-        end
-      end
-
-      context "and the main data content block is enabled" do
-        let(:blocks_manifests) { ["main_data"] }
-
-        it "the menu link is not shown" do
-          visit decidim_assemblies.assembly_path(assembly, locale: I18n.locale)
-
-          expect(page).to have_no_content("Members")
-        end
-      end
-    end
-  end
-
-  context "when there are some published assembly members" do
-    let!(:private_user) { create(:participatory_space_private_user, user:, privatable_to:, published: true) }
-    let!(:ceased_private_user) { create(:participatory_space_private_user, user: ceased_user, privatable_to:, published: false) }
-
-    before do
-      visit decidim_assemblies.assembly_participatory_space_private_users_path(assembly, locale: I18n.locale)
-    end
-
-    context "and accessing from the assembly homepage" do
-      context "and the main data content block is disabled" do
-        it "the menu nav is not shown" do
-          visit decidim_assemblies.assembly_path(assembly, locale: I18n.locale)
-
-          expect(page).to have_no_css(".participatory-space__nav-container")
-        end
-      end
-
-      context "and the main data content block is enabled" do
-        let(:blocks_manifests) { ["main_data"] }
-
-        it "the menu link is shown" do
-          visit decidim_assemblies.assembly_path(assembly, locale: I18n.locale)
-
-          within ".participatory-space__nav-container" do
-            expect(page).to have_content("Members")
-            click_on "Members"
-          end
-
-          expect(page).to have_current_path decidim_assemblies.assembly_participatory_space_private_users_path(assembly, locale: I18n.locale)
-        end
-      end
-
-      it "lists all the non ceased assembly members" do
-        within "#assembly_members-grid" do
-          expect(page).to have_css(".profile__user", count: 1)
-
-          expect(page).to have_no_content(Decidim::ParticipatorySpacePrivateUserPresenter.new(ceased_private_user).name)
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-assemblies/spec/system/private_assemblies_spec.rb b/decidim-assemblies/spec/system/private_assemblies_spec.rb
index e51c3d216ff11..c715c38be55d2 100644
--- a/decidim-assemblies/spec/system/private_assemblies_spec.rb
+++ b/decidim-assemblies/spec/system/private_assemblies_spec.rb
@@ -9,8 +9,8 @@
   let!(:user) { create(:user, :confirmed, organization:) }
   let!(:other_user) { create(:user, :confirmed, organization:) }
   let!(:other_user2) { create(:user, :confirmed, organization:) }
-  let!(:assembly_private_user) { create(:assembly_private_user, user: other_user, privatable_to: private_assembly) }
-  let!(:assembly_private_user2) { create(:assembly_private_user, user: other_user2, privatable_to: private_assembly) }
+  let!(:assembly_member) { create(:assembly_member, user: other_user, participatory_space: private_assembly) }
+  let!(:assembly_member2) { create(:assembly_member, user: other_user2, participatory_space: private_assembly) }
 
   context "when there are private assemblies" do
     context "and the assembly is transparent" do
@@ -37,7 +37,7 @@
       end
 
       context "when user is logged in" do
-        context "when is not an assembly private user" do
+        context "when is not an assembly member" do
           before do
             switch_to_host(organization.host)
             login_as user, scope: :user
@@ -98,7 +98,7 @@
         end
       end
 
-      context "when user is logged in and is not an assembly private user" do
+      context "when user is logged in and is not an assembly member" do
         context "when the user is not admin" do
           before do
             switch_to_host(organization.host)
@@ -155,7 +155,7 @@
         end
       end
 
-      context "when user is logged in and is an assembly private user" do
+      context "when user is logged in and is an assembly member" do
         before do
           switch_to_host(organization.host)
           login_as other_user, scope: :user
diff --git a/decidim-assemblies/spec/types/integration_schema_spec.rb b/decidim-assemblies/spec/types/integration_schema_spec.rb
index 2762812f16ab5..506a9bf3b697c 100644
--- a/decidim-assemblies/spec/types/integration_schema_spec.rb
+++ b/decidim-assemblies/spec/types/integration_schema_spec.rb
@@ -191,6 +191,7 @@
     )
   end
 
+  include_examples "when the introspection is disabled"
   describe "valid query" do
     it "executes successfully" do
       expect { response }.not_to raise_error
diff --git a/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb b/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
index a0c885cfe7624..aeffda5c91004 100644
--- a/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
+++ b/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
@@ -26,7 +26,7 @@ def new
 
       def create
         enforce_permission_to :create, :blogpost
-        @form = form(Decidim::Blogs::PostForm).from_params(params, current_component: current_component)
+        @form = form(Decidim::Blogs::PostForm).from_params(params, current_component:)
 
         CreatePost.call(@form) do
           on(:ok) do |new_post|
@@ -48,7 +48,7 @@ def edit
 
       def update
         enforce_permission_to :update, :blogpost, blogpost: post
-        @form = form(PostForm).from_params(params, current_component: current_component)
+        @form = form(PostForm).from_params(params, current_component:)
 
         UpdatePost.call(@form, post) do
           on(:ok) do |post|
diff --git a/decidim-blogs/app/forms/decidim/blogs/post_form.rb b/decidim-blogs/app/forms/decidim/blogs/post_form.rb
index 9a23a3943f563..c19adec62d439 100644
--- a/decidim-blogs/app/forms/decidim/blogs/post_form.rb
+++ b/decidim-blogs/app/forms/decidim/blogs/post_form.rb
@@ -48,7 +48,7 @@ def can_set_author
       end
 
       def post
-        @post ||= Post.find_by(id: id)
+        @post ||= Post.find_by(id:)
       end
 
       def participatory_space_manifest
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..4e61a3b8c66fc 100644
--- a/decidim-blogs/app/views/decidim/blogs/posts/index.html.erb
+++ b/decidim-blogs/app/views/decidim/blogs/posts/index.html.erb
@@ -1,7 +1,7 @@
 <% add_decidim_meta_tags(
   description: translated_attribute(current_component.participatory_space.try(:description)),
   title: t("decidim.components.pagination.page_title",
-           component_name: component_name,
+           component_name:,
            current_page: paginate_posts.current_page,
            total_pages: paginate_posts.total_pages ),
   url: posts_url,
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..37f5e2428b66b 100644
--- a/decidim-blogs/app/views/decidim/blogs/posts/show.html.erb
+++ b/decidim-blogs/app/views/decidim/blogs/posts/show.html.erb
@@ -39,7 +39,7 @@
           <%= cell "decidim/author", post_presenter.author, from: post, context_actions: [:date], layout: :compact %>
         </div>
         <%= render "decidim/shared/resource_actions", resource: post do %>
-          <%= render "decidim/blogs/posts/menu_actions", post: post %>
+          <%= render "decidim/blogs/posts/menu_actions", post: %>
         <% end %>
       </div>
     </div>
diff --git a/decidim-blogs/config/locales/cs.yml b/decidim-blogs/config/locales/cs.yml
index 8125c6a3e8400..4320b8cef0208 100644
--- a/decidim-blogs/config/locales/cs.yml
+++ b/decidim-blogs/config/locales/cs.yml
@@ -111,6 +111,7 @@ cs:
           destroy: Smazat
           like: Líbí se mi
           update: Aktualizovat
+          vote_comment: Komentář hlasování
         name: Blog
         settings:
           global:
diff --git a/decidim-blogs/config/locales/fi.yml b/decidim-blogs/config/locales/fi.yml
index 273118d593726..c954c630a1c4c 100644
--- a/decidim-blogs/config/locales/fi.yml
+++ b/decidim-blogs/config/locales/fi.yml
@@ -12,7 +12,7 @@ fi:
     models:
       decidim/blogs/post:
         one: Artikkeli
-        other: Artikkelia
+        other: Artikkelit
   decidim:
     admin:
       admin_log:
diff --git a/decidim-blogs/config/locales/ja.yml b/decidim-blogs/config/locales/ja.yml
index c794a68e776e7..c2741bde08503 100644
--- a/decidim-blogs/config/locales/ja.yml
+++ b/decidim-blogs/config/locales/ja.yml
@@ -105,6 +105,7 @@ ja:
           destroy: 削除
           like: いいね
           update: 更新
+          vote_comment: コメントに投票
         name: ブログ
         settings:
           global:
diff --git a/decidim-blogs/config/locales/pt-BR.yml b/decidim-blogs/config/locales/pt-BR.yml
index d3bff9a68ee5f..b0e3bd6703b44 100644
--- a/decidim-blogs/config/locales/pt-BR.yml
+++ b/decidim-blogs/config/locales/pt-BR.yml
@@ -7,30 +7,43 @@ pt-BR:
         published_at: Horário da publicação
         title: Título
     models:
-      decidim/blogs/create_post_event: Nova postagem no blog
+      decidim/blogs/create_post_event: Nova postagem no ‘blog’
   activerecord:
     models:
       decidim/blogs/post:
         one: Postagem
         other: Postagens
   decidim:
+    admin:
+      admin_log:
+        changeset:
+          posts: Postagens
+      tooltips:
+        deleted_posts_info: Não é possível excluir este post
     blogs:
       actions:
         author_id: Criar publicação como
+        confirm_delete_post: Deseja mesmo excluir este post?
+        deleted_posts_info: Postagens excluídas podem ser restaurados da lixeira.
         edit: Editar
         new: Nova postagem
         title: Ações
+        view_deleted_posts: Ver propostas excluídas
       admin:
         posts:
           create:
             invalid: Houve um problema ao criar esta postagem.
             success: Post criado com sucesso.
+          destroy:
+            success: Postagem excluída com sucesso.
           edit:
             save: Atualizar
             title: Editar publicação
           index:
             not_published_yet: Não publicado.
             title: Postagens
+          manage_trash:
+            title: Postagens excluídas
           new:
             create: Criar
             title: Criar post
@@ -39,9 +52,11 @@ pt-BR:
             success: Post salvo com sucesso.
       admin_log:
         post:
-          create: "%{user_name} criou a publicação no blog %{resource_name} do %{space_name}"
-          delete: "O %{user_name} excluiu a publicação no blog %{resource_name} do %{space_name}"
-          update: "%{user_name} atualizou a publicação no blog %{resource_name} do %{space_name}"
+          create: "%{user_name} Criou a publicação no ‘blog’ %{resource_name} do %{space_name}"
+          delete: "O %{user_name} excluiu a publicação no ‘blog’ %{resource_name} do %{space_name}"
+          restore: "%{user_name} restaurou a postagem do blog %{resource_name} no %{space_name}"
+          soft_delete: "%{user_name} moveu a postagem do blog %{resource_name} no %{space_name} para a lixeira"
+          update: "%{user_name} Atualizou a publicação no ‘blog’ %{resource_name} do %{space_name}"
       content_blocks:
         highlighted_posts:
           last_published: Último publicado
@@ -56,29 +71,60 @@ pt-BR:
             body: Corpo
             official_blog_post: Publicação oficial
             published_at: Horário da publicação
+            taxonomies: Taxonomias
             title: Título
       posts:
+        edit:
+          add_attachments: Adicionar anexos
+          attachment_legend: Adicionar um documento ou uma imagem
+          back: Voltar à postagem
+          button: Atualizar
+          edit_attachments: Editar anexos
+          title: Editar postagem
+        form:
+          author_id: Autor
+          body: Corpo
+          title: Título
         index:
           count:
             one: "%{count} publicação"
             other: "%{count} publicações"
           empty: Não existem publicações ainda.
+          new_post: Nova postagem
+        menu_actions:
+          button_destroy: Excluir postagem
+          button_destroy_confirm: Tem certeza que deseja excluir esta postagem?
+          button_edit: Editar postagem
+        new:
+          back: Voltar às postagens
+          button: Criar
+          title: Criar nova postagem
     components:
       blogs:
         actions:
           comment: Comentário
           create: Criar
           destroy: Excluir
+          like: Curti
           update: Atualizar
+          vote_comment: Vote no comentário
         name: Blog
         settings:
           global:
             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.
+            taxonomy_filters: Selecione filtros para o componente
+            taxonomy_filters_add: Adicionar filtro
           step:
             announcement: Anúncio
             comments_blocked: Comentários bloqueados
+            likes_blocked: Curtidas bloqueadas
+            likes_enabled: Curtidas ativadas
     events:
       blogs:
         post_created:
@@ -86,5 +132,33 @@ pt-BR:
           email_outro: Você recebeu esta notificação porque está seguindo "%{participatory_space_title}". Você pode deixar de segui-lo no link anterior.
           email_subject: Nova postagem publicada em %{participatory_space_title}
           notification_title: A postagem <a href="%{resource_path}">%{resource_title}</a> foi publicada em %{participatory_space_title}
+    open_data:
+      help:
+        post_comments:
+          alignment: Se este comentário foi um favorito, contra ou neutro
+          author: O nome do usuário que fez este comentário
+          body: O comentário em si
+          commentable_id: A identificação única do comentável
+          commentable_type: O tipo do comentário (se foi um resultado, uma proposta, etc.)
+          created_at: A data em que este comentário foi criado
+          depth: O lugar onde este comentário está nos três comentários (se for uma resposta ou uma resposta de uma resposta)
+          id: O ID deste comentário
+          locale: O idioma (localidade) que o participante tinha ao deixar este comentário
+          root_commentable_url: O URL do recurso relacionado a este comentário
+        posts:
+          author: Informações do autor
+          body: O corpo da postagem
+          comments_count: O número de comentários que esta publicação recebeu
+          component: O componente ao qual a postagem pertence
+          created_at: A data em que esta publicação foi criada
+          follows_count: O número de seguidores que esta publicação tem
+          id: O identificador único desta publicação
+          likes_count: O número de curtidas que esta publicação tem
+          participatory_space: A que espaço (por exemplo, Processo Participativo ou Assembleia) pertence esta publicação
+          published_at: A data em que esta postagem foi publicada
+          title: O título da postagem
+          updated_at: Última data em que esta publicação foi atualizada
+          url: O URL para esta postagem
     statistics:
       posts_count: Postagens
+      posts_count_tooltip: O número de atualizações ou posts de ‘blog’, publicados.
diff --git a/decidim-blogs/config/locales/ro-RO.yml b/decidim-blogs/config/locales/ro-RO.yml
index 81a658a9117aa..6b3462daedb9f 100644
--- a/decidim-blogs/config/locales/ro-RO.yml
+++ b/decidim-blogs/config/locales/ro-RO.yml
@@ -19,6 +19,8 @@ ro:
       admin_log:
         changeset:
           posts: Postări
+      tooltips:
+        deleted_posts_info: Nu se poate șterge această postare
     blogs:
       actions:
         author_id: Creeați postare ca
@@ -105,7 +107,9 @@ ro:
           comment: Comentați
           create: Creați
           destroy: Ștergeți
+          like: Apreciere
           update: Actualizați
+          vote_comment: Votați comentariul
         name: Blog
         settings:
           global:
@@ -121,6 +125,8 @@ ro:
           step:
             announcement: Anunț
             comments_blocked: Comentarii blocate
+            likes_blocked: Aprecieri blocate
+            likes_enabled: Aprecieri activate
     events:
       blogs:
         post_created:
@@ -149,6 +155,7 @@ ro:
           created_at: Data la care acestă postare a fost creată
           follows_count: Numărul de urmăritori al acestei postări
           id: Identificatorul unic al acestei postări
+          likes_count: Numărul de aprecieri pe care le are această postare
           participatory_space: Cărui spațiu (de exemplu, proces participativ sau adunare) aparține această postare
           published_at: Data la care acestă postare a fost publicată
           title: Titlul postării
diff --git a/decidim-blogs/lib/decidim/api/post_type.rb b/decidim-blogs/lib/decidim/api/post_type.rb
index 5e83e70cff8bd..894eb6c470f77 100644
--- a/decidim-blogs/lib/decidim/api/post_type.rb
+++ b/decidim-blogs/lib/decidim/api/post_type.rb
@@ -33,8 +33,6 @@ def self.authorized?(object, context)
         ].all?
 
         super && chain
-      rescue Decidim::PermissionAction::PermissionNotSetError
-        false
       end
     end
   end
diff --git a/decidim-blogs/lib/decidim/blogs/component.rb b/decidim-blogs/lib/decidim/blogs/component.rb
index c1e80ce8090b2..fa8b60e928c0e 100644
--- a/decidim-blogs/lib/decidim/blogs/component.rb
+++ b/decidim-blogs/lib/decidim/blogs/component.rb
@@ -9,10 +9,6 @@
 
   component.query_type = "Decidim::Blogs::BlogsType"
 
-  component.on(:before_destroy) do |instance|
-    raise StandardError, "Cannot remove this component" if Decidim::Blogs::Post.where(component: instance).any?
-  end
-
   component.on(:publish) do |instance|
     Decidim::Blogs::Post.where(component: instance).find_in_batches(batch_size: 100) do |batch|
       Decidim::UpdateSearchIndexesJob.perform_later(batch)
diff --git a/decidim-blogs/spec/system/blogs_breadcrumbs_spec.rb b/decidim-blogs/spec/system/blogs_breadcrumbs_spec.rb
new file mode 100644
index 0000000000000..d3d4dd0b6bf99
--- /dev/null
+++ b/decidim-blogs/spec/system/blogs_breadcrumbs_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Blogs Breadcrumb" do
+  include_context "with a component"
+  let(:manifest_name) { "blogs" }
+  let!(:post) { create(:post, component:) }
+
+  before do
+    visit_component
+  end
+
+  describe "index" do
+    it "shows the correct information in breadcrumb (space, component)" do
+      within(".menu-bar") do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+      end
+    end
+  end
+
+  describe "show" do
+    it "shows the correct information in breadcrumb (space, component, post)" do
+      click_on translated(post.title)
+
+      within(".menu-bar") do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+        expect(page).to have_content(translated(post.title))
+      end
+    end
+  end
+end
diff --git a/decidim-blogs/spec/system/explore_posts_spec.rb b/decidim-blogs/spec/system/explore_posts_spec.rb
index 9cba82f5d0380..babc8cdd00eb2 100644
--- a/decidim-blogs/spec/system/explore_posts_spec.rb
+++ b/decidim-blogs/spec/system/explore_posts_spec.rb
@@ -37,10 +37,13 @@
         visit_component
       end
 
-      it "shows the component name in the sidebar" do
+      it "shows the correct information in breadcrumb" do
         within(".menu-bar") do
           expect(page).to have_content(translated(component.name))
         end
+      end
+
+      it "shows the component name in the sidebar" do
         within("aside") do
           expect(page).to have_content(translated(component.name))
         end
@@ -89,10 +92,6 @@
           within ".author__name" do
             expect(page).to have_content("Official")
           end
-          within(".menu-bar") do
-            expect(page).to have_content(translated(component.name))
-            expect(page).to have_content(translated(post.title))
-          end
         end
       end
 
diff --git a/decidim-blogs/spec/types/blogs_type_spec.rb b/decidim-blogs/spec/types/blogs_type_spec.rb
index 5a9ae0829a6e9..3c0ae899a9e9f 100644
--- a/decidim-blogs/spec/types/blogs_type_spec.rb
+++ b/decidim-blogs/spec/types/blogs_type_spec.rb
@@ -39,8 +39,8 @@ module Blogs
         context "when the post does not belong to the component" do
           let!(:post) { create(:post, component: create(:post_component)) }
 
-          it "returns null" do
-            expect(response["post"]).to be_nil
+          it "raises error" do
+            expect { response }.to raise_error(Decidim::Api::Errors::NotFoundError, "Post not found")
           end
         end
       end
diff --git a/decidim-blogs/spec/types/post_type_spec.rb b/decidim-blogs/spec/types/post_type_spec.rb
index 294b106257278..26c47eeb54cc9 100644
--- a/decidim-blogs/spec/types/post_type_spec.rb
+++ b/decidim-blogs/spec/types/post_type_spec.rb
@@ -17,6 +17,12 @@ module Blogs
       include_examples "likeable interface"
       include_examples "followable interface"
 
+      shared_examples "unauthorized Post" do
+        it "throws Decidim::Api::Errors::UnauthorizedObjectError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::UnauthorizedObjectError, "You cannot view or edit this Post because you do not have permissions")
+        end
+      end
+
       describe "id" do
         let(:query) { "{ id }" }
 
@@ -55,9 +61,7 @@ module Blogs
         let(:model) { create(:post, component: current_component) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Post"
       end
 
       context "when participatory space is private but transparent" do
@@ -77,9 +81,7 @@ module Blogs
         let(:model) { create(:post, component: current_component) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Post"
       end
 
       context "when component is not published" do
@@ -87,9 +89,7 @@ module Blogs
         let(:model) { create(:post, component: current_component) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Post"
       end
 
       context "when post is moderated" do
@@ -97,9 +97,7 @@ module Blogs
         let(:query) { "{ id }" }
         let(:root_value) { model.reload }
 
-        it "returns all the required fields" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Post"
       end
 
       context "when post is not published" do
@@ -107,9 +105,7 @@ module Blogs
         let(:model) { create(:post, published_at: nil, component: current_component) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Post"
       end
     end
   end
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/import_proposals_to_budgets.rb b/decidim-budgets/app/commands/decidim/budgets/admin/import_proposals_to_budgets.rb
index 52d4a7450690c..ebeee8d734727 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/import_proposals_to_budgets.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/import_proposals_to_budgets.rb
@@ -68,7 +68,17 @@ def budget_for(original_proposal)
         end
 
         def proposals
-          Decidim::Proposals::Proposal.where(component: origin_component).published.not_hidden.not_withdrawn.accepted.order(:published_at)
+          proposals = Decidim::Proposals::Proposal.where(component: origin_component).published.not_hidden.not_withdrawn
+
+          if form.internal_states.present?
+            if form.internal_states.include?("not_answered")
+              proposals.not_answered.or(proposals.where(id: proposals.only_status(form.internal_states).pluck(:id)))
+            else
+              proposals.only_status(form.internal_states)
+            end
+          else
+            proposals
+          end.order(:published_at)
         end
 
         def origin_component
diff --git a/decidim-budgets/app/controllers/decidim/budgets/projects_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/projects_controller.rb
index 9f0508765e23c..4c314f1d72c99 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/projects_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/projects_controller.rb
@@ -6,10 +6,11 @@ module Budgets
     class ProjectsController < Decidim::Budgets::ApplicationController
       include FilterResource
       include NeedsCurrentOrder
+      include Decidim::AttachmentsHelper
       include Decidim::Budgets::Orderable
       include Decidim::IconHelper
 
-      helper_method :projects, :project, :budget, :all_geocoded_projects, :tabs, :panels, :resource_added?
+      helper_method :projects, :project, :budget, :all_geocoded_projects, :resource_added?, :tab_panel_items
 
       before_action :set_focus_mode_if_voting_open
 
@@ -64,16 +65,8 @@ def show_selected_budgets?
         voting_finished? && budget.projects.selected.any?
       end
 
-      def tabs
-        @tabs ||= items.map { |item| item.slice(:id, :text, :icon) }
-      end
-
-      def panels
-        @panels ||= items.map { |item| item.slice(:id, :method, :args) }
-      end
-
-      def items
-        @items ||= [
+      def tab_panel_items
+        @tab_panel_items ||= [
           {
             enabled: ProjectHistoryCell.new(@project).render?,
             id: "included_history",
@@ -82,24 +75,31 @@ def items
             method: :cell,
             args: ["decidim/budgets/project_history", @project]
           },
-          {
-            enabled: @project.photos.present?,
-            id: "images",
-            text: t("decidim.application.photos.photos"),
-            icon: resource_type_icon_key("images"),
-            method: :cell,
-            args: ["decidim/images_panel", @project]
-          },
-          {
-            enabled: @project.documents.present?,
-            id: "documents",
-            text: t("decidim.application.documents.documents"),
-            icon: resource_type_icon_key("documents"),
-            method: :cell,
-            args: ["decidim/documents_panel", @project]
-          }
+          *attachments_tab_panel_items(@project)
         ].select { |item| item[:enabled] }
       end
+
+      def add_breadcrumb_item
+        return {} if project.blank?
+
+        {
+          label: translated_attribute(project.title),
+          url: Decidim::EngineRouter.main_proxy(current_component).budget_project_url(budget, project, locale: current_locale),
+          active: false,
+          resource: project
+        }
+      end
+
+      def add_parent_breadcrumb_item
+        return {} if budget.blank?
+
+        {
+          label: translated_attribute(budget.title),
+          url: Decidim::EngineRouter.main_proxy(current_component).budget_projects_url(budget, locale: current_locale),
+          active: false,
+          resource: budget
+        }
+      end
     end
   end
 end
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 fe4f1ed29b9d2..2a5efb7f2a258 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
@@ -10,10 +10,9 @@ class ProjectImportProposalsForm < Decidim::Form
 
         attribute :origin_component_id, Integer
         attribute :default_budget, Integer
-        attribute :import_all_accepted_proposals, Boolean
+        attribute :internal_states, Array[String]
 
         validates :origin_component_id, :origin_component, :current_component, presence: true
-        validates :import_all_accepted_proposals, allow_nil: false, acceptance: true
         validates :default_budget, presence: true, numericality: { greater_than: 0 }
 
         def origin_component
@@ -33,6 +32,17 @@ def origin_components_collection
         def budget
           @budget ||= context[:budget]
         end
+
+        def available_states(component_id = nil)
+          scope = Decidim::Proposals::ProposalState
+          scope = scope.where(component: Decidim::Component.find(component_id)) if component_id.present?
+
+          states = scope.pluck(:token).uniq.map do |token|
+            OpenStruct.new(token:, title: token.humanize)
+          end
+
+          states + [OpenStruct.new(token: "not_answered", title: I18n.t("decidim.proposals.answers.not_answered"))]
+        end
       end
     end
   end
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/proposals_imports/new.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/proposals_imports/new.html.erb
index 9f772c6666f0d..907b43f81de50 100644
--- a/decidim-budgets/app/views/decidim/budgets/admin/proposals_imports/new.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/admin/proposals_imports/new.html.erb
@@ -20,9 +20,17 @@
               <div class="row column">
                 <%= f.number_field :default_budget, label: t(".default_budget") %>
               </div>
-              <div class="row column">
-                <%= f.check_box :import_all_accepted_proposals, label: t(".import_all_accepted_proposals") %>
-              </div>
+              <% if @form.available_states.any? %>
+                <label class="ml-4"><%= t(".proposal_states") %></label>
+                <span class="help-text ml-4"><%= t(".proposal_states_help") %></span>
+                <div class="row column">
+                  <%= f.collection_check_boxes :internal_states, @form.available_states, :token, ->(a) { translated_attribute(a.title) } do |builder| %>
+                  <div>
+                    <%= builder.label { builder.check_box + builder.text } %>
+                  </div>
+                  <% end %>
+                </div>
+              <% end %>
             </div>
           </div>
         </div>
diff --git a/decidim-budgets/app/views/decidim/budgets/projects/_budget_summary.html.erb b/decidim-budgets/app/views/decidim/budgets/projects/_budget_summary.html.erb
index fe9e4acd4f924..4d8fe7883cad7 100644
--- a/decidim-budgets/app/views/decidim/budgets/projects/_budget_summary.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/projects/_budget_summary.html.erb
@@ -1,6 +1,6 @@
 <div id="order-progress<%= "-responsive" if responsive %>" class="budget-summary <%= responsive ? "block md:hidden" : "hidden md:block" %>" data-progress-reference data-safe-url="<%= budget_url(budget) %>">
   <% if responsive %>
-    <%= render partial: "decidim/budgets/projects/order_progress_summary/content_responsive", locals: { focus_mode_origin: focus_mode_origin } %>
+    <%= render partial: "decidim/budgets/projects/order_progress_summary/content_responsive", locals: { focus_mode_origin: } %>
   <% else %>
     <%= render partial: "decidim/budgets/projects/order_progress_summary/content" %>
   <% end %>
diff --git a/decidim-budgets/app/views/decidim/budgets/projects/order_progress_summary/_content.html.erb b/decidim-budgets/app/views/decidim/budgets/projects/order_progress_summary/_content.html.erb
index d4257b75eebb7..cba6776611e75 100644
--- a/decidim-budgets/app/views/decidim/budgets/projects/order_progress_summary/_content.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/projects/order_progress_summary/_content.html.erb
@@ -2,11 +2,13 @@
   <%= render partial: "decidim/budgets/projects/order_progress_summary/progress_box" %>
   <%= render partial: "decidim/budgets/projects/order_progress_summary/progress_box_buttons" %>
 
-  <div class="budget-summary__button-modal">
-    <button type="button" data-dialog-open="budget-modal-info" aria-haspopup="dialog" tabindex="0" class="button button__text button__xs underline font-bold">
-      <%= t("more_information", scope: "decidim.budgets.budget_information_modal") %>
-    </button>
-  </div>
+  <% if cell("decidim/budgets/budget_information_modal", budget).more_information.present? %>
+    <div class="budget-summary__button-modal">
+      <button type="button" data-dialog-open="budget-modal-info" aria-haspopup="dialog" tabindex="0" class="button button__text button__xs underline font-bold">
+        <%= t("more_information", scope: "decidim.budgets.budget_information_modal") %>
+      </button>
+    </div>
+  <% end %>
 
   <div class="w-screen max-w-screen progressbox-fixed-wrapper" data-progressbox-fixed>
     <div class="gap-0 layout-item py-4 items-center budget-summary__progressbar">
diff --git a/decidim-budgets/app/views/decidim/budgets/projects/show.html.erb b/decidim-budgets/app/views/decidim/budgets/projects/show.html.erb
index bd36576b7c8fd..a4393f5a824aa 100644
--- a/decidim-budgets/app/views/decidim/budgets/projects/show.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/projects/show.html.erb
@@ -54,24 +54,8 @@ edit_link(
       </div>
     </section>
     <section class="layout-main__section">
-      <% if tabs.any? %>
-        <div class="mt-8" data-controller="accordion" data-multiselectable="false" data-collapsible="false">
-          <ul class="tab-x-container">
-            <% tabs.each_with_index do |tab, i| %>
-              <li>
-                <button id="trigger-<%= tab[:id] %>" class="tab-x" data-controls="panel-<%= tab[:id] %>" data-open="<%= "true" if i.zero? %>">
-                  <%= icon tab[:icon], class: "text-gray fill-current" %><%= tab[:text] %>
-                </button>
-              </li>
-            <% end %>
-          </ul>
-
-          <% panels.each do |panel| %>
-            <div id="panel-<%= panel[:id] %>" class="py-8 panel-container">
-              <%= send(panel[:method], *panel[:args]) %>
-            </div>
-          <% end %>
-        </div>
+      <% if tab_panel_items.any? %>
+        <%= cell "decidim/tab_panels", tab_panel_items %>
       <% end %>
     </section>
 
diff --git a/decidim-budgets/config/locales/bg.yml b/decidim-budgets/config/locales/bg.yml
index bcfdb15b3299d..f25c399bc2a07 100644
--- a/decidim-budgets/config/locales/bg.yml
+++ b/decidim-budgets/config/locales/bg.yml
@@ -107,7 +107,6 @@ bg:
           new:
             create: Импортиране на предложения в проекти
             default_budget: Бюджет по подразбиране
-            import_all_accepted_proposals: Импортиране на всички приети предложения
             no_components: Няма други компоненти на предложения в това пространство за участие за импортиране на предложенията в проекти.
             origin_component_id: Компонент за произход
             select_component: Моля, изберете компонент
diff --git a/decidim-budgets/config/locales/ca-IT.yml b/decidim-budgets/config/locales/ca-IT.yml
index 201c10001bf2c..0f8111422d786 100644
--- a/decidim-budgets/config/locales/ca-IT.yml
+++ b/decidim-budgets/config/locales/ca-IT.yml
@@ -142,9 +142,10 @@ ca-IT:
           new:
             create: Importa propostes a projectes
             default_budget: Pressupost per defecte
-            import_all_accepted_proposals: Importar totes les propostes acceptades
             no_components: No hi ha cap component de propostes en aquest espai participatiu per importar les propostes a projectes.
             origin_component_id: Component d'origen
+            proposal_states: Estats de resposta a la proposta
+            proposal_states_help: Selecciona un o més estats de resposta de les propostes a importar com a projectes. Si no seleccioneu cap estat de resposta, s'importaran totes les propostes publicades que encara no hagin estat importades a altres pressupostos d'aquest mateix component.
             select_component: Selecciona un component
             title: Importa propostes a projectes
         reminders:
diff --git a/decidim-budgets/config/locales/ca.yml b/decidim-budgets/config/locales/ca.yml
index 3b3abbbbe4f4f..0fa323df97509 100644
--- a/decidim-budgets/config/locales/ca.yml
+++ b/decidim-budgets/config/locales/ca.yml
@@ -142,9 +142,10 @@ ca:
           new:
             create: Importa propostes a projectes
             default_budget: Pressupost per defecte
-            import_all_accepted_proposals: Importar totes les propostes acceptades
             no_components: No hi ha cap component de propostes en aquest espai participatiu per importar les propostes a projectes.
             origin_component_id: Component d'origen
+            proposal_states: Estats de resposta a la proposta
+            proposal_states_help: Selecciona un o més estats de resposta de les propostes a importar com a projectes. Si no seleccioneu cap estat de resposta, s'importaran totes les propostes publicades que encara no hagin estat importades a altres pressupostos d'aquest mateix component.
             select_component: Selecciona un component
             title: Importa propostes a projectes
         reminders:
diff --git a/decidim-budgets/config/locales/cs.yml b/decidim-budgets/config/locales/cs.yml
index 49d004a5beaef..ee132992646ef 100644
--- a/decidim-budgets/config/locales/cs.yml
+++ b/decidim-budgets/config/locales/cs.yml
@@ -146,7 +146,6 @@ cs:
           new:
             create: Návrhy na projekty
             default_budget: Výchozí rozpočet
-            import_all_accepted_proposals: Importovat všechny přijaté návrhy
             no_components: V tomto participativním prostoru neexistují jiné komponenty návrhu, které by mohly importovat návrhy do projektů.
             origin_component_id: Původ komponenty
             select_component: Vyberte součást
@@ -303,6 +302,8 @@ cs:
           dynamic_help:
             minimum_reached: Dosáhli jste minima, abyste mohli hlasovat
           minimum: Minimum
+          minimum_projects_rule:
+            description: "<b>Vyberte alespoň %{minimum_number} projektů</b>, které chcete a hlasujete podle vašich preferencí."
         orders:
           highest_cost: Nejvyšší náklady
           label: Seřadit projekty podle
diff --git a/decidim-budgets/config/locales/de.yml b/decidim-budgets/config/locales/de.yml
index f8073ef1aab84..687a579e5a6e8 100644
--- a/decidim-budgets/config/locales/de.yml
+++ b/decidim-budgets/config/locales/de.yml
@@ -142,7 +142,6 @@ de:
           new:
             create: Importieren Sie Vorschläge in Projekte
             default_budget: Standardbudget
-            import_all_accepted_proposals: Alle akzeptierten Vorschläge importieren
             no_components: Es gibt keine weiteren Vorschlagskomponenten in diesem partizipativen Raum, um die Vorschläge in Projekte zu importieren.
             origin_component_id: Ursprungskomponente
             select_component: Bitte wählen Sie eine Komponente aus
@@ -307,8 +306,8 @@ de:
           remove: Projekt %{resource_name} aus Ihrer Abstimmung entfernen.
           selected: Ausgewählt
           votes:
-            one: Abstimmung
-            other: Abstimmungen
+            one: Stimme
+            other: Stimmen
           you_voted: Sie haben dafür gestimmt
         project_budget_button:
           add: Zur Abstimmung hinzufügen
@@ -326,7 +325,7 @@ de:
       prompt: Budget auswählen
       vote_reminder_mailer:
         vote_reminder:
-          email_budgets: 'Bereiche, in denen Sie eine unvollendete Abstimmung haben:'
+          email_budgets: 'In diesen Bereichen haben Sie die Abstimmung noch nicht abgeschlossen:'
           email_intro: Sie haben Ihre begonnene Abstimmung zur Verteilung des partizipativen Budgets noch nicht abgeschlossen.
           email_link: Mit der Abstimmung fortfahren
           email_outro: Denken Sie daran, die Abstimmung vollständig abzuschließen. Wählen Sie dazu den gewünschten Vorschlag oder die gewünschten Vorschläge aus, denen Sie Ihre Stimme geben möchten. Bestätigen Sie anschliessend Ihre Auswahl, indem Sie auf "Abstimmen" klicken.
diff --git a/decidim-budgets/config/locales/el.yml b/decidim-budgets/config/locales/el.yml
index 6bdc9621d9913..d4543193e15c3 100644
--- a/decidim-budgets/config/locales/el.yml
+++ b/decidim-budgets/config/locales/el.yml
@@ -95,7 +95,6 @@ el:
           new:
             create: Εισαγωγή προτάσεων σε έργα
             default_budget: Προεπιλεγμένος προϋπολογισμός
-            import_all_accepted_proposals: Εισαγωγή όλων των αποδεχθείσων προτάσεων
             no_components: Δεν υπάρχουν άλλα στοιχεία προτάσεων σε αυτόν τον χώρο συμμετοχής για εισαγωγή των προτάσεων σε έργα.
             origin_component_id: Στοιχείο καταγωγής
             select_component: Επιλέξτε ένα στοιχείο
diff --git a/decidim-budgets/config/locales/en.yml b/decidim-budgets/config/locales/en.yml
index 5f8ca1d601fe7..d4421a1bf919f 100644
--- a/decidim-budgets/config/locales/en.yml
+++ b/decidim-budgets/config/locales/en.yml
@@ -143,9 +143,10 @@ en:
           new:
             create: Import proposals to projects
             default_budget: Default budget
-            import_all_accepted_proposals: Import all accepted proposals
             no_components: There are no other proposal components in this participatory space to import the proposals into projects.
             origin_component_id: Origin component
+            proposal_states: Proposal States
+            proposal_states_help: Select one or more proposal states to import into projects. By selecting none, you will import all published proposals that have not already been imported in other budgets from this component.
             select_component: Please select a component
             title: Import proposals to projects
         reminders:
diff --git a/decidim-budgets/config/locales/es-MX.yml b/decidim-budgets/config/locales/es-MX.yml
index 37beb0083178d..55721d2b44e35 100644
--- a/decidim-budgets/config/locales/es-MX.yml
+++ b/decidim-budgets/config/locales/es-MX.yml
@@ -142,9 +142,10 @@ es-MX:
           new:
             create: Importar propuestas a proyectos
             default_budget: Presupuesto por defecto
-            import_all_accepted_proposals: Importar todas las propuestas aceptadas
             no_components: No hay otros componentes de la propuesta en este espacio participativo para importar las propuestas en los proyectos.
             origin_component_id: Componente de origen
+            proposal_states: Estados de repuesta a la propuesta
+            proposal_states_help: Selecciona uno o más estados de respuesta de las propuestas a importar como proyectos. Si no seleccionas ningún estado de respuesta, se importaran todas las propuestas publicadas que no hayan sido importadas aún a otros presupuestos de este mismo componente.
             select_component: Por favor seleccione un componente
             title: Importar propuestas a proyectos
         reminders:
diff --git a/decidim-budgets/config/locales/es-PY.yml b/decidim-budgets/config/locales/es-PY.yml
index 07f8cde89d1f1..a01be4863c46a 100644
--- a/decidim-budgets/config/locales/es-PY.yml
+++ b/decidim-budgets/config/locales/es-PY.yml
@@ -142,9 +142,10 @@ es-PY:
           new:
             create: Importar propuestas a proyectos
             default_budget: Presupuesto por defecto
-            import_all_accepted_proposals: Importar todas las propuestas aceptadas
             no_components: No hay otros componentes de la propuesta en este espacio participativo para importar las propuestas en los proyectos.
             origin_component_id: Componente de origen
+            proposal_states: Estados de repuesta a la propuesta
+            proposal_states_help: Selecciona uno o más estados de respuesta de las propuestas a importar como proyectos. Si no seleccionas ningún estado de respuesta, se importaran todas las propuestas publicadas que no hayan sido importadas aún a otros presupuestos de este mismo componente.
             select_component: Por favor seleccione un componente
             title: Importar propuestas a proyectos
         reminders:
diff --git a/decidim-budgets/config/locales/es.yml b/decidim-budgets/config/locales/es.yml
index 8b7cf69b083de..004c036dcde1c 100644
--- a/decidim-budgets/config/locales/es.yml
+++ b/decidim-budgets/config/locales/es.yml
@@ -142,9 +142,10 @@ es:
           new:
             create: Importar propuestas a proyectos
             default_budget: Presupuesto por defecto
-            import_all_accepted_proposals: Importar todas las propuestas aceptadas
             no_components: No hay otros componentes de la propuesta en este espacio participativo para importar las propuestas en los proyectos.
             origin_component_id: Componente de origen
+            proposal_states: Estados de repuesta a la propuesta
+            proposal_states_help: Selecciona uno o más estados de respuesta de las propuestas a importar como proyectos. Si no seleccionas ningún estado de respuesta, se importaran todas las propuestas publicadas que no hayan sido importadas aún a otros presupuestos de este mismo componente.
             select_component: Por favor seleccione un componente
             title: Importar propuestas a proyectos
         reminders:
diff --git a/decidim-budgets/config/locales/eu.yml b/decidim-budgets/config/locales/eu.yml
index 7df9582cdc6e6..e70d4e257cb53 100644
--- a/decidim-budgets/config/locales/eu.yml
+++ b/decidim-budgets/config/locales/eu.yml
@@ -142,9 +142,10 @@ eu:
           new:
             create: Inportatu proiektuetarako proposamenak
             default_budget: Aurrekontu lehenetsia
-            import_all_accepted_proposals: Inportatu onartutako proposamen guztiak 
             no_components: Ez dago proposamen osagairik parte hartzeko espazio honetan proposamenak proiektuetara inportatzeko.
             origin_component_id: Jatorrizko osagaia
+            proposal_states: Proposamenen egoera
+            proposal_states_help: Hautatu proposamen-egoera bat edo gehiago, proiektuetara inportatzeko. Bat ere hautatzen ez baduzu, osagai honetako beste aurrekontu batzuetan inportatu ez diren argitaratutako proposamen guztiak inportatuko dituzu.
             select_component: Meesedez, hautatu osagaia
             title: Inportatu proiektuetarako proposamenak
         reminders:
diff --git a/decidim-budgets/config/locales/fi-plain.yml b/decidim-budgets/config/locales/fi-plain.yml
index 1061c2eccbaec..af6bf93fc3c40 100644
--- a/decidim-budgets/config/locales/fi-plain.yml
+++ b/decidim-budgets/config/locales/fi-plain.yml
@@ -142,9 +142,10 @@ fi-pl:
           new:
             create: Tuo ehdotuksia suunnitelmiin
             default_budget: Oletusbudjetti
-            import_all_accepted_proposals: Tuo kaikki hyväksytyt ehdotukset
             no_components: Tässä osallisuustilassa ei ole ole muita ehdotuskomponentteja, joista voitaisiin tuoda ehdotuksia suunnitelmiin.
             origin_component_id: Lähdekomponentti
+            proposal_states: Ehdotusten tilat
+            proposal_states_help: Valitse yksi tai useampi ehdotusten tila, joiden perusteella ehdotuksia tuodaan projekteiksi. Mikäli et valitse yhtään tilaa, kaikki julkaistut ehdotukset tuodaan, jos niitä ei ole aikaisemmin tuotu tämän komponentin budjetteihin.
             select_component: Valitse komponentti
             title: Tuo ehdotuksia projekteiksi
         reminders:
diff --git a/decidim-budgets/config/locales/fi.yml b/decidim-budgets/config/locales/fi.yml
index 74fa6abcd09cc..3c76e6380f3c4 100644
--- a/decidim-budgets/config/locales/fi.yml
+++ b/decidim-budgets/config/locales/fi.yml
@@ -142,9 +142,10 @@ fi:
           new:
             create: Tuo ehdotuksia projekteiksi
             default_budget: Oletusbudjetti
-            import_all_accepted_proposals: Tuo kaikki hyväksytyt ehdotukset
             no_components: Tässä osallistumistilassa ei ole ole muita ehdotuskomponentteja, joista voitaisiin tuoda ehdotuksia projekteiksi.
             origin_component_id: Lähdekomponentti
+            proposal_states: Ehdotusten tilat
+            proposal_states_help: Valitse yksi tai useampi ehdotusten tila, joiden perusteella ehdotuksia tuodaan projekteiksi. Mikäli et valitse yhtään tilaa, kaikki julkaistut ehdotukset tuodaan, jos niitä ei ole aikaisemmin tuotu tämän komponentin budjetteihin.
             select_component: Valitse komponentti
             title: Tuo ehdotuksia projekteiksi
         reminders:
diff --git a/decidim-budgets/config/locales/fr-CA.yml b/decidim-budgets/config/locales/fr-CA.yml
index d01b681714295..70a70272606d7 100644
--- a/decidim-budgets/config/locales/fr-CA.yml
+++ b/decidim-budgets/config/locales/fr-CA.yml
@@ -136,9 +136,10 @@ fr-CA:
           new:
             create: Importer des propositions dans des projets
             default_budget: Budget par défaut
-            import_all_accepted_proposals: Importer toutes les propositions acceptées
             no_components: Il n'y a pas d'autres modules de proposition dans cet espace participatif pour importer les propositions dans des projets.
             origin_component_id: Composant d'origine
+            proposal_states: Statuts de proposition
+            proposal_states_help: Sélectionnez un ou plusieurs statuts de proposition à importer dans les projets. Si vous n'en sélectionnez aucun, vous importerez toutes les propositions publiées qui n'ont pas déjà été importées dans d'autres budgets à partir de cette fonctionnalité.
             select_component: Veuillez sélectionner un module
             title: Importer des propositions dans des projets
         reminders:
diff --git a/decidim-budgets/config/locales/fr.yml b/decidim-budgets/config/locales/fr.yml
index 3cecf6f208df9..f6311b01d9287 100644
--- a/decidim-budgets/config/locales/fr.yml
+++ b/decidim-budgets/config/locales/fr.yml
@@ -136,9 +136,10 @@ fr:
           new:
             create: Importer des propositions dans des projets
             default_budget: Budget par défaut
-            import_all_accepted_proposals: Importer toutes les propositions acceptées
             no_components: Il n'y a pas d'autres modules de proposition dans cet espace participatif pour importer les propositions dans des projets.
             origin_component_id: Composant d'origine
+            proposal_states: Statuts de proposition
+            proposal_states_help: Sélectionnez un ou plusieurs statuts de proposition à importer dans les projets. Si vous n'en sélectionnez aucun, vous importerez toutes les propositions publiées qui n'ont pas déjà été importées dans d'autres budgets à partir de cette fonctionnalité.
             select_component: Veuillez sélectionner un module
             title: Importer des propositions dans des projets
         reminders:
diff --git a/decidim-budgets/config/locales/hu.yml b/decidim-budgets/config/locales/hu.yml
index f5a59346c5226..7feb3bcadd82d 100644
--- a/decidim-budgets/config/locales/hu.yml
+++ b/decidim-budgets/config/locales/hu.yml
@@ -103,7 +103,6 @@ hu:
           new:
             create: Javaslatok importálása projektekbe
             default_budget: Alapértelmezett költségvetés
-            import_all_accepted_proposals: Minden elfogadott javaslat importálása
             no_components: Ebben a részvételi térben nincs más javaslat-összetevő a javaslatok projektekbe való importálásához.
             origin_component_id: A komponens származása
             select_component: Válassz ki egy elemet
diff --git a/decidim-budgets/config/locales/it.yml b/decidim-budgets/config/locales/it.yml
index 4f1c3bd162f0a..010a436baa194 100644
--- a/decidim-budgets/config/locales/it.yml
+++ b/decidim-budgets/config/locales/it.yml
@@ -100,6 +100,8 @@ it:
       order:
         status:
           title: OK, il tuo voto è stato acquisito.
+      order_pdf:
+        title: Ok, il tuo voto è stato acquisito.
       order_summary_mailer:
         order_summary:
           selected_projects: 'I progetti che hai selezionato sono:'
diff --git a/decidim-budgets/config/locales/ja.yml b/decidim-budgets/config/locales/ja.yml
index 3ad5109ac8a3e..30d181087d3a7 100644
--- a/decidim-budgets/config/locales/ja.yml
+++ b/decidim-budgets/config/locales/ja.yml
@@ -140,9 +140,10 @@ ja:
           new:
             create: プロジェクトへの提案をインポート
             default_budget: 既定の予算
-            import_all_accepted_proposals: すべての承認済みの提案をインポート
             no_components: この参加型スペースには、プロジェクトにインポートするための他の提案コンポーネントはありません。
             origin_component_id: 元のコンポーネント
+            proposal_states: 提案状態
+            proposal_states_help: プロジェクトにインポートする提案状態を1つ以上選択してください。何も選択しない場合、このコンポーネントの提案のうち、公開済みかつ他の予算にインポートされていないすべての提案をインポートします。
             select_component: コンポーネントを選択してください
             title: プロジェクトに提案をインポート
         reminders:
@@ -328,6 +329,7 @@ ja:
         actions:
           comment: コメント
           vote: 投票
+          vote_comment: コメントに投票
         name: 予算
         settings:
           global:
diff --git a/decidim-budgets/config/locales/lt.yml b/decidim-budgets/config/locales/lt.yml
index efcd45f7cfa31..c1bc17510c53b 100644
--- a/decidim-budgets/config/locales/lt.yml
+++ b/decidim-budgets/config/locales/lt.yml
@@ -97,7 +97,6 @@ lt:
           new:
             create: Importuoti pasiūlymus į projektus
             default_budget: Numatytasis biudžetas
-            import_all_accepted_proposals: Importuoti visus priimtus projektus
             no_components: Nėra kitų pasiūlymų komponentų šioje dalyvaujamojoje erdvėje, kuriuos būtų galima importuoti į projektus.
             origin_component_id: Originalusis komponentas
             select_component: Pasirinkite komponentą
diff --git a/decidim-budgets/config/locales/nl.yml b/decidim-budgets/config/locales/nl.yml
index beabb767cac4f..95c3bdc461555 100644
--- a/decidim-budgets/config/locales/nl.yml
+++ b/decidim-budgets/config/locales/nl.yml
@@ -73,7 +73,6 @@ nl:
           new:
             create: Voorstellen importeren in projecten
             default_budget: Standaard budget
-            import_all_accepted_proposals: Alle geaccepteerde voorstellen importeren
             no_components: Er zijn geen andere voorstelonderdelen in deze participatieruimte om voorstellen in projecten te kunnen importeren.
             origin_component_id: Oorsprong component
             select_component: Selecteer een component
diff --git a/decidim-budgets/config/locales/pl.yml b/decidim-budgets/config/locales/pl.yml
index 8c5a5e7a6e00d..c8020543b85de 100644
--- a/decidim-budgets/config/locales/pl.yml
+++ b/decidim-budgets/config/locales/pl.yml
@@ -106,7 +106,6 @@ pl:
           new:
             create: Importuj propozycje do projektów
             default_budget: Domyślny budżet
-            import_all_accepted_proposals: Importuj wszystkie zaakceptowane propozycje
             no_components: W tej przestrzeni partycypacyjnej nie ma innych komponentów do zaimportowania propozycji jako projektów.
             origin_component_id: Źródłowy komponent
             select_component: Wybierz komponent
diff --git a/decidim-budgets/config/locales/pt-BR.yml b/decidim-budgets/config/locales/pt-BR.yml
index 0934a1b10d774..851fe209234b3 100644
--- a/decidim-budgets/config/locales/pt-BR.yml
+++ b/decidim-budgets/config/locales/pt-BR.yml
@@ -17,6 +17,10 @@ pt-BR:
         scope_id: Escopo
   activerecord:
     models:
+      decidim:
+        budgets:
+          project:
+            text: 'Foi adicionado a este orçamento: %{link}'
       decidim/budgets/budget:
         one: Orçamento
         other: Orçamentos
@@ -25,6 +29,9 @@ pt-BR:
         other: Projetos
   decidim:
     admin:
+      admin_log:
+        changeset:
+          projects: Projetos
       filters:
         projects:
           selected_at_null:
@@ -32,15 +39,25 @@ pt-BR:
             values:
               'false': Selecionado para implementação
               'true': Não selecionado para implementação
+          taxonomies_part_of_contains:
+            label: Taxonomia
+      tooltips:
+        deleted_projects_info: Não é possível excluir este projeto
     budgets:
       actions:
+        confirm_delete_budget: Tem certeza de que deseja excluir este orçamento?
+        confirm_delete_project: Tem certeza que deseja excluir este projeto?
+        deleted_budgets_info: Orçamentos excluídos podem ser restaurados da lixeira.
         edit: Editar
+        edit_projects: Adicionar projetos
         import: Importar propostas para os projetos
         new_budget: Novo orçamento
         new_project: Novo projeto
         preview: Pré-visualização
         send_voting_reminders: Enviar lembretes de votação
         title: Ações
+        view_deleted_budgets: Ver orçamentos excluídos
+        view_deleted_projects: Ver projetos excluídos
       admin:
         budgets:
           create:
@@ -55,6 +72,8 @@ pt-BR:
             title: Orçamentos
             users_with_finished_orders: Usuários com votos finalizados
             users_with_pending_orders: Usuários com votos pendentes
+          manage_trash:
+            title: Orçamentos excluídos
           new:
             create: Criar orçamento
             title: Novo orçamento
@@ -78,6 +97,7 @@ pt-BR:
             cancel: Cancelar
             change_budget: Alterar orçamento
             change_selected: Alterar estado selecionado
+            change_taxonomies: Alterar taxonomias
             deselect_implementation: Desselecionar da implementação
             finished_orders: Votos finais
             pending_orders: Votações pendentes
@@ -89,6 +109,8 @@ pt-BR:
             title: Projetos
             update: Atualizar
             update_budget_button: Atualizar orçamento do projeto
+          manage_trash:
+            title: Projetos excluídos
           new:
             create: Criar
             title: Novo projeto
@@ -96,10 +118,23 @@ pt-BR:
             invalid: Houve um problema ao atualizar este projeto.
             success: Projeto atualizado com sucesso.
           update_budget:
+            invalid: 'Esses projetos já estão no mesmo orçamento ou seus orçamentos são mais que o máximo permitido: %{errored}.'
             select_a_project: Por favor, selecione um projeto.
+            success: 'Projetos atualizados com sucesso para o orçamento %{subject_name}: %{successful}.'
           update_selected:
+            invalid:
+              selected: 'Estes projetos já foram selecionados para a implementação: %{errored}.'
+              unselected: 'Estes projetos já foram desselecionados da implementação: %{errored}.'
             select_a_project: Por favor, selecione um projeto.
             select_a_selection: Por favor, selecione um estado de implementação.
+            success:
+              selected: 'Estes projetos foram selecionados com sucesso para a implementação: %{successful}.'
+              unselected: 'Estes projetos foram desselecionados da implementação com sucesso: %{successful}.'
+          update_taxonomies:
+            invalid: 'Taxonomias %{taxonomies} já estão atribuídas a esses projetos: %{errored}.'
+            select_a_project: Por favor, selecione um projeto.
+            select_a_taxonomy: Por favor, selecione uma taxonomia.
+            success: 'Projetos atualizados com sucesso para as taxonomias %{taxonomies}: %{successful}.'
         proposals_imports:
           create:
             invalid: Houve um problema ao importar as propostas para projetos.
@@ -107,9 +142,10 @@ pt-BR:
           new:
             create: Importar propostas para projetos
             default_budget: Orçamento padrão
-            import_all_accepted_proposals: Importar todas as propostas aceitas
             no_components: Não há outros componentes da proposta neste espaço participativo para importar as propostas para projetos.
             origin_component_id: Componente de origem
+            proposal_states: Estados da proposta
+            proposal_states_help: Selecione um ou mais estados da proposta para importar para os projetos. Selecionando nenhuma, você importará todas as propostas publicadas que não foram já importadas para outros orçamentos deste componente.
             select_component: Selecione um componente
             title: Importar propostas para os projetos
         reminders:
@@ -122,10 +158,14 @@ pt-BR:
         budget:
           create: "%{user_name} criou o orçamento %{resource_name} no espaço %{space_name}"
           delete: "%{user_name} excluiu o orçamento %{resource_name} no espaço %{space_name}"
+          restore: "%{user_name} restaurou o orçamento %{resource_name} em %{space_name}"
+          soft_delete: "%{user_name} moveu o orçamento %{resource_name} em %{space_name} para a lixeira"
           update: "%{user_name} atualizou o orçamento %{resource_name} no espaço %{space_name}"
         project:
           create: "%{user_name} criou o projeto %{resource_name} no espaço %{space_name}"
           delete: "%{user_name} excluiu o projeto %{resource_name} no espaço %{space_name}"
+          restore: "%{user_name} restaurou o projeto %{resource_name} em %{space_name}"
+          soft_delete: "%{user_name} moveu o projeto %{resource_name} em %{space_name} para a lixeira"
           update: "%{user_name} atualizou o projeto %{resource_name} no espaço %{space_name}"
       budget_information_modal:
         back_to: Voltar para %{component_name}
@@ -137,6 +177,7 @@ pt-BR:
         cancel_order:
           more_than_one: exclua seu voto em %{name} e comece de novo
           only_one: exclua seu voto e comece novamente.
+        completed: Concluído
         count:
           one: "Orçamento em %{count}"
           other: "%{count} Orçamentos"
@@ -144,6 +185,7 @@ pt-BR:
         finished_message: Você terminou o processo de votação. Obrigado por participar!
         highlighted_cta: Votar em %{name}
         if_change_opinion: Se você mudou de ideia, você pode
+        incomplete: Incompleto
         orders:
           highest_cost: Custo mais alto
           label: Ordenar orçamentos por
@@ -151,10 +193,14 @@ pt-BR:
           random: Ordem aleatória
         progress: Terminar votação
         remove_vote: Remover voto
+        see_projects: Ver projetos
+        see_results: Ver resultados
         show: Ver projetos
         vote: Voto
         voted_budgets: Orçamentos votados
         voted_on: Você votou em %{links}.
+      creation:
+        text: Eles foram adicionados a este orçamento
       last_activity:
         new_vote_at: Nova votação sobre orçamentação em
       limit_announcement:
@@ -169,11 +215,26 @@ pt-BR:
         project:
           fields:
             map: Mapa
+            taxonomies: Taxonomias
             title: Título
       order:
         status:
+          continue_voting: Continuar votando
+          download_vote: Baixe seu voto
+          pending_to_vote_budgets:
+            one: Você pode votar em outro orçamento
+            other: Você pode votar em outros orçamentos
+          share_text: "Acabei de votar nos meus projetos favoritos em %{space_name}! 🎉 Vote agora: %{component_url}"
+          share_vote: Compartilhe seu voto
           title: Seu voto foi aceito com sucesso
+          view_votes:
+            one: Visualizar voto
+            other: Ver votos
+          votes_count:
+            one: Seu voto para %{budget_name} já foi registrado.
+            other: Seus votos %{count} para %{budget_name} já foram registrados.
       order_pdf:
+        text: Você votou em %{space_name}, para os seguintes projetos
         title: Seu voto foi aceito com sucesso.
       order_summary_mailer:
         order_summary:
@@ -181,6 +242,7 @@ pt-BR:
           subject: Você votou no espaço participativo %{space_name}
           voted_on_space: Você votou no orçamento %{budget_name} para o espaço participativo %{space_name}.
       projects:
+        back_to_budgets: Voltar aos orçamentos
         budget_confirm:
           are_you_sure: Se mudar de ideia, você pode mudar de voto mais tarde.
           cancel: Cancelar
@@ -198,6 +260,7 @@ pt-BR:
             title: Máximo de projetos excedido
         budget_summary:
           are_you_sure: Deseja mesmo cancelar o seu voto?
+          cancel_order: Exclua seu voto
           checked_out:
             description: Você já votou no orçamento. Se você mudou de ideia, você pode apagar seu voto %{cancel_link}.
             title: Votação do orçamento concluída
@@ -225,6 +288,14 @@ pt-BR:
           dynamic_help:
             minimum_reached: Você atingiu o mínimo para poder votar
           minimum: Mínimo
+          minimum_projects_rule:
+            description: "<b>Selecione pelo menos %{minimum_number} projetos</b> você quer e vote de acordo com suas preferências."
+          projects_rule:
+            description: "<b>Selecione no mínimo %{minimum_number} e no máximo %{maximum_number} projetos que você deseja e vote de acordo com suas preferências.</b>."
+          projects_rule_maximum_only:
+            description: "<b>Selecione até %{maximum_number} projetos</b> você quer e vote de acordo com suas preferências."
+          vote_threshold_percent_rule:
+            description: "<b>Atribua pelo menos %{minimum_budget}</b> aos projetos que você deseja e vote de acordo com suas preferências."
         orders:
           highest_cost: Custo mais alto
           label: Ordenar projetos por
@@ -249,8 +320,10 @@ pt-BR:
           added: Adicionado
           all: Todos
         projects_for: Projetos para %{name}
+        select_projects: Adicionar projetos
         show:
           budget: Orçamento
+          votes: Votos
       prompt: Selecione o orçamento
       vote_reminder_mailer:
         vote_reminder:
@@ -266,12 +339,15 @@ pt-BR:
         actions:
           comment: Comentar
           vote: Voto
+          vote_comment: Vote no comentário
         name: Orçamentos
         settings:
           global:
             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:
                 budget_voting_rule_only_one: Apenas uma regra de votação deve estar habilitada.
@@ -279,8 +355,11 @@ pt-BR:
             geocoding_enabled: Mapas ativados
             landing_page_content: Página inicial dos orçamentos
             more_information_modal: Modal de mais informação
+            no_taxonomy_filters_found: Nenhum filtro de taxonomia encontrado.
             projects_per_page: Projetos por página
             resources_permissions_enabled: Permissões de ações podem ser definidas para cada projeto
+            taxonomy_filters: Selecione filtros para o componente
+            taxonomy_filters_add: Adicionar filtro
             title: Título
             total_budget: Orçamento total
             vote_minimum_budget_projects_number: Número mínimo de projetos para votar
@@ -290,6 +369,11 @@ pt-BR:
             vote_selected_projects_maximum: Quantidade máxima de projetos a serem selecionados
             vote_selected_projects_minimum: Quantidade mínima de projetos a serem selecionados
             vote_threshold_percent: Porcentagem do limiar de voto
+            voting_rule: Regra de votação
+            voting_rule_choices:
+              minimum_projects: Número mínimo de projetos para votação
+              selected_projects: Número mínimo e máximo de projetos a serem votados
+              threshold_percent: Porcentagem de orçamento mínimo
             workflow: Fluxo de Trabalho
             workflow_choices:
               all: 'Votar em todos: permite que os participantes votem em todos os orçamentos.'
@@ -308,6 +392,43 @@ pt-BR:
               disabled: Votação desativada
               enabled: Votação habilitada
               finished: Votação finalizada
+    download_your_data:
+      help:
+        orders:
+          budget: O orçamento com o qual a ordem está relacionada
+          checked_out_at: A data e hora em que o pedido foi verificado
+          component: O componente com o qual a ordem está relacionada
+          created_at: A data e hora em que o pedido foi criado
+          id: O identificador exclusivo do pedido
+          projects: Os projetos em que a ordem foi votada
+          updated_at: A data e hora em que o pedido foi atualizado
+      show:
+        projects: Exportação de projetos
+    open_data:
+      help:
+        projects:
+          address: O endereço do projeto (se houver)
+          budget: Dados relativos ao orçamento (por exemplo, "2021 orçamento") do projeto
+          budget_amount: O montante total do orçamento para este projeto
+          comments: O número de comentários que este projeto recebeu
+          component: O componente ao qual o projeto pertence
+          confirmed_votes: O número de votos confirmados que este projeto recebeu
+          created_at: Data e hora em que o projeto foi criado
+          description: A descrição do projeto
+          follows_count: O número de seguir o projeto tem
+          id: O identificador exclusivo do projeto
+          latitude: A latitude do projeto, caso tenha uma localização física
+          longitude: A longitude do projeto, caso ele tenha um local físico
+          participatory_space: A que espaço (por exemplo, Processo participativo, ou montagem) este projeto pertence
+          reference: A referência exclusiva do projeto
+          related_proposal_titles: Os títulos das propostas relacionadas
+          related_proposal_urls: As URLs das propostas relacionadas
+          related_proposals: As propostas relacionadas a este projeto
+          selected_at: O momento em que o projeto foi selecionado
+          taxonomies: As taxonomias do projeto
+          title: O título do projeto
+          updated_at: A última data em que o projeto foi atualizado
+          url: A URL do projeto
     orders:
       checkout:
         error: Ocorreu um erro ao processar seu voto.
@@ -319,5 +440,7 @@ pt-BR:
         project_proposal: Propostas incluídas neste projeto
     statistics:
       orders_count: Suportes
+      projects_count: Orçamentos
+      projects_count_tooltip: O número de projectos de orçamentação participativa e o total de votos expressos sobre eles.
   index:
     confirmed_orders_count: Contagem de votos
diff --git a/decidim-budgets/config/locales/ro-RO.yml b/decidim-budgets/config/locales/ro-RO.yml
index bdc78da938abc..87a25adfd788c 100644
--- a/decidim-budgets/config/locales/ro-RO.yml
+++ b/decidim-budgets/config/locales/ro-RO.yml
@@ -77,6 +77,8 @@ ro:
           new:
             create: Importă propuneri în proiecte
             no_components: Nu există alte componente de propuneri în acest spațiu participativ pentru a importa propunerile în proiecte.
+            proposal_states: Stări ale propunerii
+            proposal_states_help: Selectați una sau mai multe stări de propunere pentru a importa în proiecte. Prin neselectarea vreuneia, veți importa toate propunerile publicate care nu au fost deja importate în alte bugete din această componentă.
             select_component: Te rugăm selectează o componentă
       admin_log:
         budget:
diff --git a/decidim-budgets/config/locales/sv.yml b/decidim-budgets/config/locales/sv.yml
index b769923634516..2fe190c1bd81a 100644
--- a/decidim-budgets/config/locales/sv.yml
+++ b/decidim-budgets/config/locales/sv.yml
@@ -142,7 +142,6 @@ sv:
           new:
             create: Importera förslag till projekt
             default_budget: Förvald budget
-            import_all_accepted_proposals: Importera alla godkända förslag
             no_components: Det finns inga andra förslagskomponenter med förslag i deltagarutrymmet som kan importeras till projekt.
             origin_component_id: Ursprungskomponent
             select_component: Välj en komponent
diff --git a/decidim-budgets/config/locales/zh-TW.yml b/decidim-budgets/config/locales/zh-TW.yml
index 6f0ed34f4df41..87214182a0f52 100644
--- a/decidim-budgets/config/locales/zh-TW.yml
+++ b/decidim-budgets/config/locales/zh-TW.yml
@@ -94,7 +94,6 @@ zh-TW:
           new:
             create: 將提案匯入專案
             default_budget: 預設預算
-            import_all_accepted_proposals: 導入所有已接受的提案
             no_components: 在此參與空間中沒有其他提案元件可以將提案匯入到專案中。
             origin_component_id: 原始元件
             select_component: 請選擇一個組件
diff --git a/decidim-budgets/lib/decidim/api/budget_type.rb b/decidim-budgets/lib/decidim/api/budget_type.rb
index 0e08730102dcd..1f3de24edeb81 100644
--- a/decidim-budgets/lib/decidim/api/budget_type.rb
+++ b/decidim-budgets/lib/decidim/api/budget_type.rb
@@ -23,8 +23,6 @@ def url
 
       def self.authorized?(object, context)
         super && object.visible?
-      rescue Decidim::PermissionAction::PermissionNotSetError
-        false
       end
     end
   end
diff --git a/decidim-budgets/lib/decidim/api/budgets_type.rb b/decidim-budgets/lib/decidim/api/budgets_type.rb
index f2e4ff44503dc..f54ed84eaf134 100644
--- a/decidim-budgets/lib/decidim/api/budgets_type.rb
+++ b/decidim-budgets/lib/decidim/api/budgets_type.rb
@@ -15,8 +15,8 @@ def budgets
         Budget.where(component: object).includes(:component)
       end
 
-      def budget(**args)
-        Budget.where(component: object).find_by(id: args[:id])
+      def budget(id:)
+        Decidim::Core::ComponentFinderBase.new(model_class: Budget).call(object, { id: }, context)
       end
     end
   end
diff --git a/decidim-budgets/lib/decidim/api/project_type.rb b/decidim-budgets/lib/decidim/api/project_type.rb
index f26390c3a70e3..f2df243583d8e 100644
--- a/decidim-budgets/lib/decidim/api/project_type.rb
+++ b/decidim-budgets/lib/decidim/api/project_type.rb
@@ -49,13 +49,11 @@ def self.authorized?(object, context)
         context[:project] = object
 
         chain = [
-          allowed_to?(:read, :project, object, context),
-          object.visible?
+          object.visible?,
+          allowed_to?(:read, :project, object, context)
         ].all?
 
         super && chain
-      rescue Decidim::PermissionAction::PermissionNotSetError
-        false
       end
     end
   end
diff --git a/decidim-budgets/lib/decidim/budgets/component.rb b/decidim-budgets/lib/decidim/budgets/component.rb
index 597b7971ab720..fc77f38657f92 100644
--- a/decidim-budgets/lib/decidim/budgets/component.rb
+++ b/decidim-budgets/lib/decidim/budgets/component.rb
@@ -17,10 +17,6 @@
 
   component.actions = %w(vote comment vote_comment)
 
-  component.on(:before_destroy) do |instance|
-    raise StandardError, "Cannot remove this component" if Decidim::Budgets::Budget.where(component: instance).any?
-  end
-
   component.on(:publish) do |instance|
     Decidim::Budgets::Budget.where(component: instance).find_each do |budget|
       Decidim::UpdateSearchIndexesJob.perform_later([budget])
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 082187f80b6c2..dff91c0a0bab9 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
@@ -29,14 +29,14 @@ module Admin
               current_component:,
               current_user:,
               default_budget:,
-              import_all_accepted_proposals:,
+              internal_states:,
               budget:,
               valid?: valid
             )
           end
 
           let(:default_budget) { 1000 }
-          let(:import_all_accepted_proposals) { true }
+          let(:internal_states) { ["accepted"] }
 
           let(:command) { described_class.new(form) }
 
@@ -65,6 +65,29 @@ module Admin
               expect { command.call }.to change { Project.where(budget:).count }.by(3)
             end
 
+            context "when importing multiple states" do
+              let!(:rejected_proposals) { create_list(:proposal, 2, :rejected, component: proposals_component) }
+              let(:internal_states) { %w(accepted rejected) }
+
+              it "imports proposals from all selected states" do
+                expect { command.call }.to change { Project.where(budget:).count }.by(5)
+              end
+            end
+
+            context "when importing custom states" do
+              let!(:custom_state) { create(:proposal_state, token: "custom_state", component: proposals_component) }
+              let!(:custom_state_proposals) do
+                create_list(:proposal, 2, :published, component: proposals_component).each do |proposal|
+                  proposal.update!(proposal_state: custom_state)
+                end
+              end
+              let(:internal_states) { ["custom_state"] }
+
+              it "imports proposals with custom states" do
+                expect { command.call }.to change { Project.where(budget:).count }.by(2)
+              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 1c67d6c040758..5864d702866e3 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
@@ -12,12 +12,12 @@ module Admin
         let(:component) { project.component }
         let(:origin_component) { create(:proposal_component, participatory_space: component.participatory_space) }
         let(:default_budget) { 1000 }
-        let(:import_all_accepted_proposals) { true }
+        let(:internal_states) { %w(accepted rejected) }
         let(:params) do
           {
             origin_component_id: origin_component.try(:id),
             default_budget:,
-            import_all_accepted_proposals:
+            internal_states:
           }
         end
 
@@ -44,10 +44,10 @@ module Admin
           it { is_expected.to be_invalid }
         end
 
-        context "when the import proposals is not accepted" do
-          let(:import_all_accepted_proposals) { false }
+        context "when no states are selected" do
+          let(:internal_states) { [] }
 
-          it { is_expected.to be_invalid }
+          it { is_expected.to be_valid }
         end
 
         describe "origin_component" do
diff --git a/decidim-budgets/spec/shared/import_proposals_to_projects_examples.rb b/decidim-budgets/spec/shared/import_proposals_to_projects_examples.rb
index 7c179f8c35530..0a4a6404549cc 100644
--- a/decidim-budgets/spec/shared/import_proposals_to_projects_examples.rb
+++ b/decidim-budgets/spec/shared/import_proposals_to_projects_examples.rb
@@ -14,7 +14,7 @@
     within ".import_proposals" do
       select origin_component.name["en"], from: :proposals_import_origin_component_id
       fill_in "Default budget", with: default_budget
-      check :proposals_import_import_all_accepted_proposals
+      check "Accepted" || "Rejected"
     end
 
     click_on "Import proposals to projects"
diff --git a/decidim-budgets/spec/system/admin_manages_budgets_spec.rb b/decidim-budgets/spec/system/admin_manages_budgets_spec.rb
index ffb8c68bbea44..12a280ca45d14 100644
--- a/decidim-budgets/spec/system/admin_manages_budgets_spec.rb
+++ b/decidim-budgets/spec/system/admin_manages_budgets_spec.rb
@@ -175,4 +175,30 @@
     it_behaves_like "manage soft deletable resource", "budget"
     it_behaves_like "manage trashed resource", "budget"
   end
+
+  describe "more information button" do
+    context "when budget has more_information content" do
+      let!(:budget_with_info) { create(:budget, :with_projects, component: current_component) }
+
+      before do
+        current_component.update!(settings: { more_information_modal: { en: "Additional budget information" } })
+      end
+
+      it "displays the more information button" do
+        visit Decidim::EngineRouter.main_proxy(current_component).budget_projects_path(budget_with_info)
+
+        expect(page).to have_button("More information")
+      end
+    end
+
+    context "when budget has no more_information content" do
+      let!(:budget_without_info) { create(:budget, :with_projects, component: current_component) }
+
+      it "does not display the more information button" do
+        visit Decidim::EngineRouter.main_proxy(current_component).budget_projects_path(budget_without_info)
+
+        expect(page).to have_no_button("More information")
+      end
+    end
+  end
 end
diff --git a/decidim-budgets/spec/system/budgets_breadcrumbs_spec.rb b/decidim-budgets/spec/system/budgets_breadcrumbs_spec.rb
new file mode 100644
index 0000000000000..a491d85ed8048
--- /dev/null
+++ b/decidim-budgets/spec/system/budgets_breadcrumbs_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Budgets Breadcrumb" do
+  let(:organization) { create(:organization) }
+  let(:participatory_space) { create(:participatory_process, :with_steps, :published, organization:, title: { "en" => "Participatory space" }) }
+  let(:component) { create(:budgets_component, :published, :with_votes_disabled, participatory_space:, name: { "en" => "Component" }) }
+  let(:budget) { create(:budget, component:, title: { "en" => "Budget" }) }
+  let!(:project) { create(:project, budget:, title: { "en" => "Project" }) }
+  let(:router) { Decidim::EngineRouter.main_proxy(component) }
+
+  before do
+    switch_to_host(organization.host)
+  end
+
+  context "when visiting the budgets index page" do
+    it "shows the correct information in breadcrumb (space, component)" do
+      visit router.root_path(locale: I18n.locale)
+
+      within ".menu-bar" do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+      end
+    end
+  end
+
+  context "when visiting single budget page" do
+    it "shows the correct information in breadcrumb (space, component, budget)" do
+      visit router.budget_path(budget, locale: I18n.locale)
+
+      within ".menu-bar" do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+        expect(page).to have_content(translated(budget.title))
+      end
+    end
+  end
+
+  context "when visiting single project page" do
+    it "shows the correct information in breadcrumb (space, component, budget, project)" do
+      visit router.budget_project_path(budget, project, locale: I18n.locale)
+
+      within ".menu-bar" do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+        expect(page).to have_content(translated(budget.title))
+        expect(page).to have_content(translated(project.title))
+      end
+    end
+  end
+end
diff --git a/decidim-budgets/spec/system/explore_projects_spec.rb b/decidim-budgets/spec/system/explore_projects_spec.rb
index 7fa16548097fb..044ecd1564a71 100644
--- a/decidim-budgets/spec/system/explore_projects_spec.rb
+++ b/decidim-budgets/spec/system/explore_projects_spec.rb
@@ -110,7 +110,7 @@
             [-142.15275006889419, 33.33377235135252],
             [-55.28745034772282, -35.587843900166945]
           ]
-          Decidim::Budgets::Project.where(budget: budget).geocoded.each_with_index do |project, index|
+          Decidim::Budgets::Project.where(budget:).geocoded.each_with_index do |project, index|
             project.update!(latitude: coordinates[index][0], longitude: coordinates[index][1]) if coordinates[index]
           end
 
diff --git a/decidim-budgets/spec/types/budget_type_spec.rb b/decidim-budgets/spec/types/budget_type_spec.rb
index 40b169938a459..006f869243dfc 100644
--- a/decidim-budgets/spec/types/budget_type_spec.rb
+++ b/decidim-budgets/spec/types/budget_type_spec.rb
@@ -10,7 +10,7 @@ module Budgets
       let(:model) { create(:budget, :with_projects) }
 
       it_behaves_like "traceable interface" do
-        let(:author) { create(:user, :admin, organization: model.component.organization) }
+        let(:author) { create(:user, :admin, :confirmed, organization: model.component.organization) }
       end
 
       describe "id" do
diff --git a/decidim-budgets/spec/types/budgets_type_spec.rb b/decidim-budgets/spec/types/budgets_type_spec.rb
index 46b62664470c9..1aba5e98f8454 100644
--- a/decidim-budgets/spec/types/budgets_type_spec.rb
+++ b/decidim-budgets/spec/types/budgets_type_spec.rb
@@ -40,8 +40,8 @@ module Budgets
         context "when the budget does not belong to the component" do
           let!(:budget) { create(:budget, component: create(:budgets_component)) }
 
-          it "returns null" do
-            expect(response["budget"]).to be_nil
+          it "raises error" do
+            expect { response }.to raise_error(Decidim::Api::Errors::NotFoundError, "Budget not found")
           end
         end
       end
diff --git a/decidim-budgets/spec/types/integration_schema_spec.rb b/decidim-budgets/spec/types/integration_schema_spec.rb
index d164389d7087d..1399a58d16993 100644
--- a/decidim-budgets/spec/types/integration_schema_spec.rb
+++ b/decidim-budgets/spec/types/integration_schema_spec.rb
@@ -123,6 +123,12 @@
     }
   end
 
+  shared_examples "unauthorized Budget" do
+    it "throws Decidim::Api::Errors::UnauthorizedObjectError" do
+      expect { response }.to raise_error(Decidim::Api::Errors::UnauthorizedObjectError, "You cannot view or edit this Budget because you do not have permissions")
+    end
+  end
+
   describe "commentable" do
     let(:component_fragment) { nil }
 
@@ -275,8 +281,33 @@
         context "when user is visitor" do
           let!(:current_user) { nil }
 
+          let(:component_fragment) do
+            %(
+      fragment fooComponent on Budgets {
+        budget(id: #{budget.id}) {
+          createdAt
+          description {
+            translation(locale:"#{locale}")
+          }
+          id
+          title {
+            translation(locale:"#{locale}")
+          }
+          total_budget
+          updatedAt
+          url
+          versions {
+            id
+          }
+          versionsCount
+          weight
+        }
+      }
+    )
+          end
+
           it "should be visible" do
-            expect(response["participatoryProcess"]["components"].first[lookout_key]).to eq(query_result.merge("projects" => [nil, nil]))
+            expect(response["participatoryProcess"]["components"].first[lookout_key]).to eq(query_result.except("projects"))
           end
         end
 
@@ -295,16 +326,14 @@
         context "when the user is admin" do
           let!(:current_user) { create(:user, :admin, :confirmed, organization: current_organization) }
 
-          it "should not be visible" do
-            expect(response["participatoryProcess"]["components"].first[lookout_key]).to be_nil
-          end
+          it_behaves_like "unauthorized Budget"
         end
 
         context "when user is visitor" do
           let!(:current_user) { nil }
 
           it "should not be visible" do
-            expect(response["participatoryProcess"]["components"].first).to be_nil
+            expect(response["participatoryProcess"]["components"]).to be_empty
           end
         end
 
@@ -312,7 +341,7 @@
           let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
 
           it "should not be visible" do
-            expect(response["participatoryProcess"]["components"].first).to be_nil
+            expect(response["participatoryProcess"]["components"]).to be_empty
           end
         end
       end
@@ -327,25 +356,19 @@
         context "when the user is admin" do
           let!(:current_user) { create(:user, :admin, :confirmed, organization: current_organization) }
 
-          it "should not be visible" do
-            expect(response["participatoryProcess"]["components"].first[lookout_key]).to be_nil
-          end
+          it_behaves_like "unauthorized Budget"
         end
 
         context "when user is visitor" do
           let!(:current_user) { nil }
 
-          it "should not be visible" do
-            expect(response["participatoryProcess"]).to be_nil
-          end
+          it_behaves_like "graphQL not found space"
         end
 
         context "when user is normal user" do
           let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
 
-          it "should not be visible" do
-            expect(response["participatoryProcess"]).to be_nil
-          end
+          it_behaves_like "graphQL not found space"
         end
       end
 
@@ -355,25 +378,19 @@
         context "when the user is admin" do
           let!(:current_user) { create(:user, :admin, :confirmed, organization: current_organization) }
 
-          it "should not be visible" do
-            expect(response["participatoryProcess"]["components"].first[lookout_key]).to be_nil
-          end
+          it_behaves_like "unauthorized Budget"
         end
 
         context "when user is visitor" do
           let!(:current_user) { nil }
 
-          it "should not be visible" do
-            expect(response["participatoryProcess"]).to be_nil
-          end
+          it_behaves_like "graphQL not found space"
         end
 
         context "when user is normal user" do
           let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
 
-          it "should not be visible" do
-            expect(response["participatoryProcess"]).to be_nil
-          end
+          it_behaves_like "graphQL not found space"
         end
       end
     end
@@ -421,18 +438,62 @@
             end
           end
         end
-
         context "when user is visitor" do
           let!(:current_user) { nil }
 
+          let(:component_fragment) do
+            %(
+      fragment fooComponent on Budgets {
+        budget(id: #{budget.id}) {
+          createdAt
+          description {
+            translation(locale:"#{locale}")
+          }
+          id
+          title {
+            translation(locale:"#{locale}")
+          }
+          total_budget
+          updatedAt
+          url
+          versions {
+            id
+          }
+          versionsCount
+          weight
+        }
+      }
+    )
+          end
+
           it "is visible" do
-            expect(response["assembly"]["components"].first[lookout_key]).to eq(query_result.merge("projects" => [nil, nil]))
+            expect(response["assembly"]["components"].first[lookout_key]).to eq(query_result.except("projects"))
+          end
+        end
+
+        context "when user is visitor and requests projects that is not supposed to see" do
+          let!(:current_user) { nil }
+
+          let(:component_fragment) do
+            %(
+    fragment fooComponent on Budgets {
+      budget(id: #{budget.id}) {
+        id
+        projects {
+          id
+        }
+      }
+    })
+          end
+
+          it "throws Decidim::Api::Errors::UnauthorizedObjectError" do
+            expect { response }.to raise_error(Decidim::Api::Errors::UnauthorizedObjectError, "You cannot view or edit this Project because you do not have permissions")
           end
         end
 
         context "when user is member" do
           let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
-          let!(:participatory_space_private_user) { create(:assembly_private_user, user: current_user, privatable_to: participatory_process) }
+          let!(:member) { create(:assembly_member, user: current_user, participatory_space: participatory_process) }
 
           it "is visible" do
             expect(response["assembly"]["components"].first[lookout_key]).to eq(query_result)
@@ -454,9 +515,7 @@
         context "when the user is admin" do
           let!(:current_user) { create(:user, :admin, :confirmed, organization: current_organization) }
 
-          it "is visible" do
-            expect(response["assembly"]["components"].first[lookout_key]).to be_nil
-          end
+          it_behaves_like "unauthorized Budget"
         end
 
         %w(admin collaborator evaluator).each do |role|
@@ -465,16 +524,17 @@
             let!(:role) { create(:assembly_user_role, assembly: participatory_process, user: current_user, role:) }
 
             it "is visible" do
-              expect(response["assembly"]["components"].first[lookout_key]).to be_nil
+              expect(response["assembly"]["components"]).to be_empty
             end
           end
         end
+
         context "when the user is space moderator" do
           let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
           let!(:role) { create(:assembly_user_role, assembly: participatory_process, user: current_user, role: "moderator") }
 
           it "is visible" do
-            expect(response["assembly"]["components"].first).to be_nil
+            expect(response["assembly"]["components"]).to be_empty
           end
         end
 
@@ -482,15 +542,15 @@
           let!(:current_user) { nil }
 
           it "should not be visible" do
-            expect(response["assembly"]["components"].first).to be_nil
+            expect(response["assembly"]["components"]).to be_empty
           end
 
           context "when user is member" do
             let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
-            let!(:participatory_space_private_user) { create(:assembly_private_user, user: current_user, privatable_to: participatory_process) }
+            let!(:member) { create(:assembly_member, user: current_user, participatory_space: participatory_process) }
 
             it "should not be visible" do
-              expect(response["assembly"]["components"].first).to be_nil
+              expect(response["assembly"]["components"]).to be_empty
             end
           end
         end
@@ -499,7 +559,7 @@
           let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
 
           it "should not be visible" do
-            expect(response["assembly"]["components"].first).to be_nil
+            expect(response["assembly"]["components"]).to be_empty
           end
         end
       end
@@ -514,25 +574,19 @@
         context "when the user is admin" do
           let!(:current_user) { create(:user, :admin, :confirmed, organization: current_organization) }
 
-          it "should not be visible" do
-            expect(response["participatoryProcess"]["components"].first[lookout_key]).to be_nil
-          end
+          it_behaves_like "unauthorized Budget"
         end
 
         context "when user is visitor" do
           let!(:current_user) { nil }
 
-          it "should not be visible" do
-            expect(response["participatoryProcess"]).to be_nil
-          end
+          it_behaves_like "graphQL not found space"
         end
 
         context "when user is normal user" do
           let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
 
-          it "should not be visible" do
-            expect(response["participatoryProcess"]).to be_nil
-          end
+          it_behaves_like "graphQL not found space"
         end
       end
 
@@ -542,25 +596,19 @@
         context "when the user is admin" do
           let!(:current_user) { create(:user, :admin, :confirmed, organization: current_organization) }
 
-          it "should not be visible" do
-            expect(response["participatoryProcess"]["components"].first[lookout_key]).to be_nil
-          end
+          it_behaves_like "unauthorized Budget"
         end
 
         context "when user is visitor" do
           let!(:current_user) { nil }
 
-          it "should not be visible" do
-            expect(response["participatoryProcess"]).to be_nil
-          end
+          it_behaves_like "graphQL not found space"
         end
 
         context "when user is normal user" do
           let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
 
-          it "should not be visible" do
-            expect(response["participatoryProcess"]).to be_nil
-          end
+          it_behaves_like "graphQL not found space"
         end
       end
     end
diff --git a/decidim-budgets/spec/types/project_type_spec.rb b/decidim-budgets/spec/types/project_type_spec.rb
index 94448418103db..cd19a363da937 100644
--- a/decidim-budgets/spec/types/project_type_spec.rb
+++ b/decidim-budgets/spec/types/project_type_spec.rb
@@ -21,6 +21,12 @@ module Budgets
       include_examples "referable interface"
       include_examples "followable interface"
 
+      shared_examples "unauthorized Project" do
+        it "throws Decidim::Api::Errors::UnauthorizedObjectError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::UnauthorizedObjectError, "You cannot view or edit this Project because you do not have permissions")
+        end
+      end
+
       describe "id" do
         let(:query) { "{ id }" }
 
@@ -155,9 +161,7 @@ module Budgets
         let(:model) { create(:project, budget:) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Project"
       end
 
       context "when participatory space is not published" do
@@ -167,9 +171,7 @@ module Budgets
         let(:model) { create(:project, budget:) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Project"
       end
 
       context "when component is not published" do
@@ -177,9 +179,7 @@ module Budgets
         let(:model) { create(:project, component:) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Project"
       end
 
       context "when budget is not visible" do
@@ -189,10 +189,11 @@ module Budgets
         let(:query) { "{ id }" }
         let(:root_value) { model.reload }
 
-        it "returns all the required fields" do
+        before do
           allow(model).to receive(:visible?).and_return(false)
-          expect(response).to be_nil
         end
+
+        it_behaves_like "unauthorized Project"
       end
     end
   end
diff --git a/decidim-collaborative_texts/config/locales/en.yml b/decidim-collaborative_texts/config/locales/en.yml
index 58991fd8369c3..b74f98097e0dd 100644
--- a/decidim-collaborative_texts/config/locales/en.yml
+++ b/decidim-collaborative_texts/config/locales/en.yml
@@ -16,6 +16,11 @@ en:
           body: Body
           draft: Draft
           version_number: Version number
+  activerecord:
+    models:
+      decidim/collaborative_texts/document:
+        one: Collaborative text
+        other: Collaborative texts
   decidim:
     admin:
       tooltips:
diff --git a/decidim-collaborative_texts/config/locales/eu.yml b/decidim-collaborative_texts/config/locales/eu.yml
index c645ac4c56c73..e51d5676463dc 100644
--- a/decidim-collaborative_texts/config/locales/eu.yml
+++ b/decidim-collaborative_texts/config/locales/eu.yml
@@ -87,7 +87,7 @@ eu:
           unpublish: "%{user_name} parte-hartzaileak %{resource_name} testu kolaboratiboa argitaratzeari utzi dio %{space_name} espazioan"
           update: "%{user_name} parte-hartzaileak %{resource_name} testu kolaboratiboa aldatu du %{space_name} espazioan"
         suggestion:
-          create: "%{user_name} parte-hartzaileak %{resource_name} testu kolaboratiboan aldaketak iradoki ditu %{space_name} partaidetza espazioan"
+          create: "%{user_name} parte-hartzaileak %{resource_name} testu kolaboratiboan aldaketak iradoki ditu %{space_name} partaidetza-espazioan"
         version:
           delete: "%{user_name} parte-hartzaileak %{resource_name} testu kolaboratiboaren bertsioa ezabatu du %{space_name} espazioan"
           update: "%{user_name} parte-hartzaileak %{resource_name} testu kolaboratiboaren bertsioa aldatu du %{space_name} espazioan"
diff --git a/decidim-collaborative_texts/config/locales/pt-BR.yml b/decidim-collaborative_texts/config/locales/pt-BR.yml
index 21460cdedbdf8..bcfb6eb3afbb0 100644
--- a/decidim-collaborative_texts/config/locales/pt-BR.yml
+++ b/decidim-collaborative_texts/config/locales/pt-BR.yml
@@ -1 +1,158 @@
+---
 pt-BR:
+  activemodel:
+    attributes:
+      collaborative_texts:
+        document:
+          body: Corpo
+          draft: Rascunho
+          title: Título
+          version_number: Número da versão
+        suggestion:
+          nodes: DOM nodes
+          original: Texto original
+          replace: Substituição
+        version:
+          body: Corpo
+          draft: Rascunho
+          version_number: Número da versão
+  decidim:
+    admin:
+      tooltips:
+        deleted_collaborative_texts_info: Não é possível excluir este documento
+    collaborative_texts:
+      actions:
+        confirm_delete_document: Tem certeza de que deseja excluir este documento?
+        deleted_document_info: Documento excluído pode ser restaurado da lixeira.
+        edit: Editar
+        manage: Configurar
+        new: Novo texto
+        title: Ações
+        view_deleted_documents: Visualizar documentos excluídos
+      admin:
+        documents:
+          create:
+            invalid: Houve um problema ao criar o documento.
+            success: Documento criado com sucesso.
+          draft_options:
+            accepting_suggestions: Habilitar sugestões na próxima versão
+            accepting_suggestions_help: Habilitar as sugestões iniciarão uma nova rodada de sugestões para este documento. As sugestões atuais não ficarão visíveis na nova versão.
+            draft: Versão do rascunho
+            draft_help_html: Uma versão rascunho não é pública e pode ser editada pelos administradores. Remova o status de rascunho para tornar este conteúdo público. <strong>Observe que, enquanto a versão rascunho estiver ativa, os participantes verão a versão anterior e não poderão fazer sugestões.</strong>
+          edit:
+            document_has_suggestions_html: <a href="%{url}">Este documento contém sugestões</a> e não pode ser editado diretamente. Por favor, aceite ou rejeite as sugestões para gerar uma nova versão de rascunho que possa ser editada.
+            draft: Versão do rascunho
+            previous_versions: Versões anteriores
+            public_version: Versão pública
+            title: Editar textos colaborativos
+            update: Atualização
+            version: Versão %{version_number}, criada em %{created_at} recebeu sugestões %{suggestions_count}.
+          edit_settings:
+            title: Configurar textos colaborativos
+            update: Atualizar
+          index:
+            title: Textos colaborativos
+          manage_trash:
+            title: Documentos excluídos
+          new:
+            create: Criar
+            title: Criar textos colaborativos
+          non_draft_options:
+            create_draft: Descartar sugestões e criar uma nova versão de rascunho
+            draft_help_html: Uma versão rascunho não é pública e pode ser editada pelos administradores. Remova o status de rascunho para tornar este conteúdo público. <strong>Observe que, enquanto a versão rascunho estiver ativa, os participantes verão a versão anterior e não poderão fazer sugestões.</strong>
+            enable_suggestions: Ativar sugestões
+            enable_suggestions_help: Permitir sugestões permitirá que os participantes façam sugestões nesta versão.
+          publish:
+            invalid: Ocorreu um erro ao publicar este documento.
+            success: Documento publicado com sucesso.
+          unpublish:
+            invalid: Ocorreu um erro ao cancelar a publicação deste documento.
+            success: Documento despublicado com sucesso.
+          update:
+            invalid: Houve um problema ao atualizar o documento.
+            success: Documento atualizado com sucesso.
+          update_settings:
+            invalid: Houve um problema ao atualizar o documento.
+            success: Documento atualizado com sucesso.
+        index:
+          published: Publicado
+          unpublished: Despublicado
+      admin_log:
+        document:
+          create: "%{user_name} criou o texto colaborativo %{resource_name} em %{space_name}"
+          delete: "%{user_name} excluiu o texto colaborativo %{resource_name} do %{space_name}"
+          publish: "%{user_name} publicou o texto colaborativo %{resource_name} em %{space_name}"
+          restore: "%{user_name} restaurou o texto colaborativo %{resource_name} em %{space_name}"
+          soft_delete: "%{user_name} moveu o texto colaborativo %{resource_name} em %{space_name} para a lixeira"
+          unpublish: "%{user_name} despublicou o texto colaborativo %{resource_name} em %{space_name}"
+          update: "%{user_name} atualizou o texto colaborativo %{resource_name} em %{space_name}"
+        suggestion:
+          create: "%{user_name} sugeriu alterações ao texto colaborativo %{resource_name} em %{space_name}"
+        version:
+          delete: "%{user_name} excluiu a versão do texto colaborativo %{resource_name} do %{space_name}"
+          update: "%{user_name} atualizou a versão do texto colaborativo %{resource_name} em %{space_name}"
+      document:
+        apply: Aplicar
+        cancel: Cancelar
+        consolidate:
+          confirm: Esta ação consolidará todas as sugestões aceites em uma nova versão do documento. Sugestões não aceitas serão transferidas para a nova versão para uma nova revisão. Esta ação irá manter as sugestões habilitadas status.
+          new: Consolidar sugestões aceitas
+        consolidate_counter: Consolidar irá mesclar as sugestões %{applied} aplicadas e mover as sugestões %{pending} pendentes para a nova versão.
+        controls_label: Controles de sugestão
+        draft_counter: O rascunho irá mesclar as sugestões %{applied} aplicadas e descartar as sugestões %{pending} pendentes.
+        index: Índice
+        restore: Restaurar
+        rollout:
+          confirm: Esta ação criará uma nova versão rascunho do documento e você será redirecionado para a página de edição para refinos finais. A versão atual permanecerá pública e as sugestões serão desativadas.
+          invalid: Ocorreu um erro ao criar uma nova versão do documento (%{errors}).
+          new: Elabore uma nova versão
+        save: Sugerir alterações
+        status:
+          accepting_suggestions: Para sugerir alterações, selecione ou clique duas vezes no texto que deseja editar e clique no botão 'Sugerir alterações'.
+          draft: Este documento está atualmente em revisão pelos administradores. As sugestões não são permitidas neste momento, mas você pode ver as sugestões feitas por outros participantes.
+          not_accepting_suggestions: Sugestões não são permitidas no momento.
+          selection_active: Uma seleção está ativa. Cancele a seleção atual para fazer uma nova.
+        suggestions_count: "Sugestões de %{count}"
+        toggle: Mostrar/ocultar sugestões
+      documents:
+        index:
+          count:
+            one: "%{count} texto colaborativo"
+            other: "%{count} textos colaborativos"
+          empty: Ainda não há textos colaborativos.
+        show:
+          contributors: Colaboradores
+      models:
+        collaborative_text:
+          fields:
+            published: Publicados
+            suggestions: Aceitar sugestões
+            title: Título
+      suggestion:
+        add_html: <span class="type">Adicionar:</span> <span class="text">%{text}</span>
+        remove_html: <span class="type">Excluir:</span> <span class="text">%{text}</span>
+        replace_html: <span class="type">Substituir:</span> <span class="text">%{text}</span>
+      suggestions:
+        create:
+          invalid: Houve um problema ao criar a sugestão.
+          success: Sugestão criada com sucesso.
+        errors:
+          blank_changeset: O conjunto de alterações não pode ficar em branco.
+          invalid_nodes: Nós selecionados inválidos.
+    components:
+      collaborative_texts:
+        actions:
+          create: Criar
+          destroy: Destruir
+          update: Atualizar
+        name: Textos colaborativos
+        settings:
+          global:
+            announcement: Anúncio
+            comments_blocked: Comentários bloqueados
+          step:
+            announcement: Anúncio
+    statistics:
+      all_collaborative_texts_count: Todos os textos colaborativos
+      collaborative_texts_count: Textos colaborativos
+      collaborative_texts_count_tooltip: Número de textos colaborativos
diff --git a/decidim-collaborative_texts/config/locales/ro-RO.yml b/decidim-collaborative_texts/config/locales/ro-RO.yml
index 9a46abf5eb629..52791944bf5b2 100644
--- a/decidim-collaborative_texts/config/locales/ro-RO.yml
+++ b/decidim-collaborative_texts/config/locales/ro-RO.yml
@@ -5,17 +5,26 @@ ro:
       collaborative_texts:
         document:
           body: Conținut
+          draft: Schiță
           title: Titlu
           version_number: Număr versiune
+        suggestion:
+          original: Text original
+          replace: Înlocuire
         version:
           body: Conținut
+          draft: Ciornă
           version_number: Număr versiune
   decidim:
+    admin:
+      tooltips:
+        deleted_collaborative_texts_info: Nu puteți șterge acest document
     collaborative_texts:
       actions:
         confirm_delete_document: Sigur doriți să ștergeți acest document?
         deleted_document_info: Documentul șters poate fi restaurat din gunoi.
         edit: Modificați
+        manage: Configurare
         new: Text nou
         title: Acțiuni
         view_deleted_documents: Vizualizați documentele șterse
@@ -24,7 +33,14 @@ ro:
           create:
             invalid: A apărut o problemă la crearea documentului.
             success: Documentul a fost creat cu succes.
+          draft_options:
+            accepting_suggestions: Activați sugestiile în versiunea următoare
+            accepting_suggestions_help: Activarea sugestiilor va începe o nouă rundă de sugestii pentru acest document. Sugestiile actuale nu vor fi vizibile în noua versiune.
+            draft: Versiune ciornă
           edit:
+            draft: Versiune ciornă
+            previous_versions: Versiuni anterioare
+            public_version: Versiune publică
             title: Actualizați texte colaborative
             update: Actualizați
           edit_settings:
@@ -37,6 +53,8 @@ ro:
           new:
             create: Creați
             title: Creați texte colaborative
+          non_draft_options:
+            enable_suggestions: Activați sugestiile
           publish:
             invalid: A apărut o problemă la publicarea acestui document.
             success: Documentul a fost publicat cu succes.
@@ -49,20 +67,32 @@ ro:
           update_settings:
             invalid: A apărut o eroare la actualizarea documentului.
             success: Document actualizat cu succes.
+        index:
+          published: Publicate
+          unpublished: Nepublicate
       admin_log:
         document:
-          create: "%{user_name} a creat postarea %{resource_name} în %{space_name}"
-          delete: "%{user_name} a creat postarea %{resource_name} în %{space_name}"
-          publish: "%{user_name} a creat postarea %{resource_name} în %{space_name}"
+          create: "%{user_name} a creat textul colaborativ %{resource_name} în %{space_name}"
+          delete: "%{user_name} a eliminat textul colaborativ %{resource_name} în %{space_name}"
+          publish: "%{user_name} a publicat textul colaborativ %{resource_name} în %{space_name}"
           restore: "%{user_name} a restaurat postarea %{resource_name} din %{space_name}"
-          soft_delete: "%{user_name} a mutat postarea %{resource_name} din %{space_name}"
+          soft_delete: "%{user_name} a mutat la gunoi textul colaborativ %{resource_name} din %{space_name}"
           unpublish: "%{user_name} a nepublicat %{resource_name} în %{space_name}"
-          update: "%{user_name} a actualizat postarea %{resource_name} în %{space_name}"
+          update: "%{user_name} a actualizat textul colaborativ %{resource_name} în %{space_name}"
         version:
-          delete: "%{user_name} a șters versiunea text colaborativă %{resource_name} din %{space_name}"
-          update: "%{user_name} a actualizat versiunea text colaborativ %{resource_name} în %{space_name}"
+          delete: "%{user_name} a eliminat versiunea de text colaborativ %{resource_name} din %{space_name}"
+          update: "%{user_name} a actualizat versiunea de text colaborativ %{resource_name} în %{space_name}"
       document:
-        cancel: Anulează
+        cancel: Anulați
+        consolidate:
+          confirm: Această acțiune va consolida toate sugestiile acceptate într-o nouă versiune a documentului. Sugestiile neacceptate vor fi transferate noii versiuni pentru a fi revizuite în continuare. Această acțiune va menține starea sugestiilor activate.
+          new: Consolidați sugestiile acceptate
+        controls_label: Controale privind sugestiile
+        draft_counter: Ciorna va fuziona %{applied} sugestii aplicate și va anula %{pending} sugestii în așteptare.
+        index: Index
+        rollout:
+          new: Creați o nouă versiune ca ciornă
+        save: Sugerați modificări
       documents:
         index:
           count:
diff --git a/decidim-collaborative_texts/lib/decidim/collaborative_texts/engine.rb b/decidim-collaborative_texts/lib/decidim/collaborative_texts/engine.rb
index 563e68ebf837a..853be3d5daee0 100644
--- a/decidim-collaborative_texts/lib/decidim/collaborative_texts/engine.rb
+++ b/decidim-collaborative_texts/lib/decidim/collaborative_texts/engine.rb
@@ -15,6 +15,11 @@ class Engine < ::Rails::Engine
         get "/", to: redirect("documents", status: 301)
       end
 
+      initializer "decidim_collaborative_texts.register_icons" do
+        Decidim.icons.register(name: "Decidim::CollaborativeTexts::Document", icon: "draft-line", description: "Collaborative texts", category: "activity",
+                               engine: :collaborative_texts)
+      end
+
       initializer "decidim_collaborative_texts.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-collaborative_texts/lib/decidim/collaborative_texts/seeds.rb b/decidim-collaborative_texts/lib/decidim/collaborative_texts/seeds.rb
index e0866a2fc4512..be0737377fcd2 100644
--- a/decidim-collaborative_texts/lib/decidim/collaborative_texts/seeds.rb
+++ b/decidim-collaborative_texts/lib/decidim/collaborative_texts/seeds.rb
@@ -29,7 +29,7 @@ def create_component!
           name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :collaborative_texts).i18n_name,
           manifest_name: :collaborative_texts,
           published_at: Time.current,
-          participatory_space: participatory_space
+          participatory_space:
         }
 
         Decidim.traceability.perform_action!(
diff --git a/decidim-collaborative_texts/spec/commands/decidim/collaborative_texts/admin/update_document_spec.rb b/decidim-collaborative_texts/spec/commands/decidim/collaborative_texts/admin/update_document_spec.rb
index 3cea1fb8dc5bc..fea4327a4f361 100644
--- a/decidim-collaborative_texts/spec/commands/decidim/collaborative_texts/admin/update_document_spec.rb
+++ b/decidim-collaborative_texts/spec/commands/decidim/collaborative_texts/admin/update_document_spec.rb
@@ -22,7 +22,7 @@ module Admin
             title:,
             body:,
             draft?: draft,
-            draft: draft,
+            draft:,
             accepting_suggestions:,
             coauthorships: [Decidim::Coauthorship.new(author: organization)]
           )
@@ -68,11 +68,11 @@ module Admin
               .with(last_version, user, updated_keys, {
                       extra: {
                         document_id: document.id,
-                        title: title,
+                        title:,
                         version_number: 1
                       },
                       resource: {
-                        title: title
+                        title:
                       },
                       participatory_space: {
                         title: document.participatory_space.title
@@ -116,11 +116,11 @@ module Admin
               .with(Decidim::CollaborativeTexts::Version, user, { document:, body: document.body, draft: true }, {
                       extra: {
                         document_id: document.id,
-                        title: title,
+                        title:,
                         version_number: 2
                       },
                       resource: {
-                        title: title
+                        title:
                       },
                       participatory_space: {
                         title: document.participatory_space.title
diff --git a/decidim-collaborative_texts/spec/controllers/decidim/collaborative_texts/admin/documents_controller_spec.rb b/decidim-collaborative_texts/spec/controllers/decidim/collaborative_texts/admin/documents_controller_spec.rb
index b454c80814c34..483d81c2785eb 100644
--- a/decidim-collaborative_texts/spec/controllers/decidim/collaborative_texts/admin/documents_controller_spec.rb
+++ b/decidim-collaborative_texts/spec/controllers/decidim/collaborative_texts/admin/documents_controller_spec.rb
@@ -15,8 +15,8 @@ module Admin
         let(:document_versions) { [build(:collaborative_text_version)] }
         let(:params) do
           {
-            title: title,
-            body: body
+            title:,
+            body:
           }
         end
         let(:title) { "A nice test document" }
@@ -69,7 +69,7 @@ module Admin
           describe "POST #create" do
             it "creates a new document and redirects to index" do
               expect do
-                post :create, params: params
+                post :create, params:
               end.to change(Document, :count).by(1)
               expect(response).to redirect_to(documents_path)
               expect(flash[:notice]).to eq("Document successfully created.")
@@ -80,7 +80,7 @@ module Admin
 
               it "does not create a document" do
                 expect do
-                  post :create, params: params
+                  post :create, params:
                 end.not_to change(Document, :count)
                 expect(response).to render_template(:new)
                 expect(flash.now[:alert]).to eq("There was a problem creating the document.")
@@ -98,7 +98,7 @@ module Admin
 
           describe "PATCH #update" do
             it "updates the document and redirects to index" do
-              patch :update, params: { id: collaborative_text_document.id, title: "Updated Title", body: body }
+              patch :update, params: { id: collaborative_text_document.id, title: "Updated Title", body: }
               expect(response).to redirect_to(documents_path)
             end
           end
@@ -121,7 +121,7 @@ module Admin
               let(:title) { "" }
 
               it "does not update the document settings" do
-                patch :update_settings, params: { id: collaborative_text_document.id, title: "", body: body }
+                patch :update_settings, params: { id: collaborative_text_document.id, title: "", body: }
                 expect(response).to render_template(:edit_settings)
                 expect(flash.now[:alert]).to eq("There was a problem updating the document.")
               end
diff --git a/decidim-collaborative_texts/spec/controllers/decidim/collaborative_texts/suggestions_controller_spec.rb b/decidim-collaborative_texts/spec/controllers/decidim/collaborative_texts/suggestions_controller_spec.rb
index 730dc04bb30b7..bf1a9103e38e5 100644
--- a/decidim-collaborative_texts/spec/controllers/decidim/collaborative_texts/suggestions_controller_spec.rb
+++ b/decidim-collaborative_texts/spec/controllers/decidim/collaborative_texts/suggestions_controller_spec.rb
@@ -30,7 +30,7 @@ module CollaborativeTexts
 
       describe "GET #index" do
         it "returns a success response" do
-          get :index, params: params
+          get(:index, params:)
           expect(response).to have_http_status(:ok)
           body = JSON.parse(response.body)
           expect(body.first.keys).to contain_exactly("changeset", "createdAt", "id", "profileHtml", "status", "summary", "type")
@@ -60,7 +60,7 @@ module CollaborativeTexts
         let(:first_node) { "1" }
 
         it "returns an error when user is not signed in" do
-          post :create, params: params
+          post(:create, params:)
           expect(response).to have_http_status(:unprocessable_entity)
           body = JSON.parse(response.body)
           expect(body["message"]).to eq("You are not authorized to perform this action.")
@@ -73,7 +73,7 @@ module CollaborativeTexts
 
           it "creates a new suggestion" do
             expect do
-              post :create, params: params
+              post :create, params:
             end.to change(Suggestion, :count).by(1)
             expect(response).to have_http_status(:ok)
             body = JSON.parse(response.body)
@@ -84,7 +84,7 @@ module CollaborativeTexts
             let(:first_node) { "" }
 
             it "returns an error" do
-              post :create, params: params
+              post(:create, params:)
               expect(response).to have_http_status(:unprocessable_entity)
               body = JSON.parse(response.body)
               expect(body["message"]).to eq("There was a problem creating the suggestion. Invalid selected nodes.")
diff --git a/decidim-collaborative_texts/spec/models/decidim/collaborative_texts/document_spec.rb b/decidim-collaborative_texts/spec/models/decidim/collaborative_texts/document_spec.rb
index 1ff9a5332099a..9ea7444532d8a 100644
--- a/decidim-collaborative_texts/spec/models/decidim/collaborative_texts/document_spec.rb
+++ b/decidim-collaborative_texts/spec/models/decidim/collaborative_texts/document_spec.rb
@@ -33,7 +33,7 @@ module CollaborativeTexts
 
       it "current version points to last created" do
         document.save!
-        version = create(:collaborative_text_version, created_at: 1.second.from_now, document: document)
+        version = create(:collaborative_text_version, created_at: 1.second.from_now, document:)
         expect(document.reload.document_versions.count).to eq(4)
         expect(document.document_versions_count).to eq(4)
         expect(document.current_version).to eq(version)
diff --git a/decidim-collaborative_texts/spec/permissions/decidim/collaborative_texts/permissions_spec.rb b/decidim-collaborative_texts/spec/permissions/decidim/collaborative_texts/permissions_spec.rb
index 22cc9b757c886..cd3c2e6dd3f74 100644
--- a/decidim-collaborative_texts/spec/permissions/decidim/collaborative_texts/permissions_spec.rb
+++ b/decidim-collaborative_texts/spec/permissions/decidim/collaborative_texts/permissions_spec.rb
@@ -9,7 +9,7 @@
   let(:context) do
     {
       current_component: collaborative_text_component,
-      document: document
+      document:
     }
   end
   let(:collaborative_text_component) { create(:collaborative_text_component) }
diff --git a/decidim-collaborative_texts/spec/presenters/decidim/collaborative_texts/admin_log/document_presenter_spec.rb b/decidim-collaborative_texts/spec/presenters/decidim/collaborative_texts/admin_log/document_presenter_spec.rb
index 5078e72d81458..b970af4e0892a 100644
--- a/decidim-collaborative_texts/spec/presenters/decidim/collaborative_texts/admin_log/document_presenter_spec.rb
+++ b/decidim-collaborative_texts/spec/presenters/decidim/collaborative_texts/admin_log/document_presenter_spec.rb
@@ -6,7 +6,7 @@ module Decidim
   module CollaborativeTexts
     module AdminLog
       describe DocumentPresenter do
-        let(:action_log) { double("ActionLog", action: action, resource: resource, extra: extra, version: version) }
+        let(:action_log) { double("ActionLog", action:, resource:, extra:, version:) }
         let(:resource) { double("Document", document_versions: [document]) }
         let(:document) { create(:collaborative_text_document, body: "This is and example body") }
         let(:extra) { { "extra" => { "version_number" => "2", "body" => document.body } } }
diff --git a/decidim-collaborative_texts/spec/system/collaborative_tests_breadcrumbs_spec.rb b/decidim-collaborative_texts/spec/system/collaborative_tests_breadcrumbs_spec.rb
new file mode 100644
index 0000000000000..23e02bf5cc047
--- /dev/null
+++ b/decidim-collaborative_texts/spec/system/collaborative_tests_breadcrumbs_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "CollaborativeTexts Breadcrumb" do
+  include_context "with a component"
+  let(:manifest_name) { "collaborative_texts" }
+  let!(:component) do
+    create(:collaborative_text_component,
+           manifest:,
+           participatory_space: participatory_process)
+  end
+  let!(:document) { create(:collaborative_text_document, :with_body, :published, component:) }
+
+  before do
+    visit_component
+  end
+
+  describe "index" do
+    it "shows the correct information in breadcrumb (space, component)" do
+      within(".menu-bar") do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+      end
+    end
+  end
+
+  describe "show" do
+    it "shows the correct information in breadcrumb (space, component, document)" do
+      click_on document.title
+
+      within(".menu-bar") do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+        expect(page).to have_content(translated(document.title))
+      end
+    end
+  end
+end
diff --git a/decidim-collaborative_texts/spec/system/user_sends_suggestions_spec.rb b/decidim-collaborative_texts/spec/system/user_sends_suggestions_spec.rb
index 13bdf4b263e25..e12a570f1bc38 100644
--- a/decidim-collaborative_texts/spec/system/user_sends_suggestions_spec.rb
+++ b/decidim-collaborative_texts/spec/system/user_sends_suggestions_spec.rb
@@ -46,9 +46,6 @@
     end
 
     it "lists all the documents" do
-      within(".menu-bar") do
-        expect(page).to have_content(translated(component.name))
-      end
       within("aside") do
         expect(page).to have_content(translated(component.name))
       end
@@ -60,11 +57,6 @@
     it "shows the document details" do
       click_on document.title
 
-      within(".menu-bar") do
-        expect(page).to have_content(translated(component.name))
-        expect(page).to have_content(translated(document.title))
-      end
-
       expect(page).to have_content(translated(document.title))
       within("aside") do
         expect(page).to have_content("Index")
diff --git a/decidim-collaborative_texts/spec/types/document_type_spec.rb b/decidim-collaborative_texts/spec/types/document_type_spec.rb
index 7961837fdfad8..6cb15cef4d6e0 100644
--- a/decidim-collaborative_texts/spec/types/document_type_spec.rb
+++ b/decidim-collaborative_texts/spec/types/document_type_spec.rb
@@ -13,6 +13,12 @@ module CollaborativeTexts
       include_examples "traceable interface"
       include_examples "timestamps interface"
 
+      shared_examples "unauthorized Document" do
+        it "throws Decidim::Api::Errors::UnauthorizedObjectError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::UnauthorizedObjectError, "You cannot view or edit this CollaborativeText because you do not have permissions")
+        end
+      end
+
       describe "id" do
         let(:query) { "{ id }" }
 
@@ -93,9 +99,7 @@ module CollaborativeTexts
         let(:model) { create(:collaborative_text_document, :published, component: current_component) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Document"
       end
 
       context "when participatory space is private but transparent" do
@@ -115,9 +119,7 @@ module CollaborativeTexts
         let(:model) { create(:collaborative_text_document, :published, component: current_component) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Document"
       end
 
       context "when component is not published" do
@@ -125,9 +127,7 @@ module CollaborativeTexts
         let(:model) { create(:collaborative_text_document, :published, component: current_component) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Document"
       end
 
       context "when document is not published" do
@@ -135,9 +135,7 @@ module CollaborativeTexts
         let(:model) { create(:collaborative_text_document, :published, published_at: nil, component: current_component) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Document"
       end
     end
   end
diff --git a/decidim-collaborative_texts/spec/types/documents_type_spec.rb b/decidim-collaborative_texts/spec/types/documents_type_spec.rb
index ad8b42dd8ec39..cad1e4492b98d 100644
--- a/decidim-collaborative_texts/spec/types/documents_type_spec.rb
+++ b/decidim-collaborative_texts/spec/types/documents_type_spec.rb
@@ -39,8 +39,8 @@ module CollaborativeTexts
         context "when the document does not belong to the component" do
           let!(:document) { create(:collaborative_text_document, :published, component: create(:collaborative_text_component)) }
 
-          it "returns null" do
-            expect(response["collaborativeText"]).to be_nil
+          it "raises error" do
+            expect { response }.to raise_error(Decidim::Api::Errors::NotFoundError, "CollaborativeText not found")
           end
         end
       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..314f5e9548b8a 100644
--- a/decidim-collaborative_texts/spec/types/integration_schema_spec.rb
+++ b/decidim-collaborative_texts/spec/types/integration_schema_spec.rb
@@ -36,7 +36,7 @@
   let!(:current_component) { create(:collaborative_text_component, participatory_space: participatory_process) }
   let!(:document) { create(:collaborative_text_document, component: current_component, published_at: 2.days.ago) }
   let!(:document_version) { create(:collaborative_text_version, document:) }
-  let!(:suggestions) { create_list(:collaborative_text_suggestion, 2, document_version: document_version) }
+  let!(:suggestions) { create_list(:collaborative_text_suggestion, 2, document_version:) }
   let(:author) { nil }
   let(:document_single_result) do
     {
diff --git a/decidim-comments/app/cells/decidim/comments/comment/alignment_badge.erb b/decidim-comments/app/cells/decidim/comments/comment/alignment_badge.erb
index 9f11f2a607000..a8197fb093859 100644
--- a/decidim-comments/app/cells/decidim/comments/comment/alignment_badge.erb
+++ b/decidim-comments/app/cells/decidim/comments/comment/alignment_badge.erb
@@ -1 +1 @@
-<span class="<%= alignment_badge_classes %> comment__content--label"><%= alignment_badge_label %></span>
+<p class="<%= alignment_badge_classes %> comment__content--label"><%= alignment_badge_label %></p>
diff --git a/decidim-comments/app/cells/decidim/comments/comment_s_cell.rb b/decidim-comments/app/cells/decidim/comments/comment_s_cell.rb
index 001cb75b5ef1c..4e035c23d1f05 100644
--- a/decidim-comments/app/cells/decidim/comments/comment_s_cell.rb
+++ b/decidim-comments/app/cells/decidim/comments/comment_s_cell.rb
@@ -12,7 +12,7 @@ class CommentSCell < Decidim::CardSCell
       private
 
       def title
-        resource_link_text
+        sanitize(translated_attribute(model.body))
       end
 
       def resource_path
diff --git a/decidim-comments/app/models/decidim/comments/seed.rb b/decidim-comments/app/models/decidim/comments/seed.rb
index 0302a877b0718..04a765653addc 100644
--- a/decidim-comments/app/models/decidim/comments/seed.rb
+++ b/decidim-comments/app/models/decidim/comments/seed.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "decidim/seeds"
+
 module Decidim
   module Comments
     # A comment can belong to many Commentable models. This class is responsible
@@ -20,16 +22,16 @@ def comments_for(resource)
 
           @organization = resource.organization
 
-          rand(0..6).times do
+          rand(0..config_value(:comments_count)).times do
             comment1 = create_comment(resource)
             NewCommentNotificationCreator.new(comment1, []).create
 
-            if [true, false].sample
+            if rand < config_value(:comments_nested_probability)
               comment2 = create_comment(comment1, resource)
               NewCommentNotificationCreator.new(comment2, []).create
             end
 
-            next if [true, false].sample
+            next if rand < config_value(:comments_vote_skip_probability)
 
             create_votes(comment1) if comment1
             create_votes(comment2) if comment2
@@ -40,6 +42,14 @@ def comments_for(resource)
 
         attr_reader :organization
 
+        def config_value(key)
+          slow_seeds? ? Decidim::Seeds::SEEDS_CONFIG[key][:slow] : Decidim::Seeds::SEEDS_CONFIG[key][:fast]
+        end
+
+        def slow_seeds?
+          Decidim::Env.new("SLOW_SEEDS").present?
+        end
+
         # Creates a comment for a given resource.
         #
         # @private
@@ -74,7 +84,7 @@ def create_comment(resource, root_commentable = nil)
         #
         # @return nil
         def create_votes(comment)
-          rand(0..12).times do
+          rand(0..config_value(:comments_votes_count)).times do
             author = random_user
             next if CommentVote.where(comment:, author:).any?
 
diff --git a/decidim-comments/app/resolvers/decidim/comments/vote_comment_resolver.rb b/decidim-comments/app/resolvers/decidim/comments/vote_comment_resolver.rb
deleted file mode 100644
index aeccb5ef96e0a..0000000000000
--- a/decidim-comments/app/resolvers/decidim/comments/vote_comment_resolver.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Comments
-    # A GraphQL resolver to handle `upVote` and `downVote` mutations
-    # It creates a vote for a comment by the current user.
-    class VoteCommentResolver
-      def initialize(options = { weight: 1 })
-        @weight = options[:weight]
-      end
-
-      def call(obj, _args, ctx)
-        Decidim::Comments::VoteComment.call(obj, ctx[:current_user], weight: @weight) do
-          on(:ok) do |comment|
-            return comment
-          end
-          on(:invalid) do
-            return GraphQL::ExecutionError.new(I18n.t("votes.create.error", scope: "decidim.comments"))
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-comments/config/locales/pt-BR.yml b/decidim-comments/config/locales/pt-BR.yml
index 1ecdfde9eade4..6eee23d65daee 100644
--- a/decidim-comments/config/locales/pt-BR.yml
+++ b/decidim-comments/config/locales/pt-BR.yml
@@ -20,20 +20,38 @@ pt-BR:
         changeset:
           comments: Comentários
     comments:
+      admin:
+        shared:
+          availability_fields:
+            enabled: Comentários ativados
+            end_time: Comentários ativados até
+            start_time: Comentários ativados de
+      comment_thread:
+        accessibility_label: Tópico de comentário iniciado por %{full_name} em %{date}
       comments:
         create:
           error: Houveram erros ao criar o comentário.
+        delete:
+          error: O comentário não pode ser excluído.
         update:
           error: Houve um erro ao atualizar o comentário.
+      comments_title: Comentário
+      last_activity:
+        new_comment: 'Novo comentário:'
       votes:
         create:
           error: Houve erros ao votar o comentário.
     components:
       add_comment_form:
+        account_message: Faça o acesso ou crie uma conta para adicionar o seu comentário.
+        add_comment: Adicionar comentário
         form:
           body:
             label: Comente
             placeholder: O que você pensa sobre isso?
+          form_error: O texto é obrigatório e não pode ser maior que %{length} caracteres.
+          submit_reply: Publicar resposta
+          submit_root_comment: Publicar comentário
         opinion:
           label: Sua opinião sobre este tópico
           negative: Negativo
@@ -49,12 +67,22 @@ pt-BR:
         alignment:
           against: Contra
           in_favor: A favor
+        answers:
+          one: "%{count} resposta"
+          other: "%{count} respostas"
+        cancel_reply: Cancelar resposta
+        comment_label: Comentário %{comment_id}
+        comment_label_reply: Comentário %{comment_id} (responder ao comentário %{parent_comment_id})
         confirm_destroy: Tem certeza que deseja excluir este comentário?
+        controls_label: Controles de comentários
         delete: Deletar
         deleted_at: Comentário excluído em %{date}
         deleted_user: Usuário excluído
         edit: Editar
         edited: Editado
+        hide_replies:
+          one: Ocultar resposta
+          other: Ocultar {count} respostas
         moderated_at: Comentário moderado em %{date}
         reply: Resposta
         report:
@@ -64,6 +92,7 @@ pt-BR:
           description: Este conteúdo é impróprio?
           details: Comentários adicionais
           reasons:
+            does_not_belong: Contém atividades ilegais, ameaças suicidas, informações pessoais ou outra coisa que você acha que não pertence ao %{organization_name}.
             offensive: Contém racismo, sexismo, insultos, ataques pessoais, ameaças de morte, pedidos de suicídio ou qualquer tipo de discurso de ódio.
             spam: Contém clickbait, publicidade, fraudes ou script bots.
           title: Reportar conteúdo impróprio
@@ -71,6 +100,7 @@ pt-BR:
           one: Mostrar resposta
           other: Mostrar %{count} respostas
         single_comment_link_title: Obter o link
+        sort_by: 'Classificar por: '
       comment_order_selector:
         order:
           best_rated: Melhores avaliações
@@ -79,15 +109,23 @@ pt-BR:
           recent: Recente
         title: 'Ordenar por:'
       comments:
+        against: Contra
         blocked_comments_for_unauthorized_user_warning: Você precisa ser verificado para comentar neste momento, mas pode ler os anteriores.
         blocked_comments_for_user_warning: Você não pode comentar neste momento, mas pode ler os anteriores.
+        blocked_comments_warning: Comentários estão atualmente desativados, somente administradores podem responder ou postar novos.
         comment_details_title: Detalhes do comentário
+        in_favor: A favor
         loading: Carregando comentários ...
+        single_comment_warning: <a href="%{url}">Ver todos os comentários</a>
         single_comment_warning_title: Você está vendo um único comentário
         title:
           one: "%{count} comentário"
           other: "%{count} comentários"
+        top_comment_label: Mais votado
       down_vote_button:
+        label:
+          one: Botão "Não gostei". %{count} não gostei
+          other: Botão "Não gostei". %{count} não gostaram
         text: Eu discordo deste comentário
       edit_comment_modal_form:
         close: Fechar
@@ -98,7 +136,29 @@ pt-BR:
           submit: Enviar
         title: Editar seu comentário
       up_vote_button:
+        label:
+          one: Botão "Gostei". %{count} gostei
+          other: Botão "Gostei". %{count} gostaram
         text: Eu concordo com este comentário
+    download_your_data:
+      help:
+        comment_votes:
+          comment: A identificação do comentário votado
+          created_at: A data em que esta votação foi criada
+          id: A identificação da votação
+          updated_at: A data da última atualização desta votação
+          weight: O peso da votação (1 a favor do voto, -1 contra o voto)
+        comments:
+          alignment: Se este comentário foi um favorito, contra ou neutro
+          author: O nome do usuário que fez este comentário
+          body: O comentário em si
+          commentable_id: A identificação única do cometário
+          commentable_type: O tipo do comentário (se for um resultado, uma proposta, etc.)
+          created_at: A data em que este comentário foi criado
+          depth: O lugar onde este comentário está nos três comentários (se for uma resposta ou uma resposta de uma resposta)
+          id: O identificador para este comentário
+          locale: A localidade (linguagem) que o usuário teve ao deixar este comentário
+          root_commentable_url: A URL do recurso ligado a este comentário
     events:
       comments:
         comment_by_followed_user:
@@ -131,3 +191,6 @@ pt-BR:
           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/ro-RO.yml b/decidim-comments/config/locales/ro-RO.yml
index 06a0cf8bc4d1c..84c10de28a215 100644
--- a/decidim-comments/config/locales/ro-RO.yml
+++ b/decidim-comments/config/locales/ro-RO.yml
@@ -129,6 +129,10 @@ ro:
           other: "%{count} comentarii"
         top_comment_label: Cele mai votate
       down_vote_button:
+        label:
+          one: Buton dezaprobare. O dezaprobare
+          few: Buton dezaprobare. %{count} dezaprobări
+          other: Buton dezaprobare. %{count} dezaprobări
         text: Nu sunt de acord cu acest comentariu
       edit_comment_modal_form:
         close: Închideți
@@ -139,6 +143,10 @@ ro:
           submit: Actualizați
         title: Modificați comentariul dumneavoastră
       up_vote_button:
+        label:
+          one: Buton apreciere. %{count} apreciază
+          few: Buton apreciere. %{count} apreciază
+          other: Buton apreciere. %{count} apreciază
         text: Sunt de acord cu acest comentariu
     download_your_data:
       help:
diff --git a/decidim-comments/config/locales/sv.yml b/decidim-comments/config/locales/sv.yml
index 45fd4ac806ed1..4dde695e5caf1 100644
--- a/decidim-comments/config/locales/sv.yml
+++ b/decidim-comments/config/locales/sv.yml
@@ -48,7 +48,7 @@ sv:
         form:
           body:
             label: Kommentera
-            placeholder: Vad tycker du om detta?
+            placeholder: Vad tycker du?
           form_error: Texten är obligatorisk och får inte vara längre än %{length} tecken.
           submit_reply: Publicera svar
           submit_root_comment: Publicera kommentar
@@ -103,10 +103,10 @@ sv:
         sort_by: 'Sortera efter: '
       comment_order_selector:
         order:
-          best_rated: Bästa betyg
+          best_rated: Högst betyg
           most_discussed: Mest diskuterade
-          older: Äldsta
-          recent: Senaste
+          older: Gamla
+          recent: Nya
         title: 'Sortera efter:'
       comments:
         against: Mot
diff --git a/decidim-comments/lib/decidim/api/comment_mutation_type.rb b/decidim-comments/lib/decidim/api/comment_mutation_type.rb
index eb18b16042da3..7a5d590665607 100644
--- a/decidim-comments/lib/decidim/api/comment_mutation_type.rb
+++ b/decidim-comments/lib/decidim/api/comment_mutation_type.rb
@@ -10,12 +10,20 @@ class CommentMutationType < Decidim::Api::Types::BaseObject
       field :id, GraphQL::Types::ID, "The Comment's unique ID", null: false
       field :up_vote, Decidim::Comments::CommentType, "The comment that is upvoted", null: true
 
-      def up_vote(args: {})
-        VoteCommentResolver.new(weight: 1).call(object, args, context)
+      def up_vote(_args: {})
+        Decidim::Comments::VoteComment.call(object, current_user, weight: 1) do
+          on(:ok) do |comment|
+            return comment
+          end
+        end
       end
 
-      def down_vote(args: {})
-        VoteCommentResolver.new(weight: -1).call(object, args, context)
+      def down_vote(_args: {})
+        Decidim::Comments::VoteComment.call(object, current_user, weight: -1) do
+          on(:ok) do |comment|
+            return comment
+          end
+        end
       end
     end
   end
diff --git a/decidim-comments/lib/decidim/api/commentable_mutation_type.rb b/decidim-comments/lib/decidim/api/commentable_mutation_type.rb
index 7ce370b8a8a58..0fcada3818574 100644
--- a/decidim-comments/lib/decidim/api/commentable_mutation_type.rb
+++ b/decidim-comments/lib/decidim/api/commentable_mutation_type.rb
@@ -22,6 +22,10 @@ def add_comment(body:, alignment: nil)
           on(:ok) do |comment|
             return comment
           end
+
+          on(:invalid) do
+            raise GraphQL::ExecutionError, t("create.error", scope: "decidim.comments.comments")
+          end
         end
       end
     end
diff --git a/decidim-comments/spec/system/search_comments_spec.rb b/decidim-comments/spec/system/search_comments_spec.rb
index 4a898f2c3e744..93a610dcf3681 100644
--- a/decidim-comments/spec/system/search_comments_spec.rb
+++ b/decidim-comments/spec/system/search_comments_spec.rb
@@ -16,5 +16,22 @@
     searchables << comment
   end
 
+  context "when there is a link in the comment search result" do
+    let(:search_input_selector) { "input#input-search" }
+
+    before do
+      create(:comment, body: "Here is an interesting link: https://github.com/decidim", commentable:)
+      visit decidim.root_path
+      field = find(search_input_selector)
+      field.set "Here is an interesting"
+      send_keys(:enter)
+    end
+
+    it "does not allow clickable link" do
+      expect(page).to have_no_link(href: "https://github.com/decidim")
+      expect(page).to have_text("Here is an interesting link: https://github.com/decidim")
+    end
+  end
+
   include_examples "searchable results"
 end
diff --git a/decidim-comments/spec/types/comment_type_spec.rb b/decidim-comments/spec/types/comment_type_spec.rb
index d65bacb7473ab..d2ba11f4faa9f 100644
--- a/decidim-comments/spec/types/comment_type_spec.rb
+++ b/decidim-comments/spec/types/comment_type_spec.rb
@@ -11,6 +11,12 @@ module Comments
       let(:model) { create(:comment) }
       let(:sgid) { double("sgid", to_s: "1234") }
 
+      shared_examples "unauthorized Comment" do
+        it "throws Decidim::Api::Errors::UnauthorizedObjectError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::UnauthorizedObjectError, "You cannot view or edit this Comment because you do not have permissions")
+        end
+      end
+
       context "when participatory space is unpublished" do
         let(:participatory_space) { create(:assembly, :unpublished) }
         let(:component) { create(:dummy_component, :published, participatory_space:) }
@@ -20,9 +26,7 @@ module Comments
         let(:model) { create(:comment, commentable:) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Comment"
       end
 
       context "when participatory space is private and transparent" do
@@ -45,9 +49,7 @@ module Comments
         let(:model) { create(:comment, commentable:) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Comment"
       end
 
       context "when component is unpublished" do
@@ -57,9 +59,7 @@ module Comments
         let(:model) { create(:comment, commentable:) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Comment"
       end
 
       context "when resource is unpublished" do
@@ -68,9 +68,7 @@ module Comments
         let(:model) { create(:comment, commentable:) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Comment"
       end
 
       context "when resource is moderated" do
@@ -80,27 +78,21 @@ module Comments
         let(:model) { create(:comment, commentable:) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Comment"
       end
 
       describe "deleted comment" do
         let(:model) { create(:comment, :deleted) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Comment"
       end
 
       describe "moderated comment" do
         let(:model) { create(:comment, :moderated) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Comment"
       end
 
       describe "author" do
diff --git a/decidim-conferences/app/cells/decidim/conferences/conference_dropdown_metadata_cell.rb b/decidim-conferences/app/cells/decidim/conferences/conference_dropdown_metadata_cell.rb
deleted file mode 100644
index 829fed3742275..0000000000000
--- a/decidim-conferences/app/cells/decidim/conferences/conference_dropdown_metadata_cell.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Conferences
-    class ConferenceDropdownMetadataCell < Decidim::ParticipatorySpaceDropdownMetadataCell
-      include ConferenceHelper
-      include Decidim::ComponentPathHelper
-      include ActiveLinkTo
-
-      def decidim_conferences
-        Decidim::Conferences::Engine.routes.url_helpers
-      end
-
-      private
-
-      def nav_items_method = :conference_nav_items
-    end
-  end
-end
diff --git a/decidim-conferences/app/controllers/decidim/conferences/conference_program_controller.rb b/decidim-conferences/app/controllers/decidim/conferences/conference_program_controller.rb
index 4e5c24ddd1efa..a97099fcb3c01 100644
--- a/decidim-conferences/app/controllers/decidim/conferences/conference_program_controller.rb
+++ b/decidim-conferences/app/controllers/decidim/conferences/conference_program_controller.rb
@@ -10,6 +10,8 @@ class ConferenceProgramController < Decidim::Conferences::ApplicationController
 
       helper_method :collection, :conference, :meeting_days, :meeting_component
 
+      before_action :set_program_breadcrumb_item
+
       def show
         raise ActionController::RoutingError, "No meetings for this conference " if meetings.blank?
 
@@ -47,6 +49,17 @@ def current_participatory_space
       def conference
         current_participatory_space
       end
+
+      def set_program_breadcrumb_item
+        return unless meeting_component
+
+        context_breadcrumb_items << {
+          label: t("conference_program.index.title", scope: "decidim"),
+          url: decidim_conferences.conference_conference_program_path(current_participatory_space, meeting_component, locale: I18n.locale),
+          active: true,
+          resource: meeting_component
+        }
+      end
     end
   end
 end
diff --git a/decidim-conferences/app/models/decidim/conference.rb b/decidim-conferences/app/models/decidim/conference.rb
index b48faa15ccbaf..ae978d9d85525 100644
--- a/decidim-conferences/app/models/decidim/conference.rb
+++ b/decidim-conferences/app/models/decidim/conference.rb
@@ -157,7 +157,7 @@ def self.ransackable_attributes(auth_object = nil)
 
       return base unless auth_object&.admin?
 
-      base + %w(published_at)
+      base + %w(published_at created_at)
     end
 
     def self.ransackable_associations(_auth_object = nil)
diff --git a/decidim-conferences/app/presenters/decidim/admin/conference_speaker_presenter.rb b/decidim-conferences/app/presenters/decidim/admin/conference_speaker_presenter.rb
index f41e77d451c5e..d6ee463a4ec85 100644
--- a/decidim-conferences/app/presenters/decidim/admin/conference_speaker_presenter.rb
+++ b/decidim-conferences/app/presenters/decidim/admin/conference_speaker_presenter.rb
@@ -8,11 +8,19 @@ module Admin
     class ConferenceSpeakerPresenter < SimpleDelegator
       def name
         if user
-          "#{user.name} (#{Decidim::UserPresenter.new(user).nickname})"
+          "#{user.name} (#{user.nickname})"
         else
           full_name
         end
       end
+
+      private
+
+      def user
+        @user ||= if (user = __getobj__.user.presence)
+                    Decidim::UserPresenter.new(user)
+                  end
+      end
     end
   end
 end
diff --git a/decidim-conferences/config/locales/cs.yml b/decidim-conferences/config/locales/cs.yml
index 49f00704fa60d..41520df4c54fc 100644
--- a/decidim-conferences/config/locales/cs.yml
+++ b/decidim-conferences/config/locales/cs.yml
@@ -632,6 +632,7 @@ cs:
     open_data:
       help:
         conferences:
+          component_settings: Nastavení komponent v konferenčním prostoru
           created_at: Datum, kdy byl tento prostor vytvořen
           decidim_scope_id: Rozsah konference
           description: Dlouhý popis konference
diff --git a/decidim-conferences/config/locales/fi-plain.yml b/decidim-conferences/config/locales/fi-plain.yml
index 8fb676a94b9e0..74c65f2c96147 100644
--- a/decidim-conferences/config/locales/fi-plain.yml
+++ b/decidim-conferences/config/locales/fi-plain.yml
@@ -622,6 +622,7 @@ fi-pl:
     open_data:
       help:
         conferences:
+          component_settings: Konferenssin komponenttiasetukset
           created_at: Tilan luontiaika
           decidim_scope_id: Konferenssin teema
           description: Konferenssin pitkä kuvaus
diff --git a/decidim-conferences/config/locales/fi.yml b/decidim-conferences/config/locales/fi.yml
index 6f67310e6bfa9..3cfc05873cbc9 100644
--- a/decidim-conferences/config/locales/fi.yml
+++ b/decidim-conferences/config/locales/fi.yml
@@ -622,6 +622,7 @@ fi:
     open_data:
       help:
         conferences:
+          component_settings: Konferenssin komponenttiasetukset
           created_at: Tilan luontiaika
           decidim_scope_id: Konferenssin teema
           description: Konferenssin pitkä kuvaus
diff --git a/decidim-conferences/config/locales/ja.yml b/decidim-conferences/config/locales/ja.yml
index 64b14a53698ec..76a038fad586d 100644
--- a/decidim-conferences/config/locales/ja.yml
+++ b/decidim-conferences/config/locales/ja.yml
@@ -617,6 +617,7 @@ ja:
     open_data:
       help:
         conferences:
+          component_settings: カンファレンススペースのコンポーネント設定
           created_at: このスペースが作成された日時
           decidim_scope_id: カンファレンスのスコープ
           description: カンファレンスの詳しい説明
diff --git a/decidim-conferences/config/locales/pt-BR.yml b/decidim-conferences/config/locales/pt-BR.yml
index fce64732802ea..f322fdfb87d4e 100644
--- a/decidim-conferences/config/locales/pt-BR.yml
+++ b/decidim-conferences/config/locales/pt-BR.yml
@@ -2,10 +2,14 @@ pt-BR:
   activemodel:
     attributes:
       conference:
+        assemblies_ids: Assembleias Relacionadas
         available_slots: Vagas disponíveis
         banner_image: Imagem de banner
         decidim_scope_id: Escopo
         description: Descrição
+        duplicate_categories: Categorias duplicadas
+        duplicate_components: Componentes duplicados
+        duplicate_features: Recursos duplicados
         end_date: Data final
         hero_image: Imagem inicial
         location: Localização
@@ -55,11 +59,14 @@ pt-BR:
         personal_url: URL pessoal
         position: Posição
         short_bio: Perfil curto
+        twitter_handle: X handler
         user_id: Usuário
       conference_user_role:
         email: O email
         name: Nome
         role: Função
+      partner:
+        logo: Logotipo
     errors:
       models:
         conference_registration_invite:
@@ -81,6 +88,7 @@ pt-BR:
     admin:
       actions:
         confirm: confirme
+        confirm_delete_conference: Tem certeza de que deseja excluir esta conferência? Se mudar de ideia, você pode restaurá-la mais tarde.
         new_conference: Nova conferência
         new_conference_user_role: Novo usuário da conferência
         new_media_link: Novo link de mídia
@@ -88,6 +96,12 @@ pt-BR:
         new_registration_type: Novo tipo de registro
         new_speaker: Novo Pregador
         send_diplomas: Envie certificados de participação
+        view_deleted_conferences: Ver conferências excluídas
+      conference_duplicates:
+        new:
+          duplicate: Duplicado
+          select: Selecione quais dados você gostaria de duplicar
+          title: Conferência duplicada
       conference_publications:
         create:
           error: Ocorreu um erro ao publicar esta conferência.
@@ -106,11 +120,13 @@ pt-BR:
         destroy:
           success: Alto-falante excluído com sucesso para esta conferência.
         edit:
+          title: Atualize o orador da conferência
           update: Atualizar
         index:
           conference_speakers_title: Alto-falantes da conferência
         new:
           create: Crio
+          title: Novo orador da conferência
         publish:
           invalid: Ocorreu um problema ao publicar esta reunião.
           success: Alto-falante excluído com sucesso para esta conferência.
@@ -127,11 +143,13 @@ pt-BR:
         destroy:
           success: Usuário removido com sucesso desta conferência.
         edit:
+          title: Atualize o usuário da conferência
           update: Atualizar
         index:
           conference_admins_title: Administradores da conferência
         new:
           create: Crio
+          title: Novo administrador da conferência
         update:
           error: Houve um erro ao atualizar um usuário para esta conferência.
           success: Usuário atualizado com sucesso para esta conferência.
@@ -144,25 +162,45 @@ pt-BR:
         exports:
           registrations: Inscrições
         form:
+          duration: Duração
           images: Fotos
+          metadata: Metadados
+          registrations: Inscrições
+          related_spaces: Espaços relacionados
           title: Informação geral
+          visibility: Visibilidade
         index:
           published: Publicados
           unpublished: Despublicado
+        manage_trash:
+          title: Conferências excluídas
         new:
           create: Crio
+          title: Nova conferência
         update:
           error: Houve um erro ao atualizar esta conferência.
           success: Conferência atualizada com sucesso.
+      conferences_duplicates:
+        create:
+          error: Houve um erro ao duplicar esta conferência.
+          success: Conferência duplicada com sucesso.
       media_links:
         create:
           error: Ocorreu um erro ao criar um novo link de mídia.
+          success: Link de mídia criado com sucesso.
+        destroy:
+          success: Link de mídia excluído com sucesso.
         edit:
+          title: Atualizar link de mídia
           update: Atualizar
+        index:
+          media_links_title: Links de mídia
         new:
           create: Criar
+          title: Criar link de mídia
         update:
           error: Houve um erro ao atualizar este link de mídia.
+          success: Link de mídia atualizado com sucesso.
       menu:
         conferences: Conferências
         conferences_submenu:
@@ -173,24 +211,32 @@ pt-BR:
           conference_admins: Administradores da conferência
           conference_invites: Convites
           conference_speakers: caixas de som
+          diploma: Certificado de participação
           info: Links sobre esta conferência
+          media_links: Links de mídia
           moderations: Moderações
           partners: Parceiros
+          registration_types: Tipos de registro
           registrations: Inscrições
+          see_conference: Ver conferência
+          user_registrations: Inscrições de usuários
       models:
         conference:
           fields:
+            actions: Ações
             created_at: Criado em
             published: Publicados
             title: Título
         conference_speaker:
           fields:
+            actions: Ações
             affiliation: Afiliação
             full_name: Nome completo
             position: Posição
           name: Conferência Palestrante
         conference_user_role:
           fields:
+            actions: Ações
             email: O email
             name: Nome
             role: Função
@@ -198,14 +244,18 @@ pt-BR:
           roles:
             admin: Administrador
             collaborator: Colaborador
+            evaluator: Avaliador
             moderator: Moderador
         media_link:
           fields:
+            actions: Ações
             date: Encontro
             link: Link
             title: Título
+          name: Link da mídia
         partner:
           fields:
+            actions: Ações
             link: Link
             logo: Logotipo
             name: Nome
@@ -216,6 +266,7 @@ pt-BR:
             main_promotor: Principais promotores
         registration_type:
           fields:
+            actions: Ações
             conference_meetings: Reuniões da conferência
             price: Preço
             registrations_count: Contagem de registros
@@ -229,6 +280,7 @@ pt-BR:
         destroy:
           success: Alto-falante excluído com sucesso para esta conferência.
         edit:
+          title: Atualizar parceiro
           update: Atualizar
         new:
           create: Criar
@@ -250,6 +302,7 @@ pt-BR:
         destroy:
           success: Tipo de registro removido com sucesso desta conferência.
         edit:
+          title: Atualizar tipo de registro
           update: Atualizar
         new:
           create: Crio
@@ -257,13 +310,21 @@ pt-BR:
         update:
           error: Ocorreu um erro ao atualizar um tipo de registro para esta conferência.
           success: Tipo de registro atualizado com sucesso para esta conferência.
+      taxonomy_filters:
+        space_filter_for:
+          conferences: Todas as conferências
       titles:
         conferences: Conferências
+        conferences_deleted: Conferências excluídas
+      tooltips:
+        deleted_conferences_info: As conferências só podem ser excluídas se o status for "Não publicado".
     admin_log:
       conference:
         create: "%{user_name} criou a conferência %{resource_name}"
         publish: "%{user_name} publicou a conferencia%{resource_name}"
+        restore: "%{user_name} restaurou a conferência %{resource_name}"
         send_conference_diplomas: "%{user_name} enviou certificados de participação para os %{resource_name} participantes da conferência"
+        soft_delete: "%{user_name} movido para a lixeira da conferência %{resource_name}"
         unpublish: "%{user_name} despublicou a conferencia%{resource_name}"
         update: "%{user_name} Atualizou a conferência %{resource_name}"
         update_diploma: "%{user_name} atualizou a configuração dos certificados de participação para %{resource_name} conferência"
@@ -300,6 +361,9 @@ pt-BR:
         title: caixas de som
     conferences:
       admin:
+        conference_duplicates:
+          form:
+            slug_help_html: 'Os slugs de URL são usados para gerar as URLs que apontam para esta conferência. Aceita apenas letras, números e traços e deve começar com uma letra. Exemplo: %{url}'
         conference_invites:
           create:
             error: Houve um problema ao convidar o usuário para participar da conferência.
@@ -331,16 +395,20 @@ pt-BR:
         conferences:
           form:
             available_slots_help: Deixe-o em 0 se você tiver slots ilimitados disponíveis.
+            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.
             registrations_count:
               one: Houve 1 registro.
               other: Houve %{count} inscrições.
             slug_help_html: 'Os slugs de URL são usados para gerar as URLs que apontam para esta conferência. Aceita apenas letras, números e traços e deve começar com uma letra. Exemplo: %{url}'
+            taxonomies: Taxonomias
         content_blocks:
           highlighted_conferences:
             max_results: Quantidade máxima de elementos para mostrar
         diplomas:
           edit:
             save: Salve 
+            title: Certificado de participação
         invite_join_conference_mailer:
           invite:
             decline: Recusar convite '%{conference_title}'
@@ -360,6 +428,7 @@ pt-BR:
             diploma_html: Você encontrará o certificado de participação para a conferência <a href="%{url}">%{title}</a> nos anexos.
           diploma_user:
             attendance_verified_by: Atendimento verificado por
+            certificate_of_attendance: Certificado de participação
             certificate_of_attendance_description: Certifica-se que <strong>%{user}</strong> participou e participou nos <strong>%{title}</strong> realizados em <strong>%{location}</strong> em <strong>%{start} - %{end}</strong>
         send_diploma:
           error: Houve um problema ao enviar os certificados de participação da conferência.
@@ -373,6 +442,8 @@ pt-BR:
           no_slots_available: Não há slots disponíveis
           registration: Cadastro
       conference_program:
+        program_item:
+          other_category: Outros
         show:
           program: Programa
       conference_registration_mailer:
@@ -406,6 +477,11 @@ pt-BR:
       conference_speaker_cell:
         personal_url:
           personal_website: Site pessoal
+      conference_speakers:
+        index:
+          speakers:
+            one: Palestrante
+            other: caixas de som
       conferences:
         partners:
           collaborators: Parceiros
@@ -424,6 +500,8 @@ pt-BR:
           name: Conferências destacadas
       index:
         title: Conferências
+      last_activity:
+        new_conference: 'Nova conferência:'
       mailer:
         conference_registration_mailer:
           confirmation:
@@ -450,6 +528,7 @@ pt-BR:
             sent: Enviei
         conference_registration:
           fields:
+            actions: Ações
             email: O email
             name: Nome
             registration_type: Tipo de Registro
@@ -474,6 +553,25 @@ pt-BR:
         objectives: Objetivos
         related_assemblies: Assembleias Relacionadas
         related_participatory_processes: Processos participativos relacionados
+    download_your_data:
+      help:
+        conference_invites:
+          accepted_at: A data em que o convite de conferência foi aceito
+          conference: A conferência para onde este convite foi enviado
+          confirmed_at: A data em que este convite foi confirmado
+          created_at: A data em que este convite foi criado
+          id: O identificador único do convite de conferência
+          registration_type: O tipo de registro para esta conferência que foi enviado
+          rejected_at: A data em que o convite para conferência foi rejeitado
+          sent_at: A data em que o convite desta conferência foi enviado
+          updated_at: A data em que este convite foi atualizado pela última vez
+        conference_registrations:
+          conference: A conferência a que isto pertence
+          confirmed_at: A data em que este registro foi confirmado
+          created_at: A data em que esta inscrição foi criada
+          id: O identificador exclusivo dos registros de conferência
+          registration_type: O tipo de registro que pertence a
+          updated_at: A data da última atualização desta inscrição
     events:
       conferences:
         conference_registration_confirmed:
@@ -521,8 +619,36 @@ pt-BR:
         title: Mídia e Links
     menu:
       conferences: Conferências
+    open_data:
+      help:
+        conferences:
+          component_settings: Configurações do componente do espaço de conferência
+          created_at: A data em que esta comunidade foi criada
+          decidim_scope_id: O escopo da conferência
+          description: Uma longa descrição da conferência
+          end_date: A data em que esta conferência termina.
+          follows_count: O número de usuários que seguem este espaço
+          id: O identificador único dessa conferência
+          location: Local da conferência. Onde esta conferência será realizada.
+          objectives: Quais são os objetivos desta conferência. Qual é a meta.
+          promoted: Se a conferência é promovida ou não
+          published_at: A data em que esta comunidade foi publicada
+          reference: A referência única do espaço
+          remote_banner_image_url: A URL da imagem do banner da conferência
+          remote_hero_image_url: URL da imagem do herói da conferência
+          scope: O escopo da conferência
+          scopes_enabled: Clima os escopos estão ativados ou não
+          short_description: Uma breve descrição da conferência
+          slogan: O slogan para esta conferência
+          slug: O slug de conferência (usado para fins de identificação, para a URL)
+          start_date: A data de início desta conferência.
+          taxonomies: As taxonomias da conferência
+          title: O título da conferência
+          updated_at: A última data em que este espaço foi atualizado
+          url: A URL do espaço
     statistics:
       conferences_count: Conferências
+      conferences_count_tooltip: O número de conferências publicadas.
   devise:
     mailer:
       join_conference:
diff --git a/decidim-conferences/config/locales/ro-RO.yml b/decidim-conferences/config/locales/ro-RO.yml
index 18957f0f884c7..f7b3eb156c09f 100644
--- a/decidim-conferences/config/locales/ro-RO.yml
+++ b/decidim-conferences/config/locales/ro-RO.yml
@@ -174,12 +174,12 @@ ro:
           attachment_files: Fișiere
           attachments: Atașamente
           components: Componente
-          conference_admins: Administratori ai conferinţei
+          conference_admins: Administratori ai conferinței
           conference_invites: Invitații
           conference_speakers: Vorbitori
           diploma: Certificat de participare
           media_links: Link-uri media
-          moderations: Moderatii
+          moderations: Moderări
           partners: Parteneri
           registration_types: Tipuri de înregistrare
           registrations: Înregistrări
diff --git a/decidim-conferences/lib/decidim/api/conference_registration_type_type.rb b/decidim-conferences/lib/decidim/api/conference_registration_type_type.rb
index a4c6062292abd..54916546008e1 100644
--- a/decidim-conferences/lib/decidim/api/conference_registration_type_type.rb
+++ b/decidim-conferences/lib/decidim/api/conference_registration_type_type.rb
@@ -22,8 +22,6 @@ def self.authorized?(object, context)
         ].all?
 
         super && chain
-      rescue Decidim::PermissionAction::PermissionNotSetError
-        false
       end
     end
   end
diff --git a/decidim-conferences/lib/decidim/api/conference_speaker_type.rb b/decidim-conferences/lib/decidim/api/conference_speaker_type.rb
index 2992a2a024184..239890b9393c0 100644
--- a/decidim-conferences/lib/decidim/api/conference_speaker_type.rb
+++ b/decidim-conferences/lib/decidim/api/conference_speaker_type.rb
@@ -30,8 +30,6 @@ def self.authorized?(object, context)
         ].all?
 
         super && chain
-      rescue Decidim::PermissionAction::PermissionNotSetError
-        false
       end
     end
   end
diff --git a/decidim-conferences/lib/decidim/conferences/participatory_space.rb b/decidim-conferences/lib/decidim/conferences/participatory_space.rb
index b2cd8e49fced6..59bc60725c8a9 100644
--- a/decidim-conferences/lib/decidim/conferences/participatory_space.rb
+++ b/decidim-conferences/lib/decidim/conferences/participatory_space.rb
@@ -17,8 +17,6 @@
 
   participatory_space.query_type = "Decidim::Conferences::ConferenceType"
 
-  participatory_space.breadcrumb_cell = "decidim/conferences/conference_dropdown_metadata"
-
   participatory_space.register_resource(:conference) do |resource|
     resource.model_class_name = "Decidim::Conference"
     resource.card = "decidim/conferences/conference"
diff --git a/decidim-conferences/spec/cells/decidim/conferences/conference_dropdown_metadata_cell_spec.rb b/decidim-conferences/spec/cells/decidim/conferences/conference_dropdown_metadata_cell_spec.rb
deleted file mode 100644
index 1f58b121eb134..0000000000000
--- a/decidim-conferences/spec/cells/decidim/conferences/conference_dropdown_metadata_cell_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-require "decidim/core/test/shared_examples/participatory_space_dropdown_metadata_cell_examples"
-
-module Decidim::Conferences
-  describe ConferenceDropdownMetadataCell, type: :cell do
-    controller Decidim::ApplicationController
-
-    subject { cell("decidim/conferences/conference_dropdown_metadata", model).call }
-
-    let(:model) { create(:conference) }
-
-    include_examples "participatory space dropdown metadata cell"
-  end
-end
diff --git a/decidim-conferences/spec/lib/decidim/conferences/query_extensions_spec.rb b/decidim-conferences/spec/lib/decidim/conferences/query_extensions_spec.rb
index 741da0678c957..2ebb49d9f1aa7 100644
--- a/decidim-conferences/spec/lib/decidim/conferences/query_extensions_spec.rb
+++ b/decidim-conferences/spec/lib/decidim/conferences/query_extensions_spec.rb
@@ -38,8 +38,8 @@ module Conferences
           let!(:conference) { create(:conference) }
           let(:id) { conference.id }
 
-          it "returns nil" do
-            expect(response["conference"]).to be_nil
+          it_behaves_like "graphQL not found space" do
+            let(:space_type) { "conference" }
           end
         end
       end
diff --git a/decidim-conferences/spec/system/admin/admin_filters_conferences_spec.rb b/decidim-conferences/spec/system/admin/admin_filters_conferences_spec.rb
new file mode 100644
index 0000000000000..e4ba765868f31
--- /dev/null
+++ b/decidim-conferences/spec/system/admin/admin_filters_conferences_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin sorting conferences" do
+  let(:organization) { create(:organization) }
+  let(:user) { create(:user, :admin, :confirmed, organization:) }
+
+  let!(:old_conference) { create(:conference, title: { en: "Old conference" }, created_at: 3.weeks.ago, organization:) }
+  let!(:recent_conference) { create(:conference, title: { en: "Recent conference" }, created_at: 1.day.ago, organization:) }
+  let!(:newest_conference) { create(:conference, title: { en: "Newest conference" }, created_at: Time.current, organization:) }
+
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+    visit decidim_admin_conferences.conferences_path
+  end
+
+  context "when sorting conferences by their creation" do
+    it "sorts by created_at descending by default" do
+      within "table thead" do
+        click_link "Created at"
+      end
+
+      titles = page.all("table tbody tr td:first-child")
+      expect(titles[0].text).to include("Newest conference")
+      expect(titles[1].text).to include("Recent conference")
+      expect(titles[2].text).to include("Old conference")
+    end
+
+    it "sorts by created_at ascending when clicked again" do
+      within "table thead" do
+        click_link "Created at"
+        click_link "Created at"
+      end
+
+      titles = page.all("table tbody tr td:first-child")
+      expect(titles[0].text).to include("Old conference")
+      expect(titles[1].text).to include("Recent conference")
+      expect(titles[2].text).to include("Newest conference")
+    end
+  end
+end
diff --git a/decidim-conferences/spec/system/admin/admin_manages_conference_soft_delete_spec.rb b/decidim-conferences/spec/system/admin/admin_manages_conference_soft_delete_spec.rb
index d1fecf196bbf0..6321649f6f4f2 100644
--- a/decidim-conferences/spec/system/admin/admin_manages_conference_soft_delete_spec.rb
+++ b/decidim-conferences/spec/system/admin/admin_manages_conference_soft_delete_spec.rb
@@ -14,12 +14,12 @@
   it_behaves_like "manage trashed resource", "conference"
 
   context "when a user is collaborator" do
-    let!(:conference) { create(:conference, organization: organization) }
-    let!(:collaborator_user) { create(:user, :admin_terms_accepted, :confirmed, organization: organization) }
+    let!(:conference) { create(:conference, organization:) }
+    let!(:collaborator_user) { create(:user, :admin_terms_accepted, :confirmed, organization:) }
     let!(:collaborator_role) do
       create(:conference_user_role,
              user: collaborator_user,
-             conference: conference,
+             conference:,
              role: :collaborator)
     end
 
@@ -36,12 +36,12 @@
   end
 
   context "when a user is evaluator" do
-    let!(:conference) { create(:conference, organization: organization) }
-    let!(:evaluator_user) { create(:user, :admin_terms_accepted, :confirmed, organization: organization) }
+    let!(:conference) { create(:conference, organization:) }
+    let!(:evaluator_user) { create(:user, :admin_terms_accepted, :confirmed, organization:) }
     let!(:evaluator_role) do
       create(:conference_user_role,
              user: evaluator_user,
-             conference: conference,
+             conference:,
              role: :evaluator)
     end
 
@@ -58,12 +58,12 @@
   end
 
   context "when a user is moderator" do
-    let!(:conference) { create(:conference, organization: organization) }
-    let!(:moderator_user) { create(:user, :admin_terms_accepted, :confirmed, organization: organization) }
+    let!(:conference) { create(:conference, organization:) }
+    let!(:moderator_user) { create(:user, :admin_terms_accepted, :confirmed, organization:) }
     let!(:moderator_role) do
       create(:conference_user_role,
              user: moderator_user,
-             conference: conference,
+             conference:,
              role: :moderator)
     end
 
@@ -80,12 +80,12 @@
   end
 
   context "when a user is a space admin" do
-    let!(:conference) { create(:conference, organization: organization) }
-    let!(:admin_user) { create(:user, :admin_terms_accepted, :confirmed, organization: organization) }
+    let!(:conference) { create(:conference, organization:) }
+    let!(:admin_user) { create(:user, :admin_terms_accepted, :confirmed, organization:) }
     let!(:admin_role) do
       create(:conference_user_role,
              user: admin_user,
-             conference: conference,
+             conference:,
              role: :admin)
     end
 
diff --git a/decidim-conferences/spec/system/admin/invite_conference_admin_spec.rb b/decidim-conferences/spec/system/admin/invite_conference_admin_spec.rb
index dff23ccf1fa7d..f3bbda98a23c1 100644
--- a/decidim-conferences/spec/system/admin/invite_conference_admin_spec.rb
+++ b/decidim-conferences/spec/system/admin/invite_conference_admin_spec.rb
@@ -15,5 +15,5 @@
 
   include_context "when inviting participatory space users"
 
-  it_behaves_like "inviting participatory space admins", check_private_space: false, check_landing_page: false
+  it_behaves_like "inviting participatory space admins", check_members_page: false, check_landing_page: false
 end
diff --git a/decidim-conferences/spec/system/conference_breadcrumb_spec.rb b/decidim-conferences/spec/system/conference_breadcrumb_spec.rb
deleted file mode 100644
index b55a1c4579ce2..0000000000000
--- a/decidim-conferences/spec/system/conference_breadcrumb_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "Conference Breadcrumb" do
-  let(:organization) { create(:organization) }
-  let(:participatory_space) { create(:conference, :published, organization:) }
-  let(:component) { create(:proposal_component, :published, participatory_space:) }
-  let(:router) { Decidim::EngineRouter.main_proxy(component) }
-  let!(:proposal) { create(:proposal, :published, component:) }
-
-  before do
-    switch_to_host(organization.host)
-  end
-
-  scenario "shows breadcrumb with only conference" do
-    visit decidim_conferences.conference_path(participatory_space, locale: I18n.locale)
-
-    within ".menu-bar" do
-      expect(page).to have_content("Conferences")
-      expect(page).to have_content(translated(participatory_space.title))
-    end
-  end
-
-  scenario "shows breadcrumb with conference and component" do
-    visit router.root_path
-
-    within ".menu-bar" do
-      expect(page).to have_content("Conferences")
-      expect(page).to have_content(translated(participatory_space.title))
-      expect(page).to have_content(translated(component.name))
-    end
-  end
-end
diff --git a/decidim-conferences/spec/system/conferences_breadcrumbs_spec.rb b/decidim-conferences/spec/system/conferences_breadcrumbs_spec.rb
new file mode 100644
index 0000000000000..1db071a774907
--- /dev/null
+++ b/decidim-conferences/spec/system/conferences_breadcrumbs_spec.rb
@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Conferences Breadcrumb" do
+  let(:organization) { create(:organization) }
+  let(:participatory_space) { create(:conference, :published, organization:) }
+  let(:component) { create(:proposal_component, :published, participatory_space:) }
+  let(:router) { Decidim::EngineRouter.main_proxy(component) }
+  let!(:proposal) { create(:proposal, :published, component:) }
+
+  before do
+    switch_to_host(organization.host)
+  end
+
+  scenario "shows breadcrumb with only conference" do
+    visit decidim_conferences.conference_path(participatory_space, locale: I18n.locale)
+
+    within ".menu-bar" do
+      expect(page).to have_content("Conferences")
+      expect(page).to have_content(translated(participatory_space.title))
+    end
+  end
+
+  scenario "shows breadcrumb with conference and component" do
+    visit router.root_path
+
+    within ".menu-bar" do
+      expect(page).to have_content("Conferences")
+      expect(page).to have_content(translated(participatory_space.title))
+      expect(page).to have_content(translated(component.name))
+    end
+  end
+
+  describe "with a program" do
+    let(:meetings_component) { create(:meeting_component, :published, participatory_space:) }
+    let!(:meeting) { create(:meeting, :published, latitude:, longitude:, component: meetings_component, start_time: 1.day.from_now) }
+
+    let(:latitude) { 40.7504928941818 }
+    let(:longitude) { -73.993466492276 }
+    let(:geocoder_request_url) { "https://nominatim.openstreetmap.org/reverse?accept-language=en&addressdetails=1&format=json&lat=#{latitude}&lon=#{longitude}" }
+    let(:geocoder_response) { File.read(Decidim::Dev.asset("geocoder_result_osm.json")) }
+
+    before do
+      stub_request(:get, geocoder_request_url).with(
+        headers: {
+          "Accept" => "*/*",
+          "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
+          "User-Agent" => "Ruby"
+        }
+      ).to_return(body: geocoder_response)
+    end
+
+    scenario "shows breadcrumb with conference and program" do
+      visit decidim_conferences.conference_conference_program_path(participatory_space, meetings_component, locale: I18n.locale)
+
+      within ".menu-bar" do
+        expect(page).to have_content("Conferences")
+        expect(page).to have_content(translated(participatory_space.title))
+        expect(page).to have_content("Program")
+      end
+    end
+
+    scenario "shows breadcrumb with conference, program, and meeting" do
+      visit decidim_conferences.conference_conference_program_path(participatory_space, meetings_component, locale: I18n.locale)
+      click_on decidim_sanitize_translated(meeting.title)
+
+      within ".menu-bar" do
+        expect(page).to have_content("Conferences")
+        expect(page).to have_content(translated(participatory_space.title))
+        expect(page).to have_content("Program")
+        expect(page).to have_content(translated_attribute(meeting.title))
+      end
+    end
+  end
+end
diff --git a/decidim-conferences/spec/types/conference_type_spec.rb b/decidim-conferences/spec/types/conference_type_spec.rb
index d12a166b469e3..121de1003b4bb 100644
--- a/decidim-conferences/spec/types/conference_type_spec.rb
+++ b/decidim-conferences/spec/types/conference_type_spec.rb
@@ -204,8 +204,8 @@ module Conferences
         context "when registrations are disabled" do
           let(:registrations_enabled) { false }
 
-          it "does not return any registration type" do
-            expect(response["registrationTypes"]).to eq([nil])
+          it "throws Decidim::Api::Errors::UnauthorizedObjectError" do
+            expect { response }.to raise_error(Decidim::Api::Errors::UnauthorizedObjectError, "You cannot view or edit this ConferenceRegistrationType because you do not have permissions")
           end
         end
 
diff --git a/decidim-conferences/spec/types/integration_schema_spec.rb b/decidim-conferences/spec/types/integration_schema_spec.rb
index 3e3ae4df8daf6..532f084d93929 100644
--- a/decidim-conferences/spec/types/integration_schema_spec.rb
+++ b/decidim-conferences/spec/types/integration_schema_spec.rb
@@ -131,6 +131,7 @@
     )
   end
 
+  include_examples "when the introspection is disabled"
   describe "valid query" do
     it "executes successfully" do
       expect { response }.not_to raise_error
diff --git a/decidim-core/app/cells/decidim/attachments_file_tab/show.erb b/decidim-core/app/cells/decidim/attachments_file_tab/show.erb
index 05bf98426f02e..22ce3b4998dfc 100644
--- a/decidim-core/app/cells/decidim/attachments_file_tab/show.erb
+++ b/decidim-core/app/cells/decidim/attachments_file_tab/show.erb
@@ -1,3 +1,3 @@
 <div class="row column">
-  <%= form.upload :file, button_class: "button button__sm button__transparent-secondary" %>
+  <%= form.upload :file, attachments: form.object.file.present? ? [form.object.file] : [], button_class: "button button__sm button__transparent-secondary" %>
 </div>
diff --git a/decidim-core/app/cells/decidim/content_blocks/menu_breadcrumb_last_activity/show.erb b/decidim-core/app/cells/decidim/content_blocks/menu_breadcrumb_last_activity/show.erb
deleted file mode 100644
index cc547b6dd2b8c..0000000000000
--- a/decidim-core/app/cells/decidim/content_blocks/menu_breadcrumb_last_activity/show.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="bg-background rounded p-4 space-y-3 text-sm [&_[data-activity]]:gap-4">
-  <%= cell(
-        "decidim/activities",
-        valid_activities,
-        **activities_options
-      ) %>
-</div>
-<%= link_to last_activities_path, class: "mt-2.5 button button__text-secondary" do %>
-  <span><%= t("decidim.content_blocks.last_activity.name") %></span><%= icon "arrow-right-line" %>
-<% end %>
diff --git a/decidim-core/app/cells/decidim/content_blocks/menu_breadcrumb_last_activity_cell.rb b/decidim-core/app/cells/decidim/content_blocks/menu_breadcrumb_last_activity_cell.rb
deleted file mode 100644
index 0b69b1fec531f..0000000000000
--- a/decidim-core/app/cells/decidim/content_blocks/menu_breadcrumb_last_activity_cell.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module ContentBlocks
-    # A cell to be rendered as a content block with the latest activities performed
-    # in a Decidim Organization.
-    class MenuBreadcrumbLastActivityCell < LastActivityCell
-      def show
-        return if current_user.blank? && current_organization&.force_users_to_authenticate_before_access_organization
-
-        super
-      end
-
-      private
-
-      def activities
-        @activities ||= if model.is_a?(Decidim::Organization)
-                          Decidim::LastActivity.new(model).query
-                        else
-                          Decidim::ParticipatorySpaceLastActivity.new(model).query
-                        end.limit(activities_to_show * 6)
-      end
-
-      # A MD5 hash of model attributes is needed because
-      # it ensures the cache version value will always be the same size
-      def cache_hash
-        hash = []
-        hash << "decidim/content_blocks/menu_breadcrumb_last_activity"
-        hash << id_prefix
-        hash << Digest::SHA256.hexdigest(valid_activities.map(&:cache_key_with_version).to_s)
-        hash << I18n.locale.to_s
-
-        hash.join(Decidim.cache_key_separator)
-      end
-
-      def activities_options
-        @activities_options ||= { id_prefix: }.merge(options.slice(:hide_participatory_space))
-      end
-
-      def id_prefix
-        @id_prefix ||= options[:id_prefix] || model.respond_to?(:to_gid) ? model.to_gid.to_param : "menu-breadcrumb"
-      end
-
-      def activities_to_show
-        4
-      end
-    end
-  end
-end
diff --git a/decidim-core/app/cells/decidim/content_blocks/participatory_space_metadata/content.erb b/decidim-core/app/cells/decidim/content_blocks/participatory_space_metadata/content.erb
index 54b23bfe7bd43..0c1da81bef8d9 100644
--- a/decidim-core/app/cells/decidim/content_blocks/participatory_space_metadata/content.erb
+++ b/decidim-core/app/cells/decidim/content_blocks/participatory_space_metadata/content.erb
@@ -2,9 +2,9 @@
   <% metadata_valued_items.each do |item| %>
     <div class="participatory-space__metadata-item">
       <div class="participatory-space__metadata-item-title">
-        <span><%= item[:title] %></span>
+        <p><%= item[:title] %></p>
       </div>
-      <span><%= item[:value] %></span>
+      <p><%= item[:value] %></p>
     </div>
   <% end %>
 </div>
diff --git a/decidim-core/app/cells/decidim/participatory_space_private_user/show.erb b/decidim-core/app/cells/decidim/member/show.erb
similarity index 100%
rename from decidim-core/app/cells/decidim/participatory_space_private_user/show.erb
rename to decidim-core/app/cells/decidim/member/show.erb
diff --git a/decidim-core/app/cells/decidim/participatory_space_private_user_cell.rb b/decidim-core/app/cells/decidim/member_cell.rb
similarity index 86%
rename from decidim-core/app/cells/decidim/participatory_space_private_user_cell.rb
rename to decidim-core/app/cells/decidim/member_cell.rb
index cd6aac893d571..a4427a667a36f 100644
--- a/decidim-core/app/cells/decidim/participatory_space_private_user_cell.rb
+++ b/decidim-core/app/cells/decidim/member_cell.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # This cell renders the card for an instance of an Assembly member
-  class ParticipatorySpacePrivateUserCell < Decidim::ViewModel
+  class MemberCell < Decidim::ViewModel
     property :name
     property :role
     property :nickname
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
deleted file mode 100644
index ab02418703794..0000000000000
--- a/decidim-core/app/cells/decidim/participatory_space_dropdown_metadata/links.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% if nav_items.present? %>
-  <% nav_items.each do |item| %>
-    <li>
-      <%= link_to item[:url] do %>
-        <span><%= item[:name] %></span><%= icon "arrow-right-line" %>
-      <% end %>
-    </li>
-  <% end %>
-<% end %>
diff --git a/decidim-core/app/cells/decidim/participatory_space_dropdown_metadata/metadata.erb b/decidim-core/app/cells/decidim/participatory_space_dropdown_metadata/metadata.erb
deleted file mode 100644
index 71ff053bdbb89..0000000000000
--- a/decidim-core/app/cells/decidim/participatory_space_dropdown_metadata/metadata.erb
+++ /dev/null
@@ -1 +0,0 @@
-<h4 class="menu-bar__secondary-dropdown__title"><%= title %></h4>
diff --git a/decidim-core/app/cells/decidim/participatory_space_dropdown_metadata/show.erb b/decidim-core/app/cells/decidim/participatory_space_dropdown_metadata/show.erb
deleted file mode 100644
index 478ec9c6ab7d1..0000000000000
--- a/decidim-core/app/cells/decidim/participatory_space_dropdown_metadata/show.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<div id="breadcrumb-secondary-dropdown-<%= id %>" class="menu-bar__secondary-dropdown">
-  <div class="menu-bar__secondary-dropdown__left">
-    <%= render :metadata %>
-    <%= cell "decidim/content_blocks/menu_breadcrumb_last_activity", model, hide_participatory_space: true %>
-  </div>
-  <nav role="navigation" aria-label="<%= t("decidim.accessibility.secondary_menu") %>">
-    <ul class="menu-bar__secondary-dropdown__menu">
-      <%= render :links %>
-    </ul>
-  </nav>
-</div>
diff --git a/decidim-core/app/cells/decidim/participatory_space_dropdown_metadata_cell.rb b/decidim-core/app/cells/decidim/participatory_space_dropdown_metadata_cell.rb
deleted file mode 100644
index bbdb481dad922..0000000000000
--- a/decidim-core/app/cells/decidim/participatory_space_dropdown_metadata_cell.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  class ParticipatorySpaceDropdownMetadataCell < Decidim::ViewModel
-    private
-
-    def nav_items_method = nil
-
-    def nav_items
-      return [] if nav_items_method.blank?
-      return [] if (nav_items = try(nav_items_method, model)).blank?
-
-      nav_items
-    end
-
-    def title
-      decidim_escape_translated(model.try(:title) || model.try(:name) || "")
-    end
-
-    def id
-      return "#{model.id}-mobile" if options[:mobile]
-
-      model.id
-    end
-  end
-end
diff --git a/decidim-core/app/cells/decidim/share_widget/modal.erb b/decidim-core/app/cells/decidim/share_widget/modal.erb
index 61a0573556414..1c94de87b2df8 100644
--- a/decidim-core/app/cells/decidim/share_widget/modal.erb
+++ b/decidim-core/app/cells/decidim/share_widget/modal.erb
@@ -1,6 +1,6 @@
 <%= decidim_modal id: "socialShare", class: "share-modal" do %>
   <div data-dialog-container>
-    <h2 tabindex="-1" data-dialog-title><%= t("share", scope: "decidim.shared.share_modal") %></h2>
+    <h2 id="dialog-title-social-share-modal" tabindex="-1" data-dialog-title><%= t("share", scope: "decidim.shared.share_modal") %></h2>
 
     <div>
 
diff --git a/decidim-core/app/cells/decidim/statistic/show.erb b/decidim-core/app/cells/decidim/statistic/show.erb
index 31ba229089d2b..9bb0bb460dabf 100644
--- a/decidim-core/app/cells/decidim/statistic/show.erb
+++ b/decidim-core/app/cells/decidim/statistic/show.erb
@@ -1,9 +1,9 @@
 <div class="statistic <%= stat_dom_class %>" data-statistic>
   <div class="statistic__header">
     <div class="statistic__metric">
-      <div class="statistic__title" title="<%= stat_title %>">
+      <p class="statistic__title" title="<%= stat_title %>">
         <%= stat_title %>
-      </div>
+      </p>
       <div class="statistic__tooltip">
         <%= information_tooltip %>
       </div>
@@ -13,14 +13,14 @@
     </div>
   </div>
   <% if second_stat_number %>
-    <div class="statistic__second-number">
+    <p class="statistic__second-number">
       <%= stat_sub_title %>
       <span class="font-semibold"><%= second_stat_number %></span>
-    </div>
+    </p>
   <% else %>
     <p class="h-[21px]"></p>
   <% end %>
-  <div class="statistic__number">
+  <p class="statistic__number">
     <%= stat_number %>
-  </div>
+  </p>
 </div>
diff --git a/decidim-core/app/cells/decidim/upload_modal/files.erb b/decidim-core/app/cells/decidim/upload_modal/files.erb
index d56cabe7df66b..651da3aacd0b2 100644
--- a/decidim-core/app/cells/decidim/upload_modal/files.erb
+++ b/decidim-core/app/cells/decidim/upload_modal/files.erb
@@ -1,9 +1,9 @@
 <div class="upload-modal__files-container upload-container-for-<%= attribute %> <%= with_title %>">
   <div>
-    <%= label %>
+    <%= options[:paragraph] == true ? paragraph : label %>
 
     <% if options[:help_text].present? %>
-      <span class="help-text"><%= options[:help_text] %></span>
+      <p class="help-text"><%= options[:help_text] %></p>
     <% end %>
 
     <%# NOTE: this block is about wrapping a default image for the avatar with the new styles,
@@ -22,24 +22,28 @@
     <div class="upload-modal__files" data-active-uploads="<%= modal_id %>">
       <% attachments.each do |attachment| %>
         <% next if [Array, Hash].any? { |klass| attachment.is_a? klass } %>
+        <% is_persisted_attachment = attachment.is_a?(Decidim::Attachment) && attachment.persisted? %>
+        <% attachment_blob = blob(attachment) %>
 
-        <div class="attachment-details" data-attachment-id="<%= attachment.id %>" data-title="<%= title_for(attachment) %>" data-filename="<%= file_name_for(attachment) %>" data-state="uploaded">
-          <% if file_attachment_path(attachment) && blob(attachment).image? %>
+        <div class="attachment-details"<% if is_persisted_attachment %> data-attachment-id="<%= attachment.id %>"<% end %> data-title="<%= title_for(attachment) %>" data-filename="<%= file_name_for(attachment) %>" data-state="uploaded" data-hidden-field="<%= attachment_blob&.signed_id %>">
+          <% if file_attachment_path(attachment) && attachment_blob&.image? %>
             <div><%= image_tag(file_attachment_path(attachment), alt: "") %></div>
           <% elsif uploader_default_image_path(attribute).present? %>
             <div><%= image_tag uploader_default_image_path(attribute) %></div>
           <% end %>
 
           <% if has_title? %>
-            <span><%= title_for(attachment) %></span>
-            <%= form.hidden_field attribute, multiple: true, value: attachment.id, id: attachment.id %>
+            <p><%= title_for(attachment) %></p>
           <% else %>
-            <% if blob(attachment).image? %>
-              <span><%= title_for(attachment) %></span>
+            <% if attachment_blob&.image? %>
+              <p><%= title_for(attachment) %></p>
             <% else %>
               <%= link_to title_for(attachment), file_attachment_path(attachment), class: "w-full break-all mb-2" %>
             <% end %>
           <% end %>
+          <% if attachment_blob.present? %>
+            <%= form.hidden_field attribute, value: attachment_blob.signed_id, id: "hidden_#{attribute}_#{attachment_blob.id}" %>
+          <% end %>
         </div>
       <% end %>
     </div>
diff --git a/decidim-core/app/cells/decidim/upload_modal_cell.rb b/decidim-core/app/cells/decidim/upload_modal_cell.rb
index 6f743d00ae465..055d4d1df8081 100644
--- a/decidim-core/app/cells/decidim/upload_modal_cell.rb
+++ b/decidim-core/app/cells/decidim/upload_modal_cell.rb
@@ -30,6 +30,10 @@ def label
       form.send(:custom_label, attribute, options[:label], { required: required?, for: nil })
     end
 
+    def paragraph
+      form.send(:custom_paragraph, attribute, options[:label], { required: required? })
+    end
+
     def button_label
       return button_edit_label if attachments.count.positive?
 
@@ -71,13 +75,16 @@ def required?
     end
 
     # By default FoundationRailsHelper adds form errors next to input, but since input is in the modal
-    # and modal is hidden by default, we need to add an additional validation field to the form.
+    # and modal is hidden by default, we add a hidden checkbox field to handle HTML5 validation.
     # This should only be necessary when file is required by the form.
+    # Note: Validation errors are now displayed in the main form area, not inside the modal.
     def input_validation_field
       object_name = form.object.present? ? "#{form.object.model_name.param_key}[#{add_attribute}_validation]" : "#{add_attribute}_validation"
-      input = check_box_tag object_name, 1, attachments.present?, class: "reset-defaults", hidden: true, label: false, required: required?
-      message = form.send(:abide_error_element, add_attribute) + form.send(:error_and_help_text, add_attribute)
-      input + message
+      check_box_tag object_name, 1, attachments.present?, class: "reset-defaults", hidden: true, label: false, required: required?, id: validation_field_id
+    end
+
+    def validation_field_id
+      "#{attribute}_validation"
     end
 
     def explanation
diff --git a/decidim-core/app/commands/decidim/create_follow.rb b/decidim-core/app/commands/decidim/create_follow.rb
index 0be0c622378d5..523234116c2b6 100644
--- a/decidim-core/app/commands/decidim/create_follow.rb
+++ b/decidim-core/app/commands/decidim/create_follow.rb
@@ -20,6 +20,7 @@ def initialize(form)
     # Returns nothing.
     def call
       return broadcast(:invalid) if form.invalid?
+      return broadcast(:invalid) unless current_user.is_a?(Decidim::User)
 
       create_follow!
       increment_score
@@ -32,13 +33,10 @@ def call
     attr_reader :follow, :form
 
     def create_follow!
-      @follow = Follow.find_by(
+      @follow = Follow.where(
         followable: form.followable,
         user: current_user
-      ) || Follow.create!(
-        followable: form.followable,
-        user: current_user
-      )
+      ).first_or_create!
     end
 
     def increment_score
diff --git a/decidim-core/app/commands/decidim/destroy_account.rb b/decidim-core/app/commands/decidim/destroy_account.rb
index 6199f2ffbf6cb..8ad711b72fc0d 100644
--- a/decidim-core/app/commands/decidim/destroy_account.rb
+++ b/decidim-core/app/commands/decidim/destroy_account.rb
@@ -28,7 +28,7 @@ def call
         destroy_user_badges
         destroy_user_likes
         destroy_user_reports
-        destroy_participatory_space_private_user
+        destroy_member
         delegate_destroy_to_participatory_spaces
       end
 
@@ -101,8 +101,8 @@ def destroy_follows
       Decidim::Follow.where(user: current_user).find_each(&:destroy)
     end
 
-    def destroy_participatory_space_private_user
-      Decidim::ParticipatorySpacePrivateUser.where(user: current_user).find_each(&:destroy)
+    def destroy_member
+      Decidim::ParticipatorySpace::Member.where(user: current_user).find_each(&:destroy)
     end
 
     def delegate_destroy_to_participatory_spaces
diff --git a/decidim-core/app/controllers/concerns/decidim/has_members_page.rb b/decidim-core/app/controllers/concerns/decidim/has_members_page.rb
deleted file mode 100644
index f0ff4f9ebd135..0000000000000
--- a/decidim-core/app/controllers/concerns/decidim/has_members_page.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require "active_support/concern"
-
-module Decidim
-  module HasMembersPage
-    extend ActiveSupport::Concern
-
-    included do
-      helper_method :collection
-
-      private
-
-      def can_visit_index?
-        current_user_can_visit_space? && current_participatory_space.members_public_page?
-      end
-
-      def members
-        @members ||= current_participatory_space.participatory_space_private_users.published
-      end
-
-      alias_method :collection, :members
-    end
-  end
-end
diff --git a/decidim-core/app/controllers/concerns/decidim/participatory_space/has_members_page.rb b/decidim-core/app/controllers/concerns/decidim/participatory_space/has_members_page.rb
new file mode 100644
index 0000000000000..edda01621be6c
--- /dev/null
+++ b/decidim-core/app/controllers/concerns/decidim/participatory_space/has_members_page.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module ParticipatorySpace
+    module HasMembersPage
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :collection
+
+        private
+
+        def can_visit_index?
+          current_user_can_visit_space? && current_participatory_space.members_public_page?
+        end
+
+        def members
+          @members ||= current_participatory_space.members.published
+        end
+
+        alias_method :collection, :members
+      end
+    end
+  end
+end
diff --git a/decidim-core/app/controllers/concerns/decidim/participatory_space_context.rb b/decidim-core/app/controllers/concerns/decidim/participatory_space_context.rb
index 931f7fda3e75c..b4e604f49095d 100644
--- a/decidim-core/app/controllers/concerns/decidim/participatory_space_context.rb
+++ b/decidim-core/app/controllers/concerns/decidim/participatory_space_context.rb
@@ -36,8 +36,6 @@ def current_participatory_space
     #           title of the space (mandatory).
     # * url - The url of the resource (optional).
     # * active - Whether the item is active (optional).
-    # * dropdown_cell - When this value is present is used to generate a dropdown
-    #                   associated to the item (optional).
     # * resource - The resource of the item. This value is passed to the
     #              dropdown cell, so it is mandatory if the dropdown cell is
     #              present.
@@ -48,7 +46,6 @@ def current_participatory_space_breadcrumb_item
         label: current_participatory_space.title,
         url: Decidim::ResourceLocatorPresenter.new(current_participatory_space).path,
         active: true,
-        dropdown_cell: current_participatory_space_manifest.breadcrumb_cell,
         resource: current_participatory_space
       }
     end
diff --git a/decidim-core/app/controllers/decidim/components/base_controller.rb b/decidim-core/app/controllers/decidim/components/base_controller.rb
index b07f684295f15..da45894553027 100644
--- a/decidim-core/app/controllers/decidim/components/base_controller.rb
+++ b/decidim-core/app/controllers/decidim/components/base_controller.rb
@@ -35,7 +35,7 @@ class BaseController < Decidim::ApplicationController
 
       before_action :redirect_unless_feature_private
 
-      before_action :set_component_breadcrumb_item
+      before_action :set_breadcrumb_items
 
       def current_participatory_space
         request.env["decidim.current_participatory_space"]
@@ -66,7 +66,7 @@ def redirect_unless_feature_private
         raise ActionController::RoutingError, "Not Found" unless current_user_can_visit_space?
       end
 
-      def set_component_breadcrumb_item
+      def set_breadcrumb_items
         context_breadcrumb_items << add_current_component
         context_breadcrumb_items << add_parent_breadcrumb_item
         context_breadcrumb_items << add_breadcrumb_item
diff --git a/decidim-core/app/events/decidim/welcome_notification_event.rb b/decidim-core/app/events/decidim/welcome_notification_event.rb
index d29f4dfcb76ea..687e6fd49ce5f 100644
--- a/decidim-core/app/events/decidim/welcome_notification_event.rb
+++ b/decidim-core/app/events/decidim/welcome_notification_event.rb
@@ -43,7 +43,7 @@ def resource_title
 
     def interpolate(template)
       template
-        .gsub("{{name}}", user.name)
+        .gsub("{{name}}", user.presenter.name)
         .gsub("{{organization}}", organization_name(organization))
         .gsub("{{help_url}}", url_helpers.pages_url(host: organization.host, locale: I18n.locale))
         .gsub("{{badges_url}}", url_helpers.gamification_badges_url(host: organization.host))
diff --git a/decidim-core/app/helpers/decidim/amendments_helper.rb b/decidim-core/app/helpers/decidim/amendments_helper.rb
index 1873619b9dc9d..29fa088e71bd2 100644
--- a/decidim-core/app/helpers/decidim/amendments_helper.rb
+++ b/decidim-core/app/helpers/decidim/amendments_helper.rb
@@ -17,9 +17,9 @@ def emendation_announcement_for(emendation)
     end
 
     # Checks if the user can participate in a participatory space
-    # based on its settings related with Decidim::HasPrivateUsers.
+    # based on its settings related with Decidim::ParticipatorySpace::HasMembers.
     def can_participate_in_private_space?
-      return true unless current_participatory_space.class.included_modules.include?(HasPrivateUsers)
+      return true unless current_participatory_space.class.included_modules.include?(Decidim::ParticipatorySpace::HasMembers)
 
       current_participatory_space.can_participate?(current_user)
     end
diff --git a/decidim-core/app/helpers/decidim/menu_helper.rb b/decidim-core/app/helpers/decidim/menu_helper.rb
index d84f6aeab96b5..d31e9aaf0ea6e 100644
--- a/decidim-core/app/helpers/decidim/menu_helper.rb
+++ b/decidim-core/app/helpers/decidim/menu_helper.rb
@@ -69,10 +69,10 @@ def menu_highlighted_participatory_process
         # The queries already include the order by weight
         Decidim::ParticipatoryProcesses::OrganizationParticipatoryProcesses.new(current_organization) |
           Decidim::ParticipatoryProcesses::PromotedParticipatoryProcesses.new
-      ).select(&:published?).map { |process| remove_private_space_if_not_private_user(process) }&.compact&.first
+      ).select(&:published?).map { |process| remove_private_space_if_not_member(process) }&.compact&.first
     end
 
-    def remove_private_space_if_not_private_user(process)
+    def remove_private_space_if_not_member(process)
       return nil if process.private_space == true && !process.can_participate?(current_user)
 
       process
diff --git a/decidim-core/app/models/decidim/attachment.rb b/decidim-core/app/models/decidim/attachment.rb
index d13e5ce54dec3..35d84fea9712c 100644
--- a/decidim-core/app/models/decidim/attachment.rb
+++ b/decidim-core/app/models/decidim/attachment.rb
@@ -9,7 +9,7 @@ class Attachment < ApplicationRecord
     include Traceable
 
     before_save :set_content_type_and_size, if: :attached?
-    before_validation :set_link_content_type_and_size, if: :link?
+    before_validation :set_link_content_type_and_size, if: :editable_link?
 
     translatable_fields :title, :description
     belongs_to :attachment_collection, class_name: "Decidim::AttachmentCollection", optional: true
@@ -69,6 +69,13 @@ def link?
       link.present?
     end
 
+    # Whether this attachment is a link that can be edited or not.
+    #
+    # Returns Boolean.
+    def editable_link?
+      !destroyed? && !frozen? && link?
+    end
+
     # Whether this attachment has a file or not.
     #
     # Returns Boolean.
@@ -130,5 +137,12 @@ def set_link_content_type_and_size
     def self.log_presenter_class_for(_log)
       Decidim::AdminLog::AttachmentPresenter
     end
+
+    def can_participate?(user)
+      return true unless attached_to
+      return true unless attached_to.respond_to?(:can_participate?)
+
+      attached_to.can_participate?(user)
+    end
   end
 end
diff --git a/decidim-core/app/models/decidim/component.rb b/decidim-core/app/models/decidim/component.rb
index eb2b04d203c04..af7604c5acb66 100644
--- a/decidim-core/app/models/decidim/component.rb
+++ b/decidim-core/app/models/decidim/component.rb
@@ -108,6 +108,7 @@ def can_participate_in_space?(user)
 
       participatory_space.can_participate?(user)
     end
+    alias can_participate? can_participate_in_space?
 
     def private_non_transparent_space?
       return false unless participatory_space.respond_to?(:private_space?)
diff --git a/decidim-core/app/models/decidim/participatory_space/member.rb b/decidim-core/app/models/decidim/participatory_space/member.rb
new file mode 100644
index 0000000000000..1be8ee4ed73f2
--- /dev/null
+++ b/decidim-core/app/models/decidim/participatory_space/member.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatorySpace
+    # This class gives a given User access to a given private Member
+    class Member < ApplicationRecord
+      include Decidim::DownloadYourData
+      include ParticipatorySpaceUser
+      include Decidim::TranslatableResource
+
+      belongs_to :participatory_space, polymorphic: true
+
+      translatable_fields :role
+
+      delegate :email, :name, to: :user
+
+      scope :by_participatory_space, ->(participatory_space) { where(participatory_space_id: participatory_space.id, participatory_space_type: participatory_space.class.to_s) }
+      scope :published, -> { where(published: true) }
+
+      def self.user_collection(user)
+        where(decidim_user_id: user.id)
+      end
+
+      def self.member_ids_for_participatory_spaces(spaces)
+        joins(:user).where(participatory_space: spaces).distinct.pluck(:decidim_user_id)
+      end
+
+      def self.export_serializer
+        Decidim::DownloadYourDataSerializers::DownloadYourDataMemberSerializer
+      end
+
+      def self.log_presenter_class_for(_log)
+        Decidim::AdminLog::ParticipatorySpace::MemberPresenter
+      end
+
+      ransacker :invitation_sent_at do
+        Arel.sql(%{("invitation_sent_at")::text})
+      end
+
+      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)
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w(user)
+      end
+
+      def target_space_association = :participatory_space
+    end
+  end
+end
diff --git a/decidim-core/app/models/decidim/participatory_space_private_user.rb b/decidim-core/app/models/decidim/participatory_space_private_user.rb
deleted file mode 100644
index cd8676f037dd2..0000000000000
--- a/decidim-core/app/models/decidim/participatory_space_private_user.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # This class gives a given User access to a given private ParticipatorySpacePrivateUser
-  class ParticipatorySpacePrivateUser < ApplicationRecord
-    include Decidim::DownloadYourData
-    include ParticipatorySpaceUser
-    include Decidim::TranslatableResource
-
-    belongs_to :privatable_to, polymorphic: true
-
-    translatable_fields :role
-
-    delegate :email, :name, to: :user
-
-    scope :by_participatory_space, ->(privatable_to) { where(privatable_to_id: privatable_to.id, privatable_to_type: privatable_to.class.to_s) }
-    scope :published, -> { where(published: true) }
-
-    def self.user_collection(user)
-      where(decidim_user_id: user.id)
-    end
-
-    def self.private_user_ids_for_participatory_spaces(spaces)
-      joins(:user).where(privatable_to: spaces).distinct.pluck(:decidim_user_id)
-    end
-
-    def self.export_serializer
-      Decidim::DownloadYourDataSerializers::DownloadYourDataParticipatorySpacePrivateUserSerializer
-    end
-
-    def self.log_presenter_class_for(_log)
-      Decidim::AdminLog::ParticipatorySpacePrivateUserPresenter
-    end
-
-    ransacker :invitation_sent_at do
-      Arel.sql(%{("invitation_sent_at")::text})
-    end
-
-    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)
-    end
-
-    def self.ransackable_associations(_auth_object = nil)
-      %w(user)
-    end
-
-    def target_space_association = :privatable_to
-  end
-end
diff --git a/decidim-core/app/models/decidim/user_base_entity.rb b/decidim-core/app/models/decidim/user_base_entity.rb
index f69d8048d7633..4532c4dfde91b 100644
--- a/decidim-core/app/models/decidim/user_base_entity.rb
+++ b/decidim-core/app/models/decidim/user_base_entity.rb
@@ -20,7 +20,7 @@ class UserBaseEntity < ApplicationRecord
     has_one :blocking, class_name: "Decidim::UserBlock", foreign_key: :id, primary_key: :block_id, dependent: :destroy
 
     # Regex for name & nickname format validations
-    REGEXP_NAME = /\A(?!.*[<>?%&\^*#@()\[\]=+:;"{}\\|])/
+    REGEXP_NAME = /\A(?!.*[<>?%&\^*#@()\[\]=+:;"{}\\|\n\r])/m
     REGEXP_NICKNAME = /\A[a-z0-9_-]+\z/
 
     has_one_attached :avatar
diff --git a/decidim-core/app/packs/src/decidim/controllers/assign_role/assign_role.test.js b/decidim-core/app/packs/src/decidim/controllers/assign_role/assign_role.test.js
new file mode 100644
index 0000000000000..5d0602dbc2936
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/controllers/assign_role/assign_role.test.js
@@ -0,0 +1,80 @@
+/* global global, jest */
+
+import { Application } from "@hotwired/stimulus";
+import AssignRoleController from "src/decidim/controllers/assign_role/controller";
+
+describe("AssignRoleController", () => {
+  let application = null;
+  let element = null;
+  let controller = null;
+
+  beforeEach(() => {
+    document.body.innerHTML = `
+      <div data-controller="assign-role" data-role="navigation"></div>
+    `;
+
+    application = Application.start();
+    application.register("assign-role", AssignRoleController);
+
+    element = document.querySelector('[data-controller="assign-role"]');
+
+    return new Promise((resolve) => {
+      setTimeout(() => {
+        controller = application.getControllerForElementAndIdentifier(element, "assign-role");
+        resolve();
+      }, 0);
+    });
+  });
+
+  afterEach(() => {
+    application.stop();
+    document.body.innerHTML = "";
+    jest.useRealTimers();
+    jest.restoreAllMocks();
+  });
+
+  describe("connect", () => {
+    it("sets the role attribute after the delay", () => {
+      controller.disconnect();
+      jest.useFakeTimers();
+
+      controller.connect();
+
+      expect(element.getAttribute("role")).toBeNull();
+      jest.advanceTimersByTime(300);
+      expect(element.getAttribute("role")).toBe("navigation");
+    });
+
+    it("returns early when no data-role is provided", () => {
+      controller.disconnect();
+
+      element.dataset.role = "";
+      const setTimeoutSpy = jest.spyOn(global, "setTimeout");
+      jest.useFakeTimers();
+
+      controller.connect();
+
+      expect(element.getAttribute("role")).toBeNull();
+      expect(setTimeoutSpy).not.toHaveBeenCalled();
+      jest.advanceTimersByTime(300);
+      expect(element.getAttribute("role")).toBeNull();
+    });
+  });
+
+  describe("disconnect", () => {
+    it("clears any pending timeout", () => {
+      controller.disconnect();
+      jest.useFakeTimers();
+
+      const clearTimeoutSpy = jest.spyOn(global, "clearTimeout");
+
+      controller.connect();
+      controller.disconnect();
+
+      expect(clearTimeoutSpy).toHaveBeenCalled();
+
+      jest.advanceTimersByTime(300);
+      expect(element.getAttribute("role")).toBeNull();
+    });
+  });
+});
diff --git a/decidim-core/app/packs/src/decidim/controllers/assign_role/controller.js b/decidim-core/app/packs/src/decidim/controllers/assign_role/controller.js
new file mode 100644
index 0000000000000..9d5769ab80b92
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/controllers/assign_role/controller.js
@@ -0,0 +1,27 @@
+import { Controller } from "@hotwired/stimulus"
+
+/**
+ * This controller is used to set a role attribute for any element where is being assigned.
+ * It requires a data-role attribute with the value of the role attribute to be set.
+ * We are using to change the value "menu" of role attribute set by a11y on div dropdown-menu-account and
+ * dropdown-menu-account-mobile which are inappropriate for accessibility
+ */
+export default class extends Controller {
+  connect() {
+    const role = this.element.dataset.role
+
+    if (!role) {
+      return
+    }
+
+    this.timeoutId = setTimeout(() => {
+      this.element.setAttribute("role", role)
+    }, 300)
+  }
+
+  disconnect() {
+    if (this.timeoutId) {
+      clearTimeout(this.timeoutId)
+    }
+  }
+}
diff --git a/decidim-core/app/packs/src/decidim/controllers/main_menu/controller.js b/decidim-core/app/packs/src/decidim/controllers/main_menu/controller.js
new file mode 100644
index 0000000000000..f7b5fb7836c4f
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/controllers/main_menu/controller.js
@@ -0,0 +1,115 @@
+import { Controller } from "@hotwired/stimulus"
+
+const OPEN_DELAY_MS = 50
+
+/**
+ * Main menu dropdown controller and traps page scroll while the menu is open.
+ *
+ * Expected markup:
+ * - The controller element has a `data-target` attribute with the menu container id.
+ * - The menu container uses `aria-hidden="true|false"` for visibility.
+ * - An optional close button exists with id `main-dropdown-summary-desktop-close`.
+ */
+export default class extends Controller {
+  connect() {
+    this.menuButton = this.element
+    this.menuContainer = document.getElementById(this.element.dataset.target)
+    this.closeButton = document.getElementById(this.element.dataset.closeButton)
+
+    if (!this.menuContainer) {
+      return;
+    }
+
+    this.handleContainerClick = this.handleContainerClick.bind(this)
+    this.handleButtonClick = this.handleButtonClick.bind(this)
+    this.handleKeydown = this.handleKeydown.bind(this)
+    this.handleCloseButtonClick = this.handleCloseButtonClick.bind(this)
+
+    this.menuButton.addEventListener("click", this.handleButtonClick)
+    this.menuContainer.addEventListener("click", this.handleContainerClick)
+
+
+    document.addEventListener("keydown", this.handleKeydown)
+    if (this.closeButton) {
+      this.closeButton.addEventListener("click", this.handleCloseButtonClick)
+    }
+  }
+
+  disconnect() {
+    if (!this.menuContainer) {
+      return;
+    }
+
+    this.menuButton.removeEventListener("click", this.handleButtonClick)
+    this.menuContainer.removeEventListener("click", this.handleContainerClick)
+    document.removeEventListener("keydown", this.handleKeydown)
+    if (this.closeButton) {
+      this.closeButton.removeEventListener("click", this.handleCloseButtonClick)
+    }
+    if (!this.isHidden()) {
+      this.closeMenu();
+    }
+  }
+
+
+  handleContainerClick(event) {
+    if (this.isHidden()) {
+      return;
+    }
+    if (event.target !== this.menuContainer) {
+      return;
+    }
+    this.closeMenu()
+  }
+
+  handleButtonClick() {
+    if (!this.isHidden()) {
+      return;
+    }
+
+    setTimeout(() => {
+      this.openMenu()
+      window.scrollTo({ top: 0, behavior: "smooth" })
+    }, OPEN_DELAY_MS)
+  }
+
+  handleKeydown(event) {
+    if (event.key !== "Escape") {
+      return;
+    }
+    if (this.isHidden()) {
+      return;
+    }
+
+    this.closeMenu()
+  }
+
+  handleCloseButtonClick() {
+    if (this.isHidden()) {
+      return;
+    }
+
+    this.closeMenu();
+  }
+
+  isHidden() {
+    return this.menuContainer.getAttribute("aria-hidden") === "true"
+  }
+
+  openMenu() {
+    if (typeof this.previousBodyOverflow === "undefined") {
+      this.previousBodyOverflow = document.body.style.overflow;
+    }
+    document.body.style.overflow = "hidden"
+    this.element.setAttribute("aria-expanded", "true")
+    this.menuContainer.setAttribute("aria-hidden", "false")
+    this.menuContainer.setAttribute("aria-modal", "true")
+  }
+
+  closeMenu() {
+    document.body.style.overflow = this.previousBodyOverflow ?? ""
+    this.element.setAttribute("aria-expanded", "false")
+    this.menuContainer.setAttribute("aria-hidden", "true")
+    this.menuContainer.removeAttribute("aria-modal")
+  }
+}
diff --git a/decidim-core/app/packs/src/decidim/controllers/main_menu/main_menu.test.js b/decidim-core/app/packs/src/decidim/controllers/main_menu/main_menu.test.js
new file mode 100644
index 0000000000000..39d38bd82cfbc
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/controllers/main_menu/main_menu.test.js
@@ -0,0 +1,185 @@
+/* global jest */
+import { Application } from "@hotwired/stimulus"
+import MainMenuController from "src/decidim/controllers/main_menu/controller"
+
+describe("MainMenuController", () => {
+  let application = null
+  let controller = null
+  let menuButton = null
+  let menuContainer = null
+  let closeButton = null
+
+  const buildDom = () => {
+    document.body.innerHTML = `
+      <button
+        data-controller="main-menu"
+        data-target="main-menu-container"
+        data-close-button="main-menu-close"
+        aria-expanded="false"
+      >
+        Menu
+      </button>
+      <div id="main-menu-container" aria-hidden="true">
+        <div id="main-menu-item"></div>
+      </div>
+      <button id="main-menu-close">Close</button>
+    `
+  }
+
+  const startController = () => new Promise((resolve) => {
+    setTimeout(() => {
+      controller = application.getControllerForElementAndIdentifier(menuButton, "main-menu")
+      resolve()
+    }, 0)
+  })
+
+  beforeEach(() => {
+    application = Application.start()
+    application.register("main-menu", MainMenuController)
+    buildDom()
+
+    menuButton = document.querySelector('[data-controller="main-menu"]')
+    menuContainer = document.getElementById("main-menu-container")
+    closeButton = document.getElementById("main-menu-close")
+
+    jest.spyOn(window, "scrollTo").mockImplementation(() => {})
+
+    return startController()
+  })
+
+  afterEach(() => {
+    application.stop()
+    document.body.innerHTML = ""
+    jest.useRealTimers()
+    jest.restoreAllMocks()
+  })
+
+  describe("connect", () => {
+    it("binds expected event listeners", () => {
+      const buttonSpy = jest.spyOn(menuButton, "addEventListener")
+      const documentSpy = jest.spyOn(document, "addEventListener")
+      const closeSpy = jest.spyOn(closeButton, "addEventListener")
+
+      controller.disconnect()
+      controller.connect()
+
+      expect(buttonSpy).toHaveBeenCalledWith("click", controller.handleButtonClick)
+      expect(documentSpy).toHaveBeenCalledWith("keydown", controller.handleKeydown)
+      expect(closeSpy).toHaveBeenCalledWith("click", controller.handleCloseButtonClick)
+    })
+
+    it("returns early when menu container is missing", async () => {
+      document.body.innerHTML = `
+        <button data-controller="main-menu" data-target="missing-menu"></button>
+      `
+
+      application.stop()
+      application = Application.start()
+      application.register("main-menu", MainMenuController)
+
+      const missingButton = document.querySelector('[data-controller="main-menu"]')
+      const missingController = await new Promise((resolve) => {
+        setTimeout(() => {
+          resolve(application.getControllerForElementAndIdentifier(missingButton, "main-menu"))
+        }, 0)
+      })
+
+      expect(missingController.menuContainer).toBeNull()
+      expect(() => missingController.disconnect()).not.toThrow()
+    })
+  })
+
+  describe("handleButtonClick", () => {
+    it("opens the menu after the delay and scrolls to top", () => {
+      jest.useFakeTimers()
+      document.body.style.overflow = "scroll"
+
+      controller.handleButtonClick()
+      jest.advanceTimersByTime(50)
+
+      expect(menuButton.getAttribute("aria-expanded")).toBe("true")
+      expect(menuContainer.getAttribute("aria-hidden")).toBe("false")
+      expect(document.body.style.overflow).toBe("hidden")
+      expect(window.scrollTo).toHaveBeenCalledWith({ top: 0, behavior: "smooth" })
+    })
+
+    it("does nothing when menu is already open", () => {
+      jest.useFakeTimers()
+      controller.openMenu()
+
+      controller.handleButtonClick()
+      jest.advanceTimersByTime(50)
+
+      expect(window.scrollTo).not.toHaveBeenCalled()
+      expect(menuContainer.getAttribute("aria-hidden")).toBe("false")
+    })
+  })
+
+  describe("handleKeydown", () => {
+    it("closes the menu on Escape", () => {
+      document.body.style.overflow = "scroll"
+      controller.openMenu()
+
+      controller.handleKeydown({ key: "Escape" })
+
+      expect(menuButton.getAttribute("aria-expanded")).toBe("false")
+      expect(menuContainer.getAttribute("aria-hidden")).toBe("true")
+      expect(document.body.style.overflow).toBe("scroll")
+    })
+
+    it("ignores non-escape keys", () => {
+      controller.openMenu()
+
+      controller.handleKeydown({ key: "Enter" })
+
+      expect(menuContainer.getAttribute("aria-hidden")).toBe("false")
+    })
+  })
+
+  describe("handleContainerClick", () => {
+    it("closes the menu when clicking the container", () => {
+      controller.openMenu()
+
+      controller.handleContainerClick({ target: menuContainer })
+
+      expect(menuContainer.getAttribute("aria-hidden")).toBe("true")
+    })
+
+    it("does not close the menu when clicking inside the container", () => {
+      const childItem = document.getElementById("main-menu-item")
+      controller.openMenu()
+
+      controller.handleContainerClick({ target: childItem })
+
+      expect(menuContainer.getAttribute("aria-hidden")).toBe("false")
+    })
+  })
+
+  describe("handleCloseButtonClick", () => {
+    it("closes the menu when open", () => {
+      controller.openMenu()
+
+      controller.handleCloseButtonClick()
+
+      expect(menuContainer.getAttribute("aria-hidden")).toBe("true")
+    })
+  })
+
+  describe("disconnect", () => {
+    it("removes listeners and closes the menu if open", () => {
+      const buttonSpy = jest.spyOn(menuButton, "removeEventListener")
+      const documentSpy = jest.spyOn(document, "removeEventListener")
+      const closeSpy = jest.spyOn(closeButton, "removeEventListener")
+
+      document.body.style.overflow = "scroll"
+      controller.openMenu()
+      controller.disconnect()
+
+      expect(buttonSpy).toHaveBeenCalledWith("click", controller.handleButtonClick)
+      expect(documentSpy).toHaveBeenCalledWith("keydown", controller.handleKeydown)
+      expect(closeSpy).toHaveBeenCalledWith("click", controller.handleCloseButtonClick)
+      expect(menuContainer.getAttribute("aria-hidden")).toBe("true")
+      expect(document.body.style.overflow).toBe("scroll")
+    })
+  })
+})
diff --git a/decidim-core/app/packs/src/decidim/controllers/sticky_header/controller.js b/decidim-core/app/packs/src/decidim/controllers/sticky_header/controller.js
deleted file mode 100644
index 98e0abb00dac0..0000000000000
--- a/decidim-core/app/packs/src/decidim/controllers/sticky_header/controller.js
+++ /dev/null
@@ -1,116 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-import { screens } from "tailwindcss/defaultTheme"
-
-export default class extends Controller {
-  connect() {
-    this.prevScroll = window.scrollY;
-
-    // Set the initial margin for the menu bar container
-    this.fixMenuBarContainerMargin();
-
-    // Attach event listeners for page load and window resize events
-    this.setupEventListeners();
-
-    // Set up the scroll event handler for sticky header behavior
-    this.setupScrollHandler();
-  }
-
-  /**
-   * Determines if the current screen size matches or is smaller than the specified breakpoint.
-   * Uses Tailwind CSS screen breakpoints for responsive behavior.
-   *
-   * @param {string} key - The Tailwind CSS screen breakpoint key (e.g., 'md', 'lg')
-   * @returns {boolean} True if the screen is at or below the specified breakpoint
-   */
-  isMaxScreenSize(key) {
-    return window.matchMedia(`(max-width: ${screens[key]})`).matches;
-  }
-
-  /**
-   * Dynamically adjusts the top margin of the menu bar container to accommodate
-   * the sticky header height. This prevents content from being hidden behind
-   * the fixed sticky header.
-   *
-   * The margin is only applied on mobile devices (screens smaller than 'md' breakpoint)
-   * to ensure proper spacing when multiple header elements are present, such as
-   * omnipresent banner, admin bar, and offline banner.
-   * @returns {void}
-   */
-  fixMenuBarContainerMargin() {
-    // Locate the menu bar container element
-    const menuBarContainer = document.querySelector("#menu-bar-container");
-
-    // Calculate margin based on screen size and sticky header height
-    const marginTop = this.isMaxScreenSize("sm")
-      ? this.element.offsetHeight
-      : 0;
-
-    // Apply the calculated margin to the menu bar container
-    if (menuBarContainer) {
-      menuBarContainer.style.marginTop = `${marginTop}px`;
-    }
-  }
-
-  /**
-   * Sets up event listeners for page navigation and window resize events.
-   * Ensures the sticky header behaves correctly after page transitions
-   * and when the window is resized.
-   * @returns {void}
-   */
-  setupEventListeners() {
-    // Handle window resizes events to recalculate margins for responsive behavior
-    window.addEventListener("resize", () => {
-      this.fixMenuBarContainerMargin();
-    });
-  }
-
-  /**
-   * Sets up the scroll event handler that manages the sticky header visibility
-   * based on a scroll direction. Only initializes if the sticky header element exists.
-   * @returns {void}
-   */
-  setupScrollHandler() {
-    // Attach scroll event listener for sticky header show/hide behavior
-    document.addEventListener("scroll", () => {
-      this.handleScroll();
-    });
-  }
-
-  /**
-   * Handles scroll events to show or hide the sticky header based on scroll direction.
-   * The header is shown when scrolling up or near the top of the page,
-   * and hidden when scrolling down to maximize content visibility.
-   *
-   * Uses a scroll threshold of 5 pixels to prevent excessive toggling
-   * from minor scroll movements.
-   * @returns {void}
-   */
-  handleScroll() {
-    // Continuously adjust menu bar margin to handle dynamic content changes
-    this.fixMenuBarContainerMargin();
-
-    // Check if the main bar element is visible (has offsetParent when visible)
-    const header = document.getElementById("main-bar")?.offsetParent;
-
-    // Only proceed if header is visible and sticky header is in fixed position
-    if (header && window.getComputedStyle(this.element).position === "fixed") {
-      const currentScroll = window.scrollY;
-      const goingDown = this.prevScroll > currentScroll;
-      const change = Math.abs(this.prevScroll - currentScroll);
-
-      // Apply scroll threshold to prevent excessive header toggling
-      if (change > 5) {
-        // Show header when scrolling up or when near the top of the page
-        if (goingDown || currentScroll < this.element.offsetHeight) {
-          this.element.style.top = "0";
-        } else {
-          // Hide header when scrolling down by moving it above the viewport
-          this.element.style.top = `-${this.element.offsetHeight}px`;
-        }
-
-        // Update previous scroll position for next comparison
-        this.prevScroll = currentScroll;
-      }
-    }
-  }
-}
diff --git a/decidim-core/app/packs/src/decidim/controllers/sticky_header/sticky_header.test.js b/decidim-core/app/packs/src/decidim/controllers/sticky_header/sticky_header.test.js
deleted file mode 100644
index 1a34be107d02a..0000000000000
--- a/decidim-core/app/packs/src/decidim/controllers/sticky_header/sticky_header.test.js
+++ /dev/null
@@ -1,320 +0,0 @@
-/* eslint max-lines: ["error", 320] */
-/* global jest */
-
-import { Application } from "@hotwired/stimulus"
-import StickyHeaderController from "src/decidim/controllers/sticky_header/controller";
-
-// Mock Tailwind CSS screens
-jest.mock("tailwindcss/defaultTheme", () => ({
-  screens: {
-    md: "768px",
-    lg: "1024px",
-    xl: "1280px"
-  }
-}));
-
-describe("StickyHeader", () => {
-  let mockStickyHeaderElement = null;
-  let mockMenuBarContainer = null;
-  let mockMainBar = null;
-  let application = null;
-  let controller = null;
-
-  beforeEach(() => {
-    application = Application.start();
-    application.register("sticky-header", StickyHeaderController);
-    // Reset DOM
-    document.body.innerHTML = "";
-
-    // Create mock elements
-    mockStickyHeaderElement = document.createElement("div");
-    mockStickyHeaderElement.setAttribute("data-controller", "sticky-header");
-    mockStickyHeaderElement.style.position = "fixed";
-    Reflect.defineProperty(mockStickyHeaderElement, "offsetHeight", {
-      value: 60,
-      writable: true
-    });
-
-    mockMenuBarContainer = document.createElement("div");
-    mockMenuBarContainer.id = "menu-bar-container";
-
-    mockMainBar = document.createElement("div");
-    mockMainBar.id = "main-bar";
-    Reflect.defineProperty(mockMainBar, "offsetParent", {
-      value: mockMainBar,
-      writable: true
-    });
-
-    // Append elements to DOM
-    document.body.appendChild(mockStickyHeaderElement);
-    document.body.appendChild(mockMenuBarContainer);
-    document.body.appendChild(mockMainBar);
-
-    // Mock window properties
-    Reflect.defineProperty(window, "scrollY", {
-      value: 0,
-      writable: true
-    });
-
-    // Mock window.matchMedia
-    window.matchMedia = jest.fn().mockImplementation((query) => ({
-      matches: Boolean(query.includes("768px")),
-      media: query,
-      onchange: null,
-      addListener: jest.fn(),
-      removeListener: jest.fn(),
-      addEventListener: jest.fn(),
-      removeEventListener: jest.fn(),
-      dispatchEvent: jest.fn()
-    }));
-
-    // Mock getComputedStyle
-    window.getComputedStyle = jest.fn().mockReturnValue({
-      position: "fixed"
-    });
-
-    // Spy on event listeners
-    jest.spyOn(document, "addEventListener");
-    jest.spyOn(window, "addEventListener");
-
-    // Wait for the controller to be connected
-    return new Promise((resolve) => {
-      setTimeout(() => {
-        controller = application.getControllerForElementAndIdentifier(mockStickyHeaderElement, "sticky-header");
-        resolve();
-      }, 0);
-    });
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-    document.body.innerHTML = "";
-  });
-
-  describe("connect", () => {
-    it("should initialize with correct default values", () => {
-      window.scrollY = 100;
-
-      controller.disconnect();
-      controller.connect();
-
-      expect(controller.prevScroll).toBe(100);
-      expect(controller.element).toBe(mockStickyHeaderElement);
-    });
-
-    it("should call all setup methods", () => {
-      const fixMarginSpy = jest.spyOn(controller, "fixMenuBarContainerMargin");
-      const setupListenersSpy = jest.spyOn(controller, "setupEventListeners");
-      const setupScrollSpy = jest.spyOn(controller, "setupScrollHandler");
-
-      controller.disconnect();
-      controller.connect();
-
-      expect(fixMarginSpy).toHaveBeenCalled();
-      expect(setupListenersSpy).toHaveBeenCalled();
-      expect(setupScrollSpy).toHaveBeenCalled();
-    });
-  });
-
-  describe("isMaxScreenSize", () => {
-    it("should return true for screens at or below breakpoint", () => {
-      window.matchMedia.mockReturnValue({ matches: true });
-
-      const result = controller.isMaxScreenSize("md");
-
-      expect(result).toBe(true);
-      expect(window.matchMedia).toHaveBeenCalledWith("(max-width: 768px)");
-    });
-
-    it("should return false for screens above breakpoint", () => {
-      window.matchMedia.mockReturnValue({ matches: false });
-
-      const result = controller.isMaxScreenSize("md");
-
-      expect(result).toBe(false);
-    });
-
-    it("should handle different breakpoint keys", () => {
-      controller.isMaxScreenSize("lg");
-      expect(window.matchMedia).toHaveBeenCalledWith("(max-width: 1024px)");
-    });
-  });
-
-  describe("fixMenuBarContainerMargin", () => {
-
-    it("should set margin on mobile devices", () => {
-      window.matchMedia.mockReturnValue({ matches: true });
-
-      controller.fixMenuBarContainerMargin();
-
-      expect(mockMenuBarContainer.style.marginTop).toBe("60px");
-    });
-
-    it("should not set margin on desktop devices", () => {
-      window.matchMedia.mockReturnValue({ matches: false });
-
-      controller.fixMenuBarContainerMargin();
-
-      expect(mockMenuBarContainer.style.marginTop).toBe("0px");
-    });
-
-    it("should handle missing menu bar container", () => {
-      mockMenuBarContainer.remove();
-
-      expect(() => controller.fixMenuBarContainerMargin()).not.toThrow();
-    });
-  });
-
-  describe("setupEventListeners", () => {
-    it("should add resize event listener", () => {
-      controller.setupEventListeners();
-
-      expect(window.addEventListener).toHaveBeenCalledWith(
-        "resize",
-        expect.any(Function)
-      );
-    });
-
-    it("should call fixMenuBarContainerMargin on resize", () => {
-      const fixMarginSpy = jest.spyOn(controller, "fixMenuBarContainerMargin");
-      controller.setupEventListeners();
-
-      // Simulate resize event
-      const resizeHandler = window.addEventListener.mock.calls.find(
-        (call) => call[0] === "resize"
-      )[1];
-      resizeHandler();
-
-      expect(fixMarginSpy).toHaveBeenCalled();
-    });
-  });
-
-  describe("setupScrollHandler", () => {
-    it("should add scroll event listener when sticky header exists", () => {
-      controller.setupScrollHandler();
-
-      expect(document.addEventListener).toHaveBeenCalledWith(
-        "scroll",
-        expect.any(Function)
-      );
-    });
-
-    it("should call handleScroll on scroll event", () => {
-      const handleScrollSpy = jest.spyOn(controller, "handleScroll");
-      controller.setupScrollHandler();
-
-      // Simulate scroll event
-      const scrollHandler = document.addEventListener.mock.calls.find(
-        (call) => call[0] === "scroll"
-      )[1];
-      scrollHandler();
-
-      expect(handleScrollSpy).toHaveBeenCalled();
-    });
-  });
-
-  describe("handleScroll", () => {
-    beforeEach(() => {
-      controller.prevScroll = 0;
-    });
-
-    it("should call fixMenuBarContainerMargin", () => {
-      const fixMarginSpy = jest.spyOn(controller, "fixMenuBarContainerMargin");
-
-      controller.handleScroll();
-
-      expect(fixMarginSpy).toHaveBeenCalled();
-    });
-
-    it("should return early if main bar has no offsetParent", () => {
-      Reflect.defineProperty(mockMainBar, "offsetParent", { value: null });
-
-      controller.handleScroll();
-
-      expect(mockStickyHeaderElement.style.top).toBe("");
-    });
-
-    it("should return early if sticky header is not fixed", () => {
-      window.getComputedStyle.mockReturnValue({ position: "static" });
-
-      controller.handleScroll();
-
-      expect(mockStickyHeaderElement.style.top).toBe("");
-    });
-
-    it("should show header when scrolling up", () => {
-      window.scrollY = 50;
-      controller.prevScroll = 100;
-
-      controller.handleScroll();
-
-      expect(mockStickyHeaderElement.style.top).toBe("0px");
-      expect(controller.prevScroll).toBe(50);
-    });
-
-    it("should hide header when scrolling down", () => {
-      window.scrollY = 150;
-      controller.prevScroll = 100;
-
-      controller.handleScroll();
-
-      expect(mockStickyHeaderElement.style.top).toBe("-60px");
-      expect(controller.prevScroll).toBe(150);
-    });
-
-    it("should show header when near top of page", () => {
-      // Less than offsetHeight (60)
-      window.scrollY = 30;
-      controller.prevScroll = 100;
-
-      controller.handleScroll();
-
-      expect(mockStickyHeaderElement.style.top).toBe("0px");
-    });
-
-    it("should not change header position for small scroll changes", () => {
-      // Change of 3 pixels (less than threshold of 5)
-      window.scrollY = 103;
-      controller.prevScroll = 100;
-
-      controller.handleScroll();
-
-      expect(mockStickyHeaderElement.style.top).toBe("");
-      // Should not update
-      expect(controller.prevScroll).toBe(100);
-    });
-
-    it("should handle missing main bar element", () => {
-      mockMainBar.remove();
-
-      expect(() => controller.handleScroll()).not.toThrow();
-    });
-  });
-
-  describe("integration tests", () => {
-    it("should properly initialize and handle scroll events", () => {
-      // Simulate scrolling down
-      window.scrollY = 200;
-      controller.handleScroll();
-      expect(mockStickyHeaderElement.style.top).toBe("-60px");
-
-      // Simulate scrolling up
-      window.scrollY = 100;
-      controller.handleScroll();
-      expect(mockStickyHeaderElement.style.top).toBe("0px");
-    });
-
-    it("should handle responsive behavior correctly", () => {
-      // Mobile view
-      window.matchMedia.mockReturnValue({ matches: true });
-      controller.disconnect();
-      controller.connect();
-      expect(mockMenuBarContainer.style.marginTop).toBe("60px");
-
-      // Desktop view
-      window.matchMedia.mockReturnValue({ matches: false });
-      controller.fixMenuBarContainerMargin();
-      expect(mockMenuBarContainer.style.marginTop).toBe("0px");
-    });
-  });
-});
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 02027cac228b0..8f4fd49f81b4d 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
@@ -79,7 +79,7 @@ const updateActiveUploads = (modal) => {
     const template = `
       <div ${attachmentIdOrHiddenField} data-filename="${escapeQuotes(file.name)}" data-title="${escapeQuotes(title)}">
         ${(/image/).test(file.type) && "<div><img src=\"data:,\" role=\"presentation\" /></div>" || ""}
-        <span>${escapeHtml(title)}</span>
+        <p>${escapeHtml(title)}</p>
         ${hidden}
       </div>
     `
diff --git a/decidim-core/app/packs/src/decidim/dropdown_menu.js b/decidim-core/app/packs/src/decidim/dropdown_menu.js
deleted file mode 100644
index bb3ce7068eb82..0000000000000
--- a/decidim-core/app/packs/src/decidim/dropdown_menu.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// changes the value "menu" of role attribute set by a11y on div dropdown-menu-account and
-// dropdown-menu-account-mobile which are inappropriate for accessibility
-document.addEventListener("turbo:load", () => {
-  const dropdownDiv = document.querySelector("#dropdown-menu-account");
-  const dropdownMobileDiv = document.querySelector("#dropdown-menu-account-mobile");
-  if (dropdownDiv) {
-    setTimeout(() => {
-      dropdownDiv.setAttribute("role", "dialog")
-      dropdownMobileDiv.setAttribute("role", "dialog")
-    }, 300)
-  }
-  const triggerButtonMobile = document.querySelector("#dropdown-trigger-links-mobile");
-  if (triggerButtonMobile) {
-    triggerButtonMobile.addEventListener("click", () => {
-      dropdownMobileDiv.setAttribute("aria-modal", "true")
-    })
-  }
-});
-
-const setMenuOpacity = (opacity) => {
-  const content = document.getElementById("content");
-  const footer = document.querySelector("footer");
-  const menuBar = document.getElementById("menu-bar-container");
-
-  if (content) {
-    content.style.opacity = opacity;
-  }
-  if (footer) {
-    footer.style.opacity = opacity;
-  }
-  if (menuBar) {
-    menuBar.style.opacity = opacity;
-  }
-}
-
-const menuContainer = document.getElementById("dropdown-menu-main-desktop");
-const menuButton = document.getElementById("main-dropdown-summary-desktop");
-
-if (menuButton && menuContainer) {
-  menuButton.addEventListener("click", function () {
-    const isHidden = menuContainer.getAttribute("aria-hidden") === "true";
-    if (!isHidden) {
-      return;
-    }
-    setTimeout(() => {
-      setMenuOpacity("0.3");
-      document.body.style.overflow = "hidden";
-      menuContainer.setAttribute("aria-hidden", "false");
-      window.scrollTo({ top: 0, behavior: "smooth" });
-    }, 50);
-  });
-}
-
-if (menuContainer) {
-  document.addEventListener("keydown", function (event) {
-    if (event.key === "Escape") {
-      const isOpen = menuContainer.getAttribute("aria-hidden") === "true";
-
-      if (isOpen) {
-        menuContainer.setAttribute("aria-hidden", "true");
-        setMenuOpacity("1");
-        document.body.style.overflow = "scroll";
-      }
-    }
-  })
-
-  document.addEventListener("click", function (event) {
-    const isOpen = menuContainer.getAttribute("aria-hidden") === "false";
-    const closeMenuButton = document.getElementById("main-dropdown-summary-desktop-close");
-    const clickedInsideMenu = menuContainer.contains(event.target);
-    const clickCloseButton = closeMenuButton && closeMenuButton.contains(event.target);
-
-    if (isOpen && (!clickedInsideMenu || clickCloseButton)) {
-      menuContainer.setAttribute("aria-hidden", "true");
-      setMenuOpacity("1");
-      document.body.style.overflow = "scroll";
-    }
-  });
-}
diff --git a/decidim-core/app/packs/src/decidim/editor/common/suggestion.js b/decidim-core/app/packs/src/decidim/editor/common/suggestion.js
index 0d8aea65d160b..b3c8b3821d94d 100644
--- a/decidim-core/app/packs/src/decidim/editor/common/suggestion.js
+++ b/decidim-core/app/packs/src/decidim/editor/common/suggestion.js
@@ -183,7 +183,7 @@ export const createSuggestionRenderer = (node, { itemConverter } = {}) => () =>
 export const createNodeView = (self) => {
   return ({ node }) => {
     const dom = document.createElement("span");
-    dom.textContent = self.options.renderLabel({ options: self.options, node });
+    dom.textContent = self.options.renderText({ options: self.options, node });
 
     const { id, label } = node.attrs;
     dom.dataset.suggestion = node.type.name;
diff --git a/decidim-core/app/packs/src/decidim/editor/extensions/decidim_kit/index.js b/decidim-core/app/packs/src/decidim/editor/extensions/decidim_kit/index.js
index 04228ee11bbef..a640c51c65ecf 100644
--- a/decidim-core/app/packs/src/decidim/editor/extensions/decidim_kit/index.js
+++ b/decidim-core/app/packs/src/decidim/editor/extensions/decidim_kit/index.js
@@ -43,7 +43,10 @@ export default Extension.create({
         heading: false,
         bold: false,
         orderedList: false,
-        codeBlock: false
+        codeBlock: false,
+        link: false,
+        underline: false,
+        trailingNode: false
       }),
       CharacterCount.configure(this.options.characterCount),
       Link.configure({ openOnClick: false, ...this.options.link }),
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..69f0ed0b882bd 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
@@ -172,13 +172,16 @@ export default Image.extend({
             return true;
           },
 
-          handleDoubleClick() {
-            if (!editor.isActive("image")) {
-              return false;
+          handleDoubleClick(view, pos) {
+            const { state } = view;
+            const node = state.doc.nodeAt(pos);
+
+            if (node && node.type.name === "image") {
+              editor.chain().focus().imageDialog().run();
+              return true;
             }
 
-            editor.chain().focus().imageDialog().run();
-            return true;
+            return false;
           },
 
           handleDOMEvents: {
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..964ae9b17823c 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
@@ -33,6 +33,14 @@ export default Link.extend({
     }
   },
 
+  renderHTML({ HTMLAttributes }) {
+    const attrs = { ...HTMLAttributes };
+    if (attrs.target === "") {
+      Reflect.deleteProperty(attrs, "target");
+    }
+    return ["a", attrs, 0];
+  },
+
   addCommands() {
     const i18n = getDictionary("editor.extensions.link");
 
diff --git a/decidim-core/app/packs/src/decidim/editor/extensions/mention/index.js b/decidim-core/app/packs/src/decidim/editor/extensions/mention/index.js
index 103abf955e051..1d6f503b28fb4 100644
--- a/decidim-core/app/packs/src/decidim/editor/extensions/mention/index.js
+++ b/decidim-core/app/packs/src/decidim/editor/extensions/mention/index.js
@@ -32,11 +32,10 @@ export default Mention.extend({
 
     return {
       ...parentOptions,
-      renderLabel({ node }) {
-        // The labels are formed based on the nicknames returned by the API
-        // which already contain the suggestion character, so there is no need
-        // to display it twice.
-        return `${node.attrs.label ?? node.attrs.id}`
+      renderText({ node }) {
+        // renderText is used to create the DOM representation
+        const label = node.attrs.label ?? node.attrs.id;
+        return label;
       },
       suggestion: {
         ...parentOptions?.suggestion,
@@ -59,6 +58,20 @@ export default Mention.extend({
     };
   },
 
+  renderHTML({ node }) {
+    // renderHTML is used for visual rendering getHTML()
+    const label = node.attrs.label ?? node.attrs.id;
+    return [
+      "span",
+      {
+        "data-type": "mention",
+        "data-id": node.attrs.id,
+        "data-label": node.attrs.label
+      },
+      label
+    ];
+  },
+
   addNodeView() {
     return createNodeView(this);
   }
diff --git a/decidim-core/app/packs/src/decidim/editor/extensions/mention_resource/index.js b/decidim-core/app/packs/src/decidim/editor/extensions/mention_resource/index.js
index 0fe40a6b35377..4df8d17d24f58 100644
--- a/decidim-core/app/packs/src/decidim/editor/extensions/mention_resource/index.js
+++ b/decidim-core/app/packs/src/decidim/editor/extensions/mention_resource/index.js
@@ -27,18 +27,14 @@ const searchResources = async (queryText) => {
 
 export default Mention.extend({
   name: "mentionResource",
-
   addOptions() {
     const options = this.parent?.();
     const suggestion = options?.suggestion;
-
     return {
       ...options,
-      renderLabel({ node }) {
-        // The labels are formed based on the titles returned by the API
-        // which already contain the suggestion character, so there is no need
-        // to display it twice.
-        return `${node.attrs.label ?? node.attrs.id}`
+      renderText({ node }) {
+        // renderText is used to create the DOM representation
+        return node.attrs.label ?? node.attrs.id;
       },
       suggestion: {
         ...suggestion,
@@ -63,6 +59,19 @@ export default Mention.extend({
     };
   },
 
+  renderHTML({ node }) {
+    // renderHTML is used for visual rendering getHTML()
+    return [
+      "span",
+      {
+        "data-type": "mentionResource",
+        "data-id": node.attrs.id,
+        "data-label": node.attrs.label
+      },
+      node.attrs.label ?? node.attrs.id
+    ];
+  },
+
   addNodeView() {
     return createNodeView(this);
   }
diff --git a/decidim-core/app/packs/src/decidim/editor/test/extensions/decidim_kit.test.js b/decidim-core/app/packs/src/decidim/editor/test/extensions/decidim_kit.test.js
index 1e5d8350c53d5..b5516e2ac6856 100644
--- a/decidim-core/app/packs/src/decidim/editor/test/extensions/decidim_kit.test.js
+++ b/decidim-core/app/packs/src/decidim/editor/test/extensions/decidim_kit.test.js
@@ -32,15 +32,24 @@ describe("DecidimKit", () => {
         "code",
         "doc",
         "dropCursor",
-        "gapCursor",
         "hardBreak",
-        "history",
+        "paragraph",
+        "link",
+        "decidimKit",
+        "starterKit",
         "horizontalRule",
         "italic",
         "listItem",
-        "paragraph",
         "strike",
-        "text"
+        "text",
+        "characterCount",
+        "bold",
+        "dialog",
+        "indent",
+        "orderedList",
+        "codeBlock",
+        "underline",
+        "heading"
       ].forEach((name) => expect(extensions).toContain(name));
     });
 
diff --git a/decidim-core/app/packs/src/decidim/editor/test/extensions/heading.test.js b/decidim-core/app/packs/src/decidim/editor/test/extensions/heading.test.js
index 89dd4a7a99562..807ee4c8ad3d6 100644
--- a/decidim-core/app/packs/src/decidim/editor/test/extensions/heading.test.js
+++ b/decidim-core/app/packs/src/decidim/editor/test/extensions/heading.test.js
@@ -51,6 +51,6 @@ describe("Heading", () => {
     editorElement.focus();
     await updateContent(editorElement, "# ");
 
-    expect(editor.getHTML()).toMatchHtml("<h2></h2>");
+    expect(editor.getHTML()).toMatchHtml("<p># </p>");
   });
 });
diff --git a/decidim-core/app/packs/src/decidim/editor/test/extensions/image.test.js b/decidim-core/app/packs/src/decidim/editor/test/extensions/image.test.js
index d2248318a4396..260b6393c98e2 100644
--- a/decidim-core/app/packs/src/decidim/editor/test/extensions/image.test.js
+++ b/decidim-core/app/packs/src/decidim/editor/test/extensions/image.test.js
@@ -28,24 +28,7 @@ describe("Image", () => {
   let uploadFilePath = "/path/to/image.jpg";
   let uploadDialogElement = null;
   let editorInnerHTML = (dim, src, alt) => {
-    return `
-    <div data-image-resizer="" class="ProseMirror-selectednode" draggable="true">
-      <div data-image-resizer-wrapper="">
-        <button type="button" data-image-resizer-control="top-left"></button>
-        <button type="button" data-image-resizer-control="top-right"></button>
-        <button type="button" data-image-resizer-control="bottom-left"></button>
-        <button type="button" data-image-resizer-control="bottom-right"></button>
-        <div data-image-resizer-dimensions="">
-          <span data-image-resizer-dimension="width" data-image-resizer-dimension-value="${dim}"></span>
-          ×
-          <span data-image-resizer-dimension="height" data-image-resizer-dimension-value="${dim}"></span>
-        </div>
-        <div class="editor-content-image" data-image="">
-          <img src="${src}" alt="${alt}">
-        </div>
-      </div>
-    </div>
-  `
+    return `<div data-image-resizer="" class="ProseMirror-selectednode" draggable="true"><div data-image-resizer-wrapper=""><button type="button" data-image-resizer-control="top-left"></button><button type="button" data-image-resizer-control="top-right"></button><button type="button" data-image-resizer-control="bottom-left"></button><button type="button" data-image-resizer-control="bottom-right"></button><div data-image-resizer-dimensions=""><span data-image-resizer-dimension="width" data-image-resizer-dimension-value="${dim}"></span>×<span data-image-resizer-dimension="height" data-image-resizer-dimension-value="${dim}"></span></div><div class="editor-content-image" data-image=""><img src="${src}" alt="${alt}"></div></div></div>`;
   }
 
   const updateFile = async (path, alt) => {
@@ -63,6 +46,10 @@ describe("Image", () => {
     await sleep(0);
   }
 
+  const normalizeHTML = (html) => {
+    return html.replace(/<p><br class="ProseMirror-trailingBreak"><\/p>/g, "").replace(/<p><\/p>/g, "");
+  };
+
   beforeEach(() => {
     document.body.innerHTML = "";
 
@@ -109,7 +96,8 @@ describe("Image", () => {
   it("editing setting the image through the dialog", async () => {
     editorElement.focus();
     await updateContent(editorElement,
-      '<div class="editor-content-image" data-image=""><img src="/path/to/image.jpg" alt="Test text"></div>'
+      '<div class="editor-content-image" data-image=""><img src="/path/to/image.jpg" alt="Test text"></div>',
+      editor
     );
 
     editor.commands.imageDialog();
@@ -117,7 +105,7 @@ describe("Image", () => {
     await updateFile("/path/to/image_updated.jpg", "Updated text")
     expect(editorElement.classList.contains("dialog-open")).toBe(false);
 
-    expect(editorElement.innerHTML).toMatchHtml(editorInnerHTML("null", "/path/to/image_updated.jpg", "Updated text"));
+    expect(normalizeHTML(editorElement.innerHTML)).toMatchHtml(editorInnerHTML("null", "/path/to/image_updated.jpg", "Updated text"));
     expect(editor.getHTML()).toMatchHtml(`
       <div class="editor-content-image" data-image=""><img src="/path/to/image_updated.jpg" alt="Updated text"></div>
     `);
@@ -126,16 +114,26 @@ describe("Image", () => {
   it("allows double clicking the image", async () => {
     editorElement.focus();
     await updateContent(editorElement,
-      '<div class="editor-content-image" data-image=""><img src="/path/to/image.jpg" alt="Test text"></div>'
+      '<div class="editor-content-image" data-image=""><img src="/path/to/image.jpg" alt="Test text"></div>',
+      editor
     );
 
     jest.spyOn(uploadDialogElement.dialog, "open");
 
     // Position calculations do not work with JSDom / Jest
-    editor.view.posAtCoords = jest.fn().mockReturnValue({ pos: 1, inside: -1 });
-    editorElement.dispatchEvent(new MouseEvent("mousedown", { button: 0, clientX: 10, clientY: 10 }));
-    editorElement.dispatchEvent(new MouseEvent("mousedown", { button: 0, clientX: 10, clientY: 10 }));
-    await updateFile("/path/to/image_updated.jpg", "Updated text")
+    editor.view.posAtCoords = jest.fn().mockReturnValue({ pos: 0, inside: 0 });
+
+    const mockEvent = new MouseEvent("dblclick", {
+      button: 0,
+      clientX: 10,
+      clientY: 10
+    });
+
+    editor.view.someProp("handleDoubleClick", (click) => click(editor.view, 0, mockEvent));
+
+    await sleep(0);
+
+    await updateFile("/path/to/image_updated.jpg", "Updated text");
 
     expect(uploadDialogElement.dialog.open).toHaveBeenCalled();
     expect(editor.getHTML()).toMatchHtml(`
@@ -283,9 +281,9 @@ describe("Image", () => {
       });
 
       editorElement.focus();
-      await updateContent(editorElement,
-        '<div class="editor-content-image" data-image=""><img src="/path/to/image.jpg" alt="Test text"></div>'
-      );
+
+      editor.commands.setImage({ src: "/path/to/image.jpg", alt: "Test text" });
+      await sleep(0);
     });
     describe("with mouse", () => behavesLikeImageResizer("mouse"));
 
diff --git a/decidim-core/app/packs/src/decidim/editor/test/extensions/mention.test.js b/decidim-core/app/packs/src/decidim/editor/test/extensions/mention.test.js
index fa9199179d60b..5b8b645dd0b67 100644
--- a/decidim-core/app/packs/src/decidim/editor/test/extensions/mention.test.js
+++ b/decidim-core/app/packs/src/decidim/editor/test/extensions/mention.test.js
@@ -64,6 +64,10 @@ describe("Mention", () => {
   let editor = null;
   let editorElement = null;
 
+  const normalizeHTML = (html) => {
+    return html.replace(/\s*data-mention-suggestion-char="[^"]*"/g, "");
+  };
+
   beforeEach(() => {
     document.body.innerHTML = "";
 
@@ -108,7 +112,7 @@ describe("Mention", () => {
     expect(editorElement.innerHTML).toEqual(
       '<p><span data-suggestion="mention" data-id="@johndoe" data-label="@johndoe (John Doe)">@johndoe (John Doe)</span> </p>'
     );
-    expect(editor.getHTML()).toEqual(
+    expect(normalizeHTML(editor.getHTML())).toEqual(
       '<p><span data-type="mention" data-id="@johndoe" data-label="@johndoe (John Doe)">@johndoe (John Doe)</span> </p>'
     );
   });
@@ -122,7 +126,7 @@ describe("Mention", () => {
     expect(editorElement.innerHTML).toEqual(
       '<p><span data-suggestion="mention" data-id="@johndoe" data-label="@johndoe (John Doe)">@johndoe (John Doe)</span> </p>'
     );
-    expect(editor.getHTML()).toEqual(
+    expect(normalizeHTML(editor.getHTML())).toEqual(
       '<p><span data-type="mention" data-id="@johndoe" data-label="@johndoe (John Doe)">@johndoe (John Doe)</span> </p>'
     );
   });
diff --git a/decidim-core/app/packs/src/decidim/editor/test/extensions/video_embed.test.js b/decidim-core/app/packs/src/decidim/editor/test/extensions/video_embed.test.js
index cf2ca9a98341e..af2f3e3e4cc82 100644
--- a/decidim-core/app/packs/src/decidim/editor/test/extensions/video_embed.test.js
+++ b/decidim-core/app/packs/src/decidim/editor/test/extensions/video_embed.test.js
@@ -9,6 +9,10 @@ describe("VideoEmbed", () => {
   let editor = null;
   let editorElement = null;
 
+  const normalizeHTML = (html) => {
+    return html.replace(/<p><br class="ProseMirror-trailingBreak"><\/p>/g, "").replace(/<p><\/p>/g, "");
+  };
+
   beforeEach(() => {
     document.body.innerHTML = "";
 
@@ -35,7 +39,7 @@ describe("VideoEmbed", () => {
         </div>
       </div>
     `);
-    expect(editor.getHTML()).toMatchHtml(`
+    expect(normalizeHTML(editor.getHTML())).toMatchHtml(`
       <div class="editor-content-videoEmbed" data-video-embed="https://www.youtube.com/watch?v=f6JMgJAQ2tc">
         <div>
           <iframe src="https://www.youtube-nocookie.com/embed/f6JMgJAQ2tc?cc_load_policy=1&amp;modestbranding=1" title="Decidim" frameborder="0" allowfullscreen="true"></iframe>
@@ -52,21 +56,21 @@ describe("VideoEmbed", () => {
           <iframe src="https://www.youtube-nocookie.com/embed/f6JMgJAQ2tc?cc_load_policy=1&amp;modestbranding=1" title="Decidim" frameborder="0" allowfullscreen="true"></iframe>
         </div>
       </div>
-    `);
+    `, editor);
 
     editor.commands.setVideo({
       src: "https://www.youtube.com/watch?v=zhMMW0TENNA",
       title: "Free Open-Source"
     });
 
-    expect(editorElement.innerHTML).toMatchHtml(`
+    expect(normalizeHTML(editorElement.innerHTML)).toMatchHtml(`
       <div class="editor-content-videoEmbed ProseMirror-selectednode" data-video-embed="https://www.youtube.com/watch?v=zhMMW0TENNA" draggable="true">
         <div>
           <iframe src="https://www.youtube-nocookie.com/embed/zhMMW0TENNA?cc_load_policy=1&amp;modestbranding=1" title="Free Open-Source" frameborder="0" allowfullscreen="true"></iframe>
         </div>
       </div>
     `);
-    expect(editor.getHTML()).toMatchHtml(`
+    expect(normalizeHTML(editor.getHTML())).toMatchHtml(`
       <div class="editor-content-videoEmbed" data-video-embed="https://www.youtube.com/watch?v=zhMMW0TENNA">
         <div>
           <iframe src="https://www.youtube-nocookie.com/embed/zhMMW0TENNA?cc_load_policy=1&amp;modestbranding=1" title="Free Open-Source" frameborder="0" allowfullscreen="true"></iframe>
@@ -83,7 +87,7 @@ describe("VideoEmbed", () => {
           <iframe src="https://www.youtube-nocookie.com/embed/f6JMgJAQ2tc?cc_load_policy=1&amp;modestbranding=1" title="Decidim" frameborder="0" allowfullscreen="true"></iframe>
         </div>
       </div>
-    `);
+    `, editor);
 
     editor.commands.videoEmbedDialog();
     expect(editorElement.classList.contains("dialog-open")).toBe(true);
@@ -94,7 +98,7 @@ describe("VideoEmbed", () => {
     dialog.querySelector("[data-dialog-actions] button[data-action='save']").click();
     await sleep(50);
 
-    expect(editor.getHTML()).toMatchHtml(`
+    expect(normalizeHTML(editor.getHTML())).toMatchHtml(`
       <div class="editor-content-videoEmbed" data-video-embed="https://www.youtube.com/watch?v=f6JMgJAQ2tc">
         <div>
           <iframe src="https://www.youtube-nocookie.com/embed/f6JMgJAQ2tc?cc_load_policy=1&amp;modestbranding=1" title="Decidim" frameborder="0" allowfullscreen="true"></iframe>
@@ -113,7 +117,7 @@ describe("VideoEmbed", () => {
     dialog.querySelector("[data-dialog-actions] button[data-action='save']").click();
     await sleep(50);
 
-    expect(editor.getHTML()).toMatchHtml(`
+    expect(normalizeHTML(editor.getHTML())).toMatchHtml(`
       <div class="editor-content-videoEmbed" data-video-embed="https://www.youtube.com/watch?v=zhMMW0TENNA">
         <div>
           <iframe src="https://www.youtube-nocookie.com/embed/zhMMW0TENNA?cc_load_policy=1&amp;modestbranding=1" title="Free Open-Source" frameborder="0" allowfullscreen="true"></iframe>
@@ -125,7 +129,7 @@ describe("VideoEmbed", () => {
   it("allows pasting a YouTube video", async () => {
     await pasteContent(editorElement, "https://www.youtube.com/watch?v=f6JMgJAQ2tc");
 
-    expect(editor.getHTML()).toMatchHtml(`
+    expect(normalizeHTML(editor.getHTML())).toMatchHtml(`
       <div class="editor-content-videoEmbed" data-video-embed="https://www.youtube.com/watch?v=f6JMgJAQ2tc">
         <div>
           <iframe src="https://www.youtube-nocookie.com/embed/f6JMgJAQ2tc?cc_load_policy=1&amp;modestbranding=1" title="" frameborder="0" allowfullscreen="true"></iframe>
@@ -137,7 +141,7 @@ describe("VideoEmbed", () => {
   it("allows pasting a Vimeo video", async () => {
     await pasteContent(editorElement, "https://vimeo.com/312909656");
 
-    expect(editor.getHTML()).toMatchHtml(`
+    expect(normalizeHTML(editor.getHTML())).toMatchHtml(`
       <div class="editor-content-videoEmbed" data-video-embed="https://vimeo.com/312909656">
         <div>
           <iframe src="https://player.vimeo.com/video/312909656" title="" frameborder="0" allowfullscreen="true"></iframe>
@@ -154,13 +158,21 @@ describe("VideoEmbed", () => {
           <iframe src="https://www.youtube-nocookie.com/embed/f6JMgJAQ2tc?cc_load_policy=1&amp;modestbranding=1" title="Decidim" frameborder="0" allowfullscreen="true"></iframe>
         </div>
       </div>
-    `);
+    `, editor);
+
+    // Position calculations do not work with JSDom / Jest.
+    editor.view.posAtCoords = jest.fn().mockReturnValue({ pos: 0, inside: 0 });
+
+    // Manually trigger the handleDoubleClick handler directly.
+    const mockEvent = new MouseEvent("dblclick", {
+      bubbles: true,
+      cancelable: true,
+      clientX: 10,
+      clientY: 10
+    });
 
-    // Position calculations do not work with JSDom / Jest
-    editor.view.posAtCoords = jest.fn().mockReturnValue({ pos: 1, inside: -1 });
+    editor.view.someProp("handleDoubleClick", (click) => click(editor.view, 0, mockEvent));
 
-    editorElement.dispatchEvent(new MouseEvent("mousedown", { clientX: 10, clientY: 10 }));
-    editorElement.dispatchEvent(new MouseEvent("mousedown", { clientX: 10, clientY: 10 }));
     await sleep(0);
 
     expect(editorElement.classList.contains("dialog-open")).toBe(true);
@@ -172,7 +184,7 @@ describe("VideoEmbed", () => {
     dialog.querySelector("[data-dialog-actions] button[data-action='save']").click();
     await sleep(50);
 
-    expect(editor.getHTML()).toMatchHtml(`
+    expect(normalizeHTML(editor.getHTML())).toMatchHtml(`
       <div class="editor-content-videoEmbed" data-video-embed="https://www.youtube.com/watch?v=zhMMW0TENNA">
         <div>
           <iframe src="https://www.youtube-nocookie.com/embed/zhMMW0TENNA?cc_load_policy=1&amp;modestbranding=1" title="Decidim" frameborder="0" allowfullscreen="true"></iframe>
diff --git a/decidim-core/app/packs/src/decidim/editor/test/helpers.js b/decidim-core/app/packs/src/decidim/editor/test/helpers.js
index 6adb94b227f7a..4644c076b7dd7 100644
--- a/decidim-core/app/packs/src/decidim/editor/test/helpers.js
+++ b/decidim-core/app/packs/src/decidim/editor/test/helpers.js
@@ -76,16 +76,14 @@ Object.assign(Range.prototype, {
 
 export const sleep = async (time) => new Promise((resolve) => setTimeout(resolve, time));
 
-export const updateContent = async (editable, content) => {
-  // ProseMirror listens has a mutation observer which listens to the changes on
-  // the contenteditable element. This forces us to manually change the
-  // `innerHTML` of the element to cause a change event to be triggered for the
-  // editor.
-  editable.innerHTML = content;
-
-  // We need to wait for the mutation observer to complete its logic. It has a
-  // timeout of 20 milliseconds by default which is the minimum amount we need
-  // to wait.
+export const updateContent = async (editable, content, editor) => {
+  if (editor) {
+    // Allows the proper use of TipTap's setContent method
+    editor.commands.setContent(content);
+  } else {
+    // Fallback for cases where editor is not available
+    editable.innerHTML = content;
+  }
   await sleep(50);
 };
 
diff --git a/decidim-core/app/packs/src/decidim/editor/test/toolbar/full.test.js b/decidim-core/app/packs/src/decidim/editor/test/toolbar/full.test.js
index 72da4bf9a5848..1279edb157461 100644
--- a/decidim-core/app/packs/src/decidim/editor/test/toolbar/full.test.js
+++ b/decidim-core/app/packs/src/decidim/editor/test/toolbar/full.test.js
@@ -53,6 +53,12 @@ describe("full toolbar", () => {
     });
 
     describe("videoEmbed", () => {
+
+      const normalizeHTML = (html) => {
+        return html.replace(/\s*data-mention-suggestion-char="[^"]*"/g, "").
+          replace(/<p><br class="ProseMirror-trailingBreak"><\/p>/g, "");
+      };
+
       it("creates a new video embed with the provided details at the end of the selection", async () => {
         await setContent("Hello, world!");
         prosemirror.focus();
@@ -69,7 +75,7 @@ describe("full toolbar", () => {
         // handled
         await sleep(0);
 
-        expect(prosemirror.innerHTML).toMatchHtml(
+        expect(normalizeHTML(prosemirror.innerHTML)).toMatchHtml(
           `
             <p>Hello, world!</p>
             <div class="editor-content-videoEmbed ProseMirror-selectednode" data-video-embed="https://www.youtube.com/watch?v=f6JMgJAQ2tc" draggable="true">
@@ -112,7 +118,7 @@ describe("full toolbar", () => {
         // handled
         await sleep(0);
 
-        expect(prosemirror.innerHTML).toMatchHtml(
+        expect(normalizeHTML(prosemirror.innerHTML)).toMatchHtml(
           `
             <p>Hello, world!</p>
             <div class="editor-content-videoEmbed ProseMirror-selectednode" data-video-embed="https://www.youtube.com/watch?v=zhMMW0TENNA" draggable="true">
@@ -148,6 +154,11 @@ describe("full toolbar", () => {
         window.Decidim.currentDialogs[dialog] = dialogEl.dialog;
       }
 
+      const normalizeHTML = (html) => {
+        return html.replace(/\s*data-mention-suggestion-char="[^"]*"/g, "").
+          replace(/<p><br class="ProseMirror-trailingBreak"><\/p>/g, "");
+      };
+
       beforeEach(() => {
         const csrf = document.createElement("meta");
         csrf.setAttribute("name", "csrf-token")
@@ -174,7 +185,7 @@ describe("full toolbar", () => {
 
         await sleep(0);
 
-        expect(prosemirror.innerHTML).toMatchHtml(
+        expect(normalizeHTML(prosemirror.innerHTML)).toMatchHtml(
           `
             <p>Hello, world!</p>
             <div data-image-resizer="" class="ProseMirror-selectednode" draggable="true">
@@ -218,7 +229,7 @@ describe("full toolbar", () => {
 
         await sleep(0);
 
-        expect(prosemirror.innerHTML).toMatchHtml(
+        expect(normalizeHTML(prosemirror.innerHTML)).toMatchHtml(
           `
             <p>Hello, world!</p>
             <div data-image-resizer="" class="ProseMirror-selectednode" draggable="true">
diff --git a/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_block.js b/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_block.js
index 0a3f008cfa871..1459da54ea38a 100644
--- a/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_block.js
+++ b/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_block.js
@@ -5,13 +5,17 @@ import contextHelpers from "src/decidim/editor/test/toolbar/shared/context";
 export default (ctx) => {
   const { getControl, setContent } = contextHelpers(ctx);
 
+  const normalizeHTML = (html) => {
+    return html.replace(/<p><br class="ProseMirror-trailingBreak"><\/p>$/g, "").trim();
+  };
+
   describe("codeBlock", () => {
     it("creates a new code block", async () => {
       await setContent("Hello, world!");
       selectContent(ctx.prosemirror);
       getControl("codeBlock").click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual("<pre><code>Hello, world!</code></pre>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<pre><code>Hello, world!</code></pre>");
     });
 
     it("makes existing code block content as normal text", async () => {
@@ -20,7 +24,7 @@ export default (ctx) => {
       selectContent(ctx.prosemirror, "pre code");
       getControl("codeBlock").click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual("<p>Hello, world!</p>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p>Hello, world!</p>");
     });
   });
 
@@ -30,7 +34,7 @@ export default (ctx) => {
       selectContent(ctx.prosemirror);
       getControl("blockquote").click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual("<blockquote><p>Hello, world!</p></blockquote>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<blockquote><p>Hello, world!</p></blockquote>");
     });
 
     it("makes existing blockquote content as normal text", async () => {
@@ -39,7 +43,7 @@ export default (ctx) => {
       selectContent(ctx.prosemirror, "blockquote p");
       getControl("blockquote").click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual("<p>Hello, world!</p>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p>Hello, world!</p>");
     });
   });
 };
diff --git a/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_formatting.js b/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_formatting.js
index f0356e0298a2a..4a53714e62644 100644
--- a/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_formatting.js
+++ b/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_formatting.js
@@ -3,6 +3,10 @@ import contextHelpers from "src/decidim/editor/test/toolbar/shared/context";
 export default (ctx) => {
   const { getControl, setContent } = contextHelpers(ctx);
 
+  const normalizeHTML = (html) => {
+    return html.replace(/<p><br class="ProseMirror-trailingBreak"><\/p>$/g, "").trim();
+  };
+
   describe("hardBreak", () => {
     it("creates a new line break at the cursor position", async () => {
       await setContent("Hello, world!");
@@ -11,7 +15,7 @@ export default (ctx) => {
 
       // Note that the "tailingBreak" is only ProseMirror's internal element
       // to place the cursor at the correct location.
-      expect(ctx.prosemirror.innerHTML).toEqual('<p>Hello, world!<br><br class="ProseMirror-trailingBreak"></p>');
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual('<p>Hello, world!<br><br class="ProseMirror-trailingBreak"></p>');
     });
   });
 };
diff --git a/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_indent.js b/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_indent.js
index 45399a48334a4..e2ffbcb84cf20 100644
--- a/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_indent.js
+++ b/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_indent.js
@@ -5,6 +5,10 @@ import contextHelpers from "src/decidim/editor/test/toolbar/shared/context";
 export default (ctx) => {
   const { getControl, setContent } = contextHelpers(ctx);
 
+  const normalizeHTML = (html) => {
+    return html.replace(/<p><br class="ProseMirror-trailingBreak"><\/p>$/g, "").trim();
+  };
+
   describe("indent:indent", () => {
     it("indents the existing content", async () => {
       await setContent("Hello, world!");
@@ -13,7 +17,7 @@ export default (ctx) => {
       ctrl.click();
       ctrl.click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual('<p class="editor-indent-2">Hello, world!</p>');
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual('<p class="editor-indent-2">Hello, world!</p>');
     });
 
     it("indents a list item correctly", async () => {
@@ -21,7 +25,7 @@ export default (ctx) => {
       selectContent(ctx.prosemirror, "ul li:nth-child(2) p");
       getControl("indent:indent").click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual(
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual(
         "<ul><li><p>First item</p><ul><li><p>Second item</p></li></ul></li></ul>"
       );
     });
@@ -35,7 +39,7 @@ export default (ctx) => {
       ctrl.click();
       ctrl.click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual("<p>Hello, world!</p>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p>Hello, world!</p>");
     });
 
     it("outdents a list item correctly", async () => {
@@ -43,7 +47,7 @@ export default (ctx) => {
       selectContent(ctx.prosemirror, "ul li ul li p");
       getControl("indent:outdent").click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual(
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual(
         "<ul><li><p>First item</p></li><li><p>Second item</p></li></ul>"
       );
     });
@@ -53,7 +57,7 @@ export default (ctx) => {
       selectContent(ctx.prosemirror, "ul li:nth-child(2) p");
       getControl("indent:outdent").click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual(
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual(
         "<ul><li><p>First item</p></li><li><p>Second item</p></li></ul>"
       );
     });
diff --git a/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_link.js b/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_link.js
index 018e067f8be0b..124089b8fefec 100644
--- a/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_link.js
+++ b/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_link.js
@@ -5,6 +5,10 @@ import contextHelpers from "src/decidim/editor/test/toolbar/shared/context";
 export default (ctx) => {
   const { getControl, setContent } = contextHelpers(ctx);
 
+  const normalizeHTML = (html) => {
+    return html.replace(/<p><br class="ProseMirror-trailingBreak"><\/p>$/g, "").trim();
+  };
+
   describe("link", () => {
     it("creates a link for the selected text", async () => {
       await setContent("Hello, world!");
@@ -25,7 +29,7 @@ export default (ctx) => {
       // handled
       await sleep(0);
 
-      expect(ctx.prosemirror.innerHTML).toEqual(
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual(
         '<p>Hello, <a href="https://decidim.org" target="_blank">world</a>!</p>'
       );
     });
diff --git a/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_list.js b/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_list.js
index 40c1076c59309..3e18b3a762194 100644
--- a/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_list.js
+++ b/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_list.js
@@ -5,13 +5,17 @@ import contextHelpers from "src/decidim/editor/test/toolbar/shared/context";
 export default (ctx) => {
   const { getControl, setContent } = contextHelpers(ctx);
 
+  const normalizeHTML = (html) => {
+    return html.replace(/<p><br class="ProseMirror-trailingBreak"><\/p>$/g, "").trim();
+  };
+
   describe("orderedList", () => {
     it("creates a new ordered list", async () => {
       await setContent("Hello, world!");
       ctx.prosemirror.focus();
       getControl("orderedList").click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual("<ol><li><p>Hello, world!</p></li></ol>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<ol><li><p>Hello, world!</p></li></ol>");
     });
 
     it("makes existing ordered list as normal text", async () => {
@@ -21,7 +25,7 @@ export default (ctx) => {
       selectContent(ctx.prosemirror, "ol li p");
       getControl("orderedList").click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual("<p>Hello, world!</p>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p>Hello, world!</p>");
     });
   });
 
@@ -31,7 +35,7 @@ export default (ctx) => {
       ctx.prosemirror.focus();
       getControl("bulletList").click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual("<ul><li><p>Hello, world!</p></li></ul>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<ul><li><p>Hello, world!</p></li></ul>");
     });
 
     it("makes existing bullet list as normal text", async () => {
@@ -41,7 +45,7 @@ export default (ctx) => {
       selectContent(ctx.prosemirror, "ul li p");
       getControl("bulletList").click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual("<p>Hello, world!</p>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p>Hello, world!</p>");
     });
   });
 };
diff --git a/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_styling.js b/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_styling.js
index 4b3e3e3215b84..0cd5f69112424 100644
--- a/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_styling.js
+++ b/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_styling.js
@@ -5,13 +5,17 @@ import contextHelpers from "src/decidim/editor/test/toolbar/shared/context";
 export default (ctx) => {
   const { getControl, setContent } = contextHelpers(ctx);
 
+  const normalizeHTML = (html) => {
+    return html.replace(/<p><br class="ProseMirror-trailingBreak"><\/p>$/g, "").trim();
+  };
+
   describe("bold", () => {
     it("makes text bold", async () => {
       await setContent("Hello, world!");
       selectContent(ctx.prosemirror);
       getControl("bold").click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual("<p><strong>Hello, world!</strong></p>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p><strong>Hello, world!</strong></p>");
     });
 
     it("makes already bolded text normal", async () => {
@@ -20,7 +24,7 @@ export default (ctx) => {
       selectContent(ctx.prosemirror, "p strong");
       getControl("bold").click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual("<p>Hello, world!</p>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p>Hello, world!</p>");
     });
   });
 
@@ -30,7 +34,7 @@ export default (ctx) => {
       selectContent(ctx.prosemirror);
       getControl("italic").click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual("<p><em>Hello, world!</em></p>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p><em>Hello, world!</em></p>");
     });
 
     it("makes already italic text normal", async () => {
@@ -39,7 +43,7 @@ export default (ctx) => {
       selectContent(ctx.prosemirror, "p em");
       getControl("italic").click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual("<p>Hello, world!</p>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p>Hello, world!</p>");
     });
   });
 
@@ -49,7 +53,7 @@ export default (ctx) => {
       selectContent(ctx.prosemirror);
       getControl("underline").click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual("<p><u>Hello, world!</u></p>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p><u>Hello, world!</u></p>");
     });
 
     it("makes already underlined text normal", async () => {
@@ -58,7 +62,7 @@ export default (ctx) => {
       selectContent(ctx.prosemirror, "p u");
       getControl("underline").click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual("<p>Hello, world!</p>");
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p>Hello, world!</p>");
     });
   });
 
@@ -71,7 +75,7 @@ export default (ctx) => {
 
       getControl("common:eraseStyles").click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual("<p>Hello, world!</p>")
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p>Hello, world!</p>")
     });
 
     it("makes ordered list content as normal text", async () => {
@@ -80,7 +84,7 @@ export default (ctx) => {
 
       getControl("common:eraseStyles").click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual("<p>Hello, world!</p>")
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p>Hello, world!</p>")
     });
 
     it("makes bullet list content as normal text", async () => {
@@ -89,7 +93,7 @@ export default (ctx) => {
 
       getControl("common:eraseStyles").click();
 
-      expect(ctx.prosemirror.innerHTML).toEqual("<p>Hello, world!</p>")
+      expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p>Hello, world!</p>")
     });
   });
 };
diff --git a/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_content_styling.js b/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_content_styling.js
index 93b676fb1b92e..2f3828dde464e 100644
--- a/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_content_styling.js
+++ b/decidim-core/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_content_styling.js
@@ -5,6 +5,10 @@ import contextHelpers from "src/decidim/editor/test/toolbar/shared/context";
 export default (ctx) => {
   const { getControl, setContent } = contextHelpers(ctx);
 
+  const normalizeHTML = (html) => {
+    return html.replace(/<p><br class="ProseMirror-trailingBreak"><\/p>$/g, "").trim();
+  };
+
   describe("heading", () => {
     const levels = ["2", "3", "4", "5", "6"];
     let selectValue = (value) => {
@@ -21,7 +25,7 @@ export default (ctx) => {
         selectValue(level);
 
         const tag = `h${level}`;
-        expect(ctx.prosemirror.innerHTML).toEqual(`<${tag}>Hello, world!</${tag}>`);
+        expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual(`<${tag}>Hello, world!</${tag}>`);
       });
     });
 
@@ -33,7 +37,7 @@ export default (ctx) => {
 
         selectValue("normal");
 
-        expect(ctx.prosemirror.innerHTML).toEqual("<p>Hello, world!</p>");
+        expect(normalizeHTML(ctx.prosemirror.innerHTML)).toEqual("<p>Hello, world!</p>");
       });
     });
   });
diff --git a/decidim-core/app/packs/src/decidim/identity_selector_dialog.js b/decidim-core/app/packs/src/decidim/identity_selector_dialog.js
deleted file mode 100644
index e0c35291de937..0000000000000
--- a/decidim-core/app/packs/src/decidim/identity_selector_dialog.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Send a request to select which identity want to use
- * NOTE: this should not be done using javascript
- *
- * @param {HTMLElement} node target node
- * @returns {void}
- */
-export default function(node = document) {
-  node.addEventListener("click", ({ target: element }) => {
-    const { method } = element.dataset
-
-    let attr = "destroy_url";
-
-    if (method === "POST") {
-      attr = "create_url";
-    }
-
-    const { [attr]: url } = element.dataset
-    Rails.ajax({
-      url: url,
-      type: method,
-      success: function() {
-        if (method === "POST") {
-          element.classList.add("is-selected")
-          element.dataset.method = "DELETE"
-        } else {
-          element.classList.remove("is-selected")
-          element.dataset.method = "POST"
-        }
-      }
-    })
-  })
-}
diff --git a/decidim-core/app/packs/src/decidim/index.js b/decidim-core/app/packs/src/decidim/index.js
index 249e15daed5b3..92c5fc8962af2 100644
--- a/decidim-core/app/packs/src/decidim/index.js
+++ b/decidim-core/app/packs/src/decidim/index.js
@@ -36,7 +36,6 @@ 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"
 
 // local deps that require initialization
diff --git a/decidim-core/app/packs/stylesheets/decidim/_dropdown.scss b/decidim-core/app/packs/stylesheets/decidim/_dropdown.scss
index 604983164afd0..79f94b80aaa8c 100644
--- a/decidim-core/app/packs/stylesheets/decidim/_dropdown.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/_dropdown.scss
@@ -66,42 +66,6 @@
   @apply md:hidden;
 }
 
-[data-target="dropdown-menu-language-chooser"] {
-  & > span {
-    @apply block font-semibold text-black text-xs;
-  }
-
-  > svg {
-    @apply w-5 h-6 flex-none text-xs font-normal text-black fill-current;
-  }
-
-  & > ul {
-    @apply w-6 bg-gray;
-
-    > li {
-      @apply w-6 bg-gray;
-    }
-  }
-}
-
-[data-target="dropdown-menu-language-chooser-mobile"] {
-  & > span {
-    @apply block text-black font-normal text-sm;
-  }
-
-  > svg {
-    @apply w-fit h-6 flex-none text-xs font-normal text-black fill-current px-2;
-  }
-
-  & > ul {
-    @apply w-6 bg-gray;
-
-    > li {
-      @apply w-6 bg-gray;
-    }
-  }
-}
-
 .dropdown {
   @apply absolute border-2 border-gray-3 rounded-md min-w-max p-1 drop-shadow-md text-left z-10 after:content-[''] after:absolute after:left-0 after:top-0 after:w-full after:h-full after:bg-white;
 
diff --git a/decidim-core/app/packs/stylesheets/decidim/_footer.scss b/decidim-core/app/packs/stylesheets/decidim/_footer.scss
index 6fcf8478c0e4c..2544d21ebfd23 100644
--- a/decidim-core/app/packs/stylesheets/decidim/_footer.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/_footer.scss
@@ -14,42 +14,6 @@ footer {
     &__down {
       @apply border-t border-black flex flex-wrap items-center gap-6 container py-6 text-white;
     }
-
-    &__language {
-      @apply absolute top-full left-0 bg-white rounded w-full;
-
-      &-container {
-        @apply relative;
-      }
-
-      &-trigger {
-        @apply flex items-center gap-1 border border-white rounded py-1.5 px-2 cursor-pointer text-md font-semibold;
-      }
-    }
-
-    /* overwrite default dropdown styles */
-    [data-target*="dropdown"] {
-      > svg {
-        @apply w-4 h-4 text-white fill-current last-of-type:block last-of-type:ml-auto;
-      }
-
-      &[aria-expanded="true"] > svg:first-of-type {
-        @apply block;
-      }
-
-      > span {
-        @apply block text-white;
-      }
-    }
-
-    /* overwrite default dropdown styles */
-    [id*="dropdown-menu"] {
-      @apply py-0 mx-0 w-full;
-
-      &[aria-hidden="true"] {
-        @apply md:hidden;
-      }
-    }
   }
 
   .mini-footer {
diff --git a/decidim-core/app/packs/stylesheets/decidim/_forms.scss b/decidim-core/app/packs/stylesheets/decidim/_forms.scss
index 701746de9f606..2763f412c23c7 100644
--- a/decidim-core/app/packs/stylesheets/decidim/_forms.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/_forms.scss
@@ -1,11 +1,15 @@
 #form-search-mobile {
-  @apply py-1.5 px-4 bg-gray-5 rounded-lg border border-gray outline outline-1 outline-transparent;
+  @apply py-1.5 px-4 pr-8 bg-gray-5 rounded-lg border border-gray outline outline-1 outline-transparent;
 
   input[type="text"] {
     @apply bg-gray-5;
   }
 }
 
+#input-search-page {
+  @apply w-full px-4 pr-8;
+}
+
 .form-defaults {
   /* text-like inputs */
   input[type="date"],
diff --git a/decidim-core/app/packs/stylesheets/decidim/_header.scss b/decidim-core/app/packs/stylesheets/decidim/_header.scss
index e37d30f6e0d56..8ba8cecf918e5 100644
--- a/decidim-core/app/packs/stylesheets/decidim/_header.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/_header.scss
@@ -28,14 +28,10 @@ header {
     #flash-messages-container {
       @apply mt-40 md:mt-0;
     }
-
-    #menu-bar-container {
-      @apply mt-[140px] md:mt-0;
-    }
   }
 
-  #sticky-header-container {
-    @apply fixed w-full top-0 z-40 bg-white md:relative transition-top duration-300;
+  #header-container {
+    @apply w-full z-40 bg-white;
   }
 
   .main-bar {
@@ -69,11 +65,11 @@ header {
       @apply hidden md:block col-span-2 col-start-5 xl:col-start-4;
 
       form {
-        @apply block relative rounded text-md border border-neutral-200 outline outline-1 outline-transparent rounded bg-background-2 leading-relaxed;
+        @apply block relative rounded text-md border border-neutral-200 outline outline-1 outline-transparent rounded bg-background-2 leading-none;
       }
 
       input[type="text"] {
-        @apply block bg-transparent w-full px-4 py-2 h-full;
+        @apply block bg-transparent w-full pl-4 pr-10 py-2 h-full;
 
         &::placeholder {
           @apply text-neutral-500 text-sm ltr:pl-0 rtl:pr-0;
@@ -103,7 +99,7 @@ header {
 
     &__links-desktop,
     > *:last-child:not(.main-bar__back-button) {
-      @apply col-span-1 md:col-start-8 lg:col-start-8 lg:col-span-5 justify-self-end;
+      @apply col-span-1 lg:col-start-8 lg:col-start-8 lg:col-span-5 justify-self-end;
     }
 
     &__links-desktop {
@@ -125,12 +121,18 @@ header {
         }
       }
 
+      .card__highlight-img {
+        svg {
+          @apply w-full h-full;
+        }
+      }
+
       &__dropdown {
-        @apply flex items-end absolute top-0 right-0 z-30 h-screen;
+        @apply flex items-end absolute top-0 right-0 bg-[rgba(0,0,0,0.25)] transition duration-300 z-30 h-screen cursor-auto;
 
         .menu-bar {
           &__main-dropdown {
-            @apply hidden lg:flex flex-col h-full md:p-8;
+            @apply hidden sm:flex flex-col h-full sm:p-8;
 
             &__left {
               @apply w-full;
@@ -141,7 +143,7 @@ header {
             @apply w-full;
 
             li {
-              @apply py-3 md:py-3.5 border-b border-t-0 last:border-0 border-gray-3 #{!important};
+              @apply py-3 sm:py-3.5 border-b border-t-0 last:border-0 border-gray-3 #{!important};
 
               a {
                 @apply no-underline;
@@ -188,7 +190,7 @@ header {
       }
 
       svg + span {
-        @apply text-md leading-[22px] first-letter:uppercase font-semibold;
+        @apply text-md leading-[22px] first-letter:uppercase font-semibold whitespace-nowrap;
       }
     }
 
@@ -313,16 +315,16 @@ header {
 
     /* overwrite default dropdown styles */
     [id*="dropdown-menu"] {
-      @apply py-0 mx-0 w-full lg:w-fit;
+      @apply py-0 mx-0 w-full;
 
       &[aria-hidden="true"] {
-        @apply md:hidden;
+        @apply sm:hidden;
       }
     }
   }
 
   .menu-bar {
-    @apply container h-full flex justify-between items-center lg:relative last-of-type:[&>svg]:hidden;
+    @apply container h-full flex justify-between items-center sm:relative last-of-type:[&>svg]:hidden;
 
     &__container {
       @apply bg-white relative h-14 flex justify-between;
@@ -348,7 +350,7 @@ header {
       }
 
       &__dropdown-wrapper {
-        @apply flex items-center cursor-pointer underline focus:backdrop-brightness-75 focus:outline-none;
+        @apply flex items-center cursor-pointer underline;
       }
 
       &__dropdown-content {
@@ -459,87 +461,11 @@ header {
       }
     }
 
-    &__language-chooser {
-      @apply absolute top-full left-0 rounded w-full bg-gray-5;
-
-      &-desktop {
-        @apply border-r border-gray-6 pr-10;
-
-        &.focus-mode {
-          @apply border-none pr-0;
-        }
-      }
-
-      &-desktop,
-      &-mobile {
-        & button {
-          @apply border border-neutral-300 rounded px-4 py-2 gap-x-2;
-
-          & > span,
-          & > svg:first-of-type {
-            @apply text-neutral-500;
-
-            display: block !important;
-          }
-
-          & > span.mobile-holder {
-            @apply items-center gap-x-1;
-
-            display: flex !important;
-          }
-
-          & > span {
-            @apply text-sm font-normal;
-          }
-
-          & > svg:last-of-type {
-            @apply text-gray-2  ml-1;
-
-            display: block !important;
-          }
-        }
-
-        #dropdown-menu-language-chooser {
-          @apply absolute top-full bg-white shadow-[1px_4px_8px_3px_rgba(0,0,0,0.15)] p-2;
-
-          ul {
-            @apply flex flex-col space-y-2;
-
-            li:hover {
-              @apply rounded;
-            }
-
-            .is-active {
-              @apply bg-neutral-200 rounded;
-
-              &:hover {
-                @apply bg-[var(--secondary)];
-              }
-            }
-          }
-        }
-
-        #dropdown-menu-language-chooser-mobile {
-          @apply overflow-scroll h-[50vh];
-
-          ul {
-            .is-active {
-              @apply bg-neutral-200 rounded;
-
-              &:hover {
-                @apply bg-[var(--secondary)];
-              }
-            }
-          }
-        }
-      }
-    }
-
     &__dropdown-menu {
-      @apply w-full md:w-1/4 px-4 md:px-0 pt-0 pb-3 md:py-3 divide-y divide-gray-3 text-[var(--secondary)];
+      @apply w-full sm:w-1/4 px-4 sm:px-0 pt-0 pb-3 sm:py-3 divide-y divide-gray-3 text-[var(--secondary)];
 
       > * {
-        @apply py-3 md:py-3.5 md:px-2;
+        @apply py-3 sm:py-3.5 sm:px-2;
       }
 
       a {
@@ -564,10 +490,10 @@ header {
     }
 
     &__main-dropdown {
-      @apply bg-white flex flex-row rounded-b shadow-lg text-black w-full lg:w-[530px] h-screen md:h-auto;
+      @apply bg-white flex flex-row rounded-b shadow-lg text-black w-full lg:w-[530px] h-screen lg:h-auto;
 
       &__left {
-        @apply p-4 md:py-8 md:px-0 space-y-5 hidden md:block md:w-3/4;
+        @apply p-4 sm:py-8 sm:px-0 space-y-5 hidden sm:block sm:w-3/4;
 
         &-top {
           @apply border-b-4 border-gray-3 pb-3;
@@ -578,14 +504,14 @@ header {
         @apply w-full px-4;
 
         &-menu {
-          @apply w-full md:w-[100%] mt-0 grid md:grid-cols-2 gap-x-6 text-secondary;
+          @apply w-full lg:w-[100%] mt-0 grid lg:grid-cols-2 gap-x-6 text-secondary;
 
           > * {
-            @apply py-3 md:py-3.5 border-b last:border-0 border-gray-3;
+            @apply py-3 lg:py-3.5 border-b last:border-0 border-gray-3;
 
             /* since the grid has 2 columns, remove the border for these last 2 columns */
             &:nth-last-child(-n + 2) {
-              @apply md:border-0;
+              @apply lg:border-0;
             }
           }
 
@@ -604,7 +530,7 @@ header {
       }
 
       &__bottom {
-        @apply hidden md:flex;
+        @apply hidden lg:flex;
 
         &-right {
           @apply mr-2 mb-2;
@@ -629,7 +555,11 @@ header {
         @apply flex-col ring-transparent rounded-lg shadow-[1px_4px_8px_3px_rgba(0,0,0,0.15)];
 
         &-img {
-          @apply w-full aspect-[3/1] rounded-tl-lg rounded-tr-lg;
+          @apply w-full aspect-[21/9] rounded-none rounded-tl-lg rounded-tr-lg;
+
+          svg {
+            @apply fill-primary;
+          }
         }
 
         &-text {
diff --git a/decidim-core/app/packs/stylesheets/decidim/_language_chooser.scss b/decidim-core/app/packs/stylesheets/decidim/_language_chooser.scss
new file mode 100644
index 0000000000000..59046ec48ae5f
--- /dev/null
+++ b/decidim-core/app/packs/stylesheets/decidim/_language_chooser.scss
@@ -0,0 +1,79 @@
+header {
+  .main-bar {
+    &__language-chooser {
+      &-desktop {
+        @apply hidden md:block;
+      }
+
+      > div[id*="dropdown-menu"] {
+        @apply bg-white shadow-[1px_4px_8px_3px_rgba(0,0,0,0.15)] overflow-auto max-h-[50vh] p-2 sm:w-fit z-[100];
+      }
+
+      &.focus-mode {
+        @apply border-none pr-0;
+      }
+
+      &-trigger {
+        @apply inline-flex border border-neutral-300 rounded px-4 py-[9px] gap-x-2 flex-row;
+
+        &[id*="dropdown-menu"] {
+          @apply py-[9px];
+        }
+
+        & > span,
+        & > svg:first-of-type {
+          @apply text-neutral-500;
+        }
+
+        & > svg:last-of-type,
+        & > svg:first-of-type {
+          @apply block;
+        }
+
+        & > svg:last-of-type {
+          @apply text-gray-2 ml-1;
+        }
+
+        svg + span {
+          @apply text-sm font-normal;
+        }
+      }
+
+      &-holder {
+        @apply items-center gap-x-1 flex;
+      }
+
+      &-list {
+        @apply flex flex-col space-y-2;
+      }
+
+      &-item {
+        @apply text-black text-left text-md hover:bg-secondary hover:text-white;
+
+        &:hover {
+          @apply rounded;
+        }
+
+        &-active {
+          @apply bg-neutral-200 rounded;
+
+          &:hover {
+            @apply bg-[var(--secondary)];
+          }
+        }
+      }
+
+      & > div {
+        @apply absolute;
+      }
+    }
+  }
+
+  .menu-bar__language-chooser-mobile {
+    .main-bar__language-chooser {
+      & > div[id*="dropdown-menu"] {
+        @apply w-full relative;
+      }
+    }
+  }
+}
diff --git a/decidim-core/app/packs/stylesheets/decidim/_modal_update.scss b/decidim-core/app/packs/stylesheets/decidim/_modal_update.scss
index e60887cb602dd..4fdb0c7779d99 100644
--- a/decidim-core/app/packs/stylesheets/decidim/_modal_update.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/_modal_update.scss
@@ -127,7 +127,7 @@
         @apply w-full rounded bg-background flex items-center justify-center py-4 [&_img]:object-cover [&_img]:h-[200px];
       }
 
-      span {
+      p {
         @apply text-sm text-gray-2 mx-auto w-full break-all mb-2;
       }
     }
diff --git a/decidim-core/app/packs/stylesheets/decidim/application.scss b/decidim-core/app/packs/stylesheets/decidim/application.scss
index 7a85caabde943..bb71da580380e 100644
--- a/decidim-core/app/packs/stylesheets/decidim/application.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/application.scss
@@ -9,6 +9,7 @@
 // On the other hand, the following styles match with specific routes
 @use "stylesheets/decidim/header";
 @use "stylesheets/decidim/footer";
+@use "stylesheets/decidim/language_chooser";
 @use "stylesheets/decidim/login";
 @use "stylesheets/decidim/pages";
 @use "stylesheets/decidim/notifications";
diff --git a/decidim-core/app/presenters/decidim/admin_log/participatory_space/member_presenter.rb b/decidim-core/app/presenters/decidim/admin_log/participatory_space/member_presenter.rb
new file mode 100644
index 0000000000000..a86d0687fcbdc
--- /dev/null
+++ b/decidim-core/app/presenters/decidim/admin_log/participatory_space/member_presenter.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    module ParticipatorySpace
+      # This class holds the logic to present a `Decidim::ParticipatorySpace::MemberPresenter`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    MemberPresenter.new(action_log, view_helpers).present
+      class MemberPresenter < Decidim::Log::BasePresenter
+        private
+
+        def diff_fields_mapping
+          {
+            name: :string,
+            email: :string
+          }
+        end
+
+        def action_string
+          case action
+          when "create", "create_via_csv", "delete"
+            "decidim.admin_log.member.#{action}"
+          else
+            super
+          end
+        end
+
+        def i18n_labels_scope
+          "activemodel.attributes.member"
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/app/presenters/decidim/admin_log/participatory_space_private_user_presenter.rb b/decidim-core/app/presenters/decidim/admin_log/participatory_space_private_user_presenter.rb
deleted file mode 100644
index 27787e840f560..0000000000000
--- a/decidim-core/app/presenters/decidim/admin_log/participatory_space_private_user_presenter.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module AdminLog
-    # This class holds the logic to present a `Decidim::ParticipatorySpacePrivateUserPresenter`
-    # for the `AdminLog` log.
-    #
-    # Usage should be automatic and you should not need to call this class
-    # directly, but here is an example:
-    #
-    #    action_log = Decidim::ActionLog.last
-    #    view_helpers # => this comes from the views
-    #    ParticipatorySpacePrivateUserPresenter.new(action_log, view_helpers).present
-    class ParticipatorySpacePrivateUserPresenter < Decidim::Log::BasePresenter
-      private
-
-      def diff_fields_mapping
-        {
-          name: :string,
-          email: :string
-        }
-      end
-
-      def action_string
-        case action
-        when "create", "create_via_csv", "delete"
-          "decidim.admin_log.participatory_space_private_user.#{action}"
-        else
-          super
-        end
-      end
-
-      def i18n_labels_scope
-        "activemodel.attributes.participatory_space_private_user"
-      end
-    end
-  end
-end
diff --git a/decidim-core/app/presenters/decidim/breadcrumb_root_menu_item_presenter.rb b/decidim-core/app/presenters/decidim/breadcrumb_root_menu_item_presenter.rb
index e7e9e49cbbd39..94748cb2ffee1 100644
--- a/decidim-core/app/presenters/decidim/breadcrumb_root_menu_item_presenter.rb
+++ b/decidim-core/app/presenters/decidim/breadcrumb_root_menu_item_presenter.rb
@@ -9,14 +9,14 @@ class BreadcrumbRootMenuItemPresenter < MenuItemPresenter
 
     def render
       content_tag :li, class: link_wrapper_classes do
-        output = [arrow_link(label, url, link_options)]
+        output = [root_link(label, url, link_options)]
         output.push(@view.send(:simple_menu, **@menu_item.submenu).render) if @menu_item.submenu
 
         safe_join(output)
       end
     end
 
-    def arrow_link(text, url, args = {})
+    def root_link(text, url, args = {})
       link_to url, class: args.with_indifferent_access[:class] do
         "<span>#{text}</span>".html_safe
       end
diff --git a/decidim-core/app/presenters/decidim/log/user_presenter.rb b/decidim-core/app/presenters/decidim/log/user_presenter.rb
index 969d620b2dac2..9804a3c58e711 100644
--- a/decidim-core/app/presenters/decidim/log/user_presenter.rb
+++ b/decidim-core/app/presenters/decidim/log/user_presenter.rb
@@ -10,6 +10,7 @@ module Log
     # overwrite `BasePresenter#user_presenter` to return your custom user presenter.
     # The only requirement for custom renderers is that they should respond to `present`.
     class UserPresenter
+      include Decidim::SanitizeHelper
       # Public: Initializes the presenter.
       #
       # user - An instance of Decidim::User
@@ -60,7 +61,7 @@ def present_user
       #
       # Returns an HTML-safe String.
       def present_user_name
-        extra["name"].html_safe
+        decidim_sanitize_translated(extra["name"]).html_safe
       end
 
       # Private: Presents the nickname of the user performing the action.
diff --git a/decidim-core/app/presenters/decidim/organization_presenter.rb b/decidim-core/app/presenters/decidim/organization_presenter.rb
index 1b542a8afdb70..7ad70c9e25d77 100644
--- a/decidim-core/app/presenters/decidim/organization_presenter.rb
+++ b/decidim-core/app/presenters/decidim/organization_presenter.rb
@@ -7,6 +7,10 @@ def html_name
       translated_attribute(name).html_safe
     end
 
+    def html_short_name
+      translated_attribute(short_name).html_safe
+    end
+
     def translated_description
       ActionView::Base.full_sanitizer.sanitize(translated_attribute(description)).html_safe
     end
diff --git a/decidim-core/app/presenters/decidim/participatory_space/member_presenter.rb b/decidim-core/app/presenters/decidim/participatory_space/member_presenter.rb
new file mode 100644
index 0000000000000..c36faa25b1a81
--- /dev/null
+++ b/decidim-core/app/presenters/decidim/participatory_space/member_presenter.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatorySpace
+    #
+    # Decorator for participatory space members
+    #
+    class MemberPresenter < SimpleDelegator
+      delegate :profile_url, to: :user, allow_nil: true
+
+      def name
+        user ? user.name : full_name
+      end
+
+      def nickname
+        user.nickname if user
+      end
+
+      def avatar_url(variant = nil)
+        return user.avatar_url(variant) if user.present?
+
+        non_user_avatar_path(variant)
+      end
+
+      def non_user_avatar_path(variant = nil)
+        return non_user_avatar.default_url(variant) unless non_user_avatar.attached?
+
+        non_user_avatar.path(variant:)
+      end
+
+      def non_user_avatar
+        attached_uploader(:non_user_avatar)
+      end
+
+      def deleted?
+        false
+      end
+
+      private
+
+      def user
+        @user ||= if (user = __getobj__.user.presence)
+                    Decidim::UserPresenter.new(user)
+                  end
+      end
+    end
+  end
+end
diff --git a/decidim-core/app/presenters/decidim/participatory_space_private_user_presenter.rb b/decidim-core/app/presenters/decidim/participatory_space_private_user_presenter.rb
deleted file mode 100644
index ab086c9095f29..0000000000000
--- a/decidim-core/app/presenters/decidim/participatory_space_private_user_presenter.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  #
-  # Decorator for assembly members
-  #
-  class ParticipatorySpacePrivateUserPresenter < SimpleDelegator
-    delegate :profile_url, to: :user, allow_nil: true
-
-    def name
-      user ? user.name : full_name
-    end
-
-    def nickname
-      user.nickname if user
-    end
-
-    def avatar_url(variant = nil)
-      return user.avatar_url(variant) if user.present?
-
-      non_user_avatar_path(variant)
-    end
-
-    def non_user_avatar_path(variant = nil)
-      return non_user_avatar.default_url(variant) unless non_user_avatar.attached?
-
-      non_user_avatar.path(variant:)
-    end
-
-    def non_user_avatar
-      attached_uploader(:non_user_avatar)
-    end
-
-    def deleted?
-      false
-    end
-
-    private
-
-    def user
-      @user ||= if (user = __getobj__.user.presence)
-                  Decidim::UserPresenter.new(user)
-                end
-    end
-  end
-end
diff --git a/decidim-core/app/presenters/decidim/user_presenter.rb b/decidim-core/app/presenters/decidim/user_presenter.rb
index 14286dd10dc5d..bb49475bfa40f 100644
--- a/decidim-core/app/presenters/decidim/user_presenter.rb
+++ b/decidim-core/app/presenters/decidim/user_presenter.rb
@@ -6,7 +6,12 @@ module Decidim
   #
   class UserPresenter < SimpleDelegator
     include ActionView::Helpers::UrlHelper
-    include Decidim::TranslatableAttributes
+    include Decidim::SanitizeHelper
+
+    # name sanitized
+    def name
+      decidim_sanitize_translated(__getobj__.name)
+    end
 
     #
     # nickname presented in a twitter-like style
diff --git a/decidim-core/app/queries/decidim/last_activity.rb b/decidim-core/app/queries/decidim/last_activity.rb
index b54d2bf7f30e8..5025ad8a2d0db 100644
--- a/decidim-core/app/queries/decidim/last_activity.rb
+++ b/decidim-core/app/queries/decidim/last_activity.rb
@@ -79,7 +79,7 @@ def filter_spaces(query)
       Decidim.participatory_space_manifests.map do |manifest|
         klass = manifest.model_class_name.constantize
 
-        condition = if klass.include?(Decidim::HasPrivateUsers)
+        condition = if klass.include?(Decidim::ParticipatorySpace::HasMembers)
                       Arel.sql(
                         <<~SQL.squish
                           (
diff --git a/decidim-core/app/serializers/decidim/exporters/participatory_space_serializer.rb b/decidim-core/app/serializers/decidim/exporters/participatory_space_serializer.rb
index 6e02322533747..a74a9c6764cef 100644
--- a/decidim-core/app/serializers/decidim/exporters/participatory_space_serializer.rb
+++ b/decidim-core/app/serializers/decidim/exporters/participatory_space_serializer.rb
@@ -28,7 +28,7 @@ def serialize
           short_description: resource.short_description,
           description: resource.description,
           promoted: resource.promoted,
-          component_settings: component_settings
+          component_settings:
         }
       end
 
diff --git a/decidim-core/app/uploaders/decidim/organization_favicon_uploader.rb b/decidim-core/app/uploaders/decidim/organization_favicon_uploader.rb
index 7778bb3f4cb27..68f62e9326957 100644
--- a/decidim-core/app/uploaders/decidim/organization_favicon_uploader.rb
+++ b/decidim-core/app/uploaders/decidim/organization_favicon_uploader.rb
@@ -7,7 +7,8 @@ class OrganizationFaviconUploader < ImageUploader
       huge: 512,
       big: 192,
       medium: 180,
-      small: 32
+      small: 32,
+      favicon: 256
     }.freeze
 
     set_variants do
@@ -16,17 +17,11 @@ class OrganizationFaviconUploader < ImageUploader
           resize_and_pad: [value, value],
           format: :png
         }
-      end.merge(
-        favicon: {
-          resize_and_pad: [256, 256],
-          define: "icon:auto-resize=16,24,32,48,64,72,96,128,256",
-          format: :ico
-        }
-      )
+      end
     end
 
     def extension_allowlist
-      %w(png jpg jpeg webp ico)
+      %w(png jpg jpeg webp)
     end
   end
 end
diff --git a/decidim-core/app/validators/uploader_image_dimensions_validator.rb b/decidim-core/app/validators/uploader_image_dimensions_validator.rb
index bfd26fab16349..9a9af8d49ddaa 100644
--- a/decidim-core/app/validators/uploader_image_dimensions_validator.rb
+++ b/decidim-core/app/validators/uploader_image_dimensions_validator.rb
@@ -3,7 +3,7 @@
 # This validator checks when the files to be uploaded are images and the attached uploader's
 # has enabled dimensions validation that the image dimensions are below the
 # limit defined by the uploader
-require "mini_magick"
+require "vips"
 
 class UploaderImageDimensionsValidator < ActiveModel::Validations::FileContentTypeValidator
   def validate_each(record, attribute, value)
@@ -32,14 +32,12 @@ def validate_image_size(record, attribute, file, uploader)
     # avoid reckless users that upload images with too many pixels.
     #
     # See https://hackerone.com/reports/390
-    record.errors.add attribute, I18n.t("decidim.errors.files.file_resolution_too_large") if image.dimensions.any? { |dimension| dimension > uploader.max_image_height_or_width }
-  rescue MiniMagick::Error
+    max_dimension = [image.width, image.height].max
+    record.errors.add attribute, I18n.t("decidim.errors.files.file_resolution_too_large") if max_dimension > uploader.max_image_height_or_width
+  rescue Vips::Error
     # The error may happen because of many reasons but most commonly the image
-    # exceeds the default maximum dimensions set for ImageMagick when the
-    # `identify` command fails to identify the image.
-    #
-    # To relax ImageMagick default limits, please refer to:
-    # https://imagemagick.org/script/security-policy.php
+    # exceeds the default maximum dimensions set for libvips when the image
+    # fails to load.
     #
     # Note that the error can also happen because of other reasons than only
     # the image dimensions being too large. But as we do not really know the
@@ -51,11 +49,11 @@ def extract_image(file)
     return unless file.try(:content_type).to_s.start_with?("image")
 
     if uploaded_file?(file)
-      MiniMagick::Image.new(file.path, File.extname(file.original_filename))
+      Vips::Image.new_from_file(file.path)
     elsif file.is_a?(ActiveStorage::Attached) && file.blob.persisted?
-      MiniMagick::Image.read(file.blob.download, File.extname(file.blob.filename.to_s))
+      Vips::Image.new_from_buffer(file.blob.download, "")
     end
-  rescue ActiveStorage::FileNotFoundError, MiniMagick::Invalid
+  rescue ActiveStorage::FileNotFoundError, Vips::Error
     # Although the blob is persisted, the file is not available to download and analyze
     # after committing the record
     nil
diff --git a/decidim-core/app/views/decidim/manifests/show.json.erb b/decidim-core/app/views/decidim/manifests/show.json.erb
index 2c3b6d412af13..7b3ed0e32981b 100644
--- a/decidim-core/app/views/decidim/manifests/show.json.erb
+++ b/decidim-core/app/views/decidim/manifests/show.json.erb
@@ -1,5 +1,6 @@
 {
   "name": "<%= organization_params.html_name %>",
+  "short_name": "<%= organization_params.html_short_name %>",
   "lang": "<%= organization_params.default_locale %>",
   "description": "<%= organization_params.translated_description %>",
   "display": "<%= organization_params.pwa_display %>",
diff --git a/decidim-core/app/views/decidim/participatory_space/members/_member.html.erb b/decidim-core/app/views/decidim/participatory_space/members/_member.html.erb
new file mode 100644
index 0000000000000..8cd1bdbf22597
--- /dev/null
+++ b/decidim-core/app/views/decidim/participatory_space/members/_member.html.erb
@@ -0,0 +1 @@
+<%= cell "decidim/member", Decidim::ParticipatorySpace::MemberPresenter.new(member) %>
diff --git a/decidim-core/app/views/decidim/participatory_space_private_users/_participatory_space_private_user.html.erb b/decidim-core/app/views/decidim/participatory_space_private_users/_participatory_space_private_user.html.erb
deleted file mode 100644
index 69f415e14ccb2..0000000000000
--- a/decidim-core/app/views/decidim/participatory_space_private_users/_participatory_space_private_user.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= cell "decidim/participatory_space_private_user", Decidim::ParticipatorySpacePrivateUserPresenter.new(participatory_space_private_user) %>
diff --git a/decidim-core/app/views/devise/mailer/invite_private_user.html.erb b/decidim-core/app/views/devise/mailer/invite_member.html.erb
similarity index 81%
rename from decidim-core/app/views/devise/mailer/invite_private_user.html.erb
rename to decidim-core/app/views/devise/mailer/invite_member.html.erb
index 3694d05a6827d..382aebadde83d 100644
--- a/decidim-core/app/views/devise/mailer/invite_private_user.html.erb
+++ b/decidim-core/app/views/devise/mailer/invite_member.html.erb
@@ -2,9 +2,9 @@
 
 <p class="email-instructions">
   <% if @resource.invited_by.present? %>
-    <%= t("devise.mailer.invitation_instructions.invited_you_as_private_user", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
+    <%= t("devise.mailer.invitation_instructions.invited_you_as_member", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
   <% else %>
-    <%= t("devise.mailer.invitation_instructions.someone_invited_you_as_private_user", application: organization_name(@resource.organization)) %>
+    <%= t("devise.mailer.invitation_instructions.someone_invited_you_as_member", application: organization_name(@resource.organization)) %>
   <% end %>
 </p>
 
diff --git a/decidim-core/app/views/devise/mailer/invite_private_user.text.erb b/decidim-core/app/views/devise/mailer/invite_member.text.erb
similarity index 68%
rename from decidim-core/app/views/devise/mailer/invite_private_user.text.erb
rename to decidim-core/app/views/devise/mailer/invite_member.text.erb
index 8f572859214a1..aeab6dba9d470 100644
--- a/decidim-core/app/views/devise/mailer/invite_private_user.text.erb
+++ b/decidim-core/app/views/devise/mailer/invite_member.text.erb
@@ -1,9 +1,9 @@
 <%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %>
 
 <% if @resource.invited_by.present? %>
-<%= t("devise.mailer.invitation_instructions.invited_you_as_private_user", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
+<%= t("devise.mailer.invitation_instructions.invited_you_as_member", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
 <% else %>
-<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_private_user", application: organization_name(@resource.organization)) %>
+<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_member", application: organization_name(@resource.organization)) %>
 <% end %>
 
 <%= accept_invitation_url(@resource, invitation_token: @token, host: @resource.organization.host) %>
diff --git a/decidim-core/app/views/layouts/decidim/_wrapper.html.erb b/decidim-core/app/views/layouts/decidim/_wrapper.html.erb
index 067a78c7d2c30..ffc18cf5b6fae 100644
--- a/decidim-core/app/views/layouts/decidim/_wrapper.html.erb
+++ b/decidim-core/app/views/layouts/decidim/_wrapper.html.erb
@@ -12,7 +12,7 @@ end
 
 <div class="layout-container">
   <header <%= "class=with-admin-bar" if current_user && allowed_to?(:read, :admin_dashboard) %>>
-    <div id="sticky-header-container" data-controller="sticky-header">
+    <div id="header-container">
       <%= render partial: "layouts/decidim/impersonation_warning" %>
       <%= render partial: "layouts/decidim/omnipresent_banner" %>
       <%= render partial: "layouts/decidim/offline_banner" %>
diff --git a/decidim-core/app/views/layouts/decidim/header/_focus_mode_back_button.html.erb b/decidim-core/app/views/layouts/decidim/header/_focus_mode_back_button.html.erb
index 9d027b5f2d97f..a0e8cf78ca94b 100644
--- a/decidim-core/app/views/layouts/decidim/header/_focus_mode_back_button.html.erb
+++ b/decidim-core/app/views/layouts/decidim/header/_focus_mode_back_button.html.erb
@@ -9,15 +9,14 @@
   <% end %>
 </div>
 
-<div class="menu-bar__language-chooser-desktop focus-mode">
-  <%= render partial: "layouts/decidim/header/main_language_chooser" %>
+<div class="main-bar__language-chooser-desktop focus-mode">
+  <%= render partial: "layouts/decidim/header/main_language_chooser", locals: { id: "dropdown-menu-language-chooser-desktop" } %>
 </div>
 
 <div class="main-bar__back-button lg:hidden">
   <%= link_to(
       content_for(:focus_mode_return_path),
       class: "main-bar__links-desktop__item",
-      type: :button,
       "aria-label": t("layouts.decidim.header.back")
     ) do %>
       <span class="flex items-center gap-1">
diff --git a/decidim-core/app/views/layouts/decidim/header/_main.html.erb b/decidim-core/app/views/layouts/decidim/header/_main.html.erb
index 9533c257faa57..8a74b36b24063 100644
--- a/decidim-core/app/views/layouts/decidim/header/_main.html.erb
+++ b/decidim-core/app/views/layouts/decidim/header/_main.html.erb
@@ -16,10 +16,17 @@
       <% if current_user&.ephemeral? %>
         <%= render partial: "layouts/decidim/header/close_ephemeral_session" %>
       <% else %>
-        <div class="flex md:justify-between md:gap-x-10">
-          <div role="search" class="main-bar__search">
-            <%= render partial: "layouts/decidim/header/main_search" %>
+        <div class="flex lg:justify-between lg:gap-x-10">
+          <div class="hidden lg:flex lg:gap-x-8 border-r border-gray-6 pr-10">
+            <div role="search" class="main-bar__search">
+              <%= render partial: "layouts/decidim/header/main_search" %>
+            </div>
+
+            <div class="main-bar__language-chooser-desktop">
+              <%= render partial: "layouts/decidim/header/main_language_chooser", locals: { id: "dropdown-menu-language-chooser-desktop" } %>
+            </div>
           </div>
+
           <nav role="navigation" aria-label="<%= t("layouts.decidim.header.user_menu") %>" class="main-bar__links-desktop md:flex md:gap-x-8">
             <%= render partial: "layouts/decidim/header/main_links_desktop" %>
           </nav>
diff --git a/decidim-core/app/views/layouts/decidim/header/_main_language_chooser.html.erb b/decidim-core/app/views/layouts/decidim/header/_main_language_chooser.html.erb
index 85c9bd3c40468..7b25df0efa9ff 100644
--- a/decidim-core/app/views/layouts/decidim/header/_main_language_chooser.html.erb
+++ b/decidim-core/app/views/layouts/decidim/header/_main_language_chooser.html.erb
@@ -1,18 +1,20 @@
 <% if available_locales.length > 1 %>
-  <div class="main-footer__language-container">
-    <button id="trigger-dropdown-language-chooser" data-controller="dropdown" data-target="dropdown-menu-language-chooser" class="main-footer__language-trigger">
-      <%= icon "global-line" %>
-      <span><%= t("name", scope: "locale" ) %></span>
+  <div class="main-bar__language-chooser">
+    <button id="trigger-<%= id %>" data-controller="dropdown" data-target="<%= id %>" class="main-bar__language-chooser-trigger">
+      <span class="main-bar__language-chooser-holder">
+        <%= icon "global-line" %>
+        <span><%= t("name", scope: "locale" ) %></span>
+      </span>
       <%= icon "arrow-down-s-line" %>
       <span class="sr-only" lang="<%= locale %>">
         <%= t("layouts.decidim.language_chooser.choose_language") %>
       </span>
     </button>
 
-    <div id="dropdown-menu-language-chooser" aria-hidden="true">
-      <ul class="main-footer__language" role="menu">
+    <div id="<%= id %>" aria-hidden="true">
+      <ul class="main-bar__language-chooser-list" role="menu">
         <% available_locales.each do |locale| %>
-          <li class="text-black text-md hover:bg-secondary hover:text-white <%= "is-active" if I18n.locale.to_s == locale %>" role="presentation">
+          <li class="<%= I18n.locale.to_s == locale ? "main-bar__language-chooser-item-active" : "main-bar__language-chooser-item" %>" role="presentation">
             <%= link_to locale_name(locale), decidim.locale_path(locale:), method: :post, role: "menuitem", lang: locale, class: "p-2 w-full block" %>
           </li>
         <% end %>
diff --git a/decidim-core/app/views/layouts/decidim/header/_main_links_desktop.html.erb b/decidim-core/app/views/layouts/decidim/header/_main_links_desktop.html.erb
index 3408270e3b61b..11adeab9e8829 100644
--- a/decidim-core/app/views/layouts/decidim/header/_main_links_desktop.html.erb
+++ b/decidim-core/app/views/layouts/decidim/header/_main_links_desktop.html.erb
@@ -1,7 +1,4 @@
 <div class="flex items-center gap-x-8">
-  <div class="menu-bar__language-chooser-desktop">
-    <%= render partial: "layouts/decidim/header/main_language_chooser" %>
-  </div>
   <% if !current_user %>
     <div>
       <%= link_to decidim.new_user_session_path, class: "main-bar__links-desktop__item", "aria-label": t("layouts.decidim.header.log_in") do %>
@@ -36,7 +33,7 @@
           </span>
         <% end %>
       </button>
-      <div id="dropdown-menu-account" aria-hidden="true">
+      <div id="dropdown-menu-account" aria-hidden="true" data-controller="assign-role" data-role="dialog">
         <ul class="dropdown dropdown__bottom main-bar__dropdown">
           <%= render partial: "layouts/decidim/header/main_links_dropdown", locals: { unread_data: } %>
         </ul>
@@ -44,12 +41,21 @@
     </div>
   <% end %>
   <button id="main-dropdown-summary-desktop" class="main-bar__links-desktop__trigger"
-          data-controller="dropdown"
+          data-controller="main-menu"
+          data-close-button="main-dropdown-summary-desktop-close"
           data-target="dropdown-menu-main-desktop" aria-expanded="false">
     <%= icon "menu-line" %><span><%= t("menu", scope: "decidim.admin.titles") %></span>
   </button>
 
   <div id="dropdown-menu-main-desktop" class="main-bar__links-desktop__dropdown main-bar__links-desktop__dropdown-before" aria-hidden="true">
-    <%= render partial: "layouts/decidim/header/menu_breadcrumb_main_dropdown_desktop", locals: { id: "breadcrumb-main-dropdown-desktop" } %>
+    <div id="breadcrumb-main-dropdown-desktop" class="menu-bar__main-dropdown menu-bar__dropdown-desktop">
+      <button id="main-dropdown-summary-desktop-close" class="main-bar__links-desktop__trigger">
+        <%= icon "close-line" %><span><%= t("close", scope: "layouts.decidim.header") %></span>
+      </button>
+      <%= breadcrumb_root_menu.render %>
+      <div class="menu-bar__main-dropdown__left">
+        <%= cell("decidim/highlighted_participatory_process", menu_highlighted_participatory_process) %>
+      </div>
+    </div>
   </div>
 </div>
diff --git a/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb b/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb
index d2625c46365dc..e803c1d9c4ba7 100644
--- a/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb
+++ b/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb
@@ -1,4 +1,4 @@
-<div id="dropdown-menu-account-mobile" class="main-bar__links-mobile__account" aria-hidden="true">
+<div id="dropdown-menu-account-mobile" class="main-bar__links-mobile__account" aria-hidden="true" data-controller="assign-role" data-role="dialog">
   <div class="main-bar">
     <div class="main-bar__logo">
       <div class="main-bar__logo-desktop">
@@ -10,7 +10,7 @@
     </div>
 
     <div>
-      <div class="main-bar__links-mobile__trigger" tabindex="0" onclick="document.querySelector('#dropdown-trigger-links-mobile').click();document.querySelector('#dropdown-menu-account-mobile').removeAttribute('aria-modal')">
+      <div id="dropdown-trigger-links-mobile-close" class="main-bar__links-mobile__trigger" tabindex="0">
         <%= icon "close-line" %>
         <p class="sr-only"><%= t("close", scope: "decidim.shared.flag_modal") %></p>
       </div>
diff --git a/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_item_account.html.erb b/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_item_account.html.erb
index ee26624c023a5..7ea333706b4a8 100644
--- a/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_item_account.html.erb
+++ b/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_item_account.html.erb
@@ -1,5 +1,7 @@
 <% if current_user %>
-  <button id="dropdown-trigger-links-mobile" class="main-bar__links-mobile__item" data-controller="dropdown" data-target="dropdown-menu-account-mobile">
+  <button id="dropdown-trigger-links-mobile" class="main-bar__links-mobile__item" data-controller="main-menu"
+          data-target="dropdown-menu-account-mobile"
+          data-close-button="dropdown-trigger-links-mobile-close">
     <% if current_user.notifications.any? %>
       <span class="main-bar__notification"></span>
     <% end %>
diff --git a/decidim-core/app/views/layouts/decidim/header/_main_menu_mobile.html.erb b/decidim-core/app/views/layouts/decidim/header/_main_menu_mobile.html.erb
index c14917542ad6e..1eaedae5e6776 100644
--- a/decidim-core/app/views/layouts/decidim/header/_main_menu_mobile.html.erb
+++ b/decidim-core/app/views/layouts/decidim/header/_main_menu_mobile.html.erb
@@ -1,14 +1,25 @@
 <button id="main-dropdown-summary-mobile" class="main-bar__links-mobile__trigger p-0"
-        data-controller="dropdown"
+        data-controller="main-menu"
         data-target="dropdown-menu-main-mobile"
+        data-close-button="main-dropdown-summary-mobile"
         aria-expanded="false">
   <%= icon "menu-line" %><span><%= t("menu", scope: "decidim.admin.titles") %></span>
   <%= icon "close-line" %><span><%= t("close", scope: "layouts.decidim.header") %></span>
 </button>
-<div aria-hidden="true" class="border-r border-gray-6 h-full"></div>
+<div aria-hidden="true" class="md:hidden border-r border-gray-6 h-full"></div>
 
 <div id="dropdown-menu-main-mobile" class="main-bar__links-mobile__dropdown main-bar__links-mobile__dropdown-before" aria-hidden="true">
-  <%= render partial: "layouts/decidim/header/menu_breadcrumb_main_dropdown_mobile", locals: { id: "breadcrumb-main-dropdown-mobile" } %>
+  <div id="breadcrumb-main-dropdown-mobile" class="menu-bar__main-dropdown">
+    <div class="menu-bar__main-dropdown__top">
+      <div class="mb-8">
+        <%= render partial: "layouts/decidim/header/menu_form_search_mobile" %>
+      </div>
+      <%= mobile_breadcrumb_root_menu.render %>
+      <div class="menu-bar__language-chooser-mobile">
+        <%= render partial: "layouts/decidim/header/main_language_chooser", locals: { id: "dropdown-menu-language-chooser-mobile" } %>
+      </div>
+    </div>
+  </div>
 </div>
 
 <%= render partial: "layouts/decidim/header/main_links_mobile_item_account" %>
diff --git a/decidim-core/app/views/layouts/decidim/header/_menu.html.erb b/decidim-core/app/views/layouts/decidim/header/_menu.html.erb
index 975925e6e8e1e..85a85115aa939 100644
--- a/decidim-core/app/views/layouts/decidim/header/_menu.html.erb
+++ b/decidim-core/app/views/layouts/decidim/header/_menu.html.erb
@@ -13,7 +13,7 @@
 
     <%# secondary dropdown mobile-tablet %>
     <nav class="menu-bar__breadcrumb-mobile">
-      <%= render partial: "layouts/decidim/header/menu_breadcrumb_mobile_tablet" %>
+      <%= render partial: "layouts/decidim/header/menu_breadcrumb_mobile" %>
     </nav>
 
   </div>
diff --git a/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_desktop.html.erb b/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_desktop.html.erb
index 423dcc62a71ab..f82029021eacb 100644
--- a/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_desktop.html.erb
+++ b/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_desktop.html.erb
@@ -1,6 +1,15 @@
-<div class="menu-bar__breadcrumb-desktop__dropdown-wrapper">
-  <%= link_to decidim.root_url, class: "menu-bar__breadcrumb-desktop__dropdown-trigger" do %>
-    <span class=""><%= t("decidim.menu.home") %></span>
+<%= link_to decidim.root_url, class: "menu-bar__breadcrumb-desktop__dropdown-wrapper menu-bar__breadcrumb-desktop__dropdown-trigger" do %>
+  <span class=""><%= t("decidim.menu.home") %></span>
+<% end %>
+<% breadcrumb_items.each_with_index do |item, i| %>
+  <% next if item.blank? %>
+
+  <% item_label = translated_attribute(item[:label]) %>
+  <span aria-hidden="true"><%= icon "arrow-right-s-line" %></span>
+  <%= link_to_if(item[:url].present? && !is_active_link?(item[:url], :exclusive), item_label, item[:url], class: "menu-bar__breadcrumb-desktop__dropdown-wrapper menu-bar__breadcrumb-desktop__dropdown-trigger", "aria-current": (item[:active] ? "page" : nil)) do %>
+    <%# This block is executed if the condition is false %>
+    <%= content_tag :span, item_label, class: "menu-bar__breadcrumb-desktop__dropdown-trigger no-interactive", tabindex: "0", "aria-current": (item[:active] ? "page" : nil) %>
   <% end %>
-</div>
-<%= render partial: "layouts/decidim/header/menu_breadcrumb_items" %>
+<% end %>
+
+<%= render partial: "layouts/decidim/schema_org_breadcrumb_list", locals: { breadcrumb_items: } %>
diff --git a/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_items.html.erb b/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_items.html.erb
deleted file mode 100644
index 8ab08c116ea7d..0000000000000
--- a/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_items.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% breadcrumb_items.each_with_index do |item, i| %>
-  <% next if item.blank? %>
-
-  <% item_label = translated_attribute(item[:label]) %>
-  <span aria-hidden="true"><%= icon "arrow-right-s-line" %></span>
-  <%= link_to_if(item[:url].present? && !is_active_link?(item[:url], :exclusive), item_label, item[:url], class: "menu-bar__breadcrumb-desktop__dropdown-wrapper menu-bar__breadcrumb-desktop__dropdown-trigger", "aria-current": (item[:active] ? "page" : nil)) do %>
-    <%# This block is executed if the condition is false %>
-    <%= content_tag :span, item_label, class: "menu-bar__breadcrumb-desktop__dropdown-trigger no-interactive", tabindex: "0", "aria-current": "page" %>
-  <% end %>
-<% end %>
-
-<%= render partial: "layouts/decidim/schema_org_breadcrumb_list", locals: { breadcrumb_items: } %>
diff --git a/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown_desktop.html.erb b/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown_desktop.html.erb
deleted file mode 100644
index 7c05c2dcec15b..0000000000000
--- a/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown_desktop.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<div id="<%= id %>" class="menu-bar__main-dropdown menu-bar__dropdown-desktop test">
-  <button id="main-dropdown-summary-desktop-close" class="main-bar__links-desktop__trigger"
-          data-controller="dropdown"
-          data-target="dropdown-menu-main-desktop">
-    <%= icon "close-line" %><span><%= t("close", scope: "layouts.decidim.header") %></span>
-  </button>
-  <%= breadcrumb_root_menu.render %>
-  <div class="menu-bar__main-dropdown__left">
-    <%= cell("decidim/highlighted_participatory_process", menu_highlighted_participatory_process) %>
-  </div>
-</div>
diff --git a/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown_mobile.html.erb b/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown_mobile.html.erb
deleted file mode 100644
index d6730aa755768..0000000000000
--- a/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown_mobile.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<div id="<%= id %>" class="menu-bar__main-dropdown">
-  <div class="menu-bar__main-dropdown__top">
-    <div class="mb-8">
-      <%= render partial: "layouts/decidim/header/menu_form_search_mobile" %>
-    </div>
-    <%= mobile_breadcrumb_root_menu.render %>
-    <%= render partial: "layouts/decidim/header/mobile_language_choose" %>
-  </div>
-  <div class="menu-bar__main-dropdown__bottom">
-    <div class="menu-bar__main-dropdown__bottom-left">
-      <%= cell("decidim/highlighted_participatory_process", menu_highlighted_participatory_process) %>
-    </div>
-    <div class="menu-bar__main-dropdown__bottom-right">
-      <%= cell "decidim/content_blocks/menu_breadcrumb_last_activity", current_organization %>
-    </div>
-  </div>
-</div>
diff --git a/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown_top_left.html.erb b/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown_top_left.html.erb
deleted file mode 100644
index f7dde44f3d1ba..0000000000000
--- a/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown_top_left.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<h3 class="menu-bar__main-dropdown__title"><%= t("decidim.pages.home.footer_sub_hero.footer_sub_hero_headline", organization: current_organization_name) %></h3>
-<p class="menu-bar__main-dropdown__subtitle"><%= organization_description_label %></p>
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.html.erb
similarity index 86%
rename from decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_mobile_tablet.html.erb
rename to decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_mobile.html.erb
index 8af65d4cc86e5..fd56509bfaf6c 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.html.erb
@@ -1,4 +1,7 @@
-<% previous_item = breadcrumb_items[-2] if breadcrumb_items.size > 1 %>
+<% non_empty_items = breadcrumb_items.reject(&:empty?) %>
+<% if breadcrumb_items.size > 1 %>
+  <% previous_item = non_empty_items[-2] || non_empty_items[-1] %>
+<% end %>
 <div class="menu-bar__breadcrumb-mobile__dropdown-trigger">
   <span class="inline-block w-full overflow-hidden text-ellipsis align-middle">
       <span class="cursor-pointer truncate flex items-center gap-x-2">
diff --git a/decidim-core/app/views/layouts/decidim/header/_mobile_language_choose.html.erb b/decidim-core/app/views/layouts/decidim/header/_mobile_language_choose.html.erb
deleted file mode 100644
index 24868bb110eac..0000000000000
--- a/decidim-core/app/views/layouts/decidim/header/_mobile_language_choose.html.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<% if available_locales.length > 1 %>
-  <div class="menu-bar__language-chooser-mobile">
-    <div class="main-footer__language-container">
-      <button id="dropdown-trigger-language-chooser-mobile" data-controller="dropdown" data-target="dropdown-menu-language-chooser-mobile" class="main-footer__language-trigger">
-        <span class="mobile-holder">
-          <%= icon "global-line" %>
-          <span><%= t("name", scope: "locale" ) %></span>
-        </span>
-        <%= icon "arrow-down-s-line" %>
-        <span class="sr-only" lang="<%= locale %>">
-          <%= t("layouts.decidim.language_chooser.choose_language") %>
-        </span>
-      </button>
-
-      <div id="dropdown-menu-language-chooser-mobile" aria-hidden="true">
-        <ul class="main-footer__language" role="menu">
-          <% available_locales.each do |locale| %>
-            <li class="text-black text-md hover:bg-secondary hover:text-white <%= "is-active" if I18n.locale.to_s == locale %>" role="presentation">
-              <%= link_to locale_name(locale), decidim.locale_path(locale:), method: :post, role: "menuitem", lang: locale, class: "p-2 w-full block" %>
-            </li>
-          <% end %>
-        </ul>
-      </div>
-    </div>
-  </div>
-<% end %>
diff --git a/decidim-core/config/locales/ar.yml b/decidim-core/config/locales/ar.yml
index 9b773fb4ea553..b6656014bca54 100644
--- a/decidim-core/config/locales/ar.yml
+++ b/decidim-core/config/locales/ar.yml
@@ -202,10 +202,6 @@ ar:
       organization:
         update: "قام %{user_name} بتحديث إعدادات المنظمة"
         update_external_domain: "قام %{user_name} بتحديث النطاقات الخارجية للمنظمة external domains"
-      participatory_space_private_user:
-        create: "%{user_name} مدعو %{resource_name} ليكون مشاركًا خاصًا"
-        create_via_csv: "%{user_name} دعا %{resource_name} عبر CSV ليكون مشاركا خاصا"
-        delete: "%{user_name} أزال المشارك %{resource_name} كمشارك خاص"
       scope:
         create: "%{user_name} خلق نطاق %{resource_name}"
         create_with_parent: "إنشاء %{user_name} النطاق %{resource_name} داخل النطاق %{parent_scope}"
@@ -1136,10 +1132,8 @@ ar:
         decline: رفض الدعوة
         hello: مرحبا %{email}،
         invited_you_as_admin: "%{invited_by} دعاك كمشرف لـ %{application}. يمكنك قبول ذلك من خلال الرابط أدناه."
-        invited_you_as_private_user: "تلقيت دعوة من %{invited_by} كمشارك خاص لـ %{application}يمكنك قبول ذلك من خلال الرابط أدناه."
         someone_invited_you: دعاك شخص ما إلى %{application}. يمكنك قبول ذلك من خلال الرابط أدناه.
         someone_invited_you_as_admin: قام شخص ما بدعوتك كمسؤول لـ %{application}، يمكنك قبولها من خلال الرابط أدناه.
-        someone_invited_you_as_private_user: قام شخص ما بدعوتك كمشارك خاص بقيمة %{application}، ويمكنك قبولها من خلال الرابط أدناه.
         subject: تعليمات الدعوة
       password_change:
         greeting: مرحبا %{recipient}!
diff --git a/decidim-core/config/locales/bg.yml b/decidim-core/config/locales/bg.yml
index 966695e798145..6b41cf839b9a6 100644
--- a/decidim-core/config/locales/bg.yml
+++ b/decidim-core/config/locales/bg.yml
@@ -232,10 +232,6 @@ bg:
       organization:
         update: "%{user_name} обнови настройките на организацията"
         update_external_domain: "%{user_name} актуализира външните домейни на организацията"
-      participatory_space_private_user:
-        create: "%{user_name} покани %{resource_name} да бъде частен участник"
-        create_via_csv: "%{user_name} покани %{resource_name} чрез CSV да бъде частен участник"
-        delete: "%{user_name} премахна участника %{resource_name} като частен"
       scope:
         create: "%{user_name} създаде сферата %{resource_name}"
         create_with_parent: "%{user_name} създаде сферата %{resource_name} в родителската сфера %{parent_scope}"
@@ -1331,17 +1327,13 @@ bg:
           Ако не искате да приемете поканата, моля, игнорирайте този имейл.<br />
           Профилът Ви няма да бъде създаден, докато не отворите връзката по-горе и не зададете своите псевдоним и парола.
         invited_you_as_admin: "%{invited_by} Ви покани за администратор на %{application}. Можете да приемете чрез връзката по-долу."
-        invited_you_as_private_user: "%{invited_by} Ви покани като частен участник на %{application}. Можете да приемете чрез връзката по-долу."
         someone_invited_you: Някой Ви покани в %{application}. Можете да приемете чрез връзката по-долу.
         someone_invited_you_as_admin: Някой ви покани за администратор на %{application}, можете да приемете чрез връзката по-долу.
-        someone_invited_you_as_private_user: Някой ви покани частен участник в %{application}, можете да приемете чрез връзката по-долу.
         subject: Инструкции за покана
       invite_admin:
         subject: Получихте покана да управлявате %{organization}
       invite_collaborator:
         subject: Получихте покана да сътрудничите на %{organization}
-      invite_private_user:
-        subject: Поканени сте в частен процес на сътрудничество в %{organization}
       organization_admin_invitation_instructions:
         subject: Получихте покана да управлявате %{organization}
       password_change:
diff --git a/decidim-core/config/locales/ca-IT.yml b/decidim-core/config/locales/ca-IT.yml
index 0a86bd17e725e..a3ac333348b8e 100644
--- a/decidim-core/config/locales/ca-IT.yml
+++ b/decidim-core/config/locales/ca-IT.yml
@@ -179,7 +179,6 @@ ca-IT:
       front_page_link: Anar a la pàgina principal
       logo: "Logo oficial de %{organization}"
       opens_in_new_tab: Obrir en una pestanya nova
-      secondary_menu: Menú secundari
       skip_button: Vés al contingut principal
     account:
       blocked: Aquest compte ha estat bloquejat degut a una violació dels termes i condicions d'ús
@@ -266,6 +265,10 @@ ca-IT:
         results: resultats
       impersonation_log:
         manage: "%{user_name} ha gestionat a %{resource_name} perquè %{reason}"
+      member:
+        create: "%{user_name} ha convidat a %{resource_name} com a membre"
+        create_via_csv: "%{user_name} ha convidat a %{resource_name} com a membre via CSV"
+        delete: "%{user_name} ha eliminat a %{resource_name} de membre"
       moderation:
         bulk_hide: "%{user_name} ha amagat %{reported_count} continguts"
         bulk_unhide: "%{user_name} ha tornat a mostrar %{reported_count} continguts"
@@ -284,10 +287,6 @@ ca-IT:
       organization:
         update: "%{user_name} ha actualitzat la configuració de l'organització"
         update_external_domain: "%{user_name} ha actualitzat els dominis externs de l'organització"
-      participatory_space_private_user:
-        create: "%{user_name} ha convidat %{resource_name} com a participant privada"
-        create_via_csv: "%{user_name} ha convidat %{resource_name} via CSV per a ser participant privada"
-        delete: "%{user_name} ha eliminat %{resource_name} com a participant privada"
       scope:
         create: "%{user_name} ha creat l'àmbit %{resource_name}"
         create_with_parent: "%{user_name} ha creat l'àmbit %{resource_name} dins l'àmbit %{parent_scope}"
@@ -766,13 +765,13 @@ ca-IT:
           id: L'identificador únic d'aquesta notificació
           resource_type: El tipus de recurs amb el qual està relacionat amb la notificació
           updated_at: La data i hora en què aquesta notificació va ser actualitzada per darrera vegada
-        participatory_space_private_users:
-          created_at: La data i l'hora en què es va crear aquesta participant privada
-          id: L'identificador únic d'aquesta participant privada
-          privatable_to: A quin espai de participació pertanys aquesta participant privada
-          published: Si aquesta participant privada està publicada o no
-          role: El rol que té aquesta participant privada
-          updated_at: La data i hora en què aquesta participant privada va ser actualitzada per darrera vegada
+        participatory_space_members:
+          created_at: La data i l'hora en què es va crear aquesta membre
+          id: L'identificador únic d'aquesta membre
+          participatory_space: A quin espai de participació pertany aquesta membre
+          published: Si aquesta membre està publicada o no
+          role: El rol que té aquesta membre
+          updated_at: La data de la darrera actualització d'aquesta membre
         reports:
           created_at: La data i hora en què es va crear aquest informe
           details: Els detalls dels informes de moderació
@@ -1291,8 +1290,10 @@ ca-IT:
       action_error: S'ha produït un error en actualitzar la configuració de les notificacions.
       no_notifications: Encara no hi ha notificacions.
       show:
+        deleted: El contingut ha estat eliminat per l'autora.
         missing_event: Vaja, aquesta notificació pertany a un element que ja no està disponible. Pots descartar-la.
         moderated: El contingut s'ha amagat correctament a través de la moderació.
+        not_available: Vaja, aquesta notificació pertany a un element que ja no està disponible. Pots descartar-la.
     notifications_digest_mailer:
       header:
         daily: Resum diari de notificacions
@@ -1836,16 +1837,16 @@ ca-IT:
         ignore: |-
           Si no vols acceptar la invitació, si us plau, ignora aquest correu electrònic.<br /> El teu compte no es crearà fins que no accedeixis a l'enllaç anterior i estableixis el teu àlies i contrasenya.
         invited_you_as_admin: "%{invited_by} t'ha convidat com a administradora de %{application}. Pots acceptar-ho a través de l'enllaç següent."
-        invited_you_as_private_user: "%{invited_by} t'ha convidat com a participant privada de %{application}. Pots acceptar a través de l'enllaç següent."
+        invited_you_as_member: "%{invited_by} t'ha convidat com a membre de %{application}. Pots acceptar-ho a través de l'enllaç següent."
         someone_invited_you: Algú t'ha convidat a %{application}. Pots acceptar-ho a través de l'enllaç següent.
         someone_invited_you_as_admin: Algú t'ha convidat com a administradora de %{application}, pots acceptar-lo a través de l'enllaç següent.
-        someone_invited_you_as_private_user: Algú t'ha convidat com a participant privada de %{application}. Pots acceptar a través del següent enllaç.
+        someone_invited_you_as_member: Algú t'ha convidat com a membre de %{application}, pots acceptar-ho a través de l'enllaç següent.
         subject: Instruccions d'invitació
       invite_admin:
         subject: T'han convidat a administrar %{organization}
       invite_collaborator:
         subject: T'han convidat a col·laborar a %{organization}
-      invite_private_user:
+      invite_member:
         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}
diff --git a/decidim-core/config/locales/ca.yml b/decidim-core/config/locales/ca.yml
index 74e0bb8631177..9891621515069 100644
--- a/decidim-core/config/locales/ca.yml
+++ b/decidim-core/config/locales/ca.yml
@@ -179,7 +179,6 @@ ca:
       front_page_link: Anar a la pàgina principal
       logo: "Logo oficial de %{organization}"
       opens_in_new_tab: Obrir en una pestanya nova
-      secondary_menu: Menú secundari
       skip_button: Vés al contingut principal
     account:
       blocked: Aquest compte ha estat bloquejat degut a una violació dels termes i condicions d'ús
@@ -266,6 +265,10 @@ ca:
         results: resultats
       impersonation_log:
         manage: "%{user_name} ha gestionat a %{resource_name} perquè %{reason}"
+      member:
+        create: "%{user_name} ha convidat a %{resource_name} com a membre"
+        create_via_csv: "%{user_name} ha convidat a %{resource_name} com a membre via CSV"
+        delete: "%{user_name} ha eliminat a %{resource_name} de membre"
       moderation:
         bulk_hide: "%{user_name} ha amagat %{reported_count} continguts"
         bulk_unhide: "%{user_name} ha tornat a mostrar %{reported_count} continguts"
@@ -284,10 +287,6 @@ ca:
       organization:
         update: "%{user_name} ha actualitzat la configuració de l'organització"
         update_external_domain: "%{user_name} ha actualitzat els dominis externs de l'organització"
-      participatory_space_private_user:
-        create: "%{user_name} ha convidat %{resource_name} com a participant privada"
-        create_via_csv: "%{user_name} ha convidat %{resource_name} via CSV per a ser participant privada"
-        delete: "%{user_name} ha eliminat %{resource_name} com a participant privada"
       scope:
         create: "%{user_name} ha creat l'àmbit %{resource_name}"
         create_with_parent: "%{user_name} ha creat l'àmbit %{resource_name} dins l'àmbit %{parent_scope}"
@@ -766,13 +765,13 @@ ca:
           id: L'identificador únic d'aquesta notificació
           resource_type: El tipus de recurs amb el qual està relacionat amb la notificació
           updated_at: La data i hora en què aquesta notificació va ser actualitzada per darrera vegada
-        participatory_space_private_users:
-          created_at: La data i l'hora en què es va crear aquesta participant privada
-          id: L'identificador únic d'aquesta participant privada
-          privatable_to: A quin espai de participació pertanys aquesta participant privada
-          published: Si aquesta participant privada està publicada o no
-          role: El rol que té aquesta participant privada
-          updated_at: La data i hora en què aquesta participant privada va ser actualitzada per darrera vegada
+        participatory_space_members:
+          created_at: La data i l'hora en què es va crear aquesta membre
+          id: L'identificador únic d'aquesta membre
+          participatory_space: A quin espai de participació pertany aquesta membre
+          published: Si aquesta membre està publicada o no
+          role: El rol que té aquesta membre
+          updated_at: La data de la darrera actualització d'aquesta membre
         reports:
           created_at: La data i hora en què es va crear aquest informe
           details: Els detalls dels informes de moderació
@@ -1291,8 +1290,10 @@ ca:
       action_error: S'ha produït un error en actualitzar la configuració de les notificacions.
       no_notifications: Encara no hi ha notificacions.
       show:
+        deleted: El contingut ha estat eliminat per l'autora.
         missing_event: Vaja, aquesta notificació pertany a un element que ja no està disponible. Pots descartar-la.
         moderated: El contingut s'ha amagat correctament a través de la moderació.
+        not_available: Vaja, aquesta notificació pertany a un element que ja no està disponible. Pots descartar-la.
     notifications_digest_mailer:
       header:
         daily: Resum diari de notificacions
@@ -1836,16 +1837,16 @@ ca:
         ignore: |-
           Si no vols acceptar la invitació, si us plau, ignora aquest correu electrònic.<br /> El teu compte no es crearà fins que no accedeixis a l'enllaç anterior i estableixis el teu àlies i contrasenya.
         invited_you_as_admin: "%{invited_by} t'ha convidat com a administradora de %{application}. Pots acceptar-ho a través de l'enllaç següent."
-        invited_you_as_private_user: "%{invited_by} t'ha convidat com a participant privada de %{application}. Pots acceptar a través de l'enllaç següent."
+        invited_you_as_member: "%{invited_by} t'ha convidat com a membre de %{application}. Pots acceptar-ho a través de l'enllaç següent."
         someone_invited_you: Algú t'ha convidat a %{application}. Pots acceptar-ho a través de l'enllaç següent.
         someone_invited_you_as_admin: Algú t'ha convidat com a administradora de %{application}, pots acceptar-lo a través de l'enllaç següent.
-        someone_invited_you_as_private_user: Algú t'ha convidat com a participant privada de %{application}. Pots acceptar a través del següent enllaç.
+        someone_invited_you_as_member: Algú t'ha convidat com a membre de %{application}, pots acceptar-ho a través de l'enllaç següent.
         subject: Instruccions d'invitació
       invite_admin:
         subject: T'han convidat a administrar %{organization}
       invite_collaborator:
         subject: T'han convidat a col·laborar a %{organization}
-      invite_private_user:
+      invite_member:
         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}
diff --git a/decidim-core/config/locales/cs.yml b/decidim-core/config/locales/cs.yml
index cae9d70d597ec..7ebaefb142e1d 100644
--- a/decidim-core/config/locales/cs.yml
+++ b/decidim-core/config/locales/cs.yml
@@ -203,7 +203,6 @@ cs:
       front_page_link: Přejít na titulní stránku
       logo: "Oficiální logo %{organization}"
       opens_in_new_tab: Otevře se v nové kartě
-      secondary_menu: Sekundární menu
       skip_button: Přeskočit na hlavní obsah
     account:
       blocked: Tento účet byl zablokován kvůli porušení smluvních podmínek
@@ -306,10 +305,6 @@ cs:
       organization:
         update: "%{user_name} aktualizovala nastavení organizace"
         update_external_domain: "%{user_name} aktualizoval externí domény organizace"
-      participatory_space_private_user:
-        create: "%{user_name} pozval %{resource_name} aby se stal soukromým uživatelem"
-        create_via_csv: "%{user_name} pozval %{resource_name} prostřednictvím CSV k tomu, aby byl soukromým účastníkem"
-        delete: "%{user_name} uživatele %{resource_name} odstranil jako soukromého uživatele"
       scope:
         create: "%{user_name} vytvořil oblast působnosti %{resource_name}"
         create_with_parent: "%{user_name} vytvořil oblast působnosti %{resource_name} uvnitř oblasti působnosti %{parent_scope}"
@@ -803,13 +798,6 @@ cs:
           id: Jedinečný identifikátor tohoto oznámení
           resource_type: Typ zdroje, ke kterému se oznámení vztahuje
           updated_at: Datum a čas, kdy bylo oznámení naposledy aktualizováno
-        participatory_space_private_users:
-          created_at: Datum a čas, kdy byl tento soukromý uživatel vytvořen
-          id: Jedinečný identifikátor tohoto soukromého uživatele
-          privatable_to: Do kterého prostoru patří tento soukromý uživatel
-          published: Zda je tento soukromý uživatel zveřejněn, nebo ne
-          role: Role, kterou má tento soukromý uživatel
-          updated_at: Datum a čas poslední aktualizace tohoto soukromého uživatele
         reports:
           created_at: Datum a čas vytvoření této zprávy
           details: Podrobnosti této zprávy
@@ -1289,6 +1277,7 @@ cs:
         success: Nastavení Zpravodaje bylo úspěšně aktualizováno.
     newsletters_opt_in_mailer:
       notify:
+        body_1: Zpracování osobních údajů a jejich ochrana jsou pro nás všechny stále důležitější. Díky obecnému nařízení o ochraně osobních údajů (GDPR) z 25. května 2018 mají jednotlivci lepší kontrolu nad svými osobními údaji. Z tohoto důvodu potřebujeme váš „souhlas“ s tím, abychom vám i nadále zasílali relevantní informace o aktivitách %{organization_name}.
         body_2: 'Jak nám můžete dát svůj souhlas? Stačí kliknout na následující tlačítko:'
         body_3: S tímto souhlasem budete moci pokračovat v přijímání informací o službách platformy. Pokud naopak nedostaneme pozitivní potvrzení z vašeho hlediska, přestaneme vám posílat naše zprávy. Pokud potvrdíte, že chcete být stále informováni, máte vždy možnost kdykoli zrušit.
         button: Ano, chci i nadále přijímat relevantní informace
@@ -1302,9 +1291,13 @@ cs:
         same_language: Obsah byl zveřejněn ve vašem preferovaném jazyce (%{language}), proto se v tomto e-mailu nezobrazuje automatický překlad.
         translated_text: 'Automaticky přeložený text:'
     notifications:
+      action_error: Při aktualizaci nastavení oznámení došlo k chybě.
       no_notifications: Zatím žádné oznámení.
       show:
+        deleted: Obsah byl autorem odstraněn.
         missing_event: Jejda, toto oznámení patří k položce, která již není k dispozici. Můžete ho zahodit.
+        moderated: Obsah byl skrytý moderováním.
+        not_available: Jejda, toto oznámení patří k položce, která již není k dispozici. Můžete ho zahodit.
     notifications_digest_mailer:
       header:
         daily: Denní výběr oznámení
@@ -1313,6 +1306,7 @@ cs:
       hello: Dobrý den %{name},
       intro:
         daily: 'Toto jsou oznámení z posledního dne založená na aktivitě, kterou máte:'
+        real_time: 'Toto je oznámení o aktivitě, kterou sledujete:'
         weekly: 'Toto jsou oznámení z minulého týdne založená na aktivitě, kterou máte:'
       outro: Obdrželi jste tato oznámení, protože sledujete tento obsah nebo jeho autory. Můžete je zrušit z jejich příslušných stránek.
       see_more: Zobrazit další oznámení
@@ -1452,7 +1446,9 @@ cs:
           title: Jak tyto soubory otevřít a pracovat s nimi
         license:
           body_1_html: Tato databáze %{organization_name} je k dispozici pod %{link_database}. Jakákoli práva v jednotlivém obsahu databáze jsou licencována pod %{link_contents}.
+          license_contents_link: https://opendatacommons.org/licenses/dbcl/1.0/
           license_contents_name: Licence obsahu databáze
+          license_database_link: https://opendatacommons.org/licenses/odbl/1.0/
           license_database_name: Open Database License
           title: Licence
         title: Otevřená data
@@ -1475,6 +1471,7 @@ cs:
         footer_sub_hero:
           footer_sub_hero_body_html: Vytvořme otevřenější, transparentnější a více spolupracující společnost.<br /> Připojte se, účastněte se a rozhodujte.
           footer_sub_hero_headline: Vítejte na %{organization} participační platformě.
+          register: Vytvořit účet
         hero:
           participate: Účastnit se
           participate_title: Účast na procesech platformy
@@ -1482,6 +1479,7 @@ cs:
         statistics:
           headline: Statistiky
         sub_hero:
+          register: Vytvořit účet
           register_title: Vytvořit účet
       index:
         standalone_pages: Stránky
@@ -1721,6 +1719,16 @@ cs:
         instructions_1: Pokud máte přístup k tomuto e-mailovému účtu, zkontrolujte prosím svou doručenou poštu pro pokyny.
       notify_deprecation_to_owner:
         greeting: Dobrý den %{name},
+        set_password: Nastavte své heslo
+        subject: Důležitá aktualizace vašeho profilu skupiny
+      notify_user_group_patched:
+        body_3_html: Abychom mohli pokračovat v přístupu k vašemu účtu a sdílet přístup, potřebujeme, abyste si nastavili nový e-mail a heslo. Vezměte prosím na vědomí, že každý člen vaší skupiny obdrží tento e-mail. Chcete-li zajistit trvalý přístup, musíte se interně dohodnout na sdílených přihlašovacích údajích (e-mail a heslo), které budou všichni používat.
+        greeting: Dobrý den %{name},
+        instructions_1_html: 'K přihlášení použijte následující dočasné přihlašovací údaje: <br><br> Uživatelské jméno: <strong>%{email}</strong> <br> heslo: <strong>%{password}</strong><br><br>'
+        instructions_2_html: Nastavte novou e-mailovou adresu a heslo.
+        instructions_3_html: Sdílejte vybrané přihlašovací údaje s vašimi kolegy, aby celá skupina mohla pokračovat v přístupu k účtu.
+        instructions_title_html: "<strong>Co potřebujete udělat</strong>"
+        subject: Důležitá aktualizace vašeho profilu skupiny
     user_report_mailer:
       notify:
         body_1: Uživatel %{user} byl nahlášen od %{token}
@@ -1812,17 +1820,13 @@ cs:
           Pokud pozvánku nechcete přijmout, ignorujte tento e-mail.<br />
           Váš účet nebude vytvořen, dokud nekliknete na odkaz výše a nenastavíte si uživatelské jméno a heslo.
         invited_you_as_admin: "%{invited_by} vás pozval jako administrátora z %{application}. Můžete jej přijmout prostřednictvím níže uvedeného odkazu."
-        invited_you_as_private_user: "%{invited_by} vás pozval jako soukromého uživatele %{application}. Můžete jej přijmout prostřednictvím níže uvedeného odkazu."
         someone_invited_you: Někdo vás pozval na %{application}. Můžete jej přijmout prostřednictvím níže uvedeného odkazu.
         someone_invited_you_as_admin: Někdo Vás pozval jako administrátora %{application}, můžete jej přijmout pomocí níže uvedeného odkazu.
-        someone_invited_you_as_private_user: Někdo vás pozval jako private_user %{application}, můžete jej přijmout pomocí níže uvedeného odkazu.
         subject: Pokyny k pozvánkám
       invite_admin:
         subject: Byli jste pozváni ke spravování organizace %{organization}
       invite_collaborator:
         subject: Byli jste pozváni ke spolupráci na organizaci %{organization}
-      invite_private_user:
-        subject: Byli jste pozváni k soukromé účasti na organizaci %{organization}
       organization_admin_invitation_instructions:
         subject: Byli jste pozváni ke spravování organizace %{organization}
       password_change:
diff --git a/decidim-core/config/locales/de.yml b/decidim-core/config/locales/de.yml
index 1fb4a143bcbcc..5f6021c9bf008 100644
--- a/decidim-core/config/locales/de.yml
+++ b/decidim-core/config/locales/de.yml
@@ -179,7 +179,6 @@ de:
       front_page_link: Zur Startseite gehen
       logo: "Offizielles Logo von %{organization}"
       opens_in_new_tab: In neuem Tab öffnen
-      secondary_menu: Sekundäres Menü
       skip_button: Zu Hauptinhalten überspringen
     account:
       blocked: Dieses Konto wurde wegen Verletzung der Nutzungsbedingungen gesperrt
@@ -284,10 +283,6 @@ de:
       organization:
         update: "%{user_name} hat die Organisationseinstellungen aktualisiert"
         update_external_domain: "%{user_name} hat die externe Domains der Organisation aktualisiert"
-      participatory_space_private_user:
-        create: "%{user_name} hat %{resource_name} als privaten Benutzer eingeladen"
-        create_via_csv: "%{user_name} hat %{resource_name} per CSV als privaten Teilnehmer eingeladen"
-        delete: "%{user_name} hat den Benutzer %{resource_name} als privaten Benutzer entfernt"
       scope:
         create: "%{user_name} hat den Bereich %{resource_name} erstellt"
         create_with_parent: "%{user_name} hat den Bereich %{resource_name} im übergeordneten Bereich %{parent_scope} erstellt"
@@ -772,13 +767,6 @@ de:
           id: Die eindeutige Bezeichnung dieser Benachrichtigung
           resource_type: Der Typ der Ressource, mit der die Benachrichtigung verknüpft ist
           updated_at: Datum und Uhrzeit, an dem die Benachrichtigung zuletzt aktualisiert wurde
-        participatory_space_private_users:
-          created_at: Das Datum und die Uhrzeit, als diese private Teilnahme erstellt wurde
-          id: Die eindeutige Bezeichnung der privaten Teilnahme
-          privatable_to: Zu welchem Raum diese private Teilnahme gehört
-          published: Ob diese private Teilnahme veröffentlicht ist oder nicht
-          role: Die Rolle, die diese private Teilnahme hat
-          updated_at: Das Datum und die Uhrzeit, als diese private Teilnahme zuletzt aktualisiert wurde
         reports:
           created_at: Das Datum und die Uhrzeit, an der dieser Bericht erstellt wurde
           details: Die Details dieses Berichts
@@ -1816,17 +1804,13 @@ de:
           Wenn Sie die Einladung nicht annehmen möchten, ignorieren Sie diese E-Mail.<br />
           Ihr Konto wird erst erstellt, wenn Sie auf den angegebenen Link zugreifen und Ihren Kontonamen und Ihr Passwort festlegen.
         invited_you_as_admin: "%{invited_by} hat Sie als Admin von %{application} eingeladen. Sie können die Einladung über den folgenden Link akzeptieren."
-        invited_you_as_private_user: "%{invited_by} hat Sie als privaten Teilnehmenden zu %{application} eingeladen. Sie können die Einladung über den folgenden Link akzeptieren."
         someone_invited_you: Jemand hat Sie zu %{application} eingeladen. Sie können die EInladung über den folgenden Link akzeptieren.
         someone_invited_you_as_admin: Jemand hat Sie als Admin zu %{application} eingeladen. Sie können die Einladung über den folgenden Link akzeptieren.
-        someone_invited_you_as_private_user: Jemand hat Sie als privaten Teilnehmenden zu %{application} eingeladen. Sie können die Einladung über den folgenden Link akzeptieren.
         subject: Anweisungen zur Einladung
       invite_admin:
         subject: Sie wurden eingeladen %{organization} zu verwalten
       invite_collaborator:
         subject: Sie wurden zur Zusammenarbeit auf %{organization} eingeladen
-      invite_private_user:
-        subject: Sie wurden zu einem privaten Beteiligungsprozess auf %{organization} eingeladen
       organization_admin_invitation_instructions:
         subject: Sie wurden eingeladen %{organization} zu verwalten
       password_change:
diff --git a/decidim-core/config/locales/el.yml b/decidim-core/config/locales/el.yml
index 5d32b20ba9a2d..9eaf98a6e2b79 100644
--- a/decidim-core/config/locales/el.yml
+++ b/decidim-core/config/locales/el.yml
@@ -187,9 +187,6 @@ el:
         update: "Ο χρήστης %{user_name} ενημέρωσε την εφαρμογή OAuth %{resource_name}"
       organization:
         update: "Ο χρήστης %{user_name} ενημέρωσε τις ρυθμίσεις του οργανισμού"
-      participatory_space_private_user:
-        create: "Ο χρήστης %{user_name} προσκάλεσε τον χρήστη %{resource_name} να γίνει ιδιωτικός συμμετέχων"
-        delete: "Ο χρήστης %{user_name} κατάργησε τον συμμετέχοντα %{resource_name} ως ιδιωτικό συμμετέχων"
       scope:
         create: "Ο χρήστης %{user_name} δημιούργησε το πεδίο εφαρμογής %{resource_name}"
         create_with_parent: "Ο χρήστης %{user_name} δημιούργησε το πεδίο εφαρμογής %{resource_name} μέσα στο πεδίο εφαρμογής %{parent_scope}"
@@ -990,10 +987,8 @@ el:
         decline: Απόρριψη πρόσκλησης
         hello: Γεια σας %{email},
         invited_you_as_admin: "Ο χρήστης %{invited_by} σάς προσκάλεσε ως διαχειριστή της εφαρμογής %{application}. Μπορείτε να την αποδεχτείτε μέσω του παρακάτω συνδέσμου."
-        invited_you_as_private_user: "Ο χρήστης %{invited_by} σάς προσκάλεσε ως ιδιωτικό συμμετέχοντα της εφαρμογής %{application}. Μπορείτε να την αποδεχτείτε μέσω του παρακάτω συνδέσμου."
         someone_invited_you: Κάποιος σάς προσκάλεσε στην εφαρμογή %{application}. Μπορείτε να την αποδεχτείτε μέσω του παρακάτω συνδέσμου.
         someone_invited_you_as_admin: Κάποιος σάς προσκάλεσε ως διαχειριστή της εφαρμογής %{application}. Μπορείτε να την αποδεχτείτε μέσω του παρακάτω συνδέσμου.
-        someone_invited_you_as_private_user: Κάποιος σάς προσκάλεσε ως ιδιωτικό συμμετέχοντα της εφαρμογής %{application}. Μπορείτε να την αποδεχτείτε μέσω του παρακάτω συνδέσμου.
         subject: Οδηγίες πρόσκλησης
       password_change:
         greeting: Γεια σας %{recipient}!
diff --git a/decidim-core/config/locales/en.yml b/decidim-core/config/locales/en.yml
index 22a5736e3bed1..13ae255b7a54e 100644
--- a/decidim-core/config/locales/en.yml
+++ b/decidim-core/config/locales/en.yml
@@ -180,7 +180,6 @@ en:
       front_page_link: Go to front page
       logo: "%{organization}'s official logo"
       opens_in_new_tab: Opens in new tab
-      secondary_menu: Secondary menu
       skip_button: Skip to main content
     account:
       blocked: This account has been blocked due to terms of service violation
@@ -267,6 +266,10 @@ en:
         results: results
       impersonation_log:
         manage: "%{user_name} has managed %{resource_name} because %{reason}"
+      member:
+        create: "%{user_name} invited %{resource_name} to be a member"
+        create_via_csv: "%{user_name} invited %{resource_name} via CSV to be a member"
+        delete: "%{user_name} removed the participant %{resource_name} as a member"
       moderation:
         bulk_hide: "%{user_name} hid %{reported_count} resources"
         bulk_unhide: "%{user_name} unhid %{reported_count} resources"
@@ -285,10 +288,6 @@ en:
       organization:
         update: "%{user_name} updated the organization settings"
         update_external_domain: "%{user_name} updated the organization external domains"
-      participatory_space_private_user:
-        create: "%{user_name} invited %{resource_name} to be a private participant"
-        create_via_csv: "%{user_name} invited %{resource_name} via CSV to be a private participant"
-        delete: "%{user_name} removed the participant %{resource_name} as a private participant"
       scope:
         create: "%{user_name} created the %{resource_name} scope"
         create_with_parent: "%{user_name} created the %{resource_name} scope inside the %{parent_scope} scope"
@@ -774,13 +773,13 @@ en:
           id: The unique identifier of this notification
           resource_type: The type of the resource that the notification is related to
           updated_at: The date and time when the notification was last updated
-        participatory_space_private_users:
-          created_at: The date and time when this private user was created
-          id: The unique identifier of this private user
-          privatable_to: To which space this private user belongs
-          published: Wether this private user is published or not
-          role: The role that this private user has
-          updated_at: The date and time when this private user was last updated
+        participatory_space_members:
+          created_at: The date and time when this member was created
+          id: The unique identifier of this member
+          participatory_space: To which space this member belongs
+          published: Wether this member is published or not
+          role: The role that this member has
+          updated_at: The date and time when this member was last updated
         reports:
           created_at: The date and time when this report was created
           details: The details of this report
@@ -1062,6 +1061,9 @@ en:
           explanation: 'Guidance for image:'
           message_1: Preferably a landscape image that does not have any text.
           message_2: The service crops the image.
+        import_file:
+          explanation: 'Guidance for import file:'
+          message_1: Has to be a JSON document downloaded through the export feature.
       file_validation:
         allowed_file_extensions: 'Allowed file extensions: %{extensions}'
         max_file_dimension: 'Maximum file dimensions: %{resolution} pixels'
@@ -1847,16 +1849,16 @@ en:
           If you do not want to accept the invitation, please ignore this email.<br />
           Your account will not be created until you access the link above and set your nickname and password.
         invited_you_as_admin: "%{invited_by} has invited you as an admin of %{application}. You can accept it through the link below."
-        invited_you_as_private_user: "%{invited_by} has invited you as a private participant of %{application}. You can accept it through the link below."
+        invited_you_as_member: "%{invited_by} has invited you as a member of %{application}. You can accept it through the link below."
         someone_invited_you: Someone has invited you to %{application}. You can accept it through the link below.
         someone_invited_you_as_admin: Someone has invited you as an admin of %{application}, you can accept it through the link below.
-        someone_invited_you_as_private_user: Someone has invited you as private participant of %{application}, you can accept it through the link below.
+        someone_invited_you_as_member: Someone has invited you as member of %{application}, you can accept it through the link below.
         subject: Invitation instructions
       invite_admin:
         subject: You have been invited to manage %{organization}
       invite_collaborator:
         subject: You have been invited to collaborate on %{organization}
-      invite_private_user:
+      invite_member:
         subject: You have been invited to a private participatory process on %{organization}
       organization_admin_invitation_instructions:
         subject: You have been invited to manage %{organization}
diff --git a/decidim-core/config/locales/es-MX.yml b/decidim-core/config/locales/es-MX.yml
index ea65d73fd35ba..634f62253e567 100644
--- a/decidim-core/config/locales/es-MX.yml
+++ b/decidim-core/config/locales/es-MX.yml
@@ -179,7 +179,6 @@ es-MX:
       front_page_link: Ir a la página principal
       logo: "Logo oficial de %{organization}"
       opens_in_new_tab: Abrir en una pestaña nueva
-      secondary_menu: Menú secundario
       skip_button: Saltar al contenido principal
     account:
       blocked: Esta cuenta ha sido bloqueada por una violación de los términos y condiciones de uso
@@ -266,6 +265,10 @@ es-MX:
         results: resultados
       impersonation_log:
         manage: "%{user_name} ha gestionado a %{resource_name} porque %{reason}"
+      member:
+        create: "%{user_name} ha invitado a %{resource_name} como miembro"
+        create_via_csv: "%{user_name} ha invitado a %{resource_name} como miembro vía CSV"
+        delete: "%{user_name} ha eliminado a la participante %{resource_name} de miembro"
       moderation:
         bulk_hide: "%{user_name} ha ocultado %{reported_count} contenidos"
         bulk_unhide: "%{user_name} ha vuelto a mostrar %{reported_count} contenidos"
@@ -284,10 +287,6 @@ es-MX:
       organization:
         update: "%{user_name} actualizó la configuración de la organización"
         update_external_domain: "%{user_name} ha actualizado los dominios externos de la organización"
-      participatory_space_private_user:
-        create: "%{user_name} ha invitado a %{resource_name} a ser un usuario privado"
-        create_via_csv: "%{user_name} invitó a %{resource_name} vía CSV a ser un participante privada"
-        delete: "%{user_name} ha eliminado el usuario %{resource_name} como usuario privado"
       scope:
         create: "%{user_name} creó el ámbito %{resource_name}"
         create_with_parent: "%{user_name} creó el ámbito %{resource_name} dentro del ámbito %{parent_scope}"
@@ -769,13 +768,13 @@ es-MX:
           id: El identificador único de esta notificación
           resource_type: El tipo de recurso con el que está relacionada la notificación
           updated_at: La fecha y hora en que esta notificación fue actualizada por última vez
-        participatory_space_private_users:
-          created_at: La fecha y hora en que se creó esta participante privada
-          id: El identificador único de esta participante privada
-          privatable_to: A qué espacio de participación pertenece esta participante privada
-          published: Si esta participante privada está publicado o no
-          role: El rol tiene que esta participante privada
-          updated_at: La fecha y hora en que esta participante privada fue actualizada por última vez
+        participatory_space_members:
+          created_at: La fecha y hora en que se creó esta miembro
+          id: El identificador único de esta miembro
+          participatory_space: A qué espacio de participación pertenece esta miembro
+          published: Si esta miembro está publicada o no
+          role: El rol tiene que esta miembro
+          updated_at: La fecha de la última actualización de esta miembro
         reports:
           created_at: La fecha y hora en que se creó este informe
           details: Los detalles de los informes de moderación
@@ -1294,8 +1293,10 @@ es-MX:
       action_error: Se ha producido un error al actualizar la configuración de las notificaciones.
       no_notifications: No hay notificaciones aún.
       show:
+        deleted: El contenido ha sido eliminado por la autora.
         missing_event: Vaya, esta notificación pertenece a un elemento que ya no está disponible. Puedes descartarla.
         moderated: El contenido se ha ocultado mediante la moderación.
+        not_available: Vaya, esta notificación pertenece a un elemento que ya no está disponible. Puedes descartarla.
     notifications_digest_mailer:
       header:
         daily: Resumen diario de notificaciones
@@ -1839,17 +1840,17 @@ es-MX:
         ignore: |-
           Si no deseas aceptar la invitación, por favor ignora este correo electrónico.<br /> Tu cuenta no se creará hasta que accedas al enlace de arriba y establezcas tu nombre de usuaria y contraseña.
         invited_you_as_admin: "%{invited_by} te ha invitado como administrador de %{application}. Puedes aceptarlo a través del siguiente enlace."
-        invited_you_as_private_user: "%{invited_by} te ha invitado como usuario privado de %{application}. Puedes aceptar a través del siguiente enlace."
+        invited_you_as_member: "%{invited_by} te ha invitado como miembro de %{application}. Puedes aceptarlo a través del siguiente enlace."
         someone_invited_you: Alguien te ha invitado a %{application}. Puedes aceptar la invitación a través del siguiente enlace.
         someone_invited_you_as_admin: Alguien te ha invitado como administrador de %{application}, puedes aceptar a través del siguiente enlace.
-        someone_invited_you_as_private_user: Alguien te ha invitado como usuario_privado de %{application}, puedes aceptarlo a través del siguiente enlace.
+        someone_invited_you_as_member: Alguien te ha invitado como miembro de %{application}, puedes aceptarlo a través del siguiente enlace.
         subject: Instrucciones de invitación
       invite_admin:
         subject: Te han invitado a administrar %{organization}
       invite_collaborator:
         subject: Te han invitado a colaborar en %{organization}
-      invite_private_user:
-        subject: Te han invitado a participar en un proceso participativo privado en %{organization}
+      invite_member:
+        subject: Te han invitado a participar en un espacio de participación privado en %{organization}
       organization_admin_invitation_instructions:
         subject: Te han invitado a administrar %{organization}
       password_change:
diff --git a/decidim-core/config/locales/es-PY.yml b/decidim-core/config/locales/es-PY.yml
index 1f0e6651ded69..ff43b57e0c05a 100644
--- a/decidim-core/config/locales/es-PY.yml
+++ b/decidim-core/config/locales/es-PY.yml
@@ -179,7 +179,6 @@ es-PY:
       front_page_link: Ir a la página principal
       logo: "Logo oficial de %{organization}"
       opens_in_new_tab: Abrir en una pestaña nueva
-      secondary_menu: Menú secundario
       skip_button: Saltar al contenido principal
     account:
       blocked: Esta cuenta ha sido bloqueada por una violación de los términos y condiciones de uso
@@ -266,6 +265,10 @@ es-PY:
         results: resultados
       impersonation_log:
         manage: "%{user_name} ha gestionado a %{resource_name} porque %{reason}"
+      member:
+        create: "%{user_name} ha invitado a %{resource_name} como miembro"
+        create_via_csv: "%{user_name} ha invitado a %{resource_name} como miembro vía CSV"
+        delete: "%{user_name} ha eliminado a la participante %{resource_name} de miembro"
       moderation:
         bulk_hide: "%{user_name} ha ocultado %{reported_count} contenidos"
         bulk_unhide: "%{user_name} ha vuelto a mostrar %{reported_count} contenidos"
@@ -284,10 +287,6 @@ es-PY:
       organization:
         update: "%{user_name} actualizó la configuración de la organización"
         update_external_domain: "%{user_name} ha actualizado los dominios externos de la organización"
-      participatory_space_private_user:
-        create: "%{user_name} invitados %{resource_name} para ser un usuario privado"
-        create_via_csv: "%{user_name} invitó a %{resource_name} vía CSV a ser un participante privada"
-        delete: "%{user_name} eliminado el usuario %{resource_name} como un usuario privado"
       scope:
         create: "%{user_name} creó el ámbito %{resource_name}"
         create_with_parent: "%{user_name} creó el ámbito %{resource_name} dentro del ámbito %{parent_scope}"
@@ -769,13 +768,13 @@ es-PY:
           id: El identificador único de esta notificación
           resource_type: El tipo de recurso con el que está relacionada la notificación
           updated_at: La fecha y hora en que esta notificación fue actualizada por última vez
-        participatory_space_private_users:
-          created_at: La fecha y hora en que se creó esta participante privada
-          id: El identificador único de esta participante privada
-          privatable_to: A qué espacio de participación pertenece esta participante privada
-          published: Si esta participante privada está publicado o no
-          role: El rol tiene que esta participante privada
-          updated_at: La fecha y hora en que esta participante privada fue actualizada por última vez
+        participatory_space_members:
+          created_at: La fecha y hora en que se creó esta miembro
+          id: El identificador único de esta miembro
+          participatory_space: A qué espacio de participación pertenece esta miembro
+          published: Si esta miembro está publicada o no
+          role: El rol tiene que esta miembro
+          updated_at: La fecha de la última actualización de esta miembro
         reports:
           created_at: La fecha y hora en que se creó este informe
           details: Los detalles de los informes de moderación
@@ -1294,8 +1293,10 @@ es-PY:
       action_error: Se ha producido un error al actualizar la configuración de las notificaciones.
       no_notifications: No hay notificaciones aún.
       show:
+        deleted: El contenido ha sido eliminado por la autora.
         missing_event: Vaya, esta notificación pertenece a un elemento que ya no está disponible. Puedes descartarla.
         moderated: El contenido se ha ocultado mediante la moderación.
+        not_available: Vaya, esta notificación pertenece a un elemento que ya no está disponible. Puedes descartarla.
     notifications_digest_mailer:
       header:
         daily: Resumen diario de notificaciones
@@ -1839,17 +1840,17 @@ es-PY:
         ignore: |-
           Si no deseas aceptar la invitación, por favor ignora este correo electrónico.<br /> Tu cuenta no se creará hasta que accedas al enlace de arriba y establezcas tu nombre de usuaria y contraseña.
         invited_you_as_admin: "%{invited_by} te ha invitado como administrador de %{application}. Puedes aceptarlo a través del siguiente enlace."
-        invited_you_as_private_user: "%{invited_by} te ha invitado como usuario privado de %{application}. Puedes aceptar a través del siguiente enlace."
+        invited_you_as_member: "%{invited_by} te ha invitado como miembro de %{application}. Puedes aceptarlo a través del siguiente enlace."
         someone_invited_you: Alguien te ha invitado a %{application}. Puedes aceptar la invitación a través del siguiente enlace.
         someone_invited_you_as_admin: Alguien te ha invitado como administrador de %{application}, puedes aceptar a través del siguiente enlace.
-        someone_invited_you_as_private_user: Alguien te ha invitado como usuario_privado de %{application}, puedes aceptarlo a través del siguiente enlace.
+        someone_invited_you_as_member: Alguien te ha invitado como miembro de %{application}, puedes aceptarlo a través del siguiente enlace.
         subject: Instrucciones de invitación
       invite_admin:
         subject: Te han invitado a administrar %{organization}
       invite_collaborator:
         subject: Te han invitado a colaborar en %{organization}
-      invite_private_user:
-        subject: Te han invitado a participar en un proceso participativo privado en %{organization}
+      invite_member:
+        subject: Te han invitado a participar en un espacio de participación privado en %{organization}
       organization_admin_invitation_instructions:
         subject: Te han invitado a administrar %{organization}
       password_change:
diff --git a/decidim-core/config/locales/es.yml b/decidim-core/config/locales/es.yml
index 61c55696f6fae..30e8e3234a186 100644
--- a/decidim-core/config/locales/es.yml
+++ b/decidim-core/config/locales/es.yml
@@ -179,7 +179,6 @@ es:
       front_page_link: Ir a la página principal
       logo: "Logo oficial de %{organization}"
       opens_in_new_tab: Abrir en una pestaña nueva
-      secondary_menu: Menú secundario
       skip_button: Saltar al contenido principal
     account:
       blocked: Esta cuenta ha sido bloqueada por una violación de los términos y condiciones de uso
@@ -266,6 +265,10 @@ es:
         results: resultados
       impersonation_log:
         manage: "%{user_name} ha gestionado a %{resource_name} porque %{reason}"
+      member:
+        create: "%{user_name} ha invitado a %{resource_name} como miembro"
+        create_via_csv: "%{user_name} ha invitado a %{resource_name} como miembro vía CSV"
+        delete: "%{user_name} ha eliminado a la participante %{resource_name} de miembro"
       moderation:
         bulk_hide: "%{user_name} ha ocultado %{reported_count} contenidos"
         bulk_unhide: "%{user_name} ha vuelto a mostrar %{reported_count} contenidos"
@@ -284,10 +287,6 @@ es:
       organization:
         update: "%{user_name} actualizó la configuración de la organización"
         update_external_domain: "%{user_name} ha actualizado los dominios externos de la organización"
-      participatory_space_private_user:
-        create: "%{user_name} ha invitado a %{resource_name} como participante privada"
-        create_via_csv: "%{user_name} invitó a %{resource_name} vía CSV a ser un participante privada"
-        delete: "%{user_name} ha eliminado %{resource_name} como participante privada"
       scope:
         create: "%{user_name} creó el ámbito %{resource_name}"
         create_with_parent: "%{user_name} creó el ámbito %{resource_name} dentro del ámbito %{parent_scope}"
@@ -766,13 +765,13 @@ es:
           id: El identificador único de esta notificación
           resource_type: El tipo de recurso con el que está relacionada la notificación
           updated_at: La fecha y hora en que esta notificación fue actualizada por última vez
-        participatory_space_private_users:
-          created_at: La fecha y hora en que se creó esta participante privada
-          id: El identificador único de esta participante privada
-          privatable_to: A qué espacio de participación pertenece esta participante privada
-          published: Si esta participante privada está publicado o no
-          role: El rol tiene que esta participante privada
-          updated_at: La fecha y hora en que esta participante privada fue actualizada por última vez
+        participatory_space_members:
+          created_at: La fecha y hora en que se creó esta miembro
+          id: El identificador único de esta miembro
+          participatory_space: A qué espacio de participación pertenece esta miembro
+          published: Si esta miembro está publicada o no
+          role: El rol tiene que esta miembro
+          updated_at: La fecha de la última actualización de esta miembro
         reports:
           created_at: La fecha y hora en que se creó este informe
           details: Los detalles de los informes de moderación
@@ -1291,8 +1290,10 @@ es:
       action_error: Se ha producido un error al actualizar la configuración de las notificaciones.
       no_notifications: Aún no hay notificaciones.
       show:
+        deleted: El contenido ha sido eliminado por la autora.
         missing_event: Vaya, esta notificación pertenece a un elemento que ya no está disponible. Puedes descartarla.
         moderated: El contenido se ha ocultado mediante la moderación.
+        not_available: Vaya, esta notificación pertenece a un elemento que ya no está disponible. Puedes descartarla.
     notifications_digest_mailer:
       header:
         daily: Resumen diario de notificaciones
@@ -1836,16 +1837,16 @@ es:
         ignore: |-
           Si no deseas aceptar la invitación, por favor ignora este correo electrónico.<br /> Tu cuenta no se creará hasta que accedas al enlace de arriba y establezcas tu nombre de usuaria y contraseña.
         invited_you_as_admin: "%{invited_by} te ha invitado como administradora de %{application}. Puedes aceptarlo a través del siguiente enlace."
-        invited_you_as_private_user: "%{invited_by} te ha invitado como participante privada de %{application}. Puedes aceptar a través del siguiente enlace."
+        invited_you_as_member: "%{invited_by} te ha invitado como miembro de %{application}. Puedes aceptarlo a través del siguiente enlace."
         someone_invited_you: Alguien te ha invitado a %{application}. Puedes aceptar la invitación a través del siguiente enlace.
         someone_invited_you_as_admin: Alguien te ha invitado como administradora de %{application}, puedes aceptar a través del siguiente enlace.
-        someone_invited_you_as_private_user: Alguien te ha invitado como participante privada de %{application}, puedes aceptar a través del siguiente enlace.
+        someone_invited_you_as_member: Alguien te ha invitado como miembro de %{application}, puedes aceptarlo a través del siguiente enlace.
         subject: Instrucciones de invitación
       invite_admin:
         subject: Te han invitado a administrar %{organization}
       invite_collaborator:
         subject: Te han invitado a colaborar en %{organization}
-      invite_private_user:
+      invite_member:
         subject: Te han invitado a participar en un espacio de participación privado en %{organization}
       organization_admin_invitation_instructions:
         subject: Te han invitado a administrar %{organization}
diff --git a/decidim-core/config/locales/eu.yml b/decidim-core/config/locales/eu.yml
index 46876a3a63f13..96a5c4c446e42 100644
--- a/decidim-core/config/locales/eu.yml
+++ b/decidim-core/config/locales/eu.yml
@@ -45,7 +45,7 @@ eu:
         email: Zure helbide elektronikoa
         encrypted_password: Pasahitza
         locale: Tokikoa
-        name: Zure Izena
+        name: Zure izen-abizenak
         nickname: Ezizena
         old_password: Egungo pasahitza
         password: Pasahitza
@@ -179,7 +179,6 @@ eu:
       front_page_link: Zoaz orri nagusira
       logo: "%{organization} erakundaren logo ofiziala"
       opens_in_new_tab: Ireki beste fitxa batean
-      secondary_menu: Bigarren mailako menua
       skip_button: Eduki nagusira joan
     account:
       blocked: Kontu hau blokeatu egin da erabilera-terminoak eta -baldintzak urratu direlako
@@ -266,6 +265,10 @@ eu:
         results: emaitzak
       impersonation_log:
         manage: "%{user_name} parte-hartzaileak %{resource_name} kudeatu du arrazoi honengatik %{reason}"
+      member:
+        create: "%{user_name} parte-hartzaileak %{resource_name} baliabidera kide izateko gonbidatu du"
+        create_via_csv: "%{user_name} -k %{resource_name} CSV bidez gonbidatu du kide izateko"
+        delete: "%{user_name} parte-hartzailek %{resource_name} kendu du kide bezala"
       moderation:
         bulk_hide: "%{user_name} parte-hartzaileak %{reported_count} baliabide ezkutatu du"
         bulk_unhide: "%{user_name} parte-hartzaileak berriro erakutsi du %{reported_count} baliabide"
@@ -284,10 +287,6 @@ eu:
       organization:
         update: "%{user_name} parte-hartzaileak erakundearen ezarpenak eguneratu ditu"
         update_external_domain: "%{user_name} parte-hartzaileak erakundearen kanpoko domeinuak eguneratu ditu"
-      participatory_space_private_user:
-        create: "%{user_name} parte-hartzaileak %{resource_name} gonbidatu du parte-hartzaile pribatua izatera"
-        create_via_csv: "%{user_name} parte-hartzaileak %{resource_name} gonbidatu du CSV bidez parte-hartzaile pribatua izatera"
-        delete: "%{user_name} parte-hartzaileak %{resource_name} parte-hartzaile pribatu gisa kendu du"
       scope:
         create: "%{user_name} parte-hartzaileak %{resource_name} eremua sortu du"
         create_with_parent: "%{user_name} parte-hartzaileak %{resource_name} eremua%{parent_scope} eremua barruan sortu du"
@@ -383,11 +382,10 @@ eu:
           help_text: Berrikusi aldaketak eta onartu edo ukatu zuzenketa hau. Jakinarazpen bat bidaliko zaio/e bere egileari/ei.
         announcement:
           accepted: |-
-            For the Aldaketa hori %{amendable_type} %{amendable_link} izan da
-            onartu <strong>%{announcement_date}</strong>.
+            %{amendable_type} %{proposal_link} erako zuzenketa hau <strong>%{date}</strong>ean onartu da.
           evaluating: |-
-            For the Aldaketa hori %{amendable_type} %{amendable_link}
-            ebaluatu dago.
+            Aldaketa hau %{amendable_type} %{proposal_link} rako
+            ebaluatzen ari da.
           promoted: Sustatu hau %{amendable_type}.
           rejected: "%{amendable_type} %{amendable_link} en zuzenketa\nukatu da <strong>%{announcement_date}</strong>."
           withdrawn: |-
@@ -730,7 +728,7 @@ eu:
           connect_your_account_html: 'Konektatu zure kontua saioa hasteko hemen: %{organization}.'
           publish_content: Argitaratu edukia zuretzat
           see_email: Ikusi zure helbide elektronikoa
-          see_name: Ikusi zure izena
+          see_name: Ikusi zure izena-abizenak
           see_username: Ikusi zure parte-hartzailearen izena
           this_application_will_be_able_to: 'Aplikazio horrek honako zeregin hauek egin ahal izango ditu:'
           this_application_will_not_be_able_to: 'Aplikazio honek ezin izango du:'
@@ -768,13 +766,13 @@ eu:
           id: Jakinarazpen honen identifikatzaile bakarra
           resource_type: Jakinarazpena zein baliabide motarekin dago lotuta
           updated_at: Zein datatan eta zein ordutan eguneratu zen jakinarazpena azken aldiz
-        participatory_space_private_users:
-          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
-          role: Zein rol duen parte-hartzaile pribatu honek
-          updated_at: Zein datatan eta zein ordutan eguneratu zen parte-hartzaile pribatu hau
+        participatory_space_members:
+          created_at: Kide hori sortu zen eguna eta ordua
+          id: The unique identifier of this member
+          participatory_space: Kide hori zein espaziotakoa den
+          published: Parte-hartzaile pribatu hori argitaratuta dagoen ala ez
+          role: Kide horrek duen rola
+          updated_at: Kide hori azken aldiz eguneratu zen eguna eta ordua
         reports:
           created_at: Zein datatan eta zein ordutan sortu zen salaketa hau
           details: Txosten honen xehetasunak
@@ -876,7 +874,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: 'Zuzenketa bat bertan bera onartu %{amendable_title}. Orrialde hau ikusi dezakezu:'
+            email_intro: '%{amendable_title} rako zuzenketa bat onartu da. Orrialde honetan ikus dezakezue:'
             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>.'
@@ -1053,7 +1051,7 @@ eu:
           message_2: Irudi honetarako gomendatzen den tamaina da 512x512.
         image:
           explanation: 'Jarraibideak irudirako:'
-          message_1: Ahal dela, testurik gabeko irudi etzana.
+          message_1: Testurik ez duen irudi etzan bat, ahal dela.
           message_2: Zerbitzuak irudia moztu egiten du.
       file_validation:
         allowed_file_extensions: 'Onartutako artxiboen formatua: %{extensions}'
@@ -1292,8 +1290,10 @@ eu:
       action_error: Arazo bat egon da jakinarazpenaren konfigurazioa eguneratzean.
       no_notifications: Oraindik ez dago jakinarazpenik.
       show:
+        deleted: Egileak edukia ezabatu egin du.
         missing_event: Aiba, jakinarazpen hau dagoeneko eskuragarri ez dagoen item batena da. Baztertu dezakezu.
         moderated: Edukia ezkutatu egin da, moderazioaren bidez.
+        not_available: Hara, jakinarazpen hau dagoeneko erabilgarri ez dagoen elementu bati dagokio. Alde batera utz dezakezu.
     notifications_digest_mailer:
       header:
         daily: Jakinarazpenen eguneroko laburpena
@@ -1470,7 +1470,7 @@ eu:
         footer_sub_hero:
           footer_sub_hero_body_html: Eraiki dezagun gizarte irekiago, gardenago eta kolaboratiboagoa <br /> Lotu, hartu parte eta erabaki.
           footer_sub_hero_headline: Ongi etorri %{organization} erakundearen partaidetzarako plataformara.
-          register: Sortu kontu bat
+          register: Kontu bat sortu
         hero:
           participate: Hartu parte
           participate_title: Parte hartu plataformako prozesuetan
@@ -1564,7 +1564,7 @@ eu:
         details: Xehetasunak
         hello: 'Kaixo, %{name}:'
         manage_moderations: Moderazioak kudeatu
-        participatory_space: Partaidetza espazioa
+        participatory_space: Partaidetza-espazioa
         reason: Arrazoia
         report_html: <p>Hurrengo <a href="%{url}">edukia</a>automatikoki ezkutatu da</p>
         subject: '%{moderator} -k baliabidea ezkutatu du'
@@ -1606,7 +1606,7 @@ eu:
       term_input_placeholder: Bilatu
     searches:
       filters:
-        jump_to: 'Salto egin:'
+        jump_to: 'Hona jo:'
         resource: "%{label} %{collection} artean"
         search: Bilatu
         state:
@@ -1641,7 +1641,7 @@ eu:
         help: "Bilaketa-baldintzak aldatzen direnean, beheko inprimakiak dinamikoki iragazten ditu bilaketaren\nemaitzak."
         skip: Joan emaitzetara
       flag_modal:
-        already_reported: Eduki hau jada salatuta dago, eta administratzaile batek berrikusiko du.
+        already_reported: Eduki horren berri ematen da dagoeneko, eta administrazio batek berrikusiko du.
         close: Itxi
         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.
@@ -1650,7 +1650,7 @@ eu:
         offensive: Bertan badago arrazakeriarik, sexismorik, irainik, eraso pertsonalik, heriotza-mehatxurik, suizidio-eskaerarik edo beste edozein eratako gorroto-diskurtsorik.
         reason: Arrazoia
         report: Salatu
-        spam: Bertan badago clickbait-ik, publizitaterik edo iruzurrik.
+        spam: Clickbait, publizitatea, iruzurrak edo script bot-ak ditu.
         title: Salatu eduki desegokia
       flag_user_modal:
         already_reported: Eduki hau jada salatuta dago, eta administratzaile batek berrikusiko du.
@@ -1780,7 +1780,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: Eskerrik asko sartzeko {{organization}}!
+      default_subject: Thanks for joining {{organization}}!
     wizard_step_form:
       wizard_aside:
         back: Atzera
@@ -1791,9 +1791,9 @@ eu:
     confirmations:
       confirmed: Zure helbide elektronikoa ondo egiaztatu da.
       new:
-        resend_confirmation_instructions: Berrikusi berrespen-argibideak
+        resend_confirmation_instructions: Berrespen-jarraibideak birbidali
       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, zure helbide elektronikoa berretsi ahal izateko gutxienez minutu bat jasoko duzu.
+      send_paranoid_instructions: Zure helbide elektronikoa gure datu-basean badago, mezu elektroniko bat jasoko duzu zure helbide elektronikoa minutu gutxi barru baieztatzeko jarraibideekin.
     failure:
       already_authenticated: Saioa hasi duzu.
       inactive: Zure kontua ez dago oraindik aktibatuta.
@@ -1816,7 +1816,7 @@ eu:
         header: Bidali gonbidapena
         submit_button: Bidali gonbidapena
       no_invitations_remaining: Ez da gonbidapenik geratzen
-      send_instructions: Gonbidapen mezu bat bidali da %{email}.
+      send_instructions: Gonbidapen-mezu elektroniko bat %{email} helbidera bidali da.
       updated: Pasahitza ondo ezarri da. Saioa hasi duzu.
       updated_not_active: Pasahitza ondo ezarri da.
     mailer:
@@ -1837,17 +1837,17 @@ eu:
         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."
+        invited_you_as_member: "%{invited_by} k %{application} -ren kide gisa gisa gonbidatu zaitu. Beheko estekan onartu dezakezu."
         someone_invited_you: Norbaitek %{application} 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.
+        someone_invited_you_as_member: '%{application}-eko kide gisa gonbidatu zaitu norbaitek. Esteka honen bidez onar dezakezu.'
         subject: Gonbidapenaren argibideak
       invite_admin:
         subject: '%{organization} kudeatzeko gonbita jaso duzu'
       invite_collaborator:
         subject: 'Gonbita jaso duzu erakunde honekin lankidetzan aritzeko: %{organization}'
-      invite_private_user:
-        subject: Gonbidatu zaituzte partaidetza-prozesu pribatu batean %{organization} erakundean
+      invite_member:
+        subject: '%{organization} erakundeari buruzko partaidetza prozesu pribatu batera gonbidatu zaituzte'
       organization_admin_invitation_instructions:
         subject: '%{organization} erakundea kudeatzeko gonbita jaso duzu'
       password_change:
@@ -1889,13 +1889,13 @@ eu:
       updated: Pasahitza ondo aldatu da. Saioa hasi duzu.
       updated_not_active: Pasahitza ondo aldatu da.
     registrations:
-      destroyed: Agur! Zure kontua behar bezala bertan behera utzi da. Laster ikusiko dugu berriro.
+      destroyed: Agur! Zure kontua behar bezala bertan behera utzi da. Laster ikusiko dugu elkar berriro.
       new:
         sign_up: Sortu kontu bat
       signed_up: Ongi etorri!  Ondo eman duzu izena.
       signed_up_but_inactive: Eginda sinatu duzu. Hala ere, ezin izan dugu saioa hasi kontua oraindik ez baita aktibatuta.
       signed_up_but_locked: Ongi eman duzu izena. Hala ere, ezin duzu saioa hasi zure kontua giltzapetuta dagoelako.
-      signed_up_but_unconfirmed: Berrespen-esteka duen mezu bat zure helbide elektronikora bidali da. Jarraitu esteka zure kontua aktibatzeko.
+      signed_up_but_unconfirmed: Berrespen-esteka duen mezu bat bidali da zure helbide elektronikora. Mesedez, jarraitu esteka zure kontua aktibatzeko.
       update_needs_confirmation: Zure kontua arrakastaz eguneratu duzu, baina helbide elektroniko berria egiaztatu behar dugu. Egiaztatu zure posta elektronikoa eta berretsi esteka jarraitu zure helbide elektroniko berria berresteko.
       updated: Zure kontua ondo eguneratu da.
     sessions:
@@ -2044,7 +2044,7 @@ eu:
     required: Nahitaezkoa da
     required_explanation: "* Nahitaez bete beharreko eremuak batez daude markatuta"
   invisible_captcha:
-    sentence_for_humans: Gizaki bat bazara, ez egin kasu eremu honi
+    sentence_for_humans: Gizakia bazara, ez jaramonik egin eremu horri
     timestamp_error_message: Barkatu, baina azkarregi aritu zara! Mesedez, birbidali.
   layouts:
     decidim:
@@ -2163,7 +2163,7 @@ eu:
       user_profile:
         account: Kontua
         authorizations: Baimenak
-        delete_my_account: Ezabatu nire kontua
+        delete_my_account: Nire kontua ezabatu
         my_data: Nire datuak
         notifications_settings: Jakinarazpen-konfigurazioa
         profile: Profila
@@ -2178,12 +2178,12 @@ eu:
         format_html: "<span>%u</span> %n"
   password_validator:
     denied: ukatu egin da
-    domain_included_in_password: domeinu izen honen antzekoa da
+    domain_included_in_password: domeinu-izen horren oso antzekoa da
     email_included_in_password: zure posta elektronikoaren antzekoa da
     fallback: ez da zuzena
     name_included_in_password: zure izenaren antzekoa da
     nickname_included_in_password: zure ezizenaren antzekoegia da
-    not_enough_unique_characters: ez da nahikoa karaktere berezirik
+    not_enough_unique_characters: ez ditu nahikoa karaktere berezi
     password_repeated: Ezin da erabili pasahitz zaharra
     password_too_common: oso ohikoa da
     password_too_long: luzeegia da
diff --git a/decidim-core/config/locales/fa-IR.yml b/decidim-core/config/locales/fa-IR.yml
index 88215f82cbd5d..74e6c76216548 100644
--- a/decidim-core/config/locales/fa-IR.yml
+++ b/decidim-core/config/locales/fa-IR.yml
@@ -1 +1,3 @@
 fa:
+  locale:
+    name: فارسی
diff --git a/decidim-core/config/locales/fi-plain.yml b/decidim-core/config/locales/fi-plain.yml
index a0c9e7990d578..b7c180546ff26 100644
--- a/decidim-core/config/locales/fi-plain.yml
+++ b/decidim-core/config/locales/fi-plain.yml
@@ -179,7 +179,6 @@ fi-pl:
       front_page_link: Siirry etusivulle
       logo: "Organisaation %{organization} virallinen logo"
       opens_in_new_tab: Avautuu uuteen välilehteen
-      secondary_menu: Toissijainen valikko
       skip_button: Siirry sisältöön
     account:
       blocked: Tämä käyttäjätili on estetty, koska käyttäjä ei noudattanut käyttöehtoja
@@ -266,6 +265,10 @@ fi-pl:
         results: tulokset
       impersonation_log:
         manage: "%{user_name} hallinnoi käyttäjää %{resource_name}, koska %{reason}"
+      member:
+        create: "%{user_name} kutsui henkilön %{resource_name} jäseneksi"
+        create_via_csv: "%{user_name} kutsui henkilön %{resource_name} jäseneksi CSV-tuonnin kautta"
+        delete: "%{user_name} poisti osallistujan %{resource_name} jäsenyyden"
       moderation:
         bulk_hide: "%{user_name} piilotti %{reported_count} kohdetta"
         bulk_unhide: "%{user_name} palautti %{reported_count} kohdetta näkyviin"
@@ -284,10 +287,6 @@ fi-pl:
       organization:
         update: "%{user_name} päivitti organisaation asetuksia"
         update_external_domain: "%{user_name} päivitti organisaation ulkoisia verkkotunnuksia"
-      participatory_space_private_user:
-        create: "%{user_name} kutsui %{resource_name} yksityiseksi käyttäjaksi"
-        create_via_csv: "%{user_name} kutsui yksityisen osallistujan %{resource_name} CSV-tuonnin kautta"
-        delete: "%{user_name} poisti yksityisen käyttäjän %{resource_name}"
       scope:
         create: "%{user_name} loi %{resource_name} teeman"
         create_with_parent: "%{user_name} loi %{resource_name} teeman %{parent_scope} teeman alle"
@@ -760,6 +759,7 @@ fi-pl:
           created_at: Keskustelun luontiaika
           id: Keskustelun yksilöivä tunniste
           messages: Keskustelun viestit
+          updated_at: Keskustelun viimeisimmän päivityksen ajankohta
         notifications:
           created_at: Ilmoituksen luontiaika
           event_class: Tapahtuman tyyppi, jota ilmoitus koskee
@@ -768,13 +768,13 @@ fi-pl:
           id: Ilmoituksen yksilöivä tunniste
           resource_type: Ilmoituksen kohteen tyyppi
           updated_at: Ilmoituksen viimeisimmän päivityksen ajankohta
-        participatory_space_private_users:
-          created_at: Yksityisen käyttäjän luontiaika
-          id: Yksityisen käyttäjän yksilöivä tunniste
-          privatable_to: Mihin osallistumistilaan tämä yksityinen käyttäjä kuuluu
-          published: Onko yksityinen käyttäjä julkaistu vai ei
-          role: Yksityisen käyttäjän rooli
-          updated_at: Yksityisen käyttäjän viimeisimmän päivityksen ajankohta
+        participatory_space_members:
+          created_at: Jäsenen luontiaika
+          id: Jäsenen yksilöivä tunniste
+          participatory_space: Mihin osallistumistilaan tämä jäsen kuuluu
+          published: Onko jäsen julkaistu vai ei
+          role: Jäsenen rooli
+          updated_at: Jäsenen viimeisimmän päivityksen ajankohta
         reports:
           created_at: Ilmoituksen luontiaika
           details: Ilmoituksen tiedot
@@ -784,6 +784,7 @@ fi-pl:
           reason: Ilmoituksen syy
           updated_at: Ilmoituksen viimeisimmän päivityksen ajankohta
         users:
+          about: Osallistujan profiilikuvaus
           accepted_tos_version: Käyttäjän palvelun käyttöehtojen hyväksymisaika
           admin: Onko tämä käyttäjä hallintakäyttäjä
           confirmation_sent_at: Käyttäjätilin vahvistusviestin lähetysaika
@@ -794,6 +795,7 @@ fi-pl:
           delete_reason: Käyttäjätilin poistamisen syy
           deleted_at: Käyttäjätilin poistamisen ajankohta
           email: Käyttäjätilin sähköpostiosoite
+          followers_count: Käyttäjää seuraavien osallistujien lukumäärä
           following_count: Käyttäjän seuraamien osallistujien lukumäärä
           id: Käyttäjätilin yksilöivä tunniste
           invitation_accepted_at: Käyttäjätilin kutsun hyväksymisen ajankohta
@@ -801,12 +803,16 @@ fi-pl:
           invitation_sent_at: Käyttäjän kutsun lähetyksen ajankohta
           invitations_count: Käyttäjälle lähetettyjen kutsujen lukumäärä
           invited_by: Kutsun lähettänyt käyttäjä
+          last_sign_in_at: Edellisen kirjautumisen ajankohta
+          last_sign_in_ip: Edellisen kirjautumisen IP-osoite
           locale: Käyttäjän valitsema kieliasetus
           managed: Onko tämä käyttäjätili toisen käyttäjän hallinnoima
           name: Käyttäjän nimi
+          newsletter_notifications_at: Uutiskirjeiden tilauksen ajankohta
           nickname: Käyttäjän nimimerkki
           notification_settings: Käyttäjän määrittämät ilmoitusten asetukset
           notifications_sending_frequency: Käyttäjän vastaanottamien ilmoitusten tiheys
+          officialized_as: Virallistamisen nimi (valtuutettu, kunnanjohtaja, pormestari, jne.)
           officialized_at: Käyttäjän virallistamisen ajankohta
           organization: Käyttäjän organisaatio
           password_updated_at: Salasanan viimeisimmän päivityksen ajankohta
@@ -844,6 +850,7 @@ fi-pl:
       files:
         file_cannot_be_processed: Tiedostoa ei voida käsitellä
         file_resolution_too_large: Tiedoston resoluutio on liian suuri
+        not_inside_organization: Tiedostoa ei ole liitetty mihinkään organisaatioon.
       internal_server_error:
         copied: Teksti kopioitu!
         copy_error_message_clarification: Kopioi virheviesti leikepöydälle
@@ -1039,6 +1046,7 @@ fi-pl:
         file:
           explanation: 'Tiedoston ohjeistus:'
           message_1: On oltava kuva tai asiakirja.
+          message_2: Mikäli lataat kuvan, käytä mieluiten vaakasuuntaista kuvaa, joka ei sisällä ole tekstiä. Palvelu rajaa kuvaa.
         icon:
           explanation: 'Ikonin ohjeistus:'
           message_1: On oltava neliömuotoinen kuva.
@@ -1281,9 +1289,13 @@ fi-pl:
         same_language: Sisältö on lisätty toivomallasi kielellä (%{language}), minkä takia tässä viestissä ei näytetä automaattista käännöstä.
         translated_text: 'Automaattisesti käännetty teksti:'
     notifications:
+      action_error: Ilmoitusasetusten päivittäminen epäonnistui.
       no_notifications: Ei vielä ilmoituksia.
       show:
+        deleted: Sisällön laatija on poistanut tämän sisällön.
         missing_event: Hups, tämä ilmoitus kuuluu kohteeseen, joka ei ole enää käytettävissä. Voit merkitä sen luetuksi.
+        moderated: Moderoija on piilottanut tämän sisällön.
+        not_available: Tämä ilmoitus kuuluu kohteeseen, joka ei ole enää käytettävissä. Voit merkitä sen luetuksi.
     notifications_digest_mailer:
       header:
         daily: Päivittäinen ilmoitusyhteenveto
@@ -1292,6 +1304,7 @@ fi-pl:
       hello: Hei %{name},
       intro:
         daily: 'Tässä on lista edellisen päivän ilmoituksista niistä asioista, joita seuraat:'
+        real_time: 'Tämä on ilmoitus seuraamistasi alustalla tapahtuneista asioista:'
         weekly: 'Tässä on lista edellisen viikon ilmoituksista niistä asioista, joita seuraat:'
       outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat ilmoitukseen liittyviä sisältöjä tai niiden tekijöitä. Voit lopettaa seuraamisen näiden sisältöjen sivuilta.
       see_more: Näytä lisää ilmoituksia
@@ -1434,7 +1447,9 @@ fi-pl:
           title: Miten nämä tiedostot avataan ja miten niiden kanssa työskennellään?
         license:
           body_1_html: '%{organization_name} -palvelun tietokanta on lisensoitu %{link_database} -lisenssillä. Kaikki tietokannan sisällöt on lisensoitu %{link_contents} -lisenssillä.'
+          license_contents_link: https://opendatacommons.org/licenses/dbcl/1.0/
           license_contents_name: Tietokannan sisällön lisenssi
+          license_database_link: https://opendatacommons.org/licenses/odbl/1.0/
           license_database_name: Avoimien tietojen lisenssi
           title: Lisenssi
         title: Avoin data
@@ -1457,6 +1472,7 @@ fi-pl:
         footer_sub_hero:
           footer_sub_hero_body_html: Rakennetaan entistä avoimempi, läpinäkyvämpi ja yhteistyökykyisempi yhteiskunta.<br /> Liity, osallistu ja päätä.
           footer_sub_hero_headline: Tervetuloa yhteisölliseen osallisuuspalveluun %{organization}.
+          register: Luo tili
         hero:
           participate: Osallistu
           participate_title: Osallistu alustan prosesseihin
@@ -1464,6 +1480,7 @@ fi-pl:
         statistics:
           headline: Tilastot
         sub_hero:
+          register: Luo tili
           register_title: Luo tili
       index:
         standalone_pages: Sivut
@@ -1823,16 +1840,16 @@ fi-pl:
           Jos et halua hyväksyä kutsua, jätä tämä viesti huomioimatta.<br />
           Sinulle ei luoda tiliä ennen kuin seuraat yllä olevaa linkkiä ja asetat käyttäjänimen sekä salasanan.
         invited_you_as_admin: "%{invited_by} on kutsunut sinut hallinnoimaan kohdetta %{application}. Voit hyväksyä sen alla olevan linkin kautta."
-        invited_you_as_private_user: "%{invited_by} on kutsunut sinut yksityiseksi käyttäjäksi %{application} -nimiseen palveluun. Voit hyväksyä kutsun alla olevan linkin kautta."
+        invited_you_as_member: "%{invited_by} on kutsunut sinut jäseneksi palveluun %{application}. Voit hyväksyä kutsun alla olevan linkin avulla."
         someone_invited_you: Joku on kutsunut sinut kohteeseen %{application}. Voit hyväksyä sen alla olevan linkin kautta.
         someone_invited_you_as_admin: Joku on kutsunut sinut ylläpitämään palvelua %{application}. Voit hyväksyä kutsun alla olevan linkin avulla.
-        someone_invited_you_as_private_user: Joku on kutsunut sinut yksityiseksi käyttäjäksi %{application} -nimiseen palveluun. Voit hyväksyä kutsun alla olevan linkin kautta.
+        someone_invited_you_as_member: Joku on kutsunut sinut jäseneksi palveluun %{application}. Voit hyväksyä kutsun alla olevan linkin kautta.
         subject: Kutsuohjeet
       invite_admin:
         subject: Sinut on kutsuttu hallinnoimaan palvelua %{organization}
       invite_collaborator:
         subject: Sinut on kutsuttu osallistumaan palvelussa %{organization}
-      invite_private_user:
+      invite_member:
         subject: Sinut on kutsuttu yksityiseen osallistumisprosessiin palvelussa %{organization}
       organization_admin_invitation_instructions:
         subject: Sinut on kutsuttu hallinnoimaan palvelua %{organization}
@@ -2113,6 +2130,8 @@ fi-pl:
         expire_time_html: Istuntosi vanhenee <b><span data-impersonation-warning-target="minutes">%{minutes}</span> minuutin kuluttua</b>.
       language_chooser:
         choose_language: Valitse kieli
+      navigation:
+        aria_label: 'Navigaatiovalikko: %{title}'
       notifications_dashboard:
         mark_all_as_read: Merkitse kaikki luetuiksi
         mark_as_read: Merkitse luetuiksi
diff --git a/decidim-core/config/locales/fi.yml b/decidim-core/config/locales/fi.yml
index e5a87fc68225f..280d686882a87 100644
--- a/decidim-core/config/locales/fi.yml
+++ b/decidim-core/config/locales/fi.yml
@@ -179,7 +179,6 @@ fi:
       front_page_link: Siirry etusivulle
       logo: "Organisaation %{organization} virallinen logo"
       opens_in_new_tab: Avautuu uuteen välilehteen
-      secondary_menu: Toissijainen valikko
       skip_button: Siirry sisältöön
     account:
       blocked: Tämä käyttäjätili on estetty, koska käyttäjä ei noudattanut käyttöehtoja
@@ -266,6 +265,10 @@ fi:
         results: tulokset
       impersonation_log:
         manage: "%{user_name} hallinnoi käyttäjää %{resource_name}, koska %{reason}"
+      member:
+        create: "%{user_name} kutsui henkilön %{resource_name} jäseneksi"
+        create_via_csv: "%{user_name} kutsui henkilön %{resource_name} jäseneksi CSV-tuonnin kautta"
+        delete: "%{user_name} poisti osallistujan %{resource_name} jäsenyyden"
       moderation:
         bulk_hide: "%{user_name} piilotti %{reported_count} kohdetta"
         bulk_unhide: "%{user_name} palautti %{reported_count} kohdetta näkyviin"
@@ -284,10 +287,6 @@ fi:
       organization:
         update: "%{user_name} päivitti organisaation asetuksia"
         update_external_domain: "%{user_name} päivitti organisaation ulkoisia verkkotunnuksia"
-      participatory_space_private_user:
-        create: "%{user_name} kutsui käyttäjän %{resource_name} yksityiseksi käyttäjäksi"
-        create_via_csv: "%{user_name} kutsui yksityisen osallistujan %{resource_name} CSV-tuonnin kautta"
-        delete: "%{user_name} poisti yksityisen käyttäjän %{resource_name}"
       scope:
         create: "%{user_name} loi %{resource_name} teeman"
         create_with_parent: "%{user_name} loi %{resource_name} teeman %{parent_scope} teeman alle"
@@ -760,6 +759,7 @@ fi:
           created_at: Keskustelun luontiaika
           id: Keskustelun yksilöivä tunniste
           messages: Keskustelun viestit
+          updated_at: Keskustelun viimeisimmän päivityksen ajankohta
         notifications:
           created_at: Ilmoituksen luontiaika
           event_class: Tapahtuman tyyppi, jota ilmoitus koskee
@@ -768,13 +768,13 @@ fi:
           id: Ilmoituksen yksilöivä tunniste
           resource_type: Ilmoituksen kohteen tyyppi
           updated_at: Ilmoituksen viimeisimmän päivityksen ajankohta
-        participatory_space_private_users:
-          created_at: Yksityisen käyttäjän luontiaika
-          id: Yksityisen käyttäjän yksilöivä tunniste
-          privatable_to: Mihin osallistumistilaan tämä yksityinen käyttäjä kuuluu
-          published: Onko yksityinen käyttäjä julkaistu vai ei
-          role: Yksityisen käyttäjän rooli
-          updated_at: Yksityisen käyttäjän viimeisimmän päivityksen ajankohta
+        participatory_space_members:
+          created_at: Jäsenen luontiaika
+          id: Jäsenen yksilöivä tunniste
+          participatory_space: Mihin osallistumistilaan tämä jäsen kuuluu
+          published: Onko jäsen julkaistu vai ei
+          role: Jäsenen rooli
+          updated_at: Jäsenen viimeisimmän päivityksen ajankohta
         reports:
           created_at: Ilmoituksen luontiaika
           details: Ilmoituksen tiedot
@@ -784,6 +784,7 @@ fi:
           reason: Ilmoituksen syy
           updated_at: Ilmoituksen viimeisimmän päivityksen ajankohta
         users:
+          about: Osallistujan profiilikuvaus
           accepted_tos_version: Käyttäjän palvelun käyttöehtojen hyväksymisaika
           admin: Onko tämä käyttäjä hallintakäyttäjä
           confirmation_sent_at: Käyttäjätilin vahvistusviestin lähetysaika
@@ -794,6 +795,7 @@ fi:
           delete_reason: Käyttäjätilin poistamisen syy
           deleted_at: Käyttäjätilin poistamisen ajankohta
           email: Käyttäjätilin sähköpostiosoite
+          followers_count: Käyttäjää seuraavien osallistujien lukumäärä
           following_count: Käyttäjän seuraamien osallistujien lukumäärä
           id: Käyttäjätilin yksilöivä tunniste
           invitation_accepted_at: Käyttäjätilin kutsun hyväksymisen ajankohta
@@ -801,12 +803,16 @@ fi:
           invitation_sent_at: Käyttäjän kutsun lähetyksen ajankohta
           invitations_count: Käyttäjälle lähetettyjen kutsujen lukumäärä
           invited_by: Kutsun lähettänyt käyttäjä
+          last_sign_in_at: Edellisen kirjautumisen ajankohta
+          last_sign_in_ip: Edellisen kirjautumisen IP-osoite
           locale: Käyttäjän valitsema kieliasetus
           managed: Onko tämä käyttäjätili toisen käyttäjän hallinnoima
           name: Käyttäjän nimi
+          newsletter_notifications_at: Uutiskirjeiden tilauksen ajankohta
           nickname: Käyttäjän nimimerkki
           notification_settings: Käyttäjän määrittämät ilmoitusten asetukset
           notifications_sending_frequency: Käyttäjän vastaanottamien ilmoitusten tiheys
+          officialized_as: Virallistamisen nimi (valtuutettu, kunnanjohtaja, pormestari, jne.)
           officialized_at: Käyttäjän virallistamisen ajankohta
           organization: Käyttäjän organisaatio
           password_updated_at: Salasanan viimeisimmän päivityksen ajankohta
@@ -844,6 +850,7 @@ fi:
       files:
         file_cannot_be_processed: Tiedostoa ei voida käsitellä
         file_resolution_too_large: Tiedoston resoluutio on liian suuri
+        not_inside_organization: Tiedostoa ei ole liitetty mihinkään organisaatioon.
       internal_server_error:
         copied: Teksti kopioitu!
         copy_error_message_clarification: Kopioi virheviesti leikepöydälle
@@ -1039,6 +1046,7 @@ fi:
         file:
           explanation: 'Tiedoston ohjeistus:'
           message_1: On oltava kuva tai asiakirja.
+          message_2: Mikäli lataat kuvan, käytä mieluiten vaakasuuntaista kuvaa, joka ei sisällä ole tekstiä. Palvelu rajaa kuvaa.
         icon:
           explanation: 'Kuvakkeen ohjeistus:'
           message_1: On oltava neliömuotoinen kuva.
@@ -1281,9 +1289,13 @@ fi:
         same_language: Sisältö on lisätty toivomallasi kielellä (%{language}), minkä takia tässä viestissä ei näytetä automaattista käännöstä.
         translated_text: 'Automaattisesti käännetty teksti:'
     notifications:
+      action_error: Ilmoitusasetusten päivittäminen epäonnistui.
       no_notifications: Ei vielä ilmoituksia.
       show:
+        deleted: Sisällön laatija on poistanut tämän sisällön.
         missing_event: Hups, tämä ilmoitus kuuluu kohteeseen, joka ei ole enää käytettävissä. Voit merkitä sen luetuksi.
+        moderated: Moderoija on piilottanut tämän sisällön.
+        not_available: Tämä ilmoitus kuuluu kohteeseen, joka ei ole enää käytettävissä. Voit merkitä sen luetuksi.
     notifications_digest_mailer:
       header:
         daily: Päivittäinen ilmoitusyhteenveto
@@ -1292,6 +1304,7 @@ fi:
       hello: Hei %{name},
       intro:
         daily: 'Tässä on lista edellisen päivän ilmoituksista niistä asioista, joita seuraat:'
+        real_time: 'Tämä on ilmoitus seuraamistasi alustalla tapahtuneista asioista:'
         weekly: 'Tässä on lista edellisen viikon ilmoituksista niistä asioista, joita seuraat:'
       outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat ilmoitukseen liittyviä sisältöjä tai niiden tekijöitä. Voit lopettaa seuraamisen näiden sisältöjen sivuilta.
       see_more: Näytä lisää ilmoituksia
@@ -1434,7 +1447,9 @@ fi:
           title: Miten nämä tiedostot avataan ja miten niiden kanssa työskennellään?
         license:
           body_1_html: '%{organization_name} -palvelun tietokanta on lisensoitu %{link_database} -lisenssillä. Kaikki tietokannan sisällöt on lisensoitu %{link_contents} -lisenssillä.'
+          license_contents_link: https://opendatacommons.org/licenses/dbcl/1.0/
           license_contents_name: Tietokannan sisällön lisenssi
+          license_database_link: https://opendatacommons.org/licenses/odbl/1.0/
           license_database_name: Avoimien tietojen lisenssi
           title: Lisenssi
         title: Avoin data
@@ -1457,6 +1472,7 @@ fi:
         footer_sub_hero:
           footer_sub_hero_body_html: Rakennetaan entistä avoimempi, läpinäkyvämpi ja yhteistyökykyisempi yhteiskunta.<br /> Liity, osallistu ja päätä.
           footer_sub_hero_headline: Tervetuloa yhteisölliseen osallistumispalveluun %{organization}.
+          register: Luo tili
         hero:
           participate: Osallistu
           participate_title: Osallistu prosesseihin alustalla
@@ -1464,6 +1480,7 @@ fi:
         statistics:
           headline: Tilastot
         sub_hero:
+          register: Luo tili
           register_title: Luo tili
       index:
         standalone_pages: Sivut
@@ -1823,16 +1840,16 @@ fi:
           Jos et halua hyväksyä kutsua, jätä tämä viesti huomioimatta.<br />
           Sinulle ei luoda tiliä ennen kuin seuraat yllä olevaa linkkiä ja asetat käyttäjänimen sekä salasanan.
         invited_you_as_admin: "%{invited_by} on kutsunut sinut hallinnoimaan kohdetta %{application}. Voit hyväksyä sen alla olevan linkin kautta."
-        invited_you_as_private_user: "%{invited_by} on kutsunut sinut yksityiseksi käyttäjäksi %{application} -nimiseen palveluun. Voit hyväksyä kutsun alla olevan linkin kautta."
+        invited_you_as_member: "%{invited_by} on kutsunut sinut jäseneksi palveluun %{application}. Voit hyväksyä kutsun alla olevan linkin avulla."
         someone_invited_you: Joku on kutsunut sinut kohteeseen %{application}. Voit hyväksyä sen alla olevan linkin kautta.
         someone_invited_you_as_admin: Joku on kutsunut sinut ylläpitämään palvelua %{application}. Voit hyväksyä kutsun alla olevan linkin avulla.
-        someone_invited_you_as_private_user: Joku on kutsunut sinut yksityiseksi käyttäjäksi %{application} -nimiseen palveluun. Voit hyväksyä kutsun alla olevan linkin kautta.
+        someone_invited_you_as_member: Joku on kutsunut sinut jäseneksi palveluun %{application}. Voit hyväksyä kutsun alla olevan linkin kautta.
         subject: Kutsuohjeet
       invite_admin:
         subject: Sinut on kutsuttu hallinnoimaan palvelua %{organization}
       invite_collaborator:
         subject: Sinut on kutsuttu osallistumaan palvelussa %{organization}
-      invite_private_user:
+      invite_member:
         subject: Sinut on kutsuttu yksityiseen osallistumisprosessiin palvelussa %{organization}
       organization_admin_invitation_instructions:
         subject: Sinut on kutsuttu hallinnoimaan palvelua %{organization}
@@ -2116,6 +2133,8 @@ fi:
         expire_time_html: Istuntosi vanhenee <b><span data-impersonation-warning-target="minutes">%{minutes}</span> minuutin kuluttua</b>.
       language_chooser:
         choose_language: Valitse kieli
+      navigation:
+        aria_label: 'Navigaatiovalikko: %{title}'
       notifications_dashboard:
         mark_all_as_read: Merkitse kaikki luetuiksi
         mark_as_read: Merkitse luetuiksi
diff --git a/decidim-core/config/locales/fr-CA.yml b/decidim-core/config/locales/fr-CA.yml
index 1009ef1600cec..b7958764cccd8 100644
--- a/decidim-core/config/locales/fr-CA.yml
+++ b/decidim-core/config/locales/fr-CA.yml
@@ -164,7 +164,6 @@ fr-CA:
       front_page_link: Aller à la première page
       logo: "Logo officiel de %{organization}"
       opens_in_new_tab: S'ouvre dans un nouvel onglet
-      secondary_menu: Menu secondaire
       skip_button: Passer au contenu principal
     account:
       blocked: Ce compte a été bloqué en raison d'une violation des conditions d'utilisation
@@ -250,6 +249,10 @@ fr-CA:
         results: résultats
       impersonation_log:
         manage: "%{user_name} a représenté %{resource_name} parce que %{reason}"
+      member:
+        create: "%{user_name} a invité %{resource_name} à devenir membre"
+        create_via_csv: "%{user_name} a invité %{resource_name} via CSV à devenir membre"
+        delete: "%{user_name} a supprimé le participant %{resource_name} en tant que membre"
       moderation:
         hide: "%{user_name} a caché une ressource de type %{resource_type} dans l'espace %{space_name}"
         unreport: "%{user_name} a annulé le signalement d'une ressource de type %{resource_type} dans l'espace %{space_name}"
@@ -265,10 +268,6 @@ fr-CA:
       organization:
         update: "%{user_name} a mis à jour les paramètres de l'organisation"
         update_external_domain: "%{user_name} a mis à jour les domaines externes de l'organisation"
-      participatory_space_private_user:
-        create: "%{user_name} invité %{resource_name} pour être un utilisateur privé"
-        create_via_csv: "%{user_name} a invité %{resource_name} via CSV à être un utilisateur privé"
-        delete: "%{user_name} supprimé l'utilisateur %{resource_name} tant qu'utilisateur privé"
       scope:
         create: "%{user_name} a créé le périmètre d'application %{resource_name}"
         create_with_parent: "%{user_name} a créé le périmètre d'application %{resource_name} à l'intérieur du périmètre %{parent_scope}"
@@ -704,13 +703,13 @@ fr-CA:
           updated_at: La date de la dernière mise à jour de cette conversation
         notifications:
           extra: Informations supplémentaires sur cette notification
-        participatory_space_private_users:
-          created_at: La date et l'heure de création de cet utilisateur privé
-          id: L'identifiant unique de cet utilisateur privé
-          privatable_to: À quel espace cet utilisateur privé appartient
-          published: Que cet utilisateur privé soit publié ou non
-          role: Le rôle que cet utilisateur privé a
-          updated_at: La date et l'heure de la dernière mise à jour de cet utilisateur privé
+        participatory_space_members:
+          created_at: La date et l'heure de création de ce membre
+          id: L'identifiant unique de ce membre
+          participatory_space: À quel espace ce membre appartient
+          published: Que ce membre soit publié ou non
+          role: Le rôle que ce membre a
+          updated_at: La date et l'heure de la dernière mise à jour de ce membre
         reports:
           created_at: La date et l'heure de création de ce rapport
           details: Les détails de ce rapport
@@ -1169,8 +1168,10 @@ fr-CA:
       action_error: Un problème est survenu lors de la mise à jour des paramètres de notification.
       no_notifications: Il n'y a pas encore de notifications.
       show:
+        deleted: Le contenu a été supprimé par l'auteur.
         missing_event: Oups, cette notification est liée à un élément qui n'est plus disponible. Vous pouvez la supprimer.
         moderated: Le contenu a été masqué par modération.
+        not_available: Oups, cette notification est liée à un élément qui n'est plus disponible. Vous pouvez la supprimer.
     notifications_digest_mailer:
       header:
         daily: Résumé quotidien des notifications
@@ -1681,17 +1682,17 @@ fr-CA:
         ignore: |-
           Si vous n’acceptez pas l’invitation, veuillez ignorer ce courrier électronique.<br />Votre compte ne sera pas créé tant que vous n’aurez pas accédé au lien ci-dessus et que vous n’aurez pas configuré votre pseudo et votre mot de passe.
         invited_you_as_admin: "%{invited_by} vous a invité en tant qu'administrateur de %{application}. Vous pouvez accepter cette invitation grâce au lien ci-dessous."
-        invited_you_as_private_user: "%{invited_by} vous a invité en tant qu'utilisateur privé de %{application}. Vous pouvez l'accepter via le lien ci-dessous."
+        invited_you_as_member: "%{invited_by} vous a invité en tant que membre de %{application}. Vous pouvez accepter cette invitation via le lien ci-dessous."
         someone_invited_you: Vous avez été invité à %{application}. Vous pouvez accepter cette invitation grâce au lien ci-dessous.
         someone_invited_you_as_admin: Vous avez été invité en tant qu'administrateur de %{application}, vous pouvez l'accepter via le lien ci-dessous.
-        someone_invited_you_as_private_user: Vous avez été invité en tant qu'utilisateur privé de %{application}, vous pouvez l'accepter via le lien ci-dessous.
+        someone_invited_you_as_member: Quelqu'un vous a invité en tant que membre de %{application}, vous pouvez accepter cette invitation via le lien ci-dessous.
         subject: Instructions d'invitation
       invite_admin:
         subject: Vous avez été invité(e) à gérer %{organization}
       invite_collaborator:
         subject: Vous avez été invité à collaborer sur %{organization}
-      invite_private_user:
-        subject: Vous avez été invité(e) à une concertation privés sur %{organization}
+      invite_member:
+        subject: Vous avez été invité(e) à un processus participatif privé sur %{organization}
       organization_admin_invitation_instructions:
         subject: Vous avez été invité(e) à gérer %{organization}
       password_change:
diff --git a/decidim-core/config/locales/fr.yml b/decidim-core/config/locales/fr.yml
index 50759fa79a744..1abdc1f399ab1 100644
--- a/decidim-core/config/locales/fr.yml
+++ b/decidim-core/config/locales/fr.yml
@@ -164,7 +164,6 @@ fr:
       front_page_link: Aller à la première page
       logo: "Logo officiel de %{organization}"
       opens_in_new_tab: S'ouvre dans un nouvel onglet
-      secondary_menu: Menu secondaire
       skip_button: Passer au contenu principal
     account:
       blocked: Ce compte a été bloqué en raison d'une violation des conditions d'utilisation
@@ -250,6 +249,10 @@ fr:
         results: résultats
       impersonation_log:
         manage: "%{user_name} a représenté %{resource_name} parce que %{reason}"
+      member:
+        create: "%{user_name} a invité %{resource_name} à devenir membre"
+        create_via_csv: "%{user_name} a invité %{resource_name} via CSV à devenir membre"
+        delete: "%{user_name} a supprimé le participant %{resource_name} en tant que membre"
       moderation:
         hide: "%{user_name} a caché une ressource de type %{resource_type} dans l'espace %{space_name}"
         unreport: "%{user_name} a annulé le signalement d'une ressource de type %{resource_type} dans l'espace %{space_name}"
@@ -265,10 +268,6 @@ fr:
       organization:
         update: "%{user_name} a mis à jour les paramètres de l'organisation"
         update_external_domain: "%{user_name} a mis à jour les domaines externes de l'organisation"
-      participatory_space_private_user:
-        create: "%{user_name} invité %{resource_name} pour être un utilisateur privé"
-        create_via_csv: "%{user_name} a invité %{resource_name} via CSV à être un utilisateur privé"
-        delete: "%{user_name} supprimé l'utilisateur %{resource_name} tant qu'utilisateur privé"
       scope:
         create: "%{user_name} a créé le périmètre d'application %{resource_name}"
         create_with_parent: "%{user_name} a créé le périmètre d'application %{resource_name} à l'intérieur du périmètre %{parent_scope}"
@@ -704,13 +703,13 @@ fr:
           updated_at: La date de la dernière mise à jour de cette conversation
         notifications:
           extra: Informations supplémentaires sur cette notification
-        participatory_space_private_users:
-          created_at: La date et l'heure de création de cet utilisateur privé
-          id: L'identifiant unique de cet utilisateur privé
-          privatable_to: À quel espace cet utilisateur privé appartient
-          published: Que cet utilisateur privé soit publié ou non
-          role: Le rôle que cet utilisateur privé a
-          updated_at: La date et l'heure de la dernière mise à jour de cet utilisateur privé
+        participatory_space_members:
+          created_at: La date et l'heure de création de ce membre
+          id: L'identifiant unique de ce membre
+          participatory_space: À quel espace ce membre appartient
+          published: Que ce membre soit publié ou non
+          role: Le rôle que ce membre a
+          updated_at: La date et l'heure de la dernière mise à jour de ce membre
         reports:
           created_at: La date et l'heure de création de ce rapport
           details: Les détails de ce rapport
@@ -1169,8 +1168,10 @@ fr:
       action_error: Un problème est survenu lors de la mise à jour des paramètres de notification.
       no_notifications: Il n'y a pas encore de notifications.
       show:
+        deleted: Le contenu a été supprimé par l'auteur.
         missing_event: Oups, cette notification est liée à un élément qui n'est plus disponible. Vous pouvez la supprimer.
         moderated: Le contenu a été masqué par modération.
+        not_available: Oups, cette notification est liée à un élément qui n'est plus disponible. Vous pouvez la supprimer.
     notifications_digest_mailer:
       header:
         daily: Résumé quotidien des notifications
@@ -1681,17 +1682,17 @@ fr:
         ignore: |-
           Si vous n’acceptez pas l’invitation, veuillez ignorer ce courrier électronique.<br />Votre compte ne sera pas créé tant que vous n’aurez pas accédé au lien ci-dessus et que vous n’aurez pas configuré votre pseudo et votre mot de passe.
         invited_you_as_admin: "%{invited_by} vous a invité en tant qu'administrateur de %{application}. Vous pouvez accepter cette invitation grâce au lien ci-dessous."
-        invited_you_as_private_user: "%{invited_by} vous a invité en tant qu'utilisateur privé de %{application}. Vous pouvez l'accepter via le lien ci-dessous."
+        invited_you_as_member: "%{invited_by} vous a invité en tant que membre de %{application}. Vous pouvez accepter cette invitation via le lien ci-dessous."
         someone_invited_you: Vous avez été invité à %{application}. Vous pouvez accepter cette invitation grâce au lien ci-dessous.
         someone_invited_you_as_admin: Vous avez été invité en tant qu'administrateur de %{application}, vous pouvez l'accepter via le lien ci-dessous.
-        someone_invited_you_as_private_user: Vous avez été invité en tant qu'utilisateur privé de %{application}, vous pouvez l'accepter via le lien ci-dessous.
+        someone_invited_you_as_member: Quelqu'un vous a invité en tant que membre de %{application}, vous pouvez accepter cette invitation via le lien ci-dessous.
         subject: Instructions d'invitation
       invite_admin:
         subject: Vous avez été invité(e) à gérer %{organization}
       invite_collaborator:
         subject: Vous avez été invité à collaborer sur %{organization}
-      invite_private_user:
-        subject: Vous avez été invité(e) à une concertation privés sur %{organization}
+      invite_member:
+        subject: Vous avez été invité(e) à un processus participatif privé sur %{organization}
       organization_admin_invitation_instructions:
         subject: Vous avez été invité(e) à gérer %{organization}
       password_change:
diff --git a/decidim-core/config/locales/gl.yml b/decidim-core/config/locales/gl.yml
index 5e30ec16bbad4..4df1864fd2b35 100644
--- a/decidim-core/config/locales/gl.yml
+++ b/decidim-core/config/locales/gl.yml
@@ -109,9 +109,6 @@ gl:
         update: "%{user_name} actualizou a aplicación %{resource_name} OAuth"
       organization:
         update: "%{user_name} actualizou a configuración da organización"
-      participatory_space_private_user:
-        create: "%{user_name} invitados %{resource_name} para ser un usuario privado"
-        delete: "%{user_name} eliminou o usuario %{resource_name} como usuario privado"
       scope:
         create: "O %{user_name} creou o alcance %{resource_name}"
         create_with_parent: "%{user_name} creou o alcance %{resource_name} no ámbito %{parent_scope}"
@@ -703,10 +700,8 @@ gl:
         decline: Declina a invitación
         hello: Ola %{email},
         invited_you_as_admin: "%{invited_by} invitoute como administrador de %{application}. Podes aceptalo a través da seguinte ligazón."
-        invited_you_as_private_user: "%{invited_by} convidoute como usuario privado de %{application}. Podes aceptalo a través da seguinte ligazón."
         someone_invited_you: Alguén te invitou a %{application}. Podes aceptalo a través da seguinte ligazón.
         someone_invited_you_as_admin: Alguén te convidou como administrador de %{application}, podes aceptalo a través da seguinte ligazón.
-        someone_invited_you_as_private_user: Alguén te convidou como usuario privado de %{application}, podes aceptalo a través da seguinte ligazón.
         subject: Instrucións de invitación
       password_change:
         greeting: Ola %{recipient}!
diff --git a/decidim-core/config/locales/hu.yml b/decidim-core/config/locales/hu.yml
index dae16c42eb94c..5e739e6f041b5 100644
--- a/decidim-core/config/locales/hu.yml
+++ b/decidim-core/config/locales/hu.yml
@@ -197,10 +197,6 @@ hu:
       organization:
         update: "%{user_name} frissítette a szervezet beállításait"
         update_external_domain: "%{user_name} frissítette a szervezet külső domainjeit"
-      participatory_space_private_user:
-        create: "%{user_name} meghívott %{resource_name} privát felhasználónak"
-        create_via_csv: "%{user_name} meghívta %{resource_name} önt, hogy privát résztvevő legyen"
-        delete: "%{user_name} eltávolította a felhasználót %{resource_name} privát felhasználóként"
       scope:
         create: "%{user_name} létrehozta a(z) %{resource_name} hatáskört"
         create_with_parent: "%{user_name} létrehozta a(z) %{resource_name} hatáskört ezen belül: %{parent_scope}"
@@ -1213,17 +1209,13 @@ hu:
           Ha nem szeretné elfogadni a meghívást, hagyja figyelmen kívül ezt az e-mailt.<br />
           Fiókját addig nem hozzuk létre, amíg nem használja a fenti hivatkozást, és nem adja meg becenevét és jelszavát.
         invited_you_as_admin: "%{invited_by} meghívott, mint admint, hogy csatlakozz ehhez: %{application}. Jelezz vissza az alábbi linken."
-        invited_you_as_private_user: "%{invited_by} meghívott, mint privát felhasználót, hogy csatlakozz ehhez: %{application}. Jelezz vissza az alábbi linken."
         someone_invited_you: 'Valaki meghívott, hogy csatlakozz ehhez: %{application}. Jelezz vissza az alábbi linken.'
         someone_invited_you_as_admin: 'Valaki meghívott, mint admint, hogy csatlakozz ehhez: %{application}. Jelezz vissza az alábbi linken.'
-        someone_invited_you_as_private_user: 'Valaki meghívott, mint privát felhasználót, hogy csatlakozz ehhez: %{application}. Jelezz vissza az alábbi linken.'
         subject: Meghívó utasítások
       invite_admin:
         subject: 'Meghívást kapott, hogy ezt kezelje a következő szervezetet: %{organization}'
       invite_collaborator:
         subject: Meghívták együttműködésre a(z) %{organization} szervezetben
-      invite_private_user:
-        subject: Meghívtak egy privát folyamatban való részvételre a (%{organization}) szervezetnél
       organization_admin_invitation_instructions:
         subject: 'Meghívást kapott, hogy kezelje a következő szervezetet: %{organization}'
       password_change:
diff --git a/decidim-core/config/locales/id-ID.yml b/decidim-core/config/locales/id-ID.yml
index 6fce30b52ef4c..1a28d7880f575 100644
--- a/decidim-core/config/locales/id-ID.yml
+++ b/decidim-core/config/locales/id-ID.yml
@@ -96,9 +96,6 @@ id:
         update: "%{user_name} memperbarui aplikasi %{resource_name} OAuth"
       organization:
         update: "%{user_name} memperbarui pengaturan organisasi"
-      participatory_space_private_user:
-        create: "%{user_name} diundang %{resource_name} untuk menjadi pengguna pribadi"
-        delete: "%{user_name} menghapus pengguna %{resource_name} sebagai pengguna pribadi"
       scope:
         create: "%{user_name} menciptakan %{resource_name} ruang lingkup"
         create_with_parent: "%{user_name} menciptakan %{resource_name} ruang lingkup di dalam %{parent_scope} ruang lingkup"
@@ -626,10 +623,8 @@ id:
         decline: Tolak undangan
         hello: Halo %{email},
         invited_you_as_admin: "%{invited_by} telah mengundang Anda sebagai admin %{application}. Anda dapat menerimanya melalui tautan di bawah ini."
-        invited_you_as_private_user: "%{invited_by} telah mengundang Anda sebagai pengguna pribadi dari %{application}. Anda dapat menerimanya melalui tautan di bawah ini."
         someone_invited_you: Seseorang telah mengundang Anda ke %{application}. Anda dapat menerimanya melalui tautan di bawah ini.
         someone_invited_you_as_admin: Seseorang telah mengundang Anda sebagai admin %{application}, Anda dapat menerimanya melalui tautan di bawah.
-        someone_invited_you_as_private_user: Seseorang telah mengundang Anda sebagai pengguna pribadi %{application}, Anda dapat menerimanya melalui tautan di bawah ini.
         subject: Instruksi undangan
       password_change:
         greeting: Halo %{recipient}!
diff --git a/decidim-core/config/locales/it.yml b/decidim-core/config/locales/it.yml
index 57a7b76e469d3..6199d2dde1612 100644
--- a/decidim-core/config/locales/it.yml
+++ b/decidim-core/config/locales/it.yml
@@ -204,10 +204,6 @@ it:
       organization:
         update: "%{user_name} aggiornato le impostazioni dell'organizzazione"
         update_external_domain: "%{user_name} ha aggiornato i domini esterni dell'organizzazione"
-      participatory_space_private_user:
-        create: "%{user_name} invitato %{resource_name} a essere un utente privato"
-        create_via_csv: "%{user_name} ha invitato %{resource_name} tramite csv a unirsi come partecipante privato"
-        delete: "%{user_name} rimosso l'utente %{resource_name} come utente privato"
       scope:
         create: "%{user_name} ha creato l'ambito %{resource_name}"
         create_with_parent: "%{user_name} ha creato l'ambito %{resource_name} all'interno dell'ambito %{parent_scope}"
@@ -1030,10 +1026,8 @@ it:
         decline: Rifiuta l'invito
         hello: Ciao %{email},
         invited_you_as_admin: "%{invited_by} ti ha invitato come amministratore di %{application}. Puoi accettare l'invito facendo clic sul link sottostante."
-        invited_you_as_private_user: "%{invited_by} ti ha invitato come utente privato di %{application}. Puoi accettarlo tramite il link sottostante."
         someone_invited_you: Qualcuno ti ha invitato a %{application}. Puoi accettare l'invito facendo clic sul link sottostante.
         someone_invited_you_as_admin: Qualcuno ti ha invitato come amministratore di %{application}. Puoi accettare l'invito facendo clic sul link sottostante.
-        someone_invited_you_as_private_user: Qualcuno ti ha invitato come private_user di %{application}, puoi accettarlo tramite il link sottostante.
         subject: Istruzioni di invito
       password_change:
         greeting: Ciao %{recipient}!
diff --git a/decidim-core/config/locales/ja.yml b/decidim-core/config/locales/ja.yml
index 958033364a424..5c026659bb67a 100644
--- a/decidim-core/config/locales/ja.yml
+++ b/decidim-core/config/locales/ja.yml
@@ -107,10 +107,10 @@ ja:
     formats:
       decidim_short: "%Y/%m/%d"
       decidim_short_dashed: "%Y-%m-%d"
-      decidim_short_with_month_name_short: "%Y %b %d"
+      decidim_short_with_month_name_short: "%Y年%-m月%-d日"
       decidim_with_day_and_month_name: "%Y %b %d %A"
-      decidim_with_month_name: "%Y %B %d"
-      decidim_with_month_name_short: "%b %d"
+      decidim_with_month_name: "%Y年%-m月%-d日"
+      decidim_with_month_name_short: "%-m月%-d日"
       help:
         date_format: 'フォーマット: dd/mm/yyyy'
       order: d-m-y
@@ -166,7 +166,6 @@ ja:
       front_page_link: フロントページに移動
       logo: "%{organization}の公式ロゴ"
       opens_in_new_tab: 新しいタブで開く
-      secondary_menu: セカンダリメニュー
       skip_button: メインコンテンツにスキップ
     account:
       blocked: このアカウントは利用規約に違反しているためブロックされています
@@ -253,6 +252,10 @@ ja:
         results: 結果
       impersonation_log:
         manage: "%{user_name} は %{reason} により %{resource_name} を管理しています。"
+      member:
+        create: "%{user_name} が %{resource_name} をメンバーに招待しました"
+        create_via_csv: "%{user_name} が %{resource_name} をCSV経由でメンバーに招待しました"
+        delete: "%{user_name} が参加者 %{resource_name} をメンバーから削除しました"
       moderation:
         bulk_hide: "%{user_name} が %{reported_count} リソースを非表示にしました"
         bulk_unhide: "%{user_name} が %{reported_count} 件のリソースの非表示を解除しました"
@@ -271,10 +274,6 @@ ja:
       organization:
         update: "%{user_name} が組織設定を更新しました"
         update_external_domain: "%{user_name} が組織の外部ドメインを更新しました"
-      participatory_space_private_user:
-        create: "%{user_name} が %{resource_name} をプライベート参加者に招待しました"
-        create_via_csv: "%{user_name} が %{resource_name} をCSV経由でプライベート参加者に招待しました"
-        delete: "%{user_name} がプライベート参加者の %{resource_name} を削除しました"
       scope:
         create: "%{user_name} が %{resource_name} スコープを作成しました"
         create_with_parent: "%{user_name} は %{resource_name} スコープ内で %{parent_scope} スコープを作成しました"
@@ -742,6 +741,7 @@ ja:
           created_at: この会話の作成日時
           id: この会話の固有ID
           messages: この会話のメッセージ
+          updated_at: この会話の最終更新日時
         notifications:
           created_at: 通知の作成日時
           event_class: 通知をトリガーしたイベントのクラス
@@ -750,13 +750,13 @@ ja:
           id: この通知の固有ID
           resource_type: 通知に関連するリソースの種類
           updated_at: 通知の最終更新日時
-        participatory_space_private_users:
-          created_at: プライベートユーザーの作成日時
-          id: このプライベートユーザーの固有ID
-          privatable_to: このプライベートユーザーが所属する領域：
-          published: このプライベートユーザーが公開されているか否か
-          role: このプライベートユーザーが持つ役割
-          updated_at: プライベートユーザーの最終更新日時
+        participatory_space_members:
+          created_at: メンバーの作成日時
+          id: メンバーの固有ID
+          participatory_space: このメンバーが所属しているスペース
+          published: このメンバーが公開されているか否か
+          role: このメンバーが持っている役割
+          updated_at: このメンバーの最終更新日時
         reports:
           created_at: レポートの作成日時
           details: レポートの詳細
@@ -766,6 +766,7 @@ ja:
           reason: レポートの理由
           updated_at: レポートの最終更新日時
         users:
+          about: この参加者のプロフィール説明
           accepted_tos_version: プラットフォームの利用規約がユーザーに承諾された日時
           admin: このユーザーが管理者であるかどうか
           confirmation_sent_at: 確認の送信日時
@@ -776,6 +777,7 @@ ja:
           delete_reason: このユーザーの削除理由
           deleted_at: このユーザーの削除日時
           email: このユーザーのメールアドレス
+          followers_count: このユーザーをフォローしている参加者数
           following_count: このユーザーがフォローしている参加者数
           id: ユーザーの固有ID
           invitation_accepted_at: 招待の承認日時
@@ -783,12 +785,16 @@ ja:
           invitation_sent_at: 招待の送信日時
           invitations_count: このユーザーに送信された招待の数
           invited_by: このユーザーを招待したユーザー
+          last_sign_in_at: 前回のログイン日時
+          last_sign_in_ip: 前回ログイン時のIPアドレス
           locale: このユーザーが選択したロケール（言語）
           managed: このユーザーが別のユーザーによって管理されているかどうか
           name: ユーザー名
+          newsletter_notifications_at: この参加者のニュースレター購読登録日時
           nickname: ユーザーのニックネーム
           notification_settings: このユーザーが選択した通知設定
           notifications_sending_frequency: このユーザーが受け取る通知の頻度
+          officialized_as: 役職の説明（市長、局長など）
           officialized_at: このユーザーの公式化日時
           organization: このユーザーが所属する組織
           password_updated_at: パスワードの最終更新日時
@@ -826,6 +832,7 @@ ja:
       files:
         file_cannot_be_processed: ファイルを処理できません
         file_resolution_too_large: ファイルの解像度が大きすぎます
+        not_inside_organization: ファイルはどの組織にも紐ついていません。
       internal_server_error:
         copied: テキストをコピーしました
         copy_error_message_clarification: エラーメッセージをクリップボードにコピー
@@ -1022,6 +1029,7 @@ ja:
         file:
           explanation: 'ファイルのガイダンス:'
           message_1: 画像またはドキュメントである必要があります。
+          message_2: 画像を使用する場合は、テキストが含まれない横長の画像が最適です。プラットフォーム側で画像をトリミングします。
         icon:
           explanation: 'アイコンのガイド:'
           message_1: 正方形の画像でなければなりません。
@@ -1263,9 +1271,13 @@ ja:
         same_language: コンテンツはあなたの設定された言語(%{language}) で投稿されました。このため、このメールには自動翻訳は表示されません。
         translated_text: '自動翻訳されたテキスト:'
     notifications:
+      action_error: 通知設定の更新に問題が発生しました。
       no_notifications: まだ通知はありません。
       show:
+        deleted: コンテンツは著者によって削除されました。
         missing_event: この通知は利用できなくなった要素に属しています。破棄してください。
+        moderated: コンテンツはモデレーションにより非表示になっています。
+        not_available: この通知は現在利用できないアイテムに関するものです。破棄できます。
     notifications_digest_mailer:
       header:
         daily: 日次の通知のダイジェスト
@@ -1274,6 +1286,7 @@ ja:
       hello: こんにちは %{name} さん、
       intro:
         daily: 'あなたがフォローしているアクティビティに基づいた最終日以降の通知です:'
+        real_time: 'これはあなたがフォローしている活動に関する通知です：'
         weekly: 'あなたがフォローしているアクティビティに基づいた先週以降の通知です:'
       outro: このコンテンツまたは著者をフォローしているため、これらの通知を受け取りました。それぞれのページからフォローを解除できます。
       see_more: 他の通知を見る
@@ -1415,7 +1428,9 @@ ja:
           title: これらのファイルを開いて操作する方法
         license:
           body_1_html: この %{organization_name} データベースは、 %{link_database} の下で利用可能になります。データベースの個々のコンテンツの権利は、 %{link_contents} の下でライセンスされます。
+          license_contents_link: https://opendatacommons.org/licenses/dbcl/1.0/
           license_contents_name: Database Contents License
+          license_database_link: https://opendatacommons.org/licenses/odbl/1.0/
           license_database_name: Open Database License
           title: ライセンス
         title: オープンデータ
@@ -1438,6 +1453,7 @@ ja:
         footer_sub_hero:
           footer_sub_hero_body_html: より開かれた透明性のあるコラボレーティブな社会を構築しましょう。<br /> 一緒に参加し、決定しましょう。
           footer_sub_hero_headline: '%{organization} 参加型プラットフォームへようこそ。'
+          register: アカウントを作成
         hero:
           participate: 参加
           participate_title: プラットフォームのプロセスに参加する
@@ -1445,6 +1461,7 @@ ja:
         statistics:
           headline: 統計情報
         sub_hero:
+          register: アカウントを作成
           register_title: アカウントを作成
       index:
         standalone_pages: ページ
@@ -1802,17 +1819,17 @@ ja:
         ignore: |-
           招待を受け入れたくない場合は、このメールを無視してください。<br />上記のリンクにアクセスし、アカウントIDとパスワードを設定するまで、あなたのアカウントは作成されません。
         invited_you_as_admin: "%{invited_by} さんが %{application}の管理者としてあなたを招待しました。以下のリンクから承認できます。"
-        invited_you_as_private_user: "%{invited_by} が %{application} のプライベート参加者としてあなたを招待しました。以下のリンクから承認できます。"
+        invited_you_as_member: "%{invited_by} さんより %{application}のメンバーとして招待されています。下記のリンクより承諾してください。"
         someone_invited_you: '%{application} にあなたを招待しました。以下のリンクから受け入れることができます。'
         someone_invited_you_as_admin: '%{application} の管理者としてあなたを招待しました。以下のリンクから承認できます。'
-        someone_invited_you_as_private_user: '%{application} のプライベート参加者としてあなたは招待されています。以下のリンクから承認できます。'
+        someone_invited_you_as_member: 誰かがあなたを %{application} のメンバーとして招待しています。下記リンクより承諾してください。
         subject: 招待の説明
       invite_admin:
         subject: '%{organization} を管理するために招待されています'
       invite_collaborator:
         subject: あなたは %{organization} で共同作業に招待されています
-      invite_private_user:
-        subject: あなたは %{organization} のプライベート参加プロセスに招待されています
+      invite_member:
+        subject: 非公開の参加型プロセス %{organization} に招待されています
       organization_admin_invitation_instructions:
         subject: '%{organization} を管理するために招待されています'
       password_change:
@@ -2092,6 +2109,8 @@ ja:
         expire_time_html: このログインセッションは <b><span data-impersonation-warning-target="minutes">%{minutes}</span> 分後に無効になります。</b>。
       language_chooser:
         choose_language: 言語を選択
+      navigation:
+        aria_label: 'ナビゲーションメニュー: %{title}'
       notifications_dashboard:
         mark_all_as_read: すべての通知を削除する
         mark_as_read: 既読にする
@@ -2190,16 +2209,16 @@ ja:
       day_of_year: "%y.%m.%d"
       ddmm: "%m/%d"
       ddmmyyyy: "%Y/%m/%d"
-      decidim_day_of_year: "%Y %B %d"
+      decidim_day_of_year: "%Y年%-m月%-d日"
       decidim_short: "%Y/%m/%d %H:%M"
       default: "%Y %d %b (%a) %H:%M:%S %z"
       devise:
         mailer:
           invitation_instructions:
-            accept_until_format: "%Y %B %d, %I:%M %p"
+            accept_until_format: "%Y/%m/%d %I:%M %p"
       help:
         time_format: 'フォーマット: hh:mm'
-      long: "%B %d, %Y %H:%M"
+      long: "%Y/%m/%d %H:%M"
       long_dashed: "%Y-%m-%d %H:%M:%S"
       long_with_particles: "%Y年%m月%d日 %H:%M"
       short: "%Y/%m/%d %H:%M"
diff --git a/decidim-core/config/locales/ko.yml b/decidim-core/config/locales/ko.yml
index 8a7b3b861deda..867fae663ef9a 100644
--- a/decidim-core/config/locales/ko.yml
+++ b/decidim-core/config/locales/ko.yml
@@ -1 +1,3 @@
 ko:
+  locale:
+    name: 한국어
diff --git a/decidim-core/config/locales/lb.yml b/decidim-core/config/locales/lb.yml
index 06ff8beeed07a..cea1645fb3d55 100644
--- a/decidim-core/config/locales/lb.yml
+++ b/decidim-core/config/locales/lb.yml
@@ -118,10 +118,6 @@ lb:
         update: "%{user_name} huet d'OAuth-Applikation %{resource_name} aktualiséiert"
       organization:
         update: "%{user_name} huet d'Organisatiouns-Astellungen aktualiséiert"
-      participatory_space_private_user:
-        create: "%{user_name} huet d' %{resource_name} als privaten Benotzer agelueden"
-        create_via_csv: "%{user_name} huet d'%{resource_name} per CSV als privaten Teilnehmer agelueden"
-        delete: "%{user_name} huet den Benotzer %{resource_name} als privaten Benotzer geläscht"
       scope:
         create: "%{user_name} huet den Beräich %{resource_name} erstallt"
         create_with_parent: "%{user_name} huet den Beräich %{resource_name} am iwwergeuerdenten Beräich %{parent_scope} erstallt"
@@ -886,10 +882,8 @@ lb:
         decline: Invitatioun refuséieren
         hello: Moien %{email},
         invited_you_as_admin: "%{invited_by} huet dech als Admin vun %{application} aglueden. Du kanns se unhuelen andeems op den Link ënnen gees."
-        invited_you_as_private_user: "%{invited_by} huet dech als privaten Teilnehmer vun %{application} agelueden. Du déi kanns iwwer den folgenden Link unhuelen."
         someone_invited_you: Et huet een dech fir d' %{application} agelueden. Du kanns dat unhuelen andeems du op op den Link ënnen gees.
         someone_invited_you_as_admin: Et huet een dech als Admin op %{application} agelueden, du kanns dat iwwer den Link ënnen unhuelen.
-        someone_invited_you_as_private_user: Jemand hat dich als private_user von %{application}eingeladen, du kannst es über den folgenden Link akzeptieren.
         subject: Instruktiounen fir d'Invitatioun
       password_change:
         greeting: Moien %{recipient}!
diff --git a/decidim-core/config/locales/lt.yml b/decidim-core/config/locales/lt.yml
index 7e2f3abc87d5c..5ba6692f34ccd 100644
--- a/decidim-core/config/locales/lt.yml
+++ b/decidim-core/config/locales/lt.yml
@@ -246,10 +246,6 @@ lt:
       organization:
         update: "%{user_name} atnaujino organizacijos nustatymus"
         update_external_domain: "%{user_name} atnaujino organizacijos išorinius domenus"
-      participatory_space_private_user:
-        create: "%{user_name} pakvietė %{resource_name} būti privačiu dalyviu"
-        create_via_csv: "%{user_name} pakvietė %{resource_name} per CSV tapti privačiu dalyviu"
-        delete: "%{user_name} pašalino %{resource_name} dalyvį iš privačių dalyvių"
       scope:
         create: "%{user_name} sukūrė %{resource_name} sritį"
         create_with_parent: "%{user_name} sukūrė %{resource_name} sritį %{parent_scope} srityje"
@@ -1299,17 +1295,13 @@ lt:
           Jei nenorite priimti kvietimo, nekreipkite dėmesio į šį e. laišką. <br />
           jūsų paskyra nebus sukurta tol, kol nespustelėsite pirmiau pateiktos nuorodos ir nenustatysite savo naudotojo vardo ir slaptažodžio.
         invited_you_as_admin: "%{invited_by} pakvietė jus kaip %{application} administratorių. Kvietimą galite priimti spustelėję toliau pateikiamą nuorodą."
-        invited_you_as_private_user: "%{invited_by} pakvietė jus kaip %{application} privatų dalyvį. Kvietimą galite priimti spustelėję toliau pateikiamą nuorodą."
         someone_invited_you: Kažkas pakvietė jus į %{application}. Kvietimą galite priimti spustelėję toliau pateikiamą nuorodą.
         someone_invited_you_as_admin: Kažkas pakvietė jus kaip %{application} administratorių. Kvietimą galite priimti spustelėję toliau pateikiamą nuorodą.
-        someone_invited_you_as_private_user: Kažkas pakvietė jus kaip %{application} privatų dalyvį. Kvietimą galite priimti spustelėję toliau pateikiamą nuorodą.
         subject: Kvietimo nurodymai
       invite_admin:
         subject: Esate pakviestas tvarkyti %{organization}
       invite_collaborator:
         subject: Esate pakviesta(-s) bendradarbiauti %{organization}
-      invite_private_user:
-        subject: Esate pakviesta(-s) į %{organization} uždarą dalyvaujamąjį procesą
       organization_admin_invitation_instructions:
         subject: Esate pakviesta(-s) tvarkyti %{organization}
       password_change:
diff --git a/decidim-core/config/locales/lv.yml b/decidim-core/config/locales/lv.yml
index cb5b98ac9c57a..45107a82eb88d 100644
--- a/decidim-core/config/locales/lv.yml
+++ b/decidim-core/config/locales/lv.yml
@@ -110,9 +110,6 @@ lv:
         update: "%{user_name} atjaunināja %{resource_name} OAuth lietojumprogrammu"
       organization:
         update: "%{user_name} atjaunināja organizācijas iestatījumus"
-      participatory_space_private_user:
-        create: "%{user_name} uzaicināja %{resource_name} par privāto dalībnieku"
-        delete: "%{user_name} noņēma %{resource_name} kā privāto dalībnieku"
       scope:
         create: "%{user_name} izveidoja darbības tvērumu %{resource_name}"
         create_with_parent: "%{user_name} izveidoja darbības tvērumu %{resource_name} darbības tvērumā %{parent_scope}"
@@ -736,10 +733,8 @@ lv:
         decline: Noraidīt ielūgumu
         hello: Sveiki, %{email}!
         invited_you_as_admin: "%{invited_by} uzaicināja jūs kā %{application} administratoru. Jūs varat ielūgumu pieņemt, izmantojot turpmāk esošo saiti."
-        invited_you_as_private_user: "%{invited_by} uzaicināja jūs kā %{application} privātu dalībnieku. Jūs varat ielūgumu pieņemt, izmantojot zemāk esošo saiti."
         someone_invited_you: Kāds jūs ir uzaicinājis uz %{application}. Jūs varat ielūgumu pieņemt, izmantojot turpmāk esošo saiti.
         someone_invited_you_as_admin: Kāds ir uzaicinājis jūs kā %{application} administratoru. Jūs varat ielūgumu pieņemt, izmantojot zemāk esošo saiti.
-        someone_invited_you_as_private_user: Kāds ir uzaicinājis jūs kā %{application} privātu dalībnieku. Jūs varat ielūgumu pieņemt, izmantojot zemāk esošo saiti.
         subject: Ielūgumu norādījumi
       password_change:
         greeting: Sveiki, %{recipient}!
diff --git a/decidim-core/config/locales/mt.yml b/decidim-core/config/locales/mt.yml
index f7aabc7149a9b..b5b1e3cbc583f 100644
--- a/decidim-core/config/locales/mt.yml
+++ b/decidim-core/config/locales/mt.yml
@@ -1 +1,3 @@
 mt:
+  locale:
+    name: Malti
diff --git a/decidim-core/config/locales/nl.yml b/decidim-core/config/locales/nl.yml
index 628e7378f1ad9..584a3217c5034 100644
--- a/decidim-core/config/locales/nl.yml
+++ b/decidim-core/config/locales/nl.yml
@@ -125,10 +125,6 @@ nl:
         update: "%{user_name} heeft de %{resource_name} OAuth-toepassing bijgewerkt"
       organization:
         update: "%{user_name} heeft de organisatie-instellingen bijgewerkt"
-      participatory_space_private_user:
-        create: "%{user_name} heeft %{resource_name} uitgenodigd om een privé deelnemer te zijn"
-        create_via_csv: "%{user_name} heeft %{resource_name} uitgenodigd als privé deelnemer"
-        delete: "%{user_name} heeft de deelnemer %{resource_name} verwijderd als privé-deelnemer"
       scope:
         create: "%{user_name} heeft het bereik %{resource_name} gemaakt"
         create_with_parent: "%{user_name} heeft het bereik %{resource_name} gemaakt binnen het bereik %{parent_scope}"
@@ -879,10 +875,8 @@ nl:
         decline: Uitnodiging afwijzen
         hello: Hallo %{email},
         invited_you_as_admin: "%{invited_by} heeft je uitgenodigd als admin van %{application}. U kunt het accepteren via de onderstaande link."
-        invited_you_as_private_user: "%{invited_by} heeft je uitgenodigd als een privé deelnemer van %{application}. Accepteren kan via onderstaande link."
         someone_invited_you: Iemand heeft u uitgenodigd voor %{application}. U kunt het accepteren via de onderstaande link.
         someone_invited_you_as_admin: Iemand heeft u uitgenodigd als administrator van %{application}, u kunt het accepteren via onderstaande link.
-        someone_invited_you_as_private_user: Iemand heeft je uitgenodigd als privé-deelnemer van %{application}, je kunt het accepteren via de onderstaande link.
         subject: Instructies voor de uitnodiging
       password_change:
         greeting: Hallo %{recipient}!
diff --git a/decidim-core/config/locales/no.yml b/decidim-core/config/locales/no.yml
index 81d37093d11a1..feec9af15d660 100644
--- a/decidim-core/config/locales/no.yml
+++ b/decidim-core/config/locales/no.yml
@@ -127,10 +127,6 @@
         update: "%{user_name} oppdaterte %{resource_name} OAuth applikasjonen"
       organization:
         update: "%{user_name} oppdaterte organisasjonens innstillinger"
-      participatory_space_private_user:
-        create: "%{user_name} inviterte %{resource_name} til å bli en privat deltaker"
-        create_via_csv: "%{user_name} inviterte %{resource_name} via CSV til å være privat deltaker"
-        delete: "%{user_name} fjernet deltakeren %{resource_name} som en privat deltaker"
       scope:
         create: "%{user_name} laget temaet %{resource_name}"
         create_with_parent: "%{user_name} lagde %{resource_name} temaet inni %{parent_scope} temaet"
@@ -910,10 +906,8 @@
         decline: Avvis invitasjon
         hello: Hei %{email},
         invited_you_as_admin: "%{invited_by} har invitert deg som en admin av %{application}. Du kan godta via lenken nedenfor."
-        invited_you_as_private_user: "%{invited_by} har invitert deg som en privat deltaker av %{application}. Du kan godta via lenken nedenfor."
         someone_invited_you: Noen har invitert deg til %{application}. Du kan godta det via lenken nedenfor.
         someone_invited_you_as_admin: Noen har invitert deg som en administrator av %{application}, du kan godta det via lenken nedenfor.
-        someone_invited_you_as_private_user: Noen har invitert deg som privat deltaker av %{application}, du kan godta det via lenken nedenfor.
         subject: Invitasjonsinstruksjoner
       password_change:
         greeting: Hei %{recipient}!
diff --git a/decidim-core/config/locales/pl.yml b/decidim-core/config/locales/pl.yml
index db4975782628f..bf6243e2763c1 100644
--- a/decidim-core/config/locales/pl.yml
+++ b/decidim-core/config/locales/pl.yml
@@ -219,10 +219,6 @@ pl:
       organization:
         update: "%{user_name} zaktualizował(a) ustawienia organizacji"
         update_external_domain: "%{user_name} zaktualizował zewnętrzne domeny organizacji"
-      participatory_space_private_user:
-        create: "%{user_name} zaprosił(a) %{resource_name} jako użytkownika prywatnego"
-        create_via_csv: "%{user_name} zaprosił(a) %{resource_name} jako prywatnego użytkownika poprzez CSV"
-        delete: "%{user_name} usunął/usunęła użytkownika %{resource_name} jako użytkownika prywatnego"
       scope:
         create: "%{user_name} utworzył(a) zakres %{resource_name}"
         create_with_parent: "%{user_name} utworzył(a) zakres podrzędny %{resource_name} w zakresie %{parent_scope}"
@@ -1333,17 +1329,13 @@ pl:
           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.
         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.
         someone_invited_you_as_admin: Ktoś zaprosił Cię jako administratora %{application}, możesz zaakceptować zaproszenie za pomocą poniższego linku.
-        someone_invited_you_as_private_user: Ktoś zaprosił Cię jako prywatnego użytkownika %{application}, możesz zaakceptować zaproszenie za pomocą poniższego linku.
         subject: Instrukcje dotyczące zaproszenia
       invite_admin:
         subject: Zaproszono Cię do zarządzania %{organization}
       invite_collaborator:
         subject: Zaproszono Cię do współpracy przy %{organization}
-      invite_private_user:
-        subject: Zostałeś zaproszony do uczestnictwa w prywatnym procesie w %{organization}
       organization_admin_invitation_instructions:
         subject: Zaproszono Cię do zarządzania %{organization}
       password_change:
diff --git a/decidim-core/config/locales/pt-BR.yml b/decidim-core/config/locales/pt-BR.yml
index 82ea669430d5c..d2e35b36c7e68 100644
--- a/decidim-core/config/locales/pt-BR.yml
+++ b/decidim-core/config/locales/pt-BR.yml
@@ -3,10 +3,21 @@ pt-BR:
     attributes:
       account:
         delete_reason: Motivo para excluir sua conta
+      attachment:
+        documents: Documentos
+        image: Imagem
+        photos: Fotos
       common:
         created_at: Criado em
+      component:
+        taxonomy_filters: Filtros de taxonomia
+      content_block_attachment:
+        background_image: Imagem de fundo
+        main_image: Imagem principal
       conversation:
         body: Corpo
+      editor_image:
+        file: Arquivo
       group:
         about: Sobre
         avatar: Avatar
@@ -15,14 +26,22 @@ pt-BR:
         name: Nome
         nickname: Nome de usuário
         phone: Telefone
+      import:
+        file: Arquivo
       message:
         body: Corpo
       report:
         details: Comentários adicionais
       taxonomy:
         name: Nome da taxonomia
+      taxonomy_filter:
+        internal_name: Rótulo Interno
+        name: Etiqueta
+        root_taxonomy_id: Da taxonomia
+        space_filter: Filtro disponível para
       user:
         about: Sobre
+        avatar: Foto de perfil
         email: O seu email
         encrypted_password: Senha
         locale: Local
@@ -34,6 +53,12 @@ pt-BR:
         personal_url: URL pessoal
         remove_avatar: Excluir avatar
         tos_agreement: Acordo de Termos de Serviço
+    errors:
+      models:
+        user:
+          attributes:
+            nickname:
+              format: O apelido deve ser minúsculo e não conter espaços
     models:
       decidim/attachment_created_event: Anexo
       decidim/component_published_event: Componente ativo
@@ -48,6 +73,7 @@ pt-BR:
       decidim/promoted_to_admin_event: Promovido a administrador do grupo
       decidim/removed_from_group: Removido do grupo
       decidim/resource_hidden_event: Conteúdo ocultado
+      decidim/resource_liked_event: Recurso curtido
       decidim/welcome_notification_event: Mensagem de boas-vindas
   activerecord:
     attributes:
@@ -56,14 +82,22 @@ pt-BR:
         with_participatory_space: Espaço participativo
       decidim/user:
         current_password: Senha atual
+        email: Endereço de e-mail
         name: Nome de usuário
         password: Senha
         password_confirmation: Confirmação de senha
         remember_me: Lembrar-me
     models:
+      decidim:
+        history:
+          one: História
+          other: Histórico
       decidim/amendment:
         one: Emenda
         other: Emendas
+      decidim/like:
+        one: Curti
+        other: Curtidas
       decidim/user:
         one: Nenhum usuário
         other: Comercial
@@ -132,6 +166,13 @@ pt-BR:
       x_seconds:
         one: 1 segundo
         other: "%{count} segundos"
+    widget:
+      label:
+        date: Selecione a data para %{label}
+        time: Selecione o horário para %{label}
+      picker:
+        date_button: Abra o seletor de calendário para %{label}
+        time_button: Abrir seletor para %{label}
   decidim:
     accessibility:
       external_link: Link externo
@@ -152,8 +193,11 @@ pt-BR:
         leaving_authorizations_behind: Alguns dados vinculados à sua autorização serão salvos para segurança. Se você criar outra conta e autorizar novamente, estes dados serão recuperados para sua nova conta.
       destroy:
         error: Ocorreu um erro ao cancelar a sua conta.
+        inactive_account_removal_reason: Conta removida após %{inactivity_period} dias de inatividade
         success: Sua conta foi excluída.
       download_your_data_export:
+        export_expired: A exportação expirou. Tente gerar uma nova exportação.
+        export_not_found: A exportação que você acessou não existe, ou você não tem permissão para baixa-lá
         file_no_exists: O arquivo não existe
         notice: Seus dados estão atualmente em andamento. Você receberá um e-mail quando estiver concluído.
       email_change:
@@ -208,6 +252,8 @@ pt-BR:
         delete: "%{user_name} removeu o componente %{resource_name} do espaço %{space_name}"
         export_component: "%{user_name} exportou %{resource_name} %{component_name} em %{space_name} como %{format_name}"
         publish: "%{user_name} publicou o componente %{resource_name} no espaço %{space_name}"
+        restore: "%{user_name} restaurou o %{resource_name} componente no %{space_name} espaço"
+        soft_delete: "%{user_name} Moveu para o lixo o %{resource_name} componente no %{space_name} espaço"
         unpublish: "%{user_name} despublicou o componente %{resource_name} do espaço %{space_name}"
         update_permissions_with_space: "%{user_name} atualizou as permissões de %{resource_name} no %{space_name}"
       contextual_help_section:
@@ -219,7 +265,14 @@ pt-BR:
         results: resultados
       impersonation_log:
         manage: "%{user_name} gerenciou %{resource_name} porque %{reason}"
+      member:
+        create: "%{user_name} convide %{resource_name} para ser um membro"
+        create_via_csv: "%{user_name} Convide %{resource_name} via CSV para ser um membro"
+        delete: "%{user_name} Participante removido %{resource_name} como membro"
       moderation:
+        bulk_hide: "%{user_name} Ocultou %{reported_count} recursos"
+        bulk_unhide: "%{user_name} Desocultou %{reported_count} recursos"
+        bulk_unreport: "%{user_name} Recursos não declarados %{reported_count}"
         hide: "%{user_name} Escondeu um recurso de tipo %{resource_type} no %{space_name} espaço"
         unreport: "%{user_name} Não declarou um recurso de tipo %{resource_type} no %{space_name} espaço"
       newsletter:
@@ -234,10 +287,6 @@ pt-BR:
       organization:
         update: "%{user_name} atualizou as configurações da organização"
         update_external_domain: "%{user_name} atualizou os domínios externos da organização"
-      participatory_space_private_user:
-        create: "%{user_name} Convidado %{resource_name} ser um usuário privado"
-        create_via_csv: "%{user_name} convidou %{resource_name} via CSV para ser um usuário privado"
-        delete: "%{user_name} removeu o usuário %{resource_name} como usuário particular"
       scope:
         create: "%{user_name} criou o âmbito %{resource_name}"
         create_with_parent: "%{user_name} criou o âmbito %{resource_name} dentro do âmbito %{parent_scope}"
@@ -249,12 +298,36 @@ pt-BR:
         create: "%{user_name} criou o tipo de escopo %{resource_name}"
         delete: "%{user_name} excluiu o tipo de escopo %{resource_name}"
         update: "%{user_name} atualizou o tipo de escopo %{resource_name}"
+      share_token:
+        create: "%{user_name} Criou um link de acesso em %{space_name}"
+        create_with_space: "%{user_name} Criou um link de acesso para%{resource_name} no %{space_name}"
+        delete: "%{user_name} Deletou um link de acesso em %{space_name}"
+        delete_with_space: "%{user_name} Deletou um link de acesso para%{resource_name} no %{space_name}"
+        update: "%{user_name} Atualizou um link de acesso em %{space_name}"
+        update_with_space: "%{user_name} Atualizou um link de acesso para%{resource_name} no %{space_name}"
       static_page:
         create: "%{user_name} criou o %{resource_name} página estática"
         delete: "%{user_name} apagou o %{resource_name} página estática"
         update: "%{user_name} atualizou o %{resource_name} página estática"
+      taxonomy:
+        create: "%{user_name} Criou uma %{resource_name} taxonomia"
+        create_with_parent: "%{user_name} Criou uma %{resource_name} taxonomia na %{parent_taxonomy} taxonomia"
+        delete: "%{user_name} Deletou uma %{resource_name} taxonomia"
+        delete_with_parent: "%{user_name} Deletou uma %{resource_name} taxonomia na %{parent_taxonomy} taxonomia"
+        update: "%{user_name} Atualizou uma %{resource_name} taxonomia"
+        update_with_parent: "%{user_name} Atualizou uma %{resource_name} taxonomia na %{parent_taxonomy} taxonomia"
+      taxonomy_filter:
+        create: "%{user_name} Criou um filtro %{resource_name}"
+        create_with_filter_info: '%{user_name} Criou um filtro %{resource_name} baseado na taxonomia %{taxonomy_name} com%{filter_items_count} com itens'
+        delete: "%{user_name} Deletou um filtro %{resource_name}"
+        delete_with_filter_info: '%{user_name} Deletou um filtro %{resource_name} baseado na taxonomia %{taxonomy_name} com%{filter_items_count} com itens'
+        update: "%{user_name} Atualizou um filtro %{resource_name}"
+        update_with_filter_info: '%{user_name} Atualizou um filtro %{resource_name} baseado na taxonomia %{taxonomy_name} com%{filter_items_count} com itens'
       user:
         block: "%{user_name} bloqueou o usuário %{resource_name}"
+        bulk_block: "%{user_name} Bloqueou %{blocked_count} usuário"
+        bulk_ignore: "%{user_name} Não declarou %{unreported_users_count} usuário"
+        bulk_unblock: "%{user_name} Desbloqueou %{unblocked_count} usuário"
         invite: "%{user_name} convidou o usuário %{resource_name} com papel: %{role}"
         officialize: "%{user_name} oficializou o usuário %{resource_name}"
         promote: "%{user_name} promoveu %{resource_name}"
@@ -265,12 +338,17 @@ pt-BR:
         unofficialize: "%{user_name} não oficializado o usuário %{resource_name}"
       user_group:
         block: "%{user_name} bloqueou o grupo de usuários %{resource_name}"
+        bulk_block: "%{user_name} Bloqueou %{blocked_count} usuários"
+        bulk_ignore: "%{user_name} Não declarou %{unreported_users_count} usuários"
+        bulk_unblock: "%{user_name} Desbloqueou %{unblocked_count} usuários"
         reject: "%{user_name} rejeitou o %{resource_name} verificação do grupo de usuários"
         unblock: "%{user_name} desbloqueou o grupo de usuários %{resource_name}"
         verify: "%{user_name} verificado o %{resource_name} grupo de usuários"
         verify_via_csv: "%{user_name} verificou o %{resource_name} grupo de usuários por meio de um arquivo CSV"
       user_moderation:
         unreport: "%{user_name} removeu a denuncia %{resource_type} - %{unreported_user_name}"
+    admin_terms_of_service:
+      default_body: "<h2>TERMOS DE SERVIÇO DO ADMINISTRADOR</h2><p>Confiamos que você já tenha recebido a palestra de praxe do administrador de sistemas local. Geralmente, ela se resume a estes três pontos:</p><ol><li>Respeite a privacidade dos outros.</li><li>Pense antes de clicar.</li><li>Grandes poderes trazem grandes responsabilidades.</li></ol>"
     alert:
       dismiss: Limpar notificação
     amendments:
@@ -352,6 +430,7 @@ pt-BR:
         visit_link: Visitar Link
       documents:
         component_documents:
+          dummy:
           meetings: Documentos de reuniões
         documents: Documentos
         related_documents: Documentos relacionados
@@ -366,6 +445,9 @@ pt-BR:
       comments:
         one: comentário
         other: comentários
+      likes:
+        one: curtir
+        other: curtidas
       official_author: Oficial
     authorization_handlers:
       another_dummy_authorization_handler:
@@ -382,7 +464,15 @@ pt-BR:
           postal_code: Código postal
         name: Exemplo de autorização
       dummy_authorization_workflow:
+        explanation: Fluxo de autorização fictício
         name: Fluxo de trabalho de autorização falsa
+      ephemeral_dummy_authorization_handler:
+        explanation: Obtenha a verificação inserindo um número de documento que termine com "X".
+        fields:
+          allowed_postal_codes: Códigos postais permitidos (separados por vírgulas)
+          document_number: Número do documento
+          postal_code: Código Postal
+        name: Exemplo de autorização efêmero
       errors:
         duplicate_authorization: Um usuário já está autorizado com os mesmos dados. Um administrador entrará em contato para verificar suas informações.
       expired_at: Expirou em %{timestamp}
@@ -416,9 +506,12 @@ pt-BR:
         ok:
           title: Você foi autorizado nesta página. Recarregue a página para executar sua ação.
         pending:
+          explanation: Para realizar esta ação, você precisa estar autorizado com "%{authorization}", mas sua autorização ainda está em andamento.
+          resume: Verifique o progresso da sua autorização "%{authorization}".
           title: A autorização ainda está em progresso
         unauthorized:
           explanation: Desculpe, você não pode executar esta ação porque alguns de seus dados de autorização não coincidem.
+          invalid_field: "%{field} Valor %{value} não é válido."
           ok: Ok
           title: Não autorizado
         unconfirmed:
@@ -463,11 +556,14 @@ pt-BR:
             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
             dummy_global_translatable_text: Texto Tradutor Falso
             enable_pads_creation: Ativar criação de blocos
+            no_taxonomy_filters_found: Nenhum filtro de taxonomia encontrado.
             resources_permissions_enabled: Permissões de recursos ativadas
+            taxonomy_filters: Selecione os filtros para o componente
           step:
             amendment_creation_enabled: Criação de alteração ativada
             amendment_promotion_enabled: Promoção de alteração ativada
@@ -477,6 +573,8 @@ pt-BR:
             dummy_step_attribute1: Dummy Step Attribute 1
             dummy_step_attribute2: Dummy Step Attribute 2
             dummy_step_translatable_text: Texto traduzível de Etapa falso
+      pagination:
+        page_title: "%{component_name} Página %{current_page} de %{total_pages}"
     contact: Contato
     content_blocks:
       announcement:
@@ -490,11 +588,25 @@ pt-BR:
         description: Descrição
       footer_sub_hero:
         name: Rodapé do sub-herói banner
+      hero:
+        name: Imagem de destaque e CTA
       hero_settings_form:
         background_image: Imagem de fundo
+        cta_button_path: URL do botão de chamada à ação
+        cta_button_path_help: 'Você pode sobrescrever para onde o botão de Chamada para Ação CTA da página inicial direciona. Use caminhos parciais, não URLs completas. São aceitos letras, números, hífens e barras, e o valor deve começar com uma letra. O botão de Chamada para Ação é exibido na página inicial entre o texto de boas-vindas e a descrição. Exemplo: %{url}'
+        cta_button_text: Texto do botão de chamada à ação
+        cta_button_text_help: Você pode alterar o texto do botão de chamada para ação na página inicial para cada idioma disponível em sua organização. Caso não seja definido, o valor padrão será utilizado. O botão de chamada para ação é exibido na página inicial entre o texto de boas-vindas e a descrição.
         welcome_text: Texto de boas-vindas
       highlighted_content_banner:
         name: Banner de conteúdo destacado
+      highlighted_content_banner_settings_form:
+        action_button_subtitle: Legenda do botão de ação
+        action_button_title:
+        action_button_url:
+        background_image: Imagem de fundo
+        short_description: Descrição curta
+        subtitle: Subtitulo
+        title: Título
       highlighted_elements_settings_form:
         components:
           all: Todos
@@ -546,6 +658,8 @@ pt-BR:
           all: Tudo
         filter_scope_values:
           all: Tudo
+        filter_taxonomy_values:
+          all: tudo
     devise:
       omniauth_registrations:
         create:
@@ -575,25 +689,44 @@ pt-BR:
           username_help: Nome público que aparece em suas postagens. Com o objetivo de garantir o anonimato, pode ser qualquer nome.
       sessions:
         new:
+          are_you_new?: Ainda não se registrou?
           register: Criar uma conta
           sign_in_disabled: Você pode acessar com uma conta externa.
           sign_up_disabled: A Criação de Conta está desabilitada, você pode usar um usuário que já existe para acessar.
         user:
+          ephemeral_session_closed: Sua sessão como convidado terminou
           timed_out: Você ficou inativo por muito tempo e foi automaticamente desconectado do serviço. Se você deseja continuar usando o serviço, entre novamente.
       shared:
         newsletter_modal:
           buttons:
             check: Verificar e continuar
             uncheck: Manter desmarcado
+          notice: |-
+            <p>Olá, tem certeza de que não deseja receber o boletim informativo?
+
+            Por favor, considere marcar a caixa de seleção do boletim informativo abaixo.
+
+            É muito importante para nós que você receba e-mails ocasionais com anúncios importantes.
+            Você pode alterar isso a qualquer momento na sua página de configurações de notificações.</p>
+            <p>Se você não marcar a caixa, poderá perder informações relevantes sobre novas oportunidades de participação na plataforma.<br>
+            Se você ainda preferir não receber boletins informativos, nós entendemos perfeitamente a sua decisão.</p>
+            <p>Obrigado por ler!</p>
           title: Notificações de newsletter
+        omniauth_buttons:
+          or: ou
         password_fields:
           hidden_password: Sua senha está oculta
           hide_password: Ocultar Senha
           show_password: Mostrar senha
+          shown_password:
         placeholder_email: oi@exemplo.org
+    documents:
+      one: "%{count} Documento"
+      other: "%{count} Documentos"
     doorkeeper:
       authorizations:
         new:
+          api_read: Leia o conteúdo através da API
           authorize: Autorizar aplicativo
           by_organization_link_html: <small class="heading-small">por %{link}</small>
           cancel: Cancelar
@@ -609,15 +742,118 @@ pt-BR:
     download_your_data:
       export:
         ready: pronto
+      help:
+        core:
+          description: Estes são os arquivos com os dados pessoais, contribuições e atividades do usuário %{user_name}
+          title: Baixe os seus arquivos de dados em %{organization}
+        follows:
+          created_at: A data e hora em que o seguimento foi criado
+          followable: O recurso ou espaço que está sendo acompanhado
+          id: O identificador único deste seguimento
+          updated_at: A data e a hora em que o seguimento foi atualizado pela última vez
+        identities:
+          created_at: Data e hora de criação da identidade
+          id: O identificador único desta identidade
+          provider: O fornecedor desta identidade
+          uid: O identificador único desta identidade
+          updated_at: A data e a hora em que a identidade foi atualizada pela última vez
+          user: O usuário ao qual esta identidade pertence
+        messaging_conversations:
+          created_at: A data em que esta conversa foi criada
+          id: O identificador único desta conversa
+          messages: As mensagens dessa conversa
+          updated_at: A data em que esta conversa foi atualizada pela última vez
+        notifications:
+          created_at: A data e a hora em que a notificação foi criada
+          event_class: A classe do evento que desencadeou a notificação
+          event_name: O nome do evento que desencadeou a notificação
+          extra: Informações adicionais desta notificação
+          id: O identificador único desta notificação
+          resource_type: O tipo de recurso ao qual a notificação está relacionada
+          updated_at: A data e a hora em que a notificação foi atualizada pela última vez
+        participatory_space_members:
+          created_at: A data e a hora em que este membro foi criado
+          id: O identificador único deste membro
+          participatory_space: A que espaço este membro pertence
+          published: Se este membro é publicado ou não
+          role: O papel que este membro desempenha
+          updated_at: A data e a hora da última atualização deste membro
+        reports:
+          created_at: A data e a hora em que este relatório foi criado
+          details: Os detalhes deste relatório
+          id: O identificador único deste relatório
+          locale: A linguagem deste relatório
+          moderation: A moderação que este relatório tem
+          reason: O motivo deste relatório
+          updated_at: Data e hora da última atualização deste relatório
+        users:
+          about: Descrição do perfil deste participante
+          accepted_tos_version: A data em que os Termos de Serviço desta plataforma foram aceitos pelo usuário
+          admin: Se este usuário é um administrador
+          confirmation_sent_at: A data e a hora em que a confirmação foi enviada
+          confirmed_at: A data e a hora em que este usuário foi confirmado
+          created_at: A data e a hora em que este usuário foi criado
+          current_sign_in_at: A data e a hora do ‘login’ atual
+          current_sign_in_ip: O endereço IP do ‘login’ atual
+          delete_reason: O motivo apresentado para a exclusão deste usuário
+          deleted_at: A data e a hora em que este usuário foi excluído
+          email: O endereço de mensagem eletrônica deste usuário
+          followers_count: O número de participantes que seguem este usuário
+          following_count: O número de participantes que este usuário está seguindo
+          id: O identificador único deste usuário
+          invitation_accepted_at: A data e a hora em que o convite foi aceito
+          invitation_created_at: A data e a hora em que este usuário foi convidado
+          invitation_sent_at: A data e a hora em que o convite foi enviado
+          invitations_count: O número de convites enviados a este usuário
+          invited_by: O usuário que convidou este usuário
+          last_sign_in_at: A data e hora do acesso anterior
+          last_sign_in_ip: O endereço de IP do acesso anterior
+          locale: A localidade (idioma) que este usuário selecionou
+          managed: Se esse usuário é gerenciado por outro usuário
+          name: O nome do usuário
+          newsletter_notifications_at: A data e hora que este participante se inscreveu para receber uma notícia
+          nickname: O apelido deste usuário
+          notification_settings: As configurações de notificações que este usuário selecionou
+          notifications_sending_frequency: A frequência das notificações que este usuário recebe
+          officialized_as: O nome da oficialização (Concelheiro, Prefeito, etc.)
+          officialized_at: A data e hora em que este usuário foi oficializado
+          organization: A organização a que este usuário pertence
+          password_updated_at: A data em que sua senha foi alterada pela última vez
+          personal_url: A URL pessoal deste usuário
+          remember_created_at: A data e hora em que o usuário foi selecionado para ser lembrado
+          reset_password_sent_at: A data e hora em que a redefinição de senha foi enviada
+          roles: O papel que este usuário tem, se tiver algum
+          sign_in_count: O número de vezes que este usuário iniciou acesso
+          type: O tipo deste usuário
+          unconfirmed_email: O endereço de email que esse usuário ainda não confirmou
+          updated_at: A data e hora que este usuário foi atualizado pela última vez
+      show:
+        action: Ação
+        download: Baixar arquivo
+        download_data: Baixar dados
+        download_data_description_1: Aqui você pode encontrar todos os arquivos disponíveis para sua conta. Esses arquivos .zip estarão disponíveis por duas semanas antes de serem excluídos.
+        download_data_description_2: Você pode solicitar um arquivo .zip com o envio dos seus dados pessoais.
+        download_your_data: Dados Pessoais
+        expiration: Expiração
+        expired: Já expirado
+        explanation:
+          body_1: Estes arquivos são conjuntos de dados exportados da sua atividade nesta plataforma, como propostas ou comentários. Eles fornecem dados robustos e estruturados que podem ser usados para análise, pesquisa ou integração com outras ferramentas
+          body_2: Esses arquivos estão no formato CSV (Valores separados por Vírgula), é um formato de arquivo amplamente usado que pode ser aberto e processado por uma variedade de aplicativos de software, incluindo programas de planilha, editores de texto e ferramentas de análise de dados.
+          title: O que são esses arquivos?
+        files_to_download: Arquivos para baixar
+        request_data: Solicitação
+        type: Tipo de Download
     editor_images:
       create:
         error: Erro ao carregar a imagem.
         success: Imagem carregada com sucesso.
       drag_and_drop_help: Adicione imagens arrastando e soltando ou colando-as.
+    ephemeral_user: Visitante
     errors:
       files:
         file_cannot_be_processed: O arquivo não pode ser processado
         file_resolution_too_large: A resolução do arquivo é muito grande
+        not_inside_organization: O arquivo não está anexado a nenhuma organização.
       internal_server_error:
         copied: Texto copiado!
         copy_error_message_clarification: Copiar mensagem de erro para área de transferência
@@ -680,6 +916,11 @@ pt-BR:
             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:'
@@ -708,7 +949,19 @@ pt-BR:
           email_outro: Você recebeu esta notificação porque fez uma atividade em nosso site.
           email_subject: Você atingiu o nível %{current_level} na medalha %{badge_name}!
           notification_title: Bom trabalho! Você atingiu o nível %{current_level} na medalha <a href="%{resource_path}">%{badge_name}</a>!
+      nickname_event:
+        notification_body: Temos corrigido a forma que os nomes de usuário são utilizados para que não haja duplicados, e por isso excluímos a regra de sensibilidade de maiúsculas e minúsculas. <br/> Seu nome de usuário foi criado depois de um usuário com o mesmo nome, então renomeamos automaticamente. Pode mudar seu nome de usuário em <a href="%{link_to_account_settings}"> suas configurações de conta </a>.
+      notification_event:
+        notification_title: Ocorreu um evento em <a href="%{resource_path}">%{resource_title}</a>.
       reports:
+        parent_hidden:
+          email_intro: |-
+            O 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.
+          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>
         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.
@@ -716,6 +969,14 @@ 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.
@@ -729,7 +990,11 @@ pt-BR:
           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}.
         download: Download
+      export:
+        click_button_html: Seu baixar está pronto. <br/>O arquivo estará disponível para baixar até %{date}.
+        download: Baixar
       subject: Sua exportação "%{name}" está pronta
     filters:
       linked_classes:
@@ -764,10 +1029,16 @@ pt-BR:
       create:
         button: Seguir
         error: Ocorreu um erro ao seguir este recurso.
+        participatory_space: Seguindo<span>%{resource_name}</span>
       destroy:
         button: Parar de seguir
         error: Ocorreu um erro ao seguir esse recurso.
     forms:
+      attachment_link:
+        explanation: Orientações para links de anexos
+        help_messages:
+          - Somente formatos de URL válidos são aceites.
+          - Observe que os links devem ser públicos para que todos os participantes possam acessá-los.
       errors:
         decidim/user:
           password: Senha muito curta.
@@ -777,12 +1048,14 @@ pt-BR:
         file:
           explanation: 'Orientação para o arquivo:'
           message_1: Tem que ser uma imagem ou um documento.
+          message_2: Se for uma imagem, de preferência uma imagem horizontal sem texto. A plataforma recorta a imagem.
         icon:
           explanation: 'Orientação para o ícone:'
           message_1: Deve ser uma imagem quadrada.
           message_2: O tamanho recomendado para esta imagem é 512x512.
         image:
           explanation: 'Orientação da imagem:'
+          message_1: De preferência, uma imagem na horizontal, sem texto.
           message_2: O serviço recorta a imagem.
       file_validation:
         allowed_file_extensions: 'Extensões de arquivo permitidas: %{extensions}'
@@ -806,6 +1079,7 @@ pt-BR:
           title_required: Título é obrigatório!
           uploaded: Carregado
           validating: Validando...
+          validation_error: Erro de validação! Verifique se o arquivo possui a extensão ou o tamanho permitidos.
         select_file: Selecione um arquivo
       upload_help:
         dropzone: Solte os arquivos aqui ou clique no botão para carregar
@@ -842,10 +1116,24 @@ pt-BR:
         default_page:
           content: "<p>Em %{organization} você pode participar e decidir sobre diferentes tópicos, através dos espaços que você vê no menu superior: Processos, Assembleias, Iniciativas, Consultas.</p> <p>Dentro de cada um você encontrará diferentes opções para participar: fazer propostas - individualmente ou com outras pessoas -, participar de debates, priorizar projetos a serem implementados, participar de reuniões presenciais e outras ações.</p>\n"
           title: O que posso fazer em %{organization}?
+        description: Leia mais sobre %{organization}.
+        title: Em geral
     last_activities:
       all: Todos os tipos de atividade
       index:
         last_activity: Última atividade
+      name: Últimas atividades
+      no_activities_warning: Não há resultados para essa categoria de atividade.
+    like_buttons_cell:
+      already_liked: Desfazer a curtida
+      like: Curtida
+    likes_list:
+      liked_by:
+        one: Curtido por %{visible}
+        other: Curtido por %{visible} e %{others}
+      others: "%{count} Mais"
+      title: Curtido por
+      you: Você
     linked_resource_from:
       included_in: Incluído em
     links:
@@ -862,11 +1150,14 @@ pt-BR:
         create_with_space: "%{user_name} criado %{resource_name} em %{space_name}"
         delete: "%{user_name} excluído %{resource_name}"
         delete_with_space: "%{user_name} excluído %{resource_name} em %{space_name}"
+        publish: "%{user_name} Publicou %{resource_name}"
         publish_with_space: "%{user_name} publicou %{resource_name} em %{space_name}"
         unknown_action: "%{user_name} executou alguma ação em %{resource_name}"
         unknown_action_with_space: "%{user_name} executou alguma ação em %{resource_name} em %{space_name}"
         unpublish_with_space: "%{user_name} despublicou %{resource_name} de %{space_name}"
         update: "%{user_name} atualizado %{resource_name}"
+        update_filters: "%{user_name} Atualizou os filtros de %{resource_name}"
+        update_filters_with_space: "%{user_name} Atualizou os filtros de %{resource_name} em %{space_name}"
         update_permissions_with_space: "%{user_name} atualizou as permissões de %{resource_name} no %{space_name}"
         update_with_space: "%{user_name} atualizado %{resource_name} em %{space_name}"
       value_types:
@@ -878,6 +1169,10 @@ pt-BR:
           not_found: 'O âmbito não foi encontrado no banco de dados (ID: %{id})'
         scope_type_presenter:
           not_found: 'O tipo de âmbito não foi encontrado no banco de dados (ID: %{id})'
+        taxonomy_presenter:
+          not_found: 'A taxonomia não foi encontrada no banco de dados (ID: %{id})'
+    machine_translations:
+      automatic: Tradução automática em %{locale_name}
     managed_users:
       expired_session: A sessão de representação atual expirou.
     map:
@@ -907,6 +1202,9 @@ pt-BR:
           add_users_placeholder: Buscar...
           modal_title: Nova conversa
           no_results: Nenhum resultado
+          participant_with_disabled_message_reception: Este participante não deseja receber mensagens privadas.
+          participants:
+            title: Participantes
         create:
           error: Conversa não iniciada. Tente mais tarde.
         error_modal:
@@ -925,6 +1223,7 @@ pt-BR:
         show:
           back: Voltar para todas as conversas
           chat_with: Conversa com
+          deleted_accounts: Não é possível manter uma conversa com contas excluídas.
           not_allowed: Este usuário não aceita mensagens diretas.
           title: Conversa com %{usernames}
         start:
@@ -937,9 +1236,12 @@ pt-BR:
         active: Ativo
         finished: 'Concluído: %{end_date}'
         not_started: Não iniciado ainda
+        remaining: "%{time_distance} Restante"
     newsletter_mailer:
       newsletter:
         no_reply_notice: Este email foi enviado de uma caixa postal que não pode receber emails. Favor não responder esta mensagem.
+        note: Você recebeu esta mensagem eletrônica porque está inscrito nos boletins informativos da %{organization_name}. Você pode alterar suas configurações na sua <a href="%{link}">página de notificações</a>.
+        see_on_website: Não consegue visualizar esta mensagem eletrônica corretamente? Veja-o no <a href="%{link}" target="_blank" class="see-on-website">site</a>.
         unsubscribe: Para optar por não receber esse tipo de email, <a href="%{link}" target="_blank" class="unsubscribe">Unsubscribe</a>.
     newsletter_templates:
       basic_only_text:
@@ -962,9 +1264,12 @@ pt-BR:
         main_image: Imagem principal
     newsletters:
       unsubscribe:
+        check_subscription_html: Se você quiser voltar a recebê-los, pode reativar sua assinatura a qualquer momento na <a href="%{link}" target="_blank">página de configurações</a>.
         error: Ocorreu um erro ao se desinscrever.
+        subscription_preferences: Atualizamos suas preferências de assinatura e você não receberá mais boletins da %{organization_name}.
         success: Você está inscrito com sucesso.
         token_error: O link expirou.
+        unsubscribe: Cancelar inscrição no boletim informativo
     newsletters_opt_in:
       unauthorized: Desculpe, este link não está mais disponível.
       update:
@@ -972,6 +1277,7 @@ pt-BR:
         success: Configurações de boletim informativo atualizadas com sucesso.
     newsletters_opt_in_mailer:
       notify:
+        body_1: O processamento e a proteção de dados pessoais estão se tornando cada vez mais importantes para todos nós. Com o Regulamento Geral de Proteção de Dados (RGPD) de 25 de maio de 2018, os indivíduos têm maior controle sobre seus dados pessoais. Por esse motivo, precisamos da sua autorização para continuar enviando informações relevantes sobre as atividades da %{organization_name}.
         body_2: 'Como você pode nos dar seu consentimento? Basta clicar no seguinte botão:'
         body_3: Com esse consentimento, você poderá continuar recebendo informações sobre os serviços da plataforma. Se, pelo contrário, não recebermos uma confirmação positiva da sua parte, deixaremos de lhe enviar as nossas mensagens. Se você confirmar que deseja continuar sendo informado, sempre terá a opção de cancelar a qualquer momento.
         button: Sim, quero continuar recebendo informações relevantes
@@ -980,20 +1286,27 @@ pt-BR:
         subject: Você deseja continuar recebendo informações relevantes sobre %{organization_name}?
     notification_mailer:
       event_received:
+        no_translation_available: 'Lamentamos, mas não foi possível recuperar a tradução automática após o envio da mensagem eletrônica. Você pode conferir a tradução do texto original no seguinte link: %{link}.'
         original_text: 'Texto original:'
         same_language: O conteúdo foi publicado em seu idioma preferido (%{language}), e é por isso que nenhuma tradução automática é exibida neste e-mail.
         translated_text: 'Texto traduzido automaticamente:'
     notifications:
+      action_error: Ocorreu um problema ao atualizar as configurações de notificação.
       no_notifications: Não há notificações.
       show:
+        deleted: O conteúdo foi removido pelo autor.
         missing_event: Ops, esta notificação pertence a um item que não está mais disponível. Você pode descartá-lo.
+        moderated: O conteúdo foi ocultado por meio da moderação.
+        not_available: Ops, esta notificação pertence a um “item” que não está mais disponível. Você pode descartá-la.
     notifications_digest_mailer:
       header:
         daily: Resumo de Notificação Diário
+        real_time: Tempo real
         weekly: Resumo de Notificação Semanal
       hello: Olá %{name},
       intro:
         daily: 'Estas são as notificações do último dia com base na atividade que você está seguindo:'
+        real_time: 'Esta é uma notificação sobre a atividade que você está acompanhando:'
         weekly: 'Estas são as notificações da última semana com base na atividade que você está seguindo:'
       outro: Você recebeu essas notificações porque está seguindo este conteúdo ou seus autores. Você pode deixar de segui-las em suas respectivas páginas.
       see_more: Ver mais notificações
@@ -1006,6 +1319,7 @@ pt-BR:
         assigned_to_proposal: Quero receber um e-mail quando alguém me atribuir uma proposta para avaliar
         direct_messages: Receber mensagens diretas de qualquer pessoa
         email_on_moderations: Quero receber um e-mail toda vez que algo ou alguém for denunciado por moderação.
+        evaluators: Avaliadores
         everything_followed: Tudo que eu sigo
         newsletter_notifications: Quero receber boletins informativos
         newsletters: boletins informativos
@@ -1018,6 +1332,7 @@ pt-BR:
           weekly: Semanalmente
         notifications_sending_frequency: Com que frequência deseja receber o e-mail de notificações?
         own_activity: Minha atividade, como quando alguém comenta minha proposta ou me menciona
+        push_notifications: Notificações instantâneas
         push_notifications_reminder: Para receber notificações da plataforma, primeiro você precisará autorizá-las nas configurações do seu navegador.
         receive_notifications_about: Quero receber notificações sobre
         update_notifications_settings: Guardar alterações
@@ -1027,11 +1342,123 @@ pt-BR:
     offline:
       name: Desconectado
       show:
+        message_1: Parece que você está offline no momento.
+        message_2: Por favor, tente novamente mais tarde.
         retry: Tentar de novo
+    onboarding_action_message:
+      click_link: Clique aqui
+      cta_html: <a href="%{path}">%{link_text}</a> Para %{action} no %{resource_name} <strong>%{resource_title}</strong>
+      ephemeral_authorized_message: Sua autorização foi concedida com sucesso. <br/>  Você iniciou uma sessão como convidado e agora pode participar.
+      expired_authorization_active_title: Sua autorização expirou.
+      finish_authorization_process: Você pode concluir o processo de autorização
+      incomplete_authorization_active_title: Sua verificação não foi concluída com todas as informações necessárias.
+      pending_authorization_active_message: Por favor, preencha o formulário para prosseguir com esta ação.
+      pending_authorization_active_title: Precisamos verificar sua identidade.
+      pending_ephemeral_authorization: Por favor, verifique sua identidade para prosseguir.
     open_data:
+      help:
+        core:
+          components: Componentes
+          description: Este arquivo ZIP contém arquivos para estudo e pesquisa sobre esta plataforma de participação.
+          generated_on_date: Gerado em %{date}
+          main: Essencial
+          resources:
+            one: "%{count} Recurso"
+            other: "%{count} Recursos"
+          spaces: Espaços
+          title: Abra os arquivos de dados para %{organization}
+        moderated_users:
+          about: O campo "Sobre" do usuário
+          block_reasons: O motivo pelo qual o usuário administrador bloqueou o usuário
+          blocked_at: Data e hora em que o usuário foi bloqueado
+          blocking_user: O nome do usuário que realizou o bloqueio
+          details: Os detalhes dos relatórios
+          reasons: Segue uma lista dos motivos pelos quais o perfil foi denunciado
+          user_id: O ID exclusivo do usuário denunciado
+        moderations:
+          hidden_at: Data e hora em que o conteúdo foi ocultado
+          id: O identificador único da moderação
+          report_count: O número de vezes relatado
+          reportable_id: O identificador único do ‘item’ reportável
+          reportable_type: Tipo de informação a ser relatada
+          reported_content: O conteúdo relatado
+          reported_url: O URL do recurso relatado
+          reports: Uma lista dos motivos pelos quais o recurso foi denunciado
+        taxonomies:
+          children_count: A contagem de crianças que esta taxonomia possui
+          created_at: A data em que esta taxonomia foi criada
+          filter_items_count: O número de filtros de itens que estão usando esta taxonomia
+          filters_count: O número de filtros que utilizam esta taxonomia
+          id: O identificador único desta taxonomia
+          is_root: Verdadeiro se esta taxonomia não tiver nenhum pai
+          name: O nome desta taxonomia
+          parent_id: Os identificadores únicos desta taxonomia principal (se houver)
+          part_of: Utilizado para detectar se esta taxonomia faz parte de outra taxonomia
+          taxonomizations_count: A contagem dos recursos que utilizam esta taxonomia
+          updated_at: A data em que esta taxonomia foi atualizada pela última vez
+          weight: A ordem em que esta taxonomia é apresentada
+        users:
+          about: O texto "Sobre o usuário"
+          avatar_url: O avatar do "usuário"
+          badge: O crachá do "usuário"
+          deleted: Se o usuário foi excluído ou não
+          direct_messages_enabled: Se o usuário permite mensagens diretas
+          groups: O id e nome do grupo de usuários
+          id: O único identificador deste usuário
+          name: O nome de exibição do usuário
+          nickname: O nome de usuário deste usuário
+          profile_url: A Url do perfil
+      index:
+        description: Bem-vindo a %{organization_name} página de Dados Abertos. Aqui, você encontrará arquivos de dados que são regulamente gerados a partir de vários processos deliberados e de governança dentro de %{organization_name}. Estes ficheiros são disponibilizados para promover a transparência, acessibilidade e a colaboração. Abaixo, você encontrará informações detalhadas sobre o que são esses arquivos, como abrir e trabalhar com eles, e uma descrição do conteúdo e estrutura de cada arquivo.
+        detailed:
+          body_1: 'Abaixo está uma descrição de cada conjunto de dados, incluindo seu esquema (estrutura) e o tipo de informação que contém:'
+          components: Componentes
+          spaces: Espaços participativos
+          title: Explicação detalhada de cada arquivo
+        download:
+          components: Componentes
+          core: Essencial
+          spaces: Espaços participativos
+          title: Baixar recursos
+        download_open_data: Baixe todos os arquivos de dados abertos
+        download_resource: Baixar %{resource_name} no formato CSV
+        explanation:
+          body_1: Esses arquivos são conjuntos de dados exportados dos processos participativos da %{organization_name}, como propostas, comentários e reuniões. Eles fornecem dados brutos e estruturados que podem ser usados ​​para análise, pesquisa ou integração com outras ferramentas. Os dados são atualizados automaticamente a cada 24 horas, garantindo que você tenha acesso às informações mais recentes.
+          body_2: Esses arquivos estão no formato CSV (Valores Separados por Vírgula), um formato amplamente utilizado que pode ser aberto e processado por diversos aplicativos de ‘software’, incluindo planilhas eletrônicas, editores de texto e ferramentas de análise de dados.
+          title: O que são esses arquivos?
+        how_to:
+          step_1:
+            body_html: Clique nos links fornecidos abaixo para baixar os arquivos CSV para seu computador.
+            title: 1. Baixar os arquivos
+          step_2:
+            body_html: |-
+              <ul>
+              <li><b>Planilha de Aplicações </b>: É possível abrir arquivos CSV usando aplicações como Microsoft Excel, Google Sheets, ou LibreOffice Calc. Basta abrir o aplicativo, depois selecione "Abrir" no menu do arquivo, e escolha o arquivo CSV baixado.</li>
+              <li><b>Editores de Texto</b>: os arquivos CSV também podem ser abertos em qualquer editor de texto, como Notepad ou Sublime Text. Isso irá exibir os dados brutos, com cada linha representando uma linha e cada valor separado por uma vírgula.</li>
+              <li><b>Análise de Dados</b>: Se você está familiarizado com ferramentas de análise de dados como Python (com pandas), R, ou SQL databases, você pode importar esses arquivos CSV diretamente para processamento e análise.</li>
+              </ul>
+            title: 2. Abra os arquivos
+          step_3:
+            body_html: |-
+              <ul>
+              <li><b>Filtrar e classificar</b>: Em aplicações de planilha você pode filtrar e classificar os dados para se concentrar em subconjuntos específicos de informações.</li>
+              <li><b>Análise</b>: Use os dados para realizar várias análises, como a contagem do número de propostas, a análise das tendências nos comentários ou a avaliação da participação nas reuniões.</li>
+              <li><b>Visualização</b>: Você pode criar gráficos, gráficos e outras visualizações para ajudar a interpretar os dados.</li>
+              </ul>
+            title: 3. Trabalhando com dados
+          title: Como abrir e trabalhar com esses arquivos
+        license:
+          body_1_html: Este %{organization_name} banco de dados é disponibilizado sob o %{link_database}. Quaisquer direitos em conteúdos individuais do banco de dados são licenciados sob o %{link_contents}.
+          license_contents_link: https://opendatacommons.org/licenses/dbcl/1.0/
+          license_contents_name: Licença de Conteúdo Base
+          license_database_link: https://opendatacommons.org/licenses/odbl/1.0/
+          license_database_name: Abrir Licença do Banco
+          title: Licença
+        title: Dados Abertos
       not_available_yet: Os arquivos Open Data ainda não estão disponíveis. Tente novamente em alguns minutos.
     pad_iframe:
       disclaimer: O conteúdo deste bloco é escrito por usuários registrados e expressa suas opiniões. %{organization} não pode ser responsabilizado pelo seu conteúdo.
+      explanation: Use esse bloco para fazer anotações colaborativos durante a reunião, para que seja fácil escrever o minuto depois.
       pad: Almofada
     pages:
       home:
@@ -1047,11 +1474,15 @@ pt-BR:
         footer_sub_hero:
           footer_sub_hero_body_html: Vamos construir uma sociedade mais aberta, transparente e colaborativa.<br /> Participe, participe e decida.
           footer_sub_hero_headline: Bem-vindo à plataforma participativa %{organization}.
+          register: Criar uma conta
         hero:
           participate: Participar
           participate_title: Participe dos processos da plataforma
           welcome: Bem-vindo ao %{organization}!
+        statistics:
+          headline: Estatísticas
         sub_hero:
+          register: Criar uma conta
           register_title: Criar uma conta
       index:
         standalone_pages: Páginas
@@ -1059,16 +1490,42 @@ pt-BR:
         title: Ajuda
         topics: Tópicos
       terms_of_service:
+        accept:
+          error: Houve um problema ao aceitar os termos do serviço.
+          success: Ótimo! Você aceitou os termos de serviço.
         form:
           agreement: Concordo com estes termos
+          legend: Concordo com os termos de serviço
         refuse:
+          modal_body: Se recusar, você não poderá usar a plataforma, você pode <a href="%{download_your_data_path}"> baixar seus dados</a> e/ou <a href="%{delete_path}"> excluir sua conta </a>.
           modal_btn_continue: Aceite os termos e continue
           modal_btn_exit: Vou revisá-lo mais tarde
           modal_button: Recuse os termos
+          modal_title: Você realmente recusa os termos de serviço atualizados?
         required_review:
           alert: Atualizamos nossos Termos de Serviço, revise-os.
           body: Por favor, dedique um momento para rever as atualizações dos nossos Termos de Serviço. Caso contrário, você não poderá usar a plataforma.
           title: 'Obrigatório: Revise as atualizações dos nossos termos de serviço'
+    participants_account_mailer:
+      inactivity_notification:
+        body_html: |
+          <p>Nossos registros indicam que você criou uma conta %{organization_name} em <strong>%{date_account_creation}</strong> e não estão ativos desde <strong>%{date_last_connection}</strong>.</p>
+          <p>Para proteger sua privacidade, esta conta foi agendada para exclusão automática em <strong>%{days} dias</strong>.</p>
+          <p>Se quiser manter a sua conta %{organization_name}, simplesmente %{login_url} antes desta vez, e sua conta será preservada.<p>
+        greetings_html: |
+          Atenciosamente,<br>
+          %{organization_name}
+        hello_html: Prezado <strong>%{username}</strong>,
+        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}
+        hello: Prezado %{username},
+        subject: Conta inativa excluída
     passwords:
       update:
         error: Houve um problema ao atualizar a senha.
@@ -1092,7 +1549,29 @@ pt-BR:
           edit_profile: Editar perfil
           message: Mensagem
           resend_email_confirmation_instructions: Reenviar instruções de confirmação
+    qr:
+      show:
+        scan: Digitalizar código QR
+        title: Código QR para %{resource_title}
     reported_mailer:
+      hidden_automatically:
+        content: Conteúdo denunciado
+        details: Detalhes
+        hello: Olá %{name},
+        manage_moderations: Gerenciar moderadores
+        participatory_space: Espaço participativo
+        reason: Razão
+        report_html: <p>O seguinte <a href="%{url}">conteúdo</a> foi ocultado automaticamente.</p>
+        subject: Um recurso foi ocultado automaticamente
+      hidden_manually:
+        content: Conteúdo relatado
+        details: Detalhes
+        hello: Olá, %{name}
+        manage_moderations: Gerenciar moderações
+        participatory_space: Espaço participativo
+        reason: Razão
+        report_html: <p>O seguinte <a href="%{url}">conteúdo</a> foi ocultado por %{moderator}.</p>
+        subject: Um recurso foi ocultado por %{moderator}
       report:
         authors: Autores
         content: Conteúdo denunciado
@@ -1108,17 +1587,31 @@ pt-BR:
         subject: Um recurso foi relatado
     reports:
       create:
+        error: Ocorreu um problema ao gerar o relatório. Por favor, tente novamente.
         success: O relatório foi criado com sucesso e será revisto por um administrador.
+      hide:
+        success: Este recurso foi ocultado.
+      parent_hidden:
+        report_details: O recurso principal estava oculto
+    resource:
+      controls_label: Controles de recursos
+    resource_autocomplete:
+      help: Digite para pesquisar propostas
+    resource_likes:
+      create:
+        error: Houve um problema durante a ação de curtir.
     scopes:
       global: Âmbito global
       prompt: Selecione um âmbito
     search:
       name: Pesquisar
       results: Procurar resultados
+      results_found_for_term: '%{count} Resultados para a pesquisa: "%{term}"'
       term_input_placeholder: Pesquisa
     searches:
       filters:
         jump_to: 'Pule para:'
+        resource: "%{rótulo} entre %{coleção}"
         search: Pesquisa
         state:
           active: Ativo
@@ -1135,6 +1628,10 @@ pt-BR:
       selfxss_warning:
         description: Este recurso de navegador é destinado a desenvolvedores e você não deve colar nada aqui se você for solicitado a fazê-lo. Colar conteúdo nesta janela pode comprometer sua privacidade e dar aos hackers acesso à sua conta.
         title: Pare!
+    share_widget:
+      download: Baixar
+      print: Imprimir pôster
+      qr_code: Código QR
     shared:
       confirm_modal:
         cancel: Cancelar
@@ -1142,6 +1639,8 @@ pt-BR:
         ok: OK
         title: Confirmar
       confirm_unload: Esta página contém alterações não salvas. Tem certeza que deseja sair desta página?
+      embed:
+        title: Conteúdo de vídeo incorporado
       filter_form_help:
         help: O formulário abaixo filtra os resultados da busca dinamicamente quando as condições de busca são alteradas.
         skip: Pular para os resultados
@@ -1149,6 +1648,9 @@ pt-BR:
         already_reported: Este conteúdo já foi relatado e será revisto por um administrador.
         close: Fechar
         description: Este conteúdo é impróprio?
+        does_not_belong: Contém atividades ilegais, ameaças de suicídio, informações pessoais ou algo que você considere inadequado para %{organization_name}.
+        hide: Esconder
+        hide_content: Ocultar este conteúdo
         offensive: Contém racismo, sexismo, insultos, ataques pessoais, ameaças de morte, pedidos de suicídio ou qualquer tipo de discurso de ódio.
         reason: Motivo
         report: Denunciar
@@ -1156,10 +1658,14 @@ pt-BR:
         title: Reportar um problema
       flag_user_modal:
         already_reported: Este conteúdo já foi reportado e será revisado por um administrador.
+        block: Bloquear este participante
+        description: O que há de inapropriado neste participante?
+        does_not_belong: Contém atividades ilegais, ameaças de suicídio, informações pessoais ou algo que você considere inadequado para %{organization_name}.
         hide: Ocultar todo o conteúdo
         offensive: Contém racismo, sexismo, insultos, ataques pessoais, ameaças de morte, pedidos de suicídio ou qualquer tipo de discurso de ódio.
         report: Denunciar
         spam: Contém clickbait, publicidade, fraudes ou scripts bots.
+        title: Denunciar participante inadequado
       floating_help:
         help: Ajuda
       follow_button:
@@ -1181,18 +1687,29 @@ pt-BR:
         copy_share_link: Copiar
         copy_share_link_clarification: Copiar link para área de transferência
         copy_share_link_copied: Copiado!
+        copy_share_link_cta: Ou copie o 'link'
         copy_share_link_message: Link copiado para área de transferência.
         share: Compartilhar
         share_link: Partilhar link
         share_to: Compartilhar com %{service}
     statistics:
       comments_count: Comentários
+      comments_count_tooltip: Número total de comentários publicados neste espaço.
       followers_count: Seguidores
+      followers_count_tooltip: O número de usuários que acompanham qualquer parte deste espaço para se manterem atualizados.
       headline: Estatísticas
+      likes_count: Curtidas
       no_stats: Ainda não há estatísticas.
       pages_count: Páginas
       participants_count: Participantes
+      participants_count_tooltip: O número de usuários únicos que interagiram neste espaço, seja enviando propostas, participando de reuniões, votando ou juntando-se a discussões.
+      surveys_count: Formulários
       users_count: Participantes
+      users_count_tooltip: Número total de usuários que se cadastraram e confirmaram suas contas por e-mail.
+    tags:
+      filter_results_for_taxonomy: 'Filtrar resultados para: %{resource}'
+    taxonomies:
+      prompt: Por favor, selecione uma opção
     translation_bar:
       help_text: "<strong>Aviso:</strong> O conteúdo pode ser traduzido automaticamente e não está 100% correto."
       show_original: Exibir texto original
@@ -1204,6 +1721,36 @@ pt-BR:
     user_conversations:
       index:
         time_ago: "%{time} atrás"
+    user_group_mailer:
+      notify_deprecation_to_member:
+        body_1: 'Estamos entrando em contato para informá-lo sobre uma atualização importante do Grupo de Usuários do qual você é membro: <strong>%{group_name}</strong>.'
+        body_2: Como parte dos nossos esforços para simplificar a experiência para as organizações, o recurso "Grupos de Usuários" está sendo desativado. Seu perfil de Grupo de Usuários foi convertido em um perfil de participante comum.
+        greeting: Prezado %{name},
+        instructions_1: Se você tiver acesso a essa conta de e-mail, verifique sua caixa de entrada para obter as instruções.
+        instructions_2: Caso contrário, um dos seus colegas que tenha acesso precisará definir a senha e compartilhar as credenciais de ‘login’ com você.
+        instructions_intro: Os membros do grupo agora compartilharão o acesso a este perfil usando credenciais de ‘login’ compartilhadas (e-mail e senha). Enviamos instruções para %{email} para definir uma nova senha para o perfil.
+        instructions_title: "<strong>O que isso significa para você</strong>"
+        subject: Atualização importante sobre o seu perfil de grupo
+      notify_deprecation_to_owner:
+        body_1: Estamos entrando em contato para informar sobre uma atualização importante referente ao seu perfil de grupo em %{organization_name}.
+        body_2: Como parte de nossos esforços para simplificar e melhorar a experiência para organizações como a sua, estamos desativando o recurso "Grupos de Usuários". Seu grupo, <strong>%{name}</strong>, foi convertido em uma conta normal.
+        body_3: Para continuar acessando sua conta e compartilhar o acesso, precisamos que você defina uma senha. Após definida, você poderá compartilhar as credenciais de ‘login’ (e-mail e senha) com qualquer pessoa.
+        greeting: Prezado %{name},
+        instructions_1: 'Clique no link abaixo para definir sua senha:'
+        instructions_2: 'Compartilhe as credenciais de ‘login’ (e-mail: %{email} e a nova senha) com seus colegas.'
+        instructions_title: "<strong>O que você precisa fazer</strong>"
+        set_password: Defina sua senha
+        subject: Atualização importante sobre o seu perfil de grupo
+      notify_user_group_patched:
+        body_1_html: Estamos entrando em contato para informar sobre uma atualização importante referente ao seu perfil de grupo em %{organization_name}.
+        body_2_html: Como parte de nossos esforços para simplificar e melhorar a experiência para organizações como a sua, estamos desativando o recurso "Grupos de Usuários". Seu grupo, <strong>%{name}</strong>, foi convertido em uma conta normal.
+        body_3_html: Para continuar acessando sua conta e compartilhando o acesso, precisamos que você defina um novo e-mail e senha. Observe que todos os membros do seu grupo receberão este e-mail. Para garantir o acesso contínuo, será necessário que todos concordem internamente com as credenciais compartilhadas (e-mail e senha) que serão utilizadas por todos.
+        greeting: Prezado %{name},
+        instructions_1_html: 'Utilize as seguintes credenciais temporárias para fazer ‘login’: <br><br> Nome de usuário: <strong>%{email}</strong> <br> Senha: <strong>%{password}</strong><br><br>'
+        instructions_2_html: Defina um novo endereço de e-mail e uma nova senha.
+        instructions_3_html: Compartilhe as credenciais de ‘login’ escolhidas com seus colegas para que todo o grupo possa continuar acessando a conta.
+        instructions_title_html: "<strong>O que você precisa fazer</strong>"
+        subject: Atualização importante sobre o seu perfil de grupo
     user_report_mailer:
       notify:
         body_1: O usuário %{user} foi denunciado por %{token}
@@ -1215,6 +1762,12 @@ pt-BR:
     user_update_mailer:
       notify:
         body_1: Estamos enviando esta mensagem para informá-lo sobre uma atualização da sua conta.
+        body_2: Caso você não tenha realizado essa atualização, faça ‘login’ na sua conta para alterar sua senha. Se não conseguir fazer ‘login’, entre em contato com o suporte da plataforma.
+        greetings: Saudações,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
+        hello: Olá %{user}
+        main_body: 'Os seguintes detalhes foram alterados: %{updates}.'
+        update_fields: "%{updates} E %{last_update}"
+      subject: Sua conta foi atualizada
     version:
       show:
         back_to_resource: Voltar
@@ -1230,6 +1783,7 @@ pt-BR:
       show:
         version_index: Versão %{index}
     welcome_notification:
+      default_body: <p>Olá {{name}}, obrigado por se juntar à {{organization}} e seja bem-vindo!</p><ul><li>Se você quiser ter uma ideia rápida do que pode fazer aqui, dê uma olhada na seção <a href="{{help_url}}">Ajuda</a>.</li><li>Depois de lê-la, você receberá seu primeiro distintivo. Aqui está uma <a href="{{badges_url}}">lista de todos os distintivos</a> que você pode obter ao participar da {{organization}}</li><li>Por último, mas não menos importante, junte-se a outras pessoas, compartilhe com elas a experiência de estar engajado e participar da {{organization}}. Faça propostas, comentários, debata, pense em como contribuir para o bem comum, apresente argumentos para convencer, ouça e leia para se convencer, expresse suas ideias de forma concreta e direta, responda com paciência e decisão, defenda suas ideias e mantenha a mente aberta para colaborar e se juntar às ideias de outras pessoas.</li></ul>
       default_subject: Obrigado por se juntar a {{organization}}!
     wizard_step_form:
       wizard_aside:
@@ -1252,9 +1806,12 @@ pt-BR:
       last_attempt: Você tem mais uma tentativa antes que sua conta seja bloqueada.
       locked: Sua conta está bloqueada.
       not_found_in_database: '%{authentication_keys} inválido ou senha.'
+      timeout: Sua sessão expirou. Faça ‘login’ novamente para continuar.
+      unauthenticated: Você precisa fazer ‘login’ ou criar uma conta antes de continuar.
     invitations:
       edit:
         header: Termine de criar sua conta
+        nickname_help: Seu apelido em %{organization}. Pode conter apenas letras, números, '-' e '_'.
         submit_button: Salvar
         subtitle: Se você aceitar o convite, defina seu apelido e senha.
       invitation_removed: Seu convite foi removido.
@@ -1281,30 +1838,42 @@ pt-BR:
         accept_until: Este convite será devido em %{due_date}.
         decline: Negar convite
         hello: Olá %{email},
+        ignore: |-
+          Se você não deseja aceitar o convite, ignore este e-mail.<br />
+          Sua conta não será criada até que você acesse o link acima e defina seu apelido e senha.
         invited_you_as_admin: "%{invited_by} convidou você como administrador de %{application}. Você pode aceitá-lo através do link abaixo."
-        invited_you_as_private_user: "%{invited_by} convidou você como usuário particular de %{application}. Você pode aceitá-lo através do link abaixo."
+        invited_you_as_member: "%{invited_by} Convidou você para participar do %{application}. Você pode aceitar o convite pelo link abaixo."
         someone_invited_you: Alguém convidou você para %{application}. Você pode aceitá-lo através do link abaixo.
         someone_invited_you_as_admin: Alguém convidou você como administrador de %{application}, você pode aceitá-lo através do link abaixo.
-        someone_invited_you_as_private_user: Alguém convidou você como usuário privado de %{application}, você pode aceitá-lo através do link abaixo.
+        someone_invited_you_as_member: Você recebeu um convite para participar do %{application} e pode aceitá-lo através do link abaixo.
         subject: Instruções de convite
       invite_admin:
         subject: Você foi convidado a gerenciar %{organization}
+      invite_collaborator:
+        subject: Você foi convidado a colaborar em %{organization}
+      invite_member:
+        subject: Você foi convidado para um processo participativo privado em %{organization}
       organization_admin_invitation_instructions:
         subject: Você foi convidado a gerenciar %{organization}
       password_change:
         greeting: Olá %{recipient}!
+        message: Estamos entrando em contato com você para notificá-lo de que sua senha foi alterada.
         subject: A senha mudou
       reset_password_instructions:
         action: Mudar minha senha
         greeting: Olá %{recipient}!
         instruction: Alguém solicitou um link para alterar sua senha, e você pode fazer isso através do link abaixo.
+        instruction_2: Se você não solicitou isso, ignore este email.
+        instruction_3: Sua senha não será alterada até que você acesse o link acima e crie uma.
         subject: Redefinir instruções de senha
       unlock_instructions:
         action: Desbloquear minha conta
         greeting: Olá %{recipient}!
         instruction: 'Clique no link abaixo para desbloquear sua conta:'
+        message: Sua conta foi bloqueada devido a uma quantidade excessiva de tentativas de acesso incorretas.
         subject: Desbloquear instruções
     omniauth_callbacks:
+      add_tos_errors: Os termos de serviço devem ser aceitos para criar uma conta.
       failure: Não foi possível autenticá-lo de %{kind} porque "%{reason}".
       success: Autenticado com êxito a partir de %{kind} conta.
     passwords:
@@ -1312,10 +1881,14 @@ pt-BR:
         change_my_password: Mudar minha senha
         confirm_new_password: Confirme a nova senha
         new_password: Nova senha
+        old_password_help: Para confirmar as alterações à sua conta, por favor, forneça a sua senha atual.
+        password_help: "O mínimo de caracteres %{minimum_characters}, não deve ser muito comum (por exemplo, 123456) e deve ser diferente do seu apelido e do seu e-mail."
+        password_help_admin: "Mínimo de caracteres %{minimum_characters}, não deve ser muito comum (por exemplo, 123456) deve ser diferente do seu apelido e seu email e deve ser diferente das senhas antigas."
         title: Senha alterada
       new:
         forgot_your_password: Esqueceu sua senha?
         send_me_reset_password_instructions: Envie-me as instruções de redefinição de senha
+      no_token: Você não pode acessar esta página sem precisar de um email de redefinição de senha. Se você veio de um email de redefinição de senha, verifique se você usou a URL completa fornecida.
       send_instructions: Você receberá um e-mail com instruções sobre como redefinir sua senha em alguns minutos.
       send_paranoid_instructions: Se o seu endereço de e-mail existir em nosso banco de dados, você receberá um link de recuperação de senha em seu endereço de e-mail em alguns minutos.
       updated: Sua senha foi alterada com sucesso. Agora você está conectado.
@@ -1374,9 +1947,13 @@ pt-BR:
       link:
         bubbleMenu:
           edit: Editar
+          remove: Excluir
+          url: URL
         hrefLabel: Link URL
+        targetLabel: Destino
         targets:
           blank: Nova aba
+          default: Defeito (mesma guia)
       videoEmbed:
         titleLabel: Título
         urlLabel: URL do vídeo
@@ -1388,11 +1965,26 @@ pt-BR:
       close: Fechar modal
     toolbar:
       control:
+        blockquote: Bloco de citação
         bold: Negrito
+        bulletList: Lista não ordenada
+        codeBlock: Bloco de código
+        common:
+          eraseStyles: Apagar estilos
+        hardBreak: Quebra de linha
+        heading: Estilo do texto
         image: Imagem
         indent:
           indent: Indentar
+          outdent: Desdentar
         italic: Itálico
+        link: Link
+        orderedList: Lista ordenada
+        underline: Sublinhar
+        videoEmbed: Vídeo incorporado
+      textStyle:
+        heading: Cabeçalho %level%
+        normal: Normal
     upload:
       uploadedFile: Arquivo carregado
   emojis:
@@ -1401,18 +1993,26 @@ pt-BR:
     categories:
       activity: Atividade
       custom: Personalizar
+      flags: Bandeiras
+      foods: Comida e Bebida
+      frequent: Usados com frequência
       nature: Animais e Natureza
+      objects: Objetos
+      people: Carinhas e Pessoas
       places: Viagens e Lugares
       search: Resultados da Pesquisa
       symbols: Símbolos
     pick: Escolher um emoji…
     search: Pesquisar
     search_no_results_1: Ah não!
+    search_no_results_2: Não foi possível encontrar esse emoji
     skins:
       '1': Padrão
       '2': Claro
       '3': Luz média
+      '4': Médio
       '5': Médio-Escuro
+      '6': Escuro
       choose: Escolha um tom de pele
   errors:
     messages:
@@ -1420,8 +2020,10 @@ pt-BR:
       already_confirmed: já foi confirmada, tente fazer login
       blank: não pode estar em branco
       cannot_be_blank: não pode estar em branco
+      confirmation: não corresponde %{attribute}
       confirmation_period_expired: precisa ser confirmado dentro de %{period}, solicite um novo
       content_type_allowlist_error: o tipo de arquivo não é válido
+      cycle_detected: O pai de um escopo não pode ser um de seus descendentes
       empty: não pode estar vazio
       expired: expirou, solicite um novo
       file_size_is_less_than_or_equal_to: o tamanho do arquivo deve ser menor ou igual a %{count}
@@ -1507,23 +2109,34 @@ pt-BR:
         edit: Editar
       footer:
         cc_by_license: Licença Creative Commons
+        current_organization_img: "%{organization} (Voltar para a página inicial)"
         data_consent_settings: Configurações de cookies
         decidim_logo: Logo Decidim
         decidim_title: Decidim
+        help: Ajuda
         log_in: Iniciar sessão
         made_with_open_source: Site criado com <a target="_blank" href="https://github.com/decidim/decidim"> software livre</a>.
+        open_data: Dado Aberto
         resources: Recursos
         sign_up: Criar uma conta
+        social_media: Mídias sociais
         terms_of_service: Termos de serviço
       header:
+        back: Voltar
+        close: Fechar
+        confirm_close_ephemeral_session: Se você sair da sessão, ela será encerrada temporariamente. No entanto, todo o seu progresso e atividades serão salvos. Se você concluiu sua atividade, clique em OK.
+        confirm_title_close_ephemeral_session: Antes de sair desta página…
         log_in: Iniciar sessão
         main_menu: Menu principal
         user_menu: Menu de usuários
       impersonation_warning:
         close_session: Fechar sessão
         description_html: Você está representando o usuário <b>%{user_name}</b>.
+        expire_time_html: Sua sessão expirará em <b><span data-impersonation-warning-target="minutes">%{minutes}</span> minutos</b>.
       language_chooser:
         choose_language: Escolher idioma
+      navigation:
+        aria_label: 'Menu de navegação: %{title} '
       notifications_dashboard:
         mark_all_as_read: Marcar tudo como lido
         mark_as_read: Marcar como lida
@@ -1550,6 +2163,8 @@ pt-BR:
         profile: Minha conta
         public_profile: Meu perfil público
         title: Links do perfil
+        unread_conversations: Você tem notificações não lidas
+        unread_notifications: Você tem notificações não lidas
       user_profile:
         account: Conta
         authorizations: Autorizações
@@ -1561,6 +2176,11 @@ pt-BR:
   locale:
     name: Português brasileiro
     name_with_error: Português brasileiro (erro!)
+  number:
+    currency:
+      format:
+        format: "%rs%n"
+        format_html: "<span>%rs</span> %n"
   password_validator:
     denied: foi negado
     domain_included_in_password: é muito semelhante a este nome de domínio
@@ -1613,6 +2233,8 @@ pt-BR:
       day_of_week: "%a"
       day_of_week_long: "%a %e"
       day_of_year: "%d.%m.%y"
+      ddmm: "%d.%m"
+      ddmmyyyy: "%d.%m.%Y"
       decidim_day_of_year: "%d %B %Y"
       decidim_short: "%d/%m/%Y %H:%M"
       default: "%a, %d %b %Y %H:%M:%S %z"
@@ -1624,8 +2246,10 @@ pt-BR:
         time_format: 'Formato: hh:mm'
       long: "%B %d, %Y %H:%M"
       long_dashed: "%Y-%m-%d %H:%M:%S"
+      long_with_particles: "%d %B, %Y as %H:%M"
       short: "%d/%m/%Y %H:%M"
       time_of_day: "%H:%M"
+      tooltip: "%d-%m-%Y %H:%M %p %Z (GMT %: z)"
   versions:
     directions:
       left: Exclusões
@@ -1637,6 +2261,7 @@ pt-BR:
       option_split: Lado-por lado
       option_unescaped: Abandonado
       option_unified: Unificado
+      toggle: Alternar visualização
   views:
     pagination:
       next: Próxima
diff --git a/decidim-core/config/locales/pt.yml b/decidim-core/config/locales/pt.yml
index 51156136d98b7..4280aa05fffa6 100644
--- a/decidim-core/config/locales/pt.yml
+++ b/decidim-core/config/locales/pt.yml
@@ -118,10 +118,6 @@ pt:
         update: "%{user_name} atualizou a aplicação OAuth %{resource_name}"
       organization:
         update: "%{user_name} atualizou as configurações da organização"
-      participatory_space_private_user:
-        create: "%{user_name} convidou %{resource_name} para ser um participante privado"
-        create_via_csv: "%{user_name} convidou %{resource_name} via CSV para ser participante privado"
-        delete: "%{user_name} removeu o participante %{resource_name} como participante privado"
       scope:
         create: "%{user_name} criou o âmbito %{resource_name}"
         create_with_parent: "%{user_name} criou o âmbito %{resource_name} dentro do âmbito %{parent_scope}"
@@ -890,10 +886,8 @@ pt:
         decline: Recusar convite
         hello: Olá %{email},
         invited_you_as_admin: "%{invited_by} convidou-(a) como administrador(a) de %{application}. Pode aceitar através da hiperligação abaixo."
-        invited_you_as_private_user: "%{invited_by} convidou-o(a) como participante privado de %{application}. Pode aceitar através da hiperligação abaixo."
         someone_invited_you: Alguém convidou-o(a) para %{application}. Pode aceitar através da hiperligação abaixo.
         someone_invited_you_as_admin: Alguém convidou-o(a) como administrador(a) de %{application}, pode aceitar através da hiperligação abaixo.
-        someone_invited_you_as_private_user: Alguém convidou-o(a) como participante privado de %{application}, pode aceitar através da hiperligação abaixo.
         subject: Instruções de convite
       password_change:
         greeting: Olá %{recipient}!
diff --git a/decidim-core/config/locales/ro-RO.yml b/decidim-core/config/locales/ro-RO.yml
index e0e5df16640ee..0211f384db046 100644
--- a/decidim-core/config/locales/ro-RO.yml
+++ b/decidim-core/config/locales/ro-RO.yml
@@ -45,7 +45,7 @@ ro:
         email: E-mailul dumneavoastră
         encrypted_password: Parolă
         locale: Setări regionale
-        name: Numele
+        name: Numele dumneavoastră
         nickname: Pseudonim
         old_password: Parola curentă
         password: Parolă
@@ -72,7 +72,8 @@ ro:
       decidim/promote_to_admin: Promovat ca administrator
       decidim/promoted_to_admin_event: Promovat ca administrator
       decidim/removed_from_group: Eliminat din grup
-      decidim/resource_hidden_event: Conținut ascuns
+      decidim/resource_hidden_event: Resursă ascunsă
+      decidim/resource_liked_event: Resursă apreciată
       decidim/welcome_notification_event: Mesaj de întâmpinare
   activerecord:
     attributes:
@@ -96,6 +97,10 @@ ro:
         one: Amendament
         few: Amendamente
         other: Amendamente
+      decidim/like:
+        one: Apreciere
+        few: Aprecieri
+        other: Aprecieri
       decidim/user:
         one: Participant
         few: Participanți
@@ -155,7 +160,7 @@ ro:
         x_seconds: "%{count}s"
         x_years: "%{count}y"
       x_days:
-        one: 1 zi
+        one: o zi
         few: "%{count} zile"
         other: "%{count} zile"
       x_hours:
@@ -171,26 +176,32 @@ ro:
         few: "%{count} luni"
         other: "%{count} luni"
       x_seconds:
-        one: 1 secundă
+        one: o secundă
         few: "%{count} secunde"
         other: "%{count} secunde"
+    widget:
+      label:
+        date: Selectați data pentru %{label}
+        time: Selectaţi timpul pentru %{label}
+      picker:
+        date_button: Deschideți selectorul de calendar pentru %{label}
+        time_button: Deschideți selectorul de timp pentru %{label}
   decidim:
     accessibility:
       external_link: Link extern
       front_page_link: Mergeți la prima pagină
       logo: "Logo-ul oficial al %{organization}"
       opens_in_new_tab: Deschideți în tab nou
-      secondary_menu: Meniu secundar
       skip_button: Salt la conținutul principal
     account:
       blocked: Acest cont a fost blocat din cauza încălcării termenilor și condițiilor
       delete:
         alert: Această acțiune nu poate fi anulată. Dacă vă ștergeți contul, nu veți mai putea să vă autentificați cu datele de autentificare. Ștergerea contului dvs. va duce la anonimizarea contribuțiilor dvs. Veți putea crea în continuare un cont nou, dar aceste contribuții nu vor fi asociate cu acesta.
         confirm:
-          close: Închideţi fereastra
+          close: Închideți fereastra
           ok: Da, vreau să îmi șterg contul
           question: Sigur doriți să vă ștergeți contul?
-          title: Șterge contul meu
+          title: Ștergeți contul meu
         explanation: Vă rugăm, completați motivul pentru care doriți să vă ștergeți contul (opțional).
         leaving_authorizations_behind: Unele date asociate autorizării dumneavoastră vor fi salvate pentru securitate. Dacă creați un alt cont și autorizați din nou, aceste date vor fi recuperate în noul dvs. cont.
       destroy:
@@ -199,6 +210,7 @@ ro:
         success: Contul dumneavoastră a fost șters cu succes.
       download_your_data_export:
         export_expired: Exportul a expirat. Încercați să generați un nou export.
+        export_not_found: Exportul pe care l-ați accesat nu există sau nu aveți acces să-l descărcați
         file_no_exists: Fișierul nu există
         notice: Generarea fișierului de export a datelor dumneavoastră este în desfășurare. Veți primi un e-mail atunci când este completă.
       email_change:
@@ -226,27 +238,27 @@ ro:
         cancel: Anulați
       password_change:
         alert: Trebuie să vă schimbați parola pentru a merge mai departe.
-        notification: Utilizatorii cu rol de administrator trebuie să își schimbe parola o dată la %{count} zile.
+        notification: Participanții cu rol de administrator trebuie să își schimbe parola o dată la %{count} zile.
     admin_log:
       area:
         create: "%{user_name} a creat zona %{resource_name}"
-        delete: "%{user_name} a șters zona %{resource_name}"
+        delete: "%{user_name} a eliminat zona %{resource_name}"
         update: "%{user_name} a actualizat zona %{resource_name}"
       area_type:
         create: "%{user_name} a creat tipul de zonă %{resource_name}"
-        delete: "%{user_name} a șters tipul de zonă %{resource_name}"
+        delete: "%{user_name} a eliminat tipul de zonă %{resource_name}"
         update: "%{user_name} a actualizat tipul de zonă %{resource_name}"
       attachment:
         create: "%{user_name} a creat atașamentul %{resource_name}"
-        delete: "%{user_name} a șters atașamentul %{resource_name}"
+        delete: "%{user_name} a eliminat atașamentul %{resource_name}"
         update: "%{user_name} a actualizat atașamentul %{resource_name}"
       attachment_collection:
         create: "%{user_name} a creat colecția de atașamente %{resource_name}"
-        delete: "%{user_name} a șters colecția de atașamente %{resource_name}"
+        delete: "%{user_name} a eliminat colecția de atașamente %{resource_name}"
         update: "%{user_name} a actualizat colecția de atașamente %{resource_name}"
       category:
         create: "%{user_name} a adăugat categoria %{resource_name} în spațiul participativ %{space_name}"
-        delete: "%{user_name} a șters categoria %{resource_name} din spațiul participativ %{space_name}"
+        delete: "%{user_name} a eliminat categoria %{resource_name} din spațiul participativ %{space_name}"
         update: "%{user_name} a actualizat categoria %{resource_name} din spațiul participativ %{space_name}"
       component:
         create: "%{user_name} a adăugat componenta %{resource_name} în spațiul participativ %{space_name}"
@@ -258,14 +270,18 @@ ro:
         unpublish: "%{user_name} a anulat publicarea componentei %{resource_name} din spațiul participativ %{space_name}"
         update_permissions_with_space: "%{user_name} a actualizat permisiunile %{resource_name} din spațiul participativ %{space_name}"
       contextual_help_section:
-        update: "%{user_name} a actualizat secțiunea de ajutor %{resource_name}"
+        update: "%{user_name} a actualizat secțiunea de ajutor a %{resource_name}"
       helpers:
         answers: răspunsuri
         comments: comentarii
         projects: proiecte
         results: rezultate
       impersonation_log:
-        manage: "%{user_name} a gestionat %{resource_name} deoarece %{reason}"
+        manage: "%{user_name} a gestionat participantul %{resource_name} deoarece %{reason}"
+      member:
+        create: "%{user_name} l-a invitat pe %{resource_name} să fie membru"
+        create_via_csv: "%{user_name} l-a invitat pe %{resource_name} prin upload de CSV să fie membru"
+        delete: "%{user_name} l-a eliminat ca membru pe %{resource_name}"
       moderation:
         bulk_hide: "%{user_name} a ascuns %{reported_count} resurse"
         bulk_unhide: "%{user_name} a ascuns %{reported_count} resurse"
@@ -274,87 +290,83 @@ ro:
         unreport: "%{user_name} nu a raportat o resursă de tip %{resource_type} în spațiul %{space_name}"
       newsletter:
         create: "%{user_name} a creat newsletterul %{resource_name}"
-        delete: "%{user_name} a șters newsletterul %{resource_name}"
-        deliver: "%{user_name} a livrat newsletterul %{resource_name}"
+        delete: "%{user_name} a eliminat newsletterul %{resource_name}"
+        deliver: "%{user_name} a trimis newsletterul %{resource_name}"
         update: "%{user_name} a actualizat newsletterul %{resource_name}"
       oauth_application:
         create: "%{user_name} a creat aplicația OAuth %{resource_name}"
-        delete: "%{user_name} a șters aplicația OAuth %{resource_name}"
+        delete: "%{user_name} a eliminat aplicația OAuth %{resource_name}"
         update: "%{user_name} a actualizat aplicația OAuth %{resource_name}"
       organization:
         update: "%{user_name} a actualizat setările organizației"
         update_external_domain: "%{user_name} a actualizat domeniile externe ale organizației"
-      participatory_space_private_user:
-        create: "%{user_name} a invitat pe %{resource_name} să fie un participant privat"
-        create_via_csv: "%{user_name} a invitat pe %{resource_name} prin upload de CSV să fie un participant privat"
-        delete: "%{user_name} l-a eliminat pe %{resource_name} din lista de participanți privați"
       scope:
         create: "%{user_name} a creat domeniul de interes %{resource_name}"
         create_with_parent: "%{user_name} a creat subdomeniul de interes %{resource_name} în cadrul domeniului de interes %{parent_scope}"
-        delete: "%{user_name} a șters domeniul de interes %{resource_name}"
-        delete_with_parent: "%{user_name} a șters subdomeniul de interes %{resource_name} în cadrul domeniului de interes %{parent_scope}"
+        delete: "%{user_name} a eliminat domeniul de interes %{resource_name}"
+        delete_with_parent: "%{user_name} a eliminat subdomeniul de interes %{resource_name} în cadrul domeniului de interes %{parent_scope}"
         update: "%{user_name} a actualizat domeniul de interes %{resource_name}"
         update_with_parent: "%{user_name} a actualizat subdomeniul %{resource_name} în cadrul domeniului %{parent_scope}"
       scope_type:
         create: "%{user_name} a creat tipul de domeniu de interes %{resource_name}"
-        delete: "%{user_name} a șters tipul de domeniu de interes %{resource_name}"
+        delete: "%{user_name} a eliminat tipul de domeniu de interes %{resource_name}"
         update: "%{user_name} a actualizat tipul de domeniu de interes %{resource_name}"
       share_token:
         create: "%{user_name} a creat un link de acces în %{space_name}"
         create_with_space: "%{user_name} a creat un link de acces pentru %{resource_name} din %{space_name}"
-        delete: "%{user_name} a șters un link de acces din %{space_name}"
-        delete_with_space: "%{user_name} a șters un link de acces pentru %{resource_name} din %{space_name}"
+        delete: "%{user_name} a eliminat un link de acces din %{space_name}"
+        delete_with_space: "%{user_name} a eliminat un link de acces pentru %{resource_name} din %{space_name}"
         update: "%{user_name} a actualizat un link de acces din %{space_name}"
         update_with_space: "%{user_name} a actualizat un link de acces pentru %{resource_name} din %{space_name}"
       static_page:
         create: "%{user_name} a creat pagina statică %{resource_name}"
-        delete: "%{user_name} a șters pagina statică %{resource_name}"
+        delete: "%{user_name} a eliminat pagina statică %{resource_name}"
         update: "%{user_name} a actualizat pagina statică %{resource_name}"
       taxonomy:
         create: "%{user_name} a creat taxonomia %{resource_name}"
         create_with_parent: "%{user_name} a creat taxonomia %{resource_name} în interiorul taxonomiei %{parent_taxonomy}"
-        delete: "%{user_name} a șters taxonomia %{resource_name}"
-        delete_with_parent: "%{user_name} a șters taxonomia %{resource_name} din cadrul taxonomiei %{parent_taxonomy}"
+        delete: "%{user_name} a eliminat taxonomia %{resource_name}"
+        delete_with_parent: "%{user_name} a eliminat taxonomia %{resource_name} din cadrul taxonomiei %{parent_taxonomy}"
         update: "%{user_name} a actualizat taxonomia %{resource_name}"
         update_with_parent: "%{user_name} a actualizat taxonomia %{resource_name} din cadrul taxonomiei %{parent_taxonomy}"
       taxonomy_filter:
         create: "%{user_name} a creat filtrul %{resource_name}"
         create_with_filter_info: '%{user_name} a creat filtrul %{resource_name} bazat pe taxonomie"%{taxonomy_name}" care are %{filter_items_count} elemente'
-        delete: "%{user_name} a șters filtrul %{resource_name}"
+        delete: "%{user_name} a eliminat filtrul %{resource_name}"
         delete_with_filter_info: '%{user_name} a șters filtrul %{resource_name} bazat pe taxonomie"%{taxonomy_name}" care are %{filter_items_count} elemente'
         update: "%{user_name} a actualizat filtrul %{resource_name}"
         update_with_filter_info: '%{user_name} a creat filtrul %{resource_name} bazat pe taxonomie"%{taxonomy_name}" care are %{filter_items_count} elemente'
       user:
         block: "%{user_name} a blocat accesul participantului %{resource_name}"
-        bulk_block: "%{user_name} a blocat %{blocked_count} utilizatori"
+        bulk_block: "%{user_name} a blocat %{blocked_count} participanți"
         bulk_ignore: "%{user_name} a deblocat %{unreported_users_count} utilizatori"
-        bulk_unblock: "%{user_name} a deblocat %{unblocked_count} utilizatori"
+        bulk_unblock: "%{user_name} a deblocat %{unblocked_count} participanți"
         invite: "%{user_name} a invitat participantul %{resource_name} cu rolul: %{role}"
-        officialize: "%{user_name} a validat participantul %{resource_name}"
+        officialize: "%{user_name} a oficializat participantul %{resource_name}"
         promote: "%{user_name} a promovat %{resource_name}"
-        remove_from_admin: "%{user_name} a eliminat participantul %{resource_name} cu rolul: %{role}"
+        remove_from_admin: "%{user_name} a eliminat rolul de %{role} al participantului %{resource_name}"
         show_email: "%{user_name} a vizualizat e-mailul participantului %{resource_name}"
         transfer: "%{user_name} a transferat participantul %{resource_name}"
         unblock: "%{user_name} a deblocat accesul participantului %{resource_name}"
-        unofficialize: "%{user_name} a revocat validarea pentru participantul %{resource_name}"
+        unofficialize: "%{user_name} a revocat oficializarea pentru participantul %{resource_name}"
       user_group:
-        block: "%{user_name} a blocat grupul de utilizatori %{resource_name}"
-        bulk_block: "%{user_name} a blocat %{blocked_count} utilizatori"
+        block: "%{user_name} a blocat grupul de participanți %{resource_name}"
+        bulk_block: "%{user_name} a blocat %{blocked_count} participanți"
         bulk_ignore: "%{user_name} a deblocat %{unreported_users_count} utilizatori"
-        bulk_unblock: "%{user_name} a deblocat %{unblocked_count} utilizatori"
+        bulk_unblock: "%{user_name} a deblocat %{unblocked_count} participanți"
         reject: "%{user_name} a respins verificarea grupului %{resource_name}"
-        unblock: "%{user_name} a deblocat grupul de utilizatori %{resource_name}"
-        verify: "%{user_name} a verificat grupul de utilizatori %{resource_name}"
-        verify_via_csv: "%{user_name} a verificat grupul de utilizatori %{resource_name} printr-un upload de fișier CSV"
+        unblock: "%{user_name} a deblocat grupul de participanți %{resource_name}"
+        verify: "%{user_name} a verificat grupul de participanți %{resource_name}"
+        verify_via_csv: "%{user_name} a verificat grupul de participanți %{resource_name} printr-un upload de fișier CSV"
       user_moderation:
         unreport: "%{user_name} a anulat raportarea pentru %{resource_type} - %{unreported_user_name}"
     admin_terms_of_service:
       default_body: "<h2>ADMIN TERMS OF USE</h2><p>Avem încredere că ați primit prelegerea obișnuită de la administratorul local de sistem. De obicei se rezumă la aceste trei lucruri: </p><ol><li>Respectați viața privată a celorlalți. </li><li>Gândiți înainte de a face clic.</li><li>Cu o putere mare vine și o mare responsabilitate.</li></ol>"
     alert:
-      dismiss: Închideți notificare
+      dismiss: Închideți notificarea
     amendments:
       accepted:
-        error: Există o problemă la acceptarea amendamentului.
+        error: A apărut o problemă la acceptarea amendamentului.
         success: Amendamentul a fost acceptat cu succes.
       amendable:
         button: Creați amendament pentru %{model_name}
@@ -371,12 +383,12 @@ ro:
         error: A apărut o problemă la crearea ciornei de amendament.
         success: Proiectul de amendament a fost creat cu succes.
       destroy_draft:
-        error: A apărut o eroare la ștergerea proiectului de amendament.
-        success: Proiectul de amendament a fost șters cu succes.
+        error: A apărut o eroare la ștergerea ciornei de amendament.
+        success: Ciorna de amendament a fost ștearsă cu succes.
       edit_draft:
-        discard: Renunțați la acest proiect de amendament
+        discard: Renunțați la acest ciornă de amendament
         send: Previzualizați
-        title: Editați proiectul de amendament
+        title: Editează ciorna de amendament
       emendation:
         actions:
           button_accept: Acceptaţi
@@ -391,19 +403,19 @@ ro:
           rejected: Acest amendament pentru %{amendable_type} %{proposal_link} a fost respins la data de <strong>%{date}</strong>.
           withdrawn: |-
             Acest amendament pentru %{amendable_type} %{proposal_link} a fost retras de către autor.
-      name: Amendamente
+      name: Amendament
       new:
         send: Creați
-        title: Creați un proiect de amendament
+        title: Creează o ciornă de amendament
       preview_draft:
         modify: Modificați
         publish: Publicați
-        title: Publicați proiectul de amendament
+        title: Publică ciorna de amendament
       promoted:
-        error: A existat o problemă la publicarea amendamentului ca propunere nouă.
+        error: A apărut o eroare la publicarea amendamentului ca propunere nouă.
         success: Amendamentul a fost publicat cu succes ca propunere nouă.
       publish_draft:
-        error: A apărut o problemă la publicarea amendamentului.
+        error: A apărut o eroare la publicarea amendamentului.
         success: Amendamentul a fost publicat cu succes.
       rejected:
         error: A apărut o eroare la respingerea acestui amendament, vă rugăm să încercați mai târziu.
@@ -413,8 +425,8 @@ ro:
         heading: Revizuiți amendamentul
         send: Acceptați amendamentul
       update_draft:
-        error: A apărut o problemă la actualizarea proiectului de amendament.
-        success: Proiectului de amendament a fost actualizat cu succes.
+        error: A apărut o eroare la actualizarea ciornei de amendament.
+        success: Ciorna de amendament a fost actualizată cu succes.
       withdraw:
         error: A apărut o eroare la retragerea amendamentului.
         success: Amendamentul a fost retras cu succes.
@@ -445,6 +457,10 @@ ro:
         one: comentariu
         few: comentarii
         other: comentarii
+      likes:
+        one: o apreciere
+        few: aprecieri
+        other: aprecieri
       official_author: Oficial
     authorization_handlers:
       another_dummy_authorization_handler:
@@ -476,9 +492,9 @@ ro:
       expires_at: Expiră la %{timestamp}
       foo_authorization:
         fields:
-          bar: Bară
+          bar: Bar
           foo: Foo
-        name: Autorizare foo
+        name: Substitut pentru autorizare
       granted_at: Acordată la %{timestamp}
       sms:
         explanation: Introduceți numărul de telefon mobil pentru a vă putea verifica identitatea.
@@ -499,7 +515,7 @@ ro:
         missing:
           authorize: Autorizați cu "%{authorization}"
           explanation: Pentru a efectua această acțiune, trebuie să fiți autorizat cu "%{authorization}".
-          title: Autorizare necesară
+          title: Este necesară autorizarea
         ok:
           title: Ați fost autorizat în timp ce vizitai această pagină. Te rugăm să reîncarci pagina pentru a efectua acțiunea.
         pending:
@@ -593,6 +609,13 @@ ro:
         welcome_text: Text de întâmpinare
       highlighted_content_banner:
         name: Banner conținut evidențiat
+      highlighted_content_banner_settings_form:
+        action_button_title: Titlul butonului de acțiune
+        action_button_url: URL-ul butonului de acțiune
+        background_image: Imagine de fundal
+        short_description: Scurtă descriere
+        subtitle: Subtitlu
+        title: Titlu
       highlighted_elements_settings_form:
         components:
           all: Toate
@@ -658,7 +681,7 @@ ro:
           username_help: Numele public care apare pe postări. Pentru a garanta anonimitatea, poate fi orice nume.
         new_tos_fields:
           sign_up: Creați un cont
-          sign_up_title: Finalizează crearea contului tău
+          sign_up_title: Finalizați crearea contului dumneavoastră
       registrations:
         create:
           error: A apărut o problemă la crearea contului dumneavoastră.
@@ -702,13 +725,18 @@ ro:
           or: sau
         password_fields:
           hidden_password: Parola dvs. este ascunsă
-          hide_password: Ascunde parola
-          show_password: Afişeaza parola
-          shown_password:
+          hide_password: Ascundeți parola
+          show_password: Afișați parola
+          shown_password: Parola dumneavoastră este vizibilă
         placeholder_email: hi@exemplu.org
+    documents:
+      one: "%{count} document"
+      few: "%{count} documente"
+      other: "%{count} documente"
     doorkeeper:
       authorizations:
         new:
+          api_read: Citiți conținutul prin API
           authorize: Autorizați aplicație
           by_organization_link_html: <small class="heading-small">de %{link}</small>
           cancel: Anulați
@@ -724,6 +752,11 @@ ro:
       export:
         ready: Pregătit
       help:
+        follows:
+          created_at: Data și ora când a fost creată urmărirea
+          followable: Resursa sau spațiul care este urmărit
+          id: Identificatorul unic al acestei urmăriri
+          updated_at: Data și ora la care a fost actualizată ultima dată
         identities:
           created_at: Data și ora la care a fost creată identitatea
           id: Identificatorul unic al acestei identități
@@ -733,13 +766,20 @@ ro:
           user: Utilizatorul căruia îi aparține această identitate
         messaging_conversations:
           created_at: Data la care a fost creată această conversație
-        participatory_space_private_users:
-          created_at: Data și ora la care a fost creat acest utilizator privat
-          id: Identificatorul unic al acestui utilizator privat
-          privatable_to: Spațiul căruia îi aparține acest utilizator privat
-          published: Daca acest utilizator privat este vizibil sau nu
-          role: Rolul pe care îl are acest utilizator privat
-          updated_at: Data și ora la care acest utilizator privat a fost actualizat ultima dată
+          id: Identificatorul unic pentru această conversație
+          messages: Mesajele acestei conversații
+          updated_at: Data la care această conversație a fost actualizată ultima dată
+        notifications:
+          created_at: Data și ora la care a fost creată notificarea
+          event_class: Clasa evenimentului care a declanșat notificarea
+          event_name: Numele evenimentului care a declanșat notificarea
+          extra: Informații suplimentare despre această notificare
+          id: Identificatorul unic pentru această notificare
+          resource_type: Tipul de resursă pentru care s-a realizat notificarea
+          updated_at: Data și ora la care notificarea a fost actualizată ultima dată
+        participatory_space_members:
+          participatory_space: Spațiul din care face parte acest membru
+          role: Rolul pe care îl are acest membru
         reports:
           created_at: Data și ora la care acest raport a fost creat
           details: Detaliile acestui raport
@@ -749,14 +789,46 @@ ro:
           reason: Motivul prezentului raport
           updated_at: Data și ora la care acest raport a fost actualizat ultima dată
         users:
+          about: Descrierea profilului acestui participant
           accepted_tos_version: Data la care termenii de utilizare ai acestei platforme au fost acceptați de către utilizator
+          admin: Dacă acest participant este un administrator
+          confirmation_sent_at: Data și ora la care a fost trimisă confirmarea
+          confirmed_at: Data și ora la care a fost confirmat acest participant
+          created_at: Data și ora la care a fost creat acest participant
+          current_sign_in_at: Data și ora autentificării curente
+          current_sign_in_ip: Adresa IP a autentificării curente
+          email: Adresa de e-mail a acestui participant
+          followers_count: Numărul de urmăritori ai acestui participant
           following_count: Numărul de participanți pe care acest utilizator îl urmărește
+          id: Identificatorul unic al acestui participant
+          invitation_accepted_at: Data și ora la care a fost acceptată invitația
+          invitation_created_at: Data și ora la care a fost invitat acest participant
+          invitation_sent_at: Data și ora la care a fost trimisă invitația
+          invitations_count: Numărul de invitații trimise acestui participant
+          invited_by: Participantul care a invitat acest participant
+          last_sign_in_at: Data și ora penultimei autentificări
+          last_sign_in_ip: Adresa IP a penultimei autentificări
+          locale: Limba locală (limba) selectată de acest participant
+          managed: Dacă acest participant este gestionat de un altul
+          name: Numele acestui participant
+          newsletter_notifications_at: Data și ora la care acest participant a ales să primească buletine informative
+          nickname: Pseudonimul acestui participant
+          notifications_sending_frequency: Frecvența notificărilor pe care le primește acest participant
+          officialized_as: Numele oficializării (consilier, primar, etc.)
+          officialized_at: Data și ora la care a fost oficializat acest participant
+          organization: Organizația căreia îi aparține acest participant
           password_updated_at: Data la care parola a fost schimbată ultima dată
+          personal_url: URL-ul personal al acestui participant
+          remember_created_at: Data și ora la care participantul a ales să fie ținut minte
+          reset_password_sent_at: Data și ora la care a fost trimisă cererea de resetare a parolei
           roles: Rolul pe care îl are acest utilizator, dacă are vreun astfel de rol
+          sign_in_count: De câte ori s-a autentificat acest participant
           type: Tipul pe care acest utilizator îl are
-          updated_at: Data și ora la care acest raport a fost actualizat ultima dată
+          unconfirmed_email: Adresa de e-mail pe care acest participant nu a confirmat-o încă
+          updated_at: Data și ora la care acest participant a fost actualizat ultima dată
       show:
-        download: Descarcă fișier
+        action: Acțiune
+        download: Descarcați fișier
         download_data: Descărcare date
         download_data_description_1: Aici puteți găsi toate descărcările disponibile pentru contul dvs. Aceste fișiere .zip vor fi disponibile timp de două săptămâni înainte de a fi șterse.
         download_data_description_2: Puteți solicita un fișier .zip cu conținutul generat, precum și datele dumneavoastră personale.
@@ -782,20 +854,20 @@ ro:
         file_resolution_too_large: Rezoluția fișierului este prea mare
       internal_server_error:
         copied: Text copiat!
-        copy_error_message_clarification: Copiază mesajul de eroare în clipboard
+        copy_error_message_clarification: Copiați mesajul de eroare în clipboard
         copy_to_clipboard: Copiați în clipboard
         date_and_time: Data și ora
-        reference: Referinţa
+        reference: Referință
         request_method: Metoda de solicitare
         title: A apărut o problemă cu serverul nostru
-        try_later: Te rugăm să încerci mai târziu. Dacă eroarea persistă, vă rugăm să copiați următoarele informații și să le trimiteți către întreținătorii platformei cu orice alte informații pe care poate doriți să le partajați.
+        try_later: Vă rugăm să încercați mai târziu. Dacă eroarea persistă, vă rugăm să copiați următoarele informații și să le trimiteți către întreținătorii platformei cu orice alte informații pe care poate doriți să le partajați.
         unknown: Necunoscut
         url: Adresa URL
-        user: ID utilizator
+        user: ID participant
       not_found:
         back_home: Înapoi acasă
         content_doesnt_exist: Această adresă este incorectă sau a fost eliminată.
-        title: Pagina pe care o cauți nu poate fi găsită.
+        title: Pagina pe care o cautați nu poate fi găsită
     events:
       amendments:
         amendment_accepted:
@@ -833,8 +905,8 @@ ro:
             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 a fost respins pentru %{amendable_title}. Îl poți vedea de pe această pagină:'
-            email_outro: Ai primit această notificare deoarece ești autorul %{amendable_title}.
+            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:
@@ -902,6 +974,7 @@ ro:
         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:
       download_your_data_export:
         download: Descărcare
@@ -933,6 +1006,11 @@ ro:
         other: "%{count} urmăritori"
       no_followers: Nici un urmăritor încă.
     following:
+      following_count:
+        one: "%{count} urmăritor"
+        few: "%{count} urmăritori"
+        other: "%{count} urmăritori"
+      no_followings: Nu urmărește pe nimeni sau nimic încă.
       non_public_followings: Unele dintre resursele urmărite nu sunt publice.
     follows:
       create:
@@ -946,31 +1024,38 @@ ro:
         decidim/user:
           password: Parola este prea scurtă.
           password_confirmation: Confirmarea parolei trebuie să coincidă cu parola.
+        error: Există o eroare în acest câmp.
       file_help:
         file:
           explanation: 'Orientări pentru fișier:'
           message_1: Are o imagine sau un document.
         icon:
-          explanation: 'Îndrumare pentru imagine:'
+          explanation: 'Îndrumare pentru icoană:'
         image:
-          explanation: 'Orientări pentru imagine:'
+          explanation: 'Îndrumare pentru imagine:'
+          message_1: De preferință o imagine orizontală care să nu conțină vreun text.
           message_2: Serviciul decupează imaginea.
       file_validation:
         allowed_file_extensions: 'Extensii de fișiere permise: %{extensions}'
+        max_file_dimension: 'Dimensiunea maximă a fișierului: %{resolution} pixeli'
         max_file_size: 'Dimensiunea maximă a fișierului: %{megabytes}MB'
       upload:
         labels:
-          add_attachment: Adaugă atașament
-          add_file: Adaugă fișier
-          add_image: Adaugă imagine
-          edit_image: Schimbă imaginea
+          add_attachment: Adaugați atașament
+          add_file: Adăugați fișier
+          add_image: Adaugați imagine
+          edit_image: Modificați imaginea
           error: Eroare!
+          file_size_too_large: 'Mărimea fișierului este prea mare! Mărimea maximă a fișierului: %{megabytes}MB'
           filename: Nume fișier
-          remove: Șterge
-          replace: Înlocuiește
+          remove: Eliminați
+          replace: Înlocuiți
           save: Salvați
           title: Titlu
           title_required: Titlul este obligatoriu!
+          uploaded: Încărcat
+          validating: Se validează...
+          validation_error: Eroare de validare! Verificați dacă fișierul are o extensie sau o dimensiune permisă.
         select_file: Selectaţi fişierul
       upload_help:
         dropzone: Trageți fișierele aici sau apăsați pe buton pentru a încărca
@@ -986,9 +1071,11 @@ ro:
           description_own: "%{score} persoane te urmăresc."
           name: Urmăritori
           next_level_in: Obțineți încă %{score} urmăritori pentru a atinge următorul nivel!
+          unearned_another: Acest participant nu are încă niciun urmăritor.
+          unearned_own: Încă nu aveți urmăritori.
         index:
           badge_title: "Insignă %{name}"
-          how: Cum poți să o câștigi
+          how: Cum puteți să o câștigați
           page_description: Insignele sunt recunoașterea acțiunilor participanților și progresele înregistrate în cadrul platformei. Pe măsură ce începi să descoperi, să participi și să interacționezi în platformă, vei câștiga diferite insigne. Aici este lista de insigne și câteva modalități prin care le poți câștiga.
           title: Insigne
       description: Insignele sunt recunoașterea acțiunilor participanților și progresele înregistrate în cadrul platformei. Pe măsură ce începi să descoperi, să participi și să interacționezi în platformă, vei câștiga diferite insigne.
@@ -1004,27 +1091,43 @@ ro:
         default_page:
           content: "<p>În %{organization} poți participa și decide cu privire la diferite subiecte, prin spaţiile participative pe care le vezi în meniul superior: Procese, Grupuri de lucru, Iniţiative, Consultări.</p> <p>În cadrul fiecăruia vei găsi opțiuni diferite pentru a participa: formulează propuneri individual sau împreună cu alte persoane, ia parte la dezbateri, prioritizează proiectele ce urmează a fi puse în aplicare, participă la întâlniri față-în-față și la alte acțiuni.</p>\n"
           title: Ce pot face în %{organization}?
+        title: General
     last_activities:
       all: Toate tipurile de activitate
       index:
         last_activity: Activitate recentă
+      name: Activitate recentă
+      no_activities_warning: Nu există intrări de afișat pentru acest tip de activitate.
+    like_buttons_cell:
+      already_liked: Anulează aprecierea
+      like: Apreciere
+    likes_list:
+      liked_by:
+        one: Apreciat de %{visible}
+        few: Apreciat de %{visible}
+        other: Apreciat de %{visible} și %{others}
+      others: "încă %{count}"
+      title: Apreciat de
+    linked_resource_from:
+      included_in: Inclus în
     links:
       invalid_url: URL invalid
       warning:
         body_1: Ești pe cale de a vizita un link extern și am dori să fii precaut în ceea ce privește conținutul de pe site-ul extern.
         body_2: Te rugăm să verifici link-ul pe care urmează să îl vizitezi și să te asiguri că îl este un site sigur înainte de a continua.
-        cancel: Anulare
+        cancel: Anulați
         proceed: Continuă
-        title: Deschide link-ul extern
+        title: Deschideți link-ul extern
     log:
       base_presenter:
         create: "%{user_name} a creat %{resource_name}"
         create_with_space: "%{user_name} a creat %{resource_name} în %{space_name}"
-        delete: "%{user_name} a șters %{resource_name}"
-        delete_with_space: "%{user_name} a șters %{resource_name} în %{space_name}"
-        unknown_action: "%{user_name} a efectuat o acțiune pe %{resource_name}"
-        unknown_action_with_space: "%{user_name} a efectuat o acțiune pe %{resource_name} în %{space_name}"
-        update: "%{user_name} actualizat %{resource_name}"
+        delete: "%{user_name} a eliminat %{resource_name}"
+        delete_with_space: "%{user_name} a eliminat %{resource_name} în %{space_name}"
+        publish: "%{user_name} a publicat %{resource_name}"
+        unknown_action: "%{user_name} a efectuat o acțiune în %{resource_name}"
+        unknown_action_with_space: "%{user_name} a efectuat o acțiune asupra %{resource_name} în %{space_name}"
+        update: "%{user_name} a actualizat %{resource_name}"
         update_with_space: "%{user_name} a actualizat %{resource_name} în %{space_name}"
       value_types:
         area_presenter:
@@ -1035,6 +1138,8 @@ ro:
           not_found: 'Domeniul de interes nu a fost găsit în baza de date (ID: %{id})'
         scope_type_presenter:
           not_found: 'Tipul domeniului de interes nu a fost găsit în baza de date (ID: %{id})'
+    machine_translations:
+      automatic: traducere automată în %{locale_name}
     managed_users:
       expired_session: Actuala sesiune de administrare a unui participant a expirat.
     map:
@@ -1049,12 +1154,14 @@ ro:
     messaging:
       conversation_mailer:
         new_conversation:
-          greeting: Hi, %{recipient}!
-          intro: "%{sender} a început o nouă conversație cu tine. Apasă aici pentru a o vedea:"
+          greeting: Bună ziua, %{recipient}!
+          intro: "%{sender} a început o nouă conversație cu tine. Apăsați aici pentru a o vedea:"
+          outro: Bucurați-vă de platformă!
           subject: "%{sender} a început o conversație cu tine"
         new_message:
           greeting: Hi, %{recipient}!
           intro: "%{sender} a postat mesaje noi în conversația ta. Apasă aici pentru a le vedea:"
+          outro: Bucurați-vă de platformă!
           subject: Ai mesaje noi de la %{sender}
       conversations:
         add_conversation_users:
@@ -1062,6 +1169,9 @@ ro:
           add_users_placeholder: Caută...
           modal_title: Conversație nouă
           no_results: Niciun rezultat
+          participant_with_disabled_message_reception: Acest participant nu dorește să primească mesaje private.
+          participants:
+            title: Participanți
         error_modal:
           close: Închidere
           correct_errors: Vă rugăm să remediați erorile și să încercați din nou.
@@ -1070,6 +1180,7 @@ ro:
         index:
           new_conversation: Conversație nouă
           next: Următoarea
+          no_conversations: Nu aveți nicio conversație.
           title: Conversații
         reply_form:
           placeholder: Răspunsul tău...
@@ -1077,18 +1188,22 @@ ro:
         show:
           back: Înapoi la toate conversațiile
           chat_with: Conversație cu
+          deleted_accounts: Nu puteți avea o conversație cu participanți care și-au șters contul.
           not_allowed: Acest participant nu acceptă mesaje directe.
           title: Conversație cu %{usernames}
         start:
-          placeholder: Mesajul tău...
-          send: Trimite
+          placeholder: Mesajul dumneavoastră...
+          send: Trimiteți
     metadata:
       progress:
+        active: Activ
+        finished: 'Finalizat: %{end_date}'
         not_started: Încă nu a început
         remaining: "%{time_distance} ramas"
     newsletter_mailer:
       newsletter:
         no_reply_notice: Acest e-mail a fost trimis de la o adresă de e-mail de notificare care nu poate accepta e-mailul primit. Nu răspundeți la acest mesaj.
+        note: Ați primit acest e-mail deoarece sunteți abonat la buletine informative privind %{organization_name}. Vă puteți schimba setările pe <a href="%{link}">pagina de notificări</a>.
         see_on_website: Nu se poate vedea corect acest e-mail? Vezi pe site-ul <a href="%{link}" target="_blank" class="see-on-website"></a>.
         unsubscribe: Pentru a renunța la primirea acestui tip de e-mail, <a href="%{link}" target="_blank" class="unsubscribe">Dezabonați-vă</a>.
     newsletter_templates:
@@ -1096,7 +1211,7 @@ ro:
         body_preview: 'Dummy text for body: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque fringilla nisl tellus. Donec sed mi dui. Sed efficitur libero a felis tempor sollicitudin. Nullam vestibulum fringilla felis, id efficitur lorem sagittis et. Vivamus aliquam maximus velit vel dapibus. Mauris pellentesque, enim eu varius lacinia, risus ante rutrum ipsum, non lobortis augue lorem quis urna. Aenean et malesuada arcu.'
         name: Basic (doar text)
       basic_only_text_settings_form:
-        body: Corp
+        body: Conținut
         interpolations_hint: 'Sugestie: Puteţi utiliza "%{name}" oriunde în corp sau subiect şi va fi înlocuit cu numele destinatarului.'
       image_text_cta:
         body_preview: 'Dummy text for body: Maecenas ac nisl vitae lectus pretium facilisis. Etiam facilisis sem nibh, sit amet rutrum mi aliquam nec. Sed id urna at nisl pretium mollis eu vel velit. Proin vitae suscipit urna, sed faucibus urna. Pellentesque id libero vulputate ipsum scelerisque suscipit. Nam aliquam sodales mi sit amet cursus. Donec mattis faucibus purus. Aenean tincidunt porta lorem ac commodo. Vestibulum in mollis mi. Morbi eros erat, cursus ut tortor sit amet, imperdiet dapibus arcu. Suspendisse id egestas enim. In eget magna sed enim efficitur elementum sit amet aliquam quam. Donec fermentum metus eget urna luctus pulvinar.'
@@ -1104,7 +1219,7 @@ ro:
         introduction_preview: 'Dummy text for introduction: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque fringilla nisl tellus. Donec sed mi dui. Sed efficitur libero a felis tempor sollicitudin. Nullam vestibulum fringilla felis, id efficitur lorem sagittis et. Vivamus aliquam maximus velit vel dapibus. Mauris pellentesque, enim eu varius lacinia, risus ante rutrum ipsum, non lobortis augue lorem quis urna. Aenean et malesuada arcu.'
         name: Imagine, text și butonul Apel la acțiune
       image_text_cta_settings_form:
-        body: Corp
+        body: Conținut
         cta_text: Textul butonului Apel la acțiune
         cta_url: URL buton Apel la Acțiune
         interpolations_hint: 'Sugestie: Puteţi utiliza "%{name}" oriunde în introducere, corp, text CTA sau subiect şi va fi înlocuit cu numele destinatarului.'
@@ -1113,11 +1228,14 @@ ro:
     newsletters:
       unsubscribe:
         error: A apărut o eroare la dezabonare.
-        success: Sunteți dezabonat cu succes.
+        success: V-ați dezabonat cu succes.
         token_error: Link-ul a expirat.
+        unsubscribe: Dezabonați-vă de la buletinul informativ
     newsletters_opt_in:
+      unauthorized: Ne pare rău, acest link nu mai este disponibil.
       update:
-        error: A apărut o eroare la actualizarea acestui buletin informativ.
+        error: A apărut o eroare la actualizarea setărilor acestui buletin informativ.
+        success: Setările pentru buletine informative au fost actualizate.
     newsletters_opt_in_mailer:
       notify:
         body_2: 'Cum ne puteți da acordul? Doar faceți clic pe următorul buton:'
@@ -1133,26 +1251,38 @@ ro:
         same_language: Conținutul a fost postat în limba preferată (%{language}), de aceea nu este afișată nicio traducere automată în acest e-mail.
         translated_text: 'Text tradus automat:'
     notifications:
-      no_notifications: Nici o notificare încă.
+      action_error: A apărut o eroare la actualizarea setărilor de notificări.
+      no_notifications: Nicio notificare încă.
+      show:
+        deleted: Conținutul a fost eliminat de autor.
+        missing_event: Ups, această notificare aparține unui articol care nu mai este disponibil. Puteți renunța la ea.
+        moderated: Conținutul a fost eliminat prin moderare.
+        not_available: Ups, această notificare aparține unui articol care nu mai este disponibil. Puteți renunța la ea.
     notifications_digest_mailer:
       header:
         daily: Rezumat notificare zilnică
+        real_time: În timp real
         weekly: Rezumat notificări săptămânale
       hello: Salut %{name},
       intro:
         daily: 'Acestea sunt notificările din ultima zi în funcție de activitatea pe care o dețineți:'
+        real_time: 'Aceasta este o notificare privind activitatea pe care o urmăriți:'
       see_more: Vezi mai multe notificări
+      subject: Acesta este email-ul cu sumarul
     notifications_settings:
       show:
         administrators: Administratori
         allow_public_contact: Permit tuturor să îmi trimită un mesaj direct, chiar dacă nu îi urmăresc.
+        allow_push_notifications: Obțineți notificări push pentru a afla ce se întâmplă când nu sunteți pe platformă. Puteți să le dezactivați oricând.
         assigned_to_proposal: Vreau să primesc un e-mail atunci când cineva îmi atribuie o propunere pentru evaluare
-        direct_messages: Primește mesaje directe de la oricine
+        direct_messages: Permiteți primirea de mesaje directe de la oricine
         email_on_moderations: Vreau să primesc un e-mail de fiecare dată când se raportează ceva pentru moderare.
         evaluators: Evaluatori
         everything_followed: Tot ce urmăresc
         newsletter_notifications: Vreau să primesc buletine informative
-        newsletters: Newslettere
+        newsletters: Buletine informative
+        notification_settings:
+          close_meeting_reminder: Vreau să primesc mementouri prin e-mail cu privire la rapoartele nepublicate ale ședințelor încheiate
         notifications_sending_frequencies:
           daily: Zilnic
           none: Nimic
@@ -1161,22 +1291,68 @@ ro:
         notifications_sending_frequency: Cât de des doriți să primiți e-mailul de notificări?
         own_activity: Propria mea activitate, ca atunci când cineva comentează în propunerea mea sau mă menționează
         push_notifications: Notificări Instant
+        push_notifications_reminder: Pentru a primi notificări de pe platformă, trebuie să le permiteți mai întâi din setările browser-ului.
         receive_notifications_about: Vreau să primesc notificări despre
         update_notifications_settings: Salvați modificările
       update:
         error: A apărut o eroare la actualizarea setărilor notificărilor.
         success: Setările de notificări au fost actualizate cu succes.
     offline:
+      name: Deconectat
       show:
+        message_1: Se pare că sunteți momentan deconectat.
+        message_2: Vă rugăm să încercați din nou mai târziu.
         retry: Încearcă din nou
+    onboarding_action_message:
+      click_link: Faceți clic aici
+      expired_authorization_active_title: Autorizarea dumneavoastră a expirat.
     open_data:
       help:
         core:
+          components: Componente
           generated_on_date: Generat la %{date}
           resources:
             one: "%{count} rezultat"
             few: "%{count} rezultate"
             other: "%{count} rezultate"
+          spaces: Spații
+        users:
+          about: Textul de descriere a participantului
+          direct_messages_enabled: Dacă utilizatorul permite mesaje directe
+      index:
+        detailed:
+          body_1: 'Mai jos este prezentată o descriere a fiecărui set de date, inclusiv schema (structura) sa și tipul de informații pe care le conține:'
+          components: Componente
+          spaces: Spatii participative
+          title: Explicații detaliate pentru fiecare fișier
+        download:
+          components: Componente
+          spaces: Spatii participative
+          title: Descărcați resurse
+        download_open_data: Descarcați toate fișierele de date deschise
+        how_to:
+          step_1:
+            body_html: Dați click pe link-urile de mai jos pentru a descărca fișierele CSV în computer.
+            title: 1. Descărcați fișierele
+          step_2:
+            body_html: |-
+              <ul>
+              <li><b>Aplicaţii Spreadsheet</b>: Puteţi deschide fişiere CSV folosind aplicaţii precum Microsoft Excel, Google Sheets sau LibreOffice Calc. Pur şi simplu deschideţi aplicaţia, apoi selectaţi "Deschide" din meniul de fişiere, şi alegeţi fişierul CSV descărcat.</li>
+              <li><b>Editori de Text</b>: fişierele CSV pot fi deschise şi în orice editor de text, precum Notepad sau Text Sublime. Acest lucru va afișa datele brute, cu fiecare linie reprezentând un rând și fiecare valoare separate prin virgulă.</li>
+              <li><b>Instrumente de analiză a datelor</b>: Dacă sunteţi familiarizaţi cu instrumente de analiză a datelor precum Python (cu pandas), R, sau baze de date SQL, puteţi importa aceste fişiere CSV direct pentru procesare şi analiză.</li>
+              </ul>
+            title: 2. Deschideți fișierele
+          step_3:
+            body_html: |-
+              <ul>
+              <li><b>Filtrare și sortare</b>: În aplicațiile tabelei de calcul puteți filtra și sorta datele pentru a vă concentra pe anumite subseturi de informații.</li>
+              <li><b>Analiza</b>: Utilizeazați datele pentru a efectua diverse analize, cum ar fi luarea în considerare a numărului de propuneri, analiza tendinţelor observaţiilor sau evaluarea participării la reuniuni.</li>
+              <li><b>Vizualizare</b>: Puteţi crea grafice, grafice şi alte vizualizări pentru a ajuta la interpretarea datelor.</li>
+              </ul>
+            title: 3. Lucrul cu datele
+          title: Cum să deschideți și să lucrați cu aceste fișiere
+        license:
+          title: Licență
       not_available_yet: Fişierele de date deschise nu sunt încă disponibile, vă rugăm să încercaţi din nou în câteva minute.
     pad_iframe:
       disclaimer: Conținutul acestui panou este scris de utilizatori înregistrați și își exprimă opiniile. %{organization} nu poate fi considerat responsabil pentru conținutul său.
@@ -1187,13 +1363,15 @@ ro:
           debates: Dezbateri
           debates_explanation: Dezbați și discuți, îți împărtășești opiniile și contribui la subiectele relevante pentru tine.
           how_to_participate: Cum pot lua parte la un proces?
-          meetings: Întâlniri
+          meetings: Ședințe
           meetings_explanation: Află unde și când poți participa la întâlniri deschise publicului.
           more_info: Mai multe informații
           proposals: Propuneri
           proposals_explanation: Formulează propuneri, votează propunerile existente și promovează schimbările pe care dorești să le vezi implementate.
         footer_sub_hero:
+          footer_sub_hero_body_html: Să construim o societate mai deschisă, mai transparentă și mai colaborativă. <br /> Participați și decideți.
           footer_sub_hero_headline: Bun venit pe platforma participativă %{organization}.
+          register: Creați un cont
         hero:
           participate: Participă
           participate_title: Participați la procesele platformei
@@ -1201,12 +1379,16 @@ ro:
         statistics:
           headline: Statistici
         sub_hero:
+          register: Creați un cont
           register_title: Creați un cont
       index:
         standalone_pages: Pagini
         subheading: Navigați prin paginile de ajutor ale %{name}
         title: Ajutor
         topics: Subiecte
+      terms_of_service:
+        form:
+          agreement: Sunt de acord cu acești termeni de utilizare
     participants_account_mailer:
       inactivity_notification:
         body_html: |
@@ -1240,6 +1422,7 @@ ro:
         send_private_message: Trimite mesaj privat
       user:
         actions:
+          disabled_message: Mesaj
           edit_profile: Editare profil
           message: Mesaj
           resend_email_confirmation_instructions: Retrimite e-mail instrucțiuni de confirmare
@@ -1248,6 +1431,11 @@ ro:
         scan: Scanaţi codul QR
         title: Cod QR pentru %{resource_title}
     reported_mailer:
+      hidden_manually:
+        details: Detalii
+        hello: Bună ziua %{name},
+        manage_moderations: Gestionați moderările
+        participatory_space: Spațiu participativ
       report:
         authors: Autori
         content: Conținut raportat
@@ -1259,8 +1447,8 @@ ro:
         participatory_space: Spaţiu participativ
         reason: Motiv
         report_html: <p>A fost raportat următorul <a href="%{url}">conținut</a> .</p>
-        see_report: Vezi raportul
-        subject: A fost raportată o resursă
+        see_report: Vizualizați raportul
+        subject: O resursă a fost raportată
     reports:
       create:
         success: Raportul a fost creat cu succes şi va fi revizuit de un administrator.
@@ -1272,24 +1460,27 @@ ro:
       help: Tastați pentru a căuta propuneri
     scopes:
       global: Domeniul global de interes
-      prompt: Selectează un domeniu
+      prompt: Selectează un domeniu de interes
     search:
+      name: Căutare
       results: Rezultatele căutării
       results_found_for_term: '%{count} rezultate ale căutării: "%{term}"'
-      term_input_placeholder: Caută
+      term_input_placeholder: Căutare
     searches:
       filters:
         jump_to: 'Sari la:'
+        search: Căutare
         state:
           active: Activ
           all: Toate
-          future: Viitorul
+          future: Viitor
           past: Trecute
       filters_small_view:
         filter: Filtrare
+        filter_and_search: Filtrare și căutare
         filter_by: Filtrare după
       results:
-        view_all: Vezi toate (%{count})
+        view_all: Vizualizați toate (%{count})
     security:
       selfxss_warning:
         description: Această caracteristică de browser este destinată dezvoltatorilor și nu ar trebui să inserați nimic aici dacă vi s-a cerut să faceți acest lucru. Lipirea conținutului în această fereastră poate compromite intimitatea ta și permite hackerilor să îți acceseze contul.
@@ -1300,35 +1491,41 @@ ro:
       qr_code: Cod QR
     shared:
       confirm_modal:
-        cancel: Anulează
-        close_modal: Închide fereastra
+        cancel: Anulați
+        close_modal: Închideți fereastra
         ok: Ok
         title: Confirmare
+      confirm_unload: Această pagină conține modificări nesalvate. Sunteți sigur că doriți să părăsiți această pagină?
       filter_form_help:
         help: Formularul de mai jos filtrează dinamic rezultatele căutării atunci când condițiile de căutare sunt schimbate.
         skip: Sari la rezultate
       flag_modal:
         already_reported: Acest conținut este deja raportat și va fi revizuit de către un administrator.
         close: Închideți
-        description: Este acest conținut neadecvat?
-        hide: Ascunde
+        description: Acest conținut este neadecvat?
+        does_not_belong: Conține activitate ilegală, amenințări la sinucidere, informații personale sau altceva ce credeți că nu aparține %{organization_name}.
+        hide: Ascundeți
         hide_content: Ascundeți conținutul
         offensive: Conține rasism, sexism, slurbii, atacuri personale, amenințări cu moartea, cereri de sinucidere sau orice formă de discurs de incitare la ură.
         reason: Motiv
-        report: Raport
+        report: Raportați
         spam: Conține clickbait, publicitate, escrocherii sau roboți script.
         title: Raportează o problemă
       flag_user_modal:
         already_reported: Acest conținut este deja raportat și va fi revizuit de către un administrator.
         description: Ce este nepotrivit pentru acest participant?
         offensive: Conține rasism, sexism, insulte, atacuri personale, amenințări cu moartea, cereri de sinucidere sau orice formă de discurs de incitare la ură.
-        report: Raportează
+        report: Raportați
         spam: Conține clickbait, publicitate, escrocherii sau roboți script.
         title: Raportează un participant nepotrivit
       floating_help:
         help: Ajutor
       login_modal:
+        please_log_in: Vă rugăm să vă autentificați
         sign_up: Creați un cont
+      mentions_modal:
+        remove_recipient: Eliminați destinatarul %{name}
+      progress: Progres
       public_participation:
         public_participation: Arată public participarea mea
       reference:
@@ -1337,25 +1534,30 @@ ro:
         label: 'Rezultate pe pagină:'
         title: Selectați numărul de rezultate pe pagină
       share_modal:
-        copy_share_link: Copiază
-        copy_share_link_clarification: Copiază link-ul de partajare în clipboard
+        copy_share_link: Copiați
+        copy_share_link_clarification: Copiați link-ul de distribuire în clipboard
         copy_share_link_copied: Copiat!
         copy_share_link_cta: Sau copiați link-ul
         copy_share_link_message: Link-ul a fost copiat cu succes în clipboard.
         share: Distribuie
-        share_link: Distribuie link-ul
+        share_link: Distribuiți link-ul
+        share_to: Distribuiți către %{service}
     statistics:
       comments_count: Comentarii
       comments_count_tooltip: Numărul total de comentarii postate în acest spațiu.
       followers_count: Urmăritori
       followers_count_tooltip: Numărul de utilizatori care urmăresc orice parte a acestui spațiu pentru a rămâne la curent.
       headline: Statistici
-      no_stats: Încă nu există statistici.
+      likes_count: Aprecieri
+      no_stats: Nu există statistici încă.
       pages_count: Pagini
       participants_count: Participanți
       participants_count_tooltip: Numărul de utilizatori unici care au interacționat în acest spațiu prin prezentarea de propuneri, participarea la întâlniri, votarea sau participarea la discuții.
+      surveys_count: Sondaje
       users_count: Participanți
       users_count_tooltip: Numărul total de utilizatori care s-au înregistrat și și-au confirmat contul prin e-mail.
+    taxonomies:
+      prompt: Vă rugăm, alegeți o opțiune
     translation_bar:
       help_text: "<strong>Avertisment:</strong> Conținutul poate fi tradus automat și nu este 100% exact."
       show_original: Afișați textul original
@@ -1374,13 +1576,35 @@ ro:
         greeting: Dragă %{name},
         instructions_1: Dacă aveți acces la acest cont de e-mail, vă rugăm să verificați căsuța poștală pentru instrucțiuni.
         instructions_2: În caz contrar, unul dintre colegii dvs. care are acces va trebui să seteze parola și să partajeze credențialele de conectare cu dvs.
+        subject: Actualizare importantă cu privire la profilul grupului dumneavoastră
+      notify_deprecation_to_owner:
+        body_1: Vă contactăm pentru a vă informa cu privire la o actualizare importantă a grupului de utilizatori pe care îl dețineți in %{organization_name}.
+        body_2: Ca parte a eforturilor noastre de a simplifica și îmbunătăți experiența pentru organizații ca a ta, vom elimina funcționalitatea "Grupuri de utilizatori". Grupul dumneavoastră, <strong>%{name}</strong>, a fost transformat într-un profil obișnuit de participant.
+        body_3: Pentru a continua să accesați contul dumneavoastră și a permite accesul altor utilizatori, trebuie să setați o parolă. După setare, puteți partaja carențialele de autentificare (e-mail și parolă) cu oricine.
+        greeting: Bună ziua %{name},
+        instructions_1: 'Faceți click pe link-ul de mai jos pentru a vă seta parola:'
+        instructions_2: 'Împărtășiți datele de conectare (e-mail: %{email} și noua parolă) cu colegii dumneavoastră.'
+        set_password: Stabiliți o parolă
+        subject: Actualizare importantă cu privire la profilul grupului dumneavoastră
+      notify_user_group_patched:
+        body_1_html: Vă contactăm pentru a vă informa cu privire la o actualizare importantă a grupului de utilizatori la care sunteți membru in %{organization_name}.
+        instructions_1_html: 'Folosiți următoarele credențiale temporare pentru a vă autentifica: <br><br> Nume de utilizator: <strong>%{email}</strong> <br> Parola: <strong>%{password}</strong><br><br>'
+        instructions_2_html: Setați o nouă adresă de e-mail și o parolă.
+        subject: Actualizare importantă cu privire la profilul grupului dumneavoastră
     user_report_mailer:
       notify:
         body_1: Utilizatorul %{user} a fost raportat de %{token}
         body_2: 'Motiv: %{reason}'
+        details: Detalii furnizate de utilizator
         greetings: Salutări,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
         hello: Bună ziua %{admin},
         subject: Un nou utilizator a fost raportat în %{organization_name}
+    user_update_mailer:
+      notify:
+        body_1: Vă trimitem acest mesaj pentru a vă informa despre o actualizare a contului dumneavoastră.
+        body_2: În cazul în care nu ați efectuat o astfel de actualizare, vă rugăm să vă autentificați în contul dumneavoastră pentru a vă schimba parola. În cazul în care nu vă puteți conecta, contactați asistența platformei.
+        main_body: 'Următoarele detalii au fost actualizate: %{updates}.'
+      subject: Contul dumneavoastră a fost actualizat
     version:
       show:
         back_to_resource: Mergi înapoi
@@ -1394,7 +1618,7 @@ ro:
         version: Versiunea %{number}
     versions_list_item:
       show:
-        version_index: Versiunea %{index}
+        version_index: Versiunea %{index} din %{total}
     welcome_notification:
       default_subject: Îți mulțumim că te-ai alăturat {{organization}}!
     wizard_step_form:
@@ -1407,20 +1631,23 @@ ro:
     confirmations:
       confirmed: Adresa ta de e-mail a fost confirmată cu succes.
       new:
-        resend_confirmation_instructions: Retrimite instrucțiunile de confirmare
+        resend_confirmation_instructions: Retrimiteți instrucțiunile de confirmare
       send_instructions: Veţi primi un e-mail cu instrucţiuni despre cum să confirmaţi adresa de e-mail în câteva minute.
       send_paranoid_instructions: Dacă adresa ta de e-mail există în baza noastră de date, în câteva minute veți primi un e-mail cu instrucțiuni pentru confirmarea adresei dvs. de e-mail.
     failure:
       already_authenticated: Sunteți deja conectat.
-      inactive: Contul tău nu este încă activat.
+      inactive: Contul dumneavoastră nu este activat încă.
       invalid: '%{authentication_keys} sau parolă invalidă.'
       invited: Aveți o invitație în așteptare, acceptați-o pentru a finaliza crearea contului.
       last_attempt: Mai ai încă o încercare înainte de a bloca contul.
-      locked: Contul dvs. este blocat.
+      locked: Contul dumneavoastră este blocat.
       not_found_in_database: '%{authentication_keys} sau parolă invalidă.'
+      timeout: Sesiunea dumneavoastră a expirat. Vă rugăm să vă conectați din nou pentru a continua.
+      unauthenticated: Trebuie să vă autentificați sau să creați un cont înainte de a continua.
     invitations:
       edit:
         header: Finalizați crearea contului dumneavoastră
+        nickname_help: Pseudonimul dumneavoastră în %{organization}, poate conține doar litere, numere, '-' și '_'.
         submit_button: Salvează
         subtitle: Dacă acceptați invitația, vă rugăm să vă setați porecla și parola.
       invitation_removed: Invitația dumneavoastră a fost eliminată.
@@ -1440,17 +1667,19 @@ ro:
         subject: Instrucțiuni de confirmare
       email_changed:
         greeting: Bună ziua %{recipient}!
+        message: Vă contactăm pentru a vă informa că adresa dumneavoastră e-mail a fost schimbată în %{email}.
         subject: Adresa e-mai a fost schimbată
       invitation_instructions:
         accept: Acceptați invitația
         accept_until: Această invitație va expira la %{due_date}.
         decline: Refuzați invitația
         hello: Bună ziua %{email},
+        ignore: |-
+          Dacă nu doriți să acceptați invitația, vă rugăm să ignorați acest e-mail.<br />
+          Contul dumneavoastră nu va fi creat decât după ce accesați linkul de mai sus și vă stabiliți numele de utilizator și parola.
         invited_you_as_admin: "%{invited_by} v-a invitat ca administrator al %{application}. Îl puteți accepta prin link-ul de mai jos."
-        invited_you_as_private_user: "%{invited_by} v-a invitat ca participant privat la %{application}. Puteți accepta prin linkul de mai jos."
         someone_invited_you: Cineva v-a invitat la %{application}. Puteți accepta prin linkul de mai jos.
         someone_invited_you_as_admin: Cineva v-a invitat să administrați %{application}. Puteți accepta prin linkul de mai jos.
-        someone_invited_you_as_private_user: Cineva v-a invitat ca participant privat la %{application}, puteți accepta prin intermediul linkului de mai jos.
         subject: Instrucțiuni pentru invitație
       invite_admin:
         subject: Ați fost invitat să gestionați %{organization}
@@ -1475,6 +1704,10 @@ ro:
         change_my_password: Modificați parola mea
         confirm_new_password: Confirmați parola nouă
         new_password: Parola nouă
+        old_password_help: Pentru a confirma modificările aduse contului dumneavoastră, vă rugăm să introduceți parola curentă.
+        password_help: "%{minimum_characters} nr. minim de caractere, nu trebuie să fie prea des întâlnite (de exemplu, 123456) și trebuie să fie diferite de numele dvs. și de adresa dvs. e-mail."
+        password_help_admin: "Minim %{minimum_characters} caractere, nu trebuie să fie prea comun (ex. 123456), trebuie să fie diferit de porecla și adresa de e-mail și trebuie să fie diferită de parola veche."
+        title: Schimbare parolă
       new:
         forgot_your_password: Ați uitat parola?
         send_me_reset_password_instructions: Trimiteți-mi instrucțiunile de resetare a parolei
@@ -1493,13 +1726,19 @@ ro:
       update_needs_confirmation: V-ați actualizat contul, însă trebuie să vă verificăm noua adresă de e-mail. Vă rugăm să verificați e-mailul și să urmați linkul de confirmare pentru a vă confirma noua adresă de e-mail.
       updated: Contul dumneavoastră fost actualizat cu succes.
     sessions:
+      already_signed_out: Deconectat cu succes.
       new:
         log_in: Autentificare
+      signed_in: Autentificat cu succes.
+      signed_out: Deconectat cu succes.
     shared:
       links:
         back: Înapoi
+        didn_t_receive_confirmation_instructions: Nu ați primit instrucțiunile de confirmare?
+        didn_t_receive_unlock_instructions: Nu ați primit instrucțiuni de deblocare?
         forgot_your_password: V-ați uitat parola?
         log_in: Autentificare
+        log_in_with_provider: Autentificați-vă cu {provider}
         sign_up: Creați un cont
       minimum_password_length:
         one: "(minimum %{count} caractere)"
@@ -1513,6 +1752,60 @@ ro:
   doorkeeper:
     scopes:
       public: Informațiile dumneavoastră publice.
+  editor:
+    extensions:
+      image:
+        altLabel: Text alternativ pentru imagine
+        nodeView:
+          resizer:
+            control:
+              resize: Redimensionați imaginea (%position%)
+            position:
+              bottomLeft: colț stânga jos
+              bottomRight: colț dreapta jos
+              topLeft: colț stânga sus
+              topRight: colț dreapta sus
+        uploadError: Încărcarea fișierului a eșuat.
+      link:
+        bubbleMenu:
+          edit: Modificați
+          remove: Eliminați
+          url: Adresa URL
+        hrefLabel: Legătură URL
+        targetLabel: Destinație
+        targets:
+          blank: Tab nou
+          default: Implicit (same tab)
+      videoEmbed:
+        titleLabel: Titlu
+        urlLabel: URL videoclip
+    inputDialog:
+      buttons:
+        cancel: Anulați
+        remove: Eliminați
+        save: Salvaţi
+      close: Închideți fereastra
+    toolbar:
+      control:
+        blockquote: Citat
+        bold: Îngroșat
+        bulletList: Listă neordonată
+        codeBlock: Bloc de cod
+        hardBreak: Linie pauză
+        heading: Stilul textului
+        image: Imagine
+        indent:
+          indent: Indentare
+          outdent: Anulare indentare
+        italic: Înclinat
+        link: Link
+        orderedList: Listă ordonată
+        underline: Subliniat
+        videoEmbed: Video încorporat
+      textStyle:
+        normal: Normal
+    upload:
+      uploadedFile: Fișier încărcat
   emojis:
     add_custom: Adaugați emoji personalizat
     button: Adaugați emoji
@@ -1542,16 +1835,26 @@ ro:
       choose: Alegeți ton implicit pentru piele
   errors:
     messages:
+      allowed_file_content_types: 'numai fișierele cu următoarele extensii sunt permise: %{types}'
+      already_confirmed: a fost deja confirmat, vă rugăm încercați să vă autentificați
+      blank: nu poate fi gol
+      cannot_be_blank: nu poate fi gol
+      confirmation: nu se potrivește cu %{attribute}
       confirmation_period_expired: trebuie să fie confirmat în %{period}, vă rugăm să solicitați unul nou
       content_type_allowlist_error: tipul de fișier nu este valid
-      expired: a expirat, vă rugăm să solicitaţi unul nou
-      file_size_is_less_than_or_equal_to: dimensiunea fişierului trebuie să fie mai mică sau egală cu %{count}
+      empty: nu poate fi gol
+      expired: a expirat, vă rugăm să solicitați unul nou
+      file_size_is_less_than_or_equal_to: dimensiunea fișierului trebuie să fie mai mică sau egală cu %{count}
       invalid_time_zone: nu este un fus orar valid
       long_words: conține cuvinte care sunt prea lungi (peste 35 de caractere)
       must_start_with_caps: trebuie să înceapă cu o majusculă
+      nesting_too_deep: nu se poate afla în interiorul unei subcategorii
+      not_found: nu a putut fi găsit. Ați creat un cont anterior?
       not_locked: nu a fost blocat
       too_many_marks: folosește prea multe semne consecutive de punctuație (de ex. ! și ?)
       too_much_caps: utilizează prea multe majuscule (peste 25% din text)
+      too_short: este prea scurt (sub %{count} caractere)
+      url_format: Acest URL are un format incorect
   forms:
     correct_errors: Există erori în formular, vă rugăm să le corectaţi pentru a continua.
     length_validator:
@@ -1566,15 +1869,29 @@ ro:
     timestamp_error_message: Ne pare rău, acest lucru a fost prea rapid! Te rugăm să retrimiți.
   layouts:
     decidim:
+      announcements:
+        view_less: Afișați mai puțin
+        view_more: Mai multe informații
       data_consent:
         details:
           columns:
+            description: Descriere
+            name: Categorie
+            service: Serviciu
             type: Tip
           items:
             _session_id:
               description: Permite site-urilor web să rețină utilizatorul din cadrul unui site web atunci când se mută între paginile web.
+              service: Acest site
             decidim-consent:
               description: Stochează informații despre cookie-urile permise de utilizator pe acest site.
+              service: Acest site
+            pwaInstallPromptSeen:
+              description: Stochează statusul în cazul în care notificarea de instalare pentru aplicația web progresivă (PWA) a fost deja văzută de către utilizator.
+              service: Acest site
+          types:
+            cookie: Cookie
+            local_storage: Stocare locală
         dialog:
           accept_all: Acceptați toate
           accept_only_essential: Acceptați numai esențiale
@@ -1587,24 +1904,41 @@ ro:
           analytics:
             description: Aceste cookie-uri sunt utilizate pentru a măsura și analiza publicul site-ului web pentru a ajuta la îmbunătățirea acestuia.
             title: Analize și statistici
+          description: Folosim cookie-uri pentru a asigura funcționalitățile de bază ale website-ului și pentru a vă îmbunătăți experiența online. Puteți configura și accepta utilizarea cookie-urilor și vă puteți modifica în orice moment opțiunile de aprobare.
           essential:
+            description: Aceste cookie-uri permit funcționalitatea cheie a site-ului și ajută utilizatorii să își păstreze securitatea. Acestea sunt salvate automat în browser și nu pot fi dezactivate.
             title: Esențiale
           marketing:
             description: Aceste cookie-uri colectează informații despre modul în care utilizați site-ul și pot fi utilizate pentru a vă oferi experiență de marketing personalizată pe diferitele site-uri pe care le utilizați.
             title: Marketing
           preferences:
+            description: Aceste cookie-uri permit site-ului web să își amintească de alegerile pe care le-ați făcut în trecut pe acest website pentru a oferi o experiență mai personalizată utilizatorilor website-ului.
             title: Preferințe
           save_settings: Salvați setările
+          title: Setări cookie-uri
+          toggle: Comută %{consent_category}
+        warning:
+          all_categories: toate cookie-urile
+          change_settings: Schimbați setările cookie-urilor
+          consent_required: Trebuie să activați %{categories} pentru a vedea acest conținut.
       edit_link:
-        edit: Editare
+        edit: Modificați
       footer:
         cc_by_license: Licență Creative Commons
+        data_consent_settings: Setări cookie-uri
         decidim_logo: Logo decidim
+        decidim_title: Decidim
+        help: Ajutor
         log_in: Autentificare
         made_with_open_source: Site web creat cu <a target="_blank" href="https://github.com/decidim/decidim">software gratuit</a>.
+        open_data: Seturi de date
         resources: Resurse
         sign_up: Creați un cont
+        social_media: Rețele de socializare
+        terms_of_service: Condiții de utilizare
       header:
+        back: Înapoi
+        close: Închideți
         confirm_close_ephemeral_session: Dacă părăsiți pagina, sesiunea temporară va fi închisă. Cu toate acestea, progresul și activitatea dumneavoastră vor fi salvate. Dacă ați terminat activitatea, apăsați Ok.
         confirm_title_close_ephemeral_session: Înainte de a părăsi această pagină…
         log_in: Autentificare
@@ -1613,34 +1947,46 @@ ro:
       impersonation_warning:
         close_session: Închideți sesiunea
         description_html: Gestionați participantul <b>%{user_name}</b>.
+        expire_time_html: Sesiunea dumneavoastră va expira în <b><span data-impersonation-warning-target="minutes">%{minutes}</span> minute</b>.
       language_chooser:
         choose_language: Alegeți limba
+      navigation:
+        aria_label: 'Navigare meniu: %{title}'
       notifications_dashboard:
         mark_all_as_read: Marcați totul ca fiind citit
         mark_as_read: Marcați ca fiind citit
+      offline_banner:
+        cache_version_page: Ups! Rețeaua dvs. este offline. Aceasta este o versiune cache anterioară a paginii pe care o vizitați, poate conținutul nu este actualizat.
       social_media_links:
         facebook: "%{organization} pe Facebook"
         github: "%{organization} pe GitHub"
         instagram: "%{organization} pe Instagram"
+        x: "%{organization} pe X (Twitter)"
         youtube: "%{organization} pe YouTube"
       timeout_modal:
         body: Ați fost inactiv pentru %{minutes} minute. Dacă veți continua să fiți inactiv, veți fi deconectat automat pentru propria securitate.
         continue_session: Continuați sesiunea
+        log_out: Deconectare
         title: Doriți să continuați sesiunea?
       user_menu:
         account: 'Cont de utilizator: %{name}'
         admin_dashboard: Panou de administrare
+        configuration: Configurare
         conversations: Conversații
+        log_out: Deconectare
         notifications: Notificări
         profile: Contul meu
         public_profile: Profilul meu public
         title: Link-uri profil
+        unread_conversations: Aveți conversații necitite
+        unread_notifications: Aveți notificări necitite
       user_profile:
         account: Cont
         authorizations: Autorizări
         delete_my_account: Ștergere cont
         my_data: Datele mele
         notifications_settings: Setări notificări
+        profile: Profil
         title: Setări participant
   locale:
     name: Română
@@ -1652,9 +1998,16 @@ ro:
     name_included_in_password: este prea asemănător cu numele dumneavoastră
     nickname_included_in_password: este prea asemănător cu nickname-ul dvs
     not_enough_unique_characters: nu are destule caractere unice
+    password_repeated: nu se poate reutiliza parola veche
     password_too_common: este prea frecvent
     password_too_long: este prea lungă
     password_too_short: este prea scurtă
+  ransack:
+    predicates:
+      dtgt: după
+      dtgteq: după sau egal cu
+      dtlt: înainte de
+      dtlteq: înainte sau egal cu
   social_share_button:
     delicious: Delicios
     douban: Dublu
@@ -1677,9 +2030,11 @@ ro:
     weibo: Sina Weibo
     whatsapp_app: WhatsApp
     whatsapp_web: WhatsApp
+    x: X
     xing: Xing
   time:
     buttons:
+      close: Închideți
       select: Selectare
     formats:
       day_of_month: "%b %d"
@@ -1710,6 +2065,7 @@ ro:
       option_unified: Unificat
   views:
     pagination:
+      next: Următoarea
       next_title: Link către pagina următoare
       pagination: Paginare
       previous_title: Link către pagina anterioară
diff --git a/decidim-core/config/locales/ru.yml b/decidim-core/config/locales/ru.yml
index 30020e782f774..5e7e884658de9 100644
--- a/decidim-core/config/locales/ru.yml
+++ b/decidim-core/config/locales/ru.yml
@@ -95,9 +95,6 @@ ru:
         update: "%{user_name} обновил приложение OAuth %{resource_name}"
       organization:
         update: "%{user_name} обновил настройки организации"
-      participatory_space_private_user:
-        create: "%{user_name} пригласил %{resource_name} стать частным участником"
-        delete: "%{user_name} удалил участника %{resource_name} как приватного участника"
       scope:
         create: "%{user_name} добавил охват %{resource_name}"
         create_with_parent: "%{user_name} создал охват %{resource_name} внутри охвата %{parent_scope}"
@@ -534,10 +531,8 @@ ru:
         decline: Отклонить приглашение
         hello: Здравствуйте, %{email}!
         invited_you_as_admin: "%{invited_by} пригласил вас в качестве администратора %{application}. Вы можете принять это приглашение по ссылке ниже."
-        invited_you_as_private_user: "%{invited_by} пригласил вас в качестве частного участника %{application}. Вы можете принять это приглашение по ссылке ниже."
         someone_invited_you: Кто-то пригласил вас в %{application}. Вы можете принять это приглашение по ссылке ниже.
         someone_invited_you_as_admin: Кто-то пригласил вас в качестве администратора %{application}, вы можете принять это приглашение по ссылке ниже.
-        someone_invited_you_as_private_user: Кто-то пригласил вас в качестве частного участника %{application}, вы можете принять это приглашение по ссылке ниже.
         subject: Инструкция по приглашению
       password_change:
         greeting: Здравствуйте, %{recipient}!
diff --git a/decidim-core/config/locales/sk.yml b/decidim-core/config/locales/sk.yml
index 9ea527fd3d76a..d7b20bf6c9b1a 100644
--- a/decidim-core/config/locales/sk.yml
+++ b/decidim-core/config/locales/sk.yml
@@ -113,9 +113,6 @@ sk:
         update: "%{user_name} aktualizoval %{resource_name} aplikáciu OAuth"
       organization:
         update: "%{user_name} aktualizoval nastavenia organizácie"
-      participatory_space_private_user:
-        create: "%{user_name} pozval %{resource_name} aby sa stal súkromným používateľom"
-        delete: "%{user_name} odstránil užívateľa %{resource_name} ako súkromného účastníka"
       scope:
         create: "%{user_name} vytvoril %{resource_name} rozsah"
         create_with_parent: "%{user_name} vytvoril%{resource_name} rozsah vnútri rozsahu%{parent_scope}"
@@ -734,10 +731,8 @@ sk:
         decline: Odmietnuť pozvaním
         hello: Dobrý deň%{email},
         invited_you_as_admin: "%{invited_by} vás pozval ako administrátora na %{application}. Môžete pozvanie prijať prostredníctvom nižšie uvedeného odkazu."
-        invited_you_as_private_user: "%{invited_by} vás pozval ako súkromného užívateľa na %{application}. Môžete pozvanie prijať prostredníctvom nižšie uvedeného odkazu."
         someone_invited_you: Niekto vás pozval na%{application}. Môžete pozvanie prijať prostredníctvom nižšie uvedeného odkazu.
         someone_invited_you_as_admin: Niekto Vás pozval ako administrátora%{application}, môžete ho prijať pomocou nižšie uvedeného odkazu.
-        someone_invited_you_as_private_user: Niekto vás pozval ako private_user%{application}, môžete ho prijať pomocou nižšie uvedeného odkazu.
         subject: Pokyny k pozvánkam
       password_change:
         greeting: Dobrý deň, %{recipient}!
diff --git a/decidim-core/config/locales/sv.yml b/decidim-core/config/locales/sv.yml
index 5491a98940707..a818966670161 100644
--- a/decidim-core/config/locales/sv.yml
+++ b/decidim-core/config/locales/sv.yml
@@ -162,7 +162,6 @@ sv:
       front_page_link: Gå till startsidan
       logo: "%{organization}s logotyp"
       opens_in_new_tab: Öppnas i en ny flik
-      secondary_menu: Sekundär meny
       skip_button: Gå till innehåll
     account:
       blocked: Detta konto har blockerats på grund av brott mot användarvillkoren
@@ -266,10 +265,6 @@ sv:
       organization:
         update: "%{user_name} uppdaterade organisationsinställningarna"
         update_external_domain: "%{user_name} uppdaterade organisationens externa domäner"
-      participatory_space_private_user:
-        create: "%{user_name} uppmanade %{resource_name} att vara en privat deltagare"
-        create_via_csv: "%{user_name} bjöd in %{resource_name} till att vara en privat deltagare via CSV-fil"
-        delete: "%{user_name} tog deltagaren %{resource_name} som en privat deltagare"
       scope:
         create: "%{user_name} skapade indelningen %{resource_name}"
         create_with_parent: "%{user_name} skapade indelningen %{resource_name} inom %{parent_scope}"
@@ -648,7 +643,7 @@ sv:
           email_already_exists: Ett annat konto använder samma e-postadress.
         new:
           complete_profile: Komplettera profil
-          nickname_help: Ditt användarnamn i %{organization}. Kan bara innehålla bokstäver, siffror, '-' och '_'.
+          nickname_help: Ditt användarnamn i %{organization}. Kan bara innehålla små bokstäver a-z, siffror, '-' och '_'.
           sign_up: Var god slutför din profil
           subtitle: Slutför registreringen genom att fylla i följande formulär
           username_help: Offentligt namn som visas i dina inlägg. Du kan ange ett annat namn än ditt eget, om du vill vara anonym.
@@ -736,13 +731,6 @@ sv:
           provider: Leverantören av identiteten
         messaging_conversations:
           updated_at: Datum när denna konversation senast uppdaterades
-        participatory_space_private_users:
-          created_at: Datum och tid när den privata användaren skapades
-          id: Unikt id för den privata användaren
-          privatable_to: Till vilken plats den privata användaren tillhör
-          published: Om den privata användaren är publicerad eller inte
-          role: Den privata användarens roll
-          updated_at: Datum och tid när den privata användaren senast uppdaterades
         reports:
           created_at: Datum och tid för när rapporteringen skapades
           details: Mer information om rapporteringen
@@ -884,7 +872,7 @@ sv:
           email_intro: |-
             Din %{resource_type} är inte längre synlig.<br>
             Detta hände därför att förslaget, mötet, debatten eller kommentaren du svarade på har modererats. Om den blir tillgänglig igen, kommer din kommentar automatiskt att återställas.
-          email_outro: Du har fått det här meddelandet eftersom du är en författare till %{resource_type}.
+          email_outro: Du har fått det här meddelandet eftersom du är författare till %{resource_type}.
           email_subject: Din %{resource_type} är inte längre synlig
           notification_title: |-
             Din %{resource_type} är inte längre synlig.<br>
@@ -1003,6 +991,7 @@ sv:
           title_required: Titel måste fyllas i!
           uploaded: Uppladdad
           validating: Validerar...
+          validation_error: Valideringsfel! Kontrollera att filen har en tillåten filtyp eller storlek.
         select_file: Välj fil
       upload_help:
         dropzone: Släpp filer här eller klicka på knappen för att ladda upp
@@ -1212,8 +1201,10 @@ sv:
       action_error: Det gick inte att uppdatera inställningen för meddelanden.
       no_notifications: Inga meddelanden ännu.
       show:
+        deleted: Innehållet har tagits bort av författaren.
         missing_event: Hoppsan, det här meddelandet tillhör ett objekt som inte längre är tillgängligt. Du kan kasta det.
         moderated: Innehållet har dolts av moderator.
+        not_available: Hoppsan, det här meddelandet tillhör ett objekt som inte längre är tillgängligt. Du kan kasta det.
     notifications_digest_mailer:
       header:
         daily: Dagligt sammandrag
@@ -1275,7 +1266,7 @@ sv:
     pad_iframe:
       disclaimer: Innehållet i anteckningarna är skrivet av registrerade användare och uttrycker deras åsikter. %{organization} kan inte hållas ansvarig för innehållet.
       explanation: Använd den här anteckningsytan för att gemensamt ta anteckningar under mötet så att det går lättare att skriva protokollet efteråt.
-      pad: Memo
+      pad: Anteckningar
     pages:
       home:
         extended:
@@ -1502,8 +1493,11 @@ sv:
       pages_count: Sidor
       participants_count: Deltagare
       participants_count_tooltip: Antalet unika användare som har interagerat i detta område genom att lägga fram förslag, delta i möten, rösta eller delta i diskussioner.
+      surveys_count: Enkäter
       users_count: Deltagare
       users_count_tooltip: Det totala antalet användare som har registrerat sig och bekräftat sitt konto via e-post.
+    tags:
+      filter_results_for_taxonomy: 'Filtrera resultat: %{resource}'
     translation_bar:
       help_text: "<strong>Obs:</strong> Innehåll kan ha översatts automatiskt och inte vara 100% korrekt."
       show_original: Visa originaltexten
@@ -1532,7 +1526,7 @@ sv:
     version:
       show:
         back_to_resource: Gå tillbaka
-        changes_at_title: Ändringar på "%{title}"
+        changes_at_title: Ändringar av "%{title}"
         number_of_versions: Versioner
         version_created_at: Version skapad
     versions:
@@ -1572,7 +1566,7 @@ sv:
     invitations:
       edit:
         header: Slutför skapandet av ditt konto
-        nickname_help: Ditt användarnamn för %{organization}. Kan bara innehålla bokstäver, siffror, '-' och '_'.
+        nickname_help: Ditt användarnamn i %{organization}. Kan bara innehålla små bokstäver a-z, siffror, '-' och '_'.
         submit_button: Spara
         subtitle: Om du godkänner inbjudan väljer du ditt användarnamn och lösenord.
       invitation_removed: Din inbjudan har tagits bort.
@@ -1603,17 +1597,13 @@ sv:
           Om du inte vill godkänna inbjudan kan du ignorera detta e-postmeddelande.<br />
           Ditt konto kommer bara att skapas om du öppnar länken ovan och anger ditt användarnamn och lösenord.
         invited_you_as_admin: "%{invited_by} har bjudit in dig som administratör av %{application}. Du kan acceptera det via länken nedan."
-        invited_you_as_private_user: "%{invited_by} har bjudit in dig som privat deltagare till %{application}. Du kan godkänna detta via länken nedan."
         someone_invited_you: Någon har bjudit in dig till %{application}. Du kan acceptera det via länken nedan.
         someone_invited_you_as_admin: Någon har bjudit in dig som administratör av %{application}. Du kan acceptera det via länken nedan.
-        someone_invited_you_as_private_user: Någon har bjudit in dig som privatperson till %{application}, du kan godkänna detta via länken nedan.
         subject: Anvisningar om inbjudningar
       invite_admin:
         subject: Du har blivit inbjuden att hantera %{organization}
       invite_collaborator:
         subject: Du har blivit inbjuden att samarbeta på %{organization}
-      invite_private_user:
-        subject: Du har blivit inbjuden till en privat deltagarprocess på %{organization}
       organization_admin_invitation_instructions:
         subject: Du har blivit inbjuden att hantera %{organization}
       password_change:
diff --git a/decidim-core/config/locales/tr-TR.yml b/decidim-core/config/locales/tr-TR.yml
index d4676d70fec78..60045d6e90ca9 100644
--- a/decidim-core/config/locales/tr-TR.yml
+++ b/decidim-core/config/locales/tr-TR.yml
@@ -115,10 +115,6 @@ tr:
         update: "%{user_name} , %{resource_name} OAuth uygulamasını güncelledi"
       organization:
         update: "%{user_name} kuruluş ayarlarını güncelledi"
-      participatory_space_private_user:
-        create: "%{user_name}, %{resource_name} adlı kullanıcıyı özel katılımcı olması için davet etti"
-        create_via_csv: "%{user_name}, %{resource_name} kaynağını CSV aracılığıyla özel bir katılımcı olması için davet etti"
-        delete: "%{user_name}, katılımcıyı %{resource_name} özel katılımcı özelliğini kaldırdı"
       scope:
         create: "%{user_name}, %{resource_name} kapsamı oluşturdu"
         create_with_parent: "%{user_name}, %{parent_scope} içindeki %{resource_name} kapsamı oluşturdu"
@@ -891,10 +887,8 @@ tr:
         decline: Davet reddet
         hello: Merhaba %{email}
         invited_you_as_admin: "%{invited_by} sizi %{application}yönetici olarak davet etti. Aşağıdaki bağlantıdan kabul edebilirsiniz."
-        invited_you_as_private_user: "%{invited_by} özel bir kullanıcı olarak davet etti %{application}. Aşağıdaki bağlantıdan kabul edebilirsiniz."
         someone_invited_you: Birisi sizi %{application}davet etti. Aşağıdaki bağlantıdan kabul edebilirsiniz.
         someone_invited_you_as_admin: Birisi sizi %{application}yönetici olarak davet etti, aşağıdaki bağlantıdan kabul edebilirsiniz.
-        someone_invited_you_as_private_user: Birisi sizi %{application}private_user olarak davet etti, aşağıdaki bağlantıdan kabul edebilirsiniz.
         subject: Davet talimatları
       password_change:
         greeting: Merhaba %{recipient}!
diff --git a/decidim-core/config/locales/uk.yml b/decidim-core/config/locales/uk.yml
index baf6902f484a5..9ef0719b56cef 100644
--- a/decidim-core/config/locales/uk.yml
+++ b/decidim-core/config/locales/uk.yml
@@ -423,10 +423,8 @@ uk:
         decline: Відхилити запрошення
         hello: Доброго дня, %{email}%!
         invited_you_as_admin: "%{invited_by} запросив вас як адміністратора %{application}. Ви можете прийняти це запрошення за посиланням нижче."
-        invited_you_as_private_user: "%{invited_by} запросив вас як приватного учасника %{application}. Ви можете прийняти це запрошення за посиланням нижче."
         someone_invited_you: Хтось запросив вас до %{application}. Ви можете прийняти це запрошення за посиланням нижче.
         someone_invited_you_as_admin: Хтось запросив вас як адміністратора %{application}, ви можете прийняти це запрошення за посиланням нижче.
-        someone_invited_you_as_private_user: Хтось запросив вас як приватного учасника %{application}, ви можете прийняти це запрошення за посиланням нижче.
       password_change:
         greeting: Доброго дня, %{recipient}!
         subject: Пароль змінено
diff --git a/decidim-core/config/locales/vi.yml b/decidim-core/config/locales/vi.yml
index 326506f0b1a36..8ddf65e6d1d49 100644
--- a/decidim-core/config/locales/vi.yml
+++ b/decidim-core/config/locales/vi.yml
@@ -1 +1,3 @@
 vi:
+  locale:
+    name: tiếng Việt
diff --git a/decidim-core/config/locales/zh-CN.yml b/decidim-core/config/locales/zh-CN.yml
index d2718f3c68974..fea07ed23454f 100644
--- a/decidim-core/config/locales/zh-CN.yml
+++ b/decidim-core/config/locales/zh-CN.yml
@@ -108,9 +108,6 @@ zh-CN:
         update: "%{user_name} 更新了 %{resource_name} OAuth 应用程序"
       organization:
         update: "%{user_name} 更新了组织设置"
-      participatory_space_private_user:
-        create: "%{user_name} 邀請了 %{resource_name} 作为私人参与者"
-        delete: "%{user_name} 移除了参与者 %{resource_name} 作为私人参与者"
       scope:
         create: "%{user_name} 创建了 %{resource_name} 范围"
         create_with_parent: "%{user_name} 在 %{parent_scope} 范围内创建了 %{resource_name} 范围"
@@ -788,10 +785,8 @@ zh-CN:
         decline: 拒绝邀请
         hello: 您好 %{email}，
         invited_you_as_admin: "%{invited_by} 邀请您担任了 %{application}的管理员。您可以通过下面的链接接受它。"
-        invited_you_as_private_user: "%{invited_by} 邀请您作为私有参与者 %{application}。您可以通过下面的链接接受它。"
         someone_invited_you: 有人邀请您访问 %{application}。您可以通过下面的链接接受它。
         someone_invited_you_as_admin: 有人邀请您作为 %{application}的管理员，您可以通过下面的链接接受它。
-        someone_invited_you_as_private_user: 有人邀请您作为私有参与者 %{application}，您可以通过下面的链接接受它。
         subject: 邀请说明
       password_change:
         greeting: 你好 %{recipient}！
diff --git a/decidim-core/config/locales/zh-TW.yml b/decidim-core/config/locales/zh-TW.yml
index 4fd66b144c3eb..bc0d1a700f6b2 100644
--- a/decidim-core/config/locales/zh-TW.yml
+++ b/decidim-core/config/locales/zh-TW.yml
@@ -195,10 +195,6 @@ zh-TW:
       organization:
         update: "%{user_name} 更新了組織設定"
         update_external_domain: "%{user_name} 更新了組織外部域名"
-      participatory_space_private_user:
-        create: "%{user_name} 邀請了 %{resource_name} 成為私人參與者"
-        create_via_csv: "%{user_name} 透過 CSV 邀請了 %{resource_name} 成為私人參與者"
-        delete: "%{user_name} 將參與者 %{resource_name} 從私人參與者中移除"
       scope:
         create: "%{user_name} 創建了 %{resource_name} 範圍"
         create_with_parent: "%{user_name} 在 %{parent_scope} 範圍內創建了 %{resource_name} 範圍"
@@ -1185,17 +1181,13 @@ zh-TW:
         ignore: |-
           如果您不想接受邀請，請忽略此電子郵件。<br />在您使用上述連結設置您的暱稱和密碼之前，您的帳戶不會被創建。
         invited_you_as_admin: "%{invited_by} 邀請您成為 %{application} 的管理員。您可以通過下面的連結接受邀請。"
-        invited_you_as_private_user: "%{invited_by} 邀請您成為 %{application} 的私密參與者。您可以通過下面的連結接受邀請。"
         someone_invited_you: 有人邀請您加入 %{application}。您可以通過下面的連結接受邀請。
         someone_invited_you_as_admin: 有人邀請您成為 %{application} 的管理員，您可以通過下面的連結接受邀請。
-        someone_invited_you_as_private_user: 有人邀請您成為 %{application} 的私人參與者，您可以通過下面的連結接受邀請。
         subject: 邀請說明
       invite_admin:
         subject: 你已經被邀請成為 %{organization} 的管理者
       invite_collaborator:
         subject: 你已獲邀成為 %{organization} 的協作者
-      invite_private_user:
-        subject: 您已被邀請參加 %{organization} 的私密參與過程。
       organization_admin_invitation_instructions:
         subject: 你已經被邀請成為 %{organization} 的管理者
       password_change:
diff --git a/decidim-core/db/data/20251125144141_add_short_name_to_organizations.rb b/decidim-core/db/data/20251125144141_add_short_name_to_organizations.rb
new file mode 100644
index 0000000000000..44bf99471b8e4
--- /dev/null
+++ b/decidim-core/db/data/20251125144141_add_short_name_to_organizations.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class AddShortNameToOrganizations < ActiveRecord::Migration[7.2]
+  class Organization < ApplicationRecord
+    self.table_name = "decidim_organizations"
+  end
+
+  def up
+    Organization.find_each do |organization|
+      # Skip if short_name is already populated
+      next if organization.short_name.present? && organization.short_name != {}
+
+      next if organization.name.blank?
+
+      short_name_hash = {}
+      organization.name.each do |locale, name_value|
+        # Skip machine_translations and other nested hashes
+        next if name_value.is_a?(Hash)
+        next if name_value.blank?
+
+        generated_short_name = name_value.gsub(/\s+/, "")[0, 12]
+        next if generated_short_name.length < 3
+
+        short_name_hash[locale] = generated_short_name
+      end
+
+      # Only update if we have a valid short_name to set, otherwise leave as empty hash
+      organization.update_column(:short_name, short_name_hash) unless short_name_hash.empty? # rubocop:disable Rails/SkipsModelValidations
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/decidim-core/db/data/20251213075429_rename_members_in_action_log.rb b/decidim-core/db/data/20251213075429_rename_members_in_action_log.rb
new file mode 100644
index 0000000000000..58481f44df6df
--- /dev/null
+++ b/decidim-core/db/data/20251213075429_rename_members_in_action_log.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class RenameMembersInActionLog < ActiveRecord::Migration[7.2]
+  class ActionLog < ApplicationRecord
+    self.table_name = :decidim_action_logs
+  end
+
+  def up
+    old_resource_type = "Decidim::ParticipatorySpacePrivateUser"
+    new_resource_type = "Decidim::ParticipatorySpace::Member"
+
+    # rubocop:disable Rails/SkipsModelValidations
+    updated_count = ActionLog.where(resource_type: old_resource_type).update_all(resource_type: new_resource_type)
+    # rubocop:enable Rails/SkipsModelValidations
+
+    Rails.logger.info "Updated #{updated_count} ActionLog records from #{old_resource_type} to #{new_resource_type}"
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/decidim-core/db/migrate/20250523104311_move_cta_to_hero_content_block.rb b/decidim-core/db/migrate/20250523104311_move_cta_to_hero_content_block.rb
index b89ddbcf5c202..fb569cc5d8898 100644
--- a/decidim-core/db/migrate/20250523104311_move_cta_to_hero_content_block.rb
+++ b/decidim-core/db/migrate/20250523104311_move_cta_to_hero_content_block.rb
@@ -8,7 +8,7 @@ class Organization < ApplicationRecord
   def up
     Decidim::ContentBlock.reset_column_information
     Organization.find_each do |organization|
-      content_block = Decidim::ContentBlock.find_by(organization: organization, scope_name: :homepage, manifest_name: :hero)
+      content_block = Decidim::ContentBlock.find_by(organization:, scope_name: :homepage, manifest_name: :hero)
       settings = {}
       cta_button_text = organization.cta_button_text || {}
       settings = cta_button_text.inject(settings) { |acc, (k, v)| acc.update("cta_button_text_#{k}" => v) }
diff --git a/decidim-core/db/migrate/20250527122040_move_highlighted_content_banner_settings_to_content_block.rb b/decidim-core/db/migrate/20250527122040_move_highlighted_content_banner_settings_to_content_block.rb
index 0d2e1796b84f2..59b29fb108365 100644
--- a/decidim-core/db/migrate/20250527122040_move_highlighted_content_banner_settings_to_content_block.rb
+++ b/decidim-core/db/migrate/20250527122040_move_highlighted_content_banner_settings_to_content_block.rb
@@ -11,7 +11,7 @@ def up
     Decidim::ContentBlock.reset_column_information
 
     Organization.find_each do |organization|
-      content_block = Decidim::ContentBlock.find_by(organization: organization, scope_name: :homepage, manifest_name: :highlighted_content_banner)
+      content_block = Decidim::ContentBlock.find_by(organization:, scope_name: :homepage, manifest_name: :highlighted_content_banner)
       settings = extract_settings(organization)
 
       # We need to do a workaround for getting the image, as ActiveStorage is polymorphic and expects that the `record_type` is the class name of the model
diff --git a/decidim-core/db/migrate/20251031150928_add_short_name_to_organization.rb b/decidim-core/db/migrate/20251031150928_add_short_name_to_organization.rb
new file mode 100644
index 0000000000000..3511b8bf74ebe
--- /dev/null
+++ b/decidim-core/db/migrate/20251031150928_add_short_name_to_organization.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddShortNameToOrganization < ActiveRecord::Migration[7.2]
+  def change
+    add_column :decidim_organizations, :short_name, :jsonb, null: false, default: {}
+  end
+end
diff --git a/decidim-core/db/migrate/20251205122428_rename_participatory_space_private_users_to_members.rb b/decidim-core/db/migrate/20251205122428_rename_participatory_space_private_users_to_members.rb
new file mode 100644
index 0000000000000..40ff31c4f8260
--- /dev/null
+++ b/decidim-core/db/migrate/20251205122428_rename_participatory_space_private_users_to_members.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RenameParticipatorySpacePrivateUsersToMembers < ActiveRecord::Migration[7.0]
+  def change
+    rename_table :decidim_participatory_space_private_users, :decidim_members
+
+    rename_index :decidim_members, :index_decidim_spaces_users_on_private_user_id, :index_decidim_members_on_user_id
+  end
+end
diff --git a/decidim-core/db/migrate/20251216185133_rename_privatable_to_to_participatory_space_in_members.rb b/decidim-core/db/migrate/20251216185133_rename_privatable_to_to_participatory_space_in_members.rb
new file mode 100644
index 0000000000000..cdf6bc82ccb08
--- /dev/null
+++ b/decidim-core/db/migrate/20251216185133_rename_privatable_to_to_participatory_space_in_members.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class RenamePrivatableToToParticipatorySpaceInMembers < ActiveRecord::Migration[7.2]
+  def change
+    rename_column :decidim_members, :privatable_to_id, :participatory_space_id
+    rename_column :decidim_members, :privatable_to_type, :participatory_space_type
+
+    rename_index :decidim_members, "space_privatable_to_privatable_id", "index_decidim_members_on_participatory_space"
+  end
+end
diff --git a/decidim-core/decidim-core.gemspec b/decidim-core/decidim-core.gemspec
index c0b85c30f2b5a..4655b70fa8670 100644
--- a/decidim-core/decidim-core.gemspec
+++ b/decidim-core/decidim-core.gemspec
@@ -59,7 +59,6 @@ Gem::Specification.new do |s|
   s.add_dependency "kaminari", "~> 1.2", ">= 1.2.1"
   s.add_dependency "loofah", "~> 2.19", ">= 2.19.1"
   s.add_dependency "mime-types", ">= 1.16", "< 4.0"
-  s.add_dependency "mini_magick", "~> 4.9"
   s.add_dependency "net-smtp", "~> 0.5.0"
   s.add_dependency "nokogiri", "~> 1.16", ">= 1.16.2"
   s.add_dependency "omniauth", "~> 2.0"
@@ -80,6 +79,7 @@ Gem::Specification.new do |s|
   s.add_dependency "redis", "~> 4.1"
   s.add_dependency "request_store", "~> 1.7.0"
   s.add_dependency "rqrcode", "~> 2.2.0"
+  s.add_dependency "ruby-vips", "~> 2.2"
   s.add_dependency "rubyXL", "~> 3.4"
   s.add_dependency "rubyzip", "~> 2.0"
   s.add_dependency "shakapacker", "~> 8.3.0"
diff --git a/decidim-core/lib/decidim/api/functions/component_finder_base.rb b/decidim-core/lib/decidim/api/functions/component_finder_base.rb
index 7d15191e5773d..f855a207fc129 100644
--- a/decidim-core/lib/decidim/api/functions/component_finder_base.rb
+++ b/decidim-core/lib/decidim/api/functions/component_finder_base.rb
@@ -26,7 +26,7 @@ def call(component, args, _ctx)
         args.keys.each do |key|
           @query[key] = args[key]
         end
-        query_scope.find_by(@query)
+        query_scope.find_by!(@query)
       end
 
       # By default, any model in its default scope
diff --git a/decidim-core/lib/decidim/api/functions/component_list.rb b/decidim-core/lib/decidim/api/functions/component_list.rb
index a7fbf3f3691bb..23b9f298ca656 100644
--- a/decidim-core/lib/decidim/api/functions/component_list.rb
+++ b/decidim-core/lib/decidim/api/functions/component_list.rb
@@ -23,11 +23,12 @@ def initialize
         @model_class = Component
       end
 
-      def call(participatory_space, args, _ctx)
+      def call(participatory_space, args, ctx)
         @query = Decidim::Component
         # remove default ordering if custom order required
         @query = @query.unscoped if args[:order]
         @query = @query.where(participatory_space:)
+        @query = @query.published unless ctx[:current_user]&.admin?
         add_filter_keys(args[:filter])
         add_order_keys(args[:order].to_h)
         add_default_order
diff --git a/decidim-core/lib/decidim/api/functions/participatory_space_finder_base.rb b/decidim-core/lib/decidim/api/functions/participatory_space_finder_base.rb
index 192d76de1b262..1c56e87dc864a 100644
--- a/decidim-core/lib/decidim/api/functions/participatory_space_finder_base.rb
+++ b/decidim-core/lib/decidim/api/functions/participatory_space_finder_base.rb
@@ -32,7 +32,7 @@ def call(_obj, args, ctx)
             model_class.public_spaces
           end
 
-        @query.find_by(query)
+        @query.find_by!(query)
       end
     end
   end
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..c38623ec99015 100644
--- a/decidim-core/lib/decidim/api/functions/user_entity_list.rb
+++ b/decidim-core/lib/decidim/api/functions/user_entity_list.rb
@@ -21,7 +21,6 @@ def call(_obj, args, ctx)
                  .where(organization: ctx[:current_organization])
                  .confirmed
                  .not_blocked
-                 .includes(avatar_attachment: :blob)
         add_filter_keys(args[:filter])
         add_order_keys(args[:order].to_h)
         @query
diff --git a/decidim-core/lib/decidim/api/interfaces/author_interface.rb b/decidim-core/lib/decidim/api/interfaces/author_interface.rb
index e49ea8e2b262d..a82fe64464cbe 100644
--- a/decidim-core/lib/decidim/api/interfaces/author_interface.rb
+++ b/decidim-core/lib/decidim/api/interfaces/author_interface.rb
@@ -25,7 +25,7 @@ def organization_name
       end
 
       def self.resolve_type(obj, _ctx)
-        return Decidim::Core::UserType if obj.is_a? Decidim::User
+        return Decidim::Core::UserType if obj.is_a? Decidim::UserBaseEntity
       end
     end
   end
diff --git a/decidim-core/lib/decidim/core.rb b/decidim-core/lib/decidim/core.rb
index f194a6cdfbf30..e59f148306552 100644
--- a/decidim-core/lib/decidim/core.rb
+++ b/decidim-core/lib/decidim/core.rb
@@ -74,9 +74,7 @@ module Decidim
   autoload :Searchable, "decidim/searchable"
   autoload :FilterableResource, "decidim/filterable_resource"
   autoload :SearchResourceFieldsMapper, "decidim/search_resource_fields_mapper"
-  autoload :QueryExtensions, "decidim/query_extensions"
   autoload :ParticipatorySpaceResourceable, "decidim/participatory_space_resourceable"
-  autoload :HasPrivateUsers, "decidim/has_private_users"
   autoload :ViewModel, "decidim/view_model"
   autoload :FingerprintCalculator, "decidim/fingerprint_calculator"
   autoload :Fingerprintable, "decidim/fingerprintable"
@@ -134,6 +132,11 @@ module Decidim
   autoload :ApiResponseHelper, "decidim/api_response_helper"
   autoload :ResourceHelper, "decidim/resource_helper"
   autoload :TooltipHelper, "decidim/tooltip_helper"
+  autoload :FormFactory, "decidim/form_factory"
+
+  module ParticipatorySpace
+    autoload :HasMembers, "decidim/participatory_space/has_members"
+  end
 
   module Commands
     autoload :CreateResource, "decidim/commands/create_resource"
diff --git a/decidim-core/lib/decidim/core/engine.rb b/decidim-core/lib/decidim/core/engine.rb
index 07d6a4536f9a8..abdcabc70de93 100644
--- a/decidim-core/lib/decidim/core/engine.rb
+++ b/decidim-core/lib/decidim/core/engine.rb
@@ -241,13 +241,6 @@ class Engine < ::Rails::Engine
         ENV["SHAKAPACKER_CONFIG"] = Decidim::Shakapacker.configuration.configuration_file
       end
 
-      # Rails 7.0 default is vips, but
-      # The `:mini_magick` option is not deprecated; it is fine to keep using it.
-      # And we are going to use it while migrating rails application
-      initializer "decidim_core.active_storage_variant_processor" do |app|
-        app.config.active_storage.variant_processor = :mini_magick
-      end
-
       initializer "decidim_core.setup_i18n" do |app|
         app.config.i18n.available_locales = Decidim.available_locales
         app.config.i18n.default_locale = Decidim.default_locale
@@ -365,8 +358,6 @@ def named_variants
       end
 
       initializer "decidim_core.graphql_api" do
-        Decidim::Api::QueryType.include Decidim::QueryExtensions
-
         Decidim::Api.add_orphan_type Decidim::Core::UserType
       end
 
diff --git a/decidim-core/lib/decidim/core/test.rb b/decidim-core/lib/decidim/core/test.rb
index fe81ecfc107b8..786154fe3c299 100644
--- a/decidim-core/lib/decidim/core/test.rb
+++ b/decidim-core/lib/decidim/core/test.rb
@@ -53,7 +53,7 @@
 require "decidim/core/test/shared_examples/uncommentable_component_examples"
 require "decidim/core/test/shared_examples/searchable_resources_shared_context"
 require "decidim/core/test/shared_examples/searchable_participatory_space_examples"
-require "decidim/core/test/shared_examples/has_private_users"
+require "decidim/core/test/shared_examples/has_members"
 require "decidim/core/test/shared_examples/with_likeable_permissions_examples"
 require "decidim/core/test/shared_examples/system_like_resource_examples"
 require "decidim/core/test/shared_examples/rich_text_editor_examples"
diff --git a/decidim-core/lib/decidim/core/test/factories.rb b/decidim-core/lib/decidim/core/test/factories.rb
index 5bafdefd7f4ce..85ec7176743da 100644
--- a/decidim-core/lib/decidim/core/test/factories.rb
+++ b/decidim-core/lib/decidim/core/test/factories.rb
@@ -117,6 +117,11 @@ def generate_title(field = nil, skip_injection:)
       Decidim.available_locales.index_with { |_locale| Faker::Company.unique.name }
     end
 
+    # we do not want machine translation here
+    short_name do
+      Decidim.available_locales.index_with { |_locale| Faker::Company.unique.name.gsub(/\s+/, "")[0, 12] }
+    end
+
     reference_prefix { Faker::Name.suffix }
     time_zone { "UTC" }
     twitter_handler { Faker::Hipster.word }
@@ -205,6 +210,14 @@ def generate_title(field = nil, skip_injection:)
     previous_passwords { [] }
     extended_data { {} }
 
+    trait :malicious do
+      after :create do |user|
+        # rubocop:disable Rails/SkipsModelValidations
+        user.update_column(:name, "user_#{user.id}\n<script>alert('name')</script>")
+        # rubocop:enable Rails/SkipsModelValidations
+      end
+    end
+
     trait :confirmed do
       confirmed_at { Time.current }
     end
@@ -277,12 +290,12 @@ def generate_title(field = nil, skip_injection:)
     value { 1 }
   end
 
-  factory :participatory_space_private_user, class: "Decidim::ParticipatorySpacePrivateUser" do
+  factory :member, class: "Decidim::ParticipatorySpace::Member" do
     transient do
       skip_injection { false }
     end
     user
-    privatable_to { create(:participatory_process, organization: user.organization, skip_injection:) }
+    participatory_space { create(:participatory_process, organization: user.organization, skip_injection:) }
 
     role { generate_localized_title(:role, skip_injection:) }
 
@@ -295,12 +308,12 @@ def generate_title(field = nil, skip_injection:)
     end
   end
 
-  factory :assembly_private_user, class: "Decidim::ParticipatorySpacePrivateUser" do
+  factory :assembly_member, class: "Decidim::ParticipatorySpace::Member" do
     transient do
       skip_injection { false }
     end
     user
-    privatable_to { create(:assembly, organization: user.organization, skip_injection:) }
+    participatory_space { create(:assembly, organization: user.organization, skip_injection:) }
   end
 
   factory :identity, class: "Decidim::Identity" do
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 c8a195f154a3a..518558417ef14 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
@@ -13,6 +13,32 @@
     expect_no_js_errors
   end
 
+  context "when user name is improperly formatted" do
+    let!(:user) { create(:user, :malicious, :confirmed, organization:) }
+
+    before do
+      # rubocop:disable Rails/SkipsModelValidations
+      comments.each do |comment|
+        comment.author.update_column(:name, "user_#{comment.author.id}\n<script>alert('name')</script>") if comment.author.is_a?(Decidim::UserBaseEntity)
+      end
+      # rubocop:enable Rails/SkipsModelValidations
+    end
+
+    it "properly displays the user name" do
+      login_as user, scope: :user
+      visit resource_path
+
+      within "#add-comment-anchor" do
+        within "form#new_comment_for_#{commentable.commentable_type.demodulize}_#{commentable.id}" do
+          expect(page).to have_css("p.comment__as-author-name")
+          within "p.comment__as-author-name" do
+            expect(page).to have_content("user_#{user.id} alert('name')")
+          end
+        end
+      end
+    end
+  end
+
   it "shows the list of comments for the resource" do
     visit resource_path
 
@@ -21,7 +47,7 @@
 
     within "#comments" do
       comments.each do |comment|
-        expect(page).to have_content comment.author.name
+        expect(page).to have_content decidim_sanitize_translated(comment.author.name).gsub("\n", " ")
         expect(page).to have_content comment.body.values.first
       end
     end
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/has_private_users.rb b/decidim-core/lib/decidim/core/test/shared_examples/has_members.rb
similarity index 64%
rename from decidim-core/lib/decidim/core/test/shared_examples/has_private_users.rb
rename to decidim-core/lib/decidim/core/test/shared_examples/has_members.rb
index 24bf9077fa8cb..1259697203423 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/has_private_users.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/has_members.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-shared_examples_for "has private users" do
+shared_examples_for "has members" do
   let(:factory_name) { described_class.name.demodulize.underscore.to_sym }
 
   let!(:public_space) do
@@ -13,8 +13,8 @@
     create(factory_name, private_space: true, published_at: Time.current)
   end
 
-  def create_space_private_user(space, user = create(:user, organization: space.organization))
-    Decidim::ParticipatorySpacePrivateUser.create(privatable_to: space, user:)
+  def create_space_member(space, user = create(:user, organization: space.organization))
+    Decidim::ParticipatorySpace::Member.create(participatory_space: space, user:)
   end
 
   describe ".public_spaces" do
@@ -26,7 +26,7 @@ def create_space_private_user(space, user = create(:user, organization: space.or
   describe ".visible_for" do
     let(:scope) { described_class.send(:visible_for, user) }
 
-    before { create_space_private_user(private_space) }
+    before { create_space_member(private_space) }
 
     context "without user" do
       let(:user) { nil }
@@ -34,26 +34,26 @@ def create_space_private_user(space, user = create(:user, organization: space.or
       it { expect(scope).to contain_exactly(public_space) }
     end
 
-    context "with non-private user" do
+    context "with non-member" do
       let(:user) { create(:user) }
 
       it { expect(scope).to contain_exactly(public_space) }
     end
 
-    context "with private user" do
+    context "with member" do
       let(:user) { private_space.users.first }
 
       it { expect(scope).to contain_exactly(public_space, private_space) }
     end
 
-    context "when the space is both public and has private users" do
-      # Visible spaces for non-private user.
+    context "when the space is both public and has members" do
+      # Visible spaces for non-member.
       let(:user) { create(:user) }
 
       before do
-        # Public space has multiple private users.
-        create_space_private_user(public_space)
-        create_space_private_user(public_space)
+        # Public space has multiple members.
+        create_space_member(public_space)
+        create_space_member(public_space)
       end
 
       # Expect no duplicate results.
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/participatory_space_dropdown_metadata_cell_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/participatory_space_dropdown_metadata_cell_examples.rb
deleted file mode 100644
index 3d8dfd904c016..0000000000000
--- a/decidim-core/lib/decidim/core/test/shared_examples/participatory_space_dropdown_metadata_cell_examples.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-shared_examples_for "participatory space dropdown metadata cell" do
-  it "renders the space title" do
-    expect(subject).to have_content(translated(model.title))
-  end
-
-  context "when there is a component" do
-    let(:manifest_name) { "dummy" }
-    let(:manifest) { Decidim.find_component_manifest(manifest_name) }
-    let(:participatory_space) { model }
-    let(:organization) { model.organization }
-    let!(:component) do
-      create(:component,
-             manifest:,
-             participatory_space:)
-    end
-    let(:resource) do
-      create(:dummy_resource, component:, published_at: Time.current)
-    end
-
-    before do
-      allow(Decidim::ActionLog).to receive(:public_resource_types).and_return(
-        %w(Decidim::Dev::DummyResource)
-      )
-      allow(Decidim::ActionLog).to receive(:publicable_public_resource_types).and_return(
-        %w(Decidim::Dev::DummyResource)
-      )
-    end
-
-    it "renders the component link in the navigation menu" do
-      within "ul.menu-bar__secondary-dropdown__menu" do
-        expect(subject).to have_link(translated(component.name))
-      end
-    end
-
-    context "when there are no activities" do
-      it "does not render an activities block" do
-        expect(subject).to have_no_css("div.activity__container")
-      end
-    end
-
-    context "when there are activities related with components in other spaces" do
-      let(:other_space) { create(:participatory_process, organization:) }
-      let!(:other_component) do
-        create(:component,
-               manifest:,
-               participatory_space: other_space)
-      end
-      let(:other_resource) do
-        create(:dummy_resource, component: other_component, published_at: Time.current)
-      end
-      let!(:action_log) do
-        create(
-          :action_log,
-          action: "publish",
-          visibility: "all",
-          resource: other_resource,
-          organization:,
-          participatory_space: other_space
-        )
-      end
-
-      it "does not render an activities block" do
-        expect(subject).to have_no_css("div.activity__container")
-      end
-    end
-
-    context "when there are activities related with components of the space" do
-      let!(:action_log) do
-        create(:action_log, action: "publish", visibility: "all", resource:, organization:, participatory_space:)
-      end
-
-      it "renders the activities related with the component" do
-        expect(subject).to have_css("div.activity__container")
-      end
-    end
-  end
-end
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/participatory_space_members_page_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/participatory_space_members_page_examples.rb
index d48ef63eb7d7f..1f9b35611b478 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/participatory_space_members_page_examples.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/participatory_space_members_page_examples.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 shared_examples "participatory space members page examples" do
-  let(:user1) { create(:user, organization: privatable_to.organization) }
-  let(:user2) { create(:user, organization: privatable_to.organization) }
-  let(:user3) { create(:user, organization: privatable_to.organization) }
+  let(:user1) { create(:user, organization: participatory_space.organization) }
+  let(:user2) { create(:user, organization: participatory_space.organization) }
+  let(:user3) { create(:user, organization: participatory_space.organization) }
 
   before do
     request.env["decidim.current_organization"] = organization
@@ -18,9 +18,9 @@
     end
 
     context "when participatory space has members" do
-      let!(:member1) { create(:participatory_space_private_user, privatable_to:, user: user1, published: true) }
-      let!(:member2) { create(:participatory_space_private_user, privatable_to:, user: user2, published: true) }
-      let!(:non_published) { create(:participatory_space_private_user, privatable_to:, user: user3, published: false) }
+      let!(:member1) { create(:member, participatory_space:, user: user1, published: true) }
+      let!(:member2) { create(:member, participatory_space:, user: user2, published: true) }
+      let!(:non_published) { create(:member, participatory_space:, user: user3, published: false) }
 
       context "when user has permissions" do
         it "displays list of members" do
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/participatory_space_members_shared_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/participatory_space_members_shared_examples.rb
new file mode 100644
index 0000000000000..2f9662df95209
--- /dev/null
+++ b/decidim-core/lib/decidim/core/test/shared_examples/participatory_space_members_shared_examples.rb
@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+shared_examples "participatory space members" do
+  let(:blocks_manifests) { [] }
+  let(:organization) { create(:organization) }
+  let(:user) { create(:user, organization: participatory_space.organization) }
+  let(:ceased_user) { create(:user, organization: participatory_space.organization) }
+
+  before do
+    switch_to_host(organization.host)
+  end
+
+  context "when there are no members and directly accessing from URL" do
+    it_behaves_like "a 404 page" do
+      let(:target_path) { members_path }
+    end
+  end
+
+  context "when there are no members and accessing from the space homepage" do
+    context "and the main data content block is disabled" do
+      it "the menu nav is not shown" do
+        visit participatory_space_homepage_path
+
+        expect(page).to have_no_css(".participatory-space__nav-container")
+      end
+    end
+
+    context "and the main data content block is enabled" do
+      let(:blocks_manifests) { ["main_data"] }
+
+      it "the menu link is not shown" do
+        visit participatory_space_homepage_path
+
+        expect(page).to have_no_content("Members")
+      end
+    end
+  end
+
+  context "when the participatory space does not exist" do
+    it_behaves_like "a 404 page" do
+      let(:target_path) { unexisting_participatory_space_members_path }
+    end
+  end
+
+  context "when there are some members and all are unpublished" do
+    before do
+      create(:member, user:, participatory_space:, published: false)
+    end
+
+    context "and directly accessing from URL" do
+      it_behaves_like "a 404 page" do
+        let(:target_path) { members_path }
+      end
+    end
+
+    context "and accessing from the homepage" do
+      context "and the main data content block is disabled" do
+        it "the menu nav is not shown" do
+          visit participatory_space_homepage_path
+
+          expect(page).to have_no_css(".participatory-space__nav-container")
+        end
+      end
+
+      context "and the main data content block is enabled" do
+        let(:blocks_manifests) { ["main_data"] }
+
+        it "the menu link is not shown" do
+          visit participatory_space_homepage_path
+
+          expect(page).to have_no_content("Members")
+        end
+      end
+    end
+  end
+
+  context "when there are some published members" do
+    let!(:member) { create(:member, user:, participatory_space:, published: true) }
+    let!(:ceased_member) { create(:member, user: ceased_user, participatory_space:, published: false) }
+
+    before do
+      visit members_path
+    end
+
+    context "and accessing from the space homepage" do
+      context "and the main data content block is disabled" do
+        it "the menu nav is not shown" do
+          visit participatory_space_homepage_path
+
+          expect(page).to have_no_css(".participatory-space__nav-container")
+        end
+      end
+
+      context "and the main data content block is enabled" do
+        let(:blocks_manifests) { ["main_data"] }
+
+        it "the menu link is shown" do
+          visit participatory_space_homepage_path
+
+          within ".participatory-space__nav-container" do
+            expect(page).to have_content("Members")
+            click_on "Members"
+          end
+
+          expect(page).to have_current_path members_path
+        end
+      end
+
+      it "lists all the non ceased members" do
+        within "#assembly_members-grid" do
+          expect(page).to have_css(".profile__user", count: 1)
+
+          expect(page).to have_no_content(Decidim::ParticipatorySpace::MemberPresenter.new(ceased_member).name)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/download_your_data_serializers.rb b/decidim-core/lib/decidim/download_your_data_serializers.rb
index 83216146ce224..0af8b9cde17c2 100644
--- a/decidim-core/lib/decidim/download_your_data_serializers.rb
+++ b/decidim-core/lib/decidim/download_your_data_serializers.rb
@@ -8,12 +8,12 @@ module DownloadYourDataSerializers
     autoload :DownloadYourDataFollowSerializer, "decidim/download_your_data_serializers/download_your_data_follow_serializer"
     autoload :DownloadYourDataNotificationSerializer, "decidim/download_your_data_serializers/download_your_data_notification_serializer"
     autoload :DownloadYourDataIdentitySerializer, "decidim/download_your_data_serializers/download_your_data_identity_serializer"
-    autoload :DownloadYourDataParticipatorySpacePrivateUserSerializer, "decidim/download_your_data_serializers/download_your_data_participatory_space_private_user_serializer"
+    autoload :DownloadYourDataMemberSerializer, "decidim/download_your_data_serializers/download_your_data_member_serializer"
 
     def self.data_entities
       ["Decidim::Follow", "Decidim::Identity",
        "Decidim::Messaging::Conversation", "Decidim::Notification",
-       "Decidim::ParticipatorySpacePrivateUser", "Decidim::Report", "Decidim::User"] |
+       "Decidim::ParticipatorySpace::Member", "Decidim::Report", "Decidim::User"] |
         Decidim.component_manifests.map(&:data_portable_entities).flatten |
         Decidim.participatory_space_manifests.map(&:data_portable_entities).flatten |
         (Decidim::Comments.data_portable_entities.flatten if defined?(Decidim::Comments))
diff --git a/decidim-core/lib/decidim/download_your_data_serializers/download_your_data_participatory_space_private_user_serializer.rb b/decidim-core/lib/decidim/download_your_data_serializers/download_your_data_member_serializer.rb
similarity index 61%
rename from decidim-core/lib/decidim/download_your_data_serializers/download_your_data_participatory_space_private_user_serializer.rb
rename to decidim-core/lib/decidim/download_your_data_serializers/download_your_data_member_serializer.rb
index 0e2b619882412..669cf1c7c1dc5 100644
--- a/decidim-core/lib/decidim/download_your_data_serializers/download_your_data_participatory_space_private_user_serializer.rb
+++ b/decidim-core/lib/decidim/download_your_data_serializers/download_your_data_member_serializer.rb
@@ -3,18 +3,18 @@
 module Decidim
   # This class serializes a User so can be exported to CSV
   module DownloadYourDataSerializers
-    class DownloadYourDataParticipatorySpacePrivateUserSerializer < Decidim::Exporters::Serializer
+    class DownloadYourDataMemberSerializer < Decidim::Exporters::Serializer
       include Decidim::ResourceHelper
 
       # Public: Exports a hash with the serialized data for this user.
       def serialize
         {
           id: resource.id,
-          privatable_to: {
-            id: resource.privatable_to_id,
-            type: resource.privatable_to_type,
-            title: resource.privatable_to.title,
-            slug: resource.privatable_to.slug
+          participatory_space: {
+            id: resource.participatory_space_id,
+            type: resource.participatory_space_type,
+            title: resource.participatory_space.title,
+            slug: resource.participatory_space.slug
           },
           created_at: resource.created_at,
           updated_at: resource.updated_at,
diff --git a/decidim-core/lib/decidim/form_builder.rb b/decidim-core/lib/decidim/form_builder.rb
index 43ce2905e5302..addf4727e3a0a 100644
--- a/decidim-core/lib/decidim/form_builder.rb
+++ b/decidim-core/lib/decidim/form_builder.rb
@@ -366,11 +366,17 @@ def upload(attribute, options = {})
         button_edit_label: I18n.t("decidim.forms.upload.labels.replace")
       }.merge(options)
 
-      ::Decidim::ViewModel.cell(
+      upload_cell = ::Decidim::ViewModel.cell(
         "decidim/upload_modal",
         self,
         options
       ).call
+
+      options_without_help = options.dup
+      options_without_help.delete(:help)
+      options_without_help.delete(:help_text)
+
+      upload_cell + error_and_help_text(attribute, options_without_help) + (options[:required] ? abide_error_element(attribute, for: "#{attribute}_validation") : "")
     end
 
     def max_file_size(record, attribute)
@@ -615,9 +621,33 @@ def custom_label(attribute, text, options, field_before_label: false, show_requi
              else
                text
              end
-
       label(attribute, text, options || {})
     end
+
+    # render p tag instead of label for proposals "add a document"
+    def custom_paragraph(attribute, text, options, field_before_label: false, show_required: true)
+      return "".html_safe if text == false
+
+      required = options.is_a?(Hash) && options.delete(:required)
+      text = default_label_text(object, attribute) if text.nil? || text == true
+      if show_required
+        text +=
+          if required
+            required_indicator
+          else
+            required_for_attribute(attribute)
+          end
+      end
+
+      text = if field_before_label && block_given?
+               safe_join([yield, text.html_safe])
+             elsif block_given?
+               safe_join([text.html_safe, yield])
+             else
+               text
+             end
+      content_tag(:p, text.html_safe, class: "text-lg font-semibold")
+    end
     # rubocop:enable Metrics/PerceivedComplexity
     # rubocop:enable Metrics/CyclomaticComplexity
 
@@ -626,19 +656,23 @@ def custom_label(attribute, text, options, field_before_label: false, show_requi
     # does it.
     #
     # attribute - The name of the attribute of the field.
+    # options - A Hash of options:
+    #           :for - The ID of the input field this error is for (adds data-form-error-for attribute)
     #
     # Returns a String.
-    def abide_error_element(attribute)
+    def abide_error_element(attribute, options = {})
       defaults = []
       defaults << :"decidim.forms.errors.#{object.class.model_name.i18n_key}.#{attribute}"
       defaults << :"decidim.forms.errors.#{attribute}"
       defaults << :"forms.errors.#{attribute}"
       defaults << :"decidim.forms.errors.error"
 
-      options = { count: 1, default: defaults }
+      i18n_options = { count: 1, default: defaults }
 
-      text = I18n.t(defaults.shift, **options)
-      content_tag(:span, text, class: "form-error")
+      text = I18n.t(defaults.shift, **i18n_options)
+      tag_options = { class: "form-error" }
+      tag_options[:"data-form-error-for"] = options[:for] if options[:for]
+      content_tag(:span, text, tag_options)
     end
 
     def tab_element_class_for(type, index)
diff --git a/decidim-core/app/controllers/concerns/decidim/form_factory.rb b/decidim-core/lib/decidim/form_factory.rb
similarity index 100%
rename from decidim-core/app/controllers/concerns/decidim/form_factory.rb
rename to decidim-core/lib/decidim/form_factory.rb
diff --git a/decidim-core/lib/decidim/has_private_users.rb b/decidim-core/lib/decidim/has_private_users.rb
deleted file mode 100644
index 90dd3fba6a160..0000000000000
--- a/decidim-core/lib/decidim/has_private_users.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-require "active_support/concern"
-
-module Decidim
-  # A concern with the features needed when you want a model to be able to create
-  # private users
-  module HasPrivateUsers
-    extend ActiveSupport::Concern
-
-    included do
-      has_many :participatory_space_private_users,
-               class_name: "Decidim::ParticipatorySpacePrivateUser",
-               as: :privatable_to,
-               dependent: :destroy
-      has_many :users,
-               through: :participatory_space_private_users,
-               class_name: "Decidim::User",
-               foreign_key: "private_user_to_id"
-
-      def self.visible_for(user)
-        if user
-          return all if user.admin?
-
-          where(
-            id: public_spaces +
-                private_spaces
-                  .joins(:participatory_space_private_users)
-                  .where(decidim_participatory_space_private_users: { decidim_user_id: user.id })
-          )
-        else
-          public_spaces
-        end
-      end
-
-      def members_public_page?
-        private_space && participatory_space_private_users.published.any?
-      end
-
-      def can_participate?(user)
-        return false unless published?
-        return true unless private_space?
-        return false unless user
-
-        participatory_space_private_users.exists?(decidim_user_id: user.id)
-      end
-
-      def self.public_spaces
-        where(private_space: false).published
-      end
-
-      def self.private_spaces
-        where(private_space: true)
-      end
-    end
-  end
-end
diff --git a/decidim-core/lib/decidim/participatory_space/has_members.rb b/decidim-core/lib/decidim/participatory_space/has_members.rb
new file mode 100644
index 0000000000000..03e87511cde67
--- /dev/null
+++ b/decidim-core/lib/decidim/participatory_space/has_members.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module ParticipatorySpace
+    # A concern with the features needed when you want a model to be able to create
+    # members
+    module HasMembers
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :members,
+                 class_name: "Decidim::ParticipatorySpace::Member",
+                 as: :participatory_space,
+                 dependent: :destroy
+        has_many :users,
+                 through: :members,
+                 class_name: "Decidim::User",
+                 foreign_key: "member_to_id"
+
+        def self.visible_for(user)
+          if user
+            return all if user.admin?
+
+            where(
+              id: public_spaces +
+                  private_spaces
+                    .joins(:members)
+                    .where(decidim_members: { decidim_user_id: user.id })
+            )
+          else
+            public_spaces
+          end
+        end
+
+        def members_public_page?
+          has_members && members.published.any?
+        end
+
+        def can_participate?(user)
+          return false unless published?
+          return true unless private_space?
+          return false unless user
+
+          members.exists?(decidim_user_id: user.id)
+        end
+
+        def self.public_spaces
+          where(private_space: false).published
+        end
+
+        def self.private_spaces
+          where(private_space: true)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/participatory_space_manifest.rb b/decidim-core/lib/decidim/participatory_space_manifest.rb
index 443828de42323..320d0a9d39e99 100644
--- a/decidim-core/lib/decidim/participatory_space_manifest.rb
+++ b/decidim-core/lib/decidim/participatory_space_manifest.rb
@@ -43,10 +43,6 @@ class ParticipatorySpaceManifest
     # probably have the form of `Decidim::<MySpace>::Permissions`.
     attribute :permissions_class_name, String, default: "Decidim::DefaultPermissions"
 
-    # The cell to use as dropdown in the breadcrumb element associated to the space.
-    # If this value is omitted or blank, no breadcrumb is displayed
-    attribute :breadcrumb_cell, String
-
     # The cell path to use to render the card of a resource.
     attribute :card, String
 
diff --git a/decidim-core/lib/decidim/query_extensions.rb b/decidim-core/lib/decidim/query_extensions.rb
deleted file mode 100644
index 323eb3a02c605..0000000000000
--- a/decidim-core/lib/decidim/query_extensions.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # This module's job is to extend the API with custom fields related to
-  # decidim-core.
-  module QueryExtensions
-    # Public: Extends a type with `decidim-core`'s fields.
-    #
-    # type - A GraphQL::BaseType to extend.
-    #
-    # Returns nothing.
-    def self.included(type)
-      type.field :component, Decidim::Core::ComponentInterface, null: true do
-        description "Lists the components this space contains."
-        argument :id, GraphQL::Types::ID, required: true, description: "The ID of the component to be found"
-      end
-      type.field :session, Core::SessionType, description: "Return's information about the logged in user", null: true
-      type.field :decidim, Core::DecidimType, "Decidim's framework properties.", null: true
-      type.field :organization, Core::OrganizationType, "The current organization", null: true
-      type.field :user,
-                 type: Core::UserType, null: true,
-                 description: "A participant (user or group) in the current organization" do
-        argument :id, GraphQL::Types::ID, "The ID of the participant", required: false
-        argument :nickname, GraphQL::Types::String, "The @nickname of the participant", required: false
-      end
-      type.field :users,
-                 type: [Core::UserType], null: true,
-                 description: "The participants (users or groups) for the current organization" do
-        argument :order, Decidim::Core::UserEntityInputSort, "Provides several methods to order the results", required: false
-        argument :filter, Decidim::Core::UserEntityInputFilter, "Provides several methods to filter the results", required: false
-      end
-      type.field :participant_details, type: Decidim::Core::ParticipantDetailsType, null: true do
-        description "Participant details visible to admin users only"
-        argument :id, GraphQL::Types::ID, "The ID of the participant", required: true
-        argument :nickname, GraphQL::Types::String, "The @nickname of the participant", required: false
-      end
-      type.field :static_pages, type: [Decidim::Core::StaticPageType], null: true,
-                                description: "The static pages for the current organization"
-      type.field :static_page_topics, type: [Decidim::Core::StaticPageTopicType], null: true,
-                                      description: "The static page topics for the current organization"
-      type.field :moderated_users, type: [Decidim::Core::UserModerationType], null: true,
-                                   description: "The moderated users for the current organization"
-      type.field :moderations, type: [Decidim::Core::ModerationType], null: true,
-                               description: "The moderation for the current organization"
-    end
-
-    def component(id: {})
-      component = Decidim::Component.published.find_by(id:)
-      component&.organization == context[:current_organization] ? component : nil
-    end
-
-    def session
-      context[:current_user]
-    end
-
-    def decidim
-      Decidim
-    end
-
-    def organization
-      context[:current_organization]
-    end
-
-    def user(id: nil, nickname: nil)
-      Core::UserEntityFinder.new.call(object, { id:, nickname: }, context)
-    end
-
-    def users(filter: {}, order: {})
-      Core::UserEntityList.new.call(object, { filter:, order: }, context)
-    end
-
-    def participant_details(id: nil, nickname: nil)
-      participant = Decidim::Core::UserEntityFinder.new.call(object, { id: id, nickname: nickname }, context)
-      return nil unless participant
-
-      return nil unless Decidim::Core::ParticipantDetailsType.authorized?(participant, context)
-
-      Decidim::ActionLogger.log(
-        "read",
-        context[:current_user],
-        participant,
-        nil,
-        {}
-      )
-
-      participant
-    end
-
-    def static_pages
-      Decidim::StaticPage.accessible_for(context[:current_organization], context[:current_user])
-    end
-
-    def static_page_topics
-      static_pages.collect(&:topic).uniq.compact_blank
-    end
-
-    def moderated_users
-      Decidim::UserModeration.joins(:user).where(decidim_users: { decidim_organization_id: context[:current_organization]&.id }).where.not(decidim_users: { blocked_at: nil })
-    end
-
-    def moderations
-      Decidim::Moderation.where(participatory_space: context[:current_organization].participatory_spaces).includes(:reports).hidden
-    end
-  end
-end
diff --git a/decidim-core/lib/decidim/seeds.rb b/decidim-core/lib/decidim/seeds.rb
index 0e3042274bb6a..3820b8451abb7 100644
--- a/decidim-core/lib/decidim/seeds.rb
+++ b/decidim-core/lib/decidim/seeds.rb
@@ -7,6 +7,19 @@
 module Decidim
   # Base class to be inherited from the different modules' seeds classes
   class Seeds
+    SEEDS_CONFIG = {
+      comments_count: { slow: 6, fast: 2 },
+      comments_nested_probability: { slow: 0.5, fast: 0.2 },
+      comments_vote_skip_probability: { slow: 0.5, fast: 0.7 },
+      comments_votes_count: { slow: 12, fast: 3 },
+      surveys_responses_count: { slow: 200, fast: 20 },
+      surveys_response_options_count: { slow: 3, fast: 2 },
+      surveys_matrix_rows_count: { slow: 3, fast: 2 },
+      initiatives_votes_count: { slow: 50, fast: 10 },
+      accountability_statuses_count: { slow: 5, fast: 3 },
+      accountability_taxonomies_count: { slow: 2, fast: 1 }
+    }.freeze
+
     protected
 
     def slow_seeds?
@@ -17,6 +30,10 @@ def number_of_records
       slow_seeds? ? rand(3..5) : 1
     end
 
+    def config_value(key)
+      slow_seeds? ? SEEDS_CONFIG[key][:slow] : SEEDS_CONFIG[key][:fast]
+    end
+
     def organization
       @organization ||= Decidim::Organization.first
     end
diff --git a/decidim-core/lib/tasks/decidim_procfile.rake b/decidim-core/lib/tasks/decidim_procfile.rake
index fd043af677932..a72f31066cdab 100644
--- a/decidim-core/lib/tasks/decidim_procfile.rake
+++ b/decidim-core/lib/tasks/decidim_procfile.rake
@@ -23,7 +23,7 @@ set -e
 
 bundle check || bundle install --jobs 20 --retry 5
 
-bin/rails decidim:upgrade db:migrate
+bin/rails decidim:upgrade db:migrate data:migrate
 
 if ! gem list foreman -i --silent; then
   echo "Installing foreman..."
diff --git a/decidim-core/lib/tasks/upgrade/decidim_remove_deleted_users_left_data_tasks.rake b/decidim-core/lib/tasks/upgrade/decidim_remove_deleted_users_left_data_tasks.rake
index d1e5a1ca7864e..858fba83bda24 100644
--- a/decidim-core/lib/tasks/upgrade/decidim_remove_deleted_users_left_data_tasks.rake
+++ b/decidim-core/lib/tasks/upgrade/decidim_remove_deleted_users_left_data_tasks.rake
@@ -8,7 +8,7 @@ namespace :decidim do
       Decidim::User.where.not(deleted_at: nil).find_each do |deleted_user|
         Decidim::Follow.where(followable: deleted_user).find_each(&:destroy)
         Decidim::Follow.where(user: deleted_user).find_each(&:destroy)
-        Decidim::ParticipatorySpacePrivateUser.where(user: deleted_user).find_each(&:destroy)
+        Decidim::ParticipatorySpace::Member.where(user: deleted_user).find_each(&:destroy)
         Decidim::Gamification::BadgeScore.where(user: deleted_user).find_each(&:destroy)
         Decidim::UserModeration.where(user: deleted_user).find_each(&:destroy)
         Decidim::Like.where(author: deleted_user).find_each(&:destroy)
diff --git a/decidim-core/lib/tasks/upgrade/fix_deleted_private_follows.rake b/decidim-core/lib/tasks/upgrade/fix_deleted_private_follows.rake
index 9a77bc41bec85..21277ed55d17b 100644
--- a/decidim-core/lib/tasks/upgrade/fix_deleted_private_follows.rake
+++ b/decidim-core/lib/tasks/upgrade/fix_deleted_private_follows.rake
@@ -17,7 +17,7 @@ namespace :decidim do
           next unless user.following_follows.count.positive?
 
           spaces.each do |space|
-            Decidim::Admin::DestroyPrivateUsersFollowsJob.perform_later(user, space)
+            Decidim::Admin::ParticipatorySpace::DestroyMembersFollowsJob.perform_later(user, space)
           end
         end
       end
diff --git a/decidim-core/spec/cells/decidim/upload_modal_cell_spec.rb b/decidim-core/spec/cells/decidim/upload_modal_cell_spec.rb
index 45e2dd82d1295..f52fb521c5942 100644
--- a/decidim-core/spec/cells/decidim/upload_modal_cell_spec.rb
+++ b/decidim-core/spec/cells/decidim/upload_modal_cell_spec.rb
@@ -63,9 +63,19 @@ def model_name
       expect(subject).to have_css("input[name='dummy[#{attribute}_validation]']", visible: :hidden)
     end
 
+    it "renders the hidden checkbox with the correct ID for Foundation Abide" do
+      expect(subject).to have_css("input##{attribute}_validation", visible: :hidden)
+    end
+
     it "renders the required field indicator" do
       expect(subject).to have_css("label .label-required", text: "Required field")
     end
+
+    it "does not render error or help text inside the modal" do
+      # Error and help text should be rendered outside the modal by the form builder
+      expect(subject).to have_no_css(".form-error")
+      expect(subject).to have_no_css(".help-text")
+    end
   end
 
   context "when attachment is present" do
diff --git a/decidim-core/spec/commands/decidim/destroy_account_spec.rb b/decidim-core/spec/commands/decidim/destroy_account_spec.rb
index a5ef541383240..27870cc580ae4 100644
--- a/decidim-core/spec/commands/decidim/destroy_account_spec.rb
+++ b/decidim-core/spec/commands/decidim/destroy_account_spec.rb
@@ -133,10 +133,10 @@ module Decidim
           expect { command.call }.not_to change(Decidim::Authorization, :count)
         end
 
-        it "deletes participatory space private user" do
-          create(:participatory_space_private_user, user:)
+        it "deletes member" do
+          create(:member, user:)
 
-          expect { command.call }.to change(ParticipatorySpacePrivateUser, :count).by(-1)
+          expect { command.call }.to change(Decidim::ParticipatorySpace::Member, :count).by(-1)
         end
 
         it "deletes user likes" do
diff --git a/decidim-core/spec/controllers/favicon_controller_spec.rb b/decidim-core/spec/controllers/favicon_controller_spec.rb
index 3502eec6088dd..6e09f8aa5fd6e 100644
--- a/decidim-core/spec/controllers/favicon_controller_spec.rb
+++ b/decidim-core/spec/controllers/favicon_controller_spec.rb
@@ -36,7 +36,7 @@ module Decidim
       end
 
       context "when the organization has a favicon" do
-        let(:favicon_path) { Decidim::Dev.asset("icon.ico") }
+        let(:favicon_path) { Decidim::Dev.asset("icon.png") }
 
         before do
           organization.favicon.attach(io: File.open(favicon_path), filename: File.basename(favicon_path))
diff --git a/decidim-core/spec/db/data/add_short_name_to_organizations_spec.rb b/decidim-core/spec/db/data/add_short_name_to_organizations_spec.rb
new file mode 100644
index 0000000000000..58128e1b450d3
--- /dev/null
+++ b/decidim-core/spec/db/data/add_short_name_to_organizations_spec.rb
@@ -0,0 +1,205 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "./db/data/20251125144141_add_short_name_to_organizations"
+
+describe AddShortNameToOrganizations do
+  let(:migrator) do
+    described_class.new.tap do |m|
+      m.verbose = false
+    end
+  end
+
+  describe "#up" do
+    shared_examples_for "adds the short name" do |describe_title, example_title, name_hash, short_name_hash|
+      describe describe_title do
+        let!(:organization) do
+          org = create(:organization, name: name_hash)
+          org.update_column(:short_name, {}) # rubocop:disable Rails/SkipsModelValidations
+          org
+        end
+
+        it example_title do
+          expect(organization.reload.short_name).to eq({})
+          migrator.migrate(:up)
+          expect(organization.reload.short_name).to eq(short_name_hash)
+        end
+      end
+    end
+
+    it_behaves_like "adds the short name",
+                    "with a normal name",
+                    "generates short_name from name",
+                    { en: "MyOrganization" },
+                    { "en" => "MyOrganizati" }
+
+    it_behaves_like "adds the short name",
+                    "with a name containing spaces",
+                    "removes spaces and generates short_name",
+                    { en: "My Organization" },
+                    { "en" => "MyOrganizati" }
+
+    it_behaves_like "adds the short name",
+                    "with a short name without spaces",
+                    "uses the name as short_name",
+                    { en: "Test" },
+                    { "en" => "Test" }
+
+    it_behaves_like "adds the short name",
+                    "with a name that results in less than 3 characters",
+                    "does not set short_name",
+                    { en: "A B" },
+                    {}
+
+    it_behaves_like "adds the short name",
+                    "with a long name",
+                    "truncates to 12 characters",
+                    { en: "Very Long Organization Name" },
+                    { "en" => "VeryLongOrga" }
+
+    it_behaves_like "adds the short name",
+                    "with a blank name",
+                    "does not set short_name",
+                    { en: "" },
+                    {}
+
+    it_behaves_like "adds the short name",
+                    "with a Spanish name",
+                    "generates short_name from Spanish name",
+                    { es: "MiOrganización", en: "MyOrganization" },
+                    { "es" => "MiOrganizaci", "en" => "MyOrganizati" }
+
+    it_behaves_like "adds the short name",
+                    "with a French name containing accents",
+                    "removes spaces and generates short_name from French",
+                    { fr: "Mon Organisation", en: "My Organization" },
+                    { "fr" => "MonOrganisat", "en" => "MyOrganizati" }
+
+    it_behaves_like "adds the short name",
+                    "with a Catalan name",
+                    "generates short_name from Catalan name",
+                    { ca: "LaMevaOrganització", en: "MyOrganization" },
+                    { "ca" => "LaMevaOrgani", "en" => "MyOrganizati" }
+
+    it_behaves_like "adds the short name",
+                    "with multiple locales and spaces",
+                    "generates short_name for all locales",
+                    { en: "My Organization", es: "Mi Organización", ca: "La Meva Organització" },
+                    { "en" => "MyOrganizati", "es" => "MiOrganizaci", "ca" => "LaMevaOrgani" }
+
+    it_behaves_like "adds the short name",
+                    "with German name",
+                    "generates short_name from German name",
+                    { de: "Meine Organisation", en: "My Organization" },
+                    { "de" => "MeineOrganis", "en" => "MyOrganizati" }
+
+    it_behaves_like "adds the short name",
+                    "with faker multilingual organization",
+                    "generates short_name for all valid locales",
+                    {
+                      "ar" => "سعيد شركة",
+                      "bg" => "Schultz-Mosciski",
+                      "ca" => "Garau, Miquel and Pitart",
+                      "cs" => "Rogahn, Farrell and Spinka",
+                      "da" => "DuBuque, Gislason and Buckridge",
+                      "de" => "Oeser KG",
+                      "el" => "Wunsch, Adams and Simonis",
+                      "en" => "Emmerich Inc",
+                      "eo" => "Gusikowski Inc",
+                      "es" => "Fonseca, Robles y Rivera Asociados",
+                      "et" => "McClure, Leffler and Zboncak",
+                      "eu" => "Corwin and Sons",
+                      "fa" => "ندوشن Group",
+                      "fi" => "Zemlak, Swift and Lemke",
+                      "fr" => "Duval EURL",
+                      "ga" => "Rippin Group",
+                      "gl" => "Jacobson, Schinner and Feil",
+                      "hr" => "Hamill Group",
+                      "hu" => "Lueilwitz-Schaden",
+                      "id" => "Haryanto, Waluyo and Idris",
+                      "is" => "Romaguera and Sons",
+                      "it" => "Amato, Negri e Barone SPA",
+                      "ja" => "加藤運輸株式会社",
+                      "ko" => "한국 민준",
+                      "lb" => "Mante-Emard",
+                      "lt" => "Pfeffer, Nienow and Schaefer",
+                      "lv" => "Irbe AS",
+                      "mt" => "Ebert, Zulauf and Grady",
+                      "nl" => "Tegelaar V.O.F.",
+                      "no" => "Bartell-Corwin",
+                      "pl" => "Matusiak-Flis",
+                      "pt" => "Moreira-Araújo",
+                      "ro" => "Kautzer and Sons",
+                      "ru" => "ИП Эдуард",
+                      "sk" => "Labudová s.r.o.",
+                      "sl" => "Sanford-Leannon",
+                      "sr" => "Jakubowski, Ullrich and Reynolds",
+                      "sv" => "Andersson Group",
+                      "tr" => "Özkanlı, Zengel and Davut",
+                      "uk" => "ФОП Яцьків",
+                      "vi" => "Cửa hàng Triệu",
+                      "es-MX" => "Rivas y Lozano S.R.L",
+                      "es-PY" => "Ceballos S.A.",
+                      "fi-pl" => "Leannon-Stroman",
+                      "fr-CA" => "Aubért et Rémy",
+                      "pt-BR" => "Marcondes, Ferraço e Solimões",
+                      "zh-CN" => "杜-雷",
+                      "machine_translations" => { "zh-TW" => "章 Inc" }
+                    },
+                    {
+                      "ar" => "سعيدشركة",
+                      "bg" => "Schultz-Mosc",
+                      "ca" => "Garau,Miquel",
+                      "cs" => "Rogahn,Farre",
+                      "da" => "DuBuque,Gisl",
+                      "de" => "OeserKG",
+                      "el" => "Wunsch,Adams",
+                      "en" => "EmmerichInc",
+                      "eo" => "GusikowskiIn",
+                      "es" => "Fonseca,Robl",
+                      "et" => "McClure,Leff",
+                      "eu" => "CorwinandSon",
+                      "fa" => "ندوشنGroup",
+                      "fi" => "Zemlak,Swift",
+                      "fr" => "DuvalEURL",
+                      "ga" => "RippinGroup",
+                      "gl" => "Jacobson,Sch",
+                      "hr" => "HamillGroup",
+                      "hu" => "Lueilwitz-Sc",
+                      "id" => "Haryanto,Wal",
+                      "is" => "Romagueraand",
+                      "it" => "Amato,Negrie",
+                      "ja" => "加藤運輸株式会社",
+                      "ko" => "한국민준",
+                      "lb" => "Mante-Emard",
+                      "lt" => "Pfeffer,Nien",
+                      "lv" => "IrbeAS",
+                      "mt" => "Ebert,Zulauf",
+                      "nl" => "TegelaarV.O.",
+                      "no" => "Bartell-Corw",
+                      "pl" => "Matusiak-Fli",
+                      "pt" => "Moreira-Araú",
+                      "ro" => "KautzerandSo",
+                      "ru" => "ИПЭдуард",
+                      "sk" => "Labudovás.r.",
+                      "sl" => "Sanford-Lean",
+                      "sr" => "Jakubowski,U",
+                      "sv" => "AnderssonGro",
+                      "tr" => "Özkanlı,Zeng",
+                      "uk" => "ФОПЯцьків",
+                      "vi" => "CửahàngTriệu",
+                      "es-MX" => "RivasyLozano",
+                      "es-PY" => "CeballosS.A.",
+                      "fi-pl" => "Leannon-Stro",
+                      "fr-CA" => "AubértetRémy",
+                      "pt-BR" => "Marcondes,Fe",
+                      "zh-CN" => "杜-雷"
+                    }
+  end
+
+  describe "#down" do
+    it "raises IrreversibleMigration exception" do
+      expect { migrator.migrate(:down) }.to raise_error(ActiveRecord::IrreversibleMigration)
+    end
+  end
+end
diff --git a/decidim-core/spec/db/data/rename_members_in_action_log_spec.rb b/decidim-core/spec/db/data/rename_members_in_action_log_spec.rb
new file mode 100644
index 0000000000000..2459e5772ab5d
--- /dev/null
+++ b/decidim-core/spec/db/data/rename_members_in_action_log_spec.rb
@@ -0,0 +1,128 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+require "./db/data/20251213075429_rename_members_in_action_log"
+
+describe RenameMembersInActionLog do
+  let(:migrator) do
+    described_class.new.tap do |m|
+      m.verbose = false
+    end
+  end
+
+  describe "#up" do
+    let(:old_resource_type) { "Decidim::ParticipatorySpacePrivateUser" }
+    let(:new_resource_type) { "Decidim::ParticipatorySpace::Member" }
+    let(:organization) { create(:organization) }
+
+    context "when there are records with the old resource type" do
+      let!(:action_logs_with_old_type) do
+        user = create(:user, organization:)
+        # rubocop:disable Rails/SkipsModelValidations
+        Decidim::ActionLog.insert_all([
+                                        {
+                                          decidim_organization_id: organization.id,
+                                          user_id: user.id,
+                                          user_type: user.class.name,
+                                          resource_type: old_resource_type,
+                                          resource_id: 1,
+                                          action: "create",
+                                          visibility: "admin-only",
+                                          extra: {},
+                                          created_at: Time.current,
+                                          updated_at: Time.current
+                                        },
+                                        {
+                                          decidim_organization_id: organization.id,
+                                          user_id: user.id,
+                                          user_type: user.class.name,
+                                          resource_type: old_resource_type,
+                                          resource_id: 2,
+                                          action: "create",
+                                          visibility: "admin-only",
+                                          extra: {},
+                                          created_at: Time.current,
+                                          updated_at: Time.current
+                                        },
+                                        {
+                                          decidim_organization_id: organization.id,
+                                          user_id: user.id,
+                                          user_type: user.class.name,
+                                          resource_type: old_resource_type,
+                                          resource_id: 3,
+                                          action: "create",
+                                          visibility: "admin-only",
+                                          extra: {},
+                                          created_at: Time.current,
+                                          updated_at: Time.current
+                                        }
+                                      ])
+      end
+      # rubocop:enable Rails/SkipsModelValidations
+      let!(:action_logs_with_other_types) do
+        create_list(:action_log, 2, resource: create(:dummy_resource, organization:))
+      end
+
+      it "updates all records with the old resource type to the new one" do
+        expect { migrator.migrate(:up) }.to change {
+          Decidim::ActionLog.where(resource_type: old_resource_type).count
+        }.from(3).to(0)
+
+        expect(Decidim::ActionLog.where(resource_type: new_resource_type).count).to eq(3)
+      end
+
+      it "does not affect records with other resource types" do
+        expect { migrator.migrate(:up) }.not_to(change do
+          Decidim::ActionLog.where(resource_type: "Decidim::SomeOtherModel").count
+        end)
+      end
+
+      it "logs the number of updated records" do
+        allow(Rails.logger).to receive(:info)
+
+        migrator.migrate(:up)
+
+        expect(Rails.logger).to have_received(:info).with("Updated 3 ActionLog records from Decidim::ParticipatorySpacePrivateUser to Decidim::ParticipatorySpace::Member")
+      end
+    end
+
+    context "when there are no records with the old resource type" do
+      let!(:action_logs_with_other_types) do
+        create_list(:action_log, 2, resource: create(:dummy_resource, organization:))
+      end
+
+      it "does not raise an error" do
+        expect { migrator.migrate(:up) }.not_to raise_error
+      end
+
+      it "logs that zero records were updated" do
+        allow(Rails.logger).to receive(:info)
+
+        migrator.migrate(:up)
+
+        expect(Rails.logger).to have_received(:info).with("Updated 0 ActionLog records from Decidim::ParticipatorySpacePrivateUser to Decidim::ParticipatorySpace::Member")
+      end
+    end
+
+    context "when the table is empty" do
+      it "does not raise an error" do
+        expect { migrator.migrate(:up) }.not_to raise_error
+      end
+
+      it "logs that zero records were updated" do
+        allow(Rails.logger).to receive(:info)
+
+        migrator.migrate(:up)
+
+        expect(Rails.logger).to have_received(:info).with("Updated 0 ActionLog records from Decidim::ParticipatorySpacePrivateUser to Decidim::ParticipatorySpace::Member")
+      end
+    end
+  end
+
+  describe "#down" do
+    it "raises ActiveRecord::IrreversibleMigration" do
+      expect { migrator.migrate(:down) }.to raise_error(ActiveRecord::IrreversibleMigration)
+    end
+  end
+end
diff --git a/decidim-core/spec/helpers/decidim/breadcrumb_helper_spec.rb b/decidim-core/spec/helpers/decidim/breadcrumb_helper_spec.rb
index 8b5636a47e377..59e85f2bae5f2 100644
--- a/decidim-core/spec/helpers/decidim/breadcrumb_helper_spec.rb
+++ b/decidim-core/spec/helpers/decidim/breadcrumb_helper_spec.rb
@@ -13,14 +13,7 @@ module Decidim
             label: "Processes",
             url: "/processes",
             active: true
-          },
-          {
-            label: { ca: "Hola mon", es: "Hola mundo", en: "Hello world" },
-            url: "/processes/hello-world",
-            dropdown_cell: "decidim/participatory_processes/process_dropdown_metadata",
-            resource: participatory_process
           }
-
         ]
       end
 
diff --git a/decidim-core/spec/helpers/decidim/menu_helper_spec.rb b/decidim-core/spec/helpers/decidim/menu_helper_spec.rb
index e0c510763ea23..06885ca66d827 100644
--- a/decidim-core/spec/helpers/decidim/menu_helper_spec.rb
+++ b/decidim-core/spec/helpers/decidim/menu_helper_spec.rb
@@ -5,7 +5,7 @@
 module Decidim
   describe MenuHelper do
     let(:organization) { create(:organization) }
-    let(:user) { create(:user, organization: organization) }
+    let(:user) { create(:user, organization:) }
     let!(:process) { create(:participatory_process, :active, weight: 1, organization:) }
     let!(:process_two) { create(:participatory_process, :active, weight: 2, organization:) }
     let!(:process_three) { create(:participatory_process, :active, :promoted, weight: 3, organization:) }
@@ -70,15 +70,15 @@ module Decidim
             process_two.update!(promoted: true, private_space: true)
           end
 
-          context "and current_user is private user of that process" do
-            let!(:participatory_space_private_user) { create(:participatory_space_private_user, privatable_to: process_two, user:) }
+          context "and current_user is member of that process" do
+            let!(:member) { create(:member, participatory_space: process_two, user:) }
 
             it "returns the private process" do
               expect(helper.menu_highlighted_participatory_process).to eq(process_two)
             end
           end
 
-          context "and current_user is not private user of that process" do
+          context "and current_user is not member of that process" do
             it "returns the other published promoted process" do
               expect(helper.menu_highlighted_participatory_process).to eq(process_three)
             end
diff --git a/decidim-core/spec/lib/api/functions/participatory_space_list_base_spec.rb b/decidim-core/spec/lib/api/functions/participatory_space_list_base_spec.rb
index c813bcdc1a1ea..57358fa6171c4 100644
--- a/decidim-core/spec/lib/api/functions/participatory_space_list_base_spec.rb
+++ b/decidim-core/spec/lib/api/functions/participatory_space_list_base_spec.rb
@@ -30,7 +30,7 @@ module Decidim::Core
 
     context "with a private space participant" do
       let(:user) { create(:user, :confirmed, organization:) }
-      let!(:private_user) { create(:participatory_space_private_user, privatable_to: private_process, user:) }
+      let!(:member) { create(:member, participatory_space: private_process, user:) }
 
       it "returns all spaces including the private space" do
         expect(subject).to include(process1, process2, process3, private_process)
diff --git a/decidim-core/spec/lib/download_your_data_serializers/download_your_data_participatory_space_private_user_serializer_spec.rb b/decidim-core/spec/lib/download_your_data_serializers/download_your_data_member_serializer_spec.rb
similarity index 57%
rename from decidim-core/spec/lib/download_your_data_serializers/download_your_data_participatory_space_private_user_serializer_spec.rb
rename to decidim-core/spec/lib/download_your_data_serializers/download_your_data_member_serializer_spec.rb
index 8ec4077b380c8..011bdc42c82a1 100644
--- a/decidim-core/spec/lib/download_your_data_serializers/download_your_data_participatory_space_private_user_serializer_spec.rb
+++ b/decidim-core/spec/lib/download_your_data_serializers/download_your_data_member_serializer_spec.rb
@@ -3,9 +3,9 @@
 require "spec_helper"
 
 module Decidim
-  describe DownloadYourDataSerializers::DownloadYourDataParticipatorySpacePrivateUserSerializer do
+  describe DownloadYourDataSerializers::DownloadYourDataMemberSerializer do
     subject { described_class.new(resource) }
-    let(:resource) { build(:participatory_space_private_user) }
+    let(:resource) { build(:member) }
 
     let(:serialized) { subject.serialize }
 
@@ -14,18 +14,18 @@ module Decidim
         expect(serialized).to include(id: resource.id)
       end
 
-      it "includes the privatable to" do
-        expect(serialized[:privatable_to]).to(
-          include(id: resource.privatable_to_id)
+      it "includes the participatory space" do
+        expect(serialized[:participatory_space]).to(
+          include(id: resource.participatory_space_id)
         )
-        expect(serialized[:privatable_to]).to(
-          include(type: resource.privatable_to_type)
+        expect(serialized[:participatory_space]).to(
+          include(type: resource.participatory_space_type)
         )
-        expect(serialized[:privatable_to]).to(
-          include(title: resource.privatable_to.title)
+        expect(serialized[:participatory_space]).to(
+          include(title: resource.participatory_space.title)
         )
-        expect(serialized[:privatable_to]).to(
-          include(slug: resource.privatable_to.slug)
+        expect(serialized[:participatory_space]).to(
+          include(slug: resource.participatory_space.slug)
         )
       end
 
diff --git a/decidim-core/spec/lib/form_builder_spec.rb b/decidim-core/spec/lib/form_builder_spec.rb
index 75e913592eece..6284b463208fa 100644
--- a/decidim-core/spec/lib/form_builder_spec.rb
+++ b/decidim-core/spec/lib/form_builder_spec.rb
@@ -808,6 +808,46 @@ def organization
           end
         end
       end
+
+      context "with errors on the field" do
+        let(:attributes) { {} }
+        let(:output) { builder.upload :image, attributes }
+
+        before do
+          allow(resource).to receive(:errors).and_return(image: ["cannot be blank"])
+        end
+
+        it "renders error and help text after the upload cell" do
+          expect(parsed.css(".form-error")).not_to be_empty
+        end
+
+        it "renders the error message" do
+          expect(parsed.css(".form-error").text).to include("cannot be blank")
+        end
+      end
+
+      context "with help_text option" do
+        let(:attributes) { { help_text: "Upload a valid image file" } }
+        let(:output) { builder.upload :image, attributes }
+
+        it "renders help text after the upload cell" do
+          expect(parsed.css(".help-text")).not_to be_empty
+          expect(parsed.css(".help-text").text).to include("Upload a valid image file")
+        end
+      end
+
+      context "when the field is required" do
+        let(:attributes) { { required: true } }
+        let(:output) { builder.upload :image, attributes }
+
+        it "renders the HTML5 validation error element outside the modal" do
+          expect(parsed.css("span.form-error")).not_to be_empty
+        end
+
+        it "renders the error element with data-form-error-for linking to the validation field" do
+          expect(parsed.css("span.form-error[data-form-error-for='image_validation']")).not_to be_empty
+        end
+      end
     end
 
     describe "#data_picker" do
diff --git a/decidim-core/spec/controllers/concerns/form_factory_spec.rb b/decidim-core/spec/lib/form_factory_spec.rb
similarity index 100%
rename from decidim-core/spec/controllers/concerns/form_factory_spec.rb
rename to decidim-core/spec/lib/form_factory_spec.rb
diff --git a/decidim-core/spec/lib/oauth/token_generator_spec.rb b/decidim-core/spec/lib/oauth/token_generator_spec.rb
index 63c14acaba422..35032bdd2e985 100644
--- a/decidim-core/spec/lib/oauth/token_generator_spec.rb
+++ b/decidim-core/spec/lib/oauth/token_generator_spec.rb
@@ -13,7 +13,7 @@ module Decidim
       let(:scopes) { "profile" }
       let(:options) do
         {
-          application: application,
+          application:,
           resource_owner_id: user.id,
           scopes: ::Doorkeeper::OAuth::Scopes.from_string(scopes)
         }
diff --git a/decidim-core/spec/mailers/notification_digest_mailer_spec.rb b/decidim-core/spec/mailers/notification_digest_mailer_spec.rb
index 3d49276636b4b..80d2f86c1c45b 100644
--- a/decidim-core/spec/mailers/notification_digest_mailer_spec.rb
+++ b/decidim-core/spec/mailers/notification_digest_mailer_spec.rb
@@ -81,7 +81,7 @@ module Decidim
       context "when the space is private and user has access" do
         let!(:participatory_space) { create(:participatory_process, :private, organization:) }
         let(:component) { create(:component, :published, manifest_name: "dummy", participatory_space:) }
-        let!(:participatory_space_private_user) { create(:participatory_space_private_user, privatable_to: participatory_space, user: user) }
+        let!(:member) { create(:member, participatory_space:, user:) }
 
         it "displays the notification" do
           expect(subject.body).to include(test_content)
@@ -92,7 +92,7 @@ module Decidim
       context "when the space is transparent and user has access" do
         let!(:participatory_space) { create(:assembly, :transparent, :private, organization:) }
         let(:component) { create(:component, :published, manifest_name: "dummy", participatory_space:) }
-        let!(:participatory_space_private_user) { create(:participatory_space_private_user, privatable_to: participatory_space, user: user) }
+        let!(:member) { create(:member, participatory_space:, user:) }
 
         it "displays the notification" do
           expect(subject.body).to include(test_content)
diff --git a/decidim-core/spec/models/decidim/attachment_spec.rb b/decidim-core/spec/models/decidim/attachment_spec.rb
index 5686bb0498dd0..403cb428efd89 100644
--- a/decidim-core/spec/models/decidim/attachment_spec.rb
+++ b/decidim-core/spec/models/decidim/attachment_spec.rb
@@ -47,7 +47,7 @@ module Decidim
 
         it "shows the correct error" do
           expect(subject.valid?).to be(false)
-          expect(subject.errors[:file]).to contain_exactly("File cannot be processed")
+          expect(subject.errors[:file]).to contain_exactly("File resolution is too large")
         end
       end
     end
diff --git a/decidim-core/spec/models/decidim/organization_spec.rb b/decidim-core/spec/models/decidim/organization_spec.rb
index 965c9bbfa7e0c..23cc58360278e 100644
--- a/decidim-core/spec/models/decidim/organization_spec.rb
+++ b/decidim-core/spec/models/decidim/organization_spec.rb
@@ -180,14 +180,6 @@ module Decidim
           expect(subject.favicon_ico.blob).to be_a(ActiveStorage::Blob)
         end
       end
-
-      context "when the favicon is image/vnd.microsoft.icon" do
-        let(:favicon_path) { Decidim::Dev.asset("icon.ico") }
-
-        it "returns the favicon itself" do
-          expect(subject.favicon_ico).to be(subject.favicon)
-        end
-      end
     end
 
     describe "favicon variants" do
@@ -198,9 +190,8 @@ module Decidim
         end
 
         let(:image) do
-          MiniMagick::Image.open(
-            ActiveStorage::Blob.service.path_for(variant.key),
-            File.extname(variant.filename.to_s)
+          Vips::Image.new_from_file(
+            ActiveStorage::Blob.service.path_for(variant.key)
           )
         end
       end
@@ -216,37 +207,9 @@ module Decidim
         context "with favicon variant" do
           include_context "with processed variant", :favicon
 
-          let(:identified) { image.identify.split("\n") }
-
-          it "creates the correct ICO variant" do
-            expect(variant.content_type).to eq("image/vnd.microsoft.icon")
-            expect(variant.filename.to_s).to eq("#{File.basename(favicon_path, ".*")}.ico")
-          end
-
-          it "converts all ICO sizes" do
-            # Example output:
-            #   /tmp/mini_magick20220101-123456-abcdef.ico[0] ICO 16x16 16x16+0+0 8-bit sRGB 0.020u 0:00.000
-            #   /tmp/mini_magick20220101-123456-abcdef.ico[1] ICO 24x24 24x24+0+0 8-bit sRGB 0.010u 0:00.000
-            #   /tmp/mini_magick20220101-123456-abcdef.ico[2] ICO 32x32 32x32+0+0 8-bit sRGB 0.000u 0:00.000
-            #   /tmp/mini_magick20220101-123456-abcdef.ico[3] ICO 48x48 48x48+0+0 8-bit sRGB 0.000u 0:00.000
-            #   /tmp/mini_magick20220101-123456-abcdef.ico[4] ICO 64x64 64x64+0+0 8-bit sRGB 0.000u 0:00.000
-            #   /tmp/mini_magick20220101-123456-abcdef.ico[5] ICO 72x72 72x72+0+0 8-bit sRGB 0.000u 0:00.000
-            #   /tmp/mini_magick20220101-123456-abcdef.ico[6] ICO 96x96 96x96+0+0 8-bit sRGB 0.000u 0:00.000
-            #   /tmp/mini_magick20220101-123456-abcdef.ico[7] ICO 128x128 128x128+0+0 8-bit sRGB 0.000u 0:00.000
-            #   /tmp/mini_magick20220101-123456-abcdef.ico[8] PNG 256x256 256x256+0+0 8-bit sRGB 179438B 0.000u 0:00.000
-            [
-              /\.ico\[0\] ICO 16x16 16x16\+0\+0 8-bit sRGB 0.[0-9]{3}u 0:[0-9]{2}\.[0-9]{3}$/,
-              /\.ico\[1\] ICO 24x24 24x24\+0\+0 8-bit sRGB 0.[0-9]{3}u 0:[0-9]{2}\.[0-9]{3}$/,
-              /\.ico\[2\] ICO 32x32 32x32\+0\+0 8-bit sRGB 0.[0-9]{3}u 0:[0-9]{2}\.[0-9]{3}$/,
-              /\.ico\[3\] ICO 48x48 48x48\+0\+0 8-bit sRGB 0.[0-9]{3}u 0:[0-9]{2}\.[0-9]{3}$/,
-              /\.ico\[4\] ICO 64x64 64x64\+0\+0 8-bit sRGB 0.[0-9]{3}u 0:[0-9]{2}\.[0-9]{3}$/,
-              /\.ico\[5\] ICO 72x72 72x72\+0\+0 8-bit sRGB 0.[0-9]{3}u 0:[0-9]{2}\.[0-9]{3}$/,
-              /\.ico\[6\] ICO 96x96 96x96\+0\+0 8-bit sRGB 0.[0-9]{3}u 0:[0-9]{2}\.[0-9]{3}$/,
-              /\.ico\[7\] ICO 128x128 128x128\+0\+0 8-bit sRGB 0.[0-9]{3}u 0:[0-9]{2}\.[0-9]{3}$/,
-              /\.ico\[8\] PNG 256x256 256x256\+0\+0 8-bit sRGB 179438B 0.[0-9]{3}u 0:[0-9]{2}\.[0-9]{3}$/
-            ].each_with_index do |regexp, idx|
-              expect(identified[idx]).to match(regexp)
-            end
+          it "creates the correct png variant" do
+            expect(variant.content_type).to eq("image/png")
+            expect(variant.filename.to_s).to eq("#{File.basename(favicon_path, ".*")}.png")
           end
         end
 
@@ -259,21 +222,22 @@ module Decidim
           end
 
           it "converts it the image correct dimensions" do
-            expect(image.dimensions).to eq([32, 32])
+            expect(image.width).to eq(32)
+            expect(image.height).to eq(32)
           end
         end
-      end
 
-      context "with an ICO file" do
-        let(:favicon_path) { Decidim::Dev.asset("icon.ico") }
+        context "with a HEIC format" do
+          let(:favicon_path) { Decidim::Dev.asset("icon.HEIC") }
 
-        it_behaves_like "creates correct favicon variants"
-      end
+          it_behaves_like "creates correct favicon variants"
+        end
 
-      context "with a PNG file" do
-        let(:favicon_path) { Decidim::Dev.asset("icon.png") }
+        context "with a JPEG format" do
+          let(:favicon_path) { Decidim::Dev.asset("avatar.jpeg") }
 
-        it_behaves_like "creates correct favicon variants"
+          it_behaves_like "creates correct favicon variants"
+        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/member_spec.rb
similarity index 66%
rename from decidim-core/spec/models/decidim/participatory_space_private_user_spec.rb
rename to decidim-core/spec/models/decidim/participatory_space/member_spec.rb
index e570af135e9df..aac19b3afddda 100644
--- a/decidim-core/spec/models/decidim/participatory_space_private_user_spec.rb
+++ b/decidim-core/spec/models/decidim/participatory_space/member_spec.rb
@@ -2,11 +2,11 @@
 
 require "spec_helper"
 
-module Decidim
-  describe ParticipatorySpacePrivateUser do
-    subject { participatory_space_private_user }
+module Decidim::ParticipatorySpace
+  describe Member do
+    subject { member }
 
-    let(:participatory_space_private_user) { build(:participatory_space_private_user) }
+    let(:member) { build(:member) }
 
     it { is_expected.to be_valid }
 
@@ -23,11 +23,11 @@ module Decidim
 
       let(:user) { create(:user, organization: user_organization) }
 
-      let(:participatory_space_private_user) do
+      let(:member) do
         build(
-          :participatory_space_private_user,
+          :member,
           user:,
-          privatable_to: participatory_process
+          participatory_space: participatory_process
         )
       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 837af9b96a132..e3860f91acf18 100644
--- a/decidim-core/spec/models/decidim/user_base_entity_spec.rb
+++ b/decidim-core/spec/models/decidim/user_base_entity_spec.rb
@@ -9,20 +9,77 @@ module Decidim
     let(:organization) { create(:organization) }
     let(:user) { build(:user, organization:) }
 
-    let(:user_followed) { create(:user, organization: user.organization) }
-    let(:public_resource) { create(:dummy_resource, :published) }
-    let(:user_blocked) { create(:user, organization: user.organization, blocked: true) }
-
-    before do
-      create(:follow, user:, followable: user_followed)
-      create(:follow, user:, followable: public_resource)
-      create(:follow, user:, followable: user_blocked)
-    end
-
     describe "public followings" do
+      let(:user_followed) { create(:user, organization: user.organization) }
+      let(:public_resource) { create(:dummy_resource, :published) }
+      let(:user_blocked) { create(:user, organization: user.organization, blocked: true) }
+
+      before do
+        user.save!
+        create(:follow, user:, followable: user_followed)
+        create(:follow, user:, followable: public_resource)
+        create(:follow, user:, followable: user_blocked)
+      end
+
       it "return all the things followed unless the blocked users" do
         expect(subject.public_followings).to contain_exactly(public_resource, user_followed)
       end
     end
+
+    describe "#validates :name" do
+      context "when name is John Doe" do
+        let(:user) { build(:user, organization:, name: "John Doe") }
+
+        it "is valid" do
+          expect(user).to be_valid
+        end
+      end
+
+      context "when name contains newlines" do
+        let(:user) { build(:user, organization:, name: "John\n<script>alert('name')</script>") }
+
+        it "is invalid" do
+          expect(user).not_to be_valid
+          expect(user.errors[:name]).to be_present
+        end
+      end
+
+      context "when name contains carriage return" do
+        let(:user) { build(:user, organization:, name: "John\r<script>alert('name')</script>") }
+
+        it "is invalid" do
+          expect(user).not_to be_valid
+          expect(user.errors[:name]).to be_present
+        end
+      end
+    end
+
+    describe "#validates :nickname" do
+      context "when nickname is john_doe" do
+        let(:user) { build(:user, organization:, nickname: "john_doe") }
+
+        it "is valid" do
+          expect(user).to be_valid
+        end
+      end
+
+      context "when nickname contains newlines" do
+        let(:user) { build(:user, organization:, nickname: "john\n<script>alert('nickname')</script>") }
+
+        it "is invalid" do
+          expect(user).not_to be_valid
+          expect(user.errors[:nickname]).to be_present
+        end
+      end
+
+      context "when nickname contains carriage return" do
+        let(:user) { build(:user, organization:, nickname: "john\r<script>alert('nickname')</script>") }
+
+        it "is invalid" do
+          expect(user).not_to be_valid
+          expect(user.errors[:nickname]).to be_present
+        end
+      end
+    end
   end
 end
diff --git a/decidim-core/spec/presenters/decidim/organization_presenter_spec.rb b/decidim-core/spec/presenters/decidim/organization_presenter_spec.rb
index e49025934bb7d..cd51f08913762 100644
--- a/decidim-core/spec/presenters/decidim/organization_presenter_spec.rb
+++ b/decidim-core/spec/presenters/decidim/organization_presenter_spec.rb
@@ -5,7 +5,7 @@
 module Decidim
   describe OrganizationPresenter, type: :helper do
     let(:description) { { "en" => "<p>A necessitatibus quo. 1</p>" } }
-    let(:organization) { create(:organization, name: { en: "Organization's name" }, description:) }
+    let(:organization) { create(:organization, name: { en: "Organization's name" }, short_name: { en: "OrgName" }, description:) }
 
     subject { described_class.new(organization) }
 
@@ -16,6 +16,12 @@ module Decidim
         end
       end
 
+      describe "#html_short_name" do
+        it "returns the short_name translated and without any html tag" do
+          expect(subject.html_short_name).to eq("OrgName")
+        end
+      end
+
       describe "#translated_description" do
         it "returns the description translated and without any html tag" do
           expect(subject.translated_description).to eq("A necessitatibus quo. 1")
diff --git a/decidim-core/spec/presenters/decidim/stats_presenter_spec.rb b/decidim-core/spec/presenters/decidim/stats_presenter_spec.rb
index 00e560398595a..23a364fbde8bc 100644
--- a/decidim-core/spec/presenters/decidim/stats_presenter_spec.rb
+++ b/decidim-core/spec/presenters/decidim/stats_presenter_spec.rb
@@ -8,14 +8,14 @@
 
   describe "#collection" do
     let(:priority) { Decidim::StatsRegistry::MEDIUM_PRIORITY }
-    let(:conditions) { { priority: priority } }
+    let(:conditions) { { priority: } }
 
     before do
-      allow(presenter).to receive(:all_stats).with(priority: priority).and_return([
-                                                                                    { name: "stat_1", data: [1, 23] },
-                                                                                    { name: "stat_2", data: [0] },
-                                                                                    { name: "stat_3", data: [45] }
-                                                                                  ])
+      allow(presenter).to receive(:all_stats).with(priority:).and_return([
+                                                                           { name: "stat_1", data: [1, 23] },
+                                                                           { name: "stat_2", data: [0] },
+                                                                           { name: "stat_3", data: [45] }
+                                                                         ])
     end
 
     it "returns stats with non-empty data" do
@@ -31,10 +31,10 @@
     end
 
     it "sums the data of stats with the same name" do
-      allow(presenter).to receive(:all_stats).with(priority: priority).and_return([
-                                                                                    { name: "stat_1", data: [12, 3] },
-                                                                                    { name: "stat_1", data: [4] }
-                                                                                  ])
+      allow(presenter).to receive(:all_stats).with(priority:).and_return([
+                                                                           { name: "stat_1", data: [12, 3] },
+                                                                           { name: "stat_1", data: [4] }
+                                                                         ])
 
       result = presenter.collection(priority:)
 
diff --git a/decidim-core/spec/presenters/decidim/user_presenter_spec.rb b/decidim-core/spec/presenters/decidim/user_presenter_spec.rb
index 903dfbcf34527..84c9e36512636 100644
--- a/decidim-core/spec/presenters/decidim/user_presenter_spec.rb
+++ b/decidim-core/spec/presenters/decidim/user_presenter_spec.rb
@@ -7,6 +7,20 @@ module Decidim
     let(:presenter) { described_class.new(user) }
     let(:user) { build(:user) }
 
+    describe "name" do
+      subject { presenter.name }
+
+      context "when is valid" do
+        it { is_expected.to eq(user.name) }
+      end
+
+      context "when is not valid" do
+        let(:user) { build(:user, name: "John\r<script>alert('name')</script>") }
+
+        it { is_expected.to eq("John\ralert('name')") }
+      end
+    end
+
     describe "#nickname" do
       subject { presenter.nickname }
 
diff --git a/decidim-core/spec/queries/decidim/inactive_users_query_spec.rb b/decidim-core/spec/queries/decidim/inactive_users_query_spec.rb
index a0e437559452a..f1665a8a87870 100644
--- a/decidim-core/spec/queries/decidim/inactive_users_query_spec.rb
+++ b/decidim-core/spec/queries/decidim/inactive_users_query_spec.rb
@@ -15,21 +15,21 @@
   let!(:inactive_recent_sign_in) { create(:user, organization:, current_sign_in_at: 400.days.ago, created_at: 400.days.ago, extended_data: {}) }
   let!(:active_recent_sign_in) { create(:user, organization:, current_sign_in_at: 200.days.ago, created_at: 200.days.ago, extended_data: {}) }
   let!(:user_reminder_due) do
-    create(:user, organization: organization,
+    create(:user, organization:,
                   current_sign_in_at: 294.days.ago,
                   created_at: 400.days.ago,
                   extended_data: { "inactivity_notification" => { "notification_type" => "first", "sent_at" => 23.days.ago } })
   end
 
   let!(:user_ready_for_removal) do
-    create(:user, organization: organization,
+    create(:user, organization:,
                   current_sign_in_at: 400.days.ago,
                   created_at: 400.days.ago,
                   extended_data: { "inactivity_notification" => { "notification_type" => "second", "sent_at" => 40.days.ago } })
   end
 
   let!(:user_logged_in_after_notification) do
-    create(:user, organization: organization,
+    create(:user, organization:,
                   current_sign_in_at: 1.day.ago,
                   created_at: 400.days.ago,
                   extended_data: { "inactivity_notification" => { "notification_type" => "second", "sent_at" => 7.days.ago } })
diff --git a/decidim-core/spec/queries/decidim/public_activities_spec.rb b/decidim-core/spec/queries/decidim/public_activities_spec.rb
index 16f690fe87181..83135326bb365 100644
--- a/decidim-core/spec/queries/decidim/public_activities_spec.rb
+++ b/decidim-core/spec/queries/decidim/public_activities_spec.rb
@@ -15,15 +15,15 @@
   let(:private_assembly) { create(:assembly, :private, organization:) }
 
   before do
-    # Note that it is possible to add private users also to public processes
+    # Note that it is possible to add members also to public processes
     # and assemblies, there is no programming logic forbidding that to happen.
     [process, assembly, private_process, private_assembly].each do |space|
-      10.times { create(:participatory_space_private_user, user: build(:user, :confirmed, organization:), privatable_to: space) }
+      10.times { create(:member, user: build(:user, :confirmed, organization:), participatory_space: space) }
     end
 
     # Add the user to both private spaces
-    create(:participatory_space_private_user, user:, privatable_to: private_process)
-    create(:participatory_space_private_user, user:, privatable_to: private_assembly)
+    create(:member, user:, participatory_space: private_process)
+    create(:member, user:, participatory_space: private_assembly)
   end
 
   describe "#query" do
@@ -41,9 +41,9 @@
       expect(subject.count).to eq(1)
     end
 
-    context "when the current user has access to the private space" do
+    context "when the current user is a member of the private space" do
       before do
-        create(:participatory_space_private_user, user: current_user, privatable_to: private_process)
+        create(:member, user: current_user, participatory_space: private_process)
       end
 
       it "returns also the private comment without duplicates" do
diff --git a/decidim-core/spec/serializers/decidim/schema_org_breadcrumb_list_serializer_spec.rb b/decidim-core/spec/serializers/decidim/schema_org_breadcrumb_list_serializer_spec.rb
index 43d998ea5979a..d35dd908735eb 100644
--- a/decidim-core/spec/serializers/decidim/schema_org_breadcrumb_list_serializer_spec.rb
+++ b/decidim-core/spec/serializers/decidim/schema_org_breadcrumb_list_serializer_spec.rb
@@ -14,12 +14,6 @@ module Decidim
           label: "Processes",
           url: "/processes",
           active: true
-        },
-        {
-          label: { ca: "Hola mon", es: "Hola mundo", en: "Hello world" },
-          url: "/processes/hello-world",
-          dropdown_cell: "decidim/participatory_processes/process_dropdown_metadata",
-          resource: participatory_process
         }
       ]
     end
@@ -45,8 +39,7 @@ module Decidim
 
       it "serializes the breadcrumb items" do
         expected_items_elements = [
-          { "@type": "ListItem", position: 1, name: "Processes", item: "https://example.org/processes" },
-          { "@type": "ListItem", position: 2, name: "Hello world", item: "https://example.org/processes/hello-world" }
+          { "@type": "ListItem", position: 1, name: "Processes", item: "https://example.org/processes" }
         ]
         expect(serialized[:itemListElement]).to eq(expected_items_elements)
       end
@@ -59,20 +52,13 @@ module Decidim
               url: "/processes",
               active: true
             },
-            {
-              label: { ca: "Hola mon", es: "Hola mundo", en: "Hello world" },
-              url: "/processes/hello-world",
-              dropdown_cell: "decidim/participatory_processes/process_dropdown_metadata",
-              resource: participatory_process
-            },
             {}
           ]
         end
 
         it "ignores them" do
           expected_items_elements = [
-            { "@type": "ListItem", position: 1, name: "Processes", item: "https://example.org/processes" },
-            { "@type": "ListItem", position: 2, name: "Hello world", item: "https://example.org/processes/hello-world" }
+            { "@type": "ListItem", position: 1, name: "Processes", item: "https://example.org/processes" }
           ]
           expect(serialized[:itemListElement]).to eq(expected_items_elements)
         end
diff --git a/decidim-core/spec/services/decidim/download_your_data_exporter_spec.rb b/decidim-core/spec/services/decidim/download_your_data_exporter_spec.rb
index 74c4ff091faa8..26c437d9d6ce5 100644
--- a/decidim-core/spec/services/decidim/download_your_data_exporter_spec.rb
+++ b/decidim-core/spec/services/decidim/download_your_data_exporter_spec.rb
@@ -16,7 +16,7 @@ module Decidim
         decidim-identities-
         decidim-messaging-conversations-
         decidim-notifications-
-        decidim-participatoryspaceprivateusers-
+        decidim-participatoryspace-members-
         decidim-reports-
         decidim-users-
         decidim-meetings-registrations-
@@ -98,9 +98,9 @@ module Decidim
         it_behaves_like "a download your data entity"
       end
 
-      context "when the user has participatory_space_private_user" do
-        let!(:participatory_space_private_user) { create(:participatory_space_private_user, user:) }
-        let(:help_definition_string) { "The role that this private user has" }
+      context "when the user has member" do
+        let!(:member) { create(:member, user:) }
+        let(:help_definition_string) { "The role that this member has" }
 
         it_behaves_like "a download your data entity"
       end
diff --git a/decidim-core/spec/services/decidim/notifications_digest_sending_decider_spec.rb b/decidim-core/spec/services/decidim/notifications_digest_sending_decider_spec.rb
index 364b9da293118..2cd62941b600e 100644
--- a/decidim-core/spec/services/decidim/notifications_digest_sending_decider_spec.rb
+++ b/decidim-core/spec/services/decidim/notifications_digest_sending_decider_spec.rb
@@ -5,6 +5,8 @@
 describe Decidim::NotificationsDigestSendingDecider do
   subject { described_class }
 
+  before { travel_to(Time.now.utc.noon) }
+
   context "with a user who has never received a notifications digest mail" do
     let(:user) { build(:user, notifications_sending_frequency: :daily, digest_sent_at: nil) }
 
diff --git a/decidim-core/spec/system/authentication_spec.rb b/decidim-core/spec/system/authentication_spec.rb
index 000f4f0c73ee2..52655fddcda95 100644
--- a/decidim-core/spec/system/authentication_spec.rb
+++ b/decidim-core/spec/system/authentication_spec.rb
@@ -415,7 +415,7 @@
   end
 
   context "when confirming the account" do
-    let!(:user) { create(:user, organization:) }
+    let!(:user) { create(:user, :malicious, organization:) }
 
     before do
       perform_enqueued_jobs { user.confirm }
diff --git a/decidim-core/spec/system/editor_spec.rb b/decidim-core/spec/system/editor_spec.rb
index 82d0b3ba3b7c6..8316cb543eade 100644
--- a/decidim-core/spec/system/editor_spec.rb
+++ b/decidim-core/spec/system/editor_spec.rb
@@ -260,13 +260,14 @@ def protect_against_forgery?
       )
     end
 
-    it "link" do
+    it "link" do # rubocop:disable RSpec/ExampleLength
       click_toggle("link")
       within "[data-dialog][aria-hidden='false']" do
         fill_in "Link URL", with: "https://decidim.org"
         select "New tab", from: "Target"
         find("button[data-action='save']").click
       end
+      sleep 0.5
       expect_value(
         <<~HTML
           <p>Hello, world!</p>
@@ -277,11 +278,13 @@ def protect_against_forgery?
       within prosemirror_selector do
         find("a").double_click
       end
+      sleep 0.5
       within "[data-dialog][aria-hidden='false']" do
         fill_in "Link URL", with: "https://docs.decidim.org"
         select "Default (same tab)", from: "Target"
         find("button[data-action='save']").click
       end
+      sleep 0.2
       expect_value(
         <<~HTML
           <p>Hello, world!</p>
@@ -291,11 +294,13 @@ def protect_against_forgery?
 
       # Test that editing works also when re-clicking the link toolbar button
       click_toggle("link")
+      sleep 0.5
       within "[data-dialog][aria-hidden='false']" do
         fill_in "Link URL", with: "https://try.decidim.org"
         select "New tab", from: "Target"
         find("button[data-action='save']").click
       end
+      sleep 0.5
       expect_value(
         <<~HTML
           <p>Hello, world!</p>
@@ -596,6 +601,7 @@ def protect_against_forgery?
           fill_in "Link URL", with: "https://demo.decidim.org"
           find("[data-input='href'] input").native.send_keys [:enter]
         end
+        sleep 0.5
         expect_value(
           <<~HTML
             <p>Hello, world!</p>
@@ -1119,7 +1125,9 @@ def protect_against_forgery?
     context "when resizing an image" do
       let(:image) { create(:editor_image, organization:) }
       let(:image_src) { image.attached_uploader(:file).path }
-      let(:dimensions) { MiniMagick::Image.read(image.file.blob.download).dimensions }
+      let(:vips_image) { Vips::Image.new_from_buffer(image.file.blob.download, "") }
+      let(:width) { vips_image.width }
+      let(:height) { vips_image.height }
       let(:editor_content) do
         <<~HTML
           <div class="editor-content-image" data-image="">
@@ -1137,30 +1145,27 @@ def protect_against_forgery?
         context "with right side controls" do
           it "allows resizing the image" do
             drag("[data-image-resizer-control='top-right']", mode:, direction: "left", amount: 100)
-            expect_value(%(<div class="editor-content-image" data-image=""><img src="#{image_src}" alt="Test" width="#{dimensions[0] - 100}"></div>))
+            expect_value(%(<div class="editor-content-image" data-image=""><img src="#{image_src}" alt="Test" width="#{width - 100}"></div>))
 
             drag("[data-image-resizer-control='bottom-right']", mode:, direction: "right", amount: 50)
-            expect_value(%(<div class="editor-content-image" data-image=""><img src="#{image_src}" alt="Test" width="#{dimensions[0] - 50}"></div>))
+            expect_value(%(<div class="editor-content-image" data-image=""><img src="#{image_src}" alt="Test" width="#{width - 50}"></div>))
           end
 
           it "removes the width attribute when resizing back to original width or above it" do
             drag("[data-image-resizer-control='top-right']", mode:, direction: "left", amount: 100)
-            expect_value(%(<div class="editor-content-image" data-image=""><img src="#{image_src}" alt="Test" width="#{dimensions[0] - 100}"></div>))
+            expect_value(%(<div class="editor-content-image" data-image=""><img src="#{image_src}" alt="Test" width="#{width - 100}"></div>))
 
             drag("[data-image-resizer-control='bottom-right']", mode:, direction: "right", amount: 100)
             expect_value(%(<div class="editor-content-image" data-image=""><img src="#{image_src}" alt="Test"></div>))
 
             drag("[data-image-resizer-control='top-right']", mode:, direction: "left", amount: 100)
-            expect_value(%(<div class="editor-content-image" data-image=""><img src="#{image_src}" alt="Test" width="#{dimensions[0] - 100}"></div>))
+            expect_value(%(<div class="editor-content-image" data-image=""><img src="#{image_src}" alt="Test" width="#{width - 100}"></div>))
 
             drag("[data-image-resizer-control='bottom-right']", mode:, direction: "right", amount: 500)
             expect_value(%(<div class="editor-content-image" data-image=""><img src="#{image_src}" alt="Test"></div>))
           end
 
           it "shows and updates image sizes" do
-            width = dimensions[0]
-            height = dimensions[1]
-
             expect(page).to have_css("[data-image-resizer-dimension-value='#{width}']", visible: :all)
             expect(page).to have_css("[data-image-resizer-dimension-value='#{height}']", visible: :all)
 
@@ -1173,21 +1178,21 @@ def protect_against_forgery?
         context "with left side controls" do
           it "allows resizing the image" do
             drag("[data-image-resizer-control='bottom-left']", mode:, direction: "right", amount: 100)
-            expect_value(%(<div class="editor-content-image" data-image=""><img src="#{image_src}" alt="Test" width="#{dimensions[0] - 100}"></div>))
+            expect_value(%(<div class="editor-content-image" data-image=""><img src="#{image_src}" alt="Test" width="#{width - 100}"></div>))
 
             drag("[data-image-resizer-control='top-left']", mode:, direction: "left", amount: 50)
-            expect_value(%(<div class="editor-content-image" data-image=""><img src="#{image_src}" alt="Test" width="#{dimensions[0] - 50}"></div>))
+            expect_value(%(<div class="editor-content-image" data-image=""><img src="#{image_src}" alt="Test" width="#{width - 50}"></div>))
           end
 
           it "removes the width attribute when resizing back to original width or above it" do
             drag("[data-image-resizer-control='bottom-left']", mode:, direction: "right", amount: 100)
-            expect_value(%(<div class="editor-content-image" data-image=""><img src="#{image_src}" alt="Test" width="#{dimensions[0] - 100}"></div>))
+            expect_value(%(<div class="editor-content-image" data-image=""><img src="#{image_src}" alt="Test" width="#{width - 100}"></div>))
 
             drag("[data-image-resizer-control='top-left']", mode:, direction: "left", amount: 100)
             expect_value(%(<div class="editor-content-image" data-image=""><img src="#{image_src}" alt="Test"></div>))
 
             drag("[data-image-resizer-control='bottom-left']", mode:, direction: "right", amount: 100)
-            expect_value(%(<div class="editor-content-image" data-image=""><img src="#{image_src}" alt="Test" width="#{dimensions[0] - 100}"></div>))
+            expect_value(%(<div class="editor-content-image" data-image=""><img src="#{image_src}" alt="Test" width="#{width - 100}"></div>))
 
             drag("[data-image-resizer-control='top-left']", mode:, direction: "left", amount: 500)
             expect_value(%(<div class="editor-content-image" data-image=""><img src="#{image_src}" alt="Test"></div>))
@@ -1274,7 +1279,7 @@ def protect_against_forgery?
     it "allows selecting resource mentions with a slash" do
       allow(Decidim::SearchableResource).to receive(:where).with(
         resource_type: %w(Decidim::Proposals::Proposal),
-        organization: organization,
+        organization:,
         decidim_participatory_space: participatory_space,
         locale: I18n.locale
       ).and_return(double(
diff --git a/decidim-core/spec/system/link_target_spec.rb b/decidim-core/spec/system/link_target_spec.rb
index 7afcad6a162e6..1528cf098407f 100644
--- a/decidim-core/spec/system/link_target_spec.rb
+++ b/decidim-core/spec/system/link_target_spec.rb
@@ -4,8 +4,8 @@
 
 describe "Admin editor link target remains" do
   let(:organization) { create(:organization) }
-  let(:admin) { create(:user, :admin, :confirmed, organization: organization) }
-  let(:participatory_process) { create(:participatory_process, organization: organization) }
+  let(:admin) { create(:user, :admin, :confirmed, organization:) }
+  let(:participatory_process) { create(:participatory_process, organization:) }
   let(:component) { create(:component, manifest_name: "pages", participatory_space: participatory_process) }
 
   before do
diff --git a/decidim-core/spec/system/mobile_header_spec.rb b/decidim-core/spec/system/mobile_header_spec.rb
index 3afcc1aab236f..d852498d307ee 100644
--- a/decidim-core/spec/system/mobile_header_spec.rb
+++ b/decidim-core/spec/system/mobile_header_spec.rb
@@ -29,8 +29,8 @@
       click_on(id: "dc-dialog-accept")
     end
 
-    it "has a sticky header" do
-      expect(page).to have_css("#sticky-header-container")
+    it "has a header" do
+      expect(page).to have_css("#header-container")
     end
 
     context "when user view the header" do
@@ -51,7 +51,7 @@
       it "includes access to the language selector and search bar" do
         within ".menu-bar__main-dropdown__top" do
           expect(page).to have_css(".filter-search")
-          expect(page).to have_css("#dropdown-trigger-language-chooser-mobile")
+          expect(page).to have_css("#trigger-dropdown-menu-language-chooser-mobile")
         end
       end
     end
diff --git a/decidim-core/spec/system/notifications_spec.rb b/decidim-core/spec/system/notifications_spec.rb
index b7fba202a04c7..64e480c7b1ac2 100644
--- a/decidim-core/spec/system/notifications_spec.rb
+++ b/decidim-core/spec/system/notifications_spec.rb
@@ -111,6 +111,23 @@
         end
       end
     end
+
+    context "when the notification is from a component" do
+      let!(:notification) do
+        create(:notification, user:,
+                              resource: resource.component,
+                              event_name: "decidim.events.components.component_published",
+                              event_class: "Decidim::ComponentPublishedEvent")
+      end
+
+      before do
+        page.visit decidim.notifications_path
+      end
+
+      it "shows the notifications" do
+        expect(page).to have_css(".notification")
+      end
+    end
   end
 
   context "when the notification event has an action" do
diff --git a/decidim-core/spec/tasks/upgrade/decidim_remove_deleted_users_left_data_spec.rb b/decidim-core/spec/tasks/upgrade/decidim_remove_deleted_users_left_data_spec.rb
index 0bc4b466a40e8..77c83050339e6 100644
--- a/decidim-core/spec/tasks/upgrade/decidim_remove_deleted_users_left_data_spec.rb
+++ b/decidim-core/spec/tasks/upgrade/decidim_remove_deleted_users_left_data_spec.rb
@@ -15,9 +15,9 @@
     create(:reminder, user: deleted_user)
     create(:private_export, attached_to: deleted_user)
     create(:identity, user: deleted_user)
-    create(:follow, followable: deleted_user, user: user)
+    create(:follow, followable: deleted_user, user:)
     create(:follow, followable: user, user: deleted_user)
-    create(:participatory_space_private_user, user: deleted_user)
+    create(:member, user: deleted_user)
 
     create(:oauth_access_token, resource_owner_id: user.id)
     create(:identity, user:)
@@ -64,8 +64,8 @@
       expect { task.execute }.to change(Decidim::Identity, :count).by(-1)
     end
 
-    it "deletes the participatory space private user of deleted user" do
-      expect { task.execute }.to change(Decidim::ParticipatorySpacePrivateUser, :count).by(-1)
+    it "deletes the member of deleted user" do
+      expect { task.execute }.to change(Decidim::ParticipatorySpace::Member, :count).by(-1)
     end
 
     it "deletes the badges of deleted user" do
diff --git a/decidim-core/spec/tasks/upgrade/fix_deleted_private_follows_spec.rb b/decidim-core/spec/tasks/upgrade/fix_deleted_private_follows_spec.rb
index a0c4cd056668e..2e73d45ae4804 100644
--- a/decidim-core/spec/tasks/upgrade/fix_deleted_private_follows_spec.rb
+++ b/decidim-core/spec/tasks/upgrade/fix_deleted_private_follows_spec.rb
@@ -8,12 +8,12 @@
   let(:user) { create(:user, :admin, :confirmed, organization:) }
   let(:second_user) { create(:user, :confirmed, organization:) }
   let(:component) { create(:dummy_component, :published, participatory_space:) }
-  let!(:followable) { create(:dummy_resource, component: component, author: user) }
+  let!(:followable) { create(:dummy_resource, component:, author: user) }
   let!(:follow) { create(:follow, user:, followable: participatory_space) }
   let!(:unwanted_follow) { create(:follow, user: second_user, followable: participatory_space) }
   let!(:resource_follow) { create(:follow, followable:, user:) }
   let!(:resource_unwanted_follow) { create(:follow, followable:, user: second_user) }
-  let!(:participatory_space_private_user) { create(:participatory_space_private_user, user:, privatable_to: participatory_space) }
+  let!(:member) { create(:member, user:, participatory_space:) }
   let(:participatory_space) { create(:participatory_process, :published, organization: user.organization) }
 
   around do |example|
@@ -27,7 +27,7 @@
   context "when assembly is private and non transparent" do
     let(:participatory_space) { create(:assembly, :private, :published, :opaque, organization: user.organization) }
 
-    it "deletes follows of non private users" do
+    it "deletes follows of non members" do
       # we have 2 follows, one for assembly, and one for a "child" resource
       expect { task.execute }.to change(Decidim::Follow, :count).by(-2)
     end
@@ -36,7 +36,7 @@
   context "when assembly is private but transparent" do
     let(:participatory_space) { create(:assembly, :private, :published, organization: user.organization) }
 
-    it "preserves follows of non private users" do
+    it "preserves follows of non members" do
       # we have 2 follows, one for assembly, and one for a "child" resource
       expect { task.execute }.not_to change(Decidim::Follow, :count)
     end
@@ -45,7 +45,7 @@
   context "when assembly is public" do
     let(:participatory_space) { create(:assembly, :published, organization: user.organization) }
 
-    it "preserves follows of non private users" do
+    it "preserves follows of non members" do
       # we have 2 follows, one for assembly, and one for a "child" resource
       expect { task.execute }.not_to change(Decidim::Follow, :count)
     end
@@ -54,7 +54,7 @@
   context "when process is private" do
     let(:participatory_space) { create(:participatory_process, :private, :published, organization: user.organization) }
 
-    it "deletes follows of non private users" do
+    it "deletes follows of non members" do
       # we have 2 follows, one for process, and one for a "child" resource
       expect { task.execute }.to change(Decidim::Follow, :count).by(-2)
     end
@@ -63,7 +63,7 @@
   context "when process is public" do
     let(:participatory_space) { create(:participatory_process, :published, organization: user.organization) }
 
-    it "preserves follows of non private users" do
+    it "preserves follows of non members" do
       expect { task.execute }.not_to change(Decidim::Follow, :count)
     end
   end
diff --git a/decidim-core/spec/types/reportable_type_spec.rb b/decidim-core/spec/types/reportable_type_spec.rb
index 55944375888fa..ef7ec7f5c15d2 100644
--- a/decidim-core/spec/types/reportable_type_spec.rb
+++ b/decidim-core/spec/types/reportable_type_spec.rb
@@ -11,6 +11,12 @@ module Core
 
       include_examples "timestamps interface"
 
+      shared_examples "unauthorized User object" do
+        it "throws Decidim::Api::Errors::UnauthorizedObjectError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::UnauthorizedObjectError, "You cannot view or edit this User because you do not have permissions")
+        end
+      end
+
       describe "id" do
         let(:query) { "{ id }" }
 
@@ -56,17 +62,13 @@ module Core
           context "when user reporting deleted his account" do
             let!(:model) { create(:report, moderation:, user: create(:user, :confirmed, :deleted, organization: moderation.reportable.organization), details: "Testing reason", locale: "en") }
 
-            it "returns nil" do
-              expect(response["user"]).to be_nil
-            end
+            it_behaves_like "unauthorized User object"
           end
 
           context "when user reporting got blocked" do
             let!(:model) { create(:report, moderation:, user: create(:user, :confirmed, :blocked, organization: moderation.reportable.organization), details: "Testing reason", locale: "en") }
 
-            it "returns nil" do
-              expect(response["user"]).to be_nil
-            end
+            it_behaves_like "unauthorized User object"
           end
         end
       end
diff --git a/decidim-core/spec/types/reportable_user_type_spec.rb b/decidim-core/spec/types/reportable_user_type_spec.rb
index 343e647a172c6..6cc9cce746cbf 100644
--- a/decidim-core/spec/types/reportable_user_type_spec.rb
+++ b/decidim-core/spec/types/reportable_user_type_spec.rb
@@ -11,6 +11,12 @@ module Core
 
       include_examples "timestamps interface"
 
+      shared_examples "unauthorized User object" do
+        it "throws Decidim::Api::Errors::UnauthorizedObjectError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::UnauthorizedObjectError, "You cannot view or edit this User because you do not have permissions")
+        end
+      end
+
       describe "id" do
         let(:query) { "{ id }" }
 
@@ -47,24 +53,18 @@ module Core
 
           let!(:model) { create(:user_report, moderation:, user: moderation.user, details: "Testing reason") }
 
-          it "returns nil" do
-            expect(response["user"]).to be_nil
-          end
+          it_behaves_like "unauthorized User object"
 
           context "when the user that made the report deleted their account" do
             let(:moderation) { create(:user_moderation, user: create(:user, :confirmed, :deleted)) }
 
-            it "returns nil" do
-              expect(response["user"]).to be_nil
-            end
+            it_behaves_like "unauthorized User object"
           end
 
           context "when the user that made the reporting got blocked" do
             let(:moderation) { create(:user_moderation, user: create(:user, :confirmed, :blocked)) }
 
-            it "returns nil" do
-              expect(response["user"]).to be_nil
-            end
+            it_behaves_like "unauthorized User object"
           end
         end
       end
diff --git a/decidim-core/spec/types/user_type_spec.rb b/decidim-core/spec/types/user_type_spec.rb
index 78e206d2e8f3c..a66e251dc6dc0 100644
--- a/decidim-core/spec/types/user_type_spec.rb
+++ b/decidim-core/spec/types/user_type_spec.rb
@@ -13,31 +13,31 @@ module Core
       include_examples "timestamps interface"
       include_examples "followable interface"
 
+      shared_examples "unauthorized User object" do
+        it "throws Decidim::Api::Errors::UnauthorizedObjectError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::UnauthorizedObjectError, "You cannot view or edit this User because you do not have permissions")
+        end
+      end
+
       describe "unconfirmed user" do
         let(:model) { create(:user) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized User object"
       end
 
       describe "deleted user" do
         let(:model) { create(:user, :deleted) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized User object"
       end
 
       describe "moderated user" do
         let(:model) { create(:user, :blocked) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized User object"
       end
 
       describe "name" do
@@ -124,9 +124,7 @@ module Core
         context "when user is deleted" do
           let(:model) { create(:user, :deleted) }
 
-          it "returns empty" do
-            expect(response).to be_nil
-          end
+          it_behaves_like "unauthorized User object"
         end
       end
 
diff --git a/decidim-core/spec/uploaders/organization_favicon_uploader_spec.rb b/decidim-core/spec/uploaders/organization_favicon_uploader_spec.rb
index d0c487688f8fa..0d89c764b86d3 100644
--- a/decidim-core/spec/uploaders/organization_favicon_uploader_spec.rb
+++ b/decidim-core/spec/uploaders/organization_favicon_uploader_spec.rb
@@ -14,7 +14,7 @@ module Decidim
       subject { uploader.extension_allowlist }
 
       it "returns the custom allowed extensions" do
-        expect(subject).to eq(%w(png jpg jpeg webp ico))
+        expect(subject).to eq(%w(png jpg jpeg webp))
       end
     end
 
@@ -22,7 +22,7 @@ module Decidim
       subject { uploader.content_type_allowlist }
 
       it "returns the correct MIME types" do
-        expect(subject).to eq(%w(image/png image/jpeg image/webp image/vnd.microsoft.icon))
+        expect(subject).to eq(%w(image/png image/jpeg image/webp))
       end
     end
   end
diff --git a/decidim-core/spec/validators/uploader_image_dimensions_validator_spec.rb b/decidim-core/spec/validators/uploader_image_dimensions_validator_spec.rb
index d95ec7824a8e7..2385f34db7be5 100644
--- a/decidim-core/spec/validators/uploader_image_dimensions_validator_spec.rb
+++ b/decidim-core/spec/validators/uploader_image_dimensions_validator_spec.rb
@@ -41,13 +41,13 @@ def self.attached_config
         expect(subject.attached_uploader(:upload).validable_dimensions).to be(true)
       end
 
-      # Ensure MiniMagic is called so that the validations are actually run for
+      # Ensure Vips is called so that the validations are actually run for
       # the same reason as above.
-      it "calls MiniMagick" do
+      it "calls Vips" do
         if type == :blob
-          expect(MiniMagick::Image).to receive(:read).and_call_original
+          expect(Vips::Image).to receive(:read).and_call_original
         else
-          expect(MiniMagick::Image).to receive(:new).and_call_original
+          expect(Vips::Image).to receive(:new).and_call_original
         end
 
         subject.valid?
@@ -67,19 +67,6 @@ def self.attached_config
 
       it_behaves_like "valid image type"
     end
-
-    context "with an ICO" do
-      let(:filename) { "icon.ico" }
-      let(:content_type) { "image/vnd.microsoft.icon" }
-
-      it_behaves_like "valid image type"
-
-      context "without an extension" do
-        let(:blob_filename) { "icon_ico" }
-
-        it_behaves_like "valid image type"
-      end
-    end
   end
 
   context "when the file is an Rack::Test::UploadedFile" do
@@ -149,15 +136,29 @@ def upload=(blob)
     let(:upload) { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
     let(:uploader) { record.attached_uploader(:upload) }
 
-    context "when MiniMagick fails to process the image" do
+    context "when image dimensions exceed maximum allowed" do
+      let(:image) { instance_double(Vips::Image, width: 10_000, height: 8_000) }
+
+      before do
+        allow(Vips::Image).to receive(:new_from_file).and_return(image)
+        allow(uploader).to receive(:max_image_height_or_width).and_return(5_000)
+      end
+
+      it "adds the correct error" do
+        expect { subject }.not_to raise_error
+        expect(record.errors[:upload]).to contain_exactly("File resolution is too large")
+      end
+    end
+
+    context "when Vips fails to process the image" do
       let(:image) do
-        MiniMagick::Image.new(upload.path, File.extname(upload.original_filename))
+        Vips::Image.new_from_file(upload.path)
       end
 
       before do
-        allow(MiniMagick::Image).to receive(:new).and_return(image)
-        allow(image).to receive(:dimensions).and_raise(
-          MiniMagick::Error.new(
+        allow(Vips::Image).to receive(:new_from_file).and_return(image)
+        allow(image).to receive(:width).and_raise(
+          Vips::Error.new(
             <<~ERR.strip
               identify-im6.q16: unable to open image `%w': No such file or directory @ error/blob.c/OpenBlob/2924.
               identify-im6.q16: no decode delegate for this image format `' @ error/constitute.c/ReadImage/575.
diff --git a/decidim-debates/app/commands/decidim/debates/close_debate.rb b/decidim-debates/app/commands/decidim/debates/close_debate.rb
index 297d1fdff54f7..a9323aec7b049 100644
--- a/decidim-debates/app/commands/decidim/debates/close_debate.rb
+++ b/decidim-debates/app/commands/decidim/debates/close_debate.rb
@@ -28,6 +28,8 @@ def call
 
       attr_reader :form
 
+      delegate :debate, to: :form
+
       def close_debate
         @debate = Decidim.traceability.perform_action!(
           :close,
diff --git a/decidim-debates/app/permissions/decidim/debates/permissions.rb b/decidim-debates/app/permissions/decidim/debates/permissions.rb
index d67ee4bb7a496..3670a9fde8e3d 100644
--- a/decidim-debates/app/permissions/decidim/debates/permissions.rb
+++ b/decidim-debates/app/permissions/decidim/debates/permissions.rb
@@ -31,6 +31,8 @@ def permissions
       private
 
       def can_create_debate?
+        return false unless user
+
         authorized?(:create) &&
           current_settings&.creation_enabled? && component.participatory_space.can_participate?(user)
       end
diff --git a/decidim-debates/app/views/decidim/debates/debates/index.html.erb b/decidim-debates/app/views/decidim/debates/debates/index.html.erb
index 230ae2850bdb6..7286167642cdd 100644
--- a/decidim-debates/app/views/decidim/debates/debates/index.html.erb
+++ b/decidim-debates/app/views/decidim/debates/debates/index.html.erb
@@ -1,7 +1,7 @@
 <% add_decidim_meta_tags(
   description: translated_attribute(current_participatory_space.short_description),
   title: t("decidim.components.pagination.page_title",
-           component_name: component_name,
+           component_name:,
            current_page: paginated_debates.current_page,
            total_pages: paginated_debates.total_pages ),
   url: debates_url,
diff --git a/decidim-debates/config/locales/eu.yml b/decidim-debates/config/locales/eu.yml
index 79bfdaccc1033..0b659edc324ec 100644
--- a/decidim-debates/config/locales/eu.yml
+++ b/decidim-debates/config/locales/eu.yml
@@ -248,7 +248,7 @@ eu:
           author: Iruzkin hau egin duen parte-hartzailearen izena
           body: Iruzkin bera
           commentable_id: Iruzkingarriaren identifikazio bakarra
-          commentable_type: Iruzkingarri mota (emaitza, proposamena... izan bazen)
+          commentable_type: Komentagarri mota (emaitza izan bada, proposamena, etab.)
           created_at: Zein datatan sortu da iruzkin hau
           depth: Iruzkin hau hiru iruzkinetan dago (erantzuna edo erantzunaren erantzuna bada)
           id: Identifikazioa iruzkin honetarako
diff --git a/decidim-debates/config/locales/ja.yml b/decidim-debates/config/locales/ja.yml
index 7da9070acb9ed..377904e1bd22d 100644
--- a/decidim-debates/config/locales/ja.yml
+++ b/decidim-debates/config/locales/ja.yml
@@ -32,6 +32,7 @@ ja:
           comment: コメント
           create: ディベートを作成
           like: いいね
+          vote_comment: コメントに投票
         name: ディベート
         settings:
           global:
diff --git a/decidim-debates/config/locales/ro-RO.yml b/decidim-debates/config/locales/ro-RO.yml
index 9e5f6f28cd60d..c66ca185303a6 100644
--- a/decidim-debates/config/locales/ro-RO.yml
+++ b/decidim-debates/config/locales/ro-RO.yml
@@ -136,6 +136,7 @@ ro:
         show:
           debate_conclusions_are: 'Dezbaterea s-a încheiat la %{date} cu următoarele concluzii:'
           edit_conclusions: Modificați concluziile
+          ongoing: În desfășurare
           participants_count: Participanți
         update:
           invalid: A apărut o problemă la actualizarea dezbaterii.
diff --git a/decidim-debates/config/locales/sv.yml b/decidim-debates/config/locales/sv.yml
index 622c9c8842828..a20f29da99664 100644
--- a/decidim-debates/config/locales/sv.yml
+++ b/decidim-debates/config/locales/sv.yml
@@ -122,7 +122,7 @@ sv:
           create: Skapa
           title: Skapa ny debatt
         orders:
-          commented: Mest kommenterade
+          commented: Flest kommentarer
           label: Sortera debater efter
           random: Slumpmässig ordning
           recent: Senaste
diff --git a/decidim-debates/lib/decidim/api/debates_type.rb b/decidim-debates/lib/decidim/api/debates_type.rb
index af65b858ec16c..c2d8991076d57 100644
--- a/decidim-debates/lib/decidim/api/debates_type.rb
+++ b/decidim-debates/lib/decidim/api/debates_type.rb
@@ -15,8 +15,8 @@ def debates
         Debate.where(component: object).includes(:component)
       end
 
-      def debate(**args)
-        Debate.where(component: object).find_by(id: args[:id])
+      def debate(id:)
+        Decidim::Core::ComponentFinderBase.new(model_class: Debate).call(object, { id: }, context)
       end
     end
   end
diff --git a/decidim-debates/lib/decidim/api/mutations/close_debate_attributes.rb b/decidim-debates/lib/decidim/api/mutations/close_debate_attributes.rb
new file mode 100644
index 0000000000000..d40707c7729d3
--- /dev/null
+++ b/decidim-debates/lib/decidim/api/mutations/close_debate_attributes.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    class CloseDebateAttributes < Decidim::Api::Types::BaseInputObject
+      graphql_name "CloseDebateAttributes"
+      description "Attributes for closing a debate"
+
+      argument :conclusions, GraphQL::Types::String, description: "The conclusions for closing the debate", required: true
+    end
+  end
+end
diff --git a/decidim-debates/lib/decidim/api/mutations/close_debate_type.rb b/decidim-debates/lib/decidim/api/mutations/close_debate_type.rb
new file mode 100644
index 0000000000000..c8d07d176e914
--- /dev/null
+++ b/decidim-debates/lib/decidim/api/mutations/close_debate_type.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    class CloseDebateType < Decidim::Api::Types::BaseMutation
+      graphql_name "CloseDebate"
+
+      description "Closes a debate"
+      type Decidim::Debates::DebateType
+
+      argument :attributes, CloseDebateAttributes, description: "Input attributes for closing a debate", required: true
+      argument :locale, GraphQL::Types::String, "The locale to use for the mutation", required: true
+      argument :toggle_translations, GraphQL::Types::Boolean, "Whether the user asked to toggle the machine translations or not", required: false, default_value: false
+
+      def resolve(attributes:, locale:, toggle_translations:)
+        set_locale(locale:, toggle_translations:)
+
+        params = {
+          id: object.id,
+          conclusions: attributes.to_h.fetch(:conclusions, "")
+        }
+
+        form = form(Decidim::Debates::CloseDebateForm).from_params(params)
+
+        Decidim::Debates::CloseDebate.call(form) do
+          on(:ok) do |debate|
+            return debate.reload
+          end
+
+          on(:invalid) do
+            raise Decidim::Api::Errors::AttributeValidationError, form.errors
+          end
+        end
+      end
+
+      def authorized?(attributes:, locale:, toggle_translations:)
+        raise Decidim::Api::Errors::MutationNotAuthorizedError, I18n.t("decidim.api.errors.unauthorized_mutation") unless [
+          super,
+          allowed_to?(:close, :debate, object, context),
+          !object.closed?
+        ].all?
+
+        true
+      end
+    end
+  end
+end
diff --git a/decidim-debates/lib/decidim/api/mutations/create_debate_type.rb b/decidim-debates/lib/decidim/api/mutations/create_debate_type.rb
new file mode 100644
index 0000000000000..3d89f7343733c
--- /dev/null
+++ b/decidim-debates/lib/decidim/api/mutations/create_debate_type.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    class CreateDebateType < Decidim::Api::Types::BaseMutation
+      graphql_name "CreateDebate"
+
+      description "Creates a debate"
+      type Decidim::Debates::DebateType
+
+      argument :attributes, DebateAttributes, description: "Input attributes of a debate", required: true
+      argument :locale, GraphQL::Types::String, "The locale for which to set the debate texts", required: true
+      argument :toggle_translations, GraphQL::Types::Boolean, "Whether the user asked to toggle the machine translations or not.", required: false, default_value: false
+
+      def resolve(attributes:, locale:, toggle_translations:)
+        set_locale(locale:, toggle_translations:)
+
+        params = attributes.to_h.slice(:title, :description)
+
+        params[:taxonomies] = Decidim::Taxonomy.where(organization: current_organization, id: attributes.to_h.fetch(:taxonomies, [])).pluck(:id)
+
+        form = form(Decidim::Debates::DebateForm).from_params(params)
+
+        Decidim::Debates::CreateDebate.call(form) do
+          on(:ok) do |debate|
+            return debate.reload
+          end
+
+          on(:invalid) do
+            raise Decidim::Api::Errors::AttributeValidationError, form.errors
+          end
+        end
+      end
+
+      def authorized?(attributes:, locale:, toggle_translations:)
+        unless super && allowed_to?(:create, :debate, Debate.new(component: current_component), { current_user:, current_component: })
+          raise Decidim::Api::Errors::MutationNotAuthorizedError, I18n.t("decidim.api.errors.unauthorized_mutation")
+        end
+
+        true
+      end
+    end
+  end
+end
diff --git a/decidim-debates/lib/decidim/api/mutations/debate_attributes.rb b/decidim-debates/lib/decidim/api/mutations/debate_attributes.rb
new file mode 100644
index 0000000000000..d6dae4fe31af0
--- /dev/null
+++ b/decidim-debates/lib/decidim/api/mutations/debate_attributes.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    class DebateAttributes < Decidim::Api::Types::BaseInputObject
+      graphql_name "DebateAttributes"
+      description "Attributes of a debate"
+
+      argument :description, GraphQL::Types::String, description: "The description of the debate", required: true
+      argument :taxonomies, [GraphQL::Types::ID], description: "Array of taxonomy IDs", required: false
+      argument :title, GraphQL::Types::String, description: "The title of the debate", required: true
+    end
+  end
+end
diff --git a/decidim-debates/lib/decidim/api/mutations/debate_mutation_type.rb b/decidim-debates/lib/decidim/api/mutations/debate_mutation_type.rb
new file mode 100644
index 0000000000000..aad97d4f93325
--- /dev/null
+++ b/decidim-debates/lib/decidim/api/mutations/debate_mutation_type.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    class DebateMutationType < Decidim::Api::Types::BaseObject
+      include Decidim::ApiResponseHelper
+
+      graphql_name "DebateMutation"
+      description "A debate which includes its available mutations"
+
+      field :close, mutation: Decidim::Debates::CloseDebateType, description: "Closes a debate"
+      field :update, mutation: Decidim::Debates::UpdateDebateType, description: "Updates a debate"
+    end
+  end
+end
diff --git a/decidim-debates/lib/decidim/api/mutations/debates_mutation_type.rb b/decidim-debates/lib/decidim/api/mutations/debates_mutation_type.rb
new file mode 100644
index 0000000000000..02a79fe792a2b
--- /dev/null
+++ b/decidim-debates/lib/decidim/api/mutations/debates_mutation_type.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    class DebatesMutationType < Decidim::Core::ComponentType
+      description "Debates mutations for a component."
+
+      field :create_debate, mutation: Decidim::Debates::CreateDebateType, description: "Creates a debate"
+      field :debate, type: Decidim::Debates::DebateMutationType, description: "Mutates a debate", null: true do
+        argument :id, GraphQL::Types::ID, "The ID of the debate", required: true
+      end
+
+      def debate(id:)
+        collection.find(id)
+      end
+
+      private
+
+      def collection
+        Debate.where(component: object).not_hidden
+      end
+    end
+  end
+end
diff --git a/decidim-debates/lib/decidim/api/mutations/update_debate_type.rb b/decidim-debates/lib/decidim/api/mutations/update_debate_type.rb
new file mode 100644
index 0000000000000..56700a49f81c8
--- /dev/null
+++ b/decidim-debates/lib/decidim/api/mutations/update_debate_type.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    class UpdateDebateType < Decidim::Api::Types::BaseMutation
+      graphql_name "UpdateDebate"
+
+      description "Updates a debate"
+      type Decidim::Debates::DebateType
+
+      argument :attributes, DebateAttributes, description: "input attributes of a debate", required: true
+      argument :locale, GraphQL::Types::String, "The locale for which to set the debate texts", required: true
+      argument :toggle_translations, GraphQL::Types::Boolean, "Whether the user asked to toggle the machine translations or not.", required: false, default_value: false
+
+      def resolve(attributes:, locale:, toggle_translations:)
+        set_locale(locale:, toggle_translations:)
+
+        params = extract_from(attributes)
+        params[:taxonomies] = Decidim::Taxonomy.where(organization: current_organization, id: params[:taxonomies]).pluck(:id) if params[:taxonomies]
+
+        form = form(Decidim::Debates::DebateForm).from_params(params)
+
+        UpdateDebate.call(form, object) do
+          on(:ok) do
+            return object.reload
+          end
+
+          on(:invalid) do
+            raise Decidim::Api::Errors::AttributeValidationError, form.errors
+          end
+        end
+      end
+
+      def authorized?(attributes:, locale:, toggle_translations:)
+        raise Decidim::Api::Errors::MutationNotAuthorizedError, I18n.t("decidim.api.errors.unauthorized_mutation") unless super && allowed_to?(:edit, :debate, object, context)
+
+        true
+      end
+
+      private
+
+      def extract_from(attributes)
+        attributes = attributes.to_h.compact
+
+        title = attributes.fetch(:title, translated_attribute(object.title))
+        description = attributes.fetch(:description, translated_attribute(object.description))
+        taxonomies = attributes.fetch(:taxonomies, object.taxonomies.pluck(:id))
+
+        {
+          title:,
+          description:,
+          taxonomies:
+        }
+      end
+    end
+  end
+end
diff --git a/decidim-debates/lib/decidim/debates/api.rb b/decidim-debates/lib/decidim/debates/api.rb
index 132761788529f..1cae0927b1beb 100644
--- a/decidim-debates/lib/decidim/debates/api.rb
+++ b/decidim-debates/lib/decidim/debates/api.rb
@@ -4,5 +4,13 @@ module Decidim
   module Debates
     autoload :DebateType, "decidim/api/debate_type"
     autoload :DebatesType, "decidim/api/debates_type"
+
+    autoload :DebatesMutationType, "decidim/api/mutations/debates_mutation_type"
+    autoload :DebateMutationType, "decidim/api/mutations/debate_mutation_type"
+    autoload :CloseDebateType, "decidim/api/mutations/close_debate_type"
+    autoload :CloseDebateAttributes, "decidim/api/mutations/close_debate_attributes"
+    autoload :CreateDebateType, "decidim/api/mutations/create_debate_type"
+    autoload :DebateAttributes, "decidim/api/mutations/debate_attributes"
+    autoload :UpdateDebateType, "decidim/api/mutations/update_debate_type"
   end
 end
diff --git a/decidim-debates/lib/decidim/debates/component.rb b/decidim-debates/lib/decidim/debates/component.rb
index f638b5e7280ed..037a158c38454 100644
--- a/decidim-debates/lib/decidim/debates/component.rb
+++ b/decidim-debates/lib/decidim/debates/component.rb
@@ -12,10 +12,6 @@
 
   component.newsletter_participant_entities = ["Decidim::Debates::Debate"]
 
-  component.on(:before_destroy) do |instance|
-    raise StandardError, "Cannot remove this component" if Decidim::Debates::Debate.where(component: instance).any?
-  end
-
   component.on(:publish) do |instance|
     Decidim::Debates::Debate.where(component: instance).find_in_batches(batch_size: 100) do |batch|
       Decidim::UpdateSearchIndexesJob.perform_later(batch)
diff --git a/decidim-debates/lib/decidim/debates/engine.rb b/decidim-debates/lib/decidim/debates/engine.rb
index bbffffa296165..e8efdd91fedbc 100644
--- a/decidim-debates/lib/decidim/debates/engine.rb
+++ b/decidim-debates/lib/decidim/debates/engine.rb
@@ -98,6 +98,12 @@ class Engine < ::Rails::Engine
           end
         end
       end
+
+      initializer "decidim_debates.register_mutations", before: "decidim_api.graphiql" do
+        Decidim::MutationRegistry.instance.register(
+          Decidim::Debates::DebatesMutationType
+        )
+      end
     end
   end
 end
diff --git a/decidim-debates/spec/factories.rb b/decidim-debates/spec/factories.rb
index e03ae1bcd43f9..454c7cba15845 100644
--- a/decidim-debates/spec/factories.rb
+++ b/decidim-debates/spec/factories.rb
@@ -3,5 +3,5 @@
 require "decidim/core/test/factories"
 require "decidim/comments/test/factories"
 require "decidim/participatory_processes/test/factories"
-
+require "decidim/api/test/factories"
 require "decidim/debates/test/factories"
diff --git a/decidim-debates/spec/system/debates_breadcrumbs_spec.rb b/decidim-debates/spec/system/debates_breadcrumbs_spec.rb
new file mode 100644
index 0000000000000..2c7132a76255a
--- /dev/null
+++ b/decidim-debates/spec/system/debates_breadcrumbs_spec.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Debates Breadcrumb" do
+  include_context "with a component"
+  let(:manifest_name) { "debates" }
+
+  let!(:debate) { create(:debate, component:) }
+
+  before do
+    visit_component
+  end
+
+  describe "index" do
+    it "shows the correct information in breadcrumb (space, component)" do
+      within(".menu-bar") do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+      end
+    end
+  end
+
+  describe "show" do
+    it "shows the correct information in breadcrumb (space, component, debate)" do
+      click_on translated(debate.title), class: "card__list"
+
+      within(".menu-bar") do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+        expect(page).to have_content(translated(debate.title))
+      end
+    end
+  end
+
+  describe "versions", versioning: true do
+    let(:additional_description) { generate_localized_description(:debate_description) }
+
+    before do
+      Decidim.traceability.update!(
+        debate,
+        "Dummy author",
+        description: additional_description
+      )
+      click_on translated(debate.title), class: "card__list"
+      click_on "see other versions"
+    end
+
+    it "shows the correct information in breadcrumb (space, component, debate)" do
+      within(".menu-bar") do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+        expect(page).to have_content(translated(debate.title))
+      end
+    end
+  end
+end
diff --git a/decidim-debates/spec/system/debates_versions_spec.rb b/decidim-debates/spec/system/debates_versions_spec.rb
index 0cf4735a66503..f75e6b2c21be8 100644
--- a/decidim-debates/spec/system/debates_versions_spec.rb
+++ b/decidim-debates/spec/system/debates_versions_spec.rb
@@ -14,10 +14,6 @@
     end
 
     it "has only one version" do
-      within(".menu-bar") do
-        expect(page).to have_content(translated(component.name))
-        expect(page).to have_content(translated(debate.title))
-      end
       expect(page).to have_content("Version number 1 (of 1)")
     end
 
diff --git a/decidim-debates/spec/system/private_space_debate_spec.rb b/decidim-debates/spec/system/private_space_debate_spec.rb
index 716cccde301ba..f451829b576c3 100644
--- a/decidim-debates/spec/system/private_space_debate_spec.rb
+++ b/decidim-debates/spec/system/private_space_debate_spec.rb
@@ -10,7 +10,7 @@
   let(:user) { create(:user, :confirmed, organization:) }
   let!(:other_user) { create(:user, :confirmed, organization:) }
 
-  let!(:participatory_space_private_user) { create(:participatory_space_private_user, user: other_user, privatable_to: participatory_space_private) }
+  let!(:member) { create(:member, user: other_user, participatory_space: participatory_space_private) }
 
   let!(:participatory_space) { participatory_space_private }
 
@@ -39,7 +39,7 @@ def visit_component
     end
 
     context "when the user is logged in" do
-      context "and is private user space" do
+      context "and is member space" do
         before do
           login_as other_user, scope: :user
         end
@@ -51,7 +51,7 @@ def visit_component
         end
       end
 
-      context "and is not private user space" do
+      context "and is not member space" do
         before do
           login_as user, scope: :user
         end
@@ -83,7 +83,7 @@ def visit_component
     end
 
     context "when the user is logged in" do
-      context "and is private user space" do
+      context "and is member space" do
         before do
           login_as other_user, scope: :user
         end
@@ -104,7 +104,7 @@ def visit_component
         end
       end
 
-      context "and is not private user space" do
+      context "and is not member space" do
         let(:target_path) { main_component_path(component) }
 
         before do
diff --git a/decidim-debates/spec/system/show_spec.rb b/decidim-debates/spec/system/show_spec.rb
index 579d5f892591c..0dfda11ee6cf5 100644
--- a/decidim-debates/spec/system/show_spec.rb
+++ b/decidim-debates/spec/system/show_spec.rb
@@ -66,10 +66,6 @@
 
   context "when shows the debate component" do
     it "shows the debate title" do
-      within(".menu-bar") do
-        expect(page).to have_content(translated(component.name))
-        expect(page).to have_content(translated(debate.title))
-      end
       expect(page).to have_content(translated(debate.title))
     end
   end
diff --git a/decidim-debates/spec/types/close_debate_type_spec.rb b/decidim-debates/spec/types/close_debate_type_spec.rb
new file mode 100644
index 0000000000000..f2808e5bce128
--- /dev/null
+++ b/decidim-debates/spec/types/close_debate_type_spec.rb
@@ -0,0 +1,128 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Debates
+    describe CloseDebateType, type: :graphql do
+      include_context "with a graphql class mutation"
+
+      let(:root_klass) { DebateMutationType }
+      let(:organization) { current_organization }
+      let(:participatory_process) { create(:participatory_process, :with_steps, organization:) }
+      let(:debates_component) { create(:component, manifest_name: :debates, participatory_space: participatory_process) }
+      let(:author) { current_user }
+      let!(:model) { create(:debate, component: debates_component, author:) }
+      let(:conclusions) { ::Faker::Lorem.sentence(word_count: 15) }
+      let(:component) { model.component }
+      let(:locale) { "en" }
+      let(:variables) do
+        {
+          input: {
+            locale:,
+            attributes: {
+              conclusions:
+            }
+          }
+        }
+      end
+      let(:query) do
+        <<~GRAPHQL
+          mutation($input: CloseDebateInput!) {
+            close(input: $input) {
+              id
+              conclusions { translation(locale: "en") }
+              closedAt
+            }
+          }
+        GRAPHQL
+      end
+
+      shared_examples "close debate mutation examples" do
+        context "when user cannot close the debate" do
+          let!(:author) { create(:user, :confirmed, organization: current_organization) }
+
+          it "raises a Decidim::Api::Errors::MutationNotAuthorizedError" do
+            expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+          end
+        end
+
+        context "when user can close the debate" do
+          it "closes the debate" do
+            closed = response["close"]
+            expect(closed).to be_present
+            expect(closed).to include(
+              {
+                "id" => model.id.to_s,
+                "conclusions" => {
+                  "translation" => conclusions
+                },
+                "closedAt" => model.reload.closed_at.to_time.iso8601
+              }
+            )
+          end
+        end
+
+        context "when validating" do
+          context "when debate is hidden" do
+            let!(:model) { create(:debate, :hidden, component: debates_component, author:) }
+
+            it "raises a Decidim::Api::Errors::UnauthorizedObjectError" do
+              expect { response }.to raise_error(Decidim::Api::Errors::UnauthorizedObjectError, "You cannot view or edit this Debate because you do not have permissions")
+            end
+          end
+
+          context "when debate is closed" do
+            let!(:model) { create(:debate, :closed, component: debates_component, author:) }
+
+            it "raises a Decidim::Api::Errors::MutationNotAuthorizedError" do
+              expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+            end
+          end
+
+          context "when conclusions are empty" do
+            let(:conclusions) { "" }
+
+            it "raises an error" do
+              expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /cannot be blank/)
+            end
+          end
+
+          context "when conclusions are too short" do
+            let(:conclusions) { "Short" }
+
+            it "raises an error" do
+              expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /is too short/)
+            end
+          end
+
+          context "with invalid locale" do
+            let(:locale) { "tlh" }
+
+            it "raises an error" do
+              expect { response }.to raise_error(Decidim::Api::Errors::InvalidLocaleError, /Invalid locale provided/)
+            end
+          end
+        end
+      end
+
+      context "with admin user" do
+        let!(:user_type) { :admin }
+
+        it_behaves_like "close debate mutation examples"
+      end
+
+      context "with debate author" do
+        let!(:user_type) { :user }
+
+        it_behaves_like "close debate mutation examples"
+      end
+
+      context "with api_user" do
+        let!(:user_type) { :api_user }
+
+        it_behaves_like "close debate mutation examples"
+      end
+    end
+  end
+end
diff --git a/decidim-debates/spec/types/create_debate_type_spec.rb b/decidim-debates/spec/types/create_debate_type_spec.rb
new file mode 100644
index 0000000000000..7d495bfe3ec14
--- /dev/null
+++ b/decidim-debates/spec/types/create_debate_type_spec.rb
@@ -0,0 +1,162 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "decidim/api/test"
+
+module Decidim
+  module Debates
+    describe CreateDebateType, type: :graphql do
+      include_context "with a graphql class mutation"
+
+      let(:type_class) { Decidim::Debates::CreateDebateType }
+      let(:root_klass) { Decidim::Debates::DebatesMutationType }
+      let(:root_value) { current_component }
+
+      let(:current_organization) { create(:organization, available_locales: [:en]) }
+      let(:organization) { current_organization }
+      let(:participatory_process) { create(:participatory_process, :published, :with_steps, organization:) }
+      let!(:current_component) do
+        create(:debates_component, :published, :with_creation_enabled, participatory_space: participatory_process, settings: {
+                 taxonomy_filters: [taxonomy_filter.id]
+               })
+      end
+
+      let(:title) { "Should every organization use Decidim?" }
+      let(:description) { "Add your comments on whether Decidim is useful for every organization." }
+
+      let(:root_taxonomy) { create(:taxonomy, organization:) }
+      let!(:taxonomy) { create(:taxonomy, parent: root_taxonomy, organization:) }
+      let(:taxonomy_filter) { create(:taxonomy_filter, root_taxonomy:) }
+      let!(:taxonomy_filter_item) { create(:taxonomy_filter_item, taxonomy_filter:, taxonomy_item: taxonomy) }
+      let!(:taxonomies) { [taxonomy.id] }
+
+      let(:locale) { "en" }
+      let(:translation_locale) { "en" }
+
+      let(:attributes) do
+        {
+          title:,
+          description:,
+          taxonomies:
+        }
+      end
+
+      let(:variables) do
+        {
+          component_id: current_component.id,
+          input: {
+            locale:,
+            attributes:
+          }
+        }
+      end
+
+      let(:query) do
+        <<~GRAPHQL
+          mutation createDebate($input: CreateDebateInput!) {
+            createDebate(input: $input) {
+              id
+              title { translation(locale: "en") }
+              description { translation(locale: "en") }
+              taxonomies {
+                name { translation(locale: "en") }
+              }
+              author { id }
+            }
+          }
+        GRAPHQL
+      end
+
+      shared_examples "create debate mutation examples" do
+        context "when creation is enabled" do
+          it "creates a debate" do
+            debate = response["createDebate"]
+            expect(debate).to be_present
+            expect(debate["id"]).to be_present
+            expect(debate["title"]["translation"]).to eq(title)
+            expect(debate["description"]["translation"]).to eq(description)
+          end
+
+          it "associates taxonomies with the debate" do
+            debate = response["createDebate"]
+            expect(debate["taxonomies"]).to be_present
+            expect(debate["taxonomies"].length).to eq(1)
+            expect(debate["taxonomies"].first["name"]["translation"]).to eq(taxonomy.name["en"])
+          end
+
+          context "without taxonomies" do
+            let(:taxonomies) { [] }
+
+            it "creates a debate without taxonomies" do
+              debate = response["createDebate"]
+              expect(debate).to be_present
+              expect(debate["taxonomies"]).to be_empty
+            end
+          end
+        end
+      end
+
+      context "when the user is not logged in" do
+        let!(:current_user) { nil }
+
+        it "raises a Decidim::Api::Errors::MutationNotAuthorizedError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+        end
+      end
+
+      context "with admin user" do
+        it_behaves_like "create debate mutation examples" do
+          let!(:user_type) { :admin }
+        end
+      end
+
+      context "with normal user" do
+        it_behaves_like "create debate mutation examples" do
+          let!(:user_type) { :user }
+        end
+      end
+
+      context "with api_user" do
+        it_behaves_like "create debate mutation examples" do
+          let!(:user_type) { :api_user }
+        end
+      end
+
+      context "when creation is not enabled" do
+        let(:current_component) { create(:debates_component, :published, participatory_space: participatory_process) }
+
+        it "raises a Decidim::Api::Errors::MutationNotAuthorizedError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+        end
+      end
+
+      context "when validating" do
+        let!(:user_type) { :user }
+
+        context "with having invalid locale" do
+          let(:locale) { "tlh" }
+
+          it "raises an error" do
+            expect { response }.to raise_error(Api::Errors::InvalidLocaleError, /Invalid locale provided/)
+          end
+        end
+
+        context "and title is missing" do
+          let(:title) { "" }
+
+          it "raises an error" do
+            expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /cannot be blank/)
+          end
+        end
+
+        context "and description is missing" do
+          let(:description) { "" }
+
+          it "raises an error" do
+            expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /cannot be blank/)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-debates/spec/types/debate_type_spec.rb b/decidim-debates/spec/types/debate_type_spec.rb
index bf11613707e2e..ee604b48146e3 100644
--- a/decidim-debates/spec/types/debate_type_spec.rb
+++ b/decidim-debates/spec/types/debate_type_spec.rb
@@ -23,6 +23,12 @@ module Debates
         let(:model) { create(:debate, :ongoing_ama, :with_likes) }
       end
 
+      shared_examples "unauthorized Debate" do
+        it "throws Decidim::Api::Errors::UnauthorizedObjectError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::UnauthorizedObjectError, "You cannot view or edit this Debate because you do not have permissions")
+        end
+      end
+
       describe "id" do
         let(:query) { "{ id }" }
 
@@ -140,9 +146,7 @@ module Debates
         let(:model) { create(:debate, :ongoing_ama, component: current_component) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Debate"
       end
 
       context "when participatory space is private but transparent" do
@@ -162,9 +166,7 @@ module Debates
         let(:model) { create(:debate, :ongoing_ama, component: current_component) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Debate"
       end
 
       context "when component is not published" do
@@ -172,9 +174,7 @@ module Debates
         let(:model) { create(:debate, :ongoing_ama, component: current_component) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Debate"
       end
 
       context "when debate is moderated" do
@@ -182,9 +182,7 @@ module Debates
         let(:query) { "{ id }" }
         let(:root_value) { model.reload }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Debate"
       end
     end
   end
diff --git a/decidim-debates/spec/types/debates_type_spec.rb b/decidim-debates/spec/types/debates_type_spec.rb
index 5b6fe5ae19d36..761a5ee5b748f 100644
--- a/decidim-debates/spec/types/debates_type_spec.rb
+++ b/decidim-debates/spec/types/debates_type_spec.rb
@@ -39,8 +39,8 @@ module Debates
         context "when the debate does not belong to the component" do
           let(:debate) { create(:debate, component: create(:debates_component)) }
 
-          it "does not find the debate" do
-            expect(response["debate"]).to be_nil
+          it "raises error" do
+            expect { response }.to raise_error(Decidim::Api::Errors::NotFoundError, "Debate not found")
           end
         end
       end
diff --git a/decidim-debates/spec/types/update_debate_type_spec.rb b/decidim-debates/spec/types/update_debate_type_spec.rb
new file mode 100644
index 0000000000000..ff6714e30e83b
--- /dev/null
+++ b/decidim-debates/spec/types/update_debate_type_spec.rb
@@ -0,0 +1,160 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Debates
+    describe UpdateDebateType, type: :graphql do
+      include_context "with a graphql class mutation"
+
+      let(:root_klass) { DebateMutationType }
+      let(:participatory_process) { create(:participatory_process, :with_steps, organization: current_organization) }
+      let!(:current_component) do
+        create(:debates_component, :published, :with_creation_enabled, participatory_space: participatory_process, settings: {
+                 taxonomy_filters: [taxonomy_filter.id]
+               })
+      end
+      let!(:model) { create(:debate, author: current_user, component: current_component) }
+      let(:title) { "Updated title" }
+      let(:description) { "Updated description" }
+
+      let(:root_taxonomy) { create(:taxonomy, organization: current_organization) }
+      let!(:taxonomy) { create(:taxonomy, parent: root_taxonomy, organization: current_organization) }
+      let(:taxonomy_filter) { create(:taxonomy_filter, root_taxonomy:) }
+      let!(:taxonomy_filter_item) { create(:taxonomy_filter_item, taxonomy_filter:, taxonomy_item: taxonomy) }
+      let!(:taxonomies) { [taxonomy.id] }
+
+      let(:locale) { "en" }
+      let(:translation_locale) { "en" }
+
+      let(:attributes) do
+        {
+          title:,
+          description:,
+          taxonomies:
+        }
+      end
+
+      let(:variables) do
+        {
+          input: {
+            locale:,
+            attributes:
+          }
+        }
+      end
+      let(:query) do
+        <<~GRAPHQL
+          mutation($input: UpdateDebateInput!) {
+            update(input: $input) {
+              id
+              title { translation(locale: "en") }
+              description { translation(locale: "en") }
+              taxonomies {
+                name { translation(locale: "en") }
+              }
+            }
+          }
+        GRAPHQL
+      end
+
+      shared_examples "manage debate mutation examples" do
+        context "when user is the author" do
+          it "updates the debate" do
+            update = response["update"]
+            expect(update).to be_present
+            expect(update).to include(
+              {
+                "id" => model.id.to_s,
+                "title" => {
+                  "translation" => title
+                },
+                "description" => {
+                  "translation" => description
+                }
+              }
+            )
+          end
+
+          it "associates taxonomies with the debate" do
+            debate = response["update"]
+            expect(debate["taxonomies"]).to be_present
+            expect(debate["taxonomies"].length).to eq(1)
+            expect(debate["taxonomies"].first["name"]["translation"]).to eq(taxonomy.name["en"])
+          end
+
+          context "without taxonomies" do
+            let(:taxonomies) { [] }
+
+            it "updates a debate without taxonomies" do
+              debate = response["update"]
+              expect(debate).to be_present
+              expect(debate["taxonomies"]).to be_empty
+            end
+          end
+        end
+      end
+
+      context "when the user is not logged in" do
+        let!(:current_user) { nil }
+        let!(:model) { create(:debate, component: current_component) }
+
+        it "raises a Decidim::Api::Errors::MutationNotAuthorizedError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+        end
+      end
+
+      context "when owner is not the current user" do
+        let!(:model) { create(:debate, component: current_component) }
+
+        it "raises a Decidim::Api::Errors::MutationNotAuthorizedError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+        end
+      end
+
+      context "with admin user" do
+        it_behaves_like "manage debate mutation examples" do
+          let!(:user_type) { :admin }
+        end
+      end
+
+      context "with normal user" do
+        it_behaves_like "manage debate mutation examples"
+      end
+
+      context "with api_user" do
+        it_behaves_like "manage debate mutation examples" do
+          let!(:user_type) { :api_user }
+        end
+      end
+
+      context "when validating" do
+        let!(:user_type) { :user }
+
+        context "with having invalid locale" do
+          let(:locale) { "tlh" }
+
+          it "raises an error" do
+            expect { response }.to raise_error(Api::Errors::InvalidLocaleError, /Invalid locale provided/)
+          end
+        end
+
+        context "and title is missing" do
+          let(:title) { "" }
+
+          it "raises an error" do
+            expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /cannot be blank/)
+          end
+        end
+
+        context "and description is missing" do
+          let(:description) { "" }
+
+          it "raises an error" do
+            expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /cannot be blank/)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-demographics/config/locales/ro-RO.yml b/decidim-demographics/config/locales/ro-RO.yml
index 79dbaa871cae8..f8de138232334 100644
--- a/decidim-demographics/config/locales/ro-RO.yml
+++ b/decidim-demographics/config/locales/ro-RO.yml
@@ -1 +1,79 @@
+---
 ro:
+  decidim:
+    demographics:
+      actions:
+        title: Acțiuni
+      admin:
+        demographics:
+          tabs_menu:
+            title: Demografice
+        demographics_menu:
+          questions: Întrebări
+          responses: Răspunsuri
+          settings: Setări
+        publish_responses:
+          index:
+            description: Descriere
+            title: Afișați răspunsurile
+        questions:
+          edit:
+            save: Salvaţi
+            title: Întrebări
+          questions_form:
+            add_question: Adăugați o întrebare
+            collapse: Restrângeți toate întrebările
+            expand: Extindeți toate întrebările
+        responses:
+          index:
+            publish_responses: Afișați răspunsurile
+            title: "%{total} răspunsuri în total"
+        settings:
+          show:
+            collect_data: Permiteți colectarea datelor demografice
+            collect_data_help: Activarea acestei opțiuni va permite participanților să își doneze datele către platformă.
+            save: Salvați
+            title: Setări
+          update:
+            invalid: A apărut o eroare la salvarea datelor demografice
+            success: Date demografice salvate cu succes
+        title: Date demografice
+      demographics:
+        questionnaire:
+          delete_my_data: Ștergeți datele
+          modal_close: Anulați
+          modal_ok: Ok
+          modal_question: Toate datele demografice vor fi eliminate.
+          modal_title: Ștergeți datele
+          submit: Salvați datele
+          terms_of_service: condițiile de utilizare
+          tos_agreement: Prin participarea dumneavoastră acceptați %{link}.
+        show:
+          page_title: Informații demografice
+      destroy:
+        error: A apărut o eroare la eliminarea datelor demografice
+        success: Datele demografice au fost eliminate cu succes
+      name: Informații demografice
+      questions:
+        age:
+          options:
+          - 15 - 29 ani
+          - 30 - 44 ani
+          - 45 - 64 ani
+          - 65 ani şi peste
+          question: Care este vârsta dumneavoastră?
+        gender:
+          options:
+          - Bărbat
+          - Femeie
+          - Non-binar
+          - Sexul meu nu este listat
+          - Prefer să nu spun
+          question: Care dintre următoarele opțiuni descriu cel mai bine sexul dumneavoastră?
+        postal:
+          question: Care este codul poștal de acasă?
+  layouts:
+    decidim:
+      shared:
+        layout_center:
+          alert: Furnizând aceste informații, contribuiți la analiza statistică ce contribuie la îmbunătățirea indicatorului de calitate. Datele dumneavoastră vor fi agregate și utilizate numai în scopuri de cercetare.
diff --git a/decidim-design/config/locales/eu.yml b/decidim-design/config/locales/eu.yml
index 34a5112bc743d..14e62859c7bc3 100644
--- a/decidim-design/config/locales/eu.yml
+++ b/decidim-design/config/locales/eu.yml
@@ -39,7 +39,7 @@ eu:
           tips_description: 'Modal konplexu bat erakusteko, estiloekin bat eginez, egin marka hau:'
           tips_description_html: 'Adi hauei: <i>data-attributes</i> eta the <i>ids</i>. Adibidez, <code>[data-dialog-title]</code> kodea hasten da honela: <i>dialog-title</i> gehi <i>modal id</i>.'
           title: Elkarrizketak
-          usage_description: Elkarrizketa batek bi elementu eskatzen ditu
+          usage_description: Elkarrizketa batek bi elementu behar ditu
           usage_description_2_html: 2. Elementu modala, zeinaren <code>id</code> datu-kontrolek bat egiten duten eragileari dagokion balioarekin.
           usage_description_html: 1. Parte-hartzailearen elementu erabilgarria, <code>data-dialog-open="example"</code> data-atributuarekin, non adibidea den modalaren <code>id</code>.
         follow:
diff --git a/decidim-dev/config/locales/eu.yml b/decidim-dev/config/locales/eu.yml
index cdf97a105953f..9e8f7590daf8d 100644
--- a/decidim-dev/config/locales/eu.yml
+++ b/decidim-dev/config/locales/eu.yml
@@ -21,12 +21,12 @@ eu:
             guided: Input gidatua
             guided_help: Laguntza-testua
             guided_readonly: Input desgaitua
-            guided_rich: Input gidatu aberastua
-            guided_rich_help_html: HTML<strong>ayuda</strong> testua
-            guided_rich_readonly_html: HTML<strong>laguntza</strong>testua input desgaiturako
+            guided_rich: Sarrera aberats gidatua
+            guided_rich_help_html: HTML<strong>laguntza </strong> testua
+            guided_rich_readonly_html: HTML <strong>laguntza</strong> desaktibatutako testua sartzeko
             readonly_attribute: Soilik irakurtzeko atributua
             test: Proba bat
-            test_add: Erantsi testa
+            test_add: Testa erantsi
             test_choices:
               a: A aukera
               b: B aukera
@@ -46,12 +46,12 @@ eu:
     dummy:
       admin:
         exports:
-          dummies: Probak
+          dummies: Alegiazko parte-hartzaileak
     gamification:
       badges:
         test:
           conditions:
-            - Erabili probako ingurunea erabakitzeko.
+            - Erabili probako ingurune bat Decidim-erako.
           description: Parte-hartzaileek garaikur hau lortzen dute probak sortzeagatik.
           description_another: Parte-hartzaile honek %{score} proba egin ditu.
           description_own: '%{score} proba sortu dituzu.'
@@ -64,6 +64,6 @@ eu:
         dummy_resource_dummy: ' Honekin lotutako proba'
     statistics:
       bar: Bar
-      dummies_count_high: Dummies altua
-      dummies_count_medium: Dummies ertainak
+      dummies_count_high: Alegiazko parte-hartzaileen gehieneko kopurua
+      dummies_count_medium: Alegiazko parte-hartzaileen batez bestekoa
       foo: Foo
diff --git a/decidim-dev/config/locales/ro-RO.yml b/decidim-dev/config/locales/ro-RO.yml
index 83f5a820a9ce7..26ea674b84b82 100644
--- a/decidim-dev/config/locales/ro-RO.yml
+++ b/decidim-dev/config/locales/ro-RO.yml
@@ -1,6 +1,9 @@
 ro:
   activemodel:
     attributes:
+      dummy:
+        image: Imagine
+      dummy_attribute: Atribut fictiv
       dummy_resource:
         created_at: Creat la
         decidim_scope_id: Domeniu de interes
@@ -14,26 +17,30 @@ ro:
       dummy:
         settings:
           global:
+            clear_all: Eliminați tot
             guided: Introducere ghidată
             guided_help: Text de ajutor
-            guided_readonly: Intrare dezactivată
+            guided_readonly: Câmp dezactivat
             guided_rich: Introducere ghidată a conținutului bogat
             guided_rich_help_html: <strong>Ajutor</strong> text pentru HTML
             guided_rich_readonly_html: <strong>Ajutor</strong> HTML text pentru intrare dezactivată
-            readonly_attribute: Atribut Readonly
+            readonly_attribute: Atribut read only
             test: Un test
+            test_add: Adaugați test
             test_choices:
-              a: O alegere
-              b: Alegere B
-              c: Alegere C
+              a: Opțiunea A
+              b: Opțiunea B
+              c: Opțiunea C
             test_options:
               bar: Bară
               baz: Baz
               foo: Foo
           step:
+            likes_blocked: Aprecieri blocate
+            likes_enabled: Aprecieri activate
             readonly_step_attribute: Atribut pas Readonly
             test_options:
-              bar: Bară
+              bar: Bar
               baz: Baz
               foo: Foo
     dummy:
@@ -50,13 +57,13 @@ ro:
           description_own: Ați creat %{score} teste.
           name: Teste
           next_level_in: Crează încă %{score} teste pentru a atinge următorul nivel!
-          unearned_another: Acest participant nu a creat încă niciun test.
-          unearned_own: Nu ați creat încă niciun test.
+          unearned_another: Acest participant nu a creat niciun test încă.
+          unearned_own: Nu ați creat niciun test încă.
     resource_links:
       test_link:
         dummy_resource_dummy: Test asociat
     statistics:
-      bar: Bară
+      bar: Bar
       dummies_count_high: Test mare
       dummies_count_medium: Test mediu
       foo: Foo
diff --git a/decidim-dev/config/rubocop/graphql/configuration.yml b/decidim-dev/config/rubocop/graphql/configuration.yml
index 113e2a9bb2e6b..af48798184769 100644
--- a/decidim-dev/config/rubocop/graphql/configuration.yml
+++ b/decidim-dev/config/rubocop/graphql/configuration.yml
@@ -17,6 +17,11 @@ GraphQL/ObjectDescription:
     - "**/lib/decidim/api/graphiql/config.rb"
     - "**/lib/decidim/api/graphql_permissions.rb"
     - "**/lib/decidim/api/functions/*"
+    - "**/lib/decidim/api/errors/*"
+    - "decidim-api/lib/decidim/api/alias_analyzer.rb"
+    - "decidim-api/lib/decidim/api/introspection_analyzer.rb"
+    - "decidim-api/lib/decidim/api/recursion_analyzer.rb"
+    - "decidim-api/spec/lib/decidim/api/recursion_analyzer_spec.rb"
     - "spec/**/*"
     - "test/**/*"
 
diff --git a/decidim-dev/config/rubocop/ruby/configuration.yml b/decidim-dev/config/rubocop/ruby/configuration.yml
index f02aa6e69ba2f..b35906036929c 100644
--- a/decidim-dev/config/rubocop/ruby/configuration.yml
+++ b/decidim-dev/config/rubocop/ruby/configuration.yml
@@ -521,6 +521,7 @@ Style/GuardClause:
   MinBodyLength: 6
 
 Style/HashSyntax:
+  EnforcedShorthandSyntax: always
   EnforcedStyle: no_mixed_keys
   SupportedStyles:
     # checks for 1.9 syntax (e.g. {a: 1}) for all symbol keys
diff --git a/decidim-dev/lib/decidim/dev/assets/import_participatory_space_private_users.csv b/decidim-dev/lib/decidim/dev/assets/import_members.csv
similarity index 100%
rename from decidim-dev/lib/decidim/dev/assets/import_participatory_space_private_users.csv
rename to decidim-dev/lib/decidim/dev/assets/import_members.csv
diff --git a/decidim-dev/lib/decidim/dev/assets/import_participatory_space_private_users_invalid_col_sep.csv b/decidim-dev/lib/decidim/dev/assets/import_members_invalid_col_sep.csv
similarity index 100%
rename from decidim-dev/lib/decidim/dev/assets/import_participatory_space_private_users_invalid_col_sep.csv
rename to decidim-dev/lib/decidim/dev/assets/import_members_invalid_col_sep.csv
diff --git a/decidim-dev/lib/decidim/dev/assets/import_participatory_space_private_users_iso8859-1.csv b/decidim-dev/lib/decidim/dev/assets/import_members_iso8859-1.csv
similarity index 100%
rename from decidim-dev/lib/decidim/dev/assets/import_participatory_space_private_users_iso8859-1.csv
rename to decidim-dev/lib/decidim/dev/assets/import_members_iso8859-1.csv
diff --git a/decidim-dev/lib/decidim/dev/assets/import_participatory_space_private_users_nok.csv b/decidim-dev/lib/decidim/dev/assets/import_members_nok.csv
similarity index 100%
rename from decidim-dev/lib/decidim/dev/assets/import_participatory_space_private_users_nok.csv
rename to decidim-dev/lib/decidim/dev/assets/import_members_nok.csv
diff --git a/decidim-dev/lib/decidim/dev/assets/import_participatory_space_private_users_with_bom.csv b/decidim-dev/lib/decidim/dev/assets/import_members_with_bom.csv
similarity index 100%
rename from decidim-dev/lib/decidim/dev/assets/import_participatory_space_private_users_with_bom.csv
rename to decidim-dev/lib/decidim/dev/assets/import_members_with_bom.csv
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/comments.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/comments.rb
index d2f3a3a5dcbdb..968a0c8bd65a8 100644
--- a/decidim-dev/lib/decidim/dev/test/rspec_support/comments.rb
+++ b/decidim-dev/lib/decidim/dev/test/rspec_support/comments.rb
@@ -3,7 +3,7 @@
 module CommentsHelpers
   def have_comment_from(user, text, opts = {})
     within "#comments" do
-      have_content(user.name, **opts).and have_content(text, **opts)
+      have_content(decidim_sanitize_translated(user.name).gsub("\n", " "), **opts).and have_content(text, **opts)
     end
   end
 
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/helpers.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/helpers.rb
index b78032386b153..b95c635b78078 100644
--- a/decidim-dev/lib/decidim/dev/test/rspec_support/helpers.rb
+++ b/decidim-dev/lib/decidim/dev/test/rspec_support/helpers.rb
@@ -34,7 +34,7 @@ def within_admin_menu
 
     def within_language_menu(options = {})
       within(options[:admin] ? ".language-choose" : "header") do
-        find(options[:admin] ? "#admin-menu-trigger" : "#trigger-dropdown-language-chooser").click
+        find(options[:admin] ? "#admin-menu-trigger" : "#trigger-dropdown-menu-language-chooser-desktop").click
         yield
       end
     end
diff --git a/decidim-dev/spec/types/errors_spec.rb b/decidim-dev/spec/types/errors_spec.rb
new file mode 100644
index 0000000000000..170615943a778
--- /dev/null
+++ b/decidim-dev/spec/types/errors_spec.rb
@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "decidim/api/test"
+
+describe "Decidim::Api::Errors" do
+  include_context "with a graphql class type"
+
+  let(:query) do
+    %(
+      query {
+        testedError
+      }
+    )
+  end
+
+  let(:schema) do
+    klass = type_class
+    Class.new(Decidim::Api::Schema) do
+      query klass
+    end
+  end
+
+  before do
+    I18n.backend.reload!
+    I18n.backend.store_translations(
+      :en,
+      decidim: {
+        test: "Test %{name}"
+      }
+    )
+  end
+
+  context "when Decidim::Api::Errors::PermissionNotSetError is raised" do
+    let(:type_class) do
+      Class.new(Decidim::Api::Types::BaseObject) do
+        graphql_name "ErrorTypeTest"
+        field :tested_error, String, null: false
+
+        def tested_error
+          raise Decidim::PermissionAction::PermissionNotSetError, "Exemplifying permission not set error"
+        end
+      end
+    end
+
+    it "throws exception" do
+      expect { response }.to raise_error(Decidim::Api::Errors::PermissionNotSetError, /Permission has not been set for this/)
+    end
+  end
+
+  context "when Decidim::Api::Errors::LocaleError is raised because of I18n::MissingInterpolationArgument is raised" do
+    let(:type_class) do
+      Class.new(Decidim::Api::Types::BaseObject) do
+        graphql_name "ErrorTypeTest"
+        field :tested_error, String, null: false
+
+        def tested_error
+          I18n.translate!("decidim.test", invalid_interpolation: "Testing Missing interpolation argument")
+        end
+      end
+    end
+
+    it "throws exception" do
+      expect { response }.to raise_error(Decidim::Api::Errors::LocaleError, "There was an error while internally handling i18n data")
+    end
+  end
+
+  context "when Decidim::Api::Errors::LocaleError is raised because of I18n::MissingTranslationData is raised" do
+    let(:type_class) do
+      Class.new(Decidim::Api::Types::BaseObject) do
+        graphql_name "ErrorTypeTest"
+        field :tested_error, String, null: false
+
+        def tested_error
+          I18n.translate!("decidim.invalid_translation_key")
+        end
+      end
+    end
+
+    it "throws exception" do
+      expect { response }.to raise_error(Decidim::Api::Errors::LocaleError, "There was an error while internally handling i18n data")
+    end
+  end
+
+  context "when Decidim::Api::Errors::InvalidLocaleError is raised because of I18n::InvalidLocaleError is raised" do
+    let(:type_class) do
+      Class.new(Decidim::Api::Types::BaseObject) do
+        graphql_name "ErrorTypeTest"
+        field :tested_error, String, null: false
+
+        def tested_error
+          I18n.with_locale("invalid_locale") do
+            I18n.translate!("decidim.test", name: "test")
+          end
+        end
+      end
+    end
+
+    it "throws exception" do
+      expect { response }.to raise_error(Decidim::Api::Errors::InvalidLocaleError, "Invalid locale provided")
+    end
+  end
+end
diff --git a/decidim-elections/app/commands/decidim/elections/admin/process_census.rb b/decidim-elections/app/commands/decidim/elections/admin/process_census.rb
index f56e06415240e..9bbf4c67ee5a9 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/process_census.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/process_census.rb
@@ -9,7 +9,7 @@ class ProcessCensus < Decidim::Commands::UpdateResource
         def attributes
           {
             census_manifest: resource.census.name,
-            census_settings: census_settings
+            census_settings:
           }
         end
 
diff --git a/decidim-elections/app/commands/decidim/elections/cast_votes.rb b/decidim-elections/app/commands/decidim/elections/cast_votes.rb
index 0f5a93655d823..d3842a8c186c2 100644
--- a/decidim-elections/app/commands/decidim/elections/cast_votes.rb
+++ b/decidim-elections/app/commands/decidim/elections/cast_votes.rb
@@ -40,11 +40,11 @@ def save_votes!
         voted_questions.each do |question, responses|
           raise StandardError, "No responses for question #{question.id}" if responses.blank?
 
-          question.votes.where(voter_uid: voter_uid).destroy_all
+          question.votes.where(voter_uid:).destroy_all
           responses.each do |response_option|
             question.votes.create!(
-              voter_uid: voter_uid,
-              response_option: response_option
+              voter_uid:,
+              response_option:
             )
           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 08cf7b7c030c8..4561b6e6bfbeb 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
@@ -49,10 +49,16 @@ def create
 
       # Shows the receipt page
       def receipt
+        if params[:exit].present?
+          votes_buffer.clear
+          session_attributes.clear
+          return redirect_to(exit_path)
+        end
+
         enforce_permission_to(:create, :vote, election:)
 
-        votes_buffer.clear
-        session_attributes.clear
+        votes_buffer.clear unless election.per_question?
+
         return redirect_to(exit_path) unless election.votes.exists?(voter_uid: session[:voter_uid])
 
         render "decidim/elections/votes/receipt"
@@ -85,7 +91,7 @@ def response_chosen?(response_option)
 
       def previous_responses
         @previous_responses ||= election.questions.to_h do |question|
-          [question.id.to_s, question.votes.where(voter_uid: voter_uid).pluck(:response_option_id).map(&:to_s)]
+          [question.id.to_s, question.votes.where(voter_uid:).pluck(:response_option_id).map(&:to_s)]
         end
       end
     end
diff --git a/decidim-elections/app/controllers/decidim/elections/admin/census_controller.rb b/decidim-elections/app/controllers/decidim/elections/admin/census_controller.rb
index d22ef580641ad..833b58c7ccecb 100644
--- a/decidim-elections/app/controllers/decidim/elections/admin/census_controller.rb
+++ b/decidim-elections/app/controllers/decidim/elections/admin/census_controller.rb
@@ -11,15 +11,15 @@ class CensusController < Admin::ApplicationController
         before_action :set_census_manifest, only: [:edit, :update]
 
         def edit
-          enforce_permission_to :update, :census, election: election
+          enforce_permission_to(:update, :census, election:)
 
-          @form = form(election.census.admin_form.constantize).from_params(election.census_settings, election: election) if election.census && election.census.admin_form.present?
+          @form = form(election.census.admin_form.constantize).from_params(election.census_settings, election:) if election.census && election.census.admin_form.present?
         end
 
         def update
-          enforce_permission_to :update, :census, election: election
+          enforce_permission_to(:update, :census, election:)
 
-          @form = form(election.census.admin_form.constantize).from_params(params, election: election) if election.census.admin_form.present?
+          @form = form(election.census.admin_form.constantize).from_params(params, election:) if election.census.admin_form.present?
 
           ProcessCensus.call(@form, election) do
             on(:ok) do
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 bddf6d142ed39..2b7da14469687 100644
--- a/decidim-elections/app/controllers/decidim/elections/admin/elections_controller.rb
+++ b/decidim-elections/app/controllers/decidim/elections/admin/elections_controller.rb
@@ -46,7 +46,7 @@ def edit
         end
 
         def update
-          enforce_permission_to :update, :election, election: election
+          enforce_permission_to(:update, :election, election:)
 
           @form = form(Decidim::Elections::Admin::ElectionForm).from_params(params, current_component:, election:)
 
@@ -64,7 +64,7 @@ def update
         end
 
         def publish
-          enforce_permission_to :publish, :election, election: election
+          enforce_permission_to(:publish, :election, election:)
 
           PublishElection.call(election, current_user) do
             on(:ok) do
@@ -80,7 +80,7 @@ def publish
         end
 
         def unpublish
-          enforce_permission_to :unpublish, :election, election: election
+          enforce_permission_to(:unpublish, :election, election:)
 
           Decidim::Elections::Admin::UnpublishElection.call(election, current_user) do
             on(:ok) do
@@ -96,7 +96,7 @@ def unpublish
         end
 
         def dashboard
-          enforce_permission_to :dashboard, :election, election: election
+          enforce_permission_to(:dashboard, :election, election:)
 
           respond_to do |format|
             format.html { render :dashboard }
@@ -107,7 +107,7 @@ def dashboard
         end
 
         def update_status
-          enforce_permission_to :update, :election, election: election
+          enforce_permission_to(:update, :election, election:)
 
           status_action = params[:status_action]
           UpdateElectionStatus.call(status_action, election) do
@@ -123,7 +123,7 @@ def update_status
         end
 
         def toggle_census_check
-          enforce_permission_to :update, :election, election: election
+          enforce_permission_to(:update, :election, election:)
 
           value = ActiveModel::Type::Boolean.new.cast(params[:allow_census_check_before_start])
           election.update!(allow_census_check_before_start: value)
diff --git a/decidim-elections/app/controllers/decidim/elections/per_question_votes_controller.rb b/decidim-elections/app/controllers/decidim/elections/per_question_votes_controller.rb
index cceaddb0fc58d..485fecadcce39 100644
--- a/decidim-elections/app/controllers/decidim/elections/per_question_votes_controller.rb
+++ b/decidim-elections/app/controllers/decidim/elections/per_question_votes_controller.rb
@@ -16,12 +16,20 @@ class PerQuestionVotesController < Decidim::Elections::ApplicationController
       end
 
       before_action only: [:show, :update] do
-        redirect_to(**next_vote_step_action) unless question.voting_enabled?
+        redirect_to(**next_vote_step_action) unless question.voting_enabled? || request.format.json?
       end
 
       # Show the voting form for the given question
+      # Responds to HTML (render the form) and JSON (check question status for polling)
       def show
         enforce_permission_to(:create, :vote, election:)
+
+        respond_to do |format|
+          format.html
+          format.json do
+            render json: question_status_response
+          end
+        end
       end
 
       # Saves the vote for the current question and redirect to the next question
@@ -29,6 +37,7 @@ def update
         enforce_permission_to(:create, :vote, election:)
 
         response_ids = params.dig(:response, question.id.to_s)
+        requeue_following_questions
         votes_buffer[question.id.to_s] = response_ids
         CastVotes.call(election, { question.id.to_s => response_ids }, voter_uid) do
           on(:ok) do
@@ -84,6 +93,24 @@ def next_vote_step_action
 
         { action: :show, id: next_question }
       end
+
+      # Returns JSON response with question voting status for client-side polling.
+      # Used to redirect users when a question's voting is closed while they are on the voting page.
+      def question_status_response
+        if question.voting_enabled?
+          { voting_enabled: true, redirect_url: nil }
+        else
+          redirect_action = next_vote_step_action
+          { voting_enabled: false, redirect_url: url_for(**redirect_action) }
+        end
+      end
+
+      def requeue_following_questions
+        election.questions
+                .where("position > ?", question.position)
+                .pluck(:id)
+                .each { |id| votes_buffer.delete(id.to_s) }
+      end
     end
   end
 end
diff --git a/decidim-elections/app/forms/decidim/elections/censuses/internal_users_form.rb b/decidim-elections/app/forms/decidim/elections/censuses/internal_users_form.rb
index 9f4f67e2695e7..58e1d02cc8941 100644
--- a/decidim-elections/app/forms/decidim/elections/censuses/internal_users_form.rb
+++ b/decidim-elections/app/forms/decidim/elections/censuses/internal_users_form.rb
@@ -29,7 +29,7 @@ def authorizations
             [
               adapter,
               Decidim::Verifications::Authorizations.new(
-                organization: organization,
+                organization:,
                 user: current_user,
                 name: adapter.name
               ).first
diff --git a/decidim-elections/app/models/decidim/elections/vote.rb b/decidim-elections/app/models/decidim/elections/vote.rb
index 1af4fdf945dd5..0c161cfdd34ec 100644
--- a/decidim-elections/app/models/decidim/elections/vote.rb
+++ b/decidim-elections/app/models/decidim/elections/vote.rb
@@ -31,7 +31,7 @@ def response_belong_to_question
 
       def max_votable_options
         return unless question && response_option
-        return if question.votes.where.not(id: id).where(voter_uid: voter_uid).count < question.max_votable_options
+        return if question.votes.where.not(id:).where(voter_uid:).count < question.max_votable_options
 
         errors.add(:response_option, :invalid)
       end
diff --git a/decidim-elections/app/packs/entrypoints/decidim_elections.js b/decidim-elections/app/packs/entrypoints/decidim_elections.js
index bd596b1dff83e..7238e2af9520d 100644
--- a/decidim-elections/app/packs/entrypoints/decidim_elections.js
+++ b/decidim-elections/app/packs/entrypoints/decidim_elections.js
@@ -2,6 +2,7 @@ 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";
+import "src/decidim/elections/question_status_checker.js";
 
 // Images
 require.context("../images", true)
diff --git a/decidim-elections/app/packs/src/decidim/elections/live_results_update.js b/decidim-elections/app/packs/src/decidim/elections/live_results_update.js
index 335a7ad29154e..fa97538eac739 100644
--- a/decidim-elections/app/packs/src/decidim/elections/live_results_update.js
+++ b/decidim-elections/app/packs/src/decidim/elections/live_results_update.js
@@ -12,6 +12,7 @@ document.addEventListener("DOMContentLoaded", () => {
   const optionVoteCountTexts = () => document.querySelectorAll("[data-option-votes-count-text]");
   const optionVotePercentTexts = () => document.querySelectorAll("[data-option-votes-percent-text]");
   const optionVoteWidths = () => document.querySelectorAll("[data-option-votes-width]");
+  const questionTotalVotesTexts = () => document.querySelectorAll("[data-question-total-votes-text]");
   
   const animateText = (element, value) => {
     if (element.textContent === value) {
@@ -24,6 +25,15 @@ document.addEventListener("DOMContentLoaded", () => {
     }, 1000);
   };
   
+  const digQuestionValue = (questionId, data, key) => {
+    const questions = data.questions || [];
+    const question = questions.find((item) => item.id === parseInt(questionId, 10));
+    if (!question || !(key in question)) {
+      return null;
+    }
+    return question[key];
+  };
+
   const digOptionValue = (questionId, optionId, data, key) => {
     data.questions = data.questions || [];
     const question = data.questions.find((item) => item.id === parseInt(questionId, 10));
@@ -55,6 +65,11 @@ document.addEventListener("DOMContentLoaded", () => {
       questionElement.id = `question-${question.id}`;
       questionElement.classList.remove("hidden");
       questionElement.querySelector("[data-question-body]").textContent = question.body;
+      const totalVotesElement = questionElement.querySelector("[data-question-total-votes-text]");
+      if (totalVotesElement) {
+        totalVotesElement.dataset.questionTotalVotesText = question.id;
+        totalVotesElement.textContent = question.total_votes_text || "";
+      }
       const optionsContainer = questionElement.querySelector("[data-options-container]");
       question.response_options.forEach((option) => {
         const optionElement = optionTemplate.cloneNode(true);
@@ -106,6 +121,13 @@ document.addEventListener("DOMContentLoaded", () => {
           el.style.width = `${val}%`;
         }
       });
+      questionTotalVotesTexts().forEach((el) => {
+        const questionId = el.dataset.questionTotalVotesText;
+        const val = digQuestionValue(questionId, data, "total_votes_text");
+        if (val) {
+          animateText(el, val);
+        }
+      });
       // repeat for ongoing elections only
       if (data.ongoing) {
         setTimeout(fetchResults, 4000);
diff --git a/decidim-elections/app/packs/src/decidim/elections/question_status_checker.js b/decidim-elections/app/packs/src/decidim/elections/question_status_checker.js
new file mode 100644
index 0000000000000..0622211a6c764
--- /dev/null
+++ b/decidim-elections/app/packs/src/decidim/elections/question_status_checker.js
@@ -0,0 +1,42 @@
+/**
+ * Polls the server to check if the current question is still available for voting.
+ * When voting is closed, redirects user to the waiting room or next question.
+ */
+document.addEventListener("DOMContentLoaded", () => {
+  const votingBooth = document.querySelector("[data-question-status-url]");
+  if (!votingBooth) {
+    return;
+  }
+
+  const statusUrl = votingBooth.dataset.questionStatusUrl;
+  if (!statusUrl) {
+    return;
+  }
+
+  const checkStatus = async () => {
+    try {
+      const response = await fetch(statusUrl, {
+        method: "GET",
+        headers: {
+          "Accept": "application/json",
+          "Content-Type": "application/json",
+          "X-Requested-With": "XMLHttpRequest"
+        }
+      });
+
+      if (response.ok) {
+        const result = await response.json();
+        if (!result.voting_enabled && result.redirect_url) {
+          window.location.href = result.redirect_url;
+          return;
+        }
+      }
+    } catch (error) {
+      console.error("[QuestionStatusChecker] Error:", error);
+    }
+
+    setTimeout(checkStatus, 1000);
+  };
+
+  setTimeout(checkStatus, 1000);
+});
diff --git a/decidim-elections/app/presenters/decidim/elections/election_presenter.rb b/decidim-elections/app/presenters/decidim/elections/election_presenter.rb
index 0d002734754c6..1e129078b5f50 100644
--- a/decidim-elections/app/presenters/decidim/elections/election_presenter.rb
+++ b/decidim-elections/app/presenters/decidim/elections/election_presenter.rb
@@ -42,7 +42,13 @@ def to_json(admin: false)
               body: translated_attribute(question.body),
               position: question.position,
               voting_enabled: question.voting_enabled?,
-              published_results: question.published_results?,
+              published_results: question.published_results?
+            }.tap do |hash|
+              next unless admin || result_published_questions.include?(question)
+
+              hash[:total_votes] = question.total_votes
+              hash[:total_votes_text] = I18n.t("total_votes", scope: "decidim.elections.elections.vote_results", count: question.total_votes)
+            end.merge(
               response_options: question.response_options.map do |option|
                 {
                   id: option.id,
@@ -56,7 +62,7 @@ def to_json(admin: false)
                   hash[:votes_percent] = option.votes_percent
                 end
               end
-            }
+            )
           end
         }
       end
diff --git a/decidim-elections/app/views/decidim/elections/admin/censuses/_internal_users_form.html.erb b/decidim-elections/app/views/decidim/elections/admin/censuses/_internal_users_form.html.erb
index 3457f04c1fcd0..86b35414e858a 100644
--- a/decidim-elections/app/views/decidim/elections/admin/censuses/_internal_users_form.html.erb
+++ b/decidim-elections/app/views/decidim/elections/admin/censuses/_internal_users_form.html.erb
@@ -10,7 +10,7 @@
     <div class="row">
       <%= builder.label { builder.check_box + builder.text } %>
       <div id="authorization-handler-<%= builder.value %>" class="authorization-handler my-4 ml-6" style="display: <%= form.object.authorization_handlers_names.include?(builder.value) ? "block" : "none" %>;">
-        <%= render "decidim/elections/admin/censuses/internal_users_options_form", form: form, handler_name: builder.value %>
+        <%= render "decidim/elections/admin/censuses/internal_users_options_form", form:, handler_name: builder.value %>
       </div>
     </div>
   <% end %>
diff --git a/decidim-elections/app/views/decidim/elections/admin/dashboard/_questions_with_results.html.erb b/decidim-elections/app/views/decidim/elections/admin/dashboard/_questions_with_results.html.erb
index 2e3c5642e5ce7..b6018efd93181 100644
--- a/decidim-elections/app/views/decidim/elections/admin/dashboard/_questions_with_results.html.erb
+++ b/decidim-elections/app/views/decidim/elections/admin/dashboard/_questions_with_results.html.erb
@@ -35,6 +35,11 @@
                 <td data-option-votes-percent-text="<%= question.id %>,<%= option.id %>"><%= number_to_percentage(option.votes_percent, precision: 1) %></td>
               </tr>
             <% end %>
+            <tr>
+              <td class="w-2/3 border-none"><%= t("decidim.elections.admin.dashboard.questions_table.total") %></td>
+              <td class="border-none"></td>
+              <td class="border-none" data-question-total-votes-text="<%= question.id %>"><%= t("votes_count", scope: "decidim.elections.admin.dashboard.questions_table", count: question.total_votes) %></td>
+            </tr>
             </tbody>
           </table>
         </div>
diff --git a/decidim-elections/app/views/decidim/elections/admin/elections/_election-tr.html.erb b/decidim-elections/app/views/decidim/elections/admin/elections/_election-tr.html.erb
index 282943921e40e..21b3255c510be 100644
--- a/decidim-elections/app/views/decidim/elections/admin/elections/_election-tr.html.erb
+++ b/decidim-elections/app/views/decidim/elections/admin/elections/_election-tr.html.erb
@@ -25,6 +25,6 @@
     <%= election.census&.label %>
   </td>
   <td data-label="<%= t("actions.title", scope: "decidim.elections") %>" class="table-list__actions">
-    <%= render partial: "decidim/elections/admin/elections/actions", locals: { election: election, view: view } %>
+    <%= render partial: "decidim/elections/admin/elections/actions", locals: { election:, view: } %>
   </td>
 </tr>
diff --git a/decidim-elections/app/views/decidim/elections/censuses/_internal_users_form.html.erb b/decidim-elections/app/views/decidim/elections/censuses/_internal_users_form.html.erb
index 7a286593fc830..2e1c535d2a928 100644
--- a/decidim-elections/app/views/decidim/elections/censuses/_internal_users_form.html.erb
+++ b/decidim-elections/app/views/decidim/elections/censuses/_internal_users_form.html.erb
@@ -17,7 +17,7 @@
         </div>
     <% end %>
     <%= link_to t(".exit_button"), exit_path, class: "button button__secondary button__lg w-full mt-12" %>
-    <%= render "decidim/elections/censuses/submit_button", form: form, disabled: true %>
+    <%= render "decidim/elections/censuses/submit_button", form:, disabled: true %>
   <% else %>
     <% redirect_url = new_election_vote_path(election) %>
     <div class="verification__container">
@@ -54,7 +54,7 @@
         <% end %>
       <% end %>
     </div>
-    <%= render "decidim/elections/censuses/submit_button", form: form %>
+    <%= render "decidim/elections/censuses/submit_button", form: %>
     <% end %>
 <% else %>
   <%= render partial: "decidim/devise/shared/login_boxes", locals: { scope: "decidim.elections.censuses.internal_users" } %>
diff --git a/decidim-elections/app/views/decidim/elections/censuses/_token_csv_form.html.erb b/decidim-elections/app/views/decidim/elections/censuses/_token_csv_form.html.erb
index 7912c3774865a..c3eb7616cbb84 100644
--- a/decidim-elections/app/views/decidim/elections/censuses/_token_csv_form.html.erb
+++ b/decidim-elections/app/views/decidim/elections/censuses/_token_csv_form.html.erb
@@ -1,4 +1,4 @@
 <%= form.text_field :email, label: t(".email"), placeholder: t(".email_placeholder"), autofocus: true, required: true %>
 <%= form.text_field :token, label: t(".token"), placeholder: t(".token_placeholder"), required: true %>
 
-<%= render "decidim/elections/censuses/submit_button", form: form %>
+<%= render "decidim/elections/censuses/submit_button", form: %>
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 0826ccd0bb05c..91442a6932dc0 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
@@ -1,7 +1,8 @@
 <section class="layout-aside__section">
   <div class="election__aside-vote layout-aside__ctas-buttons" data-controller="sticky-buttons">
     <% if election.ongoing? %>
-      <%= link_to t("vote_button", scope: "decidim.elections.elections.show"), new_election_vote_path(election), class: "button button__secondary button__lg" %>
+      <% button_key = voted_by_current_user?(election) ? "edit_vote_button" : "vote_button" %>
+      <%= link_to t(button_key, scope: "decidim.elections.elections.show"), new_election_vote_path(election), class: "button button__secondary button__lg" %>
       <% if voted_by_current_user?(election) %>
         <div class="election__aside-voted mt-6 hidden lg:block">
           <span><%= icon "check-line", class: "fill-success inline mr-2" %></span>
diff --git a/decidim-elections/app/views/decidim/elections/elections/_vote_results_question.html.erb b/decidim-elections/app/views/decidim/elections/elections/_vote_results_question.html.erb
index a16df46eedbc4..5c439fd5e8bf4 100644
--- a/decidim-elections/app/views/decidim/elections/elections/_vote_results_question.html.erb
+++ b/decidim-elections/app/views/decidim/elections/elections/_vote_results_question.html.erb
@@ -9,5 +9,9 @@
     <% question.response_options.each_with_index do |option, index| %>
       <%= render "decidim/elections/elections/vote_results_option", option: %>
     <% end %>
+    <div class="py-4 flex justify-between items-center">
+      <span><%= t("decidim.elections.elections.vote_results.total") %></span>
+      <span data-question-total-votes-text="<%= question.id %>"><%= t("total_votes", scope: "decidim.elections.elections.vote_results", count: question.total_votes) %></span>
+    </div>
   </div>
 </div>
diff --git a/decidim-elections/app/views/decidim/elections/elections/index.html.erb b/decidim-elections/app/views/decidim/elections/elections/index.html.erb
index 80f249f8b1743..b9e16b4babfd6 100644
--- a/decidim-elections/app/views/decidim/elections/elections/index.html.erb
+++ b/decidim-elections/app/views/decidim/elections/elections/index.html.erb
@@ -1,7 +1,7 @@
 <% add_decidim_meta_tags(
      description: translated_attribute(current_participatory_space.short_description),
      title: t("decidim.components.pagination.page_title",
-              component_name: component_name,
+              component_name:,
               current_page: paginated_elections.current_page,
               total_pages: paginated_elections.total_pages ),
      url: elections_url,
diff --git a/decidim-elections/app/views/decidim/elections/elections/show.html.erb b/decidim-elections/app/views/decidim/elections/elections/show.html.erb
index b0d243dba2187..72ffbc413b70a 100644
--- a/decidim-elections/app/views/decidim/elections/elections/show.html.erb
+++ b/decidim-elections/app/views/decidim/elections/elections/show.html.erb
@@ -9,7 +9,7 @@
     resource_locator(election).edit,
     :update,
     :election,
-    election: election
+    election:
   )
 %>
 
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 0d7078b270212..d9162686b30c4 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,3 +1,4 @@
+<div class="voting-booth" data-question-status-url="<%= url_for(action: :show, id: question, format: :json) %>">
 <%= form_with url: url_for(action: :show, id: question), method: :patch, local: true do %>
   <%= question_title(question, :h1, class: "vote_booth-question_title") %>
   <div class="editor-content">
@@ -28,3 +29,4 @@
     </div>
   </div>
 <% end %>
+</div>
diff --git a/decidim-elections/app/views/decidim/elections/votes/receipt.html.erb b/decidim-elections/app/views/decidim/elections/votes/receipt.html.erb
index 7bdeb45e33781..9d240b5609fa5 100644
--- a/decidim-elections/app/views/decidim/elections/votes/receipt.html.erb
+++ b/decidim-elections/app/views/decidim/elections/votes/receipt.html.erb
@@ -4,5 +4,22 @@
     <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" %>
+
+  <% editable_question = election.per_question? ? election.questions.enabled.unpublished_results.last : nil %>
+  <% exit_button_path = election.per_question? ? url_for(action: :receipt, exit: true) : exit_path %>
+  <% if editable_question.present? %>
+    <div class="vote-navigation w-full flex justify-between mt-8">
+      <%= link_to election_per_question_vote_path(election_id: election, id: editable_question),
+                  class: "button button__lg button__transparent-secondary" do %>
+        <%= icon "edit-line", class: "fill-current mr-2" %>
+        <%= t(".edit_vote") %>
+      <% end %>
+
+      <div class="ml-auto">
+        <%= link_to t(".exit_button"), exit_button_path, class: "button button__lg button__secondary" %>
+      </div>
+    </div>
+  <% else %>
+    <%= link_to t(".exit_button"), exit_button_path, class: "button button__secondary button__lg w-full mt-12" %>
+  <% end %>
 </div>
diff --git a/decidim-elections/config/locales/ca-IT.yml b/decidim-elections/config/locales/ca-IT.yml
index 1ac5d68f61062..cf88a2147221b 100644
--- a/decidim-elections/config/locales/ca-IT.yml
+++ b/decidim-elections/config/locales/ca-IT.yml
@@ -81,6 +81,7 @@ ca-IT:
           questions_table:
             answer: Respostes
             percentage: Percentatge
+            total: Total
             votes: Vots
             votes_count:
               one: 1 vot
@@ -254,6 +255,7 @@ ca-IT:
           active_voting_until: 'Votació activa fins: %{end_date}'
           check_census_button: Comprova si pots votar
           check_census_explanation: Aquesta elecció encara no ha començat, però pots comprovar si constes 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 s'explicarà la teva última votació.
           votes_count:
@@ -266,6 +268,10 @@ ca-IT:
             per_question: Els resultats estan disponibles per pregunta. Pots veure els resultats de cada pregunta una vegada que s'habiliti la votació i es publiquin els resultats.
             real_time: Els resultats estan disponibles a temps real. Podeu veure els resultats mentre la votació està en curs.
           title: Resultats
+          total: 'TOTAL:'
+          total_votes:
+            one: 1 vot
+            other: "%{count} vots"
       models:
         election:
           fields:
@@ -314,6 +320,7 @@ ca-IT:
           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.
+          edit_vote: Edita el teu vot
           exit_button: Sortir de la cabina de votació
           title: El teu vot s'ha emès correctament
     metadata:
diff --git a/decidim-elections/config/locales/ca.yml b/decidim-elections/config/locales/ca.yml
index 32f5cc1f1f271..1fd3d4edf1777 100644
--- a/decidim-elections/config/locales/ca.yml
+++ b/decidim-elections/config/locales/ca.yml
@@ -81,6 +81,7 @@ ca:
           questions_table:
             answer: Respostes
             percentage: Percentatge
+            total: Total
             votes: Vots
             votes_count:
               one: 1 vot
@@ -254,6 +255,7 @@ ca:
           active_voting_until: 'Votació activa fins: %{end_date}'
           check_census_button: Comprova si pots votar
           check_census_explanation: Aquesta elecció encara no ha començat, però pots comprovar si constes 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 s'explicarà la teva última votació.
           votes_count:
@@ -266,6 +268,10 @@ ca:
             per_question: Els resultats estan disponibles per pregunta. Pots veure els resultats de cada pregunta una vegada que s'habiliti la votació i es publiquin els resultats.
             real_time: Els resultats estan disponibles a temps real. Podeu veure els resultats mentre la votació està en curs.
           title: Resultats
+          total: 'TOTAL:'
+          total_votes:
+            one: 1 vot
+            other: "%{count} vots"
       models:
         election:
           fields:
@@ -314,6 +320,7 @@ ca:
           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.
+          edit_vote: Edita el teu vot
           exit_button: Sortir de la cabina de votació
           title: El teu vot s'ha emès correctament
     metadata:
diff --git a/decidim-elections/config/locales/cs.yml b/decidim-elections/config/locales/cs.yml
index 26966015846a8..c1f5fcc63defb 100644
--- a/decidim-elections/config/locales/cs.yml
+++ b/decidim-elections/config/locales/cs.yml
@@ -36,6 +36,7 @@ cs:
         census:
           edit:
             created_at: Vytvořeno v
+            identifier: Identifikátor uživatele
         dashboard:
           calendar:
             end_at: 'Čas ukončení:'
@@ -71,6 +72,8 @@ cs:
             start_question_button: Povolit hlasování
             title: Výsledky
           status:
+            results_availability:
+              real_time: Výsledky jsou dostupné v reálném čase
             title: Stav voleb
         elections:
           create:
@@ -113,6 +116,9 @@ cs:
           edit_questions:
             new_question: Nová otázka
             title: Otázky
+          form:
+            errors:
+              at_least_one_question: Je vyžadována alespoň jedna otázka.
         statuses:
           publish_results:
             invalid: Při publikování výsledků došlo k chybě.
@@ -123,6 +129,9 @@ cs:
           publish: "%{user_name} zveřejnil volby %{resource_name} v %{space_name}"
           restore: "%{user_name} obnovil volby %{resource_name} v %{space_name}"
           update: "%{user_name} aktualizoval volby %{resource_name} v %{space_name}"
+      census_checks:
+        show:
+          title: Byl jste úspěšně ověřen
       censuses:
         internal_users:
           already_have_an_account?: Již máte účet?
@@ -176,6 +185,7 @@ cs:
         questions:
           title: Volební otázky
         show:
+          check_census_button: Zkontrolujte, zda mohu hlasovat
           vote_button: Hlasovat
         vote_results:
           subtitle:
diff --git a/decidim-elections/config/locales/en.yml b/decidim-elections/config/locales/en.yml
index a6d488e49d941..efbfb63cbbbb8 100644
--- a/decidim-elections/config/locales/en.yml
+++ b/decidim-elections/config/locales/en.yml
@@ -7,6 +7,11 @@ en:
       token_csv:
         file: File
         remove_all: Remove all current census data
+  activerecord:
+    models:
+      decidim/elections/election:
+        one: Election
+        other: Elections
   decidim:
     admin:
       menu:
@@ -82,6 +87,7 @@ en:
           questions_table:
             answer: Answers
             percentage: Percentage
+            total: Total
             votes: Votes
             votes_count:
               one: 1 vote
@@ -257,6 +263,7 @@ en:
           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.
+          edit_vote_button: Edit vote
           vote_button: Vote
           voted: You have already voted. You can vote again, only your last vote will be counted.
           votes_count:
@@ -269,6 +276,10 @@ en:
             per_question: Results are available per question. You can see the results for each question after voting is enabled and results are published.
             real_time: Results are available in real time. You can see the results while voting is in progress.
           title: Results
+          total: 'TOTAL:'
+          total_votes:
+            one: 1 vote
+            other: "%{count} votes"
       models:
         election:
           fields:
@@ -316,7 +327,8 @@ en:
           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.
+          description: You can vote again at any time while the voting period is open. Your previous vote will be overwritten by the new one.
+          edit_vote: Edit your vote
           exit_button: Exit the voting booth
           title: Your votes have been cast successfully
     metadata:
diff --git a/decidim-elections/config/locales/es-MX.yml b/decidim-elections/config/locales/es-MX.yml
index d7ad2f6ad4b59..53092aa54b98a 100644
--- a/decidim-elections/config/locales/es-MX.yml
+++ b/decidim-elections/config/locales/es-MX.yml
@@ -81,6 +81,7 @@ es-MX:
           questions_table:
             answer: Respuestas
             percentage: Porcentaje
+            total: Total
             votes: Votos
             votes_count:
               one: 1 voto
@@ -254,6 +255,7 @@ es-MX:
           active_voting_until: 'Votación activa hasta: %{end_date}'
           check_census_button: Comprobar si puedo votar
           check_census_explanation: Esta elección aún no ha comenzado, pero puede comprobar si constas 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:
@@ -266,6 +268,10 @@ es-MX:
             per_question: Los resultados están disponibles por pregunta. Puedes ver los resultados de cada pregunta una vez que se habilite la votación y se publiquen los resultados.
             real_time: Los resultados están disponibles en tiempo real. Puedes ver los resultados mientras la votación está en curso.
           title: Resultados
+          total: 'TOTAL:'
+          total_votes:
+            one: 1 voto
+            other: "%{count} votos"
       models:
         election:
           fields:
@@ -314,6 +320,7 @@ es-MX:
           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.
+          edit_vote: Edita tu voto
           exit_button: Salir de la cabina de votación
           title: Tu voto se ha emitido correctamente
     metadata:
diff --git a/decidim-elections/config/locales/es-PY.yml b/decidim-elections/config/locales/es-PY.yml
index 6b025b1a4a191..1754505bc2c36 100644
--- a/decidim-elections/config/locales/es-PY.yml
+++ b/decidim-elections/config/locales/es-PY.yml
@@ -81,6 +81,7 @@ es-PY:
           questions_table:
             answer: Respuestas
             percentage: Porcentaje
+            total: Total
             votes: Votos
             votes_count:
               one: 1 voto
@@ -254,6 +255,7 @@ es-PY:
           active_voting_until: 'Votación activa hasta: %{end_date}'
           check_census_button: Comprobar si puedo votar
           check_census_explanation: Esta elección aún no ha comenzado, pero puede comprobar si constas 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:
@@ -266,6 +268,10 @@ es-PY:
             per_question: Los resultados están disponibles por pregunta. Puedes ver los resultados de cada pregunta una vez que se habilite la votación y se publiquen los resultados.
             real_time: Los resultados están disponibles en tiempo real. Puedes ver los resultados mientras la votación está en curso.
           title: Resultados
+          total: 'TOTAL:'
+          total_votes:
+            one: 1 voto
+            other: "%{count} votos"
       models:
         election:
           fields:
@@ -314,6 +320,7 @@ es-PY:
           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.
+          edit_vote: Edita tu voto
           exit_button: Salir de la cabina de votación
           title: Tu voto se ha emitido correctamente
     metadata:
diff --git a/decidim-elections/config/locales/es.yml b/decidim-elections/config/locales/es.yml
index 6cfcba3b3f235..70bfec1d1c297 100644
--- a/decidim-elections/config/locales/es.yml
+++ b/decidim-elections/config/locales/es.yml
@@ -81,6 +81,7 @@ es:
           questions_table:
             answer: Respuestas
             percentage: Porcentaje
+            total: Total
             votes: Votos
             votes_count:
               one: 1 voto
@@ -254,6 +255,7 @@ es:
           active_voting_until: 'Votación activa hasta: %{end_date}'
           check_census_button: Comprobar si puedo votar
           check_census_explanation: Esta elección aún no ha comenzado, pero puede comprobar si constas 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:
@@ -266,6 +268,10 @@ es:
             per_question: Los resultados están disponibles por pregunta. Puedes ver los resultados de cada pregunta una vez que se habilite la votación y se publiquen los resultados.
             real_time: Los resultados están disponibles en tiempo real. Puedes ver los resultados mientras la votación está en curso.
           title: Resultados
+          total: 'TOTAL:'
+          total_votes:
+            one: 1 voto
+            other: "%{count} votos"
       models:
         election:
           fields:
@@ -314,6 +320,7 @@ es:
           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.
+          edit_vote: Edita tu voto
           exit_button: Salir de la cabina de votación
           title: Tu voto se ha emitido correctamente
     metadata:
diff --git a/decidim-elections/config/locales/eu.yml b/decidim-elections/config/locales/eu.yml
index aceb1772ed9d5..a14fde09a4b99 100644
--- a/decidim-elections/config/locales/eu.yml
+++ b/decidim-elections/config/locales/eu.yml
@@ -81,6 +81,7 @@ eu:
           questions_table:
             answer: Erantzunak
             percentage: Ehunekoa
+            total: Guztira
             votes: Babesak
             votes_count:
               one: Boto 1
@@ -96,6 +97,7 @@ eu:
             start_question_button: Botoa eman daiteke
             title: Emaitzak
           status:
+            allow_census_check_before_start: Parte hartzaileek botoa ematen duten ala ez egiaztatu ahal izango dute aukeraketa hasi aurretik
             census: 'Errolda:'
             results_availability:
               after_end: Emaitzak eskuragarri bozketak amaitu ondoren
@@ -140,6 +142,8 @@ eu:
           publish:
             invalid: Arazo bat egon da hauteskundea argitaratzean.
             success: Hauteskundea zuzen argitaratua.
+          toggle_census_check:
+            error: Akats bat gertatu da errolda egiaztatzean.
           unpublish:
             invalid: Arazo bat egon da hauteskundea despublikatzean.
             success: Hauteskundea zuzen despublikatua.
@@ -182,6 +186,11 @@ eu:
           update: "%{user_name} parte-hartzaileak %{resource_name} hauteskundea eguneratu du %{space_name} espazioan"
         question:
           update: "%{user_name} parte-hartzaileak eguneratu ditu %{resource_name} aukerako galderak"
+      census_checks:
+        show:
+          description: Behin hauteskundeak hasita, bertan bozkatu ahal izango da.
+          exit_button: Exit the census check
+          title: Behar bezala egiaztatu da
       censuses:
         census_ready_html: Erroldako datuak kargatuta daude eta prest daude % <b>%{election_title}{@eleccion_title}</b> bozketan erabiltzeko.
         census_size_html:
@@ -246,6 +255,9 @@ eu:
           title: Aukeraketaren galderak
         show:
           active_voting_until: 'Bozketa aktibo %{end_date} arte'
+          check_census_button: Begiratu ea botoa eman dezakedan
+          check_census_explanation: Hauteskunde hauek oraindik ez dira hasi, baina erroldan sartuta zauden egiazta dezakezu.
+          edit_vote_button: Editatu botoak
           vote_button: Eman babesa
           voted: Bozkatu duzu. Berriz bozkatu dezakezu, zure azken botoa baino ez da kontuan hartuko.
           votes_count:
@@ -258,6 +270,10 @@ eu:
             per_question: Emaitzak kontsulta daitezke galderaren arabera. Galdera bakoitzaren emaitzak ikus ditzakezu botoa eman eta emaitzak argitaratu ondoren.
             real_time: Emaitzak denbora errealean daude eskuragarri. Emaitzak ikus ditzakezu bozketa egiten den bitartean.
           title: Emaitzak
+          total: 'GUZTIRA:'
+          total_votes:
+            one: Bozka 1
+            other: "%{count} bozka"
       models:
         election:
           fields:
@@ -305,7 +321,8 @@ eu:
           max_choices_exceeded: Ezin da aukeratu % {max} aukera baino gehiago. Mesedez, itzuli eta doitu zure aukeraketa.
           next: Hurrengoa
         receipt:
-          description: Edozein unetan eman dezakezu botoa berriro, bozkatzeko epea irekita dagoen bitartean. Zure boto berriak aurrekoa gainidatziko du.
+          description: Bozkatzeko epea zabalik dagoen bitartean edozein unetan eman daiteke berriro botoa. Zure aurreko botoa berriaz gainidatziko da.
+          edit_vote: Zure botoa editau
           exit_button: Irten bozkatzeko kabinatik
           title: Zure botoak zuzen eman dira
     metadata:
diff --git a/decidim-elections/config/locales/fi-plain.yml b/decidim-elections/config/locales/fi-plain.yml
index e905e60076635..91b3daa5b41df 100644
--- a/decidim-elections/config/locales/fi-plain.yml
+++ b/decidim-elections/config/locales/fi-plain.yml
@@ -81,6 +81,7 @@ fi-pl:
           questions_table:
             answer: Vastaukset
             percentage: Prosentti
+            total: Yhteensä
             votes: Äänet
             votes_count:
               one: 1 ääni
@@ -96,6 +97,7 @@ fi-pl:
             start_question_button: Ota äänestys käyttöön
             title: Tulokset
           status:
+            allow_census_check_before_start: Salli käyttäjien tarkistaa, voivatko he äänestää ennen vaalin alkamista
             census: 'Henkilötietorekisteri:'
             results_availability:
               after_end: Tulokset ovat saatavilla vaalin päätyttyä
@@ -140,6 +142,8 @@ fi-pl:
           publish:
             invalid: Vaalin julkaisu epäonnistui.
             success: Vaalin julkaisu onnistui.
+          toggle_census_check:
+            error: Henkilötietorekisterin tarkastuksen käyttöönotto epäonnistui.
           unpublish:
             invalid: Vaalin julkaisun peruminen epäonnistui.
             success: Vaalin julkaisun peruminen onnistui.
@@ -182,6 +186,11 @@ fi-pl:
           update: "%{user_name} päivitti vaalia %{resource_name} tilassa %{space_name}"
         question:
           update: "%{user_name} päivitti kysymyksiä vaalille %{resource_name}"
+      census_checks:
+        show:
+          description: Tämä tarkoittaa sitä, että kun vaalit alkavat, voit äänestää niissä.
+          exit_button: Poistu väestölaskennan tarkastuksesta
+          title: Tilisi vahvistaminen onnistui
       censuses:
         census_ready_html: Henkilötietorekisterin tietoja ladataan ja valmistellaan käytettäväksi vaalissa <b>%{election_title}</b>.
         census_size_html:
@@ -246,6 +255,9 @@ fi-pl:
           title: Vaaliin liittyvät kysymykset
         show:
           active_voting_until: 'Äänestysaika päättyy: %{end_date}'
+          check_census_button: Tarkasta, voitko äänestää
+          check_census_explanation: Nämä vaalit eivät ole vielä alkaneet, mutta voit tarkistaa, onko sinut merkitty näiden vaalien henkilötietorekisteriin.
+          edit_vote_button: Muokkaa ääntä
           vote_button: Äänestä
           voted: Olet jo äänestänyt. Voit äänestää uudestaan, ainoastaan viimeinen äänesi otetaan huomioon ääntenlaskennassa.
           votes_count:
@@ -258,6 +270,10 @@ fi-pl:
             per_question: Tulokset ovat saatavilla kutakin kysymystä kohden. Näet kunkin kysymyksen tulokset, kun äänestys päättyy ja tulokset julkaistaan.
             real_time: Tulokset näkyvät reaaliaikaisesti. Näet tulokset äänestyksen aikana.
           title: Tulokset
+          total: 'YHTEENSÄ:'
+          total_votes:
+            one: 1 ääni
+            other: "%{count} ääntä"
       models:
         election:
           fields:
@@ -306,6 +322,7 @@ fi-pl:
           next: Seuraava
         receipt:
           description: Voit äänestää uudestaan äänestyksen ollessa auki. Aikaisempi äänesi mitätöidään ja korvataan antamallasi uudella äänellä.
+          edit_vote: Muokkaa ääntäsi
           exit_button: Poistu äänestyskopista
           title: Äänesi kirjaaminen onnistui
     metadata:
diff --git a/decidim-elections/config/locales/fi.yml b/decidim-elections/config/locales/fi.yml
index 9319fa8e6959c..6ed9d74e90177 100644
--- a/decidim-elections/config/locales/fi.yml
+++ b/decidim-elections/config/locales/fi.yml
@@ -81,6 +81,7 @@ fi:
           questions_table:
             answer: Vastaukset
             percentage: Prosentti
+            total: Yhteensä
             votes: Äänet
             votes_count:
               one: 1 ääni
@@ -96,6 +97,7 @@ fi:
             start_question_button: Ota äänestys käyttöön
             title: Tulokset
           status:
+            allow_census_check_before_start: Salli käyttäjien tarkistaa, voivatko he äänestää ennen vaalin alkamista
             census: 'Henkilötietorekisteri:'
             results_availability:
               after_end: Tulokset ovat saatavilla vaalin päätyttyä
@@ -140,6 +142,8 @@ fi:
           publish:
             invalid: Vaalin julkaisu epäonnistui.
             success: Vaalin julkaisu onnistui.
+          toggle_census_check:
+            error: Henkilötietorekisterin tarkastuksen käyttöönotto epäonnistui.
           unpublish:
             invalid: Vaalin julkaisun peruminen epäonnistui.
             success: Vaalin julkaisun peruminen onnistui.
@@ -182,6 +186,11 @@ fi:
           update: "%{user_name} päivitti vaalia %{resource_name} tilassa %{space_name}"
         question:
           update: "%{user_name} päivitti kysymyksiä vaalille %{resource_name}"
+      census_checks:
+        show:
+          description: Tämä tarkoittaa sitä, että kun vaalit alkavat, voit äänestää niissä.
+          exit_button: Poistu väestölaskennan tarkastuksesta
+          title: Tilisi vahvistaminen onnistui
       censuses:
         census_ready_html: Henkilötietorekisterin tietoja ladataan ja valmistellaan käytettäväksi vaalissa <b>%{election_title}</b>.
         census_size_html:
@@ -246,6 +255,9 @@ fi:
           title: Vaaliin liittyvät kysymykset
         show:
           active_voting_until: 'Äänestysaika päättyy: %{end_date}'
+          check_census_button: Tarkasta, voitko äänestää
+          check_census_explanation: Nämä vaalit eivät ole vielä alkaneet, mutta voit tarkistaa, onko sinut merkitty näiden vaalien henkilötietorekisteriin.
+          edit_vote_button: Muokkaa ääntä
           vote_button: Äänestä
           voted: Olet jo äänestänyt. Voit äänestää uudestaan, ainoastaan viimeinen äänesi otetaan huomioon ääntenlaskennassa.
           votes_count:
@@ -258,6 +270,10 @@ fi:
             per_question: Tulokset ovat saatavilla kutakin kysymystä kohden. Näet kunkin kysymyksen tulokset, kun äänestys päättyy ja tulokset julkaistaan.
             real_time: Tulokset näkyvät reaaliaikaisesti. Näet tulokset äänestyksen aikana.
           title: Tulokset
+          total: 'YHTEENSÄ:'
+          total_votes:
+            one: 1 ääni
+            other: "%{count} ääntä"
       models:
         election:
           fields:
@@ -306,6 +322,7 @@ fi:
           next: Seuraava
         receipt:
           description: Voit äänestää uudestaan äänestyksen ollessa auki. Aikaisempi äänesi mitätöidään ja korvataan antamallasi uudella äänellä.
+          edit_vote: Muokkaa ääntäsi
           exit_button: Poistu äänestyskopista
           title: Äänesi kirjaaminen onnistui
     metadata:
diff --git a/decidim-elections/config/locales/fr-CA.yml b/decidim-elections/config/locales/fr-CA.yml
index 63b0dcb6996ed..8cf5920a8e187 100644
--- a/decidim-elections/config/locales/fr-CA.yml
+++ b/decidim-elections/config/locales/fr-CA.yml
@@ -66,6 +66,7 @@ fr-CA:
             title: Questions
           questions_table:
             answer: Réponses
+            total: Total
             votes: Votes
             votes_count:
               one: 1 vote
@@ -211,6 +212,7 @@ fr-CA:
           active_voting_until: 'Vote actif jusqu''au : %{end_date}'
           check_census_button: Vérifier si je peux voter
           check_census_explanation: L'élection n'a pas encore commencé, mais vous pouvez vérifier si vous êtes inscrit dans le recensement.
+          edit_vote_button: Modifier le vote
           vote_button: Voter
           voted: Vous avez déjà voté. Vous pouvez voter à nouveau, seul votre dernier vote sera prise en compte.
           votes_count:
@@ -223,6 +225,10 @@ fr-CA:
             per_question: Les résultats sont disponibles par question. Vous pouvez voir les résultats pour chaque question après que le vote soit activé et que les résultats soient publiés.
             real_time: Les résultats sont disponibles en temps réel. Vous pouvez voir les résultats en cours de vote.
           title: Résultats
+          total: 'TOTAL :'
+          total_votes:
+            one: 1 vote
+            other: "%{count} votes"
       models:
         election:
           fields:
@@ -268,7 +274,8 @@ fr-CA:
           max_choices_exceeded: Vous ne pouvez pas sélectionner plus que %{max} options. Veuillez revenir en arrière et ajuster votre sélection.
           next: Suivant
         receipt:
-          description: Vous pouvez voter à nouveau à tout moment tant que la période de vote est ouverte. Votre vote précédent sera écrasé par le nouveau.
+          description: Vous pouvez voter à nouveau à tout moment pendant que la période de vote est ouverte. Votre vote précédent sera écrasé par le nouveau.
+          edit_vote: Modifier votre vote
           exit_button: Quitter l'isoloir
           title: Vos votes ont été exprimés avec succès
     metadata:
diff --git a/decidim-elections/config/locales/fr.yml b/decidim-elections/config/locales/fr.yml
index f213257812177..5ba33334c4983 100644
--- a/decidim-elections/config/locales/fr.yml
+++ b/decidim-elections/config/locales/fr.yml
@@ -66,6 +66,7 @@ fr:
             title: Questions
           questions_table:
             answer: Réponses
+            total: Total
             votes: Votes
             votes_count:
               one: 1 vote
@@ -211,6 +212,7 @@ fr:
           active_voting_until: 'Vote actif jusqu''au : %{end_date}'
           check_census_button: Vérifier si je peux voter
           check_census_explanation: L'élection n'a pas encore commencé, mais vous pouvez vérifier si vous êtes inscrit dans le recensement.
+          edit_vote_button: Modifier le vote
           vote_button: Voter
           voted: Vous avez déjà voté. Vous pouvez voter à nouveau, seul votre dernier vote sera prise en compte.
           votes_count:
@@ -223,6 +225,10 @@ fr:
             per_question: Les résultats sont disponibles par question. Vous pouvez voir les résultats pour chaque question après que le vote soit activé et que les résultats soient publiés.
             real_time: Les résultats sont disponibles en temps réel. Vous pouvez voir les résultats en cours de vote.
           title: Résultats
+          total: 'TOTAL :'
+          total_votes:
+            one: 1 vote
+            other: "%{count} votes"
       models:
         election:
           fields:
@@ -268,7 +274,8 @@ fr:
           max_choices_exceeded: Vous ne pouvez pas sélectionner plus que %{max} options. Veuillez revenir en arrière et ajuster votre sélection.
           next: Suivant
         receipt:
-          description: Vous pouvez voter à nouveau à tout moment tant que la période de vote est ouverte. Votre vote précédent sera écrasé par le nouveau.
+          description: Vous pouvez voter à nouveau à tout moment pendant que la période de vote est ouverte. Votre vote précédent sera écrasé par le nouveau.
+          edit_vote: Modifier votre vote
           exit_button: Quitter l'isoloir
           title: Vos votes ont été exprimés avec succès
     metadata:
diff --git a/decidim-elections/config/locales/ja.yml b/decidim-elections/config/locales/ja.yml
index c9098848640e4..69fa8c3ebafa6 100644
--- a/decidim-elections/config/locales/ja.yml
+++ b/decidim-elections/config/locales/ja.yml
@@ -1,6 +1,8 @@
 ja:
   activemodel:
     attributes:
+      elections_question:
+        max_choices: 選択肢の最大数
       token_csv:
         file: ファイル
         remove_all: 現在のセンサスデータをすべて削除する
@@ -78,6 +80,7 @@ ja:
           questions_table:
             answer: 回答
             percentage: パーセンテージ
+            total: 合計
             votes: 投票
             votes_count:
               other: "%{count} 票"
@@ -92,6 +95,7 @@ ja:
             start_question_button: 投票を有効化
             title: 結果
           status:
+            allow_census_check_before_start: 選挙開始前にユーザーが投票可能かどうかを確認できるようにする
             census: 'センサス：'
             results_availability:
               after_end: 選挙終了後に利用可能な結果
@@ -136,6 +140,8 @@ ja:
           publish:
             invalid: 選挙の公表中に問題が発生しました。
             success: 選挙を公開しました。
+          toggle_census_check:
+            error: センサスチェックを有効にする際にエラーが発生しました。
           unpublish:
             invalid: 選挙の非公表中に問題が発生しました。
             success: 選挙を非公開にしました。
@@ -178,6 +184,11 @@ ja:
           update: "%{user_name} が %{space_name} の %{resource_name} 選挙を更新しました"
         question:
           update: "%{user_name} が %{resource_name} 選挙の質問を更新しました"
+      census_checks:
+        show:
+          description: これは、選挙が始まったらあなたはその選挙に投票できるということを意味します。
+          exit_button: センサスチェックを終了
+          title: 正常に検証されました
       censuses:
         census_ready_html: センサスデータはアップロードされ、 <b>%{election_title}</b> 選挙での使用に備えられています。
         census_size_html:
@@ -240,6 +251,9 @@ ja:
           title: 選挙の質問
         show:
           active_voting_until: '有効な投票まで: %{end_date}'
+          check_census_button: 投票できるかどうかチェック
+          check_census_explanation: この選挙はまだ始まっていませんが、センサスの対象に含まれているかどうか確認できます。
+          edit_vote_button: 投票を編集
           vote_button: 投票
           voted: すでに投票済みです。再度投票することは可能ですが、最後に投票した内容のみが集計対象となります。
           votes_count:
@@ -251,6 +265,9 @@ ja:
             per_question: 結果は質問ごとに確認できます。投票が有効化され、結果が公開されると、各質問の結果を確認できるようになります。
             real_time: 結果はリアルタイムで確認できます。投票が行われている間も結果を閲覧可能です。
           title: 結果
+          total: '合計：'
+          total_votes:
+            other: "%{count}票"
       models:
         election:
           fields:
@@ -293,9 +310,13 @@ ja:
         question:
           back: 戻る
           cast_vote: 投票
+          max_choices: '最大選択数: %{count}'
+          max_choices_alert: 選択したオプションが多すぎます。続行するには選択をいくつか解除してください。
+          max_choices_exceeded: 選択できるオプションは最大 %{max} 個までです。一度戻って選択を調整してください。
           next: 次へ
         receipt:
           description: 投票期間中はいつでも再投票が可能です。以前の投票結果は新しい投票結果で上書きされます。
+          edit_vote: 投票を編集
           exit_button: 投票ブースを出る
           title: 投票は正常に行われました
     metadata:
diff --git a/decidim-elections/config/locales/pt-BR.yml b/decidim-elections/config/locales/pt-BR.yml
index 0b2cbf4c21ccf..79d9241c1da10 100644
--- a/decidim-elections/config/locales/pt-BR.yml
+++ b/decidim-elections/config/locales/pt-BR.yml
@@ -1,10 +1,22 @@
 pt-BR:
+  activemodel:
+    attributes:
+      elections_question:
+        max_choices: Número máximo de escolhas
+      token_csv:
+        file: Arquivo
+        remove_all: Remover todos os dados do censo atual
   decidim:
     admin:
       menu:
         elections_menu:
+          basic_elections: Principal
           election_census: Censo
+          election_dashboard: Painel de Controle
           election_questions: Questões
+      tooltips:
+        deleted_elections_info: Não é possível excluir esta eleição
+        edit_elections_info: Não é possível editar esta eleição
     components:
       elections:
         actions:
@@ -19,86 +31,280 @@ pt-BR:
             announcement: Anúncio
     elections:
       actions:
+        confirm_delete_election: Você tem certeza que deseja excluir esta eleição?
+        confirm_unpublish_election: Você tem certeza que deseja cancelar a publicação desta eleição?
+        deleted_election_info: Eleições excluídas não são exibidas na lista. Você pode visualizá-las clicando no botão abaixo.
+        edit: Editar eleição
+        new: Nova eleição
         preview: Pré-visualização
         title: Ações
+        view: Ver eleição
+        view_deleted_elections: Ver eleições excluídas
       admin:
         census:
           edit:
+            choose_census: Escolha o tipo de censo que deseja usar para esta eleição
             created_at: Criado em
+            identifier: Identificador de usuário
+          preview:
+            title:
+              one: A lista de pré-visualização é limitada ao registro %{count}.
+              other: A lista de pré-visualização é limitada aos %{count} registros.
+          update:
+            error: Ocorreu um erro ao gerar ou salvar o censo.
+            success: Censo atualizados com sucesso.
         dashboard:
+          calendar:
+            end_at: 'Hora de término:'
+            end_election: Final da eleição
+            manual_start: Manualmente
+            published_results_at: Resultados publicados em
+            start_at: 'Horário de início:'
+            start_election: Começar a eleição
+            title: Calendário
           census:
             title: Censo
           main:
             labels:
+              calendar: Calendário
               description: Descrição
+              image: Galeria de imagens
+              results: Disponibilidade de resultados
+              title: Título
+            title: Principal
+          publish_confirm: Você tem certeza que deseja publicar esta eleição?
           questions:
             labels:
               answers: Respostas
+            limit_info: Esta eleição tem mais perguntas. A previsão é limitada a três perguntas.
             title: Questões
           questions_table:
             answer: Respostas
+            percentage: Porcentagem
+            total: Total
             votes: Votos
+            votes_count:
+              one: 1 voto
+              other: "%{count} votos"
           results:
+            not_started: A eleição ainda não começou.
+            per_question_waiting: Votação ainda não está habilitada para nenhuma pergunta. Os participantes verão uma mensagem "Aguardando pela próxima pergunta" até que você ative pelo menos uma.
             publish_button: Publicar resultados
+            results_availability:
+              after_end: Você pode publicar todos os resultados após o término da eleição. Os resultados permanecerão ocultos até que você os publique manualmente.
+              per_question: Você precisa habilitar a votação e publicar manualmente os resultados para cada pergunta individualmente.
+              real_time: Os resultados são exibidos automaticamente durante a eleição.
+            start_question_button: Habilitar votação
             title: Resultados
           status:
+            allow_census_check_before_start: Permitir que os usuários verifiquem se eles podem votar antes do início da eleição
+            census: 'Censo:'
+            results_availability:
+              after_end: Resultados disponíveis após o término da eleição
+              per_question: Resultados disponíveis por pergunta
+              real_time: Resultados disponíveis em tempo real
             title: Status da eleição
         elections:
+          create:
+            invalid: Houve um problema ao criar a eleição.
+            success: Eleição criada com sucesso.
+          dashboard:
+            subtitle: 'Etapa final: Revise seus detalhes. Edições ainda podem ser feitas antes de publicar. Uma vez publicado, você ainda poderá atualizar a descrição das eleições.'
+            title: Painel de controle
           edit:
             title: Editar eleição
           form:
             add_images: Adicionar imagens
+            attachment_legend: Adicionar uma galeria de imagens (opcional)
+            basic_title: Informação básica
+            calendar: Calendário
+            calendar_description: Verifique se o fuso horário da organização está correto nas configurações da organização. A configuração atual é %{timezone}.
+            edit_attachments: Editar anexos
+            end_at: Hora de término
+            manual_start: Início manual
             publish: Publicar
+            results_availability:
+              after_end: Após o fim das eleições
+              after_end_help: publicar resultados quando a eleição for concluída
+              per_question: Pergunta por pergunta
+              per_question_help: manipular manualmente a votação e publicar os resultados para cada questão
+              real_time: Tempo real
+              real_time_help: publicar automaticamente os resultados durante a votação
+              title: Disponibilidade de resultados
+            save: Salvar e continuar
+            start_at: Horário de início
           index:
             title: Eleições
+          manage_trash:
+            title: Eleições apagadas
           new:
             title: Nova eleição
+          publish:
+            invalid: Ocorreu um erro ao publicar a eleição.
+            success: Eleição publicada com sucesso.
+          toggle_census_check:
+            error: Houve um erro ao habilitar a verificação do censo.
+          unpublish:
+            invalid: Ocorreu um erro ao cancelar a publicação da eleição.
+            success: Eleição não publicada com sucesso.
+          update:
+            invalid: Ocorreu um erro ao atualizar a eleição.
+            success: Eleição atualizada com sucesso.
         questions:
           edit_questions:
             new_question: Nova questão
+            remove_question_confirm: Tem certeza de que deseja excluir esta questão?
             title: Questões
+          form:
+            errors:
+              at_least_one_question: Pelo menos uma pergunta é necessária.
+            form_description: A pergunta deve ter pelo menos duas respostas para dar o passo seguinte.
+          update:
+            invalid: Ocorreu um erro ao atualizar as perguntas.
+            success: Perguntas atualizadas com sucesso.
         statuses:
+          enable_voting:
+            invalid: Houve um problema ao permitir a votação.
+            success: Votação habilitada com sucesso.
+          end:
+            invalid: Houve um problema ao terminar a eleição.
+            success: A eleição terminou com sucesso.
           publish_results:
             invalid: Ocorreu um erro ao publicar os resultados.
+            success: Resultados publicados com sucesso.
+          start:
+            invalid: Houve um problema ao iniciar a eleição.
+            success: Eleição iniciada com sucesso.
+          unknown: Status desconhecido
+      census_checks:
+        show:
+          description: Isto significa que, uma vez iniciadas as eleições, se pode votar nelas.
+          exit_button: Sair da verificação de censo
+          title: Você foi verificado com sucesso
       censuses:
+        census_ready_html: Os dados do censo são enviados e preparados para seu uso na eleição <b>%{election_title}</b>.
+        census_size_html:
+          one: Atualmente há uma pessoa <strong>1</strong> elegível para votar nesta eleição (isso pode mudar em um censo dinâmico).
+          other: Existem atualmente <strong>%{count}</strong> pessoas elegíveis para votar nesta eleição (isso pode mudar em um censo dinâmico).
+        internal_users:
+          already_have_an_account?: Já possui uma conta?
+          are_you_new?: Novo participante?
+          info_html: |
+            Você pode restringir a participação nas eleições para participantes que tenham uma autorização.<br>
+            Note que os participantes precisam cumprir as autorizações selecionadas para poder votar. Deixar todas as caixas de seleção vazias permitirá votar qualquer pessoa registrada.
+          internal_type_title: Autorização adicional necessária para votar (opcional)
+          label: Participantes registrados (dinâmico)
+          sign_in_description: Faça login para votar nesta eleição
+          sign_up_description: Criar uma conta para votar nesta eleição
+        internal_users_form:
+          authorization_options_invalid: Infelizmente, embora tenha todas as autorizações necessárias, algumas delas não são válidas para esta eleição.
+          exit_button: Sair da cabine de votação
+          invalid: Você não está autorizado a votar nesta eleição.
+          resume_with_method: Retomar verificação com %{name}
+          verify_with_method: Verificar com %{name}
+        token_csv:
+          example: |
+            email;token
+            user@example.org;123456
+            user2@example.org;ABCXYZ
+          info_html: |
+            Deve ser um arquivo em formato CSV com duas colunas, uma com o endereço de e-mail e outra com o valor de um token que o usuário deverá inserir para votar.
+            Deve ser separado por um ponto e vírgula (;)
+          label: Usuários não registrados com tokens (corrigidos)
+          remove_before_upload: Se você deseja carregar um novo censo, primeiro você deve remover o já existente.
+          upload_file: Enviar um arquivo
+          upload_new_census: Carregar arquivo CSV
         token_csv_form:
           email: E-mail
+          email_placeholder: Insira o endereço de email do eleitor
+          invalid: O email ou token não é válido. Por favor, verifique os detalhes e tente novamente.
+          token: Token
+          token_placeholder: Insira o token do eleitor
       elections:
         count:
           elections_count:
             one: "%{count} eleição"
             other: "%{count} eleições"
+        elections:
+          empty: Não há eleições disponíveis.
+          empty_filters: Não há eleições que correspondam aos seus filtros.
         filters:
           all: Todos
           state: Status
           state_values:
             finished: Finalizado
             ongoing: Em andamento
+            scheduled: Agendado
         orders:
+          end_at: Data de término
+          label: Ordenar por
           recent: Recente
+          start_at: Data de início
         questions:
+          subtitle: 'Estas são as questões que determinam este processo de votação:'
           title: Perguntas eleitorais
         show:
+          active_voting_until: 'Ativar votação até: %{end_date}'
+          check_census_button: Verifique se eu posso votar
+          check_census_explanation: Esta eleição ainda não começou, mas você pode verificar se está incluído no censo.
+          edit_vote_button: Editar voto
           vote_button: Voto
+          voted: Você já votou. Você pode votar novamente, apenas o seu último voto será contado.
+          votes_count:
+            one: 1 voto
+            other: "%{count} votos"
+          voting_began: 'Votação iniciada em: %{start_date}'
         vote_results:
+          subtitle:
+            after_end: A eleição terminou. Agora você pode ver os resultados.
+            per_question: Os resultados estão disponíveis por pergunta. Você pode ver os resultados para cada questão após a votação ser habilitada e os resultados são publicados.
+            real_time: Os resultados estão disponíveis em tempo real. Você pode ver os resultados enquanto a votação estiver em andamento.
           title: Resultados
+          total: 'TOTAL:'
+          total_votes:
+            one: 1 voto
+            other: "%{count} votos"
       models:
         election:
           fields:
             census: Censo
+            end_at: Hora de término
+            start_at: Horário de início
             status: Status
             title: Título
+      per_question_votes:
+        waiting:
+          description: Você pode esperar aqui até que a próxima pergunta esteja disponível. Você será automaticamente redirecionado para a próxima pergunta quando ela estiver pronta.
+          edit_vote: Edite seu voto
+          exit_button: Sair da sala de espera
+          title: Aguardando a próxima pergunta
       status:
         active: Ativo
         finished: Finalizado
         not_started: Não Iniciado
         ongoing: Em andamento
+        published_results: Resultados publicados
+        scheduled: Agendado
+        voting_enabled: Votação em andamento
       votes:
+        cast:
+          invalid: Houve um problema ao transmitir o seu voto. Por favor, verifique as informações que você forneceu e tente novamente.
+          success: Seu voto foi enviado com sucesso.
+        check_census:
+          access: Acesso
+          election_not_open: A eleição ainda não foi aberta. Por favor, verifique as datas e tente novamente.
+          form_title: Verifique sua identidade
         confirm:
+          edit_vote: Edite seu voto
           title: Confirme seu voto
         question:
           back: Voltar
+          cast_vote: Transmitir voto
           next: Próxima
+        receipt:
+          edit_vote: Edite seu voto
+          exit_button: Sair da cabine de votação
+          title: Seus votos foram enviados com sucesso
     statistics:
       elections_count: Eleições
   layouts:
diff --git a/decidim-elections/config/locales/ro-RO.yml b/decidim-elections/config/locales/ro-RO.yml
index 0cfdf9a37018a..468259880fc88 100644
--- a/decidim-elections/config/locales/ro-RO.yml
+++ b/decidim-elections/config/locales/ro-RO.yml
@@ -76,6 +76,7 @@ ro:
         active: Activ
         finished: Terminat
         not_started: Nu a început
+        unpublished: Nepublicate
       votes:
         confirm:
           title: Confirmă votul tău
diff --git a/decidim-elections/config/locales/sv.yml b/decidim-elections/config/locales/sv.yml
index 75992528f3265..b2f3c5c2eae72 100644
--- a/decidim-elections/config/locales/sv.yml
+++ b/decidim-elections/config/locales/sv.yml
@@ -62,11 +62,16 @@ sv:
             title: Frågor
           questions_table:
             answer: Svar
+            total: Totalt
             votes: Röster
+            votes_count:
+              one: 1 röst
+              other: "%{count} röster"
           results:
             publish_button: Publicera resultat
             title: Resultat
           status:
+            allow_census_check_before_start: Tillåt användare att kontrollera om de kan rösta innan valet börjar
             census: 'Folkräkning:'
             results_availability:
               after_end: Resultat tillgängliga efter valets slut
@@ -105,6 +110,8 @@ sv:
           publish:
             invalid: Det gick inte att publicera valet.
             success: Valet publicerades.
+          toggle_census_check:
+            error: Det gick inte att aktivera kontrollen av folkräkningen.
           unpublish:
             invalid: Det gick inte att ta bort valet.
             success: Valet togs bort.
@@ -123,6 +130,11 @@ sv:
           soft_delete: "%{user_name} Flyttade valet %{resource_name} i %{space_name} till papperskorgen"
           unpublish: "%{user_name} Tog bort valet %{resource_name} i %{space_name}"
           update: "%{user_name} Uppdaterade valet %{resource_name} i %{space_name}"
+      census_checks:
+        show:
+          description: Detta innebär att direkt när valet har startat kan ni rösta i det.
+          exit_button: Avsluta folkräkningskontrollen
+          title: Du har blivit auktoriserad
       censuses:
         internal_users:
           already_have_an_account?: Har du redan ett konto?
@@ -181,6 +193,9 @@ sv:
           subtitle: 'Detta är frågorna för denna omröstningsprocess:'
         show:
           active_voting_until: 'Aktiv röstning till: %{end_date}'
+          check_census_button: Kontrollera om jag kan rösta
+          check_census_explanation: Detta val har ännu inte börjat, men du kan kontrollera om du är med i folkräkningen.
+          edit_vote_button: Redigera röst
           vote_button: Rösta
           voted: Du har redan röstat. Om du röstar igen kommer bara den senaste rösten att räknas.
           votes_count:
@@ -193,6 +208,10 @@ sv:
             per_question: Resultat finns tillgängliga per fråga. Du kan se resultaten för varje fråga efter att röstning har aktiverats och resultaten är publicerade.
             real_time: Resultaten är tillgängliga i realtid. Du kan se resultaten medan omröstningen pågår.
           title: Resultat
+          total: 'TOTAL:'
+          total_votes:
+            one: 1 röst
+            other: "%{count} röster"
       models:
         election:
           fields:
@@ -238,6 +257,7 @@ sv:
           next: Nästa
         receipt:
           description: Du kan rösta igen så länge omröstningsperioden pågår. En ny omröstning kommer att skriva över den gamla.
+          edit_vote: Redigera din röst
           exit_button: Lämna valbåset
           title: Tack, din röst är mottagen
     metadata:
diff --git a/decidim-elections/lib/decidim/elections/component.rb b/decidim-elections/lib/decidim/elections/component.rb
index 9c6836fda5854..4b0e1bc14411c 100644
--- a/decidim-elections/lib/decidim/elections/component.rb
+++ b/decidim-elections/lib/decidim/elections/component.rb
@@ -10,10 +10,6 @@
 
   component.actions = %w()
 
-  component.on(:before_destroy) do |instance|
-    raise StandardError, "Cannot remove this component" if Decidim::Elections::Election.where(component: instance).any?
-  end
-
   component.register_stat :elections_count, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, _start_at, _end_at|
     elections = Decidim::Elections::Election.where(component: components).not_hidden
     elections.count
diff --git a/decidim-elections/lib/decidim/elections/engine.rb b/decidim-elections/lib/decidim/elections/engine.rb
index a9497ed99a9e5..06dd72474849c 100644
--- a/decidim-elections/lib/decidim/elections/engine.rb
+++ b/decidim-elections/lib/decidim/elections/engine.rb
@@ -28,6 +28,10 @@ class Engine < ::Rails::Engine
         get "/", to: redirect("elections", status: 301)
       end
 
+      initializer "decidim_elections.register_icons" do
+        Decidim.icons.register(name: "Decidim::Elections::Election", icon: "file-paper-2-line", description: "Elections", category: "activity", engine: :elections)
+      end
+
       initializer "decidim_elections.add_cells_view_paths" do
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Elections::Engine.root}/app/cells")
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Elections::Engine.root}/app/views") # for partials
@@ -47,7 +51,7 @@ class Engine < ::Rails::Engine
           manifest.voter_form_partial = "decidim/elections/censuses/token_csv_form"
           manifest.after_update_command = "Decidim::Elections::Admin::Censuses::TokenCsv"
           manifest.user_query do |election|
-            Decidim::Elections::Voter.where(election: election)
+            Decidim::Elections::Voter.where(election:)
           end
         end
 
diff --git a/decidim-elections/lib/decidim/elections/seeds.rb b/decidim-elections/lib/decidim/elections/seeds.rb
index 97e3ac0984c39..5e75f632b4d19 100644
--- a/decidim-elections/lib/decidim/elections/seeds.rb
+++ b/decidim-elections/lib/decidim/elections/seeds.rb
@@ -89,7 +89,7 @@ def create_questions_for!(election)
       def create_voters_for!(election)
         number_of_records.times do |i|
           Decidim::Elections::Voter.create!(
-            election: election,
+            election:,
             data: {
               "email" => "user#{i + 1}@example.org",
               "token" => SecureRandom.hex(6).upcase
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 4972a1da1469c..2f789fb9d98cc 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
@@ -31,7 +31,7 @@
     expect(page).to have_current_path(election_path)
     expect(page).to have_content("You have already voted.")
     expect(election.votes.where(voter_uid:).size).to eq(3)
-    click_on "Vote"
+    click_on "Edit vote"
     expect(page).to have_current_path(new_election_vote_path)
     fill_in "Email", with: election.voters.first.data["email"]
     fill_in "Token", with: election.voters.first.data["token"]
@@ -73,7 +73,7 @@
     expect(page).to have_current_path(election_path)
     expect(page).to have_content("You have already voted.")
     expect(election.votes.where(voter_uid:).size).to eq(2)
-    click_on "Vote"
+    click_on "Edit vote"
     expect(find("input[value='#{question1.response_options.first.id}']")).to be_checked
     choose translated_attribute(question1.response_options.second.body)
     click_on "Cast vote"
@@ -114,7 +114,7 @@
     expect(page).to have_current_path(election_path)
     expect(page).to have_content("You have already voted.")
     expect(election.votes.where(voter_uid:).size).to eq(1)
-    click_on "Vote"
+    click_on "Edit vote"
     expect(page).to have_current_path(election_vote_path(question2))
     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
@@ -171,3 +171,105 @@
     expect(page).to have_no_content("Edit your vote")
   end
 end
+
+shared_examples "a per question votable election with automatic redirect when question closes" do
+  it "redirects to the waiting room when admin closes voting while user is on question page" do
+    expect(page).to have_content(translated_attribute(election.title))
+    click_on "Vote"
+    expect(page).to have_current_path(election_vote_path(question1))
+    expect(page).to have_content(strip_tags(translated_attribute(question1.description)))
+
+    # Simulate admin closing voting for question1 (publishing results)
+    question1.update!(published_results_at: Time.current)
+
+    # Wait for JavaScript polling to detect the change and redirect
+    expect(page).to have_current_path(waiting_election_votes_path, wait: 3)
+    expect(page).to have_content("Waiting for the next question")
+  end
+
+  it "redirects to next question when admin closes current question and next is available" do
+    # Enable question2 from the start
+    question2.update!(voting_enabled_at: Time.current)
+
+    expect(page).to have_content(translated_attribute(election.title))
+    click_on "Vote"
+    expect(page).to have_current_path(election_vote_path(question1))
+    expect(page).to have_content(strip_tags(translated_attribute(question1.description)))
+
+    # Simulate admin closing voting for question1
+    question1.update!(published_results_at: Time.current)
+
+    # Wait for JavaScript polling to detect the change and redirect
+    expect(page).to have_current_path(election_vote_path(question2), wait: 3)
+    expect(page).to have_content(strip_tags(translated_attribute(question2.description)))
+  end
+end
+
+shared_examples "a per question votable election with edit from receipt" do
+  it "allows editing votes from receipt page" do
+    click_on "Vote"
+    choose translated_attribute(question1.response_options.first.body)
+    click_on "Cast vote"
+    check translated_attribute(question2.response_options.first.body)
+    click_on "Cast vote"
+    expect(page).to have_current_path(receipt_election_votes_path)
+    expect(page).to have_link("Edit your vote")
+    expect(page).to have_link("Exit the voting booth")
+
+    click_on "Edit your vote"
+    expect(page).to have_current_path(election_vote_path(question2))
+    expect(find("input[value='#{question2.response_options.first.id}']")).to be_checked
+
+    click_on "Back"
+    expect(page).to have_current_path(election_vote_path(question1))
+    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))
+
+    check translated_attribute(question2.response_options.second.body)
+    click_on "Cast vote"
+    expect(page).to have_current_path(receipt_election_votes_path)
+    expect(election.votes.where(voter_uid:).size).to eq(3)
+
+    click_on "Exit the voting booth"
+    expect(page).to have_current_path(election_path)
+    expect(page).to have_content("You have already voted.")
+  end
+end
+
+shared_examples "a per question votable election with edit from receipt when all questions enabled" do
+  it "allows editing any question from receipt page" do
+    click_on "Vote"
+    choose translated_attribute(question1.response_options.first.body)
+    click_on "Cast vote"
+    check translated_attribute(question2.response_options.first.body)
+    click_on "Cast vote"
+    expect(page).to have_current_path(receipt_election_votes_path)
+
+    click_on "Edit your vote"
+    expect(page).to have_current_path(election_vote_path(question2))
+
+    click_on "Back"
+    expect(page).to have_current_path(election_vote_path(question1))
+
+    choose translated_attribute(question1.response_options.second.body)
+    click_on "Cast vote"
+    expect(page).to have_current_path(election_vote_path(question2))
+    expect(find("input[value='#{question2.response_options.first.id}']")).to be_checked
+
+    click_on "Cast vote"
+    expect(page).to have_current_path(receipt_election_votes_path)
+
+    click_on "Edit your vote"
+    click_on "Back"
+    choose translated_attribute(question1.response_options.first.body)
+    click_on "Cast vote"
+    uncheck translated_attribute(question2.response_options.first.body)
+    check translated_attribute(question2.response_options.second.body)
+    click_on "Cast vote"
+    expect(page).to have_current_path(receipt_election_votes_path)
+    expect(election.votes.where(voter_uid:).size).to eq(2)
+  end
+end
diff --git a/decidim-elections/lib/decidim/elections/test/vote_controller_examples.rb b/decidim-elections/lib/decidim/elections/test/vote_controller_examples.rb
index 00d3f8692b2f1..fa86c9781fe97 100644
--- a/decidim-elections/lib/decidim/elections/test/vote_controller_examples.rb
+++ b/decidim-elections/lib/decidim/elections/test/vote_controller_examples.rb
@@ -2,9 +2,9 @@
 
 def do_action(action)
   if [:show, :confirm, :waiting, :receipt].include?(action)
-    get action, params: params
+    get(action, params:)
   else
-    patch action, params: params
+    patch action, params:
   end
 end
 
@@ -39,7 +39,7 @@ def do_action(action)
 shared_examples "an authenticated vote controller" do
   describe "GET new" do
     it "renders the new vote form" do
-      get :new, params: params
+      get(:new, params:)
       expect(response).to have_http_status(:ok)
       expect(assigns(:form)).to be_a(Decidim::Elections::Censuses::InternalUsersForm)
       expect(subject).to render_template("decidim/elections/votes/new")
@@ -52,7 +52,7 @@ def do_action(action)
 
       it "redirects to the question path" do
         expect(controller).to receive(:redirect_to).with(action: :show, id: question)
-        get :new, params: params
+        get(:new, params:)
 
         expect(controller.send(:session_authenticated?)).to be true
         expect(response).to render_template("decidim/elections/votes/new")
@@ -63,7 +63,7 @@ def do_action(action)
   describe "POST create" do
     it "renders the new form with errors when the form is invalid" do
       expect(controller).to receive(:redirect_to).with(action: :new)
-      post :create, params: params
+      post(:create, params:)
 
       expect(controller.send(:session_authenticated?)).to be false
       expect(controller.send(:voter_uid)).to be_nil
@@ -77,7 +77,7 @@ def do_action(action)
 
       it "creates the session credentials and redirects to form again" do
         expect(controller).to receive(:redirect_to).with(action: :show, id: question)
-        post :create, params: params
+        post(:create, params:)
 
         expect(session[:session_attributes]).to be_present
         expect(controller.send(:session_authenticated?)).to be true
diff --git a/decidim-elections/lib/decidim/elections/test/vote_examples.rb b/decidim-elections/lib/decidim/elections/test/vote_examples.rb
index 6c7f5326444a1..dcf717d30b8d3 100644
--- a/decidim-elections/lib/decidim/elections/test/vote_examples.rb
+++ b/decidim-elections/lib/decidim/elections/test/vote_examples.rb
@@ -44,7 +44,7 @@ def fill_in_votes
   click_on "Exit the voting booth"
   expect(page).to have_current_path(election_path)
   expect(page).to have_content("You have already voted.")
-  expect(election.votes.where(voter_uid: voter_uid).size).to eq(3)
+  expect(election.votes.where(voter_uid:).size).to eq(3)
 end
 
 shared_examples "a votable election" do
@@ -52,7 +52,7 @@ def fill_in_votes
     click_on "Vote"
 
     fill_in_votes
-    click_on "Vote"
+    click_on "Edit vote"
     expect(page).to have_current_path(election_vote_path(election.questions.first))
   end
 end
@@ -131,7 +131,7 @@ def fill_in_votes
     fill_in "Token", with: election.voters.first.data["token"]
     click_on "Access"
     fill_in_votes
-    click_on "Vote"
+    click_on "Edit vote"
     expect(page).to have_current_path(new_election_vote_path)
     fill_in "Email", with: election.voters.first.data["email"]
     fill_in "Token", with: election.voters.first.data["token"]
@@ -163,13 +163,14 @@ def fill_in_votes
     click_on "Exit the voting booth"
     expect(page).to have_current_path(election_path)
     expect(page).to have_content("You have already voted.")
-    expect(election.votes.where(voter_uid: voter_uid).size).to eq(2)
+    expect(election.votes.where(voter_uid:).size).to eq(2)
   end
 end
 
 shared_examples "an editable votable election" do
   it "Allows the user to edit the vote" do
-    click_on "Vote"
+    expect(page).to have_link("Edit vote")
+    click_on "Edit vote"
     expect(page).to have_current_path(election_vote_path(election.questions.first))
     expect(find("input[value='#{election.questions.first.response_options.first.id}']")).to be_checked
     expect(find("input[value='#{election.questions.first.response_options.second.id}']")).not_to be_checked
@@ -185,12 +186,13 @@ def fill_in_votes
     click_on "Exit the voting booth"
     expect(page).to have_current_path(election_path)
     expect(page).to have_content("You have already voted.")
-    expect(election.votes.where(voter_uid: voter_uid).size).to eq(3)
+    expect(election.votes.where(voter_uid:).size).to eq(3)
   end
 end
 
 shared_examples "a csv token editable votable election" do
   it "Allows the user to edit the vote" do
+    expect(page).to have_link("Vote")
     click_on "Vote"
     expect(page).to have_current_path(new_election_vote_path)
     expect(page).to have_content("Verify your identity")
@@ -212,6 +214,6 @@ def fill_in_votes
     click_on "Exit the voting booth"
     expect(page).to have_current_path(election_path)
     expect(page).to have_content("You have already voted.")
-    expect(election.votes.where(voter_uid: voter_uid).size).to eq(3)
+    expect(election.votes.where(voter_uid:).size).to eq(3)
   end
 end
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..a50d602443b99 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
@@ -84,8 +84,8 @@ module Admin
                 Decidim::Elections::Election,
                 current_user,
                 hash_including(
-                  title: title,
-                  description: description,
+                  title:,
+                  description:,
                   start_at:,
                   end_at:,
                   results_availability: "after_end",
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 b1d35796b0490..a4b1b1ccd6734 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
@@ -25,7 +25,7 @@ module Admin
         let(:second_question_second_option) { second_question.response_options.second }
 
         let(:context_params) do
-          { current_organization: organization, current_user: current_user }
+          { current_organization: organization, current_user: }
         end
 
         context "when updating an existing question" do
@@ -180,7 +180,7 @@ module Admin
 
         context "when the form is invalid" do
           let(:form) do
-            double("Form", invalid?: true, current_user: current_user, current_organization: organization, questions: [])
+            double("Form", invalid?: true, current_user:, current_organization: organization, questions: [])
           end
           let(:command) { described_class.new(form, election) }
 
diff --git a/decidim-elections/spec/controllers/decidim/elections/admin/census_controller_spec.rb b/decidim-elections/spec/controllers/decidim/elections/admin/census_controller_spec.rb
index 3b5c7b6480f5c..634a57445fe22 100644
--- a/decidim-elections/spec/controllers/decidim/elections/admin/census_controller_spec.rb
+++ b/decidim-elections/spec/controllers/decidim/elections/admin/census_controller_spec.rb
@@ -38,7 +38,7 @@ module Admin
             let(:params) { { id: election.id, manifest: :token_csv, file: valid_file } }
 
             it "processes the census and redirects with a success message" do
-              patch :update, params: params
+              patch(:update, params:)
 
               expect(flash[:notice]).to eq(I18n.t("decidim.elections.admin.census.update.success"))
               expect(response).to redirect_to(dashboard_election_path)
@@ -49,7 +49,7 @@ module Admin
             let(:params) { { id: election.id, manifest: :token_csv, file: invalid_file } }
 
             it "renders the edit view with an error message" do
-              patch :update, params: params
+              patch(:update, params:)
 
               expect(flash[:alert]).to eq(I18n.t("decidim.elections.admin.census.update.error"))
               expect(response).to render_template(:edit)
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 61289d07ec63a..eadcfcb5697c1 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
@@ -117,6 +117,8 @@ def dashboard_path(election)
                   "position" => election_question.position,
                   "voting_enabled" => false,
                   "published_results" => false,
+                  "total_votes" => 0,
+                  "total_votes_text" => "0 votes",
                   "response_options" => election_question.response_options.map do |ro|
                     {
                       "id" => ro.id,
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
index 531918bf2bda7..34569c44bf153 100644
--- a/decidim-elections/spec/controllers/decidim/elections/census_checks_controller_spec.rb
+++ b/decidim-elections/spec/controllers/decidim/elections/census_checks_controller_spec.rb
@@ -28,7 +28,7 @@ module Elections
 
       describe "GET new" do
         it "renders the census check form" do
-          get :new, params: params
+          get(:new, params:)
 
           expect(response).to have_http_status(:ok)
           expect(assigns(:form)).to be_present
@@ -40,7 +40,7 @@ module Elections
           end
 
           it "redirects to the success page" do
-            get :new, params: params
+            get(:new, params:)
 
             expect(response).to redirect_to(census_check_path)
           end
@@ -66,7 +66,7 @@ module Elections
 
       describe "GET show" do
         it "redirects to the form when the session is not authenticated" do
-          get :show, params: params
+          get(:show, params:)
 
           expect(response).to redirect_to(new_census_check_path)
           expect(flash[:alert]).to eq(I18n.t("decidim.elections.votes.check_census.failed"))
@@ -78,7 +78,7 @@ module Elections
           end
 
           it "renders the success page" do
-            get :show, params: params
+            get(:show, params:)
 
             expect(response).to have_http_status(:ok)
             expect(subject).to render_template(:show)
diff --git a/decidim-elections/spec/controllers/decidim/elections/per_question_votes_controller_spec.rb b/decidim-elections/spec/controllers/decidim/elections/per_question_votes_controller_spec.rb
index a16c780fd1a8c..2742beff135c9 100644
--- a/decidim-elections/spec/controllers/decidim/elections/per_question_votes_controller_spec.rb
+++ b/decidim-elections/spec/controllers/decidim/elections/per_question_votes_controller_spec.rb
@@ -9,7 +9,7 @@ module Elections
       let(:user) { create(:user, :confirmed, organization: component.organization) }
       let(:component) { create(:elections_component) }
       let(:election) { create(:election, :published, :with_internal_users_census, :per_question, :ongoing, component:) }
-      let!(:existing_vote) { create(:election_vote, question: question, response_option: question.response_options.first, voter_uid: "some-id") }
+      let!(:existing_vote) { create(:election_vote, question:, response_option: question.response_options.first, voter_uid: "some-id") }
       let!(:question) { create(:election_question, :with_response_options, :voting_enabled, election:) }
       let!(:second_question) { create(:election_question, :with_response_options, :voting_enabled, election:) }
 
@@ -29,6 +29,7 @@ module Elections
         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_vote_path).and_return(election_vote_path)
+        allow(controller).to receive(:second_election_vote_path).and_return(second_election_vote_path)
         allow(controller).to receive(:new_election_vote_path).and_return(new_election_vote_path)
         allow(controller).to receive(:election_path).and_return(election_path)
         allow(controller).to receive(:waiting_election_votes_path).and_return(waiting_election_votes_path)
@@ -48,7 +49,7 @@ module Elections
           it_behaves_like "a redirect to the waiting room", :show
 
           it "renders the voting form" do
-            get :show, params: params
+            get(:show, params:)
             expect(response).to have_http_status(:ok)
             expect(controller.helpers.question).to eq(question)
             expect(subject).to render_template(:show)
@@ -57,16 +58,57 @@ module Elections
           it "redirects to the next question if the current question is not enabled" do
             question.update(voting_enabled_at: nil)
             expect(controller).to receive(:redirect_to).with(action: :show, id: second_question)
-            get :show, params: params
+            get(:show, params:)
             expect(response).to have_http_status(:ok)
           end
 
           it "redirects to the next question if the current question has published results" do
             question.update(published_results_at: Time.current)
             expect(controller).to receive(:redirect_to).with(action: :show, id: second_question)
-            get :show, params: params
+            get(:show, params:)
             expect(response).to have_http_status(:ok)
           end
+
+          context "when json format is requested" do
+            it "returns voting_enabled true when question is enabled" do
+              get :show, params: params.merge(id: question.id), format: :json
+              expect(response).to have_http_status(:ok)
+              json_response = JSON.parse(response.body)
+              expect(json_response["voting_enabled"]).to be(true)
+              expect(json_response["redirect_url"]).to be_nil
+            end
+
+            it "returns voting_enabled false with redirect_url when question voting is disabled" do
+              question.update(voting_enabled_at: nil)
+              allow(controller).to receive(:url_for).with(action: :show, id: second_question).and_return(second_election_vote_path)
+              get :show, params: params.merge(id: question.id), format: :json
+              expect(response).to have_http_status(:ok)
+              json_response = JSON.parse(response.body)
+              expect(json_response["voting_enabled"]).to be(false)
+              expect(json_response["redirect_url"]).to eq(second_election_vote_path)
+            end
+
+            it "returns redirect_url to next question when current question has published results" do
+              question.update(published_results_at: Time.current)
+              allow(controller).to receive(:url_for).with(action: :show, id: second_question).and_return(second_election_vote_path)
+              get :show, params: params.merge(id: question.id), format: :json
+              expect(response).to have_http_status(:ok)
+              json_response = JSON.parse(response.body)
+              expect(json_response["voting_enabled"]).to be(false)
+              expect(json_response["redirect_url"]).to eq(second_election_vote_path)
+            end
+
+            it "returns redirect_url to waiting room when no enabled questions available" do
+              question.update(published_results_at: Time.current)
+              second_question.update(voting_enabled_at: nil)
+              allow(controller).to receive(:url_for).with(action: :waiting).and_return(waiting_election_votes_path)
+              get :show, params: params.merge(id: question.id), format: :json
+              expect(response).to have_http_status(:ok)
+              json_response = JSON.parse(response.body)
+              expect(json_response["voting_enabled"]).to be(false)
+              expect(json_response["redirect_url"]).to eq(waiting_election_votes_path)
+            end
+          end
         end
       end
 
@@ -118,14 +160,23 @@ module Elections
           end
 
           it "casts the votes and redirects to the receipt page if successful" do
-            # ensure there are no pending votes
-            allow(controller).to receive(:votes_buffer).and_return({ question.id.to_s => [question.response_options.first.id], second_question.id.to_s => [second_question.response_options.first.id] })
+            session[:votes_buffer] = { question.id.to_s => [question.response_options.first.id.to_s], second_question.id.to_s => [second_question.response_options.first.id.to_s] }
 
             expect(controller).to receive(:redirect_to).with(action: :receipt)
-            patch :update, params: params.merge(id: question.id, response: { question.id.to_s => [question.response_options.first.id] })
+            patch :update, params: params.merge(id: second_question.id, response: { second_question.id.to_s => [second_question.response_options.first.id] })
             expect(session[:voter_uid]).to eq(user.to_global_id.to_s)
             expect(flash[:notice]).to eq(I18n.t("votes.cast.success", scope: "decidim.elections"))
           end
+
+          it "clears subsequent questions from buffer when updating a previous question" do
+            session[:votes_buffer] = { question.id.to_s => [question.response_options.first.id.to_s], second_question.id.to_s => [second_question.response_options.first.id.to_s] }
+
+            expect(controller).to receive(:redirect_to).with(action: :show, id: second_question)
+            patch :update, params: params.merge(id: question.id, response: { question.id.to_s => [question.response_options.second.id] })
+
+            expect(session[:votes_buffer]).not_to have_key(second_question.id.to_s)
+            expect(session[:votes_buffer][question.id.to_s]).to eq([question.response_options.second.id.to_s])
+          end
         end
       end
 
@@ -142,7 +193,7 @@ module Elections
             allow(controller).to receive(:votes_buffer).and_return({ question.id.to_s => [question.response_options.first.id] })
 
             expect(controller).to receive(:redirect_to).with(action: :show, id: second_question)
-            get :waiting, params: params
+            get(:waiting, params:)
             expect(response).to have_http_status(:ok)
           end
 
@@ -153,7 +204,7 @@ module Elections
 
             it "redirects to the non voted question" do
               expect(controller).to receive(:redirect_to).with(action: :show, id: question)
-              get :waiting, params: params
+              get(:waiting, params:)
               expect(response).to have_http_status(:ok)
             end
 
@@ -162,13 +213,13 @@ module Elections
 
               it "redirects to the non voted question" do
                 expect(controller).to receive(:redirect_to).with(action: :show, id: question)
-                get :waiting, params: params
+                get(:waiting, params:)
                 expect(response).to have_http_status(:ok)
               end
 
               it "renders the waiting page if votes_buffer exist" do
                 allow(controller).to receive(:votes_buffer).and_return({ question.id.to_s => [question.response_options.first.id] })
-                get :waiting, params: params
+                get(:waiting, params:)
                 expect(response).to have_http_status(:ok)
                 expect(subject).to render_template(:waiting)
               end
@@ -181,7 +232,7 @@ module Elections
               allow(controller).to receive(:votes_buffer).and_return({ question.id.to_s => [question.response_options.first.id] })
 
               expect(controller).to receive(:url_for).with(action: :show, id: second_question)
-              get :waiting, params: params, format: :json
+              get :waiting, params:, format: :json
               expect(response).to have_http_status(:ok)
               expect(JSON.parse(response.body)).to have_key("url")
             end
@@ -205,25 +256,32 @@ module Elections
             end
 
             it "redirects to the election path" do
-              get :receipt, params: params
+              get(:receipt, params:)
               expect(response).to redirect_to(election_path)
             end
 
             context "when the election has votes for the voter UID" do
               before do
-                create(:election_vote, voter_uid: session[:voter_uid], question: question, response_option: question.response_options.first)
+                create(:election_vote, voter_uid: session[:voter_uid], question:, response_option: question.response_options.first)
                 create(:election_vote, voter_uid: session[:voter_uid], question: second_question, response_option: second_question.response_options.first)
               end
 
               it_behaves_like "a redirect to the waiting room", :receipt
 
-              it "renders the receipt page" do
-                expect(controller.send(:votes_buffer)).to receive(:clear)
-                expect(controller.send(:session_attributes)).to receive(:clear)
-                get :receipt, params: params
+              it "renders the receipt page without clearing session" do
+                expect(controller.send(:votes_buffer)).not_to receive(:clear)
+                expect(controller.send(:session_attributes)).not_to receive(:clear)
+                get(:receipt, params:)
                 expect(response).to have_http_status(:ok)
                 expect(subject).to render_template(:receipt)
               end
+
+              it "clears session when exit param is present" do
+                expect(controller.send(:votes_buffer)).to receive(:clear)
+                expect(controller.send(:session_attributes)).to receive(:clear)
+                get :receipt, params: params.merge(exit: true)
+                expect(response).to redirect_to(election_path)
+              end
             end
           end
         end
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 7cab91d3c4936..1da30d6e346b4 100644
--- a/decidim-elections/spec/controllers/decidim/elections/votes_controller_spec.rb
+++ b/decidim-elections/spec/controllers/decidim/elections/votes_controller_spec.rb
@@ -9,7 +9,7 @@ module Elections
       let(:user) { create(:user, :confirmed, organization: component.organization) }
       let(:component) { create(:elections_component) }
       let(:election) { create(:election, :published, :with_internal_users_census, :ongoing, component:) }
-      let!(:existing_vote) { create(:election_vote, question: question, response_option: question.response_options.first, voter_uid: "some-id") }
+      let!(:existing_vote) { create(:election_vote, question:, response_option: question.response_options.first, voter_uid: "some-id") }
       let!(:question) { create(:election_question, :with_response_options, :voting_enabled, election:) }
       let!(:second_question) { create(:election_question, :with_response_options, :voting_enabled, election:) }
 
@@ -52,7 +52,7 @@ module Elections
         end
 
         it "renders the voting form" do
-          get :show, params: params
+          get(:show, params:)
           expect(response).to have_http_status(:ok)
           expect(controller.helpers.question).to eq(question)
           expect(subject).to render_template(:show)
@@ -158,7 +158,7 @@ module Elections
           end
 
           it "renders the confirmation page" do
-            get :confirm, params: params
+            get(:confirm, params:)
             expect(response).to have_http_status(:ok)
             expect(subject).to render_template(:confirm)
           end
@@ -184,7 +184,7 @@ module Elections
           it "casts the votes and redirects to the receipt page" do
             expect(controller.send(:votes_buffer)).to receive(:clear)
             expect(controller.send(:session_attributes)).to receive(:clear)
-            post :cast, params: params
+            post(:cast, params:)
             expect(session[:voter_uid]).to eq(user.to_global_id.to_s)
             expect(response).to redirect_to(receipt_election_votes_path)
             expect(flash[:notice]).to eq(I18n.t("votes.cast.success", scope: "decidim.elections"))
@@ -198,7 +198,7 @@ module Elections
             end
 
             it "redirects to the confirm page if votes are incomplete" do
-              post :cast, params: params
+              post(:cast, params:)
               expect(response).to redirect_to(confirm_election_votes_path)
               expect(flash[:alert]).to eq(I18n.t("votes.cast.invalid", scope: "decidim.elections"))
             end
@@ -208,7 +208,7 @@ module Elections
 
       describe "GET receipt" do
         it "redirects to the election path" do
-          get :receipt, params: params
+          get(:receipt, params:)
           expect(response).to redirect_to(election_path)
         end
 
@@ -218,7 +218,7 @@ module Elections
           end
 
           it "redirects to the election path" do
-            get :receipt, params: params
+            get(:receipt, params:)
             expect(response).to redirect_to(election_path)
           end
         end
@@ -232,16 +232,23 @@ module Elections
 
           context "when the election has votes for the voter UID" do
             before do
-              create(:election_vote, voter_uid: session[:voter_uid], question: question, response_option: question.response_options.first)
+              create(:election_vote, voter_uid: session[:voter_uid], question:, response_option: question.response_options.first)
             end
 
-            it "renders the receipt page" do
+            it "renders the receipt page and clears votes buffer" do
               expect(controller.send(:votes_buffer)).to receive(:clear)
-              expect(controller.send(:session_attributes)).to receive(:clear)
-              get :receipt, params: params
+              expect(controller.send(:session_attributes)).not_to receive(:clear)
+              get(:receipt, params:)
               expect(response).to have_http_status(:ok)
               expect(subject).to render_template(:receipt)
             end
+
+            it "clears session when exit param is present" do
+              expect(controller.send(:votes_buffer)).to receive(:clear)
+              expect(controller.send(:session_attributes)).to receive(:clear)
+              get :receipt, params: params.merge(exit: true)
+              expect(response).to redirect_to(election_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 75e3f42235347..ab0d67abc50a7 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
@@ -20,10 +20,10 @@ module Admin
 
         let(:attributes) do
           {
-            body_en: body_en,
-            description_en: description_en,
-            question_type: question_type,
-            response_options: response_options
+            body_en:,
+            description_en:,
+            question_type:,
+            response_options:
           }
         end
 
@@ -58,11 +58,11 @@ module Admin
         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
+              body_en:,
+              description_en:,
+              question_type:,
+              response_options:,
+              max_choices:
             }
           end
 
diff --git a/decidim-elections/spec/forms/decidim/elections/admin/questions_form_spec.rb b/decidim-elections/spec/forms/decidim/elections/admin/questions_form_spec.rb
index 3df91827c8233..98dc848d85b86 100644
--- a/decidim-elections/spec/forms/decidim/elections/admin/questions_form_spec.rb
+++ b/decidim-elections/spec/forms/decidim/elections/admin/questions_form_spec.rb
@@ -35,7 +35,7 @@ module Admin
 
         subject(:form) do
           described_class.from_params(attributes).with_context(
-            current_organization: current_organization
+            current_organization:
           )
         end
 
diff --git a/decidim-elections/spec/forms/decidim/elections/admin/token_csv_form_spec.rb b/decidim-elections/spec/forms/decidim/elections/admin/token_csv_form_spec.rb
index fcadf003b446c..e0275029f51eb 100644
--- a/decidim-elections/spec/forms/decidim/elections/admin/token_csv_form_spec.rb
+++ b/decidim-elections/spec/forms/decidim/elections/admin/token_csv_form_spec.rb
@@ -8,7 +8,7 @@ module Admin
       module Censuses
         describe TokenCsvForm do
           let(:organization) { create(:organization) }
-          let(:attributes) { { file: file, remove_all: remove_all } }
+          let(:attributes) { { file:, remove_all: } }
           let(:remove_all) { false }
 
           subject { described_class.new(attributes).with_context(current_organization: organization) }
diff --git a/decidim-elections/spec/permissions/decidim/elections/admin/permissions_spec.rb b/decidim-elections/spec/permissions/decidim/elections/admin/permissions_spec.rb
index 4175e951d3510..b9a8dbee9c78c 100644
--- a/decidim-elections/spec/permissions/decidim/elections/admin/permissions_spec.rb
+++ b/decidim-elections/spec/permissions/decidim/elections/admin/permissions_spec.rb
@@ -14,7 +14,7 @@
       election:
     }
   end
-  let(:permission_action) { Decidim::PermissionAction.new(scope: scope, action: action_name, subject: action_subject) }
+  let(:permission_action) { Decidim::PermissionAction.new(scope:, action: action_name, subject: action_subject) }
   let(:scope) { :admin }
   let(:action_name) { :foo }
   let(:action_subject) { :foo }
diff --git a/decidim-elections/spec/presenters/decidim/elections/election_presenter_spec.rb b/decidim-elections/spec/presenters/decidim/elections/election_presenter_spec.rb
index eb2e85c5f39e8..60b72f7b81015 100644
--- a/decidim-elections/spec/presenters/decidim/elections/election_presenter_spec.rb
+++ b/decidim-elections/spec/presenters/decidim/elections/election_presenter_spec.rb
@@ -13,7 +13,7 @@ module Elections
 
       let(:election) do
         create(:election,
-               component: component,
+               component:,
                title: { en: "Test election" })
       end
 
@@ -43,6 +43,45 @@ module Elections
         it { expect(presenter.title).to be_nil }
         it { expect(presenter.election_path).to be_nil }
       end
+
+      describe "#to_json" do
+        let(:election) { create(:election, :published, :real_time, :ongoing, component:) }
+        let!(:question) { create(:election_question, :with_response_options, election:) }
+        let!(:vote) { create(:election_vote, question:, response_option: question.response_options.first, voter_uid: "voter1") }
+
+        context "when admin is true" do
+          subject(:json) { presenter.to_json(admin: true) }
+
+          it "includes total_votes for each question" do
+            question_json = json[:questions].find { |q| q[:id] == question.id }
+            expect(question_json[:total_votes]).to eq(1)
+            expect(question_json[:total_votes_text]).to eq("1 vote")
+          end
+        end
+
+        context "when admin is false and results are published" do
+          subject(:json) { presenter.to_json(admin: false) }
+
+          it "includes total_votes for questions with published results" do
+            question_json = json[:questions].find { |q| q[:id] == question.id }
+            expect(question_json[:total_votes]).to eq(1)
+            expect(question_json[:total_votes_text]).to eq("1 vote")
+          end
+        end
+
+        context "when admin is false and results are not published" do
+          let(:election) { create(:election, :published, :per_question, :ongoing, component:) }
+          let!(:question) { create(:election_question, :with_response_options, election:, voting_enabled_at: Time.current, published_results_at: nil) }
+
+          subject(:json) { presenter.to_json(admin: false) }
+
+          it "does not include total_votes for questions without published results" do
+            question_json = json[:questions].find { |q| q[:id] == question.id }
+            expect(question_json).not_to have_key(:total_votes)
+            expect(question_json).not_to have_key(:total_votes_text)
+          end
+        end
+      end
     end
   end
 end
diff --git a/decidim-elections/spec/system/admin/admin_manages_election_census_spec.rb b/decidim-elections/spec/system/admin/admin_manages_election_census_spec.rb
index e3518d6cbd15c..94ca9124e8c44 100644
--- a/decidim-elections/spec/system/admin/admin_manages_election_census_spec.rb
+++ b/decidim-elections/spec/system/admin/admin_manages_election_census_spec.rb
@@ -99,7 +99,7 @@
     let(:available_authorizations) { %w(dummy_authorization_handler another_dummy_authorization_handler) }
 
     before do
-      organization.update!(available_authorizations: available_authorizations)
+      organization.update!(available_authorizations:)
     end
 
     context "when no verification handlers are selected" do
diff --git a/decidim-elections/spec/system/admin/dashboard_spec.rb b/decidim-elections/spec/system/admin/dashboard_spec.rb
index 8cebc33cd646e..067380a52a7c3 100644
--- a/decidim-elections/spec/system/admin/dashboard_spec.rb
+++ b/decidim-elections/spec/system/admin/dashboard_spec.rb
@@ -133,6 +133,27 @@
         expect(page).to have_no_content("Election has not started yet.")
         expect(page).to have_no_content("Publish results")
       end
+
+      it "shows total votes for each question" do
+        questions.each do |question|
+          within("#question_#{question.id}") do
+            expect(page).to have_content("Total")
+            expect(page).to have_css("[data-question-total-votes-text='#{question.id}']", text: "0 votes")
+          end
+        end
+      end
+
+      context "when there are votes" do
+        let!(:questions) { create_list(:election_question, 3, :with_response_options, election:) }
+        let!(:vote) { create(:election_vote, question: questions.first, response_option: questions.first.response_options.first, voter_uid: "voter1") }
+
+        it "shows the correct total votes count" do
+          visit election_dashboard_path
+          within("#question_#{questions.first.id}") do
+            expect(page).to have_css("[data-question-total-votes-text='#{questions.first.id}']", text: "1 vote")
+          end
+        end
+      end
     end
   end
 
@@ -176,6 +197,15 @@
         expect(page).to have_button("Enable voting", count: 3, disabled: false)
       end
 
+      it "shows total votes for each question" do
+        questions.each do |question|
+          within("#question_#{question.id}") do
+            expect(page).to have_content("Total")
+            expect(page).to have_css("[data-question-total-votes-text='#{question.id}']", text: "0 votes")
+          end
+        end
+      end
+
       context "when a question is enabled" do
         before do
           within("#question_#{first_question.id}") do
@@ -262,6 +292,15 @@
         expect(page).to have_no_content("Election has not started yet.")
         expect(page).to have_button("Publish results")
       end
+
+      it "shows total votes for each question" do
+        questions.each do |question|
+          within("#question_#{question.id}") do
+            expect(page).to have_content("Total")
+            expect(page).to have_css("[data-question-total-votes-text='#{question.id}']", text: "0 votes")
+          end
+        end
+      end
     end
   end
 
@@ -272,6 +311,15 @@
       expect(page).to have_content("Finished")
       expect(page).to have_no_button("Results published at")
     end
+
+    it "shows total votes for each question" do
+      questions.each do |question|
+        within("#question_#{question.id}") do
+          expect(page).to have_content("Total")
+          expect(page).to have_css("[data-question-total-votes-text='#{question.id}']", text: "0 votes")
+        end
+      end
+    end
   end
 
   private
diff --git a/decidim-elections/spec/system/election_results_spec.rb b/decidim-elections/spec/system/election_results_spec.rb
index 0653401acf4d2..db988ea0edb09 100644
--- a/decidim-elections/spec/system/election_results_spec.rb
+++ b/decidim-elections/spec/system/election_results_spec.rb
@@ -32,6 +32,11 @@ def expect_vote_count(question, option, count)
     expect(div).to have_content("#{count} vote")
   end
 
+  def expect_total_votes(question, count)
+    div = find("[data-question-total-votes-text='#{question.id}']")
+    expect(div).to have_content("#{count} vote")
+  end
+
   it "shows the results" do
     expect(page).to have_content("Results")
     within "#question-#{question1.id}" do
@@ -53,6 +58,8 @@ def expect_vote_count(question, option, count)
     expect_vote_count(question2, option21, "0")
     expect_vote_percent(question2, option22, "0.0%")
     expect_vote_count(question2, option22, "0")
+    expect_total_votes(question1, "0")
+    expect_total_votes(question2, "0")
 
     create(:election_vote, question: question1, voter_uid: "voter1", response_option: option11)
     create(:election_vote, question: question2, voter_uid: "voter1", response_option: option22)
@@ -66,6 +73,8 @@ def expect_vote_count(question, option, count)
     expect_vote_count(question2, option21, "0")
     expect_vote_percent(question2, option22, "100.0%")
     expect_vote_count(question2, option22, "1")
+    expect_total_votes(question1, "1")
+    expect_total_votes(question2, "1")
   end
 
   context "when the election is per question" do
@@ -100,6 +109,7 @@ def expect_vote_count(question, option, count)
       expect_vote_count(question1, option11, "0")
       expect_vote_percent(question1, option12, "0.0%")
       expect_vote_count(question1, option12, "0")
+      expect_total_votes(question1, "0")
 
       question1.update(published_results_at: Time.current)
       question2.update(voting_enabled_at: Time.current)
@@ -112,6 +122,7 @@ def expect_vote_count(question, option, count)
       expect_vote_count(question1, option11, "1")
       expect_vote_percent(question1, option12, "0.0%")
       expect_vote_count(question1, option12, "0")
+      expect_total_votes(question1, "1")
       expect(page).to have_no_selector("#question-#{question2.id}")
 
       question2.update(published_results_at: Time.current)
@@ -125,6 +136,7 @@ def expect_vote_count(question, option, count)
       expect_vote_count(question2, option21, "1")
       expect_vote_percent(question2, option22, "0.0%")
       expect_vote_count(question2, option22, "0")
+      expect_total_votes(question2, "1")
     end
   end
 end
diff --git a/decidim-elections/spec/system/elections_breadcrumbs_spec.rb b/decidim-elections/spec/system/elections_breadcrumbs_spec.rb
new file mode 100644
index 0000000000000..6b7f17285060f
--- /dev/null
+++ b/decidim-elections/spec/system/elections_breadcrumbs_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Elections Breadcrumb" do
+  include_context "with a component"
+  let(:manifest_name) { "elections" }
+
+  let!(:election) { create(:election, :published, :finished, :with_internal_users_census, component:) }
+
+  before do
+    visit_component
+  end
+
+  describe "index" do
+    it "shows the correct information in breadcrumb (space, component)" do
+      within(".menu-bar") do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+      end
+    end
+  end
+
+  describe "show" do
+    it "shows the correct information in breadcrumb (space, component, election)" do
+      click_on translated(election.title)
+      within(".menu-bar") do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+        expect(page).to have_content(translated(election.title))
+      end
+    end
+  end
+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 54ec42daacb07..f0262fe5b9047 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
@@ -95,10 +95,6 @@ def election_vote_path(question)
       let(:election) { create(:election, :published, :finished, :with_internal_users_census) }
 
       it "does not allow to vote" do
-        within(".menu-bar") do
-          expect(page).to have_content(translated(election.component.name))
-          expect(page).to have_content(translated(election.title))
-        end
         expect(page).to have_no_link("Vote")
         expect(page).to have_no_content("You have already voted.")
         visit new_election_vote_path
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 7be60f6e774b7..75710068b5ad1 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
@@ -73,6 +73,19 @@ def election_vote_path(question)
     it_behaves_like "a per question votable election with already voted questions"
   end
 
+  context "when editing votes from receipt page" do
+    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, election:, skip_injection: true, position: 2) }
+
+    before do
+      login_as user, scope: :user
+      visit election_path
+    end
+
+    it_behaves_like "a per question votable election with edit from receipt"
+    it_behaves_like "a per question votable election with edit from receipt when all questions enabled"
+  end
+
   context "when the election is real time" do
     let(:election) { create(:election, :published, :ongoing, :with_internal_users_census, :real_time, :with_questions) }
 
@@ -90,4 +103,13 @@ def election_vote_path(question)
       expect(page).to have_current_path(new_election_normal_vote_path)
     end
   end
+
+  context "when admin closes question voting while user is viewing the question" do
+    before do
+      login_as user, scope: :user
+      visit election_path
+    end
+
+    it_behaves_like "a per question votable election with automatic redirect when question closes"
+  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..3ae31237c4890 100644
--- a/decidim-forms/app/commands/decidim/forms/response_questionnaire.rb
+++ b/decidim-forms/app/commands/decidim/forms/response_questionnaire.rb
@@ -79,7 +79,7 @@ def build_choices(response, form_response)
       end
 
       def clear_responses!
-        Response.where(questionnaire: questionnaire, user: current_user, session_token: form.context.session_token, ip_hash: form.context.ip_hash).destroy_all
+        Response.where(questionnaire:, user: current_user, session_token: form.context.session_token, ip_hash: form.context.ip_hash).destroy_all
       end
 
       def response_questionnaire
diff --git a/decidim-forms/app/presenters/decidim/forms/admin/questionnaire_response_presenter.rb b/decidim-forms/app/presenters/decidim/forms/admin/questionnaire_response_presenter.rb
index e70832a3ad96e..a607f5860f770 100644
--- a/decidim-forms/app/presenters/decidim/forms/admin/questionnaire_response_presenter.rb
+++ b/decidim-forms/app/presenters/decidim/forms/admin/questionnaire_response_presenter.rb
@@ -28,13 +28,32 @@ def body
           return attachments if response.attachments.any?
           return "-" if response.choices.empty?
 
-          choices = response.choices.map do |choice|
+          choices = build_choices
+
+          render_choices_list(choices)
+        end
+
+        private
+
+        def build_choices
+          response.choices.map do |choice|
+            matrix_row_body = matrix_row_body_for(choice)
             {
               response_option_body: choice.try(:response_option).try(:translated_body),
-              choice_body: body_or_custom_body(choice)
+              choice_body: body_or_custom_body(choice),
+              matrix_row_body:
             }
           end
+        end
 
+        def matrix_row_body_for(choice)
+          return unless response.question.matrix?
+          return unless choice.matrix_row&.body
+
+          translated_attribute(choice.matrix_row.body)
+        end
+
+        def render_choices_list(choices)
           content_tag(:ul) do
             if response.question.question_type == "single_option"
               choice(choices.first)
@@ -70,7 +89,11 @@ def pretty_attachment(attachment)
 
         def choice(choice_hash)
           content_tag :li do
-            render_body_for choice_hash
+            if choice_hash[:matrix_row_body].present?
+              content_tag(:strong, choice_hash[:matrix_row_body]) + ": " + render_body_for(choice_hash) # rubocop:disable Style/StringConcatenation
+            else
+              render_body_for choice_hash
+            end
           end
         end
 
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 8fd55f4036f09..986483dfc89ae 100644
--- a/decidim-forms/app/views/decidim/forms/questionnaires/_questionnaire.html.erb
+++ b/decidim-forms/app/views/decidim/forms/questionnaires/_questionnaire.html.erb
@@ -3,7 +3,7 @@
 </noscript>
 
 <% unless current_participatory_space.can_participate?(current_user) %>
-  <%= cell("decidim/announcement", { title: t("decidim.forms.questionnaires.show.questionnaire_for_private_users.title"), body: t("decidim.forms.questionnaires.show.questionnaire_for_private_users.body") }, callout_class: "alert") %>
+  <%= cell("decidim/announcement", { title: t("decidim.forms.questionnaires.show.questionnaire_for_members.title"), body: t("decidim.forms.questionnaires.show.questionnaire_for_members.body") }, callout_class: "alert") %>
 <% end %>
 
 <% if questionnaire_for.respond_to?(:announcement) and questionnaire_for.announcement.present? %>
diff --git a/decidim-forms/app/views/decidim/forms/questionnaires/show.html.erb b/decidim-forms/app/views/decidim/forms/questionnaires/show.html.erb
index c2fc3f24d5d01..4da5e4778d96b 100644
--- a/decidim-forms/app/views/decidim/forms/questionnaires/show.html.erb
+++ b/decidim-forms/app/views/decidim/forms/questionnaires/show.html.erb
@@ -39,7 +39,7 @@
           <% else %>
             <% body = t("decidim.forms.questionnaires.show.questionnaire_responded.body") %>
           <% end %>
-          <%= cell("decidim/announcement", { title: t("decidim.forms.questionnaires.show.questionnaire_responded.title"), body: body }) %>
+          <%= cell("decidim/announcement", { title: t("decidim.forms.questionnaires.show.questionnaire_responded.title"), body: }) %>
         <% else %>
           <% if @form.responses_by_step.flatten.empty? %>
             <%= cell("decidim/announcement", t("decidim.forms.questionnaires.show.empty")) %>
diff --git a/decidim-forms/config/locales/ar.yml b/decidim-forms/config/locales/ar.yml
index 7042fd89b4195..96f09c3697ff6 100644
--- a/decidim-forms/config/locales/ar.yml
+++ b/decidim-forms/config/locales/ar.yml
@@ -44,9 +44,6 @@ ar:
         show:
           questionnaire_closed:
             title: شكل مغلق
-          questionnaire_for_private_users:
-            body: النموذج متاح فقط للمستخدمين من القطاع الخاص
-            title: شكل مغلق
           tos_agreement: من خلال المشاركة ، فإنك تقبل شروط الخدمة
       step_navigation:
         show:
diff --git a/decidim-forms/config/locales/bg.yml b/decidim-forms/config/locales/bg.yml
index e5dd6a57c5493..b23acd82bb15d 100644
--- a/decidim-forms/config/locales/bg.yml
+++ b/decidim-forms/config/locales/bg.yml
@@ -94,9 +94,6 @@ bg:
           of_total_steps: от %{total_steps}
           questionnaire_closed:
             title: Формулярът е затворен
-          questionnaire_for_private_users:
-            body: Формулярът е налице само за частни потребители
-            title: Формулярът е затворен
           questionnaire_js_disabled:
             body: Някои от функциите на формуляра ще бъдат деактивирани. За да подобрите практическата си работа, моля, активирайте JavaScript в браузъра си.
             title: JavaScript е деактивиран
diff --git a/decidim-forms/config/locales/ca-IT.yml b/decidim-forms/config/locales/ca-IT.yml
index 622234cd53531..a612f2352888e 100644
--- a/decidim-forms/config/locales/ca-IT.yml
+++ b/decidim-forms/config/locales/ca-IT.yml
@@ -188,8 +188,8 @@ ca-IT:
           questionnaire_closed:
             body: El formulari està tancat i no es pot respondre.
             title: S'ha tancat el formulari
-          questionnaire_for_private_users:
-            body: El formulari només està disponible per a participants privades
+          questionnaire_for_members:
+            body: El formulari només està disponible per a membres
             title: S'ha tancat el formulari
           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.
diff --git a/decidim-forms/config/locales/ca.yml b/decidim-forms/config/locales/ca.yml
index 4ddaea69b633f..75169a86570e4 100644
--- a/decidim-forms/config/locales/ca.yml
+++ b/decidim-forms/config/locales/ca.yml
@@ -188,8 +188,8 @@ ca:
           questionnaire_closed:
             body: El formulari està tancat i no es pot respondre.
             title: S'ha tancat el formulari
-          questionnaire_for_private_users:
-            body: El formulari només està disponible per a participants privades
+          questionnaire_for_members:
+            body: El formulari només està disponible per a membres
             title: S'ha tancat el formulari
           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.
diff --git a/decidim-forms/config/locales/cs.yml b/decidim-forms/config/locales/cs.yml
index e5a70845220d0..eb68f5ce69570 100644
--- a/decidim-forms/config/locales/cs.yml
+++ b/decidim-forms/config/locales/cs.yml
@@ -185,9 +185,8 @@ cs:
           questionnaire_closed:
             body: Formulář je uzavřen a nelze jej odpovědět.
             title: Dotazník byl uzavřen
-          questionnaire_for_private_users:
-            body: Dotazník je k dispozici pouze pro soukromé uživatele
-            title: Dotazník byl uzavřen
+          questionnaire_for_members:
+            title: Formulář uzavřen
           questionnaire_js_disabled:
             body: Některé funkce tohoto formuláře budou zakázány. Pro zlepšení použití formuláře povolte JavaScript ve vašem prohlížeči.
             title: JavaScript je zakázán
diff --git a/decidim-forms/config/locales/de.yml b/decidim-forms/config/locales/de.yml
index 65ddc6f0bbdd2..31077d2e75d3b 100644
--- a/decidim-forms/config/locales/de.yml
+++ b/decidim-forms/config/locales/de.yml
@@ -187,9 +187,8 @@ de:
           questionnaire_closed:
             body: Das Formular ist geschlossen und kann nicht beantwortet werden.
             title: Fragebogen geschlossen
-          questionnaire_for_private_users:
-            body: Der Fragebogen ist nur für Privatanwender verfügbar
-            title: Fragebogen geschlossen
+          questionnaire_for_members:
+            title: Formular geschlossen
           questionnaire_js_disabled:
             body: Manche Funktionen des Formulars werden deaktiviert sein. Aktivieren Sie JavaScript in Ihrem Browser für eine bessere Erfahrung.
             title: JavaScript ist deaktiviert
@@ -215,7 +214,7 @@ de:
           back: Zurück
           continue: Weiter
           disallowed: Sie dürfen Ihre Antworten nicht bearbeiten.
-          submit: einreichen
+          submit: Absenden
       user_responses_serializer:
         body: Antwort
         completion: Abschluss
diff --git a/decidim-forms/config/locales/el.yml b/decidim-forms/config/locales/el.yml
index 10b084f6d4d75..a0f6e237cfac7 100644
--- a/decidim-forms/config/locales/el.yml
+++ b/decidim-forms/config/locales/el.yml
@@ -93,9 +93,6 @@ el:
           of_total_steps: από %{total_steps}
           questionnaire_closed:
             title: Η φόρμα έκλεισε
-          questionnaire_for_private_users:
-            body: Η φόρμα είναι διαθέσιμη μόνο για ιδιωτικούς χρήστες
-            title: Η φόρμα έκλεισε
           questionnaire_js_disabled:
             body: Ορισμένες από τις δυνατότητες αυτής της φόρμας θα απενεργοποιηθούν. Για να βελτιώσετε την εμπειρία σας, ενεργοποιήστε την JavaScript στο πρόγραμμα περιήγησης.
             title: Η JavaScript είναι απενεργοποιημένη
diff --git a/decidim-forms/config/locales/en.yml b/decidim-forms/config/locales/en.yml
index e054af6244b60..6ff6602004b6d 100644
--- a/decidim-forms/config/locales/en.yml
+++ b/decidim-forms/config/locales/en.yml
@@ -189,8 +189,8 @@ en:
           questionnaire_closed:
             body: The form is closed and cannot be responded.
             title: Form closed
-          questionnaire_for_private_users:
-            body: The form is available only for private users
+          questionnaire_for_members:
+            body: The form is available only for members
             title: Form closed
           questionnaire_js_disabled:
             body: Some of this form's features will be disabled. To improve your experience, please enable JavaScript in your browser.
diff --git a/decidim-forms/config/locales/es-MX.yml b/decidim-forms/config/locales/es-MX.yml
index d59aa33ed3987..0ceccba3b9ecf 100644
--- a/decidim-forms/config/locales/es-MX.yml
+++ b/decidim-forms/config/locales/es-MX.yml
@@ -188,9 +188,9 @@ es-MX:
           questionnaire_closed:
             body: El formulario está cerrado y no puedes responder.
             title: Cuestionario cerrado
-          questionnaire_for_private_users:
-            body: El cuestionario está disponible solo para usuarios privados
-            title: Cuestionario cerrado
+          questionnaire_for_members:
+            body: El formulario está disponible solo para miembros
+            title: Formulario cerrado
           questionnaire_js_disabled:
             body: Algunas de las características de este formulario se desactivarán. Para mejorar tu experiencia, habilita JavaScript en tu navegador.
             title: Javascript está desactivado
diff --git a/decidim-forms/config/locales/es-PY.yml b/decidim-forms/config/locales/es-PY.yml
index e7e3ee0e50f2d..524048e44d972 100644
--- a/decidim-forms/config/locales/es-PY.yml
+++ b/decidim-forms/config/locales/es-PY.yml
@@ -188,9 +188,9 @@ es-PY:
           questionnaire_closed:
             body: El formulario está cerrado y no puedes responder.
             title: Cuestionario cerrado
-          questionnaire_for_private_users:
-            body: El cuestionario está disponible solo para usuarios privados
-            title: Cuestionario cerrado
+          questionnaire_for_members:
+            body: El formulario está disponible solo para miembros
+            title: Formulario cerrado
           questionnaire_js_disabled:
             body: Algunas de las características de este formulario se desactivarán. Para mejorar tu experiencia, habilita JavaScript en tu navegador.
             title: Javascript está desactivado
diff --git a/decidim-forms/config/locales/es.yml b/decidim-forms/config/locales/es.yml
index 2dfebad4ba786..f1bb3d6296025 100644
--- a/decidim-forms/config/locales/es.yml
+++ b/decidim-forms/config/locales/es.yml
@@ -188,8 +188,8 @@ es:
           questionnaire_closed:
             body: El formulario está cerrado y no puedes responder.
             title: Formulario cerrado
-          questionnaire_for_private_users:
-            body: El formulario está disponible solo para participantes privadas
+          questionnaire_for_members:
+            body: El formulario está disponible solo para miembros
             title: Formulario cerrado
           questionnaire_js_disabled:
             body: Algunas de las características de este formulario se desactivarán. Para mejorar tu experiencia, habilita JavaScript en tu navegador.
diff --git a/decidim-forms/config/locales/eu.yml b/decidim-forms/config/locales/eu.yml
index 3faf10583f609..5df5c18cd18e6 100644
--- a/decidim-forms/config/locales/eu.yml
+++ b/decidim-forms/config/locales/eu.yml
@@ -29,7 +29,7 @@ eu:
       help:
         responses:
           id: Erantzunaren identifikatzaile bakarra
-          question: Erantzun zen galdera
+          question: Erantzun den galdera
           questionnaire: Erantzun zen galdetegia
           response: Galderaren erantzuna
           user: Inkesta erantzun duen parte-hartzailea
@@ -54,8 +54,8 @@ eu:
             tos: Zerbitzu-baldintzak
         questionnaires:
           actions:
-            back: Itzuli erantzunetara
-            publish_responses: Argitaratu erantzunak
+            back: Erantzunetara itzuli
+            publish_responses: Erantzunak argitura
             show: Erantzunak
           display_condition:
             condition_question: Galdera
@@ -71,7 +71,7 @@ eu:
             mandatory: Baldintza hau beti bete behar da, beste baldintza batzuen egoera edozein dela ere
             remove: Kendu
             response_option: Erantzuteko aukera
-            save_warning: Gogoratu formularioa gorde behar duzula, bistaratze-baldintzak konfiguratu aurretik
+            save_warning: Gogoratu formularioa gorde behar duzula bistaratzeko baldintzak konfiguratu aurretik
             select_condition_question: Hautatu galdera bat
             select_condition_type: Hautatu baldintza mota bat
             select_response_option: Hautatu erantzuteko aukera
@@ -95,7 +95,7 @@ eu:
             remove: Kendu
             statement: Adierazpena
           question:
-            add_display_condition: Gehitu bistaratzeko baldintza
+            add_display_condition: Bistaratzeko baldintza gehitu
             add_display_condition_info: Gorde galdetegia bistaratzeko baldintzak konfiguratzeko
             add_matrix_row: Gehitu errenkada
             add_response_option: Erantsi erantzuteko aukera
@@ -188,8 +188,8 @@ eu:
           questionnaire_closed:
             body: Galdetegia itxita dago eta ezin da erantzun.
             title: Galdeketa itxia
-          questionnaire_for_private_users:
-            body: Galdetegia parte-hartzaile pribatuentzat soilik dago erabilgarri
+          questionnaire_for_members:
+            body: Formularioa bazkideentzat soilik dago eskuragarri
             title: Galdeketa itxia
           questionnaire_js_disabled:
             body: Galdetegi honen ezaugarri batzuk desaktibatu egingo dira. Zure esperientzia hobetzeko, gaitu JavaScript zure nabigatzailean.
diff --git a/decidim-forms/config/locales/fi-plain.yml b/decidim-forms/config/locales/fi-plain.yml
index 39b2526c63201..aae7287598312 100644
--- a/decidim-forms/config/locales/fi-plain.yml
+++ b/decidim-forms/config/locales/fi-plain.yml
@@ -188,9 +188,9 @@ fi-pl:
           questionnaire_closed:
             body: Kyselylomake on suljettu, eikä siihen voi vastata.
             title: Kysely on suljettu
-          questionnaire_for_private_users:
-            body: Kyselylomake on saatavilla vain yksityisille käyttäjille
-            title: Kysely on suljettu
+          questionnaire_for_members:
+            body: Kyselylomake on nähtävillä vain jäsenille
+            title: Kyselylomake on suljettu
           questionnaire_js_disabled:
             body: Jotkin tämän lomakkeen ominaisuudet eivät ole käytössä. Parantaaksesi käyttökokemustasi, ota JavaScript käyttöön selaimestasi.
             title: JavaScript ei ole käytössä
diff --git a/decidim-forms/config/locales/fi.yml b/decidim-forms/config/locales/fi.yml
index 7ccceb939f2ff..a3c7802873318 100644
--- a/decidim-forms/config/locales/fi.yml
+++ b/decidim-forms/config/locales/fi.yml
@@ -188,8 +188,8 @@ fi:
           questionnaire_closed:
             body: Kyselylomake on suljettu, eikä siihen voi vastata.
             title: Kyselylomake on suljettu
-          questionnaire_for_private_users:
-            body: Kyselylomake on nähtävillä vain yksityisille käyttäjille
+          questionnaire_for_members:
+            body: Kyselylomake on nähtävillä vain jäsenille
             title: Kyselylomake on suljettu
           questionnaire_js_disabled:
             body: Jotkin tämän lomakkeen ominaisuudet eivät ole käytössä. Parantaaksesi käyttökokemustasi, ota JavaScript käyttöön selaimestasi.
diff --git a/decidim-forms/config/locales/fr-CA.yml b/decidim-forms/config/locales/fr-CA.yml
index 92c8e581e2cee..e5661ae1cb9fa 100644
--- a/decidim-forms/config/locales/fr-CA.yml
+++ b/decidim-forms/config/locales/fr-CA.yml
@@ -184,9 +184,9 @@ fr-CA:
           questionnaire_closed:
             body: Le questionnaire est fermé et vous ne pouvez pas y répondre.
             title: Questionnaire fermé
-          questionnaire_for_private_users:
-            body: Le questionnaire est disponible uniquement pour les utilisateurs privés
-            title: Questionnaire fermé
+          questionnaire_for_members:
+            body: Le formulaire est disponible uniquement pour les membres
+            title: Formulaire fermé
           questionnaire_js_disabled:
             body: Certaines des fonctionnalités de ce formulaire seront désactivées. Pour améliorer votre expérience, veuillez activer JavaScript dans votre navigateur.
             title: JavaScript est désactivé
diff --git a/decidim-forms/config/locales/fr.yml b/decidim-forms/config/locales/fr.yml
index 4a8bd3e64e367..9ee5458700d1e 100644
--- a/decidim-forms/config/locales/fr.yml
+++ b/decidim-forms/config/locales/fr.yml
@@ -184,9 +184,9 @@ fr:
           questionnaire_closed:
             body: Le questionnaire est fermé et vous ne pouvez pas y répondre.
             title: Questionnaire fermé
-          questionnaire_for_private_users:
-            body: Le questionnaire est disponible uniquement pour les utilisateurs privés
-            title: Questionnaire fermé
+          questionnaire_for_members:
+            body: Le formulaire est disponible uniquement pour les membres
+            title: Formulaire fermé
           questionnaire_js_disabled:
             body: Certaines des fonctionnalités de ce formulaire seront désactivées. Pour améliorer votre expérience, veuillez activer JavaScript dans votre navigateur.
             title: JavaScript est désactivé
diff --git a/decidim-forms/config/locales/gl.yml b/decidim-forms/config/locales/gl.yml
index e6a033ab862a0..f1b3d9381a59c 100644
--- a/decidim-forms/config/locales/gl.yml
+++ b/decidim-forms/config/locales/gl.yml
@@ -51,9 +51,6 @@ gl:
         show:
           questionnaire_closed:
             title: Cuestionario pechado
-          questionnaire_for_private_users:
-            body: O cuestionario só está dispoñible para usuarios privados
-            title: Cuestionario pechado
           tos_agreement: Ao participar aceptas as Condicións de servizo
       step_navigation:
         show:
diff --git a/decidim-forms/config/locales/hu.yml b/decidim-forms/config/locales/hu.yml
index f1dfa868b8571..f72203a7b3d3c 100644
--- a/decidim-forms/config/locales/hu.yml
+++ b/decidim-forms/config/locales/hu.yml
@@ -54,9 +54,6 @@ hu:
         show:
           questionnaire_closed:
             title: A kérdőív lezárult
-          questionnaire_for_private_users:
-            body: A kérdőív csak magán felhasználók számára áll rendelkezésre
-            title: A kérdőív lezárult
           tos_agreement: A részvétellel elfogadja az Általános Szerződési Feltételeket
       step_navigation:
         show:
diff --git a/decidim-forms/config/locales/id-ID.yml b/decidim-forms/config/locales/id-ID.yml
index c653067528910..6e17c2da315b3 100644
--- a/decidim-forms/config/locales/id-ID.yml
+++ b/decidim-forms/config/locales/id-ID.yml
@@ -39,9 +39,6 @@ id:
         show:
           questionnaire_closed:
             title: Formulir ditutup
-          questionnaire_for_private_users:
-            body: Formulir ini hanya tersedia untuk pengguna pribadi
-            title: Formulir ditutup
           tos_agreement: Dengan berpartisipasi Anda menerima Ketentuan Layanannya
       step_navigation:
         show:
diff --git a/decidim-forms/config/locales/it.yml b/decidim-forms/config/locales/it.yml
index 68022295dfd58..7cdcae34be0c6 100644
--- a/decidim-forms/config/locales/it.yml
+++ b/decidim-forms/config/locales/it.yml
@@ -79,9 +79,6 @@ it:
           of_total_steps: di %{total_steps}
           questionnaire_closed:
             title: Questionario chiuso
-          questionnaire_for_private_users:
-            body: Il questionario è disponibile solo per gli utenti privati
-            title: Questionario chiuso
           questionnaire_js_disabled:
             body: Alcune caratteristiche di questo modulo saranno disabilitate. Per migliorare la tua esperienza, abilita JavaScript nel tuo browser.
             title: JavaScript è disabilitato
diff --git a/decidim-forms/config/locales/ja.yml b/decidim-forms/config/locales/ja.yml
index 905932733be8a..322dc9023f60f 100644
--- a/decidim-forms/config/locales/ja.yml
+++ b/decidim-forms/config/locales/ja.yml
@@ -188,8 +188,8 @@ ja:
           questionnaire_closed:
             body: フォームが閉じられているため、応答できません。
             title: フォームを閉じました
-          questionnaire_for_private_users:
-            body: このフォームはプライベートユーザーのみ利用できます
+          questionnaire_for_members:
+            body: フォームはメンバーのみ利用可能です
             title: フォームを閉じました
           questionnaire_js_disabled:
             body: このフォームのいくつかの機能は無効になります。あなたのエクスペリエンスを向上させるために、ブラウザでJavaScriptを有効にしてください。
diff --git a/decidim-forms/config/locales/lb.yml b/decidim-forms/config/locales/lb.yml
index caea150b2c2be..3c6351dd67b9c 100644
--- a/decidim-forms/config/locales/lb.yml
+++ b/decidim-forms/config/locales/lb.yml
@@ -79,9 +79,6 @@ lb:
           of_total_steps: von %{total_steps}
           questionnaire_closed:
             title: Fragebogen geschlossen
-          questionnaire_for_private_users:
-            body: Der Fragebogen ist nur für Privatanwender verfügbar
-            title: Fragebogen geschlossen
           questionnaire_js_disabled:
             body: Manche Funktionen des Formulars werden deaktiviert sein. Aktivieren Sie JavaScript in Ihrem Browser für eine bessere Erfahrung.
             title: JavaScript ist deaktiviert
diff --git a/decidim-forms/config/locales/lt.yml b/decidim-forms/config/locales/lt.yml
index 0f394d3f3407a..6505b0049b35f 100644
--- a/decidim-forms/config/locales/lt.yml
+++ b/decidim-forms/config/locales/lt.yml
@@ -93,9 +93,6 @@ lt:
           of_total_steps: iš%{total_steps}
           questionnaire_closed:
             title: Forma uždaryta
-          questionnaire_for_private_users:
-            body: Forma pateikiama tik privatiems naudotojams
-            title: Forma uždaryta
           questionnaire_js_disabled:
             body: Kai kurie šios formos funkcionalumai bus neaktyvūs. Kad pagerintumėte naudojimo patirtį, naršyklėje įjunkite „JavaScript“.
             title: '„JavaScript“ išjungta'
diff --git a/decidim-forms/config/locales/lv.yml b/decidim-forms/config/locales/lv.yml
index c5c4e62abfc76..d06bcadf5a419 100644
--- a/decidim-forms/config/locales/lv.yml
+++ b/decidim-forms/config/locales/lv.yml
@@ -55,9 +55,6 @@ lv:
           of_total_steps: no %{total_steps}
           questionnaire_closed:
             title: Veidlapa slēgta
-          questionnaire_for_private_users:
-            body: Veidlapa ir pieejama tikai privātiem lietotājiem
-            title: Veidlapa slēgta
           tos_agreement: Piedaloties jūs piekrītat pakalpojumu sniegšanas noteikumiem.
       step_navigation:
         show:
diff --git a/decidim-forms/config/locales/nl.yml b/decidim-forms/config/locales/nl.yml
index d01d3e1fe62d8..64a8798f95f23 100644
--- a/decidim-forms/config/locales/nl.yml
+++ b/decidim-forms/config/locales/nl.yml
@@ -84,9 +84,6 @@ nl:
           of_total_steps: van %{total_steps}
           questionnaire_closed:
             title: Vragenlijst gesloten
-          questionnaire_for_private_users:
-            body: De vragenlijst is alleen beschikbaar voor privé-gebruikers
-            title: Vragenlijst gesloten
           questionnaire_js_disabled:
             body: Sommige functies van dit formulier worden uitgeschakeld. Schakel JavaScript in in uw browser om uw ervaring te verbeteren.
             title: JavaScript is uitgeschakeld
diff --git a/decidim-forms/config/locales/no.yml b/decidim-forms/config/locales/no.yml
index 72c3f1c7a7a36..1c59334fa3ef4 100644
--- a/decidim-forms/config/locales/no.yml
+++ b/decidim-forms/config/locales/no.yml
@@ -87,9 +87,6 @@
           of_total_steps: av %{total_steps}
           questionnaire_closed:
             title: Skjema lukket
-          questionnaire_for_private_users:
-            body: Skjemaet er bare tilgjengelig for private brukere
-            title: Skjema lukket
           questionnaire_js_disabled:
             body: Noen av funksjonene i dette skjemaet vil bli deaktivert. For å forbedre opplevelsen, må du aktivere JavaScript i nettleseren.
             title: JavaScript deaktivert
diff --git a/decidim-forms/config/locales/pl.yml b/decidim-forms/config/locales/pl.yml
index 70676065346b6..a20382fa64e02 100644
--- a/decidim-forms/config/locales/pl.yml
+++ b/decidim-forms/config/locales/pl.yml
@@ -94,9 +94,6 @@ pl:
           of_total_steps: z %{total_steps}
           questionnaire_closed:
             title: Formularz został zamknięty
-          questionnaire_for_private_users:
-            body: Formularz jest dostępny tylko dla użytkowników prywatnych
-            title: Formularz został zamknięty
           questionnaire_js_disabled:
             body: Niektóre funkcje tego formularza zostaną wyłączone. Aby strona dostarczała lepszych doświadczeń, włącz obsługę JavaScript w przeglądarce.
             title: JavaScript jest wyłączony
diff --git a/decidim-forms/config/locales/pt-BR.yml b/decidim-forms/config/locales/pt-BR.yml
index bb87045f561d8..d7cf7c22f9a88 100644
--- a/decidim-forms/config/locales/pt-BR.yml
+++ b/decidim-forms/config/locales/pt-BR.yml
@@ -7,14 +7,56 @@ pt-BR:
       questionnaire_question:
         mandatory: Obrigatório
         max_characters: Limite de caracteres (deixe para 0 se não houver limite)
+      response:
+        body: Resposta
+        choices: Escolhas
+        selected_choices: Escolhas selecionadas
+    errors:
+      models:
+        questionnaire:
+          request_invalid: Houve um problema ao lidar com a solicitação. Por favor, tente novamente.
+        response:
+          attributes:
+            add_documents:
+              needs_to_be_reattached: Precisa ser reanexado
+            body:
+              too_long: é muito longo
+            choices:
+              missing: não estão completos
+              too_many: Você pode escolher um máximo de %{count}.
   decidim:
+    download_your_data:
+      help:
+        responses:
+          id: O identificador único da resposta
+          question: A pergunta respondida
+          questionnaire: O formulário respondido
+          response: A resposta para a pergunta
+          user: O usuário que respondeu ao formulário
+      show:
+        responses: Exportação de respostas
+        survey_user_responses: Respostas do usuário da pesquisa
     forms:
       admin:
         models:
           components:
+            allow_editing_responses: Permitir que usuários registrados editem suas próprias respostas à pesquisa
+            allow_responses: Permitir respostas
+            allow_unregistered: Permitir que usuários não registrados respondam à pesquisa
+            allow_unregistered_help: Se ativo, nenhum login será necessário para responder à pesquisa. Isso pode levar a dados ruins ou não confiáveis e será mais vulnerável a ataques automatizados. Usar com cuidado! Lembre-se de que um usuário pode responder à mesma pesquisa várias vezes, usando diferentes navegadores ou a função "navegação privada" de seu navegador.
+            announcement: Anúncio
+            clean_after_publish: Excluir respostas ao publicar a pesquisa
             description: Descrição
+            ends_at: Respostas aceitas até
+            ends_at_help: Deixe em branco para nenhuma data específica
+            starts_at: Respostas aceitas de
+            starts_at_help: Deixe em branco para nenhuma data específica
             tos: Termos de serviço
         questionnaires:
+          actions:
+            back: Voltar para respostas
+            publish_responses: Publicar respostas
+            show: Respostas
           display_condition:
             condition_question: Questão
             condition_type: Condição
@@ -22,16 +64,26 @@ pt-BR:
               equal: Igual
               match: Incluir texto
               not_equal: Diferente
+              not_responded: Não respondeu
+              responded: Respondeu
             condition_value: Incluir texto
             display_condition: Exibir condição
             mandatory: Esta condição precisa ser sempre satisfeita independentemente do status de outras condições
             remove: Remover
+            response_option: Opção de resposta
             save_warning: Lembre-se de salvar o formulário antes de configurar condições de exibição
             select_condition_question: Selecione uma pergunta
             select_condition_type: Selecione um tipo de condição
+            select_response_option: Selecionar opção de resposta
           edit:
             save: Salvar
             title: Editar questionário
+          edit_questions:
+            add_question: Adicionar pergunta
+            add_separator: Adicionar separador
+            add_title_and_description: Adicionar título e descrição
+            save: Salvar
+            title: Perguntas
           form:
             add_question: Adicionar pergunta
             collapse: Recolher todas as questões
@@ -46,6 +98,7 @@ pt-BR:
             add_display_condition: Adicionar condição de exibição
             add_display_condition_info: Salve o formulário para configurar condições de exibição
             add_matrix_row: Adicionar linha
+            add_response_option: Adicionar opção de resposta
             any: Qualquer
             collapse: Recolher
             description: Descrição
@@ -53,9 +106,35 @@ pt-BR:
             question: Questão
             remove: Remover
             statement: Declaração
+          questions_form:
+            already_responded_warning: O formulário já foi respondido por alguns usuários então você não pode modificar suas perguntas.
+            collapse: Recolher todas as perguntas
+            expand: Expandir todas as perguntas
+            unpublished_warning: O formulário não foi publicado. Você pode modificar suas perguntas, mas ao fazê-lo apagará as respostas atuais.
+            update:
+              success: Perguntas da pesquisa salvas com sucesso.
+          response_option:
+            free_text: Texto livre
+            remove: Excluir
+            response_option: Opção de resposta
+            statement: Instrução
           responses:
             actions:
+              back: Voltar para respostas
+              export: Exportar
+              next: Próximo &rsaquo;
+              previous: "&lsaquo; Anterior"
               show: Mostrar respostas
+            empty: Ainda não há respostas
+            export:
+              response:
+                title: 'Resposta #%{number}'
+            export_response:
+              title: pesquisa_respostas_do_usuário_%{token}
+            index:
+              title: "Total de respostas de %{total}"
+            show:
+              title: 'Resposta #%{number}'
           separator:
             remove: Remover
             separator: Separador
@@ -70,8 +149,14 @@ pt-BR:
             invalid: Houve erros ao salvar o questionário.
             success: Formulário salvo com sucesso.
       admin_log:
+        question:
+          publish_responses: "%{user_name} publicou as respostas da pergunta %{resource_name} no espaço %{space_name}"
+          unpublish_responses: "%{user_name} não publicou as respostas da pergunta %{resource_name} no espaço %{space_name}"
         questionnaire:
           update: "%{user_name} atualizou o questionário %{resource_name}"
+      errors:
+        response:
+          body: Corpo não pode estar em branco
       images:
         dimensions: "%{width} x %{height} px"
         processors:
@@ -79,31 +164,67 @@ pt-BR:
           resize_to_fit: Esta imagem será redimensionada para caber %{dimensions}.
       question_types:
         files: Arquivos
+        long_response: Resposta longa
         matrix_multiple: Matriz (Múltipla opção)
         matrix_single: Matriz (opção única)
         multiple_option: Opção múltipla
+        short_response: Resposta curta
         single_option: Opção única
         sorting: Classificação
         title_and_description: Título e descrição
+      questionnaire_response_presenter:
+        download_attachment: Baixar anexo
       questionnaires:
         question:
           max_choices: 'Escolhas máximas: %{n}'
+        response:
+          invalid: Houve um problema ao responder o formulário.
+          max_choices_alert: Há muitas opções selecionadas
+          success: Formulário respondido com sucesso.
         show:
           current_step: Passo %{step}
+          empty: Nenhuma pergunta configurada para este formulário ainda.
           of_total_steps: de %{total_steps}
           questionnaire_closed:
+            body: O formulário está fechado e não pode ser respondido.
             title: Questionário fechado
-          questionnaire_for_private_users:
-            body: O questionário está disponível apenas para usuários particulares
-            title: Questionário fechado
+          questionnaire_for_members:
+            body: O formulário está disponível apenas para membros
+            title: Formulário fechado
           questionnaire_js_disabled:
             body: Algumas das funcionalidades deste formulário serão desativadas. Para melhorar sua experiência, por favor ative o JavaScript no seu navegador.
             title: JavaScript está desativado
           questionnaire_not_published:
             body: Este formulário ainda não foi publicado.
+          questionnaire_responded:
+            body: Você já respondeu a este formulário.
+            title: Já respondido
+          questionnaire_responded_edit:
+            body: Você já respondeu a este formulário. %{link}
+            edit: Edite suas respostas
+          response_questionnaire:
+            already_have_an_account?: Já tem uma conta?
+            are_you_new?: Usuário novo?
+            sign_in_description: Faça ‘login’ para participar da pesquisa
+            sign_up_description: Crie uma conta de participante para responder à pesquisa
+            title: Responda ao formulário
           tos_agreement: Ao participar você aceita seus Termos de Serviço
       step_navigation:
         show:
+          are_you_sure_edit_guest: Se você quiser poder editar suas respostas posteriormente, precisará fazer ‘login’ ou criar uma conta.
+          are_you_sure_no_edit: Esta ação não pode ser desfeita e você não poderá editar suas respostas. Tem certeza?
           back: Voltar
           continue: Continuar
+          disallowed: Você não tem permissão para editar suas respostas.
           submit: Enviar
+      user_responses_serializer:
+        body: Resposta
+        completion: Conclusão
+        created_at: Respondeu em
+        id: ID resposta
+        ip_hash: IP 'Hash'
+        question: Pergunta
+        registered: Registrado
+        session_token: Identificador do usuário
+        unregistered: Não registrado
+        user_status: '''Status'' do usuário'
diff --git a/decidim-forms/config/locales/pt.yml b/decidim-forms/config/locales/pt.yml
index 71e0ac8220d36..78b8f9b369bc7 100644
--- a/decidim-forms/config/locales/pt.yml
+++ b/decidim-forms/config/locales/pt.yml
@@ -79,9 +79,6 @@ pt:
           of_total_steps: de %{total_steps}
           questionnaire_closed:
             title: Questionário encerrado
-          questionnaire_for_private_users:
-            body: O questionário está disponível apenas para utilizadores privados
-            title: Questionário encerrado
           questionnaire_js_disabled:
             body: Algumas características deste questionário serão desativadas. Para melhorar a sua experiência, por favor ative o JavaScript no seu navegador.
             title: JavaScript está desativado
diff --git a/decidim-forms/config/locales/ro-RO.yml b/decidim-forms/config/locales/ro-RO.yml
index e623d8996bc7a..9c265fc637330 100644
--- a/decidim-forms/config/locales/ro-RO.yml
+++ b/decidim-forms/config/locales/ro-RO.yml
@@ -121,9 +121,6 @@ ro:
           of_total_steps: din %{total_steps}
           questionnaire_closed:
             title: Formular închis
-          questionnaire_for_private_users:
-            body: Chestionarul este disponibil doar pentru utilizatorii privați
-            title: Chestionar închis
           questionnaire_js_disabled:
             body: Unele dintre funcționalitățile acestui chestionar vor fi dezactivate. Pentru a îți îmbunătăți experiența, te rugăm să activezi JavaScript în browser-ul tău.
             title: JavaScript este dezactivat
diff --git a/decidim-forms/config/locales/ru.yml b/decidim-forms/config/locales/ru.yml
index ff7c24cf77ddc..00b362d9d4c3f 100644
--- a/decidim-forms/config/locales/ru.yml
+++ b/decidim-forms/config/locales/ru.yml
@@ -26,9 +26,6 @@ ru:
         show:
           questionnaire_closed:
             title: Форма закрыта
-          questionnaire_for_private_users:
-            body: Форма доступна только для частных пользователей
-            title: Форма закрыта
       step_navigation:
         show:
           submit: Отправить
diff --git a/decidim-forms/config/locales/sk.yml b/decidim-forms/config/locales/sk.yml
index 011f764cf7e4d..7acf78a16928f 100644
--- a/decidim-forms/config/locales/sk.yml
+++ b/decidim-forms/config/locales/sk.yml
@@ -39,9 +39,6 @@ sk:
         show:
           questionnaire_closed:
             title: Formulár je uzavretý.
-          questionnaire_for_private_users:
-            body: Formulár je otvorený len pre súkromných používateľov
-            title: Formulár je uzavretý
           tos_agreement: Účasťou súhlasíte s našimi Podmienkami použitia
       step_navigation:
         show:
diff --git a/decidim-forms/config/locales/sv.yml b/decidim-forms/config/locales/sv.yml
index cf8971b8aec75..0f38b0c136130 100644
--- a/decidim-forms/config/locales/sv.yml
+++ b/decidim-forms/config/locales/sv.yml
@@ -188,9 +188,6 @@ sv:
           questionnaire_closed:
             body: Formuläret är stängt och kan inte besvaras.
             title: Formuläret är stängt
-          questionnaire_for_private_users:
-            body: Formuläret är endast tillgängligt för privata användare
-            title: Formuläret är stängt
           questionnaire_js_disabled:
             body: Vissa av formulärets funktioner kommer att inaktiveras. Aktivera JavaScript i webbläsaren för att förbättra upplevelsen.
             title: JavaScript är inaktiverat
diff --git a/decidim-forms/config/locales/tr-TR.yml b/decidim-forms/config/locales/tr-TR.yml
index c3ee5b0b05565..0097feac467a5 100644
--- a/decidim-forms/config/locales/tr-TR.yml
+++ b/decidim-forms/config/locales/tr-TR.yml
@@ -78,9 +78,6 @@ tr:
           of_total_steps: '%{total_steps}'
           questionnaire_closed:
             title: Form kapatıldı
-          questionnaire_for_private_users:
-            body: Form yalnızca özel kullanıcılar tarafından kullanılabilir
-            title: Form kapatıldı
           questionnaire_js_disabled:
             body: Bu formun bazı özellikleri devre dışı bırakılacak. Deneyiminizi iyileştirmek için lütfen tarayıcınızda JavaScript'i etkinleştirin.
             title: JavaScript devre dışı
diff --git a/decidim-forms/config/locales/zh-CN.yml b/decidim-forms/config/locales/zh-CN.yml
index 14ce15a99d451..8f5a1d669122a 100644
--- a/decidim-forms/config/locales/zh-CN.yml
+++ b/decidim-forms/config/locales/zh-CN.yml
@@ -76,9 +76,6 @@ zh-CN:
           of_total_steps: '%{total_steps}'
           questionnaire_closed:
             title: 表单已关闭
-          questionnaire_for_private_users:
-            body: 表单仅供私人用户使用
-            title: 表单已关闭
           questionnaire_js_disabled:
             body: 此表单的一些功能将被禁用。为了改善您的体验，请在您的浏览器中启用 JavaScript。
             title: JavaScript 已禁用
diff --git a/decidim-forms/config/locales/zh-TW.yml b/decidim-forms/config/locales/zh-TW.yml
index a10d704e680f2..701e42cee666d 100644
--- a/decidim-forms/config/locales/zh-TW.yml
+++ b/decidim-forms/config/locales/zh-TW.yml
@@ -93,9 +93,6 @@ zh-TW:
           of_total_steps: 的%{total_steps}
           questionnaire_closed:
             title: 表單已關閉
-          questionnaire_for_private_users:
-            body: 此表單僅適用於私人使用者
-            title: 表單已關閉
           questionnaire_js_disabled:
             body: 此表單的某些功能將被禁用。為了改善您的體驗，請在您的瀏覽器中啟用JavaScript。
             title: JavaScript已停用
diff --git a/decidim-forms/lib/decidim/exporters/form_pdf.rb b/decidim-forms/lib/decidim/exporters/form_pdf.rb
index 8722d0159080a..76cb22c7fb0b7 100644
--- a/decidim-forms/lib/decidim/exporters/form_pdf.rb
+++ b/decidim-forms/lib/decidim/exporters/form_pdf.rb
@@ -12,7 +12,14 @@ class FormPDF < PDF
 
       class QuestionnaireResponsePresenter < Decidim::Forms::Admin::QuestionnaireResponsePresenter
         def choice(choice_hash)
-          render_body_for choice_hash
+          if choice_hash[:matrix_row_body].present?
+            row_text = choice_hash[:matrix_row_body]
+            option_text = choice_hash[:response_option_body]
+            custom_text = choice_hash[:choice_body].present? ? " (#{choice_hash[:choice_body]})" : ""
+            "#{row_text}: #{option_text}#{custom_text}"
+          else
+            render_body_for choice_hash
+          end
         end
 
         delegate :attachments, to: :response
@@ -25,7 +32,8 @@ def body
           choices = response.choices.map do |choice|
             {
               response_option_body: choice.try(:response_option).try(:translated_body),
-              choice_body: body_or_custom_body(choice)
+              choice_body: body_or_custom_body(choice),
+              matrix_row_body: choice.try(:matrix_row).try(:body) ? translated_attribute(choice.matrix_row.body) : nil
             }
           end
 
diff --git a/decidim-forms/spec/forms/decidim/forms/admin/display_condition_form_spec.rb b/decidim-forms/spec/forms/decidim/forms/admin/display_condition_form_spec.rb
index 96eb8fcddecd0..972183d127152 100644
--- a/decidim-forms/spec/forms/decidim/forms/admin/display_condition_form_spec.rb
+++ b/decidim-forms/spec/forms/decidim/forms/admin/display_condition_form_spec.rb
@@ -112,7 +112,7 @@ module Admin
 
         describe "#questions_for_select" do
           let(:questions_for_select) { subject.questions_for_select(questionnaire, question.id) }
-          let!(:separator_question) { create(:questionnaire_question, questionnaire: questionnaire, question_type: "separator") }
+          let!(:separator_question) { create(:questionnaire_question, questionnaire:, question_type: "separator") }
 
           it "returns an array of arrays containing translated body, id, and a hash" do
             expect(questions_for_select.first.first).to eq(
diff --git a/decidim-forms/spec/types/questionnaire_type_spec.rb b/decidim-forms/spec/types/questionnaire_type_spec.rb
index 7d84f0821f489..f120e944a6601 100644
--- a/decidim-forms/spec/types/questionnaire_type_spec.rb
+++ b/decidim-forms/spec/types/questionnaire_type_spec.rb
@@ -85,11 +85,11 @@ module Forms
           end
         end
 
-        context "when meeting is no published" do
+        context "when meeting is not published" do
           let(:meeting) { create(:meeting) }
 
-          it "returns the questionnaire's entity corresponding to questionnaire_for_id" do
-            expect(response["forEntity"]).to be_nil
+          it "throws Decidim::Api::Errors::UnauthorizedObjectError" do
+            expect { response }.to raise_error(Decidim::Api::Errors::UnauthorizedObjectError, "You cannot view or edit this Meeting because you do not have permissions")
           end
         end
       end
diff --git a/decidim-generators/Gemfile.lock b/decidim-generators/Gemfile.lock
index 9e6e228b876aa..65c17283c45ad 100644
--- a/decidim-generators/Gemfile.lock
+++ b/decidim-generators/Gemfile.lock
@@ -83,7 +83,6 @@ PATH
       kaminari (~> 1.2, >= 1.2.1)
       loofah (~> 2.19, >= 2.19.1)
       mime-types (>= 1.16, < 4.0)
-      mini_magick (~> 4.9)
       net-smtp (~> 0.5.0)
       nokogiri (~> 1.16, >= 1.16.2)
       omniauth (~> 2.0)
@@ -104,6 +103,7 @@ PATH
       redis (~> 4.1)
       request_store (~> 1.7.0)
       rqrcode (~> 2.2.0)
+      ruby-vips (~> 2.2)
       rubyXL (~> 3.4)
       rubyzip (~> 2.0)
       shakapacker (~> 8.3.0)
@@ -488,8 +488,8 @@ GEM
       ice_cube (~> 0.16)
       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)
@@ -543,7 +543,8 @@ GEM
       logger
       mime-types-data (~> 3.2015)
     mime-types-data (3.2025.0722)
-    mini_magick (4.13.2)
+    mini_magick (5.3.1)
+      logger
     mini_mime (1.1.5)
     minitest (5.25.5)
     msgpack (1.8.0)
@@ -802,7 +803,7 @@ GEM
       rubocop (~> 1.72)
       yard
     ruby-progressbar (1.13.0)
-    ruby-vips (2.2.4)
+    ruby-vips (2.2.5)
       ffi (~> 1.12)
       logger
     rubyXL (3.4.33)
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..21f62d91586e8 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
@@ -51,7 +51,7 @@ jobs:
       - name: Get npm cache directory path
         id: npm-cache-dir-path
         run: echo "dir=$(npm get cache)-<%= component_name %>" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         id: npm-cache
         with:
           path: ${{ steps.npm-cache-dir-path.outputs.dir }}
diff --git a/decidim-generators/lib/decidim/generators/component_templates/lib/decidim/component/component.rb.erb b/decidim-generators/lib/decidim/generators/component_templates/lib/decidim/component/component.rb.erb
index fd06a07836cea..9d8854ed5502b 100644
--- a/decidim-generators/lib/decidim/generators/component_templates/lib/decidim/component/component.rb.erb
+++ b/decidim-generators/lib/decidim/generators/component_templates/lib/decidim/component/component.rb.erb
@@ -7,10 +7,6 @@ Decidim.register_component(:<%= component_name %>) do |component|
   component.admin_engine = Decidim::<%= component_module_name %>::AdminEngine
   component.icon = "decidim/<%= component_name %>/icon.svg"
 
-  # component.on(:before_destroy) do |instance|
-  #   # Code executed before removing the component
-  # end
-
   # These actions permissions can be configured in the admin panel
   # component.actions = %w()
 
diff --git a/decidim-initiatives/app/cells/decidim/initiatives/initiative_dropdown_metadata_cell.rb b/decidim-initiatives/app/cells/decidim/initiatives/initiative_dropdown_metadata_cell.rb
deleted file mode 100644
index f6790f14100ad..0000000000000
--- a/decidim-initiatives/app/cells/decidim/initiatives/initiative_dropdown_metadata_cell.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Initiatives
-    class InitiativeDropdownMetadataCell < Decidim::ParticipatorySpaceDropdownMetadataCell
-      include InitiativesHelper
-      include Decidim::ComponentPathHelper
-      include ActiveLinkTo
-
-      def decidim_initiatives
-        Decidim::Initiatives::Engine.routes.url_helpers
-      end
-
-      private
-
-      def nav_items_method = :initiative_nav_items
-    end
-  end
-end
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/admin/create_initiative_type.rb b/decidim-initiatives/app/commands/decidim/initiatives/admin/create_initiative_type.rb
index 2ef054d6f7932..fa2aa61bb45b0 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/admin/create_initiative_type.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/admin/create_initiative_type.rb
@@ -5,8 +5,6 @@ module Initiatives
     module Admin
       # A command with all the business logic that creates a new initiative type
       class CreateInitiativeType < Decidim::Commands::CreateResource
-        fetch_file_attributes :banner_image
-
         fetch_form_attributes :title, :description, :signature_type, :comments_enabled, :attachments_enabled,
                               :undo_online_signatures_enabled, :custom_signature_end_date_enabled, :area_enabled,
                               :promoting_committee_enabled, :minimum_committee_members, :collect_user_extra_fields,
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative_type.rb b/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative_type.rb
index 6230d2c020e88..099459f910013 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative_type.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative_type.rb
@@ -6,8 +6,6 @@ module Admin
       # A command with all the business logic that updates an
       # existing initiative type.
       class UpdateInitiativeType < Decidim::Commands::UpdateResource
-        fetch_file_attributes :banner_image
-
         fetch_form_attributes :title, :description, :signature_type, :attachments_enabled, :comments_enabled,
                               :undo_online_signatures_enabled, :custom_signature_end_date_enabled, :area_enabled,
                               :promoting_committee_enabled, :minimum_committee_members, :collect_user_extra_fields,
diff --git a/decidim-initiatives/app/controllers/decidim/initiatives/initiatives_controller.rb b/decidim-initiatives/app/controllers/decidim/initiatives/initiatives_controller.rb
index 9f99358b9891f..d717d3a0e2fca 100644
--- a/decidim-initiatives/app/controllers/decidim/initiatives/initiatives_controller.rb
+++ b/decidim-initiatives/app/controllers/decidim/initiatives/initiatives_controller.rb
@@ -22,6 +22,7 @@ class InitiativesController < Decidim::Initiatives::ApplicationController
       include InitiativeSlug
       include FilterResource
       include Paginable
+      include Decidim::AttachmentsHelper
       include Decidim::FormFactory
       include Decidim::Initiatives::Orderable
       include TypeSelectorOptions
@@ -30,7 +31,7 @@ class InitiativesController < Decidim::Initiatives::ApplicationController
       include SingleInitiativeType
       include Decidim::IconHelper
 
-      helper_method :collection, :initiatives, :pending_initiatives, :filter, :stats, :tabs, :panels
+      helper_method :collection, :initiatives, :pending_initiatives, :filter, :stats, :tab_panel_items
       helper_method :initiative_type, :available_initiative_types
 
       before_action :authorize_participatory_space, only: [:show]
@@ -176,33 +177,8 @@ def stats
         @stats ||= InitiativeStatsPresenter.new(initiative: current_initiative)
       end
 
-      def tabs
-        @tabs ||= items.map { |item| item.slice(:id, :text, :icon) }
-      end
-
-      def panels
-        @panels ||= items.map { |item| item.slice(:id, :method, :args) }
-      end
-
-      def items
-        @items ||= [
-          {
-            enabled: @current_initiative.photos.present?,
-            id: "images",
-            text: t("decidim.application.photos.photos"),
-            icon: resource_type_icon_key("images"),
-            method: :cell,
-            args: ["decidim/images_panel", @current_initiative]
-          },
-          {
-            enabled: @current_initiative.documents.present?,
-            id: "documents",
-            text: t("decidim.application.documents.documents"),
-            icon: resource_type_icon_key("documents"),
-            method: :cell,
-            args: ["decidim/documents_panel", @current_initiative]
-          }
-        ].select { |item| item[:enabled] }
+      def tab_panel_items
+        @tab_panel_items ||= attachments_tab_panel_items(@current_initiative)
       end
     end
   end
diff --git a/decidim-initiatives/app/forms/decidim/initiatives/admin/initiative_type_form.rb b/decidim-initiatives/app/forms/decidim/initiatives/admin/initiative_type_form.rb
index b8f3fde7cf42b..b40ec7d852861 100644
--- a/decidim-initiatives/app/forms/decidim/initiatives/admin/initiative_type_form.rb
+++ b/decidim-initiatives/app/forms/decidim/initiatives/admin/initiative_type_form.rb
@@ -13,7 +13,6 @@ class InitiativeTypeForm < Decidim::Form
 
         translatable_attribute :title, String
         translatable_attribute :description, Decidim::Attributes::RichText
-        attribute :banner_image
         attribute :signature_type, String
         attribute :undo_online_signatures_enabled, Boolean
         attribute :attachments_enabled, Boolean
@@ -33,11 +32,8 @@ class InitiativeTypeForm < Decidim::Form
         validates :attachments_enabled, :undo_online_signatures_enabled, :custom_signature_end_date_enabled,
                   :area_enabled, :promoting_committee_enabled, inclusion: { in: [true, false] }
         validates :minimum_committee_members, numericality: { only_integer: true }, allow_nil: true
-        validates :banner_image, presence: true, if: ->(form) { !form.persisted? && form.context.initiative_type.nil? }
         validates :document_number_authorization_handler, presence: true, if: ->(form) { form.collect_user_extra_fields? }
 
-        validates :banner_image, passthru: { to: Decidim::InitiativesType }
-
         alias organization current_organization
 
         def minimum_committee_members=(value)
diff --git a/decidim-initiatives/app/models/decidim/initiative.rb b/decidim-initiatives/app/models/decidim/initiative.rb
index df2118eb55a85..6bb20cefbcf6b 100644
--- a/decidim-initiatives/app/models/decidim/initiative.rb
+++ b/decidim-initiatives/app/models/decidim/initiative.rb
@@ -173,7 +173,7 @@ def self.ransackable_attributes(auth_object = nil)
 
       return base unless auth_object&.admin?
 
-      base + %w(published_at state decidim_area_id type_id)
+      base + %w(published_at created_at state decidim_area_id type_id)
     end
 
     def self.ransackable_associations(_auth_object = nil)
@@ -184,14 +184,6 @@ def self.ransackable_scopes(_auth_object = nil)
       [:with_any_state, :with_any_type, :with_any_scope, :with_any_area]
     end
 
-    # Public: Overrides participatory space's banner image with the banner image defined
-    # for the initiative type.
-    #
-    # Returns Decidim::BannerImageUploader
-    def banner_image
-      type.attached_uploader(:banner_image)
-    end
-
     # Public: Whether the object's comments are visible or not.
     def commentable?
       type.comments_enabled?
diff --git a/decidim-initiatives/app/models/decidim/initiatives_type.rb b/decidim-initiatives/app/models/decidim/initiatives_type.rb
index 45620a99f6728..1aa69b1ec3c75 100644
--- a/decidim-initiatives/app/models/decidim/initiatives_type.rb
+++ b/decidim-initiatives/app/models/decidim/initiatives_type.rb
@@ -28,9 +28,6 @@ class InitiativesType < ApplicationRecord
 
     validates :title, :description, :signature_type, presence: true
 
-    has_one_attached :banner_image
-    validates_upload :banner_image, uploader: Decidim::BannerImageUploader
-
     def allowed_signature_types_for_initiatives
       return %w(online offline any) if any_signature_type?
 
diff --git a/decidim-initiatives/app/views/decidim/initiatives/admin/committee_requests/index.html.erb b/decidim-initiatives/app/views/decidim/initiatives/admin/committee_requests/index.html.erb
index 22cf06a2d434b..01eeee78af3be 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/admin/committee_requests/index.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/admin/committee_requests/index.html.erb
@@ -13,7 +13,7 @@
 
     <div class="row column">
       <div data-committee_link>
-        <%= decidim_initiatives.new_initiative_committee_request_url(current_initiative) %>
+        <%= decidim_initiatives.new_initiative_committee_request_url(current_initiative, locale: current_locale) %>
         <%= icon_link_to "clipboard-line", "#", t(".invite_to_committee_help"), class: "card--list__data__icon invite-users-link" %>
       </div>
     </div>
diff --git a/decidim-initiatives/app/views/decidim/initiatives/admin/exports/_dropdown.html.erb b/decidim-initiatives/app/views/decidim/initiatives/admin/exports/_dropdown.html.erb
index 1d27d0b782ea1..91c292cca779c 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/admin/exports/_dropdown.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/admin/exports/_dropdown.html.erb
@@ -13,7 +13,7 @@
   <ul id="dropdown-exports-<%= menu_id %>-<%= dropdown_id(collection_ids) %>" class="dropdown dropdown__bottom" aria-hidden="true">
     <% %w(CSV JSON).each do |format| %>
       <li class="dropdown__item">
-        <%= form_with url: export_initiatives_path(format: format), method: :post, class: "dropdown__button" do |f| %>
+        <%= form_with url: export_initiatives_path(format:), method: :post, class: "dropdown__button" do |f| %>
           <%= hidden_field_tag "collection_ids", collection_ids&.join(",") %>
           <%= f.submit t("decidim.admin.exports.export_as",
                          name: t("decidim.initiatives.admin.exports.initiatives"),
diff --git a/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives_types/_form.html.erb b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives_types/_form.html.erb
index a7eaa5e95fb5a..0aa44668c0667 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives_types/_form.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives_types/_form.html.erb
@@ -17,12 +17,6 @@
       <div class="row column">
         <%= form.translated :editor, :description, aria: { label: :description } %>
       </div>
-
-      <div class="row">
-        <div class="columns">
-          <%= form.upload :banner_image, button_class: "button button__sm button__transparent-secondary" %>
-        </div>
-      </div>
     </div>
   </div>
 
diff --git a/decidim-initiatives/app/views/decidim/initiatives/committee_requests/new.html.erb b/decidim-initiatives/app/views/decidim/initiatives/committee_requests/new.html.erb
index c96dbaab5e332..d0d386f084395 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/committee_requests/new.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/committee_requests/new.html.erb
@@ -5,8 +5,6 @@
                            url: initiative_url(current_initiative.id, locale: current_locale)
                          }) %>
 
-<% provide :meta_image_url, current_initiative.type.attached_uploader(:banner_image).url %>
-
 <%= render layout: "layouts/decidim/shared/layout_center" do %>
   <div class="text-center py-10">
     <h2 class="title-decorator inline-block text-left"><%= translated_attribute(current_initiative.title) %></h2>
diff --git a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/_share_committee_link.html.erb b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/_share_committee_link.html.erb
index e53dc782cad53..e5bc4af825d35 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/_share_committee_link.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/_share_committee_link.html.erb
@@ -19,5 +19,3 @@
     </div>
   </div>
 </div>
-
-<%= append_javascript_pack_tag "decidim_initiatives_admin" %>
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 d723a564614c8..d6caed1a4ea08 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
@@ -66,7 +66,7 @@
           <%= t(".discard") %>
         <% end %>
       <% end %>
-      <%= f.submit t(".continue"), class: "button button__sm md:button__lg button__secondary", data: { disable_with: true } %>
+      <%= f.submit t(".continue"), class: "button button__sm md:button__lg button__secondary", data: { disable_with: t(".continue") } %>
     </div>
   </div>
 <% end %>
diff --git a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/promotal_committee.html.erb b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/promotal_committee.html.erb
index d12a20dd2f88f..febfd21147449 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/promotal_committee.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/promotal_committee.html.erb
@@ -22,7 +22,7 @@
 <% if promoters_committee_members.count.positive? %>
   <div class="block">
     <% current_initiative.committee_members.each do |request| %>
-      <%= render partial: "committee_member", locals: { request: request } %>
+      <%= render partial: "committee_member", locals: { request: } %>
     <% end %>
   </div>
 <% end %>
diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiatives/_committee_members.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiatives/_committee_members.html.erb
index be6c45acd0fa5..519e5bce9a859 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/initiatives/_committee_members.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/initiatives/_committee_members.html.erb
@@ -51,5 +51,3 @@
     </div>
   <% end %>
 </div>
-
-<%= append_javascript_pack_tag "decidim_initiatives_admin" %>
diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiatives/_pending_initiatives.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiatives/_pending_initiatives.html.erb
index 6ff965a16933c..7c8141d9e132c 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/initiatives/_pending_initiatives.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/initiatives/_pending_initiatives.html.erb
@@ -1,5 +1,7 @@
 <h2 class="h5 md:h3 decorator"><%= t("title", scope: "decidim.initiatives.initiatives.pending_initiatives") %></h2>
 
+<%= cell("decidim/announcement", t("description", scope: "decidim.initiatives.initiatives.pending_initiatives")) %>
+
 <div class="card__grid-grid">
   <%= render pending_initiatives %>
 </div>
diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiatives/show.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiatives/show.html.erb
index 9c8c640906786..d49e021851d98 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/initiatives/show.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/initiatives/show.html.erb
@@ -180,24 +180,8 @@ edit_link(
 </section>
 
 <section class="layout-main__section">
-  <% if tabs.any? %>
-    <div class="mt-8" data-controller="accordion" data-multiselectable="false" data-collapsible="false">
-      <ul class="tab-x-container">
-        <% tabs.each_with_index do |tab, i| %>
-          <li>
-            <button id="trigger-<%= tab[:id] %>" class="tab-x" data-controls="panel-<%= tab[:id] %>" data-open="<%= "true" if i.zero? %>">
-              <%= icon tab[:icon], class: "text-gray fill-current" %><%= tab[:text] %>
-            </button>
-          </li>
-        <% end %>
-      </ul>
-
-      <% panels.each do |panel| %>
-        <div id="panel-<%= panel[:id] %>" class="py-8">
-          <%= send(panel[:method], *panel[:args]) %>
-        </div>
-      <% end %>
-    </div>
+  <% if tab_panel_items.any? %>
+    <%= cell "decidim/tab_panels", tab_panel_items %>
   <% end %>
 </section>
 
diff --git a/decidim-initiatives/app/views/layouts/decidim/initiative.html.erb b/decidim-initiatives/app/views/layouts/decidim/initiative.html.erb
index a49d60de5d8a2..efb0ea3f3c339 100644
--- a/decidim-initiatives/app/views/layouts/decidim/initiative.html.erb
+++ b/decidim-initiatives/app/views/layouts/decidim/initiative.html.erb
@@ -1,8 +1,6 @@
 <%= append_javascript_pack_tag "decidim_initiatives" %>
 <%= append_stylesheet_pack_tag "decidim_initiatives", media: "all" %>
 
-<% 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>
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..0a67d0b080faa 100644
--- a/decidim-initiatives/app/views/layouts/decidim/initiative_head.html.erb
+++ b/decidim-initiatives/app/views/layouts/decidim/initiative_head.html.erb
@@ -1,8 +1,6 @@
 <%= append_javascript_pack_tag "decidim_initiatives" %>
 <%= append_stylesheet_pack_tag "decidim_initiatives", media: "all" %>
 
-<% provide :meta_image_url, current_initiative.type.attached_uploader(:banner_image).url %>
-
 <%= render partial: "layouts/decidim/header/follow_space_menu_bar_button", locals: { participatory_space: current_participatory_space } %>
 
 <%= render "layouts/decidim/application" do %>
diff --git a/decidim-initiatives/config/locales/de.yml b/decidim-initiatives/config/locales/de.yml
index e4fa4f2580053..bd5f2b73954e2 100644
--- a/decidim-initiatives/config/locales/de.yml
+++ b/decidim-initiatives/config/locales/de.yml
@@ -686,6 +686,7 @@ de:
       initiative:
         actions:
           comment: Kommentieren
+          vote_comment: Kommentar bewerten
       initiatives_type:
         actions:
           create: Initiative erstellen
diff --git a/decidim-initiatives/config/locales/en.yml b/decidim-initiatives/config/locales/en.yml
index 60adc39386bcf..c5c5e2528ea92 100644
--- a/decidim-initiatives/config/locales/en.yml
+++ b/decidim-initiatives/config/locales/en.yml
@@ -28,7 +28,6 @@ en:
       initiatives_type:
         area_enabled: Enable authors to choose the area for their initiative
         attachments_enabled: Enable attachments
-        banner_image: Banner image
         child_scope_threshold_enabled: Enable child scope signatures
         collect_user_extra_fields: Collect participant personal data on signature
         comments_enabled: Enable comments
@@ -551,6 +550,7 @@ en:
           recent: Most recent
           recently_published: Most recently published
         pending_initiatives:
+          description: These initiatives are not public yet. Please review them and submit them for technical validation so they can be made public.
           title: Draft & Pending initiatives
         print:
           address: Address
diff --git a/decidim-initiatives/config/locales/eu.yml b/decidim-initiatives/config/locales/eu.yml
index 4969ce7dc21f6..f26ae1175f1a0 100644
--- a/decidim-initiatives/config/locales/eu.yml
+++ b/decidim-initiatives/config/locales/eu.yml
@@ -200,7 +200,7 @@ eu:
       badges:
         initiatives:
           conditions:
-            - Joan zaitez Intiatives-ko partaidetza espaziora
+            - Joan zaitez Intiatives-ko partaidetza-espaziora
             - Jarraitu urrats berriak beste ekimen bat sortzeko
           description: Garaikur hau ekimen berriak martxan jartzean ematen da, beste batzuekin partekatuz horiek lortzeko.
           description_another: Parte-hartzaile honek %{score} ekimen argitaratzea lortu du.
@@ -260,9 +260,9 @@ eu:
             confirm: Ziur zaude?
             confirm_send_to_technical_validation: Ziur zaude?
             discard: Ekimena baztertu
-            export_pdf_signatures: Esportatu sinaduren PDF
+            export_pdf_signatures: Esportatu sinaduren PDF fitxetagia
             export_votes: Esportatu sinadurak
-            reject: Ukatu ekimena
+            reject: Ekimena ukatu
             send_to_technical_validation: Baliozkotze teknikorako bidali
             success: Ekimena baliozkotze teknikora bidali da.
             update: Eguneratu
@@ -385,7 +385,7 @@ eu:
         fill_data:
           confirm_discard: Ziur zaude ekimen hau baztertu nahi duzula?
           continue: Jarraitu
-          discard: Kendu ekimena
+          discard: Ekimena kendu
           fill_data_help: "<ul> <li>Berrikusi zure ekimenaren edukia. Zure izenburua ulertzen erraza da? Zure ekimenaren helburua argi dago?</li> <li>Sinadura mota aukeratu behar duzu.</li> <li>aurrez aurre, linean edo biak konbinatuta. Zein da ekimenaren eremu geografikoa? </li> </ul>"
           more_information: Informazio gehiago
           select_area: Hautatu arlo bat
@@ -393,8 +393,8 @@ eu:
         finish:
           back: Atzera
           callout_text_created: Zorionak! Zure ekimena zuzen sortu da.
-          callout_text_validating: Zure ekimena zuzen bidali da balidazio teknikora.
-          go_to_initiatives: Joan ekimenetara
+          callout_text_validating: Zure ekimena balidazio teknikora zuzen bidali da.
+          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
@@ -409,10 +409,10 @@ eu:
         select_initiative_type:
           back: Back
           choose_html: <strong>%{title}</strong>bat sortu nahi dut
-          consult_existing_initiatives: Kontsultatu lehendik dauden ekimenak
+          consult_existing_initiatives: Lehendik dauden ekimenak konsultatu
           continue: Jarraitu
-          more_information: (Informazio gehiago)
-          new: Sortu beste ekimen bat
+          more_information: Informazio gehiago
+          new: Beste ekimen bat sortu
           select: Ekimen hau sustatu nahi dut
           select_initiative_type_help_html: "<p>Ekimenak bide dira parte-hartzaileek parte har dezaten, erakundeak interes orokorraren aldeko ekintzak egin ditzan. Zein ekimen jarri nahi duzu abian?</p>"
           show_less: Gutxiago erakutsi
@@ -431,9 +431,9 @@ eu:
         back: Atzera
         confirm: Ziur zaude?
         discard: Kendu ekimena
-        export_pdf_signatures: Esportatu sinaduren PDF
+        export_pdf_signatures: Sinadurak PDF batera esportatu
         export_votes: Sinadurak esportatu
-        reject: Ukatu ekimena
+        reject: Ekimena ukatu
         title: Ekimena editatu
         update: Eguneratu
       events:
@@ -458,10 +458,10 @@ eu:
           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>.
       form:
-        add_attachments: Gehitu eranskinak
+        add_attachments: Eranskinak gehitu
         add_image: Irudia gehitu
-        attachment_legend: Gehitu dokumentu bat edo irudi bat
-        edit_attachments: Editatu eranskinak
+        attachment_legend: Dokumentu bat edo irudi bat gehitu
+        edit_attachments: Eranskinak editatu
         edit_image: Editatu irudia
         image_legend: "(Aukerakoa) Gehitu irudi bat"
       index:
@@ -596,7 +596,7 @@ eu:
         votes_count:
           count:
             one: SIGNATURE
-            other: sinadurak
+            other: Sinadurak
       initiatives_mailer:
         creation_subject: Zure '%{title}'ekimena sortu egin da
         initiative_link:
@@ -647,7 +647,7 @@ eu:
             name: Sinaduren Legezko Kudeatzailea
       states:
         accepted: Onartua
-        expired: iraungi
+        expired: Iraungita
       unavailable_scope: Eremua ez dago erabilgarri
       update:
         error: Arazo bat izan da ekimena eguneratzean.
@@ -685,11 +685,11 @@ eu:
     resources:
       initiative:
         actions:
-          comment: Egin iruzkina
-          vote_comment: Bozkatu iruzkina
+          comment: Iruzkindu
+          vote_comment: Iruzkina bozkatu
       initiatives_type:
         actions:
-          create: Sortu ekimen bat
+          create: Ekimen bat sortu
           title: Ekintzak
     statistics:
       initiatives_count: Ekimenak
@@ -703,7 +703,7 @@ eu:
         select_initiative_type: Aukeratu
       initiative_signature_creation_header:
         help_information_html: '%{iniciative_autor}-k sustatzen duen %<strong>{iniciative_title}</strong> ekimena sinatzeko, beharrezkoa da informazio jakin bat ematea, sinatzen duen ekimena legez loteslea izan dadin. Ez da zuri buruzko informaziorik argitaratuko.'
-        verify_your_identity: Egiaztatu zure nortasuna
+        verify_your_identity: Zure nortasuna egiaztatu
       initiatives:
         no_initiatives_yet:
           no_initiatives_yet: Ez dago ekimenik oraindik!
diff --git a/decidim-initiatives/config/locales/ja.yml b/decidim-initiatives/config/locales/ja.yml
index ec4b11ebd5fe9..7dea683486745 100644
--- a/decidim-initiatives/config/locales/ja.yml
+++ b/decidim-initiatives/config/locales/ja.yml
@@ -92,6 +92,8 @@ ja:
               validating: 技術的検証
           type_id_eq:
             label: タイプ
+        search_placeholder:
+          title_or_description_or_author_name_or_author_nickname_cont: '%{collection} をタイトル、説明、または著者名で検索'
       initiatives_settings:
         update:
           error: イニシアチブ設定の更新中に問題が発生しました。
@@ -677,6 +679,7 @@ ja:
       initiative:
         actions:
           comment: コメント
+          vote_comment: コメントに投票
       initiatives_type:
         actions:
           create: イニシアチブを作成
diff --git a/decidim-initiatives/config/locales/ro-RO.yml b/decidim-initiatives/config/locales/ro-RO.yml
index b1359215bf439..84d904ceb2327 100644
--- a/decidim-initiatives/config/locales/ro-RO.yml
+++ b/decidim-initiatives/config/locales/ro-RO.yml
@@ -172,6 +172,7 @@ ro:
             - Urmează pașii necesari pentru a crea o nouă inițiativă
           description: Această insignă este acordată atunci când lansezi noi inițiative, colaborând cu alții pentru a o realiza.
           description_another: Acest participant a publicat %{score} inițiative.
+          description_own: Aveți %{score} inițiative publicate.
           name: Inițiative publicate
           next_level_in: Obține încă %{score} inițiative publicate pentru a atinge următorul nivel!
           unearned_another: Acest participant nu a publicat încă nicio inițiativă.
@@ -518,6 +519,8 @@ ro:
         promotal_committee_help: Nu uita că trebuie să inviți cel puțin %{member_count} persoane în comisia de promovare. Poți trimite link-ul următor pentru a invita persoane în comitetul de promovare
         status_change_body_for: 'Inițiativa %{title} și-a schimbat statutul după cum urmează: %{state}'
         status_change_for: Inițiativa %{title} și-a schimbat statutul
+      last_activity:
+        new_initiative: 'Inițiativă nouă:'
       modal:
         not_authorized:
           authorizations_page: Vezi autorizațiile
@@ -528,6 +531,7 @@ ro:
           accepted: Semnături suficiente
           created: Create
           discarded: Respins
+          open: Deschisă
           rejected: Semnături insuficiente
           validating: Validarea tehnică
       signatures:
diff --git a/decidim-initiatives/config/locales/sv.yml b/decidim-initiatives/config/locales/sv.yml
index a7b8f1aa2eba6..fc582e7eb4ef5 100644
--- a/decidim-initiatives/config/locales/sv.yml
+++ b/decidim-initiatives/config/locales/sv.yml
@@ -146,6 +146,9 @@ sv:
             nickname: Användarnamn
             postal_code: Postnummer
             timestamp: Tidsstämpel
+      taxonomy_filters:
+        space_filter_for:
+          initiatives: Alla initiativ
       titles:
         initiatives: Initiativ
         initiatives_types: Typer av initiativ
@@ -269,7 +272,7 @@ sv:
           edit:
             update: Uppdatera
           form:
-            comments: Mest kommenterade
+            comments: Flest kommentarer
             date: Senaste
             publication_date: Senast publicerade
             random: Slumpvis
@@ -452,7 +455,7 @@ sv:
           no_initiatives_warning: Inga initiativ matchar dina sökkriterier.
         orders:
           label: 'Sortera initiativ efter:'
-          most_commented: Mest kommenterade
+          most_commented: Flest kommentarer
           most_voted: Flest underskrifter
           random: Slumpvis
           recent: Senaste
diff --git a/decidim-initiatives/lib/decidim/api/initiative_api_type.rb b/decidim-initiatives/lib/decidim/api/initiative_api_type.rb
index 60f624b683f94..a204ed6e65d48 100644
--- a/decidim-initiatives/lib/decidim/api/initiative_api_type.rb
+++ b/decidim-initiatives/lib/decidim/api/initiative_api_type.rb
@@ -9,7 +9,6 @@ class InitiativeApiType < Decidim::Api::Types::BaseObject
       description "An initiative type"
 
       field :attachments_enabled, GraphQL::Types::Boolean, "Enable attachments on initiative types", null: true
-      field :banner_image, GraphQL::Types::String, "Banner image", null: true
       field :collect_user_extra_fields, GraphQL::Types::Boolean, "Collect participant personal data on signature", null: true
       field :comments_enabled, GraphQL::Types::Boolean, "Enable comments on initiative types", null: true
       field :custom_signature_end_date_enabled, GraphQL::Types::Boolean, "Enable participants to set custom signature end date", null: true
@@ -23,10 +22,6 @@ class InitiativeApiType < Decidim::Api::Types::BaseObject
       field :title, Decidim::Core::TranslatedFieldType, "Initiative type name", null: true
       field :undo_online_signatures_enabled, GraphQL::Types::Boolean, "Enable participants to undo their online signatures", null: true
       field :validate_sms_code_on_votes, GraphQL::Types::Boolean, "Add SMS code validation step to signature process", null: true
-
-      def banner_image
-        object.attached_uploader(:banner_image).url
-      end
     end
   end
 end
diff --git a/decidim-initiatives/lib/decidim/initiatives/participatory_space.rb b/decidim-initiatives/lib/decidim/initiatives/participatory_space.rb
index c25dbaebc0f3d..4e9e5fadaa43e 100644
--- a/decidim-initiatives/lib/decidim/initiatives/participatory_space.rb
+++ b/decidim-initiatives/lib/decidim/initiatives/participatory_space.rb
@@ -20,8 +20,6 @@
 
   participatory_space.query_type = "Decidim::Initiatives::InitiativeType"
 
-  participatory_space.breadcrumb_cell = "decidim/initiatives/initiative_dropdown_metadata"
-
   participatory_space.register_resource(:initiative) do |resource|
     resource.actions = %w(comment vote_comment)
     resource.permissions_class_name = "Decidim::Initiatives::Permissions"
diff --git a/decidim-initiatives/lib/decidim/initiatives/query_extensions.rb b/decidim-initiatives/lib/decidim/initiatives/query_extensions.rb
index 7fa586154a42d..7a3c9977d53f9 100644
--- a/decidim-initiatives/lib/decidim/initiatives/query_extensions.rb
+++ b/decidim-initiatives/lib/decidim/initiatives/query_extensions.rb
@@ -36,16 +36,11 @@ def self.included(type)
       end
 
       def initiatives_types
-        Decidim::InitiativesType.where(
-          organization: context[:current_organization]
-        )
+        Decidim::InitiativesType.where(organization:)
       end
 
       def initiatives_type(id:)
-        Decidim::InitiativesType.find_by(
-          organization: context[:current_organization],
-          id:
-        )
+        Decidim::InitiativesType.find_by!(organization:, id:)
       end
 
       def initiatives(filter: {}, order: {})
diff --git a/decidim-initiatives/lib/decidim/initiatives/seeds.rb b/decidim-initiatives/lib/decidim/initiatives/seeds.rb
index ce6dd6f85bf30..081edc6d869e8 100644
--- a/decidim-initiatives/lib/decidim/initiatives/seeds.rb
+++ b/decidim-initiatives/lib/decidim/initiatives/seeds.rb
@@ -48,8 +48,7 @@ def create_initiative_type!
         Decidim::InitiativesType.create!(
           title: Decidim::Faker::Localized.sentence(word_count: 5),
           description: Decidim::Faker::Localized.sentence(word_count: 25),
-          organization:,
-          banner_image: ::Faker::Boolean.boolean(true_ratio: 0.5) ? banner_image : nil # Keep after organization
+          organization:
         )
       end
 
@@ -93,7 +92,7 @@ def create_initiative!(state:)
 
       def create_initiative_votes!(initiative:)
         users = []
-        rand(50).times do
+        rand(0..config_value(:initiatives_votes_count)).times do
           author = (Decidim::User.all - users).sample
           initiative.votes.create!(author:, scope: initiative.scope, hash_id: SecureRandom.hex)
           users << author
diff --git a/decidim-initiatives/lib/decidim/initiatives/test/factories.rb b/decidim-initiatives/lib/decidim/initiatives/test/factories.rb
index f80d6485724c1..7bf18f5e7d33b 100644
--- a/decidim-initiatives/lib/decidim/initiatives/test/factories.rb
+++ b/decidim-initiatives/lib/decidim/initiatives/test/factories.rb
@@ -11,14 +11,6 @@
     title { generate_localized_title(:initiatives_type_title, skip_injection:) }
     description { generate_localized_description(:initiatives_type_description, skip_injection:) }
     organization
-    # Keep banner_image after organization
-    banner_image do
-      ActiveStorage::Blob.create_and_upload!(
-        io: File.open(Decidim::Dev.test_file("city2.jpeg", "image/jpeg")),
-        filename: "city2.jpeg",
-        content_type: "image/jpeg"
-      ).signed_id
-    end
     signature_type { :online }
     attachments_enabled { true }
     undo_online_signatures_enabled { true }
diff --git a/decidim-initiatives/spec/cells/decidim/initiatives/initiative_dropdown_metadata_cell_spec.rb b/decidim-initiatives/spec/cells/decidim/initiatives/initiative_dropdown_metadata_cell_spec.rb
deleted file mode 100644
index 96699c86b0c45..0000000000000
--- a/decidim-initiatives/spec/cells/decidim/initiatives/initiative_dropdown_metadata_cell_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-require "decidim/core/test/shared_examples/participatory_space_dropdown_metadata_cell_examples"
-
-module Decidim::Initiatives
-  describe InitiativeDropdownMetadataCell, type: :cell do
-    controller Decidim::ApplicationController
-
-    subject { cell("decidim/initiatives/initiative_dropdown_metadata", model).call }
-
-    let(:model) { create(:initiative) }
-
-    include_examples "participatory space dropdown metadata cell"
-  end
-end
diff --git a/decidim-initiatives/spec/commands/decidim/initiatives/admin/create_initiative_type_spec.rb b/decidim-initiatives/spec/commands/decidim/initiatives/admin/create_initiative_type_spec.rb
index 8ec780215f3b1..5b0fb34c1d2a8 100644
--- a/decidim-initiatives/spec/commands/decidim/initiatives/admin/create_initiative_type_spec.rb
+++ b/decidim-initiatives/spec/commands/decidim/initiatives/admin/create_initiative_type_spec.rb
@@ -16,7 +16,7 @@ module Admin
           let(:organization) { create(:organization) }
           let(:user) { create(:user, organization:) }
           let!(:initiative_type) do
-            build(:initiatives_type, banner_image: nil, organization:)
+            build(:initiatives_type, organization:)
           end
           let(:form) do
             form_klass
diff --git a/decidim-initiatives/spec/commands/decidim/initiatives/admin/update_initiative_type_spec.rb b/decidim-initiatives/spec/commands/decidim/initiatives/admin/update_initiative_type_spec.rb
index 06b4908167099..376c046aa1fb4 100644
--- a/decidim-initiatives/spec/commands/decidim/initiatives/admin/update_initiative_type_spec.rb
+++ b/decidim-initiatives/spec/commands/decidim/initiatives/admin/update_initiative_type_spec.rb
@@ -15,8 +15,7 @@ module Admin
         context "when validation error" do
           let(:organization) { create(:organization) }
           let(:user) { create(:user, organization:) }
-          let!(:initiative_type) { create(:initiatives_type, organization:, banner_image:) }
-          let(:banner_image) { upload_test_file(Decidim::Dev.test_file("city2.jpeg", "image/jpeg")) }
+          let!(:initiative_type) { create(:initiatives_type, organization:) }
           let(:form) do
             form_klass
               .from_model(initiative_type)
diff --git a/decidim-initiatives/spec/forms/admin/initiative_type_form_spec.rb b/decidim-initiatives/spec/forms/admin/initiative_type_form_spec.rb
index b6c546d49ab37..5061a75b7609b 100644
--- a/decidim-initiatives/spec/forms/admin/initiative_type_form_spec.rb
+++ b/decidim-initiatives/spec/forms/admin/initiative_type_form_spec.rb
@@ -25,8 +25,7 @@ module Admin
             area_enabled: false,
             comments_enabled:,
             promoting_committee_enabled:,
-            minimum_committee_members:,
-            banner_image: Decidim::Dev.test_file("city2.jpeg", "image/jpeg")
+            minimum_committee_members:
           }
         end
         let(:context) do
diff --git a/decidim-initiatives/spec/lib/query_extensions_spec.rb b/decidim-initiatives/spec/lib/query_extensions_spec.rb
index 60caf695ab075..4c4229d01434b 100644
--- a/decidim-initiatives/spec/lib/query_extensions_spec.rb
+++ b/decidim-initiatives/spec/lib/query_extensions_spec.rb
@@ -57,12 +57,12 @@ module Initiatives
           end
         end
 
-        context "with a conference of another organization" do
+        context "with an initiative of another organization" do
           let!(:initiative) { create(:initiative) }
           let(:id) { initiative.id }
 
-          it "returns nil" do
-            expect(response["initiative"]).to be_nil
+          it_behaves_like "graphQL not found space" do
+            let(:space_type) { "initiative" }
           end
         end
       end
diff --git a/decidim-initiatives/spec/services/decidim/initiatives/progress_notifier_spec.rb b/decidim-initiatives/spec/services/decidim/initiatives/progress_notifier_spec.rb
index 853abfefd2dd4..d6a623cc50e27 100644
--- a/decidim-initiatives/spec/services/decidim/initiatives/progress_notifier_spec.rb
+++ b/decidim-initiatives/spec/services/decidim/initiatives/progress_notifier_spec.rb
@@ -65,7 +65,7 @@ module Initiatives
           double(
             "initiative",
             author:,
-            followers: followers,
+            followers:,
             committee_members: double("committee_members", approved: approved_committee_members)
           )
         end
diff --git a/decidim-initiatives/spec/shared/create_initiative_type_example.rb b/decidim-initiatives/spec/shared/create_initiative_type_example.rb
index 52d2817609a93..2fa8a76c26295 100644
--- a/decidim-initiatives/spec/shared/create_initiative_type_example.rb
+++ b/decidim-initiatives/spec/shared/create_initiative_type_example.rb
@@ -27,7 +27,6 @@
         comments_enabled: true,
         promoting_committee_enabled: true,
         minimum_committee_members: 7,
-        banner_image: Decidim::Dev.test_file("city2.jpeg", "image/jpeg"),
         collect_user_extra_fields: false,
         extra_fields_legal_information: Decidim::Faker::Localized.sentence(word_count: 25),
         child_scope_threshold_enabled: false,
diff --git a/decidim-initiatives/spec/shared/update_initiative_type_example.rb b/decidim-initiatives/spec/shared/update_initiative_type_example.rb
index 2875c73fd043a..7be8fa1608642 100644
--- a/decidim-initiatives/spec/shared/update_initiative_type_example.rb
+++ b/decidim-initiatives/spec/shared/update_initiative_type_example.rb
@@ -35,7 +35,6 @@
         comments_enabled: true,
         promoting_committee_enabled: true,
         minimum_committee_members: 7,
-        banner_image: Decidim::Dev.test_file("city2.jpeg", "image/jpeg"),
         collect_user_extra_fields: false,
         extra_fields_legal_information: Decidim::Faker::Localized.sentence(word_count: 25).except("machine_translations"),
         document_number_authorization_handler: "",
diff --git a/decidim-initiatives/spec/system/admin/admin_filters_initiatives_spec.rb b/decidim-initiatives/spec/system/admin/admin_filters_initiatives_spec.rb
new file mode 100644
index 0000000000000..8cae3b71802a9
--- /dev/null
+++ b/decidim-initiatives/spec/system/admin/admin_filters_initiatives_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin sorting initiatives" do
+  let(:organization) { create(:organization) }
+  let(:user) { create(:user, :admin, :confirmed, organization:) }
+
+  let!(:old_initiative) { create(:initiative, title: { en: "Old initiative" }, created_at: 3.weeks.ago, organization:) }
+  let!(:recent_initiative) { create(:initiative, title: { en: "Recent initiative" }, created_at: 1.day.ago, organization:) }
+  let!(:newest_initiative) { create(:initiative, title: { en: "Newest initiative" }, created_at: Time.current, organization:) }
+
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+    visit decidim_admin_initiatives.initiatives_path
+  end
+
+  context "when sorting initiatives by their creation" do
+    it "sorts by created_at descending by default" do
+      within "table thead" do
+        click_link "Created at"
+      end
+
+      titles = page.all("table tbody tr td:first-child")
+      expect(titles[0].text).to include("Newest initiative")
+      expect(titles[1].text).to include("Recent initiative")
+      expect(titles[2].text).to include("Old initiative")
+    end
+
+    it "sorts by created_at ascending when clicked again" do
+      within "table thead" do
+        click_link "Created at"
+        click_link "Created at"
+      end
+
+      titles = page.all("table tbody tr td:first-child")
+      expect(titles[0].text).to include("Old initiative")
+      expect(titles[1].text).to include("Recent initiative")
+      expect(titles[2].text).to include("Newest initiative")
+    end
+  end
+end
diff --git a/decidim-initiatives/spec/system/admin/admin_manages_initiatives_committee_members_spec.rb b/decidim-initiatives/spec/system/admin/admin_manages_initiatives_committee_members_spec.rb
new file mode 100644
index 0000000000000..7fba608da29f1
--- /dev/null
+++ b/decidim-initiatives/spec/system/admin/admin_manages_initiatives_committee_members_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "User manages the initiatives committee members page" do
+  include_context "when admins initiative"
+
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+    visit decidim_admin_initiatives.initiatives_path
+    click_on translated(initiative.title)
+  end
+
+  context "when the initiative does not have promoting committee" do
+    let(:initiative_type) { create(:initiatives_type, :promoting_committee_disabled, organization:) }
+
+    it "does not have the committee members section" do
+      expect(page).to have_no_content("Committee members")
+    end
+  end
+
+  context "when the initiative has promoting committee" do
+    let(:initiative_type) { create(:initiatives_type, :promoting_committee_enabled, organization:) }
+
+    before do
+      click_on "Committee members"
+    end
+
+    it "has the committee members section" do
+      expect(page).to have_content("Committee members")
+    end
+  end
+end
diff --git a/decidim-initiatives/spec/system/admin/admin_manages_initiatives_types_spec.rb b/decidim-initiatives/spec/system/admin/admin_manages_initiatives_types_spec.rb
index db79db89bfcc2..0f9b231bf9978 100644
--- a/decidim-initiatives/spec/system/admin/admin_manages_initiatives_types_spec.rb
+++ b/decidim-initiatives/spec/system/admin/admin_manages_initiatives_types_spec.rb
@@ -38,8 +38,6 @@
 
       select("Online", from: "Signature type")
 
-      dynamically_attach_file(:initiatives_type_banner_image, Decidim::Dev.asset("city2.jpeg"))
-
       click_on "Create"
 
       expect(page).to have_admin_callout("A new initiative type has been successfully created")
diff --git a/decidim-initiatives/spec/system/initiative_breadcrumb_spec.rb b/decidim-initiatives/spec/system/initiatives_breadcrumbs_spec.rb
similarity index 96%
rename from decidim-initiatives/spec/system/initiative_breadcrumb_spec.rb
rename to decidim-initiatives/spec/system/initiatives_breadcrumbs_spec.rb
index 5f1fbb136371b..fefd289a839e9 100644
--- a/decidim-initiatives/spec/system/initiative_breadcrumb_spec.rb
+++ b/decidim-initiatives/spec/system/initiatives_breadcrumbs_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "Initiative Breadcrumb" do
+describe "Initiatives Breadcrumb" do
   let(:organization) { create(:organization) }
   let(:participatory_space) { create(:initiative, :open, organization:) }
   let(:component) { create(:meeting_component, :published, participatory_space:) }
diff --git a/decidim-initiatives/spec/system/initiatives_social_share_spec.rb b/decidim-initiatives/spec/system/initiatives_social_share_spec.rb
index 9455150c17cb0..b3f64ea4fa93a 100644
--- a/decidim-initiatives/spec/system/initiatives_social_share_spec.rb
+++ b/decidim-initiatives/spec/system/initiatives_social_share_spec.rb
@@ -6,12 +6,11 @@
 describe "Social shares" do
   let(:organization) { create(:organization) }
   let!(:initiative) { create(:initiative, description:, scoped_type: initiative_type_scope, organization:) }
-  let!(:initiative_type) { create(:initiatives_type, banner_image:, organization:) }
+  let!(:initiative_type) { create(:initiatives_type, organization:) }
   let!(:initiative_type_scope) { create(:initiatives_type_scope, type: initiative_type) }
   let!(:attachment) { create(:attachment, :with_image, attached_to: initiative, file: attachment_file) }
   let(:content_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) }
   let(:description) { { en: "Description <p><img src=\"#{description_image_path}\"></p>" } }
-  let(:banner_image) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
   let!(:attachment_file) { Decidim::Dev.test_file("city3.jpeg", "image/jpeg") }
   let(:description_image_path) { Rails.application.routes.url_helpers.rails_blob_path(description_image, only_path: true) }
   let(:description_image) do
diff --git a/decidim-initiatives/spec/system/initiatives_spec.rb b/decidim-initiatives/spec/system/initiatives_spec.rb
index 37b558fd0104f..691a36b65cbe3 100644
--- a/decidim-initiatives/spec/system/initiatives_spec.rb
+++ b/decidim-initiatives/spec/system/initiatives_spec.rb
@@ -149,5 +149,67 @@
         expect(page).to have_content("21")
       end
     end
+
+    context "when user has pending initiatives" do
+      let!(:user) { create(:user, :confirmed, organization:) }
+      let!(:pending_initiative) { create(:initiative, :created, author: user, organization:) }
+      let!(:validating_initiative) { create(:initiative, :validating, author: user, organization:) }
+
+      before do
+        switch_to_host(organization.host)
+        login_as user, scope: :user
+        visit decidim_initiatives.initiatives_path(locale: I18n.locale)
+      end
+
+      it "displays the pending initiatives section" do
+        expect(page).to have_css("#pending_initiatives")
+      end
+
+      it "displays the title for pending initiatives" do
+        within "#pending_initiatives" do
+          expect(page).to have_content("Draft & Pending initiatives")
+        end
+      end
+
+      it "displays the description for pending initiatives" do
+        within "#pending_initiatives" do
+          expect(page).to have_content("These initiatives are not public yet. Please review them and submit them for technical validation so they can be made public.")
+        end
+      end
+
+      it "lists the pending initiatives" do
+        within "#pending_initiatives" do
+          expect(page).to have_content(translated(pending_initiative.title, locale: :en))
+          expect(page).to have_content(translated(validating_initiative.title, locale: :en))
+        end
+      end
+
+      it "does not display pending initiatives in the main list" do
+        within "#initiatives" do
+          expect(page).to have_no_content(translated(pending_initiative.title, locale: :en))
+          expect(page).to have_no_content(translated(validating_initiative.title, locale: :en))
+        end
+      end
+    end
+
+    context "when user does not have pending initiatives" do
+      let!(:user) { create(:user, :confirmed, organization:) }
+      let!(:other_user) { create(:user, :confirmed, organization:) }
+      let!(:other_user_pending_initiative) { create(:initiative, :created, author: other_user, organization:) }
+
+      before do
+        switch_to_host(organization.host)
+        login_as user, scope: :user
+        visit decidim_initiatives.initiatives_path(locale: I18n.locale)
+      end
+
+      it "does not display the pending initiatives section" do
+        expect(page).to have_no_css("#pending_initiatives")
+      end
+
+      it "does not display other users' pending initiatives" do
+        expect(page).to have_no_content(translated(other_user_pending_initiative.title, locale: :en))
+      end
+    end
   end
 end
diff --git a/decidim-initiatives/spec/types/initiative_api_type_spec.rb b/decidim-initiatives/spec/types/initiative_api_type_spec.rb
index d6bb41c10eda0..119bb26861b67 100644
--- a/decidim-initiatives/spec/types/initiative_api_type_spec.rb
+++ b/decidim-initiatives/spec/types/initiative_api_type_spec.rb
@@ -98,14 +98,6 @@ module Initiatives
         end
       end
 
-      describe "bannerImage" do
-        let(:query) { "{ bannerImage }" }
-
-        it "returns the banner image field" do
-          expect(response["bannerImage"]).to be_blob_url(model.banner_image.blob)
-        end
-      end
-
       describe "collectUserExtraFields" do
         let(:query) { "{ collectUserExtraFields }" }
 
diff --git a/decidim-initiatives/spec/types/initiative_type_spec.rb b/decidim-initiatives/spec/types/initiative_type_spec.rb
index a7e63c592586c..cb08c57c2f3c5 100644
--- a/decidim-initiatives/spec/types/initiative_type_spec.rb
+++ b/decidim-initiatives/spec/types/initiative_type_spec.rb
@@ -201,7 +201,7 @@ module Initiatives
             let(:msg) { "Field '#{field}' doesn't exist on type 'Initiative'" }
 
             it "has not have a #{field} field" do
-              expect { response }.to raise_error(an_instance_of(StandardError).and(having_attributes(message: msg)))
+              expect { response }.to raise_error(an_instance_of(GraphQL::ExecutionError).and(having_attributes(message: msg)))
             end
           end
         end
diff --git a/decidim-initiatives/spec/types/integration_schema_spec.rb b/decidim-initiatives/spec/types/integration_schema_spec.rb
index 8f52953a84abb..bf4641c52b459 100644
--- a/decidim-initiatives/spec/types/integration_schema_spec.rb
+++ b/decidim-initiatives/spec/types/integration_schema_spec.rb
@@ -161,6 +161,7 @@
     )
   end
 
+  include_examples "when the introspection is disabled"
   describe "valid query" do
     it "executes successfully" do
       expect { response }.not_to raise_error
diff --git a/decidim-meetings/app/commands/decidim/meetings/admin/mark_as_attendee.rb b/decidim-meetings/app/commands/decidim/meetings/admin/mark_as_attendee.rb
index 5951020dca534..ffc5f53a372b2 100644
--- a/decidim-meetings/app/commands/decidim/meetings/admin/mark_as_attendee.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/admin/mark_as_attendee.rb
@@ -34,7 +34,7 @@ def send_notification
             resource: meeting,
             affected_users: [registration.user],
             extra: {
-              registration: registration
+              registration:
             }
           )
         end
diff --git a/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb b/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb
index be43cad6c15e9..8898ae2e44874 100644
--- a/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb
+++ b/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb
@@ -202,14 +202,44 @@ def previous_space
         nil
       end
 
+      def conference_context?
+        return false unless Decidim.module_installed?(:conferences)
+        return false if current_participatory_space.blank?
+
+        current_participatory_space.is_a?(Decidim::Conference)
+      end
+
+      # Override the add_current_component method when in conference context
+      # to avoid showing "Meetings" breadcrumb and show "Program" instead
+      def add_current_component
+        return {} if conference_context?
+
+        super
+      end
+
       def add_breadcrumb_item
         return {} if meeting.blank?
 
-        {
+        breadcrumb = {
           label: translated_attribute(meeting.title),
-          url: Decidim::EngineRouter.main_proxy(current_component).meeting_path(meeting),
+          url: Decidim::EngineRouter.main_proxy(current_component).meeting_path(meeting, locale: current_locale),
           active: false
         }
+
+        # If this meeting is being accessed from within a conference program context,
+        # add program breadcrumb to maintain proper navigation hierarchy
+        if conference_context?
+          program_path = decidim_conferences.conference_conference_program_path(current_participatory_space, current_component, locale: I18n.locale)
+
+          context_breadcrumb_items << {
+            label: t("conference_program.index.title", scope: "decidim"),
+            url: program_path,
+            active: false,
+            resource: current_component
+          }
+        end
+
+        breadcrumb
       end
     end
   end
diff --git a/decidim-meetings/app/events/decidim/meetings/update_meeting_event.rb b/decidim-meetings/app/events/decidim/meetings/update_meeting_event.rb
index 3b803c3b19e5a..34265613a339a 100644
--- a/decidim-meetings/app/events/decidim/meetings/update_meeting_event.rb
+++ b/decidim-meetings/app/events/decidim/meetings/update_meeting_event.rb
@@ -11,9 +11,9 @@ def notification_title
         I18n.t(
           "notification_title",
           scope: i18n_scope,
-          changed_fields: changed_fields,
+          changed_fields:,
           resource_title: translated_attribute(resource.title),
-          resource_path: resource_path
+          resource_path:
         ).html_safe
       end
 
diff --git a/decidim-meetings/app/forms/decidim/meetings/meeting_form.rb b/decidim-meetings/app/forms/decidim/meetings/meeting_form.rb
index 2dace5dc9a0a3..336c090d0b784 100644
--- a/decidim-meetings/app/forms/decidim/meetings/meeting_form.rb
+++ b/decidim-meetings/app/forms/decidim/meetings/meeting_form.rb
@@ -23,7 +23,7 @@ class MeetingForm < ::Decidim::Meetings::BaseMeetingForm
       validates :title, presence: true, etiquette: true
       validates :description, presence: true, etiquette: true
       validates :type_of_meeting, presence: true
-      validates :location, presence: true, if: ->(form) { form.in_person_meeting? || form.hybrid_meeting? }
+      validates :location, presence: true, if: ->(form) { form.needs_address? }
       validates :online_meeting_url, presence: true, url: true, if: ->(form) { form.online_meeting? || form.hybrid_meeting? }
       validates :registration_type, presence: true
       validates :available_slots, numericality: { greater_than_or_equal_to: 0 }, presence: true, if: ->(form) { form.on_this_platform? }
diff --git a/decidim-meetings/app/models/decidim/meetings/meeting.rb b/decidim-meetings/app/models/decidim/meetings/meeting.rb
index 6f730bd95ba7b..863d5e536a627 100644
--- a/decidim-meetings/app/models/decidim/meetings/meeting.rb
+++ b/decidim-meetings/app/models/decidim/meetings/meeting.rb
@@ -122,8 +122,8 @@ class Meeting < Meetings::ApplicationRecord
                 SELECT decidim_components.id FROM decidim_components
                 WHERE CONCAT(decidim_components.participatory_space_id, '-', decidim_components.participatory_space_type)
                 IN
-                  (SELECT CONCAT(decidim_participatory_space_private_users.privatable_to_id, '-', decidim_participatory_space_private_users.privatable_to_type)
-                  FROM decidim_participatory_space_private_users WHERE decidim_participatory_space_private_users.decidim_user_id = ?)
+                  (SELECT CONCAT(decidim_members.participatory_space_id, '-', decidim_members.participatory_space_type)
+                  FROM decidim_members WHERE decidim_members.decidim_user_id = ?)
               )
             "
             if user_role_queries.any?
diff --git a/decidim-meetings/app/permissions/decidim/meetings/permissions.rb b/decidim-meetings/app/permissions/decidim/meetings/permissions.rb
index 61059771c4587..d34f6f71af357 100644
--- a/decidim-meetings/app/permissions/decidim/meetings/permissions.rb
+++ b/decidim-meetings/app/permissions/decidim/meetings/permissions.rb
@@ -35,7 +35,7 @@ def question
       def space_member?(participatory_space, user)
         return false unless user
 
-        participatory_space.participatory_space_private_users.exists?(decidim_user_id: user.id)
+        participatory_space.members.exists?(decidim_user_id: user.id)
       end
 
       def can_update_poll?
diff --git a/decidim-meetings/config/locales/ca-IT.yml b/decidim-meetings/config/locales/ca-IT.yml
index 95ebb175e7297..466f4410d1c46 100644
--- a/decidim-meetings/config/locales/ca-IT.yml
+++ b/decidim-meetings/config/locales/ca-IT.yml
@@ -801,7 +801,7 @@ ca-IT:
           follows_count: El número de seguidores que té la trobada
           id: L'identificador únic de la trobada
           iframe_access_level: El nivell d'accés de la sala de videoconferències de la trobada
-          iframe_embed_type: El tipus de visualització de la sala de videoconferències de la trobada
+          iframe_embed_type: El tipus de visualització de la sala de videoconferències dins de l'espai web amb la informació de la trobada
           latitude: La latitud del lloc de trobada
           location: La localització de la trobada
           location_hints: Detall d'ubicació dins del lloc on es va celebrar la trobada
diff --git a/decidim-meetings/config/locales/ca.yml b/decidim-meetings/config/locales/ca.yml
index f2397b057db03..a728fca8cfb52 100644
--- a/decidim-meetings/config/locales/ca.yml
+++ b/decidim-meetings/config/locales/ca.yml
@@ -801,7 +801,7 @@ ca:
           follows_count: El número de seguidores que té la trobada
           id: L'identificador únic de la trobada
           iframe_access_level: El nivell d'accés de la sala de videoconferències de la trobada
-          iframe_embed_type: El tipus de visualització de la sala de videoconferències de la trobada
+          iframe_embed_type: El tipus de visualització de la sala de videoconferències dins de l'espai web amb la informació de la trobada
           latitude: La latitud del lloc de trobada
           location: La localització de la trobada
           location_hints: Detall d'ubicació dins del lloc on es va celebrar la trobada
diff --git a/decidim-meetings/config/locales/cs.yml b/decidim-meetings/config/locales/cs.yml
index a1d38d6063c96..04d937cd0f31a 100644
--- a/decidim-meetings/config/locales/cs.yml
+++ b/decidim-meetings/config/locales/cs.yml
@@ -153,6 +153,8 @@ cs:
           copy: Kopírovat
           title: Duplicitní schůzka
       tooltips:
+        cannot_close_meetings: Tuto schůzku nelze zavřít, protože ji vytvořil účastník
+        cannot_duplicate_meetings: Tuto schůzku nelze duplikovat, protože byla vytvořena účastníkem
         cannot_manage_attachments_meetings: Nelze spravovat přílohy v této schůzce, protože jsou vytvořeny uživatelem
         cannot_manage_poll_meetings: Nelze spravovat anketu na této schůzce, protože je vytvořena účastníkem
     components:
@@ -799,7 +801,6 @@ cs:
           follows_count: Počet sledujících které schůzka má
           id: Jedinečný identifikátor sschůzky
           iframe_access_level: Úroveň přístupu k iframe na schůzce
-          iframe_embed_type: Typ iframe vložený do schůzky
           latitude: Zeměpisná šířka schůzky
           location: Místo schůzky
           location_hints: Nápověda k místu, kde se schůzka koná
diff --git a/decidim-meetings/config/locales/de.yml b/decidim-meetings/config/locales/de.yml
index b080f8ff20da9..c34d31788e4a3 100644
--- a/decidim-meetings/config/locales/de.yml
+++ b/decidim-meetings/config/locales/de.yml
@@ -162,6 +162,7 @@ de:
           comment: Kommentieren
           join: Beitreten
           reply_poll: Umfrage beantworten
+          vote_comment: Kommentar bewerten
         name: Veranstaltungen
         settings:
           global:
@@ -330,6 +331,7 @@ de:
           update:
             invalid: Beim Aktualisieren des Traktandums ist ein Problem aufgetreten.
             success: Traktandum erfolgreich aktualisiert.
+        deprecation_warning_polls_html: "⚠️ <b>Warnung zur Entfernung.</b> Die Umfragefunktion bei Veranstaltungen wird in einer zukünftigen, noch zu bestimmenden Version entfernt werden. Organisationen, die Veranstaltungsumfragen nutzen, sollten die Verwendung externer Wahlwerkzeuge planen (zum Beispiel durch Jitsi) oder zu anderen Wahlmechanismen migireren, die in Decidim verfügbar sind, wie zum Beispiel das neue Wahlmodul (`decidim-elections`)."
         exports:
           meeting_comments: Kommentare
           meetings: Veranstaltungen
@@ -799,7 +801,7 @@ de:
           follows_count: Die Anzahl der Folgen, die das Meeting hat
           id: Die eindeutige Bezeichnung der Veranstaltung
           iframe_access_level: Die iFrame-Zugriffsebene der Veranstaltung
-          iframe_embed_type: Die Art des iFrames, der in diese Veranstaltung eingebettet ist
+          iframe_embed_type: Die Art des iFrames, das in diese Veranstaltung eingebettet ist
           latitude: Der Breitengrad des Veranstaltungsorts
           location: Der Ort der Veranstaltung
           location_hints: Ein Hinweis auf den Ort, an dem die Veranstaltung stattfindet
diff --git a/decidim-meetings/config/locales/en.yml b/decidim-meetings/config/locales/en.yml
index 82dbc8c729ea3..41bc5970aa729 100644
--- a/decidim-meetings/config/locales/en.yml
+++ b/decidim-meetings/config/locales/en.yml
@@ -802,7 +802,7 @@ en:
           follows_count: The number of follows the meeting has
           id: The unique identifier of the meeting
           iframe_access_level: The iframe access level of the meeting
-          iframe_embed_type: The type of iframe embeded in the meeting
+          iframe_embed_type: The type of iframe embedded in the meeting
           latitude: The latitude of the meeting
           location: The location of the meeting
           location_hints: A hint of the location in which the meeting is taking place
diff --git a/decidim-meetings/config/locales/es-MX.yml b/decidim-meetings/config/locales/es-MX.yml
index 0d9c02799b85e..2f84c33a81e8f 100644
--- a/decidim-meetings/config/locales/es-MX.yml
+++ b/decidim-meetings/config/locales/es-MX.yml
@@ -801,7 +801,7 @@ es-MX:
           follows_count: El número de seguidoras que tiene el encuentro
           id: El identificador único del encuentro
           iframe_access_level: El nivel de acceso de la sala de videoconferencias del encuentro
-          iframe_embed_type: El tipo de visualización de la sala de videoconferencias del encuentro
+          iframe_embed_type: El tipo de visualización de la sala de videoconferencias dentro del espacio web con la información del encuentro
           latitude: La latitud del lugar de encuentro
           location: La localización del encuentro
           location_hints: Detalle de ubicación dentro del lugar donde se celebró el encuentro
diff --git a/decidim-meetings/config/locales/es-PY.yml b/decidim-meetings/config/locales/es-PY.yml
index 0bbfddbc7ba7b..f2506b2ddd0a3 100644
--- a/decidim-meetings/config/locales/es-PY.yml
+++ b/decidim-meetings/config/locales/es-PY.yml
@@ -801,7 +801,7 @@ es-PY:
           follows_count: El número de seguidoras que tiene el encuentro
           id: El identificador único del encuentro
           iframe_access_level: El nivel de acceso de la sala de videoconferencias del encuentro
-          iframe_embed_type: El tipo de visualización de la sala de videoconferencias del encuentro
+          iframe_embed_type: El tipo de visualización de la sala de videoconferencias dentro del espacio web con la información del encuentro
           latitude: La latitud del lugar de encuentro
           location: La localización del encuentro
           location_hints: Detalle de ubicación dentro del lugar donde se celebró el encuentro
diff --git a/decidim-meetings/config/locales/es.yml b/decidim-meetings/config/locales/es.yml
index 536b2689a0994..ac6c24a7727dc 100644
--- a/decidim-meetings/config/locales/es.yml
+++ b/decidim-meetings/config/locales/es.yml
@@ -801,7 +801,7 @@ es:
           follows_count: El número de seguidoras que tiene el encuentro
           id: El identificador único del encuentro
           iframe_access_level: El nivel de acceso de la sala de videoconferencias del encuentro
-          iframe_embed_type: El tipo de visualización de la sala de videoconferencias del encuentro
+          iframe_embed_type: El tipo de visualización de la sala de videoconferencias dentro del espacio web con la información del encuentro
           latitude: La latitud del lugar de encuentro
           location: La localización del encuentro
           location_hints: Detalle de ubicación dentro del lugar donde se celebró el encuentro
diff --git a/decidim-meetings/config/locales/eu.yml b/decidim-meetings/config/locales/eu.yml
index 123c991def1c9..133fb94895389 100644
--- a/decidim-meetings/config/locales/eu.yml
+++ b/decidim-meetings/config/locales/eu.yml
@@ -162,7 +162,7 @@ eu:
           comment: Iruzkina
           join: Hartu parte
           reply_poll: Erantzun inkesta
-          vote_comment: Bozkatu iruzkina
+          vote_comment: Iruzkina bozkatu
         name: Topaketak
         settings:
           global:
@@ -339,7 +339,7 @@ eu:
           responses: Erantzunak
         invite_join_meeting_mailer:
           invite:
-            decline: Deuseztatu gonbidapena
+            decline: Gonbidapena deuseztatu
             invited_you_to_join_a_meeting: "%{invited_by} k %{application} topaketan parte hartzera gonbidatu zaitu. Beheko estekan onar dezakezu gobidapena."
             join: Erregistratu '%{meeting_title}' topaketa
         invites:
@@ -422,7 +422,7 @@ eu:
             title: Izenburua
             up: Gora
           services:
-            add_service: Gehitu zerbitzua
+            add_service: Zerbitzua gehitu
             services: Zerbitzuak
           unpublish:
             invalid: Arazo bat egon da topaketa hau desargitaratzean.
@@ -506,7 +506,7 @@ eu:
         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_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: Esportatu egutegia
+        export_calendar: Egutegia esportatu
       close_meeting_reminder_mailer:
         close_meeting_reminder:
           body: <a href="%{meeting_path}">"%{meeting_title}"</a> topaketa ixteko dago. Mesedez, gehitu topaketari buruzko txosten bat "Itxi topaketa" botoia erabiliz.
@@ -782,7 +782,7 @@ eu:
         meetings:
           address: Topaketaren helbidea, baldin eta aurrez aurre badago eta kokapen fisikoa badu
           attachments: Topaketa honetako atxikipen kopurua
-          attendees: Zenbat jende bildu da topaketa honetan?
+          attendees: Bilera horretara joan den pertsona kopurua
           attending_organizations: Topaketan izan diren erakundeak
           audio_url: Topaketaren audiograbazioa
           author: Topaketa honen egilearen data
@@ -801,7 +801,7 @@ eu:
           follows_count: Topaketa honek duen jarraitzaile kopurua
           id: Topaketaren identifikatzaile bakarra
           iframe_access_level: Topaketaren sarrera maila
-          iframe_embed_type: Topaketan agertu zen "Iframe" mota
+          iframe_embed_type: Iframe mota bileran txertatuta
           latitude: Topaketaren latitudea
           location: Topaketaren kokapena
           location_hints: Kokapenaren xehetasuna, topaketa egin zen lekuaren barruan
@@ -825,10 +825,10 @@ eu:
           title: Topaketaren izenburua
           transparent: Topaketaren ikusgarritasuna bisitarientzat
           type_of_meeting: Topaketa mota
-          updated_at: Zein datatan eguneratu zen topaketa azken aldiz
+          updated_at: Zein datatan eguneratu da topaketa azken aldiz
           url: Topaketaren URLa
           video_url: Topaketaren bideograbazioa
-          withdrawn: Topaketa bertan behera geratu zen ala ez
+          withdrawn: Topaketa bertan behera geratu den ala ez
           withdrawn_at: Noiz utzi zen bertan behera topaketa hau?
     participatory_spaces:
       highlighted_meetings:
@@ -838,10 +838,10 @@ eu:
     resource_links:
       meetings_through_proposals:
         meeting_result: 'Topaketaren emaitzak:'
-        result_meeting: 'Proposamenarekin lotutako topaketak:'
+        result_meeting: 'Topaketari dagozkion proposamenak:'
       proposals_from_meeting:
         meeting_proposal: 'Topaketari dagozkion proposamenak:'
-        proposal_meeting: 'Proposamenarekin lotutako topaketak:'
+        proposal_meeting: 'Topaketari dagozkion proposamenak:'
     statistics:
       attendees_count: Topaketara bertaratuak
       meetings_count: Topaketak
diff --git a/decidim-meetings/config/locales/fr-CA.yml b/decidim-meetings/config/locales/fr-CA.yml
index 82a2ae1585fa4..36877ae9d5f52 100644
--- a/decidim-meetings/config/locales/fr-CA.yml
+++ b/decidim-meetings/config/locales/fr-CA.yml
@@ -783,7 +783,7 @@ fr-CA:
           end_time: La date et l'heure de fin de cette rencontre
           follows_count: Le nombre de personnes qui suivent cette rencontre
           id: L'identifiant unique de la rencontre
-          iframe_embed_type: Le type d'iframe inclus dans la rencontre
+          iframe_embed_type: Le type d'iframe intégré dans la réunion
           latitude: La latitude de la rencontre
           location: La localisation de la rencontre
           location_hints: Un indice de l'endroit où se déroule la rencontre
diff --git a/decidim-meetings/config/locales/fr.yml b/decidim-meetings/config/locales/fr.yml
index fe6b170b268ec..3643ef8326ce8 100644
--- a/decidim-meetings/config/locales/fr.yml
+++ b/decidim-meetings/config/locales/fr.yml
@@ -783,7 +783,7 @@ fr:
           end_time: La date et l'heure de fin de cette rencontre
           follows_count: Le nombre de personnes qui suivent cette rencontre
           id: L'identifiant unique de la rencontre
-          iframe_embed_type: Le type d'iframe inclus dans la rencontre
+          iframe_embed_type: Le type d'iframe intégré dans la réunion
           latitude: La latitude de la rencontre
           location: La localisation de la rencontre
           location_hints: Un indice de l'endroit où se déroule la rencontre
diff --git a/decidim-meetings/config/locales/ja.yml b/decidim-meetings/config/locales/ja.yml
index 1527b90e67791..a68280cf79f22 100644
--- a/decidim-meetings/config/locales/ja.yml
+++ b/decidim-meetings/config/locales/ja.yml
@@ -159,6 +159,7 @@ ja:
           comment: コメント
           join: 参加する
           reply_poll: 投票
+          vote_comment: コメントに投票
         name: ミーティング
         settings:
           global:
@@ -792,7 +793,7 @@ ja:
           follows_count: ミーティングのフォロー数
           id: ミーティングの固有ID
           iframe_access_level: ミーティングのiframeアクセスレベル
-          iframe_embed_type: ミーティングに埋め込まれた iframe のタイプ
+          iframe_embed_type: ミーティングに埋め込まれたiframeの種類
           latitude: ミーティングの緯度
           location: ミーティングの場所
           location_hints: ミーティングが行われている場所のヒント
diff --git a/decidim-meetings/config/locales/pt-BR.yml b/decidim-meetings/config/locales/pt-BR.yml
index 96cbb06b593e5..ff392d722749e 100644
--- a/decidim-meetings/config/locales/pt-BR.yml
+++ b/decidim-meetings/config/locales/pt-BR.yml
@@ -8,11 +8,11 @@ pt-BR:
         closing_report: Minutos
         closing_visible: É visível
         contributions_count: Número de contribuições
-        proposal_ids: Propostas criadas na reunião
+        proposal_ids: Propostas criadas no evento
         video_url: URL do vídeo
       meeting:
         address: Endereço
-        available_slots: Slots disponíveis para esta reunião
+        available_slots: Slots disponíveis para este evento
         customize_registration_email: Personalizar e-mail de registro
         decidim_category_id: Categoria
         decidim_scope_id: Âmbito
@@ -24,10 +24,10 @@ pt-BR:
         iframe_embed_type_html: Apenas alguns serviços permitem o "Embed na página de reunião" ou "Abrir na página de eventos ao vivo". Observe que com a opção "Incorporar na página de reunião" em mobilizações, como a tela herda diferentes dimensões, na verdade funcionará como um "Abrir na página de eventos ao vivo".
         location: Localização
         location_hints: Dicas de localização
-        online_meeting_url: URL da reunião on-line
+        online_meeting_url: URL do evento on-line
         organizer_gid: Criar como
         organizer_id: Organizador
-        private_meeting: Reunião privada
+        private_meeting: Evento privado
         registration_email_custom_content: Registro de conteúdo personalizado do e-mail
         registration_form_enabled: Formulário de inscrição ativado
         registration_terms: Termos de registro
@@ -49,6 +49,8 @@ pt-BR:
       meeting_registration_invite:
         email: E-mail
         name: Nome
+      response:
+        add_documents: Adicionar documentos
       validate_registration_code:
         code: Código
     errors:
@@ -69,17 +71,21 @@ pt-BR:
             email:
               already_invited: Este endereço de e-mail já foi convidado.
     models:
-      decidim/meetings/close_meeting_event: Reunião fechada
+      decidim/meetings/close_meeting_event: Evento fechado
       decidim/meetings/create_meeting_event: Encontro
       decidim/meetings/meeting_registrations_enabled_event: Registros habilitados
       decidim/meetings/meeting_registrations_over_percentage_event: Inscrições acima do limite
       decidim/meetings/upcoming_meeting_event: Próximo encontro
-      decidim/meetings/update_meeting_event: Reunião atualizada
+      decidim/meetings/update_meeting_event: Evento atualizado
   activerecord:
     models:
+      decidim:
+        meetings:
+          meeting:
+            text: 'Foi discutido neste evento: %{link}'
       decidim/meetings/meeting:
-        one: Reunião
-        other: Reuniões
+        one: Evento
+        other: Eventos
       decidim/meetings/minutes:
         one: Ata
         other: Atas
@@ -88,6 +94,9 @@ pt-BR:
         other: Registros
   decidim:
     admin:
+      admin_log:
+        changeset:
+          meetings: Eventos
       filters:
         accepted_at_not_null:
           label: Aceitou
@@ -105,13 +114,15 @@ pt-BR:
             values:
               'false': Passado
               'true': Próximos
+          taxonomies_part_of_contains:
+            label: Taxonomia
           with_any_origin:
             label: Origem
             values:
               official: Oficial
               participants: Participante
           with_any_type:
-            label: Tipo de reunião
+            label: Tipo de evento
             values:
               hybrid: Híbrido
               in_person: Presencialmente
@@ -130,32 +141,72 @@ pt-BR:
             'true': Enviado
       meeting_copies:
         create:
-          error: Ocorreu um erro ao duplicar esta reunião.
-          success: Reunião duplicada com sucesso.
+          error: Ocorreu um erro ao duplicar este evento.
+          success: Evento duplicado com sucesso.
         new:
           copy: cópia de
-          title: Reunião duplicada
+          title: Evento duplicado
+      tooltips:
+        cannot_close_meetings: Não é possível fechar este evento, pois é criada por um participante
+        cannot_duplicate_meetings: Não é possível duplicar este evento, como é criada por um participante
+        cannot_edit_meetings: Não é possível editar este evento, pois é criada por um participante
+        cannot_manage_agenda_meetings: Não é possível gerenciar a agenda neste evento pois é criada por um usuário
+        cannot_manage_attachments_meetings: Não é possível gerenciar anexos neste evento pois ela é criada por um usuário
+        cannot_manage_poll_meetings: Não é possível gerenciar a enquete neste evento pois ela é criada por um usuário
+        cannot_manage_registrations_meetings: Não é possível gerenciar inscrições neste evento, como é criado por um participante, tem inscrições desabilitadas ou esses registos são externos
+        cannot_mark_attendee: Não é possível marcar como solicitado, pois já estava marcado
+        deleted_meetings_info: Não é possível excluir este evento, pois ela é criada por um participante.
     components:
       meetings:
         actions:
           comment: Comentário
           join: Junte-se
+          reply_poll: Responder enquete
+          vote_comment: Vote no comentário
         name: Reuniões
         settings:
           global:
             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.
             enable_pads_creation: Ativar criação de blocos
             maps_enabled: Mapas ativados
+            no_taxonomy_filters_found: Nenhum filtro de taxonomia encontrado.
+            registration_code_enabled: Código de registro e QR ativado
             resources_permissions_enabled: Permissões de ações podem ser definidas para cada encontro
+            taxonomy_filters: Selecione filtros para o componente
+            taxonomy_filters_add: Adicionar filtro
             terms_and_conditions_url_for_meeting_creators: URL de Termos e condições para criadores da reunião
           step:
             announcement: Anúncio
             comments_blocked: Comentários bloqueados
             creation_enabled_for_participants: Criação de reunião por participantes habilitada
+    download_your_data:
+      help:
+        invites:
+          accepted_at: A data e hora em que este convite foi aceito
+          created_at: A data e hora em que este convite foi criado
+          id: O identificador único para esse convite
+          meeting: A reunião onde esse convite aconteceu
+          rejected_at: A data e hora em que este convite foi rejeitado
+          sent_at: A data e hora em que esse convite foi enviado
+          updated_at: A data e hora em que este convite foi atualizado pela última vez
+        registrations:
+          code: O código de registro
+          created_at: A data e hora em que esta inscrição foi criada
+          id: O identificador exclusivo do registo
+          meeting: A reunião em que o usuário se registrou
+          public_participation: Se esta participação foi mostrada publicamente
+          updated_at: Data e hora da última atualização desta inscrição
+          user: O usuário que fez o registro
+          validated_at: A data e hora em que esta inscrição foi validada
+      show:
+        meeting_comments: Exportação de comentários do evento
+        meetings: Exportação de eventos
     events:
       meetings:
         meeting_closed:
@@ -183,18 +234,38 @@ pt-BR:
           email_subject: Os espaços de ocupação ocupados com "%{resource_title}" estão acima de %{percentage}%
           notification_title: Os <a href="%{resource_path}">%{resource_title}</a> atendimento ocupados são mais de %{percentage}%.
         meeting_updated:
+          email_intro: 'O evento "%{resource_title}" foi atualizada com alterações a %{changed_fields}. Você pode ler a nova versão em sua página:'
           email_outro: Você recebeu esta notificação porque está seguindo a reunião "%{resource_title}". Você pode ignorá-lo do link anterior.
           email_subject: A reunião "%{resource_title}" foi atualizada
+          field_names:
+            address: o endereço
+            end_time: o horário de término
+            location: a localização
+            start_time: o horário de início
+          notification_title: O evento <a href="%{resource_path}">%{resource_title}</a> foi atualizada com alterações a %{changed_fields}.
+        meeting_waitlist_added:
+          notification_title: Você foi adicionado à lista de espera para o evento <a href="%{resource_url}">%{resource_title}</a>.
         registration_code_validated:
           email_intro: Seu código de registro "%{registration_code}" para a reunião "%{resource_title}" foi validado.
           email_outro: Você recebeu esta notificação porque seu código de registro para a reunião "%{resource_title}" foi validado.
           email_subject: Seu código de registro "%{registration_code}" para a reunião "%{resource_title}" foi validado
           notification_title: Seu código de registro "%{registration_code}" para a reunião <a href="%{resource_path}">%{resource_title}</a> foi validado.
+        registration_marked_as_attendee:
+          email_intro: Sua inscrição para o evento "%{resource_title}" foi marcada como participante.
+          email_outro: Você recebeu esta notificação porque sua inscrição para o evento "%{resource_title}" foi marcada como participante.
+          email_subject: Sua inscrição para o evento "%{resource_title}" foi marcada como participante
+          notification_title: Sua inscrição para o evento <a href="%{resource_path}">%{resource_title}</a> foi marcada como participante.
         registrations_enabled:
           email_intro: 'A reunião "%{resource_title}" permitiu registos. Você pode se registrar em sua página:'
           email_outro: Você recebeu esta notificação porque está seguindo a reunião "%{resource_title}". Você pode ignorá-lo do link anterior.
           email_subject: A reunião "%{resource_title}" permitiu registos.
           notification_title: A reunião <a href="%{resource_path}">%{resource_title}</a> permitiu registos.
+        upcoming_meeting:
+          default_body: O evento "{{meeting_title}}" começará em menos de {{before_hours}}h.
+          email_intro: O evento "%{resource_title}" começará em menos de %{reminders_before_hours}h.
+          email_outro: Você recebeu esta notificação porque está seguindo o evento %{resource_title}. Você pode ignorá-lo do link anterior.
+          email_subject: O evento "%{resource_title}" começará em menos de %{reminders_before_hours}h.
+          notification_title: O evento <a href="%{resource_path}">%{resource_title}</a> começará em menos de %{reminders_before_hours}h.
     forms:
       meetings:
         attendees_count_help_text: Não se esqueça de incluir o número total de participantes na sua reunião, seja presencial, on-line ou híbrida.
@@ -214,16 +285,21 @@ pt-BR:
       actions:
         agenda: Agenda
         close: Fechar
+        confirm_delete_meeting: Tem certeza de que deseja excluir este evento?
+        confirm_unpublish_meeting: Tem certeza de que deseja cancelar a publicação deste evento?
+        deleted_meetings_info: Eventos excluídos podem ser restauradas do lixo.
         edit: Editar
         invalid_destroy:
           proposals_count:
             one: 'A reunião não pode ser destruída porque tem %{count} proposta associada a ela:'
             other: 'A reunião não pode ser destruída porque tem %{count} propostas associadas a ela:'
         manage_poll: Gerenciar enquete
+        mark_as_attendee: Marcar como participante
         new_meeting: Nova reunião
         preview: Visualização
         registrations: Inscrições
         title: Ações
+        view_deleted_meetings: Ver eventos excluídos
       admin:
         agenda:
           agenda_item:
@@ -255,10 +331,12 @@ pt-BR:
           update:
             invalid: Houve um problema ao atualizar esta agenda.
             success: Agenda atualizada com sucesso.
+        deprecation_warning_polls_html: "⚠️ <b>Aviso de desativação.</b> O recurso de enquetes será removido em uma versão futura (por ser determinado). As organizações que usam reuniões de enquetes devem planejar usar ferramentas de enquete externas (por exemplo, através de Jitsi) ou migrar para outros mecanismos de votação disponíveis no Decidim, como o novo módulo de Eleições (`decidim-elections`)."
         exports:
           meeting_comments: Comentários
           meetings: Reuniões
           registrations: Inscrições
+          responses: Respostas
         invite_join_meeting_mailer:
           invite:
             decline: Rejeitar convite
@@ -287,6 +365,8 @@ pt-BR:
           close:
             invalid: Houve um problema ao encerrar esta reunião.
             success: Reunião encerrada com sucesso.
+          component:
+            unlink: Desvincular
           create:
             invalid: Houve um problema ao criar esta reunião.
             success: Reunião criada com sucesso. Note que ainda não foi publicada, você precisa publicá-la manualmente.
@@ -305,13 +385,35 @@ pt-BR:
             select_a_registration_type: Por favor, selecione um tipo de registro
             select_an_iframe_access_level: Por favor, selecione um nível de acesso iframe
           index:
+            linked_meeting_warning_html: Este evento deve ser editado de <br><a href="%{href}">%{name}</a>
+            published: Publicado
             title: Reuniões
+            unpublished: Despublicado
+          linked_spaces:
+            assign: Atribuir
+            link_a_space: Vincular um espaço
+            private_meeting_warning: Espaços vinculados não serão aplicados se o evento for privado e não transparente.
+            private_space_warning: Espaços vinculados não serão aplicados quando o evento pertencer a um espaço privado não transparente.
+            select: Selecione um espaço
+            table:
+              actions: Ações
+              component: Espaços vinculados
+            title: Espaços vinculados
+          manage_trash:
+            title: Eventos excluídos
           new:
             create: Criar
             title: Criar reunião
           publish:
             invalid: Ocorreu um problema ao publicar esta reunião.
             success: Reunião publicada com sucesso.
+          reminders:
+            reminder_enabled: Enviar um lembrete para este evento
+            reminder_message: Conteúdo do email de lembrete
+            reminder_message_help_text: Personalize a mensagem conforme necessário. Use {{meeting_title}} para exibir o nome do evento.
+            send_reminder: Email de lembrete programado
+            send_reminder_help_text: Tempo de lembrete em horas antes do evento.
+            title: Lembrete
           service:
             description: Descrição
             down: Baixa
@@ -334,6 +436,13 @@ pt-BR:
           update:
             invalid: Houve um problema ao atualizar essa enquete de reunião.
             success: Enquete da reunião atualizada com sucesso.
+        poll:
+          form:
+            announcement_html:
+              - Quando uma pergunta recebe respostas ou é publicada/fechada, ela não poderá mais ser editada.
+              - Você pode adicionar uma pergunta a qualquer momento.
+              - A enquete será fechada quando os resultados de todas as questões criadas forem publicados.
+              - Acesse a <a href='%{admin_link}'>página de administração da enquete</a> para enviar perguntas e publicar resultados.
         registrations:
           edit:
             save: Salvar
@@ -344,6 +453,7 @@ pt-BR:
             recommendation_message: Por razões de privacidade, recomendamos que você exclua esse formulário de inscrição quando não precisar mais dele. Por padrão, isso será daqui a 3 meses após o fim da reunião.
             registration_email_help: Este texto aparecerá no meio do e-mail de confirmação de registro. Logo após o código de registro.
             registration_form: Formulário de registro
+            registrations: Visualizar inscrições
             registrations_count:
               one: Houve %{count} registro.
               other: Houve %{count} inscrições.
@@ -353,6 +463,17 @@ pt-BR:
           update:
             invalid: Ocorreu um problema ao salvar as configurações de registro.
             success: Configurações de registro de reunião salvas com sucesso.
+        registrations_attendees:
+          index:
+            title: Inscrições
+            validate: Validar
+            validate_registration_code: Confirmar código de registro
+          mark_attendee:
+            invalid: Inscrição já marcada como participante.
+            success: Registro marcado como assistido com sucesso.
+          validate_registration_code:
+            invalid: Este código de registro é inválido.
+            success: Código de registro validado com sucesso.
       admin_log:
         invite:
           create: "%{user_name} convidados %{attendee_name} a participar de %{resource_name} reunião no espaço %{space_name}"
@@ -363,6 +484,8 @@ pt-BR:
           create: "%{user_name} criou a reunião %{resource_name} no espaço %{space_name}"
           delete: "%{user_name} eliminou a reunião %{resource_name} no espaço %{space_name}"
           export_registrations: "%{user_name} exportou os registros da reunião %{resource_name} no espaço %{space_name}"
+          restore: "%{user_name} restaurou o evento%{resource_name} no espaço %{space_name}"
+          soft_delete: "%{user_name} moveu o evento %{resource_name} no espaço %{space_name} para a lixeira"
           update: "%{user_name} atualizou a reunião %{resource_name} no espaço %{space_name}"
           value_types:
             organizer_presenter:
@@ -389,6 +512,7 @@ pt-BR:
           body: A reunião <a href="%{meeting_path}">"%{meeting_title}"</a> está pendente para ser fechada. Adicione um relatório da reunião usando o botão "Fechar reunião".
           greetings: Saudações,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
           hello: Olá %{username},
+          subject: Agora você pode fechar o evento "%{meeting_title}" com um relatório
       conference_venues: Locais de conferência
       content_blocks:
         upcoming_meetings:
@@ -405,6 +529,7 @@ pt-BR:
       iframe_embed_type:
         embed_in_meeting_page: Incorporar na página da reunião
         none: Nenhum
+        open_in_live_event_page: Abrir na página de eventos ao vivo
         open_in_new_tab: Abrir URL em uma nova aba
       last_activity:
         meeting_updated: 'Reunião atualizada:'
@@ -485,14 +610,19 @@ pt-BR:
           see_all_withdrawn: Veja todas as reuniões retiradas
           text_banner: Você está vendo a lista de reuniões retiradas por seus autores. %{go_back_link}.
         meeting:
+          close_meeting: Fechar
           edit_close_meeting: Editar relatório da reunião
+          edit_meeting: Editar
           join_meeting: Participe da reunião
+          reply_poll: Responder enquete
+          view_poll: Ver enquete
         meetings:
           no_meetings_warning: Nenhuma reunião corresponde aos seus critérios de pesquisa ou não há nenhuma reunião agendada.
           upcoming_meetings_warning: Atualmente, não há reuniões agendadas, mas aqui você pode encontrar todas as reuniões anteriores listadas.
         new:
           back: Voltar
           create: Criar
+          title: Criar nova reunião
         registration_confirm:
           cancel: Cancelar
           confirm: confirme
@@ -500,8 +630,11 @@ pt-BR:
           attendees: Contagem de participantes
           contributions: Contagem de Contribuições
           join: Participe da reunião
+          join_waitlist: Inscrever-se na lista de espera
           leave: Cancelar registro
           leave_confirmation: Tem certeza de que deseja cancelar seu cadastro para esta reunião?
+          leave_waitlist: Sair da lista de espera
+          leave_waitlist_confirmation: Tem certeza de que deseja sair da lista de espera para este evento?
           link_available_soon: Link disponível em breve
           link_closed: O link para participar da reunião estará disponível alguns minutos antes de iniciar
           live_event: Esta reunião está acontecendo agora
@@ -509,6 +642,11 @@ pt-BR:
           micro_camera_permissions_warning: Quando você clicar no botão abaixo, serão solicitadas permissões de microfone e/ou câmera e participará na videoconferência
           no_slots_available: Não há slots disponíveis
           organizations: Organizações participantes
+          pending_address: A localização será anunciada em breve.
+          redirect_notice: Este evento faz parte de outro espaço, por isso você foi movido para %{current_space_name}. <br>Se preferir, você pode voltar para <a href="%{previous_space_url}">%{previous_space_name}</a>.
+          registration_and_qr_code: Registro e Código QR
+          registration_code: 'Código de registro: %{code}'
+          registration_code_help_text: Seu registro e código QR
           registration_state:
             validated: VALIDADO
             validation_pending: VALIDAÇÃO PENDENTE
@@ -516,8 +654,12 @@ pt-BR:
             one: "%{count} slot restante"
             other: "%{count} slots restantes"
           visit_finished: Ver reunião anterior
+          waitlist:
+            description: Se um local estiver disponível, nós processaremos seu cadastro automaticamente e o notificaremos por email.
+            status: Você está na lista de espera
           withdraw_btn_hint: Você pode retirar sua reunião se mudar de ideia. A reunião não é excluída, ela aparecerá na lista de reuniões retiradas.
           withdraw_confirmation_html: Tem certeza de que deseja retirar esta reunião?<br><br><strong>esta ação não pode ser cancelada!</strong>
+          withdraw_meeting: Retirar
         update:
           invalid: Houve um problema ao atualizar a reunião.
           success: Você atualizou a reunião com sucesso.
@@ -538,21 +680,52 @@ pt-BR:
             end_time: Data final
             map: Mapa
             official_meeting: Reunião oficial
+            published: Publicado
             start_time: Data de início
+            taxonomies: Taxonomias
             title: Título
+        registration:
+          actions: Ações
+          fields:
+            email: Email
+            name: Nome
+            status: Situação
+          status:
+            attended: Participou
+            not_attended: Não participou
       polls:
         questions:
+          closed_question:
+            announcement: As respostas para esta pergunta foram fechadas.
+            question: Pergunta
+            question_results: Resultados
+          index:
+            empty_questions: Durante este evento, algumas perguntas serão enviadas e você poderá respondê-las. Elas serão exibidas aqui.
           index_admin:
             edit: Editar no painel de administração
             question: Pergunta
+            received_response: resposta recebida
+            received_responses: respostas recebidas
             results: Resultados
             send: Enviar
             sent: Enviado
+            statuses:
+              closed: Resultados enviados (fechados)
+              published: Enviado (aberto)
+              unpublished: Pendente de envio
           published_question:
             max_choices_alert: Há muitas opções selecionadas
             question: Pergunta
             question_replied: Pergunta respondida
             reply_question: Responder pergunta
+        responses:
+          index:
+            administrate: Administrar
+            title: Enquete
+          index_admin:
+            back_to_meeting: Voltar ao evento
+            title: Administrar enquete
+            view_poll: Ver enquete
       public_participants_list:
         attending_participants: Participantes presentes
         hidden_participants_count:
@@ -563,6 +736,7 @@ pt-BR:
         confirmation:
           confirmed_html: Seu registro para a reunião <a href="%{url}">%{title}</a> foi confirmado.
           details: Você encontrará os detalhes da reunião no anexo.
+          registration_code: Seu código de registro é %{code}. Por favor, mostre o seguinte código QR a um administrador para validar a sua participação.
       registration_type:
         on_different_platform: Em uma plataforma diferente
         on_this_platform: Nesta plataforma
@@ -577,6 +751,9 @@ pt-BR:
         destroy:
           invalid: Tem havido um problema ao sair desta reunião.
           success: Você saiu da reunião com sucesso.
+        waitlist:
+          invalid: Houve um problema ao juntar-se à lista de espera.
+          success: Você entrou na lista de espera do evento com sucesso. Você será notificado assim que sua inscrição for confirmada.
       type_of_meeting:
         hybrid: Híbrido
         in_person: Pessoalmente
@@ -586,7 +763,73 @@ pt-BR:
         transparent: Transparente
         withdraw: Retirado
       withdraw:
+        error: Houve um problema ao retirar o evento.
         success: A reunião foi retirada com sucesso.
+    open_data:
+      help:
+        meeting_comments:
+          alignment: Se este comentário foi um favorito, contra ou neutro
+          author: O nome do usuário que fez este comentário
+          body: O comentário em si
+          commentable_id: A identificação única do comentário
+          commentable_type: O tipo do comentário (se for um resultado, uma proposta, etc.)
+          comments: Os dados dos comentários do evento
+          created_at: A data em que este comentário foi criado
+          depth: O lugar onde este comentário está nos três comentários (se for uma resposta ou uma resposta de uma resposta)
+          id: O Id para este comentário
+          locale: A localidade (linguagem) que o usuário teve ao deixar este comentário
+          root_commentable_url: A URL do recurso ligado a este comentário
+        meetings:
+          address: O endereço do evento, caso seja em pessoa e tenha um local físico
+          attachments: O número de anexos neste evento
+          attendees: O número de pessoas que presentes neste evento
+          attending_organizations: As organizações que participam do evento
+          audio_url: Gravação de áudio do evento
+          author: Os dados para o autor deste evento
+          available_slots: O número de slots disponíveis em um evento
+          closed_at: A data em que o evento fechou
+          closing_report: Relatório do evento fechado
+          closing_visible: A visibilidade do evento
+          comments: Os dados dos comentários do evento
+          component: O componente ao qual pertence o evento
+          contributions: O número de contribuições feitas pelos participantes neste evento
+          created_at: A data em que o evento foi criada
+          customize_registration_email: A capacidade de permitir um email personalizado no registro
+          decidim_author_type: Tipo de autor do autor do evento
+          description: A descrição do evento
+          end_time: A data e a hora em que este evento termina
+          follows_count: O número de seguir que o evento tem
+          id: O identificador único do evento
+          iframe_access_level: O nível de acesso iframe do evento
+          iframe_embed_type: O tipo de iframe incorporado no evento
+          latitude: A latitude do evento
+          location: A localização do evento
+          location_hints: Uma dica sobre a localização em que o evento está acontecendo
+          longitude: A longitude do evento
+          online_meeting_url: O URL do evento online
+          organizations: As organizações que participam deste evento
+          participatory_space: A que espaço (por exemplo, Processo participativo, ou Assembléia) este evento pertence
+          private_meeting: Indique se o evento é privado ou não
+          published: Quando o evento for publicado
+          reference: O identificador único do recurso nesta plataforma
+          registration_form_enabled: Se o formulário de registro foi habilitado ou não
+          registration_terms: Os termos acordados antes da participação do evento
+          registration_type: O tipo de registro do evento
+          registration_url: URL do registro do evento
+          registrations_enabled: Se os registros foram permitidos
+          related_proposals: As propostas relacionadas a este evento
+          related_results: Os resultados relacionados a este evento
+          reserved_slots: O número de slots reservados que o evento tem
+          start_time: A data e hora em que este evento começa
+          taxonomies: As taxonomias a que este evento pertence
+          title: O título do evento
+          transparent: Visibilidade do evento para não membros
+          type_of_meeting: O tipo de evento
+          updated_at: O horário em que o evento foi atualizado pela última vez
+          url: A URL do evento
+          video_url: Gravação de vídeo do evento
+          withdrawn: Se este evento foi retirado
+          withdrawn_at: Quando este evento for retirada
     participatory_spaces:
       highlighted_meetings:
         past_meetings: Reuniões anteriores
@@ -600,7 +843,10 @@ pt-BR:
         meeting_proposal: 'Propostas relacionadas:'
         proposal_meeting: 'Reuniões relacionadas:'
     statistics:
+      attendees_count: Participantes do evento
       meetings_count: Reuniões
+      meetings_count_tooltip: O número de eventos que ocorreram, tanto online quanto presencialmente.
+      participatory_space_meetings_count: Eventos
   devise:
     mailer:
       join_meeting:
diff --git a/decidim-meetings/config/locales/ro-RO.yml b/decidim-meetings/config/locales/ro-RO.yml
index 76776d6f01210..336e85ef38ad7 100644
--- a/decidim-meetings/config/locales/ro-RO.yml
+++ b/decidim-meetings/config/locales/ro-RO.yml
@@ -217,6 +217,8 @@ ro:
           description_own: Ai participat la %{score} întâlniri.
           name: Întâlniri la care ai participat
           next_level_in: Participă la încă %{score} întâlniri pentru a atinge următorul nivel!
+          unearned_another: Acest participant nu a participat încă la nicio ședință.
+          unearned_own: Încă nu ați participat la nicio ședință.
     meetings:
       actions:
         agenda: Agendă
@@ -600,6 +602,7 @@ ro:
         meetings:
           attending_organizations: Organizațiile participante la întâlnire
           audio_url: Înregistrarea audio a întâlnirii
+          iframe_embed_type: Tipul de iframe încorporat în ședință
           location_hints: O indicație a locului în care se desfășoară întâlnirea
           registration_type: Tipul de înregistrare pentru participare la întâlnire
           registration_url: URL-ul pentru înregistrare ca participant la întâlnire
diff --git a/decidim-meetings/config/locales/sv.yml b/decidim-meetings/config/locales/sv.yml
index d88b37215060a..4ce5825f58c94 100644
--- a/decidim-meetings/config/locales/sv.yml
+++ b/decidim-meetings/config/locales/sv.yml
@@ -7,7 +7,7 @@ sv:
         audio_url: Ljud-URL
         closing_report: Protokoll
         closing_visible: Är synlig
-        contributions_count: Antal bidrag
+        contributions_count: Antal inlägg
         proposal_ids: Förslag som skapades på mötet
         video_url: Video-URL
       meeting:
@@ -611,7 +611,7 @@ sv:
           confirm: Bekräfta
         show:
           attendees: Antal deltagare
-          contributions: Antal bidrag
+          contributions: Antal inlägg
           join: Anmäl dig
           join_waitlist: Gå med i väntelistan
           leave: Dra tillbaka din anmälan
@@ -621,10 +621,10 @@ sv:
           link_available_soon: Länk kommer snart
           link_closed: Länken till mötet kommer finnas tillgänglig några minuter innan det börjar
           live_event: Mötet pågår just nu
-          meeting_minutes: Mötesprotokoll
+          meeting_minutes: Sammanfattning av mötet
           micro_camera_permissions_warning: När du klickar på knappen nedan kommer du att bli ombedd att godkänna att webbplatsen använder din mikrofon och/eller kamera och du kommer att ansluta till videokonferensen
           no_slots_available: Inga platser kvar
-          organizations: Delta i organisationer
+          organizations: Deltagande organisationer
           pending_address: Platsen kommer att meddelas snart.
           redirect_notice: Mötet är en del av ett annat utrymme, så du har flyttats till %{current_space_name}. <br>Om du vill kan du gå tillbaka till <a href="%{previous_space_url}">%{previous_space_name}</a>.
           registration_and_qr_code: Anmälan och QR-kod
diff --git a/decidim-meetings/lib/decidim/api/agenda_type.rb b/decidim-meetings/lib/decidim/api/agenda_type.rb
index 99cbc43606509..93ef97d4acded 100644
--- a/decidim-meetings/lib/decidim/api/agenda_type.rb
+++ b/decidim-meetings/lib/decidim/api/agenda_type.rb
@@ -14,8 +14,6 @@ class AgendaType < Decidim::Api::Types::BaseObject
 
       def self.authorized?(object, context)
         super && object.visible?
-      rescue Decidim::PermissionAction::PermissionNotSetError
-        false
       end
     end
   end
diff --git a/decidim-meetings/lib/decidim/api/iframe_access_level_enum.rb b/decidim-meetings/lib/decidim/api/iframe_access_level_enum.rb
new file mode 100644
index 0000000000000..2c5f3c628994b
--- /dev/null
+++ b/decidim-meetings/lib/decidim/api/iframe_access_level_enum.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class IframeAccessLevelEnum < Decidim::Api::Types::BaseEnum
+      description "The iframe access level of the meeting"
+
+      value "ALL", value: "all", description: "All visitors", value_method: false
+      value "SIGNED_IN", value: "signed_in", description: "Only signed-in participants", value_method: false
+      value "REGISTERED", value: "registered", description: "Registered participants to this meeting", value_method: false
+    end
+  end
+end
diff --git a/decidim-meetings/lib/decidim/api/iframe_embed_type_enum.rb b/decidim-meetings/lib/decidim/api/iframe_embed_type_enum.rb
new file mode 100644
index 0000000000000..2b4d7ddaf113f
--- /dev/null
+++ b/decidim-meetings/lib/decidim/api/iframe_embed_type_enum.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class IframeEmbedTypeEnum < Decidim::Api::Types::BaseEnum
+      description "The type of iframe embedded in the meeting"
+
+      value "NONE", value: "none", description: "None", value_method: false
+      value "EMBED_IN_MEETING_PAGE", value: "embed_in_meeting_page", description: "Embed in meeting page", value_method: false
+      value "OPEN_IN_LIVE_EVENT_PAGE", value: "open_in_live_event_page", description: "Open in live event page", value_method: false
+      value "OPEN_IN_NEW_TAB", value: "open_in_new_tab", description: "Open URL in a new tab", value_method: false
+    end
+  end
+end
diff --git a/decidim-meetings/lib/decidim/api/meeting_type.rb b/decidim-meetings/lib/decidim/api/meeting_type.rb
index 6c3850674d247..86379c71eb37f 100644
--- a/decidim-meetings/lib/decidim/api/meeting_type.rb
+++ b/decidim-meetings/lib/decidim/api/meeting_type.rb
@@ -32,8 +32,8 @@ class MeetingType < Decidim::Api::Types::BaseObject
       field :description, Decidim::Core::TranslatedFieldType, "The description of this meeting.", null: true
       field :end_time, Decidim::Core::DateTimeType, "The time this meeting ends", null: false
       field :id, GraphQL::Types::ID, "ID of this meeting", null: false
-      field :iframe_access_level, GraphQL::Types::String, "The iframe access level of the meeting ", null: true
-      field :iframe_embed_type, GraphQL::Types::String, "The type of displaying of the online meeting URL", null: true
+      field :iframe_access_level, Decidim::Meetings::IframeAccessLevelEnum, "The iframe access level of the meeting ", null: true
+      field :iframe_embed_type, Decidim::Meetings::IframeEmbedTypeEnum, "The type of displaying of the online meeting URL", null: true
       field :location, Decidim::Core::TranslatedFieldType, "The location of this meeting (free format)", null: true
       field :location_hints, Decidim::Core::TranslatedFieldType, "The location of this meeting (free format)", null: true
       field :online_meeting_url, GraphQL::Types::String, "The URL of the meeting (when the type is online)", null: false
@@ -43,14 +43,14 @@ class MeetingType < Decidim::Api::Types::BaseObject
       field :registration_form, Decidim::Forms::QuestionnaireType, description: "If registration requires to fill a form, this is the questionnaire", null: true
       field :registration_form_enabled, GraphQL::Types::Boolean, "Whether the registrations have a form or not", null: false
       field :registration_terms, Decidim::Core::TranslatedFieldType, "The registration terms", null: true
-      field :registration_type, GraphQL::Types::String, "The type of registration (disabled, on this platform or different platform)", null: false
+      field :registration_type, Decidim::Meetings::RegistrationTypeEnum, "The type of registration (disabled, on this platform or different platform)", null: false
       field :registration_url, GraphQL::Types::String, "URL for the registration form", null: true
       field :registrations_enabled, GraphQL::Types::Boolean, "Whether the registrations are enabled or not", null: false
       field :remaining_slots, GraphQL::Types::Int, "Amount of slots available for this meeting", null: true
       field :start_time, Decidim::Core::DateTimeType, "The time this meeting starts", null: false
       field :title, Decidim::Core::TranslatedFieldType, "The title of this meeting.", null: false
       field :transparent, GraphQL::Types::Boolean, "For private meetings, information is public if transparent", null: false
-      field :type_of_meeting, GraphQL::Types::String, "The type of the meeting (online or in-person)", null: false
+      field :type_of_meeting, Meetings::TypeOfMeetingEnum, "The type of the meeting (online, hybrid or in-person)", null: false
       field :url, GraphQL::Types::String, "The URL for this meeting", null: false
       field :video_url, GraphQL::Types::String, "URL for the video of the session, if any", null: true
       field :withdrawn, GraphQL::Types::Boolean, "Whether this meeting has been withdrawn or not", method: :withdrawn?, null: true
diff --git a/decidim-meetings/lib/decidim/api/meetings_type.rb b/decidim-meetings/lib/decidim/api/meetings_type.rb
index 8a174d7c6f76b..10ee36a31d922 100644
--- a/decidim-meetings/lib/decidim/api/meetings_type.rb
+++ b/decidim-meetings/lib/decidim/api/meetings_type.rb
@@ -15,8 +15,8 @@ def meetings
         Meeting.published.visible.where(component: object).includes(:component)
       end
 
-      def meeting(**args)
-        Meeting.published.visible.where(component: object).find_by(id: args[:id])
+      def meeting(id:)
+        Decidim::Core::ComponentFinderBase.new(model_class: Meeting.published.visible).call(object, { id: }, context)
       end
     end
   end
diff --git a/decidim-meetings/lib/decidim/api/mutations/close_meeting_attributes.rb b/decidim-meetings/lib/decidim/api/mutations/close_meeting_attributes.rb
new file mode 100644
index 0000000000000..adcccb0589a0b
--- /dev/null
+++ b/decidim-meetings/lib/decidim/api/mutations/close_meeting_attributes.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class CloseMeetingAttributes < Decidim::Api::Types::BaseInputObject
+      graphql_name "CloseMeetingAttributes"
+      description "Attributes for closing a meeting"
+
+      argument :attendees_count, GraphQL::Types::Int, description: "Number of attendees", required: true
+      argument :closed_at, Decidim::Core::DateTimeType,
+               description: "Optional custom date and time when the meeting was closed. If omitted, the meeting will be closed at the current time (as in the UI).
+This field is only available via the API to support integrations (for example, importing or synchronizing meetings with externally managed closure times).", required: false
+      argument :closing_report, GraphQL::Types::String, description: "The closing report for the meeting", required: true
+      argument :proposal_ids, [GraphQL::Types::ID], description: "IDs of proposals to link to the meeting", required: false
+    end
+  end
+end
diff --git a/decidim-meetings/lib/decidim/api/mutations/close_meeting_type.rb b/decidim-meetings/lib/decidim/api/mutations/close_meeting_type.rb
new file mode 100644
index 0000000000000..f73c74b8f120c
--- /dev/null
+++ b/decidim-meetings/lib/decidim/api/mutations/close_meeting_type.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class CloseMeetingType < Decidim::Api::Types::BaseMutation
+      graphql_name "CloseMeeting"
+
+      description "Closes a meeting"
+      type Decidim::Meetings::MeetingType
+
+      argument :attributes, CloseMeetingAttributes, description: "Input attributes for closing a meeting", required: true
+      argument :locale, GraphQL::Types::String, "The locale to use for the mutation", required: true
+      argument :toggle_translations, GraphQL::Types::Boolean, "Whether the user asked to toggle the machine translations or not", required: false, default_value: false
+
+      def resolve(attributes:, locale:, toggle_translations:)
+        set_locale(locale:, toggle_translations:)
+
+        closing_report = attributes.to_h.fetch(:closing_report, object.closing_report)
+        attendees_count = attributes.to_h.fetch(:attendees_count, object.attendees_count)
+        proposal_ids = Array(attributes.to_h.fetch(:proposal_ids, [])).map(&:to_i)
+        closed_at = attributes.to_h.fetch(:closed_at, Time.current)
+
+        params = {
+          closing_report:,
+          attendees_count:,
+          proposal_ids:,
+          closed_at:,
+          proposals: object.sibling_scope(:proposals)
+        }
+
+        form = form(Decidim::Meetings::CloseMeetingForm).from_params(params)
+
+        CloseMeeting.call(form, object) do
+          on(:ok) do
+            return object.reload
+          end
+
+          on(:invalid) do
+            raise Decidim::Api::Errors::AttributeValidationError, form.errors
+          end
+        end
+      end
+
+      def authorized?(attributes:, locale:, toggle_translations:)
+        raise Decidim::Api::Errors::MutationNotAuthorizedError, I18n.t("decidim.api.errors.unauthorized_mutation") unless [
+          super,
+          allowed_to?(:close, :meeting, object, context),
+          object.published?,
+          object.closed? == false,
+          object.withdrawn? == false
+        ].all?
+
+        true
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/lib/decidim/api/mutations/create_meeting_type.rb b/decidim-meetings/lib/decidim/api/mutations/create_meeting_type.rb
new file mode 100644
index 0000000000000..2417000ccb9e6
--- /dev/null
+++ b/decidim-meetings/lib/decidim/api/mutations/create_meeting_type.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class CreateMeetingType < Decidim::Api::Types::BaseMutation
+      graphql_name "CreateMeeting"
+
+      description "Creates a meeting"
+      type Decidim::Meetings::MeetingType
+
+      argument :attributes, MeetingAttributes, description: "Input attributes for creating a meeting", required: true
+      argument :locale, GraphQL::Types::String, "The locale for which to set the meeting texts", required: true
+      argument :toggle_translations, GraphQL::Types::Boolean, "Whether the user asked to toggle the machine translations or not.", required: false, default_value: false
+
+      def resolve(attributes:, locale:, toggle_translations:)
+        set_locale(locale:, toggle_translations:)
+
+        params = attributes.to_h.slice(
+          :address,
+          :available_slots,
+          :description,
+          :end_time,
+          :iframe_access_level,
+          :iframe_embed_type,
+          :latitude,
+          :location,
+          :location_hints,
+          :longitude,
+          :online_meeting_url,
+          :registration_terms,
+          :registration_type,
+          :registration_url,
+          :registrations_enabled,
+          :start_time,
+          :taxonomies,
+          :title,
+          :type_of_meeting
+        )
+
+        params[:taxonomies] = Decidim::Taxonomy.where(organization: current_organization, id: params[:taxonomies]).pluck(:id) if params[:taxonomies]
+
+        form = form(Decidim::Meetings::MeetingForm).from_params(params)
+
+        Decidim::Meetings::CreateMeeting.call(form) do
+          on(:ok) do |meeting|
+            return meeting.reload
+          end
+          on(:invalid) do
+            raise Decidim::Api::Errors::AttributeValidationError, form.errors
+          end
+        end
+      end
+
+      def authorized?(attributes:, locale:, toggle_translations:)
+        unless super && allowed_to?(:create, :meeting, Meeting.new(component: current_component), { current_user:, current_component: })
+          raise Decidim::Api::Errors::MutationNotAuthorizedError, I18n.t("decidim.api.errors.unauthorized_mutation")
+        end
+
+        true
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/lib/decidim/api/mutations/meeting_attributes.rb b/decidim-meetings/lib/decidim/api/mutations/meeting_attributes.rb
new file mode 100644
index 0000000000000..326e01453953f
--- /dev/null
+++ b/decidim-meetings/lib/decidim/api/mutations/meeting_attributes.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class MeetingAttributes < Decidim::Api::Types::BaseInputObject
+      graphql_name "MeetingAttributes"
+      description "Attributes for creating or updating a meeting"
+
+      argument :address, GraphQL::Types::String, description: "The address of the meeting", required: false
+      argument :available_slots, GraphQL::Types::Int, description: "Number of available slots for registration", required: false
+      argument :description, GraphQL::Types::String, description: "The description of the meeting", required: true
+      argument :end_time, Decidim::Core::DateTimeType, description: "The end time of the meeting", required: true
+      argument :iframe_access_level, Decidim::Meetings::IframeAccessLevelEnum,
+               description: "Who can access the iframe: 'all', 'registered', 'signed_in'", required: false
+      argument :iframe_embed_type, Decidim::Meetings::IframeEmbedTypeEnum,
+               description: "How to embed the iframe: 'none', 'embed_in_meeting_page', 'open_in_live_event_page', 'open_in_new_tab'",
+               required: false
+      argument :latitude, GraphQL::Types::Float, description: "The latitude coordinate", required: false
+      argument :location, GraphQL::Types::String, description: "The physical location of the meeting", required: false
+      argument :location_hints, GraphQL::Types::String, description: "Hints about the location", required: false
+      argument :longitude, GraphQL::Types::Float, description: "The longitude coordinate", required: false
+      argument :online_meeting_url, GraphQL::Types::String, description: "URL for online meeting", required: false
+      argument :registration_terms, GraphQL::Types::String, description: "Terms and conditions for registration", required: false
+      argument :registration_type, Decidim::Meetings::RegistrationTypeEnum,
+               description: "Type of registration: 'on_this_platform', 'on_different_platform', or 'registration_disabled'",
+               required: true
+      argument :registration_url, GraphQL::Types::String, description: "External registration URL", required: false
+      argument :registrations_enabled, GraphQL::Types::Boolean, description: "Whether registrations are enabled or not", required: false
+      argument :start_time, Decidim::Core::DateTimeType, description: "The start time of the meeting", required: true
+      argument :taxonomies, [GraphQL::Types::ID], description: "Array of taxonomy IDs", required: false
+      argument :title, GraphQL::Types::String, description: "The title of the meeting", required: true
+      argument :type_of_meeting, Decidim::Meetings::TypeOfMeetingEnum, description: "The type of meeting: 'online', 'in_person', or 'hybrid'", required: true
+    end
+  end
+end
diff --git a/decidim-meetings/lib/decidim/api/mutations/meeting_mutation_type.rb b/decidim-meetings/lib/decidim/api/mutations/meeting_mutation_type.rb
new file mode 100644
index 0000000000000..83f75df16a998
--- /dev/null
+++ b/decidim-meetings/lib/decidim/api/mutations/meeting_mutation_type.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class MeetingMutationType < Decidim::Api::Types::BaseObject
+      include Decidim::ApiResponseHelper
+
+      graphql_name "MeetingMutation"
+      description "A meeting which includes its available mutations"
+
+      field :close, mutation: Decidim::Meetings::CloseMeetingType, description: "Closes a meeting"
+      field :update, mutation: Decidim::Meetings::UpdateMeetingType, description: "Updates a meeting"
+      field :withdraw, mutation: Decidim::Meetings::WithdrawMeetingType, description: "Withdraws a meeting"
+    end
+  end
+end
diff --git a/decidim-meetings/lib/decidim/api/mutations/meetings_mutation_type.rb b/decidim-meetings/lib/decidim/api/mutations/meetings_mutation_type.rb
new file mode 100644
index 0000000000000..a133f643bca7a
--- /dev/null
+++ b/decidim-meetings/lib/decidim/api/mutations/meetings_mutation_type.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class MeetingsMutationType < Decidim::Core::ComponentType
+      graphql_name "MeetingsMutation"
+      description "A meetings component with mutations."
+
+      field :create_meeting, mutation: Decidim::Meetings::CreateMeetingType, description: "Creates a new meeting"
+      field :meeting, type: Decidim::Meetings::MeetingMutationType, description: "Mutates a meeting", null: true do
+        argument :id, GraphQL::Types::ID, "The ID of the meeting", required: true
+      end
+
+      def meeting(id:)
+        collection.find(id)
+      end
+
+      private
+
+      def collection
+        Meeting.where(component: object).not_hidden.published
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/lib/decidim/api/mutations/update_meeting_type.rb b/decidim-meetings/lib/decidim/api/mutations/update_meeting_type.rb
new file mode 100644
index 0000000000000..87d01d2927657
--- /dev/null
+++ b/decidim-meetings/lib/decidim/api/mutations/update_meeting_type.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class UpdateMeetingType < Decidim::Api::Types::BaseMutation
+      graphql_name "UpdateMeeting"
+
+      description "Updates a meeting"
+      type Decidim::Meetings::MeetingType
+
+      argument :attributes, MeetingAttributes, description: "Input attributes for updating a meeting", required: true
+      argument :locale, GraphQL::Types::String, "The locale for which to set the meeting texts", required: true
+      argument :toggle_translations, GraphQL::Types::Boolean, "Whether the user asked to toggle the machine translations or not.", required: false, default_value: false
+
+      def resolve(attributes:, locale:, toggle_translations:)
+        set_locale(locale:, toggle_translations:)
+
+        params = extract_from(attributes)
+        params[:taxonomies] = Decidim::Taxonomy.where(organization: current_organization, id: params[:taxonomies]).pluck(:id) if params[:taxonomies]
+
+        form = form(Decidim::Meetings::MeetingForm).from_params(params)
+
+        UpdateMeeting.call(form, object) do
+          on(:ok) do |meeting|
+            return meeting.reload
+          end
+
+          on(:invalid) do
+            raise Decidim::Api::Errors::AttributeValidationError, form.errors
+          end
+        end
+      end
+
+      def authorized?(attributes:, locale:, toggle_translations:)
+        raise Decidim::Api::Errors::MutationNotAuthorizedError, I18n.t("decidim.api.errors.unauthorized_mutation") unless super && allowed_to?(:update, :meeting, object, context)
+
+        true
+      end
+
+      private
+
+      def extract_from(attributes)
+        attributes = attributes.to_h.compact
+
+        {
+          address: attributes.fetch(:address, object.address),
+          available_slots: attributes.fetch(:available_slots, object.available_slots),
+          description: attributes.fetch(:description, translated_attribute(object.description)),
+          end_time: attributes.fetch(:end_time, object.end_time),
+          iframe_access_level: attributes.fetch(:iframe_access_level, object.iframe_access_level),
+          iframe_embed_type: attributes.fetch(:iframe_embed_type, object.iframe_embed_type),
+          latitude: attributes.fetch(:latitude, object.latitude),
+          location: attributes.fetch(:location, translated_attribute(object.location)),
+          location_hints: attributes.fetch(:location_hints, translated_attribute(object.location_hints)),
+          longitude: attributes.fetch(:longitude, object.longitude),
+          online_meeting_url: attributes.fetch(:online_meeting_url, object.online_meeting_url),
+          registration_terms: attributes.fetch(:registration_terms, translated_attribute(object.registration_terms)),
+          registration_type: attributes.fetch(:registration_type, object.registration_type),
+          registration_url: attributes.fetch(:registration_url, object.registration_url),
+          registrations_enabled: attributes.fetch(:registrations_enabled, object.registrations_enabled),
+          start_time: attributes.fetch(:start_time, object.start_time),
+          taxonomies: attributes.fetch(:taxonomies, object.taxonomies.pluck(:id)),
+          title: attributes.fetch(:title, translated_attribute(object.title)),
+          type_of_meeting: attributes.fetch(:type_of_meeting, object.type_of_meeting)
+        }
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/lib/decidim/api/mutations/withdraw_meeting_type.rb b/decidim-meetings/lib/decidim/api/mutations/withdraw_meeting_type.rb
new file mode 100644
index 0000000000000..18a565b6594c8
--- /dev/null
+++ b/decidim-meetings/lib/decidim/api/mutations/withdraw_meeting_type.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class WithdrawMeetingType < Decidim::Api::Types::BaseMutation
+      graphql_name "WithdrawMeeting"
+
+      description "Withdraws a meeting"
+      type Decidim::Meetings::MeetingType
+
+      def resolve
+        WithdrawMeeting.call(object, current_user) do
+          on(:ok) do |meeting|
+            return meeting
+          end
+
+          on(:invalid) do
+            raise Decidim::Api::Errors::ValidationError, I18n.t("decidim.meetings.withdraw.error")
+          end
+        end
+      end
+
+      def authorized?
+        raise Decidim::Api::Errors::MutationNotAuthorizedError, I18n.t("decidim.api.errors.unauthorized_mutation") unless super && allowed_to?(:withdraw, :meeting, object, context)
+
+        true
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/lib/decidim/api/registration_type_enum.rb b/decidim-meetings/lib/decidim/api/registration_type_enum.rb
new file mode 100644
index 0000000000000..0a30c008e5923
--- /dev/null
+++ b/decidim-meetings/lib/decidim/api/registration_type_enum.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class RegistrationTypeEnum < Decidim::Api::Types::BaseEnum
+      description "The registration types for meetings"
+
+      value "REGISTRATION_DISABLED", value: "registration_disabled", description: "Registration disabled", value_method: false
+      value "ON_THIS_PLATFORM", value: "on_this_platform", description: "On this platform", value_method: false
+      value "ON_DIFFERENT_PLATFORM", value: "on_different_platform", description: "On a different platform", value_method: false
+    end
+  end
+end
diff --git a/decidim-meetings/lib/decidim/api/type_of_meeting_enum.rb b/decidim-meetings/lib/decidim/api/type_of_meeting_enum.rb
new file mode 100644
index 0000000000000..26e6dcac357bb
--- /dev/null
+++ b/decidim-meetings/lib/decidim/api/type_of_meeting_enum.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class TypeOfMeetingEnum < Decidim::Api::Types::BaseEnum
+      description "The types of meetings"
+
+      value "HYBRID", value: "hybrid", description: "Hybrid"
+      value "IN_PERSON", value: "in_person", description: "In person"
+      value "ONLINE", value: "online", description: "Online"
+    end
+  end
+end
diff --git a/decidim-meetings/lib/decidim/meetings/api.rb b/decidim-meetings/lib/decidim/meetings/api.rb
index 2480568e5da1c..f48ac9ab3b6f9 100644
--- a/decidim-meetings/lib/decidim/meetings/api.rb
+++ b/decidim-meetings/lib/decidim/meetings/api.rb
@@ -7,7 +7,23 @@ module Meetings
     autoload :MeetingType, "decidim/api/meeting_type"
     autoload :MeetingsType, "decidim/api/meetings_type"
     autoload :ServiceType, "decidim/api/service_type"
+
     autoload :LinkedResourcesInterface, "decidim/api/linked_resources_interface"
     autoload :ServicesInterface, "decidim/api/services_interface"
+
+    autoload :MeetingAttributes, "decidim/api/mutations/meeting_attributes"
+    autoload :CloseMeetingAttributes, "decidim/api/mutations/close_meeting_attributes"
+
+    autoload :CreateMeetingType, "decidim/api/mutations/create_meeting_type"
+    autoload :CloseMeetingType, "decidim/api/mutations/close_meeting_type"
+    autoload :MeetingsMutationType, "decidim/api/mutations/meetings_mutation_type"
+    autoload :MeetingMutationType, "decidim/api/mutations/meeting_mutation_type"
+    autoload :UpdateMeetingType, "decidim/api/mutations/update_meeting_type"
+    autoload :WithdrawMeetingType, "decidim/api/mutations/withdraw_meeting_type"
+
+    autoload :IframeAccessLevelEnum, "decidim/api/iframe_access_level_enum"
+    autoload :IframeEmbedTypeEnum, "decidim/api/iframe_embed_type_enum"
+    autoload :RegistrationTypeEnum, "decidim/api/registration_type_enum"
+    autoload :TypeOfMeetingEnum, "decidim/api/type_of_meeting_enum"
   end
 end
diff --git a/decidim-meetings/lib/decidim/meetings/component.rb b/decidim-meetings/lib/decidim/meetings/component.rb
index fb9ed2ba1079a..cd4248af91f83 100644
--- a/decidim-meetings/lib/decidim/meetings/component.rb
+++ b/decidim-meetings/lib/decidim/meetings/component.rb
@@ -14,10 +14,6 @@
     "Decidim::Meetings::Meeting"
   ]
 
-  component.on(:before_destroy) do |instance|
-    raise StandardError, "Cannot remove this component" if Decidim::Meetings::Meeting.where(component: instance).any?
-  end
-
   component.on(:publish) do |instance|
     Decidim::Meetings::Meeting.where(component: instance).find_in_batches(batch_size: 100) do |batch|
       Decidim::UpdateSearchIndexesJob.perform_later(batch)
diff --git a/decidim-meetings/lib/decidim/meetings/engine.rb b/decidim-meetings/lib/decidim/meetings/engine.rb
index 4539547d0f894..f90965d9f82d9 100644
--- a/decidim-meetings/lib/decidim/meetings/engine.rb
+++ b/decidim-meetings/lib/decidim/meetings/engine.rb
@@ -81,6 +81,12 @@ class Engine < ::Rails::Engine
         end
       end
 
+      initializer "decidim_meetings.register_mutations", before: "decidim_api.graphiql" do
+        Decidim::MutationRegistry.instance.register(
+          Decidim::Meetings::MeetingsMutationType
+        )
+      end
+
       initializer "decidim_meetings.content_processors" do |_app|
         Decidim.configure do |config|
           config.content_processors += [:meeting]
diff --git a/decidim-meetings/spec/commands/admin/copy_meeting_fields_spec.rb b/decidim-meetings/spec/commands/admin/copy_meeting_fields_spec.rb
index 27a04d08ce6f4..d02d0f453e08a 100644
--- a/decidim-meetings/spec/commands/admin/copy_meeting_fields_spec.rb
+++ b/decidim-meetings/spec/commands/admin/copy_meeting_fields_spec.rb
@@ -9,9 +9,9 @@ module Admin
         subject { described_class.new(form, meeting) }
 
         let(:organization) { create(:organization) }
-        let(:participatory_process) { create(:participatory_process, organization: organization) }
+        let(:participatory_process) { create(:participatory_process, organization:) }
         let(:current_component) { create(:component, manifest_name: "meetings", participatory_space: participatory_process) }
-        let(:user) { create(:user, :admin, :confirmed, organization: organization) }
+        let(:user) { create(:user, :admin, :confirmed, organization:) }
         let(:meeting) { create(:meeting, :published, component: current_component, **meeting_attributes) }
 
         let(:meeting_attributes) do
diff --git a/decidim-meetings/spec/commands/join_waitlist_spec.rb b/decidim-meetings/spec/commands/join_waitlist_spec.rb
index fd56f92bbe837..f84f6868b90b1 100644
--- a/decidim-meetings/spec/commands/join_waitlist_spec.rb
+++ b/decidim-meetings/spec/commands/join_waitlist_spec.rb
@@ -7,17 +7,17 @@ module Decidim::Meetings
     subject { described_class.new(meeting, form) }
 
     let(:organization) { create(:organization) }
-    let(:participatory_process) { create(:participatory_process, organization: organization) }
+    let(:participatory_process) { create(:participatory_process, organization:) }
     let(:component) { create(:component, manifest_name: :meetings, participatory_space: participatory_process) }
     let(:available_slots) { 2 }
     let(:meeting) do
       create(:meeting,
-             component: component,
+             component:,
              registrations_enabled: true,
-             available_slots: available_slots)
+             available_slots:)
     end
 
-    let(:user) { create(:user, :confirmed, organization: organization, notifications_sending_frequency: "none") }
+    let(:user) { create(:user, :confirmed, organization:, notifications_sending_frequency: "none") }
     let(:form) do
       Decidim::Meetings::JoinMeetingForm.new.with_context(
         current_user: user
@@ -35,7 +35,7 @@ module Decidim::Meetings
 
     context "when all conditions are met" do
       before do
-        create_list(:registration, available_slots, meeting: meeting, status: :registered)
+        create_list(:registration, available_slots, meeting:, status: :registered)
       end
 
       it "broadcasts ok" do
@@ -58,7 +58,7 @@ module Decidim::Meetings
 
     context "when the user is already registered" do
       before do
-        create(:registration, meeting: meeting, user: user, status: :registered)
+        create(:registration, meeting:, user:, status: :registered)
       end
 
       it "broadcasts invalid" do
@@ -74,7 +74,7 @@ module Decidim::Meetings
 
     context "when the form is invalid" do
       before do
-        create_list(:registration, available_slots, meeting: meeting, status: :registered)
+        create_list(:registration, available_slots, meeting:, status: :registered)
         allow(form).to receive(:valid?).and_return(false)
       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..b2064468fd4a0 100644
--- a/decidim-meetings/spec/controllers/decidim/meetings/meetings_controller_spec.rb
+++ b/decidim-meetings/spec/controllers/decidim/meetings/meetings_controller_spec.rb
@@ -135,9 +135,9 @@
         end
       end
 
-      context "when user is private user" do
+      context "when user is member" do
         let!(:user) { create(:user, :confirmed, organization:) }
-        let!(:participatory_space_private_user) { create(:participatory_space_private_user, user:, privatable_to: participatory_process) }
+        let!(:member) { create(:member, user:, participatory_space: participatory_process) }
 
         it_behaves_like "having meeting access visibility applied"
       end
diff --git a/decidim-meetings/spec/controllers/decidim/meetings/registrations_controller_spec.rb b/decidim-meetings/spec/controllers/decidim/meetings/registrations_controller_spec.rb
index 5c901ee498c03..271c5f040e022 100644
--- a/decidim-meetings/spec/controllers/decidim/meetings/registrations_controller_spec.rb
+++ b/decidim-meetings/spec/controllers/decidim/meetings/registrations_controller_spec.rb
@@ -27,7 +27,7 @@ module Decidim::Meetings
         context "with available slots" do
           it "creates registration and redirects" do
             expect do
-              post :create, params: params
+              post :create, params:
             end.to change(Registration, :count).by(1)
 
             expect(flash[:notice]).to eq(I18n.t("registrations.create.success", scope: "decidim.meetings"))
@@ -36,10 +36,10 @@ module Decidim::Meetings
         end
 
         context "when no available slots" do
-          let!(:registrations) { create_list(:registration, 10, meeting: meeting) }
+          let!(:registrations) { create_list(:registration, 10, meeting:) }
 
           it "shows error message" do
-            post :create, params: params
+            post(:create, params:)
 
             expect(flash[:alert]).to eq(I18n.t("registrations.create.invalid", scope: "decidim.meetings"))
             expect(response).to redirect_to(my_meeting_path)
@@ -49,7 +49,7 @@ module Decidim::Meetings
 
       context "when user not authenticated" do
         it "redirects to login" do
-          post :create, params: params
+          post(:create, params:)
           expect(response).to redirect_to("/users/sign_in")
         end
       end
@@ -76,7 +76,7 @@ module Decidim::Meetings
         meeting.update!(
           registrations_enabled: true,
           registration_form_enabled: true,
-          questionnaire: questionnaire
+          questionnaire:
         )
       end
 
@@ -84,7 +84,7 @@ module Decidim::Meetings
         context "when joining directly" do
           it "answers questionnaire and redirects" do
             expect do
-              post :respond, params: params
+              post :respond, params:
             end.to change { meeting.registrations.count }.by(1)
 
             expect(flash[:notice]).to eq(I18n.t("registrations.create.success", scope: "decidim.meetings"))
@@ -94,11 +94,11 @@ module Decidim::Meetings
 
         context "when joining waitlist" do
           let(:meeting) { create(:meeting, component:, available_slots: 10) }
-          let!(:registrations) { create_list(:registration, 10, meeting: meeting) }
+          let!(:registrations) { create_list(:registration, 10, meeting:) }
 
           it "adds user to waitlist and redirects" do
             expect do
-              post :respond, params: params
+              post :respond, params:
             end.to change { meeting.registrations.where(status: :waiting_list).count }.by(1)
 
             expect(flash[:notice]).to eq(I18n.t("registrations.waitlist.success", scope: "decidim.meetings"))
@@ -116,7 +116,7 @@ module Decidim::Meetings
         end
 
         it "shows error message" do
-          post :respond, params: params
+          post(:respond, params:)
 
           expect(flash[:alert]).to eq(I18n.t("response.invalid", scope: "decidim.forms.questionnaires"))
           expect(response).to render_template("decidim/forms/questionnaires/show")
@@ -126,7 +126,7 @@ module Decidim::Meetings
 
     describe "POST join_waitlist" do
       let(:meeting) { create(:meeting, component:, available_slots: 10) }
-      let!(:registrations) { create_list(:registration, 10, meeting: meeting) }
+      let!(:registrations) { create_list(:registration, 10, meeting:) }
       let(:params) { { meeting_id: meeting.id } }
 
       before { sign_in user }
@@ -134,7 +134,7 @@ module Decidim::Meetings
       context "when meeting has no available slots" do
         it "adds user to waitlist" do
           expect do
-            post :join_waitlist, params: params
+            post :join_waitlist, params:
           end.to change(Registration.on_waiting_list, :count).by(1)
 
           expect(flash[:notice]).to eq(I18n.t("registrations.waitlist.success", scope: "decidim.meetings"))
@@ -151,7 +151,7 @@ module Decidim::Meetings
 
       it "destroys registration" do
         expect do
-          delete :destroy, params: params
+          delete :destroy, params:
         end.to change(Registration, :count).by(-1)
 
         expect(flash[:notice]).to match(/successfully/)
diff --git a/decidim-meetings/spec/factories.rb b/decidim-meetings/spec/factories.rb
index c56e85f15e5ea..eaa4fcb922fdf 100644
--- a/decidim-meetings/spec/factories.rb
+++ b/decidim-meetings/spec/factories.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/core/test/factories"
+require "decidim/api/test/factories"
 require "decidim/participatory_processes/test/factories"
 require "decidim/assemblies/test/factories"
 require "decidim/proposals/test/factories"
diff --git a/decidim-meetings/spec/permissions/decidim/meetings/permissions_spec.rb b/decidim-meetings/spec/permissions/decidim/meetings/permissions_spec.rb
index 3058ef73a2d34..32198275ef711 100644
--- a/decidim-meetings/spec/permissions/decidim/meetings/permissions_spec.rb
+++ b/decidim-meetings/spec/permissions/decidim/meetings/permissions_spec.rb
@@ -232,7 +232,7 @@
         let(:user) { admin_user }
 
         before do
-          create(:participatory_space_private_user, user:, privatable_to: participatory_space)
+          create(:member, user:, participatory_space:)
         end
 
         it { is_expected.to be true }
@@ -246,9 +246,9 @@
         it { is_expected.to be false }
       end
 
-      context "when user is a space private participant" do
+      context "when user is a space member" do
         before do
-          create(:participatory_space_private_user, user:, privatable_to: participatory_space)
+          create(:member, user:, participatory_space:)
         end
 
         it { is_expected.to be true }
diff --git a/decidim-meetings/spec/system/explore_meetings_spec.rb b/decidim-meetings/spec/system/explore_meetings_spec.rb
index a59311e7a6ef0..34a6e87e45cc7 100644
--- a/decidim-meetings/spec/system/explore_meetings_spec.rb
+++ b/decidim-meetings/spec/system/explore_meetings_spec.rb
@@ -29,10 +29,6 @@
     it "shows all meetings for the given process" do
       visit_component
 
-      within(".menu-bar") do
-        expect(page).to have_content(translated(component.name))
-      end
-
       expect(page).to have_selector(meetings_selector, count: meetings_count)
 
       meetings.each do |meeting|
diff --git a/decidim-meetings/spec/system/explore_versions_spec.rb b/decidim-meetings/spec/system/explore_versions_spec.rb
index e13475d70e35f..7bcdcef10ece9 100644
--- a/decidim-meetings/spec/system/explore_versions_spec.rb
+++ b/decidim-meetings/spec/system/explore_versions_spec.rb
@@ -49,10 +49,6 @@
     end
 
     it "lists all versions" do
-      within(".menu-bar") do
-        expect(page).to have_content(translated(component.name))
-        expect(page).to have_content(translated(meeting.reload.title))
-      end
       expect(page).to have_link("Version 1 of 2")
       expect(page).to have_link("Version 2 of 2")
     end
diff --git a/decidim-meetings/spec/system/live_meeting_access_spec.rb b/decidim-meetings/spec/system/live_meeting_access_spec.rb
index fe394e31ee808..8fa00301ec931 100644
--- a/decidim-meetings/spec/system/live_meeting_access_spec.rb
+++ b/decidim-meetings/spec/system/live_meeting_access_spec.rb
@@ -165,8 +165,8 @@ def visit_meeting
       let(:assembly) { create(:assembly, :private, :transparent, organization:) }
       let(:participatory_space) { assembly }
       let(:admin) { create(:user, :confirmed, :admin, organization:) }
-      let(:private_user) { create(:user, :confirmed, organization:) }
-      let!(:assembly_private_user) { create(:assembly_private_user, user: private_user, privatable_to: assembly) }
+      let(:member) { create(:user, :confirmed, organization:) }
+      let!(:assembly_member) { create(:assembly_member, user: member, participatory_space: assembly) }
 
       context "when user is not signed in" do
         it "does not show the meeting link embedded" do
@@ -188,9 +188,9 @@ def visit_meeting
         end
       end
 
-      context "when private user is signed in" do
+      context "when member is signed in" do
         before do
-          login_as private_user, scope: :user
+          login_as member, scope: :user
         end
 
         it "shows the meeting link embedded" do
diff --git a/decidim-meetings/spec/system/meeting_waiting_list_spec.rb b/decidim-meetings/spec/system/meeting_waiting_list_spec.rb
index f05e49b3c1e4a..49c1dd575d403 100644
--- a/decidim-meetings/spec/system/meeting_waiting_list_spec.rb
+++ b/decidim-meetings/spec/system/meeting_waiting_list_spec.rb
@@ -58,7 +58,7 @@ def leave_meeting(user)
 
     context "when the meeting has no available slots" do
       before do
-        create_list(:registration, available_slots, meeting: meeting)
+        create_list(:registration, available_slots, meeting:)
       end
 
       context "when the user is not logged in" do
@@ -111,13 +111,13 @@ def leave_meeting(user)
 
   context "when the meeting is full and a user cancels their registration" do
     context "and there are users on the waiting list" do
-      let!(:registrations) { create_list(:registration, available_slots, meeting: meeting) }
+      let!(:registrations) { create_list(:registration, available_slots, meeting:) }
       let(:users_on_waitlist) { create_list(:user, 5, :confirmed, organization:) }
       let(:first_waitlist_user) { users_on_waitlist.first }
 
       let!(:waitlist_entries) do
         users_on_waitlist.map.with_index do |user, index|
-          create(:registration, meeting: meeting, user: user, status: "waiting_list", created_at: Time.current - index.minutes)
+          create(:registration, meeting:, user:, status: "waiting_list", created_at: Time.current - index.minutes)
         end
       end
 
diff --git a/decidim-meetings/spec/system/meetings_breadcrumbs_spec.rb b/decidim-meetings/spec/system/meetings_breadcrumbs_spec.rb
new file mode 100644
index 0000000000000..2e4a1f22fcb9a
--- /dev/null
+++ b/decidim-meetings/spec/system/meetings_breadcrumbs_spec.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Meetings Breadcrumb" do
+  include_context "with a component"
+  let(:manifest_name) { "meetings" }
+
+  let!(:meeting) { create(:meeting, :published, component:) }
+
+  before do
+    stub_geocoding_coordinates([meeting.latitude, meeting.longitude])
+    visit_component
+  end
+
+  describe "index" do
+    it "shows the correct information in breadcrumb (space, component)" do
+      within(".menu-bar") do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+      end
+    end
+  end
+
+  describe "show" do
+    it "shows the correct information in breadcrumb (space, component, meeting)" do
+      click_on meeting.title[I18n.locale.to_s]
+      within(".menu-bar") do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+        expect(page).to have_content(translated(meeting.title))
+      end
+    end
+  end
+
+  describe "versions", versioning: true do
+    let(:meeting_path) do
+      decidim_participatory_process_meetings.meeting_path(
+        participatory_process_slug: participatory_process.slug,
+        component_id: component.id,
+        locale: I18n.locale,
+        id: meeting.id
+      )
+    end
+
+    before do
+      stub_geocoding_coordinates([meeting.latitude, meeting.longitude])
+      Decidim.traceability.update!(
+        meeting,
+        "test suite",
+        title: { en: "My updated title" }
+      )
+      visit meeting_path
+      click_on "see other versions"
+    end
+
+    it "shows the correct information in breadcrumb (space, component, meeting)" do
+      within(".menu-bar") do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+        expect(page).to have_content(translated(meeting.title))
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/spec/system/show_spec.rb b/decidim-meetings/spec/system/show_spec.rb
index a05cbb334d831..d411bd9662ba2 100644
--- a/decidim-meetings/spec/system/show_spec.rb
+++ b/decidim-meetings/spec/system/show_spec.rb
@@ -42,11 +42,6 @@
       end
 
       it "shows the correct time zone" do
-        within(".menu-bar") do
-          expect(page).to have_content(translated(component.name))
-          expect(page).to have_content(translated(meeting.reload.title))
-        end
-
         expect(page).to have_content("HST")
       end
     end
diff --git a/decidim-meetings/spec/types/agenda_type_spec.rb b/decidim-meetings/spec/types/agenda_type_spec.rb
index 5ac11e57989cc..765d6f3facb07 100644
--- a/decidim-meetings/spec/types/agenda_type_spec.rb
+++ b/decidim-meetings/spec/types/agenda_type_spec.rb
@@ -42,8 +42,8 @@ module Meetings
 
         let(:model) { create(:agenda, :with_agenda_items, visible: false) }
 
-        it "returns the agenda's id" do
-          expect(response).to be_nil
+        it "throws Decidim::Api::Errors::UnauthorizedObjectError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::UnauthorizedObjectError, "You cannot view or edit this MeetingAgenda because you do not have permissions")
         end
       end
     end
diff --git a/decidim-meetings/spec/types/close_meeting_type_spec.rb b/decidim-meetings/spec/types/close_meeting_type_spec.rb
new file mode 100644
index 0000000000000..83246555eceab
--- /dev/null
+++ b/decidim-meetings/spec/types/close_meeting_type_spec.rb
@@ -0,0 +1,211 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Meetings
+    describe CloseMeetingType, type: :graphql do
+      include_context "with a graphql class mutation"
+
+      let(:root_klass) { MeetingMutationType }
+      let(:organization) { current_organization }
+      let(:participatory_process) { create(:participatory_process, :with_steps, organization:) }
+      let(:meetings_component) { create(:meeting_component, participatory_space: participatory_process) }
+      let(:author) { current_user }
+      let!(:model) { create(:meeting, :published, component: meetings_component, author:, end_time:, start_time:) }
+      let(:attendees_count) { 10 }
+      let(:closing_report) { "My meeting closing report" }
+      let(:component) { model.component }
+      let(:proposal_ids) { [] }
+      let(:locale) { "en" }
+      let(:end_time) { 1.day.ago }
+      let(:start_time) { 2.days.ago }
+
+      let(:variables) do
+        {
+          input: {
+            locale:,
+            attributes: {
+              closingReport: closing_report,
+              attendeesCount: attendees_count,
+              proposalIds: proposal_ids
+            }
+          }
+        }
+      end
+
+      let(:query) do
+        <<~GRAPHQL
+          mutation($input: CloseMeetingInput!) {
+            close(input: $input) {
+              id
+              closed
+              attendeesCount
+              closingReport { translation(locale: "en") }
+              closedAt
+            }
+          }
+        GRAPHQL
+      end
+
+      shared_examples "manage meeting mutation examples" do
+        context "when meeting is in the future" do
+          let(:end_time) { 1.day.from_now }
+
+          it "raises a Decidim::Api::Errors::MutationNotAuthorizedError" do
+            expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+          end
+        end
+
+        context "when meeting can be closed" do
+          it "closes the meeting" do
+            close = response["close"]
+            expect(close).to be_present
+            expect(close).to include(
+              {
+                "id" => model.id.to_s,
+                "closed" => true,
+                "attendeesCount" => attendees_count,
+                "closingReport" => {
+                  "translation" => closing_report
+                },
+                "closedAt" => model.reload.closed_at.to_time.iso8601
+              }
+            )
+            expect(model.reload).to be_closed
+          end
+
+          context "with linked proposals" do
+            let!(:proposals_component) { create(:proposal_component, participatory_space: participatory_process) }
+            let!(:proposal1) { create(:proposal, component: proposals_component) }
+            let!(:proposal2) { create(:proposal, component: proposals_component) }
+            let!(:proposal_ids) { [proposal1.id, proposal2.id].map(&:to_s) }
+
+            it "closes the meeting and links proposals" do
+              close = response["close"]
+              expect(close).to be_present
+
+              expect(model.reload).to be_closed
+
+              # Verify proposals are linked
+              expect(model.reload.linked_resources(:proposals, "proposals_from_meeting").pluck(:id)).to match_array(proposal_ids.collect(&:to_i))
+            end
+          end
+        end
+      end
+
+      context "with admin user" do
+        it_behaves_like "manage meeting mutation examples" do
+          let!(:user_type) { :admin }
+        end
+      end
+
+      context "with normal user" do
+        it_behaves_like "manage meeting mutation examples"
+      end
+
+      context "with api_user" do
+        it_behaves_like "manage meeting mutation examples" do
+          let!(:user_type) { :api_user }
+        end
+      end
+
+      context "when validating" do
+        context "with issues on attendees_count" do
+          context "when the value is not sent" do
+            let(:variables) do
+              {
+                input: {
+                  locale:,
+                  attributes: {
+                    closingReport: closing_report,
+                    proposalIds: proposal_ids
+                  }
+                }
+              }
+            end
+
+            it "raises an error" do
+              expect { response }.to raise_error(::GraphQL::ExecutionError, /Expected value to not be null/)
+            end
+          end
+
+          context "when the value is not an integer" do
+            let(:attendees_count) { "not_an_integer" }
+
+            it "raises an error" do
+              expect { response }.to raise_error(::GraphQL::ExecutionError, /Could not coerce value "not_an_integer" to Int/)
+            end
+          end
+
+          context "when the value is less than 0" do
+            let(:attendees_count) { -1 }
+
+            it "raises an error" do
+              expect { response }.to raise_error(Api::Errors::AttributeValidationError, /must be greater than or equal to 0/)
+            end
+          end
+
+          context "when the value is larger than 1000" do
+            let(:attendees_count) { 1000 }
+
+            it "raises an error" do
+              expect { response }.to raise_error(Api::Errors::AttributeValidationError, /must be less than or equal to 999/)
+            end
+          end
+        end
+
+        context "with an invalid locale" do
+          let(:locale) { "tlh" }
+
+          it "raises an error" do
+            expect { response }.to raise_error(Api::Errors::InvalidLocaleError, /Invalid locale provided/)
+          end
+        end
+
+        context "when having an invalid closing_report" do
+          context "when is missing" do
+            let(:closing_report) { "" }
+
+            it "raises an error" do
+              expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /cannot be blank/)
+            end
+          end
+        end
+      end
+
+      context "when anonymous user" do
+        let(:current_user) { nil }
+        let(:author) { create(:user, :confirmed, organization: current_organization) }
+
+        it "raises a Decidim::Api::Errors::MutationNotAuthorizedError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+        end
+      end
+
+      context "when meeting is not published" do
+        let!(:model) { create(:meeting, component: meetings_component, author:, end_time:, start_time:) }
+
+        it "raises a Decidim::Api::Errors::MutationNotAuthorizedError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+        end
+      end
+
+      context "when meeting is closed" do
+        let!(:model) { create(:meeting, :published, :closed_with_minutes, component: meetings_component, author:) }
+
+        it "raises a Decidim::Api::Errors::MutationNotAuthorizedError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+        end
+      end
+
+      context "when meeting is withdrawn" do
+        let!(:model) { create(:meeting, :withdrawn, :closed_with_minutes, component: meetings_component, author:) }
+
+        it "raises a Decidim::Api::Errors::MutationNotAuthorizedError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/spec/types/create_meeting_type_spec.rb b/decidim-meetings/spec/types/create_meeting_type_spec.rb
new file mode 100644
index 0000000000000..d6194a5c703ea
--- /dev/null
+++ b/decidim-meetings/spec/types/create_meeting_type_spec.rb
@@ -0,0 +1,234 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "decidim/api/test"
+
+module Decidim
+  module Meetings
+    describe CreateMeetingType do
+      include_context "with a graphql class mutation"
+
+      let(:type_class) { Decidim::Meetings::CreateMeetingType }
+      let(:root_klass) { Decidim::Meetings::MeetingsMutationType }
+
+      let(:current_organization) { create(:organization, available_locales: [:en]) }
+      let(:organization) { current_organization }
+      let(:participatory_process) { create(:participatory_process, :published, :with_steps, organization:) }
+
+      let(:locale) { "en" }
+      let(:translation_locale) { "en" }
+
+      let!(:current_component) do
+        create(:meeting_component, :published, participatory_space: participatory_process, settings: {
+                 creation_enabled_for_participants: true,
+                 taxonomy_filters: [taxonomy_filter.id]
+               })
+      end
+      let(:root_taxonomy) { create(:taxonomy, organization:) }
+      let!(:taxonomy) { create(:taxonomy, parent: root_taxonomy, organization:) }
+      let(:taxonomy_filter) { create(:taxonomy_filter, root_taxonomy:) }
+      let!(:taxonomy_filter_item) { create(:taxonomy_filter_item, taxonomy_filter:, taxonomy_item: taxonomy) }
+      let!(:user) { create(:user, :confirmed, organization:) }
+
+      let(:title) { "More sidewalks and less roads" }
+      let(:description) { "Cities need more people, not more cars" }
+      let(:address) { "Carrer de la Pau, 1, Barcelona" }
+      let(:latitude) { 40.1234 }
+      let(:longitude) { 2.1234 }
+      let(:start_time) { 1.day.from_now }
+      let(:end_time) { start_time + 2.hours }
+      let(:iframe_embed_type) { "NONE" }
+      let(:iframe_access_level) { "ALL" }
+      let(:location) { "Somewhere" }
+      let(:location_hints) { "Near the main square" }
+      let(:online_meeting_url) { "https://meets.example.org/abc-def" }
+      let(:registration_terms) { "By registering you agree to the terms and conditions" }
+      let(:registration_type) { "ON_THIS_PLATFORM" }
+      let(:registration_url) { "https://example.org/register" }
+      let(:registrations_enabled) { true }
+      let(:type_of_meeting) { "ONLINE" }
+
+      let(:root_value) { current_component }
+      let(:query) do
+        <<~GRAPHQL
+          mutation createMeeting($input: CreateMeetingInput!){
+            createMeeting(input: $input) {
+              id
+              title { translation(locale: "#{translation_locale}") }
+              description { translation(locale: "#{translation_locale}") }
+              address
+              coordinates { latitude longitude }
+              publishedAt
+              author { name }
+              taxonomies { id }
+              remainingSlots
+              location  { translation(locale: "#{translation_locale}") }
+              locationHints { translation(locale: "#{translation_locale}") }
+              onlineMeetingUrl
+              registrationTerms { translation(locale: "#{translation_locale}") }
+              registrationType
+              registrationUrl
+              endTime
+              startTime
+              typeOfMeeting
+              registrationsEnabled
+            }
+          }
+        GRAPHQL
+      end
+
+      let(:attributes) do
+        {
+          address:,
+          availableSlots: 10,
+          description:,
+          endTime: end_time.iso8601,
+          iframeAccessLevel: iframe_access_level,
+          iframeEmbedType: iframe_embed_type,
+          latitude:,
+          location:,
+          locationHints: location_hints,
+          longitude:,
+          onlineMeetingUrl: online_meeting_url,
+          registrationTerms: registration_terms,
+          registrationType: registration_type,
+          registrationUrl: registration_url,
+          registrationsEnabled: registrations_enabled,
+          startTime: start_time.iso8601,
+          taxonomies: [taxonomy.id],
+          title:,
+          typeOfMeeting: type_of_meeting
+        }
+      end
+
+      let(:variables) do
+        {
+          component_id: current_component.id,
+          input: {
+            locale:,
+            attributes:
+          }
+        }
+      end
+
+      before do
+        stub_geocoding(address, [latitude, longitude])
+      end
+
+      context "when validating" do
+        context "with having invalid locale" do
+          let(:locale) { "tlh" }
+
+          it "raises an error" do
+            expect { response }.to raise_error(Api::Errors::InvalidLocaleError, /Invalid locale provided/)
+          end
+        end
+
+        context "with having invalid title" do
+          context "when is missing" do
+            let(:title) { "" }
+
+            it "raises an error" do
+              expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /cannot be blank/)
+            end
+          end
+        end
+
+        context "with having invalid registration type" do
+          let(:registration_type) { "INVALID_TYPE" }
+
+          it "raises an error" do
+            expect { response }.to raise_error(GraphQL::ExecutionError, /to be one of: REGISTRATION_DISABLED, ON_THIS_PLATFORM, ON_DIFFERENT_PLATFORM/)
+          end
+        end
+
+        context "with having invalid meeting type" do
+          let(:type_of_meeting) { "INVALID_TYPE" }
+
+          it "raises an error" do
+            expect { response }.to raise_error(GraphQL::ExecutionError, /to be one of: HYBRID, IN_PERSON, ONLINE/)
+          end
+        end
+      end
+
+      shared_examples "create meeting mutation examples" do
+        context "when creation is disabled" do
+          let!(:current_component) { create(:meeting_component, :published, participatory_space: participatory_process) }
+
+          it "raises a Decidim::Api::Errors::MutationNotAuthorizedError" do
+            expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+          end
+        end
+
+        context "when user is logged in" do
+          it "creates a new meeting" do
+            meeting_response = response["createMeeting"]
+
+            expect(meeting_response).to be_present
+            expect(meeting_response["title"]["translation"]).to eq(title)
+            expect(meeting_response["description"]["translation"]).to include(description)
+            expect(meeting_response["publishedAt"]).to be_present
+            expect(meeting_response["taxonomies"]).to include({ "id" => taxonomy.id.to_s })
+            expect(meeting_response["author"]["name"]).to eq(current_user.name)
+            expect(meeting_response["remainingSlots"]).to eq(10)
+            expect(meeting_response["location"]).to include({ "translation" => location })
+            expect(meeting_response["locationHints"]).to include({ "translation" => location_hints })
+            expect(meeting_response["registrationTerms"]).to include({ "translation" => registration_terms })
+
+            expect(meeting_response["onlineMeetingUrl"]).to eq(online_meeting_url)
+            expect(meeting_response["registrationType"]).to eq(registration_type)
+            expect(meeting_response["registrationUrl"]).to eq(registration_url)
+            expect(meeting_response["endTime"]).to eq(end_time.to_time.iso8601)
+            expect(meeting_response["startTime"]).to eq(start_time.to_time.iso8601)
+            expect(meeting_response["typeOfMeeting"]).to eq(type_of_meeting)
+            expect(meeting_response["registrationsEnabled"]).to eq(registrations_enabled)
+
+            expect(meeting_response["address"]).to eq(address)
+            expect(meeting_response["coordinates"]).to include(
+              "latitude" => latitude,
+              "longitude" => longitude
+            )
+          end
+
+          context "when submitting in one language and requesting in another" do
+            let(:locale) { "en" }
+            let(:translation_locale) { "es" }
+
+            it "creates a new meeting" do
+              meeting_response = response["createMeeting"]
+
+              expect(meeting_response).to be_present
+              expect(meeting_response["title"]["translation"]).to be_nil
+            end
+          end
+        end
+      end
+
+      context "with admin user" do
+        it_behaves_like "create meeting mutation examples" do
+          let!(:user_type) { :admin }
+        end
+      end
+
+      context "with normal user" do
+        it_behaves_like "create meeting mutation examples" do
+          let!(:user_type) { :user }
+        end
+      end
+
+      context "with api_user" do
+        it_behaves_like "create meeting mutation examples" do
+          let!(:user_type) { :api_user }
+        end
+      end
+
+      context "when the user is not logged in" do
+        let(:current_user) { nil }
+
+        it "raises a Decidim::Api::Errors::MutationNotAuthorizedError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/spec/types/integration_schema_spec.rb b/decidim-meetings/spec/types/integration_schema_spec.rb
index 158d5e676fd6f..27f21ab6b8307 100644
--- a/decidim-meetings/spec/types/integration_schema_spec.rb
+++ b/decidim-meetings/spec/types/integration_schema_spec.rb
@@ -150,8 +150,8 @@
       "followsCount" => meeting.follows_count,
       "hasComments" => meeting.comment_threads.size.positive?,
       "id" => meeting.id.to_s,
-      "iframeAccessLevel" => meeting.iframe_access_level,
-      "iframeEmbedType" => meeting.iframe_embed_type,
+      "iframeAccessLevel" => meeting.iframe_access_level.upcase,
+      "iframeEmbedType" => meeting.iframe_embed_type.upcase,
       "location" => { "translation" => meeting.location[locale] },
       "locationHints" => { "translation" => meeting.location_hints[locale] },
       "privateMeeting" => false,
@@ -161,7 +161,7 @@
       "reference" => meeting.reference,
       "registrationForm" => { "id" => meeting.questionnaire.id.to_s },
       "registrationTerms" => { "translation" => meeting.registration_terms[locale] },
-      "registrationType" => meeting.registration_type,
+      "registrationType" => meeting.registration_type.upcase,
       "registrationUrl" => nil,
       "registrationsEnabled" => false,
       "remainingSlots" => 0,
@@ -220,6 +220,35 @@
     end
   end
 
+  context "when query exceeds recursion threshold" do
+    let(:component_fragment) do
+      %(
+      fragment fooComponent on Meetings {
+        meeting(id: #{meeting.id}){
+          agenda {
+            items {
+              agenda {
+                items {
+                  agenda {
+                    items { id }
+                  }
+                }
+              }
+            }
+          }
+        }
+        }
+      )
+    end
+
+    it "raises error Decidim::Api::Errors::TooManyRecursionsError" do
+      expect { response }.to raise_error(
+        Decidim::Api::Errors::RecursionLimitExceededError,
+        I18n.t("decidim.api.errors.recursion_limit_exceeded_error")
+      )
+    end
+  end
+
   describe "valid connection query" do
     let(:component_fragment) do
       %(
diff --git a/decidim-meetings/spec/types/meeting_mutation_type_spec.rb b/decidim-meetings/spec/types/meeting_mutation_type_spec.rb
new file mode 100644
index 0000000000000..0ce4fd1b23081
--- /dev/null
+++ b/decidim-meetings/spec/types/meeting_mutation_type_spec.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Meetings
+    describe WithdrawMeetingType, type: :graphql do
+      include_context "with a graphql class mutation"
+
+      let(:root_klass) { MeetingMutationType }
+      let(:organization) { create(:organization, available_locales: [:en]) }
+      let(:participatory_process) { create(:participatory_process, :with_steps, organization:) }
+      let(:user) { create(:user, :confirmed, organization:) }
+      let(:component) { create(:meeting_component, participatory_space: participatory_process) }
+      let!(:model) { create(:meeting, :published, component:, author: user) }
+      let(:current_user) { user }
+
+      let(:query) do
+        <<~GRAPHQL
+          mutation() {
+            withdraw(input: {}) {
+              id
+              title { translation(locale: "en") }
+              withdrawn
+              withdrawnAt
+            }
+          }
+        GRAPHQL
+      end
+
+      context "when user is the author of the meeting" do
+        it "withdraws the meeting" do
+          expect(response["withdraw"]).to be_present
+          expect(response["withdraw"]["id"]).to eq(model.id.to_s)
+          expect(response["withdraw"]["withdrawn"]).to be(true)
+          expect(response["withdraw"]["withdrawnAt"]).to be_present
+          expect(model.reload).to be_withdrawn
+        end
+      end
+
+      context "when user is not the author of the meeting" do
+        let(:other_user) { create(:user, :confirmed, organization:) }
+        let(:current_user) { other_user }
+
+        it "raises a Decidim::Api::Errors::MutationNotAuthorizedError exception" do
+          expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+        end
+      end
+
+      context "when meeting is already withdrawn" do
+        let!(:model) { create(:meeting, :published, :withdrawn, component:, author: user) }
+
+        it "does not withdraw the meeting and returns an error" do
+          expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+          expect(model.reload).to be_withdrawn
+          expect(model.withdrawn_at).to be_present
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/spec/types/meeting_type_spec.rb b/decidim-meetings/spec/types/meeting_type_spec.rb
index 64262900c7570..1d7f16ce14489 100644
--- a/decidim-meetings/spec/types/meeting_type_spec.rb
+++ b/decidim-meetings/spec/types/meeting_type_spec.rb
@@ -24,6 +24,12 @@ module Meetings
       include_examples "referable interface"
       include_examples "localizable interface"
 
+      shared_examples "unauthorized Meeting" do
+        it "throws Decidim::Api::Errors::UnauthorizedObjectError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::UnauthorizedObjectError, "You cannot view or edit this Meeting because you do not have permissions")
+        end
+      end
+
       describe "id" do
         let(:query) { "{ id }" }
 
@@ -72,9 +78,7 @@ module Meetings
         context "when is not set" do
           let(:model) { create(:meeting, component:) }
 
-          it "returns the publishedAt field" do
-            expect(response).to be_nil
-          end
+          it_behaves_like "unauthorized Meeting"
         end
       end
 
@@ -107,7 +111,7 @@ module Meetings
             let(:model) { create(:meeting, :published, component:, iframe_access_level:) }
 
             it "displays the field value" do
-              expect(response["iframeAccessLevel"]).to eq(model.iframe_access_level)
+              expect(response["iframeAccessLevel"]).to eq(model.iframe_access_level.upcase)
             end
           end
         end
@@ -126,7 +130,7 @@ module Meetings
             let(:model) { create(:meeting, :published, component:, iframe_embed_type:) }
 
             it "displays the field value" do
-              expect(response["iframeEmbedType"]).to eq(model.iframe_embed_type)
+              expect(response["iframeEmbedType"]).to eq(model.iframe_embed_type.upcase)
             end
           end
         end
@@ -140,7 +144,7 @@ module Meetings
             let(:model) { create(:meeting, :published, component:, registration_type:) }
 
             it "displays the field value" do
-              expect(response["registrationType"]).to eq(model.registration_type)
+              expect(response["registrationType"]).to eq(model.registration_type.upcase)
             end
           end
         end
@@ -433,9 +437,7 @@ module Meetings
         let(:root_value) { model.reload }
         let!(:current_user) { create(:user, :confirmed, organization: current_organization) }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Meeting"
       end
 
       describe "transparent" do
@@ -452,9 +454,7 @@ module Meetings
         let(:model) { create(:meeting, component: current_component) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Meeting"
       end
 
       context "when participatory space is private but transparent" do
@@ -474,9 +474,7 @@ module Meetings
         let(:model) { create(:meeting, component: current_component) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Meeting"
       end
 
       context "when component is not published" do
@@ -484,9 +482,7 @@ module Meetings
         let(:model) { create(:meeting, component: current_component) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Meeting"
       end
 
       context "when meeting is moderated" do
@@ -494,9 +490,7 @@ module Meetings
         let(:query) { "{ id }" }
         let(:root_value) { model.reload }
 
-        it "returns all the required fields" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Meeting"
       end
 
       context "when meeting is not published" do
@@ -504,9 +498,7 @@ module Meetings
         let(:query) { "{ id }" }
         let(:root_value) { model.reload }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Meeting"
       end
     end
   end
diff --git a/decidim-meetings/spec/types/meetings_type_spec.rb b/decidim-meetings/spec/types/meetings_type_spec.rb
index 5359d84961ed7..c76def5d4e9d2 100644
--- a/decidim-meetings/spec/types/meetings_type_spec.rb
+++ b/decidim-meetings/spec/types/meetings_type_spec.rb
@@ -68,16 +68,16 @@ module Meetings
         context "when the meeting does not belong to the component" do
           let!(:meeting) { create(:meeting, :published, component: create(:meeting_component)) }
 
-          it "returns null" do
-            expect(response["meeting"]).to be_nil
+          it "raises error" do
+            expect { response }.to raise_error(Decidim::Api::Errors::NotFoundError, "Meeting not found")
           end
         end
 
         context "when private" do
           let!(:meeting) { create(:meeting, :published, component: model, private_meeting: true, transparent: false) }
 
-          it "returns null" do
-            expect(response["meeting"]).to be_nil
+          it "raises error" do
+            expect { response }.to raise_error(Decidim::Api::Errors::NotFoundError, "Meeting not found")
           end
         end
       end
diff --git a/decidim-meetings/spec/types/update_meeting_type_spec.rb b/decidim-meetings/spec/types/update_meeting_type_spec.rb
new file mode 100644
index 0000000000000..19cc2c17a5108
--- /dev/null
+++ b/decidim-meetings/spec/types/update_meeting_type_spec.rb
@@ -0,0 +1,293 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "decidim/api/test"
+
+module Decidim
+  module Meetings
+    describe UpdateMeetingType, type: :graphql do
+      include_context "with a graphql class mutation"
+
+      let(:root_klass) { MeetingMutationType }
+      let(:current_organization) { create(:organization, available_locales: [:en]) }
+      let(:participatory_process) { create(:participatory_process, :with_steps, organization: current_organization) }
+      let(:meeting_component) do
+        create(:meeting_component, :published, participatory_space: participatory_process, settings: {
+                 creation_enabled_for_participants: true,
+                 taxonomy_filters: [taxonomy_filter.id]
+               })
+      end
+      let!(:model) { create(:meeting, :published, component: meeting_component, author: current_user) }
+      let(:title) { "Updated Meeting Title" }
+      let(:description) { "Updated meeting description" }
+      let(:location) { "Updated location" }
+      let(:start_time) { (2.days.from_now).to_time.iso8601 }
+      let(:end_time) { (2.days.from_now + 2.hours).to_time.iso8601 }
+      let(:address) { "Updated address, 123" }
+      let(:latitude) { 41.1234 }
+      let(:longitude) { 2.5678 }
+      let(:registration_type) { "ON_THIS_PLATFORM" }
+      let(:available_slots) { 50 }
+      let(:type_of_meeting) { "ONLINE" }
+      let(:online_meeting_url) { "https://meet.example.org/updated-meeting" }
+      let(:registration_terms) { "Updated registration terms" }
+      let(:root_taxonomy) { create(:taxonomy, organization: current_organization) }
+      let!(:taxonomy) { create(:taxonomy, parent: root_taxonomy, organization: current_organization) }
+      let(:taxonomy_filter) { create(:taxonomy_filter, root_taxonomy:) }
+      let!(:taxonomy_filter_item) { create(:taxonomy_filter_item, taxonomy_filter:, taxonomy_item: taxonomy) }
+      let(:locale) { "en" }
+
+      let(:variables) do
+        {
+          input: {
+            locale:,
+            attributes: {
+              address:,
+              availableSlots: available_slots,
+              description:,
+              endTime: end_time,
+              latitude:,
+              location:,
+              longitude:,
+              onlineMeetingUrl: online_meeting_url,
+              registrationTerms: registration_terms,
+              registrationType: registration_type,
+              startTime: start_time,
+              taxonomies: [taxonomy.id],
+              title:,
+              typeOfMeeting: type_of_meeting
+            }
+          }
+        }
+      end
+
+      let(:query) do
+        <<~GRAPHQL
+          mutation($input: UpdateMeetingInput!) {
+            update(input: $input) {
+              address
+              description { translation(locale: "en") }
+              endTime
+              id
+              location { translation(locale: "en") }
+              registrationType
+              startTime
+              taxonomies { id }
+              title { translation(locale: "en") }
+            }
+          }
+        GRAPHQL
+      end
+
+      shared_examples "update meeting mutation examples" do
+        context "when user has permission to update" do
+          it "the meeting" do
+            meeting_response = response["update"]
+            expect(meeting_response).to be_present
+            expect(meeting_response).to include(
+              {
+                "id" => model.id.to_s,
+                "title" => {
+                  "translation" => title
+                },
+                "description" => {
+                  "translation" => description
+                },
+                "location" => {
+                  "translation" => location
+                },
+                "address" => address,
+                "registrationType" => registration_type
+              }
+            )
+
+            expect(meeting_response["taxonomies"]).to include({ "id" => taxonomy.id.to_s })
+
+            # Verify the meeting was actually updated in the database
+            model.reload
+            expect(model.title["en"]).to eq(title)
+            expect(model.description["en"]).to eq(description)
+            expect(model.address).to eq(address)
+          end
+
+          context "when validating" do
+            context "with having invalid locale" do
+              let(:locale) { "tlh" }
+
+              it "raises an error" do
+                expect { response }.to raise_error(Api::Errors::InvalidLocaleError, /Invalid locale provided/)
+              end
+            end
+
+            context "with invalid title" do
+              let(:title) { "" }
+
+              it "raises an error" do
+                expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /cannot be blank/)
+              end
+            end
+
+            context "with invalid description" do
+              let(:description) { "" }
+
+              it "raises an error" do
+                expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /cannot be blank/)
+              end
+            end
+
+            context "with invalid start_time" do
+              context "and is empty" do
+                let(:start_time) { "" }
+
+                it "raises an error" do
+                  expect { response }.to raise_error(ArgumentError)
+                end
+              end
+
+              context "and is invalid" do
+                let(:start_time) { 3.days.from_now.to_time.iso8601 }
+
+                it "raises an error" do
+                  expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /must be after/)
+                end
+              end
+            end
+
+            context "with invalid end_time" do
+              context "and is empty" do
+                let(:end_time) { "" }
+
+                it "raises an error" do
+                  expect { response }.to raise_error(ArgumentError)
+                end
+              end
+
+              context "and is invalid" do
+                let(:end_time) { (2.days.ago + 2.hours).to_time.iso8601 }
+
+                it "raises an error" do
+                  expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /must be before/)
+                end
+              end
+            end
+
+            context "with empty fields" do
+              context "when location" do
+                let(:location) { "" }
+
+                context "when online_meeting_url is required" do
+                  let(:type_of_meeting) { "IN_PERSON" }
+
+                  it "raises an error" do
+                    expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /cannot be blank/)
+                  end
+                end
+
+                context "when online_meeting_url is optional" do
+                  let(:type_of_meeting) { "ONLINE" }
+
+                  it "saves the data" do
+                    expect(response["update"]).to include({ "title" => { "translation" => title } })
+                  end
+                end
+              end
+
+              context "when address" do
+                let(:address) { "" }
+
+                context "when online_meeting_url is required" do
+                  let(:type_of_meeting) { "IN_PERSON" }
+
+                  it "raises an error" do
+                    expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /cannot be blank/)
+                  end
+                end
+
+                context "when online_meeting_url is optional" do
+                  let(:type_of_meeting) { "ONLINE" }
+
+                  it "saves the data" do
+                    expect(response["update"]).to include({ "title" => { "translation" => title } })
+                  end
+                end
+              end
+            end
+
+            context "with empty online_meeting_url" do
+              let(:online_meeting_url) { "" }
+
+              context "when online_meeting_url is required" do
+                let(:type_of_meeting) { "ONLINE" }
+
+                it "raises an error" do
+                  expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /cannot be blank/)
+                end
+              end
+
+              context "when online_meeting_url is optional" do
+                let(:type_of_meeting) { "IN_PERSON" }
+
+                it "saves the data" do
+                  expect(response["update"]).to include({ "title" => { "translation" => title } })
+                end
+              end
+            end
+          end
+
+          context "with partial update" do
+            let(:variables) do
+              {
+                input: {
+                  locale:,
+                  attributes: {
+                    description:,
+                    endTime: end_time,
+                    onlineMeetingUrl: online_meeting_url,
+                    registrationType: registration_type,
+                    startTime: start_time,
+                    taxonomies: [taxonomy.id],
+                    title: "Only title updated",
+                    typeOfMeeting: type_of_meeting
+                  }
+                }
+              }
+            end
+
+            it "updates only specified fields" do
+              meeting_response = response["update"]
+              expect(meeting_response).to be_present
+              expect(meeting_response["title"]["translation"]).to eq("Only title updated")
+            end
+          end
+        end
+      end
+
+      context "with user who owns the meeting" do
+        it_behaves_like "update meeting mutation examples" do
+          let!(:user_type) { :user }
+        end
+      end
+
+      context "with admin user" do
+        it_behaves_like "update meeting mutation examples" do
+          let!(:user_type) { :admin }
+        end
+      end
+
+      context "with api_user" do
+        it_behaves_like "update meeting mutation examples" do
+          let!(:user_type) { :api_user }
+        end
+      end
+
+      context "with user who does not own the meeting" do
+        let(:other_user) { create(:user, :confirmed, organization: current_organization) }
+        let!(:model) { create(:meeting, component: meeting_component, author: other_user) }
+
+        it "raises a Decidim::Api::Errors::MutationNotAuthorizedError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-pages/config/locales/ro-RO.yml b/decidim-pages/config/locales/ro-RO.yml
index 66b8a68ca79fb..037ea903afca4 100644
--- a/decidim-pages/config/locales/ro-RO.yml
+++ b/decidim-pages/config/locales/ro-RO.yml
@@ -14,9 +14,20 @@ ro:
         name: Pagina
         settings:
           global:
-            announcement: Anunţ
+            announcement: Anunț
           step:
-            announcement: Anunţ
+            announcement: Anunț
+    open_data:
+      help:
+        pages:
+          body: Conținutul postării
+          component: Componenta căreia îi aparține pagina
+          created_at: Data la care a fost creată această pagină
+          id: Identificatorul unic al acestei pagini
+          participatory_space: Cărui spațiu (de exemplu, proces participativ sau adunare) aparține această pagină
+          title: Titlul paginii
+          updated_at: Ultima dată la care această pagină a fost actualizată
+          url: URL-ul pentru această pagină
     pages:
       admin:
         models:
@@ -24,8 +35,10 @@ ro:
             body: Conținut
         pages:
           edit:
-            save: Actualizează
-            title: Editează pagina
+            save: Actualizați
+            title: Modificați pagina
           update:
-            invalid: A apărut o eroare la salvarea paginii.
-            success: Pagina a fost salvată cu succes.
+            invalid: A apărut o eroare la actualizarea paginii.
+            success: Pagina a fost actualizată cu succes.
+      show:
+        empty: Nu există conținut în această pagină încă.
diff --git a/decidim-pages/lib/decidim/api/pages_type.rb b/decidim-pages/lib/decidim/api/pages_type.rb
index 77ea46fe7b191..c52ec596c4ca9 100644
--- a/decidim-pages/lib/decidim/api/pages_type.rb
+++ b/decidim-pages/lib/decidim/api/pages_type.rb
@@ -15,8 +15,8 @@ def pages
         Page.where(component: object).includes(:component)
       end
 
-      def page(**args)
-        Page.where(component: object).find_by(id: args[:id])
+      def page(id:)
+        Decidim::Core::ComponentFinderBase.new(model_class: Page).call(object, { id: }, context)
       end
     end
   end
diff --git a/decidim-pages/lib/decidim/pages/test/factories.rb b/decidim-pages/lib/decidim/pages/test/factories.rb
new file mode 100644
index 0000000000000..1a185f196b7fe
--- /dev/null
+++ b/decidim-pages/lib/decidim/pages/test/factories.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :page_component, parent: :component do
+    name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :pages).i18n_name }
+    manifest_name { :pages }
+    participatory_space { create(:participatory_process, :with_steps, organization:) }
+  end
+
+  factory :page, class: "Decidim::Pages::Page" do
+    body { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    component { build(:component, manifest_name: "pages") }
+  end
+end
diff --git a/decidim-pages/spec/factories.rb b/decidim-pages/spec/factories.rb
index 4ae29a793210c..c9297c89d4afa 100644
--- a/decidim-pages/spec/factories.rb
+++ b/decidim-pages/spec/factories.rb
@@ -3,16 +3,4 @@
 require "decidim/components/namer"
 require "decidim/core/test/factories"
 require "decidim/participatory_processes/test/factories"
-
-FactoryBot.define do
-  factory :page_component, parent: :component do
-    name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :pages).i18n_name }
-    manifest_name { :pages }
-    participatory_space { create(:participatory_process, :with_steps, organization:) }
-  end
-
-  factory :page, class: "Decidim::Pages::Page" do
-    body { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    component { build(:component, manifest_name: "pages") }
-  end
-end
+require "decidim/pages/test/factories"
diff --git a/decidim-pages/spec/types/pages_type_spec.rb b/decidim-pages/spec/types/pages_type_spec.rb
index f3ebaa8a820ae..b59fd41523b6c 100644
--- a/decidim-pages/spec/types/pages_type_spec.rb
+++ b/decidim-pages/spec/types/pages_type_spec.rb
@@ -39,8 +39,8 @@ module Pages
         context "when the page does not belong to the component" do
           let!(:page) { create(:page, component: create(:page_component)) }
 
-          it "returns null" do
-            expect(response["page"]).to be_nil
+          it "raises error" do
+            expect { response }.to raise_error(Decidim::Api::Errors::NotFoundError, "Page not found")
           end
         end
       end
diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_processes/content_blocks/democratic_quality_stats_cell.rb b/decidim-participatory_processes/app/cells/decidim/participatory_processes/content_blocks/democratic_quality_stats_cell.rb
index 1d44c4f6bd2b1..c3766e7dc3056 100644
--- a/decidim-participatory_processes/app/cells/decidim/participatory_processes/content_blocks/democratic_quality_stats_cell.rb
+++ b/decidim-participatory_processes/app/cells/decidim/participatory_processes/content_blocks/democratic_quality_stats_cell.rb
@@ -21,7 +21,7 @@ def presenter
         end
 
         def info_url
-          decidim.page_path("democratic-quality-indicators")
+          decidim.page_path("democratic-quality-indicators", locale: I18n.locale)
         end
       end
     end
diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_dropdown_metadata/metadata.erb b/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_dropdown_metadata/metadata.erb
deleted file mode 100644
index 2cfeb1e739b49..0000000000000
--- a/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_dropdown_metadata/metadata.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<h4 class="menu-bar__secondary-dropdown__title"><%= title %></h4>
-<div class="menu-bar__secondary-dropdown__metadata">
-  <% if display_steps? %>
-    <span>
-      <%= icon "direction-line", class: "text-gray fill-current" %>
-
-      <span class="font-semibold"><%= t("layouts.decidim.participatory_processes.participatory_process.active_step") %></span>
-      <%= link_to(
-        step_title,
-        decidim_participatory_processes.participatory_process_path(process, display_steps: true, locale: I18n.locale),
-        class: "text-secondary underline"
-      ) %>
-    </span>
-  <% end %>
-</div>
diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_dropdown_metadata_cell.rb b/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_dropdown_metadata_cell.rb
deleted file mode 100644
index 11040932d40da..0000000000000
--- a/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_dropdown_metadata_cell.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module ParticipatoryProcesses
-    class ProcessDropdownMetadataCell < Decidim::ParticipatorySpaceDropdownMetadataCell
-      include ParticipatoryProcessHelper
-      include Decidim::ComponentPathHelper
-      include ActiveLinkTo
-
-      alias process model
-
-      def decidim_participatory_processes
-        Decidim::ParticipatoryProcesses::Engine.routes.url_helpers
-      end
-
-      private
-
-      def cache_hash
-        hash = []
-        hash << "decidim/process_dropdown_metadata"
-        hash << id
-        hash << current_user.try(:id).to_s
-        hash << nav_items_hashes.join("-")
-        hash << I18n.locale.to_s
-
-        hash.join(Decidim.cache_key_separator)
-      end
-
-      def nav_items_hashes
-        nav_items.map do |item|
-          item[:id]
-        end
-      end
-
-      def step_title
-        decidim_html_escape translated_attribute(process.active_step&.title)
-      end
-
-      def display_steps?
-        process.steps.present?
-      end
-
-      def nav_items_method = :process_nav_items
-    end
-  end
-end
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/create_participatory_process.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/create_participatory_process.rb
index 12f2813fe188d..014ef4e175bb7 100644
--- a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/create_participatory_process.rb
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/create_participatory_process.rb
@@ -10,7 +10,7 @@ class CreateParticipatoryProcess < Decidim::Commands::CreateResource
 
         fetch_form_attributes :organization, :title, :subtitle, :weight, :slug, :description,
                               :short_description, :promoted, :taxonomizations, :announcement,
-                              :private_space, :developer_group, :local_area, :target,
+                              :has_members, :private_space, :developer_group, :local_area, :target,
                               :participatory_scope, :participatory_structure, :meta_scope, :start_date, :end_date,
                               :participatory_process_group
 
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/update_participatory_process.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/update_participatory_process.rb
index 137c27d9f6c29..ad438b628f650 100644
--- a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/update_participatory_process.rb
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/update_participatory_process.rb
@@ -9,7 +9,7 @@ class UpdateParticipatoryProcess < Decidim::Commands::UpdateResource
         fetch_file_attributes :hero_image
 
         fetch_form_attributes :title, :subtitle, :weight, :slug, :promoted,
-                              :taxonomizations, :private_space, :developer_group, :local_area,
+                              :taxonomizations, :has_members, :private_space, :developer_group, :local_area,
                               :target, :participatory_scope, :participatory_structure,
                               :meta_scope, :start_date, :end_date, :participatory_process_group,
                               :announcement
diff --git a/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/members_controller.rb b/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/members_controller.rb
new file mode 100644
index 0000000000000..fd9687fc12690
--- /dev/null
+++ b/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/members_controller.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # Controller that allows managing participatory process members
+      class MembersController < Decidim::Admin::ApplicationController
+        include Concerns::ParticipatoryProcessAdmin
+        include Decidim::Admin::ParticipatorySpace::Concerns::HasMembers
+      end
+    end
+  end
+end
diff --git a/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/members_csv_imports_controller.rb b/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/members_csv_imports_controller.rb
new file mode 100644
index 0000000000000..8959019ac0a27
--- /dev/null
+++ b/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/members_csv_imports_controller.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # Controller that allows importing participatory process members
+      # on participatory processes
+      class MembersCsvImportsController < Decidim::Admin::ApplicationController
+        include Concerns::ParticipatoryProcessAdmin
+        include Decidim::Admin::ParticipatorySpace::Concerns::HasMembersCsvImport
+
+        def after_import_path
+          members_path(current_participatory_process)
+        end
+
+        def participatory_space
+          current_participatory_process
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/participatory_space_private_users_controller.rb b/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/participatory_space_private_users_controller.rb
deleted file mode 100644
index 39c51dc86ed82..0000000000000
--- a/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/participatory_space_private_users_controller.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module ParticipatoryProcesses
-    module Admin
-      # Controller that allows managing participatory process private users
-      class ParticipatorySpacePrivateUsersController < Decidim::Admin::ApplicationController
-        include Concerns::ParticipatoryProcessAdmin
-        include Decidim::Admin::Concerns::HasPrivateUsers
-
-        def after_destroy_path
-          participatory_space_private_users_path(current_participatory_process)
-        end
-
-        def privatable_to
-          current_participatory_process
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/participatory_space_private_users_csv_imports_controller.rb b/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/participatory_space_private_users_csv_imports_controller.rb
deleted file mode 100644
index 872edd4f4daa6..0000000000000
--- a/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/participatory_space_private_users_csv_imports_controller.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module ParticipatoryProcesses
-    module Admin
-      # Controller that allows importing participatory process private users
-      # on participatory processes
-      class ParticipatorySpacePrivateUsersCsvImportsController < Decidim::Admin::ApplicationController
-        include Concerns::ParticipatoryProcessAdmin
-        include Decidim::Admin::Concerns::HasPrivateUsersCsvImport
-
-        def after_import_path
-          participatory_space_private_users_path(current_participatory_process)
-        end
-
-        def privatable_to
-          current_participatory_process
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-participatory_processes/app/controllers/decidim/participatory_processes/participatory_space_private_users_controller.rb b/decidim-participatory_processes/app/controllers/decidim/participatory_processes/members_controller.rb
similarity index 86%
rename from decidim-participatory_processes/app/controllers/decidim/participatory_processes/participatory_space_private_users_controller.rb
rename to decidim-participatory_processes/app/controllers/decidim/participatory_processes/members_controller.rb
index f0d1959a8c7a5..323a528c7e276 100644
--- a/decidim-participatory_processes/app/controllers/decidim/participatory_processes/participatory_space_private_users_controller.rb
+++ b/decidim-participatory_processes/app/controllers/decidim/participatory_processes/members_controller.rb
@@ -2,9 +2,9 @@
 
 module Decidim
   module ParticipatoryProcesses
-    class ParticipatorySpacePrivateUsersController < Decidim::ParticipatoryProcesses::ApplicationController
+    class MembersController < Decidim::ParticipatoryProcesses::ApplicationController
       include ParticipatorySpaceContext
-      include Decidim::HasMembersPage
+      include Decidim::ParticipatorySpace::HasMembersPage
 
       def index
         raise ActionController::RoutingError, "No members for this participatory process" if members.none?
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..ebd0c3df3625b 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
@@ -31,6 +31,7 @@ class ParticipatoryProcessForm < Form
         attribute :related_process_ids, Array[Integer]
         attribute :weight, Integer, default: 0
 
+        attribute :has_members, Boolean
         attribute :private_space, Boolean
         attribute :promoted, Boolean
 
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 23f10e0e20f53..c612f5b041db5 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
@@ -30,6 +30,7 @@ class ParticipatoryProcessImportForm < Form
         attribute :import_components, Boolean, default: true
         attribute :document, Decidim::Attributes::Blob
 
+        validates :document, presence: true
         validates :document, file_content_type: { allow: ACCEPTED_TYPES.values }
         validates :slug, presence: true, format: { with: Decidim::ParticipatoryProcess.slug_format }
         validates :title, translatable_presence: true
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 bc23bfd2131a1..7843686b88886 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
@@ -57,8 +57,8 @@ def process_nav_items(participatory_space)
           *(if participatory_space.members_public_page?
               [{
                 name: t("member_menu_item", scope: "layouts.decidim.participatory_process_navigation"),
-                url: decidim_participatory_processes.participatory_process_participatory_space_private_users_path(participatory_space),
-                active: is_active_link?(decidim_participatory_processes.participatory_process_participatory_space_private_users_path(participatory_space), :inclusive)
+                url: decidim_participatory_processes.participatory_process_members_path(participatory_space, locale: current_locale),
+                active: is_active_link?(decidim_participatory_processes.participatory_process_members_path(participatory_space, locale: current_locale), :inclusive)
               }]
             end
            )
diff --git a/decidim-participatory_processes/app/models/decidim/participatory_process.rb b/decidim-participatory_processes/app/models/decidim/participatory_process.rb
index 442fc4e4a4cbe..a25f3100f0453 100644
--- a/decidim-participatory_processes/app/models/decidim/participatory_process.rb
+++ b/decidim-participatory_processes/app/models/decidim/participatory_process.rb
@@ -16,7 +16,7 @@ class ParticipatoryProcess < ApplicationRecord
     include Decidim::Followable
     include Decidim::HasReference
     include Decidim::Traceable
-    include Decidim::HasPrivateUsers
+    include Decidim::ParticipatorySpace::HasMembers
     include Decidim::Loggable
     include Decidim::ParticipatorySpaceResourceable
     include Decidim::Searchable
@@ -216,7 +216,7 @@ def self.ransackable_attributes(auth_object = nil)
       base = %w(title short_description description id)
       return base unless auth_object&.admin?
 
-      base + %w(private_space published_at decidim_participatory_process_group_id)
+      base + %w(private_space published_at created_at decidim_participatory_process_group_id)
     end
 
     def self.ransackable_associations(_auth_object = nil)
diff --git a/decidim-participatory_processes/app/models/decidim/participatory_process_step.rb b/decidim-participatory_processes/app/models/decidim/participatory_process_step.rb
index a7d1751a92bf8..86d62af8356d0 100644
--- a/decidim-participatory_processes/app/models/decidim/participatory_process_step.rb
+++ b/decidim-participatory_processes/app/models/decidim/participatory_process_step.rb
@@ -9,9 +9,11 @@ class ParticipatoryProcessStep < ApplicationRecord
     include Traceable
     include Loggable
 
+    delegate :can_participate?, to: :participatory_process
+
     translatable_fields :title, :description
 
-    belongs_to :participatory_process, foreign_key: "decidim_participatory_process_id", class_name: "Decidim::ParticipatoryProcess"
+    belongs_to :participatory_process, foreign_key: "decidim_participatory_process_id", class_name: "Decidim::ParticipatoryProcess", touch: true
     has_one :organization, through: :participatory_process
 
     alias participatory_space participatory_process
diff --git a/decidim-participatory_processes/app/permissions/decidim/participatory_processes/permissions.rb b/decidim-participatory_processes/app/permissions/decidim/participatory_processes/permissions.rb
index 4dd6f8691b90b..858235a7dc3af 100644
--- a/decidim-participatory_processes/app/permissions/decidim/participatory_processes/permissions.rb
+++ b/decidim-participatory_processes/app/permissions/decidim/participatory_processes/permissions.rb
@@ -43,7 +43,7 @@ def permissions
 
         return permission_action unless process
 
-        user_can_read_private_users?
+        user_can_read_members?
 
         moderator_action?
         collaborator_action?
@@ -54,9 +54,9 @@ def permissions
 
       private
 
-      def user_can_read_private_users?
-        return unless permission_action.subject == :space_private_user
-        return unless process.private_space?
+      def user_can_read_members?
+        return unless permission_action.subject == :space_member
+        return unless process.has_members?
 
         toggle_allow(user.admin? || can_manage_process?(role: :admin) || can_manage_process?(role: :collaborator))
       end
@@ -212,7 +212,7 @@ def moderator_action?
       # Collaborators can only preview their own processes.
       def collaborator_action?
         return unless can_manage_process?(role: :collaborator)
-        return if permission_action.subject == :space_private_user
+        return if permission_action.subject == :space_member
 
         allow! if permission_action.action == :preview
       end
diff --git a/decidim-participatory_processes/app/presenters/decidim/participatory_processes/admin_log/participatory_process_presenter.rb b/decidim-participatory_processes/app/presenters/decidim/participatory_processes/admin_log/participatory_process_presenter.rb
index 7b86278acd7c8..02a9a870d4adc 100644
--- a/decidim-participatory_processes/app/presenters/decidim/participatory_processes/admin_log/participatory_process_presenter.rb
+++ b/decidim-participatory_processes/app/presenters/decidim/participatory_processes/admin_log/participatory_process_presenter.rb
@@ -35,9 +35,20 @@ def diff_fields_mapping
           }
         end
 
+        # i18n-tasks-use t("decidim.admin_log.participatory_process.create")
+        # i18n-tasks-use t("decidim.admin_log.participatory_process.publish")
+        # i18n-tasks-use t("decidim.admin_log.participatory_process.unpublish")
+        # i18n-tasks-use t("decidim.admin_log.participatory_process.update")
+        # i18n-tasks-use t("decidim.admin_log.participatory_process.import")
+        # i18n-tasks-use t("decidim.admin_log.participatory_process.export")
+        # i18n-tasks-use t("decidim.admin_log.participatory_process.duplicate")
+        # i18n-tasks-use t("decidim.admin_log.participatory_process.soft_delete")
+        # i18n-tasks-use t("decidim.admin_log.participatory_process.restore")
+        # i18n-tasks-use t("decidim.admin_log.participatory_process.publish_all_members")
+        # i18n-tasks-use t("decidim.admin_log.participatory_process.unpublish_all_members")
         def action_string
           case action
-          when "create", "publish", "unpublish", "update", "import", "export", "duplicate", "soft_delete", "restore"
+          when "create", "publish", "unpublish", "update", "import", "export", "duplicate", "soft_delete", "restore", "publish_all_members", "unpublish_all_members"
             "decidim.admin_log.participatory_process.#{action}"
           else
             super
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_imports/_form.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_imports/_form.html.erb
index f361ad50f6498..810bf210115bc 100644
--- a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_imports/_form.html.erb
+++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_imports/_form.html.erb
@@ -1,8 +1,12 @@
 <div class="form__wrapper">
   <div class="card pt-4" id="processes">
     <div class="card-section">
+      <div class="row column mb-4">
+        <%= cell("decidim/announcement", { body: t("decidim.participatory_processes.admin.new_import.help_html") }, callout_class: "info") %>
+      </div>
+
       <div class="row column">
-        <%= form.translated :text_field, :title, autofocus: true %>
+        <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
       </div>
 
       <div class="row column">
@@ -10,7 +14,7 @@
       </div>
 
       <div class="row column">
-        <%= form.upload :document, required: true, label: t(".document_legend"), button_class: "button button__sm button__transparent-secondary" %>
+        <%= form.upload :document, label: t(".document_legend"), button_class: "button button__sm button__transparent-secondary", help_i18n_scope: "decidim.forms.file_help.import_file", help_i18n_messages: ["message_1"] %>
       </div>
 
       <div class="card-divider">
@@ -32,7 +36,6 @@
         </div>
       </div>
 
-      </div>
     </div>
   </div>
 </div>
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_processes/_form.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_processes/_form.html.erb
index 9842e56191210..730ea78f2c2bf 100644
--- a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_processes/_form.html.erb
+++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_processes/_form.html.erb
@@ -167,6 +167,10 @@
         <% end %>
       </div>
 
+      <div class="row column" id="has_members">
+        <%= form.check_box :has_members, help_text: t(".has_members_help") %>
+      </div>
+
       <div class="row column">
         <%= form.check_box :private_space %>
         <p class="help-text"><%= t(".private_notice") %></p>
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_space_private_users/index.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/members/index.html.erb
similarity index 84%
rename from decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_space_private_users/index.html.erb
rename to decidim-participatory_processes/app/views/decidim/participatory_processes/members/index.html.erb
index 9fe5846bc5b97..3f3d8461c4f56 100644
--- a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_space_private_users/index.html.erb
+++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/members/index.html.erb
@@ -4,7 +4,7 @@
      resource: current_participatory_space) %>
 <%
 edit_link(
-  decidim_admin_participatory_processes.participatory_space_private_users_path(current_participatory_space.slug),
+  decidim_admin_participatory_processes.members_path(current_participatory_space.slug),
   :update,
   :process,
   process: current_participatory_space
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 fc7df00685eb6..fb0b5987bfec6 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
@@ -38,6 +38,6 @@
   </div>
 
   <section class="participatory-space__block-reference">
-    <%= resource_reference(current_participatory_space) %>
+    <p><%= resource_reference(current_participatory_space) %></p>
   </section>
 </main>
diff --git a/decidim-participatory_processes/config/locales/ca-IT.yml b/decidim-participatory_processes/config/locales/ca-IT.yml
index 797553ae705aa..9152f19aad487 100644
--- a/decidim-participatory_processes/config/locales/ca-IT.yml
+++ b/decidim-participatory_processes/config/locales/ca-IT.yml
@@ -14,6 +14,7 @@ ca-IT:
         duplicate_landing_page_blocks: Duplicar els blocs de contingut de la pàgina d'inici
         duplicate_steps: Duplicar les fases
         end_date: Data de finalització
+        has_members: Aquest espai de participació té membres
         hero_image: Imatge de portada
         import_attachments: Importar arxius adjunts
         import_categories: Importar categories
@@ -115,8 +116,8 @@ ca-IT:
           components: Components
           info: Quant a aquest procés
           landing_page: Disposició de la pàgina de destinació
+          members:
           moderations: Moderacions
-          private_users: Membres
           process_admins: Administradores del procés
           steps: Fases del procés
       models:
@@ -282,9 +283,11 @@ ca-IT:
         export: "%{user_name} ha exportat el procés participatiu %{resource_name}"
         import: "%{user_name} ha importat el procés participatiu %{resource_name}"
         publish: "%{user_name} ha publicat el procés participatiu %{resource_name}"
+        publish_all_members: "%{user_name} va publicar a totes les membres del procés participatiu %{resource_name}"
         restore: "%{user_name} ha restaurat el procés participatiu \"%{resource_name}\""
         soft_delete: "%{user_name} ha enviat a la paperera el procés participatiu \"%{resource_name}\""
         unpublish: "%{user_name} ha despublicat el procés participatiu %{resource_name}"
+        unpublish_all_members: "%{user_name} va despublicar a totes les membres del procés participatiu %{resource_name}"
         update: "%{user_name} ha actualitzat el procés participatiu %{resource_name}"
       participatory_process_group:
         create: "%{user_name} ha creat el grup de processos participatius %{resource_name}"
@@ -506,10 +509,11 @@ ca-IT:
             announcement_help: El text que introdueixis aquí es mostrarà a la participant just a sota de la informació del procés.
             define_taxonomy_filters: Si us plau, defineix algunes filtres per aquest espai de participació abans de fer servir aquesta configuració.
             duration: Durada
+            has_members_help: Podràs crear i publicar membres
             images: Imatges
             metadata: Metadades
             no_taxonomy_filters_found: No s'han trobat filtres de taxonomia.
-            private_notice: Podràs administrar les membres un cop haguis configurar l'espai com a privat
+            private_notice: Fa que l'espai de participació no sigui visible per a les visitants i només ho sigui per a les usuàries membre (a no ser que també sigui transparent)
             related_processes: Processos relacionats
             select_process_group: Selecciona un grup de processos
             slug_help_html: 'Els noms curts d''URL s''utilitzen per generar les URL que apunten a aquest procés. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
@@ -558,6 +562,9 @@ ca-IT:
         title: Processos participatius
       last_activity:
         new_participatory_process: 'Nou procés participatiu:'
+      members:
+        index:
+          title: Membres
       pages:
         home:
           highlighted_processes:
@@ -604,9 +611,6 @@ ca-IT:
           type: Tipus
         show:
           title: Quant a aquest procés
-      participatory_space_private_users:
-        index:
-          title: Membres
       show:
         belongs_to_group: Aquest procés pertany a
         private_space: Aquest és un procés privat
diff --git a/decidim-participatory_processes/config/locales/ca.yml b/decidim-participatory_processes/config/locales/ca.yml
index 59080cb0b33d5..43b845b1a7a18 100644
--- a/decidim-participatory_processes/config/locales/ca.yml
+++ b/decidim-participatory_processes/config/locales/ca.yml
@@ -14,6 +14,7 @@ ca:
         duplicate_landing_page_blocks: Duplicar els blocs de contingut de la pàgina d'inici
         duplicate_steps: Duplicar les fases
         end_date: Data de finalització
+        has_members: Aquest espai de participació té membres
         hero_image: Imatge de portada
         import_attachments: Importar arxius adjunts
         import_categories: Importar categories
@@ -115,8 +116,8 @@ ca:
           components: Components
           info: Quant a aquest procés
           landing_page: Disposició de la pàgina de destinació
+          members:
           moderations: Moderacions
-          private_users: Membres
           process_admins: Administradores del procés
           steps: Fases del procés
       models:
@@ -282,9 +283,11 @@ ca:
         export: "%{user_name} ha exportat el procés participatiu %{resource_name}"
         import: "%{user_name} ha importat el procés participatiu %{resource_name}"
         publish: "%{user_name} ha publicat el procés participatiu %{resource_name}"
+        publish_all_members: "%{user_name} va publicar a totes les membres del procés participatiu %{resource_name}"
         restore: "%{user_name} ha restaurat el procés participatiu \"%{resource_name}\""
         soft_delete: "%{user_name} ha enviat a la paperera el procés participatiu \"%{resource_name}\""
         unpublish: "%{user_name} ha despublicat el procés participatiu %{resource_name}"
+        unpublish_all_members: "%{user_name} va despublicar a totes les membres del procés participatiu %{resource_name}"
         update: "%{user_name} ha actualitzat el procés participatiu %{resource_name}"
       participatory_process_group:
         create: "%{user_name} ha creat el grup de processos participatius %{resource_name}"
@@ -506,10 +509,11 @@ ca:
             announcement_help: El text que introdueixis aquí es mostrarà a la participant just a sota de la informació del procés.
             define_taxonomy_filters: Si us plau, defineix algunes filtres per aquest espai de participació abans de fer servir aquesta configuració.
             duration: Durada
+            has_members_help: Podràs crear i publicar membres
             images: Imatges
             metadata: Metadades
             no_taxonomy_filters_found: No s'han trobat filtres de taxonomia.
-            private_notice: Podràs administrar les membres un cop haguis configurar l'espai com a privat
+            private_notice: Fa que l'espai de participació no sigui visible per a les visitants i només ho sigui per a les usuàries membre (a no ser que també sigui transparent)
             related_processes: Processos relacionats
             select_process_group: Selecciona un grup de processos
             slug_help_html: 'Els noms curts d''URL s''utilitzen per generar les URL que apunten a aquest procés. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
@@ -558,6 +562,9 @@ ca:
         title: Processos participatius
       last_activity:
         new_participatory_process: 'Nou procés participatiu:'
+      members:
+        index:
+          title: Membres
       pages:
         home:
           highlighted_processes:
@@ -604,9 +611,6 @@ ca:
           type: Tipus
         show:
           title: Quant a aquest procés
-      participatory_space_private_users:
-        index:
-          title: Membres
       show:
         belongs_to_group: Aquest procés pertany a
         private_space: Aquest és un procés privat
diff --git a/decidim-participatory_processes/config/locales/cs.yml b/decidim-participatory_processes/config/locales/cs.yml
index ee13232b482b6..3881c98ea087e 100644
--- a/decidim-participatory_processes/config/locales/cs.yml
+++ b/decidim-participatory_processes/config/locales/cs.yml
@@ -121,8 +121,8 @@ cs:
           components: Komponenty
           info: O tomto procesu
           landing_page: Rozložení vstupní strany
+          members: Členové
           moderations: Moderování
-          private_users: Členové
           process_admins: Administrátoři procesu
           steps: Kroky
       models:
@@ -514,7 +514,6 @@ cs:
             images: Obrázky
             metadata: Metadata
             no_taxonomy_filters_found: Nebyly nalezeny žádné filtry taxonomie.
-            private_notice: Po nastavení jako soukromé budete moci spravovat členy
             related_processes: Související procesy
             select_process_group: Vyberte skupinu procesů
             slug_help_html: 'URL slugy slouží ke generaci adres URL, které odkazují na tento proces. Povolená jsou pouze písmena, číslice a pomlčky a musí začínat písmenem. Příklad: %{url}'
@@ -561,6 +560,9 @@ cs:
         title: Participativní procesy
       last_activity:
         new_participatory_process: 'Nový participační proces:'
+      members:
+        index:
+          title: Členové
       pages:
         home:
           highlighted_processes:
@@ -615,9 +617,6 @@ cs:
           type: Typ
         show:
           title: O tomto procesu
-      participatory_space_private_users:
-        index:
-          title: Členové
       show:
         belongs_to_group: Tento proces patří do
         private_space: Jedná se o soukromý proces
diff --git a/decidim-participatory_processes/config/locales/de.yml b/decidim-participatory_processes/config/locales/de.yml
index c247fcc78ad44..4438df16da072 100644
--- a/decidim-participatory_processes/config/locales/de.yml
+++ b/decidim-participatory_processes/config/locales/de.yml
@@ -14,6 +14,7 @@ de:
         duplicate_landing_page_blocks: Startseiten-Blöcke duplizieren
         duplicate_steps: Schritte duplizieren
         end_date: Enddatum
+        has_members: Dieser Bereich hat Mitglieder
         hero_image: Hauptbild
         import_attachments: Anhänge importieren
         import_categories: Kategorien importieren
@@ -115,8 +116,8 @@ de:
           components: Komponenten
           info: Über diesen Prozess
           landing_page: Startseiten-Layout
+          members: Mitglieder
           moderations: Moderationen
-          private_users: Mitglieder
           process_admins: Benutzer verarbeiten
           steps: Schritte
       models:
@@ -282,9 +283,11 @@ de:
         export: "%{user_name} hat den Beteiligungsprozess %{resource_name} exportiert"
         import: "%{user_name} hat den Beteiligungsprozess %{resource_name} importiert"
         publish: "%{user_name} hat den Partizipationsprozess %{resource_name} veröffentlicht"
+        publish_all_members: "%{user_name} hat alle Mitglieder des Partizipationsprozesses %{resource_name} veröffentlicht"
         restore: "%{user_name} hat den Beteiligungsprozess %{resource_name} wiederhergestellt"
         soft_delete: "%{user_name} hat den Beteiligungsprozess %{resource_name} in den Papierkorb verschoben"
         unpublish: "%{user_name} hat den Partizipationsprozess %{resource_name} auf \"unveröffentlicht\" gesetzt"
+        unpublish_all_members: "%{user_name} hat die Veräffentlichung aller Mitglieder des Partizipationsprozesses %{resource_name} aufgehoben"
         update: "%{user_name} hat den Partizipationsprozess %{resource_name} aktualisiert"
       participatory_process_group:
         create: "%{user_name} hat die Partizipationsprozess-Gruppe %{resource_name} erstellt"
@@ -340,6 +343,7 @@ de:
         participatory_processes:
           announcement: Die Ankündigungsinformationen (Banner)
           area: Der Bereich, in dem der Prozess stattfindet,
+          component_settings: Die Komponenteneinstellungen des Prozesses
           created_at: Erstellungsdatum dieses Bereichs
           description: Eine ausführliche Beschreibung des Prozesses
           developer_group: Die Entwicklergruppe des Prozesses. Dies ist die Organisation, die den Prozess fördert.
@@ -505,10 +509,11 @@ de:
             announcement_help: Der Text, den Sie hier eingeben, wird dem Benutzer direkt unter den Prozessinformationen angezeigt.
             define_taxonomy_filters: Bitte definieren Sie einige Filter für diesen partizipativen Bereich, bevor Sie diese Einstellung verwenden.
             duration: Dauer
+            has_members_help: Sie können Mitglieder erstellen und veröffentlichen
             images: Bilder
             metadata: Metadaten
             no_taxonomy_filters_found: Keine Klassifizierungsfilter gefunden.
-            private_notice: Sie können private Teilnehmende verwalten, nachdem Sie das Gremium als "privat" festgelegt haben
+            private_notice: Macht den Raum unsichtbar für externe Besuchende und zugänglich nur für Mitglieder – außer wenn er gleichzeitig transparent ist
             related_processes: Ähnliche Beteiligungsprozesse
             select_process_group: Wählen Sie eine Prozessgruppe aus
             slug_help_html: 'URL-Slugs werden zum Generieren der URLs verwendet, die auf diesen Prozess verweisen. Akzeptiert werden nur Buchstaben, Zahlen und Bindestriche und es muss mit einem Buchstaben beginnen. Beispiel: %{url}'
@@ -557,6 +562,9 @@ de:
         title: Beteiligungsprozesse
       last_activity:
         new_participatory_process: 'Neuer Beteiligungsprozess:'
+      members:
+        index:
+          title: Mitglieder
       pages:
         home:
           highlighted_processes:
@@ -603,9 +611,6 @@ de:
           type: Typ
         show:
           title: Über diesen Prozess
-      participatory_space_private_users:
-        index:
-          title: Mitglieder
       show:
         belongs_to_group: Dieser Prozess gehört zu
         private_space: Dies ist ein privater Prozess
diff --git a/decidim-participatory_processes/config/locales/en.yml b/decidim-participatory_processes/config/locales/en.yml
index 5755e225b94b6..797e363d9ce9a 100644
--- a/decidim-participatory_processes/config/locales/en.yml
+++ b/decidim-participatory_processes/config/locales/en.yml
@@ -15,6 +15,7 @@ en:
         duplicate_landing_page_blocks: Duplicate landing page blocks
         duplicate_steps: Duplicate steps
         end_date: End date
+        has_members: This space has members
         hero_image: Home image
         import_attachments: Import attachments
         import_categories: Import categories
@@ -116,8 +117,8 @@ en:
           components: Components
           info: About this process
           landing_page: Landing page layout
+          members: Members
           moderations: Moderations
-          private_users: Members
           process_admins: Process admins
           steps: Phases
       models:
@@ -283,9 +284,11 @@ en:
         export: "%{user_name} exported the %{resource_name} participatory process"
         import: "%{user_name} imported the %{resource_name} participatory process"
         publish: "%{user_name} published the %{resource_name} participatory process"
+        publish_all_members: "%{user_name} published all members of the %{resource_name} participatory process"
         restore: "%{user_name} restored the %{resource_name} participatory process"
         soft_delete: "%{user_name} trashed the %{resource_name} participatory process"
         unpublish: "%{user_name} unpublished the %{resource_name} participatory process"
+        unpublish_all_members: "%{user_name} unpublished all members of the %{resource_name} participatory process"
         update: "%{user_name} updated the %{resource_name} participatory process"
       participatory_process_group:
         create: "%{user_name} created the %{resource_name} participatory process group"
@@ -490,6 +493,7 @@ en:
         new_import:
           accepted_types:
             json: JSON
+          help_html: This import feature allows you to create a new participatory process from an exported JSON file. You can export a process from another organization or from this same organization. The imported process will include its settings, components, and attachments (if selected).
         participatory_process_duplicates:
           form:
             slug_help_html: 'URL slugs are used to generate the URLs that point to this process. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
@@ -507,10 +511,11 @@ en:
             announcement_help: The text you enter here will be shown to the user right below the process information.
             define_taxonomy_filters: Please define some filters for this participatory space before using this setting.
             duration: Duration
+            has_members_help: You will be able to create and publish members
             images: Images
             metadata: Metadata
             no_taxonomy_filters_found: No taxonomy filters found.
-            private_notice: You will be able to manage members after setting it as private
+            private_notice: Makes the space not visible for visitors and only for members (except if it is also transparent)
             related_processes: Related processes
             select_process_group: Select a process group
             slug_help_html: 'URL slugs are used to generate the URLs that point to this process. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
@@ -559,6 +564,9 @@ en:
         title: Participatory processes
       last_activity:
         new_participatory_process: 'New participatory process:'
+      members:
+        index:
+          title: Members
       pages:
         home:
           highlighted_processes:
@@ -605,9 +613,6 @@ en:
           type: Type
         show:
           title: About this process
-      participatory_space_private_users:
-        index:
-          title: Members
       show:
         belongs_to_group: This process belongs to
         private_space: This is a private process
diff --git a/decidim-participatory_processes/config/locales/es-MX.yml b/decidim-participatory_processes/config/locales/es-MX.yml
index 6b20aeaf01684..9b69ccde6e504 100644
--- a/decidim-participatory_processes/config/locales/es-MX.yml
+++ b/decidim-participatory_processes/config/locales/es-MX.yml
@@ -14,6 +14,7 @@ es-MX:
         duplicate_landing_page_blocks: Duplicar los bloques de contenido de la página de inicio
         duplicate_steps: Duplicar las fases
         end_date: Fecha de finalización
+        has_members: Este espacio de participación tiene miembros
         hero_image: Imagen de portada
         import_attachments: Importar archivos adjuntos
         import_categories: Importar categorias
@@ -115,8 +116,8 @@ es-MX:
           components: Componentes
           info: Acerca de este proceso
           landing_page: Disposición de la página de aterrizaje
+          members: Miembros
           moderations: Moderaciones
-          private_users: Miembros
           process_admins: Usuarios del proceso
           steps: Fases del proceso
       models:
@@ -282,9 +283,11 @@ es-MX:
         export: "%{user_name} exportó el proceso participativo %{resource_name}"
         import: "%{user_name} importó el proceso participativo %{resource_name}"
         publish: "%{user_name} publicó el proceso participativo %{resource_name}"
+        publish_all_members: "%{user_name} publicó todas las miembros del proceso participativo %{resource_name}"
         restore: "%{user_name} restauró el proceso participativo \"%{resource_name}\""
         soft_delete: "%{user_name} ha enviado a la papelera el proceso participativo \"%{resource_name}\""
         unpublish: "%{user_name} despublicó el proceso participativo %{resource_name}"
+        unpublish_all_members: "%{user_name} despublicó a todas las miembros del proceso participativo %{resource_name}"
         update: "%{user_name} actualizó el proceso participativo %{resource_name}"
       participatory_process_group:
         create: "%{user_name} creó el grupo de procesos participativos de %{resource_name}"
@@ -506,10 +509,11 @@ es-MX:
             announcement_help: El texto que ingreses aquí se mostrará al usuario justo debajo de la información del proceso.
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
             duration: Duración
+            has_members_help: Podrás crear y publicar miembros
             images: Imágenes
             metadata: Metadatos
             no_taxonomy_filters_found: No se han encontrado filtros de taxonomía.
-            private_notice: Podrás administrar las miembros después de configurar el espacio como privado
+            private_notice: Hace que el espacio de participación no sea visible para las visitantes y sólo lo sea para las usuarias miembro (excepto si también es transparente)
             related_processes: Procesos relacionados
             select_process_group: Seleccione un grupo de proceso
             slug_help_html: 'Los nombres cortos de URL se utilizan para generar las URL que apuntan a esta votación. Sólo acepta letras, números y guiones, y debe comenzar con una letra. Ejemplo: %{url}'
@@ -558,6 +562,9 @@ es-MX:
         title: Procesos participativos
       last_activity:
         new_participatory_process: 'Nuevo proceso participativo:'
+      members:
+        index:
+          title: Miembros
       pages:
         home:
           highlighted_processes:
@@ -604,9 +611,6 @@ es-MX:
           type: Tipo
         show:
           title: Acerca de este proceso
-      participatory_space_private_users:
-        index:
-          title: Miembros
       show:
         belongs_to_group: Este proceso pertenece a
         private_space: Este es un proceso privado
diff --git a/decidim-participatory_processes/config/locales/es-PY.yml b/decidim-participatory_processes/config/locales/es-PY.yml
index 2d89e8d262bb1..ea9bde2f86588 100644
--- a/decidim-participatory_processes/config/locales/es-PY.yml
+++ b/decidim-participatory_processes/config/locales/es-PY.yml
@@ -14,6 +14,7 @@ es-PY:
         duplicate_landing_page_blocks: Duplicar los bloques de contenido de la página de inicio
         duplicate_steps: Duplicar las fases
         end_date: Fecha de finalización
+        has_members: Este espacio de participación tiene miembros
         hero_image: Imagen de portada
         import_attachments: Importar archivos adjuntos
         import_categories: Importar categorias
@@ -115,8 +116,8 @@ es-PY:
           components: Componentes
           info: Acerca de este proceso
           landing_page: Disposición de la página de aterrizaje
+          members: Miembros
           moderations: Moderaciones
-          private_users: Miembros
           process_admins: Usuarios del proceso
           steps: Fases del proceso
       models:
@@ -282,9 +283,11 @@ es-PY:
         export: "%{user_name} ha exportado el proceso participativo %{resource_name}"
         import: "%{user_name} ha importado el proceso participativo %{resource_name}"
         publish: "%{user_name} publicó el proceso participativo %{resource_name}"
+        publish_all_members: "%{user_name} publicó todas las miembros del proceso participativo %{resource_name}"
         restore: "%{user_name} restauró el proceso participativo \"%{resource_name}\""
         soft_delete: "%{user_name} ha enviado a la papelera el proceso participativo \"%{resource_name}\""
         unpublish: "%{user_name} despublicó el proceso participativo %{resource_name}"
+        unpublish_all_members: "%{user_name} despublicó a todas las miembros del proceso participativo %{resource_name}"
         update: "%{user_name} actualizó el proceso participativo %{resource_name}"
       participatory_process_group:
         create: "%{user_name} creó el grupo de procesos participativos de %{resource_name}"
@@ -506,10 +509,11 @@ es-PY:
             announcement_help: El texto que ingreses aquí se mostrará al usuario justo debajo de la información del proceso.
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
             duration: Duración
+            has_members_help: Podrás crear y publicar miembros
             images: Imágenes
             metadata: Metadatos
             no_taxonomy_filters_found: No se han encontrado filtros de taxonomía.
-            private_notice: Podrás administrar las miembros después de configurar el espacio como privado
+            private_notice: Hace que el espacio de participación no sea visible para las visitantes y sólo lo sea para las usuarias miembro (excepto si también es transparente)
             related_processes: Procesos relacionados
             select_process_group: Seleccione un grupo de proceso
             slug_help_html: 'Los nombres cortos de URL se utilizan para generar las URL que apuntan a esta votación. Sólo acepta letras, números y guiones, y debe comenzar con una letra. Ejemplo: %{url}'
@@ -558,6 +562,9 @@ es-PY:
         title: Procesos participativos
       last_activity:
         new_participatory_process: 'Nuevo proceso participativo:'
+      members:
+        index:
+          title: Miembros
       pages:
         home:
           highlighted_processes:
@@ -604,9 +611,6 @@ es-PY:
           type: Tipo
         show:
           title: Acerca de este proceso
-      participatory_space_private_users:
-        index:
-          title: Miembros
       show:
         belongs_to_group: Este proceso pertenece a
         private_space: Este es un proceso privado
diff --git a/decidim-participatory_processes/config/locales/es.yml b/decidim-participatory_processes/config/locales/es.yml
index 0c5ab70e90ed0..537c7ac57d86e 100644
--- a/decidim-participatory_processes/config/locales/es.yml
+++ b/decidim-participatory_processes/config/locales/es.yml
@@ -14,6 +14,7 @@ es:
         duplicate_landing_page_blocks: Duplicar los bloques de contenido de la página de inicio
         duplicate_steps: Duplicar las fases
         end_date: Fecha de finalización
+        has_members: Este espacio de participación tiene miembros
         hero_image: Imagen de portada
         import_attachments: Importar archivos adjuntos
         import_categories: Importar categorias
@@ -115,8 +116,8 @@ es:
           components: Componentes
           info: Acerca de este proceso
           landing_page: Disposición de la página de aterrizaje
+          members: Miembros
           moderations: Moderaciones
-          private_users: Miembros
           process_admins: Administradoras del proceso
           steps: Fases del proceso
       models:
@@ -282,9 +283,11 @@ es:
         export: "%{user_name} ha exportado el proceso participativo %{resource_name}"
         import: "%{user_name} ha importado el proceso participativo %{resource_name}"
         publish: "%{user_name} publicó el proceso participativo %{resource_name}"
+        publish_all_members: "%{user_name} publicó todas las miembros del proceso participativo %{resource_name}"
         restore: "%{user_name} restauró el proceso participativo \"%{resource_name}\""
         soft_delete: "%{user_name} ha enviado a la papelera el proceso participativo \"%{resource_name}\""
         unpublish: "%{user_name} despublicó el proceso participativo %{resource_name}"
+        unpublish_all_members: "%{user_name} despublicó a todas las miembros del proceso participativo %{resource_name}"
         update: "%{user_name} actualizó el proceso participativo %{resource_name}"
       participatory_process_group:
         create: "%{user_name} creó el grupo de procesos participativos de %{resource_name}"
@@ -506,10 +509,11 @@ es:
             announcement_help: El texto que ingreses aquí se mostrará a la participante justo debajo de la información del proceso.
             define_taxonomy_filters: Por favor, define algunos filtros para este espacio de participación antes de utilizar esta configuración.
             duration: Duración
+            has_members_help: Podrás crear y publicar miembros
             images: Imágenes
             metadata: Metadatos
             no_taxonomy_filters_found: No se han encontrado filtros de taxonomía.
-            private_notice: Podrás administrar las miembros después de configurar el espacio como privado
+            private_notice: Hace que el espacio de participación no sea visible para las visitantes y sólo lo sea para las usuarias miembro (excepto si también es transparente)
             related_processes: Procesos relacionados
             select_process_group: Selecciona un grupo de procesos
             slug_help_html: 'Los nombres cortos de URL se utilizan para generar las URL que apuntan a esta votación. Sólo acepta letras, números y guiones, y debe comenzar con una letra. Ejemplo: %{url}'
@@ -558,6 +562,9 @@ es:
         title: Procesos participativos
       last_activity:
         new_participatory_process: 'Nuevo proceso participativo:'
+      members:
+        index:
+          title: Miembros
       pages:
         home:
           highlighted_processes:
@@ -604,9 +611,6 @@ es:
           type: Tipo
         show:
           title: Acerca de este proceso
-      participatory_space_private_users:
-        index:
-          title: Miembros
       show:
         belongs_to_group: Este proceso pertenece a
         private_space: Este es un proceso privado
diff --git a/decidim-participatory_processes/config/locales/eu.yml b/decidim-participatory_processes/config/locales/eu.yml
index a30b0262c3254..d4faefe06d465 100644
--- a/decidim-participatory_processes/config/locales/eu.yml
+++ b/decidim-participatory_processes/config/locales/eu.yml
@@ -14,6 +14,7 @@ eu:
         duplicate_landing_page_blocks: Bikoiztu lurreratze-orrien blokeak
         duplicate_steps: Bikoiztu urratsak
         end_date: Bukaera-data
+        has_members: Partaidetza-espazio honek kideak ditu
         hero_image: Orri nagusiko irudia
         import_attachments: Inportatu eranskinak
         import_categories: Inportatu kategoriak
@@ -66,7 +67,7 @@ eu:
             document:
               allowed_file_content_types: 'Dokumentu mota hau ez da onartzen. Honako hauek onartzen dira: %{types}'
     models:
-      decidim/participatory_process_step_activated_event: Urratsera aktibatuta
+      decidim/participatory_process_step_activated_event: Fasea aktibatuta
       decidim/participatory_process_step_changed_event: Pasartea aldatu da
   activerecord:
     models:
@@ -78,7 +79,7 @@ eu:
         other: Partaidetza-prozesuen taldeak
       decidim/participatory_process_step:
         one: Step
-        other: Urratsak
+        other: Faseak
   decidim:
     admin:
       actions:
@@ -115,8 +116,8 @@ eu:
           components: Osagaiak
           info: Prozesu honi buruz
           landing_page: Lurreratze-orrien antolaketa
+          members: Kideak
           moderations: Moderazioak
-          private_users: Kideak
           process_admins: Prozesuaren parte-hartzaileak
           steps: Prozesuaren faseak
       models:
@@ -282,9 +283,11 @@ eu:
         export: "%{user_name} parte-hartzaileak esportatu du %{resource_name} partaidetza-prozesua"
         import: "%{user_name} parte-hartzaileak inportatu du %{resource_name} partaidetza-prozesua"
         publish: "%{user_name} parte-hartzaileak argitaratu du %{resource_name} partaidetza-prozesua"
+        publish_all_members: "%{user_name} parte-hartzaileak %{resource_name} partaidetza-prozesuko kide guztiak argitaratu ditu"
         restore: "%{user_name} parte-hartzaileak berreskuratu du %{resource_name} partaidetza-prozesua"
         soft_delete: "%{user_name} parte-hartzaileak zaborrontzira eraman du %{resource_name} partaidetza-prozesua"
         unpublish: "%{user_name} parte-hartzaileak despublikatu du %{resource_name} partaidetza-prozesua"
+        unpublish_all_members: "%{user_name} parte-hartzaileak %{resource_name} partaidetza-prozesuko kide guztiak desargitaratu ditu"
         update: "%{user_name} parte-hartzaileak %{resource_name} partaidetza-prozesua eguneratu du"
       participatory_process_group:
         create: "%{user_name} parte-hartzaileak sortu du %{resource_name} partaidetza-prozesuen multzoa"
@@ -310,7 +313,7 @@ eu:
       participatory_process:
         role_assigned:
           email_intro: '%{role} rola esleitu zaizu <a href="%{resource_title}"> partaidetza-prozesuan.'
-          email_outro: Jakinarazpen hau jaso duzu %{role} rola esleitu zaizu "%{resource_title}" espazioan.
+          email_outro: Jakinarazpen hau jaso duzu %{role} rola esleitu zaizulako "%{resource_title}" espazioan.
           email_subject: '%{role} rola esleitu zaizu hemen "%{resource_title}".'
           notification_title: '%{role} rola esleitu zaizu <a href="%{resource_url}">%{resource_title}</a> partaidetza-prozesuan.'
         step_activated:
@@ -506,10 +509,11 @@ eu:
             announcement_help: Hemen sartzen duzun testua parte-hartzaileari erakutsiko zaio, prozesuaren informazioaren azpian.
             define_taxonomy_filters: Mesedez, eszenatoki hau erabili aurretik, zehaztu espazio parte-hartzaile honetarako iragazki batzuk.
             duration: Iraupena
+            has_members_help: Kideak sortu eta argitaratu ahal izango dituzu
             images: Irudiak
             metadata: Metadatuak
             no_taxonomy_filters_found: Ez da taxonomia-iragazkirik aurkitu.
-            private_notice: Kiak kudeatu ahal izango dituzu pribatu gisa ezarri ondoren
+            private_notice: Bisitarientzat eta bazkideentzat soilik (gardena bada izan ezik) ez da partaidetza-espazioa ikusten
             related_processes: Elkarrekin lotutako prozesuak
             select_process_group: Prozesu-talde bat hautatu
             slug_help_html: 'URLetako testu laburrak erabiltzen dira prozesu honi aurre egiteko URLak sortzeko. Letrak, zenbakiak eta gidoiak soilik onartzen ditu, eta letra batez hasi behar du. Adibidea: %{url}'
@@ -558,6 +562,9 @@ eu:
         title: Partaidetza-prozesuak
       last_activity:
         new_participatory_process: 'Beste partaidetza-prozesu bat:'
+      members:
+        index:
+          title: Kideak
       pages:
         home:
           highlighted_processes:
@@ -604,9 +611,6 @@ eu:
           type: Mota
         show:
           title: Prozesu honi buruz
-      participatory_space_private_users:
-        index:
-          title: Kideak
       show:
         belongs_to_group: Prozesu hau nori dagokio
         private_space: Prozesu pribatua da
diff --git a/decidim-participatory_processes/config/locales/fi-plain.yml b/decidim-participatory_processes/config/locales/fi-plain.yml
index e2913075c3977..837bc76352a2f 100644
--- a/decidim-participatory_processes/config/locales/fi-plain.yml
+++ b/decidim-participatory_processes/config/locales/fi-plain.yml
@@ -14,6 +14,7 @@ fi-pl:
         duplicate_landing_page_blocks: Kopioi laskeutumissivun sisältölohkot
         duplicate_steps: Kopioi vaiheet
         end_date: Päättymispäivä
+        has_members: Tässä tilassa on jäseniä
         hero_image: Etusivun kuva
         import_attachments: Tuo liitteitä
         import_categories: Kopioi aihepiirejä
@@ -115,8 +116,8 @@ fi-pl:
           components: Komponentit
           info: Tietoa tästä prosessista
           landing_page: Laskeutumissivun asettelu
+          members: Jäsenet
           moderations: Moderoinnit
-          private_users: Jäsenet
           process_admins: Prosessin käyttäjät
           steps: Vaiheet
       models:
@@ -282,9 +283,11 @@ fi-pl:
         export: "%{user_name} vei osallistumisprosessin %{resource_name}"
         import: "%{user_name} toi osallistumisprosessin %{resource_name}"
         publish: "%{user_name} julkaisi osallisuusprosessin %{resource_name}"
+        publish_all_members: "%{user_name} julkaisi osallistumisprosessin %{resource_name} jäsenet"
         restore: "%{user_name} palautti osallistumisprosessin %{resource_name}"
         soft_delete: "%{user_name} siirsi osallistumisprosessin %{resource_name} roskakoriin"
         unpublish: "%{user_name} muutti osallisuusprosessin %{resource_name} julkaisemattomaksi"
+        unpublish_all_members: "%{user_name} perui osallistumisprosessin %{resource_name} jäsenten julkaisun"
         update: "%{user_name} päivitti osallisuusprosessin %{resource_name}"
       participatory_process_group:
         create: "%{user_name} loi osallisuusprosessien ryhmän %{resource_name}"
@@ -340,6 +343,7 @@ fi-pl:
         participatory_processes:
           announcement: Ilmoituksen sisältö
           area: Alue, jota prosessi koskee
+          component_settings: Prosessin komponenttiasetukset
           created_at: Tilan luontiaika
           description: Prosessin pitkä kuvaus
           developer_group: Prosessin kehittäjäryhmä, joka edistää tämän prosessin toteutumista.
@@ -505,10 +509,11 @@ fi-pl:
             announcement_help: Tähän kirjoitettu teksti näkyy käyttäjälle heti prosessitietojen alapuolella.
             define_taxonomy_filters: Määritä osallistumistilalle suodattimia ennen kuin käytät tätä asetusta.
             duration: Kesto
+            has_members_help: Voit luoda ja julkaista jäseniä
             images: kuvat
             metadata: metadata
             no_taxonomy_filters_found: Luokittelusuodattimia ei löytynyt.
-            private_notice: Voit hallinnoida osallistumistilan yksityisiä käyttäjiä asettamalla osallistumistilan yksityiseksi
+            private_notice: Piilottaa osallistumistilan verkkosivuston vierailijoiden näkyvistä (ellei osallistumistila ole myös läpinäkyvä)
             related_processes: Liittyvät prosessit
             select_process_group: Valitse prosessiryhmä
             slug_help_html: 'URL-tunnisteita käytetään tuottamaan URL-osoitteet, jotka viittaavat tähän prosessiin. Hyväksyy vain kirjaimet, numerot ja viivat. Arvon on alettava kirjaimella. Esimerkki: %{url}'
@@ -557,6 +562,9 @@ fi-pl:
         title: Osallisuusprosessit
       last_activity:
         new_participatory_process: 'Uusi osallistumisprosessi:'
+      members:
+        index:
+          title: Jäsenet
       pages:
         home:
           highlighted_processes:
@@ -603,9 +611,6 @@ fi-pl:
           type: Tyyppi
         show:
           title: Tietoa tästä prosessista
-      participatory_space_private_users:
-        index:
-          title: Jäsenet
       show:
         belongs_to_group: Tämä prosessi kuuluu ryhmään
         private_space: Tämä on yksityinen prosessi
diff --git a/decidim-participatory_processes/config/locales/fi.yml b/decidim-participatory_processes/config/locales/fi.yml
index 7e6a8177ea264..efe4049f57c4d 100644
--- a/decidim-participatory_processes/config/locales/fi.yml
+++ b/decidim-participatory_processes/config/locales/fi.yml
@@ -14,6 +14,7 @@ fi:
         duplicate_landing_page_blocks: Kopioi laskeutumissivun sisältölohkot
         duplicate_steps: Kopioi vaiheet
         end_date: Päättymispäivä
+        has_members: Tässä tilassa on jäseniä
         hero_image: Etusivun kuva
         import_attachments: Tuo liitteitä
         import_categories: Kopioi aihepiirejä
@@ -115,8 +116,8 @@ fi:
           components: Komponentit
           info: Tietoa tästä prosessista
           landing_page: Laskeutumissivun asettelu
+          members: Jäsenet
           moderations: Moderoinnit
-          private_users: Jäsenet
           process_admins: Prosessin hallintakäyttäjät
           steps: Vaiheet
       models:
@@ -282,9 +283,11 @@ fi:
         export: "%{user_name} vei osallistumisprosessin %{resource_name}"
         import: "%{user_name} toi osallistumisprosessin %{resource_name}"
         publish: "%{user_name} julkaisi osallistumisprosessin %{resource_name}"
+        publish_all_members: "%{user_name} julkaisi osallistumisprosessin %{resource_name} jäsenet"
         restore: "%{user_name} palautti osallistumisprosessin %{resource_name}"
         soft_delete: "%{user_name} siirsi osallistumisprosessin %{resource_name} roskakoriin"
         unpublish: "%{user_name} perui osallistumisprosessin %{resource_name} julkaisun"
+        unpublish_all_members: "%{user_name} perui osallistumisprosessin %{resource_name} jäsenten julkaisun"
         update: "%{user_name} päivitti osallistumisprosessin %{resource_name}"
       participatory_process_group:
         create: "%{user_name} loi osallistumisprosessien ryhmän %{resource_name}"
@@ -340,6 +343,7 @@ fi:
         participatory_processes:
           announcement: Ilmoituksen sisältö
           area: Alue, jota prosessi koskee
+          component_settings: Prosessin komponenttiasetukset
           created_at: Tilan luontiaika
           description: Prosessin pitkä kuvaus
           developer_group: Prosessin kehittäjäryhmä, joka edistää tämän prosessin toteutumista.
@@ -505,10 +509,11 @@ fi:
             announcement_help: Tähän kirjoitettu teksti näkyy käyttäjälle heti prosessitietojen alapuolella.
             define_taxonomy_filters: Määritä osallistumistilalle suodattimia ennen kuin käytät tätä asetusta.
             duration: Kesto
+            has_members_help: Voit luoda ja julkaista jäseniä
             images: Kuvat
             metadata: Metatiedot
             no_taxonomy_filters_found: Luokittelusuodattimia ei löytynyt.
-            private_notice: Voit hallinnoida osallistumistilan yksityisiä käyttäjiä asettamalla osallistumistilan yksityiseksi
+            private_notice: Piilottaa osallistumistilan verkkosivuston vierailijoiden näkyvistä (ellei osallistumistila ole myös läpinäkyvä)
             related_processes: Liittyvät prosessit
             select_process_group: Valitse prosessiryhmä
             slug_help_html: 'URL-tunnisteita käytetään tuottamaan URL-osoitteet, jotka viittaavat tähän prosessiin. Hyväksyy vain kirjaimet, numerot ja viivat. Arvon on alettava kirjaimella. Esimerkki: %{url}'
@@ -557,6 +562,9 @@ fi:
         title: Osallistumisprosessit
       last_activity:
         new_participatory_process: 'Uusi osallistumisprosessi:'
+      members:
+        index:
+          title: Jäsenet
       pages:
         home:
           highlighted_processes:
@@ -603,9 +611,6 @@ fi:
           type: Tyyppi
         show:
           title: Tietoa tästä prosessista
-      participatory_space_private_users:
-        index:
-          title: Jäsenet
       show:
         belongs_to_group: Tämä prosessi kuuluu ryhmään
         private_space: Tämä on yksityinen prosessi
diff --git a/decidim-participatory_processes/config/locales/fr-CA.yml b/decidim-participatory_processes/config/locales/fr-CA.yml
index ad257689a6cae..ea06b08c0725b 100644
--- a/decidim-participatory_processes/config/locales/fr-CA.yml
+++ b/decidim-participatory_processes/config/locales/fr-CA.yml
@@ -14,6 +14,7 @@ fr-CA:
         duplicate_landing_page_blocks: Dupliquer les blocs de page d'accueil
         duplicate_steps: Dupliquer les étapes
         end_date: Date de fin
+        has_members: Cet espace a des membres
         hero_image: Image de la page d'accueil
         import_attachments: Importer les pièces jointes
         import_categories: Importer les catégories
@@ -113,8 +114,8 @@ fr-CA:
           attachments: Documents liés
           components: Fonctionnalités
           info: A propos de cette concertation
+          members:
           moderations: Modérations
-          private_users: Membres
           process_admins: Administrateurs de la concertation
           steps: Étapes
       models:
@@ -280,7 +281,9 @@ fr-CA:
         export: "%{user_name} a exporté la concertation %{resource_name}"
         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}"
         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}"
       participatory_process_group:
         create: "%{user_name} a créé le groupe de concertations %{resource_name}"
@@ -458,10 +461,11 @@ fr-CA:
             announcement_help: Le texte saisi ici sera affiché juste en dessous des informations de la concertation.
             define_taxonomy_filters: Veuillez définir des filtres pour cet espace participatif avant d'utiliser ce paramètre.
             duration: Durée
+            has_members_help: Vous pourrez créer et publier des membres
             images: Images
             metadata: Métadonnées
             no_taxonomy_filters_found: Aucun filtre de taxonomie trouvé.
-            private_notice: Vous serez en mesure de gérer les membres après l'avoir défini comme privé
+            private_notice: Rend l'espace non visible pour les visiteurs et visible seulement pour les membres (sauf s'il est également transparent)
             related_processes: Concertations liées
             select_process_group: Sélectionnez un groupe de concertations
             slug_help_html: 'Les identifiants d''URL sont utilisés pour générer les URL qui pointent vers cette concertation. N''accepte que des lettres, des chiffres et des tirets et doit commencer par une lettre. Exemple : %{url}'
@@ -493,6 +497,9 @@ fr-CA:
         title: Concertations
       last_activity:
         new_participatory_process: 'Nouveau processus participatif:'
+      members:
+        index:
+          title: Membres
       pages:
         home:
           highlighted_processes:
@@ -539,9 +546,6 @@ fr-CA:
           type: Type
         show:
           title: A propos de cette concertation
-      participatory_space_private_users:
-        index:
-          title: Membres
       show:
         belongs_to_group: Cette concertation appartient à
         private_space: Ceci est une concertation privée
diff --git a/decidim-participatory_processes/config/locales/fr.yml b/decidim-participatory_processes/config/locales/fr.yml
index 6e436b78a542a..5de0aa7cfee80 100644
--- a/decidim-participatory_processes/config/locales/fr.yml
+++ b/decidim-participatory_processes/config/locales/fr.yml
@@ -14,6 +14,7 @@ fr:
         duplicate_landing_page_blocks: Dupliquer les blocs de page d'accueil
         duplicate_steps: Dupliquer les étapes
         end_date: Date de fin
+        has_members: Cet espace a des membres
         hero_image: Image de la page d'accueil
         import_attachments: Importer les pièces jointes
         import_categories: Importer les catégories
@@ -113,8 +114,8 @@ fr:
           attachments: Documents liés
           components: Fonctionnalités
           info: A propos de cette concertation
+          members:
           moderations: Modérations
-          private_users: Membres
           process_admins: Administrateurs de la concertation
           steps: Étapes
       models:
@@ -280,7 +281,9 @@ fr:
         export: "%{user_name} a exporté la concertation %{resource_name}"
         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}"
         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}"
       participatory_process_group:
         create: "%{user_name} a créé le groupe de concertations %{resource_name}"
@@ -458,10 +461,11 @@ fr:
             announcement_help: Le texte saisi ici sera affiché juste en dessous des informations de la concertation.
             define_taxonomy_filters: Veuillez définir des filtres pour cet espace participatif avant d'utiliser ce paramètre.
             duration: Durée
+            has_members_help: Vous pourrez créer et publier des membres
             images: Images
             metadata: Métadonnées
             no_taxonomy_filters_found: Aucun filtre de taxonomie trouvé.
-            private_notice: Vous serez en mesure de gérer les membres après l'avoir défini comme privé
+            private_notice: Rend l'espace non visible pour les visiteurs et visible seulement pour les membres (sauf s'il est également transparent)
             related_processes: Concertations liées
             select_process_group: Sélectionnez un groupe de concertations
             slug_help_html: 'Les identifiants d''URL sont utilisés pour générer les URL qui pointent vers cette concertation. N''accepte que des lettres, des chiffres et des tirets et doit commencer par une lettre. Exemple : %{url}'
@@ -493,6 +497,9 @@ fr:
         title: Concertations
       last_activity:
         new_participatory_process: 'Nouveau processus participatif:'
+      members:
+        index:
+          title: Membres
       pages:
         home:
           highlighted_processes:
@@ -539,9 +546,6 @@ fr:
           type: Type
         show:
           title: A propos de cette concertation
-      participatory_space_private_users:
-        index:
-          title: Membres
       show:
         belongs_to_group: Cette concertation appartient à
         private_space: Ceci est une concertation privée
diff --git a/decidim-participatory_processes/config/locales/ja.yml b/decidim-participatory_processes/config/locales/ja.yml
index 5d938d8dd4313..5b4e8965d38b0 100644
--- a/decidim-participatory_processes/config/locales/ja.yml
+++ b/decidim-participatory_processes/config/locales/ja.yml
@@ -14,6 +14,7 @@ ja:
         duplicate_landing_page_blocks: ランディングページブロックを複製
         duplicate_steps: ステップを複製
         end_date: 終了日
+        has_members: このスペースにはメンバーがいます
         hero_image: ホーム画像
         import_attachments: 添付ファイルをインポート
         import_categories: カテゴリをインポート
@@ -112,8 +113,8 @@ ja:
           components: コンポーネント
           info: このプロセスについて
           landing_page: ランディングページのレイアウト
+          members: メンバー
           moderations: モデレーション
-          private_users: メンバー
           process_admins: 参加型プロセス管理者
           steps: フェーズ
       models:
@@ -279,9 +280,11 @@ ja:
         export: "%{user_name} が %{resource_name} の参加プロセスをエクスポートしました"
         import: "%{user_name} が %{resource_name} の参加プロセスをインポートしました"
         publish: "%{user_name} が %{resource_name} 参加型プロセスを公開しました"
+        publish_all_members: "%{user_name} が参加型プロセス %{resource_name} のすべてのメンバーを公開しました"
         restore: "%{user_name} が %{resource_name} 参加型プロセスを復元しました"
         soft_delete: "%{user_name} が %{resource_name} 参加型プロセスをゴミ箱に移動しました"
         unpublish: "%{user_name} が %{resource_name} 参加型プロセスを非公開にしました"
+        unpublish_all_members: "%{user_name} が参加型プロセス %{resource_name} のすべてのメンバーを非公開にしました"
         update: "%{user_name} が %{resource_name} の参加型プロセスを更新しました"
       participatory_process_group:
         create: "%{user_name} が %{resource_name} 参加型プロセスグループを作成しました"
@@ -337,6 +340,7 @@ ja:
         participatory_processes:
           announcement: アナウンス（コールアウト）情報
           area: プロセスが行われているエリア
+          component_settings: プロセスのコンポーネント設定
           created_at: このスペースの作成日時
           description: プロセスの詳しい説明
           developer_group: プロセスの開発者グループ。これはプロセスをプロモートしている組織です
@@ -501,10 +505,11 @@ ja:
             announcement_help: ここに入力したテキストは、参加型プロセス情報のすぐ下にユーザーに表示されます。
             define_taxonomy_filters: この設定を使用する前に、参加型スペースのフィルターをいくつか定義してください。
             duration: 期間
+            has_members_help: メンバーを作成し、公開することができます
             images: 画像
             metadata: メタデータ
             no_taxonomy_filters_found: タクソノミーフィルタが見つかりません。
-            private_notice: プライベートとして設定した後、メンバーを管理することができます
+            private_notice: 訪問者にはスペースを非表示にし、メンバーのみ表示します（透明化している場合を除きます）
             related_processes: 関連する参加型プロセス
             select_process_group: 参加型プロセス グループを選択
             slug_help_html: 'URLスラグは、この参加型プロセスを指すURLを生成するために使用されます。英字、数字、ハイフンのみを受け付け、英字で始める必要があります。例: %{url}'
@@ -553,6 +558,9 @@ ja:
         title: 参加型プロセス
       last_activity:
         new_participatory_process: '新しい参加型プロセス:'
+      members:
+        index:
+          title: メンバー
       pages:
         home:
           highlighted_processes:
@@ -595,9 +603,6 @@ ja:
           type: 種別
         show:
           title: このプロセスについて
-      participatory_space_private_users:
-        index:
-          title: メンバー
       show:
         belongs_to_group: このプロセスの所属グループ
         private_space: これはプライベートな参加型プロセスです
@@ -800,7 +805,7 @@ ja:
         member_menu_item: メンバー
       participatory_processes:
         index:
-          promoted_processes: ハイライトされた参加型プロセス
+          promoted_processes: 注目の参加型プロセス
         participatory_process:
           active_step: '現在のフェーズ:'
           more_info: 詳細情報
diff --git a/decidim-participatory_processes/config/locales/pt-BR.yml b/decidim-participatory_processes/config/locales/pt-BR.yml
index cce8e9ef02956..cb47524778447 100644
--- a/decidim-participatory_processes/config/locales/pt-BR.yml
+++ b/decidim-participatory_processes/config/locales/pt-BR.yml
@@ -7,16 +7,25 @@ pt-BR:
         decidim_area_id: Área
         description: Descrição
         developer_group: Grupo promotor
+        document: Documento
         domain: Domínio
+        duplicate_categories: Categoria duplicada
+        duplicate_components: Componente duplicado
+        duplicate_landing_page_blocks: Bloco da página principal duplicada
+        duplicate_steps: Etapa duplicada
         end_date: Data final
+        has_members: Este espaço tem membros
         hero_image: Imagem inicial
+        import_attachments: Importar anexos
         import_categories: Importar categorias
+        import_components: Importar componentes
         import_steps: Importar etapas
         local_area: Área da organização
         meta_scope: Metadados do âmbito
         participatory_process_group_id: Grupo de processos
         participatory_scope: O que é decidido
         participatory_structure: Como é decidido
+        private_space: Processo privado
         promoted: Destacado
         published_at: Publicado em
         related_process_ids: Processos relacionados
@@ -75,6 +84,7 @@ pt-BR:
     admin:
       actions:
         activate: Ativar
+        confirm_delete_process: Tem certeza de que deseja excluir este processo? Caso mude de ideia, você poderá restaurá-lo posteriormente.
         confirm_destroy: Confirmar exclusão
         destroy: Excluir
         duplicate: Duplicar
@@ -87,11 +97,17 @@ pt-BR:
         preview: Visualização
         publish: Publicar
         resend_invitation: Reenviar convite
+        see_process: Visualizar processo
         unpublish: Unpublish
+        view_deleted_processes: Visualizar processos excluídos
+      filters:
+        decidim_participatory_process_group_id_eq:
+          label: Por grupo de processo
       menu:
         participatory_process_groups: Grupos de processo
         participatory_process_groups_submenu:
           info: Informações
+          landing_page: Layout página principal
         participatory_processes: Processos
         participatory_processes_submenu:
           attachment_collections: Pastas
@@ -99,12 +115,15 @@ pt-BR:
           attachments: Anexos
           components: Componentes
           info: Sobre este processo
+          landing_page: Layout página principal
+          members: Membros
           moderations: Moderação
           process_admins: Processar usuários
           steps: Passos
       models:
         participatory_process:
           fields:
+            actions: Ações
             created_at: Criado em
             private: Privado
             published: Publicados
@@ -112,16 +131,19 @@ pt-BR:
           name: Processo participativo
         participatory_process_group:
           fields:
+            actions: Ações
             title: Título
           name: Grupo de processo
         participatory_process_step:
           fields:
+            actions: Ações
             end_date: Data final
             start_date: Data de início
             title: Título
           name: Etapa do processo participativo
         participatory_process_user_role:
           fields:
+            actions: Ações
             email: Endereço de e-mail
             name: Nome
             role: Cargo
@@ -129,13 +151,21 @@ pt-BR:
           roles:
             admin: Administrador
             collaborator: Colaborador
+            evaluator: Avaliador
             moderator: Moderador
         user:
           fields:
             invitation_accepted_at: Convite aceito em
             invitation_sent_at: Convite enviado em
+            published: Publicado
+      participatory_process_duplicates:
+        new:
+          duplicate: Duplicar
+          select: Selecione os dados que deseja duplicar
+          title: Processos participativos duplicados
       participatory_process_groups:
         destroy:
+          error: Ocorreu um erro ao destruir o grupo de processos participativos.
           success: Grupo de processos participativo excluído com sucesso.
         edit:
           title: Editar grupo de processos
@@ -171,6 +201,9 @@ pt-BR:
           success: Passo do processo participativo criado com sucesso.
         default_title: Introdução
         destroy:
+          error:
+            active_step: Não é possível excluir a etapa ativa.
+            last_step: Não é possível excluir a última etapa de um processo.
           success: Etapa do processo participativo excluída com sucesso.
         edit:
           title: Edite o passo do processo participativo
@@ -212,19 +245,33 @@ pt-BR:
           private: Privado
           public: Público
           published: Publicados
+          unpublished: Não publicado
+        manage_trash:
+          title: Excluir processo participativo
         new:
           create: Criar
           title: Novo processo participativo
         update:
           error: Ocorreu um erro ao atualizar este processo participativo.
           success: Processo participativo atualizado com sucesso.
+      participatory_processes_duplicates:
+        create:
+          error: Ocorreu um erro ao duplicar este processo participativo.
+          success: Processo participativo duplicado com sucesso.
       participatory_processes_group:
         create:
           error: Ocorreu um erro ao criar um novo grupo de processos participativos.
           success: Grupo de processo participativo criado com sucesso.
+      taxonomy_filters:
+        space_filter_for:
+          participatory_processes: Todos os processos participativos
       titles:
         participatory_process_groups: Grupos de processos participativos
+        participatory_process_types: Tipos de processos participativos
         participatory_processes: Processos participativos
+        participatory_processes_deleted: Processos participativos excluídos
+      tooltips:
+        deleted_processes_info: Um processo apenas pode ser excluído se estiver "Não Publicado".
       users:
         resend_invitation:
           error: Ocorreu um erro ao reenviar o convite.
@@ -236,10 +283,15 @@ pt-BR:
         export: "%{user_name} exportou o processo participativo %{resource_name}"
         import: "%{user_name} importou o processo participativo %{resource_name}"
         publish: "%{user_name} publicou o %{resource_name} processo participativo"
+        publish_all_members: ""
+        restore: "%{user_name} restaurou o processo participativo %{resource_name}"
+        soft_delete: "%{user_name} moveu o processo participativo %{resource_name} para a lixeira"
         unpublish: "%{user_name} não publicado o %{resource_name} processo participativo"
+        unpublish_all_members: "%{user_name} não publicado todos os membros do processo participativo %{resource_name}"
         update: "%{user_name} atualizou o processo participativo %{resource_name}"
       participatory_process_group:
         create: "%{user_name} criou o grupo de processo participativo %{resource_name}"
+        unpublish: "%{user_name} não publicado o grupo participativo %{resource_name}"
         update: "%{user_name} atualizou o grupo de processo participativo %{resource_name}"
       participatory_process_step:
         activate: "%{user_name} ativou o passo %{resource_name} no processo participativo %{space_name}"
@@ -254,6 +306,9 @@ pt-BR:
         create: "%{user_name} convidou o usuário %{resource_name} para o %{space_name} processo participativo"
         delete: "%{user_name} removeu o usuário %{resource_name} do %{space_name} processo participativo"
         update: "%{user_name} alterou o papel do usuário %{resource_name} no %{space_name} processo participativo"
+    download_your_data:
+      show:
+        participatory_processes: Exportar Processo Participativo
     events:
       participatory_process:
         role_assigned:
@@ -283,16 +338,56 @@ pt-BR:
           not_found: 'O tipo de processo não foi encontrado no banco de dados (ID: %{id}).'
     menu:
       processes: Processos
+    open_data:
+      help:
+        participatory_processes:
+          announcement: A informação de anúncio (chamada)
+          area: A área onde o processo está ocorrendo
+          component_settings: As configurações dos componentes do processo
+          created_at: A data em que este espaço foi criado
+          description: Uma descrição longa do processo
+          developer_group: O grupo de desenvolvedores do processo. Esta é a organização que está promovendo o processo.
+          end_date: Data final do processo
+          follows_count: O número de usuário seguindo este espaço
+          id: O identificador exclusivo desse processo
+          local_area: A área local do processo. Esta é a área da organização onde o processo está ocorrendo.
+          meta_scope: Os metadados do escopo do processo
+          participatory_process_group: Grupo do processo, se houver
+          participatory_process_type: O tipo do processo
+          participatory_scope: O escopo participativo do processo
+          participatory_structure: A estrutura participativa do processo. É assim que o processo é decidido.
+          promoted: Se o processo é promovido ou não
+          published_at: A data que esse espaço foi publicado
+          reference: A referência única do espaço
+          remote_hero_image_url: A URL da imagem do herói do processo
+          scope: O escopo do processo
+          scopes_enabled: Se os escopos estão habilitados ou não
+          short_description: Uma breve descrição do processo
+          slug: O slug do processo (usado para fins de identificação, para a URL)
+          start_date: A data início do processo
+          subtitle: O subtítulo do processo
+          target: O objetivo do processo. É quem é chamado a participar do processo.
+          title: O título do processo
+          updated_at: A data que esse espaço foi atualizado
+          url: A URL do espaço
     participatory_process_groups:
       content_blocks:
         extra_data:
           developer_group: Promovido por
+          name: Metadados
+          participatory_scope: O que é decidido
+          participatory_structure: Como é decidido
+          target: Quem participa
+        html:
+          name: Bloco HTML
         html_1:
           name: Primeiro bloco HTML
         html_2:
           name: Segundo bloco HTML
         html_3:
           name: Terceiro bloco HTML
+        main_data:
+          name: Título e descrição
         participatory_processes:
           active: Processos participativos ativos
           name: Processos participativos
@@ -303,6 +398,8 @@ pt-BR:
           participatory_processes:
             one: 1 processo
             other: "%{count} processos"
+      related_processes:
+        help: Todos os processos selecionados serão atribuídos a este grupo, incluindo os que já estão atribuídos a outros grupos.
       show:
         title: Grupos de processos participativos
     participatory_process_steps:
@@ -311,12 +408,93 @@ pt-BR:
     participatory_processes:
       admin:
         content_blocks:
+          democratic_quality_stats_settings_form:
+            announcement:
+              body_html: |-
+                <ul>
+                <li>Estes são calculados automaticamente a partir dos dados do Decidim. Eles ficarão visíveis assim que você publicar o bloco de conteúdo.</li>
+                <li>Estes são baseados nas suas respostas no formulário a seguir. Eles ficarão visíveis assim que você responder a todas as perguntas.</li>
+                </ul>
+              title: 'Este bloco de conteúdo inclui dois tipos de métricas:'
+            citizen_influence:
+              citizen_decisional_intervention:
+                legend: Fora de todas as fases do processo (de selecionar questões a supervisão) em quantos o público tem capacidade de tomar decisões ou tomar medidas executivas?
+                options:
+                  five: 80 - 100%
+                  four: 60 - 80%
+                  one: 0 - 20%
+                  three: 40 - 60%
+                  two: 20 - 40%
+              citizen_influence_level:
+                legend: Até que ponto os cidadãos detêm autoridade de decisão nesse processo, desde simplesmente, receber informações até influenciar decisivamente as decisões e gerenciar recursos?
+                options:
+                  five: Os participantes estavam envolvidos na tomada de decisão e na gestão de recursos ou na implementação
+                  four: Os participantes foram envolvidos de forma decisiva na tomada de decisões
+                  one: Os participantes receberam informações da organização
+                  three: Os participantes estavam envolvidos para compartilhar o poder de tomada de decisão
+                  two: Os participantes foram interrogados de forma consultiva ou deram feedback à organização
+              name: Influência do cidadão
+            inclusiveness:
+              description: Inclusão de acordo com a origem cultural e a diversidade funcional.
+              digital_support_offered:
+                legend: O suporte digital foi oferecido aos participantes?
+                options:
+                  five: 'Sim'
+                  two_five: Parcialmente
+                  zero: 'No'
+              functional_diversity_invited:
+                legend: Como que se avalia o grau de diversidade dos agentes e participantes relativamente à população de referência do processo?
+                options:
+                  five: Bom
+                  one: Baixa
+                  two_five: Suficiente
+                  zero: Nenhum
+              languages_communicated:
+                legend: Quantas línguas foram utilizadas no processo?
+                options:
+                  five: Mais da metade dos idiomas falados na comunidade
+                  one: Um idioma
+                  two_five: Menos de metade das línguas faladas na comunidade
+              mobility_meeting_access:
+                legend: Estavam os locais das reuniões presenciais acessíveis a pessoas com mobilidade reduzida?
+                options:
+                  five: 'Sim'
+                  two_five: Parcialmente
+                  zero: 'Não'
+              name: Inclusão
+              participation_scheduling_times:
+                legend: As sessões de participação foram agendadas para diferentes horas (manhã, meio-dia, tarde, noite e fins de semana).
+                options:
+                  five: 'Sim'
+                  two_five: Parcialmente
+                  zero: 'Não'
+            informativeness:
+              information_provided:
+                legend: Foram fornecidas informações sobre a capacidade dos participantes para influenciar o tema em debate? (tanto na comunicação do processo e convites, como no início de cada sessão de debate)
+                options:
+                  five: Sempre
+                  one: Quase nunca
+                  two_five: Geralmente
+                  zero: Nunca
+              name: Informação
+              published_information_clarity:
+                legend: As informações publicadas proporcionam clareza sobre os mecanismos de tomada de decisão? (por exemplo, votação, consenso, negociações diretas)
+                options:
+                  five: Clareza total
+                  one: Baixa clareza
+                  two_five: Clareza suficiente
+                  zero: Sem clareza
           highlighted_processes:
             active: Ativo
+            all: Tudo
             max_results: Quantidade máxima de elementos para mostrar
+            selection_criteria: Critério de seleção
         new_import:
           accepted_types:
             json: JSON
+        participatory_process_duplicates:
+          form:
+            slug_help_html: 'Os slugs de URL são usados para gerar os URLs que apontam para este processo. Aceita apenas letras, números e traços e deve começar com uma letra. Exemplo: %{url}'
         participatory_process_groups:
           form:
             metadata: Metadados
@@ -329,18 +507,64 @@ pt-BR:
         participatory_processes:
           form:
             announcement_help: O texto que você insere aqui será mostrado ao usuário logo abaixo das informações do processo.
+            define_taxonomy_filters: Por favor, defina alguns filtros para este espaço participativo antes de usar esta configuração.
             duration: Duração
+            has_members_help: Você será capaz de criar e publicar membros
             images: Imagens
             metadata: Metadados
+            no_taxonomy_filters_found: Nenhum filtro de taxonomia encontrado.
+            private_notice: Torna o espaço não visível para visitantes e apenas para membros (exceto se também for transparente)
             related_processes: Processos relacionados
             select_process_group: Selecione um grupo de processos
             slug_help_html: 'Os slugs de URL são usados para gerar os URLs que apontam para este processo. Aceita apenas letras, números e traços e deve começar com uma letra. Exemplo: %{url}'
+            taxonomies: Taxonomias
             title: Informação geral
+            visibility: Visibilidade
       content_blocks:
+        democratic_quality_stats:
+          automatic_metrics:
+            description: Esses indicadores são obtidos automaticamente a partir dos dados da plataforma.
+            indicators:
+              hybridization: Hibridização
+              hybridization_tooltip: Este indicador mede o nível de combinação entre espaços online e offline durante o processo
+              influence: Influência do cidadão
+              influence_tooltip: Este indicador mede o nível de influência dos cidadãos nas propostas aceitas e nos resultados do processo.
+              traceability: Rastreabilidade
+              traceability_tooltip: Este indicador mede a transparência e a rastreabilidade do processo participativo. Reflete com que facilidade os participantes podem acompanhar a evolução das propostas e verificar as ações institucionais através dos registos publicados.
+              transparency: Responsividade
+              transparency_tooltip: Este indicador mede o nível de resposta da organização a entrada dos participantes. Ele reflete seu envolvimento através de respostas oficiais e decisões implementadas.
+            name: Métricas automáticas
+          global_score:
+            description_html: Abaixo está um conjunto de indicadores utilizados para avaliar a qualidade democrática deste processo participativo. Para mais detalhes sobre como são calculados, consulte a página de informações <a href="%{info_url}">sobre indicadores de qualidade democrática</a>.
+            name: Pontuação global
+            note: "*Os valores indicativos são medidos em uma escala de 1 a 5, onde 1 representa o menor e 5 o indicador de maior qualidade."
+            tooltip: Calculado como a média de todas as dimensões
+          name: Indicador de qualidade
+          qualitative_metrics:
+            description: Esses indicadores são obtidos das respostas para uma pesquisa de autoavaliação preenchida pelos administradores da plataforma.
+            indicators:
+              citizen_influence: Influência do cidadão
+              citizen_influence_tooltip: Mede o nível de impacto dos participantes na tomada de decisões.
+              inclusiveness: Inclusão
+              inclusiveness_tooltip: Avalia se as diversas partes interessadas estão representadas de forma justa.
+              informativeness: Informação
+              informativeness_tooltip: Mede o nível de clareza e informação proporcionada no processo.
+            name: Métricas de auto-avaliação
+        extra_data:
+          name: Fase & Duração
+        hero:
+          name: Imagem do herói e CTA
         highlighted_processes:
           name: Processos em destaque
+        related_processes:
+          name: Processos relacionados
       index:
         title: Processos participativos
+      last_activity:
+        new_participatory_process: 'Novo processo participativo:'
+      members:
+        index:
+          title: Membros
       pages:
         home:
           highlighted_processes:
@@ -348,6 +572,14 @@ pt-BR:
             see_all_spaces: Ver todos os processos
       participatory_processes:
         description:
+          area_name: Área
+          data: Variáveis de processo
+          developer_group: Grupo promotor
+          local_area: Área de organização
+          meta_scope: Escopo
+          participatory_scope: O que é decidido
+          participatory_structure: Como é decidido
+          target: Quem participa
           title: Sobre este processo
         filters:
           all_types: Todos os tipos
@@ -364,22 +596,218 @@ pt-BR:
             upcoming:
               one: 1 processo futuro
               other: "%{count} processos futuros"
+          date: Data
           explanations:
+            no_active: Nenhum processo ativo.
+            no_active_nor_upcoming: Não há processos ativos nem futuros.
             no_active_nor_upcoming_callout: Não há processos ativos nem futuros. Aqui está uma lista dos últimos.
+          filter_by: Mostrar
           names:
             active: Ativo
             all: Todos
             past: Passado
             upcoming: próximos
           see: Ver
+          type: Tipo
         show:
           title: Sobre este processo
       show:
         belongs_to_group: Este processo pertence a
         private_space: Este é um processo privado
         related_processes: Processos relacionados
+      static_pages:
+        democratic_quality_indicators:
+          content: |-
+            <h2>Sistema de indicadores para medir a qualidade dos processos participativos no Decidim.</h2>
+
+            <h3>Introdução</h3>
+            <p>A qualidade democrática é um princípio fundamental do Decidim. Para garantir isso, desenvolvemos um sistema de indicadores que auxilia na avaliação da qualidade dos processos participativos na plataforma. Este artigo explica como esses indicadores são calculados.</p>
+
+            <h3>Como os indicadores são calculados?</h3>
+            <p>Definimos dois métodos para coletar indicadores de qualidade:</p>
+
+            <ol>
+            <li><strong>Métricas automáticas:</strong> Essas métricas são calculadas diretamente a partir dos dados da plataforma Decidim.</li>
+            <li><strong>Questões de autoavaliação:</strong> Essas questões são baseadas em um formulário preenchido por um administrador.</li>
+            </ol>
+
+            <p>Cada indicador é expresso em porcentagem (n/total).</p> Essa porcentagem é então convertida em uma pontuação em uma escala de 1 a 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>Métricas Automáticas</h3>
+            <p>Essas métricas são calculadas automaticamente a partir dos dados disponíveis no Decidim. Eles são avaliados por meio de um processo participativo e podem ser tornados públicos pelos administradores, para que todos os participantes possam acessá-los.</p>
+
+            <p>Definimos quatro indicadores principais: Influência Cidadã, Hibridização, Responsividade e Rastreabilidade:</p>
+
+            <h3>Influência Cidadã</h3>
+
+            <p>Este indicador mede o nível de influência cidadã nas propostas aceitas e nos resultados do processo.</p>
+
+            <ul>
+            <li>
+            Influência cidadã nas propostas
+            <ul>
+            <li>Percentual de propostas aceitas (n/total)</li>
+            <li>Percentual de propostas <em>cidadãs</em> aprovadas em relação ao total de propostas cidadãs (influência cidadã total nas propostas aprovadas)</li>
+            <li>Percentual de propostas cidadãs aprovadas em relação ao total de propostas aprovadas (influência cidadã relativa nas propostas aprovadas)</li>
+            </ul>
+            </li>
+            <li>
+            Influência cidadã nos resultados/produtos
+            <ul>
+            <li>Percentual de resultados vinculados a propostas cidadãs em relação ao total de resultados (influência total dos cidadãos nos resultados)</li>
+            </ul>
+            </li>
+            </ul>
+
+            <h3>Hibridização</h3>
+
+            <p>Este indicador mede o nível de combinação entre espaços online e offline durante o processo.</p>
+
+            <ul>
+            <li>Há algum componente de reunião ativo? (Sim=5, Não=0)</li>
+            <li>Há reuniões presenciais? (Sim=5, Não=0)</li>
+            <li>Há reuniões online? (Sim=5, Não=0)</li>
+            <li>Há reuniões híbridas? (Sim=5, Não=0)</li>
+            <li>Há propostas criadas a partir das reuniões? (Sim=5, Não=0)</li>
+            </ul>
+
+            <h3>Capacidade de resposta</h3>
+
+            <p>Este indicador mede o nível de capacidade de resposta da organização às contribuições dos participantes. Reflete o seu envolvimento através de respostas oficiais e decisões implementadas.</p>
+
+            <ul>
+            <li>Percentagem de propostas com respostas (n/total) – Responsividade institucional da proposta</li>
+            <li>Percentagem de resultados concluídos a 100% (n/total)</li>
+            </ul>
+
+            <h3>Rastreabilidade</h3>
+
+            <p>Este indicador mede a transparência e a rastreabilidade do processo participativo. Reflete a facilidade com que os participantes podem acompanhar a evolução das propostas e verificar as ações institucionais por meio de registros publicados.</p>
+
+            <ul>
+            <li>Número de propostas com histórico (n/total)</li>
+            <li>Percentual de resultados vinculados às propostas (n/total)</li>
+            <li>Percentual de reuniões encerradas com atas publicadas (n/total)</li>
+            <li>Ativação do módulo de dados abertos (dicotômico: 0 ou 5)</li>
+            <li>Percentual de propostas relacionadas a orçamentos (n/total)</li>
+            </ul>
+
+            <br><br>
+            <h3>Métricas de autoavaliação</h3>
+
+            <p>Além das métricas automáticas, propomos o uso de um <strong>formulário de autoavaliação</strong> para avaliar as dimensões qualitativas de cada processo participativo. Este formulário será preenchido pelos administradores da plataforma ao final de cada processo, e as respostas serão exibidas publicamente no bloco de conteúdo de indicadores.</p>
+
+            <p>Estas perguntas visam capturar aspectos da qualidade democrática que não podem ser avaliados apenas por meio de dados quantitativos. É importante observar que as respostas a esta pesquisa são influenciadas pela opinião dos administradores da plataforma.</p>
+
+            <br><br>
+            <h3>Perguntas de autoavaliação</h3>
+
+            <p>As perguntas que compõem o formulário de autoavaliação respondido pelos administradores, bem como os valores associados a cada resposta, estão descritos abaixo.</p>
+
+            <h4>Informação<h4></h4>
+
+            <ol>
+            <li>As informações publicadas fornecem clareza sobre os mecanismos de tomada de decisão (por exemplo, votação, consenso, negociações diretas)?
+
+            <ul>
+            <li>Sem clareza = 0</li>
+            <li>Baixa clareza = 1</li>
+            <li>Clareza suficiente = 2,5</li>
+            <li>Clareza total = 5</li>
+            </ul>
+            </li>
+            <li>Foram fornecidas informações sobre a capacidade dos participantes de influenciar o tema em discussão (tanto na comunicação do processo e dos convites, quanto no início de cada sessão de debate)?
+
+            <ul>
+            <li>Nunca = 0</li>
+            <li>Quase nunca = 1</li>
+            <li>Geralmente = 2,5</li>
+            <li>Sempre = 5</li>
+            </ul>
+            </li>
+            </ol>
+
+            <h4>Influência dos cidadãos</h4>
+
+            <ol>
+            <li>Avaliação do grau de participação no processo
+            <ul>
+            <li>Os participantes receberam informações da organização. = 1</li>
+            <li>Os participantes foram consultados ou deram feedback à organização. = 2</li>
+            <li>Os participantes estiveram envolvidos na partilha do poder de decisão. = 3</li>
+            <li>Os participantes estiveram envolvidos de forma decisiva na tomada de decisão. = 4</li>
+            <li>Os participantes estiveram envolvidos na tomada de decisão e na gestão de recursos ou na implementação. = 5</li>
+            </ul>
+            </li>
+            <li>Percentagem de fases com 0-5 de intervenção decisória dos cidadãos.
+
+            <p>De todas as fases do processo (da seleção de questões à supervisão da execução), em quantas o público tem a capacidade de tomar decisões ou realizar ações executivas?</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>Inclusão</h4>
+
+            <ol>
+            <li>Como é avaliado o grau de diversidade dos agentes e participantes em relação à população de referência no processo?
+
+            <ul>
+            <li>Nenhum = 0</li>
+            <li>Baixo = 1</li>
+            <li>Suficiente = 2,5</li>
+            <li>Bom = 5</li>
+            </ul>
+            </li>
+            <li>Em quantos idiomas o processo foi comunicado?
+
+            <ul>
+            <li>Um idioma = 1</li>
+            <li>Menos da metade dos idiomas falados na comunidade = 2,5</li>
+            <li>Mais da metade dos idiomas falados na comunidade = 5</li>
+            </ul>
+            </li>
+            <li>Os locais das reuniões presenciais eram acessíveis a pessoas com mobilidade reduzida?
+
+            <ul>
+            <li>Não = 0</li>
+            <li>Parcialmente = 2,5</li>
+            <li>Sim = 5</li>
+            </ul>
+            </li>
+            <li>As sessões de participação foram agendadas em horários variados (manhã, meio-dia, tarde, noite e fins de semana). <ul>
+            <li>Não = 0</li>
+            <li>Parcialmente = 2,5</li>
+            <li>Sim = 5</li>
+            </ul>
+            </li>
+            <li>Foi oferecido suporte digital aos participantes?
+
+            <ul>
+            <li>Não = 0</li>
+            <li>Parcialmente = 2,5</li>
+            <li>Sim = 5</li>
+            </ul>
+            </li>
+            </ol>
+          title: Indicadores de qualidade democráticos
     statistics:
       processes_count: Processos
+      processes_count_tooltip: O número de processos participativos que estão disponíveis ao público.
   layouts:
     decidim:
       participatory_process_groups:
@@ -387,6 +815,8 @@ pt-BR:
           browse: Navegar
           browse_resource: Buscar grupo de processos %{resource_name}
           processes_count: 'Processos:'
+      participatory_process_navigation:
+        member_menu_item: Membros
       participatory_processes:
         index:
           promoted_processes: Processos destacados
diff --git a/decidim-participatory_processes/config/locales/ro-RO.yml b/decidim-participatory_processes/config/locales/ro-RO.yml
index 3e0b33e344ca3..69fb7d267c4a8 100644
--- a/decidim-participatory_processes/config/locales/ro-RO.yml
+++ b/decidim-participatory_processes/config/locales/ro-RO.yml
@@ -9,7 +9,9 @@ ro:
         developer_group: Grup promotor
         document: Document
         domain: Domeniu
-        end_date: Data de încheiere
+        duplicate_categories: Categorii duplicate
+        end_date: Dată de sfârșit
+        has_members: Acest spațiu are membri
         hero_image: Imagine pentru pagina principală
         import_attachments: Importă atașamente
         import_categories: Importă categorii
@@ -85,8 +87,8 @@ ro:
         confirm_destroy: Confirmă ștergerea
         destroy: Șterge
         duplicate: Duplică
-        edit: Editează
-        import_process: Importă
+        edit: Modificați
+        import_process: Importați
         new_process: Proces nou
         new_process_group: Grup nou de proces
         new_process_step: Etapă nouă
@@ -158,9 +160,9 @@ ro:
           error: A apărut o problemă la importul acestui proces participativ.
           success: Procesul participativ a fost importat cu succes.
         new:
-          import: Importă
-          select: Selectează datele pe care dorești să le imporți
-          title: Importă procesul participativ
+          import: Importați
+          select: Selectați ce date doriți să importați
+          title: Importați procesul participativ
       participatory_process_publications:
         create:
           error: A apărut o problemă la publicarea acestui proces participativ.
@@ -180,21 +182,21 @@ ro:
         destroy:
           error:
             active_step: Nu se poți șterge etapa activă.
-            last_step: Nu se poți șterge ultima etapă a unui proces.
+            last_step: Nu se puteți șterge ultima etapă a unui proces.
           success: Etapa procesului participativ a fost ştearsă cu succes.
         edit:
           title: Editează etapa procesului participativ
-          update: Actualizează
+          update: Actualizați
         index:
           steps_title: Etape
         new:
           create: Creează
           title: Etapă nouă a procesului participativ
         ordering:
-          error: A apărut o problemă la reordonarea acestor etape ale procesului participativ.
+          error: A apărut o problemă la reordonarea etapelor acestui procesului participativ.
         update:
           error: A apărut o problemă la actualizarea acestei etape a procesului participativ.
-          success: Etapa procesul participativ a fost actualizată cu succes.
+          success: Etapa procesului participativ a fost actualizată cu succes.
       participatory_process_user_roles:
         create:
           error: A apărut o problemă la adăugarea unui participant pentru acest proces participativ.
@@ -296,6 +298,11 @@ ro:
       processes: Procese participative
     participatory_process_groups:
       content_blocks:
+        extra_data:
+          developer_group: Promovat de
+          participatory_scope: Ce se decide
+          participatory_structure: Cum se decide
+          target: Cine participă
         html_1:
           name: Primul bloc HTML
         html_2:
@@ -333,17 +340,19 @@ ro:
             visibility: Vizibilitate
         participatory_process_imports:
           form:
-            document_legend: Adaugă un document
+            document_legend: Adaugați un document
         participatory_processes:
           form:
             announcement_help: Textul pe care îl introduci aici va fi afișat utilizatorului chiar sub informațiile procesului.
             duration: Durată
+            has_members_help: Veți putea crea și publica membri
             images: Imagini
             metadata: Metadate
+            private_notice: Face spațiul invizibil pentru vizitatori și vizibil doar pentru membri (cu excepția cazului în care este de asemenea transparent)
             related_processes: Procese asociate
-            select_process_group: Selectează un grup de proces
+            select_process_group: Selectați un grup de procese
             taxonomies: Taxonomii
-            title: Informaţii generale
+            title: Informații generale
       content_blocks:
         highlighted_processes:
           name: Procese evidențiate
@@ -357,6 +366,13 @@ ro:
             active_spaces: Procese participative active
             see_all_spaces: Vedeți tot
       participatory_processes:
+        description:
+          developer_group: Grup de promotori
+          local_area: Zona organizației
+          meta_scope: Domeniu de interes
+          participatory_scope: Ce se decide
+          participatory_structure: Cum se decide
+          target: Cine participă
         filters:
           all_types: Toate tipurile
           counters:
@@ -376,6 +392,7 @@ ro:
               one: 1 proces viitor
               few: "%{count} procese viitoare"
               other: "%{count} procese viitoare"
+          date: Dată
           explanations:
             no_active: Niciun proces activ.
             no_active_nor_upcoming: Nu există procese active sau viitoare.
@@ -386,7 +403,7 @@ ro:
             all: Toate
             past: Anterioare
             upcoming: Viitoare
-          see: Vezi
+          see: Vedeți
         show:
           title: Despre acest proces
       show:
@@ -410,5 +427,5 @@ ro:
           active_step: 'Etapa curentă:'
           more_info: Mai multe informații
           more_info_about: Mai multe informații despre procesul %{resource_name}
-          take_part: Participă
-          take_part_in: Participă la procesul %{resource_name}
+          take_part: Participați
+          take_part_in: Participați la procesul %{resource_name}
diff --git a/decidim-participatory_processes/config/locales/sv.yml b/decidim-participatory_processes/config/locales/sv.yml
index bf84a24e8efc1..736b14c37823a 100644
--- a/decidim-participatory_processes/config/locales/sv.yml
+++ b/decidim-participatory_processes/config/locales/sv.yml
@@ -114,7 +114,6 @@ sv:
           components: Komponenter
           info: Om processen
           moderations: Moderering
-          private_users: Medlemmar
           process_admins: Administratörer för process
           steps: Steg
       models:
@@ -280,9 +279,11 @@ sv:
         export: "%{user_name} exporterade processen %{resource_name}"
         import: "%{user_name} importerade processen %{resource_name}"
         publish: "%{user_name} publicerade deltagandeprocessen %{resource_name}"
+        publish_all_members: "%{user_name} publicerade deltagandeprocessen %{resource_name}"
         restore: "%{user_name} återställde deltagandeprocessen %{resource_name}"
         soft_delete: "%{user_name} raderade deltagandeprocessen %{resource_name}"
         unpublish: "%{user_name} avpublicerade deltagandeprocessen %{resource_name}"
+        unpublish_all_members: "%{user_name} avpublicerade deltagandeprocessen %{resource_name}"
         update: "%{user_name} uppdaterade deltagandeprocessen %{resource_name}"
       participatory_process_group:
         create: "%{user_name} skapade gruppen %{resource_name}"
@@ -486,7 +487,6 @@ sv:
             images: Bilder
             metadata: Metadata
             no_taxonomy_filters_found: Inga filter för kategorier hittades.
-            private_notice: Du kommer att kunna hantera medlemmar om processen gjorts privat
             related_processes: Relaterade processer
             select_process_group: Välj en grupp av processer
             slug_help_html: 'URL-slugs används till att generera URL:er till processen. Använd bara bokstäver, siffror och bindestreck, och de måste börja med en bokstav. Exempel: %{url}'
@@ -561,9 +561,6 @@ sv:
           type: Typ
         show:
           title: Om processen
-      participatory_space_private_users:
-        index:
-          title: Medlemmar
       show:
         belongs_to_group: Den här processen tillhör
         private_space: Det här är en privat process
diff --git a/decidim-participatory_processes/db/migrate/20251205120001_add_has_members_to_decidim_participatory_processes.rb b/decidim-participatory_processes/db/migrate/20251205120001_add_has_members_to_decidim_participatory_processes.rb
new file mode 100644
index 0000000000000..79b210e453082
--- /dev/null
+++ b/decidim-participatory_processes/db/migrate/20251205120001_add_has_members_to_decidim_participatory_processes.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddHasMembersToDecidimParticipatoryProcesses < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_participatory_processes, :has_members, :boolean, default: false
+  end
+end
diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/admin_engine.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/admin_engine.rb
index ab215021ea1db..cf770a3ad2b2d 100644
--- a/decidim-participatory_processes/lib/decidim/participatory_processes/admin_engine.rb
+++ b/decidim-participatory_processes/lib/decidim/participatory_processes/admin_engine.rb
@@ -91,12 +91,12 @@ class AdminEngine < ::Rails::Engine
               resources :reports, controller: "moderations/reports", only: [:index, :show]
             end
 
-            resources :participatory_space_private_users, controller: "participatory_space_private_users" do
+            resources :members, controller: "members" do
               member do
-                post :resend_invitation, to: "participatory_space_private_users#resend_invitation"
+                post :resend_invitation, to: "members#resend_invitation"
               end
               collection do
-                resource :participatory_space_private_users_csv_imports, only: [:new, :create], path: "csv_import" do
+                resource :members_csv_imports, only: [:new, :create], path: "csv_import" do
                   delete :destroy_all
                 end
                 post :publish_all
diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/engine.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/engine.rb
index 02b0c3db1c4ce..def6358ac8d77 100644
--- a/decidim-participatory_processes/lib/decidim/participatory_processes/engine.rb
+++ b/decidim-participatory_processes/lib/decidim/participatory_processes/engine.rb
@@ -28,7 +28,7 @@ class Engine < ::Rails::Engine
 
           resources :participatory_process_groups, only: :show, path: "processes_groups"
           resources :participatory_processes, only: [:index, :show], param: :slug, path: "processes" do
-            resources :participatory_space_private_users, only: :index, path: "members"
+            resources :members, only: :index, path: "members"
           end
 
           scope "/processes/:participatory_process_slug/f/:component_id" do
diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/menu.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/menu.rb
index 8e0a3bd6e57a2..2fd81e413e2b5 100644
--- a/decidim-participatory_processes/lib/decidim/participatory_processes/menu.rb
+++ b/decidim-participatory_processes/lib/decidim/participatory_processes/menu.rb
@@ -153,12 +153,12 @@ def self.register_admin_participatory_process_menu!
                         icon_name: "user-settings-line",
                         if: allowed_to?(:read, :process_user_role)
 
-          menu.add_item :participatory_space_private_users,
-                        I18n.t("private_users", scope: "decidim.admin.menu.participatory_processes_submenu"),
-                        decidim_admin_participatory_processes.participatory_space_private_users_path(current_participatory_space),
-                        active: is_active_link?(decidim_admin_participatory_processes.participatory_space_private_users_path(current_participatory_space)),
-                        icon_name: "spy-line",
-                        if: allowed_to?(:read, :space_private_user, current_participatory_space:)
+          menu.add_item :members,
+                        I18n.t("members", scope: "decidim.admin.menu.participatory_processes_submenu"),
+                        decidim_admin_participatory_processes.members_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_participatory_processes.members_path(current_participatory_space)),
+                        icon_name: "user-settings-line",
+                        if: allowed_to?(:read, :space_member, current_participatory_space:)
 
           menu.add_item :moderations,
                         I18n.t("moderations", scope: "decidim.admin.menu.participatory_processes_submenu"),
diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/participatory_space.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/participatory_space.rb
index 43ae5ec4ae0d3..61a7b06b729ad 100644
--- a/decidim-participatory_processes/lib/decidim/participatory_processes/participatory_space.rb
+++ b/decidim-participatory_processes/lib/decidim/participatory_processes/participatory_space.rb
@@ -15,8 +15,6 @@
 
   participatory_space.permissions_class_name = "Decidim::ParticipatoryProcesses::Permissions"
 
-  participatory_space.breadcrumb_cell = "decidim/participatory_processes/process_dropdown_metadata"
-
   participatory_space.register_resource(:participatory_process) do |resource|
     resource.model_class_name = "Decidim::ParticipatoryProcess"
     resource.card = "decidim/participatory_processes/process"
diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/query_extensions.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/query_extensions.rb
index 889c02d350e6c..771ffd6037962 100644
--- a/decidim-participatory_processes/lib/decidim/participatory_processes/query_extensions.rb
+++ b/decidim-participatory_processes/lib/decidim/participatory_processes/query_extensions.rb
@@ -57,29 +57,19 @@ def participatory_process(id: nil, slug: nil)
       end
 
       def participatory_process_groups(*)
-        Decidim::ParticipatoryProcessGroup.where(
-          organization: context[:current_organization]
-        )
+        Decidim::ParticipatoryProcessGroup.where(organization:)
       end
 
       def participatory_process_group(id:)
-        Decidim::ParticipatoryProcessGroup.find_by(
-          organization: context[:current_organization],
-          id:
-        )
+        Decidim::ParticipatoryProcessGroup.where(organization:).find(id)
       end
 
       def participatory_process_types(*)
-        Decidim::ParticipatoryProcessType.where(
-          organization: context[:current_organization]
-        )
+        Decidim::ParticipatoryProcessType.where(organization:)
       end
 
       def participatory_process_type(id:)
-        Decidim::ParticipatoryProcessType.find_by(
-          organization: context[:current_organization],
-          id:
-        )
+        Decidim::ParticipatoryProcessType.where(organization:).find(id)
       end
     end
   end
diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/test/factories.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/test/factories.rb
index 0477c34497aa4..7cbf4bcd8db0e 100644
--- a/decidim-participatory_processes/lib/decidim/participatory_processes/test/factories.rb
+++ b/decidim-participatory_processes/lib/decidim/participatory_processes/test/factories.rb
@@ -31,6 +31,7 @@
     participatory_scope { generate_localized_title(:participatory_process_participatory_scope, skip_injection:) }
     participatory_structure { generate_localized_title(:participatory_process_participatory_structure, skip_injection:) }
     announcement { generate_localized_title(:participatory_process_announcement, skip_injection:) }
+    has_members { false }
     private_space { false }
     start_date { Date.current }
     end_date { 2.months.from_now }
diff --git a/decidim-participatory_processes/spec/cells/decidim/participatory_processes/content_blocks/democratic_quality_stats_cell_spec.rb b/decidim-participatory_processes/spec/cells/decidim/participatory_processes/content_blocks/democratic_quality_stats_cell_spec.rb
new file mode 100644
index 0000000000000..74c004c53ad1d
--- /dev/null
+++ b/decidim-participatory_processes/spec/cells/decidim/participatory_processes/content_blocks/democratic_quality_stats_cell_spec.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::ParticipatoryProcesses::ContentBlocks::DemocraticQualityStatsCell, type: :cell do
+  subject { cell(described_class, content_block, context: { resource: }) }
+
+  let(:organization) { create(:organization) }
+  let(:resource) { create(:participatory_process, organization:) }
+  let(:content_block) { create(:content_block, organization:, manifest_name: :democratic_quality_stats, scope_name: :participatory_process_homepage, scoped_resource_id: resource.id) }
+  let(:html) { subject.call }
+
+  controller Decidim::ParticipatoryProcesses::ParticipatoryProcessesController
+
+  before do
+    allow(controller).to receive(:current_organization).and_return(organization)
+  end
+
+  describe "#info_url" do
+    it "generates the correct page path with locale" do
+      I18n.with_locale(:en) do
+        expect(subject.send(:info_url)).to eq("/en/pages/democratic-quality-indicators")
+      end
+    end
+
+    it "uses the current locale" do
+      I18n.with_locale(:es) do
+        expect(subject.send(:info_url)).to eq("/es/pages/democratic-quality-indicators")
+      end
+    end
+  end
+
+  it "renders the democratic quality stats section" do
+    expect(html).to have_css("section#democratic_quality_stats")
+  end
+
+  it "renders the quality indicator section title" do
+    expect(html).to have_css("h2.home__section-title")
+  end
+
+  it "renders the global score indicator section" do
+    expect(html).to have_content("Global score")
+  end
+
+  it "renders the automatic metrics section title" do
+    expect(html).to have_content("Automatic metrics")
+  end
+
+  it "renders the automatic metrics indicators section" do
+    expect(html).to have_content("Citizen influence")
+    expect(html).to have_content("Hybridization")
+    expect(html).to have_content("Responsiveness")
+    expect(html).to have_content("Traceability")
+  end
+
+  it "includes a link to democratic quality indicators page" do
+    I18n.with_locale(:en) do
+      expect(html).to have_link(href: "/en/pages/democratic-quality-indicators")
+    end
+  end
+end
diff --git a/decidim-participatory_processes/spec/cells/decidim/participatory_processes/content_blocks/highlighted_processes_cell_spec.rb b/decidim-participatory_processes/spec/cells/decidim/participatory_processes/content_blocks/highlighted_processes_cell_spec.rb
index f41d8f356aac7..a78c59fbab551 100644
--- a/decidim-participatory_processes/spec/cells/decidim/participatory_processes/content_blocks/highlighted_processes_cell_spec.rb
+++ b/decidim-participatory_processes/spec/cells/decidim/participatory_processes/content_blocks/highlighted_processes_cell_spec.rb
@@ -33,4 +33,51 @@
       expect(subject).to have_css("a.card__grid", count: 8)
     end
   end
+
+  describe "#cache_hash" do
+    let(:processes) { create_list(:participatory_process, 2, :active, :with_steps, organization:) }
+
+    it "generates a unique hash" do
+      content_block.reload
+      old_hash = cell(content_block.cell, content_block).send(:cache_hash)
+      content_block.reload
+
+      expect(cell(content_block.cell, content_block).send(:cache_hash)).to eq(old_hash)
+    end
+
+    context "when participatory process active_step is updated" do
+      it "generates a different hash" do
+        old_hash = cell(content_block.cell, content_block).send(:cache_hash)
+        active_step = processes.first.active_step
+        active_step.update!(title: { en: "Updated title" })
+
+        expect(cell(content_block.cell, content_block).send(:cache_hash)).not_to eq(old_hash)
+      end
+    end
+
+    context "when parent process is touched via step update" do
+      it "generates a different hash when process is touched" do
+        old_hash = cell(content_block.cell, content_block).send(:cache_hash)
+        process = processes.first
+
+        travel_to(1.second.from_now) do
+          process.update(updated_at: Time.current)
+        end
+
+        expect(cell(content_block.cell, content_block).send(:cache_hash)).not_to eq(old_hash)
+      end
+    end
+
+    context "when current locale change" do
+      let(:alt_locale) { :ca }
+
+      before do
+        allow(I18n).to receive(:locale).and_return(alt_locale)
+      end
+
+      it "generates a different hash" do
+        expect(cell(content_block.cell, content_block).send(:cache_hash)).not_to match(/en$/)
+      end
+    end
+  end
 end
diff --git a/decidim-participatory_processes/spec/cells/decidim/participatory_processes/process_dropdown_metadata_cell_spec.rb b/decidim-participatory_processes/spec/cells/decidim/participatory_processes/process_dropdown_metadata_cell_spec.rb
deleted file mode 100644
index d402cd318436a..0000000000000
--- a/decidim-participatory_processes/spec/cells/decidim/participatory_processes/process_dropdown_metadata_cell_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-require "decidim/core/test/shared_examples/participatory_space_dropdown_metadata_cell_examples"
-
-module Decidim::ParticipatoryProcesses
-  describe ProcessDropdownMetadataCell, type: :cell do
-    controller Decidim::ApplicationController
-
-    subject { cell("decidim/participatory_processes/process_dropdown_metadata", model).call }
-
-    let(:model) { create(:participatory_process, :with_steps) }
-
-    it "renders the current step title" do
-      expect(subject).to have_content "Current phase"
-      expect(subject).to have_content translated(model.active_step.title)
-    end
-
-    include_examples "participatory space dropdown metadata cell"
-  end
-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..09672ab135b8c 100644
--- a/decidim-participatory_processes/spec/commands/create_participatory_process_spec.rb
+++ b/decidim-participatory_processes/spec/commands/create_participatory_process_spec.rb
@@ -40,6 +40,7 @@ module Decidim::ParticipatoryProcesses
         current_user:,
         current_organization: organization,
         organization:,
+        has_members: false,
         private_space: false,
         taxonomizations:,
         errors:,
diff --git a/decidim-participatory_processes/spec/controllers/admin/participatory_space_private_users_csv_imports_controller_spec.rb b/decidim-participatory_processes/spec/controllers/admin/members_csv_imports_controller_spec.rb
similarity index 62%
rename from decidim-participatory_processes/spec/controllers/admin/participatory_space_private_users_csv_imports_controller_spec.rb
rename to decidim-participatory_processes/spec/controllers/admin/members_csv_imports_controller_spec.rb
index 52f995dc7dc95..32957fbc482a7 100644
--- a/decidim-participatory_processes/spec/controllers/admin/participatory_space_private_users_csv_imports_controller_spec.rb
+++ b/decidim-participatory_processes/spec/controllers/admin/members_csv_imports_controller_spec.rb
@@ -5,31 +5,31 @@
 module Decidim
   module ParticipatoryProcesses
     module Admin
-      describe ParticipatorySpacePrivateUsersCsvImportsController do
+      describe MembersCsvImportsController do
         routes { Decidim::ParticipatoryProcesses::AdminEngine.routes }
 
         let!(:organization) { create(:organization) }
         let!(:admin) { create(:user, :admin, :confirmed, organization:) }
         let!(:user) { create(:user, organization:) }
-        let!(:privatable_to) { create(:participatory_process, organization: user.organization, private_space: true) }
-        let!(:private_user) { create(:participatory_space_private_user, user:, privatable_to:) }
+        let!(:participatory_space) { create(:participatory_process, organization: user.organization, has_members: true) }
+        let!(:member) { create(:member, user:, participatory_space:) }
 
         before do
           request.env["decidim.current_organization"] = organization
-          request.env["decidim.current_participatory_process"] = private_user.privatable_to
+          request.env["decidim.current_participatory_process"] = member.participatory_space
           sign_in admin, scope: :user
         end
 
         it "is routed to" do
-          delete :destroy_all, params: { participatory_process_slug: private_user.privatable_to.slug }
+          delete :destroy_all, params: { participatory_process_slug: member.participatory_space.slug }
 
           expect(response).to be_redirect
         end
 
         it "suppress the existing users" do
           expect do
-            delete :destroy_all, params: { participatory_process_slug: private_user.privatable_to.slug, locale: I18n.locale }
-          end.to change { Decidim::ParticipatorySpacePrivateUser.by_participatory_space(private_user.privatable_to).count }.by(-1)
+            delete :destroy_all, params: { participatory_process_slug: member.participatory_space.slug, locale: I18n.locale }
+          end.to change { Decidim::ParticipatorySpace::Member.by_participatory_space(member.participatory_space).count }.by(-1)
         end
       end
     end
diff --git a/decidim-participatory_processes/spec/controllers/participatory_space_private_users_controller_spec.rb b/decidim-participatory_processes/spec/controllers/members_controller_spec.rb
similarity index 80%
rename from decidim-participatory_processes/spec/controllers/participatory_space_private_users_controller_spec.rb
rename to decidim-participatory_processes/spec/controllers/members_controller_spec.rb
index 7aa95902cc201..bff5a78e2d469 100644
--- a/decidim-participatory_processes/spec/controllers/participatory_space_private_users_controller_spec.rb
+++ b/decidim-participatory_processes/spec/controllers/members_controller_spec.rb
@@ -5,15 +5,15 @@
 
 module Decidim
   module ParticipatoryProcesses
-    describe ParticipatorySpacePrivateUsersController do
+    describe MembersController do
       routes { Decidim::ParticipatoryProcesses::Engine.routes }
 
       let(:organization) { create(:organization) }
-      let(:destination_path) { decidim_participatory_processes.participatory_process_path(privatable_to, locale: I18n.locale) }
+      let(:destination_path) { decidim_participatory_processes.participatory_process_path(participatory_space, locale: I18n.locale) }
       let(:slug_param) { "participatory_process_slug" }
-      let(:slug) { privatable_to.slug }
+      let(:slug) { participatory_space.slug }
 
-      let!(:privatable_to) do
+      let!(:participatory_space) do
         create(
           :participatory_process,
           :published,
diff --git a/decidim-participatory_processes/spec/forms/decidim/participatory_processes/admin/participatory_process_import_form_spec.rb b/decidim-participatory_processes/spec/forms/decidim/participatory_processes/admin/participatory_process_import_form_spec.rb
new file mode 100644
index 0000000000000..106e9e333d90b
--- /dev/null
+++ b/decidim-participatory_processes/spec/forms/decidim/participatory_processes/admin/participatory_process_import_form_spec.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      describe ParticipatoryProcessImportForm do
+        subject { form }
+
+        let(:organization) { create(:organization) }
+        let(:document) { upload_test_file(Decidim::Dev.asset("participatory_processes.json"), content_type: "application/json", return_blob: true) }
+        let(:slug) { "imported-process-slug" }
+        let(:title) do
+          {
+            en: "Imported Process",
+            es: "Proceso Importado",
+            ca: "Procés Importat"
+          }
+        end
+
+        let(:params) do
+          {
+            slug:,
+            title_en: title[:en],
+            title_es: title[:es],
+            title_ca: title[:ca],
+            document:,
+            import_steps: true,
+            import_attachments: true,
+            import_components: true
+          }
+        end
+
+        let(:form) do
+          described_class.from_params(params).with_context(
+            current_organization: organization
+          )
+        end
+
+        context "when everything is OK" do
+          it { is_expected.to be_valid }
+        end
+
+        context "when document is missing" do
+          let(:document) { nil }
+
+          it { is_expected.to be_invalid }
+
+          it "adds an error on document" do
+            form.valid?
+            expect(form.errors[:document]).not_to be_empty
+          end
+        end
+
+        context "when document content type is not valid" do
+          let(:document) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg"), return_blob: true) }
+
+          it { is_expected.to be_invalid }
+
+          it "adds an error on document" do
+            form.valid?
+            expect(form.errors[:document]).not_to be_empty
+          end
+        end
+
+        context "when slug is missing" do
+          let(:slug) { nil }
+
+          it { is_expected.to be_invalid }
+        end
+
+        context "when slug is not valid" do
+          let(:slug) { "123-invalid-slug" }
+
+          it { is_expected.to be_invalid }
+        end
+
+        context "when slug is not unique" do
+          before do
+            create(:participatory_process, slug:, organization:)
+          end
+
+          it { is_expected.to be_invalid }
+
+          it "adds an error on slug" do
+            form.valid?
+            expect(form.errors[:slug]).not_to be_empty
+          end
+        end
+
+        context "when default language in title is missing" do
+          let(:title) do
+            {
+              ca: "Procés Importat"
+            }
+          end
+
+          it { is_expected.to be_invalid }
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-participatory_processes/spec/forms/participatory_process_form_spec.rb b/decidim-participatory_processes/spec/forms/participatory_process_form_spec.rb
index 04fae369103d8..1ddc2ec3d98f1 100644
--- a/decidim-participatory_processes/spec/forms/participatory_process_form_spec.rb
+++ b/decidim-participatory_processes/spec/forms/participatory_process_form_spec.rb
@@ -48,6 +48,8 @@ module Admin
         let(:end_date) { 1.month.from_now }
         let(:slug) { "slug" }
         let(:attachment) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
+        let(:private_space) { true }
+        let(:has_members) { true }
         let(:attributes) do
           {
             "participatory_process" => {
@@ -68,11 +70,25 @@ module Admin
               "end_date" => end_date,
               "hero_image" => attachment,
               "slug" => slug,
+              "private_space" => private_space,
+              "has_members" => has_members,
               "taxonomies" => [taxonomies.first.id, taxonomies.second.id]
             }
           }
         end
 
+        context "when has_members is true" do
+          let(:has_members) { true }
+
+          it { is_expected.to be_valid }
+        end
+
+        context "when has_members is false" do
+          let(:has_members) { false }
+
+          it { is_expected.to be_valid }
+        end
+
         context "when everything is OK" do
           it { is_expected.to be_valid }
         end
diff --git a/decidim-participatory_processes/spec/lib/query_extensions_spec.rb b/decidim-participatory_processes/spec/lib/query_extensions_spec.rb
index 44b524a926df9..e425abb6e565e 100644
--- a/decidim-participatory_processes/spec/lib/query_extensions_spec.rb
+++ b/decidim-participatory_processes/spec/lib/query_extensions_spec.rb
@@ -41,9 +41,7 @@ module Core
           let!(:process) { create(:participatory_process) }
           let(:id) { process.id }
 
-          it "returns nil" do
-            expect(response["participatoryProcess"]).to be_nil
-          end
+          it_behaves_like "graphQL not found space"
         end
       end
 
@@ -77,8 +75,8 @@ module Core
           let!(:process) { create(:participatory_process_group, :with_participatory_processes) }
           let(:id) { process.id }
 
-          it "returns nil" do
-            expect(response["participatoryProcessGroup"]).to be_nil
+          it "should not be visible" do
+            expect { response }.to raise_error(Decidim::Api::Errors::NotFoundError, "ParticipatoryProcessGroup not found")
           end
         end
       end
@@ -113,8 +111,8 @@ module Core
           let!(:type) { create(:participatory_process_type, :with_active_participatory_processes) }
           let(:id) { type.id }
 
-          it "returns nil" do
-            expect(response["participatoryProcessType"]).to be_nil
+          it "should not be found" do
+            expect { response }.to raise_error(Decidim::Api::Errors::NotFoundError, "ParticipatoryProcessType not found")
           end
         end
       end
diff --git a/decidim-participatory_processes/spec/models/decidim/participatory_process_spec.rb b/decidim-participatory_processes/spec/models/decidim/participatory_process_spec.rb
index 1fb57a0e6440b..721f7891cd6b9 100644
--- a/decidim-participatory_processes/spec/models/decidim/participatory_process_spec.rb
+++ b/decidim-participatory_processes/spec/models/decidim/participatory_process_spec.rb
@@ -13,7 +13,7 @@ module Decidim
     it { is_expected.to act_as_paranoid }
 
     it_behaves_like "publicable"
-    it_behaves_like "has private users"
+    it_behaves_like "has members"
 
     it "overwrites the log presenter" do
       expect(described_class.log_presenter_class_for(:foo))
diff --git a/decidim-participatory_processes/spec/models/decidim/participatory_process_step_spec.rb b/decidim-participatory_processes/spec/models/decidim/participatory_process_step_spec.rb
index efb17980afadc..fa1676288a66b 100644
--- a/decidim-participatory_processes/spec/models/decidim/participatory_process_step_spec.rb
+++ b/decidim-participatory_processes/spec/models/decidim/participatory_process_step_spec.rb
@@ -116,6 +116,33 @@ module ParticipatoryProcesses
           expect(other_step.position).to eq 0
         end
       end
+
+      context "when parent process is touched on step update" do
+        let(:participatory_process) { create(:participatory_process) }
+        let(:participatory_process_step) do
+          create(:participatory_process_step, participatory_process:)
+        end
+
+        it "touches the parent process" do
+          original_updated_at = participatory_process.updated_at
+
+          travel_to(1.second.from_now) do
+            participatory_process_step.save
+          end
+
+          expect(participatory_process.reload.updated_at).to be > original_updated_at
+        end
+
+        it "changes the process cache_key when step is updated" do
+          original_cache_key = participatory_process.cache_key_with_version
+
+          travel_to(1.second.from_now) do
+            participatory_process_step.save
+          end
+
+          expect(participatory_process.reload.cache_key_with_version).not_to eq(original_cache_key)
+        end
+      end
     end
   end
 end
diff --git a/decidim-participatory_processes/spec/permissions/decidim/participatory_processes/permissions_spec.rb b/decidim-participatory_processes/spec/permissions/decidim/participatory_processes/permissions_spec.rb
index 5dc05a8f7cf38..ee1e263af58fd 100644
--- a/decidim-participatory_processes/spec/permissions/decidim/participatory_processes/permissions_spec.rb
+++ b/decidim-participatory_processes/spec/permissions/decidim/participatory_processes/permissions_spec.rb
@@ -422,11 +422,11 @@
       it_behaves_like "allows any action on subject", :process_step
       it_behaves_like "allows any action on subject", :process_user_role
 
-      context "when private process" do
-        let(:process) { create(:participatory_process, organization:, private_space: true) }
+      context "when process has members" do
+        let(:process) { create(:participatory_process, organization:, has_members: true) }
         let!(:context) { { current_participatory_space: process } }
 
-        it_behaves_like "allows any action on subject", :space_private_user
+        it_behaves_like "allows any action on subject", :space_member
       end
     end
 
@@ -447,11 +447,11 @@
       it_behaves_like "allows any action on subject", :process_step
       it_behaves_like "allows any action on subject", :process_user_role
 
-      context "when private process" do
-        let(:process) { create(:participatory_process, organization:, private_space: true) }
+      context "when process has members" do
+        let(:process) { create(:participatory_process, organization:, has_members: true) }
         let!(:context) { { current_participatory_space: process } }
 
-        it_behaves_like "allows any action on subject", :space_private_user
+        it_behaves_like "allows any action on subject", :space_member
       end
     end
 
diff --git a/decidim-participatory_processes/spec/presenters/decidim/participatory_processes/participatory_process_democratic_quality_stats_presenter_spec.rb b/decidim-participatory_processes/spec/presenters/decidim/participatory_processes/participatory_process_democratic_quality_stats_presenter_spec.rb
index 1605d79f36941..94c6333d21125 100644
--- a/decidim-participatory_processes/spec/presenters/decidim/participatory_processes/participatory_process_democratic_quality_stats_presenter_spec.rb
+++ b/decidim-participatory_processes/spec/presenters/decidim/participatory_processes/participatory_process_democratic_quality_stats_presenter_spec.rb
@@ -9,7 +9,7 @@ module ParticipatoryProcesses
 
       let(:organization) { create(:organization) }
       let(:process) { create(:participatory_process, organization:) }
-      let(:content_block) { double("content_block", settings: settings) }
+      let(:content_block) { double("content_block", settings:) }
       let(:settings) do
         double(
           functional_diversity_invited: 2.5,
diff --git a/decidim-participatory_processes/spec/shared/manage_participatory_process_private_users_examples.rb b/decidim-participatory_processes/spec/shared/manage_participatory_process_private_users_examples.rb
deleted file mode 100644
index d6b1987c1cd10..0000000000000
--- a/decidim-participatory_processes/spec/shared/manage_participatory_process_private_users_examples.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-# frozen_string_literal: true
-
-shared_examples "manage participatory process private users examples" do
-  let(:other_user) { create(:user, organization:, email: "my_email@example.org") }
-
-  let!(:participatory_space_private_user) { create(:participatory_space_private_user, user:, privatable_to: participatory_process) }
-
-  before do
-    switch_to_host(organization.host)
-    login_as user, scope: :user
-    visit decidim_admin_participatory_processes.edit_participatory_process_path(participatory_process)
-    within_admin_sidebar_menu do
-      click_on "Members"
-    end
-  end
-
-  it "shows participatory process private user list" do
-    within "#private_users table" do
-      expect(page).to have_content(participatory_space_private_user.user.email)
-    end
-  end
-
-  it "creates a new participatory process private users" do
-    click_on "New participatory space private user"
-
-    within ".new_participatory_space_private_user" do
-      fill_in :participatory_space_private_user_name, with: "John Doe"
-      fill_in :participatory_space_private_user_email, with: other_user.email
-
-      find("*[type=submit]").click
-    end
-
-    expect(page).to have_admin_callout("successfully")
-
-    within "#private_users table" do
-      expect(page).to have_content(other_user.email)
-    end
-
-    visit decidim_admin.root_path
-    expect(page).to have_content("invited #{other_user.name} to be a private participant")
-  end
-
-  describe "when import a batch of private users from csv" do
-    it "import a batch of participatory space private users" do
-      click_on "Import via CSV"
-
-      # The CSV has no headers
-      expect(Decidim::Admin::ImportParticipatorySpacePrivateUserCsvJob).to receive(:perform_later).once.ordered.with("john.doe@example.org", "John Doe", participatory_process, user)
-      expect(Decidim::Admin::ImportParticipatorySpacePrivateUserCsvJob).to receive(:perform_later).once.ordered.with("jane.doe@example.org", "Jane Doe", participatory_process, user)
-      dynamically_attach_file(:participatory_space_private_user_csv_import_file, Decidim::Dev.asset("import_participatory_space_private_users.csv"))
-      perform_enqueued_jobs { click_on "Upload" }
-
-      expect(page).to have_content("CSV file uploaded successfully")
-    end
-  end
-
-  describe "when managing different users" do
-    before do
-      create(:participatory_space_private_user, user: other_user, privatable_to: participatory_process)
-      visit current_path
-    end
-
-    it "deletes an assembly_private_user" do
-      within "#private_users tr", text: other_user.email do
-        find("button[data-controller='dropdown']").click
-        accept_confirm { click_on "Delete" }
-      end
-
-      expect(page).to have_admin_callout("successfully")
-
-      within "#private_users table" do
-        expect(page).to have_no_content(other_user.email)
-      end
-    end
-
-    context "when the user has not accepted the invitation" do
-      before do
-        form = Decidim::Admin::ParticipatorySpacePrivateUserForm.from_params(
-          name: "test",
-          email: "test@example.org"
-        )
-
-        Decidim::Admin::CreateParticipatorySpacePrivateUser.call(
-          form,
-          participatory_process
-        )
-
-        visit current_path
-      end
-
-      it "resends the invitation to the user" do
-        within "#private_users tr", text: "test@example.org" do
-          find("button[data-controller='dropdown']").click
-          click_on "Resend invitation"
-        end
-
-        expect(page).to have_admin_callout("successfully")
-      end
-    end
-  end
-end
diff --git a/decidim-participatory_processes/spec/system/admin/admin_filters_participatory_process_spec.rb b/decidim-participatory_processes/spec/system/admin/admin_filters_participatory_process_spec.rb
new file mode 100644
index 0000000000000..2992ccb8ecb5c
--- /dev/null
+++ b/decidim-participatory_processes/spec/system/admin/admin_filters_participatory_process_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin sorting participatory processes" do
+  let(:organization) { create(:organization) }
+  let(:user) { create(:user, :admin, :confirmed, organization:) }
+
+  let!(:old_process) { create(:participatory_process, title: { en: "Old Process" }, created_at: 3.weeks.ago, organization:) }
+  let!(:recent_process) { create(:participatory_process, title: { en: "Recent Process" }, created_at: 1.day.ago, organization:) }
+  let!(:newest_process) { create(:participatory_process, title: { en: "Newest Process" }, created_at: Time.current, organization:) }
+
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+    visit decidim_admin_participatory_processes.participatory_processes_path
+  end
+
+  context "when sorting processes by their creation" do
+    it "sorts by created_at descending by default" do
+      within "table thead" do
+        click_link "Created at"
+      end
+
+      titles = page.all("table tbody tr td:first-child")
+      expect(titles[0].text).to include("Newest Process")
+      expect(titles[1].text).to include("Recent Process")
+      expect(titles[2].text).to include("Old Process")
+    end
+
+    it "sorts by created_at ascending when clicked again" do
+      within "table thead" do
+        click_link "Created at"
+        click_link "Created at"
+      end
+
+      titles = page.all("table tbody tr td:first-child")
+      expect(titles[0].text).to include("Old Process")
+      expect(titles[1].text).to include("Recent Process")
+      expect(titles[2].text).to include("Newest Process")
+    end
+  end
+end
diff --git a/decidim-participatory_processes/spec/system/admin/admin_filters_participatory_processes_private_space_users_spec.rb b/decidim-participatory_processes/spec/system/admin/admin_filters_participatory_processes_members_spec.rb
similarity index 66%
rename from decidim-participatory_processes/spec/system/admin/admin_filters_participatory_processes_private_space_users_spec.rb
rename to decidim-participatory_processes/spec/system/admin/admin_filters_participatory_processes_members_spec.rb
index 05fa359119ff7..b48d8102d36c9 100644
--- a/decidim-participatory_processes/spec/system/admin/admin_filters_participatory_processes_private_space_users_spec.rb
+++ b/decidim-participatory_processes/spec/system/admin/admin_filters_participatory_processes_members_spec.rb
@@ -2,24 +2,24 @@
 
 require "spec_helper"
 
-describe "Admin filters participatory processes private space users" do
+describe "Admin filters participatory processes members" do
   include_context "with filterable context"
 
   let(:organization) { create(:organization) }
   let!(:user) { create(:user, :admin, :confirmed, organization:) }
 
   let!(:invited_user1) { create(:user, name:, organization:) }
-  let!(:invited_private_user1) { create(:participatory_space_private_user, user: invited_user1, privatable_to: participatory_process) }
+  let!(:invited_member1) { create(:member, user: invited_user1, participatory_space: participatory_process) }
   let!(:invited_user2) { create(:user, email:, organization:) }
-  let!(:invited_private_user2) { create(:participatory_space_private_user, user: invited_user2, privatable_to: participatory_process) }
+  let!(:invited_member2) { create(:member, user: invited_user2, participatory_space: participatory_process) }
 
   let(:name) { "Dummy Name" }
   let(:email) { "dummy_email@example.org" }
 
-  let(:resource_controller) { Decidim::ParticipatoryProcesses::Admin::ParticipatorySpacePrivateUsersController }
+  let(:resource_controller) { Decidim::ParticipatoryProcesses::Admin::MembersController }
 
-  context "when managing private process" do
-    let(:participatory_process) { create(:participatory_process, organization:, private_space: true) }
+  context "when managing process with members" do
+    let(:participatory_process) { create(:participatory_process, organization:, has_members: true) }
 
     before do
       invited_user1.update!(invitation_sent_at: 1.day.ago, invitation_accepted_at: Time.current)
@@ -36,15 +36,15 @@
     include_examples "searchable participatory space users"
   end
 
-  context "when managing private users in a public process" do
-    let(:participatory_process) { create(:participatory_process, organization:, private_space: false) }
+  context "when trying to manage members and the space does not have members" do
+    let(:participatory_process) { create(:participatory_process, organization:, has_members: false) }
 
     before do
       invited_user1.update!(invitation_sent_at: 1.day.ago, invitation_accepted_at: Time.current)
 
       switch_to_host(organization.host)
       login_as user, scope: :user
-      visit decidim_admin_participatory_processes.participatory_space_private_users_path(participatory_process_slug: participatory_process.slug)
+      visit decidim_admin_participatory_processes.members_path(participatory_process_slug: participatory_process.slug)
     end
 
     it "restricts access" do
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 c56299cd97593..1b33851ee7f86 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
@@ -11,6 +11,18 @@
     visit decidim_admin_participatory_processes.participatory_processes_path
   end
 
+  context "when viewing the import page" do
+    before do
+      within_admin_menu do
+        click_on "Import"
+      end
+    end
+
+    it "displays the import help text" do
+      expect(page).to have_content("This import feature allows you to create a new participatory process from an exported JSON file")
+    end
+  end
+
   context "with context" do
     before "Imports the process with the basic fields" do
       within_admin_menu do
diff --git a/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_process_attachments_spec.rb b/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_process_attachments_spec.rb
index 4557563a07b0b..1018e387e93a5 100644
--- a/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_process_attachments_spec.rb
+++ b/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_process_attachments_spec.rb
@@ -5,5 +5,44 @@
 describe "Admin manages participatory process attachments" do
   include_context "when admin administrating a participatory process"
 
-  it_behaves_like "manage process attachments examples"
+  it_behaves_like "manage process attachments examples" do
+    context "when checking notifications" do
+      it "successfully displays the notification" do
+        create(:follow, user:, followable: attached_to)
+
+        click_on "New attachment"
+
+        within ".new_attachment" do
+          fill_in_i18n(
+            :attachment_title,
+            "#attachment-title-tabs",
+            en: "Very Important Document",
+            es: "Documento Muy Importante",
+            ca: "Document Molt Important"
+          )
+
+          fill_in_i18n(
+            :attachment_description,
+            "#attachment-description-tabs",
+            en: "This document contains important information",
+            es: "Este documento contiene información importante",
+            ca: "Aquest document conté informació important"
+          )
+        end
+
+        dynamically_attach_file(:attachment_file, Decidim::Dev.asset("Exampledocument.pdf"))
+
+        within ".new_attachment" do
+          find("*[type=submit]").click
+        end
+
+        expect(page).to have_admin_callout("successfully")
+
+        wait_enqueued_jobs do
+          visit decidim.notifications_path
+          expect(page).to have_content("A new document has been added to")
+        end
+      end
+    end
+  end
 end
diff --git a/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_process_members_spec.rb b/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_process_members_spec.rb
new file mode 100644
index 0000000000000..80212a44298a9
--- /dev/null
+++ b/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_process_members_spec.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "decidim/admin/test/admin_members_shared_examples"
+
+describe "Admin manages participatory process members" do
+  let!(:user) { create(:user, :admin, :confirmed, organization:) }
+  let(:organization) { create(:organization) }
+  let!(:participatory_space) { create(:participatory_process, organization:, has_members: true) }
+  let(:participatory_space_edit_path) { decidim_admin_participatory_processes.edit_participatory_process_path(participatory_space) }
+
+  it_behaves_like "manage admin members examples"
+end
diff --git a/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_process_private_users_spec.rb b/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_process_private_users_spec.rb
deleted file mode 100644
index 6d4fdb4fb8254..0000000000000
--- a/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_process_private_users_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "Admin manages participatory process private users" do
-  let!(:user) { create(:user, :admin, :confirmed, organization:) }
-  let(:organization) { create(:organization) }
-  let!(:participatory_process) { create(:participatory_process, organization:, private_space: true) }
-
-  it_behaves_like "manage participatory process private users examples"
-end
diff --git a/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_process_soft_delete_spec.rb b/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_process_soft_delete_spec.rb
index e573c80f1f21b..9ac6db70c80e2 100644
--- a/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_process_soft_delete_spec.rb
+++ b/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_process_soft_delete_spec.rb
@@ -14,12 +14,12 @@
   it_behaves_like "manage trashed resource", "participatory process"
 
   context "when a user is collaborator" do
-    let!(:participatory_process) { create(:participatory_process, organization: organization) }
-    let!(:collaborator_user) { create(:user, :admin_terms_accepted, :confirmed, organization: organization) }
+    let!(:participatory_process) { create(:participatory_process, organization:) }
+    let!(:collaborator_user) { create(:user, :admin_terms_accepted, :confirmed, organization:) }
     let!(:collaborator_role) do
       create(:participatory_process_user_role,
              user: collaborator_user,
-             participatory_process: participatory_process,
+             participatory_process:,
              role: :collaborator)
     end
 
@@ -36,12 +36,12 @@
   end
 
   context "when a user is evaluator" do
-    let!(:participatory_process) { create(:participatory_process, organization: organization) }
-    let!(:evaluator_user) { create(:user, :admin_terms_accepted, :confirmed, organization: organization) }
+    let!(:participatory_process) { create(:participatory_process, organization:) }
+    let!(:evaluator_user) { create(:user, :admin_terms_accepted, :confirmed, organization:) }
     let!(:evaluator_role) do
       create(:participatory_process_user_role,
              user: evaluator_user,
-             participatory_process: participatory_process,
+             participatory_process:,
              role: :evaluator)
     end
 
@@ -58,12 +58,12 @@
   end
 
   context "when a user is moderator" do
-    let!(:participatory_process) { create(:participatory_process, organization: organization) }
-    let!(:moderator_user) { create(:user, :admin_terms_accepted, :confirmed, organization: organization) }
+    let!(:participatory_process) { create(:participatory_process, organization:) }
+    let!(:moderator_user) { create(:user, :admin_terms_accepted, :confirmed, organization:) }
     let!(:moderator_role) do
       create(:participatory_process_user_role,
              user: moderator_user,
-             participatory_process: participatory_process,
+             participatory_process:,
              role: :moderator)
     end
 
@@ -80,12 +80,12 @@
   end
 
   context "when a user is a space admin" do
-    let!(:participatory_process) { create(:participatory_process, organization: organization) }
-    let!(:admin_user) { create(:user, :admin_terms_accepted, :confirmed, organization: organization) }
+    let!(:participatory_process) { create(:participatory_process, organization:) }
+    let!(:admin_user) { create(:user, :admin_terms_accepted, :confirmed, organization:) }
     let!(:admin_role) do
       create(:participatory_process_user_role,
              user: admin_user,
-             participatory_process: participatory_process,
+             participatory_process:,
              role: :admin)
     end
 
diff --git a/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_processes_spec.rb b/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_processes_spec.rb
index a5e4bd05dcdf4..2c18b0314bd89 100644
--- a/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_processes_spec.rb
+++ b/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_processes_spec.rb
@@ -18,8 +18,8 @@
     visit decidim_admin_participatory_processes.participatory_processes_path
   end
 
-  context "when conditionally displaying private user menu entry" do
-    let!(:my_space) { create(:participatory_process, organization:, private_space:) }
+  context "when conditionally displaying members menu entry" do
+    let!(:my_space) { create(:participatory_process, organization:, has_members:) }
 
     before do
       switch_to_host(organization.host)
@@ -28,20 +28,20 @@
       click_on translated(my_space.title)
     end
 
-    context "when the participatory process is private" do
-      let(:private_space) { true }
+    context "when the participatory process has members" do
+      let(:has_members) { true }
 
-      it "hides the private user menu entry" do
+      it "shows the member menu entry" do
         within_admin_sidebar_menu do
           expect(page).to have_content("Members")
         end
       end
     end
 
-    context "when the participatory process is public" do
-      let(:private_space) { false }
+    context "when the participatory process has no members" do
+      let(:has_members) { false }
 
-      it "shows the private user menu entry" do
+      it "hides the member menu entry" do
         within_admin_sidebar_menu do
           expect(page).to have_no_content("Members")
         end
diff --git a/decidim-participatory_processes/spec/system/admin/invite_process_admin_spec.rb b/decidim-participatory_processes/spec/system/admin/invite_process_admin_spec.rb
index 3746617f58f27..565d9fd7f6a4a 100644
--- a/decidim-participatory_processes/spec/system/admin/invite_process_admin_spec.rb
+++ b/decidim-participatory_processes/spec/system/admin/invite_process_admin_spec.rb
@@ -6,7 +6,7 @@
 
 describe "Invite process administrator" do
   let(:participatory_space) { create(:participatory_process) }
-  let(:private_participatory_space) { create(:participatory_process, private_space: true) }
+  let(:members_participatory_space) { create(:participatory_process, has_members: true) }
   let(:about_this_space_label) { "About this process" }
   let(:space_admins_label) { "Process admins" }
   let(:space_sidebar_label) { "Processes" }
diff --git a/decidim-participatory_processes/spec/system/members_spec.rb b/decidim-participatory_processes/spec/system/members_spec.rb
new file mode 100644
index 0000000000000..27d3a83ba654b
--- /dev/null
+++ b/decidim-participatory_processes/spec/system/members_spec.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "decidim/core/test/shared_examples/participatory_space_members_shared_examples"
+
+describe "Participatory Process members" do
+  let(:participatory_process) { create(:participatory_process, :with_content_blocks, organization:, blocks_manifests:, has_members: true) }
+  let(:participatory_space) { participatory_process }
+  let(:participatory_space_homepage_path) { decidim_participatory_processes.participatory_process_path(participatory_space, locale: I18n.locale) }
+  let(:members_path) { decidim_participatory_processes.participatory_process_members_path(participatory_space, locale: I18n.locale) }
+  let(:unexisting_participatory_space_members_path) { decidim_participatory_processes.participatory_process_members_path(participatory_process_slug: 999_999_999, locale: I18n.locale) }
+
+  it_behaves_like "participatory space members"
+end
diff --git a/decidim-participatory_processes/spec/system/participatory_process_steps_spec.rb b/decidim-participatory_processes/spec/system/participatory_process_steps_spec.rb
index 25dc891277ea5..3315674dcc759 100644
--- a/decidim-participatory_processes/spec/system/participatory_process_steps_spec.rb
+++ b/decidim-participatory_processes/spec/system/participatory_process_steps_spec.rb
@@ -33,6 +33,25 @@
       end
     end
 
+    context "when activating a step" do
+      let!(:user) { create(:user, :confirmed, organization:) }
+      let!(:follow) { create(:follow, user:, followable: participatory_process) }
+
+      before do
+        participatory_process.steps.first.update!(active: true)
+        Decidim::ParticipatoryProcesses::Admin::ActivateParticipatoryProcessStep.call(steps.last, user)
+        login_as user, scope: :user
+        switch_to_host(organization.host)
+      end
+
+      it "triggers a notification" do
+        wait_enqueued_jobs do
+          visit decidim.notifications_path
+          expect(page).to have_content("phase is now active for")
+        end
+      end
+    end
+
     it "lists all the steps" do
       visit decidim_participatory_processes.participatory_process_path(participatory_process, locale: I18n.locale, display_steps: true)
 
diff --git a/decidim-participatory_processes/spec/system/participatory_process_breadcrumb_spec.rb b/decidim-participatory_processes/spec/system/participatory_processes_breadcrumbs_spec.rb
similarity index 98%
rename from decidim-participatory_processes/spec/system/participatory_process_breadcrumb_spec.rb
rename to decidim-participatory_processes/spec/system/participatory_processes_breadcrumbs_spec.rb
index b99555e9e657c..2a807bb5c4e48 100644
--- a/decidim-participatory_processes/spec/system/participatory_process_breadcrumb_spec.rb
+++ b/decidim-participatory_processes/spec/system/participatory_processes_breadcrumbs_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "Participatory Process Breadcrumb" do
+describe "Participatory Processes Breadcrumb" do
   let(:organization) { create(:organization) }
   let(:participatory_space) { create(:participatory_process, :published, organization:) }
   let(:component) { create(:proposal_component, :published, participatory_space:) }
diff --git a/decidim-participatory_processes/spec/system/private_participatory_processes_spec.rb b/decidim-participatory_processes/spec/system/private_participatory_processes_spec.rb
index da50a37cc0584..6765265c7844f 100644
--- a/decidim-participatory_processes/spec/system/private_participatory_processes_spec.rb
+++ b/decidim-participatory_processes/spec/system/private_participatory_processes_spec.rb
@@ -10,8 +10,8 @@
   let!(:user) { create(:user, :confirmed, organization:) }
   let!(:other_user) { create(:user, :confirmed, organization:) }
   let!(:other_user2) { create(:user, :confirmed, organization:) }
-  let!(:participatory_space_private_user) { create(:participatory_space_private_user, user: other_user, privatable_to: private_participatory_process) }
-  let!(:participatory_space_private_user2) { create(:participatory_space_private_user, user: other_user2, privatable_to: private_participatory_process) }
+  let!(:member) { create(:member, user: other_user, participatory_space: private_participatory_process) }
+  let!(:member2) { create(:member, user: other_user2, participatory_space: private_participatory_process) }
 
   context "when there are private participatory processes" do
     context "and no user is logged in" do
@@ -35,7 +35,7 @@
     end
 
     context "when user is logged" do
-      context "when is not a participatory space private user" do
+      context "when is not a member" do
         before do
           switch_to_host(organization.host)
           login_as user, scope: :user
@@ -84,7 +84,7 @@
       end
     end
 
-    context "when user is logged in and is participatory space private user" do
+    context "when user is logged in and is member" do
       before do
         switch_to_host(organization.host)
         login_as other_user, scope: :user
diff --git a/decidim-participatory_processes/spec/types/integration_schema_spec.rb b/decidim-participatory_processes/spec/types/integration_schema_spec.rb
index 7f8e923d5984e..4f5fd46dcad8d 100644
--- a/decidim-participatory_processes/spec/types/integration_schema_spec.rb
+++ b/decidim-participatory_processes/spec/types/integration_schema_spec.rb
@@ -245,6 +245,7 @@
     )
   end
 
+  include_examples "when the introspection is disabled"
   describe "valid query" do
     it "executes successfully" do
       expect { response }.not_to raise_error
@@ -316,8 +317,8 @@
         end
       end
 
-      context "when the current user is a private participant" do
-        let!(:private_user) { create(:participatory_space_private_user, privatable_to: private_process, user: current_user) }
+      context "when the current user is a member" do
+        let!(:member) { create(:member, participatory_space: private_process, user: current_user) }
 
         it "returns all spaces" do
           expect(response["participatoryProcesses"]).to include(
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 0d4f975adacf9..d3a2517793c0e 100644
--- a/decidim-proposals/app/cells/decidim/proposals/proposal_vote/show.erb
+++ b/decidim-proposals/app/cells/decidim/proposals/proposal_vote/show.erb
@@ -1,4 +1,4 @@
-<% if !current_settings.votes_hidden? && (current_component.participatory_space.can_participate?(current_user) || current_user.admin?) %>
+<% 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 %>
diff --git a/decidim-proposals/app/commands/decidim/proposals/unvote_proposal.rb b/decidim-proposals/app/commands/decidim/proposals/unvote_proposal.rb
index 29545a15e4470..7f9a0d190d44d 100644
--- a/decidim-proposals/app/commands/decidim/proposals/unvote_proposal.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/unvote_proposal.rb
@@ -16,7 +16,6 @@ def initialize(proposal, current_user)
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid, together with the proposal.
-      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call
diff --git a/decidim-proposals/app/controllers/decidim/proposals/proposals_controller.rb b/decidim-proposals/app/controllers/decidim/proposals/proposals_controller.rb
index c4022c86680bb..a7ad7ae1ecbe5 100644
--- a/decidim-proposals/app/controllers/decidim/proposals/proposals_controller.rb
+++ b/decidim-proposals/app/controllers/decidim/proposals/proposals_controller.rb
@@ -290,22 +290,26 @@ def default_view_mode
         @default_view_mode ||= current_component.settings.attachments_allowed? ? "grid" : "list"
       end
 
+      def add_parent_breadcrumb_item
+        return {} if proposal.blank?
+
+        object = proposal.emendation? ? proposal.amendable : proposal
+        {
+          label: translated_attribute(object.title),
+          url: Decidim::EngineRouter.main_proxy(current_component).proposal_path(object),
+          active: false
+        }
+      end
+
       def add_breadcrumb_item
         return {} if proposal.blank?
+        return {} if proposal.amendable?
 
-        if proposal.emendation?
-          {
-            label: translated_attribute(proposal.amendable.title),
-            url: Decidim::EngineRouter.main_proxy(current_component).proposal_path(proposal.amendable),
-            active: false
-          }
-        else
-          {
-            label: translated_attribute(proposal.title),
-            url: Decidim::EngineRouter.main_proxy(current_component).proposal_path(proposal),
-            active: false
-          }
-        end
+        {
+          label: I18n.t("decidim.amendments.name"),
+          url: Decidim::EngineRouter.main_proxy(current_component).proposal_path(proposal),
+          active: false
+        }
       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 b43f0c95983b9..47010b4acfc5c 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
@@ -10,13 +10,11 @@ class ProposalsImportForm < Decidim::Form
         mimic :proposals_import
 
         attribute :origin_component_id, Integer
-        attribute :import_proposals, Boolean
         attribute :keep_answers, Boolean
         attribute :keep_authors, Boolean
-        attribute :states, Array
+        attribute :states, Array[String]
 
         validates :origin_component_id, :origin_component, :states, :current_component, presence: true
-        validates :import_proposals, allow_nil: false, acceptance: true
         validate :valid_states
 
         def states_collection
@@ -44,11 +42,22 @@ def origin_components_collection
           end
         end
 
+        def available_states(component_id = nil)
+          scope = Decidim::Proposals::ProposalState
+          scope = scope.where(component: Decidim::Component.find(component_id)) if component_id.present?
+
+          states = scope.pluck(:token).uniq.map do |token|
+            OpenStruct.new(token:, title: token.humanize)
+          end
+
+          states + [OpenStruct.new(token: "not_answered", title: I18n.t("decidim.proposals.answers.not_answered"))]
+        end
+
         private
 
         def valid_states
           return if states.all? do |state|
-            states_collection.pluck(:token).include?(state)
+            available_states(origin_component_id).pluck(:token).include?(state)
           end
 
           errors.add(:states, :invalid)
diff --git a/decidim-proposals/app/permissions/decidim/proposals/permissions.rb b/decidim-proposals/app/permissions/decidim/proposals/permissions.rb
index 9d4a274bbb750..91b13ef2ec6b5 100644
--- a/decidim-proposals/app/permissions/decidim/proposals/permissions.rb
+++ b/decidim-proposals/app/permissions/decidim/proposals/permissions.rb
@@ -79,7 +79,7 @@ def can_edit_proposal?
       end
 
       def can_withdraw_proposal?
-        toggle_allow(proposal && proposal.authored_by?(user))
+        toggle_allow(proposal && !proposal.withdrawn? && proposal.authored_by?(user))
       end
 
       def can_create_amendment?
diff --git a/decidim-proposals/app/views/decidim/proposals/admin/proposals_imports/new.html.erb b/decidim-proposals/app/views/decidim/proposals/admin/proposals_imports/new.html.erb
index dafb8bf70d053..e49e717c12224 100644
--- a/decidim-proposals/app/views/decidim/proposals/admin/proposals_imports/new.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/admin/proposals_imports/new.html.erb
@@ -16,10 +16,14 @@
                 <%= f.select :origin_component_id, @form.origin_components_collection, prompt: t(".select_component") %>
               </div>
               <div class="row column">
-                <%= f.label t(".select_states") %>
-                <%= f.collection_check_boxes :states, @form.states_collection, :token, :title do |b| %>
-                  <div>
-                    <%= b.label { b.check_box + translated_attribute(b.text) } %>
+                <label class="ml-4"><%= t(".select_states") %></label>
+                <% if @form.available_states.any? %>
+                  <div class="row column">
+                    <%= f.collection_check_boxes :states, @form.available_states, :token, ->(a) { translated_attribute(a.title) } do |builder| %>
+                    <div>
+                      <%= builder.label { builder.check_box + builder.text } %>
+                    </div>
+                    <% end %>
                   </div>
                 <% end %>
               </div>
@@ -29,9 +33,6 @@
               <div class="row column">
                 <%= f.check_box :keep_answers %>
               </div>
-              <div class="row column">
-                <%= f.check_box :import_proposals %>
-              </div>
             </div>
           </div>
         </div>
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 a01db0fd69890..ecb6049f3bbd6 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
@@ -21,5 +21,6 @@
                       button_edit_label: t("decidim.proposals.collaborative_drafts.new.edit_file"),
                       button_class: "button button__lg button__transparent-secondary w-full",
                       help_text: t("attachment_legend", scope: "decidim.proposals.collaborative_drafts.edit"),
-                      help_i18n_scope: "decidim.forms.file_help.file" %>
+                      help_i18n_scope: "decidim.forms.file_help.file",
+                      paragraph: true %>
 <% end %>
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 df4e316399256..90175af59b412 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
@@ -22,7 +22,6 @@
     <%= filter_taxonomy_items_select_field form, :taxonomies, filter %>
   <% end %>
 <% end %>
-
 <% if component_settings.attachments_allowed? && (new_proposal || @proposal) %>
   <%= form.attachment :documents,
                       multiple: true,
@@ -31,5 +30,6 @@
                       button_edit_label: t("decidim.proposals.proposals.edit.edit_attachments"),
                       button_class: "button button__lg button__transparent-secondary w-full",
                       help_i18n_scope: "decidim.forms.file_help.file",
-                      help_text: t("attachment_legend", scope: "decidim.proposals.proposals.edit") %>
+                      help_text: t("attachment_legend", scope: "decidim.proposals.proposals.edit"),
+                      paragraph: true %>
 <% 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
index df48911abd243..fde49c5ff07b8 100644
--- a/decidim-proposals/app/views/decidim/proposals/proposals/_votes_count.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/proposals/_votes_count.html.erb
@@ -1,4 +1,4 @@
-<% if !current_settings.votes_hidden? && (current_component.participatory_space.can_participate?(current_user) || current_user.admin?) %>
+<% 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 %>
diff --git a/decidim-proposals/app/views/decidim/proposals/proposals/index.html.erb b/decidim-proposals/app/views/decidim/proposals/proposals/index.html.erb
index 9371bda1c8c23..af5bce51a3f85 100644
--- a/decidim-proposals/app/views/decidim/proposals/proposals/index.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/proposals/index.html.erb
@@ -1,7 +1,7 @@
 <% add_decidim_meta_tags(
   description: translated_attribute(current_participatory_space.short_description),
   title: t("decidim.components.pagination.page_title",
-           component_name: component_name,
+           component_name:,
            current_page: @proposals.current_page,
            total_pages: @proposals.total_pages ),
   url: proposals_url,
diff --git a/decidim-proposals/config/locales/cs.yml b/decidim-proposals/config/locales/cs.yml
index e8eadad2e6715..7379b5124f4dc 100644
--- a/decidim-proposals/config/locales/cs.yml
+++ b/decidim-proposals/config/locales/cs.yml
@@ -150,6 +150,8 @@ cs:
             values:
               state_not_published: Nezodpovězeno
               state_published: Odpovězeno
+      tooltips:
+        deleted_proposals_info: Tento návrh nelze odstranit
     application:
       geocoding:
         not_configured: Geocoding není nakonfigurován!
@@ -333,6 +335,8 @@ cs:
           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í.
           email_subject: Návrhy jsou nyní k dispozici v %{participatory_space_title}
           notification_title: Nyní můžete předložit <a href="%{resource_path}">nové návrhy</a> v <a href="%{participatory_space_url}">%{participatory_space_title}</a>.
+        liking_enabled:
+          email_outro: Obdrželi jste toto oznámení, protože sledujete %{participatory_space_title}. Můžete přestat přijímat oznámení na předchozím odkazu.
         proposal_mentioned:
           email_intro: Váš návrh "%{mentioned_proposal_title}" byl zmíněn <a href="%{resource_url}">v této skupině</a> v komentářích.
           email_outro: Toto oznámení jste obdrželi, protože jste autorem položky "%{resource_title}".
diff --git a/decidim-proposals/config/locales/de.yml b/decidim-proposals/config/locales/de.yml
index 0d58a4e0df184..2dd7dd2303e3d 100644
--- a/decidim-proposals/config/locales/de.yml
+++ b/decidim-proposals/config/locales/de.yml
@@ -110,8 +110,8 @@ de:
         one: Anmerkung
         other: Anmerkungen
       decidim/proposals/proposal_vote:
-        one: Abstimmung
-        other: Abstimmungen
+        one: Stimme
+        other: Stimmen
   decidim:
     admin:
       admin_log:
diff --git a/decidim-proposals/config/locales/en.yml b/decidim-proposals/config/locales/en.yml
index 0b7db59b1814c..28639a99f3f93 100644
--- a/decidim-proposals/config/locales/en.yml
+++ b/decidim-proposals/config/locales/en.yml
@@ -53,7 +53,7 @@ en:
         file: File
       proposals_import:
         import_proposals: Import proposals
-        keep_answers: Keep state and answers
+        keep_answers: Keep statuses and answers
         keep_authors: Keep original authors
     errors:
       models:
@@ -690,7 +690,7 @@ en:
             create: Import proposals
             no_components: There are no other proposal components in this participatory space to import the proposals from.
             select_component: Please select a component
-            select_states: Check the status of the proposals to import
+            select_states: Import only proposals with these statuses. If none are selected, all proposals will be imported.
             title: Import proposals from another component
         proposals_merges:
           create:
diff --git a/decidim-proposals/config/locales/eu.yml b/decidim-proposals/config/locales/eu.yml
index 6d27b4da114a2..fdacb074060ca 100644
--- a/decidim-proposals/config/locales/eu.yml
+++ b/decidim-proposals/config/locales/eu.yml
@@ -386,7 +386,7 @@ eu:
       badges:
         accepted_proposals:
           conditions:
-            - Aukeratu zure intereseko partaidetza espazioa proposamenak bidaltzeko
+            - 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_another: Parte-hartzaile honek %{score} proposamen onartu ditu.
@@ -408,7 +408,7 @@ eu:
           unearned_own: Oraindik ez duzu proposamenik bozkatu.
         proposals:
           conditions:
-            - Aukeratu zure interesekoa den parte hartzeko espazioa, gaitutako proposamenak aurkeztuta
+            - Aukeratu zure interesekoa den partaidetza-espazioa, gaitutako proposamenak aurkeztuta
             - Sortu beste proposamen bat
           description: Garaikur hau proposamen berriekin modu aktiboan parte hartzen duzunean ematen da.
           description_another: Parte-hartzaile honek %{score} proposamen sortu ditu.
@@ -600,7 +600,7 @@ eu:
           destroy:
             success: Egoera behar bezala ezabatua
           edit:
-            title: Editatu egoera
+            title: Egoera editatu
             update: Eguneratu
           form:
             preview: Aurrebistaratu
@@ -721,7 +721,7 @@ eu:
         accepted: Onartuta
         evaluating: Ebaluatzen
         not_answered: Erantzun gabe
-        rejected: Ukatua
+        rejected: Bazteruta
         withdrawn: Kendu
       application_helper:
         filter_origin_values:
@@ -1000,7 +1000,7 @@ eu:
           already_voted_hover: Kendu babesa
           maximum_votes_reached: Babesen muga lortua
           no_votes_remaining: Ez da gelditzen babesik
-          vote: Alde egin
+          vote: Babesa eman
           votes_blocked: Eman botoa
         votes_count:
           count:
@@ -1023,7 +1023,7 @@ eu:
           title: Parte hartzeko arauak
           vote_limit:
             description: '%{limit} proposameni eman ahal diozu babesa.'
-            votes: Gainerako %{number} babes
+            votes: '%{number} babes emateke'
         wizard_aside:
           back: Atzera
           back_from_step_1: Itzuli proposamenetara
diff --git a/decidim-proposals/config/locales/pt-BR.yml b/decidim-proposals/config/locales/pt-BR.yml
index 4a9573c2c268c..af098b17e92ec 100644
--- a/decidim-proposals/config/locales/pt-BR.yml
+++ b/decidim-proposals/config/locales/pt-BR.yml
@@ -9,13 +9,21 @@ pt-BR:
         scope_id: Escopo
         state: Estado
         title: Título
+      evaluation_assignment:
+        admin_log:
+          evaluator_role_id: Nome do avaliador
+      import_participatory_text:
+        document: Documento
       proposal:
         address: Endereço
         answer: Responda
         answered_at: Respondido em
         body: Corpo
+        decidim_proposals_proposal_state_id: Estado
         decidim_scope_id: Escopo
         has_address: Tem endereço
+        latitude: Latitude
+        longitude: Longitude
         scope_id: Escopo
         state: Estado
         title: Título
@@ -24,8 +32,24 @@ pt-BR:
         cost: Custo
         cost_report: Relatório de custos
         execution_period: Período de execução
+      proposal_state:
+        announcement_title: Título da resposta
+        bg_color: Cor de fundo
+        colors:
+          blue: Azul
+          gray: Cinza
+          green: Verde
+          orange: Laranja
+          pink: Rosa
+          purple: Roxo
+          red: Vermelho
+          yellow: Amarelo
+        text_color: Cor do texto
       proposals_copy:
+        copy_proposals: Entendo que isso importará todas as propostas do componente selecionado para o componente atual e que essa ação não pode ser desfeita.
         origin_component_id: Componente para copiar as propostas de
+      proposals_file_import:
+        file: Arquivo
       proposals_import:
         import_proposals: Importar propostas
         keep_answers: Manter o estado e as respostas
@@ -47,13 +71,35 @@ pt-BR:
               identical: E o título não pode ser idêntico
             title:
               identical: E o corpo não pode ser idêntico
+        proposals_merge:
+          attributes:
+            base:
+              not_official: Não são oficiais
+              voted: Já recebeu votos ou curtidas
+        proposals_split:
+          attributes:
+            base:
+              not_official: Não são oficiais
+              voted: Já recebeu votos ou curtidas
     models:
+      decidim/proposals/admin/update_proposal_taxonomies_event: Taxonomias da proposta alteradas
       decidim/proposals/creation_enabled_event: Criação de proposta ativada
+      decidim/proposals/liking_enabled_event: Curtir propostas ativado
       decidim/proposals/proposal_mentioned_event: Proposta mencionada
       decidim/proposals/publish_proposal_event: Proposta publicada
       decidim/proposals/voting_enabled_event: Proposta de votação ativada
   activerecord:
     models:
+      decidim:
+        proposals:
+          proposal:
+            budget_text: A proposta <span class="resource-link">%{link} foi criada</span>
+            import_from_proposal_text: 'Foi tornado esta proposta: %{link}'
+            import_to_proposal_text: A proposta <span "resource-link">%{link} foi criada</span>
+            merge_from_proposal_text: 'Foi tornado esta proposta: %{link}'
+            merge_to_proposal_text: 'Esta proposta foi criada: %{link}'
+            split_from_proposal_text: 'Foi tornado esta proposta: %{link}'
+            split_to_proposal_text: 'Esta proposta foi criada: %{link}'
       decidim/proposals/collaborative_draft:
         one: Rascunho colaborativo
         other: Rascunhos colaborativos
@@ -68,13 +114,20 @@ pt-BR:
         other: Votos
   decidim:
     admin:
+      admin_log:
+        changeset:
+          proposals: Propostas
       filters:
         proposals:
+          evaluator_role_ids_has:
+            label: Atribuído ao avaliador
           is_emendation_true:
             label: Tipo
             values:
               'false': Propostas
               'true': Emendas
+          proposal_state_id_eq:
+            label: Estado
           state_eq:
             label: Estado
             values:
@@ -85,14 +138,27 @@ pt-BR:
               rejected: Rejeitado
               validating: Validação técnica
               withdrawn: Retirado
+          taxonomies_part_of_contains:
+            label: Taxonomia
           with_any_state:
+            label: Respondido
             values:
               state_not_published: Não respondido
+              state_published: Respondido
+      tooltips:
+        cannot_edit_proposal_info: Não é possível editar esta proposta, pois ela foi criada por um participante ou já recebeu votos
+        deleted_proposal_states_info: Não é possível excluir o estado desta proposta porque há propostas atribuídas a ela
+        deleted_proposals_info: Não é possível excluir esta proposta
+    application:
+      geocoding:
+        not_configured: Geocodificação não está configurado!
     components:
       proposals:
         actions:
           amend: Alterar
           comment: Comentar
+          create: Criar uma proposta
+          like: Curtir
           vote: Voto
           vote_comment: Votar no documento
           withdraw: retirar o
@@ -104,15 +170,36 @@ pt-BR:
             amendments_wizard_help_text: Texto de ajuda do Assistente
             announcement: Anúncio
             attachments_allowed: Permitir anexos
+            attachments_allowed_help: Ao ativar esta opção, as propostas serão predefinidas no modo de grade, e a primeira imagem aparecerá no cartão.
+            can_accumulate_votes_beyond_threshold: Pode acumular votos além do limite
+            clear_all: Limpar tudo
             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:
+              automatic: Automático
               most_commented: Mais comentado
+              most_followed: Mais seguido
+              most_liked: Mais curtido
+              most_voted: Mais votado
+              random: Aleatório
+              recent: Recente
+              with_more_authors: Com mais autores
+            define_taxonomy_filters: Por favor, defina alguns filtros para este espaço participativo antes de usar esta configuração.
+            edit_time: As propostas podem ser editadas pelos autores antes que esse tempo decorra
+            edit_time_units:
+              days: Dias
+              hours: Horas
+              minutes: Minutos
+            geocoding_enabled: Mapas ativados
             minimum_votes_per_user: Mínimo de votos por usuário
             new_proposal_body_template: Novo modelo de corpo da proposta
             new_proposal_body_template_help: Você pode definir o texto pré-preenchido que as novas propostas terão
             new_proposal_help_text: Novo texto de ajuda da proposta
+            no_taxonomy_filters_found: Nenhum filtro de taxonomia encontrado.
             official_proposals_enabled: Proposta oficial habilitada
             participatory_texts_enabled: Textos participativos habilitados
             participatory_texts_enabled_readonly: Não é possível interagir com esta configuração se houver propostas existentes. Por Favor, crie um novo componente `Propostas` se você quiser habilitar esta funcionalidade ou descartar todas as propostas importadas no menu `Textos Participatórios` se você quiser desativá-la.
@@ -121,11 +208,19 @@ pt-BR:
             proposal_edit_time_choices:
               infinite: Permitir a edição de propostas por um período infinito de tempo
               limited: Permitir a edição de propostas em um período de tempo específico
+            proposal_edit_time_unit_options:
+              days: Dias
+              hours: Horas
+              minutes: Minutos
             proposal_length: Comprimento máximo do corpo da proposta
             proposal_limit: Limite da proposta por usuário
             proposal_wizard_step_1_help_text: Assistente de propostas "Criar" passo ajuda texto
+            proposal_wizard_step_2_help_text: Texto de ajuda da etapa "Publicar" do assistente de propostas
             resources_permissions_enabled: Permissões de ações podem ser definidas para cada proposta
+            taxonomy_filters: Selecione os filtros para o componente
+            taxonomy_filters_add: Adicionar filtro
             threshold_per_proposal: Limiar por proposta
+            vote_limit: Limite de votos por participante
           step:
             amendment_creation_enabled: Criação de alteração ativada
             amendment_creation_enabled_help: O usuário pode alterar propostas.
@@ -143,18 +238,66 @@ pt-BR:
             comments_blocked: Comentários bloqueados
             creation_enabled: Os participantes podem criar propostas
             creation_enabled_readonly: Essa configuração é desativada quando você ativa a funcionalidade de textos participativos. Para enviar propostas como texto participativo, clique no botão de textos participativos e siga as instruções.
+            default_sort_order: Classificação de propostas padrão
+            default_sort_order_help: O termo "automático" significa que, se as votações estiverem ativadas, as propostas serão exibidas em ordem aleatória e, se as votações estiverem bloqueadas, serão ordenadas pelas mais votadas.
             default_sort_order_options:
+              automatic: Automático
               most_commented: Mais comentado
+              most_followed: Mais seguido
+              most_liked: Mais curtido
+              most_voted: Mais votado
+              random: Aleatório
+              recent: Recente
+              with_more_authors: Com mais autores
+            likes_blocked: Curtidas bloqueadas
+            likes_enabled: Curtidas ativadas
             proposal_answering_enabled: Resposta de proposta ativada
             publish_answers_immediately: Publicar respostas da proposta imediatamente
+            publish_answers_immediately_help_html: 'Observe que, se você responder a alguma proposta sem essa opção ativada, precisará publicá-la manualmente, selecionando-a e usando a ação de publicação. Para obter mais informações sobre como isso funciona, consulte <a href="https://docs.decidim.org/en/admin/components/proposals/answers#_publication" target="_blank">página de documentação das respostas às propostas</a>.'
             votes_blocked: Votos bloqueados
             votes_enabled: Votos ativados
             votes_hidden: Votos ocultos (se os votos estiverem ativados, verificar isso esconderá o número de votos)
+    download_your_data:
+      show:
+        proposal_comments: Exportação de comentários da proposta
+        proposals: Exportação de propostas
     events:
       proposals:
+        accepted_coauthorship:
+          notification_title: Você foi adicionado como um co-autor da proposta <a href="%{resource_path}">%{resource_title}</a>.
         admin:
+          proposal_assigned_to_evaluator:
+            email_intro: Você foi designado como avaliador da proposta "%{resource_title}". Isso significa que você foi incumbido de dar comentário e uma resposta adequada nos próximos dias. 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: Você foi atribuído como um avaliador da proposta %{resource_title}.
+            notification_title: Você foi atribuído como um avaliador da proposta <a href="%{resource_path}">%{resource_title}</a>. Confira no <a href="%{admin_proposal_info_path}">painel de administração</a>.
           proposal_note_created:
+            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:
+          actions:
+            accept: Aceitar
+            decline: Recusar
+          email_intro: 'Você foi convidado para ser um co-autor da proposta "%{resource_title}". Você pode aceitar ou recusar o convite nesta página:'
+          email_outro: Você recebeu esta notificação porque o autor da proposta quer reconhecer suas contribuições tornando-se um co-autor.
+          email_subject: Você foi convidado para ser um co-autor da proposta "%{resource_title}"
+          notification_title: <a href="%{author_path}">%{author_name}</a> gostaria de convidá-lo como co-autor da proposta <a href="%{resource_path}">%{resource_title}</a>.
+        coauthor_rejected_invite:
+          notification_title: <a href="%{coauthor_path}">%{coauthor_name}</a> recusou seu convite para se tornar um co-autor da proposta <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_accepted:
           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>.
@@ -189,11 +332,22 @@ pt-BR:
           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.
           email_subject: Propostas agora disponíveis em %{participatory_space_title}
+          notification_title: Agora você pode apresentar <a href="%{resource_path}">novas propostas</a> em <a href="%{participatory_space_url}">%{participatory_space_title}</a>.
+        liking_enabled:
+          email_intro: 'Você pode curtir 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.
+          email_subject: A curtida nas propostas começou por %{participatory_space_title}
+          notification_title: Agora você pode começar a<a href="%{resource_path}">curtir propostas</a> em <a href="%{participatory_space_url}">%{participatory_space_title}</a>.
         proposal_mentioned:
           email_intro: Sua proposta "%{mentioned_proposal_title}" foi mencionada <a href="%{resource_url}">neste espaço</a> nos comentários.
           email_outro: Você recebeu esta notificação porque é um autor de "%{resource_title}".
           email_subject: Sua proposta "%{mentioned_proposal_title}" foi mencionada
           notification_title: Sua proposta "%{mentioned_proposal_title}" foi mencionada <a href="%{resource_path}">neste espaço</a> nos comentários.
+        proposal_merged:
+          email_intro: 'Um administrador mesclou sua proposta "%{resource_title}", confira nesta página:'
+          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.
@@ -205,9 +359,28 @@ pt-BR:
           email_subject: Nova proposta "%{resource_title}" adicionada a %{participatory_space_title}
           notification_title: A proposta <a href="%{resource_path}">%{resource_title}</a> foi adicionada a %{participatory_space_title} por %{author}.
           notification_title_official: A proposta oficial <a href="%{resource_path}">%{resource_title}</a> foi adicionada à %{participatory_space_title}.
+        proposal_state_changed:
+          affected_user:
+            email_intro: 'A proposta "%{resource_title}" mudou seu estado para "%{state}". Você pode ler a resposta nesta página:'
+            email_outro: Você recebeu esta notificação porque é um autor de "%{resource_title}".
+            email_subject: Sua proposta mudou seu estado (%{state})
+            notification_title: Sua proposta <a href="%{resource_path}">%{resource_title}</a> mudou seu estado para "%{state}".
+          follower:
+            email_intro: 'A proposta "%{resource_title}" mudou seu estado para "%{state}". Você pode ler a resposta nesta página:'
+            email_outro: Você recebeu esta notificação porque está seguindo "%{resource_title}". Você pode ignorá-lo do link anterior.
+            email_subject: Uma proposta que você está seguindo mudou seu estado (%{state})
+            notification_title: A proposta <a href="%{resource_path}">%{resource_title}</a> mudou seu estado para "%{state}".
+        proposal_update_taxonomies:
+          email_intro: 'Um administrador atualizou as taxonomias de sua proposta "%{resource_title}", confira nesta página:'
+          email_outro: Você recebeu esta notificação porque você é o autor da proposta.
+          email_subject: As taxonomias da proposta %{resource_title} foram atualizadas
+          notification_title: As taxonomias <a href="%{resource_path}">%{resource_title}</a> da proposta foram atualizadas por um administrador.
+        rejected_coauthorship:
+          notification_title: Você recusou o convite de <a href="%{author_path}">%{author_name}</a> para se tornar um co-autor da proposta <a href="%{resource_path}">%{resource_title}</a>.
         voting_enabled:
           email_intro: 'Você pode votar 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.
+          email_subject: A votação da proposta começou para %{participatory_space_title}
           notification_title: Agora você pode iniciar <a href="%{resource_path}">propostas de votação</a> em <a href="%{participatory_space_url}">%{participatory_space_title}</a>
     gamification:
       badges:
@@ -225,7 +398,14 @@ pt-BR:
         proposal_votes:
           conditions:
             - Navegue e passe algum tempo lendo as propostas de outras pessoas
-            - 
+            - Vote nas propostas que você gosta ou acha interessantes
+          description: Este selo é concedido quando votam nas propostas das outras pessoas.
+          description_another: Este usuário votou nas propostas %{score}.
+          description_own: Você votou nas propostas %{score}.
+          name: Votos da proposta
+          next_level_in: Vote em mais %{score} propostas para alcançar o próximo nível!
+          unearned_another: Este usuário ainda não votou em nenhuma proposta.
+          unearned_own: Você ainda não votou em nenhuma proposta.
         proposals:
           conditions:
             - Escolha o espaço de participação de seu interesse com o envio de propostas ativadas
@@ -235,26 +415,121 @@ pt-BR:
           description_own: Você criou %{score} propostas.
           name: Propostas
           next_level_in: Crie mais %{score} propostas para alcançar o próximo nível!
+          unearned_another: Este usuário ainda não criou nenhuma proposta.
           unearned_own: Você não criou nenhuma proposta ainda.
+    open_data:
+      help:
+        proposal_comments:
+          alignment: Se este comentário foi um favorito, contra ou neutro
+          author: O nome do usuário que fez este comentário
+          body: O comentário em si
+          commentable_id: A identificação única do comentável
+          commentable_type: O tipo do comentável (se for um resultado, uma proposta, etc.)
+          created_at: A data em que este comentário foi criado
+          depth: O lugar onde este comentário está nos três comentários (se for uma resposta ou uma resposta de uma resposta)
+          id: O Id para este comentário
+          locale: A localidade (linguagem) que o usuário teve ao deixar este comentário
+          root_commentable_url: A URL do recurso ligado a este comentário
+        proposals:
+          address: O endereço da proposta caso a proposta tenha um local físico
+          answer: A resposta à proposta no caso de ela ter sido respondida
+          answered_at: A data em que essa proposta foi respondida
+          attachments: O número de anexos que essa proposta tem
+          author: Os dados para o autor desta proposta
+          body: O corpo da proposta
+          coauthorships_count: O número de coautorias que a proposta representa
+          comments: O número de comentários que essa proposta tem
+          component: O componente ao qual a proposta pertence
+          cost: O custo total da proposta em questão
+          cost_report: Um relatório de custos para a proposta
+          created_at: A data em que a proposta foi criada
+          created_in_meeting: Se a proposta foi criada em uma reunião
+          execution_period: O período em que a proposta correu do início ao fim
+          follows_count: O número de seguidores que essa proposta tem
+          id: O identificador único para a proposta
+          is_amend: Esta proposta está adiando outra proposta
+          latitude: A latitude da proposta no caso de ter uma localização física
+          likes: O número de curtidas ("curtidas") que essa proposta tem
+          longitude: A longitude da proposta no caso de ela ter um local físico
+          meeting_urls: As URLs das reuniões onde esta proposta foi apresentada ou discutida
+          original_proposal: A referência à proposta original se esta for uma alteração
+          participatory_space: A qual espaço (por exemplo, processo participativo, ou Assembléia) esta proposta pertence
+          published_at: A data em que esta proposta foi publicada
+          reference: O identificador único do recurso nesta plataforma
+          related_proposals: As propostas relacionadas a esta proposta
+          state: 'O status desta proposta (ex: "Aceito")'
+          state_published_at: Um registro de tempo do estado da proposta quando publicado
+          taxonomies: As taxonomias a que esta proposta pertence
+          title: O título da proposta
+          updated_at: Data da última atualização da proposta
+          url: A URL onde esta proposta pode ser encontrada
+          votes: O número de votos que esta proposta tem
+          withdrawn: Se essa proposta foi retirada
+          withdrawn_at: Quando essa proposta foi retirada
     participatory_spaces:
       highlighted_proposals:
         see_all: Ver todos
     proposals:
       actions:
         answer_proposal: Responder proposta
+        cancel_coauthor_invitation: Cancelar convite de co-autor
+        cancel_coauthor_invitation_confirm: Tem certeza de que deseja cancelar o convite de co-autor?
+        delete_proposal_state_confirm: Tem certeza que deseja excluir este estado?
+        destroy: Excluir estado
         edit_proposal: Editar proposta
+        edit_proposal_state: Editar estado
         import: Importar de outro componente
+        mark_as_coauthor: Marcar como co-autor
+        mark_as_coauthor_confirm: Tem certeza que deseja marcar este usuário como um co-autor? O destinatário receberá uma notificação para aceitar ou recusar o convite.
         new: Nova proposta
+        new_proposal_state: Novo status
         participatory_texts: Textos participativos
         show: Mostrar proposta
         title: Ações
       admin:
         actions:
+          confirm_delete_proposal: Tem certeza que deseja excluir esta proposta?
+          deleted_proposals_info: Propostas excluídas podem ser restauradas do lixo.
           preview: Previsualização
+          view_deleted_proposals: Ver propostas excluídas
+        deprecation_warning_collaborative_drafts_html: "⚠️ <b>Aviso de descontinuação.</b> O recurso de Rascunhos Colaborativos será removido na versão 0.32 do Decidim. As organizações que o utilizavam poderão migrar para o novo recurso de coautoria de propostas."
+        evaluation_assignments:
+          create:
+            invalid: Houve um problema ao atribuir propostas a um avaliador.
+            success: Propostas atribuídas a um avaliador com sucesso.
+          delete:
+            invalid: Houve um problema ao desatribuir propostas de um avaliador.
+            success: Avaliador desatribuído das propostas com sucesso.
         exports:
           proposal_comments: Comentários
           proposals: Propostas
+        import_proposals_mailer:
+          notify_failure:
+            body: Houve um problema ao importar propostas do componente %{origin_component_name} para o componente %{target_component_name}.
+            subject: Houve um erro ao importar propostas
+          notify_success:
+            added_proposals:
+              one: Uma proposta foi importada.
+              other: "%{count} propostas foram importadas."
+            body: Propostas importadas com sucesso do componente %{origin_component_name} para o componente %{target_component_name}. Você pode rever os resultados na interface de administração.
+            subject: As propostas foram importadas com sucesso
         imports:
+          help:
+            answers: |
+              O documento de importação deve conter os seguintes nomes de coluna, no caso de arquivos CSV ou Excel, ou nomes de chave, no caso de arquivos JSON (outras colunas serão ignoradas):
+              <ul>
+              <li><b>id:</b> Id da proposta a ser respondida</li>
+              <li><b>estado:</b> Uma das opções "aceito", "avaliando" ou "rejeitado"</li>
+              <li><b>resposta/en:</b> Resposta no idioma inglês. Isso dependerá da configuração de idioma de sua plataforma.</li>
+              </ul>
+            proposals: |
+              O arquivo deve ter os seguintes nomes de coluna em caso de arquivos CSV ou Excel. ou nomes de chaves no caso dos arquivos JSON:
+              <ul>
+              <li><b>titulo/en:</b> Título na língua inglesa. Isto dependerá da configuração de idioma da sua plataforma.</li>
+              <li><b>corpo/en:</b> corpo em inglês. Isto dependerá da configuração de linguagem da sua plataforma.</li>
+              <li><b>escopo/id:</b> Id do Escopo</li>
+              <li><b>categoria/id:</b> Id das Taxonomias (se houver mais de uma, separe com vírgula)</li>
+              </ul>
           label:
             answers: Importar respostas de um arquivo
             proposals: Importar propostas de um arquivo
@@ -262,7 +537,11 @@ pt-BR:
             answers:
               one: resposta na proposta
               other: respostas na proposta
+            proposals:
+              one: proposta
+              other: propostas
           title:
+            answers: Importar respostas de proposta de um arquivo
             proposals: Importar propostas de um arquivo
         models:
           proposal:
@@ -288,8 +567,12 @@ pt-BR:
               md: Markdown
               odt: ODT
             bottom_hint: "(Você será capaz de visualizar e classificar as seções do documento)"
+            document_legend: 'Adicione um documento menor que 2MB, cada seção até que 3 níveis de profundidade sejam analisados em propostas. Formatos suportados são: %{valid_mime_types}'
             title: ADICIONAR DOCUMENTO
             upload_document: Carregar documento
+          publish:
+            invalid: Ocorreu um erro ao publicar propostas.
+            success: Todas as propostas foram publicadas.
           sections:
             article: "<em>Artigo</em>"
             section: "<em>Seção:</em> <strong>%{title}</strong>"
@@ -301,11 +584,44 @@ pt-BR:
             answer_proposal: Responda
             title: Resposta para a proposta %{title}
         proposal_notes:
+          create:
+            error: Houve um problema ao criar está nota de proposta.
+            success: Nota de proposta criada com sucesso.
           form:
             note: Nota
             submit: Enviar
+          reply:
+            error: Houve um problema ao criar está resposta de nota de proposta.
+            success: Resposta de nota de proposta criada com sucesso.
           title: Notas privadas
+        proposal_states:
+          create:
+            error: Erro ao criar estado
+            success: Status criado com sucesso
+          destroy:
+            success: Status excluído com sucesso
+          edit:
+            title: Editar status
+            update: Atualização
+          form:
+            preview: Pré-visualizar
+          index:
+            title: Status
+          new:
+            create: Criar
+            title: Novo status
+          update:
+            error: Erro ao atualizar status
+            success: Status atualizado com sucesso
         proposals:
+          answer:
+            bulk_answer_error: Propostas com IDs [%{proposals}] não puderam ser respondidas devido erros aplicando o modelo "%{template}". Você pode verificar que o modelo de resposta corresponde ao formato esperado para este componente, aplicando-o individualmente.
+            bulk_answer_success: '%{count} propostas serão respondidas usando o modelo "%{template}". Por favor, aguarde alguns minutos e atualize a página para ver as atualizações.'
+            invalid: Houve erros ao responder a esta proposta.
+            success: Proposta respondida com sucesso.
+          create:
+            invalid: Houve erros ao criar esta proposta.
+            success: Proposta criada com sucesso.
           edit:
             title: Atualizar proposta
             update: Atualizar
@@ -314,44 +630,91 @@ pt-BR:
             select_a_meeting: Selecione uma reunião
           index:
             actions: Ações
+            apply_answer_template: Aplicar modelo de resposta
+            assign_to_evaluator: Atribuir ao avaliador
+            assign_to_evaluator_button: Atribuir
             cancel: Cancelar
+            change_taxonomies: Alterar taxonomias
             merge: Junte-se a um novo
+            merge_button: Criar
+            no_templates_available: Nenhum modelo disponível
             publish: Publicar
             publish_answers: Publicar respostas
             select_component: Selecionar componente
+            select_evaluators: Selecione um ou mais avaliadores
             selected: selecionado
             split: Dividir propostas
             split_button: Dividir
+            statuses: Status
             title: Propostas
+            unassign_from_evaluator: Desatribuir do avaliador
+            unassign_from_evaluator_button: Desatribuir
             update: Atualizar
+          manage_trash:
+            title: Propostas excluídas
           new:
             create: Criar
             title: Criar proposta
+          publish_answers:
+            number_of_proposals: Respostas para a proposta %{number} serão publicadas?
+            select_a_proposal: Por favor, selecione uma proposta.
           show:
             amendments_count: As alterações contam
+            assigned_evaluators: Avaliadores atribuídos
             body: Corpo
             comments_count: Contagem de Comentários
             documents: Documentos
+            evaluators: Avaliadores
+            likes: Curtidas
+            likes_count: Contagem de curtidas
+            link: Ver a proposta
+            n_more_likes:
+              one: e mais 1
+              other: e mais %{count}
             photos: Fotos
             ranking: "%{ranking} de %{total}"
             related_meetings: Reuniões relacionadas
             remove_assignment: Remover Atribuição
+            remove_assignment_confirmation: Tem certeza que deseja remover o avaliador desta proposta?
+            votes_count: Contagem de votos
+          update_taxonomies:
+            invalid: 'Essas propostas já tinham as taxonomias %{taxonomies}: %{proposals}.'
+            select_a_proposal: Por favor, selecione uma proposta.
+            select_a_taxonomy: Por favor, selecione uma taxonomia.
+            success: 'Propostas atualizadas com sucesso para as taxonomias %{taxonomies}: %{proposals}.'
         proposals_imports:
+          create:
+            invalid: Houve um problema ao importar as propostas.
+            success: O processo de importação começou. Vamos informar você assim que terminar.
           new:
             create: Propostas de importação
             no_components: Não há outros componentes da proposta neste espaço participativo para importar as propostas.
             select_component: Selecione um componente
             select_states: Verifique os estados das propostas para importar
+            title: Importar propostas de outro componente
         proposals_merges:
           create:
+            invalid: 'Houve um problema ao mesclar as propostas selecionadas porque algumas delas:'
             success: Fundiu com sucesso as propostas em uma nova.
+          form:
+            created_in_meeting: Esta proposta vem de uma reunião
+            select_a_meeting: Selecione uma reunião
+          new:
+            title: Mesclar em um novo
         proposals_splits:
           create:
+            invalid: 'Houve um problema ao dividir as propostas selecionadas porque algumas delas:'
             success: Dividiu com sucesso as propostas em novas.
       admin_log:
+        evaluation_assignment:
+          create: "%{user_name} atribuiu a proposta %{resource_name} a um avaliador"
+          delete: "%{user_name} não atribuiu um avaliador da proposta %{proposal_title}"
         proposal:
           answer: "%{user_name} respondeu a proposta %{resource_name} no espaço %{space_name}"
+          create: "%{user_name} criou a proposta %{resource_name} a partir da fusão de propostas %{merged_count} em %{space_name}"
           publish_answer: "%{user_name} publicou a resposta para a proposta %{resource_name} no espaço %{space_name}"
+          restore: "%{user_name} restaurou a proposta %{resource_name} no espaço %{space_name}"
+          soft_delete: "%{user_name} movido para a lixeira da proposta %{resource_name} no espaço %{space_name}"
           update: "%{user_name} atualizou a proposta oficial %{resource_name} no espaço %{space_name}"
         proposal_note:
           create: "%{user_name} deixou uma nota privada na proposta %{resource_name} no espaço %{space_name}"
@@ -379,6 +742,7 @@ pt-BR:
           publish:
             error: Houve erros ao publicar o rascunho colaborativo.
             irreversible_action_modal:
+              body: Depois de publicar o rascunho como uma proposta, ele não será mais editável.. A proposta não aceitará novos autores ou contribuições.
               cancel: Cancelar
               ok: Publicar como uma proposta
               title: A ação a seguir é irreversível
@@ -386,6 +750,7 @@ pt-BR:
           withdraw:
             error: Houve erros ao fechar o rascunho colaborativo.
             irreversible_action_modal:
+              body: Depois de fechar o rascunho, ele não será mais editável. O rascunho não aceitará novos autores ou contribuições.
               cancel: Cancelar
               ok: Retirar o rascunho colaborativo
               title: A ação a seguir é irreversível
@@ -394,9 +759,12 @@ pt-BR:
           error: Houve um problema ao criar este rascunho colaborativo.
           success: Rascunho colaborativo criado com sucesso.
         edit:
+          attachment_legend: Adicionar um documento ou uma imagem
           back: Costas
           send: Enviar
           title: Editar rascunho colaborativo
+        empty: Ainda não há rascunhos colaborativos
+        empty_filters: Não há nenhum rascunho colaborativo com este critério
         filters:
           all: Todos
           amendment: Emendas
@@ -415,8 +783,10 @@ pt-BR:
           count:
             one: "%{count} rascunho colaborativo"
             other: "%{count} rascunho colaborativo"
+        name: Rascunhos colaborativos
         new:
           add_file: Adicionar arquivo
+          edit_file: Editar arquivo
           send: Continuar
         new_collaborative_draft_button:
           new_collaborative_draft: Novo rascunho colaborativo
@@ -428,20 +798,25 @@ pt-BR:
         requests:
           accepted_request:
             error: Não foi possível aceitar como colaborador. Tente novamente mais tarde.
+            success: "@%{user} foi aceito como colaborador com sucesso."
           access_requested:
             error: Sua solicitação não pôde ser concluída. Tente novamente mais tarde.
+            success: Sua solicitação para colaborar foi enviada com sucesso.
           collaboration_requests:
             accept_request: Aceitar
             reject_request: Rejeitar
             title: Pedidos de colaboração
           rejected_request:
             error: Não foi possível rejeitá-lo como colaborador. Tente novamente mais tarde.
+            success: "@%{user} foi rejeitado como colaborador com sucesso."
         show:
+          edit: Editar
           final_proposal: proposta final
           final_proposal_help_text: Este rascunho está terminado. Você pode ver a proposta final concluída
           hidden_authors_count:
             one: e mais %{count} pessoa
             other: e mais %{count} pessoas
+          info-message: Este é um <strong>rascunho colaborativo</strong> de uma proposta. Isso significa que você pode ajudar os autores a moldar a proposta usando a seção de comentários abaixo ou aprimorá-la diretamente solicitando acesso para editá-la. Assim que os autores concederem o acesso, você poderá fazer alterações neste rascunho.
           publish: Publicar
           publish_info: Publicar esta versão do rascunho ou
           published_proposal: proposta publicada
@@ -465,38 +840,86 @@ pt-BR:
       create:
         error: Ocorreu erros ao salvar a proposta.
         success: Proposta criada com sucesso. Salvo como um rascunho.
+      creation:
+        imported_text: E assim surgiu esta proposta
+        merged_text: Eles se tornaram esta proposta
+        splitted_text: E assim surgiu esta proposta
+        text: Esta proposta foi criada
       destroy_draft:
         error: Houve erros ao excluir o rascunho da proposta.
         success: O rascunho da proposta foi excluído com sucesso.
+      exit_modal:
+        cancel: Cancelar
+        exit: Continuar
+        message: Você precisa dar %{number} votos a mais entre as diferentes propostas para que seus votos sejam considerados.
+        title: Lembre-se que ainda lhe restam %{number} votos
+      forms:
+        errors:
+          device_not_supported: Seu dispositivo não é compatível com serviços de localização. Digite o endereço manualmente.
+          no_device_location: Desculpe, não foi possível detectar sua localização. Por favor, insira o endereço manualmente.
+        use_my_location: Usar minha localização atual
+      invite_coauthors:
+        cancel:
+          error: Houve um problema ao cancelar o convite para co-autor.
+          success: Convite para co-autor cancelado com sucesso.
+        create:
+          error: Houve um problema ao convidar o co-autor.
+          success: "%{author_name} Foi convidado com sucesso como co-autor."
+        destroy:
+          error: Houve um problema ao recusar o convite.
+          success: O convite foi recusado.
+        update:
+          error: Ocorreu um erro ao aceitar o convite.
+          success: O convite foi aceito.
+      last_activity:
+        new_proposal: 'Nova proposta:'
+        proposal_updated: 'Proposta atualizada:'
       models:
         proposal:
           fields:
             comments: Comentários
+            evaluator: Avaliador
+            evaluators: Avaliadores
             id: ID
             notes: Notas
             official_proposal: Proposta oficial
             published_answer: Resposta publicada
             published_at: Publicado em
             state: Estado
+            taxonomies: Taxonomias
             title: Título
             votes: Votos
+        proposal_state:
+          css_class: Classe CSS
+          title: Status
+      new:
+        limit_reached: Você não pode criar novas propostas, pois excedeu o limite.
       participatory_text_proposal:
         alternative_title: Não há textos participativos no momento
         buttons:
           amend: Alterar
           comment: Comente
+      proposal_votes:
+        create:
+          error: Houve um problema ao votar na proposta.
       proposals:
         dynamic_map_instructions:
           description: As coordenadas serão atualizadas quando clicar no botão 'visualizar'. No entanto, o endereço não muda.
           instructions: Você pode mover o ponto no mapa.
         edit:
+          add_attachments: Adicionar anexos
+          attachment_legend: Adicionar um documento ou uma imagem
           back: Voltar
+          edit_attachments: Editar anexos
           send: Enviar
           title: Editar proposta
         edit_draft:
           discard: Descarte este rascunho
           discard_confirmation: Deseja mesmo descartar este rascunho de proposta?
           send: Visualização
+          title: Editar rascunho da proposta
+        edit_form_fields:
+          marker_added: Marcador adicionado ao mapa.
         filters:
           activity: Minha atividade
           all: Tudo
@@ -507,21 +930,29 @@ pt-BR:
           scope: Escopo
           search: Pesquisa
           state: Estado
+          taxonomy_filters: Filtros
           type: Tipo
           voted: Votado
         index:
+          click_here: Veja todas as propostas
           collaborative_drafts_list: Acesse rascunhos colaborativos
           count:
             one: "%{count} proposta"
             other: "%{count} propostas"
+          grid_mode: Modo grade
+          list_mode: Modo de lista
           new_proposal: Nova proposta
+          see_all: Veja todas as propostas
           see_all_withdrawn: Veja todas as propostas retiradas
+          text_banner: Você está vendo a lista de propostas retiradas por seus autores. %{go_back_link}.
         new:
           send: Continuar
+          title: Criar nova proposta
         orders:
           label: 'Ordene propostas por:'
           most_commented: Mais comentados
           most_followed: Mais seguidos
+          most_liked: Mais curtidas
           most_voted: Mais votados
           random: Aleatório
           recent: Recente
@@ -540,10 +971,17 @@ pt-BR:
             other: Você poderá editar esta proposta durante o primeiro %{count} minutos após a publicação da proposta. Uma vez que esta janela de tempo passa, você não poderá editar a proposta.
           publish: Publicar
           title: Publique sua proposta
+        proposals:
+          empty: Ainda não há propostas.
+          empty_filters: Não há propostas com estes critérios.
         show:
           answer: Responda
           changes_at_title: Alteração para "%{title}"
+          edit_proposal: Editar
           estimated_cost: Custo estimado
+          hidden_likes_count:
+            one: e mais %{count} pessoa
+            other: e mais %{count} pessoas
           link_to_collaborative_draft_help_text: Esta proposta é o resultado de um rascunho colaborativo. Revise o histórico
           link_to_collaborative_draft_text: Veja o rascunho colaborativo
           link_to_promoted_emendation_help_text: Esta proposta é uma emenda promovida
@@ -553,27 +991,52 @@ pt-BR:
           proposal_accepted_reason: 'Esta proposta foi aceita porque:'
           proposal_in_evaluation_reason: Esta proposta está sendo avaliada
           proposal_rejected_reason: 'Esta proposta foi rejeitada porque:'
+          withdraw_btn_hint: Você pode retirar sua proposta se mudar de ideia, desde que não tenha recebido nenhum voto. A proposta não é excluída, ela aparecerá na lista de propostas retiradas.
           withdraw_confirmation_html: Tem certeza que deseja retirar esta proposta?<br><br><strong>Esta ação não pode ser cancelada!</strong>
+          withdraw_proposal: Retirar
         update:
           title: Atualizar proposta
         vote_button:
+          already_voted: Votado
+          already_voted_hover: Retirar voto
           maximum_votes_reached: Limite de votação atingido
           no_votes_remaining: Não há votos restantes
           vote: Voto
+          votes_blocked: Voto
+        votes_count:
+          count:
+            one: Voto
+            other: Votos
         voting_rules:
+          already_vote:
+            description: Lembre-se de que você ainda tem que votar %{number} entre diferentes propostas para que os seus votos sejam levados em consideração.
+            see_other_proposals: Veja outras propostas
+            title: Você tem%{number} votos restantes
+          can_accumulate_votes_beyond_threshold:
+            description: Cada proposta pode acumular mais de %{limit} votos
+          minimum_votes_per_user:
+            description: Você tem que distribuir um mínimo de %{votes} votos entre diferentes propostas para que os seus votos sejam levados em conta.
           proposal_limit:
             description: Você pode criar até %{limit} propostas.
+          success: Seus votos foram aceitos com sucesso
+          threshold_per_proposal:
+            description: Para serem validadas, as propostas precisam chegar aos %{limit} votos.
+          title: Regras de participação
           vote_limit:
             description: Você pode votar até %{limit} propostas.
+            votes: '%{number} votos restantes'
         wizard_aside:
           back: Costas
           back_from_step_1: Voltar às propostas
+          back_from_step_2: Voltar à edição
         wizard_steps:
           current_step: Etapa atual
           step_1: Crie sua proposta
+          step_2: Publique sua proposta
           title: Etapas de criação proposta
       proposals_picker:
         choose_proposals: Escolher propostas
+        no_proposals: Nenhuma proposta corresponde aos seus critérios de pesquisa ou não há propostas.
       publish:
         error: Houve erros ao publicar a proposta.
         success: Proposta publicada com sucesso.
@@ -588,6 +1051,9 @@ pt-BR:
       versions:
         index:
           title: Versões
+      withdraw:
+        errors:
+          has_votes: Esta proposta não pode ser retirada porque já tem votos.
     resource_links:
       copied_from_component:
         proposal_proposal: Propostas relacionadas
@@ -597,6 +1063,9 @@ pt-BR:
         proposal_project: 'Proposta que aparece nesses projetos:'
         proposal_result: 'Proposta que aparece nesses resultados:'
     statistics:
+      participatory_space_proposals_count: Propostas
       proposals_accepted: Propostas aceitas
       proposals_count: Propostas
+      proposals_count_tooltip: O número total de propostas enviadas e votos expressos sobre elas.
+      votes: 'Votos:'
       votes_count: Votos
diff --git a/decidim-proposals/config/locales/ro-RO.yml b/decidim-proposals/config/locales/ro-RO.yml
index a802bd71dc61f..ec78aba93511f 100644
--- a/decidim-proposals/config/locales/ro-RO.yml
+++ b/decidim-proposals/config/locales/ro-RO.yml
@@ -236,6 +236,11 @@ ro:
           conditions:
             - Răsfoiește paginile și petrece puțin timp citind propunerile altora
             - 
+          description_another: Acest participant a votat %{score} propuneri.
+          description_own: Ați votat %{score} propuneri.
+          name: Voturi pentru propunere
+          unearned_another: Acest participant nu a votat încă nicio propunere.
+          unearned_own: Încă nu ați votat nicio propunere.
         proposals:
           conditions:
             - Alege spațiul de participare unde e activă opțiunea de a trimite propuneri conform domeniului tău de interes
@@ -245,6 +250,7 @@ ro:
           description_own: Ai creat %{score} propuneri.
           name: Propuneri
           next_level_in: Creează încă %{score} propuneri pentru a atinge nivelul următor!
+          unearned_another: Acest participant nu a creat nicio propunere încă.
           unearned_own: Nu ai creat încă nicio propunere.
     participatory_spaces:
       highlighted_proposals:
@@ -518,6 +524,8 @@ ro:
       invite_coauthors:
         create:
           success: "%{author_name} a fost invitat cu succes să fie coautor."
+      last_activity:
+        new_proposal: 'Propunere nouă:'
       models:
         proposal:
           fields:
diff --git a/decidim-proposals/config/locales/sv.yml b/decidim-proposals/config/locales/sv.yml
index 99befa96a9ba9..3d5cdb5c4423e 100644
--- a/decidim-proposals/config/locales/sv.yml
+++ b/decidim-proposals/config/locales/sv.yml
@@ -178,8 +178,8 @@ sv:
             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:
               automatic: Automatisk
-              most_commented: Mest kommenterade
-              most_followed: Mest följda
+              most_commented: Flest kommentarer
+              most_followed: Flest följare
               most_liked: Mest gillade
               most_voted: Flest röster
               random: Slumpvis
@@ -192,7 +192,7 @@ sv:
               hours: Timmar
               minutes: Minuter
             geocoding_enabled: Aktivera visning på karta
-            minimum_votes_per_user: Minsta antal röster per användare
+            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
@@ -210,14 +210,14 @@ sv:
               hours: Timmar
               minutes: Minuter
             proposal_length: Maximal längd på förslagets innehåll
-            proposal_limit: Förslagsgräns per deltagare
+            proposal_limit: Max antal lagda förslag per deltagare
             proposal_wizard_step_1_help_text: Hjälptext till steget "Skapa" i förslagsguiden
             proposal_wizard_step_2_help_text: Hjälptext för steget ”Publicera” i förslagsguiden
             resources_permissions_enabled: Behörigheter kan ställas in för varje förslag
             taxonomy_filters: Välj filter för komponenten
             taxonomy_filters_add: Lägg till filter
-            threshold_per_proposal: Minst antal stöd per förslag
-            vote_limit: Antal röster per deltagare
+            threshold_per_proposal: Antal röster ett förslag behöver få för att gå vidare
+            vote_limit: Max antal röster per deltagare
           step:
             amendment_creation_enabled: Skapa ändringar är aktiverat
             amendment_creation_enabled_help: Deltagare kan ändra förslag.
@@ -239,8 +239,8 @@ sv:
             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:
               automatic: Automatisk
-              most_commented: Mest kommenterade
-              most_followed: Mest följda
+              most_commented: Flest kommentarer
+              most_followed: Flest följare
               most_liked: Mest gillade
               most_voted: Flest röster
               random: Slumpvis
@@ -251,8 +251,8 @@ sv:
             proposal_answering_enabled: Aktivera svar på förslag
             publish_answers_immediately: Publicera svar på förslag omedelbart
             publish_answers_immediately_help_html: 'Tänk på att om du svarar på förslag som inte är aktiverade, kommer du att behöva publicera dem manuellt genom att välja dem och använda åtgärden för publicering. För mer information om hur det här fungerar, se <a href="https://docs.decidim.org/en/admin/components/proposals/answers#_publication" target="_blank">proposals'' answers documentation page</a>.'
-            votes_blocked: Röster blockerade
-            votes_enabled: Röster aktiverade
+            votes_blocked: Stäng av röstning
+            votes_enabled: Aktivera röstning
             votes_hidden: Dölj antal röster (om röster är aktiverade, kommer antalet röster att döljas)
     download_your_data:
       show:
@@ -296,17 +296,17 @@ sv:
         coauthor_rejected_invite:
           notification_title: <a href="%{coauthor_path}">%{coauthor_name}</a> har avböjt din inbjudan att bli medförfattare till förslaget <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_accepted:
-          email_intro: '%{requester_name} har blivit accepterad som medskapare till <a href="%{resource_url}">%{resource_title}</a> det gemensamma utkastet.'
-          email_outro: Du har fått det här meddelandet eftersom du är en medskapare av <a href="%{resource_url}">%{resource_title}</a>.
+          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 medskapare av <a href="%{resource_url}">%{resource_title}</a> samarbetsutkastet.'
+          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} begärde åtkomst som medskapare. Du kan <strong>acceptera eller avvisa begäran</strong> från <a href="%{resource_url}">%{resource_title}</a>, sidan för det gemensamma utkastet.'
+          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>.
@@ -446,7 +446,10 @@ sv:
         title: Åtgärder
       admin:
         actions:
+          confirm_delete_proposal: Är du säker på att du vill ta bort förslaget?
+          deleted_proposals_info: Borttagna förslag kan återställas från papperskorgen.
           preview: Förhandsvisa
+          view_deleted_proposals: Visa borttagna förslag
         evaluation_assignments:
           create:
             invalid: 'Problem: Utvärderaren kunde inte få förslag.'
@@ -562,6 +565,7 @@ sv:
             assign_to_evaluator: Tilldelad en utvärderare
             assign_to_evaluator_button: Tilldelad
             cancel: Avbryt
+            change_taxonomies: Ändra kategorier
             merge: Slå samman till ett nytt
             no_templates_available: Ingen mall tillgänglig
             publish: Publicera
@@ -653,15 +657,15 @@ sv:
             error: Det gick inte att publicera det gemensamma utkastet.
             irreversible_action_modal:
               body: Efter att utkastet har publicerats som ett förslag går det inte längre att redigera utkastet. Förslaget kommer inte acceptera nya författare eller tillägg.
-              cancel: Dra tillbaka
+              cancel: Avbryt
               ok: Publicera som ett förslag
               title: Följande åtgärd kan inte ångras
             success: Det gemensamma utkastet har publicerats som ett förslag.
           withdraw:
             error: Det gick inte att stänga det gemensamma utkastet.
             irreversible_action_modal:
-              body: Efter att utkastet har publicerats som ett förslag går det inte längre att redigera utkastet. Förslaget kommer inte acceptera nya författare eller tillägg.
-              cancel: Dra tillbaka
+              body: Efter att utkastet dragits tillbaka går det inte längre att redigera.
+              cancel: Avbryt
               ok: Dra tillbaka det gemensamma utkastet
               title: Det går inte att ångra denna åtgärd
             success: Det gemensamma utkastet har dragits tillbaka.
@@ -696,7 +700,7 @@ sv:
         new:
           add_file: Lägg till fil
           edit_file: Redigera fil
-          send: Fortsätt
+          send: Spara
         new_collaborative_draft_button:
           new_collaborative_draft: Nytt gemensamt utkast
         orders:
@@ -719,6 +723,7 @@ sv:
             error: Kunde inte avvisas som samarbetspartner, försök igen senare.
             success: "@%{user} har avvisats som medskapare."
         show:
+          edit: Redigera
           final_proposal: Färdigt förslag
           final_proposal_help_text: Detta utkast är klart. Du kan se det slutliga förslaget
           hidden_authors_count:
@@ -778,6 +783,7 @@ sv:
             published_answer: Publicerat svar
             published_at: Publicerad
             state: Status
+            taxonomies: Kategorier
             title: Titel
             votes: Röster
         proposal_state:
@@ -798,6 +804,8 @@ sv:
           description: Koordinaterna uppdateras när du klickar på knappen 'Förhandsgranska'. Adressen ändras dock inte.
           instructions: Du kan flytta markören på kartan.
         edit:
+          add_attachments: Lägg till bilagor
+          attachment_legend: Lägg till ett dokument eller en bild
           back: Tillbaka
           send: Skicka
           title: Redigera förslag
@@ -819,7 +827,7 @@ sv:
           search: Sök
           state: Status
           type: Typ
-          voted: Röstade
+          voted: Röstat på
         index:
           click_here: Se alla förslag
           collaborative_drafts_list: Visa gemensamma utkast
@@ -837,10 +845,10 @@ sv:
           title: Skapa ett nytt förslag
         orders:
           label: 'Ordna förslag efter:'
-          most_commented: Mest kommenterade
-          most_followed: Mest följda
+          most_commented: Flest kommentarer
+          most_followed: Flest följare
           most_liked: Mest gillade
-          most_voted: Mest röstade
+          most_voted: Flest röster
           random: Slumpvis
           recent: Senaste
           with_more_authors: Med flera författare
@@ -864,6 +872,7 @@ sv:
         show:
           answer: Svara
           changes_at_title: Ändring till %{title}
+          edit_proposal: Redigera
           estimated_cost: Beräknad kostnad
           hidden_likes_count:
             one: och %{count} person till
@@ -882,7 +891,7 @@ sv:
         update:
           title: Uppdatera förslag
         vote_button:
-          already_voted: Röstade
+          already_voted: Röstat
           already_voted_hover: Dra tillbaka röst
           maximum_votes_reached: Röstningsgränsen uppnådd
           no_votes_remaining: Inga röster kvar
@@ -893,11 +902,15 @@ sv:
             other: Röster
         voting_rules:
           can_accumulate_votes_beyond_threshold:
-            description: Varje förslag kan få mer än %{limit} röster
+            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.
           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 accepteras.
+          title: Regler för omröstning
           vote_limit:
             description: Du kan stödja upp till %{limit} förslag.
             votes: Saknar %{number} röster
diff --git a/decidim-proposals/lib/decidim/api/mutations/answer_proposal_attributes.rb b/decidim-proposals/lib/decidim/api/mutations/answer_proposal_attributes.rb
index 8f1dadd8873dc..1722f61643161 100644
--- a/decidim-proposals/lib/decidim/api/mutations/answer_proposal_attributes.rb
+++ b/decidim-proposals/lib/decidim/api/mutations/answer_proposal_attributes.rb
@@ -3,8 +3,8 @@
 module Decidim
   module Proposals
     class AnswerProposalAttributes < Decidim::Api::Types::BaseInputObject
-      graphql_name "ProposalAttributes"
-      description "Attributes of a proposal"
+      graphql_name "AnswerProposalAttributes"
+      description "Attributes for answering a proposal"
 
       argument :answer_content, GraphQL::Types::JSON, description: "The answer feedback for the status for this proposal", required: false
       argument :cost, GraphQL::Types::Float, description: "Estimated cost of the proposal", required: false
diff --git a/decidim-proposals/lib/decidim/api/mutations/create_proposal_type.rb b/decidim-proposals/lib/decidim/api/mutations/create_proposal_type.rb
new file mode 100644
index 0000000000000..2ac3c571ccf51
--- /dev/null
+++ b/decidim-proposals/lib/decidim/api/mutations/create_proposal_type.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class CreateProposalType < Decidim::Api::Types::BaseMutation
+      graphql_name "CreateProposal"
+
+      description "Creates a proposal"
+      type Decidim::Proposals::ProposalType
+
+      argument :attributes, ProposalAttributes, description: "Input attributes for the proposal", required: true
+      argument :locale, GraphQL::Types::String, "The locale for which to set the proposal texts", required: true
+      argument :toggle_translations, GraphQL::Types::Boolean, "Whether the user asked to toggle the machine translations or not.", required: false, default_value: false
+
+      def resolve(attributes:, locale:, toggle_translations:)
+        set_locale(locale:, toggle_translations:)
+
+        params = attributes.to_h.slice(:title, :body, :address, :latitude, :longitude, :taxonomies)
+
+        params[:taxonomies] = Decidim::Taxonomy.where(organization: current_organization, id: params[:taxonomies]).pluck(:id) if params[:taxonomies]
+
+        form = form(Decidim::Proposals::ProposalForm).from_params(params)
+
+        Decidim::Proposals::CreateProposal.call(form, current_user) do
+          on(:ok) do |proposal|
+            Decidim::Proposals::PublishProposal.call(proposal, current_user) do
+              on(:ok) do
+                return proposal.reload
+              end
+
+              on(:invalid) do
+                raise Decidim::Api::Errors::ValidationError, I18n.t("proposals.publish.error", scope: "decidim")
+              end
+            end
+          end
+
+          on(:invalid) do
+            raise Decidim::Api::Errors::AttributeValidationError, form.errors
+          end
+        end
+      end
+
+      def authorized?(attributes:, locale:, toggle_translations:)
+        unless super && allowed_to?(:create, :proposal, Decidim::Proposals::Proposal.new(component: current_component), { current_user:, current_component: })
+          raise Decidim::Api::Errors::MutationNotAuthorizedError, I18n.t("decidim.api.errors.unauthorized_mutation")
+        end
+
+        true
+      end
+    end
+  end
+end
diff --git a/decidim-proposals/lib/decidim/api/mutations/proposal_answer_type.rb b/decidim-proposals/lib/decidim/api/mutations/proposal_answer_type.rb
index c9c8f99388229..e92f8acd37a2b 100644
--- a/decidim-proposals/lib/decidim/api/mutations/proposal_answer_type.rb
+++ b/decidim-proposals/lib/decidim/api/mutations/proposal_answer_type.rb
@@ -21,32 +21,24 @@ def resolve(attributes:)
           execution_period: object.execution_period
         )
 
-        form = Decidim::Proposals::Admin::ProposalAnswerForm.from_params(
-          params
-        ).with_context(
-          current_component: object.component,
-          current_user:,
-          current_organization: current_user.organization
-        )
+        form = form(Decidim::Proposals::Admin::ProposalAnswerForm).from_params(params)
 
         Admin::AnswerProposal.call(form, object) do
           on(:ok) do
             return object
           end
+
           on(:invalid) do
-            return GraphQL::ExecutionError.new(
-              form.errors.full_messages.join(", ")
-            )
+            raise Decidim::Api::Errors::AttributeValidationError, form.errors
           end
-
-          GraphQL::ExecutionError.new(
-            I18n.t("decidim.proposals.admin.proposals.answer.invalid")
-          )
         end
       end
 
       def authorized?(attributes:)
-        super && allowed_to?(:create, :proposal_answer, object, context, scope: :admin)
+        authorized = super && allowed_to?(:create, :proposal_answer, object, context, scope: :admin)
+        raise Decidim::Api::Errors::MutationNotAuthorizedError, I18n.t("decidim.api.errors.unauthorized_mutation") unless authorized
+
+        true
       end
 
       def current_user
diff --git a/decidim-proposals/lib/decidim/api/mutations/proposal_attributes.rb b/decidim-proposals/lib/decidim/api/mutations/proposal_attributes.rb
new file mode 100644
index 0000000000000..21c3a7c38052b
--- /dev/null
+++ b/decidim-proposals/lib/decidim/api/mutations/proposal_attributes.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class ProposalAttributes < Decidim::Api::Types::BaseInputObject
+      graphql_name "ProposalAttributes"
+      description "Attributes for creating a proposal"
+
+      argument :address, GraphQL::Types::String, description: "Physical address for the proposal", required: false
+      argument :body, GraphQL::Types::String, description: "The body content of the proposal", required: true
+      argument :latitude, GraphQL::Types::Float, description: "Latitude coordinate", required: false
+      argument :longitude, GraphQL::Types::Float, description: "Longitude coordinate", required: false
+      argument :taxonomies, [GraphQL::Types::ID], description: "Array of taxonomy IDs", required: false
+      argument :title, GraphQL::Types::String, description: "The title of the proposal", required: true
+    end
+  end
+end
diff --git a/decidim-proposals/lib/decidim/api/mutations/proposal_mutation_type.rb b/decidim-proposals/lib/decidim/api/mutations/proposal_mutation_type.rb
index 741b0f23d8fa8..52d0768348aca 100644
--- a/decidim-proposals/lib/decidim/api/mutations/proposal_mutation_type.rb
+++ b/decidim-proposals/lib/decidim/api/mutations/proposal_mutation_type.rb
@@ -9,6 +9,10 @@ class ProposalMutationType < Decidim::Api::Types::BaseObject
       description "a proposal which includes its available mutations"
 
       field :answer, mutation: Decidim::Proposals::ProposalAnswerType, description: "Answers a proposal"
+      field :unvote, mutation: Decidim::Proposals::UnvoteProposalType, description: "Removes a vote from a proposal"
+      field :update, mutation: Decidim::Proposals::UpdateProposalType, description: "Updates a proposal"
+      field :vote, mutation: Decidim::Proposals::VoteProposalType, description: "Votes a proposal"
+      field :withdraw, mutation: Decidim::Proposals::WithdrawProposalType, description: "Withdraws a proposal"
     end
   end
 end
diff --git a/decidim-proposals/lib/decidim/api/mutations/proposals_mutation_type.rb b/decidim-proposals/lib/decidim/api/mutations/proposals_mutation_type.rb
index de6d55b84c450..ea7a2093d622b 100644
--- a/decidim-proposals/lib/decidim/api/mutations/proposals_mutation_type.rb
+++ b/decidim-proposals/lib/decidim/api/mutations/proposals_mutation_type.rb
@@ -5,6 +5,7 @@ module Proposals
     class ProposalsMutationType < Decidim::Core::ComponentType
       description "A proposals of a component."
 
+      field :create_proposal, mutation: Decidim::Proposals::CreateProposalType, description: "Creates a proposal"
       field :proposal, type: Decidim::Proposals::ProposalMutationType, description: "Mutates a proposal", null: true do
         argument :id, GraphQL::Types::ID, "The ID of the proposal", required: true
       end
diff --git a/decidim-proposals/lib/decidim/api/mutations/unvote_proposal_type.rb b/decidim-proposals/lib/decidim/api/mutations/unvote_proposal_type.rb
new file mode 100644
index 0000000000000..da61492eec6e5
--- /dev/null
+++ b/decidim-proposals/lib/decidim/api/mutations/unvote_proposal_type.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class UnvoteProposalType < Decidim::Api::Types::BaseMutation
+      graphql_name "UnvoteProposal"
+
+      description "Removes a vote from a proposal"
+      type Decidim::Proposals::ProposalType
+
+      def resolve
+        UnvoteProposal.call(object, current_user) do
+          on(:ok) do
+            return object.reload
+          end
+        end
+      end
+
+      def authorized?
+        raise Decidim::Api::Errors::MutationNotAuthorizedError, I18n.t("decidim.api.errors.unauthorized_mutation") unless super && allowed_to?(:unvote, :proposal, object, context)
+
+        true
+      end
+    end
+  end
+end
diff --git a/decidim-proposals/lib/decidim/api/mutations/update_proposal_type.rb b/decidim-proposals/lib/decidim/api/mutations/update_proposal_type.rb
new file mode 100644
index 0000000000000..130e9419d8e18
--- /dev/null
+++ b/decidim-proposals/lib/decidim/api/mutations/update_proposal_type.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class UpdateProposalType < Decidim::Api::Types::BaseMutation
+      graphql_name "UpdateProposal"
+
+      description "Updates a proposal"
+      type Decidim::Proposals::ProposalType
+
+      argument :attributes, ProposalAttributes, description: "Input attributes for updating a proposal", required: true
+      argument :locale, GraphQL::Types::String, "The locale for which to get the proposals texts", required: true
+      argument :toggle_translations, GraphQL::Types::Boolean, "Whether the user asked to toggle the machine translations or not.", required: true, default_value: false
+
+      def resolve(attributes:, locale:, toggle_translations:)
+        set_locale(locale:, toggle_translations:)
+
+        params = extract_from(attributes)
+
+        form = form(Decidim::Proposals::ProposalForm).from_params(params)
+
+        UpdateProposal.call(form, current_user, object) do
+          on(:ok) do |proposal|
+            return proposal.reload
+          end
+
+          on(:invalid) do
+            raise Decidim::Api::Errors::AttributeValidationError, form.errors
+          end
+        end
+      end
+
+      def authorized?(attributes:, locale:, toggle_translations:)
+        raise Decidim::Api::Errors::MutationNotAuthorizedError, I18n.t("decidim.api.errors.unauthorized_mutation") unless super && allowed_to?(:edit, :proposal, object, context)
+
+        true
+      end
+
+      private
+
+      def extract_from(attributes)
+        title = attributes.to_h.fetch(:title, translated_attribute(object.title))
+        body = attributes.to_h.fetch(:body, translated_attribute(object.body))
+        taxonomies = Decidim::Taxonomy.where(organization: current_organization, id: attributes.to_h.fetch(:taxonomies, object.taxonomies)).pluck(:id)
+        address = attributes.to_h.fetch(:address, object.address)
+        latitude = attributes.to_h.fetch(:latitude, object.latitude)
+        longitude = attributes.to_h.fetch(:longitude, object.longitude)
+
+        { title:, body:, address:, latitude:, longitude:, taxonomies: }
+      end
+    end
+  end
+end
diff --git a/decidim-proposals/lib/decidim/api/mutations/vote_proposal_type.rb b/decidim-proposals/lib/decidim/api/mutations/vote_proposal_type.rb
new file mode 100644
index 0000000000000..84725799d62f0
--- /dev/null
+++ b/decidim-proposals/lib/decidim/api/mutations/vote_proposal_type.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class VoteProposalType < Decidim::Api::Types::BaseMutation
+      graphql_name "VoteProposal"
+
+      description "Votes a proposal"
+      type Decidim::Proposals::ProposalType
+
+      def resolve
+        VoteProposal.call(object, current_user) do
+          on(:ok) do
+            return object.reload
+          end
+
+          on(:invalid) do
+            raise Decidim::Api::Errors::ValidationError, I18n.t("proposal_votes.create.error", scope: "decidim.proposals")
+          end
+        end
+      end
+
+      def authorized?
+        raise Decidim::Api::Errors::MutationNotAuthorizedError, I18n.t("decidim.api.errors.unauthorized_mutation") unless super && allowed_to?(:vote, :proposal, object, context)
+
+        true
+      end
+    end
+  end
+end
diff --git a/decidim-proposals/lib/decidim/api/mutations/withdraw_proposal_type.rb b/decidim-proposals/lib/decidim/api/mutations/withdraw_proposal_type.rb
new file mode 100644
index 0000000000000..5348094f283fd
--- /dev/null
+++ b/decidim-proposals/lib/decidim/api/mutations/withdraw_proposal_type.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class WithdrawProposalType < Decidim::Api::Types::BaseMutation
+      graphql_name "WithdrawProposal"
+
+      description "Withdraws a proposal"
+      type Decidim::Proposals::ProposalType
+
+      def resolve
+        WithdrawProposal.call(object, current_user) do
+          on(:ok) do |proposal|
+            return proposal
+          end
+
+          on(:has_votes) do
+            raise Decidim::Api::Errors::ValidationError, I18n.t("proposals.withdraw.errors.has_votes", scope: "decidim")
+          end
+        end
+      end
+
+      def authorized?
+        raise Decidim::Api::Errors::MutationNotAuthorizedError, I18n.t("decidim.api.errors.unauthorized_mutation") unless super && allowed_to?(:withdraw, :proposal, object,
+                                                                                                                                               context)
+
+        true
+      end
+    end
+  end
+end
diff --git a/decidim-proposals/lib/decidim/api/proposal_type.rb b/decidim-proposals/lib/decidim/api/proposal_type.rb
index ce8af12ecc1ac..209d4f382c8da 100644
--- a/decidim-proposals/lib/decidim/api/proposal_type.rb
+++ b/decidim-proposals/lib/decidim/api/proposal_type.rb
@@ -97,8 +97,6 @@ def self.authorized?(object, context)
         ].all?
 
         super && chain
-      rescue Decidim::PermissionAction::PermissionNotSetError
-        false
       end
 
       private
diff --git a/decidim-proposals/lib/decidim/proposals/api.rb b/decidim-proposals/lib/decidim/proposals/api.rb
index 6b889c6346851..60f2c04f9171d 100644
--- a/decidim-proposals/lib/decidim/proposals/api.rb
+++ b/decidim-proposals/lib/decidim/proposals/api.rb
@@ -11,5 +11,11 @@ module Proposals
     autoload :ProposalMutationType, "decidim/api/mutations/proposal_mutation_type"
     autoload :ProposalAnswerType, "decidim/api/mutations/proposal_answer_type"
     autoload :AnswerProposalAttributes, "decidim/api/mutations/answer_proposal_attributes"
+    autoload :CreateProposalType, "decidim/api/mutations/create_proposal_type"
+    autoload :ProposalAttributes, "decidim/api/mutations/proposal_attributes"
+    autoload :VoteProposalType, "decidim/api/mutations/vote_proposal_type"
+    autoload :UnvoteProposalType, "decidim/api/mutations/unvote_proposal_type"
+    autoload :WithdrawProposalType, "decidim/api/mutations/withdraw_proposal_type"
+    autoload :UpdateProposalType, "decidim/api/mutations/update_proposal_type"
   end
 end
diff --git a/decidim-proposals/lib/decidim/proposals/component.rb b/decidim-proposals/lib/decidim/proposals/component.rb
index c9c91403ce78f..fc3ff3b0033c5 100644
--- a/decidim-proposals/lib/decidim/proposals/component.rb
+++ b/decidim-proposals/lib/decidim/proposals/component.rb
@@ -7,10 +7,6 @@
   component.icon = "media/images/decidim_proposals.svg"
   component.icon_key = "chat-new-line"
 
-  component.on(:before_destroy) do |instance|
-    raise "Cannot destroy this component when there are proposals" if Decidim::Proposals::Proposal.where(component: instance).any?
-  end
-
   component.on(:create) do |instance|
     admin_user = GlobalID::Locator.locate(instance.versions.first.whodunnit)
     Decidim::Proposals.create_default_states!(instance, admin_user)
diff --git a/decidim-proposals/lib/decidim/proposals/seeds.rb b/decidim-proposals/lib/decidim/proposals/seeds.rb
index 7254c3892d281..bb176f950587b 100644
--- a/decidim-proposals/lib/decidim/proposals/seeds.rb
+++ b/decidim-proposals/lib/decidim/proposals/seeds.rb
@@ -17,7 +17,7 @@ def call
 
         Decidim::Proposals.create_default_states!(component, admin_user)
 
-        number_of_records = slow_seeds? ? 10 : rand(25..50)
+        number_of_records = slow_seeds? ? rand(25..50) : rand(5..10)
 
         (5..number_of_records).to_a.sample.times do |n|
           proposal = create_proposal!(component:)
diff --git a/decidim-proposals/spec/controllers/decidim/proposals/admin/proposal_answers_controller_spec.rb b/decidim-proposals/spec/controllers/decidim/proposals/admin/proposal_answers_controller_spec.rb
index 690ff0259d2df..b62dcca51d10f 100644
--- a/decidim-proposals/spec/controllers/decidim/proposals/admin/proposal_answers_controller_spec.rb
+++ b/decidim-proposals/spec/controllers/decidim/proposals/admin/proposal_answers_controller_spec.rb
@@ -64,7 +64,7 @@ module Admin
 
             context "when the update is successful." do
               it "renders ProposalsAdmin#index view" do
-                post :update, params: params
+                post(:update, params:)
                 expect(response).to have_http_status(:found)
                 expect(subject).to redirect_to(proposals_path)
               end
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 5e510c51b22da..d26f8dd19bfdb 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
@@ -12,13 +12,11 @@ module Admin
         let(:component) { proposal.component }
         let(:origin_component) { create(:proposal_component, participatory_space: component.participatory_space) }
         let(:states) { %w(accepted) }
-        let(:import_proposals) { true }
         let(:params) do
           {
             states:,
             keep_authors: false,
-            origin_component_id: origin_component.try(:id),
-            import_proposals:
+            origin_component_id: origin_component.try(:id)
           }
         end
 
@@ -51,10 +49,10 @@ module Admin
           it { is_expected.to be_invalid }
         end
 
-        context "when the import proposals is not accepted" do
-          let(:import_proposals) { false }
+        context "when importing from multiple states" do
+          let(:states) { %w(accepted rejected) }
 
-          it { is_expected.to be_invalid }
+          it { is_expected.to be_valid }
         end
 
         describe "states" do
diff --git a/decidim-proposals/spec/lib/tasks/upgrade/fix_state_spec.rb b/decidim-proposals/spec/lib/tasks/upgrade/fix_state_spec.rb
index 5f1e7c13af21c..0c763ee380797 100644
--- a/decidim-proposals/spec/lib/tasks/upgrade/fix_state_spec.rb
+++ b/decidim-proposals/spec/lib/tasks/upgrade/fix_state_spec.rb
@@ -11,7 +11,7 @@
 
     before do
       proposal_state = proposal.proposal_state = Decidim::Proposals::ProposalState.where(component: component2).first
-      proposal.update!(proposal_state: proposal_state)
+      proposal.update!(proposal_state:)
     end
 
     it "does not throw an exception" do
@@ -24,7 +24,7 @@
 
     before do
       proposal_state = proposal.proposal_state = Decidim::Proposals::ProposalState.where(component: component2).first
-      proposal.update!(proposal_state: proposal_state)
+      proposal.update!(proposal_state:)
     end
 
     it "sets the state of the correct component" do
diff --git a/decidim-proposals/spec/permissions/decidim/proposals/permissions_spec.rb b/decidim-proposals/spec/permissions/decidim/proposals/permissions_spec.rb
index 6149b42923f24..550a0f2b44213 100644
--- a/decidim-proposals/spec/permissions/decidim/proposals/permissions_spec.rb
+++ b/decidim-proposals/spec/permissions/decidim/proposals/permissions_spec.rb
@@ -110,6 +110,12 @@
 
       it { is_expected.to be false }
     end
+
+    context "when proposal is already withdrawn" do
+      let(:proposal) { create(:proposal, :withdrawn, component: proposal_component) }
+
+      it { is_expected.to be false }
+    end
   end
 
   describe "voting" do
diff --git a/decidim-proposals/spec/shared/import_proposals_examples.rb b/decidim-proposals/spec/shared/import_proposals_examples.rb
index 12588014bcc65..3ecf56bbb2ddc 100644
--- a/decidim-proposals/spec/shared/import_proposals_examples.rb
+++ b/decidim-proposals/spec/shared/import_proposals_examples.rb
@@ -75,7 +75,6 @@ def fill_form(keep_authors: false)
       select origin_component.name["en"], from: "Origin component"
       check "Accepted"
       check "Keep original authors" if keep_authors
-      check "Import proposals"
     end
 
     click_on "Import proposals"
diff --git a/decidim-proposals/spec/shared/proposal_mutation_examples.rb b/decidim-proposals/spec/shared/proposal_mutation_examples.rb
deleted file mode 100644
index dcfb02f94d840..0000000000000
--- a/decidim-proposals/spec/shared/proposal_mutation_examples.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-shared_examples "manage proposal mutation examples" do
-  context "when proposal answering disabled" do
-    it "does not answer the proposal" do
-      expect(response["answer"]).to be_nil
-    end
-  end
-
-  context "when proposal answering enabled" do
-    let!(:proposal_answering_enabled) { true }
-
-    it "answers the proposal but not costs" do
-      answer = response["answer"]
-      expect(answer).to be_present
-      expect(answer).to include(
-        {
-          "id" => model.id.to_s,
-          "state" => state,
-          "answer" => {
-            "translation" => answer_content[:en]
-          },
-          "cost" => nil,
-          "costReport" => nil,
-          "executionPeriod" => nil,
-          "answeredAt" => model.reload.answered_at.to_time.iso8601
-        }
-      )
-    end
-
-    context "with enabled answering with cost" do
-      let!(:proposal_answers_with_costs?) { true }
-
-      it "answers the proposal and adds the cost" do
-        answer = response["answer"]
-
-        expect(answer).to be_present
-        expect(answer).to include(
-          {
-            "id" => model.id.to_s,
-            "state" => state,
-            "answer" => {
-              "translation" => answer_content[:en]
-            },
-            "cost" => "€ 1,234.00",
-            "costReport" => {
-              "translation" => cost_report[:en]
-            },
-            "executionPeriod" => {
-              "translation" => execution_period[:en]
-            },
-            "answeredAt" => model.reload.answered_at.to_time.iso8601
-          }
-        )
-      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 5418552ded89a..0560038a3c702 100644
--- a/decidim-proposals/spec/system/admin/admin_edits_proposal_spec.rb
+++ b/decidim-proposals/spec/system/admin/admin_edits_proposal_spec.rb
@@ -112,12 +112,19 @@
 
       let!(:document) { create(:attachment, :with_pdf, attached_to: proposal) }
 
-      it "can be remove attachment" do
+      it "can remove attachment" do
         visit_component_admin
         within "tr", text: translated_attribute(proposal.title) do
           find("button[data-controller='dropdown']").click
           click_on "Edit proposal"
         end
+
+        click_on("Edit attachments")
+        within "li[data-filename='#{document.file.blob.filename}']" do
+          click_on("Remove")
+        end
+        click_on("Save")
+
         within ".item__edit-form" do
           click_on "Update"
         end
@@ -129,7 +136,7 @@
           find("button[data-controller='dropdown']").click
           click_on "Edit proposal"
         end
-        expect(page).to have_no_content("Current file")
+        expect(page).to have_no_content(document.file.blob.filename)
       end
 
       it "can attach a file" do
diff --git a/decidim-proposals/spec/system/amendable/amend_proposal_spec.rb b/decidim-proposals/spec/system/amendable/amend_proposal_spec.rb
index 5945cf5644ecb..5cc5c2ffdbf8e 100644
--- a/decidim-proposals/spec/system/amendable/amend_proposal_spec.rb
+++ b/decidim-proposals/spec/system/amendable/amend_proposal_spec.rb
@@ -167,7 +167,7 @@
           expect(page).to have_no_css("#amend-button")
         end
 
-        context "when a private user is logged in" do
+        context "when a member is logged in" do
           let!(:user) { create(:user, :confirmed, organization: component.organization) }
 
           before do
@@ -210,6 +210,7 @@
             expect(page).to have_content("Log in")
             switch_to_host(component.organization.host)
             login_as user, scope: :user
+            sleep 1
             visit proposal_path
             expect(page).to have_content(proposal_title)
             find("#dropdown-trigger-resource-#{proposal.id}").click
diff --git a/decidim-proposals/spec/system/private_space_proposal_spec.rb b/decidim-proposals/spec/system/private_space_proposal_spec.rb
index fd46e50dcf45e..b6ba864615c65 100644
--- a/decidim-proposals/spec/system/private_space_proposal_spec.rb
+++ b/decidim-proposals/spec/system/private_space_proposal_spec.rb
@@ -7,7 +7,7 @@
   let(:user) { create(:user, :confirmed, organization:) }
   let!(:other_user) { create(:user, :confirmed, organization:) }
 
-  let!(:participatory_space_private_user) { create(:participatory_space_private_user, user: other_user, privatable_to: participatory_space_private) }
+  let!(:member) { create(:member, user: other_user, participatory_space: participatory_space_private) }
 
   let!(:participatory_space) { participatory_space_private }
 
@@ -33,10 +33,32 @@ 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
-      context "and is private user space" do
+      context "and is member space" do
         before do
           login_as other_user, scope: :user
         end
@@ -50,7 +72,7 @@ def visit_component
         end
       end
 
-      context "and is not private user space" do
+      context "and is not member space" do
         before do
           login_as user, scope: :user
         end
@@ -82,7 +104,7 @@ def visit_component
     end
 
     context "when the user is logged in" do
-      context "and is private user space" do
+      context "and is member space" do
         before do
           login_as other_user, scope: :user
         end
@@ -103,7 +125,7 @@ def visit_component
         end
       end
 
-      context "and is not private user space" do
+      context "and is not member space" do
         let(:target_path) { main_component_path(component) }
 
         before do
diff --git a/decidim-proposals/spec/system/proposal_show_spec.rb b/decidim-proposals/spec/system/proposal_show_spec.rb
index 60e99f5cf1200..8a56b37e5419d 100644
--- a/decidim-proposals/spec/system/proposal_show_spec.rb
+++ b/decidim-proposals/spec/system/proposal_show_spec.rb
@@ -27,6 +27,7 @@ def visit_proposal
       describe "extra admin link" do
         before do
           login_as user, scope: :user
+          sleep 1
           visit current_path
         end
 
@@ -65,9 +66,6 @@ def visit_proposal
         end
 
         it "successfully shows the page" do
-          within(".menu-bar") do
-            expect(page).to have_content(translated(component.name))
-          end
           expect(page).to have_content("Deleted participant")
         end
       end
diff --git a/decidim-proposals/spec/system/proposals_breadcrumbs_spec.rb b/decidim-proposals/spec/system/proposals_breadcrumbs_spec.rb
new file mode 100644
index 0000000000000..4a49f10d05730
--- /dev/null
+++ b/decidim-proposals/spec/system/proposals_breadcrumbs_spec.rb
@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Proposals Breadcrumb" do
+  include_context "with a component"
+
+  let(:organization) { create(:organization) }
+  let(:participatory_space) { create(:participatory_process, :with_steps, :published, organization:, title: { "en" => "Participatory space" }) }
+  let(:component) { create(:proposal_component, :published, :with_amendments_enabled, participatory_space:, name: { "en" => "Component" }) }
+  let(:proposal) { create(:proposal, component:, title: { "en" => "Proposal" }) }
+  let(:router) { Decidim::EngineRouter.main_proxy(component) }
+
+  before do
+    switch_to_host(organization.host)
+  end
+
+  describe "index" do
+    it "shows the correct information in breadcrumb (space, component)" do
+      visit router.root_path(locale: I18n.locale)
+
+      within ".menu-bar" do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+      end
+    end
+  end
+
+  describe "show" do
+    it "shows the correct information in breadcrumb (space, component, proposal)" do
+      visit router.proposal_path(proposal, locale: I18n.locale)
+
+      within ".menu-bar" do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+        expect(page).to have_content(translated(proposal.title))
+      end
+    end
+
+    context "when it is an official proposal" do
+      let(:content) { generate_localized_title }
+      let!(:official_proposal) { create(:proposal, :official, body: content, component:) }
+      let!(:official_proposal_title) { translated(official_proposal.title) }
+
+      before do
+        visit_component
+        click_on official_proposal_title
+      end
+
+      it "shows the correct information in breadcrumb (space, component, proposal)" do
+        within(".menu-bar") do
+          expect(page).to have_content(translated(component.participatory_space.title))
+          expect(page).to have_content(translated(component.name))
+          expect(page).to have_content(translated(official_proposal.title))
+        end
+      end
+    end
+  end
+
+  describe "versions", versioning: true do
+    let!(:amendment) { create(:amendment, amendable: proposal, emendation:) }
+    let!(:emendation) { create(:proposal, body: { en: "Amended One liner body" }, component:) }
+
+    let(:form) do
+      Decidim::Amendable::ReviewForm.from_params(
+        id: amendment.id,
+        amendable_gid: proposal.to_sgid.to_s,
+        emendation_gid: emendation.to_sgid.to_s,
+        emendation_params: { title: emendation.title, body: emendation.body }
+      )
+    end
+    let(:command) { Decidim::Amendable::Accept.new(form) }
+
+    before do
+      visit router.proposal_path(proposal, locale: I18n.locale)
+      command.call
+      click_on "see other versions"
+      click_on("Version 2 of 2")
+    end
+
+    it "shows the correct information in breadcrumb (space, component, proposal)" do
+      within(".menu-bar") do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+        expect(page).to have_content(translated(proposal.reload.title))
+      end
+    end
+  end
+
+  context "when visiting single amendment page", versioning: true do
+    let!(:emendation) { create(:proposal, title: { en: "Amended Long enough title" }, component:) }
+    let!(:amendment) { create(:amendment, amendable: proposal, emendation:) }
+    let(:form) do
+      Decidim::Amendable::ReviewForm.from_params(
+        id: amendment.id,
+        amendable_gid: proposal.to_sgid.to_s,
+        emendation_gid: emendation.to_sgid.to_s,
+        emendation_params: { title: emendation.title, body: emendation.body }
+      )
+    end
+    let(:command) { Decidim::Amendable::Accept.new(form) }
+
+    before do
+      component.update!(settings: { amendments_enabled: true })
+      command.call
+    end
+
+    it "shows the correct information in breadcrumb (space, component, amendment)" do
+      visit router.proposal_path(emendation, locale: I18n.locale)
+
+      within ".menu-bar" do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+        expect(page).to have_content(translated(emendation.title))
+        expect(page).to have_content("Amendment")
+      end
+    end
+  end
+end
diff --git a/decidim-proposals/spec/system/proposals_spec.rb b/decidim-proposals/spec/system/proposals_spec.rb
index a3b78bd55fb55..0c483739de399 100644
--- a/decidim-proposals/spec/system/proposals_spec.rb
+++ b/decidim-proposals/spec/system/proposals_spec.rb
@@ -89,11 +89,6 @@
       end
 
       it "shows the author as official" do
-        within(".menu-bar") do
-          expect(page).to have_content(translated(component.name))
-          expect(page).to have_content(translated(official_proposal.title))
-        end
-
         expect(page).to have_content("Official proposal")
       end
 
diff --git a/decidim-proposals/spec/system/proposals_versions_spec.rb b/decidim-proposals/spec/system/proposals_versions_spec.rb
index 34896c771ac05..1d428ad0c8258 100644
--- a/decidim-proposals/spec/system/proposals_versions_spec.rb
+++ b/decidim-proposals/spec/system/proposals_versions_spec.rb
@@ -130,11 +130,6 @@
       visit current_path
       click_on("Version 3 of 3")
 
-      within(".menu-bar") do
-        expect(page).to have_content(translated(component.name))
-        expect(page).to have_content(translated(proposal.reload.title))
-      end
-
       within "#diff-for-state" do
         expect(page).to have_content("State")
         within ".diff > ul > .ins" do
diff --git a/decidim-proposals/spec/types/create_proposal_type_spec.rb b/decidim-proposals/spec/types/create_proposal_type_spec.rb
new file mode 100644
index 0000000000000..e08243d65eac2
--- /dev/null
+++ b/decidim-proposals/spec/types/create_proposal_type_spec.rb
@@ -0,0 +1,235 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Proposals
+    describe CreateProposalType, type: :graphql do
+      include_context "with a graphql class mutation"
+
+      let(:type_class) { Decidim::Proposals::CreateProposalType }
+      let(:root_klass) { Decidim::Proposals::ProposalsMutationType }
+
+      let(:current_organization) { create(:organization, available_locales: [:en]) }
+      let(:organization) { current_organization }
+      let(:participatory_process) { create(:participatory_process, :published, :with_steps, organization:) }
+      let!(:component) { create(:proposal_component, :published, :with_creation_enabled, participatory_space: participatory_process) }
+
+      let(:root_taxonomy) { create(:taxonomy, organization:) }
+      let!(:taxonomy) { create(:taxonomy, parent: root_taxonomy, organization:) }
+      let(:taxonomy_filter) { create(:taxonomy_filter, root_taxonomy:) }
+      let!(:taxonomy_filter_item) { create(:taxonomy_filter_item, taxonomy_filter:, taxonomy_item: taxonomy) }
+      let!(:user) { create(:user, :confirmed, organization:) }
+
+      let(:address) { "Carrer de la Pau, 1, Barcelona" }
+      let(:latitude) { 40.1234 }
+      let(:longitude) { 2.1234 }
+
+      let(:title) { "More sidewalks and less roads" }
+      let(:body) { "Cities need more people, not more cars" }
+      let(:locale) { "en" }
+      let(:translation_locale) { "en" }
+
+      let(:attributes) do
+        {
+          title:,
+          body:,
+          address:,
+          latitude:,
+          longitude:,
+          taxonomies: [taxonomy_filter.id]
+        }
+      end
+
+      let(:variables) do
+        {
+          component_id: component.id,
+          input: {
+            locale:,
+            attributes:
+          }
+        }
+      end
+
+      let(:root_value) { component }
+      let(:query) do
+        <<~GRAPHQL
+          mutation createProposal($input: CreateProposalInput!){
+            createProposal(input: $input) {
+              id
+              title { translation(locale: "#{translation_locale}") }
+              body { translation(locale: "#{translation_locale}") }
+              address
+              publishedAt
+              author { name }
+            }
+          }
+        GRAPHQL
+      end
+
+      before do
+        stub_geocoding(address, [latitude, longitude])
+      end
+
+      context "when creating a new proposal" do
+        context "when the user is not logged in" do
+          let(:current_user) { nil }
+
+          it "raises a Decidim::Api::Errors::MutationNotAuthorizedError" do
+            expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+          end
+        end
+
+        context "when the user is logged in" do
+          context "with creation enabled" do
+            let!(:component) do
+              create(:proposal_component,
+                     :published,
+                     :with_creation_enabled,
+                     participatory_space: participatory_process,
+                     settings: {
+                       taxonomy_filters: [taxonomy_filter.id]
+                     })
+            end
+
+            it "creates a new proposal" do
+              proposal_response = response["createProposal"]
+
+              expect(proposal_response).to be_present
+              expect(proposal_response["title"]["translation"]).to eq(title)
+              expect(proposal_response["body"]["translation"]).to include(body)
+              expect(proposal_response["publishedAt"]).to be_present
+              expect(proposal_response["author"]["name"]).to eq(current_user.name)
+            end
+
+            context "when submitting in one language and requesting in another" do
+              let(:locale) { "en" }
+              let(:translation_locale) { "es" }
+
+              it "creates a new proposal" do
+                proposal_response = response["createProposal"]
+
+                expect(proposal_response).to be_present
+                expect(proposal_response["title"]["translation"]).to be_nil
+              end
+            end
+
+            context "when geocoding is enabled" do
+              let!(:component) do
+                create(:proposal_component,
+                       :with_creation_enabled,
+                       :published,
+                       participatory_space: participatory_process,
+                       settings: {
+                         geocoding_enabled: true,
+                         taxonomy_filters: [taxonomy_filter.id]
+                       })
+              end
+
+              it "creates a new proposal" do
+                proposal_response = response["createProposal"]
+
+                expect(proposal_response).to be_present
+                expect(proposal_response["title"]["translation"]).to eq(title)
+                expect(proposal_response["body"]["translation"]).to include(body)
+                expect(proposal_response["address"]).to eq(address)
+                expect(proposal_response["publishedAt"]).to be_present
+                expect(proposal_response["author"]["name"]).to eq(current_user.name)
+              end
+            end
+
+            context "when the user is not authorized" do
+              context "and there is only an authorization required" do
+                before do
+                  permissions = {
+                    create: {
+                      authorization_handlers: {
+                        "dummy_authorization_handler" => { "options" => {} }
+                      }
+                    }
+                  }
+
+                  component.update!(permissions:)
+                end
+
+                it "throws an error if the user does not have a verification method" do
+                  skip("This test is failing, but it is not in the scope of this PR.")
+                  proposal_response = response["createProposal"]
+
+                  expect(proposal_response).to be_nil
+                end
+              end
+
+              context "and there are more than one authorization required" do
+                before do
+                  permissions = {
+                    create: {
+                      authorization_handlers: {
+                        "dummy_authorization_handler" => { "options" => {} },
+                        "another_dummy_authorization_handler" => { "options" => {} }
+                      }
+                    }
+                  }
+
+                  component.update!(permissions:)
+                end
+
+                it "throws an error if the user does not have a verification method" do
+                  skip("This test is failing, but it is not in the scope of this PR.")
+
+                  proposal_response = response["createProposal"]
+
+                  expect(proposal_response).to be_nil
+                end
+              end
+            end
+          end
+        end
+
+        context "when validating" do
+          context "with having invalid locale" do
+            let(:locale) { "tlh" }
+
+            it "raises an error" do
+              expect { response }.to raise_error(Api::Errors::InvalidLocaleError, /Invalid locale provided/)
+            end
+          end
+
+          context "with having invalid title" do
+            context "when is missing" do
+              let(:title) { "" }
+
+              it "raises an error" do
+                expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /too short/)
+              end
+            end
+
+            context "when is too short" do
+              let(:title) { "Short" }
+
+              it "raises an error" do
+                expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /too short/)
+              end
+            end
+          end
+
+          context "with having invalid body" do
+            let(:body) { "Short" }
+
+            it "raises an error" do
+              expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /too short/)
+            end
+          end
+        end
+
+        context "when the creating is disabled" do
+          let!(:component) { create(:proposal_component, participatory_space: participatory_process) }
+
+          it "raises a Decidim::Api::Errors::MutationNotAuthorizedError" do
+            expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-proposals/spec/types/mutations/proposal_answer_type_spec.rb b/decidim-proposals/spec/types/mutations/proposal_answer_type_spec.rb
new file mode 100644
index 0000000000000..b5569227f40a8
--- /dev/null
+++ b/decidim-proposals/spec/types/mutations/proposal_answer_type_spec.rb
@@ -0,0 +1,140 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Proposals
+    describe ProposalAnswerType, type: :graphql do
+      include_context "with a graphql class mutation"
+
+      let(:root_klass) { ProposalMutationType }
+      let(:organization) { create(:organization, available_locales: [:en]) }
+      let(:participatory_process) { create(:participatory_process, :with_steps, organization:) }
+      let(:proposal_component) { create(:proposal_component, participatory_space: participatory_process) }
+      let!(:model) { create(:proposal, component: proposal_component) }
+      let(:state) { %w(accepted evaluating rejected).sample }
+      let(:answer_content) { Decidim::Faker::Localized.sentence(word_count: 3) }
+      let(:proposal_answering_enabled) { false }
+      let(:proposal_answers_with_costs?) { false }
+      let(:cost_report) { Decidim::Faker::Localized.sentence(word_count: 3) }
+      let(:component) { model.component }
+      let(:execution_period) { Decidim::Faker::Localized.sentence(word_count: 3) }
+      let(:cost) { 123_4 }
+      let(:variables) do
+        {
+          input: {
+            attributes: {
+              state:,
+              answerContent: answer_content,
+              cost:,
+              costReport: cost_report,
+              executionPeriod: execution_period
+            }
+          }
+        }
+      end
+      let(:query) do
+        <<~GRAPHQL
+          mutation($input: AnswerInput!) {
+            answer(input: $input) {
+              id
+              answer { translation(locale: "en") }
+              state
+              cost
+              costReport { translation(locale: "en") }
+              executionPeriod { translation(locale: "en") }
+              answeredAt
+            }
+          }
+        GRAPHQL
+      end
+
+      before do
+        component.update!(
+          settings: { proposal_answering_enabled: },
+          step_settings: {
+            component.participatory_space.active_step.id => {
+              proposal_answering_enabled:,
+              answers_with_costs: proposal_answers_with_costs?
+            }
+          }
+        )
+      end
+
+      shared_examples "manage proposal answer mutation examples" do
+        context "when proposal answering disabled" do
+          it "throws Decidim::Api::Errors::MutationNotAuthorizedError" do
+            expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+          end
+        end
+
+        context "when proposal answering enabled" do
+          let!(:proposal_answering_enabled) { true }
+
+          it "answers the proposal but not costs" do
+            answer = response["answer"]
+            expect(answer).to be_present
+            expect(answer).to include(
+              {
+                "id" => model.id.to_s,
+                "state" => state,
+                "answer" => {
+                  "translation" => answer_content[:en]
+                },
+                "cost" => nil,
+                "costReport" => nil,
+                "executionPeriod" => nil,
+                "answeredAt" => model.reload.answered_at.to_time.iso8601
+              }
+            )
+          end
+
+          context "with enabled answering with cost" do
+            let!(:proposal_answers_with_costs?) { true }
+
+            it "answers the proposal and adds the cost" do
+              answer = response["answer"]
+
+              expect(answer).to be_present
+              expect(answer).to include(
+                {
+                  "id" => model.id.to_s,
+                  "state" => state,
+                  "answer" => {
+                    "translation" => answer_content[:en]
+                  },
+                  "cost" => "€ 1,234.00",
+                  "costReport" => {
+                    "translation" => cost_report[:en]
+                  },
+                  "executionPeriod" => {
+                    "translation" => execution_period[:en]
+                  },
+                  "answeredAt" => model.reload.answered_at.to_time.iso8601
+                }
+              )
+            end
+          end
+        end
+      end
+
+      context "with admin user" do
+        it_behaves_like "manage proposal answer mutation examples" do
+          let!(:user_type) { :admin }
+        end
+      end
+
+      context "with normal user" do
+        it "throws Decidim::Api::Errors::MutationNotAuthorizedError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+        end
+      end
+
+      context "with api_user" do
+        it_behaves_like "manage proposal answer mutation examples" do
+          let!(:user_type) { :api_user }
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-proposals/spec/types/proposal_mutation_type_spec.rb b/decidim-proposals/spec/types/proposal_mutation_type_spec.rb
deleted file mode 100644
index 31f11a0653a70..0000000000000
--- a/decidim-proposals/spec/types/proposal_mutation_type_spec.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-require "decidim/api/test/mutation_context"
-
-module Decidim
-  module Proposals
-    describe ProposalAnswerType, type: :graphql do
-      include_context "with a graphql class mutation"
-
-      let(:root_klass) { ProposalMutationType }
-      let(:organization) { create(:organization, available_locales: [:en]) }
-      let(:participatory_process) { create(:participatory_process, :with_steps, organization:) }
-      let(:proposal_component) { create(:proposal_component, participatory_space: participatory_process) }
-      let!(:model) { create(:proposal, component: proposal_component) }
-      let(:state) { %w(accepted evaluating rejected).sample }
-      let(:answer_content) { Decidim::Faker::Localized.sentence(word_count: 3) }
-      let(:proposal_answering_enabled) { false }
-      let(:proposal_answers_with_costs?) { false }
-      let(:cost_report) { Decidim::Faker::Localized.sentence(word_count: 3) }
-      let(:component) { model.component }
-      let(:execution_period) { Decidim::Faker::Localized.sentence(word_count: 3) }
-      let(:cost) { 123_4 }
-      let(:variables) do
-        {
-          input: {
-            attributes: {
-              state: state,
-              answerContent: answer_content,
-              cost: cost,
-              costReport: cost_report,
-              executionPeriod: execution_period
-            }
-          }
-        }
-      end
-      let(:query) do
-        <<~GRAPHQL
-          mutation($input: AnswerInput!) {
-            answer(input: $input) {
-              id
-              answer { translation(locale: "en") }
-              state
-              cost
-              costReport { translation(locale: "en") }
-              executionPeriod { translation(locale: "en") }
-              answeredAt
-            }
-          }
-        GRAPHQL
-      end
-
-      before do
-        component.update!(
-          settings: { proposal_answering_enabled: proposal_answering_enabled },
-          step_settings: {
-            component.participatory_space.active_step.id => {
-              proposal_answering_enabled: proposal_answering_enabled,
-              answers_with_costs: proposal_answers_with_costs?
-            }
-          }
-        )
-      end
-
-      context "with admin user" do
-        it_behaves_like "manage proposal mutation examples" do
-          let!(:user_type) { :admin }
-        end
-      end
-
-      context "with normal user" do
-        it "returns nil" do
-          expect(response["answer"]).to be_nil
-        end
-      end
-
-      context "with api_user" do
-        it_behaves_like "manage proposal mutation examples" do
-          let!(:user_type) { :api_user }
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-proposals/spec/types/proposal_type_spec.rb b/decidim-proposals/spec/types/proposal_type_spec.rb
index 68115fc8f63f9..7b4447837d1c3 100644
--- a/decidim-proposals/spec/types/proposal_type_spec.rb
+++ b/decidim-proposals/spec/types/proposal_type_spec.rb
@@ -26,6 +26,12 @@ module Proposals
       include_examples "localizable interface"
       include_examples "followable interface"
 
+      shared_examples "unauthorized Proposal" do
+        it "throws Decidim::Api::Errors::UnauthorizedObjectError" do
+          expect { response }.to raise_error(Decidim::Api::Errors::UnauthorizedObjectError, "You cannot view or edit this Proposal because you do not have permissions")
+        end
+      end
+
       describe "id" do
         let(:query) { "{ id }" }
 
@@ -275,9 +281,7 @@ module Proposals
         let(:model) { create(:proposal, component: current_component) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Proposal"
       end
 
       context "when participatory space is private but transparent" do
@@ -297,9 +301,7 @@ module Proposals
         let(:model) { create(:proposal, component: current_component) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Proposal"
       end
 
       context "when component is not published" do
@@ -307,9 +309,7 @@ module Proposals
         let(:model) { create(:proposal, component: current_component) }
         let(:query) { "{ id }" }
 
-        it "returns nothing" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Proposal"
       end
 
       context "when proposal is moderated" do
@@ -317,9 +317,7 @@ module Proposals
         let(:query) { "{ id }" }
         let(:root_value) { model.reload }
 
-        it "returns all the required fields" do
-          expect(response).to be_nil
-        end
+        it_behaves_like "unauthorized Proposal"
       end
     end
   end
diff --git a/decidim-proposals/spec/types/proposals_type_spec.rb b/decidim-proposals/spec/types/proposals_type_spec.rb
index aab72b587bf09..6184f3fdb5e29 100644
--- a/decidim-proposals/spec/types/proposals_type_spec.rb
+++ b/decidim-proposals/spec/types/proposals_type_spec.rb
@@ -58,16 +58,16 @@ module Proposals
         context "when the proposal does not belong to the component" do
           let!(:proposal) { create(:proposal, component: create(:proposal_component)) }
 
-          it "returns null" do
-            expect(response["proposal"]).to be_nil
+          it "raises error" do
+            expect { response }.to raise_error(Decidim::Api::Errors::NotFoundError, "Proposal not found")
           end
         end
 
         context "when the proposal is not published" do
           let!(:proposal) { create(:proposal, :draft, component: model) }
 
-          it "returns null" do
-            expect(response["proposal"]).to be_nil
+          it "raises error" do
+            expect { response }.to raise_error(Decidim::Api::Errors::NotFoundError, "Proposal not found")
           end
         end
       end
diff --git a/decidim-proposals/spec/types/unvote_proposal_type_spec.rb b/decidim-proposals/spec/types/unvote_proposal_type_spec.rb
new file mode 100644
index 0000000000000..651d8f7e26509
--- /dev/null
+++ b/decidim-proposals/spec/types/unvote_proposal_type_spec.rb
@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Proposals
+    describe UnvoteProposalType, type: :graphql do
+      include_context "with a graphql class mutation"
+
+      let(:root_klass) { ProposalMutationType }
+      let(:current_organization) { create(:organization, available_locales: [:en]) }
+      let(:participatory_process) { create(:participatory_process, :with_steps, organization: current_organization) }
+      let(:proposal_component) do
+        create(:proposal_component,
+               :with_votes_enabled,
+               participatory_space: participatory_process)
+      end
+      let!(:model) { create(:proposal, component: proposal_component) }
+      let(:component) { model.component }
+      let(:query) do
+        <<~GRAPHQL
+          mutation {
+            unvote(input: {}) {
+              id
+              voteCount
+            }
+          }
+        GRAPHQL
+      end
+      let(:variables) do
+        {
+          input: {
+            attributes: {}
+          }
+        }
+      end
+
+      context "with a normal user" do
+        let(:user_type) { :user }
+
+        context "when the user has voted" do
+          before do
+            create(:proposal_vote, proposal: model, author: current_user)
+          end
+
+          it "removes the vote from the proposal" do
+            expect do
+              expect(response["unvote"]).not_to be_nil
+            end.to change(ProposalVote, :count).by(-1)
+          end
+
+          it "returns the proposal with updated vote count" do
+            unvote = response["unvote"]
+            expect(unvote).to be_present
+            expect(unvote["id"]).to eq(model.id.to_s)
+            expect(unvote["voteCount"]).to eq(0)
+          end
+        end
+
+        context "when the user has not voted" do
+          it "does not change vote count" do
+            expect do
+              response
+            end.not_to change(ProposalVote, :count)
+          end
+
+          it "returns the proposal" do
+            unvote = response["unvote"]
+            expect(unvote).to be_present
+            expect(unvote["id"]).to eq(model.id.to_s)
+            expect(unvote["voteCount"]).to eq(0)
+          end
+        end
+
+        context "when votes are disabled" do
+          let(:proposal_component) do
+            create(:proposal_component,
+                   :with_votes_disabled,
+                   participatory_space: participatory_process)
+          end
+
+          before do
+            create(:proposal_vote, proposal: model, author: current_user)
+          end
+
+          it "raises a Decidim::Api::Errors::MutationNotAuthorizedError exception" do
+            expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+          end
+        end
+      end
+
+      context "with an unauthenticated user" do
+        let(:current_user) { nil }
+
+        it "raises a Decidim::Api::Errors::MutationNotAuthorizedError exception" do
+          expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-proposals/spec/types/update_proposal_type_spec.rb b/decidim-proposals/spec/types/update_proposal_type_spec.rb
new file mode 100644
index 0000000000000..fed4ec627cc82
--- /dev/null
+++ b/decidim-proposals/spec/types/update_proposal_type_spec.rb
@@ -0,0 +1,220 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Proposals
+    describe UpdateProposalType, type: :graphql do
+      include_context "with a graphql class mutation"
+
+      let(:root_taxonomy) { create(:taxonomy, organization:) }
+      let!(:taxonomy) { create(:taxonomy, parent: root_taxonomy, organization:) }
+      let(:taxonomy_filter) { create(:taxonomy_filter, root_taxonomy:) }
+      let!(:taxonomy_filter_item) { create(:taxonomy_filter_item, taxonomy_filter:, taxonomy_item: taxonomy) }
+      let!(:taxonomies) { [taxonomy.id] }
+
+      let(:type_class) { Decidim::Proposals::UpdateProposalType }
+      let(:root_klass) { ProposalMutationType }
+      let(:organization) { create(:organization, available_locales: [:en, :ca, :es]) }
+      let(:current_organization) { organization }
+      let(:participatory_process) { create(:participatory_process, :with_steps, organization:) }
+      let(:proposal_component) { create(:proposal_component, participatory_space: participatory_process, settings: { taxonomy_filters: [taxonomy_filter.id] }) }
+      let(:current_component) { proposal_component }
+      let(:author) { create(:user, organization:) }
+      let!(:model) { create(:proposal, component: proposal_component, users: [author]) }
+      let(:root_value) { model }
+      let(:new_title) { "Updated proposal title for testing" }
+      let(:new_body) { "This is an updated body content for the proposal that meets the minimum length requirements." }
+      let(:component) { model.component }
+      let(:locale) { "en" }
+      let(:variables) do
+        {
+          input: {
+            locale:,
+            attributes: {
+              title: new_title,
+              body: new_body,
+              taxonomies:
+            }
+          }
+        }
+      end
+      let(:query) do
+        <<~GRAPHQL
+          mutation($input: UpdateProposalInput!) {
+            updateProposal(input: $input) {
+              id
+              title { translation(locale: "#{locale}") }
+              body { translation(locale: "#{locale}") }
+              address
+              taxonomies { id }
+            }
+          }
+        GRAPHQL
+      end
+
+      before do
+        I18n.locale = "en"
+      end
+
+      shared_examples "update proposal mutation examples" do
+        context "when user is not authorized" do
+          let!(:current_user) { nil }
+
+          it "raises a Decidim::Api::Errors::MutationNotAuthorizedError exception" do
+            expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+          end
+        end
+
+        context "when user is authorized" do
+          context "with valid attributes" do
+            context "when requesting a different locale" do
+              let!(:model) { create(:proposal, title: { "en" => "Original title", "ca" => "Títol original" }, component: proposal_component, users: [author]) }
+              let(:locale) { "ca" }
+
+              it "updates only the language" do
+                update = response["updateProposal"]
+                expect(update).to be_present
+                expect(update["title"]).to include({ "translation" => new_title })
+
+                expect(model.reload.title).to include({ "ca" => new_title })
+              end
+            end
+
+            it "updates the proposal" do
+              update = response["updateProposal"]
+
+              expect(update).to be_present
+              expect(update).to include(
+                {
+                  "id" => model.id.to_s,
+                  "title" => {
+                    "translation" => new_title
+                  },
+                  "body" => {
+                    "translation" => new_body
+                  }
+                }
+              )
+              expect(update["taxonomies"]).to include({ "id" => taxonomy.id.to_s })
+            end
+
+            context "with address and coordinates" do
+              let(:address) { "Carrer de la Pau, 1, Barcelona" }
+              let(:latitude) { 41.3851 }
+              let(:longitude) { 2.1734 }
+              let(:variables) do
+                {
+                  input: {
+                    locale:,
+                    attributes: {
+                      title: new_title,
+                      body: new_body,
+                      address:,
+                      latitude:,
+                      longitude:
+                    }
+                  }
+                }
+              end
+
+              it "updates the proposal with location data" do
+                update = response["updateProposal"]
+                expect(update).to be_present
+                expect(update).to include(
+                  {
+                    "id" => model.id.to_s,
+                    "address" => address
+                  }
+                )
+              end
+            end
+          end
+
+          context "with invalid attributes" do
+            let(:new_title) { "short" }
+            let(:new_body) { "x" }
+
+            it "returns an error" do
+              expect { response }.to raise_error(StandardError)
+            end
+          end
+        end
+      end
+
+      context "with proposal author" do
+        let!(:current_user) { author }
+
+        it_behaves_like "update proposal mutation examples" do
+          let!(:user_type) { :user }
+        end
+
+        context "with having invalid locale" do
+          let(:locale) { "tlh" }
+
+          it "raises an error" do
+            expect { response }.to raise_error(Api::Errors::InvalidLocaleError, /Invalid locale provided/)
+          end
+        end
+
+        context "with invalid attributes" do
+          context "with invalid title" do
+            context "when is missing" do
+              let(:new_title) { "" }
+
+              it "raises an error" do
+                expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /too short/)
+              end
+            end
+
+            context "when is too short" do
+              let(:new_title) { "Short" }
+
+              it "raises an error" do
+                expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /too short/)
+              end
+            end
+
+            context "when is all small" do
+              let(:new_title) { "Updated proposal title for testing".downcase }
+
+              it "raises an error" do
+                expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /must start with a capital letter/)
+              end
+            end
+          end
+
+          context "with invalid body" do
+            let(:new_body) { "Short" }
+
+            it "raises an error" do
+              expect { response }.to raise_error(Decidim::Api::Errors::AttributeValidationError, /too short/)
+            end
+          end
+        end
+      end
+
+      context "with admin user" do
+        let!(:user_type) { :admin }
+
+        it "raises a Decidim::Api::Errors::MutationNotAuthorizedError exception" do
+          expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+        end
+      end
+
+      context "with normal user (not author)" do
+        it "raises an Decidim::Api::Errors::MutationNotAuthorizedError exception" do
+          expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+        end
+      end
+
+      context "with api_user" do
+        let!(:current_user) { author }
+
+        it_behaves_like "update proposal mutation examples" do
+          let!(:user_type) { :api_user }
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-proposals/spec/types/vote_proposal_type_spec.rb b/decidim-proposals/spec/types/vote_proposal_type_spec.rb
new file mode 100644
index 0000000000000..0c03ada1a4e86
--- /dev/null
+++ b/decidim-proposals/spec/types/vote_proposal_type_spec.rb
@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Proposals
+    describe VoteProposalType, type: :graphql do
+      include_context "with a graphql class mutation"
+
+      let(:root_klass) { ProposalMutationType }
+      let(:current_organization) { create(:organization, available_locales: [:en]) }
+      let(:participatory_process) { create(:participatory_process, :with_steps, organization: current_organization) }
+      let(:proposal_component) do
+        create(:proposal_component,
+               :with_votes_enabled,
+               participatory_space: participatory_process)
+      end
+      let!(:model) { create(:proposal, component: proposal_component) }
+      let(:component) { model.component }
+      let(:query) do
+        <<~GRAPHQL
+          mutation {
+            vote(input: {}) {
+              id
+              voteCount
+            }
+          }
+        GRAPHQL
+      end
+
+      let(:variables) do
+        {
+          input: {
+            attributes: {}
+          }
+        }
+      end
+
+      context "with a normal user" do
+        let(:user_type) { :user }
+
+        context "when votes are enabled" do
+          it "votes the proposal" do
+            expect do
+              expect(response["vote"]).not_to be_nil
+            end.to change(ProposalVote, :count).by(1)
+          end
+
+          it "returns the proposal with updated vote count" do
+            vote = response["vote"]
+            expect(vote).to be_present
+            expect(vote["id"]).to eq(model.id.to_s)
+            expect(vote["voteCount"]).to eq(1)
+          end
+        end
+
+        context "when the user has already voted" do
+          before do
+            create(:proposal_vote, proposal: model, author: current_user)
+          end
+
+          it "raises a Decidim::Api::Errors::ValidationError exception" do
+            expect { response }.to raise_error(Decidim::Api::Errors::ValidationError, "There was a problem voting the proposal.")
+          end
+        end
+
+        context "when votes are disabled" do
+          let(:proposal_component) do
+            create(:proposal_component,
+                   :with_votes_disabled,
+                   participatory_space: participatory_process)
+          end
+
+          it "raises a Decidim::Api::Errors::MutationNotAuthorizedError exception" do
+            expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+          end
+        end
+
+        context "when the proposal has reached maximum votes" do
+          before do
+            allow(model).to receive(:maximum_votes_reached?).and_return(true)
+            allow(model).to receive(:can_accumulate_votes_beyond_threshold).and_return(false)
+          end
+
+          it "raises a Decidim::Api::Errors::ValidationError exception" do
+            expect { response }.to raise_error(Decidim::Api::Errors::ValidationError, "There was a problem voting the proposal.")
+          end
+        end
+      end
+
+      context "with an unauthenticated user" do
+        let(:current_user) { nil }
+
+        it "raises a Decidim::Api::Errors::MutationNotAuthorizedError exception" do
+          expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-proposals/spec/types/withdraw_proposal_type_spec.rb b/decidim-proposals/spec/types/withdraw_proposal_type_spec.rb
new file mode 100644
index 0000000000000..e602904c5c08d
--- /dev/null
+++ b/decidim-proposals/spec/types/withdraw_proposal_type_spec.rb
@@ -0,0 +1,126 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Proposals
+    describe WithdrawProposalType, type: :graphql do
+      include_context "with a graphql class mutation"
+
+      let(:root_klass) { ProposalMutationType }
+      let(:current_organization) { create(:organization, available_locales: [:en]) }
+      let(:participatory_process) { create(:participatory_process, :with_steps, organization: current_organization) }
+      let(:proposal_component) { create(:proposal_component, participatory_space: participatory_process) }
+      let(:author) { create(:user, :confirmed, organization: current_organization) }
+      let!(:model) { create(:proposal, component: proposal_component, users: [author]) }
+      let(:component) { model.component }
+      let(:query) do
+        <<~GRAPHQL
+          mutation() {
+            withdraw(input: {}) {
+              id
+              state
+              withdrawnAt
+            }
+          }
+        GRAPHQL
+      end
+
+      let(:variables) do
+        {
+          input: {
+            attributes: {}
+          }
+        }
+      end
+
+      describe "withdrawing a proposal" do
+        context "with proposal author" do
+          let(:current_user) { author }
+          let(:user_type) { :user }
+
+          it "withdraws the proposal" do
+            proposal = response["withdraw"]
+            expect(proposal).to be_present
+            expect(proposal["id"]).to eq(model.id.to_s)
+            expect(model.reload).to be_withdrawn
+            expect(model.withdrawn_at).to be_present
+          end
+        end
+
+        context "with admin user" do
+          let!(:user_type) { :admin }
+
+          it "raises a Decidim::Api::Errors::MutationNotAuthorizedError exception" do
+            expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+          end
+        end
+
+        context "with api_user that is not the author" do
+          let!(:user_type) { :api_user }
+
+          it "raises a Decidim::Api::Errors::MutationNotAuthorizedError exception" do
+            expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+          end
+        end
+
+        context "with normal user that is not the author" do
+          it "raises a Decidim::Api::Errors::MutationNotAuthorizedError exception" do
+            expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+          end
+        end
+
+        context "with api_user that is the author" do
+          let!(:model) { create(:proposal, component: proposal_component, users: [current_user]) }
+          let!(:user_type) { :api_user }
+
+          it "withdraws the proposal" do
+            proposal = response["withdraw"]
+            expect(proposal).to be_present
+            expect(proposal["id"]).to eq(model.id.to_s)
+            expect(model.reload).to be_withdrawn
+            expect(model.withdrawn_at).to be_present
+          end
+        end
+      end
+
+      context "when proposal has votes" do
+        let(:current_user) { author }
+
+        before do
+          model.votes.create!(author: create(:user, :confirmed, organization: current_organization))
+        end
+
+        it "does not withdraw the proposal and returns an error" do
+          expect { response }.to raise_error(Decidim::Api::Errors::ValidationError, "This proposal cannot be withdrawn because it already has votes.")
+          expect(model.reload).not_to be_withdrawn
+          expect(model.withdrawn_at).not_to be_present
+        end
+      end
+
+      context "when proposal is already withdrawn" do
+        let!(:model) { create(:proposal, :withdrawn, component: proposal_component, users: [author]) }
+        let(:current_user) { author }
+
+        it "remains withdrawn and returns an error" do
+          expect { response }.to raise_error(Decidim::Api::Errors::MutationNotAuthorizedError, "You do not have permission to perform this mutation")
+          expect(model.reload).to be_withdrawn
+          expect(model.withdrawn_at).to be_present
+        end
+      end
+
+      context "when proposal is already answered" do
+        let!(:model) { create(:proposal, :with_answer, component: proposal_component, users: [author]) }
+        let(:current_user) { author }
+
+        it "can be withdrawn by author" do
+          proposal = response["withdraw"]
+          expect(proposal).to be_present
+          expect(proposal["id"]).to eq(model.id.to_s)
+          expect(model.reload).to be_withdrawn
+          expect(model.withdrawn_at).to be_present
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-surveys/app/views/decidim/surveys/admin/surveys/index.html.erb b/decidim-surveys/app/views/decidim/surveys/admin/surveys/index.html.erb
index af902c996941e..308db89b9beaf 100644
--- a/decidim-surveys/app/views/decidim/surveys/admin/surveys/index.html.erb
+++ b/decidim-surveys/app/views/decidim/surveys/admin/surveys/index.html.erb
@@ -61,10 +61,18 @@
 
                   <li class="dropdown__item">
                     <%= link_to edit_questions_questions_survey_path(survey), class: "dropdown__button" do %>
-                      <%= icon "survey-line" %>
+                      <%= icon "question-answer-line" %>
                       <%= t("actions.manage_questions", scope: "decidim.surveys") %>
                     <% end %>
                   </li>
+                  <% if survey.questionnaire.responses.any? %>
+                    <li class="dropdown__item">
+                      <%= link_to survey_responses_path(survey), class: "dropdown__button" do %>
+                        <%= icon "draft-line" %>
+                        <%= t("actions.responses", scope: "decidim.surveys") %>
+                      <% end %>
+                    </li>
+                  <% end %>
 
                   <hr>
 
diff --git a/decidim-surveys/app/views/decidim/surveys/surveys/not_allowed.html.erb b/decidim-surveys/app/views/decidim/surveys/surveys/not_allowed.html.erb
index a65594c9f8492..aca95331f4a20 100644
--- a/decidim-surveys/app/views/decidim/surveys/surveys/not_allowed.html.erb
+++ b/decidim-surveys/app/views/decidim/surveys/surveys/not_allowed.html.erb
@@ -17,6 +17,6 @@
   <%= render partial: "decidim/shared/component_announcement" if current_component.manifest_name == "surveys" %>
   <section>
     <% body = t("decidim.forms.questionnaires.show.questionnaire_responded.body") %>
-    <%= cell("decidim/announcement", { title: t("decidim.forms.questionnaires.show.questionnaire_responded.title"), body: body }) %>
+    <%= cell("decidim/announcement", { title: t("decidim.forms.questionnaires.show.questionnaire_responded.title"), body: }) %>
   </section>
 <% end %>
diff --git a/decidim-surveys/config/locales/ca-IT.yml b/decidim-surveys/config/locales/ca-IT.yml
index 47e021e9f06c7..6fdc6a8e99931 100644
--- a/decidim-surveys/config/locales/ca-IT.yml
+++ b/decidim-surveys/config/locales/ca-IT.yml
@@ -71,6 +71,7 @@ ca-IT:
         manage_questions: Preguntes
         new_survey: Nova enquesta
         preview: Previsualitzar
+        responses: Respostes
         responses_alert: L'opció d'esborrar les respostes en publicar l'enquesta està activada. Si segueixes, s'esborraran les %{responses_count} existents actualment.
         title: Accions
       admin:
diff --git a/decidim-surveys/config/locales/ca.yml b/decidim-surveys/config/locales/ca.yml
index 511dc34128dbe..2d4c4cc13d05f 100644
--- a/decidim-surveys/config/locales/ca.yml
+++ b/decidim-surveys/config/locales/ca.yml
@@ -71,6 +71,7 @@ ca:
         manage_questions: Preguntes
         new_survey: Nova enquesta
         preview: Previsualitzar
+        responses: Respostes
         responses_alert: L'opció d'esborrar les respostes en publicar l'enquesta està activada. Si segueixes, s'esborraran les %{responses_count} existents actualment.
         title: Accions
       admin:
diff --git a/decidim-surveys/config/locales/cs.yml b/decidim-surveys/config/locales/cs.yml
index cda656ab0872e..831d6329d8439 100644
--- a/decidim-surveys/config/locales/cs.yml
+++ b/decidim-surveys/config/locales/cs.yml
@@ -44,6 +44,11 @@ cs:
           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í.
           email_subject: Nový průzkum v %{participatory_space_title}
           notification_title: Průzkum <a href="%{resource_path}">%{resource_title}</a> v <a href="%{participatory_space_url}">%{participatory_space_title}</a> je nyní otevřený.
+    open_data:
+      help:
+        published_survey_user_responses:
+          body: Obsah odpovědi
+          created_at: Časové razítko, kdy byla odpověď vytvořena
     statistics:
       responses: 'Odpovědi:'
       responses_count: Odpovědi
diff --git a/decidim-surveys/config/locales/en.yml b/decidim-surveys/config/locales/en.yml
index 4e92e4b9352df..7f023100ef764 100644
--- a/decidim-surveys/config/locales/en.yml
+++ b/decidim-surveys/config/locales/en.yml
@@ -72,6 +72,7 @@ en:
         manage_questions: Questions
         new_survey: New survey
         preview: Preview
+        responses: Responses
         responses_alert: Delete responses at publish is active for this survey. There are currently %{responses_count} responses that will be destroyed if you continue.
         title: Actions
       admin:
diff --git a/decidim-surveys/config/locales/es-MX.yml b/decidim-surveys/config/locales/es-MX.yml
index f376da438495a..55594598b9b7c 100644
--- a/decidim-surveys/config/locales/es-MX.yml
+++ b/decidim-surveys/config/locales/es-MX.yml
@@ -71,6 +71,7 @@ es-MX:
         manage_questions: Preguntas
         new_survey: Nueva encuesta
         preview: Previsualizar
+        responses: Respuestas
         responses_alert: La opción de borrar las respuestas al publicar la encuesta está activada. Si sigues, se borrarán las %{responses_count} existentes actualmente.
         title: Acciones
       admin:
diff --git a/decidim-surveys/config/locales/es-PY.yml b/decidim-surveys/config/locales/es-PY.yml
index 5c77b85e08657..4dc5f5a7062eb 100644
--- a/decidim-surveys/config/locales/es-PY.yml
+++ b/decidim-surveys/config/locales/es-PY.yml
@@ -71,6 +71,7 @@ es-PY:
         manage_questions: Preguntas
         new_survey: Nueva encuesta
         preview: Previsualizar
+        responses: Respuestas
         responses_alert: La opción de borrar las respuestas al publicar la encuesta está activada. Si sigues, se borrarán las %{responses_count} existentes actualmente.
         title: Acciones
       admin:
diff --git a/decidim-surveys/config/locales/es.yml b/decidim-surveys/config/locales/es.yml
index 71b369fb78bf7..9f48afc165cdb 100644
--- a/decidim-surveys/config/locales/es.yml
+++ b/decidim-surveys/config/locales/es.yml
@@ -71,6 +71,7 @@ es:
         manage_questions: Preguntas
         new_survey: Nueva encuesta
         preview: Previsualizar
+        responses: Respuestas
         responses_alert: La opción de borrar las respuestas al publicar la encuesta está activada. Si sigues, se borrarán las %{responses_count} existentes actualmente.
         title: Acciones
       admin:
diff --git a/decidim-surveys/config/locales/eu.yml b/decidim-surveys/config/locales/eu.yml
index 775418d225c95..4fd8e1fb6e309 100644
--- a/decidim-surveys/config/locales/eu.yml
+++ b/decidim-surveys/config/locales/eu.yml
@@ -71,6 +71,7 @@ eu:
         manage_questions: Galderak
         new_survey: Beste inkesta bat
         preview: Aurreikusi
+        responses: Erantzunak
         responses_alert: Erantzunak ezabatzea argitalpenean aktibatuta dago inkesta honetarako. Une honetan, erantzunen %{responses_count} suntsitu egingo dira, jarraitzen baduzu.
         title: Ekintzak
       admin:
diff --git a/decidim-surveys/config/locales/fi-plain.yml b/decidim-surveys/config/locales/fi-plain.yml
index 802c2d18fb03f..7ae6b99fd2870 100644
--- a/decidim-surveys/config/locales/fi-plain.yml
+++ b/decidim-surveys/config/locales/fi-plain.yml
@@ -71,6 +71,7 @@ fi-pl:
         manage_questions: Kysymykset
         new_survey: Uusi kysely
         preview: Esikatsele
+        responses: Vastaukset
         responses_alert: Kyselyn vastausten poistaminen julkaisun yhteydessä on otettu käyttöön tälle kyselylle. Kyselyllä on tällä hetkellä %{responses_count} vastausta, jotka poistetaan, mikäli jatkat eteenpäin.
         title: Toiminnot
       admin:
diff --git a/decidim-surveys/config/locales/fi.yml b/decidim-surveys/config/locales/fi.yml
index dc9edd86ce0ed..c4e3df9fd73b8 100644
--- a/decidim-surveys/config/locales/fi.yml
+++ b/decidim-surveys/config/locales/fi.yml
@@ -71,6 +71,7 @@ fi:
         manage_questions: Kysymykset
         new_survey: Uusi kysely
         preview: Esikatsele
+        responses: Vastaukset
         responses_alert: Kyselyn vastausten poistaminen julkaisun yhteydessä on otettu käyttöön tälle kyselylle. Kyselyllä on tällä hetkellä %{responses_count} vastausta, jotka poistetaan, mikäli jatkat eteenpäin.
         title: Toiminnot
       admin:
diff --git a/decidim-surveys/config/locales/fr-CA.yml b/decidim-surveys/config/locales/fr-CA.yml
index cdb5d5f9047b2..f8897e80dc782 100644
--- a/decidim-surveys/config/locales/fr-CA.yml
+++ b/decidim-surveys/config/locales/fr-CA.yml
@@ -71,6 +71,7 @@ fr-CA:
         manage_questions: Questions
         new_survey: Nouvelle enquête
         preview: Aperçu
+        responses: Réponses
         responses_alert: La suppression des réponses lors de la publication est active pour cette enquête. Il y a actuellement %{responses_count} réponses qui seront supprimées si vous continuez.
         title: Actions
       admin:
diff --git a/decidim-surveys/config/locales/fr.yml b/decidim-surveys/config/locales/fr.yml
index 844d8f44d216b..78cfff4071d96 100644
--- a/decidim-surveys/config/locales/fr.yml
+++ b/decidim-surveys/config/locales/fr.yml
@@ -71,6 +71,7 @@ fr:
         manage_questions: Questions
         new_survey: Nouvelle enquête
         preview: Aperçu
+        responses: Réponses
         responses_alert: La suppression des réponses lors de la publication est active pour cette enquête. Il y a actuellement %{responses_count} réponses qui seront supprimées si vous continuez.
         title: Actions
       admin:
diff --git a/decidim-surveys/config/locales/ja.yml b/decidim-surveys/config/locales/ja.yml
index 0c8d28cb85a9c..8b46d0c9ecd55 100644
--- a/decidim-surveys/config/locales/ja.yml
+++ b/decidim-surveys/config/locales/ja.yml
@@ -46,6 +46,17 @@ ja:
           email_outro: '%{participatory_space_title}をフォローしているため、この通知を受け取りました。前のリンクに続く通知の受信を停止することができます。'
           email_subject: '%{participatory_space_title} での新しいアンケート'
           notification_title: <a href="%{resource_path}">%{resource_title}の</a> <a href="%{participatory_space_url}">%{participatory_space_title}のアンケート</a> が公開されました。
+    open_data:
+      help:
+        published_survey_user_responses:
+          body: 回答の内容
+          created_at: 回答が作成されたタイムスタンプ
+          id: アンケート回答の固有ID
+          ip_hash: プライバシー保護のためにハッシュ化された回答者のIPアドレス
+          question: 回答された質問
+          registered: 登録済みの参加者
+          unregistered: 未登録の参加者
+          user_status: 回答を提出したユーザーのステータス
     statistics:
       responses: '応答：'
       responses_count: 回答
@@ -58,6 +69,7 @@ ja:
         manage_questions: 質問
         new_survey: 新しいアンケート
         preview: プレビュー
+        responses: 回答
         responses_alert: このアンケートでは、公開時に回答を削除する設定が有効になっています。現在%{responses_count}件の回答があり、続行するとそれらは削除されます。
         title: アクション
       admin:
diff --git a/decidim-surveys/config/locales/pt-BR.yml b/decidim-surveys/config/locales/pt-BR.yml
index e9a130dcb5586..db6973703d66f 100644
--- a/decidim-surveys/config/locales/pt-BR.yml
+++ b/decidim-surveys/config/locales/pt-BR.yml
@@ -8,10 +8,30 @@ pt-BR:
       decidim/surveys/survey:
         one: Enquete
         other: Enquetes
+      decidim/surveys/survey_response:
+        one: Resposta
+        other: Respostas
   decidim:
+    admin:
+      actions:
+        confirm_unpublish_survey: Tem certeza de que deseja remover esta pesquisa da publicação?
+        see_survey: Veja a pesquisa
+      admin_log:
+        changeset:
+          surveys: Pesquisas
+      menu:
+        surveys_menu:
+          main: Principal
+          questions: Questões
+          responses: Respostas
+          settings: Configurações
     components:
       surveys:
+        actions:
+          respond: Responder
+        name: Pesquisas
         settings:
+          announcement: Avisos
           global:
             announcement: Anúncio
           step:
@@ -28,11 +48,131 @@ pt-BR:
           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.
           email_subject: Uma nova pesquisa em %{participatory_space_title}
           notification_title: A pesquisa <a href="%{resource_path}">%{resource_title}</a> em <a href="%{participatory_space_url}">%{participatory_space_title}</a> está agora aberta.
+    open_data:
+      help:
+        published_survey_user_responses:
+          body: O conteúdo da resposta
+          created_at: Carimbo de data/hora em que a resposta foi criada
+          id: Identificador único para a resposta da pesquisa
+          ip_hash: Endereço IP criptografado do respondente para fins de privacidade
+          question: A pergunta respondida
+          registered: Participante inscrito
+          unregistered: Participante não registrado
+          user_status: '''Estado'' do usuário que enviou a resposta'
+    statistics:
+      responses: 'Respostas:'
+      responses_count: Respostas
+      surveys_count_tooltip: O número de pesquisas disponíveis e respostas coletadas.
     surveys:
+      actions:
+        confirm_destroy: Tem certeza de que deseja excluir isso?
+        destroy: Destruir
+        edit: Editar
+        manage_questions: Questões
+        new_survey: Nova pesquisa
+        preview: Pré-visualização
+        responses: Respostas
+        responses_alert: A opção "Excluir respostas na publicação" está ativa para esta pesquisa. Atualmente, existem %{responses_count} respostas excluídas se você continuar.
+        title: Ações
       admin:
+        exports:
+          survey_user_responses: Respostas dos participantes da pesquisa
+        publish_responses:
+          index:
+            description: |-
+              Ao publicar as respostas das perguntas, você as tornará visíveis ao público.
+              Você pode selecionar as respostas que deseja publicar clicando na caixa de seleção ao lado de cada pergunta.
+              Você só pode publicar os seguintes tipos de pergunta: "Opção única", "Opção múltipla", "Matriz (opção única)", "Matriz (opção múltipla)" e "Classificação".
+            responses:
+              one: "%{count} Resposta"
+              other: "%{count} Respostas"
+            status:
+              not_published: Não publicado
+              published: Publicado
+            title: Publicar respostas
+        questions:
+          surveys:
+            edit:
+              title: Questões
+        responses:
+          index:
+            no_responses: Ainda não há respostas
+            title: "%{total} Respostas totais"
+          show:
+            title: 'Resposta #%{número}'
+        settings:
+          surveys:
+            edit:
+              title: Configurações
         surveys:
+          create:
+            invalid: Ocorreu um problema ao criar a pesquisa.
+            success: Pesquisa criada com sucesso.
+          destroy:
+            success: Pesquisa excluída com sucesso.
           edit:
             title: Editar questionário
+          index:
+            title: Pesquisas
+          new:
+            title: Nova pesquisa
+          publish:
+            invalid: Houve um problema na publicação desta pesquisa.
+            success: Pesquisa publicada com sucesso.
+          unpublish:
+            invalid: Houve um problema ao cancelar a publicação desta pesquisa.
+            success: Pesquisa não publicada com sucesso.
           update:
             invalid: Houve erros ao salvar a pesquisa.
             success: Pesquisa salva com sucesso.
+      admin_log:
+        survey:
+          create: "%{user_name} Criou a pesquisa %{resource_name} no espaço %{space_name} como uma pesquisa"
+          delete: "%{user_name} Excluiu a pesquisa %{resource_name} no espaço %{space_name} como uma pesquisa"
+          publish: "%{user_name} Publicou a pesquisa %{resource_name} no espaço %{space_name}"
+          unpublish: "%{user_name} Deixou de publicar a pesquisa %{resource_name} no espaço %{space_name}"
+          update: "%{user_name} Atualizou a pesquisa %{resource_name} no espaço %{space_name}"
+      directory:
+        surveys:
+          index:
+            surveys: Pesquisas
+      last_activity:
+        new_survey: 'Nova pesquisa:'
+      models:
+        survey:
+          fields:
+            published: Publicado
+            questions: Questões
+            responses: Respostas
+            status: Estado
+            title: Titulo
+          published:
+            published: Publicado
+            unpublished: Não publicado
+          status:
+            closed: Fechado
+            open: Aberto
+      survey_confirmation_mailer:
+        confirmation:
+          body: Você respondeu com sucesso à pesquisa %{questionnaire_title} no prazo de %{participatory_space}
+          subject: Confirmação de resposta ao questionário %{questionnaire_title}
+        export_name: Respostas da pesquisa
+      surveys:
+        count:
+          surveys_count:
+            one: "%{count} Pesquisa"
+            other: "%{count} Pesquisas"
+        filters:
+          all: Todos
+          state_values:
+            closed: Fechado
+            open: Aberto
+        no_surveys_warning: Nenhuma pesquisa corresponde aos seus critérios de busca ou não há nenhuma pesquisa disponível.
+        response:
+          invalid: Houve um problema ao responder à pesquisa.
+          spam_detected: Ocorreu um problema ao preencher o formulário. Talvez você tenha respondido muito rápido. Pode tentar novamente?
+          success: A pesquisa foi respondida com sucesso.
+        show:
+          closed: Fechado
+          open: Aberto
+          questions: Questões
diff --git a/decidim-surveys/config/locales/ro-RO.yml b/decidim-surveys/config/locales/ro-RO.yml
index aadd2076d9158..f306ae2930c2f 100644
--- a/decidim-surveys/config/locales/ro-RO.yml
+++ b/decidim-surveys/config/locales/ro-RO.yml
@@ -9,50 +9,174 @@ ro:
         one: Sondaj
         few: Sondaje
         other: Sondaje
+      decidim/surveys/survey_response:
+        one: Răspuns
+        few: Răspunsuri
+        other: Răspunsuri
   decidim:
     admin:
+      actions:
+        confirm_unpublish_survey: Sunteți sigur că doriți să anulați publicarea acestui chestionar?
+        see_survey: Vedeți sondajul
+      admin_log:
+        changeset:
+          surveys: sondaje
       menu:
         surveys_menu:
           main: Principal
           questions: Întrebări
+          responses: Răspunsuri
           settings: Setări
     components:
       surveys:
+        actions:
+          respond: Răspundeți
+        name: Sondaje
         settings:
+          announcement: Anunț
           global:
-            announcement: Anunţ
+            announcement: Anunț
           step:
-            announcement: Anunţ
+            announcement: Anunț
     events:
       surveys:
         survey_closed:
           email_intro: Sondajul %{resource_title} din %{participatory_space_title} a fost închis.
-          email_outro: Ai primit această notificare deoarece urmărești „%{participatory_space_title}”. Poți anula aceste notificări de la link-ul anterior.
-          email_subject: În %{participatory_space_title} s-a încheiat un sondaj
+          email_outro: Ați primit această notificare deoarece urmăriți %{participatory_space_title}. Puteți înceta să primiți notificări urmând linkul anterior.
+          email_subject: Un sondaj s-a încheiat în %{participatory_space_title}
           notification_title: Sondajul <a href="%{resource_path}">%{resource_title}</a> din <a href="%{participatory_space_url}">%{participatory_space_title}</a> s-a încheiat.
         survey_opened:
-          email_intro: 'Sondajul %{resource_title} din %{participatory_space_title} este acum deschis. Poți participa la acesta din 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.
-          email_subject: Un nou sondaj în %{participatory_space_title}
-          notification_title: Sondajul <a href="%{resource_path}">%{resource_title}</a> din <a href="%{participatory_space_url}">%{participatory_space_title}</a> este acum deschis.
+          email_intro: 'Sondajul %{resource_title} din %{participatory_space_title} a început. Poți participa la acesta din această pagină:'
+          email_outro: Ați primit această notificare deoarece urmărești „%{participatory_space_title}”. Puteți anula aceste notificări de la link-ul anterior.
+          email_subject: Un sondaj nou în %{participatory_space_title}
+          notification_title: Sondajul <a href="%{resource_path}">%{resource_title}</a> din <a href="%{participatory_space_url}">%{participatory_space_title}</a> a început.
+    open_data:
+      help:
+        published_survey_user_responses:
+          body: Conținutul răspunsului
+          created_at: Data și ora când a fost creat răspunsul
+          id: Identificator unic pentru răspunsurile sondajului
+          ip_hash: Semnătura adresei IP a respondentului pentru confidențialitate
+          question: Întrebarea la care s-a răspuns
+          registered: Participant înregistrat
+          unregistered: Participant neînregistrat
+          user_status: Starea participantului care a trimis răspunsul
     statistics:
       responses: 'Răspunsuri:'
+      responses_count: Răspunsuri
       surveys_count_tooltip: Numărul de sondaje disponibile și răspunsuri care au fost colectate.
     surveys:
       actions:
+        confirm_destroy: Sunteți sigur că doriți să eliminați asta?
+        destroy: Eliminați
+        edit: Modificați
         manage_questions: Întrebări
+        new_survey: Sondaj nou
+        preview: Previzualizați
+        responses: Răspunsuri
+        responses_alert: Ștergerea răspunsurilor la publicare este activă pentru acest sondaj. Există în prezent %{responses_count} răspunsuri care vor fi eliminate în momentul publicării.
+        title: Acțiuni
       admin:
+        exports:
+          survey_user_responses: Răspunsuri ale participantului la sondaj
+        publish_responses:
+          index:
+            description: |-
+              Prin publicarea răspunsurilor la întrebări, acestea vor fi vizibile pentru public.
+              Puteți selecta răspunsurile pe care doriți să le publicați făcând clic pe caseta de selectare de lângă fiecare întrebare.
+              Puteți publica numai următoarele tipuri de întrebări: "opțiune unică", "opțiune multiplă", "matrice (opțiune unică)", "matrice (opțiune multiplă)" și "Sortare".
+            responses:
+              one: "%{count} răspuns"
+              few: "%{count} răspunsuri"
+              other: "%{count} răspunsuri"
+            status:
+              not_published: Nepublicat
+              published: Publicat
+            title: Publicați răspunsuri
         questions:
           surveys:
             edit:
               title: Întrebări
+        responses:
+          index:
+            no_responses: Nu există răspunsuri încă
+            title: "%{total} răspunsuri în total"
+          show:
+            title: 'Răspuns #%{number}'
         settings:
           surveys:
             edit:
               title: Setări
         surveys:
+          create:
+            invalid: A apărut o eroare la crearea sondajului.
+            success: Sondajul a fost creat cu succes.
+          destroy:
+            success: Sondajul a fost eliminat cu succes.
+          edit:
+            title: Modificați sondajul
+          index:
+            title: Sondaje
+          new:
+            title: Sondaj nou
+          publish:
+            invalid: A apărut o problemă la publicarea acestui sondaj.
+            success: Sondajul a fost publicat cu succes.
+          unpublish:
+            invalid: A apărut o problemă la anularea publicării acestui sondaj.
+            success: Sondajul a fost retras cu succes de la publicare.
           update:
-            invalid: A apărut o eroare la salvarea sondajului.
-            success: Sondajul a fost salvat cu succes.
+            invalid: A apărut o eroare la actualizarea sondajului.
+            success: Sondajul a fost actualizat cu succes.
+      admin_log:
+        survey:
+          create: "%{user_name} a creat sondajul %{resource_name} în spațiul %{space_name}"
+          delete: "%{user_name} a eliminat sondajul %{resource_name} în spațiul %{space_name}"
+          publish: "%{user_name} a publicat sondajul %{resource_name} în spațiul participativ %{space_name}"
+          unpublish: "%{user_name} a anulat publicarea sondajului %{resource_name} din spațiul participativ %{space_name}"
+          update: "%{user_name} a actualizat sondajul %{resource_name} din spațiul %{space_name}"
+      directory:
+        surveys:
+          index:
+            surveys: Sondaje
       last_activity:
         new_survey: 'Sondaj nou:'
+      models:
+        survey:
+          fields:
+            published: Publicat
+            questions: Întrebări
+            responses: Răspunsuri
+            status: Stare
+            title: Titlu
+          published:
+            published: Publicat
+            unpublished: Nepublicat
+          status:
+            closed: Închis
+            open: Deschis
+      survey_confirmation_mailer:
+        confirmation:
+          body: Ați răspuns cu succes la sondajul %{questionnaire_title} din %{participatory_space}
+          subject: Confirmarea răspunsurilor la sondajul %{questionnaire_tile}
+        export_name: Răspunsuri la sondaj
+      surveys:
+        count:
+          surveys_count:
+            one: "%{count} sondaj"
+            few: "%{count} sondaje"
+            other: "%{count} sondaje"
+        filters:
+          all: Toate
+          state_values:
+            closed: Închise
+            open: Deschise
+        no_surveys_warning: Nici un sondaj nu corespunde criteriilor de căutare sau nu există nici un sondaj deschis.
+        response:
+          invalid: A apărut o problemă la completarea sondajului.
+          spam_detected: A apărut o problemă la completarea formularului. Poate că ați fost prea rapid(ă), puteți încerca din nou?
+          success: Răspunsul pentru sondaj a fost înregistrat cu succes.
+        show:
+          closed: Închise
+          open: Deschise
+          questions: întrebări
diff --git a/decidim-surveys/config/locales/sv.yml b/decidim-surveys/config/locales/sv.yml
index 519d2753591b3..d1747f97fedb2 100644
--- a/decidim-surveys/config/locales/sv.yml
+++ b/decidim-surveys/config/locales/sv.yml
@@ -17,6 +17,7 @@ sv:
       surveys:
         actions:
           respond: Besvara
+        name: Enkäter
         settings:
           global:
             announcement: Meddelande
@@ -47,8 +48,10 @@ sv:
           user_status: Status för användaren som skickade svaret
     statistics:
       responses: 'Svar:'
-      surveys_count_tooltip: Antalet tillgängliga undersökningar och svar som samlats in.
+      surveys_count_tooltip: Antalet enkäter och svar som samlats in.
     surveys:
+      actions:
+        responses: Svar
       admin:
         surveys:
           new:
diff --git a/decidim-surveys/lib/decidim/api/survey_type.rb b/decidim-surveys/lib/decidim/api/survey_type.rb
index 520da3b766667..d925c69a1b49c 100644
--- a/decidim-surveys/lib/decidim/api/survey_type.rb
+++ b/decidim-surveys/lib/decidim/api/survey_type.rb
@@ -27,8 +27,6 @@ def self.authorized?(object, context)
         context[:current_settings] = object.component.current_settings
 
         super
-      rescue Decidim::PermissionAction::PermissionNotSetError
-        false
       end
     end
   end
diff --git a/decidim-surveys/lib/decidim/api/surveys_type.rb b/decidim-surveys/lib/decidim/api/surveys_type.rb
index b7727082cab53..89ae53eb48146 100644
--- a/decidim-surveys/lib/decidim/api/surveys_type.rb
+++ b/decidim-surveys/lib/decidim/api/surveys_type.rb
@@ -15,8 +15,8 @@ def surveys
         Survey.where(component: object).includes(:component)
       end
 
-      def survey(**args)
-        Survey.where(component: object).find_by(id: args[:id])
+      def survey(id:)
+        Survey.published.where(component: object).find(id)
       end
     end
   end
diff --git a/decidim-surveys/lib/decidim/surveys/component.rb b/decidim-surveys/lib/decidim/surveys/component.rb
index f2f89ea4ae30a..bbe2c85187e43 100644
--- a/decidim-surveys/lib/decidim/surveys/component.rb
+++ b/decidim-surveys/lib/decidim/surveys/component.rb
@@ -16,13 +16,6 @@
 
   component.newsletter_participant_entities = ["Decidim::Forms::Response"]
 
-  component.on(:before_destroy) do |instance|
-    survey = Decidim::Surveys::Survey.find_by(decidim_component_id: instance.id)
-    survey_responses_for_component = Decidim::Forms::Response.where(questionnaire: survey.questionnaire)
-
-    raise "Cannot destroy this component when there are survey responses" if survey_responses_for_component.any?
-  end
-
   component.register_resource(:survey) do |resource|
     resource.model_class_name = "Decidim::Surveys::Survey"
     resource.card = "decidim/surveys/survey"
@@ -73,7 +66,7 @@
 
   component.exports :published_survey_user_responses do |exports|
     exports.collection do |component|
-      survey = Decidim::Surveys::Survey.find_by(component: component)
+      survey = Decidim::Surveys::Survey.find_by(component:)
 
       Decidim::Forms::Response
         .joins(:question)
diff --git a/decidim-surveys/lib/decidim/surveys/seeds.rb b/decidim-surveys/lib/decidim/surveys/seeds.rb
index 8f67ae902d6e5..8622bd4e326cb 100644
--- a/decidim-surveys/lib/decidim/surveys/seeds.rb
+++ b/decidim-surveys/lib/decidim/surveys/seeds.rb
@@ -20,7 +20,7 @@ def call
 
           next if questionnaire.questionnaire_for.allow_responses
 
-          rand(200).times { create_responses!(questionnaire:) }
+          rand(0..config_value(:surveys_responses_count)).times { create_responses!(questionnaire:) }
         end
       end
 
@@ -90,7 +90,7 @@ def create_questions!(questionnaire:)
             position: index + 2
           )
 
-          3.times do
+          config_value(:surveys_response_options_count).times do
             question.response_options.create!(body: Decidim::Faker::Localized.sentence)
           end
 
@@ -114,7 +114,7 @@ def create_questions!(questionnaire:)
             position: index
           )
 
-          3.times do |position|
+          config_value(:surveys_matrix_rows_count).times do |position|
             question.response_options.create!(body: Decidim::Faker::Localized.sentence)
             question.matrix_rows.create!(body: Decidim::Faker::Localized.sentence, position:)
           end
diff --git a/decidim-surveys/spec/lib/decidim/surveys/component_spec.rb b/decidim-surveys/spec/lib/decidim/surveys/component_spec.rb
index 33fa5ff2e8c47..d3a461adc9683 100644
--- a/decidim-surveys/spec/lib/decidim/surveys/component_spec.rb
+++ b/decidim-surveys/spec/lib/decidim/surveys/component_spec.rb
@@ -8,32 +8,6 @@
   let(:component) { create(:surveys_component) }
   let(:new_component) { create(:surveys_component) }
 
-  describe "before_destroy hooks" do
-    context "when there are no responses" do
-      before do
-        create(:survey, component:)
-      end
-
-      it "does not raise any error" do
-        expect { subject.manifest.run_hooks(:before_destroy, subject) }.not_to raise_error
-      end
-    end
-
-    context "with responses" do
-      before do
-        survey = create(:survey, component:)
-        create(:response, questionnaire: survey.questionnaire)
-      end
-
-      it "raises an error" do
-        expect { subject.manifest.run_hooks(:before_destroy, subject) }.to raise_error(
-          RuntimeError,
-          "Cannot destroy this component when there are survey responses"
-        )
-      end
-    end
-  end
-
   context "when copying component" do
     it "does not raise any error" do
       expect { subject.manifest.run_hooks(:copy, old_component: component, new_component:) }.not_to raise_error
diff --git a/decidim-surveys/spec/system/admin_manages_surveys_spec.rb b/decidim-surveys/spec/system/admin_manages_surveys_spec.rb
index 5f2b474822956..a322132c0f452 100644
--- a/decidim-surveys/spec/system/admin_manages_surveys_spec.rb
+++ b/decidim-surveys/spec/system/admin_manages_surveys_spec.rb
@@ -342,6 +342,35 @@
     end
   end
 
+  context "when the survey has responses or more" do
+    let!(:question) do
+      create(:questionnaire_question, questionnaire:)
+    end
+    let!(:response) { create(:response, questionnaire:, question:) }
+
+    before do
+      visit manage_questionnaire_path
+    end
+
+    it "allows access to responses" do
+      within "tr", text: decidim_sanitize_translated(survey.title) do
+        find("button[data-controller='dropdown']").click
+        expect(page).to have_link("Responses")
+      end
+    end
+  end
+
+  context "when the survey has no responses" do
+    let!(:question) { create(:questionnaire_question, questionnaire:) }
+
+    it "does not show the Responses button" do
+      within "tr", text: decidim_sanitize_translated(survey.title) do
+        find("button[data-controller='dropdown']").click
+        expect(page).to have_no_link("Responses")
+      end
+    end
+  end
+
   context "when updates the questionnaire" do
     let(:description) do
       {
@@ -378,6 +407,10 @@ def questionnaire_public_path
     main_component_path(component)
   end
 
+  def manage_questionnaire_path
+    Decidim::EngineRouter.admin_proxy(component).surveys_path
+  end
+
   private
 
   def find_nested_form_field(attribute, visible: :visible)
diff --git a/decidim-surveys/spec/system/private_space_survey_spec.rb b/decidim-surveys/spec/system/private_space_survey_spec.rb
index 4e8ddd8b7978e..e5ca82a3f8b7f 100644
--- a/decidim-surveys/spec/system/private_space_survey_spec.rb
+++ b/decidim-surveys/spec/system/private_space_survey_spec.rb
@@ -25,7 +25,7 @@
   let(:user) { create(:user, :confirmed, organization:) }
   let!(:another_user) { create(:user, :confirmed, organization:) }
 
-  let!(:participatory_space_private_user) { create(:participatory_space_private_user, user: another_user, privatable_to: participatory_space_private) }
+  let!(:member) { create(:member, user: another_user, participatory_space: participatory_space_private) }
 
   let!(:questionnaire) { create(:questionnaire, title:, description:) }
   let!(:survey) { create(:survey, :published, :allow_responses, component:, questionnaire:) }
@@ -65,7 +65,7 @@ def visit_component
     end
 
     context "when the user is logged in" do
-      context "and is private user space" do
+      context "and is member space" do
         before do
           login_as another_user, scope: :user
         end
@@ -92,7 +92,7 @@ def visit_component
         end
       end
 
-      context "and is not private user space" do
+      context "and is not member space" do
         before do
           login_as user, scope: :user
         end
@@ -103,7 +103,7 @@ def visit_component
 
           expect(page).to have_i18n_content(questionnaire.title)
           expect(page).to have_i18n_content(questionnaire.description)
-          expect(page).to have_content "The form is available only for private users"
+          expect(page).to have_content "The form is available only for members"
           expect(page).to have_content "Form closed"
 
           expect(page).to have_css(".button[disabled]")
@@ -128,7 +128,7 @@ def visit_component
     end
 
     context "when the user is logged in" do
-      context "and is private user space" do
+      context "and is member space" do
         before do
           login_as another_user, scope: :user
         end
@@ -157,7 +157,7 @@ def visit_component
         end
       end
 
-      context "and is not private user space" do
+      context "and is not member space" do
         let(:target_path) { main_component_path(component) }
 
         before do
diff --git a/decidim-surveys/spec/system/survey_spec.rb b/decidim-surveys/spec/system/survey_spec.rb
index 30039b8d83f7d..a4e2f14d90a61 100644
--- a/decidim-surveys/spec/system/survey_spec.rb
+++ b/decidim-surveys/spec/system/survey_spec.rb
@@ -39,10 +39,6 @@
     it "does not allow responding the survey" do
       visit_component
 
-      within(".menu-bar") do
-        expect(page).to have_content(translated(component.name))
-      end
-
       choose "All"
 
       expect(page).to have_i18n_content(questionnaire.title)
@@ -104,11 +100,6 @@
         choose "All"
         click_on translated_attribute(questionnaire.title)
 
-        within(".menu-bar") do
-          expect(page).to have_content(translated(component.name))
-          expect(page).to have_content(translated(questionnaire.title))
-        end
-
         # does not show the charts if not published
         expect(page.html).not_to include('new Chartkick["ColumnChart"]("chart-1"')
         expect(page.html).not_to include('new Chartkick["ColumnChart"]("chart-2"')
diff --git a/decidim-surveys/spec/system/surveys_breadcrumbs_spec.rb b/decidim-surveys/spec/system/surveys_breadcrumbs_spec.rb
new file mode 100644
index 0000000000000..9c71f04bb39a1
--- /dev/null
+++ b/decidim-surveys/spec/system/surveys_breadcrumbs_spec.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Surveys Breadcrumb" do
+  include_context "with a component"
+
+  let(:manifest_name) { "surveys" }
+  let(:title) do
+    {
+      "en" => "Survey's title",
+      "ca" => "Títol de l'enquesta'",
+      "es" => "Título de la encuesta"
+    }
+  end
+  let!(:questionnaire) { create(:questionnaire, title:) }
+  let!(:survey) { create(:survey, :published, component:, questionnaire:) }
+
+  context "when the survey does not allow responses" do
+    it "shows the correct information in breadcrumb (space, component)" do
+      visit_component
+
+      within(".menu-bar") do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+      end
+    end
+  end
+
+  context "when the survey has questions' responses published" do
+    let(:question_single_option) { create(:questionnaire_question, :with_response_options, position: 0, question_type: "single_option", questionnaire:) }
+
+    before do
+      10.times do
+        response = create(:response, question: question_single_option, questionnaire:)
+        response_option = question_single_option.response_options.sample
+        create(:response_choice, response_option:, response:, matrix_row: nil)
+      end
+    end
+
+    it "shows the correct information in breadcrumb (space, component, questionnaire)" do
+      visit_component
+      choose "All"
+      click_on translated_attribute(questionnaire.title)
+
+      within(".menu-bar") do
+        expect(page).to have_content(translated(component.participatory_space.title))
+        expect(page).to have_content(translated(component.name))
+        expect(page).to have_content(translated(questionnaire.title))
+      end
+    end
+  end
+end
diff --git a/decidim-surveys/spec/types/integration_schema_spec.rb b/decidim-surveys/spec/types/integration_schema_spec.rb
index 91472d1118763..5f27b5ffa8032 100644
--- a/decidim-surveys/spec/types/integration_schema_spec.rb
+++ b/decidim-surveys/spec/types/integration_schema_spec.rb
@@ -62,7 +62,7 @@
 
   let(:component_type) { "Surveys" }
   let!(:current_component) { create(:surveys_component, participatory_space: participatory_process) }
-  let!(:survey) { create(:survey, component: current_component) }
+  let!(:survey) { create(:survey, :published, component: current_component) }
   let!(:questionnaire) { create(:questionnaire, :with_questions, questionnaire_for: survey) }
 
   let(:survey_single_result) do
diff --git a/decidim-surveys/spec/types/surveys_type_spec.rb b/decidim-surveys/spec/types/surveys_type_spec.rb
index 4913a741d69f8..cf8a5aa4a3732 100644
--- a/decidim-surveys/spec/types/surveys_type_spec.rb
+++ b/decidim-surveys/spec/types/surveys_type_spec.rb
@@ -12,8 +12,8 @@ module Surveys
       it_behaves_like "a component query type"
 
       describe "surveys" do
-        let!(:component_surveys) { create_list(:survey, 2, component: model) }
-        let!(:other_surveys) { create_list(:survey, 2) }
+        let!(:component_surveys) { create_list(:survey, 2, :published, component: model) }
+        let!(:other_surveys) { create_list(:survey, 2, :published) }
 
         let(:query) { "{ surveys { edges { node { id } } } }" }
 
@@ -29,7 +29,7 @@ module Surveys
         let(:variables) { { id: survey.id.to_s } }
 
         context "when the survey belongs to the component" do
-          let!(:survey) { create(:survey, component: model) }
+          let!(:survey) { create(:survey, :published, component: model) }
 
           it "finds the survey" do
             expect(response["survey"]["id"]).to eq(survey.id.to_s)
@@ -37,10 +37,10 @@ module Surveys
         end
 
         context "when the survey does not belong to the component" do
-          let!(:survey) { create(:survey, component: create(:surveys_component)) }
+          let!(:survey) { create(:survey, :published, component: create(:surveys_component)) }
 
-          it "returns null" do
-            expect(response["survey"]).to be_nil
+          it "raises error" do
+            expect { response }.to raise_error(Decidim::Api::Errors::NotFoundError, "Survey not found")
           end
         end
       end
diff --git a/decidim-system/app/commands/decidim/system/create_organization.rb b/decidim-system/app/commands/decidim/system/create_organization.rb
index f48d3c286e097..ee466d9fece43 100644
--- a/decidim-system/app/commands/decidim/system/create_organization.rb
+++ b/decidim-system/app/commands/decidim/system/create_organization.rb
@@ -58,6 +58,7 @@ def event_arguments
       def create_organization
         Decidim::Organization.create!(
           name: { form.default_locale => form.name },
+          short_name: { form.default_locale => form.short_name },
           host: form.host,
           secondary_hosts: form.clean_secondary_hosts,
           reference_prefix: form.reference_prefix,
diff --git a/decidim-system/app/controllers/decidim/system/api_users_controller.rb b/decidim-system/app/controllers/decidim/system/api_users_controller.rb
index 890aefd0e3938..09f2e91a9f9e5 100644
--- a/decidim-system/app/controllers/decidim/system/api_users_controller.rb
+++ b/decidim-system/app/controllers/decidim/system/api_users_controller.rb
@@ -29,7 +29,7 @@ def update
         RefreshApiUserSecret.call(api_user, current_admin) do
           on(:ok) do |secret|
             flash[:notice] = I18n.t("api_user.refresh.success", scope: "decidim.system", user: api_user.api_key)
-            session[:api_user] = { id: api_user.id, secret: secret }
+            session[:api_user] = { id: api_user.id, secret: }
             redirect_to action: :index
           end
 
@@ -41,11 +41,11 @@ def update
       end
 
       def create
-        @form = ::Decidim::System::ApiUserForm.from_params(params.merge!(name: params[:admin][:name], organization: organization))
+        @form = ::Decidim::System::ApiUserForm.from_params(params.merge!(name: params[:admin][:name], organization:))
         CreateApiUser.call(@form, current_admin) do
           on(:ok) do |api_user, secret|
             flash[:notice] = I18n.t("api_user.create.success", scope: "decidim.system", user: api_user.api_key)
-            session[:api_user] = { id: api_user.id, secret: secret }
+            session[:api_user] = { id: api_user.id, secret: }
             redirect_to action: :index
           end
 
diff --git a/decidim-system/app/forms/decidim/system/base_organization_form.rb b/decidim-system/app/forms/decidim/system/base_organization_form.rb
index e9ae695ed5d48..5550fa6ae704e 100644
--- a/decidim-system/app/forms/decidim/system/base_organization_form.rb
+++ b/decidim-system/app/forms/decidim/system/base_organization_form.rb
@@ -59,9 +59,12 @@ class BaseOrganizationForm < Form
       jsonb_attribute :omniauth_settings, OMNIATH_PROVIDERS_ATTRIBUTES
 
       validates :host, :users_registration_mode, presence: true
+      validates :users_registration_mode, inclusion: { in: Decidim::Organization.users_registration_modes }
+
       validate :validate_organization_uniqueness
+      validate :validate_short_name_uniqueness
+      validate :validate_short_name_format
       validate :validate_secret_key_base_for_encryption
-      validates :users_registration_mode, inclusion: { in: Decidim::Organization.users_registration_modes }
 
       def map_model(model)
         self.default_locale = model.default_locale
@@ -123,6 +126,14 @@ def validate_secret_key_base_for_encryption
       def validate_organization_uniqueness
         raise "#{self.class.name} is expected to implement #validate_organization_uniqueness"
       end
+
+      def validate_short_name_uniqueness
+        raise "#{self.class.name} is expected to implement #validate_short_name_uniqueness"
+      end
+
+      def validate_short_name_format
+        raise "#{self.class.name} is expected to implement #validate_short_name_format"
+      end
     end
   end
 end
diff --git a/decidim-system/app/forms/decidim/system/register_organization_form.rb b/decidim-system/app/forms/decidim/system/register_organization_form.rb
index 169a34db7ad8f..ab099af92e6a3 100644
--- a/decidim-system/app/forms/decidim/system/register_organization_form.rb
+++ b/decidim-system/app/forms/decidim/system/register_organization_form.rb
@@ -11,6 +11,7 @@ class RegisterOrganizationForm < BaseOrganizationForm
       mimic :organization
 
       attribute :name, String
+      attribute :short_name, String
 
       attribute :organization_admin_email, String
       attribute :organization_admin_name, String
@@ -22,6 +23,7 @@ class RegisterOrganizationForm < BaseOrganizationForm
 
       validates :organization_admin_email, :organization_admin_name, :name, :reference_prefix, presence: true
       validates :name, presence: true
+      validates :short_name, presence: true
       validates :available_locales, presence: true
       validates :default_locale, presence: true
       validates :default_locale, inclusion: { in: :available_locales }
@@ -43,6 +45,28 @@ def validate_organization_uniqueness
         errors.add(:name, :taken) if organization_names.include?(name&.downcase)
         errors.add(:host, :taken) if Decidim::Organization.where(host:).where.not(id:).exists?
       end
+
+      def validate_short_name_uniqueness
+        base_query = Decidim::Organization.pluck(:short_name)
+
+        organization_short_names = []
+
+        base_query.each do |value|
+          organization_short_names += value.except("machine_translations").values
+          organization_short_names += value.fetch("machine_translations", {}).values
+        end
+
+        organization_short_names = organization_short_names.map(&:downcase)
+
+        errors.add(:short_name, :taken) if organization_short_names.include?(short_name&.downcase)
+      end
+
+      def validate_short_name_format
+        return if short_name.blank?
+
+        errors.add(:short_name, :too_short, count: 3) if short_name.length < 3
+        errors.add(:short_name, :too_long, count: 12) if short_name.length > 12
+      end
     end
   end
 end
diff --git a/decidim-system/app/forms/decidim/system/update_organization_form.rb b/decidim-system/app/forms/decidim/system/update_organization_form.rb
index 8a3ba712dfc74..04f1a029ea671 100644
--- a/decidim-system/app/forms/decidim/system/update_organization_form.rb
+++ b/decidim-system/app/forms/decidim/system/update_organization_form.rb
@@ -8,8 +8,11 @@ module System
     #
     class UpdateOrganizationForm < BaseOrganizationForm
       translatable_attribute :name, String
+      translatable_attribute :short_name, String
 
       validate :validate_organization_name_presence
+      validate :validate_organization_short_name_presence
+      validate :validate_short_name_format
 
       private
 
@@ -18,6 +21,11 @@ def validate_organization_name_presence
         errors.add(translated_attr, :blank) if send(translated_attr).blank?
       end
 
+      def validate_organization_short_name_presence
+        translated_attr = :"short_name_#{current_organization.try(:default_locale) || Decidim.default_locale.to_s}"
+        errors.add(translated_attr, :blank) if send(translated_attr).blank?
+      end
+
       def validate_organization_uniqueness
         base_query = persisted? ? Decidim::Organization.where.not(id:).all : Decidim::Organization.all
 
@@ -33,11 +41,40 @@ def validate_organization_uniqueness
         name.each do |language, value|
           next if value.is_a?(Hash)
 
-          errors.add("name_#{language}", :taken) if organization_names.include?(value.downcase)
+          errors.add("name_#{language}", :taken) if organization_names.include?(value&.downcase)
         end
 
         errors.add(:host, :taken) if Decidim::Organization.where(host:).where.not(id:).exists?
       end
+
+      def validate_short_name_uniqueness
+        base_query = persisted? ? Decidim::Organization.where.not(id:).all : Decidim::Organization.all
+
+        organization_short_names = []
+
+        base_query.pluck(:short_name).each do |value|
+          organization_short_names += value.except("machine_translations").values
+          organization_short_names += value.fetch("machine_translations", {}).values
+        end
+
+        organization_short_names = organization_short_names.map(&:downcase).compact_blank
+
+        short_name.each do |language, value|
+          next if value.is_a?(Hash)
+
+          errors.add("short_name_#{language}", :taken) if organization_short_names.include?(value&.downcase)
+        end
+      end
+
+      def validate_short_name_format
+        short_name.each do |language, value|
+          next if value.is_a?(Hash)
+          next if value.blank?
+
+          errors.add("short_name_#{language}", :too_short, count: 3) if value.length < 3
+          errors.add("short_name_#{language}", :too_long, count: 12) if value.length > 12
+        end
+      end
     end
   end
 end
diff --git a/decidim-system/app/views/decidim/system/organizations/edit.html.erb b/decidim-system/app/views/decidim/system/organizations/edit.html.erb
index f44edd1ac0012..da5085c6457e0 100644
--- a/decidim-system/app/views/decidim/system/organizations/edit.html.erb
+++ b/decidim-system/app/views/decidim/system/organizations/edit.html.erb
@@ -10,6 +10,10 @@
       <%= f.translated :text_field, :name, autofocus: true %>
     </div>
 
+    <div>
+      <%= f.translated :text_field, :short_name, help_text: t(".short_name_hint") %>
+    </div>
+
     <%= f.text_field :host %>
 
     <%= f.text_area :secondary_hosts, help_text: t(".secondary_hosts_hint") %>
diff --git a/decidim-system/app/views/decidim/system/organizations/new.html.erb b/decidim-system/app/views/decidim/system/organizations/new.html.erb
index 25f19ccf0b457..9ce3a24d0b66e 100644
--- a/decidim-system/app/views/decidim/system/organizations/new.html.erb
+++ b/decidim-system/app/views/decidim/system/organizations/new.html.erb
@@ -8,6 +8,8 @@
   <div class="form__wrapper">
     <%= f.text_field :name, autofocus: true %>
 
+    <%= f.text_field :short_name, help_text: t(".short_name_hint") %>
+
     <%= f.text_field :reference_prefix, help_text: t(".reference_prefix_hint") %>
 
     <%= f.text_field :host %>
diff --git a/decidim-system/config/locales/ca-IT.yml b/decidim-system/config/locales/ca-IT.yml
index 8467cdf931bd1..9f4cb6b6fa3a9 100644
--- a/decidim-system/config/locales/ca-IT.yml
+++ b/decidim-system/config/locales/ca-IT.yml
@@ -264,6 +264,7 @@ ca-IT:
           confirm_resend_invitation: Segur que vols reenviar la invitació?
           resend_invitation: Reenviar la invitació
           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.
           title: Editar l'organització
         file_upload_settings:
           content_types:
@@ -293,6 +294,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.
           title: Nova organització
         omniauth_settings:
           decidim:
diff --git a/decidim-system/config/locales/ca.yml b/decidim-system/config/locales/ca.yml
index 59b11b0dc8263..a3d4c07e8bb42 100644
--- a/decidim-system/config/locales/ca.yml
+++ b/decidim-system/config/locales/ca.yml
@@ -264,6 +264,7 @@ ca:
           confirm_resend_invitation: Segur que vols reenviar la invitació?
           resend_invitation: Reenviar la invitació
           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.
           title: Editar l'organització
         file_upload_settings:
           content_types:
@@ -293,6 +294,7 @@ ca:
           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.
           title: Nova organització
         omniauth_settings:
           decidim:
diff --git a/decidim-system/config/locales/en.yml b/decidim-system/config/locales/en.yml
index 83a2cebf65400..f474807dc447d 100644
--- a/decidim-system/config/locales/en.yml
+++ b/decidim-system/config/locales/en.yml
@@ -270,6 +270,7 @@ en:
           confirm_resend_invitation: Are you sure you want to resend the invitation?
           resend_invitation: Resend invitation
           secondary_hosts_hint: Enter each one of them in a new line
+          short_name_hint: Short name used for the Progressive Web Application. It must have 12 characters maximum.
           title: Edit organization
         file_upload_settings:
           content_types:
@@ -299,6 +300,7 @@ en:
           organization_admin_email_hint: We will send an email to this address so you can confirm it and set up your password.
           reference_prefix_hint: The reference prefix is used to uniquely identify resources across all organization.
           secondary_hosts_hint: Enter each one of them in a new line.
+          short_name_hint: Short name used for the Progressive Web Application. It must have 12 characters maximum.
           title: New organization
         omniauth_settings:
           decidim:
diff --git a/decidim-system/config/locales/es-MX.yml b/decidim-system/config/locales/es-MX.yml
index 6c1f704353185..1c59c5ae971f5 100644
--- a/decidim-system/config/locales/es-MX.yml
+++ b/decidim-system/config/locales/es-MX.yml
@@ -265,6 +265,7 @@ es-MX:
           confirm_resend_invitation: '¿Seguro que quieres reenviar la invitación?'
           resend_invitation: Reenviar invitación
           secondary_hosts_hint: Introduce cada uno de ellos en una nueva línea
+          short_name_hint: Nombre corto utilizado para la Aplicación Web Progresiva (PWA). Debe tener un máximo de 12 caracteres.
           title: Editar la organización
         file_upload_settings:
           content_types:
@@ -294,6 +295,7 @@ es-MX:
           organization_admin_email_hint: Te enviaremos un correo electrónico a esta dirección para que la puedas confirmar y configurar tu contraseña.
           reference_prefix_hint: El prefijo de referencia se utiliza para identificar de forma única los recursos del conjunto de la organización.
           secondary_hosts_hint: Introduce cada uno de ellos en una nueva línea.
+          short_name_hint: Nombre corto utilizado para la Aplicación Web Progresiva (PWA). Debe tener un máximo de 12 caracteres.
           title: Nueva organización
         omniauth_settings:
           decidim:
diff --git a/decidim-system/config/locales/es-PY.yml b/decidim-system/config/locales/es-PY.yml
index 1e6676bccba3a..b6e4cbcfce52b 100644
--- a/decidim-system/config/locales/es-PY.yml
+++ b/decidim-system/config/locales/es-PY.yml
@@ -265,6 +265,7 @@ es-PY:
           confirm_resend_invitation: '¿Seguro que quieres reenviar la invitación?'
           resend_invitation: Reenviar invitación
           secondary_hosts_hint: Introduce cada uno de ellos en una nueva línea
+          short_name_hint: Nombre corto utilizado para la Aplicación Web Progresiva (PWA). Debe tener un máximo de 12 caracteres.
           title: Editar la organización
         file_upload_settings:
           content_types:
@@ -294,6 +295,7 @@ es-PY:
           organization_admin_email_hint: Te enviaremos un correo electrónico a esta dirección para que la puedas confirmar y configurar tu contraseña.
           reference_prefix_hint: El prefijo de referencia se utiliza para identificar de forma única los recursos del conjunto de la organización.
           secondary_hosts_hint: Introduce cada uno de ellos en una nueva línea.
+          short_name_hint: Nombre corto utilizado para la Aplicación Web Progresiva (PWA). Debe tener un máximo de 12 caracteres.
           title: Nueva organización
         omniauth_settings:
           decidim:
diff --git a/decidim-system/config/locales/es.yml b/decidim-system/config/locales/es.yml
index 4a12d6cc4cb1d..396c5198ebfcc 100644
--- a/decidim-system/config/locales/es.yml
+++ b/decidim-system/config/locales/es.yml
@@ -265,6 +265,7 @@ es:
           confirm_resend_invitation: '¿Seguro que quieres reenviar la invitación?'
           resend_invitation: Reenviar invitación
           secondary_hosts_hint: Introduce cada uno de ellos en una nueva línea
+          short_name_hint: Nombre corto utilizado para la Aplicación Web Progresiva (PWA). Debe tener un máximo de 12 caracteres.
           title: Editar la organización
         file_upload_settings:
           content_types:
@@ -294,6 +295,7 @@ es:
           organization_admin_email_hint: Te enviaremos un correo electrónico a esta dirección para que la puedas confirmar y configurar tu contraseña.
           reference_prefix_hint: El prefijo de referencia se utiliza para identificar de forma única los recursos del conjunto de la organización.
           secondary_hosts_hint: Introduce cada uno de ellos en una nueva línea.
+          short_name_hint: Nombre corto utilizado para la Aplicación Web Progresiva (PWA). Debe tener un máximo de 12 caracteres.
           title: Nueva organización
         omniauth_settings:
           decidim:
diff --git a/decidim-system/config/locales/eu.yml b/decidim-system/config/locales/eu.yml
index 7d014fb663578..b2bd2b44cca50 100644
--- a/decidim-system/config/locales/eu.yml
+++ b/decidim-system/config/locales/eu.yml
@@ -72,7 +72,7 @@ eu:
         destroy:
           success: Administratzailea zuzen ezabatua.
         edit:
-          title: Editatu administratzailea
+          title: Administratzailea editatu
           update: Eguneratu
         index:
           title: Administratzaileak
@@ -265,6 +265,7 @@ eu:
           confirm_resend_invitation: Ziur zaude gonbidapena birbidali nahi duzula?
           resend_invitation: Birbidali gonbidapena
           secondary_hosts_hint: Sartu haietako bakoitza lerro berri batean
+          short_name_hint: Web aplikazio progresiborako erabilitako izen laburra. 12 karaktere izan behar ditu gehienez.
           title: Editatu erakundea
         file_upload_settings:
           content_types:
@@ -295,6 +296,7 @@ eu:
           organization_admin_email_hint: Mezu elektroniko bat bidaliko dugu helbide honetara, baieztatu eta pasahitza jar dezazun.
           reference_prefix_hint: Erreferentzia-aurrizkia erakunde guztietan baliabideak identifikatzeko erabiltzen da.
           secondary_hosts_hint: Sartu haietako bakoitza beste lerro batean.
+          short_name_hint: Web aplikazio progresiborako erabilitako izen laburra. 12 karaktere izan behar ditu gehienez.
           title: Beste erakunde bat
         omniauth_settings:
           decidim:
diff --git a/decidim-system/config/locales/fi-plain.yml b/decidim-system/config/locales/fi-plain.yml
index 9cde4529a5dda..dd27afda4e6b8 100644
--- a/decidim-system/config/locales/fi-plain.yml
+++ b/decidim-system/config/locales/fi-plain.yml
@@ -264,6 +264,7 @@ fi-pl:
           confirm_resend_invitation: Haluatko varmasti lähettää kutsun uudestaan?
           resend_invitation: Lähetä kutsu uudestaan
           secondary_hosts_hint: Syötä jokainen niistä omalle rivilleen
+          short_name_hint: Progressiivisen verkkosovelluksen (PWA) lyhyt nimi. Nimessä voi olla enintään 12 merkkiä.
           title: Muokkaa organisaatiota
         file_upload_settings:
           content_types:
@@ -293,6 +294,7 @@ fi-pl:
           organization_admin_email_hint: Lähetämme tähän sähköpostiosoitteeseen viestin vahvistaaksesi kyseisen sähköpostiosoitteen ja asettaaksesi salasanan käyttäjätilillesi.
           reference_prefix_hint: Viitetunnisteen avulla tunnistetaan yksilöllisesti resursseja eri organisaatioiden välillä.
           secondary_hosts_hint: Syötä jokainen niistä omalle rivilleen.
+          short_name_hint: Progressiivisen verkkosovelluksen (PWA) lyhyt nimi. Nimessä voi olla enintään 12 merkkiä.
           title: Uusi organisaatio
         omniauth_settings:
           decidim:
diff --git a/decidim-system/config/locales/fi.yml b/decidim-system/config/locales/fi.yml
index 84b7ee32353b8..ab9020a5a11ac 100644
--- a/decidim-system/config/locales/fi.yml
+++ b/decidim-system/config/locales/fi.yml
@@ -264,6 +264,7 @@ fi:
           confirm_resend_invitation: Haluatko varmasti lähettää kutsun uudestaan?
           resend_invitation: Lähetä kutsu uudestaan
           secondary_hosts_hint: Syötä jokainen niistä omalle rivilleen
+          short_name_hint: Progressiivisen verkkosovelluksen (PWA) lyhyt nimi. Nimessä voi olla enintään 12 merkkiä.
           title: Muokkaa organisaatiota
         file_upload_settings:
           content_types:
@@ -293,6 +294,7 @@ fi:
           organization_admin_email_hint: Lähetämme tähän sähköpostiosoitteeseen viestin vahvistaaksesi kyseisen sähköpostiosoitteen ja asettaaksesi salasanan käyttäjätilillesi.
           reference_prefix_hint: Viitetunnisteen avulla tunnistetaan yksilöllisesti resursseja eri organisaatioiden välillä.
           secondary_hosts_hint: Syötä jokainen niistä omalle rivilleen.
+          short_name_hint: Progressiivisen verkkosovelluksen (PWA) lyhyt nimi. Nimessä voi olla enintään 12 merkkiä.
           title: Uusi organisaatio
         omniauth_settings:
           decidim:
diff --git a/decidim-system/config/locales/fr-CA.yml b/decidim-system/config/locales/fr-CA.yml
index 944bdf88204bb..c90769c6bedfb 100644
--- a/decidim-system/config/locales/fr-CA.yml
+++ b/decidim-system/config/locales/fr-CA.yml
@@ -197,6 +197,7 @@ fr-CA:
           confirm_resend_invitation: Êtes-vous sûr de vouloir renvoyer l'invitation ?
           resend_invitation: Renvoyer l'invitation
           secondary_hosts_hint: Entrez chacun d'eux dans une nouvelle ligne
+          short_name_hint: Nom court utilisé pour l'application Web progressive. Il doit avoir un maximum de 12 caractères.
           title: Modifier l'organisation
         file_upload_settings:
           content_types:
@@ -226,6 +227,7 @@ fr-CA:
           organization_admin_email_hint: Nous enverrons un e-mail à cette adresse afin que vous puissiez la confirmer et configurer votre mot de passe.
           reference_prefix_hint: Le préfixe de référence est utilisé pour identifier de manière unique les ressources à travers toutes les organisations.
           secondary_hosts_hint: Entrez chacun d'eux dans une nouvelle ligne.
+          short_name_hint: Nom court utilisé pour l'application Web progressive. Il doit avoir un maximum de 12 caractères.
           title: Nouvelle organisation
         omniauth_settings:
           decidim:
diff --git a/decidim-system/config/locales/fr.yml b/decidim-system/config/locales/fr.yml
index 6052268a4813e..c36f6d4ebae02 100644
--- a/decidim-system/config/locales/fr.yml
+++ b/decidim-system/config/locales/fr.yml
@@ -197,6 +197,7 @@ fr:
           confirm_resend_invitation: Êtes-vous sûr de vouloir renvoyer l'invitation ?
           resend_invitation: Renvoyer l'invitation
           secondary_hosts_hint: Entrez chacun d'eux dans une nouvelle ligne
+          short_name_hint: Nom court utilisé pour l'application Web progressive. Il doit avoir un maximum de 12 caractères.
           title: Modifier l'organisation
         file_upload_settings:
           content_types:
@@ -226,6 +227,7 @@ fr:
           organization_admin_email_hint: Nous enverrons un e-mail à cette adresse afin que vous puissiez la confirmer et configurer votre mot de passe.
           reference_prefix_hint: Le préfixe de référence est utilisé pour identifier de manière unique les ressources à travers toutes les organisations.
           secondary_hosts_hint: Entrez chacun d'eux dans une nouvelle ligne.
+          short_name_hint: Nom court utilisé pour l'application Web progressive. Il doit avoir un maximum de 12 caractères.
           title: Nouvelle organisation
         omniauth_settings:
           decidim:
diff --git a/decidim-system/config/locales/ja.yml b/decidim-system/config/locales/ja.yml
index 1cccb86e4a962..f8fa1c695b988 100644
--- a/decidim-system/config/locales/ja.yml
+++ b/decidim-system/config/locales/ja.yml
@@ -262,6 +262,7 @@ ja:
           confirm_resend_invitation: 招待を再送信してもよろしいですか？
           resend_invitation: 招待を再送信する
           secondary_hosts_hint: 新しい行にそれぞれ入力してください
+          short_name_hint: Progressive Web アプリケーションに使用される短い名前。最大 12 文字までです。
           title: 組織の編集
         file_upload_settings:
           content_types:
@@ -291,6 +292,7 @@ ja:
           organization_admin_email_hint: このアドレスにメールを送信しますので、ご確認の上、パスワードを設定してください。
           reference_prefix_hint: 参照プレフィックスは、すべての組織をまたがってリソースを一意に識別するために使用されます。
           secondary_hosts_hint: 新しい行にそれぞれ入力します。
+          short_name_hint: Progressive Web アプリケーションに使用される短い名前。最大 12 文字までです。
           title: 新しい組織
         omniauth_settings:
           decidim:
diff --git a/decidim-system/config/locales/pt-BR.yml b/decidim-system/config/locales/pt-BR.yml
index 10c730c8ca8ff..953cd3f12cf31 100644
--- a/decidim-system/config/locales/pt-BR.yml
+++ b/decidim-system/config/locales/pt-BR.yml
@@ -7,6 +7,9 @@ pt-BR:
         organization_name: Organização
         organization_url: URL da organização
         redirect_uri: Redirecionar URI
+        refresh_tokens: Atualizar tokens
+        refresh_tokens_enabled: Atualizar tokens ativados
+        scopes: Escopos disponíveis
       organization:
         address: Nome do host SMTP
         from_email: Endereço de E-mail
@@ -31,17 +34,43 @@ pt-BR:
           attributes:
             redirect_uri:
               must_be_ssl: O URI de redirecionamento deve ser um URI com SSL
+        organization:
+          attributes:
+            password:
+              secret_key: Você precisa definir a variável de ambiente SECRET_KEY_BASE para ser capaz de salvar este campo
   decidim:
     system:
       actions:
+        api_user:
+          hidden_secret: O segredo está oculto
+          hide_secret: Ocultar Segredo
+          secret_can_not_be_shown: o segredo de API só pode ser visto ou copiado após a criação
+          show_secret: Mostrar segredo
+          shown_secret: O segredo é mostrado
+        api_users:
+          create: Criar
+          new: Novo usuário da API
+          remove: Remover usuário
         confirm_destroy: Deseja mesmo excluir isso?
+        confirm_refresh_api_secret: Tem certeza que deseja atualizar o segredo para este usuário da API? Depois da atualização, o segredo antigo será inválido e não poderá mais ser usado.
+        confirm_remove_api_user: Você tem certeza que deseja remover este usuário da API?
+        copied: Copiado
+        copy_secret: Copiar segredo
+        copy_secret_clarification: Copiar segredo para área de transferência
         destroy: Excluir
         edit: Editar
+        new_admin: Novo administrador
+        new_oauth_application: Novo aplicação OAUTH
+        new_organization: Nova organização
+        refresh_secret: Atualizar segredo
         save: Salvar
         title: Ações
       admins:
         create:
           error: Ocorreu um erro ao criar um novo administrador.
+          success: Administrador criado com sucesso.
+        destroy:
+          success: Administrador excluído com sucesso.
         edit:
           title: Edit admin
           update: Atualizar
@@ -52,12 +81,35 @@ pt-BR:
           title: Novo administrador
         update:
           error: Ocorreu um erro ao atualizar este administrador.
+          success: Administrador atualizado com sucesso.
+      api_user:
+        create:
+          error: Criação de usuário da API falhou.
+          success: Usuário de API criado com sucesso. O segredo do usuário só é visível após a criação. Por favor, copie e armazene-o com segurança antes de sair desta página!
+        destroy:
+          success: Usuário de API excluído com sucesso.
+        refresh:
+          error: Algo deu errado! Por favor, tente novamente mais tarde.
+          success: Segredo atualizado com sucesso. O segredo para o usuário só é visível após a criação. Por favor, copie e armazene-o com segurança antes de sair desta página!
+      api_users:
+        index:
+          explanation_html: |
+            <p>Os usuários da API permitem que os desenvolvedores de integração adicionem contas de usuário de máquina administrativas ao sistema. Esses usuários de máquina podem atuar como administradores na plataforma para realizar atualizações que os administradores normais realizariam por meio do painel de administração. Um caso de uso típico é uma plataforma de gerenciamento externa onde um script automatizado executaria tarefas administrativas na plataforma sem que um usuário real precisasse se autenticar no sistema. Por exemplo, um sistema de automação pode querer enviar respostas a propostas, caso em que precisamos de um usuário de integração para executar essa tarefa dentro desta plataforma.</p>
+            <p>A principal diferença entre essas contas e as contas de administrador normais é que esses usuários são destinados ao uso por máquinas e, portanto, seus requisitos de senha são diferentes. Esses usuários não precisam atualizar suas senhas regularmente e a alteração da senha da conta pode ocorrer de forma gerenciada quando necessário.</p>
+            <p>Essas credenciais são destinadas ao uso por máquinas. Os aplicativos voltados para o participante devem ser integrados com <a href="%{oauth_link}">aplicativos OAuth</a>.</p>
+          manage: Gerenciar usuários da API
+        new:
+          select_organization: Selecione sua organização
+          title: Criar novo usuário de API
       dashboard:
         show:
+          admins: Administradores
           current_organizations: Organizações atuais
+          system_checks: Verificações de sistema
       default_pages:
         placeholders:
           content: Adicione conteúdo significativo à página estática %{page} no painel do administrador.
+          summary: Por favor, adicione um resumo significativo à página estática %{page} no painel do administrador.
           title: Título padrão para %{page}
         terms-of-service: Termos de serviço
       devise:
@@ -77,8 +129,9 @@ pt-BR:
             sign_up: Criar uma conta
       menu:
         admins: Administradores
+        api_credentials: Credenciais de API
         dashboard: painel de controle
-        oauth_applications: Aplicações OAuth
+        oauth_applications: Aplicativos OAuth
         organizations: Organizações
       models:
         admin:
@@ -87,6 +140,15 @@ pt-BR:
             email: E-mail
           validations:
             email_uniqueness: outro administrador com o mesmo e-mail já existe
+        api_user:
+          fields:
+            created_at: Criado em
+            key: Chave
+            name: Nome
+            organization: Organização
+            secret: Segredo
+          validations:
+            name_uniqueness: Um usuário de API com este nome já existe.
         oauth_application:
           fields:
             created_at: Criado em
@@ -96,6 +158,7 @@ pt-BR:
           actions:
             save_and_invite: Criar organização e convidar admin
           fields:
+            content_security_policy: Política de segurança de conteúdo
             created_at: Criado em
             file_upload_settings: Configurações de upload de arquivo
             name: Nome
@@ -112,6 +175,26 @@ pt-BR:
           save: Salvar
           title: Editar aplicativo
         form:
+          application_type:
+            confidential:
+              explanation: Aplicações que conseguem autenticar de forma segura com o servidor de autorização, por exemplo, conseguindo manter seus clientes registrados seguros. Normalmente um aplicativo executando em um servidor onde o segredo do cliente é armazenado.
+              name: Confidencial
+            public:
+              explanation: Aplicativos que são incapazes de usar segredos de cliente registrados, como aplicativos executados em um navegador ou em um dispositivo móvel.
+              name: Público
+          application_type_help_html: 'O tipo de cliente OAuth conforme definido por <a href="%{client_type_link}" target="_blank">RFC 6749 Seção 2.1</a>. Os clientes públicos precisam implementar o fluxo PKCE, conforme definido pela <a href="%{pkce_link}" target="_blank">RFC 7636</a>. '
+          refresh_tokens_help_html: 'Os tokens de atualização são úteis caso o token precise de um tempo de vida mais longo do que o que é atribuído para o token de acesso. Note que <strong>os tokens de atualização devem ser usados cuidadosamente</strong> porque eles podem enfraquecer a segurança de seus usuários. '
+          scopes_explanation:
+            "api:read": Permite que o usuário realize operações de consulta por meio da API GraphQL.
+            "api:write": Permite que o usuário execute operações de mutação através da API do GraphQL.
+            profile: Fornece acesso aos detalhes do próprio perfil do usuário. Apenas este escopo é necessário no caso de a aplicação OAuth ser usada apenas como um provedor de identidade ou um serviço de autenticação.
+            user: Capacidade de agir como o usuário conectado com o token fornecido durante chamadas para a API do GraphQL. Isto é necessário para todas as operações de api:write ou api:read que precisam de informação sobre o usuário atual.
+          scopes_help_html: |
+            Os escopos selecionados estarão disponíveis para os aplicativos conectados solicitarem durante o processo de autorização. O usuário será apresentado detalhes sobre a solicitação de autorização quando ele entrar usando OAuth.
+            <br>
+            Diferentes escopos fornecem diferentes recursos para o usuário autenticado usando os tokens de acesso concedidos.
+            <br>
+            <strong>Nota:</strong> Se você só precisar autenticar os usuários em seus aplicativos externos, você só precisa do escopo <strong>do perfil</strong>. Aplicações interagindo com a API Decidim também exigem outros escopos.
           select_organization: Selecione uma organização
         index:
           confirm_delete: Tem certeza de que deseja excluir este aplicativo?
@@ -129,8 +212,60 @@ pt-BR:
         create:
           error: Ocorreu um erro ao criar uma nova organização.
           error_invitation: Ocorreu um erro ao criar uma nova organização. Revise o nome do administrador da organização.
+          success_html: |
+            <p>
+            Organização criada com sucesso.
+
+            </p>
+            <ol>
+            <li>Talvez seja necessário atualizar o código do seu aplicativo, pois para permitir solicitações para %{host} você precisa adicionar o seguinte à sua configuração de ambiente (ou seja, <code>config/environment/production.rb</code>) ou ao seu <code>config/application.rb</code>:
+            <p>config.hosts << "%{host}"</p>
+            </li>
+            <li>
+            Após isso, você poderá acessar sua plataforma através de <a href="http://%{host}">http://%{host}</a>
+            </li>
+            <li>
+            Enviamos um e-mail para <b>%{email}</b> que você precisa confirmar.
+            </li>
+            </ol>
+        csp_settings:
+          connect_src: Conectar src
+          connect_src_hint: |
+            A diretiva connect-src restringe os URLs que podem ser carregados usando elementos <script>.
+            A plataforma adicionará 'self', mas permite que você adicione mais. Deixe em branco se não tiver certeza.
+          default_src: Default src
+          default_src_hint: |
+            A diretiva default-src é a política padrão para carregar conteúdo como JavaScript, imagens, CSS, fontes, solicitações AJAX, frames e mídia HTML5.
+            A plataforma adicionará "'self' 'unsafe-inline'", mas permite que você adicione mais. Deixe em branco se não tiver certeza.
+          font_src: Font src
+          font_src_hint: |
+            A diretiva font-src restringe os URLs que podem ser carregados usando @font-face.
+            A plataforma adicionará 'self', mas permite que você adicione mais. Deixe em branco se não tiver certeza.
+          frame_src: Frame src
+          frame_src_hint: |
+            A diretiva frame-src restringe os URLs que podem ser carregados usando os elementos <frame>, <iframe> e <object>.
+            A plataforma adicionará 'self', mas permite que você adicione mais. Deixe em branco se não tiver certeza.
+          img_src: Img src
+          img_src_hint: |
+            A diretiva img-src restringe os URLs que podem ser carregados usando os elementos <img>, <image>, <picture> e <svg>.
+            A plataforma adicionará 'self', mas permite que você adicione mais. Deixe em branco se não tiver certeza.
+          media_src: Src de mídia
+          media_src_hint: |
+            A diretiva media-src restringe os URLs que podem ser carregados usando os elementos <video>, <audio> e <source>.
+            A plataforma adicionará 'self', mas permite que você adicione mais. Deixe em branco se não tiver certeza.
+          script_src: Script src
+          script_src_hint: |
+            A diretiva script-src restringe os URLs que podem ser carregados usando elementos <script>.
+            A plataforma adicionará "'self' 'unsafe-inline' 'unsafe-eval'", mas permite que você adicione mais. Deixe em branco se não tiver certeza.
+          style_src: Estilo src
+          style_src_hint: |
+            A diretiva style-src restringe os URLs que podem ser carregados usando elementos <style>.
+            A plataforma adicionará "'self' 'unsafe-inline'", mas permite que você adicione mais. Deixe em branco se não tiver certeza.
         edit:
+          confirm_resend_invitation: Tem certeza de que deseja reenviar o convite?
+          resend_invitation: Reenviar convite
           secondary_hosts_hint: Insira cada um deles em uma nova linha
+          short_name_hint: Nome curto usado para o aplicativo web progressiva. Ele deve ter no máximo 12 caracteres.
           title: Editar organização
         file_upload_settings:
           content_types:
@@ -150,6 +285,7 @@ pt-BR:
           intro: |
             Por favor, tenha um cuidado extra ao considerar alterar estas configurações. Quanto menos você permitir, melhor.
             Permitir extensões de arquivo ou tipos MIME específicos pode expor os usuários do sistema a riscos de segurança e também pode afetar a acessibilidade do site.
+        header_snippets_help_html: Use este campo para adicionar elementos ao cabeçalho HTML. O uso mais comum é para integrar serviços de terceiros que exigem JavaScript ou CSS adicionais. Você também pode usá-lo para adicionar meta tags extras ao HTML. Observe que isso só será exibido em páginas públicas, não na área administrativa. Se o código interagir com APIs externas ou não estiver em conformidade com as diretrizes de segurança do aplicativo, será necessário alterar a Política de Segurança de Conteúdo (CSP). Saiba mais sobre <a href="https://docs.decidim.org/en/develop/customize/content_security_policy">na documentação</a>.
         index:
           title: Organizações
         new:
@@ -159,6 +295,7 @@ pt-BR:
           organization_admin_email_hint: Nós enviaremos um e-mail para este endereço para que você possa confirmá-lo e configurar sua senha.
           reference_prefix_hint: O prefixo de referência é usado para identificar exclusivamente recursos em todas as organizações.
           secondary_hosts_hint: Insira cada um deles em uma nova linha.
+          short_name_hint: Nome curto usado para o aplicativo web progressiva. Ele deve ter no máximo 12 caracteres.
           title: Nova organização
         omniauth_settings:
           decidim:
@@ -179,10 +316,13 @@ pt-BR:
             api_key: Chave da API
             api_secret: Senha API
         resend_invitation:
+          error: Houve um problema ao enviar o convite.
           success: O convite remete com sucesso.
         smtp_settings:
           fieldsets:
             sender: Remetente
+          instructions:
+            from_label: 'O remetente do e-mail será: "nome-da-sua-organização <your-organization@example.org>". Deixe em branco para usar o mesmo nome definido para a organização.'
           placeholder:
             from_email: sua-organização@exemplo.org
             from_label: nome-da-organizacao
@@ -199,11 +339,18 @@ pt-BR:
           our_getting_started_guide: nosso guia inicial
         organizations_list:
           confirm_resend_invitation: Tem certeza de que deseja excluir este aplicativo?
+          resend_invitation: Reenviar convite
       system_checks:
         active_job_queue:
           decidim_documentation: Documentação do Decidim
+          error: A fila de ActiveJob não está configurada. Esta não é uma configuração recomendada para produção. Leia mais em %{error_extra}.
+          success: A fila do ActiveJob está configurada corretamente.
+        secret_key:
+          error: 'A chave secreta não está definida corretamente. Salve-a na variável de ambiente SECRET_KEY_BASE e reinicie o servidor: %{error_extra}'
+          success: A chave secreta está configurada corretamente.
       titles:
         dashboard: painel de controle
+        decidim: Decidim
   layouts:
     decidim:
       system:
diff --git a/decidim-system/config/locales/ro-RO.yml b/decidim-system/config/locales/ro-RO.yml
index 6b98bcb39410e..af6a043ede9c7 100644
--- a/decidim-system/config/locales/ro-RO.yml
+++ b/decidim-system/config/locales/ro-RO.yml
@@ -3,12 +3,15 @@ ro:
     attributes:
       oauth_application:
         name: Numele aplicației OAuth
-        organization_logo: Sigla organizației (pătrat)
+        organization_logo: Logoul organizației (pătrat)
         organization_name: Organizație
         organization_url: URL-ul organizației
         redirect_uri: URI de redirectionare
+        refresh_tokens: Tokenuri de reîmprospătare
+        refresh_tokens_enabled: Tokenurile de reîmprospătare sunt activate
+        scopes: Scopul de autentificare disponibile
       organization:
-        address: SMTP hostname
+        address: Hostname SMTP
         from_email: Adresă de e-mail
         from_label: Etichetă
         password: Parolă
@@ -20,10 +23,10 @@ ro:
           default: Tipuri MIME implicite
         allowed_file_extensions:
           admin: Extensii fişiere administrator
-          default: Extensii de fișier implicite
-          image: Extensiile fişierului imagine
+          default: Extensii implicite de fișier
+          image: Extensiile fișierului imagine
         maximum_file_size:
-          avatar: Dimensiune avatar fişier
+          avatar: Dimensiune fișier avatar
           default: Dimensiunea implicită a fișierului
     errors:
       models:
@@ -31,55 +34,103 @@ ro:
           attributes:
             redirect_uri:
               must_be_ssl: URL-ul de redirecționare trebuie să fie un URL SSL
+        organization:
+          attributes:
+            password:
+              secret_key: Trebuie să definiți variabila de mediu SECRET_KEY_BASE pentru a putea salva acest câmp.
   decidim:
     system:
       actions:
-        confirm_destroy: Sigur dorești să ştergi acest element?
-        destroy: Ștergere
-        edit: Editare
+        api_user:
+          hidden_secret: Codul secret este ascuns
+          hide_secret: Ascundeți codul secret
+          secret_can_not_be_shown: codul secret pentru API poate fi văzut sau copiat numai după creare
+          show_secret: Arătați codul secret
+          shown_secret: Codul secret este vizibil
+        api_users:
+          create: Creați
+          new: Utilizator API nou
+          remove: Eliminați utilizatorul API
+        confirm_destroy: Sigur dorești să eliminați acest element?
+        confirm_refresh_api_secret: Sunteți sigur că doriți să reîmprospătați secretul pentru acest utilizator API? După reîmprospătare, vechiul secret va fi invalid și nu va mai putea fi folosit.
+        confirm_remove_api_user: Sigur doriți să eliminați acest utilizator API?
+        copied: Copiat
+        copy_secret: Copiați codul secret
+        copy_secret_clarification: Copiați codul secret în clipboard
+        destroy: Eliminați
+        edit: Modificați
         new_admin: Administrator nou
-        new_oauth_application: Aplicație nouă OUATH
+        new_oauth_application: Aplicație nouă OAuth
         new_organization: Organizație nouă
-        save: Salvează
+        refresh_secret: Codul secret pentru reîmprospătare
+        save: Actualizați
         title: Acțiuni
       admins:
         create:
           error: A apărut o problemă la crearea unui administrator nou.
-          success: Administratorul a fost creat.
+          success: Administratorul creat cu succes.
         destroy:
-          success: Administratorul a fost șters.
+          success: Administratorul eliminat cu succes.
         edit:
-          title: Editare admin
+          title: Modificați admin
           update: Actualizare
         index:
           title: Administratori
         new:
-          create: Creează
+          create: Creați
           title: Administrator nou
         update:
           error: A apărut o eroare la actualizarea administratorului.
           success: Administratorul a fost actualizat.
+      api_user:
+        create:
+          error: A apărut o eroare la crearea utilizatorului API.
+          success: Utilizator API creat cu succes. Secretul pentru utilizator este vizibil doar după creare. Vă rugăm copiați-l și păstrați-l în siguranță înainte de a părăsi această pagină!
+        destroy:
+          success: Utilizator API a fost eliminat cu succes.
+        refresh:
+          error: Ceva nu a mers bine! Vă rugăm să încercați din nou mai târziu.
+          success: Secret reîmprospătat cu succes. Secretul pentru utilizator este vizibil doar după creare. Vă rugăm să îl copiați și să îl păstrați în siguranță înainte de a părăsi această pagină!
+      api_users:
+        index:
+          explanation_html: |
+            <p>Utilizatorii API permit dezvoltatorilor de integrări să adauge conturi de utilizator de mașini administrative la sistem. Acești utilizatori de mașini pot acționa ca administratori pe platformă pentru a efectua actualizări pe care administratorii obișnuiți le-ar efectua prin intermediul panoului de administrare. Un caz de utilizare tipic este o platformă de gestionare externă în care un script automat ar efectua sarcini administrative cu platforma fără ca un utilizator real să fie nevoit să se autentifice la sistem. De exemplu, un sistem de automatizare ar putea dori să trimită răspunsuri la propuneri, caz în care avem nevoie de un utilizator de integrare pentru a efectua această sarcină în cadrul acestei platforme.</p>
+            <p>Principala diferență dintre aceste conturi și conturile de administrator normale este că acești utilizatori sunt meniți să fie utilizați de mașini și, prin urmare, cerințele lor privind parola sunt diferite. Acești utilizatori nu trebuie să își actualizeze în mod regulat parola, iar schimbarea parolei contului se poate face într-un mod gestionat atunci când este necesar.</p>
+            <p>Aceste acreditări sunt destinate a fi utilizate de mașini. Aplicațiile orientate către participanți ar trebui integrate cu <a href="%{oauth_link}">aplicațiile OAuth</a>.</p>
+          manage: Gestionați utilizatorii API
+        new:
+          select_organization: Selectați o organizație
+          title: Creare utilizator API nou
       dashboard:
         show:
           admins: Administratori
           current_organizations: Organizații curente
+          system_checks: Verificări de sistem
       default_pages:
         placeholders:
-          content: Vă rugăm să adăugaţi conţinut semnificativ paginii statice %{page} de pe tabloul de bord al administratorului.
-          summary: Vă rugăm să adăugați un conținut semnificativ pe pagina statistică %{page} din tabloul de bord al administratorului.
+          content: Vă rugăm să adaugați conținut semnificativ în pagina %{page} de pe tabloul de bord al administratorului.
+          summary: Vă rugăm să adăugați un conținut semnificativ în pagina statică %{page} din tabloul de bord al administratorului.
           title: Titlul implicit pentru %{page}
         terms-of-service: Condiții de utilizare
       devise:
         passwords:
           edit:
             change_your_password: Schimbați parola
-            minimum_characters: "(%{minimum} caractere minim)"
+            minimum_characters: "(minimum %{minimum} caractere)"
           new:
-            forgot_your_password: Ați uitat parola
-            send_me_reset_password_instructions: Trimiteți-mi Instrucțiuni de resetare a parolei
+            forgot_your_password: Ați uitat parola?
+            send_me_reset_password_instructions: Trimiteți-mi instrucțiunile de resetare a parolei
+        shared:
+          links:
+            did_not_receive_confirmation_instructions?: Nu ați primit instrucțiunile de confirmare?
+            did_not_receive_unlock_instructions?: Nu ați primit instrucțiuni de deblocare?
+            forgot_your_password?: Ați uitat parola?
+            log_in: Autentificare
+            sign_up: Creați un cont
       menu:
         admins: Administratori
-        dashboard: Panou
+        api_credentials: Credențiale API
+        dashboard: Panou de administrare
         oauth_applications: Aplicații OAuth
         organizations: Organizații
       models:
@@ -89,6 +140,15 @@ ro:
             email: E-mail
           validations:
             email_uniqueness: un alt administrator cu același e-mail există deja
+        api_user:
+          fields:
+            created_at: Creat la
+            key: Cheie
+            name: Nume
+            organization: Organizație
+            secret: Cheie secretă
+          validations:
+            name_uniqueness: Există deja un utilizator API cu acest nume.
         oauth_application:
           fields:
             created_at: Creat la
@@ -96,12 +156,13 @@ ro:
             organization_name: Organizație
         organization:
           actions:
-            save_and_invite: Creează grupul de lucru și invită un administrator
+            save_and_invite: Creați organizație și invitați administrator
           fields:
+            content_security_policy: Politică de securitate conținut
             created_at: Creat la
-            file_upload_settings: Setări pentru încărcarea fișierului
+            file_upload_settings: Setări pentru încărcarea fișierelor
             name: Nume
-            omniauth_settings: Setări Omniauth
+            omniauth_settings: Setări Oauth
             smtp_settings: Setări SMTP
       oauth_applications:
         create:
@@ -111,35 +172,107 @@ ro:
           error: A apărut o problemă la eliminarea acestei aplicații.
           success: Aplicație eliminată cu succes.
         edit:
-          save: Salveaza
-          title: Editați aplicația
+          save: Actualizați
+          title: Modificați aplicația
         form:
+          application_type:
+            confidential:
+              explanation: Aplicațiile care pot autentifica în siguranță cu serverul de autorizare, de exemplu, având posibilitatea de a păstra confidențialitatea clientului înregistrat în siguranță. De obicei, o aplicație care rulează pe un server unde detaliile utilizatorului sunt stocate.
+              name: Confidențial
+            public:
+              explanation: Aplicații care nu pot utiliza codurile secretele ale clienților înregistrați, cum ar fi aplicațiile care rulează într-un browser sau pe un dispozitiv mobil.
+              name: Nume public
+          application_type_help_html: 'Tipul de client OAuth definit de <a href="%{client_type_link}" target="_blank">RFC 6749 Secțiunea 2.1</a>. Clienții publici trebuie să implementeze fluxul PKCE așa cum este definit de <a href="%{pkce_link}" target="_blank">RFC 7636</a>. '
+          refresh_tokens_help_html: 'Tokenele de reîmprospătare sunt utile în cazul în care tokenul are nevoie de o durată de viață mai lungă decât cea atribuită tokenul de acces. Rețineți că <strong>tokenurile de reîmprospătare trebuie utilizate cu atenție</strong>, deoarece pot slăbi securitatea utilizatorilor. '
+          scopes_explanation:
+            "api:read": Permite utilizatorului să efectueze operațiuni de interogare API prin GraphQL.
+            "api:write": Permite utilizatorului să efectueze operațiuni de modificare API prin GraphQL.
+            profile: Oferă acces la detaliile propriului profilul al utilizatorului. Aveți nevoie numai de acest scop de autentificare în cazul în care aplicația OAuth este folosită doar ca furnizor de identitate sau ca serviciu de autentificare.
+            user: Abilitatea de a acționa ca utilizator conectat folosind credențiale ca parte requestului către GraphQL API. Acest lucru este necesar pentru toate operațiunile de api:write sau api:read care necesită informații despre utilizatorul curent.
+          scopes_help_html: |
+            Scopurile de autentificare selectate vor fi disponibile pentru aplicațiile conectate, pentru a le solicita în timpul procesului de autorizare. Utilizatorului i se vor prezenta detalii despre solicitarea de autorizare atunci când se conectează utilizând OAuth.
+            <br>
+            Diferite scopuri de autentificare oferă funcții diferite pentru utilizatorul autentificat, utilizând token-urile de acces acordate.
+            <br>
+            <strong>Notă</strong>: Dacă trebuie doar să autentificați utilizatorii pentru aplicațiile externe, aveți nevoie doar de scopul de autentificare al <strong>profilului</strong>. Aplicațiile care interacționează cu API-ul Decidim necesită și alte scopuri de autentificare.
           select_organization: Selectați o organizație
         index:
-          confirm_delete: Sigur dorești să ștergi această aplicație?
+          confirm_delete: Sigur dorești să eliminați această aplicație?
           title: Aplicații OAuth
         new:
-          save: Salveaza
-          title: Adăugați o aplicație nouă
+          save: Actualizați
+          title: Aplicație nouă
         update:
           error: A apărut o eroare la actualizarea acestei aplicații.
           success: Aplicație actualizată cu succes.
       organizations:
         advanced_settings:
-          hide: Ascunde setările avansate
-          show: Arată setările avansate
+          hide: Ascundeți setările avansate
+          show: Arătați setările avansate
         create:
-          error: A apărut o problemă la crearea unei noi organizații.
+          error: A apărut o problemă la crearea unei organizații noi.
+          error_invitation: A apărut o eroare la crearea unei organizații noi. Examinați numele administratorului organizației.
+          success_html: |
+            <p>Organizația a fost creată cu succes.</p>
+            <ol>
+            <li>Este posibil să fie nevoie să actualizați codul aplicației, deoarece pentru a permite solicitări către %{host} trebuie să adăugați următoarele la
+            configurația mediului (de exemplu, <code>config/environment/production.rb</code>) sau la <code>config/application.rb</code>:
+            <p> config.hosts << "%{host}" </p>
+            </li>
+            <li>
+            După ce ați terminat, veți putea accesa platforma dvs. prin <a href="https://%{host}">https://%{host}</a>
+            </li>
+            <li>
+            Am trimis un e-mail la <b>%{email}</b> pe care trebuie să îl confirmați.
+            </li>
+            </ol>
+        csp_settings:
+          connect_src: Connect src
+          connect_src_hint: |
+            Directiva connect-src restricționează URL-urile care pot fi încărcate folosind elementele <script>.
+            Platforma va adăuga "self", dar vă permite să adăugați mai multe, lăsați-o necompletată dacă nu sunteți sigur.
+          default_src: Default src
+          default_src_hint: |
+            Directiva "default-src" este politica implicită pentru încărcarea de conținut, cum ar fi JavaScript, Imagini, CSS, Fonturi, cereri AJAX, frames, Media HTML5.
+            Platforma va adăuga "'self' 'unsafe-inline'', dar vă permite să adăugați și mai multe. Lăsați necompletat dacă nu sunteți sigur.
+          font_src: Font src
+          font_src_hint: |
+            Directiva font-src restricționează URL-urile care pot fi încărcate folosind "@font-face".
+            Platforma va adăuga "self", dar vă permite să adăugați mai multe, lăsați-o necompletată dacă nu sunteți sigur.
+          frame_src: Frame src
+          frame_src_hint: |
+            Directiva cadru restricționează URL-urile care pot fi încărcate folosind elementele <frame>, <iframe> și <object>.
+            Platforma va adăuga "self", dar vă permite să adăugați mai multe, lăsați-o necompletată dacă nu sunteți sigur.
+          img_src: Img src
+          img_src_hint: |
+            Directiva "img-src" restricționează URL-urile care pot fi încărcate folosind elementele <img>, <image>, <picture> și <svg>.
+            Platforma va adăuga "self", dar vă permite să adăugați mai multe, lăsați-o necompletată dacă nu sunteți sigur.
+          media_src: Media src
+          media_src_hint: |
+            Directiva media-src restricționează URL-urile care pot fi încărcate folosind elementele <video>, <audio> și <source>.
+            Platforma va adăuga "self", dar vă permite să adăugați mai multe, lăsați-o necompletată dacă nu sunteți sigur.
+          script_src: Script src
+          script_src_hint: |
+            Directiva script-src restricționează URL-urile care pot fi încărcate folosind elementele <script>.
+            Platforma va adăuga 'self' 'unsafe-inline' 'nesigur'', dar vă permite să adăugați mai multe. Lăsați-l necompletat dacă nu sunteți sigur.
+          style_src: Style src
+          style_src_hint: |
+            Directiva privind style-src restricționează URL-urile care pot fi încărcate folosind elementele <style>.
+            Platforma va adăuga 'self' 'unsafe-inline'', dar vă permite să adăugați și mai multe. Lăsați necompletat dacă nu sunteți sigur.
         edit:
-          secondary_hosts_hint: Introduceți fiecare dintre ele într-o linie nouă
+          confirm_resend_invitation: Sunteți sigur că doriți retrimiteți invitația?
+          resend_invitation: Retrimiteți invitația
+          secondary_hosts_hint: Introduceți câte una pe linie
+          short_name_hint: Nume scurt folosit pentru Aplicația Web Progresiv. Trebuie să aibă maxim 12 caractere.
+          title: Modificați organizația
         file_upload_settings:
           content_types:
-            admin_hint: Aceste tipuri MIME sunt permise pentru secțiunea de administrare încărcare. Utilizatorii administratori ar trebui să fie conștienți de riscurile la încărcarea unor formate de document, astfel încât să vă puteți aștepta ca acestea să fie mai prudente cu încărcările de fișiere.
+            admin_hint: Aceste tipuri MIME sunt permise pentru încărcare în secțiunea de administrare. Utilizatorii administratori ar trebui să fie conștienți de riscurile încărcării unor formate de fișier, astfel încât să vă puteți aștepta ca aceștia să fie mai prudente cu încărcările de fișiere.
             default_hint: Aceste tipuri MIME sunt permise implicit pentru toți utilizatorii.
             intro_html: Adaugă metacaractere cu caracterul asterisc pentru tipurile MIME, ex. <code>image/*</code>.
             title: Tipuri MIME permise
           file_extensions:
-            admin_hint: Aceste extensii de fișiere sunt permise pentru secțiunea de administrare încărcare. Utilizatorii administratori ar trebui să fie conștienți de riscurile la încărcarea unor formate de document, astfel încât să vă puteți aștepta ca acestea să fie mai prudente cu încărcările de fișiere.
+            admin_hint: Aceste extensii de fișiere sunt permise pentru încărcare în secțiunea de administrare. Utilizatorii administratori ar trebui să fie conștienți de riscurile la încărcarea unor formate de fișier, astfel încât să vă puteți aștepta ca aceștia să fie mai prudenți cu încărcările de fișiere.
             default_hint: Aceste extensii de fișiere sunt permise implicit pentru toți utilizatorii.
             image_hint: Aceste extensii de fișiere sunt permise pentru orice fel de încărcare de imagini.
             title: Extensii de fișiere permise
@@ -148,44 +281,76 @@ ro:
             default_hint: Megabytes (MB). Această limită de dimensiune a fișierului este cea implicită utilizată pentru toate încărcările fișierelor, cu excepția cazului în care se specifică altfel.
             title: Mărimea maximă a fișierului
           intro: |
-            Te rugăm să fii extrem de prudent când iei în considerare schimbarea acestor setări. Cu cât permiți, cu atât mai bine.
-            Permițând anumite extensii de fișiere sau tipuri MIME poate expune utilizatorii de sistem la riscuri de securitate și poate afecta accesibilitatea site-ului.
+            Vă rugăm să fiți extrem de prudent când luați în considerare schimbarea acestor setări. Cu cât permiteți mai puțin, cu atât mai bine.
+            Permițând anumite extensii de fișiere sau tipuri MIME poate expune utilizatorii sistemului la riscuri de securitate și poate afecta accesibilitatea site-ului.
+        header_snippets_help_html: Folosiți acest câmp pentru a adăuga HTML, CSS, Javascript extra în secțiunea head. Cea mai comună utilizare este integrarea serviciilor terțe care necesită extra JavaScript sau CSS. De asemenea, o puteți folosi pentru a adăuga meta tag-uri suplimentare în HTML. Reţineţi că acest conținut va fi randat doar în paginile publice, nu în secţiunea de administrare. În cazul în care codul interacționează cu API externe sau nu respectă ghidul privind securitatea aplicației; Politica de securitate a conținutului va trebui modificată. Citește mai multe despre <a href="https://docs.decidim.org/en/develop/customize/content_security_policy">pe site-ul de documentației</a>.
         index:
           title: Organizații
         new:
+          default: Implicit?
+          enabled: Activat
+          locale: Setări regionale
+          organization_admin_email_hint: Vom trimite un e-mail la această adresă pentru a o putea confirma și a vă configura parola.
+          reference_prefix_hint: Prefixul de referință este folosit pentru a identifica în mod unic resursele din toate organizațiile.
+          secondary_hosts_hint: Introduceți câte una pe linie.
+          short_name_hint: Nume scurt folosit pentru Aplicația Web Progresiv. Trebuie să aibă maxim 12 caractere.
           title: Organizație nouă
         omniauth_settings:
           decidim:
             client_id: ID client
-            client_secret: Client secret
+            client_secret: Codul secret al clientului
             site_url: URL-ul site-ului
           enabled: Activat
           enabled_by_default: Acest furnizor este activat în mod implicit. Poate fi editat dar nu dezactivat.
           facebook:
             app_id: ID Aplicație
-            app_secret: Secret aplicație
+            app_secret: Codul secret al aplicației
           google_oauth2:
             client_id: ID client
-            client_secret: Client secret
+            client_secret: Codul secret al clientului
           icon: Iconiță
           icon_path: Calea pictogramei
           twitter:
             api_key: Cheie API
-            api_secret: API secret
+            api_secret: Codul secret pentru API
+        resend_invitation:
+          error: A apărut o eroare la trimiterea invitației.
+          success: Invitație trimisă cu succes.
         smtp_settings:
           fieldsets:
             sender: Expeditor
+          instructions:
+            from_label: 'Expeditorul de e-mail va fi: "numele-organizației-dvs <organizație@exemplu.org>". Lăsați necompletat pentru a utiliza același nume ca cel definit pentru organizație.'
           placeholder:
             from_email: organizație@exemplu.org
-            from_label: numele tău de organizatorie
+            from_label: numele-organizației-dvs
         update:
           error: A apărut o eroare la actualizarea acestei organizații.
           success: Organizația a fost actualizată.
         users_registration_mode:
           disabled: Accesul se poate face doar cu conturi externe
+          enabled: Permiteți participanților să creeze un cont și să se autentifice
+          existing: Nu permiteți participanților să creeze un cont, dar permiteți participanților existenți să se autentifice
       shared:
         notices:
-          no_organization_warning_html: Trebuie să creezi o organizație pentru a începe. Asigură-te că ai citit %{guide} înainte de a continua.
+          no_organization_warning_html: Trebuie să creați o organizație pentru a începe. Asigurați-vă că ați citit %{guide} înainte de a continua.
           our_getting_started_guide: ghidul nostru de început
+        organizations_list:
+          confirm_resend_invitation: Sunteți sigur că doriți retrimiteți invitația?
+          resend_invitation: Retrimiteți invitația
+      system_checks:
+        active_job_queue:
+          decidim_documentation: Documentație Decidim
+          error: ActiveJob nu este configurat. Aceasta nu este o configurare recomandată pentru producție. Citiți mai multe la %{error_extra}.
+          success: ActiveJob este configurat corect.
+        secret_key:
+          error: 'Cheia secretă nu este definită corect. Vă rugăm să salvați în variabila de mediu SECRET_KEY_BASE și să reporniți serverul: %{error_extra}'
+          success: Cheia secretă este configurată corect.
       titles:
-        dashboard: Panou
+        dashboard: Panou de administrare
+        decidim: Decidim
+  layouts:
+    decidim:
+      system:
+        login_items:
+          logout: Deconectare
diff --git a/decidim-system/config/locales/sv.yml b/decidim-system/config/locales/sv.yml
index c21948340f528..ec3a282ab577a 100644
--- a/decidim-system/config/locales/sv.yml
+++ b/decidim-system/config/locales/sv.yml
@@ -46,7 +46,9 @@ sv:
           hide_secret: Dölj hemlighet
           secret_can_not_be_shown: API:s hemlighet kan bara ses vid skapande eller kopiering
           show_secret: Visa hemlighet
+          shown_secret: Hemligheten är visad
         api_users:
+          create: Skapa
           new: Ny API-användare
           remove: Ta bort användaren
         confirm_destroy: Vill du radera detta?
diff --git a/decidim-system/spec/commands/decidim/system/create_api_user_spec.rb b/decidim-system/spec/commands/decidim/system/create_api_user_spec.rb
index 86dd61280a96d..85e959b260612 100644
--- a/decidim-system/spec/commands/decidim/system/create_api_user_spec.rb
+++ b/decidim-system/spec/commands/decidim/system/create_api_user_spec.rb
@@ -18,7 +18,7 @@ module System
         double(
           valid?: valid,
           organization: organization.id,
-          name: name
+          name:
         )
       end
 
diff --git a/decidim-system/spec/commands/decidim/system/create_organization_spec.rb b/decidim-system/spec/commands/decidim/system/create_organization_spec.rb
index 89380cbe5b0f2..9fa8ee532a141 100644
--- a/decidim-system/spec/commands/decidim/system/create_organization_spec.rb
+++ b/decidim-system/spec/commands/decidim/system/create_organization_spec.rb
@@ -17,6 +17,7 @@ module System
           let(:params) do
             {
               name: "Gotham City",
+              short_name: "GothamCity",
               host: "decide.example.org",
               secondary_hosts: "foo.example.org\r\n\r\nbar.example.org",
               reference_prefix: "JKR",
@@ -55,6 +56,7 @@ module System
             expect { command.call }.to change(Organization, :count).by(1)
             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.external_domain_allowlist).to contain_exactly("decidim.org", "github.com")
diff --git a/decidim-system/spec/commands/decidim/system/refresh_api_user_secret_spec.rb b/decidim-system/spec/commands/decidim/system/refresh_api_user_secret_spec.rb
index 0b4c6abb71657..e2c68700d96e7 100644
--- a/decidim-system/spec/commands/decidim/system/refresh_api_user_secret_spec.rb
+++ b/decidim-system/spec/commands/decidim/system/refresh_api_user_secret_spec.rb
@@ -9,7 +9,7 @@ module System
 
       let(:command) { subject.call }
       let!(:organization) { create(:organization) }
-      let(:api_user) { create(:api_user, organization: organization) }
+      let(:api_user) { create(:api_user, organization:) }
       let(:admin) { create(:admin) }
       let(:valid) { true }
       let(:name) { "Dummy name" }
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 8106da38f5fe1..29fd5487b6376 100644
--- a/decidim-system/spec/commands/decidim/system/update_organization_spec.rb
+++ b/decidim-system/spec/commands/decidim/system/update_organization_spec.rb
@@ -18,6 +18,7 @@ module System
           let(:params) do
             {
               name: { en: "Gotham City" },
+              short_name: { en: "GothamCity" },
               host: "decide.example.org",
               secondary_hosts: "foo.example.org\r\n\r\nbar.example.org",
               force_users_to_authenticate_before_access_organization: false,
@@ -130,6 +131,7 @@ module System
           let(:params) do
             {
               name: { en: "Gotham City" },
+              short_name: { en: "GothamCity" },
               host: "decide.example.org",
               users_registration_mode: "existing",
               file_upload_settings: params_for_uploads(upload_settings),
diff --git a/decidim-system/spec/forms/decidim/system/api_user_form_spec.rb b/decidim-system/spec/forms/decidim/system/api_user_form_spec.rb
index d1f81f5ec051a..6a2452812e217 100644
--- a/decidim-system/spec/forms/decidim/system/api_user_form_spec.rb
+++ b/decidim-system/spec/forms/decidim/system/api_user_form_spec.rb
@@ -13,7 +13,7 @@ module System
 
       let(:attributes) do
         {
-          name: name,
+          name:,
           organization: organization_id
         }
       end
@@ -29,7 +29,7 @@ module System
       end
 
       context "when name is already exist" do
-        let!(:api_user) { create(:api_user, organization: organization, name: name) }
+        let!(:api_user) { create(:api_user, organization:, name:) }
 
         it { is_expected.not_to be_valid }
       end
diff --git a/decidim-system/spec/forms/decidim/system/register_organization_form_spec.rb b/decidim-system/spec/forms/decidim/system/register_organization_form_spec.rb
new file mode 100644
index 0000000000000..8149a01078c16
--- /dev/null
+++ b/decidim-system/spec/forms/decidim/system/register_organization_form_spec.rb
@@ -0,0 +1,459 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::System
+  describe RegisterOrganizationForm do
+    subject do
+      described_class.new(
+        name: "Gotham City",
+        short_name: "GothamCity",
+        host: "decide.example.org",
+        secondary_hosts: "foo.example.org\r\n\r\nbar.example.org",
+        reference_prefix: "JKR",
+        organization_admin_name: "Fiorello Henry La Guardia",
+        organization_admin_email: "f.laguardia@example.org",
+        available_locales: ["en"],
+        default_locale: "en",
+        users_registration_mode: "enabled",
+        force_users_to_authenticate_before_access_organization: "false",
+        **smtp_settings,
+        **omniauth_settings
+      )
+    end
+    let(:omniauth_settings) do
+      {
+        "omniauth_settings_facebook_enabled" => true,
+        "omniauth_settings_facebook_app_id" => facebook_app_id,
+        "omniauth_settings_facebook_app_secret" => facebook_app_secret
+      }
+    end
+    let(:smtp_settings) do
+      {
+        "address" => "mail.example.org",
+        "port" => 25,
+        "user_name" => "f.laguardia",
+        "password" => password,
+        "from_email" => "decide@example.org",
+        "from_label" => from_label
+      }
+    end
+    let(:password) { "secret_password" }
+    let(:from_label) { "Decide Gotham" }
+    let(:facebook_app_id) { "plain-text-facebook-app-id" }
+    let(:facebook_app_secret) { "plain-text-facebook-app-secret" }
+
+    context "when everything is OK" do
+      it { is_expected.to be_valid }
+
+      describe "omniauth_settings" do
+        it "contains attributes as plain text" do
+          expect(subject.omniauth_settings_facebook_enabled).to be(true)
+          expect(subject.omniauth_settings_facebook_app_id).to eq(facebook_app_id)
+          expect(subject.omniauth_settings_facebook_app_secret).to eq(facebook_app_secret)
+        end
+
+        context "when all values are blank" do
+          let(:omniauth_settings) do
+            {
+              "omniauth_settings_facebook_enabled" => nil,
+              "omniauth_settings_facebook_app_id" => nil,
+              "omniauth_settings_facebook_app_secret" => nil
+            }
+          end
+
+          it "returns nil" do
+            expect(subject.encrypted_omniauth_settings).to be_nil
+          end
+        end
+      end
+
+      describe "encrypted_omniauth_settings" do
+        it "encrypts sensible attributes" do
+          encrypted_settings = subject.encrypted_omniauth_settings
+
+          expect(encrypted_settings["omniauth_settings_facebook_enabled"]).to be(true)
+          expect(
+            Decidim::AttributeEncryptor.decrypt(encrypted_settings["omniauth_settings_facebook_app_id"])
+          ).to eq(facebook_app_id)
+          expect(
+            Decidim::AttributeEncryptor.decrypt(encrypted_settings["omniauth_settings_facebook_app_secret"])
+          ).to eq(facebook_app_secret)
+        end
+      end
+
+      describe "#set_from" do
+        it "concatenates from_label and from_email" do
+          from = subject.set_from
+
+          expect(from).to eq("Decide Gotham <decide@example.org>")
+        end
+
+        context "when from_label is empty" do
+          let(:from_label) { "" }
+
+          it "returns the email" do
+            from = subject.set_from
+
+            expect(from).to eq("decide@example.org")
+          end
+        end
+      end
+
+      describe "smtp_settings" do
+        it "handles SMTP password properly" do
+          expect(subject.smtp_settings).to eq(smtp_settings.except("password"))
+          expect(Decidim::AttributeEncryptor.decrypt(subject.encrypted_smtp_settings[:encrypted_password])).to eq(password)
+        end
+
+        context "when all values are blank" do
+          let(:smtp_settings) do
+            {
+              "address" => "",
+              "port" => "",
+              "user_name" => "",
+              "password" => "",
+              "from_email" => "",
+              "from_label" => ""
+            }
+          end
+
+          it "returns nil" do
+            expect(subject.encrypted_smtp_settings).to be_nil
+          end
+        end
+      end
+    end
+
+    describe "validations" do
+      describe "organization_admin_email" do
+        context "when organization_admin_email is blank" do
+          before { subject.organization_admin_email = "" }
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error" do
+            subject.valid?
+            expect(subject.errors[:organization_admin_email]).to include("cannot be blank")
+          end
+        end
+
+        context "when organization_admin_email is nil" do
+          before { subject.organization_admin_email = nil }
+
+          it { is_expected.not_to be_valid }
+        end
+      end
+
+      describe "organization_admin_name" do
+        context "when organization_admin_name is blank" do
+          before { subject.organization_admin_name = "" }
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error" do
+            subject.valid?
+            expect(subject.errors[:organization_admin_name]).to include("cannot be blank")
+          end
+        end
+
+        context "when organization_admin_name is nil" do
+          before { subject.organization_admin_name = nil }
+
+          it { is_expected.not_to be_valid }
+        end
+      end
+
+      describe "name" do
+        context "when name is blank" do
+          before { subject.name = "" }
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error" do
+            subject.valid?
+            expect(subject.errors[:name]).to include("cannot be blank")
+          end
+        end
+
+        context "when name is nil" do
+          before { subject.name = nil }
+
+          it { is_expected.not_to be_valid }
+        end
+      end
+
+      describe "short_name" do
+        context "when short_name is blank" do
+          before { subject.short_name = "" }
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error" do
+            subject.valid?
+            expect(subject.errors[:short_name]).to include("cannot be blank")
+          end
+        end
+
+        context "when short_name is nil" do
+          before { subject.short_name = nil }
+
+          it { is_expected.not_to be_valid }
+        end
+
+        context "when short_name is too short" do
+          before { subject.short_name = "AB" }
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error" do
+            subject.valid?
+            expect(subject.errors[:short_name]).to include("is too short (under 3 characters)")
+          end
+        end
+
+        context "when short_name is too long" do
+          before { subject.short_name = "A" * 13 }
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error" do
+            subject.valid?
+            expect(subject.errors[:short_name]).to include("is too long (maximum is 12 characters)")
+          end
+        end
+
+        context "when short_name has minimum valid length" do
+          before { subject.short_name = "ABC" }
+
+          it { is_expected.to be_valid }
+        end
+
+        context "when short_name has maximum valid length" do
+          before { subject.short_name = "A" * 12 }
+
+          it { is_expected.to be_valid }
+        end
+      end
+
+      describe "reference_prefix" do
+        context "when reference_prefix is blank" do
+          before { subject.reference_prefix = "" }
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error" do
+            subject.valid?
+            expect(subject.errors[:reference_prefix]).to include("cannot be blank")
+          end
+        end
+
+        context "when reference_prefix is nil" do
+          before { subject.reference_prefix = nil }
+
+          it { is_expected.not_to be_valid }
+        end
+      end
+
+      describe "available_locales" do
+        context "when available_locales is blank" do
+          before { subject.available_locales = [] }
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error" do
+            subject.valid?
+            expect(subject.errors[:available_locales]).to include("cannot be blank")
+          end
+        end
+
+        context "when available_locales is nil" do
+          before { subject.available_locales = nil }
+
+          it { is_expected.not_to be_valid }
+        end
+      end
+
+      describe "default_locale" do
+        context "when default_locale is blank" do
+          before { subject.default_locale = "" }
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error" do
+            subject.valid?
+            expect(subject.errors[:default_locale]).to include("cannot be blank")
+          end
+        end
+
+        context "when default_locale is nil" do
+          before { subject.default_locale = nil }
+
+          it { is_expected.not_to be_valid }
+        end
+
+        context "when default_locale is not included in available_locales" do
+          before do
+            subject.available_locales = %w(en es)
+            subject.default_locale = "fr"
+          end
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error" do
+            subject.valid?
+            expect(subject.errors[:default_locale]).to include("is not included in the list")
+          end
+        end
+
+        context "when default_locale is included in available_locales" do
+          before do
+            subject.available_locales = %w(en es fr)
+            subject.default_locale = "fr"
+          end
+
+          it { is_expected.to be_valid }
+        end
+      end
+
+      describe "organization uniqueness" do
+        let!(:existing_organization) do
+          create(
+            :organization,
+            name: { en: "Existing City", es: "Ciudad Existente" },
+            host: "existing.example.org"
+          )
+        end
+
+        context "when organization name already exists (case-insensitive)" do
+          before { subject.name = "EXISTING CITY" }
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error" do
+            subject.valid?
+            expect(subject.errors[:name]).to include("has already been taken")
+          end
+        end
+
+        context "when organization name already exists in different locale" do
+          before { subject.name = "Ciudad Existente" }
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error" do
+            subject.valid?
+            expect(subject.errors[:name]).to include("has already been taken")
+          end
+        end
+
+        context "when host already exists" do
+          before { subject.host = "existing.example.org" }
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error" do
+            subject.valid?
+            expect(subject.errors[:host]).to include("has already been taken")
+          end
+        end
+
+        context "when organization name is unique" do
+          before { subject.name = "Unique City" }
+
+          it { is_expected.to be_valid }
+        end
+
+        context "when host is unique" do
+          before { subject.host = "unique.example.org" }
+
+          it { is_expected.to be_valid }
+        end
+      end
+
+      describe "short_name uniqueness" do
+        let!(:existing_organization) do
+          create(
+            :organization,
+            short_name: { en: "ExistingCity", es: "CiudadExistente" }
+          )
+        end
+
+        context "when organization short_name already exists (case-insensitive)" do
+          before { subject.short_name = "EXISTINGCITY" }
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error" do
+            subject.valid?
+            expect(subject.errors[:short_name]).to include("has already been taken")
+          end
+        end
+
+        context "when organization short_name already exists in different locale" do
+          before { subject.short_name = "CiudadExistente" }
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error" do
+            subject.valid?
+            expect(subject.errors[:short_name]).to include("has already been taken")
+          end
+        end
+
+        context "when organization short_name is unique" do
+          before { subject.short_name = "UniqueCity" }
+
+          it { is_expected.to be_valid }
+        end
+      end
+    end
+
+    describe "#map_model" do
+      subject { described_class.from_model(organization) }
+
+      let(:organization) do
+        create(
+          :organization,
+          secondary_hosts: ["foobar.example.org", "foobaz.example.org"],
+          omniauth_settings: {
+            omniauth_settings_facebook_enabled: Decidim::AttributeEncryptor.encrypt(true),
+            omniauth_settings_facebook_app_id: Decidim::AttributeEncryptor.encrypt("foo")
+          },
+          file_upload_settings: {
+            allowed_file_extensions: {
+              default: %w(jpg jpeg),
+              admin: %w(jpg jpeg png),
+              image: %w(jpg jpeg png)
+            },
+            allowed_content_types: {
+              default: %w(image/*),
+              admin: %w(image/*)
+            },
+            maximum_file_size: {
+              default: 7.2,
+              avatar: 2.4
+            }
+          }
+        )
+      end
+
+      it "maps the organization attributes correctly" do
+        expect(subject.secondary_hosts).to eq(organization.secondary_hosts.join("\n"))
+        expect(subject.omniauth_settings).to eq(
+          {
+            "omniauth_settings_facebook_app_id" => "foo",
+            "omniauth_settings_facebook_enabled" => true
+          }
+        )
+        expect(subject.file_upload_settings.final).to eq(
+          {
+            allowed_content_types: { "admin" => %w(image/*), "default" => %w(image/*) },
+            allowed_file_extensions: { "admin" => %w(jpg jpeg png), "default" => %w(jpg jpeg), "image" => %w(jpg jpeg png) },
+            maximum_file_size: { "avatar" => 2.4, "default" => 7.2 }
+          }
+        )
+      end
+    end
+  end
+end
diff --git a/decidim-system/spec/forms/decidim/system/update_organization_form_spec.rb b/decidim-system/spec/forms/decidim/system/update_organization_form_spec.rb
index b4eebaa4b9d70..dd7084e2792f5 100644
--- a/decidim-system/spec/forms/decidim/system/update_organization_form_spec.rb
+++ b/decidim-system/spec/forms/decidim/system/update_organization_form_spec.rb
@@ -7,6 +7,7 @@ module Decidim::System
     subject do
       described_class.new(
         name: { ca: "", en: "Gotham City", es: "" },
+        short_name: { ca: "", en: "GothamCity", es: "" },
         host: "decide.example.org",
         secondary_hosts: "foo.example.org\r\n\r\nbar.example.org",
         reference_prefix: "JKR",
@@ -124,6 +125,470 @@ module Decidim::System
       end
     end
 
+    describe "validations" do
+      describe "organization name presence" do
+        let(:organization) { create(:organization, default_locale: "en") }
+
+        before do
+          subject.id = organization.id
+          allow(subject).to receive(:current_organization).and_return(organization)
+        end
+
+        context "when name in default locale is present" do
+          before { subject.name = { en: "Gotham City" } }
+
+          it { is_expected.to be_valid }
+        end
+
+        context "when name in default locale is blank" do
+          before { subject.name = { en: "" } }
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error to the default locale name attribute" do
+            subject.valid?
+            expect(subject.errors[:name_en]).to include("cannot be blank")
+          end
+        end
+
+        context "when name in default locale is nil" do
+          before { subject.name = { en: nil } }
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error to the default locale name attribute" do
+            subject.valid?
+            expect(subject.errors[:name_en]).to include("cannot be blank")
+          end
+        end
+
+        context "when organization has different default locale" do
+          let(:organization) { create(:organization, default_locale: "es") }
+
+          before do
+            subject.default_locale = "es"
+            subject.name = { es: "" }
+          end
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error to the correct locale name attribute" do
+            subject.valid?
+            expect(subject.errors[:name_es]).to include("cannot be blank")
+          end
+        end
+
+        context "when current_organization is not set" do
+          before do
+            allow(subject).to receive(:current_organization).and_return(nil)
+            subject.send(:"name_#{Decidim.default_locale}=", "")
+          end
+
+          it { is_expected.not_to be_valid }
+
+          it "uses Decidim default locale" do
+            subject.valid?
+            expect(subject.errors[:"name_#{Decidim.default_locale}"]).to include("cannot be blank")
+          end
+        end
+      end
+
+      describe "organization short_name presence" do
+        let(:organization) { create(:organization, default_locale: "en") }
+
+        before do
+          subject.id = organization.id
+          allow(subject).to receive(:current_organization).and_return(organization)
+        end
+
+        context "when short_name in default locale is present" do
+          before { subject.short_name = { en: "GothamCity" } }
+
+          it { is_expected.to be_valid }
+        end
+
+        context "when short_name in default locale is blank" do
+          before { subject.short_name = { en: "" } }
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error to the default locale short_name attribute" do
+            subject.valid?
+            expect(subject.errors[:short_name_en]).to include("cannot be blank")
+          end
+        end
+
+        context "when short_name in default locale is nil" do
+          before { subject.short_name = { en: nil } }
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error to the default locale short_name attribute" do
+            subject.valid?
+            expect(subject.errors[:short_name_en]).to include("cannot be blank")
+          end
+        end
+
+        context "when organization has different default locale" do
+          let(:organization) { create(:organization, default_locale: "es") }
+
+          before do
+            subject.default_locale = "es"
+            subject.short_name = { es: "" }
+          end
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error to the correct locale short_name attribute" do
+            subject.valid?
+            expect(subject.errors[:short_name_es]).to include("cannot be blank")
+          end
+        end
+      end
+
+      describe "short_name format" do
+        context "when short_name is too short in one locale" do
+          before { subject.short_name = { en: "AB", es: "ValidName" } }
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error to the locale with invalid format" do
+            subject.valid?
+            expect(subject.errors[:short_name_en]).to include("is too short (under 3 characters)")
+          end
+        end
+
+        context "when short_name is too long in one locale" do
+          before { subject.short_name = { en: "A" * 13, es: "ValidName" } }
+
+          it { is_expected.not_to be_valid }
+
+          it "adds an error to the locale with invalid format" do
+            subject.valid?
+            expect(subject.errors[:short_name_en]).to include("is too long (maximum is 12 characters)")
+          end
+        end
+
+        context "when short_name is invalid in multiple locales" do
+          before { subject.short_name = { en: "AB", es: "A" * 13 } }
+
+          it { is_expected.not_to be_valid }
+
+          it "adds errors to all locales with invalid format" do
+            subject.valid?
+            expect(subject.errors[:short_name_en]).to include("is too short (under 3 characters)")
+            expect(subject.errors[:short_name_es]).to include("is too long (maximum is 12 characters)")
+          end
+        end
+
+        context "when short_name has minimum valid length" do
+          before { subject.short_name = { en: "ABC" } }
+
+          it { is_expected.to be_valid }
+        end
+
+        context "when short_name has maximum valid length" do
+          before { subject.short_name = { en: "A" * 12 } }
+
+          it { is_expected.to be_valid }
+        end
+
+        context "when short_name is blank in a locale" do
+          before { subject.short_name = { en: "ValidName", es: "" } }
+
+          it "does not add format validation errors for blank values" do
+            subject.valid?
+            expect(subject.errors[:short_name_es]).not_to include("is too short (under 3 characters)")
+          end
+        end
+      end
+
+      describe "organization uniqueness" do
+        let!(:existing_organization) do
+          create(
+            :organization,
+            name: { en: "Existing City", es: "Ciudad Existente" },
+            host: "existing.example.org"
+          )
+        end
+
+        context "when creating a new organization" do
+          context "when organization name already exists (case-insensitive)" do
+            before { subject.name_en = "EXISTING CITY" }
+
+            it { is_expected.not_to be_valid }
+
+            it "adds an error to the name attribute" do
+              subject.valid?
+              expect(subject.errors[:name_en]).to include("has already been taken")
+            end
+          end
+
+          context "when organization name already exists in different locale" do
+            before { subject.name_en = "Ciudad Existente" }
+
+            it { is_expected.not_to be_valid }
+
+            it "adds an error" do
+              subject.valid?
+              expect(subject.errors[:name_en]).to include("has already been taken")
+            end
+          end
+
+          context "when multiple locale names conflict" do
+            before do
+              subject.name_en = "Existing City"
+              subject.name_es = "Ciudad Existente"
+            end
+
+            it { is_expected.not_to be_valid }
+
+            it "adds errors to both locale attributes" do
+              subject.valid?
+              expect(subject.errors[:name_en]).to include("has already been taken")
+              expect(subject.errors[:name_es]).to include("has already been taken")
+            end
+          end
+
+          context "when host already exists" do
+            before { subject.host = "existing.example.org" }
+
+            it { is_expected.not_to be_valid }
+
+            it "adds an error" do
+              subject.valid?
+              expect(subject.errors[:host]).to include("has already been taken")
+            end
+          end
+
+          context "when organization name is unique" do
+            before { subject.name_en = "Unique City" }
+
+            it { is_expected.to be_valid }
+          end
+
+          context "when host is unique" do
+            before { subject.host = "unique.example.org" }
+
+            it { is_expected.to be_valid }
+          end
+        end
+
+        context "when updating an existing organization" do
+          let(:organization_to_update) do
+            create(
+              :organization,
+              name: { en: "My City", es: "Mi Ciudad" },
+              host: "mycity.example.org"
+            )
+          end
+
+          before do
+            subject.id = organization_to_update.id
+          end
+
+          context "when keeping the same name" do
+            before { subject.name_en = "My City" }
+
+            it { is_expected.to be_valid }
+          end
+
+          context "when keeping the same host" do
+            before { subject.host = "mycity.example.org" }
+
+            it { is_expected.to be_valid }
+          end
+
+          context "when changing name to an existing one" do
+            before { subject.name_en = "Existing City" }
+
+            it { is_expected.not_to be_valid }
+
+            it "adds an error" do
+              subject.valid?
+              expect(subject.errors[:name_en]).to include("has already been taken")
+            end
+          end
+
+          context "when changing host to an existing one" do
+            before { subject.host = "existing.example.org" }
+
+            it { is_expected.not_to be_valid }
+
+            it "adds an error" do
+              subject.valid?
+              expect(subject.errors[:host]).to include("has already been taken")
+            end
+          end
+
+          context "when changing name to a unique one" do
+            before { subject.name_en = "Brand New City" }
+
+            it { is_expected.to be_valid }
+          end
+
+          context "when changing host to a unique one" do
+            before { subject.host = "other.example.org" }
+
+            it { is_expected.to be_valid }
+          end
+        end
+
+        context "when name contains machine_translations" do
+          let!(:org_with_translations) do
+            create(
+              :organization,
+              name: {
+                :en => "City",
+                "machine_translations" => { fr: "Ville" }
+              }
+            )
+          end
+
+          context "when new name conflicts with machine translation" do
+            before { subject.name_en = "Ville" }
+
+            it { is_expected.not_to be_valid }
+
+            it "adds an error" do
+              subject.valid?
+              expect(subject.errors[:name_en]).to include("has already been taken")
+            end
+          end
+        end
+
+        context "when name value is a Hash (nested structure)" do
+          before do
+            allow(subject).to receive(:name).and_return({ en: { nested: "value" }, es: "Valid Name" })
+          end
+
+          it "skips Hash values during validation" do
+            expect { subject.valid? }.not_to raise_error
+          end
+        end
+      end
+
+      describe "short_name uniqueness" do
+        let!(:existing_organization) do
+          create(
+            :organization,
+            short_name: { en: "ExistingCity", es: "CiudadExistente" }
+          )
+        end
+
+        context "when creating a new organization" do
+          context "when organization short_name already exists (case-insensitive)" do
+            before { subject.short_name = { en: "EXISTINGCITY" } }
+
+            it { is_expected.not_to be_valid }
+
+            it "adds an error to the short_name attribute" do
+              subject.valid?
+              expect(subject.errors[:short_name_en]).to include("has already been taken")
+            end
+          end
+
+          context "when organization short_name already exists in different locale" do
+            before { subject.short_name = { en: "CiudadExistente" } }
+
+            it { is_expected.not_to be_valid }
+
+            it "adds an error" do
+              subject.valid?
+              expect(subject.errors[:short_name_en]).to include("has already been taken")
+            end
+          end
+
+          context "when multiple locale short_names conflict" do
+            before { subject.short_name = { en: "ExistingCity", es: "CiudadExistente" } }
+
+            it { is_expected.not_to be_valid }
+
+            it "adds errors to both locale attributes" do
+              subject.valid?
+              expect(subject.errors[:short_name_en]).to include("has already been taken")
+              expect(subject.errors[:short_name_es]).to include("has already been taken")
+            end
+          end
+
+          context "when organization short_name is unique" do
+            before { subject.short_name = { en: "UniqueCity" } }
+
+            it { is_expected.to be_valid }
+          end
+        end
+
+        context "when updating an existing organization" do
+          let(:organization_to_update) do
+            create(
+              :organization,
+              short_name: { en: "MyCity", es: "MiCiudad" }
+            )
+          end
+
+          before do
+            subject.id = organization_to_update.id
+          end
+
+          context "when keeping the same short_name" do
+            before { subject.short_name = { en: "My City" } }
+
+            it { is_expected.to be_valid }
+          end
+
+          context "when changing short_name to an existing one" do
+            before { subject.short_name = { en: "ExistingCity" } }
+
+            it { is_expected.not_to be_valid }
+
+            it "adds an error" do
+              subject.valid?
+              expect(subject.errors[:short_name_en]).to include("has already been taken")
+            end
+          end
+
+          context "when changing short_name to a unique one" do
+            before { subject.short_name = { en: "BrandNewCity" } }
+
+            it { is_expected.to be_valid }
+          end
+        end
+
+        context "when short_name contains machine_translations" do
+          let!(:org_with_translations) do
+            create(
+              :organization,
+              short_name: {
+                :en => "City",
+                "machine_translations" => { fr: "Ville" }
+              }
+            )
+          end
+
+          context "when new short_name conflicts with machine translation" do
+            before { subject.short_name = { en: "Ville" } }
+
+            it { is_expected.not_to be_valid }
+
+            it "adds an error" do
+              subject.valid?
+              expect(subject.errors[:short_name_en]).to include("has already been taken")
+            end
+          end
+        end
+
+        context "when short_name value is a Hash (nested structure)" do
+          before do
+            allow(subject).to receive(:short_name).and_return({ en: { nested: "value" }, es: "ValidShortName" })
+          end
+
+          it "skips Hash values during validation" do
+            expect { subject.valid? }.not_to raise_error
+          end
+        end
+      end
+    end
+
     describe "#map_model" do
       subject { described_class.from_model(organization) }
 
diff --git a/decidim-system/spec/system/explore_api_credentials_spec.rb b/decidim-system/spec/system/explore_api_credentials_spec.rb
index 2550d5cc96db4..e41a6cad3729e 100644
--- a/decidim-system/spec/system/explore_api_credentials_spec.rb
+++ b/decidim-system/spec/system/explore_api_credentials_spec.rb
@@ -36,7 +36,7 @@
   end
 
   context "with API users" do
-    let!(:set) { create_list(:api_user, 3, organization: organization) }
+    let!(:set) { create_list(:api_user, 3, organization:) }
     let!(:set1) { create_list(:api_user, 4, organization: organization1) }
 
     before do
diff --git a/decidim-system/spec/system/organizations_spec.rb b/decidim-system/spec/system/organizations_spec.rb
index 38797e01ef510..c3e7c77b4d7da 100644
--- a/decidim-system/spec/system/organizations_spec.rb
+++ b/decidim-system/spec/system/organizations_spec.rb
@@ -42,6 +42,7 @@
 
       it "creates a new organization" do
         fill_in "Name", with: "Citizen Corp"
+        fill_in "Short name", with: "CitizenCorp"
         fill_in "Host", with: "www.example.org"
         fill_in "Secondary hosts", with: "foo.example.org\n\rbar.example.org"
         fill_in "Reference prefix", with: "CCORP"
@@ -78,6 +79,7 @@
 
         it "does not create an organization" do
           fill_in "Name", with: "Citizen Corp"
+          fill_in "Short name", with: "CitizenCorp"
           fill_in "Host", with: "www.example.org"
           fill_in "Reference prefix", with: "CCORP"
           click_on "Create organization & invite admin"
@@ -95,6 +97,7 @@
 
         it "does not create an organization" do
           fill_in "Name", with: "Citizen Corp 2"
+          fill_in "Short name", with: "CitizenCorp2"
           fill_in "Reference prefix", with: "CCORP"
           fill_in "Organization admin name", with: "system@example.org"
 
diff --git a/decidim-templates/app/views/decidim/templates/admin/proposal_answer_templates/index.html.erb b/decidim-templates/app/views/decidim/templates/admin/proposal_answer_templates/index.html.erb
index ec507f7f87220..5ff8ea068a958 100644
--- a/decidim-templates/app/views/decidim/templates/admin/proposal_answer_templates/index.html.erb
+++ b/decidim-templates/app/views/decidim/templates/admin/proposal_answer_templates/index.html.erb
@@ -25,7 +25,7 @@
           <% @templates.each do |template| %>
             <tr data-proposal_answer-id="<%= template.id %>">
               <td data-label="<%= t("template.name", scope: "decidim.models") %>">
-                <%= link_to_if allowed_to?(:update, :template, template: template), translated_attribute(template.name), edit_proposal_answer_template_path(template) %>
+                <%= link_to_if allowed_to?(:update, :template, template:), translated_attribute(template.name), edit_proposal_answer_template_path(template) %>
               </td>
               <td data-label="<%= t(".proposal_state_id") %>">
                 <%= proposal_state(template) %>
diff --git a/decidim-verifications/config/locales/eu.yml b/decidim-verifications/config/locales/eu.yml
index 404efb33755d2..58ec9ac11f5db 100644
--- a/decidim-verifications/config/locales/eu.yml
+++ b/decidim-verifications/config/locales/eu.yml
@@ -182,7 +182,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 aurkitu parte-hartzailerik
+              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 ab4fc7f4411a6..5dc66a492bb15 100644
--- a/decidim-verifications/config/locales/fi-plain.yml
+++ b/decidim-verifications/config/locales/fi-plain.yml
@@ -178,7 +178,7 @@ fi-pl:
               no_user: Käyttäjää ei löytynyt
               success: '%{count} tietueen tuonti onnistui. Tietoja käsitellään parhaillaan. Päivitä tämä sivu muutaman minuutin kuluttua nähdäksesi muutokset.'
             destroy:
-              success: Henkilötietorekisteriin tietue poistettiin.
+              success: Henkilötietorekisterin tietue poistettiin.
             index:
               empty: Henkilötietorekisterissä ei ole tietoja. Käytä %{import_csv} -toimintoa tuodaksesi tiedot järjestelmään CSV-tiedostosta.
               no_sign_in: Ei ole koskaan kirjautunut sisään
diff --git a/decidim-verifications/config/locales/fi.yml b/decidim-verifications/config/locales/fi.yml
index 34655354df782..c5593d8702391 100644
--- a/decidim-verifications/config/locales/fi.yml
+++ b/decidim-verifications/config/locales/fi.yml
@@ -178,7 +178,7 @@ fi:
               no_user: Käyttäjää ei löytynyt
               success: '%{count} tietueen tuonti onnistui. Tietoja käsitellään parhaillaan. Päivitä tämä sivu muutaman minuutin kuluttua nähdäksesi muutokset.'
             destroy:
-              success: Henkilötietorekisteriin tietue poistettiin.
+              success: Henkilötietorekisterin tietue poistettiin.
             index:
               empty: Henkilötietorekisterissä ei ole tietoja. Käytä %{import_csv} -toimintoa tuodaksesi tiedot järjestelmään CSV-tiedostosta.
               no_sign_in: Ei ole koskaan kirjautunut sisään
diff --git a/decidim-verifications/config/locales/pt-BR.yml b/decidim-verifications/config/locales/pt-BR.yml
index b948ec04e95d5..5d6f983ddda57 100644
--- a/decidim-verifications/config/locales/pt-BR.yml
+++ b/decidim-verifications/config/locales/pt-BR.yml
@@ -1,11 +1,17 @@
 pt-BR:
   activemodel:
     attributes:
+      authorization:
+        verification_attachment: Anexo de verificação
+      census_data:
+        file: Arquivo
       config:
         available_methods: Métodos disponíveis
         offline: desligada
         offline_explanation: Instruções para verificação off-line
         online: Conectados
+      confirmation:
+        verification_code: Código de verificação
       id_document_information:
         document_number: Número do documento (com letra)
         document_type: Tipo do documento
@@ -14,6 +20,8 @@ pt-BR:
         document_type: Tipo do seu documento
         user: Usuário
         verification_attachment: Cópia digitalizada do seu documento
+      mobile_phone:
+        mobile_phone_number: Número de telefone celular
       offline_confirmation:
         email: E-mail do usuário
       postal_letter_address:
@@ -23,6 +31,12 @@ pt-BR:
       postal_letter_postage:
         full_address: Endereço completo
         verification_code: Código de verificação
+    errors:
+      models:
+        census_data:
+          attributes:
+            file:
+              malformed: Arquivo de importação malformado, por favor leia as instruções cuidadosamente e certifique-se de que o arquivo é codificado em UTF-8.
   decidim:
     admin:
       menu:
@@ -30,8 +44,13 @@ pt-BR:
           before_date_info: Útil se o processo já começou e você deseja revogar as permissões do processo anterior.
           button: Revogar todos
           button_before: Revogar antes da data
+          destroy:
+            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
         authorization_workflows: Autorizações
     admin_log:
@@ -41,59 +60,166 @@ pt-BR:
         grant_id_documents_offline_verification: "%{user_name} verificado %{resource_name} usando a autorização dos Documentos de Identidade offline"
     authorization_handlers:
       admin:
+        another_dummy_authorization_handler:
+          help:
+            - Um manipulador de autorização de exemplo para que os desenvolvedores possam entender como funciona uma simples verificação.
+            - Destina-se aos desenvolvedores para que eles possam entender como implementar seu próprio sistema de verificação.
+            - Seja verificado introduzindo um número de passaporte começando com "A".
+        csv_census:
+          help:
+            - Administra o upload de um CSV com os emails dos participantes aceitos.
+            - Apenas participantes com um email nesse arquivo CSV podem ser verificados.
+        default:
+          help:
+            - A ajuda do manipulador de autorização não está definida.
+            - Um desenvolvedor precisa definir a ajuda na chave de tradução (i18n) "%{authorization_handler}"
+        dummy_authorization_handler:
+          help:
+            - Um manipulador de autorização de exemplo para que os desenvolvedores possam entender como funciona uma simples verificação.
+            - Destina-se aos desenvolvedores para que eles possam entender como implementar seu próprio sistema de verificação.
+            - Seja verificado introduzindo um número de documento que termine com "X".
+        ephemeral_dummy_authorization_handler:
+          help:
+            - Um exemplo de manipulador de autorização efêmera para que os desenvolvedores possam entender como funciona uma simples verificação.
+            - Destina-se aos desenvolvedores para que eles possam entender como implementar seu próprio sistema de verificação.
+            - É uma cópia do Exemplo de autorização.
+            - Seja verificado introduzindo um número de documento que termine com "X".
         id_documents:
           help:
             - Os usuários preenchem suas informações de identidade e carregam uma cópia do documento.
             - Você preencher as informações presentes na imagem carregada.
             - A informação deve corresponder ao que o usuário preenchido.
-            - 
+            - Se você não consegue ver claramente a informação ou não consegue verificá-la, você pode rejeitar a solicitação e o usuário poderá corrigi-la.
         postal_letter:
           help:
             - Os usuários solicitaram que um código de verificação seja enviado para o endereço.
             - Você envia a carta para seu endereço com o código de verificação.
             - Você marca a carta como enviada.
             - Depois de marcar a carta como enviada, o usuário poderá introduzir o código e ser verificado.
+        sms:
+          help:
+            - Os usuários solicitam que um código de verificação seja enviado para o telefone.
+            - Necessitam de introduzir o código para serem verificados.
+            - Caso não recebam o código, podem solicitá-lo novamente.
       csv_census:
+        explanation: Obtenha a verificação usando o cadastro da organização.
         name: Recenseamento da organização
       direct: Direto
       help: Ajuda
       id_documents:
+        explanation: Faça o 'upload' dos seus documentos de identidade para podermos verificar sua identidade.
         name: Documentos de identidade
       multistep: Múltiplas etapas
       name: Nome
       postal_letter:
+        explanation: Enviaremos uma carta pelos correios com um código que você deverá inserir para podermos verificar seu endereço.
         name: Código por carta postal
     events:
       verifications:
         verify_with_managed_user:
+          email_intro: O participante <a href="%{resource_url}">%{resource_title}</a> tentou verificar-se com os dados de outro participante (<a href="%{managed_user_url}">%{managed_user_name}</a>).
           email_outro: Verifique a <a href="%{conflicts_url}">lista de conflitos das verificações</a> e entre em contato com o participante para verificar seus detalhes e resolver o problema.
           email_subject: Falha na tentativa de verificação contra outro usuário
+          notification_title: O participante <a href="%{resource_path}">%{resource_title}</a> tentou se verificar com os dados de outro participante (<a href="%{managed_user_path}">%{managed_user_name}</a>).
     verifications:
+      admin_log:
+        csv_datum:
+          create: "%{user_name} criou um novo registro de dados do censo com email %{resource_email}"
+          delete: "%{user_name} excluiu o registro de dados do censo com email %{resource_email}"
+          import: "%{user_name} importou %{imported_count} registros do censo"
+          update: "%{user_name} Atualizou o registro de dados do censo com e-mail %{resource_email}"
       authorizations:
         authorization_metadata:
           info: 'Estes são os dados da verificação atual:'
           no_data_stored: Nenhum dado armazenado.
         create:
           error: Ocorreu um erro ao criar a autorização.
+          success: Sua autorização foi concedida com sucesso.
+          transferred: 'Com base na sua autorização, recuperamos os seguintes dados de participação:'
           unconfirmed: Você precisa confirmar seu e-mail para se autorizar.
         destroy:
           error: Ocorreu um erro ao excluir a autorização.
+          success: A autorização foi excluída com sucesso.
         index:
           expired_verification: O código de verificação expirou
+          granted_verification: Verificação concedida
+          introduce_code: Introduzir código
           pending_verification: Verificação pendente
           show_renew_info: Clique para renovar a verificação
+          subscribe: Inscreva-se
+          unauthorized_methods: Métodos de verificação
         new:
           authorize: Enviar
           authorize_with: Verifique com %{authorizer}
+          tos_agreement: Ao verificar sua identidade, você aceita %{link}.
+        onboarding_pending:
+          completed_verifications: Você foi autorizado com sucesso, agora você pode usar %{action} em %{resource_name}
+          granted_verifications: Verificações concedidas
+          onboarding_message_html: Você está quase pronto para %{action} no <strong>%{resource_title}</strong> %{resource_name}. Por favor, verifique sua conta concluindo as seguintes autorizações.
+          pending_admin_approval_verifications: Aguardando verificação e aprovação do administrador
+          pending_verifications: Verificações pendentes
+          unauthorized: Você não tem autorização para %{action} neste recurso
         renew_modal:
           cancel: Cancelar
           continue: Continuar
+          info_renew: Se você deseja atualizar os dados, prossiga com a renovação.
           title: Renovar Verificação
         skip_verification: Você pode ignorar isso por enquanto e %{link}
         start_exploring: comece a explorar
       csv_census:
         admin:
+          actions:
+            confirm_destroy: Tem certeza de que deseja excluir este registro de dados do censo?
+            destroy: Destruir
+            edit: Editar
+          census:
+            create_import:
+              error: Houve um problema na importação do censo.
+              no_user: Nenhum usuário encontrado
+              success: Importamos com sucesso %{count} itens. Estamos processando os dados. Atualize a página em alguns minutos para ver as alterações.
+            destroy:
+              success: Os registros de dados do censo foram excluídos.
+            index:
+              empty: Não existem dados censitários. Utilize %{import_csv} para importar um arquivo CSV.
+              no_sign_in: Nunca entrei na minha conta
+              no_user: Nenhum usuário encontrado
+            last_login:
+              no_sign_in: Nunca entrei na minha conta
+              no_user: Nenhum usuário
+            new_import:
+              errors:
+                email_exists: O endereço de 'e-mail' %{email} já existe na organização %{organization}.
+              example: |
+                john.doe@example.org
+                jane.doe@example.org
+              info: 'Deve ser um arquivo em formato CSV com apenas uma coluna contendo o endereço de e-mail:'
+              submit: Enviar um arquivo
+              title: Importar dados censitários
+              upload_new_census: Faça o 'upload' de um novo censo
+          census_records:
+            create_record:
+              success: Registro de dados do censo adicionado com sucesso. Estamos processando os dados. Atualize a página em alguns minutos para ver as alterações.
+            edit_record:
+              save: Salvar
+              title: Editar registro do censo
+            form:
+              email: Correio eletrônico
+            new_record:
+              save: Salvar
+              title: Adicionar novo registro do censo
+            update_record:
+              invalid: Ocorreu um problema ao atualizar o registro de dados do censo.
+              success: Registro de dados do censo atualizado com sucesso.
           index:
+            add_new_record_button: Adicionar novo registro
+            authorized: Usuário autorizado
+            fields:
+              actions: Ações
+              created_at: Criado Em
+              email: Correio eletrônico
+              user_authorized: Usuário autorizado?
+            import_csv: Importar CSV
+            no_authorized: Usuário não autorizado
             title: Dados do censo atual
           instructions:
             body: Para fazer isso, você deve entrar na administração do sistema e adicionar as autorizações csv_census à organização
@@ -110,6 +236,10 @@ pt-BR:
           user_postal_codes:
             one: A participação é restrita aos usuários com o código postal %{postal_codes} e seu código postal é %{user_postal_code}.
             other: 'A participação é restrita aos usuários com qualquer um dos seguintes códigos postais: %{postal_codes}. Seu código postal é %{user_postal_code}.'
+      errors:
+        invalid_emails: 'Os seguintes endereços de e-mail são inválidos: %{invalid_emails}.'
+        no_emails: O arquivo deve conter e-mails
+        wrong_number_columns: "Esperava-se que a coluna %{expected} estivesse presente, mas foram encontradas colunas %{actual}."
       id_documents:
         admin:
           config:
@@ -118,12 +248,19 @@ pt-BR:
               update: Atualizar
             update:
               error: Houve um erro ao atualizar a configuração.
+              success: Configuração atualizada com sucesso.
           confirmations:
+            create:
+              error: A verificação não corresponde. Tente novamente ou rejeite a verificação para que o participante possa corrigi-la.
+              success: Participante verificado com sucesso.
             new:
               introduce_user_data: Introduza os dados na imagem
               reject: Rejeitar
               verify: Verificar
           offline_confirmations:
+            create:
+              error: A verificação não corresponde. Tente novamente ou peça ao participante para corrigi-la.
+              success: Participante verificado com sucesso.
             new:
               cancel: Cancelar
               introduce_user_data: Introduzir o email do usuário e os dados do documento
@@ -134,47 +271,83 @@ pt-BR:
               offline_verification: Verificação off-line
               title: Verificações pendentes
               verification_number: 'Verificação # %{n}'
+          rejections:
+            create:
+              success: Verificação rejeitada. O participante será solicitado a corrigir seus documentos.
         authorizations:
           choose:
             choose_a_type: 'Por favor, selecione como deseja ser verificado:'
             offline: desligada
             online: Conectados
             title: Confirme-se usando seu documento de identidade
+          create:
+            error: Ocorreu um problema ao enviar seu documento.
+            success: Documento enviado com sucesso.
           edit:
+            being_reviewed: Estamos analisando seus documentos. Sua verificação será concluída em breve.
             offline: Use a verificação off-line
             online: Use a verificação on-line
+            rejection_clarity: Certifique-se de que as informações estejam claramente visíveis na imagem enviada.
+            rejection_correctness: Certifique-se de que as informações inseridas estejam corretas.
+            rejection_notice: Ocorreu um problema com a sua verificação. Por favor, tente novamente.
             send: Solicite novamente a verificação
           new:
             send: Solicitar verificação
             title: Carregue seu documento de identidade
+          update:
+            error: Ocorreu um problema ao reenviar seu documento.
+            success: Documento reenviado com sucesso.
+        identification_number: Número de identificação
         passport: Passaporte
       postal_letter:
         admin:
           pending_authorizations:
             index:
               address: Endereço
+              already_sent: A carta postal já foi enviada e não pode ser marcada novamente como enviada.
               letter_sent_at: Carta enviada em
               mark_as_sent: Marcar como enviado
               not_yet_sent: Ainda não enviado
               title: Verificações contínuas
               username: Nome de usuário
               verification_code: Código de verificação
+          postages:
+            create:
+              error: Erro ao marcar a carta como enviada.
+              success: Carta marcada como enviada com sucesso.
         authorizations:
+          create:
+            error: Houve um problema com sua solicitação.
+            success: Obrigado! Enviaremos um código de verificação para o seu endereço.
           edit:
             send: confirme
+            title: Insira o código de verificação que você recebeu.
+            waiting_for_letter: Enviaremos em breve uma carta para o seu endereço com o seu código de verificação.
           new:
             send: Envie-me uma carta
             title: Solicite seu código de verificação
+          update:
+            error: Seu código de verificação não corresponde ao nosso. Por favor, verifique novamente a carta que lhe enviamos.
+            success: Parabéns! Sua verificação foi concluída com sucesso.
       sms:
         authorizations:
+          create:
+            error: Houve um problema com sua solicitação.
+            success: Obrigado! Enviamos um SMS para o seu celular.
+          destroy:
+            success: O código de verificação foi redefinido com sucesso. Por favor, insira seu número de telefone novamente.
           edit:
             confirm_destroy: Tem certeza de que deseja redefinir o código de verificação?
             destroy: Redefinir código de verificação
+            resend: Não recebeu o código de verificação?
             send: confirme
             title: Introduza o código de verificação recebido
           new:
             send: Envie-me um SMS
             title: Solicite seu código de verificação
+          update:
+            error: Seu código de verificação não corresponde ao nosso. Por favor, verifique novamente o SMS que lhe enviamos.
+            success: Parabéns! Sua verificação foi concluída com sucesso.
   errors:
     messages:
       uppercase_only_letters_numbers: devem ser todas maiúsculas e conter apenas letras e / ou números
diff --git a/decidim-verifications/config/locales/ro-RO.yml b/decidim-verifications/config/locales/ro-RO.yml
index a006fc033353b..be5606d092551 100644
--- a/decidim-verifications/config/locales/ro-RO.yml
+++ b/decidim-verifications/config/locales/ro-RO.yml
@@ -60,14 +60,17 @@ ro:
             - Marcați scrisoarea ca fiind trimisă.
             - Odată ce marcați scrisoarea ca fiind trimisă, participantul va putea introduce codul și va putea fi verificat.
       csv_census:
+        explanation: Obțineți verificarea folosind recensământul organizației.
         name: Recensământul organizației
       direct: Directă
       help: Ajutor
       id_documents:
+        explanation: Încărcați documentele dumneavoastră de identitate pentru a vă putea verifica identitatea.
         name: Documente de identitate
       multistep: Mai multe etape
       name: Nume
       postal_letter:
+        explanation: Vă vom trimite o scrisoare poștală cu un cod pe care va trebui să îl introduceți pentru a vă putea verifica adresa.
         name: Cod primit prin scrisoare poștală
     verifications:
       authorizations:
@@ -121,7 +124,7 @@ ro:
               success: S-au importat cu succes înregistrări. Noi procesăm datele. Reîmprospătați pagina în câteva minute pentru a vedea modificările.
             edit_record:
               save: Salvați
-              title: Editați înregistrarea recensământului
+              title: Modificați înregistrarea recensământului
             form:
               email: Email
             new_record:
@@ -193,7 +196,7 @@ ro:
           edit:
             offline: Folosește verificarea offline
             online: Folosește verificarea online
-            send: Cere verificarea din nou
+            send: Solicitați din nou verificarea
           new:
             send: Cere verificare
             title: Încarcă documentul tău de identitate
@@ -211,17 +214,17 @@ ro:
               verification_code: Cod de verificare
         authorizations:
           edit:
-            send: Confirmă
+            send: Confirmați
           new:
             send: Trimiteți-mi o scrisoare
             title: Cere codul tău de verificare
       sms:
         authorizations:
           edit:
-            confirm_destroy: Sigur dorești să resetezi codul de verificare?
-            destroy: Resetează codul de verificare
-            send: Confirmă
-            title: Introdu codul de verificare primit
+            confirm_destroy: Sigur doriți să resetați codul de verificare?
+            destroy: Resetați codul de verificare
+            send: Confirmați
+            title: Introduceți codul de verificare primit
           new:
             send: Trimite-mi un SMS
             title: Solicitați codul de verificare
diff --git a/decidim-verifications/config/locales/sv.yml b/decidim-verifications/config/locales/sv.yml
index 1a1137abb2827..f59ee4ea2bb2b 100644
--- a/decidim-verifications/config/locales/sv.yml
+++ b/decidim-verifications/config/locales/sv.yml
@@ -143,6 +143,8 @@ sv:
         new:
           authorize: Skicka
           authorize_with: Verifiera med %{authorizer}
+        onboarding_pending:
+          completed_verifications: Du har blivit auktoriserad, nu kan du %{action} i %{resource_name}
         renew_modal:
           cancel: Avbryt
           continue: Fortsätt
diff --git a/decidim-verifications/spec/forms/decidim/verifications/csv_census/admin/census_data_form_spec.rb b/decidim-verifications/spec/forms/decidim/verifications/csv_census/admin/census_data_form_spec.rb
index 9b57f5d711ef0..8baa07d367753 100644
--- a/decidim-verifications/spec/forms/decidim/verifications/csv_census/admin/census_data_form_spec.rb
+++ b/decidim-verifications/spec/forms/decidim/verifications/csv_census/admin/census_data_form_spec.rb
@@ -7,7 +7,7 @@ module Decidim::Verifications::CsvCensus::Admin
     subject { described_class.from_params(file:) }
 
     context "when the file is in invalid format" do
-      let(:file) { Decidim::Dev.test_file("import_participatory_space_private_users_iso8859-1.csv", "text/csv") }
+      let(:file) { Decidim::Dev.test_file("import_members_iso8859-1.csv", "text/csv") }
 
       it { is_expected.not_to be_nil }
     end
diff --git a/docs/modules/configure/pages/environment_variables.adoc b/docs/modules/configure/pages/environment_variables.adoc
index bf796cdf8d132..3c038d4a037bb 100644
--- a/docs/modules/configure/pages/environment_variables.adoc
+++ b/docs/modules/configure/pages/environment_variables.adoc
@@ -777,10 +777,20 @@ Read more about this at xref:services:pdf.adoc[PDF signing] service page.
 |No
 
 | DECIDIM_API_DISCLOSE_SYSTEM_VERSION
-| This Environment variable instructs decidim whether to display or not the exact version of the application. By default, this is set to false to avoid explicit exposure of Decidim version.
+| Instructs the system whether to display or not the exact version of the application. By default, this is set to false to avoid explicit exposure of Decidim version.
 | false
 | No
 
+| DECIDIM_API_ENABLE_ANONYMOUS_INTROSPECTION
+| Allows the system to accept introspection queries, which can lead to a security issue. We recommend avoiding enabling this variable in production environments. When it is disabled, only organization admin users will be able to run introspection queries.
+| false
+| No
+
+| API_SCHEMA_MAX_ALIASES
+| This Environment variable instructs Decidim how many aliases should be allowed in a GraphQL query
+| 5
+| No
+
 |PROPOSALS_PARTICIPATORY_SPACE_HIGHLIGHTED_PROPOSALS_LIMIT
 |Number of proposals to be shown in blocks with highlighted content across different participatory spaces.
 |4
diff --git a/docs/modules/develop/pages/api/authentication.adoc b/docs/modules/develop/pages/api/authentication.adoc
new file mode 100644
index 0000000000000..21235ebd5aebf
--- /dev/null
+++ b/docs/modules/develop/pages/api/authentication.adoc
@@ -0,0 +1,95 @@
+= Authentication with the API
+
+By default, the GraphQL API in Decidim is publically available for read-only operations and it can also be used by external applications to read data from Decidim. If you want to write data over the API, i.e. perform GraphQL mutations, you need first need to authenticate the API user to perform these operations. Otherwise, it is not possible to perform such operations as most such operations are performed as an actual user in Decidim.
+
+More information regarding implementing the API authentication is available in the API documentation of your Decidim instance.
+
+== Signing in to the API
+
+In case you want to use the API as a sign in user to perform mutations representing a user in Decidim, you have two available options for such integrations through the system administration panel:
+
+1. Creating an OAuth application and implementing the OAuth authentication flow for the users of your application. Use this option for participant-facing applications where the participants represent themselves in Decidim through the API.
+2. Creating API credentials and signing in to the API with these credentials to perform the operations as a signed in machine user. Use this option for machine-to-machine automations where there is no real end user interacting with Decidim.
+
+If you only want to test the GraphQL queries as a signed in user, you can use the normal Decidim authentication functionality to sign in and then use the GraphiQL IDE to perform these queries as a signed in user.
+
+== OAuth flow for participant-facing applications
+
+Participant-facing applications where the participants need to interact with Decidim through GraphQL mutations can be integrated using OAuth applications. In order to configure such integration capability from the system administration panel, create a new OAuth application and provide the necessary details for your integration. Note that the "application type" for such applications would typically be "Public". For more information regarding the application types, refer to https://datatracker.ietf.org/doc/html/rfc6749#section-2.1[RFC 6749 Section 2.1. (OAuth client types)].
+
+In order to use the OAuth access tokens to represent the user through the API, please select the following scopes as "Available" scopes for the application:
+
+* `user` - Authenticated users have the ability to represent a logged in user in Decidim
+* `api:read` - Authenticated users have the ability to read data from the API
+* `api:write` - Authenticated users have the ability to write data through the API (in case your external application needs to perform mutations over the API on behalf of the user)
+
+Once configured, you can now use any OAuth authentication library to perform the OAuth authentication flow with your application users and receive an access token to utilize the Decidim API representing the signed in user. Please note that with public OAuth clients especially (and recommended also for confidential clients), you have to use https://datatracker.ietf.org/doc/html/rfc7636[PKCE] with the authorization flow.
+
+Once the OAuth application is created, you can authenticate against it with the following steps:
+
+1. Send the user to perform an OAuth authorization request at Decidim with the required API scopes (`user`, `api:read` and `api:write` if you want to perform mutations over the API). Along with the authorization request, also send the additional parameters required by PKCE (`code_challenge` and `code_challenge_method`).
+2. Receive an OAuth authorization code back to your application's configured redirect URI.
+3. Utilizing the received authorization code, request an OAuth access token from the OAuth token endpoint. Along with the token request, also send the additional parameter required by PKCE `code_verifier`.
+4. The issued token is a JSON Web Token (JWT) when the authorization request contains the defined scopes. This token can be now used to represent the user in further calls to the API by passing the token with its type (`Bearer`) within the HTTP Authorization header with the request to the API.
+
+When doing the requests to the API, you also need to pass the OAuth client ID within the `X-Jwt-Aud` header of the requests in order for the token to be recognized as a valid token for the issued client. Passing the bearer token to the `Authorization` header and the OAuth client ID to the `X-Jwt-Aud` header, you can send the following HTTP request to the API to validate that the token works and the user is recognized as signed in:
+
+```http
+POST /api HTTP/1.1
+Accept: application/json
+Authorization: Bearer token
+Content-Length: 53
+Content-Type: application/json
+Host: DOMAIN
+X-Jwt-Aud: OAUTH_CLIENT_ID
+
+{"query":"{ session { user { id name nickname } } }"}
+```
+
+You should see the user details in the response in case the token is valid and you have configured the API correctly. If the response does not contain the user details, please refer to the Decidim configuration documentation.
+
+Once the interaction with the API is completed, it is recommended to revoke the tokens, which is similar to the user signing out of the application. This can be done utilizing the OAuth revocation endpoint provided by Decidim. After the token is revoked, it is no longer valid and the user has to perform a re-authorization the next time they want to utilize the API.
+
+In case you need tokens with a longer life span, you can either look into the Decidim documentation to extend the validity period of the access tokens or enable refresh tokens for the OAuth application when configuring it. However, note that tokens with longer lifespan can weaken the security of your system and make your application users vulnerable to security threats. Such use cases should be carefully planned and the security concerns should be addressed seriously.
+
+== API credentials flow for machine-to-machine automations
+
+The API credentials represent an administrative user in Decidim that performs administrative tasks on behalf of the end users. This type of integration flows should never live on devices that the participants have access to. These types of integrations are meant for different types of automations, such as transferring proposal answers or meeting reports back to Decidim from an external system automatically, e.g. once a day.
+
+Note that these credentials are highly sensitive and have elevated permissions, so take good care of the system security where you are planning to store these credentials. If these credentials end up in participants' hands, the whole system is compromised and no longer secure. You should always primarily create OAuth integrations where the end users will manually perform the authorization for the application to perform actions on behalf of them.
+
+Once you have validated that this is the correct way for your integration to operate, you can create the API credentials from the system administration panel. You will receive an API key and API secret after creating the credentials. These credentials should be also manually rotated on a regular basis to prevent unauthorized access to the system with these credentials in case they are leaked. The credentials have to be manually rotated in order to prevent external applications breaking because they cannot rotate the credentials themselves and they are typically statically configured for these applications.
+
+Given you have issued the API key and API secret, you can now send a sign in request to the API using these credentials as follows:
+
+```bash
+curl -s -i -H "Content-type: application/x-www-form-urlencoded" \
+  -d "api_user[key]=PASTE_API_KEY_HERE" \
+  -d "api_user[secret]=PASTE_API_SECRET_HERE" \
+  -X POST https://DOMAIN/api/sign_in | grep 'Authorization' | cut -d ' ' -f2-
+```
+
+After running this command, you should see the following string in the console, where `token` is replaced with the access token:
+
+```bash
+Bearer token
+```
+
+This string is passed to the following requests within the HTTP `Authorization` header to represent the user during API calls. You can use the following example query to test it out and confirm that signing in works as expected:
+
+```bash
+curl -w "\n" -H "Content-Type: application/json" \
+  -H "Authorization: Bearer token" \
+  -d '{"query":"{ session { user { id name nickname } } }"}' \
+  -X POST https://DOMAIN/api
+```
+
+You should see the user details in the response in case the token is valid and you have configured the API correctly. If the response does not contain the user details, please refer to the Decidim configuration documentation.
+
+Once the API interaction is done, you should always make an HTTP DELETE request to `/api/sign_out` with the same token in order to revoke the token from further access as follows:
+
+```bash
+curl -s -o /dev/null -w "HTTP %{http_code}\n" \
+  -H "Authorization: Bearer token" \
+  -X DELETE http://DOMAIN/api/sign_out
+```
diff --git a/docs/modules/develop/pages/api/core-concepts.adoc b/docs/modules/develop/pages/api/core-concepts.adoc
new file mode 100644
index 0000000000000..524cd362c84d4
--- /dev/null
+++ b/docs/modules/develop/pages/api/core-concepts.adoc
@@ -0,0 +1,535 @@
+= Core concepts in the API: Decidim structure, Types, collections and Polymorphism
+
+There are no endpoints in the GraphQL specification, instead objects are organized according to their "Type".
+
+These objects can be grouped in a single, complex query. Also, objects may accept parameters, which are "Types" as well.
+
+Each "Type" is just a pre-defined structure with fields, or just an Scalar (Strings, Integers, Booleans, ...).
+
+For instance, to obtain *all the participatory processes in a Decidim installation published since January 2018* and order them by published date, we could execute the next query:
+
+```graphql
+{
+  participatoryProcesses(filter: {publishedSince: "2018-01-01"}, order: {publishedAt: "asc"}) {
+    slug
+    title {
+      translation(locale: "en")
+    }
+  }
+}
+```
+
+Response should look like:
+
+```json
+{
+  "data": {
+    "participatoryProcesses": [
+      {
+        "slug": "consectetur-at",
+        "title": {
+          "translation": "Soluta consectetur quos fugit aut."
+        }
+      },
+      {
+        "slug": "nostrum-earum",
+        "title": {
+          "translation": "Porro hic ipsam cupiditate reiciendis."
+        }
+      }
+    ]
+  }
+}
+```
+
+== What happened?
+
+In the former query, each keyword represents a type, the words `publishedSince`, `publishedAt`, `slug`, `locale` are scalars, all of them Strings.
+
+The other keywords however, are objects representing certain entities:
+
+* `participatoryProcesses` is a type that represents a collection of participatory spaces. It accepts arguments (`filter` and `order`), which are other object types as well. `slug` and `title` are the fields of the participatory process we are interested in, there are "Types" too.
+* `filter` is a https://nightly.decidim.org/api/docs/input_object/participatoryprocessfilter/[ParticipatoryProcessFilter] input type, it has several properties that allows us to refine our search. One of them is the `publishedSince` property with the initial date from which to list entries.
+* `order` is a https://nightly.decidim.org/api/docs/input_object/participatoryprocesssort/[ParticipatoryProcessSort] type, works the same way as the filter but with the goal of ordering the results.
+* `title` is a https://nightly.decidim.org/api/docs/object/translatedfield/[TranslatedField] type, which allows us to deal with multi-language fields.
+
+Finally, note that the returned object is an array, each item of which is a representation of the object we requested.
+
+> \***About how filters and sorting are organized**
+>
+> There are two types of objects to filter and ordering collections in Decidim, they all work in a similar fashion. The type involved in filtering always have the suffix "Filter", for ordering it has the suffix "Sort".
+>
+> The types used to filter participatory spaces are: https://nightly.decidim.org/api/docs/input_object/participatoryprocessfilter/[ParticipatoryProcessFilter], [AssemblyFilter](#AssemblyFilter), and so on.
+>
+> Other collections (or connections) may have their own filters (i.e. https://nightly.decidim.org/api/docs/input_object/componentfilter/[ComponentFilter]).
+>
+> Each filter has its own properties, you should check any object in particular for details. The way they work with multi-languages fields, however, is the same:
+>
+> We can say we have some searchable object with a multi-language field called *title*, and we have a filter that allows us to search through this field. How should it work? Should we look up content for every language in the field? or should we stick to a specific language?
+>
+> In our case, we have decided to search only one particular language of a multi-language field but we let you choose which language to search.
+> If no language is specified, the configured as default in the organization will be used. The keyword to specify the language is `locale`, and it should be provided in the 2 letters ISO 639-1 format (en = English, es = Spanish, ...).
+>
+> Example (this is not a real Decidim query):
+>
+> ```graphql
+>  some_collection(filter: { locale: "en", title: "ideas"}) {
+>    id
+>  }
+> ```
+>
+> The same applies to sorting (https://nightly.decidim.org/api/docs/input_object/participatoryprocesssort/[ParticipatoryProcessSort], [AssemblySort](#AssemblySort), etc.)
+>
+> In this case, the content of the field (*title*) only allows 2 values: *ASC* and *DESC*.
+>
+> Example of ordering alphabetically by the title content in French language:
+>
+> ```graphql
+> some_collection(order: { locale: "en", title: "asc"}) {
+>   id
+> }
+> ```
+>
+> Of course, you can combine both filter and order. Also remember to check availability of this type of behaviour for any particular filter/sort.
+
+== Decidim main types
+
+Decidim has 2 main types of objects through which content is provided. These are Participatory Spaces and Components.
+
+A participatory space is the first level, currently there are 5 officially supported: *Participatory Processes*, *Assemblies*, *Conferences* and *Initiatives*. For each participatory process there will correspond a collection type and a "single item" type.
+
+The previous example uses the collection type for participatory processes. You can try `assemblies`, `conferences`, or `initiatives` for the others. Note that each collection can implement their own filter and order types with different properties.
+
+As an example for a single item query, you can run:
+
+```graphql
+{
+  participatoryProcess(slug: "consectetur-at") {
+    slug
+    title {
+      translation(locale: "en")
+    }
+  }
+}
+```
+
+And the response will be:
+
+```json
+{
+  "data": {
+    "participatoryProcess": {
+      "slug": "consectetur-at",
+      "title": {
+        "translation": "Soluta consectetur quos fugit aut."
+      }
+    }
+  }
+}
+```
+
+== What is different?
+
+First, note that we are querying, in singular, the type `participatoryProcess`, with a different parameter, `slug`\*, (a String). We can use the `id` instead if we know it.
+
+Second, the response is not an Array, it is just the object we requested. We can expect to return `null` if the object is not found.
+
+> \* The `slug` is a convenient way to find a participatory space as is (usually) in the URL.
+>
+> For instance, consider this real case from Barcelona:
+>
+> https://www.decidim.barcelona/processes/patrimonigracia
+>
+> The word `patrimonigracia` indicates the "slug".
+
+== Components
+
+Every participatory space may (and should) have some components. There are 9 official components, these are `Proposals`, `Page`, `Meetings`, `Budgets`, `Surveys`, `Accountability`, `Debates` and `Blog`. Plugins may add their own components.
+
+If you know the `id`\* of a specific component you can obtain it by querying it directly:
+
+```graphql
+{
+  component(id:2) {
+    id
+    name {
+      translation(locale:"en")
+    }
+    __typename
+    participatorySpace {
+      id
+      type
+    }
+  }
+}
+```
+
+Response:
+
+```json
+{
+  "data": {
+    "component": {
+      "id": "2",
+      "name": {
+        "translation": "Meetings"
+      },
+      "__typename": "Meetings",
+      "participatorySpace": {
+        "id": "1",
+        "type": "Decidim::ParticipatoryProcess"
+      }
+    }
+  }
+}
+```
+
+The process is analogue as what has been explained in the case of searching for one specific participatory process.
+
+> \*Note that the `id` of a component is present also in the URL after the letter "f":
+>
+> https://www.decidim.barcelona/processes/patrimonigracia/f/3257/
+>
+> In this case, 3257.
+
+== What about component's collections?
+
+Glad you asked, component's collections cannot be retrieved directly, the are available *in the context* of a participatory space.
+
+For instance, we can query all the components in an particular Assembly as follows:
+
+```graphql
+{
+  assembly(id: 3) {
+    components {
+      id
+      name {
+        translation(locale: "en")
+      }
+      __typename
+    }
+  }
+}
+```
+
+The response will be similar to:
+
+```json
+{
+  "data": {
+    "assembly": {
+      "components": [
+        {
+          "id": "42",
+          "name": {
+            "translation": "Accountability"
+          },
+          "__typename": "Component"
+        },
+        {
+          "id": "38",
+          "name": {
+            "translation": "Meetings"
+          },
+          "__typename": "Meetings"
+        },
+        {
+          "id": "37",
+          "name": {
+            "translation": "Page"
+          },
+          "__typename": "Pages"
+        },
+        {
+          "id": "39",
+          "name": {
+            "translation": "Proposals"
+          },
+          "__typename": "Proposals"
+        }
+      ]
+    }
+  }
+}
+```
+
+We can also apply some filters by using the [ComponentFilter](#ComponentFilter) type. In the next query we would like to *find all the components with geolocation enabled in the assembly with id=2*:
+
+```graphql
+{
+  assembly(id: 2) {
+    components(filter: {withGeolocationEnabled: true}) {
+      id
+      name {
+        translation(locale: "en")
+      }
+      __typename
+    }
+  }
+}
+```
+
+The response:
+
+```json
+{
+  "data": {
+    "assembly": {
+      "components": [
+        {
+          "id": "39",
+          "name": {
+            "translation": "Meetings"
+          },
+          "__typename": "Meetings"
+        }
+      ]
+    }
+  }
+}
+```
+
+Note that, in this case, there is only one component returned, "Meetings". In some cases Proposals can be geolocated too therefore would be returned in this query.
+
+== Polymorphism and connections
+
+Many relationships between tables in Decidim are polymorphic, this means that the related object can belong to different classes and share just a few properties in common.
+
+For instance, components in a participatory space are polymorphic, while the concept of component is generic and all of them share properties like *published date*, *name* or *weight*, they differ in the rest. *Proposals* have the *status* field while *Meetings* have an *agenda*.
+
+Another example are the case of linked resources, these are properties that may link objects of different nature between components or participatory spaces.
+
+In a very simplified way (to know more please refer to the official guide), GraphQL polymorphism is handled through the operator `... on`. You will know when a field is polymorphic because the property `__typename`, which tells you the type of that particular object, will change accordingly.
+
+In the previous examples we have queried for this property:
+
+Response fragment:
+
+```json
+      "components": [
+        {
+          "id": "38",
+          "name": {
+            "translation": "Meetings"
+          },
+          "__typename": "Meetings"
+        }
+```
+
+So, if we want to access the rest of the properties in a polymorphic object, we should do it through the `... on` operator as follows:
+
+```graphql
+{
+  assembly(id: 2) {
+    components {
+      id
+      ... on Proposals {
+
+      }
+    }
+  }
+}
+```
+
+Consider this query:
+
+```graphql
+{
+  assembly(id: 3) {
+    components(filter: {type: "Proposals"}) {
+      id
+      name {
+        translation(locale: "en")
+      }
+      ... on Proposals {
+        proposals(order: {likeCount: "desc"}, first: 2) {
+          edges {
+            node {
+              id
+              likes {
+                name
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+```
+
+The response:
+
+```json
+{
+  "data": {
+    "assembly": {
+      "components": [
+        {
+          "id": "39",
+          "name": {
+            "translation": "Proposals"
+          },
+          "proposals": {
+            "edges": [
+              {
+                "node": {
+                  "id": "35",
+                  "likes": [
+                    {
+                      "name": "Ms. Johnathon Schaefer"
+                    },
+                    {
+                      "name": "Linwood Lakin PhD 3 4 endr1"
+                    },
+                    {
+                      "name": "Gracie Emmerich"
+                    },
+                    {
+                      "name": "Randall Rath 3 4 endr3"
+                    },
+                    {
+                      "name": "Jolene Schmitt MD"
+                    },
+                    {
+                      "name": "Clarence Hammes IV 3 4 endr5"
+                    },
+                    {
+                      "name": "Omar Mayer"
+                    },
+                    {
+                      "name": "Raymundo Jaskolski 3 4 endr7"
+                    }
+                  ]
+                }
+              },
+              {
+                "node": {
+                  "id": "33",
+                  "likes": [
+                    {
+                      "name": "Spring Brakus"
+                    },
+                    {
+                      "name": "Reiko Simonis IV 3 2 endr1"
+                    },
+                    {
+                      "name": "Dr. Jim Denesik"
+                    },
+                    {
+                      "name": "Dr. Mack Schoen 3 2 endr3"
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        }
+      ]
+    }
+  }
+}
+```
+
+== What is going on?
+
+Until the `... on Proposals` line, there is nothing new. We are requesting the *Assembly* participatory space identified by the `id=3`, then listing all its components with the type "Proposals". All the components share the *id* and *name* properties, so we can just add them at the query.
+
+After that, we want content specific from the *Proposals* type. In order to do that we must tell the server that the content we will request shall only be executed if the types matches *Proposals*. We do that by wrapping the rest of the query in the `... on Proposals` clause.
+
+The next line is just a property of the type *Proposals* which is a type of collection called a "connection". A connection works similar as normal collection (such as *components*) but it can handle more complex cases.
+
+Typically, a connection is used to paginate long results, for this purpose the results are not directly available but encapsulated inside the list *edges* in several *node* results. Also there are more arguments available in order to navigate between pages. This are the arguments:
+
+* `first`: Returns the first *n* elements from the list
+* `after`: Returns the elements in the list that come after the specified *cursor*
+* `last`: Returns the last *n* elements from the list
+* `before`: Returns the elements in the list that come before the specified *cursor*
+
+Example:
+
+```graphql
+{
+  assembly(id: 3) {
+    components(filter: {type: "Proposals"}) {
+      id
+      name {
+        translation(locale: "en")
+      }
+      ... on Proposals {
+        proposals(first:2,after:"Mg") {
+          pageInfo {
+            endCursor
+            startCursor
+            hasPreviousPage
+            hasNextPage
+          }
+          edges {
+            node {
+              id
+              likes {
+                name
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+```
+
+Being the response:
+
+```json
+{
+  "data": {
+    "assembly": {
+      "components": [
+        {
+          "id": "39",
+          "name": {
+            "translation": "Proposals"
+          },
+          "proposals": {
+            "pageInfo": {
+              "endCursor": "NA",
+              "startCursor": "Mw",
+              "hasPreviousPage": false,
+              "hasNextPage": true
+            },
+            "edges": [
+              {
+                "node": {
+                  "id": "32",
+                  "likes": []
+                }
+              },
+              {
+                "node": {
+                  "id": "31",
+                  "likes": [
+                    {
+                      "name": "Mr. Nicolas Raynor"
+                    },
+                    {
+                      "name": "Gerry Fritsch PhD 3 1 endr1"
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        }
+      ]
+    }
+  }
+}
+```
+
+As you can see, a part from the *edges* list, you can access to the object *pageInfo* which gives you the information needed to navigate through the different pages.
+
+For more info on how connections work, you can check the official guide:
+
+https://graphql.org/learn/pagination/
+
diff --git a/docs/modules/develop/pages/api/index.adoc b/docs/modules/develop/pages/api/index.adoc
index e485acde910f0..be86a699988d0 100644
--- a/docs/modules/develop/pages/api/index.adoc
+++ b/docs/modules/develop/pages/api/index.adoc
@@ -8,14 +8,76 @@ Documentation for this API is auto-generated in each instance of Decidim, usuall
 
 Accessing that URL will give a full details of all the objects that can be requested and how. It includes the full field types reference. Note that the API can be slightly different for different Decidim instances and versions.
 
-For example, you can see the Decidim demo application API documentation under the following URL:
+== Using the GraphQL API
 
-`https://try.decidim.org/api/docs`
+The GraphQL format is a JSON formatted text that is specified in a query. Response is a JSON object as well. For details about specification check the official https://graphql.org/learn/[GraphQL site].
 
-As an alternative, if you cannot access that URL on your instance you can read about how this work https://github.com/decidim/decidim/blob/develop/decidim-api/docs/usage.md[Using the Decidim GraphQL API].
+Exercise caution when utilizing the output of this API, as it may include HTML that has not been escaped. Take particular care in handling this data, specially if you intend to render it on a webpage.
 
-== Integrating external applications with the API
+For instance, you can check the version of a Decidim installation by using different technologies and languages:
 
-By default, the GraphQL API in Decidim is publically available for read-only operations and it can also be used by external applications to read data from Decidim. If you want to write data over the API, i.e. perform GraphQL mutations, you need first need to authenticate the API user to perform these operations. Otherwise, it is not possible to perform such operations as most such operations are performed as an actual user in Decidim.
+include::develop:partial$api/decidim_version.adoc[]
 
-More information regarding implementing the API authentication is available in the API documentation of your Decidim instance.
+Note that `Content-Type` needs to be specified.
+
+The query can also be used in GraphiQL, in that case you can skip the `"query"` text:
+
+```graphql
+{
+  decidim {
+    version
+  }
+}
+```
+
+Response (formatted) should look something like this:
+
+```json
+{
+  "data": {
+    "decidim": {
+      "version": "0.18.1"
+    }
+  }
+}
+```
+
+The most practical way to experiment with GraphQL, however, is just to use the in-browser IDE GraphiQL. It provides access to the documentation and auto-complete (use CTRL-Space) for writing queries.
+
+From now on, we will skip the "query" keyword for the purpose of readability. You can skip it too if you are using GraphiQL, if you are querying directly (by using CURL for instance) you will need to include it.
+
+** xref:develop:api/authentication.adoc[Authentication]
+** xref:develop:api/core-concepts.adoc[Core concepts]
+** xref:develop:api/reference/errors.adoc[Error Handling]
+*** xref:develop:api/reference/errors/permission_not_set.adoc[Permission Not Set Error - PERMISSION_NOT_SET_ERROR]
+*** xref:develop:api/reference/errors/unauthorized_field.adoc[Unauthorized Field Error - UNAUTHORIZED_FIELD_ERROR]
+*** xref:develop:api/reference/errors/unauthorized_mutation.adoc[Unauthorized Mutation Error - MUTATION_NOT_AUTHORIZED_ERROR]
+*** xref:develop:api/reference/errors/not_found.adoc[Not Found Error - NOT_FOUND_ERROR]
+*** xref:develop:api/reference/errors/validation_error.adoc[Validation Error - VALIDATION_ERROR]
+*** xref:develop:api/reference/errors/attribute_validation_error.adoc[Attribute Validation Error - ATTRIBUTE_VALIDATION_ERROR]
+*** xref:develop:api/reference/errors/locale_error.adoc[Locale Error - LOCALE_ERROR]
+*** xref:develop:api/reference/errors/invalid_locale_error.adoc[Invalid Locale Error - INVALID_LOCALE_ERROR]
+** API reference by module
+*** Spaces
+*** Components
+**** xref:develop:api/reference/components/debates.adoc[Debates]
+***** xref:develop:api/reference/components/debates/create.adoc[Create Debate]
+***** xref:develop:api/reference/components/debates/update.adoc[Update Debate]
+***** xref:develop:api/reference/components/debates/close.adoc[Close Debate]
+**** xref:develop:api/reference/components/meetings.adoc[Meetings]
+***** xref:develop:api/reference/components/meetings/create.adoc[Create Meeting]
+***** xref:develop:api/reference/components/meetings/update.adoc[Update Meeting]
+***** xref:develop:api/reference/components/meetings/withdraw.adoc[Withdraw Meeting]
+***** xref:develop:api/reference/components/meetings/close.adoc[Close Meeting]
+**** xref:develop:api/reference/components/proposals.adoc[Proposals]
+***** xref:develop:api/reference/components/proposals/create.adoc[Create Proposal]
+***** xref:develop:api/reference/components/proposals/update.adoc[Update Proposal]
+***** xref:develop:api/reference/components/proposals/withdraw.adoc[Withdraw Proposal]
+***** xref:develop:api/reference/components/proposals/vote.adoc[Vote Proposal]
+***** xref:develop:api/reference/components/proposals/answer.adoc[Answer Proposal]
+
+== Usage limits
+
+Decidim is just a Rails application, meaning that any particular installation may implement custom limits in order to access the API (and the application in general).
+
+By default (particular installations may change that), API uses the same limitations as the whole Decidim website, provided by the Gem https://github.com/kickstarter/rack-attack[Rack::Attack]. These are 100 maximum requests per minute per IP to prevent DoS attacks
diff --git a/docs/modules/develop/pages/api/reference/components/debates.adoc b/docs/modules/develop/pages/api/reference/components/debates.adoc
new file mode 100644
index 0000000000000..5bfb0957be4fb
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/components/debates.adoc
@@ -0,0 +1,9 @@
+= Debates
+
+In the debates module we are providing a few mutations that we find useful for day-to-day management of Decidim instance outside the admin.
+
+== For user/participants roles
+
+* xref:develop:api/reference/components/debates/create.adoc[Create Debate]
+* xref:develop:api/reference/components/debates/update.adoc[Update Debate]
+* xref:develop:api/reference/components/debates/close.adoc[Close Debate]
diff --git a/docs/modules/develop/pages/api/reference/components/debates/close.adoc b/docs/modules/develop/pages/api/reference/components/debates/close.adoc
new file mode 100644
index 0000000000000..fe01c4ebba000
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/components/debates/close.adoc
@@ -0,0 +1,48 @@
+= Close Debate
+
+To use the API to close any debate that the user has created, you will need to use the following API request.
+
+[source,graphql]
+----
+mutation closeDebate($componentId: ID!, $debateId: ID!, $input: CloseDebateInput!){
+  component(id: $componentId) {
+    ...on DebatesMutation{
+      debate(id: $debateId) {
+        close(input: $input) {
+          id
+          title {
+            translation(locale: "en")
+          }
+          conclusions {
+            translation(locale: "en")
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+Example of submitted variables
+
+[source,json]
+----
+{
+  "componentId": "9",
+  "debateId": "2",
+  "input": {
+    "locale": "en",
+    "attributes": {
+      "conclusions": "Your closing report"
+    }
+  }
+}
+----
+
+== Error Handling
+
+The most frequent errors that can be generated by this mutation are as follows:
+
+* xref:develop:api/reference/errors/unauthorized_mutation.adoc[Unauthorized Mutation Error - MUTATION_NOT_AUTHORIZED_ERROR]
+* xref:develop:api/reference/errors/attribute_validation_error.adoc[Attribute Validation Error - ATTRIBUTE_VALIDATION_ERROR]
+* xref:develop:api/reference/errors/unauthorized_object.adoc[Unauthorized Object Error - UNAUTHORIZED_OBJECT_ERROR]
diff --git a/docs/modules/develop/pages/api/reference/components/debates/create.adoc b/docs/modules/develop/pages/api/reference/components/debates/create.adoc
new file mode 100644
index 0000000000000..9b8c5c480c364
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/components/debates/create.adoc
@@ -0,0 +1,58 @@
+= Create Debate
+== Input attributes
+
+When you want to add or create data in your debates component, you need to rely on the `DebateAttributes` type, which has the following input fields:
+
+[source]
+----
+• title                 (required) - String
+• description           (required) - String
+• taxonomies            (optional) - Taxonomy ids to assign to this debate
+----
+
+== Sample request
+
+The `CreateDebate` mutation allows authenticated users to create new debates in a Decidim debates component. This mutation uses the existing `CreateDebate` command from the controller.
+
+[source,graphql]
+----
+mutation createDebate($componentId: ID!, $input: CreateDebateInput!){
+  component(id: $componentId) {
+    ...on DebatesMutation{
+      createDebate(input: $input) {
+        id
+        title { translation(locale: "en") }
+        description { translation(locale: "en") }
+        taxonomies {
+          name { translation(locale: "en") }
+        }
+      }
+    }
+  }
+}
+----
+
+Example of submitted variables
+
+[source,json]
+----
+{
+  "componentId": 5,
+  "input": {
+    "locale": "en",
+    "attributes": {
+      "description": "Cities need more people, not more cars",
+      "taxonomies": [11],
+      "title": "More sidewalks and less roads"
+    }
+  }
+}
+----
+
+== Error Handling
+
+The most frequent errors that can be generated by this mutation are as follows:
+
+* xref:develop:api/reference/errors/unauthorized_mutation.adoc[Unauthorized Mutation Error - MUTATION_NOT_AUTHORIZED_ERROR]
+* xref:develop:api/reference/errors/attribute_validation_error.adoc[Attribute Validation Error - ATTRIBUTE_VALIDATION_ERROR]
+* xref:develop:api/reference/errors/unauthorized_object.adoc[Unauthorized Object Error - UNAUTHORIZED_OBJECT_ERROR]
diff --git a/docs/modules/develop/pages/api/reference/components/debates/update.adoc b/docs/modules/develop/pages/api/reference/components/debates/update.adoc
new file mode 100644
index 0000000000000..9236618cb7628
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/components/debates/update.adoc
@@ -0,0 +1,63 @@
+= Update Debate
+
+== Input attributes
+
+When you want to update data in your debates component, you need to rely on the `DebateAttributes` type, which has the following input fields:
+
+[source]
+----
+• title                 (required) - String
+• description           (required) - String
+• taxonomies            (optional) - Taxonomy ids to assign to this debate
+----
+
+== Sample request
+
+The `UpdateDebate` mutation allows authenticated users to update debates in a Decidim debates component. This mutation uses the existing `UpdateDebate` command from the controller.
+
+[source,graphql]
+----
+mutation updateDebate($componentId: ID!,$debateId: ID!, $input: UpdateDebateInput!){
+  component(id: $componentId) {
+    ...on DebatesMutation{
+      debate(id: $debateId){
+        update(input: $input) {
+          id
+          title { translation(locale: "en") }
+          description { translation(locale: "en") }
+          taxonomies {
+            name { translation(locale: "en") }
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+Example of submitted variables
+
+[source,json]
+----
+{
+  "componentId": "5",
+  "debateId": "9",
+  "input": {
+    "locale": "en",
+    "attributes": {
+      "description": "Cities need more people, not more cars",
+      "taxonomies": [11],
+      "title": "More sidewalks and less roads"
+    }
+  }
+}
+----
+
+== Error Handling
+
+The most frequent errors that can be generated by this mutation are as follows:
+
+* xref:develop:api/reference/errors/unauthorized_mutation.adoc[Unauthorized Mutation Error - MUTATION_NOT_AUTHORIZED_ERROR]
+* xref:develop:api/reference/errors/attribute_validation_error.adoc[Attribute Validation Error - ATTRIBUTE_VALIDATION_ERROR]
+* xref:develop:api/reference/errors/unauthorized_object.adoc[Unauthorized Object Error - UNAUTHORIZED_OBJECT_ERROR]
+
diff --git a/docs/modules/develop/pages/api/reference/components/meetings.adoc b/docs/modules/develop/pages/api/reference/components/meetings.adoc
new file mode 100644
index 0000000000000..eb9f1079bfd4f
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/components/meetings.adoc
@@ -0,0 +1,10 @@
+= Meetings
+
+In the meetings module we are providing a few mutations that we find useful for day-to-day management of Decidim instance outside the admin.
+
+== For user/participants roles
+
+* xref:develop:api/reference/components/meetings/create.adoc[Create Meeting]
+* xref:develop:api/reference/components/meetings/update.adoc[Update Meeting]
+* xref:develop:api/reference/components/meetings/withdraw.adoc[Withdraw Meeting]
+* xref:develop:api/reference/components/meetings/close.adoc[Close Meeting]
diff --git a/docs/modules/develop/pages/api/reference/components/meetings/close.adoc b/docs/modules/develop/pages/api/reference/components/meetings/close.adoc
new file mode 100644
index 0000000000000..d59c74f43a8d9
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/components/meetings/close.adoc
@@ -0,0 +1,48 @@
+= Close Meeting
+
+To use the API to close any meeting that the user is authorized to close, you will need to use the following API request.
+
+[source,graphql]
+----
+mutation closeMeeting($componentId: ID!, $meetingId: ID!, $input: CloseMeetingInput!){
+  component(id: $componentId) {
+    ...on MeetingsMutation{
+      meeting(id: $meetingId) {
+        close(input: $input) {
+          id
+          closed
+          attendeesCount
+          closingReport { translation(locale: "en") }
+          closedAt
+        }
+      }
+    }
+  }
+}
+----
+
+Example of submitted variables
+
+[source,json]
+----
+{
+  "componentId": "9",
+  "meetingId": "2",
+  "input": {
+    "locale": "en",
+    "attributes": {
+      "closingReport": "Your closing report",
+      "attendeesCount": 12,
+      "proposalIds": ["1","2","3"]
+    }
+  }
+}
+----
+
+== Error Handling
+
+The most frequent errors that can be generated by this mutation are as follows:
+
+* xref:develop:api/reference/errors/unauthorized_mutation.adoc[Unauthorized Mutation Error - MUTATION_NOT_AUTHORIZED_ERROR]
+* xref:develop:api/reference/errors/attribute_validation_error.adoc[Attribute Validation Error - ATTRIBUTE_VALIDATION_ERROR]
+* xref:develop:api/reference/errors/unauthorized_object.adoc[Unauthorized Object Error - UNAUTHORIZED_OBJECT_ERROR]
diff --git a/docs/modules/develop/pages/api/reference/components/meetings/create.adoc b/docs/modules/develop/pages/api/reference/components/meetings/create.adoc
new file mode 100644
index 0000000000000..414e147bbf258
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/components/meetings/create.adoc
@@ -0,0 +1,108 @@
+= Create Meeting
+
+== Input attributes
+
+When you want to add or create data in your meetings component, you need to rely on the `MeetingAttributes` type, which has the following input fields:
+
+[source]
+----
+• address               (optional) - String
+• available_slots       (optional) - Int
+• title                 (required) - String
+• description           (required) - String
+• end_time              (required) - DateTime
+• latitude              (optional) - coordinate
+• longitude             (optional) - coordinate
+• location_hints        (optional) - String
+• location              (optional) - String
+• online_meeting_url    (optional) - String
+• registration_terms    (optional) - String
+• registration_type     (required) - RegistrationTypeType
+• registration_url      (optional) - String
+• registrations_enabled (optional) - Boolean
+• start_time            (required) - DateTime
+• taxonomies            (optional) - Taxonomy ids to assign to this meeting
+• type_of_meeting       (required) - TypeOfMeeting
+----
+
+You may want to check the following input types:
+
+* http://nightly.decidim.org/api/docs/enum/typeofmeetingenum/[TypeOfMeetingEnum]
+* http://nightly.decidim.org/api/docs/enum/registrationtypeenum/[RegistrationTypeEnum]
+* http://nightly.decidim.org/api/docs/enum/iframeembedtypeenum/[IframeEmbedTypeEnum]
+* http://nightly.decidim.org/api/docs/enum/iframeaccesslevelenum/[IframeAccessLevelEnum]
+
+== Sample request
+
+The `CreateMeeting` mutation allows authenticated users to create new meetings in a Decidim meetings component. This mutation uses the existing `CreateMeeting` command from the controller.
+
+[source,graphql]
+----
+mutation createMeeting($componentId: ID!, $input: CreateMeetingInput!){
+  component(id: $componentId) {
+    ...on MeetingsMutation{
+      createMeeting(input: $input) {
+        id
+        title {
+          translation(locale: "en")
+        }
+        description {
+          translation(locale: "en")
+        }
+        address
+        taxonomies{
+          name {
+            translation(locale: "en")
+          }
+          children{
+            name{
+              translation(locale: "en")
+            }
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+Example of submitted variables
+
+[source,json]
+----
+{
+  "componentId": 670,
+  "input": {
+    "locale": "en",
+    "attributes": {
+      "address": "Carrer de la Pau, 1, Barcelona",
+      "availableSlots": 10,
+      "description": "Cities need more people, not more cars",
+      "endTime": "2025-12-24T22:10:22Z",
+      "iframeAccessLevel": "ALL",
+      "iframeEmbedType": "NONE",
+      "latitude": 40.1234,
+      "location": "Somewhere",
+      "locationHints": "Near the main square",
+      "longitude": 2.1234,
+      "onlineMeetingUrl": "https://meets.example.org/abc-def",
+      "registrationTerms": "By registering you agree to the terms and conditions",
+      "registrationType": "ON_THIS_PLATFORM",
+      "registrationUrl": "https://example.org/register",
+      "registrationsEnabled": true,
+      "startTime": "2025-12-24T20:10:22Z",
+      "taxonomies": [1072],
+      "title": "More sidewalks and less roads",
+      "typeOfMeeting": "ONLINE"
+    }
+  }
+}
+----
+
+== Error Handling
+
+The most frequent errors that can be generated by this mutation are as follows:
+
+* xref:develop:api/reference/errors/unauthorized_mutation.adoc[Unauthorized Mutation Error - MUTATION_NOT_AUTHORIZED_ERROR]
+* xref:develop:api/reference/errors/attribute_validation_error.adoc[Attribute Validation Error - ATTRIBUTE_VALIDATION_ERROR]
+* xref:develop:api/reference/errors/unauthorized_object.adoc[Unauthorized Object Error - UNAUTHORIZED_OBJECT_ERROR]
diff --git a/docs/modules/develop/pages/api/reference/components/meetings/update.adoc b/docs/modules/develop/pages/api/reference/components/meetings/update.adoc
new file mode 100644
index 0000000000000..2ec3063c7b021
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/components/meetings/update.adoc
@@ -0,0 +1,95 @@
+= Update Meeting
+
+== Input attributes
+
+When you want to update your meetings component, you need to rely on the `MeetingAttributes` type, which has the following input fields:
+
+[source]
+----
+• address               (optional) - String
+• available_slots       (optional) - Int
+• description           (required) - String
+• end_time              (required) - DateTime
+• latitude              (optional) - coordinate
+• longitude             (optional) - coordinate
+• location_hints        (optional) - String
+• location              (optional) - String
+• online_meeting_url    (optional) - String
+• registration_terms    (optional) - String
+• registration_type     (required) - RegistrationTypeType
+• registration_url      (optional) - String
+• registrations_enabled (optional) - Boolean
+• start_time            (required) - DateTime
+• taxonomies            (optional) - Taxonomy ids to assign to this meeting
+• title                 (required) - String
+• type_of_meeting       (required) - TypeOfMeeting
+----
+
+You may want to check the following input types:
+
+* http://nightly.decidim.org/api/docs/enum/typeofmeetingenum/[TypeOfMeetingEnum]
+* http://nightly.decidim.org/api/docs/enum/registrationtypeenum/[RegistrationTypeEnum]
+* http://nightly.decidim.org/api/docs/enum/iframeembedtypeenum/[IframeEmbedTypeEnum]
+* http://nightly.decidim.org/api/docs/enum/iframeaccesslevelenum/[IframeAccessLevelEnum]
+
+== Sample request
+
+The `UpdateMeeting` mutation allows authenticated users to update meetings in a Decidim meetings component. This mutation uses the existing `UpdateMeeting` command from the controller.
+
+[source,graphql]
+----
+mutation updateMeeting($componentId: ID!, $meetingId: ID!, $input: UpdateMeetingInput!){
+  component(id: $componentId) {
+    ...on MeetingsMutation{
+      meeting(id: $meetingId) {
+        update(input: $input) {
+          id
+          title { translation(locale: "en") }
+        }
+      }
+    }
+  }
+}
+----
+
+Example of submitted variables
+
+[source,json]
+----
+{
+  "componentId": 670,
+  "meetingId": "2",
+  "input": {
+    "locale": "en",
+    "attributes": {
+      "address": "Carrer de la Pau, 1, Barcelona",
+      "availableSlots": 10,
+      "description": "Cities need more people, not more cars",
+      "endTime": "2025-12-24T22:10:22Z",
+      "iframeAccessLevel": "ALL",
+      "iframeEmbedType": "NONE",
+      "latitude": 40.1234,
+      "location": "Somewhere",
+      "locationHints": "Near the main square",
+      "longitude": 2.1234,
+      "onlineMeetingUrl": "https://meets.example.org/abc-def",
+      "registrationTerms": "By registering you agree to the terms and conditions",
+      "registrationType": "ON_THIS_PLATFORM",
+      "registrationUrl": "https://example.org/register",
+      "registrationsEnabled": true,
+      "startTime": "2025-12-24T20:10:22Z",
+      "taxonomies": [1072],
+      "title": "More sidewalks and less roads",
+      "typeOfMeeting": "ONLINE"
+    }
+  }
+}
+----
+
+== Error Handling
+
+The most frequent errors that can be generated by this mutation are as follows:
+
+* xref:develop:api/reference/errors/unauthorized_mutation.adoc[Unauthorized Mutation Error - MUTATION_NOT_AUTHORIZED_ERROR]
+* xref:develop:api/reference/errors/attribute_validation_error.adoc[Attribute Validation Error - ATTRIBUTE_VALIDATION_ERROR]
+* xref:develop:api/reference/errors/unauthorized_object.adoc[Unauthorized Object Error - UNAUTHORIZED_OBJECT_ERROR]
diff --git a/docs/modules/develop/pages/api/reference/components/meetings/withdraw.adoc b/docs/modules/develop/pages/api/reference/components/meetings/withdraw.adoc
new file mode 100644
index 0000000000000..ee7bca36ab5de
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/components/meetings/withdraw.adoc
@@ -0,0 +1,36 @@
+= Withdraw Meeting
+
+To use the API to withdraw any meeting that the user has created, you will need to use the following API request.
+
+[source,graphql]
+----
+mutation withdrawMeeting($componentId: ID!, $meetingId: ID!){
+  component(id: $componentId) {
+    ...on MeetingsMutation{
+      meeting(id: $meetingId) {
+        withdraw(input: {}) {
+          id
+        }
+      }
+    }
+  }
+}
+----
+
+Example of submitted variables
+
+[source,json]
+----
+{
+  "componentId": "9",
+  "meetingId": "2"
+}
+----
+
+== Error Handling
+
+The most frequent errors that can be generated by this mutation are as follows:
+
+* xref:develop:api/reference/errors/unauthorized_mutation.adoc[Unauthorized Mutation Error - MUTATION_NOT_AUTHORIZED_ERROR]
+* xref:develop:api/reference/errors/validation_error.adoc[Validation Error - VALIDATION_ERROR]
+* xref:develop:api/reference/errors/unauthorized_object.adoc[Unauthorized Object Error - UNAUTHORIZED_OBJECT_ERROR]
diff --git a/docs/modules/develop/pages/api/reference/components/proposals.adoc b/docs/modules/develop/pages/api/reference/components/proposals.adoc
new file mode 100644
index 0000000000000..c1173e270092f
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/components/proposals.adoc
@@ -0,0 +1,14 @@
+= Proposals
+
+In the proposals module we are providing a few mutations that we find useful for day-to-day management of Decidim instance outside the admin.
+
+== For user/participants roles
+
+* xref:develop:api/reference/components/proposals/create.adoc[Create Proposal]
+* xref:develop:api/reference/components/proposals/update.adoc[Update Proposal]
+* xref:develop:api/reference/components/proposals/withdraw.adoc[Withdraw Proposal]
+* xref:develop:api/reference/components/proposals/vote.adoc[Vote Proposal]
+
+== For admin roles
+
+* xref:develop:api/reference/components/proposals/answer.adoc[Answer Proposal]
diff --git a/docs/modules/develop/pages/api/proposals/mutations.adoc b/docs/modules/develop/pages/api/reference/components/proposals/answer.adoc
similarity index 67%
rename from docs/modules/develop/pages/api/proposals/mutations.adoc
rename to docs/modules/develop/pages/api/reference/components/proposals/answer.adoc
index 60d14806c4c0c..2dfcb8593e585 100644
--- a/docs/modules/develop/pages/api/proposals/mutations.adoc
+++ b/docs/modules/develop/pages/api/reference/components/proposals/answer.adoc
@@ -1,10 +1,8 @@
-= Proposals
-
-== Answering Proposals
+= Answer Proposal
 
 Allows administrators to answer proposals with a status (accepted, rejected, or evaluating).
 
-This is an example on how to use the Answer Proposal mutation. Please refer to the GraphQL documentation for the available fields:
+This is an example on how to use the `addProposalAnswer` mutation. Please refer to the GraphQL documentation for the available fields:
 
 
 - https://nightly.decidim.org/api/docs/input_object/answerinput/[Answer Input]
@@ -36,8 +34,8 @@ Example of submitted variables
       "state": "accepted",
       "cost": 10.0,
       "answerContent": {
-         "en" => "Some answer in english",
-         "ca" => "Some answer in Catalan"
+         "en": "Some answer in English",
+         "ca": "Some answer in Catalan"
       }
     }
   }
@@ -64,8 +62,8 @@ curl -X POST https://your-decidim-instance.org/api \
             "state": "accepted",
             "cost": 10.0,
             "answerContent": {
-              "en" => "Some answer in english",
-              "ca" => "Some answer in Catalan"
+              "en": "Some answer in English",
+              "ca": "Some answer in Catalan"
             }
           }
         }
@@ -76,10 +74,9 @@ curl -X POST https://your-decidim-instance.org/api \
 
 === Error Handling
 
-When you are not authorized, or when you are not authenticated, the server will respond with a simple:
-```graphql
-{
-  "data": null
-}
-```
+The most frequent errors that can be generated by this mutation are as follows:
 
+* xref:develop:api/reference/errors/unauthorized_mutation.adoc[Unauthorized Mutation Error - MUTATION_NOT_AUTHORIZED_ERROR]
+* xref:develop:api/reference/errors/unauthorized_object.adoc[Unauthorized Object Error - UNAUTHORIZED_OBJECT_ERROR]
+* xref:develop:api/reference/errors/not_found.adoc[Not Found Error - NOT_FOUND_ERROR]
+* xref:develop:api/reference/errors/attribute_validation_error.adoc[Attribute Validation Error - ATTRIBUTE_VALIDATION_ERROR]
diff --git a/docs/modules/develop/pages/api/reference/components/proposals/create.adoc b/docs/modules/develop/pages/api/reference/components/proposals/create.adoc
new file mode 100644
index 0000000000000..a1e770432f04c
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/components/proposals/create.adoc
@@ -0,0 +1,78 @@
+= Create Proposal
+
+== Input attributes
+
+When you want to add or create data in your proposals component, you need to rely on the `ProposalAttributes` type, which has the following input fields:
+
+[source]
+----
+• title       (required) - 15-150 characters
+• body        (required) - minimum 15 characters
+• address     (optional) - physical address (requires geocoding)
+• latitude    (optional) - coordinate
+• longitude   (optional) - coordinate
+• taxonomies  (optional) - Taxonomies ids to assign to this proposal
+----
+
+== Sample request
+
+The `CreateProposal` mutation allows authenticated users to create new proposals in a Decidim proposals component. This mutation delegates to the existing `Decidim::Proposals::CreateProposal` command used by the controllers.
+
+[source,graphql]
+----
+mutation createProposal($componentId: ID!, $input: CreateProposalInput!){
+  component(id: $componentId) {
+    ...on ProposalsMutation{
+      createProposal(input: $input) {
+        id
+        title {
+          translation(locale: "en")
+        }
+        body {
+          translation(locale: "en")
+        }
+        address
+        taxonomies{
+          name {
+            translation(locale: "en")
+          }
+          children{
+            name{
+              translation(locale: "en")
+            }
+          }
+        }
+      }
+    }
+  }
+}
+----
+
+Example of submitted variables
+
+[source,json]
+----
+{
+  "componentId": 9,
+  "input": {
+    "locale": "en",
+    "attributes": {
+      "title": "Install Bike Lanes on Main Street",
+      "body": "We propose adding dedicated bike lanes along Main Street to improve cyclist safety and encourage sustainable transportation.",
+      "address": "Main Street, Barcelona, Spain",
+      "latitude": 41.3851,
+      "longitude": 2.1734
+    }
+  }
+}
+----
+
+== Error Handling
+
+The most frequent errors that can be generated by this mutation are as follows:
+
+* xref:develop:api/reference/errors/unauthorized_mutation.adoc[Unauthorized Mutation Error - MUTATION_NOT_AUTHORIZED_ERROR]
+* xref:develop:api/reference/errors/invalid_locale_error.adoc[Invalid Locale Error - INVALID_LOCALE_ERROR]
+* xref:develop:api/reference/errors/validation_error.adoc[Validation Error - VALIDATION_ERROR]
+* xref:develop:api/reference/errors/attribute_validation_error.adoc[Attribute Validation Error - ATTRIBUTE_VALIDATION_ERROR]
+* xref:develop:api/reference/errors/unauthorized_object.adoc[Unauthorized Object Error - UNAUTHORIZED_OBJECT_ERROR]
diff --git a/docs/modules/develop/pages/api/reference/components/proposals/update.adoc b/docs/modules/develop/pages/api/reference/components/proposals/update.adoc
new file mode 100644
index 0000000000000..5d81fe5c384cf
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/components/proposals/update.adoc
@@ -0,0 +1,66 @@
+= Update Proposal
+
+== Input attributes
+
+When you want to update data in your proposals component, you need to rely on the `ProposalAttributes` type, which has the following input fields:
+
+```
+• title       (required) - 15-150 characters
+• body        (required) - minimum 15 characters
+• address     (optional) - physical address (requires geocoding)
+• latitude    (optional) - coordinate
+• longitude   (optional) - coordinate
+• taxonomies  (optional) - Taxonomies ids to assign to this proposal
+```
+
+== Sample request
+
+The `UpdateProposal` mutation allows authenticated users to update proposals in a Decidim component. This mutation delegates to the existing `Decidim::Proposals::UpdateProposal` command.
+
+[source,graphql]
+----
+mutation updateProposal($componentId: ID!,$proposalId: ID!, $input: UpdateProposalInput!){
+  component(id: $componentId) {
+    ...on ProposalsMutation{
+      proposal(id: $proposalId) {
+        update(input: $input) {
+          id
+          title { translation(locale: "en") }
+          body { translation(locale: "en") }
+        }
+      }
+    }
+  }
+}
+----
+
+Example of submitted variables
+
+[source,json]
+----
+{
+  "componentId": 9,
+  "proposalId": "140",
+  "input": {
+    "locale": "en",
+    "attributes": {
+      "title": "Install Bike Lanes on Main Street",
+      "body": "We propose adding dedicated bike lanes along Main Street to improve cyclist safety and encourage sustainable transportation.",
+      "address": "Main Street, Barcelona, Spain",
+      "latitude": 41.3851,
+      "longitude": 2.1734,
+      "taxonomies": [123, 456]
+    }
+  }
+}
+----
+
+== Error Handling
+
+The most frequent errors that can be generated by this mutation are as follows:
+
+* xref:develop:api/reference/errors/unauthorized_mutation.adoc[Unauthorized Mutation Error - MUTATION_NOT_AUTHORIZED_ERROR]
+* xref:develop:api/reference/errors/invalid_locale_error.adoc[Invalid Locale Error - INVALID_LOCALE_ERROR]
+* xref:develop:api/reference/errors/validation_error.adoc[Validation Error - VALIDATION_ERROR]
+* xref:develop:api/reference/errors/attribute_validation_error.adoc[Attribute Validation Error - ATTRIBUTE_VALIDATION_ERROR]
+* xref:develop:api/reference/errors/unauthorized_object.adoc[Unauthorized Object Error - UNAUTHORIZED_OBJECT_ERROR]
diff --git a/docs/modules/develop/pages/api/reference/components/proposals/vote.adoc b/docs/modules/develop/pages/api/reference/components/proposals/vote.adoc
new file mode 100644
index 0000000000000..a0c1c6c834c90
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/components/proposals/vote.adoc
@@ -0,0 +1,73 @@
+= Vote / Unvote Proposal
+
+== Vote Proposal
+
+To use the API to vote any proposal that is configured to receive votes, you will need to use the following API request.
+
+[source,graphql]
+----
+mutation voteProposal($componentId: ID!, $proposalId: ID!){
+  component(id: $componentId) {
+    ...on ProposalsMutation{
+      proposal(id: $proposalId) {
+        vote(input: {}) {
+        }
+      }
+    }
+  }
+}
+----
+
+Example of submitted variables
+
+[source,json]
+----
+{
+  "componentId": "9",
+  "proposalId": "2"
+}
+----
+
+=== Error Handling
+
+The most frequent errors that can be generated by this mutation are as follows:
+
+* xref:develop:api/reference/errors/unauthorized_mutation.adoc[Unauthorized Mutation Error - MUTATION_NOT_AUTHORIZED_ERROR]
+* xref:develop:api/reference/errors/validation_error.adoc[Validation Error - VALIDATION_ERROR]
+* xref:develop:api/reference/errors/unauthorized_object.adoc[Unauthorized Object Error - UNAUTHORIZED_OBJECT_ERROR]
+
+== Unvote Proposal
+
+To use the API to remove a vote on any proposal that you have already voted, you will need to use the following API request.
+
+[source,graphql]
+----
+mutation unvoteProposal($componentId: ID!, $proposalId: ID!){
+  component(id: $componentId) {
+    ...on ProposalsMutation{
+      proposal(id: $proposalId) {
+        unvote(input: {}) {
+        }
+      }
+    }
+  }
+}
+----
+
+Example of submitted variables
+
+[source,json]
+----
+{
+  "componentId": "9",
+  "proposalId": "2"
+}
+----
+
+=== Error Handling
+
+The most frequent errors that can be generated by this mutation are as follows:
+
+* xref:develop:api/reference/errors/unauthorized_mutation.adoc[Unauthorized Mutation Error - MUTATION_NOT_AUTHORIZED_ERROR]
+* xref:develop:api/reference/errors/validation_error.adoc[Validation Error - VALIDATION_ERROR]
+* xref:develop:api/reference/errors/unauthorized_object.adoc[Unauthorized Object Error - UNAUTHORIZED_OBJECT_ERROR]
diff --git a/docs/modules/develop/pages/api/reference/components/proposals/withdraw.adoc b/docs/modules/develop/pages/api/reference/components/proposals/withdraw.adoc
new file mode 100644
index 0000000000000..45ba2400d4fee
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/components/proposals/withdraw.adoc
@@ -0,0 +1,38 @@
+= Withdraw Proposal
+
+To use the API to withdraw any proposal that the user has created, you will need to use the following API request.
+
+[source,graphql]
+----
+mutation withdrawProposal($componentId: ID!, $proposalId: ID!){
+  component(id: $componentId) {
+    ...on ProposalsMutation{
+      proposal(id: $proposalId) {
+        withdraw(input: {}) {
+          id
+          state
+          withdrawnAt
+        }
+      }
+    }
+  }
+}
+----
+
+Example of submitted variables
+
+[source,json]
+----
+{
+  "componentId": "9",
+  "proposalId": "2"
+}
+----
+
+== Error Handling
+
+The most frequent errors that can be generated by this mutation are as follows:
+
+* xref:develop:api/reference/errors/unauthorized_mutation.adoc[Unauthorized Mutation Error - MUTATION_NOT_AUTHORIZED_ERROR]
+* xref:develop:api/reference/errors/validation_error.adoc[Validation Error - VALIDATION_ERROR]
+* xref:develop:api/reference/errors/unauthorized_object.adoc[Unauthorized Object Error - UNAUTHORIZED_OBJECT_ERROR]
diff --git a/docs/modules/develop/pages/api/reference/errors.adoc b/docs/modules/develop/pages/api/reference/errors.adoc
new file mode 100644
index 0000000000000..1e7a6a3f489d4
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/errors.adoc
@@ -0,0 +1,29 @@
+= Error Handling for the API
+
+Currently, in Decidim we are using some exceptions to handle API responses, aiming to serve both input (receiving data through API) and output (sending data through API).
+
+At the moment there are 4 categories of exceptions that are being handled:
+
+== System Errors
+
+* xref:develop:api/reference/errors/too_many_aliases_error.adoc[Too many aliases error - TOO_MANY_ALIASES_ERROR] - is triggered when your query uses too many aliases.
+* xref:develop:api/reference/errors/recursion_limit_exceeded_error.adoc[Recursion limit error - RECURSION_LIMIT_EXCEEDED_ERROR] - is triggered when your query uses a GraphQL circular reference for more than two times.
+* xref:develop:api/reference/errors/introspection_disabled_error.adoc[Introspection disabled error - INTROSPECTION_DISABLED_ERROR] - is triggered when a user attempts to run introspection and they do not have the required permissions.
+
+== Authorization errors
+
+* xref:develop:api/reference/errors/permission_not_set.adoc[Permission Not Set Error - PERMISSION_NOT_SET_ERROR], is triggered when there is a problem with the authorization layer.
+* xref:develop:api/reference/errors/unauthorized_object.adoc[Unauthorized Object Error - UNAUTHORIZED_OBJECT_ERROR], is triggered when the requesting user does not have access to a certain resource.
+* xref:develop:api/reference/errors/unauthorized_field.adoc[Unauthorized Field Error - UNAUTHORIZED_FIELD_ERROR], is triggered when the requesting user does not have access to a certain field or resource.
+* xref:develop:api/reference/errors/unauthorized_mutation.adoc[Unauthorized Mutation Error - MUTATION_NOT_AUTHORIZED_ERROR], is triggered when the requesting user tries to access a mutation that cannot be accessed.
+
+== Validation errors
+
+* xref:develop:api/reference/errors/not_found.adoc[Not Found Error - NOT_FOUND_ERROR], is triggered when the requested record does not exist in database, or is in a state where you should not have access to it (moderated, belongs to an unpublished component, belongs to a private process where the requesting user does not have access)
+* xref:develop:api/reference/errors/validation_error.adoc[Validation Error - VALIDATION_ERROR], is triggered when the requesting user performs an action that contains an error. This is equivalent to the flash messages displayed on the Website.
+* xref:develop:api/reference/errors/attribute_validation_error.adoc[Attribute Validation Error - ATTRIBUTE_VALIDATION_ERROR], is triggered when the requesting user submits a request to alter a resource that has an error. This is equivalent to the validation errors in the HTTP forms.
+
+== Internationalization errors
+
+* xref:develop:api/reference/errors/locale_error.adoc[Locale Error - LOCALE_ERROR], is triggered when there is a problem with the internationalization, for example, a missing translation, a missing interpolation to the output string
+* xref:develop:api/reference/errors/invalid_locale_error.adoc[Invalid Locale Error - INVALID_LOCALE_ERROR], is triggered when the provided locale is invalid or not supported by the system, for example when an unknown locale code is used or a locale that is not enabled for the current organization
diff --git a/docs/modules/develop/pages/api/reference/errors/attribute_validation_error.adoc b/docs/modules/develop/pages/api/reference/errors/attribute_validation_error.adoc
new file mode 100644
index 0000000000000..01d2f5121e41e
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/errors/attribute_validation_error.adoc
@@ -0,0 +1,38 @@
+= Attribute Validation Error - ATTRIBUTE_VALIDATION_ERROR
+
+This error is triggered when a user submits invalid data into a mutation form. This error is the equivalent of the form validation errors seen in the HTTP version
+
+The JSON response structure is:
+[source, json]
+----
+{
+  "errors": [
+    {
+      "message": [
+        {
+          "path": ["attributes", "title"],
+          "message": "cannot be blank"
+        },
+        {
+          "path": ["attributes", "title"],
+          "message": "is too short (under 15 characters)"}
+      ],
+      "locations": [
+        {
+          "line": 2,
+          "column": 3
+        }
+      ],
+      "path": [
+        "createProposal"
+      ],
+      "extensions": {
+        "code": "ATTRIBUTE_VALIDATION_ERROR"
+      }
+    }
+  ],
+  "data": {
+    "createProposal": null
+  }
+}
+----
diff --git a/docs/modules/develop/pages/api/reference/errors/introspection_disabled_error.adoc b/docs/modules/develop/pages/api/reference/errors/introspection_disabled_error.adoc
new file mode 100644
index 0000000000000..9c3b64a7ac3a8
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/errors/introspection_disabled_error.adoc
@@ -0,0 +1,19 @@
+= Introspection disabled error - INTROSPECTION_DISABLED_ERROR
+
+This error is triggered when a user tries to run introspections, and they do not have the required permissions. By default, Decidim API allows administrators to run introspection queries but restricts them for regular users due to security concerns.
+
+The JSON response structure is:
+
+[source, json]
+----
+{
+  "errors": [
+    {
+      "message": "Introspection is disabled for this request",
+      "extensions": {
+        "code": "INTROSPECTION_DISABLED_ERROR"
+      }
+    }
+  ]
+}
+----
diff --git a/docs/modules/develop/pages/api/reference/errors/invalid_locale_error.adoc b/docs/modules/develop/pages/api/reference/errors/invalid_locale_error.adoc
new file mode 100644
index 0000000000000..bba907120f4ec
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/errors/invalid_locale_error.adoc
@@ -0,0 +1,30 @@
+= Invalid Locale Error - INVALID_LOCALE_ERROR
+
+This error is issued when the user submits or requests content in a language that is not supported by the platform.
+
+The JSON response structure is:
+[source, json]
+----
+{
+  "errors": [
+    {
+      "message": "Invalid locale provided",
+      "locations": [
+        {
+          "line": 2,
+          "column": 3
+        }
+      ],
+      "path": [
+        "createProposal"
+      ],
+      "extensions": {
+        "code": "INVALID_LOCALE_ERROR"
+      }
+    }
+  ],
+  "data": {
+    "createProposal": null
+  }
+}
+----
diff --git a/docs/modules/develop/pages/api/reference/errors/locale_error.adoc b/docs/modules/develop/pages/api/reference/errors/locale_error.adoc
new file mode 100644
index 0000000000000..3ce14da998c19
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/errors/locale_error.adoc
@@ -0,0 +1,30 @@
+= Locale Error - LOCALE_ERROR
+
+This error is triggered when the requested language has any internationalization errors, like missing translation string, bad variable replacement (interpolation), or any other I18n errors.
+
+The JSON response structure is:
+[source, json]
+----
+{
+  "errors": [
+    {
+      "message": "There was an error while internally handling i18n data",
+      "locations": [
+        {
+          "line": 2,
+          "column": 39
+        }
+      ],
+      "path": [
+        "createProposal"
+      ],
+      "extensions": {
+        "code": "LOCALE_ERROR"
+      }
+    }
+  ],
+  "data": {
+    "createProposal": null
+  }
+}
+----
diff --git a/docs/modules/develop/pages/api/reference/errors/not_found.adoc b/docs/modules/develop/pages/api/reference/errors/not_found.adoc
new file mode 100644
index 0000000000000..84f64a4017fc0
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/errors/not_found.adoc
@@ -0,0 +1,30 @@
+= Not Found Error - NOT_FOUND_ERROR
+
+This error is triggered when the requested record does not exist in the database, or is in a state where you should not have access to it (moderated, belongs to an unpublished component, belongs to a private process where the requesting user does not have access). This is equivalent to 404 HTTP Status code.
+
+The JSON response structure is:
+[source, json]
+----
+{
+  "errors": [
+    {
+      "message": "ParticipatoryProcess not found",
+      "extensions": {
+        "code": "NOT_FOUND_ERROR"
+      },
+      "locations": [
+        {
+          "line": 2,
+          "column": 3
+        }
+      ],
+      "path": [
+        "participatoryProcess"
+      ]
+    }
+  ],
+  "data": {
+    "participatoryProcess": null
+  }
+}
+----
diff --git a/docs/modules/develop/pages/api/reference/errors/permission_not_set.adoc b/docs/modules/develop/pages/api/reference/errors/permission_not_set.adoc
new file mode 100644
index 0000000000000..aa1845178b38e
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/errors/permission_not_set.adoc
@@ -0,0 +1,46 @@
+= Permission Not Set Error - PERMISSION_NOT_SET_ERROR
+
+This is an error that should not be seen by end users, as this error is being fired when a request passes through a managed permission handler.
+
+The JSON response structure is:
+[source, json]
+----
+{
+  "errors": [
+    {
+      "message": "Permission has not been set for this Project",
+      "locations": [
+        {
+          "line": 3,
+          "column": 5
+        }
+      ],
+      "path": [
+        "participatoryProcess",
+        "components",
+        0,
+        "budget",
+        "projects",
+        0
+      ],
+      "extensions": {
+        "code": "PERMISSION_NOT_SET_ERROR"
+      }
+    }
+  ],
+  "data": {
+    "participatoryProcess": {
+      "components": [
+        {
+          "id": "3",
+          "budget": {
+            "projects": [
+              null
+            ]
+          }
+        }
+      ]
+    }
+  }
+}
+----
diff --git a/docs/modules/develop/pages/api/reference/errors/recursion_limit_exceeded_error.adoc b/docs/modules/develop/pages/api/reference/errors/recursion_limit_exceeded_error.adoc
new file mode 100644
index 0000000000000..a9e1cf08d95db
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/errors/recursion_limit_exceeded_error.adoc
@@ -0,0 +1,19 @@
+= Recursion limit error - RECURSION_LIMIT_EXCEEDED_ERROR
+
+This error is triggered when your query uses a GraphQL circular reference for more than two times. By default, Decidim API restricts the circular reference calls due to security and performance issues.
+
+The JSON response structure is:
+
+[source, json]
+----
+{
+  "errors": [
+    {
+      "message": "Too many recursions detected in query",
+      "extensions": {
+        "code": "RECURSION_LIMIT_EXCEEDED_ERROR"
+      }
+    }
+  ]
+}
+----
diff --git a/docs/modules/develop/pages/api/reference/errors/too_many_aliases_error.adoc b/docs/modules/develop/pages/api/reference/errors/too_many_aliases_error.adoc
new file mode 100644
index 0000000000000..a28c9cc571d92
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/errors/too_many_aliases_error.adoc
@@ -0,0 +1,23 @@
+= Too many Aliases error - TOO_MANY_ALIASES_ERROR
+
+This error is triggered when your query has too many aliases.
+To avoid this, you should do any of the following:
+
+- Simplify the query
+- If you are unable, ask for the implementer of the instance to change the `API_SCHEMA_MAX_ALIASES` environment variable. (xref:configure:environment_variables.adoc[Environment Variables page])
+
+The JSON response structure is:
+
+[source, json]
+----
+{
+  "errors": [
+    {
+      "message": "Too many aliases used. You have used 51 aliases, but 5 are allowed.",
+      "extensions": {
+        "code": "TOO_MANY_ALIASES_ERROR"
+      }
+    }
+  ]
+}
+----
diff --git a/docs/modules/develop/pages/api/reference/errors/unauthorized_field.adoc b/docs/modules/develop/pages/api/reference/errors/unauthorized_field.adoc
new file mode 100644
index 0000000000000..d159a227e94d2
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/errors/unauthorized_field.adoc
@@ -0,0 +1,30 @@
+= Unauthorized Field Error - UNAUTHORIZED_FIELD_ERROR
+
+This error is triggered when the requesting user does not have access to a certain field, or a certain resource.
+
+The JSON response structure is:
+[source, json]
+----
+{
+  "errors": [
+    {
+      "message": "You cannot view or edit answer field on Answer because you do not have permission",
+      "locations": [
+        {
+          "line": 2,
+          "column": 3
+        }
+      ],
+      "path": [
+        "answer"
+      ],
+      "extensions": {
+        "code": "UNAUTHORIZED_FIELD_ERROR"
+      }
+    }
+  ],
+  "data": {
+    "answer": null
+  }
+}
+----
diff --git a/docs/modules/develop/pages/api/reference/errors/unauthorized_mutation.adoc b/docs/modules/develop/pages/api/reference/errors/unauthorized_mutation.adoc
new file mode 100644
index 0000000000000..26ab12e6cda9b
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/errors/unauthorized_mutation.adoc
@@ -0,0 +1,30 @@
+= Unauthorized Mutation Error - MUTATION_NOT_AUTHORIZED_ERROR
+
+This error is triggered when a user submits a mutation request to a resource they do not have access to.
+
+The JSON response structure is:
+[source, json]
+----
+{
+  "errors": [
+    {
+      "message": "You do not have permission to perform this mutation",
+      "locations": [
+        {
+          "line": 2,
+          "column": 3
+        }
+      ],
+      "path": [
+        "createProposal"
+      ],
+      "extensions": {
+        "code": "MUTATION_NOT_AUTHORIZED_ERROR"
+      }
+    }
+  ],
+  "data": {
+    "createProposal": null
+  }
+}
+----
diff --git a/docs/modules/develop/pages/api/reference/errors/unauthorized_object.adoc b/docs/modules/develop/pages/api/reference/errors/unauthorized_object.adoc
new file mode 100644
index 0000000000000..c63be015ad51e
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/errors/unauthorized_object.adoc
@@ -0,0 +1,30 @@
+= Unauthorized Object Error - UNAUTHORIZED_OBJECT_ERROR
+
+This error is triggered when the requesting user does not have access to a certain resource.
+
+The JSON response structure is:
+[source, json]
+----
+{
+  "errors": [
+    {
+      "message": "You cannot view or edit this Result because you do not have permissions",
+      "locations": [
+        {
+          "line": 2,
+          "column": 3
+        }
+      ],
+      "path": [
+        "vote"
+      ],
+      "extensions": {
+        "code": "UNAUTHORIZED_OBJECT_ERROR"
+      }
+    }
+  ],
+  "data": {
+    "result": null
+  }
+}
+----
diff --git a/docs/modules/develop/pages/api/reference/errors/validation_error.adoc b/docs/modules/develop/pages/api/reference/errors/validation_error.adoc
new file mode 100644
index 0000000000000..d93511c4c60b1
--- /dev/null
+++ b/docs/modules/develop/pages/api/reference/errors/validation_error.adoc
@@ -0,0 +1,30 @@
+= Validation Error - VALIDATION_ERROR
+
+This error is triggered when the requesting user performs an action that contains an error, for example, when the user tries to publish a resource that is already published. This is equivalent to the flash messages displayed on the Website.
+
+The JSON response structure is:
+[source, json]
+----
+{
+  "errors": [
+    {
+      "message": "There was a problem voting the proposal.",
+      "locations": [
+        {
+          "line": 2,
+          "column": 3
+        }
+      ],
+      "path": [
+        "vote"
+      ],
+      "extensions": {
+        "code": "VALIDATION_ERROR"
+      }
+    }
+  ],
+  "data": {
+    "vote": null
+  }
+}
+----
diff --git a/docs/modules/develop/pages/components.adoc b/docs/modules/develop/pages/components.adoc
index 135825f4719d6..809b6cf6c54ea 100644
--- a/docs/modules/develop/pages/components.adoc
+++ b/docs/modules/develop/pages/components.adoc
@@ -47,7 +47,7 @@ Decidim.register_component(:my_component) do |component|
   # along with its hooks, so you can decide to halt the transaction by raising
   # an exception.
   #
-  # Valid hook names are :create and :destroy.
+  # Please refer to the section below to understand the component hooks
   component.on(:create) do |component|
     MyComponent::DoSomething.with(component)
   end
@@ -154,6 +154,72 @@ Each setting should have one or more translation texts related for the admin zon
 * `decidim.components.[component_name].settings.[global|step].[attribute_name]_help`: Additional text with help for the setting use.
 * `decidim.components.[component_name].settings.[global|step].[attribute_name]_readonly`: Additional text for the setting when it is readonly.
 
+
+== Life Cycle
+
+The following hooks are being fired when an action is being done in the admin web interface:
+
+- `:create` - A new component is being created
+- `:publish` - A component is being published
+- `:unpublish` - A component is being unpublished
+- `:update` - A component is being updated
+- `:permission_update` - The component permissions are being changed
+- `:duplicate` - A component is being copied
+
+[source,ruby]
+----
+# :my_component is the unique name of the component that will be globally registered.
+Decidim.register_component(:my_component) do |my_component|
+  my_component.on(:create) do |component|
+    # In the officially provided libraries we are using this hook to create additional required resources, like the default proposal states.
+    MyComponent::DoSomething.with(component)
+  end
+
+  my_component.on(:publish) do |component|
+    # In the officially provided libraries we are using this hook to add items to the search index
+    MyComponent::DoSomething.with(component)
+  end
+
+  my_component.on(:unpublish) do |component|
+    # In the officially provided libraries we are using this hook to remove items from the search index
+    MyComponent::DoSomething.with(component)
+  end
+  my_component.on(:update) do |component|
+    MyComponent::DoSomething.with(component)
+  end
+
+  my_component.on(:permission_update) do |component|
+    MyComponent::DoSomething.with(component)
+  end
+
+  my_component.on(:duplicate) do |new_component, old_component|
+    MyComponent::DoSomething.with(new_component)
+    MyComponent::DoSomethingElse.with(old_component)
+  end
+end
+----
+
+In some cases, you could define your own component hooks like the following:
+
+[source,ruby]
+----
+# :my_component is the unique name of the component that will be globally registered.
+Decidim.register_component(:my_component) do |my_component|
+  my_component.on(:my_action) do |params|
+    MyComponent::DoSomething.with_the(params)
+  end
+end
+----
+
+Then you could call it in your codebase as the following:
+
+[source,ruby]
+----
+# ... Some code that you may have
+@my_resource.component.run_hooks(:my_action, params)
+# ... Some other code you may need
+----
+
 == Fixtures
 
 This sections explains how to add dummy content to a development application.
diff --git a/docs/modules/develop/pages/maintainers/releases.adoc b/docs/modules/develop/pages/maintainers/releases.adoc
index 91d343ad28179..8ddd934c92365 100644
--- a/docs/modules/develop/pages/maintainers/releases.adoc
+++ b/docs/modules/develop/pages/maintainers/releases.adoc
@@ -33,10 +33,7 @@ During this process you will have the instructions on how to follow with the pro
 . Run `git pull && bin/rake release_all`, this will create all the tags, push the commits and tags and release the gems to RubyGems. Be ready for the One Time Password fill for each of the gems.
 . Once all the gems are published:
 .. Re-run the failed generators tests at the release branch.
-.. Always check if there are any pending security CVE's that needs to be published. If there are, add a section header called "Security fixes", and add the relevant information there, like we have done in https://github.com/decidim/decidim/releases/tag/v0.31.0[v0.31.0 release notes]
-.... Add the advisory id
-.... Make sure you change the date, to be 2 months away from release date
-.... Add the date to your calendar to actually publish the CVE's and link them to the Release Notes when that is the case. You can see how the final result looks like at https://github.com/decidim/decidim/releases/tag/v0.29.0[v0.29.0 release notes]
+.. Always check if there are any pending security CVEs that need to be published. If there are, then follow the instructions in the xref:develop:maintainers/security.adoc[Security] page.
 .. Create a new release at this repository, just go to the https://github.com/decidim/decidim/releases[releases page] and create a new one.
 
 Usually, at this point, the release branch is deployed to Metadecidim during, at least, one week to validate the stability of the version.
@@ -64,10 +61,7 @@ NOTE: When you bump the version, the generator tests will fail because the gems
 . Run `git pull && bin/rake release_all`, this will create all the tags, push the commits and tags and release the gems to RubyGems. Be ready for the One Time Password fill for each of the gems.
 . Once all the gems are published:
 .. Re-run the failed generators tests at the release branch.
-.. Always check if there are any pending security CVE's that needs to be published. If there are, add a section header called "Security fixes", and add the relevant information there, like we have done in https://github.com/decidim/decidim/releases/tag/v0.31.0[v0.31.0 release notes]
-.... Add the advisory id
-.... Make sure you change the date, to be 2 months away from release date
-.... Add the date to your calendar to actually publish the CVE's and link them to the Release Notes when that is the case. You can see how the final result looks like at https://github.com/decidim/decidim/releases/tag/v0.29.0[v0.29.0 release notes]
+.. Always check if there are any pending security CVEs that needs to be published. If there are, then follow the instructions in the xref:develop:maintainers/security.adoc[Security] page.
 .. Create a new release at this repository, just go to the https://github.com/decidim/decidim/releases[releases page] and create a new one.
 . Update Decidim's Docker repository as explained in the Docker images section below.
 . Update Crowdin synchronization configuration with GitHub:
@@ -128,11 +122,8 @@ NOTE: When you bump the version, the generator tests will fail because the gems
 . Review, accept and merge the Pull Request.
 . Run `git pull && bin/rake release_all`, this will create all the tags, push the commits and tags and release the gems to RubyGems. Be ready for the One Time Password fill for each of the gems.
 . Once all the gems are published:
- .. Re-run the failed generators tests at the release branch.
- .. Always check if there are any pending security CVE's that needs to be published. If there are, add a section header called "Security fixes", and add the relevant information there, like we have done in https://github.com/decidim/decidim/releases/tag/v0.31.0[v0.31.0 release notes]
- .... Add the advisory id
-.... Make sure you change the date, to be 2 months away from release date
-.... Add the date to your calendar to actually publish the CVE's and link them to the Release Notes when that is the case. You can see how the final result looks like at https://github.com/decidim/decidim/releases/tag/v0.29.0[v0.29.0 release notes]
+.. Re-run the failed generators tests at the release branch.
+.. Always check if there are any pending security CVEs that needs to be published. If there are, then follow the instructions in the xref:develop:maintainers/security.adoc[Security] page.
 .. Create a new release at this repository, just go to the https://github.com/decidim/decidim/releases[releases page] and create a new one.
 . Update Decidim's Docker repository as explained in the Docker images section.
 
diff --git a/docs/modules/develop/pages/maintainers/security.adoc b/docs/modules/develop/pages/maintainers/security.adoc
index 4c65b1d92233d..aff0ef5393bc9 100644
--- a/docs/modules/develop/pages/maintainers/security.adoc
+++ b/docs/modules/develop/pages/maintainers/security.adoc
@@ -7,14 +7,19 @@ This page provides an overview of the security procedures followed by the Mainta
 .. an explanation of the issue, without giving much details about the vulnerability.
 .. the metadata necessary, such as affected releases and severity.
 .. we will not give a step by step explanation on how to exploit the vulnerability.
+.. internally, we leave the instructions for other Maintainers in the comments of the Security Advisory (so it is reproducible, both the bug and the fix when there is any).
 . The issue will be handled privately (on a private fork) until a fix is ready.
 . Once the fix is ready, we will open a PR to the `develop` branch with the fix.
 . We will do the backports to the https://github.com/decidim/decidim/blob/develop/SECURITY.md[supported versions].
 . We will release a new version with the fix.
 . On the Release Notes of the versions with the fix, we will add a note about the vulnerability with a reference to the CVE or the GitHub Security Advisory ID if there is not any ID. See below the `Template for the Release Notes`.
-. We will send a notification to the Decidim Devs Matrix chat room. We will not mention the vulnerability, just that there is a new version with a security fix. See below the `Template for the Decidim Devs chat room message`
+. We will send a notification to the Decidim Devs Matrix chat room. We will not mention the vulnerability, just that there is a new version with a security fix. See below the `Template for the Decidim Devs chat room message`.
 . We will wait the grace period (2 or 4 months depending on the severity) before disclosing the vulnerability.
+. We will add a comment for other Maintainers to keep track of when the Security Advisory will be published. See below the `Template for the Security Advisory messages`.
+. We will update the metadata of the Security Advisory with the versions that have this fix (the "Patched versions" in GitHub UI).
+. We will add to the Internal Decidim calendar the date when the Security Advisory will be published.
 . After the grace period, we will publish the Security Advisory.
+. Once the Security Advisory is published, then the release note message is updated with the link to the published page.
 
 == Template for the Release Notes
 
@@ -50,3 +55,12 @@ XXX
 [1] https://github.com/decidim/decidim/releases/tag/v0.XXX.XXX
 [2] https://github.com/decidim/decidim/blob/develop/SECURITY.md
 ----
+
+== Template for the Security Advisory messages
+
+[source,markdown]
+----
+Two versions with the fix have been published today: v0.XXX.XXX and v0.XXX.XXX.
+
+This security vulnerability will be published on XXX according to our security policy.
+----
diff --git a/docs/modules/develop/partials/api/decidim_version.adoc b/docs/modules/develop/partials/api/decidim_version.adoc
new file mode 100644
index 0000000000000..7c3286b3570a5
--- /dev/null
+++ b/docs/modules/develop/partials/api/decidim_version.adoc
@@ -0,0 +1,102 @@
+
+++++
+<div class="tabs" data-tab-group="language">
+  <div class="tabs-nav">
+    <button class="tabs-nav__button is-active" data-tab="curl">cURL</button>
+    <button class="tabs-nav__button" data-tab="javascript">JavaScript</button>
+    <button class="tabs-nav__button" data-tab="python">Python</button>
+    <button class="tabs-nav__button" data-tab="ruby">Ruby</button>
+  </div>
+  <div class="tabs-content">
+    <div class="tabs-content__panel is-active" data-tab="curl">
+++++
+
+[source,bash]
+----
+curl -sSH "Content-Type: application/json" \
+  -d '{"query": "{ decidim { version } }"}' \
+  https://www.decidim.barcelona/api/
+----
+
+++++
+    </div>
+    <div class="tabs-content__panel" data-tab="javascript">
+++++
+
+[source,javascript]
+----
+const url = "https://www.decidim.barcelona/api/";
+const query = "{ decidim { version } }";
+
+fetch(url, {
+  method: "POST",
+  headers: {
+    "Content-Type": "application/json",
+  },
+  body: JSON.stringify({ query }),
+})
+  .then((response) => response.json())
+  .then((data) => {
+    console.log(data);
+  })
+  .catch((error) => {
+    console.error(error);
+  });
+----
+
+++++
+    </div>
+    <div class="tabs-content__panel" data-tab="python">
+++++
+
+[source,python]
+----
+import requests
+
+url = "https://www.decidim.barcelona/api/"
+query = "{ decidim { version } }"
+
+headers = {
+    "Content-Type": "application/json"
+}
+
+response = requests.post(
+    url,
+    json={"query": query},
+    headers=headers
+)
+
+print(response.json())
+----
+
+++++
+    </div>
+    <div class="tabs-content__panel" data-tab="ruby">
+++++
+
+[source,ruby]
+----
+require "net/http"
+require "uri"
+require "json"
+
+uri = URI.parse("https://www.decidim.barcelona/api/")
+
+http = Net::HTTP.new(uri.host, uri.port)
+http.use_ssl = true
+
+request = Net::HTTP::Post.new(uri.request_uri)
+request["Content-Type"] = "application/json"
+request.body = {
+  query: "{ decidim { version } }"
+}.to_json
+
+response = http.request(request)
+puts JSON.parse(response.body)
+----
+
+++++
+    </div>
+  </div>
+</div>
+++++
diff --git a/docs/modules/install/pages/manual.adoc b/docs/modules/install/pages/manual.adoc
index a8cdc06e545e6..ed282ee57439f 100644
--- a/docs/modules/install/pages/manual.adoc
+++ b/docs/modules/install/pages/manual.adoc
@@ -8,6 +8,7 @@ In order to develop on decidim, you will need:
 * *NodeJS* 22.14.x
 * *Npm* 10.9.x
 * *ImageMagick*
+* *LibVips*
 * *Chrome* browser and https://sites.google.com/a/chromium.org/chromedriver/[chromedriver] (if you need to run specs/tests)
 
 The compatibility between the different versions of the components is the following:
@@ -67,7 +68,7 @@ Next, we need to install the `decidim` gem with its dependencies:
 
 [source,bash]
 ----
-sudo apt install -y libicu-dev imagemagick
+sudo apt install -y libicu-dev imagemagick libvips libvips-tools
 gem install decidim
 ----
 
diff --git a/docs/modules/services/pages/activestorage.adoc b/docs/modules/services/pages/activestorage.adoc
index 6b75c6099d3c8..abc4f36388742 100644
--- a/docs/modules/services/pages/activestorage.adoc
+++ b/docs/modules/services/pages/activestorage.adoc
@@ -47,6 +47,46 @@ Locate the bucket, go into the "Permissions" tab and find the section titled "CO
 
 Read more at https://docs.aws.amazon.com/AmazonS3/latest/userguide/cors.html[Amazon S3 CORS documentation].
 
+==== Public assets
+
+To have public assets in your application, so that you do not rely on the ActiveStorage redirect system, you need to configure your bucket as follows:
+
+1. Go to your AWS S3 console
+2. Select the bucket you are using for uploads
+3. Open the *Permissions* tab
+4. In the *Block public access* section, click *Edit*
+5. Disable all blocking options by *unchecking* every box:
+  - "Block all public access"
+  - "Block public access to buckets and objects granted through new access control lists (ACLs)"
+  - "Block public access to buckets and objects granted through any access control lists (ACLs)"
+  - "Block public access to buckets and objects granted through new public bucket or access point policies"
+  - "Block public and cross-account access to buckets and objects through any public bucket or access point policies"
+6. Click *Save changes*
+7. Still in the *Permissions tab*, locate the *Bucket policy section* and click *Edit*.
+8. Add a bucket policy similar to the example below.
+   - If you are unsure of your bucket’s ARN, you can find it in the Properties tab. For this example, we use  `arn:aws:s3:::your-bucket-name`
+9. Click *Save changes*
+[source,json]
+----
+{
+    "Version": "2012-10-17",
+    "Statement": [
+        {
+            "Sid": "Statement1",
+            "Effect": "Allow",
+            "Principal": "*",
+            "Action": "s3:GetObject",
+            "Resource": "arn:aws:s3:::your-bucket-name/*"
+        }
+    ]
+}
+----
+
+[NOTE]
+====
+If you use any other provider than the default (`local`) you will need to also configure the xref:customize:content_security_policy.adoc[Content security policy]. For the directives "img-src", "media-src", and "connect-src" adding some additional content like https://$YOUR-BUCKET-NAME.s3.$YOUR-AWS-REGION.amazonaws.com/*  (should look like: https://your-bucket-name.s3.eu-west-1.amazonaws.com)
+====
+
 ===  Google Cloud Storage
 
 Google Cloud Storage requires you to use the `gsutil` command line tool to set the CORS policy on your bucket. First you need to know the name of your bucket and then use the following command (replace `your-bucket-name` with the actual name of the bucket):
diff --git a/package-lock.json b/package-lock.json
index 15f3d72490f40..e9155bf9d0aaf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,34 @@
       "dependencies": {
         "@decidim/browserslist-config": "file:packages/browserslist-config",
         "@decidim/core": "file:packages/core",
-        "@decidim/webpacker": "file:packages/webpacker"
+        "@decidim/webpacker": "file:packages/webpacker",
+        "@tiptap/core": "^3.13.0",
+        "@tiptap/extension-blockquote": "^3.13.0",
+        "@tiptap/extension-bold": "^3.13.0",
+        "@tiptap/extension-bullet-list": "^3.13.0",
+        "@tiptap/extension-character-count": "^3.13.0",
+        "@tiptap/extension-code": "^3.13.0",
+        "@tiptap/extension-code-block": "^3.13.0",
+        "@tiptap/extension-document": "^3.13.0",
+        "@tiptap/extension-dropcursor": "^3.13.0",
+        "@tiptap/extension-gapcursor": "^3.13.0",
+        "@tiptap/extension-hard-break": "^3.13.0",
+        "@tiptap/extension-heading": "^3.13.0",
+        "@tiptap/extension-history": "^3.13.0",
+        "@tiptap/extension-horizontal-rule": "^3.13.0",
+        "@tiptap/extension-image": "^3.13.0",
+        "@tiptap/extension-italic": "^3.13.0",
+        "@tiptap/extension-link": "^3.13.0",
+        "@tiptap/extension-list-item": "^3.13.0",
+        "@tiptap/extension-mention": "^3.13.0",
+        "@tiptap/extension-ordered-list": "^3.13.0",
+        "@tiptap/extension-paragraph": "^3.13.0",
+        "@tiptap/extension-strike": "^3.13.0",
+        "@tiptap/extension-text": "^3.13.0",
+        "@tiptap/extension-underline": "^3.13.0",
+        "@tiptap/pm": "^3.13.0",
+        "@tiptap/starter-kit": "^3.13.0",
+        "@tiptap/suggestion": "^3.13.0"
       },
       "devDependencies": {
         "@decidim/dev": "file:packages/dev",
@@ -4923,44 +4950,10 @@
       "license": "MIT"
     },
     "node_modules/@remirror/core-constants": {
-      "version": "2.0.2",
-      "license": "MIT"
-    },
-    "node_modules/@remirror/core-helpers": {
       "version": "3.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "@remirror/core-constants": "^2.0.2",
-        "@remirror/types": "^1.0.1",
-        "@types/object.omit": "^3.0.0",
-        "@types/object.pick": "^1.3.2",
-        "@types/throttle-debounce": "^2.1.0",
-        "case-anything": "^2.1.13",
-        "dash-get": "^1.0.2",
-        "deepmerge": "^4.3.1",
-        "fast-deep-equal": "^3.1.3",
-        "make-error": "^1.3.6",
-        "object.omit": "^3.0.0",
-        "object.pick": "^1.3.0",
-        "throttle-debounce": "^3.0.1"
-      }
-    },
-    "node_modules/@remirror/types": {
-      "version": "1.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "type-fest": "^2.19.0"
-      }
-    },
-    "node_modules/@remirror/types/node_modules/type-fest": {
-      "version": "2.19.0",
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "resolved": "https://registry.npmjs.org/@remirror/core-constants/-/core-constants-3.0.0.tgz",
+      "integrity": "sha512-42aWfPrimMfDKDi4YegyS7x+/0tlzaqwPQCULLanv3DMIlu96KTJR0fM5isWX2UViOqlGnX6YFgqWepcX+XMNg==",
+      "license": "MIT"
     },
     "node_modules/@rollup/plugin-babel": {
       "version": "5.3.1",
@@ -5128,189 +5121,219 @@
       "license": "Apache-2.0"
     },
     "node_modules/@tiptap/core": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.15.3.tgz",
+      "integrity": "sha512-bmXydIHfm2rEtGju39FiQNfzkFx9CDvJe+xem1dgEZ2P6Dj7nQX9LnA1ZscW7TuzbBRkL5p3dwuBIi3f62A66A==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/pm": "^2.0.0"
+        "@tiptap/pm": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-blockquote": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-blockquote/-/extension-blockquote-3.15.3.tgz",
+      "integrity": "sha512-13x5UsQXtttFpoS/n1q173OeurNxppsdWgP3JfsshzyxIghhC141uL3H6SGYQLPU31AizgDs2OEzt6cSUevaZg==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-bold": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-bold/-/extension-bold-3.15.3.tgz",
+      "integrity": "sha512-I8JYbkkUTNUXbHd/wCse2bR0QhQtJD7+0/lgrKOmGfv5ioLxcki079Nzuqqay3PjgYoJLIJQvm3RAGxT+4X91w==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-bullet-list": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-bullet-list/-/extension-bullet-list-3.15.3.tgz",
+      "integrity": "sha512-MGwEkNT7ltst6XaWf0ObNgpKQ4PvuuV3igkBrdYnQS+qaAx9IF4isygVPqUc9DvjYC306jpyKsNqNrENIXcosA==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0"
+        "@tiptap/extension-list": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-character-count": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-character-count/-/extension-character-count-3.15.3.tgz",
+      "integrity": "sha512-V5gdBE2bv/w4JWMB8L80VfUbrJz1aWe0/E0QR++Fm3jqYUxCCtUdJm1kbTbwuNdKT0Jhv9u4+rd3FHX1QaW/Hg==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0",
-        "@tiptap/pm": "^2.0.0"
+        "@tiptap/extensions": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-code": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-code/-/extension-code-3.15.3.tgz",
+      "integrity": "sha512-x6LFt3Og6MFINYpsMzrJnz7vaT9Yk1t4oXkbJsJRSavdIWBEBcoRudKZ4sSe/AnsYlRJs8FY2uR76mt9e+7xAQ==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-code-block": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block/-/extension-code-block-3.15.3.tgz",
+      "integrity": "sha512-q1UB9icNfdJppTqMIUWfoRKkx5SSdWIpwZoL2NeOI5Ah3E20/dQKVttIgLhsE521chyvxCYCRaHD5tMNGKfhyw==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0",
-        "@tiptap/pm": "^2.0.0"
+        "@tiptap/core": "^3.15.3",
+        "@tiptap/pm": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-document": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-document/-/extension-document-3.15.3.tgz",
+      "integrity": "sha512-AC72nI2gnogBuETCKbZekn+h6t5FGGcZG2abPGKbz/x9rwpb6qV2hcbAQ30t6M7H6cTOh2/Ut8bEV2MtMB15sw==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-dropcursor": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-dropcursor/-/extension-dropcursor-3.15.3.tgz",
+      "integrity": "sha512-jGI5XZpdo8GSYQFj7HY15/oEwC2m2TqZz0/Fln5qIhY32XlZhWrsMuMI6WbUJrTH16es7xO6jmRlDsc6g+vJWg==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0",
-        "@tiptap/pm": "^2.0.0"
+        "@tiptap/extensions": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-gapcursor": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-gapcursor/-/extension-gapcursor-3.15.3.tgz",
+      "integrity": "sha512-Kaw0sNzP0bQI/xEAMSfIpja6xhsu9WqqAK/puzOIS1RKWO47Wps/tzqdSJ9gfslPIb5uY5mKCfy8UR8Xgiia8w==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0",
-        "@tiptap/pm": "^2.0.0"
+        "@tiptap/extensions": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-hard-break": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-hard-break/-/extension-hard-break-3.15.3.tgz",
+      "integrity": "sha512-8HjxmeRbBiXW+7JKemAJtZtHlmXQ9iji398CPQ0yYde68WbIvUhHXjmbJE5pxFvvQTJ/zJv1aISeEOZN2bKBaw==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-heading": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-heading/-/extension-heading-3.15.3.tgz",
+      "integrity": "sha512-G1GG6iN1YXPS+75arDpo+bYRzhr3dNDw99c7D7na3aDawa9Qp7sZ/bVrzFUUcVEce0cD6h83yY7AooBxEc67hA==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-history": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-history/-/extension-history-3.15.3.tgz",
+      "integrity": "sha512-nzayl9Iv+lkd6Om9bip8iWSAS8mr/pw2EwOlEAogBueNhVc+VoBKwq3DGnBTbqAddc4g0T7oOtHmmmovBoZduQ==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0",
-        "@tiptap/pm": "^2.0.0"
+        "@tiptap/extensions": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-horizontal-rule": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.15.3.tgz",
+      "integrity": "sha512-FYkN7L6JsfwwNEntmLklCVKvgL0B0N47OXMacRk6kYKQmVQ4Nvc7q/VJLpD9sk4wh4KT1aiCBfhKEBTu5pv1fg==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0",
-        "@tiptap/pm": "^2.0.0"
+        "@tiptap/core": "^3.15.3",
+        "@tiptap/pm": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-image": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-image/-/extension-image-3.15.3.tgz",
+      "integrity": "sha512-Tjq9BHlC/0bGR9/uySA0tv6I1Ua1Q5t5P/mdbWyZi4JdUpKHRfgenzfXF5DYnklJ01QJ7uOPSp9sAGgPzBixtQ==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-italic": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-italic/-/extension-italic-3.15.3.tgz",
+      "integrity": "sha512-6XeuPjcWy7OBxpkgOV7bD6PATO5jhIxc8SEK4m8xn8nelGTBIbHGqK37evRv+QkC7E0MUryLtzwnmmiaxcKL0Q==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-link": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-link/-/extension-link-3.15.3.tgz",
+      "integrity": "sha512-PdDXyBF9Wco9U1x6e+b7tKBWG+kqBDXDmaYXHkFm/gYuQCQafVJ5mdrDdKgkHDWVnJzMWZXBcZjT9r57qtlLWg==",
       "license": "MIT",
       "dependencies": {
         "linkifyjs": "^4.3.2"
@@ -5320,111 +5343,168 @@
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0",
-        "@tiptap/pm": "^2.0.0"
+        "@tiptap/core": "^3.15.3",
+        "@tiptap/pm": "^3.15.3"
+      }
+    },
+    "node_modules/@tiptap/extension-list": {
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.15.3.tgz",
+      "integrity": "sha512-n7y/MF9lAM5qlpuH5IR4/uq+kJPEJpe9NrEiH+NmkO/5KJ6cXzpJ6F4U17sMLf2SNCq+TWN9QK8QzoKxIn50VQ==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/core": "^3.15.3",
+        "@tiptap/pm": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-list-item": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-list-item/-/extension-list-item-3.15.3.tgz",
+      "integrity": "sha512-CCxL5ek1p0lO5e8aqhnPzIySldXRSigBFk2fP9OLgdl5qKFLs2MGc19jFlx5+/kjXnEsdQTFbGY1Sizzt0TVDw==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0"
+        "@tiptap/extension-list": "^3.15.3"
+      }
+    },
+    "node_modules/@tiptap/extension-list-keymap": {
+      "version": "3.13.0",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-list-keymap/-/extension-list-keymap-3.13.0.tgz",
+      "integrity": "sha512-P+HtIa1iwosb1feFc8B/9MN5EAwzS+/dZ0UH0CTF2E4wnp5Z9OMxKl1IYjfiCwHzZrU5Let+S/maOvJR/EmV0g==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/extension-list": "^3.13.0"
       }
     },
     "node_modules/@tiptap/extension-mention": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-mention/-/extension-mention-3.15.3.tgz",
+      "integrity": "sha512-4YpwiQyumKZrlfiw4ExDzrDRarC4kkaC7RjEl4kYhzutID1Zy1WLES1B0CoZN9wRds/mjrQjfCFE5HE+2g3D6w==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0",
-        "@tiptap/pm": "^2.0.0",
-        "@tiptap/suggestion": "^2.0.0"
+        "@tiptap/core": "^3.15.3",
+        "@tiptap/pm": "^3.15.3",
+        "@tiptap/suggestion": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-ordered-list": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-ordered-list/-/extension-ordered-list-3.15.3.tgz",
+      "integrity": "sha512-/8uhw528Iy0c9wF6tHCiIn0ToM0Ml6Ll2c/3iPRnKr4IjXwx2Lr994stUFihb+oqGZwV1J8CPcZJ4Ufpdqi4Dw==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0"
+        "@tiptap/extension-list": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-paragraph": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-paragraph/-/extension-paragraph-3.15.3.tgz",
+      "integrity": "sha512-lc0Qu/1AgzcEfS67NJMj5tSHHhH6NtA6uUpvppEKGsvJwgE2wKG1onE4isrVXmcGRdxSMiCtyTDemPNMu6/ozQ==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-strike": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-strike/-/extension-strike-3.15.3.tgz",
+      "integrity": "sha512-Y1P3eGNY7RxQs2BcR6NfLo9VfEOplXXHAqkOM88oowWWOE7dMNeFFZM9H8HNxoQgXJ7H0aWW9B7ZTWM9hWli2Q==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-text": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-3.15.3.tgz",
+      "integrity": "sha512-MhkBz8ZvrqOKtKNp+ZWISKkLUlTrDR7tbKZc2OnNcUTttL9dz0HwT+cg91GGz19fuo7ttDcfsPV6eVmflvGToA==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-underline": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-underline/-/extension-underline-3.15.3.tgz",
+      "integrity": "sha512-r/IwcNN0W366jGu4Y0n2MiFq9jGa4aopOwtfWO4d+J0DyeS2m7Go3+KwoUqi0wQTiVU74yfi4DF6eRsMQ9/iHQ==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0"
+        "@tiptap/core": "^3.15.3"
+      }
+    },
+    "node_modules/@tiptap/extensions": {
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.15.3.tgz",
+      "integrity": "sha512-ycx/BgxR4rc9tf3ZyTdI98Z19yKLFfqM3UN+v42ChuIwkzyr9zyp7kG8dB9xN2lNqrD+5y/HyJobz/VJ7T90gA==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/core": "^3.15.3",
+        "@tiptap/pm": "^3.15.3"
       }
     },
     "node_modules/@tiptap/pm": {
-      "version": "2.1.13",
-      "license": "MIT",
-      "dependencies": {
-        "prosemirror-changeset": "^2.2.0",
-        "prosemirror-collab": "^1.3.0",
-        "prosemirror-commands": "^1.3.1",
-        "prosemirror-dropcursor": "^1.5.0",
-        "prosemirror-gapcursor": "^1.3.1",
-        "prosemirror-history": "^1.3.0",
-        "prosemirror-inputrules": "^1.2.0",
-        "prosemirror-keymap": "^1.2.0",
-        "prosemirror-markdown": "^1.10.1",
-        "prosemirror-menu": "^1.2.1",
-        "prosemirror-model": "^1.18.1",
-        "prosemirror-schema-basic": "^1.2.0",
-        "prosemirror-schema-list": "^1.2.2",
-        "prosemirror-state": "^1.4.1",
-        "prosemirror-tables": "^1.3.0",
-        "prosemirror-trailing-node": "^2.0.2",
-        "prosemirror-transform": "^1.7.0",
-        "prosemirror-view": "^1.28.2"
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.15.3.tgz",
+      "integrity": "sha512-Zm1BaU1TwFi3CQiisxjgnzzIus+q40bBKWLqXf6WEaus8Z6+vo1MT2pU52dBCMIRaW9XNDq3E5cmGtMc1AlveA==",
+      "license": "MIT",
+      "dependencies": {
+        "prosemirror-changeset": "^2.3.0",
+        "prosemirror-collab": "^1.3.1",
+        "prosemirror-commands": "^1.6.2",
+        "prosemirror-dropcursor": "^1.8.1",
+        "prosemirror-gapcursor": "^1.3.2",
+        "prosemirror-history": "^1.4.1",
+        "prosemirror-inputrules": "^1.4.0",
+        "prosemirror-keymap": "^1.2.2",
+        "prosemirror-markdown": "^1.13.1",
+        "prosemirror-menu": "^1.2.4",
+        "prosemirror-model": "^1.24.1",
+        "prosemirror-schema-basic": "^1.2.3",
+        "prosemirror-schema-list": "^1.5.0",
+        "prosemirror-state": "^1.4.3",
+        "prosemirror-tables": "^1.6.4",
+        "prosemirror-trailing-node": "^3.0.0",
+        "prosemirror-transform": "^1.10.2",
+        "prosemirror-view": "^1.38.1"
       },
       "funding": {
         "type": "github",
@@ -5432,28 +5512,35 @@
       }
     },
     "node_modules/@tiptap/starter-kit": {
-      "version": "2.1.13",
-      "license": "MIT",
-      "dependencies": {
-        "@tiptap/core": "^2.1.13",
-        "@tiptap/extension-blockquote": "^2.1.13",
-        "@tiptap/extension-bold": "^2.1.13",
-        "@tiptap/extension-bullet-list": "^2.1.13",
-        "@tiptap/extension-code": "^2.1.13",
-        "@tiptap/extension-code-block": "^2.1.13",
-        "@tiptap/extension-document": "^2.1.13",
-        "@tiptap/extension-dropcursor": "^2.1.13",
-        "@tiptap/extension-gapcursor": "^2.1.13",
-        "@tiptap/extension-hard-break": "^2.1.13",
-        "@tiptap/extension-heading": "^2.1.13",
-        "@tiptap/extension-history": "^2.1.13",
-        "@tiptap/extension-horizontal-rule": "^2.1.13",
-        "@tiptap/extension-italic": "^2.1.13",
-        "@tiptap/extension-list-item": "^2.1.13",
-        "@tiptap/extension-ordered-list": "^2.1.13",
-        "@tiptap/extension-paragraph": "^2.1.13",
-        "@tiptap/extension-strike": "^2.1.13",
-        "@tiptap/extension-text": "^2.1.13"
+      "version": "3.13.0",
+      "resolved": "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-3.13.0.tgz",
+      "integrity": "sha512-Ojn6sRub04CRuyQ+9wqN62JUOMv+rG1vXhc2s6DCBCpu28lkCMMW+vTe7kXJcEdbot82+5swPbERw9vohswFzg==",
+      "license": "MIT",
+      "dependencies": {
+        "@tiptap/core": "^3.13.0",
+        "@tiptap/extension-blockquote": "^3.13.0",
+        "@tiptap/extension-bold": "^3.13.0",
+        "@tiptap/extension-bullet-list": "^3.13.0",
+        "@tiptap/extension-code": "^3.13.0",
+        "@tiptap/extension-code-block": "^3.13.0",
+        "@tiptap/extension-document": "^3.13.0",
+        "@tiptap/extension-dropcursor": "^3.13.0",
+        "@tiptap/extension-gapcursor": "^3.13.0",
+        "@tiptap/extension-hard-break": "^3.13.0",
+        "@tiptap/extension-heading": "^3.13.0",
+        "@tiptap/extension-horizontal-rule": "^3.13.0",
+        "@tiptap/extension-italic": "^3.13.0",
+        "@tiptap/extension-link": "^3.13.0",
+        "@tiptap/extension-list": "^3.13.0",
+        "@tiptap/extension-list-item": "^3.13.0",
+        "@tiptap/extension-list-keymap": "^3.13.0",
+        "@tiptap/extension-ordered-list": "^3.13.0",
+        "@tiptap/extension-paragraph": "^3.13.0",
+        "@tiptap/extension-strike": "^3.13.0",
+        "@tiptap/extension-text": "^3.13.0",
+        "@tiptap/extension-underline": "^3.13.0",
+        "@tiptap/extensions": "^3.13.0",
+        "@tiptap/pm": "^3.13.0"
       },
       "funding": {
         "type": "github",
@@ -5461,15 +5548,17 @@
       }
     },
     "node_modules/@tiptap/suggestion": {
-      "version": "2.1.13",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/suggestion/-/suggestion-3.15.3.tgz",
+      "integrity": "sha512-+CbaHhPfKUe+fNpUIQaOPhh6xI+xL5jbK1zw++U+CZIRrVAAmHRhO+D0O2HdiE1RK7596y8bRqMiB2CRHF7emA==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^2.0.0",
-        "@tiptap/pm": "^2.0.0"
+        "@tiptap/core": "^3.15.3",
+        "@tiptap/pm": "^3.15.3"
       }
     },
     "node_modules/@tootallnate/once": {
@@ -5638,6 +5727,28 @@
       "license": "MIT",
       "peer": true
     },
+    "node_modules/@types/linkify-it": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
+      "license": "MIT"
+    },
+    "node_modules/@types/markdown-it": {
+      "version": "14.1.2",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
+      "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/linkify-it": "^5",
+        "@types/mdurl": "^2"
+      }
+    },
+    "node_modules/@types/mdurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
+      "license": "MIT"
+    },
     "node_modules/@types/mime": {
       "version": "1.3.5",
       "license": "MIT"
@@ -5666,14 +5777,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/object.omit": {
-      "version": "3.0.3",
-      "license": "MIT"
-    },
-    "node_modules/@types/object.pick": {
-      "version": "1.3.4",
-      "license": "MIT"
-    },
     "node_modules/@types/qs": {
       "version": "6.9.11",
       "license": "MIT"
@@ -5738,10 +5841,6 @@
         "@types/estree": "*"
       }
     },
-    "node_modules/@types/throttle-debounce": {
-      "version": "2.1.0",
-      "license": "MIT"
-    },
     "node_modules/@types/tough-cookie": {
       "version": "4.0.5",
       "dev": true,
@@ -7048,16 +7147,6 @@
       ],
       "license": "CC-BY-4.0"
     },
-    "node_modules/case-anything": {
-      "version": "2.1.13",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12.13"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mesqueeb"
-      }
-    },
     "node_modules/chalk": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz",
@@ -8443,10 +8532,6 @@
       "license": "BSD-2-Clause",
       "peer": true
     },
-    "node_modules/dash-get": {
-      "version": "1.0.2",
-      "license": "MIT"
-    },
     "node_modules/data-urls": {
       "version": "3.0.2",
       "dev": true,
@@ -9676,6 +9761,18 @@
       "version": "1.0.3",
       "license": "MIT"
     },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/escodegen": {
       "version": "2.1.0",
       "dev": true,
@@ -10450,18 +10547,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/eslint/node_modules/eslint-scope": {
       "version": "7.2.2",
       "dev": true,
@@ -12309,16 +12394,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-extendable": {
-      "version": "1.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "license": "MIT",
@@ -13703,7 +13778,9 @@
       }
     },
     "node_modules/jiti": {
-      "version": "1.21.0",
+      "version": "1.21.7",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
+      "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
       "license": "MIT",
       "bin": {
         "jiti": "bin/jiti.js"
@@ -13974,10 +14051,15 @@
       }
     },
     "node_modules/lilconfig": {
-      "version": "2.1.0",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
+      "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
       "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antonk52"
       }
     },
     "node_modules/lines-and-columns": {
@@ -13992,7 +14074,9 @@
       }
     },
     "node_modules/linkifyjs": {
-      "version": "4.1.3",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-4.3.2.tgz",
+      "integrity": "sha512-NT1CJtq3hHIreOianA8aSXn6Cw0JzYOuDQbOrSPe7gqFnCpKP++MQe3ODgO3oh2GJFORkAAdqredOa60z63GbA==",
       "license": "MIT"
     },
     "node_modules/live-region": {
@@ -14215,10 +14299,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/make-error": {
-      "version": "1.3.6",
-      "license": "ISC"
-    },
     "node_modules/makeerror": {
       "version": "1.0.12",
       "dev": true,
@@ -15059,26 +15139,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object.omit": {
-      "version": "3.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "is-extendable": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.pick": {
-      "version": "1.3.0",
-      "license": "MIT",
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/object.values": {
       "version": "1.1.7",
       "dev": true,
@@ -15581,7 +15641,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.33",
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
       "funding": [
         {
           "type": "opencollective",
@@ -15598,9 +15660,9 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
+        "nanoid": "^3.3.11",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -16071,13 +16133,6 @@
         }
       }
     },
-    "node_modules/postcss-load-config/node_modules/lilconfig": {
-      "version": "3.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=14"
-      }
-    },
     "node_modules/postcss-loader": {
       "version": "7.3.4",
       "license": "MIT",
@@ -16200,24 +16255,34 @@
       }
     },
     "node_modules/postcss-nested": {
-      "version": "6.0.1",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
+      "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "license": "MIT",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.11"
+        "postcss-selector-parser": "^6.1.1"
       },
       "engines": {
         "node": ">=12.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
       "peerDependencies": {
         "postcss": "^8.2.14"
       }
     },
     "node_modules/postcss-nested/node_modules/postcss-selector-parser": {
-      "version": "6.0.15",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
       "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -16656,7 +16721,9 @@
       "license": "MIT"
     },
     "node_modules/prosemirror-changeset": {
-      "version": "2.2.1",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/prosemirror-changeset/-/prosemirror-changeset-2.3.1.tgz",
+      "integrity": "sha512-j0kORIBm8ayJNl3zQvD1TTPHJX3g042et6y/KQhZhnPrruO8exkTgG8X+NRpj7kIyMMEx74Xb3DyMIBtO0IKkQ==",
       "license": "MIT",
       "dependencies": {
         "prosemirror-transform": "^1.0.0"
@@ -16670,12 +16737,14 @@
       }
     },
     "node_modules/prosemirror-commands": {
-      "version": "1.5.2",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/prosemirror-commands/-/prosemirror-commands-1.7.1.tgz",
+      "integrity": "sha512-rT7qZnQtx5c0/y/KlYaGvtG411S97UaL6gdp6RIZ23DLHanMYLyfGBV5DtSnZdthQql7W+lEVbpSfwtO8T+L2w==",
       "license": "MIT",
       "dependencies": {
         "prosemirror-model": "^1.0.0",
         "prosemirror-state": "^1.0.0",
-        "prosemirror-transform": "^1.0.0"
+        "prosemirror-transform": "^1.10.2"
       }
     },
     "node_modules/prosemirror-dropcursor": {
@@ -16698,7 +16767,9 @@
       }
     },
     "node_modules/prosemirror-history": {
-      "version": "1.3.2",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/prosemirror-history/-/prosemirror-history-1.5.0.tgz",
+      "integrity": "sha512-zlzTiH01eKA55UAf1MEjtssJeHnGxO0j4K4Dpx+gnmX9n+SHNlDqI2oO1Kv1iPN5B1dm5fsljCfqKF9nFL6HRg==",
       "license": "MIT",
       "dependencies": {
         "prosemirror-state": "^1.2.2",
@@ -16716,7 +16787,9 @@
       }
     },
     "node_modules/prosemirror-keymap": {
-      "version": "1.2.2",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/prosemirror-keymap/-/prosemirror-keymap-1.2.3.tgz",
+      "integrity": "sha512-4HucRlpiLd1IPQQXNqeo81BGtkY8Ai5smHhKW9jjPKRc2wQIxksg7Hl1tTI2IfT2B/LgX6bfYvXxEpJl7aKYKw==",
       "license": "MIT",
       "dependencies": {
         "prosemirror-state": "^1.0.0",
@@ -16724,26 +16797,35 @@
       }
     },
     "node_modules/prosemirror-markdown": {
-      "version": "1.12.0",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/prosemirror-markdown/-/prosemirror-markdown-1.13.2.tgz",
+      "integrity": "sha512-FPD9rHPdA9fqzNmIIDhhnYQ6WgNoSWX9StUZ8LEKapaXU9i6XgykaHKhp6XMyXlOWetmaFgGDS/nu/w9/vUc5g==",
       "license": "MIT",
       "dependencies": {
+        "@types/markdown-it": "^14.0.0",
         "markdown-it": "^14.0.0",
-        "prosemirror-model": "^1.0.0"
+        "prosemirror-model": "^1.25.0"
       }
     },
     "node_modules/prosemirror-markdown/node_modules/argparse": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "license": "Python-2.0"
     },
     "node_modules/prosemirror-markdown/node_modules/linkify-it": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
       "license": "MIT",
       "dependencies": {
         "uc.micro": "^2.0.0"
       }
     },
     "node_modules/prosemirror-markdown/node_modules/markdown-it": {
-      "version": "14.0.0",
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
+      "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
       "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1",
@@ -16751,7 +16833,7 @@
         "linkify-it": "^5.0.0",
         "mdurl": "^2.0.0",
         "punycode.js": "^2.3.1",
-        "uc.micro": "^2.0.0"
+        "uc.micro": "^2.1.0"
       },
       "bin": {
         "markdown-it": "bin/markdown-it.mjs"
@@ -16759,10 +16841,14 @@
     },
     "node_modules/prosemirror-markdown/node_modules/mdurl": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
       "license": "MIT"
     },
     "node_modules/prosemirror-markdown/node_modules/uc.micro": {
-      "version": "2.0.0",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
+      "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
       "license": "MIT"
     },
     "node_modules/prosemirror-menu": {
@@ -16776,21 +16862,27 @@
       }
     },
     "node_modules/prosemirror-model": {
-      "version": "1.19.4",
+      "version": "1.25.4",
+      "resolved": "https://registry.npmjs.org/prosemirror-model/-/prosemirror-model-1.25.4.tgz",
+      "integrity": "sha512-PIM7E43PBxKce8OQeezAs9j4TP+5yDpZVbuurd1h5phUxEKIu+G2a+EUZzIC5nS1mJktDJWzbqS23n1tsAf5QA==",
       "license": "MIT",
       "dependencies": {
         "orderedmap": "^2.0.0"
       }
     },
     "node_modules/prosemirror-schema-basic": {
-      "version": "1.2.2",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.4.tgz",
+      "integrity": "sha512-ELxP4TlX3yr2v5rM7Sb70SqStq5NvI15c0j9j/gjsrO5vaw+fnnpovCLEGIcpeGfifkuqJwl4fon6b+KdrODYQ==",
       "license": "MIT",
       "dependencies": {
-        "prosemirror-model": "^1.19.0"
+        "prosemirror-model": "^1.25.0"
       }
     },
     "node_modules/prosemirror-schema-list": {
-      "version": "1.3.0",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/prosemirror-schema-list/-/prosemirror-schema-list-1.5.1.tgz",
+      "integrity": "sha512-927lFx/uwyQaGwJxLWCZRkjXG0p48KpMj6ueoYiu4JX05GGuGcgzAy62dfiV8eFZftgyBUvLx76RsMe20fJl+Q==",
       "license": "MIT",
       "dependencies": {
         "prosemirror-model": "^1.0.0",
@@ -16799,7 +16891,9 @@
       }
     },
     "node_modules/prosemirror-state": {
-      "version": "1.4.3",
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/prosemirror-state/-/prosemirror-state-1.4.4.tgz",
+      "integrity": "sha512-6jiYHH2CIGbCfnxdHbXZ12gySFY/fz/ulZE333G6bPqIZ4F+TXo9ifiR86nAHpWnfoNjOb3o5ESi7J8Uz1jXHw==",
       "license": "MIT",
       "dependencies": {
         "prosemirror-model": "^1.0.0",
@@ -16808,52 +16902,49 @@
       }
     },
     "node_modules/prosemirror-tables": {
-      "version": "1.3.5",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/prosemirror-tables/-/prosemirror-tables-1.8.3.tgz",
+      "integrity": "sha512-wbqCR/RlRPRe41a4LFtmhKElzBEfBTdtAYWNIGHM6X2e24NN/MTNUKyXjjphfAfdQce37Kh/5yf765mLPYDe7Q==",
       "license": "MIT",
       "dependencies": {
-        "prosemirror-keymap": "^1.1.2",
-        "prosemirror-model": "^1.8.1",
-        "prosemirror-state": "^1.3.1",
-        "prosemirror-transform": "^1.2.1",
-        "prosemirror-view": "^1.13.3"
+        "prosemirror-keymap": "^1.2.3",
+        "prosemirror-model": "^1.25.4",
+        "prosemirror-state": "^1.4.4",
+        "prosemirror-transform": "^1.10.5",
+        "prosemirror-view": "^1.41.4"
       }
     },
     "node_modules/prosemirror-trailing-node": {
-      "version": "2.0.7",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/prosemirror-trailing-node/-/prosemirror-trailing-node-3.0.0.tgz",
+      "integrity": "sha512-xiun5/3q0w5eRnGYfNlW1uU9W6x5MoFKWwq/0TIRgt09lv7Hcser2QYV8t4muXbEr+Fwo0geYn79Xs4GKywrRQ==",
       "license": "MIT",
       "dependencies": {
-        "@remirror/core-constants": "^2.0.2",
-        "@remirror/core-helpers": "^3.0.0",
+        "@remirror/core-constants": "3.0.0",
         "escape-string-regexp": "^4.0.0"
       },
       "peerDependencies": {
-        "prosemirror-model": "^1.19.0",
+        "prosemirror-model": "^1.22.1",
         "prosemirror-state": "^1.4.2",
-        "prosemirror-view": "^1.31.2"
-      }
-    },
-    "node_modules/prosemirror-trailing-node/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "prosemirror-view": "^1.33.8"
       }
     },
     "node_modules/prosemirror-transform": {
-      "version": "1.8.0",
+      "version": "1.10.5",
+      "resolved": "https://registry.npmjs.org/prosemirror-transform/-/prosemirror-transform-1.10.5.tgz",
+      "integrity": "sha512-RPDQCxIDhIBb1o36xxwsaeAvivO8VLJcgBtzmOwQ64bMtsVFh5SSuJ6dWSxO1UsHTiTXPCgQm3PDJt7p6IOLbw==",
       "license": "MIT",
       "dependencies": {
-        "prosemirror-model": "^1.0.0"
+        "prosemirror-model": "^1.21.0"
       }
     },
     "node_modules/prosemirror-view": {
-      "version": "1.32.7",
+      "version": "1.41.4",
+      "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.41.4.tgz",
+      "integrity": "sha512-WkKgnyjNncri03Gjaz3IFWvCAE94XoiEgvtr0/r2Xw7R8/IjK3sKLSiDoCHWcsXSAinVaKlGRZDvMCsF1kbzjA==",
       "license": "MIT",
       "dependencies": {
-        "prosemirror-model": "^1.16.0",
+        "prosemirror-model": "^1.20.0",
         "prosemirror-state": "^1.0.0",
         "prosemirror-transform": "^1.1.0"
       }
@@ -16890,6 +16981,8 @@
     },
     "node_modules/punycode.js": {
       "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
+      "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -18316,7 +18409,9 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.0.2",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -19254,31 +19349,33 @@
       }
     },
     "node_modules/tailwindcss": {
-      "version": "3.4.1",
+      "version": "3.4.19",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.19.tgz",
+      "integrity": "sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ==",
       "license": "MIT",
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
         "arg": "^5.0.2",
-        "chokidar": "^3.5.3",
+        "chokidar": "^3.6.0",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
-        "fast-glob": "^3.3.0",
+        "fast-glob": "^3.3.2",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
-        "jiti": "^1.19.1",
-        "lilconfig": "^2.1.0",
-        "micromatch": "^4.0.5",
+        "jiti": "^1.21.7",
+        "lilconfig": "^3.1.3",
+        "micromatch": "^4.0.8",
         "normalize-path": "^3.0.0",
         "object-hash": "^3.0.0",
-        "picocolors": "^1.0.0",
-        "postcss": "^8.4.23",
+        "picocolors": "^1.1.1",
+        "postcss": "^8.4.47",
         "postcss-import": "^15.1.0",
         "postcss-js": "^4.0.1",
-        "postcss-load-config": "^4.0.1",
-        "postcss-nested": "^6.0.1",
-        "postcss-selector-parser": "^6.0.11",
-        "resolve": "^1.22.2",
-        "sucrase": "^3.32.0"
+        "postcss-load-config": "^4.0.2 || ^5.0 || ^6.0",
+        "postcss-nested": "^6.2.0",
+        "postcss-selector-parser": "^6.1.2",
+        "resolve": "^1.22.8",
+        "sucrase": "^3.35.0"
       },
       "bin": {
         "tailwind": "lib/cli.js",
@@ -19299,7 +19396,9 @@
       }
     },
     "node_modules/tailwindcss/node_modules/postcss-selector-parser": {
-      "version": "6.0.15",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
       "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -19564,13 +19663,6 @@
         "tslib": "^2"
       }
     },
-    "node_modules/throttle-debounce": {
-      "version": "3.0.1",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/thunky": {
       "version": "1.1.0",
       "license": "MIT"
@@ -21180,33 +21272,33 @@
         "@emoji-mart/data": "^1.1.2",
         "@rails/activestorage": "^7.2.201",
         "@tarekraafat/autocomplete.js": "10.2.7",
-        "@tiptap/core": "2.1.13",
-        "@tiptap/extension-blockquote": "2.1.13",
-        "@tiptap/extension-bold": "2.1.13",
-        "@tiptap/extension-bullet-list": "2.1.13",
-        "@tiptap/extension-character-count": "2.1.13",
-        "@tiptap/extension-code": "2.1.13",
-        "@tiptap/extension-code-block": "2.1.13",
-        "@tiptap/extension-document": "2.1.13",
-        "@tiptap/extension-dropcursor": "2.1.13",
-        "@tiptap/extension-gapcursor": "2.1.13",
-        "@tiptap/extension-hard-break": "2.1.13",
-        "@tiptap/extension-heading": "2.1.13",
-        "@tiptap/extension-history": "2.1.13",
-        "@tiptap/extension-horizontal-rule": "2.1.13",
-        "@tiptap/extension-image": "2.1.13",
-        "@tiptap/extension-italic": "2.1.13",
-        "@tiptap/extension-link": "2.1.13",
-        "@tiptap/extension-list-item": "2.1.13",
-        "@tiptap/extension-mention": "2.1.13",
-        "@tiptap/extension-ordered-list": "2.1.13",
-        "@tiptap/extension-paragraph": "2.1.13",
-        "@tiptap/extension-strike": "2.1.13",
-        "@tiptap/extension-text": "2.1.13",
-        "@tiptap/extension-underline": "2.1.13",
-        "@tiptap/pm": "2.1.13",
-        "@tiptap/starter-kit": "2.1.13",
-        "@tiptap/suggestion": "2.1.13",
+        "@tiptap/core": "^3.13.0",
+        "@tiptap/extension-blockquote": "^3.13.0",
+        "@tiptap/extension-bold": "^3.13.0",
+        "@tiptap/extension-bullet-list": "^3.13.0",
+        "@tiptap/extension-character-count": "^3.13.0",
+        "@tiptap/extension-code": "^3.13.0",
+        "@tiptap/extension-code-block": "^3.13.0",
+        "@tiptap/extension-document": "^3.13.0",
+        "@tiptap/extension-dropcursor": "^3.13.0",
+        "@tiptap/extension-gapcursor": "^3.13.0",
+        "@tiptap/extension-hard-break": "^3.13.0",
+        "@tiptap/extension-heading": "^3.13.0",
+        "@tiptap/extension-history": "^3.13.0",
+        "@tiptap/extension-horizontal-rule": "^3.13.0",
+        "@tiptap/extension-image": "^3.13.0",
+        "@tiptap/extension-italic": "^3.13.0",
+        "@tiptap/extension-link": "^3.13.0",
+        "@tiptap/extension-list-item": "^3.13.0",
+        "@tiptap/extension-mention": "^3.13.0",
+        "@tiptap/extension-ordered-list": "^3.13.0",
+        "@tiptap/extension-paragraph": "^3.13.0",
+        "@tiptap/extension-strike": "^3.13.0",
+        "@tiptap/extension-text": "^3.13.0",
+        "@tiptap/extension-underline": "^3.13.0",
+        "@tiptap/pm": "^3.13.0",
+        "@tiptap/starter-kit": "^3.13.0",
+        "@tiptap/suggestion": "^3.13.0",
         "a11y-accordion-component": "^1.2.6",
         "a11y-dialog-component": "^5.5.1",
         "a11y-dropdown-component": "^1.2.0",
@@ -21249,6 +21341,9 @@
         "node": ">=0.3.1"
       }
     },
+    "packages/core/packages/webpacker": {
+      "extraneous": true
+    },
     "packages/dev": {
       "name": "@decidim/dev",
       "version": "0.32.0-dev",
@@ -21328,7 +21423,7 @@
         "shakapacker": "~8.3.0",
         "source-map-loader": "^4.0.1",
         "style-loader": "^3.3.3",
-        "tailwindcss": "^3.4.1",
+        "tailwindcss": "^3.4.19",
         "terser-webpack-plugin": "^5.3.9",
         "webpack": "^5.88.1",
         "webpack-assets-manifest": "^5.1.0",
diff --git a/packages/core/package.json b/packages/core/package.json
index 22303a6cacb03..ad7d46886c851 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -13,33 +13,33 @@
     "@emoji-mart/data": "^1.1.2",
     "@rails/activestorage": "^7.2.201",
     "@tarekraafat/autocomplete.js": "10.2.7",
-    "@tiptap/core": "2.1.13",
-    "@tiptap/extension-blockquote": "2.1.13",
-    "@tiptap/extension-bold": "2.1.13",
-    "@tiptap/extension-bullet-list": "2.1.13",
-    "@tiptap/extension-character-count": "2.1.13",
-    "@tiptap/extension-code": "2.1.13",
-    "@tiptap/extension-code-block": "2.1.13",
-    "@tiptap/extension-document": "2.1.13",
-    "@tiptap/extension-dropcursor": "2.1.13",
-    "@tiptap/extension-gapcursor": "2.1.13",
-    "@tiptap/extension-hard-break": "2.1.13",
-    "@tiptap/extension-heading": "2.1.13",
-    "@tiptap/extension-history": "2.1.13",
-    "@tiptap/extension-horizontal-rule": "2.1.13",
-    "@tiptap/extension-image": "2.1.13",
-    "@tiptap/extension-italic": "2.1.13",
-    "@tiptap/extension-link": "2.1.13",
-    "@tiptap/extension-list-item": "2.1.13",
-    "@tiptap/extension-mention": "2.1.13",
-    "@tiptap/extension-ordered-list": "2.1.13",
-    "@tiptap/extension-paragraph": "2.1.13",
-    "@tiptap/extension-strike": "2.1.13",
-    "@tiptap/extension-text": "2.1.13",
-    "@tiptap/extension-underline": "2.1.13",
-    "@tiptap/pm": "2.1.13",
-    "@tiptap/starter-kit": "2.1.13",
-    "@tiptap/suggestion": "2.1.13",
+    "@tiptap/core": "^3.13.0",
+    "@tiptap/extension-blockquote": "^3.13.0",
+    "@tiptap/extension-bold": "^3.13.0",
+    "@tiptap/extension-bullet-list": "^3.13.0",
+    "@tiptap/extension-character-count": "^3.13.0",
+    "@tiptap/extension-code": "^3.13.0",
+    "@tiptap/extension-code-block": "^3.13.0",
+    "@tiptap/extension-document": "^3.13.0",
+    "@tiptap/extension-dropcursor": "^3.13.0",
+    "@tiptap/extension-gapcursor": "^3.13.0",
+    "@tiptap/extension-hard-break": "^3.13.0",
+    "@tiptap/extension-heading": "^3.13.0",
+    "@tiptap/extension-history": "^3.13.0",
+    "@tiptap/extension-horizontal-rule": "^3.13.0",
+    "@tiptap/extension-image": "^3.13.0",
+    "@tiptap/extension-italic": "^3.13.0",
+    "@tiptap/extension-link": "^3.13.0",
+    "@tiptap/extension-list-item": "^3.13.0",
+    "@tiptap/extension-mention": "^3.13.0",
+    "@tiptap/extension-ordered-list": "^3.13.0",
+    "@tiptap/extension-paragraph": "^3.13.0",
+    "@tiptap/extension-strike": "^3.13.0",
+    "@tiptap/extension-text": "^3.13.0",
+    "@tiptap/extension-underline": "^3.13.0",
+    "@tiptap/pm": "^3.13.0",
+    "@tiptap/starter-kit": "^3.13.0",
+    "@tiptap/suggestion": "^3.13.0",
     "a11y-accordion-component": "^1.2.6",
     "a11y-dialog-component": "^5.5.1",
     "a11y-dropdown-component": "^1.2.0",
diff --git a/packages/webpacker/package.json b/packages/webpacker/package.json
index 6a6c5d7240557..e02642699448f 100644
--- a/packages/webpacker/package.json
+++ b/packages/webpacker/package.json
@@ -37,7 +37,7 @@
     "shakapacker": "~8.3.0",
     "source-map-loader": "^4.0.1",
     "style-loader": "^3.3.3",
-    "tailwindcss": "^3.4.1",
+    "tailwindcss": "^3.4.19",
     "terser-webpack-plugin": "^5.3.9",
     "webpack": "^5.88.1",
     "webpack-assets-manifest": "^5.1.0",