decidim-core 0.26.2 → 0.26.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18193603bd469c0ea5937875b577f4cc5439727b2ad1759e60ea725d029e18f1
-  data.tar.gz: 91c95bec2cdc7af5ad17a5d5ccd165817516fbaf0ed46051c198d3b8b5b1321b
+  metadata.gz: 3cbd72f4c386bc8730dfa1d3958a691c5ed719b3cf43b15f778d2011ae5a7f0d
+  data.tar.gz: 32e72e8185fc2f28f0298ef2a9a0350cd8b436e1a39bda136fe82c9da5644433
 SHA512:
-  metadata.gz: 71b39ec5cae4751ab21048ef686cd6b3704e8d5469d9ba608fcf163944ebf83fc100d1a47c59d4eae4b4c01af4d5074918113a8cf533151e954eb97defa14bf9
-  data.tar.gz: 72011b7df988f022988d64892177f9f4b28338019152d0a2ce46f489696256acdcd095d0da83346e41d70cdeb72c72ef7e21c0e701b50a1d4b35a6de8c51840d
+  metadata.gz: 3d7a4d41fa9aeb76c68e21e5a486b8a3149d117a956c4d0ec17020db1abad1c8a8ce1316ba014a158bbb2fe254ebc0db4b4923a756d0f97997c06bb128c3e440
+  data.tar.gz: e282e746492e32a9e85edb4b72ede7804be3b5b7fd9567e49eac2ba6b9430f6d46da2596f044b87fa520fb4cde0e92259c40695837c87d6fb0943f2c244fa8e2

data/app/cells/decidim/content_blocks/cta/show.erb

@@ -1,5 +1,5 @@
 <section class="section">
-  <div class="expanded hero" style="background-image:url(<%= background_image %>);">
+  <div class="expanded hero" style="background-image:url('<%= background_image %>');">
     <div class="hero__container">
       <div class="row">
         <div class="columns small-centered medium-6 text-center">

data/app/cells/decidim/content_blocks/hero/show.erb

@@ -1,4 +1,4 @@
-<section class="extended hero home-section" style="background-image:url(<%= background_image %>);">
+<section class="extended hero home-section" style="background-image:url('<%= background_image %>');">
   <div class="hero__container">
     <div class="row">
       <div class="columns small-centered large-10">

data/app/cells/decidim/content_blocks/highlighted_content_banner/show.erb

@@ -1,5 +1,5 @@
 <section class="extended highligted-content-banner home-section"
-          style="background-image:url(<%= current_organization.attached_uploader(:highlighted_content_banner_image).path %>);">
+          style="background-image:url('<%= current_organization.attached_uploader(:highlighted_content_banner_image).path %>');">
   <div class="highligted-content-banner__container">
     <div class="row">
       <div class="columns large-10">

data/app/cells/decidim/content_blocks/stats_cell.rb

@@ -16,6 +16,7 @@ module Decidim
       def cache_hash
         hash = []
         hash.push(I18n.locale)
+        hash.push(current_organization.cache_key)
         hash.join(Decidim.cache_key_separator)
       end
     end

data/app/controllers/concerns/decidim/resource_versions_concern.rb

@@ -10,6 +10,10 @@ module Decidim
       helper Decidim::TraceabilityHelper
       helper_method :current_version, :versioned_resource
 
+      def show
+        raise ActionController::RoutingError, "Not found" unless current_version
+      end
+
       private
 
       # Overwrite this method in your controller to define how to find the

data/app/controllers/decidim/devise/registrations_controller.rb

@@ -37,7 +37,7 @@ module Decidim
           end
 
           on(:invalid) do
-            flash.now[:alert] = @form.errors[:base].join(", ") if @form.errors[:base].any?
+            flash.now[:alert] = @form.errors.full_messages.join(", ") if @form.errors.full_messages.any?
             render :new
           end
         end

data/app/events/decidim/resource_endorsed_event.rb

@@ -15,7 +15,8 @@ module Decidim
     end
 
     def resource_text
-      resource.body
+      return resource.body if resource.respond_to? :body
+      return resource.description if resource.respond_to? :description
     end
 
     def resource_type

data/app/forms/decidim/account_form.rb

@@ -50,7 +50,7 @@ module Decidim
     end
 
     def unique_email
-      return true if Decidim::User.where(
+      return true if Decidim::UserBaseEntity.where(
         organization: context.current_organization,
         email: email
       ).where.not(id: context.current_user.id).empty?
@@ -60,9 +60,10 @@ module Decidim
     end
 
     def unique_nickname
-      return true if Decidim::User.where(
-        organization: context.current_organization,
-        nickname: nickname
+      return true if Decidim::UserBaseEntity.where(
+        "decidim_organization_id = ? AND LOWER(nickname) = ? ",
+        context.current_organization.id,
+        nickname.downcase
       ).where.not(id: context.current_user.id).empty?
 
       errors.add :nickname, :taken

data/app/forms/decidim/registration_form.rb

@@ -35,11 +35,17 @@ module Decidim
     private
 
     def email_unique_in_organization
-      errors.add :email, :taken if User.no_active_invitation.find_by(email: email, organization: current_organization).present?
+      errors.add :email, :taken if valid_users.find_by(email: email, organization: current_organization).present?
     end
 
     def nickname_unique_in_organization
-      errors.add :nickname, :taken if User.no_active_invitation.find_by(nickname: nickname, organization: current_organization).present?
+      return false unless nickname
+
+      errors.add :nickname, :taken if valid_users.find_by("LOWER(nickname)= ? AND decidim_organization_id = ?", nickname.downcase, current_organization.id).present?
+    end
+
+    def valid_users
+      UserBaseEntity.where(invitation_token: nil)
     end
 
     def no_pending_invitations_exist

data/app/helpers/decidim/filters_helper.rb

@@ -24,7 +24,11 @@ module Decidim
           remote: true,
           html: { id: nil }.merge(html_options)
         ) do |form|
-          yield form
+          # Cannot use `concat()` here because it's not available in cells
+          inner = []
+          inner << hidden_field_tag("per_page", params[:per_page], id: nil) if params[:per_page]
+          inner << capture { yield form }
+          inner.join.html_safe
         end
       end
     end

data/app/models/decidim/action_log.rb

@@ -130,16 +130,16 @@ module Decidim
     end
 
     # Whether this activity or log is visible for a given user (can also be nil)
-    #
-    # Returns a True/False.
     def visible_for?(user)
-      return false if resource_lazy.blank?
-      return false if participatory_space_lazy.blank?
-      return false if resource_lazy.respond_to?(:deleted?) && resource_lazy.deleted?
-      return false if resource_lazy.respond_to?(:hidden?) && resource_lazy.hidden?
-      return false if resource_lazy.respond_to?(:can_participate?) && !resource_lazy.can_participate?(user)
-
-      true
+      resource_lazy.present? &&
+        participatory_space_lazy.present? &&
+        !resource_lazy.try(:deleted?) &&
+        !resource_lazy.try(:hidden?) &&
+        (!resource_lazy.respond_to?(:can_participate?) || resource_lazy.try(:can_participate?, user))
+    rescue NameError => e
+      Rails.logger.warn "Failed resource for #{self.class.name}(id=#{id}): #{e.message}"
+
+      false
     end
   end
 end

data/app/models/decidim/user_base_entity.rb

@@ -30,6 +30,7 @@ module Decidim
 
     scope :blocked, -> { where(blocked: true) }
     scope :not_blocked, -> { where(blocked: false) }
+    scope :available, -> { where(deleted_at: nil, blocked: false, managed: false) }
 
     # Public: Returns a collection with all the public entities this user is following.
     #

data/app/packs/src/decidim/map/factory.js

@@ -33,7 +33,7 @@ import MapDragMarkerController from "src/decidim/map/controller/drag_marker"
  * @param {Object} config The map configuration object.
  * @returns {MapController} The controller for the map.
  */
-export default function createMapController(mapId, config) {
+const createMapController = function(mapId, config) {
   if (config.type === "static") {
     return new MapStaticController(mapId, config);
   } else if (config.type === "drag-marker") {
@@ -42,3 +42,5 @@ export default function createMapController(mapId, config) {
 
   return new MapMarkersController(mapId, config);
 }
+
+window.Decidim.createMapController = createMapController;

data/app/packs/src/decidim/map/legacy.js

@@ -1,7 +1,7 @@
 /* eslint-disable require-jsdoc */
 
 import * as L from "leaflet";
-import createMapController from "src/decidim/map/factory"
+import "src/decidim/map/factory"
 
 /**
  * @deprecated
@@ -60,7 +60,7 @@ const loadMap = (mapId, markersData) => {
   legacyMapSupport($map);
 
   const mapData = $map.data("decidim-map");
-  const ctrl = createMapController(mapId, mapData);
+  const ctrl = window.Decidim.createMapController(mapId, mapData);
   const map = ctrl.load();
 
   L.tileLayer.here(mapData.tileLayer).addTo(map);

data/app/packs/src/decidim/map.js

@@ -1,4 +1,4 @@
-import createMapController from "src/decidim/map/factory"
+import "src/decidim/map/factory"
 
 $(() => {
   // Load the map controller factory method in the document.ready handler to
@@ -20,7 +20,7 @@ $(() => {
     }
 
     const mapConfig = $map.data("decidim-map");
-    const ctrl = createMapController(mapId, mapConfig);
+    const ctrl = window.Decidim.createMapController(mapId, mapConfig);
     const map = ctrl.load();
 
     $map.data("map", map);

data/app/packs/stylesheets/decidim/modules/_cards.scss

@@ -30,6 +30,8 @@ $datetime-bg: var(--primary);
   border-radius: $card-border-radius;
   // Keep visible for accessibility (active/focused card as a link)
   overflow: visible;
+  overflow-wrap: break-word;
+  hyphens: auto;
 
   @include modifiers(
     border-top-color,

data/app/packs/stylesheets/decidim/modules/_comments.scss

@@ -80,6 +80,8 @@ $comment-form-bg: $light-gray;
 
 .comment__content{
   padding: 0 $comment-padding;
+  overflow-wrap: break-word;
+  hyphens: auto;
 
   > :last-child{
     margin-bottom: 0;

data/app/packs/stylesheets/decidim/modules/_forms.scss

@@ -77,6 +77,11 @@ label > [type="radio"]{
     margin-right: 1rem;
     flex-shrink: 0;
   }
+
+  &,
+  &.tiny{
+    height: auto;
+  }
 }
 
 .switch{

data/app/permissions/decidim/permissions.rb

@@ -116,9 +116,11 @@ module Decidim
     end
 
     def apply_endorsement_permissions
-      return disallow! if !current_settings.endorsements_enabled || current_settings.endorsements_blocked
+      is_allowed = current_settings.endorsements_enabled &&
+                   !current_settings.endorsements_blocked &&
+                   authorized?(:endorse, resource: context.fetch(:resource, nil))
 
-      allow!
+      toggle_allow(is_allowed)
     end
 
     def notification_action?

data/app/presenters/decidim/user_presenter.rb

@@ -13,6 +13,8 @@ module Decidim
     # nickname presented in a twitter-like style
     #
     def nickname
+      return "" if __getobj__.blocked?
+
       "@#{__getobj__.nickname}"
     end
 
@@ -33,13 +35,14 @@ module Decidim
     end
 
     def avatar_url(variant = nil)
+      return default_avatar_url if __getobj__.blocked?
       return avatar.default_url unless avatar.attached?
 
       avatar.path(variant: variant)
     end
 
     def default_avatar_url
-      attached_uploader.default_url
+      attached_uploader(:avatar).default_url
     end
 
     def profile_path

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

@@ -1,7 +1,7 @@
 <% add_decidim_page_title(t("my_data", scope: "layouts.decidim.user_profile")) %>
 <% content_for(:subtitle) { t("my_data", scope: "layouts.decidim.user_profile") } %>
 
-<div class="row data-portability">
+<div class="data-portability">
   <strong><%= t(".download_data") %></strong>
   <p><%= t(".download_data_description", user_email: current_user.email).html_safe %></p>
   <%= button_to t(".request_data"), export_data_portability_path, class: "button", data: { disable: true } %>

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

@@ -1,62 +1,60 @@
 <% add_decidim_page_title(t("notifications_settings", scope: "layouts.decidim.user_profile")) %>
 <% content_for(:subtitle) { t("notifications_settings", scope: "layouts.decidim.user_profile") } %>
 
-<div class="row">
-  <%= form_for(@notifications_settings, url: notifications_settings_path, method: :put, class: "user-form") do |f| %>
-    <p><strong><%= t(".receive_notifications_about") %></strong></p>
-    <div class="switch tiny switch-with-label notifications_from_own_activity">
-      <%= f.label :notifications_from_own_activity do %>
-        <%= f.check_box :notifications_from_own_activity, label: false, class: "switch-input" %>
-        <span class="switch-paddle"></span>
-        <span class="switch-label"><%= t(".own_activity") %></span>
-      <% end %>
-    </div>
-    <div class="switch tiny switch-with-label notifications_from_followed">
-      <%= f.label :notifications_from_followed do %>
-        <%= f.check_box :notifications_from_followed, label: false, class: "switch-input" %>
-        <span class="switch-paddle"></span>
-        <span class="switch-label"><%= t(".everything_followed") %></span>
-      <% end %>
-    </div>
+<%= form_for(@notifications_settings, url: notifications_settings_path, method: :put, class: "user-form") do |f| %>
+  <p><strong><%= t(".receive_notifications_about") %></strong></p>
+  <div class="switch tiny switch-with-label notifications_from_own_activity">
+    <%= f.label :notifications_from_own_activity do %>
+      <%= f.check_box :notifications_from_own_activity, label: false, class: "switch-input" %>
+      <span class="switch-paddle"></span>
+      <span class="switch-label"><%= t(".own_activity") %></span>
+    <% end %>
+  </div>
+  <div class="switch tiny switch-with-label notifications_from_followed">
+    <%= f.label :notifications_from_followed do %>
+      <%= f.check_box :notifications_from_followed, label: false, class: "switch-input" %>
+      <span class="switch-paddle"></span>
+      <span class="switch-label"><%= t(".everything_followed") %></span>
+    <% end %>
+  </div>
 
-    <p><strong><%= t(".send_notifications_by_email") %></strong></p>
-    <div class="switch tiny switch-with-label email_on_notification">
-      <%= f.label :email_on_notification do %>
-        <%= f.check_box :email_on_notification, label: false, class: "switch-input" %>
-        <span class="switch-paddle"></span>
-        <span class="switch-label"><%= t(".email_on_notification") %></span>
-      <% end %>
-    </div>
+  <p><strong><%= t(".send_notifications_by_email") %></strong></p>
+  <div class="switch tiny switch-with-label email_on_notification">
+    <%= f.label :email_on_notification do %>
+      <%= f.check_box :email_on_notification, label: false, class: "switch-input" %>
+      <span class="switch-paddle"></span>
+      <span class="switch-label"><%= t(".email_on_notification") %></span>
+    <% end %>
+  </div>
 
-    <p><strong><%= t(".newsletters") %></strong></p>
-    <div class="switch tiny switch-with-label newsletter_notifications">
-      <label>
-        <%= f.check_box :newsletter_notifications, label: false, class: "switch-input" %>
-        <span class="switch-paddle"></span>
-        <span class="switch-label"><%= t(".newsletter_notifications") %></span>
-      </label>
-    </div>
+  <p><strong><%= t(".newsletters") %></strong></p>
+  <div class="switch tiny switch-with-label newsletter_notifications">
+    <label>
+      <%= f.check_box :newsletter_notifications, label: false, class: "switch-input" %>
+      <span class="switch-paddle"></span>
+      <span class="switch-label"><%= t(".newsletter_notifications") %></span>
+    </label>
+  </div>
+
+  <p><strong><%= t(".direct_messages") %></strong></p>
+  <div class="switch tiny switch-with-label allow_public_contact">
+    <label>
+      <%= f.check_box :allow_public_contact, label: false, class: "switch-input" %>
+      <span class="switch-paddle"></span>
+      <span class="switch-label"><%= t(".allow_public_contact") %></span>
+    </label>
+  </div>
 
-    <p><strong><%= t(".direct_messages") %></strong></p>
-    <div class="switch tiny switch-with-label allow_public_contact">
+  <% if @notifications_settings.user_is_moderator?(current_user) %>
+    <p><strong><%= t(".administrators") %></strong></p>
+    <div class="switch tiny switch-with-label email_on_moderations">
       <label>
-        <%= f.check_box :allow_public_contact, label: false, class: "switch-input" %>
+        <%= f.check_box :email_on_moderations, label: false, class: "switch-input" %>
         <span class="switch-paddle"></span>
-        <span class="switch-label"><%= t(".allow_public_contact") %></span>
+        <span class="switch-label"><%= t(".email_on_moderations") %></span>
       </label>
     </div>
-
-    <% if @notifications_settings.user_is_moderator?(current_user) %>
-      <p><strong><%= t(".administrators") %></strong></p>
-      <div class="switch tiny switch-with-label email_on_moderations">
-        <label>
-          <%= f.check_box :email_on_moderations, label: false, class: "switch-input" %>
-          <span class="switch-paddle"></span>
-          <span class="switch-label"><%= t(".email_on_moderations") %></span>
-        </label>
-      </div>
-    <% end %>
-
-    <%= f.submit t(".update_notifications_settings") %>
   <% end %>
-</div>
+
+  <%= f.submit t(".update_notifications_settings") %>
+<% end %>

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

@@ -1,17 +1,15 @@
 <% add_decidim_page_title(t("my_interests", scope: "layouts.decidim.user_profile")) %>
 <% content_for(:subtitle) { t("my_interests", scope: "layouts.decidim.user_profile") } %>
 
-<div class="row">
-  <p><%= t(".select_your_interests") %></p>
-  <%= form_for(@user_interests, url: user_interests_path, method: :put, class: "user-form") do |f| %>
-    <p><strong><%= t(".my_interests") %></strong></p>
-    <% if @user_interests.scopes.any? %>
-      <div class="clearfix m-bottom">
-        <%= render partial: "scopes", locals: { scopes: @user_interests.scopes, f: f } %>
-      </div>
-      <%= f.submit t(".update_my_interests") %>
-    <% else %>
-      <p><%= t(".no_scopes") %></p>
-    <% end %>
+<p><%= t(".select_your_interests") %></p>
+<%= form_for(@user_interests, url: user_interests_path, method: :put, class: "user-form") do |f| %>
+  <p><strong><%= t(".my_interests") %></strong></p>
+  <% if @user_interests.scopes.any? %>
+    <div class="clearfix m-bottom">
+      <%= render partial: "scopes", locals: { scopes: @user_interests.scopes, f: f } %>
+    </div>
+    <%= f.submit t(".update_my_interests") %>
+  <% else %>
+    <p><%= t(".no_scopes") %></p>
   <% end %>
-</div>
+<% end %>

data/config/locales/ar.yml

@@ -804,12 +804,10 @@ ar:
           title: المحادثات
         reply:
           send: إرسال
-          title: رد
         show:
           title: المحادثة مع %{usernames}
         start:
           send: إرسال
-          title: بدء محادثة
     metrics:
       followers:
         description: عدد المشاركين الذين يتبعون مساحة المشاركة هذه

data/config/locales/bg.yml

@@ -851,7 +851,7 @@ bg:
           title: Разговор с %{usernames}
         start:
           send: Изпрати
-          title: Започнете разговор
+          title: Започни разговор
     metrics:
       followers:
         description: Брой участници, които следват това пространство

data/config/locales/ca.yml

@@ -1009,7 +1009,7 @@ ca:
         reply:
           placeholder: La teva resposta...
           send: Enviar
-          title: Respon
+          title: Respondre
         show:
           back: Tornar a totes les converses
           chat_with: Conversa amb
@@ -1018,7 +1018,7 @@ ca:
           title: Conversa amb %{usernames}
         start:
           send: Enviar
-          title: Comença una conversa
+          title: Iniciar una conversa
         update:
           error: El missatge no ha estat enviat degut a un error
     metrics:
@@ -1545,7 +1545,7 @@ ca:
     registrations:
       destroyed: El teu compte s'ha cancel·lat correctament. Esperem tornar-te a veure aviat.
       edit:
-        are_you_sure: Estàs segura?
+        are_you_sure: Estàs segur?
         cancel_my_account: Cancel·lar el meu compte
         currently_waiting_confirmation_for_email: 'Estem esperant la confirmació per a: %{email}'
         leave_blank_if_you_don_t_want_to_change_it: Deixa-ho en blanc si no vols canviar-lo
@@ -1681,7 +1681,7 @@ ca:
         see_more: Veure més
   locale:
     name: Català
-    name_with_error: Anglès (error!)
+    name_with_error: Català (error!)
   password_validator:
     blacklisted: a la llista negra
     domain_included_in_password: és massa semblant a aquest nom de domini

data/config/locales/cs.yml

@@ -523,7 +523,7 @@ cs:
           newsletter: Chci dostávat příležitostný zpravodaj s relevantními informacemi
           newsletter_title: Povolení kontaktu
           nickname_help: Váš alias v %{organization}. Může obsahovat pouze písmena, číslice, '-' a '_'.
-          password_help: "%{minimun_characters} minimum znaků, nesmí být příliš běžné (např. 123456) a musí být jiné než vaše přezdívka a váš e-mail."
+          password_help: "%{minimun_characters} je minimum znaků, nesmí být příliš běžné (např. 123456) a musí být jiné než vaše přezdívka a váš e-mail."
           sign_in: Přihlásit se
           sign_up: Zaregistrovat se
           sign_up_as:
@@ -750,7 +750,7 @@ cs:
         click_button: 'Klikněte na následující odkaz pro stažení vašich dat.<br/>Soubor bude k dispozici do %{date}.<br/>Budete potřebovat <a href="https://www.7-zip.org/">7-Zip</a> (pro Windows), <a href="https://www.keka.io/en/">Keka</a> (pro MacOS) nebo <a href="https://peazip.github.io">PeaZip</a> (pro Linux) pro jeho otevření. Heslo: %{password}'
         download: Stažení
       export:
-        ready: V příloze naleznete exportovanou exportovanou verzi.
+        ready: V příloze naleznete zazipovanou verzi vašeho exportu.
       subject: Váš export "%{name}" je připraven
     filters:
       linked_classes:
@@ -969,7 +969,7 @@ cs:
         scope_type_presenter:
           not_found: 'Typ oboru nebyl nalezen v databázi (ID: %{id})'
     managed_users:
-      expired_session: Aktuální platnost sesouhlasení již vypršela.
+      expired_session: Aktuální relace správy účastníka vypršela.
     map:
       dynamic:
         screen_reader_explanation: Následující prvek je mapa, která prezentuje položky na této stránce jako mapové body. Prvek lze použít s čtečkou obrazovky, ale může být těžko srozumitelný.
@@ -1048,7 +1048,7 @@ cs:
         reply:
           placeholder: Vaše odpověď...
           send: Poslat
-          title: Odpověď
+          title: Odpovědět
         show:
           back: Zpět ke všem konverzacím
           chat_with: Konverzace s
@@ -1057,7 +1057,7 @@ cs:
           title: Konverzace s číslem %{usernames}
         start:
           send: Poslat
-          title: Spusťte konverzaci
+          title: Zahájit konverzaci
         update:
           error: Zpráva nebyla odeslána z důvodu chyby
     metrics:
@@ -1110,7 +1110,7 @@ cs:
       unathorized: Je nám líto, tento odkaz již není k dispozici
       update:
         error: Došlo k chybě
-        success: Nastavení Newsletteru bylo úspěšně aktualizováno
+        success: Nastavení Zpravodaje bylo úspěšně aktualizováno
     newsletters_opt_in_mailer:
       notify:
         body_1: Zpracování osobních údajů a jejich ochrana jsou pro nás všechny stále důležitější. S novým obecným nařízením o ochraně osobních údajů (GDPR) ze dne 25. května 2018 mají jednotlivci lepší kontrolu nad svými osobními údaji. Z tohoto důvodu potřebujeme vaše "OK" pro pokračování v zasílání relevantních informací o aktivitách %{organization_name}.
@@ -1236,7 +1236,7 @@ cs:
           info: Odznaky jsou získávány prováděním konkrétní činnosti v platformě.
           title: Odznaky
       user:
-        confirmation_instructions_sent: Byly odeslány pokyny pro potvrzení e-mailu
+        confirmation_instructions_sent: Pokyny pro potvrzení e-mailu byly odeslány
         create_user_group: Vytvořit skupinu
         edit_profile: Editovat profil
         edit_user_group: Upravit profil skupiny
@@ -1246,7 +1246,7 @@ cs:
         leave_user_group: Opustit skupinu
         manage_user_group_admins: Správa administrátorů
         manage_user_group_users: Správa členů
-        resend_email_confirmation_instructions: Opakujte e-mailové pokyny k potvrzení
+        resend_email_confirmation_instructions: Znovu odeslat pokyny pro potvrzení e-mailu
     reported_mailer:
       hide:
         hello: Zdravím %{name},
@@ -1276,7 +1276,7 @@ cs:
     scopes:
       global: Globální oblast působnosti
       picker:
-        cancel: zrušení
+        cancel: Zrušit
         change: Změnit vybraný rozsah
         choose: Vybrat
         currently_selected: Aktuálně vybraný rozsah
@@ -1729,7 +1729,7 @@ cs:
         see_more: Vidět víc
   locale:
     name: Čeština
-    name_with_error: Čeština
+    name_with_error: Čeština (chyba!)
   password_validator:
     blacklisted: je na černé listině
     domain_included_in_password: je příliš podobné tomuto názvu domény