From 08a4c33c67fb5564f4230de58e9a089040e4b90a Mon Sep 17 00:00:00 2001
From: Ilja <ilja@ilja.space>
Date: Sat, 12 Mar 2022 19:43:12 +0100
Subject: [PATCH 1/2] Explain better what delete does in moderation menu

---
 src/i18n/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 8eb7fcc6..ed54c84e 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -805,7 +805,7 @@
       "disable_any_subscription": "Disallow following user at all",
       "quarantine": "Disallow user posts from federating",
       "delete_user": "Delete user",
-      "delete_user_confirmation": "Are you absolutely sure? This action cannot be undone."
+      "delete_user_confirmation": "This will permanently delete the data from this account and deactivate it. Are you absolutely sure?"
     },
     "highlight": {
       "disabled": "No highlight",

From 2dd75ca76cd36846e76d74fc2f4d5dcedfcc66d7 Mon Sep 17 00:00:00 2001
From: Ilja <ilja@ilja.space>
Date: Sat, 26 Mar 2022 12:05:25 +0100
Subject: [PATCH 2/2] Change translation key

---
 src/i18n/ca.json          | 1 -
 src/i18n/de.json          | 1 -
 src/i18n/en.json          | 2 +-
 src/i18n/eo.json          | 1 -
 src/i18n/es.json          | 3 +--
 src/i18n/eu.json          | 3 +--
 src/i18n/fi.json          | 3 +--
 src/i18n/fr.json          | 3 +--
 src/i18n/he.json          | 3 +--
 src/i18n/id.json          | 3 +--
 src/i18n/it.json          | 1 -
 src/i18n/ja_easy.json     | 3 +--
 src/i18n/ja_pedantic.json | 3 +--
 src/i18n/nb.json          | 3 +--
 src/i18n/nl.json          | 1 -
 src/i18n/oc.json          | 3 +--
 src/i18n/pl.json          | 3 +--
 src/i18n/pt.json          | 1 -
 src/i18n/ru.json          | 3 +--
 src/i18n/uk.json          | 1 -
 src/i18n/vi.json          | 3 +--
 src/i18n/zh.json          | 3 +--
 src/i18n/zh_Hant.json     | 1 -
 23 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/src/i18n/ca.json b/src/i18n/ca.json
index 74260143..5f2795a8 100644
--- a/src/i18n/ca.json
+++ b/src/i18n/ca.json
@@ -621,7 +621,6 @@
       "disable_any_subscription": "Deshabilita completament seguir algú",
       "quarantine": "Deshabilita la federació a les entrades de les usuàries",
       "moderation": "Moderació",
-      "delete_user_confirmation": "Estàs completament segur/a? Aquesta acció no es pot desfer.",
       "revoke_admin": "Revoca l'Admin",
       "activate_account": "Activa el compte",
       "deactivate_account": "Desactiva el compte",
diff --git a/src/i18n/de.json b/src/i18n/de.json
index b6599594..4bf897ef 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -582,7 +582,6 @@
     "statuses": "Beiträge",
     "admin_menu": {
       "sandbox": "Erzwinge Beiträge nur für Follower sichtbar zu sein",
-      "delete_user_confirmation": "Achtung! Diese Entscheidung kann nicht rückgängig gemacht werden! Trotzdem durchführen?",
       "grant_admin": "Administratorprivilegien gewähren",
       "delete_user": "Nutzer löschen",
       "strip_media": "Medien von Beiträgen entfernen",
diff --git a/src/i18n/en.json b/src/i18n/en.json
index ed54c84e..2dda7f9c 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -805,7 +805,7 @@
       "disable_any_subscription": "Disallow following user at all",
       "quarantine": "Disallow user posts from federating",
       "delete_user": "Delete user",
-      "delete_user_confirmation": "This will permanently delete the data from this account and deactivate it. Are you absolutely sure?"
+      "delete_user_data_and_deactivate_confirmation": "This will permanently delete the data from this account and deactivate it. Are you absolutely sure?"
     },
     "highlight": {
       "disabled": "No highlight",
diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index 659b5960..3c401b30 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -606,7 +606,6 @@
     "mention": "Mencio",
     "hidden": "Kaŝita",
     "admin_menu": {
-      "delete_user_confirmation": "Ĉu vi tute certas? Ĉi tiu ago ne estas malfarebla.",
       "delete_user": "Forigi uzanton",
       "quarantine": "Malpermesi federadon de afiŝoj de uzanto",
       "disable_any_subscription": "Malpermesi ĉian abonadon al uzanto",
diff --git a/src/i18n/es.json b/src/i18n/es.json
index eb9fc0a5..9887f007 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -731,8 +731,7 @@
       "disable_remote_subscription": "No permitir que usuarios de instancias remotas te siga",
       "disable_any_subscription": "No permitir que ningún usuario te siga",
       "quarantine": "No permitir publicaciones de usuarios de instancias remotas",
-      "delete_user": "Eliminar usuario",
-      "delete_user_confirmation": "¿Estás completamente seguro? Esta acción no se puede deshacer."
+      "delete_user": "Eliminar usuario"
     },
     "show_repeats": "Mostrar repetidos",
     "hide_repeats": "Ocultar repetidos",
diff --git a/src/i18n/eu.json b/src/i18n/eu.json
index 539ee1bd..4e6ea550 100644
--- a/src/i18n/eu.json
+++ b/src/i18n/eu.json
@@ -609,8 +609,7 @@
       "disable_remote_subscription": "Ez utzi istantzia kanpoko erabiltzaileak zuri jarraitzea",
       "disable_any_subscription": "Ez utzi beste erabiltzaileak zuri jarraitzea",
       "quarantine": "Ez onartu mezuak beste instantzietatik",
-      "delete_user": "Erabiltzailea ezabatu",
-      "delete_user_confirmation": "Erabat ziur zaude? Ekintza hau ezin da desegin."
+      "delete_user": "Erabiltzailea ezabatu"
     }
   },
   "user_profile": {
diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index 7b5244cb..f8c3b4ae 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -620,8 +620,7 @@
       "sandbox": "Pakota viestit vain seuraajille",
       "disable_remote_subscription": "Estä seuraaminen ulkopuolisilta sivuilta",
       "quarantine": "Estä käyttäjän viestin federoituminen",
-      "delete_user": "Poista käyttäjä",
-      "delete_user_confirmation": "Oletko aivan varma? Tätä ei voi kumota."
+      "delete_user": "Poista käyttäjä"
     },
     "favorites": "Tykkäykset",
     "mention": "Mainitse",
diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index 6d3c75d1..fae7c7a2 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -659,8 +659,7 @@
       "disable_remote_subscription": "Interdir de s'abonner a l'utilisateur depuis l'instance distante",
       "disable_any_subscription": "Interdir de s'abonner à l'utilisateur tout court",
       "quarantine": "Interdir les statuts de l'utilisateur à fédérer",
-      "delete_user": "Supprimer l'utilisateur",
-      "delete_user_confirmation": "Êtes-vous absolument-sûr⋅e ? Cette action ne peut être annulée."
+      "delete_user": "Supprimer l'utilisateur"
     },
     "mention": "Mention",
     "hidden": "Caché",
diff --git a/src/i18n/he.json b/src/i18n/he.json
index b0c59a30..6c62acc4 100644
--- a/src/i18n/he.json
+++ b/src/i18n/he.json
@@ -347,8 +347,7 @@
       "disable_remote_subscription": "אל תאפשר עקיבה של המשתמש מאינסטנס אחר",
       "disable_any_subscription": "אל תאפשר עקיבה של המשתמש בכלל",
       "quarantine": "אל תאפשר פדרציה של ההודעות של המשתמש",
-      "delete_user": "מחק משתמש",
-      "delete_user_confirmation": "בטוח? פעולה זו הינה בלתי הפיכה."
+      "delete_user": "מחק משתמש"
     }
   },
   "user_profile": {
diff --git a/src/i18n/id.json b/src/i18n/id.json
index fd64b7ae..73cc2a71 100644
--- a/src/i18n/id.json
+++ b/src/i18n/id.json
@@ -327,8 +327,7 @@
       "delete_account": "Hapus akun",
       "force_nsfw": "Tandai semua postingan sebagai NSFW",
       "strip_media": "Hapus media dari postingan-postingan",
-      "delete_user": "Hapus pengguna",
-      "delete_user_confirmation": "Apakah Anda benar-benar yakin? Tindakan ini tidak dapat dibatalkan."
+      "delete_user": "Hapus pengguna"
     },
     "follow_unfollow": "Berhenti mengikuti",
     "followees": "Mengikuti",
diff --git a/src/i18n/it.json b/src/i18n/it.json
index a1ec37a2..c8c74b70 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -485,7 +485,6 @@
     "deny": "Nega",
     "remote_follow": "Segui da remoto",
     "admin_menu": {
-      "delete_user_confirmation": "Ne sei completamente sicuro? Non potrai tornare indietro.",
       "delete_user": "Elimina utente",
       "quarantine": "I messaggi non arriveranno alle altre stanze",
       "disable_any_subscription": "Rendi utente non seguibile",
diff --git a/src/i18n/ja_easy.json b/src/i18n/ja_easy.json
index f64943d9..abca262b 100644
--- a/src/i18n/ja_easy.json
+++ b/src/i18n/ja_easy.json
@@ -608,8 +608,7 @@
       "disable_remote_subscription": "ほかのインスタンスからフォローされないようにする",
       "disable_any_subscription": "フォローされないようにする",
       "quarantine": "ほかのインスタンスのユーザーのとうこうをとめる",
-      "delete_user": "ユーザーをけす",
-      "delete_user_confirmation": "あなたは、ほんとうに、きはたしかですか？ これは、とりけすことが、できません。"
+      "delete_user": "ユーザーをけす"
     }
   },
   "user_profile": {
diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index be334651..fddf24db 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -729,8 +729,7 @@
       "disable_remote_subscription": "他のインスタンスからフォローされないようにする",
       "disable_any_subscription": "フォローされないようにする",
       "quarantine": "他のインスタンスからの投稿を止める",
-      "delete_user": "ユーザーを削除",
-      "delete_user_confirmation": "あなたの精神状態に何か問題はございませんか？ この操作を取り消すことはできません。"
+      "delete_user": "ユーザーを削除"
     },
     "roles": {
       "moderator": "モデレーター",
diff --git a/src/i18n/nb.json b/src/i18n/nb.json
index 5e3e8ef3..1c160afb 100644
--- a/src/i18n/nb.json
+++ b/src/i18n/nb.json
@@ -553,8 +553,7 @@
       "disable_remote_subscription": "Fjern mulighet til å følge brukeren fra andre instanser",
       "disable_any_subscription": "Fjern mulighet til å følge brukeren",
       "quarantine": "Gjør at statuser fra brukeren ikke kan sendes til andre instanser",
-      "delete_user": "Slett bruker",
-      "delete_user_confirmation": "Er du helt sikker? Denne handlingen kan ikke omgjøres."
+      "delete_user": "Slett bruker"
     }
   },
   "user_profile": {
diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index b113ffe4..5c00efc4 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -580,7 +580,6 @@
     "remote_follow": "Volg vanop afstand",
     "statuses": "Statussen",
     "admin_menu": {
-      "delete_user_confirmation": "Weet je het heel zeker? Deze uitvoering kan niet ongedaan worden gemaakt.",
       "delete_user": "Gebruiker verwijderen",
       "quarantine": "Federeren van gebruikers berichten verbieden",
       "disable_any_subscription": "Volgen van gebruiker in zijn geheel verbieden",
diff --git a/src/i18n/oc.json b/src/i18n/oc.json
index 40f48149..556b3d0b 100644
--- a/src/i18n/oc.json
+++ b/src/i18n/oc.json
@@ -501,8 +501,7 @@
       "disable_remote_subscription": "Desactivar lo seguiment d’utilizaire d’instàncias alonhadas",
       "disable_any_subscription": "Desactivar tot seguiment",
       "quarantine": "Defendre la federacion de las publicacions de l’utilizaire",
-      "delete_user": "Suprimir l’utilizaire",
-      "delete_user_confirmation": "Volètz vertadièrament far aquò ? Aquesta accion se pòt pas anullar."
+      "delete_user": "Suprimir l’utilizaire"
     }
   },
   "user_profile": {
diff --git a/src/i18n/pl.json b/src/i18n/pl.json
index 304a0349..efebcc83 100644
--- a/src/i18n/pl.json
+++ b/src/i18n/pl.json
@@ -762,8 +762,7 @@
       "disable_remote_subscription": "Zakaż obserwowania użytkownika ze zdalnych instancji",
       "disable_any_subscription": "Zakaż całkowicie obserwowania użytkownika",
       "quarantine": "Zakaż federowania postów od tego użytkownika",
-      "delete_user": "Usuń użytkownika",
-      "delete_user_confirmation": "Czy jesteś absolutnie pewny(-a)? Ta operacja nie może być cofnięta."
+      "delete_user": "Usuń użytkownika"
     },
     "message": "Napisz",
     "edit_profile": "Edytuj profil",
diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index e32a95e4..b997701c 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -594,7 +594,6 @@
     "unmute_progress": "A retirar silêncio…",
     "mute_progress": "A silenciar…",
     "admin_menu": {
-      "delete_user_confirmation": "Tens a certeza? Esta ação não pode ser revertida.",
       "delete_user": "Eliminar utilizador",
       "quarantine": "Não permitir publicações de utilizadores de instâncias remotas",
       "disable_any_subscription": "Não permitir que nenhum utilizador te siga",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index ba0cec28..7e6ff3f5 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -576,8 +576,7 @@
       "disable_remote_subscription": "Запретить читать с других узлов",
       "disable_any_subscription": "Запретить читать пользователя",
       "quarantine": "Не федерировать статусы пользователя",
-      "delete_user": "Удалить пользователя",
-      "delete_user_confirmation": "Вы уверены? Это действие нельзя отменить."
+      "delete_user": "Удалить пользователя"
     },
     "media": "С вложениями",
     "mention": "Упомянуть",
diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index d9833087..4e62b4a9 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -755,7 +755,6 @@
       "deactivate_account": "Деактивувати обліковий запис",
       "delete_account": "Видалити обліковий запис",
       "moderation": "Модерація",
-      "delete_user_confirmation": "Ви абсолютно впевнені? Цю дію неможливо буде скасовувати.",
       "delete_user": "Видалити обліковий запис",
       "strip_media": "Вилучити медіа з дописів користувача",
       "force_nsfw": "Позначити всі дописи як NSFW",
diff --git a/src/i18n/vi.json b/src/i18n/vi.json
index c77ad4ca..fd7ae25c 100644
--- a/src/i18n/vi.json
+++ b/src/i18n/vi.json
@@ -772,8 +772,7 @@
       "quarantine": "Không cho phép tút liên hợp",
       "delete_user": "Xóa người dùng",
       "revoke_moderator": "Gỡ bỏ Quản trị viên",
-      "force_unlisted": "Đánh dấu tất cả tút là hạn chế",
-      "delete_user_confirmation": "Bạn chắc chắn chưa? Hành động này không thể phục hồi."
+      "force_unlisted": "Đánh dấu tất cả tút là hạn chế"
     },
     "highlight": {
       "disabled": "Không nổi bật",
diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index abba4be9..dd0e6827 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -714,8 +714,7 @@
       "disable_remote_subscription": "禁止从远程实例关注用户",
       "disable_any_subscription": "完全禁止关注用户",
       "quarantine": "从联合实例中禁止用户帖子",
-      "delete_user": "删除用户",
-      "delete_user_confirmation": "你确定吗？此操作无法撤销。"
+      "delete_user": "删除用户"
     },
     "hidden": "已隐藏",
     "show_repeats": "显示转发",
diff --git a/src/i18n/zh_Hant.json b/src/i18n/zh_Hant.json
index 2c4dc3fb..6f0f63b5 100644
--- a/src/i18n/zh_Hant.json
+++ b/src/i18n/zh_Hant.json
@@ -747,7 +747,6 @@
     "admin_menu": {
       "delete_account": "刪除賬號",
       "delete_user": "刪除用戶",
-      "delete_user_confirmation": "你確認嗎？此操作無法撤銷。",
       "moderation": "調停",
       "grant_admin": "賦予管理權限",
       "revoke_admin": "撤銷管理權限",