about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/locales/ar.yml5
-rw-r--r--config/locales/ast.yml2
-rw-r--r--config/locales/ca.yml6
-rw-r--r--config/locales/co.yml6
-rw-r--r--config/locales/cs.yml6
-rw-r--r--config/locales/cy.yml6
-rw-r--r--config/locales/da.yml6
-rw-r--r--config/locales/de.yml6
-rw-r--r--config/locales/el.yml6
-rw-r--r--config/locales/en.yml32
-rw-r--r--config/locales/eo.yml5
-rw-r--r--config/locales/es.yml6
-rw-r--r--config/locales/eu.yml6
-rw-r--r--config/locales/fa.yml6
-rw-r--r--config/locales/fr.yml6
-rw-r--r--config/locales/gl.yml6
-rw-r--r--config/locales/it.yml6
-rw-r--r--config/locales/ja.yml6
-rw-r--r--config/locales/ko.yml6
-rw-r--r--config/locales/nl.yml6
-rw-r--r--config/locales/oc.yml6
-rw-r--r--config/locales/pl.yml6
-rw-r--r--config/locales/pt-BR.yml6
-rw-r--r--config/locales/ru.yml6
-rw-r--r--config/locales/simple_form.en.yml19
-rw-r--r--config/locales/sk.yml6
-rw-r--r--config/locales/sr.yml6
-rw-r--r--config/routes.rb16
28 files changed, 57 insertions, 154 deletions
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 2fa075273..0652089d4 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -455,11 +455,6 @@ ar:
       last_delivery: آخر إيداع
       title: WebSub
       topic: الموضوع
-    suspensions:
-      bad_acct_msg: قيمة التأكيد غير متطابقة. متأكد مِن أنك بصدد تعليق الحساب الصحيح؟
-      hint_html: 'لتأكيد إجراء تعليق الحساب، يُرجى إدخال %{value} في الحقل التالي:'
-      proceed: مواصلة
-      title: تعليق الحساب %{acct}
     tags:
       accounts: الحسابات
       hidden: المخفية
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index e6c51b10e..c18c398eb 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -121,8 +121,6 @@ ast:
       failed_to_execute: Fallu al executar
     subscriptions:
       title: WebSub
-    suspensions:
-      warning_html: 'El suspender esta cuenta va desaniciar <strong>de mou irreversible</strong> los sos datos qu''inclúin:'
     title: Alministración
   admin_mailer:
     new_report:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 1575b32ea..b7e3cb7f6 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -439,12 +439,6 @@ ca:
       last_delivery: Últim lliurament
       title: WebSub
       topic: Tema
-    suspensions:
-      bad_acct_msg: El valor de confirmació no s'ha trobat. Estàs suspenen el compte correcte?
-      hint_html: 'Per confirmar la suspensió del compte, introdueix %{value} al camp següent:'
-      proceed: Procedeix
-      title: Suspèn %{acct}
-      warning_html: 'Suspenen aquest compte esborrarà <strong>irreversiblement</strong> les dades del compte, incloent:'
     tags:
       accounts: Comptes
       hidden: Amagat
diff --git a/config/locales/co.yml b/config/locales/co.yml
index c15f241c6..3df78f007 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -439,12 +439,6 @@ co:
       last_delivery: Ultima arricata
       title: WebSub
       topic: Sughjettu
-    suspensions:
-      bad_acct_msg: U valore di cunfirmazione ùn era micca curretta. Site sicuru·a di suspende u bonu contu?
-      hint_html: 'Per cunfirmà a suspensione di u contu, entrate %{value} quì sottu:'
-      proceed: Cuntinuà
-      title: Suspende %{acct}
-      warning_html: 'A suspensione di u contu sguasserà di manera <strong>irreversibile</strong> i so dati, cum''è:'
     tags:
       accounts: Conti
       hidden: Piattatu
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index d25ca6c2c..0042d5641 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -444,12 +444,6 @@ cs:
       last_delivery: Poslední doručení
       title: WebSub
       topic: Téma
-    suspensions:
-      bad_acct_msg: Hodnota pro potvrzení neodpovídá. Suspendujete správný účet?
-      hint_html: 'Pro potvrzení suspenzace účtu prosím zadejte do pole níže %{value}:'
-      proceed: Pokračovat
-      title: Suspendovat účet %{acct}
-      warning_html: 'Suspenzace tohoto účtu <strong>nenávratně</strong> smaže z tohoto účtu data, včetně:'
     tags:
       accounts: Účty
       hidden: Skryté
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 24ae6fa10..2467d3e78 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -423,12 +423,6 @@ cy:
       last_delivery: Danfoniad diwethaf
       title: WebSub
       topic: Pwnc
-    suspensions:
-      bad_acct_msg: Nid yw'r gwerthoedd cadarnhau yn cyfateb. Ydych chi'n atal y cyfrif cywir?
-      hint_html: 'I gadarnhau atal y cyfrif, mewnbynwch %{value} yn y maes isod:'
-      proceed: Parhau
-      title: Atal %{acct}
-      warning_html: 'Mi fydd atal y cyfrif hwn yn dileu data <strong>am byth</strong> o''r cyfrif hwn, gan gynnwys:'
     title: Gweinyddiaeth
   admin_mailer:
     new_report:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index c6bdc753a..202f6bfb3 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -427,12 +427,6 @@ da:
       last_delivery: Sidste levering
       title: Websub
       topic: Emne
-    suspensions:
-      bad_acct_msg: Bekræftelsværdien stemte ikke overens. Er du ved at udelukke den rigtige konto?
-      hint_html: 'For at bekræfte udelukkelsen af kontoen, indtast venligst %{value} i nedenstående felt:'
-      proceed: Fortsæt
-      title: Udeluk %{acct}
-      warning_html: 'Udelukkelse af denne konto vil <strong>uigenkaldeligt</strong> slette al data fra denne konto, hvilket indebærer:'
     title: Administration
   admin_mailer:
     new_report:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 945d5a0ff..647897171 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -439,12 +439,6 @@ de:
       last_delivery: Letzte Zustellung
       title: WebSub
       topic: Thema
-    suspensions:
-      bad_acct_msg: Der Bestätigungswert stimmt nicht überein. Sperrst du das richtige Benutzerkonto?
-      hint_html: 'Um die Sperrung des Benutzerkontos zu genehmigen tippe %{value} in das Feld unten ein:'
-      proceed: Fortfahren
-      title: "%{acct} sperren"
-      warning_html: 'Die Sperrung des Benutzerkontos wird <strong>unwiederrufliche</strong> Schäden hervorrufen und alle Daten löschen, die folgendes beinhalten:'
     tags:
       accounts: Konten
       hidden: Versteckt
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 66393f213..e03a116d0 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -439,12 +439,6 @@ el:
       last_delivery: Τελευταία παράδοση
       title: WebSub
       topic: Θέμα
-    suspensions:
-      bad_acct_msg: Η τιμή επιβεβαίωσης δεν ταιριάζει. Σίγουρα αναστέλλεις το σωστό λογαριασμό;
-      hint_html: 'Για να επιβεβαιώσεις την αναστολή του λογαριασμού, γράψε %{value} στο ακόλουθο πεδίο:'
-      proceed: Συνέχεια
-      title: Αναστολή %{acct}
-      warning_html: 'Αναστέλλοντας αυτό το λογαριασμό θα διαγραφούν <strong>αμετάκλητα</strong> δεδομένα του, μεταξύ των οποίων:'
     tags:
       accounts: Λογαριασμοί
       hidden: Κρυμμένες
diff --git a/config/locales/en.yml b/config/locales/en.yml
index bd0b0c3d5..bea182f0b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -70,6 +70,9 @@ en:
       moderator: Mod
     unfollow: Unfollow
   admin:
+    account_actions:
+      action: Perform action
+      title: Perform moderation action on %{acct}
     account_moderation_notes:
       create: Leave note
       created_msg: Moderation note successfully created!
@@ -173,6 +176,7 @@ en:
         assigned_to_self_report: "%{name} assigned report %{target} to themselves"
         change_email_user: "%{name} changed the e-mail address of user %{target}"
         confirm_user: "%{name} confirmed e-mail address of user %{target}"
+        create_account_warning: "%{name} sent a warning to %{target}"
         create_custom_emoji: "%{name} uploaded new emoji %{target}"
         create_domain_block: "%{name} blocked domain %{target}"
         create_email_domain_block: "%{name} blacklisted e-mail domain %{target}"
@@ -441,12 +445,6 @@ en:
       last_delivery: Last delivery
       title: WebSub
       topic: Topic
-    suspensions:
-      bad_acct_msg: The confirmation value didn't match up. Are you suspending the right account?
-      hint_html: 'To confirm the suspension of the account, please enter %{value} into the field below:'
-      proceed: Proceed
-      title: Suspend %{acct}
-      warning_html: 'Suspending this account will <strong>irreversibly</strong> delete data from this account, which includes:'
     tags:
       accounts: Accounts
       hidden: Hidden
@@ -456,6 +454,12 @@ en:
       unhide: Show in directory
       visible: Visible
     title: Administration
+    warning_presets:
+      add_new: Add new
+      delete: Delete
+      edit: Edit
+      edit_preset: Edit warning preset
+      title: Manage warning presets
   admin_mailer:
     new_report:
       body: "%{reporter} has reported %{target}"
@@ -922,6 +926,22 @@ en:
       explanation: You requested a full backup of your Mastodon account. It's now ready for download!
       subject: Your archive is ready for download
       title: Archive takeout
+    warning:
+      explanation:
+        disable: While your account is frozen, your account data remains intact, but you cannot perform any actions until it is unlocked.
+        silence: While your account is limited, only people who are already following you will see your toots on this server, and you may be excluded from various public listings. However, others may still manually follow you.
+        suspend: Your account has been suspended, and all of your toots and your uploaded media files have been irreversibly removed from this server, and servers where you had followers.
+      review_server_policies: Review server policies
+      subject:
+        disable: Your account %{acct} has been frozen
+        none: Warning for %{acct}
+        silence: Your account %{acct} has been limited
+        suspend: Your account %{acct} has been suspended
+      title:
+        disable: Account frozen
+        none: Warning
+        silence: Account limited
+        suspend: Account suspended
     welcome:
       edit_profile_action: Setup profile
       edit_profile_step: You can customize your profile by uploading an avatar, header, changing your display name and more. If you’d like to review new followers before they’re allowed to follow you, you can lock your account.
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index f944b2a19..6a62f7021 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -427,11 +427,6 @@ eo:
       last_delivery: Lasta livero
       title: WebSub
       topic: Temo
-    suspensions:
-      hint_html: 'Por konformi la haltigo de la konto, bonvolu enigi %{value} en la kampo sube:'
-      proceed: Daŭrigita
-      title: Haltigi %{acct}
-      warning_html: 'Haltigi ĉi tiu konton forigos <strong>senrevene</strong> datumojn de ĉi tiu konto, inklusive de:'
     title: Administrado
   admin_mailer:
     new_report:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 4cd1e2a38..8927c3b38 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -433,12 +433,6 @@ es:
       last_delivery: Última entrega
       title: WebSub
       topic: Tópico
-    suspensions:
-      bad_acct_msg: El valor de confirmación no cuadra. ¿Estás suspendiendo la cuenta correcta?
-      hint_html: 'Para confirmar las suspensión de la cuenta, por favor introduce %{value} en el campo de abajo:'
-      proceed: Proceder
-      title: Suspender %{acct}
-      warning_html: 'Suspender esta cuenta borrará <strong>irreversiblemente</strong> los datos de stra cuenta que incluyen:'
     title: Administración
   admin_mailer:
     new_report:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index c96438bc3..eb148c6a2 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -435,12 +435,6 @@ eu:
       last_delivery: Azken bidalketa
       title: WebSub
       topic: Mintzagaia
-    suspensions:
-      bad_acct_msg: Berrespen balioa ez dator bat. Dagokion kontua kanporatzen ari zara?
-      hint_html: 'Kontuaren kanporatzea berresteko, sartu %{value} beheko eremuan:'
-      proceed: Jarraitu
-      title: Kanporatu %{acct}
-      warning_html: 'Kontu hau kanporatzeak <strong>behin betiko</strong> ezabatuko ditu kontu honetako datuak, hauek barne:'
     tags:
       accounts: Kontuak
       hidden: Ezkutatuta
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 7802ca98d..a87949183 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -433,12 +433,6 @@ fa:
       last_delivery: آخرین ارسال
       title: WebSub
       topic: موضوع
-    suspensions:
-      bad_acct_msg: محتوایی که برای تأیید وارد کردید منطبق نبود. آیا دارید حساب درستی را معلق می‌کنید؟
-      hint_html: 'برای تأیید معلق‌کردن حساب، لطفاً در کادر زیر %{value} را وارد کنید:'
-      proceed: ادامه
-      title: معلق‌کردن %{acct}
-      warning_html: 'معلق‌کردن این حساب <strong>برای همیشه</strong> داده‌هایش را پاک می‌کند. داده‌هایی شامل:'
     title: مدیریت سرور
   admin_mailer:
     new_report:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 3d33cd40c..167c942ee 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -439,12 +439,6 @@ fr:
       last_delivery: Dernière livraison
       title: WebSub
       topic: Sujet
-    suspensions:
-      bad_acct_msg: La valeur de confirmation n'a pas correspondu. Êtes-vous certain de suspendre le bon compte ?
-      hint_html: 'Pour confirmer la suspension du compte, veuillez entrer %{value} dans le champ ci-dessous :'
-      proceed: Confirmer
-      title: Suspension de %{acct}
-      warning_html: 'Suspendre ce compte effacera <strong>irréversiblement</strong> les données de ce compte, ce qui inclut :'
     tags:
       accounts: Comptes
       hidden: Masqué
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index de1557fb9..b6830fb72 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -439,12 +439,6 @@ gl:
       last_delivery: Última entrega
       title: WebSub
       topic: Asunto
-    suspensions:
-      bad_acct_msg: O valor de confirmación non é coincidente. Está a suspender a conta correcta?
-      hint_html: 'Para confirmar a suspensión da conta introduza %{value} no campo inferior:'
-      proceed: Proceder
-      title: Suspender %{acct}
-      warning_html: 'Ao suspender esta conta eliminará <strong>de xeito irreversible</strong> os datos de esta conta, que inclúe:'
     tags:
       accounts: Contas
       hidden: Ocultas
diff --git a/config/locales/it.yml b/config/locales/it.yml
index dc62b1bea..e9bf78cdf 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -429,12 +429,6 @@ it:
       confirmed: Confermato
       expires_in: Scade in
       topic: Argomento
-    suspensions:
-      bad_acct_msg: Il valore di conferma non corrisponde. Stai sospendendo l'account giusto?
-      hint_html: 'Per confermare la sospensione dell''account, inserisci %{value} nel campo qui sotto:'
-      proceed: Continua
-      title: Sospendi %{acct}
-      warning_html: 'La sospensione dell''account comporta la cancellazione <strong>irreversibile</strong> dei suoi dati, che comprendono:'
     title: Amministrazione
   application_mailer:
     notification_preferences: Cambia preferenze email
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 038131a61..292acf52f 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -441,12 +441,6 @@ ja:
       last_delivery: 最終配送
       title: WebSub
       topic: トピック
-    suspensions:
-      bad_acct_msg: 値が一致しませんでした。停止しようとしているアカウントに間違いはありませんか?
-      hint_html: 'アカウントの停止を確認するには、以下のフィールドに %{value} と入力してください:'
-      proceed: 完全に活動停止させる
-      title: "%{acct} を停止"
-      warning_html: 'このアカウントを停止すると、このアカウントから次のようなデータが<strong>不可逆的に</strong>削除されます:'
     tags:
       accounts: アカウント
       hidden: 非表示
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 40dab2d79..6bbc71e0b 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -441,12 +441,6 @@ ko:
       last_delivery: 최종 발송
       title: WebSub
       topic: 토픽
-    suspensions:
-      bad_acct_msg: 확인값이 일치하지 않습니다. 정지하려는 계정이 맞습니까?
-      hint_html: '이 계정을 정지하려면 %{value}를 아래 입력칸에 입력하세요:'
-      proceed: 완전히 정지시키기
-      title: "%{acct} 정지하기"
-      warning_html: '이 계정을 정지하면 계정의 데이터를 모두 삭제하며 <strong>되돌릴 수 없습니다</strong>. 이것은 다음을 포함합니다:'
     tags:
       accounts: 계정들
       hidden: 숨겨짐
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index d0578bc74..700217830 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -439,12 +439,6 @@ nl:
       last_delivery: Laatste bezorging
       title: WebSub
       topic: Account
-    suspensions:
-      bad_acct_msg: De bevestigingswaarde kwam niet overeen. Schort je wel het juiste account op?
-      hint_html: Vul in het veld hieronder %{value} in, om het opschorten van dit account te bevestigen.
-      proceed: Ga verder
-      title: "%{acct} opschorten"
-      warning_html: 'Door het opschorten van dit account worden gegevens van dit account <strong>permanent</strong> verwijderd, waaronder:'
     tags:
       accounts: Accounts
       hidden: Verborgen
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 0468fac86..e647e400c 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -439,12 +439,6 @@ oc:
       last_delivery: Darrièra distribucion
       title: WebSub
       topic: Subjècte
-    suspensions:
-      bad_acct_msg: La valor de confirmacion a pas coïncidit. Sètz a suspendre lo bon compte ?
-      hint_html: 'Per confirmar la suspension del compte, picatz %{value} al camp çai-jos :'
-      proceed: Tractat
-      title: Suspension de %{acct}
-      warning_html: 'Suspendre aqueste compte suprimirà <strong>irreversiblament</strong> las donadas del compte, aquò compren :'
     tags:
       accounts: Comptes
       hidden: Amagat
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 79ba6f9fb..7fd5df038 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -445,12 +445,6 @@ pl:
       last_delivery: Ostatnio doręczono
       title: WebSub
       topic: Temat
-    suspensions:
-      bad_acct_msg: Zawartość potwierdzenia nie zgadza się. Czy próbujesz zawiesić właściwe konto?
-      hint_html: 'Aby potwierdzić zawieszenie konta, wprowadź %{value} w poniższe pole:'
-      proceed: Przejdź
-      title: Zawieś %{acct}
-      warning_html: 'Zawieszenie konta będzie skutkowało <strong>nieodwracalnym</strong> usunięciem danych z tego konta, wliczając:'
     tags:
       accounts: Konta
       hidden: Ukryte
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 27f3b820c..e9625628b 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -439,12 +439,6 @@ pt-BR:
       last_delivery: Última entrega
       title: WebSub
       topic: Tópico
-    suspensions:
-      bad_acct_msg: Os valores de confirmação não correspondem. Você está suspendendo a conta certa?
-      hint_html: 'Para confirmar a suspensão da conta, por favor digite %{value} no campo abaixo:'
-      proceed: Prosseguir
-      title: Suspender %{acct}
-      warning_html: 'Suspender essa conta vai remover <strong>irreversivelmente</strong> dados dessa conta, o que inclui:'
     tags:
       accounts: Contas
       hidden: Escondido
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 9fa85b7c2..dceb41376 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -427,12 +427,6 @@ ru:
       last_delivery: Последняя доставка
       title: WebSub
       topic: Тема
-    suspensions:
-      bad_acct_msg: Не удалось найти такое число подтверждения. Вы уверены, что замораживаете нужный аккаунт?
-      hint_html: 'Чтобы подтвердить заморозку аккаунта, пожалуйста, введите %{value} в поле ниже:'
-      proceed: Продолжить
-      title: Заморозить %{acct}
-      warning_html: 'Заморозка этого аккаунта приведёт к <strong>необратимому</strong> удалению данных с этого аккаунта, включая:'
     title: Администрирование
   admin_mailer:
     new_report:
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index ce6a62e87..4363c59e4 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -2,6 +2,13 @@
 en:
   simple_form:
     hints:
+      account_warning_preset:
+        text: You can use toot syntax, such as URLs, hashtags and mentions
+      admin_account_action:
+        send_email_notification: The user will receive an explanation of what happened with their account
+        text_html: Optional. You can use toot syntax. You can <a href="%{path}">add warning presets</a> to save time
+        type_html: Choose what to do with <strong>%{acct}</strong>
+        warning_preset_id: Optional. You can still add custom text to end of the preset
       defaults:
         autofollow: People who sign up through the invite will automatically follow you
         avatar: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
@@ -40,6 +47,18 @@ en:
         fields:
           name: Label
           value: Content
+      account_warning_preset:
+        text: Preset text
+      admin_account_action:
+        send_email_notification: Notify the user per e-mail
+        text: Custom warning
+        type: Action
+        types:
+          disable: Disable
+          none: Do nothing
+          silence: Silence
+          suspend: Suspend and irreversibly delete account data
+        warning_preset_id: Use a warning preset
       defaults:
         autofollow: Invite to follow your account
         avatar: Avatar
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 3458c699c..f44d971a4 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -444,12 +444,6 @@ sk:
       last_delivery: Posledné doručenie
       title: WebSub
       topic: Téma
-    suspensions:
-      bad_acct_msg: Hodnota pre potvrdenie sa nezhoduje. Si si istý/á že zamrazuješ ten správny účet?
-      hint_html: 'Pre potvrdenie zamrazenia účtu, prosím napíš %{value} do následujúceho políčka:'
-      proceed: Pokračuj
-      title: Zamraziť %{acct}
-      warning_html: 'Zamrazením tohto účtu budú dáta na tomto účte <strong>nenávratne</strong> zmazané, zahŕňajúc:'
     tags:
       accounts: Účty
       hidden: Skryté
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index da621a910..8dee9fdac 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -443,12 +443,6 @@ sr:
       last_delivery: Последња достава
       title: WebSub
       topic: Topic
-    suspensions:
-      bad_acct_msg: Вредност потврде се не поклапа. Да ли суспендујете прави рачун?
-      hint_html: 'Да бисте потврдили суспензију налога, унесите %{value} у поље испод:'
-      proceed: Настави
-      title: Суспендуј %{acct}
-      warning_html: 'Суспендовање овог налога ће <strong>неповратно</strong>избрисати све податке са овог налога, који укључују:'
     title: Администрација
   admin_mailer:
     new_report:
diff --git a/config/routes.rb b/config/routes.rb
index 0aba433e2..7723a08af 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -139,6 +139,7 @@ Rails.application.routes.draw do
     resources :domain_blocks, only: [:index, :new, :create, :show, :destroy]
     resources :email_domain_blocks, only: [:index, :new, :create, :destroy]
     resources :action_logs, only: [:index]
+    resources :warning_presets, except: [:new]
     resource :settings, only: [:edit, :update]
 
     resources :invites, only: [:index, :create, :destroy] do
@@ -160,7 +161,14 @@ Rails.application.routes.draw do
       end
     end
 
-    resources :reports, only: [:index, :show, :update] do
+    resources :reports, only: [:index, :show] do
+      member do
+        post :assign_to_self
+        post :unassign
+        post :reopen
+        post :resolve
+      end
+
       resources :reported_statuses, only: [:create]
     end
 
@@ -171,7 +179,8 @@ Rails.application.routes.draw do
         post :subscribe
         post :unsubscribe
         post :enable
-        post :disable
+        post :unsilence
+        post :unsuspend
         post :redownload
         post :remove_avatar
         post :remove_header
@@ -180,8 +189,7 @@ Rails.application.routes.draw do
 
       resource :change_email, only: [:show, :update]
       resource :reset, only: [:create]
-      resource :silence, only: [:create, :destroy]
-      resource :suspension, only: [:new, :create, :destroy]
+      resource :action, only: [:new, :create], controller: 'account_actions'
       resources :statuses, only: [:index, :create, :update, :destroy]
 
       resource :confirmation, only: [:create] do