decidim-budgets 0.30.2 → 0.31.0.rc1

data/app/views/decidim/budgets/projects/_project_budget_button.html.erb

@@ -1,11 +1,3 @@
 <div id="project-<%= project.id %>-budget-button">
-  <% if current_user.blank? %>
-      <button class="button button__lg w-full button__secondary"
-        data-dialog-open="loginModal"
-        aria-label="<%= t(".added_descriptive", resource_name: translated_attribute(project.title)) %>">
-        <%= t("add", scope: "decidim.budgets.projects.project_budget_button") %>
-      </button>
-  <% else %>
-    <%= cell("decidim/budgets/project_vote_button", project, project_item: true) %>
-  <% end %>
+  <%= cell("decidim/budgets/project_vote_button", project, project_item: true, button_extra_classes: "w-full") %>
 </div>

data/app/views/decidim/budgets/projects/_projects.html.erb

@@ -1,6 +1,8 @@
 <div class="budget__list--header">
   <div>
-    <%= render partial: "addition_selector" %>
+    <% if voting_open? %>
+      <%= render partial: "addition_selector" %>
+    <% end %>
   </div>
 
   <div data-collection-sort-controls>

data/app/views/decidim/budgets/projects/index.html.erb

@@ -1,3 +1,9 @@
+<% if @focus_mode %>
+  <% content_for :focus_mode, true %>
+  <% content_for :focus_mode_return_path, budgets_path %>
+  <% content_for :focus_mode_return_string, t("decidim.budgets.projects.back_to_budgets") %>
+<% end %>
+
 <% add_decidim_meta_tags(
   description: translated_attribute(budget.description),
   title: t("decidim.components.pagination.page_title",
@@ -10,7 +16,10 @@
 <%= append_javascript_pack_tag "decidim_budgets" %>
 <%= append_stylesheet_pack_tag "decidim_budgets" %>
 
-<%= render partial: "budget_summary", locals: { include_heading: true, project_item: false, responsive: true } %>
+<% if @focus_mode %>
+  <%= render partial: "budget_summary", locals: { responsive: true, focus_mode_origin: "index" } %>
+<% end %>
+
 <%= cell("decidim/budgets/budget_information_modal", budget) %>
 
 <% content_for :aside do %>
@@ -27,9 +36,9 @@
     <%= render partial: "budget_excess" %>
     <%= render partial: "budget_confirm" %>
 
-    <% unless voting_finished? %>
+    <% if @focus_mode && !voting_finished? %>
       <div class="budget-summary__container">
-        <%= render partial: "budget_summary", locals: { include_heading: true, project_item: false, responsive: false } %>
+        <%= render partial: "budget_summary", locals: { responsive: false, focus_mode_origin: "index" } %>
       </div>
     <% end %>
 
@@ -43,9 +52,19 @@
 
     <% unless voting_finished? %>
       <section class="layout-main__section">
-        <span class="text-xl font-semibold">
-          <%= t("select_projects", scope: "decidim.budgets.projects") %>
-        </span>
+        <div class="flex justify-between items-center mb-4">
+          <div class="flex items-center gap-2">
+            <span class="text-xl font-semibold">
+              <%= t("select_projects", scope: "decidim.budgets.projects") %>
+            </span>
+
+            <% if cell("decidim/budgets/budget_information_modal", budget).more_information.present? %>
+              <button type="button" data-dialog-open="budget-modal-info" aria-haspopup="dialog" tabindex="0" class="button button__icon button__text-secondary lg:hidden">
+                <%= icon "question-line" %>
+              </button>
+            <% end %>
+          </div>
+        </div>
       </section>
     <% end %>
 
@@ -56,4 +75,7 @@
     <%= cell("decidim/announcement", t("empty", scope: "decidim.budgets.projects")) %>
   <% end %>
 
+  <% if current_user&.ephemeral? %>
+    <div class="h-40 bg-transparent"></div>
+  <% end %>
 <% end %>

data/app/views/decidim/budgets/projects/order_progress_summary/_content.html.erb

@@ -0,0 +1,30 @@
+<div data-order-progress-responsive="false" class="budget-summary__content">
+  <%= 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>
+
+  <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">
+      <%= render partial: "decidim/budgets/projects/order_progress_summary/progress_box_sticky" %>
+
+      <div class="layout-item__aside budget-summary__progressbox-buttons hidden lg:block">
+        <% if !current_order_checked_out? && voting_open? %>
+          <button class="button button__secondary button__lg mt-2 md:mt-0 w-full" data-dialog-open="budget-confirm" <%= budget_confirm_disabled_attr %>>
+            <%= t("vote", scope: "decidim.budgets.projects.budget_summary") %>
+          </button>
+        <% end %>
+        <% if current_order_checked_out? %>
+          <%= link_to budget_order_path(return_to: "budget"), method: :delete, class: "button button__lg button__secondary cancel-order w-full mt-2 md:mt-0", data: { confirm: t("are_you_sure", scope: "decidim.budgets.projects.budget_confirm") } do %>
+            <span><%= t("cancel_order", scope: "decidim.budgets.projects.budget_summary") %></span>
+            <%= icon "delete-bin-line" %>
+          <% end %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/decidim/budgets/projects/order_progress_summary/_content_responsive.html.erb

@@ -0,0 +1,56 @@
+<% focus_mode_index = local_assigns[:focus_mode_origin] == "index" %>
+<% focus_mode_show = local_assigns[:focus_mode_origin] == "show" %>
+<% start_voting_param = params[:start_voting] %>
+
+<% show_vote_button = !current_order_checked_out? && voting_open? && current_order_can_be_checked_out? %>
+<% show_hint = !show_vote_button && start_voting_param.present? %>
+
+<div data-order-progress-responsive="true" class="bg-transparent">
+  <% if show_hint %>
+    <div id="progress-summary-backdrop" class="fixed hidden inset-0 z-40 bg-black/50"></div>
+  <% end %>
+
+  <div class="fixed bottom-0 left-0 z-50 flex flex-col w-full" data-controller="sticky-buttons">
+    <div class="budget-summary__content rounded-t-lg" data-progressbox-fixed>
+      <div class="flex items-center justify-between">
+        <%= render partial: "decidim/budgets/projects/order_progress_summary/progress_box" %>
+        <button
+          id="progress-summary-button"
+          data-controller="dropdown"
+          data-target="progress-summary-dropdown-menu"
+          data-open="<%= show_hint ? "true" : "false" %>"
+          aria-expanded="<%= show_hint ? "true" : "false" %>"
+          class="w-auto pr-0 cursor-pointer">
+          <%= icon "arrow-up-s-line" %>
+          <%= icon "arrow-down-s-line" %>
+        </button>
+      </div>
+      <div class="pt-5" id="progress-summary-dropdown-menu" aria-hidden="<%= show_hint ? "false" : "true" %>">
+        <ul class="list-disc">
+          <li>
+            <%= current_rule_description %>
+          </li>
+        </ul>
+      </div>
+    </div>
+
+    <% if focus_mode_show %>
+      <div class="p-4 bg-white">
+        <%= render partial: "decidim/budgets/projects/project_budget_button" %>
+      </div>
+    <% elsif focus_mode_index && show_vote_button %>
+      <div class="p-4 bg-white">
+        <button class="button button__secondary button__lg w-full" data-dialog-open="budget-confirm">
+          <%= t("vote", scope: "decidim.budgets.projects.budget_summary") %>
+        </button>
+      </div>
+    <% elsif focus_mode_index && current_order_checked_out? %>
+      <div class="p-4 bg-white">
+        <%= link_to budget_order_path(return_to: "budget"), method: :delete, class: "button button__lg button__secondary cancel-order w-full", data: { confirm: t("are_you_sure", scope: "decidim.budgets.projects.budget_confirm") } do %>
+          <span><%= t("cancel_order", scope: "decidim.budgets.projects.budget_summary") %></span>
+          <%= icon "delete-bin-line" %>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/budgets/projects/order_progress_summary/_progress_box.html.erb

@@ -0,0 +1,43 @@
+<div class="budget-summary__progressbox w-full" data-current-allocation="<%= current_order ? current_order.total : 0 %>">
+  <% if current_order_checked_out? %>
+    <%= t("title", scope: "decidim.budgets.projects.budget_summary.checked_out") %>
+    <div class="budget-summary__content__header">
+      <span class="budget-summary__content__header--title">
+        <%= t("name", scope: "decidim.components.budgets") %>
+      </span>
+      /
+      <%= translated_attribute(budget.title) %>
+      <p class="budget-summary__content__header--description">
+        <%= t("description", scope: "decidim.budgets.projects.budget_summary.checked_out") %>
+      </p>
+    </div>
+  <% else %>
+    <p class="budget-summary__progressbox--checked_out">
+      <%= current_rule_description %>
+    </p>
+  <% end %>
+  <div class="budget-summary__progressbar">
+    <div class="budget-progress" role="progressbar" aria-label="<%= t("budget", scope: "decidim.budgets.projects.order_progress") %>" aria-valuenow="<%= current_order_budget_percent %>" aria-valuetext="<%= current_order_budget_percent %> %" aria-valuemin="0" aria-valuemax="100">
+      <div class="budget-summary__progressbar--minimum" style="width: <%= current_order_budget_percent_minimum %>%">
+      </div>
+      <div class="budget-summary__progressbar--meter bg-success" style="width: <%= current_order_budget_percent %>%"> </div>
+    </div>
+    <div class="budget-summary__progressbar-marks">
+      <span class="budget-summary__progressbar-legend">
+        <strong id="order-total-budget" class="budget-summary__progressbar-legend-strong">
+          <%= render partial: "decidim/budgets/projects/order_total_budget" %>
+        </strong>
+        <%= t("assigned", scope: "decidim.budgets.projects.order_progress") %>
+      </span>
+      <% if current_order.minimum_budget > 0 %>
+        <span class="budget-summary__progressbar-legend budget-summary__progressbar-marks_center">
+          <strong class="budget-summary__progressbar-legend-strong">
+            <%= budget_to_currency(current_order.minimum_budget) %>
+          </strong>
+          <%= t("minimum", scope: "decidim.budgets.projects.order_progress") %>
+        </span>
+      <% end %>
+      <%= render partial: "decidim/budgets/projects/order_progress_summary/progressbar_marks_right" %>
+    </div>
+  </div>
+</div>

data/app/views/decidim/budgets/projects/order_progress_summary/_progress_box_buttons.html.erb

@@ -0,0 +1,12 @@
+<div class="budget-summary__progressbox-buttons layout-aside__ctas-buttons" data-controller="sticky-buttons">
+  <% if !current_order_checked_out? && voting_open? %>
+    <button class="button button__secondary button__lg w-full" data-dialog-open="budget-confirm" <%= budget_confirm_disabled_attr %>>
+      <%= t("vote", scope: "decidim.budgets.projects.budget_summary") %>
+    </button>
+  <% elsif current_order_checked_out? %>
+    <%= link_to budget_order_path(return_to: "budget"), method: :delete, class: "button button__lg button__secondary cancel-order w-full", data: { confirm: t("are_you_sure", scope: "decidim.budgets.projects.budget_confirm") } do %>
+      <span><%= t("cancel_order", scope: "decidim.budgets.projects.budget_summary") %></span>
+      <%= icon "delete-bin-line" %>
+    <% end %>
+  <% end %>
+</div>

data/app/views/decidim/budgets/projects/order_progress_summary/_progress_box_sticky.html.erb

@@ -0,0 +1,25 @@
+<div class="budget-summary__progressbox layout-item__main">
+  <div class="budget-progress relative" role="progressbar" aria-valuenow="<%= current_order_budget_percent %>" aria-valuetext="<%= current_order_budget_percent %>%" aria-valuemin="0" aria-valuemax="100">
+    <div class="budget-summary__progressbar--minimum" style="width: <%= current_order_budget_percent_minimum %>%">
+    </div>
+    <div class="budget-summary__progressbar--meter bg-success" style="width: <%= current_order_budget_percent %>%">
+    </div>
+  </div>
+  <div class="budget-summary__progressbar-marks">
+    <span class="budget-summary__progressbar-legend" style="width: <%= current_order_budget_percent_minimum %>%;">
+      <%= t("assigned", scope: "decidim.budgets.projects.order_progress") %>
+      <strong id="order-total-budget-sticky" class="budget-summary__progressbar-legend-strong">
+        <%= render partial: "decidim/budgets/projects/order_total_budget" %>
+      </strong>
+    </span>
+    <% if current_order.minimum_budget > 0 %>
+    <span class="budget-summary__progressbar-legend budget-summary__progressbar-marks_center">
+      <%= t("minimum", scope: "decidim.budgets.projects.order_progress") %>
+      <strong class="budget-summary__progressbar-legend-strong">
+        <%= budget_to_currency(current_order.minimum_budget) %>
+      </strong>
+    </span>
+    <% end %>
+    <%= render partial: "decidim/budgets/projects/order_progress_summary/progressbar_marks_right" %>
+  </div>
+</div>

data/app/views/decidim/budgets/projects/show.html.erb

@@ -1,3 +1,8 @@
+<% if @focus_mode %>
+  <% content_for :focus_mode, true %>
+  <% content_for :focus_mode_return_path, budget_projects_path(budget) %>
+<% end %>
+
 <% add_decidim_meta_tags(
   title: translated_attribute(project.title),
   description: translated_attribute(project.description),
@@ -20,14 +25,6 @@ edit_link(
 <%= render partial: "exit_modal" %>
 
 <div id="project-item">
-  <%= render partial: "budget_summary", locals: { include_heading: true, project_item: true, responsive: true } %>
-  <% content_for :item_header do %>
-    <% unless voting_finished? %>
-      <%= render partial: "budget_summary", locals: { include_heading: true, project_item: true, responsive: false } %>
-      <%= render partial: "budget_excess" %>
-      <%= render partial: "budget_confirm" %>
-    <% end %>
-  <% end %>
   <%= render layout: "layouts/decidim/shared/layout_item", locals: { back_path: budget_projects_path(budget) } do %>
     <section class="layout-main__section layout-main__heading">
       <%= cell("decidim/budgets/budget_information_modal", budget) %>
@@ -38,12 +35,12 @@ edit_link(
           <%= render partial: "decidim/shared/static_map", locals: { icon_name: "projects", geolocalizable: project } %>
         </div>
       <% end %>
-      <%= cell("decidim/budgets/project_selected_status", project, as_label: true) %>
+      <%= cell("decidim/budgets/project_selected_status", project) %>
 
       <div class="layout-author">
         <div class="relative flex items-center justify-center w-full">
           <div class="w-10/12 flex items-center gap-4">
-            <h1 class="h1 decorator budget__definition-project__title editor-content">
+            <h1 class="h2 decorator">
               <%= decidim_sanitize translated_attribute project.title %>
             </h1>
           </div>
@@ -58,7 +55,7 @@ edit_link(
     </section>
     <section class="layout-main__section">
       <% if tabs.any? %>
-        <div class="mt-8" data-component="accordion" data-multiselectable="false" data-collapsible="false">
+        <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>
@@ -89,19 +86,31 @@ edit_link(
     </section>
 
     <% content_for :aside do %>
-      <section class="layout-aside__section layout-aside__buttons">
-        <% if voting_open? %>
-          <%= render partial: "project_budget_button", locals: { project: } %>
-        <% end %>
-      </section>
       <section class="layout-aside__section">
         <span class="budget__definition-data__title">
           <%= t("budget", scope: "decidim.budgets.projects.show") %>
         </span>
         <div class="budget__definition-data__number">
-          <%= budget_to_currency project.budget_amount %>
+          <%= budget_to_currency_with_html project.budget_amount %>
         </div>
       </section>
+
+      <% if show_votes_count? %>
+        <section class="layout-aside__section">
+          <span class="budget__definition-data__title">
+            <%= t("votes", scope: "decidim.budgets.projects.show") %>
+          </span>
+          <div class="budget__definition-data__number" data-spec-project-votes>
+            <%= cell "decidim/budgets/project_votes_count", project %>
+          </div>
+        </section>
+      <% end %>
+
+      <% if current_order_checked_out? && resource_added?(project) %>
+        <section class="mt-4">
+          <%= cell("decidim/budgets/project_voted_hint", project, class: "margin-left-1") %>
+        </section>
+      <% end %>
     <% end %>
     <% content_for :item_footer do %>
       <%= comments_for project, polymorphic: [project.budget] %>
@@ -110,4 +119,8 @@ edit_link(
       </ul>
     <% end %>
   <% end %>
+
+  <% if current_user&.ephemeral? %>
+    <div class="h-40 bg-transparent"></div>
+  <% end %>
 </div>

data/config/assets.rb

@@ -2,8 +2,8 @@
 
 base_path = File.expand_path("..", __dir__)
 
-Decidim::Webpacker.register_path("#{base_path}/app/packs")
-Decidim::Webpacker.register_entrypoints(
+Decidim::Shakapacker.register_path("#{base_path}/app/packs")
+Decidim::Shakapacker.register_entrypoints(
   decidim_budgets: "#{base_path}/app/packs/entrypoints/decidim_budgets.js",
   decidim_budgets_admin: "#{base_path}/app/packs/entrypoints/decidim_budgets_admin.js"
 )

data/config/locales/ar.yml

@@ -22,10 +22,7 @@ ar:
   decidim:
     budgets:
       actions:
-        attachment_collections: المجلدات
-        attachments: مرفقات
         edit: تعديل
-        edit_projects: إدارة المشاريع
         import: استيراد مقترحات للمشاريع
         preview: معاينة
         title: أفعال
@@ -37,8 +34,6 @@ ar:
         exports:
           projects: المشاريع
         models:
-          budget:
-            name: ميزانية
           project:
             name: مشروع
         projects:
@@ -96,7 +91,6 @@ ar:
           ok: حسنا
         budget_summary:
           are_you_sure: هل أنت متأكد أنك تريد إلغاء تصويتك؟
-          cancel_order: احذف صوتك وابدأ من جديد
           checked_out:
             title: اكتمال التصويت في الميزانية
         count:
@@ -133,7 +127,5 @@ ar:
             show_votes: إظهار الأصوات
             votes_choices:
               enabled: تم تمكين التصويت
-    statistics:
-      projects_count: مشاريع
   index:
     confirmed_orders_count: عدد الأصوات

data/config/locales/bg.yml

@@ -35,10 +35,7 @@ bg:
               'true': Не избран за изпълнение
     budgets:
       actions:
-        attachment_collections: Папки
-        attachments: Прикачени файлове
         edit: Редактирай
-        edit_projects: Обедини проекти
         import: Импортиране на предложения в проекти
         new_budget: Нов бюджет
         new_project: Нов проект
@@ -68,8 +65,6 @@ bg:
         exports:
           projects: Проекти
         models:
-          budget:
-            name: Бюджет
           project:
             name: Проект
         projects:
@@ -180,6 +175,8 @@ bg:
       order:
         status:
           title: Вашият глас е приет успешно
+      order_pdf:
+        title: Вашият глас е приет успешно.
       order_summary_mailer:
         order_summary:
           selected_projects: 'Избраните от Вас проекти са:'
@@ -203,7 +200,6 @@ bg:
             title: Максималният брой проекти е надвишен
         budget_summary:
           are_you_sure: Сигурен ли сте, че искате да отмените гласа си?
-          cancel_order: изтрийте Вашия глас
           checked_out:
             description: Вие вече гласувахте бюджета. Ако сте променили решението си, можете да изтриете гласа си.
             title: Гласуването за бюджета приключи
@@ -229,18 +225,8 @@ bg:
           assigned: Възложен
           budget: Бюджет
           dynamic_help:
-            keep_adding_projects: Продължете да добавяте проекти
             minimum_reached: Достигнахте минимума, за да можете да гласувате
-            start_adding_projects: Започнете да добавяте проекти
           minimum: Минимум
-          minimum_projects_rule:
-            description: Изберете поне %{minimum_number} желани от Вас проекта и гласувайте, според предпочитанията си за дефиниране на бюджета.
-          projects_rule:
-            description: Изберете най-малко %{minimum_number}, но не повече от %{maximum_number} желани от Вас проекта и гласувайте, според предпочитанията си за дефиниране на бюджета.
-          projects_rule_maximum_only:
-            description: Изберете не повече от %{maximum_number} желани от Вас проекта и гласувайте, според предпочитанията си за дефиниране на бюджета.
-          vote_threshold_percent_rule:
-            description: Присъеденете поне %{minimum_budget} към желаните от вас проекти и гласувайте, според предпочитанията си за дефиниране на бюджета.
         orders:
           highest_cost: Най-висока стойност
           label: Подреждане на проектите по
@@ -265,7 +251,6 @@ bg:
           added: Добавено
           all: Всички
         projects_for: Проекти за %{name}
-        select_projects: Изберете Проекти
         show:
           budget: Бюджет
       prompt: Изберете бюджет
@@ -342,6 +327,5 @@ bg:
         project_proposal: Предложения, включени в този проект
     statistics:
       orders_count: Подкрепа
-      projects_count: Проекти
   index:
     confirmed_orders_count: Брой гласове

data/config/locales/ca-IT.yml

@@ -42,15 +42,15 @@ ca-IT:
               'true': No s'ha seleccionat per implementar
           taxonomies_part_of_contains:
             label: Taxonomia
+      tooltips:
+        deleted_projects_info: No podeu eliminar aquest projecte
     budgets:
       actions:
-        attachment_collections: Carpetes
-        attachments: Adjunts
         confirm_delete_budget: Segur que vols suprimir aquest pressupost?
         confirm_delete_project: Segur que vols eliminar aquest projecte?
         deleted_budgets_info: Els pressupostos eliminats es poden restaurar des de la paperera.
         edit: Editar
-        edit_projects: Gestionar projectes
+        edit_projects: Afegir projectes
         import: Importa propostes a projectes
         new_budget: Afegir pressupost
         new_project: Afegir projecte
@@ -84,8 +84,6 @@ ca-IT:
         exports:
           projects: Projectes
         models:
-          budget:
-            name: Pressupost
           project:
             name: Projecte
         projects:
@@ -179,6 +177,7 @@ ca-IT:
         cancel_order:
           more_than_one: eliminar el teu vot a %{name} i començar de nou
           only_one: eliminar el teu vot i començar de nou.
+        completed: Completat
         count:
           one: "%{count} pressupost"
           other: "%{count} pressupostos"
@@ -186,6 +185,7 @@ ca-IT:
         finished_message: Has finalitzat el procés de votació. Gràcies per participar-hi!
         highlighted_cta: Votar a %{name}
         if_change_opinion: Si has canviat d'opinió, pots
+        incomplete: Incomplet
         orders:
           highest_cost: Cost més elevat
           label: Ordenar projectes per
@@ -193,6 +193,8 @@ ca-IT:
           random: Ordre aleatori
         progress: Acaba la votació
         remove_vote: Eliminar el vot
+        see_projects: Mostra els projectes
+        see_results: Veure els resultats
         show: Mostra els projectes
         vote: Vota
         voted_budgets: Pressupostos votats
@@ -223,6 +225,7 @@ ca-IT:
           pending_to_vote_budgets:
             one: Pots votar en un altre pressupost
             other: Pots votar en altres pressupostos
+          share_text: "Acabes de votar pels teus projectes favorits a: \"%{space_name}\"!  🎉 Pots seguir votant a: \"%{component_url}\""
           share_vote: Comparteix el teu vot
           title: El teu vot s'ha tramitat correctament
           view_votes:
@@ -231,12 +234,16 @@ ca-IT:
           votes_count:
             one: El teu vot a %{budget_name} ja s'ha registrat.
             other: El teus %{count} vots a %{budget_name} ja s'han registrat.
+      order_pdf:
+        text: 'Has votat a "%{space_name}", on has seleccionat els projectes següents:'
+        title: El teu vot s'ha acceptat correctament.
       order_summary_mailer:
         order_summary:
           selected_projects: 'Els projectes que has seleccionat són:'
           subject: Has votat a l'espai de participació %{space_name}
           voted_on_space: Has votat al pressupost %{budget_name} de l'espai de participació %{space_name}.
       projects:
+        back_to_budgets: Tornar als pressupostos
         budget_confirm:
           are_you_sure: Si canvies d'opinió, pots modificar el teu vot més tard.
           cancel: Cancel·lar
@@ -254,7 +261,7 @@ ca-IT:
             title: Màxim de projectes excedit
         budget_summary:
           are_you_sure: Segur que vols cancel·lar el teu vot?
-          cancel_order: eliminar el teu vot i començar de nou
+          cancel_order: Esborra el teu vot
           checked_out:
             description: Ja has votat pel pressupost. Si has canviat d'idea, pots esborrar el teu vot.
             title: Vot pels pressupostos completat
@@ -280,18 +287,16 @@ ca-IT:
           assigned: Assignat
           budget: Pressupost
           dynamic_help:
-            keep_adding_projects: Seguir afegint projectes
             minimum_reached: Has arribat al mínim per a poder votar
-            start_adding_projects: Començar a afegir projectes
           minimum: Mínim
           minimum_projects_rule:
-            description: Selecciona com a mínim %{minimum_number} projectes que vulguis i vota segons les teves preferències per a definir el pressupost.
+            description: "<b>Selecciona com a mínim %{minimum_number} projectes</b> que vulguis i vota segons les teves preferències."
           projects_rule:
-            description: Selecciona entre %{minimum_number} i %{maximum_number} projectes que vulguis i vota segons les teves preferències per a definir el pressupost.
+            description: "<b>Selecciona entre %{minimum_number} i %{maximum_number} projectes</b> que vulguis i vota segons les teves preferències per a definir el pressupost."
           projects_rule_maximum_only:
-            description: Selecciona fins a %{maximum_number} projectes que vulguis i vota segons les teves preferències per a definir el pressupost.
+            description: "<b>Selecciona fins a %{maximum_number} projectes</b> que vulguis i vota segons les teves preferències."
           vote_threshold_percent_rule:
-            description: Assigna com a mínim %{minimum_budget} amb els projectes que vulguis i vota segons les teves preferències per a definir el pressupost.
+            description: "Selecciona els projectes que vulguis <b>fins com a mínim el %{minimum_budget} del total del pressupost</b> i vota segons les teves preferències."
         orders:
           highest_cost: Major cost
           label: Ordenar projectes per
@@ -316,9 +321,10 @@ ca-IT:
           added: Afegit
           all: Tots
         projects_for: Projectes per a %{name}
-        select_projects: Selecciona projectes
+        select_projects: Afegeix projectes
         show:
           budget: Pressupost
+          votes: Vots
       prompt: Seleccionar pressupost
       vote_reminder_mailer:
         vote_reminder:
@@ -363,6 +369,11 @@ ca-IT:
             vote_selected_projects_maximum: Número màxim de projectes a seleccionar
             vote_selected_projects_minimum: Número màxim de projectes a seleccionar
             vote_threshold_percent: Percentatge del pressupost mínim per fer el vot
+            voting_rule: Normes per a la votació
+            voting_rule_choices:
+              minimum_projects: Número mínim de projectes a votar
+              selected_projects: Número mínim i màxim de projectes a votar
+              threshold_percent: Percentatge mínim del pressupost a invertir
             workflow: Workflow
             workflow_choices:
               all: 'Votar a tots: permet a les participants votar a tots els pressupostos.'
@@ -436,6 +447,7 @@ ca-IT:
         project_proposal: Propostes incloses en aquest projecte
     statistics:
       orders_count: Suports
-      projects_count: Projectes
+      projects_count: Pressupostos
+      projects_count_tooltip: El número de pressupostos participatius i el total de vots emesos en aquests.
   index:
     confirmed_orders_count: Recompte de vots