decidim-core 0.29.4 → 0.29.6

data/app/packs/stylesheets/decidim/_header.scss

@@ -61,7 +61,7 @@ header {
       @apply hidden md:block col-span-2 col-start-5 xl:col-start-4;
 
       form {
-        @apply block relative rounded text-md bg-background;
+        @apply block relative rounded text-md border border-neutral-200 outline outline-1 outline-transparent rounded bg-background-2 leading-relaxed;
       }
 
       input[type="text"] {
@@ -69,7 +69,7 @@ header {
       }
 
       button[type="submit"] {
-        @apply absolute ltr:right-2 rtl:left-2 inset-y-2 text-secondary;
+        @apply absolute ltr:right-2 rtl:left-2 inset-y-0 text-secondary px-2;
       }
     }
 
@@ -404,7 +404,7 @@ header {
         @apply w-full px-4;
 
         &-menu {
-          @apply w-full md:w-1/2 mt-0 grid md:grid-cols-2 gap-x-6 text-secondary;
+          @apply w-full md:w-[100%] mt-0 grid md:grid-cols-2 gap-x-6 text-secondary;
 
           > * {
             @apply py-3 md:py-3.5 border-b last:border-0 border-gray-3;
@@ -431,6 +431,14 @@ header {
 
       &__bottom {
         @apply hidden md:flex;
+
+        &-right {
+          @apply mr-2 mb-2;
+        }
+
+        &-left {
+          @apply mr-2 mt-1;
+        }
       }
 
       &__title {

data/app/packs/stylesheets/decidim/_layout.scss

@@ -2,11 +2,11 @@
   @apply flex flex-col min-h-screen;
 
   &__skip {
-    @apply absolute z-10 left-0 -translate-x-full py-1 px-4 bg-primary rounded-br-lg text-white cursor-pointer transition focus:translate-x-0;
+    @apply absolute z-[9999] left-0 -translate-x-full py-1 px-4 bg-primary rounded-br-lg text-white cursor-pointer transition focus:translate-x-0;
   }
 
   [data-content] {
-    @apply relative flex flex-col;
+    @apply relative flex flex-col flex-1;
   }
 }
 

data/app/packs/stylesheets/decidim/_modal.scss

@@ -18,15 +18,11 @@
   }
 
   [data-dialog-container] {
-    @apply grid grid-cols-[auto_1fr] items-start md:items-center gap-2 text-left;
+    @apply grid grid-rows-[auto_1fr] items-start md:items-center gap-2 text-left;
 
     > svg {
       @apply w-6 h-6 text-gray fill-current flex-none;
     }
-
-    > :last-child {
-      @apply col-span-2 md:col-span-1 md:col-start-2;
-    }
   }
 
   [data-dialog-title] {

data/app/packs/stylesheets/decidim/_modal_update.scss

@@ -132,8 +132,12 @@
       }
 
       span {
-        @apply text-sm text-gray-2 mx-auto;
+        @apply text-sm text-gray-2 mx-auto w-full break-all mb-2;
       }
     }
   }
+
+  &__span {
+    @apply w-full break-all mb-2;
+  }
 }

data/app/packs/stylesheets/decidim/_profile.scss

@@ -9,18 +9,18 @@
     &-container {
       @apply w-24 h-24 relative;
     }
+  }
+
+  &__details {
+    @apply pb-3 space-y-2;
 
     &-badge {
-      @apply absolute top-full right-0 -translate-y-full grid place-items-center w-6 h-6 rounded-full overflow-hidden bg-primary border border-white;
+      @apply flex items-center gap-1 text-sm text-gray-2;
 
       svg {
-        @apply w-4 h-4 text-white fill-current;
+        @apply w-4 h-4 inline-block bg-primary rounded-full text-white fill-current;
       }
     }
-  }
-
-  &__details {
-    @apply pb-3 space-y-2;
 
     &-data {
       @apply flex flex-wrap gap-x-6 gap-y-4;

data/app/packs/stylesheets/decidim/editor.scss

@@ -89,7 +89,9 @@
     }
 
     .ProseMirror {
-      @apply relative p-2.5 outline-0 min-h-full prose max-w-none prose-headings:first:mt-0 prose-p:first:mt-0 prose-ul:first:mt-0 prose-ol:first:mt-0 prose-blockquote:first:mt-0 prose-pre:first:mt-0;
+      @apply relative p-2.5 outline-0 resize-y overflow-hidden prose max-w-none prose-headings:first:mt-0 prose-p:first:mt-0 prose-ul:first:mt-0 prose-ol:first:mt-0 prose-blockquote:first:mt-0 prose-pre:first:mt-0;
+
+      min-height: inherit;
 
       &.ProseMirror-focused,
       &.dialog-open {

data/app/permissions/decidim/permissions.rb

@@ -106,7 +106,19 @@ module Decidim
         return allow! if component.current_settings.amendment_creation_enabled
       when :accept,
           :reject
-        return allow! if component.current_settings.amendment_reaction_enabled
+        return disallow! unless component.current_settings.amendment_reaction_enabled
+
+        amendable = context.fetch(:amendable, nil)
+
+        if amendable.respond_to?(:official?) && amendable.official?
+          return allow! if user.admin?
+
+          return disallow!
+        end
+
+        return disallow! unless amendable.authored_by?(user)
+
+        return allow!
       when :promote
         return allow! if component.current_settings.amendment_promotion_enabled
       end

data/app/validators/password_validator.rb

@@ -55,7 +55,9 @@ class PasswordValidator < ActiveModel::EachValidator
   attr_reader :record, :attribute, :value
 
   def get_message(reason)
-    I18n.t "password_validator.#{reason}"
+    I18n.t! "password_validator.#{reason}"
+  rescue I18n::MissingTranslationData
+    I18n.t "password_validator.fallback"
   end
 
   def organization

data/app/views/decidim/application/_document.html.erb

@@ -1,8 +1,8 @@
 <div id="<%= dom_id(document) %>">
   <div class="card__list-content">
-    <%= link_to document.url, target: "_blank", rel: "noopener noreferrer", class: "card__list-title", title: t("decidim.application.document.download") do %>
+    <span class="card__list-title">
       <%= h attachment_title(document) %>
-    <% end %>
+    </span>
     <% if document.description.present? %>
       <div class="card__list-text"><%= decidim_escape_translated(document.description) %></div>
     <% end %>

data/app/views/decidim/errors/internal_server_error.html.erb

@@ -1,6 +1,6 @@
 <%= render layout: "layouts/decidim/shared/layout_center" do %>
 
-  <div class="place-self-center">
+  <div class="flex flex-col items-center">
     <div class="flex justify-center">
       <h1 class="title-decorator my-12"><%= t("title", scope: "decidim.errors.internal_server_error") %></h1>
     </div>

data/app/views/decidim/errors/not_found.html.erb

@@ -1,6 +1,6 @@
 <%= render layout: "layouts/decidim/shared/layout_center" do %>
 
-  <div class="place-self-center">
+  <div class="flex flex-col items-center">
     <div class="flex justify-center">
       <h1 class="title-decorator my-12"><%= t("title", scope: "decidim.errors.not_found") %></h1>
     </div>

data/app/views/decidim/newsletters/unsubscribe.html.erb

@@ -1,4 +1,16 @@
-<div class="row">
-  <h4><%== t ".unsubscribe" %></h4>
-  <p><%== t ".check_subscription", link: decidim.notifications_settings_path %></p>
-</div>
+<main class="layout-1col cols-6">
+  <div class="text-center py-12">
+    <h1 class="h1 decorator inline-block text-left"><%= t ".unsubscribe" %></h1>
+  </div>
+  <div class="page__container">
+    <div class="editor-content">
+      <div class="rich-text-display">
+        <%= t ".subscription_preferences", organization_name: translated_attribute(current_organization.name) %>
+      </div>
+      <br>
+      <div class="rich-text-display">
+        <%= t ".check_subscription_html", link: decidim.notifications_settings_path %>
+      </div>
+    </div>
+  </div>
+</main>

data/app/views/decidim/searches/_filters.html.erb

@@ -12,35 +12,70 @@
       <%= icon "arrow-down-s-line", class: "w-8 h-8 flex-none text-secondary fill-current" %>
       <%= icon "arrow-up-s-line", class: "w-8 h-8 flex-none text-secondary fill-current" %>
     </button>
-    <div id="dropdown-menu-search" aria-hidden="true">
-      <div>
-        <%= link_to main_search_path, class: "filter#{" is-active" if params.dig(:filter, :with_resource_type) == nil}" do %>
+    <ul id="dropdown-menu-search" aria-hidden="true">
+      <li>
+        <%= link_to main_search_path, class: "filter#{" is-active" if params.dig(:filter, :with_resource_type) == nil}", "aria-current": params.dig(:filter, :with_resource_type) == nil ? "true" : "" do %>
           <%= resource_type_icon("all") %>
           <span><%= t("all", scope: "decidim.searches.filters.state") %></span>
           <span class="label ml-auto"><%= @results_count %></span>
         <% end %>
-      </div>
+      </li>
       <% @blocks.each do |elements| %>
-        <div>
-          <% elements.each do |type, results| %>
-            <div>
+        <li>
+          <ul>
+            <% elements.each do |type, results| %>
               <% if results[:count].positive? %>
-                <%= link_to search_path_by_resource_type(type), class: "filter#{" is-active" if params.dig(:filter, :with_resource_type) == type}" do %>
+                <li>
+                <%= link_to search_path_by_resource_type(type), class: "filter#{" is-active" if params.dig(:filter, :with_resource_type) == type}", "aria-current": params.dig(:filter, :with_resource_type) == type ? "true" : "" do %>
                   <%= resource_type_icon(type) %>
                   <span><%= searchable_resource_human_name(type) %></span>
                   <span class="label ml-auto"><%= results[:count] %></span>
                 <% end %>
+                </li>
               <% else %>
-                <%= content_tag :div, class: "filter#{" is-empty" if results[:count].zero?}" do %>
+                <%= content_tag :li, class: "filter#{" is-empty" if results[:count].zero?}" do %>
                   <%= resource_type_icon(type) %>
                   <span><%= searchable_resource_human_name(type) %></span>
                   <span class="label ml-auto"><%= results[:count] %></span>
                 <% end %>
               <% end %>
-            </div>
-          <% end %>
-        </div>
+            <% end %>
+          </ul>
+        </li>
       <% end %>
-    </div>
+    </ul>
   </div>
 </nav>
+<script type="text/javascript">
+  const button = document.querySelector('#dropdown-trigger-search');
+  const arrowDown = button.querySelector('svg:first-of-type');
+  const arrowUp = button.querySelector('svg:last-of-type');
+  const list = document.querySelector('#dropdown-menu-search');
+  // the arrow is up when user arrives on the page, with the list displayed
+  arrowUp.addEventListener('click', function(){
+    setTimeout(() => {
+      button.setAttribute('aria-expanded', 'false');
+      list.style.display = "none";
+      }, 300)
+  })
+  arrowDown.addEventListener('click', function(){
+    setTimeout(() => {
+      button.setAttribute('aria-expanded', 'true');
+      list.style.display = "block";
+    }, 300)
+  })
+  // 32 is code for space bar and 13 is code for enter
+  button.addEventListener('keydown', function(e){
+    if ((e.keyCode === 13 || e.keyCode === 32) && button.getAttribute('aria-expanded') === 'true') {
+      setTimeout(() => {
+        button.setAttribute('aria-expanded', 'false');
+        list.style.display = "none";
+      }, 300)
+    } else if ((e.keyCode === 13 || e.keyCode === 32) && button.getAttribute('aria-expanded') === 'false'){
+        setTimeout(() => {
+          button.setAttribute('aria-expanded', 'true');
+          list.style.display = "block";
+        }, 300)
+    }
+  })
+</script>

data/app/views/decidim/shared/_component_announcement.html.erb

@@ -1,5 +1,5 @@
 <% announcement = translated_attribute(current_settings.announcement).presence || translated_attribute(component_settings.announcement).presence %>
-<% if announcement %>
+<% if strip_tags(announcement).present? %>
   <section class="layout-main__section">
     <%= cell("decidim/announcement", announcement, local_assigns.merge(callout_class: "editor-content")) %>
   </section>

data/app/views/decidim/shared/_confirm_modal.html.erb

@@ -1,16 +1,14 @@
 <%= decidim_modal id: "confirm-modal" do %>
   <div data-dialog-container>
-    <%= icon "delete-bin-line" %>
     <h2 class="h2" data-dialog-title id="dialog-title-confirm-modal"><%= t("title", scope: "decidim.shared.confirm_modal") %></h2>
-
     <div data-confirm-modal-content></div>
   </div>
 
-  <div data-dialog-actions>
-    <button class="button button__lg button__transparent-secondary" data-confirm-cancel data-dialog-close="confirm-modal">
+  <div data-dialog-actions class="flex flex-col-reverse md:flex-row">
+    <button class="button button__lg button__transparent-secondary w-full md:w-auto" data-confirm-cancel data-dialog-close="confirm-modal">
       <span><%= t("cancel", scope: "decidim.shared.confirm_modal") %></span>
     </button>
-    <button class="button button__lg button__secondary" data-confirm-ok>
+    <button class="button button__lg button__secondary w-full md:w-auto" data-confirm-ok>
       <span><%= t("ok", scope: "decidim.shared.confirm_modal") %></span>
     </button>
   </div>

data/app/views/decidim/shared/_filters.html.erb

@@ -14,18 +14,20 @@
 
     <div id="dropdown-menu-filters">
       <% if local_assigns.has_key?(:skip_to_id) %>
-        <%= link_to t("skip", scope: "decidim.shared.filter_form_help"), "##{skip_to_id}", class: "filter-skip", role: "menuitem" %>
+        <%= link_to t("skip", scope: "decidim.shared.filter_form_help"), "##{skip_to_id}", class: "filter-skip", role: "menuitem", "data-skip-to-content": true %>
       <% end %>
-      <p class="filter-help" role="menuitem" aria-disabled="true"><%= t("help", scope: "decidim.shared.filter_form_help") %></p>
+
+      <p id="filter-help-text" class="filter-help" role="menuitem" aria-disabled="true"><%= t("help", scope: "decidim.shared.filter_form_help") %></p>
 
       <% if local_assigns.has_key?(:search_variable) %>
         <div class="filter-search filter-container" role="menuitem">
           <%= form.search_field search_variable,
                                 label: false,
                                 placeholder: search_label,
-                                title: search_label,
-                                "aria-label": search_label %>
-          <button type="submit" aria-label="<%= search_label %>">
+                                title: filter_search_label(search_label, skip_to_id),
+                                "aria-label": filter_search_label(search_label, skip_to_id),
+                                "aria-describedby": "filter-help-text" %>
+          <button type="submit" aria-label="<%= filter_search_label(search_label, skip_to_id) %>">
             <%= icon "search-line" %>
           </button>
         </div>

data/app/views/layouts/decidim/_application.html.erb

@@ -8,7 +8,7 @@
 
   <body class="text-black text-md form-defaults<%= yield (:body_class) %>">
     <!--noindex--><!--googleoff: all-->
-    <%= link_to t("skip_button", scope: "decidim.accessibility"), "#content", class: "layout-container__skip" %>
+    <%= link_to t("skip_button", scope: "decidim.accessibility"), "#content", class: "layout-container__skip", "data-skip-to-content": true %>
     <%= cell("decidim/data_consent", current_organization) %>
     <!--googleon: all--><!--/noindex-->
 

data/app/views/layouts/decidim/_js_configuration.html.erb

@@ -7,6 +7,7 @@ js_configs = {
     "mentionsModal": {
       "removeRecipient": t("decidim.shared.mentions_modal.remove_recipient", name: "%name%")
     },
+    "confirmUnload": t("decidim.shared.confirm_unload"),
     emojis: I18n.t("emojis").deep_transform_keys { |k| k.to_s.camelize(:lower) },
     editor: I18n.t("editor"),
     date: I18n.t("date"),

data/app/views/layouts/decidim/footer/_main.html.erb

@@ -11,7 +11,7 @@
     <nav class="md:w-1/2 lg:w-auto" role="navigation" aria-label="Legal">
       <%= render partial: "layouts/decidim/footer/main_legal" %>
     </nav>
-    <nav class="w-full md:w-auto md:ml-auto" role="navigation" aria-label="Social media">
+    <nav class="w-full md:w-auto md:ml-auto" role="navigation" aria-label="<%= t("layouts.decidim.footer.social_media") %>">
       <%= render partial: "layouts/decidim/footer/main_social_media_links" %>
     </nav>
     <%= render partial: "layouts/decidim/footer/main_language_chooser" %>

data/app/views/layouts/decidim/footer/_main_intro.html.erb

@@ -1,6 +1,6 @@
 <% if current_organization.official_img_footer.attached? %>
   <%= link_to current_organization.official_url, class: "block mb-6" do %>
-    <%= image_tag current_organization.attached_uploader(:official_img_footer).url, alt: current_organization_name, class: "max-h-16" %>
+    <%= image_tag current_organization.attached_uploader(:official_img_footer).url, alt: t("layouts.decidim.footer.current_organization_img", organization: current_organization_name), class: "max-h-16" %>
   <% end %>
 <% end %>
 <div class="text-sm text-white prose">

data/app/views/layouts/decidim/footer/_mini.html.erb

@@ -4,9 +4,9 @@
       <a rel="decidim noopener noreferrer" href="https://decidim.org/" target="_blank" data-external-link="text-only">
         <%= image_pack_tag("media/images/decidim-logo.svg", alt: t("layouts.decidim.footer.decidim_logo"), class: "max-h-8 block") %>
       </a>
-      <div class="text-xs mt-2 [&_a]:underline">
+      <p class="text-xs mt-2 [&_a]:underline">
         <%= t("layouts.decidim.footer.made_with_open_source").html_safe %>
-      </div>
+      </p>
     </div>
     <a class="flex gap-1 hover:opacity-50" rel="license noopener noreferrer" href="http://creativecommons.org/licenses/by-sa/4.0/" target="_blank" data-external-link="text-only">
       <span class="sr-only"><%= t("layouts.decidim.footer.cc_by_license") %></span>

data/app/views/layouts/decidim/header/_main.html.erb

@@ -8,10 +8,10 @@
         <%= render partial: "layouts/decidim/logo_mobile", locals: { organization: current_organization } %>
       </div>
     </div>
-    <div class="main-bar__search">
+    <div role="search" class="main-bar__search">
       <%= render partial: "layouts/decidim/header/main_search" %>
     </div>
-    <div class="main-bar__links-desktop">
+    <div role="navigation" class="main-bar__links-desktop">
       <%= render partial: "layouts/decidim/header/main_links_desktop" %>
     </div>
     <div class="main-bar__menu-mobile">

data/app/views/layouts/decidim/header/_main_links_desktop.html.erb

@@ -30,6 +30,12 @@
       <% unread_data = current_user_unread_data %>
       <% if unread_data[:unread_items] %>
         <%= content_tag :span, "", class: "main-bar__notification", data: unread_data %>
+        <% if unread_data[:unread_notifications] %>
+          <%= content_tag :span, t("layouts.decidim.user_menu.unread_notifications"), class: "sr-only" %>
+        <% end %>
+        <% if unread_data[:unread_conversations] %>
+          <%= content_tag :span, t("layouts.decidim.user_menu.unread_conversations"), class: "sr-only" %>
+        <% end %>
       <% end %>
       <% if current_user.avatar.attached? %>
         <span class="main-bar__avatar">

data/app/views/layouts/decidim/header/_main_links_dropdown.html.erb

@@ -17,6 +17,7 @@
     <span class="text-secondary"><%= t("layouts.decidim.user_menu.notifications") %></span>
     <% if unread_data[:unread_notifications] %>
       <%= content_tag :span, "", class: "main-bar__dropdown-notification", data: unread_data %>
+      <%= content_tag :span, t("layouts.decidim.user_menu.unread_notifications"), class: "sr-only" %>
     <% end %>
   <% end %>
 </li>
@@ -26,6 +27,7 @@
     <span class="text-secondary"><%= t("layouts.decidim.user_menu.conversations") %></span>
     <% if unread_data[:unread_conversations] %>
       <%= content_tag :span, "", class: "main-bar__dropdown-notification", data: unread_data %>
+      <%= content_tag :span, t("layouts.decidim.user_menu.unread_conversations"), class: "sr-only" %>
     <% end %>
   <% end %>
 </li>

data/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb

@@ -10,7 +10,7 @@
     </div>
 
     <div>
-      <div class="main-bar__links-mobile__trigger" onclick="document.querySelector('#dropdown-trigger-links-mobile').click();">
+      <div class="main-bar__links-mobile__trigger" onclick="document.querySelector('#dropdown-trigger-links-mobile').click();document.querySelector('#dropdown-menu-account-mobile').removeAttribute('aria-modal')">
         <%= icon "close-line" %>
       </div>
     </div>

data/app/views/layouts/decidim/header/_mobile_language_choose.html.erb

@@ -1,7 +1,7 @@
 <% if available_locales.length > 1 %>
     <div>
         <button id="dropdown-trigger-language-chooser-mobile" data-component="dropdown" data-target="dropdown-menu-language-chooser-mobile" class="mt-8 rounded-lg py-0 bg-gray-5 h-10 border border-gray outline outline-1 outline-transparent">
-            <span><%= t("name", scope: "locale" ) %></span>
+            <span class="ml-2"><%= t("name", scope: "locale" ) %></span>
             <%= icon "arrow-down-s-line" %>
             <%= icon "arrow-up-s-line" %>
             <span class="sr-only">

data/config/locales/ar.yml

@@ -864,7 +864,6 @@ ar:
       reject_invitation: رفض
     group_members:
       actions:
-        are_you_sure: هل أنت واثق؟
         promote_to_admin: جعل المشرف
         remove_from_group: إزالة المشارك
       index:
@@ -1053,10 +1052,8 @@ ar:
       unsubscribe:
         success: أنت غير مشترك بنجاح.
         token_error: انتهت صلاحية الرابط.
-        unsubscribe: إلغاء الاشتراك
     newsletters_opt_in_mailer:
       notify:
-        body_1: تزداد أهمية معالجة البيانات الشخصية وحمايتها بالنسبة لنا جميعًا. مع اللائحة العامة الجديدة لحماية البيانات (GDPR) المؤرخة 25 مايو 2018 ، أصبح للأفراد سيطرة أفضل على بياناتهم الشخصية. لهذا السبب نحتاج إلى "موافق" لمواصلة إرسال المعلومات ذات الصلة حول أنشطة %{organization_name}.
         body_2: 'كيف يمكنك أن تعطينا موافقتك؟ فقط انقر على الزر التالي:'
         body_3: مع هذه الموافقة ، ستتمكن من متابعة تلقي معلومات حول خدمات النظام الأساسي. على العكس من ذلك ، إذا لم نتلق تأكيدًا إيجابيًا من جانبك ، فسنوقف إرسال رسائلنا إليك. إذا أكدت رغبتك في أن تظل على اطلاع ، فسيكون لديك دائمًا خيار الإلغاء في أي وقت.
         button: نعم ، أرغب في متابعة تلقي المعلومات ذات الصلة

data/config/locales/bg-BG.yml

@@ -405,7 +405,7 @@ bg:
           newsletter: Получавайте извънреден бюлетин с подходяща информация
           newsletter_title: Разрешение за контакт с Вас
           nickname_help: Вашя псевдоним в %{organization}
-          password_help: "Минимум %{minimun_characters} символа, не трябва да са разпространени (например, 123456) и трябва да са различни от вашите име и ел. поща."
+          password_help: "Минимум %{minimum_characters} символа, не трябва да са разпространени (например, 123456) и трябва да са различни от вашите име и ел. поща."
           sign_in: Вход
           sign_up: Регистрация
           sign_up_as:
@@ -1315,7 +1315,7 @@ bg:
         change_your_password: Промени паролата си
         confirm_new_password: Потвърди нова парола
         new_password: Нова парола
-        password_help: "Минимум %{minimun_characters} символа, не трябва да са разпространени (например, 123456) и трябва да са различни от вашите име и ел. поща."
+        password_help: "Минимум %{minimum_characters} символа, не трябва да са разпространени (например, 123456) и трябва да са различни от вашите име и ел. поща."
       new:
         forgot_your_password: Забравили сте паролата си?
         send_me_reset_password_instructions: Изпрати ми инструкции за възстановяване на паролата

data/config/locales/bg.yml

@@ -955,7 +955,6 @@ bg:
       title: Какви са значките?
     group_admins:
       actions:
-        are_you_sure: Сигурни ли сте? Това няма да премахне участника от групата.
         demote_admin: Премахни администратор
       demote:
         error: Възникна проблем при премахването на този участник от списъка с администратори.
@@ -985,7 +984,6 @@ bg:
         error: Възникна проблем при приемането на заявката за присъединяване.
         success: Заявката за присъединяване е приета успешно.
       actions:
-        are_you_sure: Сигурни ли сте?
         promote_to_admin: Направи администратор
         remove_from_group: Премахни участник
       index:
@@ -1215,11 +1213,9 @@ bg:
         main_image: Основно изображение
     newsletters:
       unsubscribe:
-        check_subscription: За да зададете предпочитанията си, отидете в страницата <a href="%{link}" target="_blank">настройки</a>.
         error: Възникна проблем при прекратяването на абонамента.
         success: Отписахте се успешно.
         token_error: Срокът на връзката е изтекъл.
-        unsubscribe: Отписване
     newsletters_opt_in:
       unauthorized: Съжаляваме, този линк вече не е активен.
       update:
@@ -1227,7 +1223,6 @@ bg:
         success: Настройките за бюлетина са успешно обновени.
     newsletters_opt_in_mailer:
       notify:
-        body_1: Обработката на личните данни и тяхната защита стават все по-важни за всички нас. С новия Общ регламент за защита на данните (GDPR) от 25 май 2018 г. лицата имат по-добър контрол върху личните си данни. Поради тази причина се нуждаем от вашето съгласие, за да продължим да изпращаме подходяща информация за дейностите на %{organization_name}.
         body_2: 'Как можете да ни дадете своето съгласие? Просто щракнете върху следния бутон:'
         body_3: С това съгласие ще продължите да получавате информация за дейностите в платформата. Ако не получим потвърждение от Ваша страна, ще спрем да ви изпращаме нашите съобщения. Дори да потвърдите, че желаете да бъдете информирани, винаги ще имате възможност да се откажете по всяко време.
         button: Да, желая да продължа да получавам подбрана информация