decidim-proposals 0.11.2 → 0.12.0.pre

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

@@ -45,13 +45,20 @@
           <% if component_settings.attachments_allowed? %>
             <fieldset>
               <legend><%= t(".attachment_legend") %></legend>
-              <%= form.fields_for :attachment, @form.attachment do |form| %>
+              <%= form.fields_for :attachment, @form.attachment do |nested_form| %>
                 <div class="field">
-                  <%= form.text_field :title %>
+                  <%= nested_form.text_field :title %>
                 </div>
 
                 <div class="field">
-                  <%= form.upload :file, optional: false %>
+                  <%= nested_form.upload :file, optional: false %>
+                  <% if @form.errors[:attachment].present? %>
+                    <% @form.errors[:attachment].each do |message| %>
+                      <small class="form-error is-visible">
+                        <%= message %>
+                      </small>
+                    <% end %>
+                  <% end %>
                 </div>
               <% end %>
             </fieldset>

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

@@ -33,7 +33,7 @@
     <h2 id="proposals-count" class="title-action__title section-heading">
       <%= render partial: "count" %>
     </h2>
-    <% if current_settings.creation_enabled %>
+    <% if current_settings.creation_enabled && current_component.participatory_space.can_participate?(current_user) %>
       <%= action_authorized_link_to :create, new_proposal_path, class: "title-action__action button small hollow", data: { "redirect_url" => new_proposal_path } do %>
         <%= t(".new_proposal") %>
         <%= icon "plus" %>

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

@@ -7,25 +7,11 @@
 <%= render partial: "voting_rules" %>
 <div class="row column view-header">
   <h2 class="heading2"><%= @proposal.title %></h2>
-  <%= cell "decidim/author_box", present(@proposal).author, extra: (capture do %>
-      <span><%= l @proposal.created_at, format: :decidim_short %></span>
-      <button type="button" data-open="<%= current_user.present? ? "flagModal" : "loginModal" %>" title="<%= t(".report") %>" aria-controls="<%= current_user.present? ? "flagModal" : "loginModal" %>" aria-haspopup="true" tabindex="0">
-        <%= icon "flag", aria_label: t(".report"), class: "icon--small" %>
-      </button>
-      <% unless @proposal.official? %>
-        <%= link_to_current_or_new_conversation_with(@proposal.author) %>
-      <% end %>
-      <% if @proposal.withdrawable_by?(current_user) %>
-        <%= action_authorized_link_to :withdraw, withdraw_proposal_path(@proposal), method: :put, class: "title-action__action button small hollow", title: t(".withdraw_btn_hint"), data: {confirm: t(".withdraw_confirmation")}  do %>
-          <%= t(".withdraw_proposal") %>
-          <%= icon "x" %>
-        <% end %>
-    <% end %>
-  <% end) %>
+  <%= cell "decidim/author", present(@proposal).author, from: @proposal %>
 </div>
 <div class="row">
   <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
-    <% if can?(:edit, @proposal) %>
+    <% if allowed_to?(:edit, :proposal, proposal: @proposal) %>
       <%= link_to t(".edit_proposal"), edit_proposal_path(@proposal), class: "button secondary hollow expanded button-sc button--icon follow-button" %>
     <% end %>
     <% if current_settings.votes_enabled? || show_endorsements_card? || current_user %>
@@ -42,18 +28,18 @@
       </div>
     <% end %>
     <%= resource_reference(@proposal) %>
+    <%= cell("decidim/fingerprint", @proposal) %>
     <%= render partial: "decidim/shared/share_modal" %>
     <%= embed_modal_for proposal_proposal_widget_url(@proposal, format: :js) %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
-      <%= render partial: "proposal_badge", locals: { proposal: @proposal } %>
+      <%== cell("decidim/proposals/proposal_m", @proposal, full_badge: true).badge %>
       <%= simple_format @proposal.body %>
       <% if component_settings.geocoding_enabled? %>
         <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @proposal } %>
       <% end %>
-      <%= render partial: "tags", locals: { resource: @proposal } %>
-
+      <%= cell "decidim/proposals/proposal_tags", @proposal %>
     </div>
     <% if @proposal.answered? && translated_attribute(@proposal.answer).present? %>
       <% if @proposal.accepted? %>
@@ -83,12 +69,12 @@
     <%= linked_resources_for @proposal, :projects, "included_proposals" %>
     <%= linked_resources_for @proposal, :meetings, "proposals_from_meeting" %>
     <%= linked_resources_for @proposal, :proposals, "copied_from_component" %>
+
+    <%= cell "decidim/proposals/endorsers_list", @proposal %>
   </div>
 </div>
 <%= attachments_for @proposal %>
 
-<a name="list-of-endorsements"></a>
-<%= identities_list_xxs(@proposal.endorsements.for_listing) %>
 <%= comments_for @proposal %>
 
 <%= javascript_include_tag "decidim/proposals/social_share" %>

data/config/locales/ca.yml

@@ -16,6 +16,37 @@ ca:
       proposals_copy:
         copy_proposals: Entenc que això importarà totes les propostes del component seleccionat a l'actual i que aquesta acció no es pot revertir.
         origin_component_id: Component des d'on copiar les propostes
+    errors:
+      models:
+        proposal:
+          attributes:
+            attachment:
+              needs_to_be_reattached: Necessita tornar a pujar-se
+    models:
+      decidim/proposals/accepted_proposal_event: S'ha acceptat la proposta
+      decidim/proposals/admin/update_proposal_category_event: S'ha canviat la categoria de la proposta
+      decidim/proposals/creation_enabled_event: S'ha activat la creació de la proposta
+      decidim/proposals/endorsing_enabled_event: Les propostes admeten adhesions
+      decidim/proposals/evaluating_proposal_event: S'està avaluant la proposta
+      decidim/proposals/proposal_endorsed_event: Proposta aprovada
+      decidim/proposals/proposal_mentioned_event: Proposta esmentada
+      decidim/proposals/publish_proposal_event: Proposta publicada
+      decidim/proposals/rejected_proposal_event: S'ha rebutjat la proposta
+      decidim/proposals/voting_enabled_event: S'ha habilitat la votació de propostes
+  activerecord:
+    models:
+      decidim/proposals/proposal:
+        one: Proposta
+        other: Propostes
+      decidim/proposals/proposal_endorsement:
+        one: Adhesió
+        other: Adhesions
+      decidim/proposals/proposal_note:
+        one: Nota
+        other: Notes
+      decidim/proposals/proposal_vote:
+        one: Vot
+        other: Vots
   decidim:
     components:
       proposals:
@@ -114,16 +145,10 @@ ca:
       participatory_process_groups:
         highlighted_proposals:
           proposals: Propostes
-        proposal:
-          creation_date: 'Creació: %{date}'
-          view_proposal: Veure proposta
     participatory_spaces:
       highlighted_proposals:
         proposals: Propostes
         see_all_proposals: Veure totes les propostes
-      proposal:
-        creation_date: 'Creació: %{date}'
-        view_proposal: Veure proposta
     proposals:
       actions:
         answer: Respondre
@@ -220,6 +245,7 @@ ca:
             category: Categoria
             comments: Comentaris
             created_at: Creat el
+            endorsements: Adhesions
             id: ID
             notes: Notes
             official_proposal: Proposta oficial
@@ -269,6 +295,7 @@ ca:
         endorsement_identities_cabin:
           endorse: Adherir-se
         endorsements_card_row:
+          comments: Comentaris
           endorse: Adherir-se
         filters:
           accepted: Acceptades
@@ -278,6 +305,7 @@ ca:
           category_prompt: Selecciona una categoria
           citizens: Ciutadania
           evaluating: En avaluació
+          except_rejected: Totes menys rebutjades
           official: Oficial
           origin: Origen
           rejected: Rebutjades
@@ -290,10 +318,6 @@ ca:
           filter: Filtra
           filter_by: Filtrar per
           unfold: Desplegar
-        identities_listing:
-          see_all: Veure tot
-          see_less: Veure menys
-          title: Llista d'adhesions
         index:
           new_proposal: Nova proposta
           see_all_withdrawn: Veure totes les propostes retirades
@@ -322,6 +346,10 @@ ca:
           view_proposal: Veure proposta
         show:
           edit_proposal: Editar proposta
+          endorsements_list: Llista d'adhesions
+          hidden_endorsers_count:
+            one: i 1 persona més
+            other: i %{count} persones més
           proposal_accepted_reason: 'Aquesta proposta ha estat acceptada perquè:'
           proposal_in_evaluation_reason: S'està avaluant aquesta proposta
           proposal_rejected_reason: 'Aquesta proposta ha estat rebutjada perquè:'
@@ -354,7 +382,7 @@ ca:
           proposal_limit:
             description: Pots crear fins a %{limit} propostes.
           threshold_per_proposal:
-            description: Per ser validades, les propostes han d'arribar a %{limit} suports
+            description: Per ser validat, les propostes han d'arribar a %{limit} suports
           title: 'La selecció de propostes es regeix per les següents normes:'
           vote_limit:
             description: Pots donar suport a %{limit} propostes.
@@ -381,9 +409,9 @@ ca:
         success: El projecte de proposta s'ha actualitzat correctament.
     resource_links:
       copied_from_component:
-        proposal_proposals: Propostes relacionades
+        proposal_proposal: Propostes relacionades
       included_projects:
-        project_results: 'Resultats que apareixen en aquest projecte:'
+        project_result: 'Resultats que apareixen en aquest projecte:'
       included_proposals:
-        proposal_projects: 'Proposta formulada en aquests projectes:'
-        proposal_results: 'La proposta apareix en aquests resultats:'
+        proposal_project: 'Proposta formulada en aquests projectes:'
+        proposal_result: 'La proposta apareix en aquests resultats:'

data/config/locales/en.yml

@@ -17,6 +17,37 @@ en:
       proposals_copy:
         copy_proposals: I understand that this will import all proposals from the selected component to the current one and that this action can't be reversed.
         origin_component_id: Component to copy the proposals from
+    errors:
+      models:
+        proposal:
+          attributes:
+            attachment:
+              needs_to_be_reattached: Needs to be reattached
+    models:
+      decidim/proposals/accepted_proposal_event: Proposal accepted
+      decidim/proposals/admin/update_proposal_category_event: Proposal category changed
+      decidim/proposals/creation_enabled_event: Proposal creation enabled
+      decidim/proposals/endorsing_enabled_event: Proposal endorsing enabled
+      decidim/proposals/evaluating_proposal_event: Proposal is being evaluated
+      decidim/proposals/proposal_endorsed_event: Proposal endorsed
+      decidim/proposals/proposal_mentioned_event: Proposal mentioned
+      decidim/proposals/publish_proposal_event: Proposal published
+      decidim/proposals/rejected_proposal_event: Proposal rejected
+      decidim/proposals/voting_enabled_event: Proposal voting enabled
+  activerecord:
+    models:
+      decidim/proposals/proposal:
+        one: Proposal
+        other: Proposals
+      decidim/proposals/proposal_endorsement:
+        one: Endorsement
+        other: Endorsements
+      decidim/proposals/proposal_note:
+        one: Note
+        other: Notes
+      decidim/proposals/proposal_vote:
+        one: Vote
+        other: Votes
   decidim:
     components:
       proposals:
@@ -115,16 +146,10 @@ en:
       participatory_process_groups:
         highlighted_proposals:
           proposals: Proposals
-        proposal:
-          creation_date: 'Creation: %{date}'
-          view_proposal: View proposal
     participatory_spaces:
       highlighted_proposals:
         proposals: Proposals
         see_all_proposals: See all proposals
-      proposal:
-        creation_date: 'Creation: %{date}'
-        view_proposal: View proposal
     proposals:
       actions:
         answer: Answer
@@ -221,6 +246,7 @@ en:
             category: Category
             comments: Comments
             created_at: Created at
+            endorsements: Endorsements
             id: ID
             notes: Notes
             official_proposal: Official proposal
@@ -270,6 +296,7 @@ en:
         endorsement_identities_cabin:
           endorse: Endorse
         endorsements_card_row:
+          comments: Comments
           endorse: Endorse
         filters:
           accepted: Accepted
@@ -279,6 +306,7 @@ en:
           category_prompt: Select a category
           citizens: Citizens
           evaluating: Evaluating
+          except_rejected: All except rejected
           official: Official
           origin: Origin
           rejected: Rejected
@@ -291,10 +319,6 @@ en:
           filter: Filter
           filter_by: Filter by
           unfold: Unfold
-        identities_listing:
-          see_all: See all
-          see_less: See less
-          title: List of Endorsements
         index:
           new_proposal: New proposal
           see_all_withdrawn: See all withdrawn proposals
@@ -323,6 +347,10 @@ en:
           view_proposal: View proposal
         show:
           edit_proposal: Edit proposal
+          endorsements_list: List of Endorsements
+          hidden_endorsers_count:
+            one: and 1 more person
+            other: and %{count} more people
           proposal_accepted_reason: 'This proposal has been accepted because:'
           proposal_in_evaluation_reason: This proposal is being evaluated
           proposal_rejected_reason: 'This proposal has been rejected because:'
@@ -355,7 +383,7 @@ en:
           proposal_limit:
             description: You can create up to %{limit} proposals.
           threshold_per_proposal:
-            description: In order to be accepted proposals need to reach %{limit} supports
+            description: In order to be validated proposals need to reach %{limit} supports
           title: 'Voting is subject to the following rules:'
           vote_limit:
             description: You can vote up to %{limit} proposals.
@@ -382,9 +410,9 @@ en:
         success: Proposal draft updated successfully.
     resource_links:
       copied_from_component:
-        proposal_proposals: Related proposals
+        proposal_proposal: Related proposals
       included_projects:
-        project_results: 'Results appearing in this project:'
+        project_result: 'Results appearing in this project:'
       included_proposals:
-        proposal_projects: 'Proposal appearing in these projects:'
-        proposal_results: 'Proposal appearing in these results:'
+        proposal_project: 'Proposal appearing in these projects:'
+        proposal_result: 'Proposal appearing in these results:'

data/config/locales/es.yml

@@ -16,6 +16,37 @@ es:
       proposals_copy:
         copy_proposals: Entiendo que esto importará todas las propuestas del componente seleccionado al actual y que esta acción no se puede revertir.
         origin_component_id: Componente para copiar las propuestas de
+    errors:
+      models:
+        proposal:
+          attributes:
+            attachment:
+              needs_to_be_reattached: Es necesario volver a adjuntar el fichero
+    models:
+      decidim/proposals/accepted_proposal_event: Propuesta aceptada
+      decidim/proposals/admin/update_proposal_category_event: La categoría de la propuesta ha cambiado
+      decidim/proposals/creation_enabled_event: Creación de propuesta habilitada
+      decidim/proposals/endorsing_enabled_event: Aprobación de propuesta habilitada
+      decidim/proposals/evaluating_proposal_event: La propuesta está siendo evaluada
+      decidim/proposals/proposal_endorsed_event: Adherido/a
+      decidim/proposals/proposal_mentioned_event: Propuesta mencionada
+      decidim/proposals/publish_proposal_event: Propuesta publicada
+      decidim/proposals/rejected_proposal_event: Propuesta rechazada
+      decidim/proposals/voting_enabled_event: Votación de propuestas habilitada
+  activerecord:
+    models:
+      decidim/proposals/proposal:
+        one: Propuesta
+        other: Propuestas
+      decidim/proposals/proposal_endorsement:
+        one: Adhesión
+        other: Adhesiones
+      decidim/proposals/proposal_note:
+        one: Nota
+        other: Notas
+      decidim/proposals/proposal_vote:
+        one: Voto
+        other: Votos
   decidim:
     components:
       proposals:
@@ -114,16 +145,10 @@ es:
       participatory_process_groups:
         highlighted_proposals:
           proposals: Propuestas
-        proposal:
-          creation_date: 'Creación: %{date}'
-          view_proposal: Ver propuesta
     participatory_spaces:
       highlighted_proposals:
         proposals: Propuestas
         see_all_proposals: Ver todas las propuestas
-      proposal:
-        creation_date: 'Creación: %{date}'
-        view_proposal: Ver propuesta
     proposals:
       actions:
         answer: Respuesta
@@ -220,6 +245,7 @@ es:
             category: Categoría
             comments: Comentarios
             created_at: Creado el
+            endorsements: Adhesión
             id: Identificador
             notes: Notas
             official_proposal: Propuesta oficial
@@ -269,6 +295,7 @@ es:
         endorsement_identities_cabin:
           endorse: Adherirse
         endorsements_card_row:
+          comments: Comentarios
           endorse: Adherirse
         filters:
           accepted: Aceptadas
@@ -278,6 +305,7 @@ es:
           category_prompt: Selecciona una categoría
           citizens: Ciudadanía
           evaluating: En evaluación
+          except_rejected: Todos excepto rechazados
           official: Oficial
           origin: Origen
           rejected: Rechazadas
@@ -290,10 +318,6 @@ es:
           filter: Filtrar
           filter_by: Filtrar por
           unfold: Desplegar
-        identities_listing:
-          see_all: Ver todo
-          see_less: Ver menos
-          title: Lista de adhesiones
         index:
           new_proposal: Nueva propuesta
           see_all_withdrawn: Ver todas las propuestas retiradas
@@ -322,6 +346,10 @@ es:
           view_proposal: Ver propuesta
         show:
           edit_proposal: Editar propuesta
+          endorsements_list: Lista de adhesiones
+          hidden_endorsers_count:
+            one: y 1 persona más
+            other: y %{count} personas más
           proposal_accepted_reason: 'Esta propuesta ha sido aceptada porque:'
           proposal_in_evaluation_reason: Esta propuesta está siendo evaluada
           proposal_rejected_reason: 'Esta propuesta ha sido rechazada porque:'
@@ -381,9 +409,9 @@ es:
         success: Borrador de propuesta actualizado con éxito.
     resource_links:
       copied_from_component:
-        proposal_proposals: Propuestas relacionadas
+        proposal_proposal: Propuestas relacionadas
       included_projects:
-        project_results: 'Resultados que aparecen en este proyecto:'
+        project_result: 'Resultados que aparecen en este proyecto:'
       included_proposals:
-        proposal_projects: 'Propuesta formulada en estos proyectos:'
-        proposal_results: 'Propuesta formulada en estos resultados:'
+        proposal_project: 'Propuesta formulada en estos proyectos:'
+        proposal_result: 'Propuesta formulada en estos resultados:'

data/config/locales/eu.yml

@@ -16,6 +16,37 @@ eu:
       proposals_copy:
         copy_proposals: Honek hautatutako osagaiaren unekoaren proposamen guztiak inportatuko ditu eta ekintza hori ezin da alderantzikatu.
         origin_component_id: Proposamenen kopia egiteko osagaia
+    errors:
+      models:
+        proposal:
+          attributes:
+            attachment:
+              needs_to_be_reattached: Berriro uzteko beharra
+    models:
+      decidim/proposals/accepted_proposal_event: Onartutako proposamena
+      decidim/proposals/admin/update_proposal_category_event: Proposamen kategoria aldatu da
+      decidim/proposals/creation_enabled_event: Proposamenaren sorrera gaituta
+      decidim/proposals/endorsing_enabled_event: Onartutako proposamena gaituta
+      decidim/proposals/evaluating_proposal_event: Proposamena ebaluatzen ari da
+      decidim/proposals/proposal_endorsed_event: Onartutako proposamena
+      decidim/proposals/proposal_mentioned_event: Proposamena aipatua
+      decidim/proposals/publish_proposal_event: Proposatutakoa argitaratua
+      decidim/proposals/rejected_proposal_event: Proposamena baztertu da
+      decidim/proposals/voting_enabled_event: Proposamenaren botoa gaituta
+  activerecord:
+    models:
+      decidim/proposals/proposal:
+        one: Proposamen
+        other: proposamenak
+      decidim/proposals/proposal_endorsement:
+        one: abal
+        other: Oniritziak
+      decidim/proposals/proposal_note:
+        one: Ohar
+        other: Oharrak
+      decidim/proposals/proposal_vote:
+        one: Bozkatu
+        other: Botoak
   decidim:
     components:
       proposals:
@@ -114,16 +145,10 @@ eu:
       participatory_process_groups:
         highlighted_proposals:
           proposals: proposamenak
-        proposal:
-          creation_date: 'Sorkuntza: %{date}'
-          view_proposal: Ikusi proposamena
     participatory_spaces:
       highlighted_proposals:
         proposals: proposamenak
         see_all_proposals: Ikusi proposamen guztiak
-      proposal:
-        creation_date: 'Sorkuntza: %{date}'
-        view_proposal: Ikusi proposamena
     proposals:
       actions:
         answer: Erantzuna
@@ -220,6 +245,7 @@ eu:
             category: Kategoria
             comments: Oharrak
             created_at: Sortutako at
+            endorsements: Oniritziak
             id: NORTASUN AGIRIA
             notes: Oharrak
             official_proposal: Proposamen ofiziala
@@ -269,6 +295,7 @@ eu:
         endorsement_identities_cabin:
           endorse: gatoz
         endorsements_card_row:
+          comments: Oharrak
           endorse: gatoz
         filters:
           accepted: Onartuta
@@ -278,6 +305,7 @@ eu:
           category_prompt: Aukeratu kategoria bat
           citizens: Hiritarrak
           evaluating: Ebaluatzen
+          except_rejected: Guztiak baztertuak izan ezik
           official: Ofiziala
           origin: Jatorria
           rejected: Ukatua
@@ -290,10 +318,6 @@ eu:
           filter: Iragazi
           filter_by: 'Iragazi honen arabera:'
           unfold: Zabaldu
-        identities_listing:
-          see_all: Dena ikusi
-          see_less: Ikusi gutxiago
-          title: Onarpenen zerrenda
         index:
           new_proposal: Proposamen berria
           see_all_withdrawn: Ikusi guztiak kendutako proposamenak
@@ -322,6 +346,10 @@ eu:
           view_proposal: Ikusi proposamena
         show:
           edit_proposal: Editatu proposamena
+          endorsements_list: Onarpenen zerrenda
+          hidden_endorsers_count:
+            one: eta beste 1 pertsona
+            other: eta beste %{count} pertsona
           proposal_accepted_reason: 'Proposamen hau onartu da arrazoi hauengatik:'
           proposal_in_evaluation_reason: Proposamen hau ebaluatzen ari da
           proposal_rejected_reason: 'Proposamen hau baztertu da arrazoi hauengatik:'
@@ -381,9 +409,9 @@ eu:
         success: Proposamenaren zirriborroa eguneratu da.
     resource_links:
       copied_from_component:
-        proposal_proposals: Lotutako proposamenak
+        proposal_proposal: Lotutako proposamenak
       included_projects:
-        project_results: 'Proiektu honetan agertzen diren emaitzak:'
+        project_result: 'Proiektu honetan agertzen diren emaitzak:'
       included_proposals:
-        proposal_projects: 'Proiektu hauetatik sortutako proposamena:'
-        proposal_results: 'Emaitza hauetatik sortutako proposamena:'
+        proposal_project: 'Proiektu hauetatik sortutako proposamena:'
+        proposal_result: 'Emaitza hauetatik sortutako proposamena:'

data/config/locales/fi.yml

@@ -16,6 +16,37 @@ fi:
       proposals_copy:
         copy_proposals: Ymmärrän, että tämä tuo kaikki valitun komponentin ehdotukset nykyiseen ja että tätä toimintaa ei voi peruuttaa.
         origin_component_id: Komponentti kopioida ehdotukset osoitteesta
+    errors:
+      models:
+        proposal:
+          attributes:
+            attachment:
+              needs_to_be_reattached: Tarvitaan uudelleen
+    models:
+      decidim/proposals/accepted_proposal_event: Ehdotus hyväksytään
+      decidim/proposals/admin/update_proposal_category_event: Ehdotusluokka muuttui
+      decidim/proposals/creation_enabled_event: Ehdotuksen luominen käyttöön
+      decidim/proposals/endorsing_enabled_event: Ehdotuksen hyväksyminen käytössä
+      decidim/proposals/evaluating_proposal_event: Ehdotus arvioidaan
+      decidim/proposals/proposal_endorsed_event: Ehdotus hyväksyttiin
+      decidim/proposals/proposal_mentioned_event: Mainittu ehdotus
+      decidim/proposals/publish_proposal_event: Ehdotus julkaistaan
+      decidim/proposals/rejected_proposal_event: Ehdotus hylättiin
+      decidim/proposals/voting_enabled_event: Ehdotus äänestys sallittu
+  activerecord:
+    models:
+      decidim/proposals/proposal:
+        one: Ehdotus
+        other: ehdotukset
+      decidim/proposals/proposal_endorsement:
+        one: merkintä
+        other: merkintöjen
+      decidim/proposals/proposal_note:
+        one: Huomautus
+        other: Huomautuksia
+      decidim/proposals/proposal_vote:
+        one: Äänestys
+        other: ääntä
   decidim:
     components:
       proposals:
@@ -114,16 +145,10 @@ fi:
       participatory_process_groups:
         highlighted_proposals:
           proposals: ehdotukset
-        proposal:
-          creation_date: 'Luontiaika: %{date}'
-          view_proposal: Näytä ehdotus
     participatory_spaces:
       highlighted_proposals:
         proposals: ehdotukset
         see_all_proposals: Katso kaikki ehdotukset
-      proposal:
-        creation_date: 'Luontiaika: %{date}'
-        view_proposal: Näytä ehdotus
     proposals:
       actions:
         answer: Vastaa
@@ -220,6 +245,7 @@ fi:
             category: Aihepiiri
             comments: Kommentit
             created_at: Luontipäivämäärä
+            endorsements: merkintöjen
             id: ID
             notes: Huomautuksia
             official_proposal: Virallinen ehdotus
@@ -269,6 +295,7 @@ fi:
         endorsement_identities_cabin:
           endorse: hyväksyä
         endorsements_card_row:
+          comments: Kommentit
           endorse: hyväksyä
         filters:
           accepted: Hyväksytty
@@ -278,6 +305,7 @@ fi:
           category_prompt: Valitse aihepiiri
           citizens: Kansalaiset
           evaluating: Arvioitavana
+          except_rejected: Kaikki paitsi hylätty
           official: Virallinen
           origin: Alkuperä
           rejected: Hylätty
@@ -290,10 +318,6 @@ fi:
           filter: Suodata
           filter_by: Suodata
           unfold: Avaa
-        identities_listing:
-          see_all: Nähdä kaikki
-          see_less: Katso vähemmän
-          title: Luettelo hyväksynnästä
         index:
           new_proposal: Uusi ehdotus
           see_all_withdrawn: Näytä kaikki peruutetut ehdotukset
@@ -322,6 +346,10 @@ fi:
           view_proposal: Näytä ehdotus
         show:
           edit_proposal: Muokkaa ehdotusta
+          endorsements_list: Luettelo hyväksynnästä
+          hidden_endorsers_count:
+            one: ja vielä yksi henkilö
+            other: ja %{count} muuta ihmistä
           proposal_accepted_reason: 'Tämä ehdotus on hyväksytty, koska:'
           proposal_in_evaluation_reason: Tämä ehdotus on arvioitavana
           proposal_rejected_reason: 'Tämä ehdotus on hylätty, koska:'
@@ -381,9 +409,9 @@ fi:
         success: Ehdotusluonnos on päivitetty onnistuneesti.
     resource_links:
       copied_from_component:
-        proposal_proposals: Vastaavat ehdotukset
+        proposal_proposal: Vastaavat ehdotukset
       included_projects:
-        project_results: 'Tässä projektissa näkyvät tulokset:'
+        project_result: 'Tässä projektissa näkyvät tulokset:'
       included_proposals:
-        proposal_projects: 'Ehdotus esiintyy näissä projekteissa:'
-        proposal_results: 'Ehdotus esiintyy näissä tuloksissa:'
+        proposal_project: 'Ehdotus esiintyy näissä projekteissa:'
+        proposal_result: 'Ehdotus esiintyy näissä tuloksissa:'