Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/models/media_attachment.rb

4 files changed, 9 insertions, 6 deletions

diff --git a/config/locales/co.yml b/config/locales/co.yml
index aa68336f1..8c1a13e54 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -269,6 +269,7 @@ co:
       created_msg: U blucchime di u duminiu hè attivu
       destroyed_msg: U blucchime di u duminiu ùn hè più attivu
       domain: Duminiu
+      existing_domain_block_html: Avete digià impostu limite più strette nant'à %{name}, duvete <a href="%{unblock_url}">sbluccallu</a> primu.
       new:
         create: Creà un blucchime
         hint: U blucchime di duminiu ùn impedirà micca a creazione di conti indè a database, mà metudi di muderazione specifiche saranu applicati.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 20a75e60c..5f87b34d6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -270,6 +270,7 @@ en:
       created_msg: Domain block is now being processed
       destroyed_msg: Domain block has been undone
       domain: Domain
+      existing_domain_block_html: You have already imposed stricter limits on %{name}, you need to <a href="%{unblock_url}">unblock it</a> first.
       new:
         create: Create block
         hint: The domain block will not prevent creation of account entries in the database, but will retroactively and automatically apply specific moderation methods on those accounts.
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index a6c806de3..d588b239f 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -260,10 +260,10 @@ fr:
         title: Nouveau blocage de domaine
       reject_media: Fichiers média rejetés
       reject_media_hint: Supprime localement les fichiers média stockés et refuse d’en télécharger ultérieurement. Ne concerne pas les suspensions
-      reject_reports: Rapports de rejet
-      reject_reports_hint: Ignorez tous les rapports provenant de ce domaine. Sans objet pour les suspensions
+      reject_reports: Rejeter les signalements
+      reject_reports_hint: Ignorez tous les signalements provenant de ce domaine. Ne concerne pas les suspensions
       rejecting_media: rejet des fichiers multimédia
-      rejecting_reports: rejet de rapports
+      rejecting_reports: rejet des signalements
       severity:
         silence: silencié
         suspend: suspendu
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index d3580c981..b6a966fa7 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -527,16 +527,17 @@ sk:
     login: Prihlás sa
     logout: Odhlás sa
     migrate_account: Presúvam sa na iný účet
-    migrate_account_html: Pokiaľ si želáš presmerovať tento účet na nejaký iný, môžeš si to <a href="%{path}">nastaviť tu</a>.
-    or_log_in_with: Alebo prihlásiť z
+    migrate_account_html: Ak si želáš presmerovať tento účet na nejaký iný, môžeš si to <a href="%{path}">nastaviť tu</a>.
+    or_log_in_with: Alebo prihlás s
     providers:
       cas: CAS
       saml: SAML
     register: Zaregistruj sa
-    resend_confirmation: Poslať potvrdzujúce pokyny znovu
+    resend_confirmation: Zašli potvrdzujúce pokyny znovu
     reset_password: Obnov heslo
     security: Zabezpečenie
     set_new_password: Nastav nové heslo
+    trouble_logging_in: Problém s prihlásením?
   authorize_follow:
     already_following: Tento účet už následuješ
     error: Naneštastie nastala chyba pri hľadaní vzdialeného účtu