decidim-proposals 0.30.4 → 0.30.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bec3bcafd4f181e4b4cec5b61945d0f998fc20252811ba408a5f96422ebc0dd2
-  data.tar.gz: 074a714a4f84e41059ac013af05982e4d195b918f1bb055b34132d922b69c4b6
+  metadata.gz: 5e7cd0b3ab3caa000c7312e538273ef7e7317ac194704dc867c4b6632c3afcff
+  data.tar.gz: c1365fa1979144c94687bb6de01ce790bcfadb88e9ec6355d0f4f78f143c53b4
 SHA512:
-  metadata.gz: 565f8c2c2661bf620aa3d35b8cf82977b0e95e20e0c1d27e30277eadec7cd05e457a8ea26685d056adea7fdb68cf10400147a05b88d2119c8d1d1a54e5188de6
-  data.tar.gz: 3d181e654fe81359840d6cf0d73a4835ca9f23d376dbf301142a60e5f2c1b93f49613a968f6a70885a3fc5b3efdde3efe28bbb7f451e8d50c4026490988197e3
+  metadata.gz: 41e7ea8b4de34287f002916b911c065e99689c75a8e3386af77f15b1e7510ebc184a025c309cc0d16365a3a0219b3f9cd85f058dcc0d58a828db64fcd5182864
+  data.tar.gz: 87648a2de629f7f9d61634d50c7885d6be5b9c7ba277ef8609e5ff20ff1c30f4ae6f7f0ee1e258a0f61632ff14c8ab7d308c4aa85b0b518c7abfc79a1134db95

data/app/cells/decidim/proposals/proposal_g/show.erb

@@ -2,7 +2,7 @@
 <%= link_to resource_path, class: classes[:default], id: resource_id do %>
   <div class="<%= classes[:img] %>">
     <% if has_image? %>
-      <%= image_tag resource_image_path, alt: alt_title %>
+      <%= image_tag resource_image_path, alt: "" %>
     <% else %>
       <%= external_icon "media/images/proposal-placeholder-card-g.svg", class: "card__proposal-placeholder-g" %>
     <% end %>

data/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 %>

data/app/controllers/concerns/decidim/proposals/admin/filterable.rb

@@ -51,7 +51,9 @@ module Decidim
           end
 
           def valuator_role_ids
-            current_participatory_space.user_roles(:valuator).order_by_name.pluck(:id)
+            roles = current_participatory_space.user_roles(:valuator)
+            roles = roles.order_by_name if roles.respond_to?(:order_by_name)
+            roles.pluck(:id)
           end
 
           def translated_valuator_role_ids_has(valuator_role_id)

data/app/controllers/decidim/proposals/proposals_controller.rb

@@ -17,7 +17,7 @@ module Decidim
       include Paginable
       include Decidim::AttachmentsHelper
 
-      helper_method :proposal_presenter, :form_presenter, :tab_panel_items
+      helper_method :proposal_presenter, :form_presenter, :tab_panel_items, :withdrawn_proposals?
 
       before_action :authenticate_user!, only: [:new, :create]
       before_action :ensure_is_draft, only: [:preview, :publish, :edit_draft, :update_draft, :destroy_draft]
@@ -234,6 +234,12 @@ module Decidim
         @proposal_presenter ||= present(@proposal)
       end
 
+      def withdrawn_proposals?
+        return @withdrawn_proposals if defined?(@withdrawn_proposals)
+
+        @withdrawn_proposals = Proposal.where(component: current_component).published.not_hidden.withdrawn.exists?
+      end
+
       def form_proposal_params
         form(ProposalForm).from_params(params)
       end

data/app/forms/decidim/proposals/admin/proposals_import_form.rb

@@ -10,13 +10,11 @@ module Decidim
         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 @@ module Decidim
           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)

data/app/helpers/decidim/proposals/admin/proposal_bulk_actions_helper.rb

@@ -33,9 +33,10 @@ module Decidim
           end
         end
 
-        # find the valuators for the current space.
+        # find the evaluators for the current space.
         def find_valuators_for_select(participatory_space, current_user)
-          valuator_roles = participatory_space.user_roles(:valuator).order_by_name
+          valuator_roles = participatory_space.user_roles(:valuator)
+          valuator_roles = valuator_roles.order_by_name if valuator_roles.respond_to?(:order_by_name)
           valuators = Decidim::User.where(id: valuator_roles.pluck(:decidim_user_id)).to_a
 
           filtered_valuator_roles = valuator_roles.filter do |role|

data/app/models/decidim/proposals/proposal.rb

@@ -174,8 +174,8 @@ module Decidim
                           A: :title,
                           datetime: :published_at
                         },
-                        index_on_create: ->(proposal) { proposal.official? },
-                        index_on_update: ->(proposal) { proposal.visible? })
+                        index_on_create: ->(proposal) { proposal.visible? && proposal.component&.published? },
+                        index_on_update: ->(proposal) { proposal.visible? && proposal.component&.published? })
 
       def self.log_presenter_class_for(_log)
         Decidim::Proposals::AdminLog::ProposalPresenter

data/app/presenters/decidim/proposals/proposal_presenter.rb

@@ -8,7 +8,6 @@ module Decidim
     class ProposalPresenter < Decidim::ResourcePresenter
       include Rails.application.routes.mounted_helpers
       include ActionView::Helpers::UrlHelper
-      include Decidim::SanitizeHelper
 
       def author
         @author ||= if official?

data/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>

data/app/views/decidim/proposals/proposals/_proposal_aside.html.erb

@@ -1,4 +1,4 @@
-<% if current_settings.votes_enabled? && (show_endorsements_card? || current_user) %>
+<% if current_settings.votes_enabled? %>
   <section class="layout-aside__section">
     <div class="proposal__aside-vote layout-aside__ctas-buttons" data-sticky-buttons>
       <%= render partial: "vote_button", locals: { proposal: @proposal, from_proposals_list: false } unless @proposal.withdrawn? %>

data/app/views/decidim/proposals/proposals/_proposals.html.erb

@@ -26,6 +26,6 @@
 
 <% if params.dig("filter", "with_availability").present? && params["filter"]["with_availability"] == "withdrawn" %>
   <%= link_to t("decidim.proposals.proposals.index.see_all"), proposals_path("filter[with_availability]" => nil), class: "button button__sm button__text-secondary" %>
-<% else %>
+<% elsif withdrawn_proposals? %>
   <%= link_to t("decidim.proposals.proposals.index.see_all_withdrawn"), proposals_path(filter: { with_availability: "withdrawn", with_any_state: [] }), class: "button button__sm button__text-secondary" %>
 <% end %>

data/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 %>

data/app/views/decidim/proposals/proposals/index.html.erb

@@ -1,5 +1,5 @@
 <% add_decidim_meta_tags(
-  description: translated_attribute(current_participatory_space.short_description),
+  description: translated_attribute(current_participatory_space.try(:short_description) || current_participatory_space.description),
   title: t("decidim.components.pagination.page_title",
            component_name: component_name,
            current_page: @proposals.current_page,

data/config/locales/ar.yml

@@ -39,7 +39,6 @@ ar:
         file: ملف
       proposals_import:
         import_proposals: مقترحات الاستيراد
-        keep_answers: الاحتفاظ بالحالة والإجابات
         keep_authors: الحفاظ على المؤلفين الأصلي
       valuation_assignment:
         admin_log:
@@ -422,7 +421,6 @@ ar:
             create: مقترحات الاستيراد
             no_components: لا توجد مكونات اقتراح أخرى في هذه المساحة التشاركية لاستيراد المقترحات منها.
             select_component: يرجى اختيار عنصر
-            select_states: تحقق من حالة مقترحات الاستيراد
         proposals_merges:
           create:
             success: دمج المقترحات بنجاح في واحدة جديدة.

data/config/locales/bg.yml

@@ -47,7 +47,6 @@ bg:
         origin_component_id: Компонент, от който да се копират предложенията
       proposals_import:
         import_proposals: Копиране на предложения
-        keep_answers: Запазете състоянието и отговорите
         keep_authors: Запази автора на оригинала
       valuation_assignment:
         admin_log:
@@ -511,7 +510,6 @@ bg:
             create: Импортиране на предложения
             no_components: Няма други компоненти на предложения в това пространство за участие, от които да се импортират предложенията.
             select_component: Моля, изберете компонент
-            select_states: Проверете състоянието на предложенията за импортиране
             title: Импортиране на предложения от друг компонент
         proposals_merges:
           create:

data/config/locales/ca-IT.yml

@@ -54,7 +54,7 @@ ca-IT:
         file: Arxiu
       proposals_import:
         import_proposals: Importar propostes
-        keep_answers: Manté l'estat i les respostes
+        keep_answers: Manté els estats i les respostes
         keep_authors: Mantenir l'autoria original
       valuation_assignment:
         admin_log:
@@ -698,7 +698,7 @@ ca-IT:
             create: Importa propostes
             no_components: No hi ha cap altre component de propostes en aquest espai participatiu des d'on importar-les.
             select_component: Escull un component
-            select_states: Consulta els estats de les propostes a importar
+            select_states: Importa només les propostes amb aquests estats. Si no s'ha seleccionat cap estat, s'importaran totes les propostes.
             title: Importar projectes des d'un altre component
         proposals_merges:
           create:

data/config/locales/ca.yml

@@ -54,7 +54,7 @@ ca:
         file: Arxiu
       proposals_import:
         import_proposals: Importar propostes
-        keep_answers: Manté l'estat i les respostes
+        keep_answers: Manté els estats i les respostes
         keep_authors: Mantenir l'autoria original
       valuation_assignment:
         admin_log:
@@ -698,7 +698,7 @@ ca:
             create: Importa propostes
             no_components: No hi ha cap altre component de propostes en aquest espai participatiu des d'on importar-les.
             select_component: Escull un component
-            select_states: Consulta els estats de les propostes a importar
+            select_states: Importa només les propostes amb aquests estats. Si no s'ha seleccionat cap estat, s'importaran totes les propostes.
             title: Importar projectes des d'un altre component
         proposals_merges:
           create:

data/config/locales/cs.yml

@@ -54,7 +54,7 @@ cs:
         file: Soubor
       proposals_import:
         import_proposals: Návrhy na dovoz
-        keep_answers: Zachovat stav a odpovědi
+        keep_answers: Zachovat stavy a odpovědi
         keep_authors: Uchovávejte původní autory
       valuation_assignment:
         admin_log:
@@ -701,7 +701,7 @@ cs:
             create: Návrhy na dovoz
             no_components: V tomto účastnickém prostoru neexistují žádné jiné komponenty návrhu, které by mohly importovat návrhy.
             select_component: Vyberte součást
-            select_states: Zkontrolujte stav návrhů, které chcete importovat
+            select_states: Importovat pouze návrhy s těmito stavy. Pokud není vybrán žádný, budou importovány všechny návrhy.
             title: Importovat návrhy z jiné komponenty
         proposals_merges:
           create:

data/config/locales/de.yml

@@ -54,7 +54,6 @@ de:
         file: Datei
       proposals_import:
         import_proposals: Vorschläge importieren
-        keep_answers: Status und Antworten behalten
         keep_authors: Behalten Sie die ursprünglichen Autoren
       valuation_assignment:
         admin_log:
@@ -115,8 +114,8 @@ de:
         one: Anmerkung
         other: Anmerkungen
       decidim/proposals/proposal_vote:
-        one: Abstimmung
-        other: Abstimmungen
+        one: Stimme
+        other: Stimmen
   decidim:
     admin:
       admin_log:
@@ -698,7 +697,6 @@ de:
             create: Vorschläge importieren
             no_components: In diesem partizipatorischen Bereich gibt es keine weiteren Vorschlagskomponenten, aus denen die Vorschläge importiert werden könnten.
             select_component: Bitte wählen Sie eine Komponente aus
-            select_states: Überprüfen Sie die Status der zu importierenden Vorschläge
             title: Vorschläge aus einer anderen Komponente importieren
         proposals_merges:
           create:

data/config/locales/el.yml

@@ -34,7 +34,6 @@ el:
         origin_component_id: Στοιχείο από το οποίο θα αντιγραφούν οι προτάσεις
       proposals_import:
         import_proposals: Εισαγωγή προτάσεων
-        keep_answers: Διατήρηση κατάστασης και απαντήσεων
         keep_authors: Διατήρηση αρχικών συντακτών
       valuation_assignment:
         admin_log:
@@ -421,7 +420,6 @@ el:
             create: Εισαγωγή προτάσεων
             no_components: Δεν υπάρχουν άλλα στοιχεία προτάσεων σε αυτόν τον χώρο συμμετοχής για εισαγωγή των προτάσεων.
             select_component: Επιλέξτε ένα στοιχείο
-            select_states: Ελέγξτε την κατάσταση των προτάσεων προς εισαγωγή
         proposals_merges:
           create:
             success: Επιτυχής συγχώνευση των προτάσεων σε μία νέα.

data/config/locales/en.yml

@@ -54,7 +54,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
       valuation_assignment:
         admin_log:
@@ -698,7 +698,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:

data/config/locales/es-MX.yml

@@ -54,7 +54,7 @@ es-MX:
         file: Archivo
       proposals_import:
         import_proposals: Propuestas de importación
-        keep_answers: Mantener estado y respuestas
+        keep_answers: Mantener estados y respuestas
         keep_authors: Mantener autores originales
       valuation_assignment:
         admin_log:
@@ -698,7 +698,7 @@ es-MX:
             create: Importar propuestas
             no_components: No hay otros componentes propuesta en este espacio participativo desde el que importar.
             select_component: Por favor selecciona un componente
-            select_states: Verifica los estados de las propuestas para importar
+            select_states: Importar solo propuestas con estos estados. Si no se selecciona ningún estado, todas las propuestas serán importadas.
             title: Importar propuestas desde otro componente
         proposals_merges:
           create:

data/config/locales/es-PY.yml

@@ -54,7 +54,7 @@ es-PY:
         file: Archivo
       proposals_import:
         import_proposals: Propuestas de importación
-        keep_answers: Mantener estado y respuestas
+        keep_answers: Mantener estados y respuestas
         keep_authors: Mantener autores originales
       valuation_assignment:
         admin_log:
@@ -698,7 +698,7 @@ es-PY:
             create: Importar propuestas
             no_components: No hay otros componentes propuesta en este espacio participativo desde el que importar.
             select_component: Por favor selecciona un componente
-            select_states: Verifique los estados de las propuestas para importar
+            select_states: Importar solo propuestas con estos estados. Si no se selecciona ningún estado, todas las propuestas serán importadas.
             title: Importar propuestas desde otro componente
         proposals_merges:
           create:

data/config/locales/es.yml

@@ -54,7 +54,7 @@ es:
         file: Archivo
       proposals_import:
         import_proposals: Importar propuestas
-        keep_answers: Mantener estado y respuestas
+        keep_answers: Mantener estados y respuestas
         keep_authors: Mantener autoría original
       valuation_assignment:
         admin_log:
@@ -698,7 +698,7 @@ es:
             create: Importar propuestas
             no_components: No hay otros componentes de propuestas en este espacio participativo desde donde importarlas.
             select_component: Selecciona un componente
-            select_states: Comprueba los estados de las propuestas a importar
+            select_states: Importar solo propuestas con estos estados. Si no se selecciona ningún estado, todas las propuestas serán importadas.
             title: Importar propuestas desde otro componente
         proposals_merges:
           create:

data/config/locales/eu.yml

@@ -54,7 +54,7 @@ eu:
         file: Fitxategia
       proposals_import:
         import_proposals: Proposamenak inportatu
-        keep_answers: Mantendu egoera eta erantzunak
+        keep_answers: Egoera-orriak eta erantzunak mantendu
         keep_authors: Mantendu jatorrizko egileak
       valuation_assignment:
         admin_log:
@@ -340,7 +340,7 @@ eu:
         endorsing_enabled:
           email_intro: 'Proposamenak egin ditzakezu %{participatory_space_title} parte hartze espazioan! Hasi orri honetan parte hartzen:'
           email_outro: Jakinarazpen hau jaso duzu %{participatory_space_title} jarraitzen ari zarelako. Jakinarazpenak jasotzeari utzi ahal diozu aurreko estekan.
-          email_subject: Onarpen proposamenak %{participatory_space_title} espazioan hasi dira
+          email_subject: '%{participatory_space_title} espazioko proposamenei atxikimenduak adierazteko aukera dago'
           notification_title: 'Orain has zaitezke <a href="%{resource_path}"></a> proposamenak onartzen hemen: <a href="%{participatory_space_url}">%{participatory_space_title}</a>.'
         proposal_mentioned:
           email_intro: Zure proposamen hau "%{mentioned_proposal_title}" aipatu da <a href="%{resource_url}"> iruzkinen</a> espazioan.
@@ -355,7 +355,7 @@ eu:
         proposal_published_for_space:
           email_intro: '"%{resource_title}" proposamena jarraizten ari zaren ondorengo "%{participatory_space_title}" espazioan erantsi zaizu.'
           email_outro: Jakinarazpen hau jaso duzu "%{participatory_space_title}" jarraitzen ari zarelako. Jarraitzeari uzti ahal diozu aurreko estekan.
-          email_subject: '"%{resource_title}" proposamen berria hona %{participatory_space_title} gehitu da'
+          email_subject: '%{participatory_space_title} espazioan "%{resource_title}" proposamen berria egin da'
           notification_title: <a href="%{resource_path}">%{resource_title}</a> proposamena %{participatory_space_title}-era gehitu du %{author} egileak.
           notification_title_official: 'Proposamen ofiziala hona gehitu da: <a href="%{resource_path}">%{resource_title}</a>.'
         proposal_state_changed:
@@ -385,7 +385,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.
@@ -407,7 +407,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.
@@ -609,7 +609,7 @@ eu:
           destroy:
             success: Egoera behar bezala ezabatua
           edit:
-            title: Editatu egoera
+            title: Egoera editatu
             update: Eguneratu
           form:
             preview: Aurrebistaratu
@@ -698,7 +698,7 @@ eu:
             create: Inportatu proposamenak
             no_components: Espazio honetan ez dago beste proposamenik proposamenak inportatzeko.
             select_component: Mesedez, hautatu osagaia
-            select_states: Egiaztatu inportatzeko proposamenen egoera
+            select_states: Inportatu proposamenak egoera horiekin soilik. Egoerarik hautatzen ez bada, proposamen guztiak inportatuko dira.
             title: Inportatu proposamenak beste osagai batetik
         proposals_merges:
           create:
@@ -732,7 +732,7 @@ eu:
         accepted: Onartuta
         evaluating: Ebaluatzen
         not_answered: Erantzun gabe
-        rejected: Ukatua
+        rejected: Bazteruta
         withdrawn: Kendu
       application_helper:
         filter_origin_values:
@@ -1012,7 +1012,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:
@@ -1035,7 +1035,7 @@ eu:
           title: Parte hartzeko arauak
           vote_limit:
             description: '%{limit} proposameni eman ahal diozu babesa.'
-            votes: Gainerako %{number} babes
+            votes: '%{number} boto emateke'
         wizard_aside:
           back: Atzera
           back_from_step_1: Itzuli proposamenetara

data/config/locales/fi-plain.yml

@@ -54,7 +54,6 @@ fi-pl:
         file: Tiedosto
       proposals_import:
         import_proposals: Tuo ehdotuksia
-        keep_answers: Säilytä tilat ja vastaukset
         keep_authors: Säilytä alkuperäiset laatijat
       valuation_assignment:
         admin_log:
@@ -698,7 +697,6 @@ fi-pl:
             create: Tuo ehdotuksia
             no_components: Tässä osallisuustilassa ei ole muita ehdotuskomponentteja ehdotusten tuomiseksi.
             select_component: Valitse komponentti
-            select_states: Tarkista tuotavien ehdotusten tilat
             title: Tuo ehdotuksia toisesta komponentista
         proposals_merges:
           create:

data/config/locales/fi.yml

@@ -54,7 +54,6 @@ fi:
         file: Tiedosto
       proposals_import:
         import_proposals: Tuo ehdotuksia
-        keep_answers: Säilytä tilat ja vastaukset
         keep_authors: Säilytä alkuperäiset laatijat
       valuation_assignment:
         admin_log:
@@ -698,7 +697,6 @@ fi:
             create: Tuo ehdotuksia
             no_components: Tässä osallistumistilassa ei ole muita ehdotuskomponentteja ehdotusten tuomiseksi.
             select_component: Valitse komponentti
-            select_states: Tarkista tuotavien ehdotusten tilat
             title: Tuo ehdotuksia toisesta komponentista
         proposals_merges:
           create:

data/config/locales/fr-CA.yml

@@ -54,7 +54,7 @@ fr-CA:
         file: Fichier
       proposals_import:
         import_proposals: Importer des propositions
-        keep_answers: Garder l'état et les réponses
+        keep_answers: Conserver les états et les réponses
         keep_authors: Gardez les auteurs originaux
       valuation_assignment:
         admin_log:
@@ -87,6 +87,7 @@ fr-CA:
               not_official: Non officiels
               voted: A reçu des votes ou des soutiens
     models:
+      decidim/proposals/admin/update_proposal_taxonomies_event: Taxonomies de la proposition changées
       decidim/proposals/creation_enabled_event: Autoriser la création de nouvelles propositions
       decidim/proposals/endorsing_enabled_event: Activer le module de soutiens
       decidim/proposals/proposal_mentioned_event: Proposition mentionnée
@@ -99,6 +100,8 @@ fr-CA:
           proposal:
             budget_text: La proposition <span class="resource-link">%{link} a été créée</span>
             import_to_proposal_text: Cette proposition <span "resource-link">%{link} a été créée</span>
+            merge_to_proposal_text: 'Cette proposition a été créée : %{link}'
+            split_to_proposal_text: 'Cette proposition a été créée : %{link}'
       decidim/proposals/collaborative_draft:
         one: Brouillon collaboratif
         other: Brouillons collaboratifs
@@ -189,6 +192,7 @@ fr-CA:
             edit_time_units:
               days: Jours
               hours: Heures
+              minutes: Compte-rendus
             geocoding_enabled: Cartes activées
             minimum_votes_per_user: Nombre minimum de votes par utilisateur
             new_proposal_body_template: Modèle de corps d'une nouvelle proposition
@@ -616,7 +620,7 @@ fr-CA:
             create: Importer des propositions
             no_components: Il n'y a pas d'autre fonctionnalité de proposition dans cet espace participatif dans laquelle importer les propositions.
             select_component: Veuillez sélectionner une fonctionnalité
-            select_states: Vérifiez l'état des propositions à importer
+            select_states: Importer uniquement des propositions avec ces états. Si aucun n'est sélectionné, toutes les propositions seront importées.
             title: Importer des propositions depuis une autre fonctionnalité
         proposals_merges:
           create:

data/config/locales/fr.yml

@@ -54,7 +54,7 @@ fr:
         file: Fichier
       proposals_import:
         import_proposals: Importer des propositions
-        keep_answers: Conserver l'état et les réponses aux propositions
+        keep_answers: Conserver les états et les réponses
         keep_authors: Gardez les auteurs originaux
       valuation_assignment:
         admin_log:
@@ -87,6 +87,7 @@ fr:
               not_official: Non officiels
               voted: A reçu des votes ou des soutiens
     models:
+      decidim/proposals/admin/update_proposal_taxonomies_event: Taxonomies de la proposition changées
       decidim/proposals/creation_enabled_event: Autoriser la création de nouvelles propositions
       decidim/proposals/endorsing_enabled_event: Activer le module de soutiens
       decidim/proposals/proposal_mentioned_event: Proposition mentionnée
@@ -99,6 +100,8 @@ fr:
           proposal:
             budget_text: La proposition <span class="resource-link">%{link} a été créée</span>
             import_to_proposal_text: Cette proposition <span "resource-link">%{link} a été créée</span>
+            merge_to_proposal_text: 'Cette proposition a été créée : %{link}'
+            split_to_proposal_text: 'Cette proposition a été créée : %{link}'
       decidim/proposals/collaborative_draft:
         one: Brouillon collaboratif
         other: Brouillons collaboratifs
@@ -189,6 +192,7 @@ fr:
             edit_time_units:
               days: Jours
               hours: Heures
+              minutes: Compte-rendus
             geocoding_enabled: Cartes activées
             minimum_votes_per_user: Nombre minimum de votes par utilisateur
             new_proposal_body_template: Modèle de corps d'une nouvelle proposition
@@ -616,7 +620,7 @@ fr:
             create: Importer des propositions
             no_components: Il n'y a pas d'autre fonctionnalité de proposition dans cet espace participatif dans laquelle importer les propositions.
             select_component: Veuillez sélectionner une fonctionnalité
-            select_states: Vérifiez l'état des propositions à importer
+            select_states: Importer uniquement des propositions avec ces états. Si aucun n'est sélectionné, toutes les propositions seront importées.
             title: Importer des propositions depuis une autre fonctionnalité
         proposals_merges:
           create:

data/config/locales/gl.yml

@@ -33,7 +33,6 @@ gl:
         origin_component_id: Componente para copiar as propostas de
       proposals_import:
         import_proposals: Propostas de importación
-        keep_answers: Manter o estado e as respostas
         keep_authors: Mantén os autores orixinais
       valuation_assignment:
         admin_log:
@@ -334,7 +333,6 @@ gl:
             create: Propostas de importación
             no_components: Non existen outros compoñentes de proposta neste espazo participativo para importar as propostas.
             select_component: Selecciona un compoñente
-            select_states: Comprobe os estados das propostas para importar
         proposals_merges:
           create:
             success: Fusionou con éxito as propostas nun novo.