From 1c6588accca23599ea1537ec527a5be04408b2af Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 8 Jan 2019 13:39:49 +0100
Subject: [PATCH] Redesign admin instances area (#9645)

---
 .../admin/domain_blocks_controller.rb         | 11 ++---
 app/controllers/admin/instances_controller.rb | 27 ++++++-----
 app/helpers/admin/filter_helper.rb            |  3 +-
 app/javascript/styles/mastodon/admin.scss     | 14 ++++++
 app/javascript/styles/mastodon/dashboard.scss |  1 +
 app/models/instance.rb                        | 21 ++++++--
 app/models/instance_filter.rb                 | 17 ++-----
 app/policies/instance_policy.rb               |  2 +-
 .../domain_blocks/_domain_block.html.haml     | 13 -----
 app/views/admin/domain_blocks/index.html.haml | 17 -------
 app/views/admin/instances/_instance.html.haml |  4 +-
 app/views/admin/instances/index.html.haml     | 48 ++++++++++++-------
 app/views/admin/instances/show.html.haml      | 44 +++++++++++++++++
 config/locales/ar.yml                         | 10 ----
 config/locales/ast.yml                        |  2 -
 config/locales/ca.yml                         | 10 ----
 config/locales/co.yml                         | 10 ----
 config/locales/cs.yml                         | 10 ----
 config/locales/cy.yml                         | 10 ----
 config/locales/da.yml                         | 10 ----
 config/locales/de.yml                         | 10 ----
 config/locales/el.yml                         | 10 ----
 config/locales/en.yml                         | 34 ++++++++-----
 config/locales/eo.yml                         | 10 ----
 config/locales/es.yml                         | 10 ----
 config/locales/eu.yml                         | 10 ----
 config/locales/fa.yml                         | 10 ----
 config/locales/fi.yml                         | 10 ----
 config/locales/fr.yml                         | 10 ----
 config/locales/gl.yml                         | 10 ----
 config/locales/he.yml                         |  7 ---
 config/locales/hu.yml                         | 10 ----
 config/locales/id.yml                         |  7 ---
 config/locales/io.yml                         |  7 ---
 config/locales/it.yml                         | 10 ----
 config/locales/ja.yml                         | 10 ----
 config/locales/ka.yml                         | 10 ----
 config/locales/ko.yml                         | 10 ----
 config/locales/ms.yml                         | 10 ----
 config/locales/nl.yml                         | 10 ----
 config/locales/no.yml                         | 10 ----
 config/locales/oc.yml                         | 10 ----
 config/locales/pl.yml                         | 10 ----
 config/locales/pt-BR.yml                      | 10 ----
 config/locales/pt.yml                         | 10 ----
 config/locales/ru.yml                         | 10 ----
 config/locales/sk.yml                         | 10 ----
 config/locales/sr-Latn.yml                    | 10 ----
 config/locales/sr.yml                         | 10 ----
 config/locales/sv.yml                         | 10 ----
 config/locales/th.yml                         |  7 ---
 config/locales/tr.yml                         |  7 ---
 config/locales/uk.yml                         | 10 ----
 config/locales/zh-CN.yml                      | 10 ----
 config/locales/zh-HK.yml                      | 10 ----
 config/locales/zh-TW.yml                      | 10 ----
 config/navigation.rb                          |  3 +-
 config/routes.rb                              |  8 +---
 .../admin/domain_blocks_controller_spec.rb    | 24 +---------
 spec/policies/instance_policy_spec.rb         |  2 +-
 60 files changed, 159 insertions(+), 531 deletions(-)
 delete mode 100644 app/views/admin/domain_blocks/_domain_block.html.haml
 delete mode 100644 app/views/admin/domain_blocks/index.html.haml
 create mode 100644 app/views/admin/instances/show.html.haml

diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb
index 90c70275a2a..5f307ddeeca 100644
--- a/app/controllers/admin/domain_blocks_controller.rb
+++ b/app/controllers/admin/domain_blocks_controller.rb
@@ -4,14 +4,9 @@ module Admin
   class DomainBlocksController < BaseController
     before_action :set_domain_block, only: [:show, :destroy]
 
-    def index
-      authorize :domain_block, :index?
-      @domain_blocks = DomainBlock.page(params[:page])
-    end
-
     def new
       authorize :domain_block, :create?
-      @domain_block = DomainBlock.new
+      @domain_block = DomainBlock.new(domain: params[:_domain])
     end
 
     def create
@@ -22,7 +17,7 @@ module Admin
       if @domain_block.save
         DomainBlockWorker.perform_async(@domain_block.id)
         log_action :create, @domain_block
-        redirect_to admin_domain_blocks_path, notice: I18n.t('admin.domain_blocks.created_msg')
+        redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.created_msg')
       else
         render :new
       end
@@ -36,7 +31,7 @@ module Admin
       authorize @domain_block, :destroy?
       UnblockDomainService.new.call(@domain_block, retroactive_unblock?)
       log_action :destroy, @domain_block
-      redirect_to admin_domain_blocks_path, notice: I18n.t('admin.domain_blocks.destroyed_msg')
+      redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.destroyed_msg')
     end
 
     private
diff --git a/app/controllers/admin/instances_controller.rb b/app/controllers/admin/instances_controller.rb
index 6f8eaf65c4a..431ce6f4de1 100644
--- a/app/controllers/admin/instances_controller.rb
+++ b/app/controllers/admin/instances_controller.rb
@@ -4,14 +4,21 @@ module Admin
   class InstancesController < BaseController
     def index
       authorize :instance, :index?
+
       @instances = ordered_instances
     end
 
-    def resubscribe
-      authorize :instance, :resubscribe?
-      params.require(:by_domain)
-      Pubsubhubbub::SubscribeWorker.push_bulk(subscribeable_accounts.pluck(:id))
-      redirect_to admin_instances_path
+    def show
+      authorize :instance, :show?
+
+      @instance        = Instance.new(Account.by_domain_accounts.find_by(domain: params[:id]) || DomainBlock.find_by!(domain: params[:id]))
+      @following_count = Follow.where(account: Account.where(domain: params[:id])).count
+      @followers_count = Follow.where(target_account: Account.where(domain: params[:id])).count
+      @reports_count   = Report.where(target_account: Account.where(domain: params[:id])).count
+      @blocks_count    = Block.where(target_account: Account.where(domain: params[:id])).count
+      @available       = DeliveryFailureTracker.available?(Account.select(:shared_inbox_url).where(domain: params[:id]).first&.shared_inbox_url)
+      @media_storage   = MediaAttachment.where(account: Account.where(domain: params[:id])).sum(:file_file_size)
+      @domain_block    = DomainBlock.find_by(domain: params[:id])
     end
 
     private
@@ -27,17 +34,11 @@ module Admin
     helper_method :paginated_instances
 
     def ordered_instances
-      paginated_instances.map { |account| Instance.new(account) }
-    end
-
-    def subscribeable_accounts
-      Account.remote.where(protocol: :ostatus).where(domain: params[:by_domain])
+      paginated_instances.map { |resource| Instance.new(resource) }
     end
 
     def filter_params
-      params.permit(
-        :domain_name
-      )
+      params.permit(:limited)
     end
   end
 end
diff --git a/app/helpers/admin/filter_helper.rb b/app/helpers/admin/filter_helper.rb
index 8807cc78468..97beb587fce 100644
--- a/app/helpers/admin/filter_helper.rb
+++ b/app/helpers/admin/filter_helper.rb
@@ -6,8 +6,9 @@ module Admin::FilterHelper
   INVITE_FILTER        = %i(available expired).freeze
   CUSTOM_EMOJI_FILTERS = %i(local remote by_domain shortcode).freeze
   TAGS_FILTERS         = %i(hidden).freeze
+  INSTANCES_FILTERS    = %i(limited).freeze
 
-  FILTERS = ACCOUNT_FILTERS + REPORT_FILTERS + INVITE_FILTER + CUSTOM_EMOJI_FILTERS + TAGS_FILTERS
+  FILTERS = ACCOUNT_FILTERS + REPORT_FILTERS + INVITE_FILTER + CUSTOM_EMOJI_FILTERS + TAGS_FILTERS + INSTANCES_FILTERS
 
   def filter_link_to(text, link_to_params, link_class_params = link_to_params)
     new_url = filtered_url_for(link_to_params)
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index e8f33193235..375c655f53e 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -151,6 +151,20 @@ $no-columns-breakpoint: 600px;
       font-weight: 500;
     }
 
+    .directory__tag a {
+      box-shadow: none;
+    }
+
+    .directory__tag h4 {
+      font-size: 18px;
+      font-weight: 700;
+      color: $primary-text-color;
+      text-transform: none;
+      padding-bottom: 0;
+      margin-bottom: 0;
+      border-bottom: none;
+    }
+
     & > p {
       font-size: 14px;
       line-height: 18px;
diff --git a/app/javascript/styles/mastodon/dashboard.scss b/app/javascript/styles/mastodon/dashboard.scss
index 1f96e73684f..e4564f062cd 100644
--- a/app/javascript/styles/mastodon/dashboard.scss
+++ b/app/javascript/styles/mastodon/dashboard.scss
@@ -39,6 +39,7 @@
     color: $primary-text-color;
     font-family: $font-display, sans-serif;
     margin-bottom: 20px;
+    line-height: 30px;
   }
 
   &__text {
diff --git a/app/models/instance.rb b/app/models/instance.rb
index 6d5c9c2ab60..7448d465c3c 100644
--- a/app/models/instance.rb
+++ b/app/models/instance.rb
@@ -3,10 +3,23 @@
 class Instance
   include ActiveModel::Model
 
-  attr_accessor :domain, :accounts_count
+  attr_accessor :domain, :accounts_count, :domain_block
 
-  def initialize(account)
-    @domain = account.domain
-    @accounts_count = account.accounts_count
+  def initialize(resource)
+    @domain         = resource.domain
+    @accounts_count = resource.accounts_count
+    @domain_block   = resource.is_a?(DomainBlock) ? resource : DomainBlock.find_by(domain: domain)
+  end
+
+  def cached_sample_accounts
+    Rails.cache.fetch("#{cache_key}/sample_accounts", expires_in: 12.hours) { Account.where(domain: domain).searchable.joins(:account_stat).popular.limit(3) }
+  end
+
+  def to_param
+    domain
+  end
+
+  def cache_key
+    domain
   end
 end
diff --git a/app/models/instance_filter.rb b/app/models/instance_filter.rb
index 5073cf1faa4..3483d8cd6e9 100644
--- a/app/models/instance_filter.rb
+++ b/app/models/instance_filter.rb
@@ -8,21 +8,10 @@ class InstanceFilter
   end
 
   def results
-    scope = Account.remote.by_domain_accounts
-    params.each do |key, value|
-      scope.merge!(scope_for(key, value)) if value.present?
-    end
-    scope
-  end
-
-  private
-
-  def scope_for(key, value)
-    case key.to_s
-    when 'domain_name'
-      Account.matches_domain(value)
+    if params[:limited].present?
+      DomainBlock.order(id: :desc)
     else
-      raise "Unknown filter: #{key}"
+      Account.remote.by_domain_accounts
     end
   end
 end
diff --git a/app/policies/instance_policy.rb b/app/policies/instance_policy.rb
index d1956e2ded4..a73823556c5 100644
--- a/app/policies/instance_policy.rb
+++ b/app/policies/instance_policy.rb
@@ -5,7 +5,7 @@ class InstancePolicy < ApplicationPolicy
     admin?
   end
 
-  def resubscribe?
+  def show?
     admin?
   end
 end
diff --git a/app/views/admin/domain_blocks/_domain_block.html.haml b/app/views/admin/domain_blocks/_domain_block.html.haml
deleted file mode 100644
index 7bfea35743c..00000000000
--- a/app/views/admin/domain_blocks/_domain_block.html.haml
+++ /dev/null
@@ -1,13 +0,0 @@
-%tr
-  %td
-    %samp= domain_block.domain
-  %td.severity
-    = t("admin.domain_blocks.severities.#{domain_block.severity}")
-  %td.reject_media
-    - if domain_block.reject_media? || domain_block.suspend?
-      %i.fa.fa-check
-  %td.reject_reports
-    - if domain_block.reject_reports? || domain_block.suspend?
-      %i.fa.fa-check
-  %td
-    = table_link_to 'undo', t('admin.domain_blocks.undo'), admin_domain_block_path(domain_block)
diff --git a/app/views/admin/domain_blocks/index.html.haml b/app/views/admin/domain_blocks/index.html.haml
deleted file mode 100644
index 4c5221c423e..00000000000
--- a/app/views/admin/domain_blocks/index.html.haml
+++ /dev/null
@@ -1,17 +0,0 @@
-- content_for :page_title do
-  = t('admin.domain_blocks.title')
-
-.table-wrapper
-  %table.table
-    %thead
-      %tr
-        %th= t('admin.domain_blocks.domain')
-        %th= t('admin.domain_blocks.severity')
-        %th= t('admin.domain_blocks.reject_media')
-        %th= t('admin.domain_blocks.reject_reports')
-        %th
-    %tbody
-      = render @domain_blocks
-
-= paginate @domain_blocks
-= link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path, class: 'button'
diff --git a/app/views/admin/instances/_instance.html.haml b/app/views/admin/instances/_instance.html.haml
index e36ebae472e..57d3e0b068c 100644
--- a/app/views/admin/instances/_instance.html.haml
+++ b/app/views/admin/instances/_instance.html.haml
@@ -1,7 +1,5 @@
 %tr
   %td
-    = link_to instance.domain, admin_accounts_path(by_domain: instance.domain)
+    = link_to instance.domain, admin_instance_path(instance)
   %td.count
     = instance.accounts_count
-  %td
-    = table_link_to 'paper-plane-o', t('admin.accounts.resubscribe'), resubscribe_admin_instances_url(by_domain: instance.domain), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }
diff --git a/app/views/admin/instances/index.html.haml b/app/views/admin/instances/index.html.haml
index 3314ce07789..ce35b5db475 100644
--- a/app/views/admin/instances/index.html.haml
+++ b/app/views/admin/instances/index.html.haml
@@ -1,23 +1,39 @@
 - content_for :page_title do
   = t('admin.instances.title')
 
-= form_tag admin_instances_url, method: 'GET', class: 'simple_form' do
-  .fields-group
-    - %i(domain_name).each do |key|
-      .input.string.optional
-        = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.instances.#{key}")
+.filters
+  .filter-subset
+    %strong= t('admin.instances.moderation.title')
+    %ul
+      %li= filter_link_to t('admin.instances.moderation.all'), limited: nil
+      %li= filter_link_to t('admin.instances.moderation.limited'), limited: '1'
 
-    .actions
-      %button= t('admin.instances.search')
-      = link_to t('admin.instances.reset'), admin_instances_path, class: 'button negative'
+  %div{ style: 'flex: 1 1 auto; text-align: right' }
+    = link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path, class: 'button'
 
-.table-wrapper
-  %table.table
-    %thead
-      %tr
-        %th= t('admin.instances.domain_name')
-        %th= t('admin.instances.account_count')
-    %tbody
-      = render @instances
+%hr.spacer/
+
+- @instances.each do |instance|
+  .directory__tag
+    = link_to admin_instance_path(instance) do
+      %h4
+        = instance.domain
+        %small
+          = t('admin.instances.known_accounts', count: instance.accounts_count)
+
+          - if instance.domain_block
+            - if !instance.domain_block.noop?
+              &bull;
+              = t("admin.domain_blocks.severity.#{instance.domain_block.severity}")
+            - if instance.domain_block.reject_media?
+              &bull;
+              = t('admin.domain_blocks.rejecting_media')
+            - if instance.domain_block.reject_reports?
+              &bull;
+              = t('admin.domain_blocks.rejecting_reports')
+
+      .avatar-stack
+        - instance.cached_sample_accounts.each do |account|
+          = image_tag current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url, width: 48, height: 48, alt: '', class: 'account__avatar'
 
 = paginate paginated_instances
diff --git a/app/views/admin/instances/show.html.haml b/app/views/admin/instances/show.html.haml
new file mode 100644
index 00000000000..c7992a490d0
--- /dev/null
+++ b/app/views/admin/instances/show.html.haml
@@ -0,0 +1,44 @@
+- content_for :page_title do
+  = @instance.domain
+
+.dashboard__counters
+  %div
+    %div
+      .dashboard__counters__num= number_with_delimiter @following_count
+      .dashboard__counters__label= t 'admin.instances.total_followed_by_them'
+  %div
+    %div
+      .dashboard__counters__num= number_with_delimiter @followers_count
+      .dashboard__counters__label= t 'admin.instances.total_followed_by_us'
+  %div
+    %div
+      .dashboard__counters__num= number_to_human_size @media_storage
+      .dashboard__counters__label= t 'admin.instances.total_storage'
+  %div
+    %div
+      .dashboard__counters__num= number_with_delimiter @blocks_count
+      .dashboard__counters__label= t 'admin.instances.total_blocked_by_us'
+  %div
+    %div
+      .dashboard__counters__num= number_with_delimiter @reports_count
+      .dashboard__counters__label= t 'admin.instances.total_reported'
+  %div
+    %div
+      .dashboard__counters__num
+        - if @available
+          = fa_icon 'check'
+        - else
+          = fa_icon 'times'
+      .dashboard__counters__label= t 'admin.instances.delivery_available'
+
+%hr.spacer/
+
+%div{ style: 'overflow: hidden' }
+  %div{ style: 'float: left' }
+    = link_to t('admin.accounts.title'), admin_accounts_path(remote: '1', by_domain: @instance.domain), class: 'button'
+
+  %div{ style: 'float: right' }
+    - if @domain_block
+      = link_to t('admin.domain_blocks.undo'), admin_domain_block_path(@domain_block), class: 'button'
+    - else
+      = link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: @instance.domain), class: 'button'
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 8766190e377..abbfa38aadc 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -280,11 +280,6 @@ ar:
       reject_media: رفض ملفات الوسائط
       reject_media_hint: يزيل ملفات الوسائط المخزنة محليًا ويرفض تنزيل أي ملفات في المستقبل. غير ذي صلة للتعليق
       reject_reports: رفض التقارير
-      severities:
-        noop: لا شيء
-        silence: إخفاء أو كتم
-        suspend: تعليق
-      severity: الشدة
       show:
         affected_accounts:
           few: "%{count} حسابات معنية في قاعدة البيانات"
@@ -298,7 +293,6 @@ ar:
           suspend: إلغاء التعليق المفروض على كافة حسابات هذا النطاق
         title: رفع حظر النطاق عن %{domain}
         undo: إلغاء
-      title: حظر النطاقات
       undo: إلغاء
     email_domain_blocks:
       add_new: إضافة
@@ -311,10 +305,6 @@ ar:
         title: إضافة نطاق بريد جديد إلى اللائحة السوداء
       title: القائمة السوداء للبريد الإلكتروني
     instances:
-      account_count: الحسابات المعروفة
-      domain_name: النطاق
-      reset: إعادة تعيين
-      search: البحث
       title: مثيلات الخوادم المعروفة
     invites:
       deactivate_all: تعطيلها كافة
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 6c7ffc9bdc8..78ad796a00d 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -96,8 +96,6 @@ ast:
     email_domain_blocks:
       domain: Dominiu
     instances:
-      account_count: Cuentes conocíes
-      domain_name: Dominiu
       title: Instancies conocíes
     invites:
       filter:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 9cb9722c1ea..271fc35819e 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -263,11 +263,6 @@ ca:
       reject_media_hint: Elimina els fitxers multimèdia emmagatzemats localment i impedeix baixar-ne cap en el futur. Irrellevant en les suspensions
       reject_reports: Rebutja informes
       reject_reports_hint: Ignora tots els informes procedents d'aquest domini. No és rellevant per a les suspensions
-      severities:
-        noop: Cap
-        silence: Silenci
-        suspend: Suspensió
-      severity: Severitat
       show:
         affected_accounts:
           one: Un compte afectat en la base de dades
@@ -277,7 +272,6 @@ ca:
           suspend: Desfés la suspensió de tots els comptes d'aquest domini
         title: Desfés el bloqueig de domini de %{domain}
         undo: Desfés
-      title: Bloquejos de domini
       undo: Desfés
     email_domain_blocks:
       add_new: Afegeix
@@ -290,10 +284,6 @@ ca:
         title: Nova adreça de correu en la llista negra
       title: Llista negra de correus electrònics
     instances:
-      account_count: Comptes coneguts
-      domain_name: Domini
-      reset: Restableix
-      search: Cerca
       title: Instàncies conegudes
     invites:
       deactivate_all: Desactiva-ho tot
diff --git a/config/locales/co.yml b/config/locales/co.yml
index 1529c4fa322..7a87219abb6 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -265,11 +265,6 @@ co:
       reject_media_hint: Sguassa tutti i media caricati è ricusa caricamenti futuri. Inutile per una suspensione
       reject_reports: Righjittà i rapporti
       reject_reports_hint: Ignurà tutti i signalamenti chì venenu d'issu duminiu. Senz'oghjettu pè e suspensione
-      severities:
-        noop: Nisuna
-        silence: Silenzà
-        suspend: Suspende
-      severity: Severità
       show:
         affected_accounts:
           one: Un contu tuccatu indè a database
@@ -279,7 +274,6 @@ co:
           suspend: Ùn suspende più i conti nant’à stu duminiu
         title: Ùn bluccà più u duminiu %{domain}
         undo: Annullà
-      title: Blucchimi di duminiu
       undo: Annullà
     email_domain_blocks:
       add_new: Aghjustà
@@ -292,10 +286,6 @@ co:
         title: Nova iscrizzione nant’a lista nera e-mail
       title: Lista nera e-mail
     instances:
-      account_count: Conti cunnisciuti
-      domain_name: Duminiu
-      reset: Riinizializà
-      search: Cercà
       title: Istanze cunnisciute
     invites:
       deactivate_all: Disattivà tuttu
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 0b666a23b6d..d2caeb999df 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -269,11 +269,6 @@ cs:
       reject_media_hint: Odstraní lokálně uložené soubory a odmítne jejich stažení v budoucnosti. Irelevantní pro suspenzace
       reject_reports: Odmítnout nahlášení
       reject_reports_hint: Ignorovat všechna nahlášení pocházející z této domény. Nepodstatné pro suspenzace
-      severities:
-        noop: Žádné
-        silence: Utišit
-        suspend: Suspendovat
-      severity: Přísnost
       show:
         affected_accounts:
           few: "%{count} účty v databázi byly ovlivněny"
@@ -284,7 +279,6 @@ cs:
           suspend: Zrušit suspenzaci všech existujících účtů z této domény
         title: Zrušit blokaci domény %{domain}
         undo: Odvolat
-      title: Doménové blokace
       undo: Odvolat
     email_domain_blocks:
       add_new: Přidat nový
@@ -297,10 +291,6 @@ cs:
         title: Nový e-mail pro zablokování
       title: Černá listina e-mailů
     instances:
-      account_count: Známé účty
-      domain_name: Doména
-      reset: Resetovat
-      search: Hledat
       title: Známé instance
     invites:
       deactivate_all: Deaktivovat vše
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 22b70d1fd6e..40cb1cac07b 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -252,11 +252,6 @@ cy:
       reject_media_hint: Dileu dogfennau cyfryngau wedi eu cadw yn lleol ac yn gwrthod i lawrlwytho unrhyw rai yn y dyfodol. Amherthnasol i ataliadau
       reject_reports: Gwrthod adroddiadau
       reject_reports_hint: Anwybyddu'r holl adroddiadau sy'n dod o'r parth hwn. Amherthnasol i ataliadau
-      severities:
-        noop: Dim
-        silence: Tawelu
-        suspend: Atal
-      severity: Difrifoldeb
       show:
         affected_accounts: "%{count} o gyfrifoedd yn y bas data wedi eu hefeithio"
         retroactive:
@@ -264,7 +259,6 @@ cy:
           suspend: Dad-atal pob cyfrif o'r parth hwn sy'n bodoli
         title: Dadwneud blocio parth ar gyfer %{domain}
         undo: Dadwneud
-      title: Blociau parth
       undo: Dadwneud
     email_domain_blocks:
       add_new: Ychwanegu
@@ -277,10 +271,6 @@ cy:
         title: Cofnod newydd yng nghosbrestr e-byst
       title: Cosbrestr e-bost
     instances:
-      account_count: Cyfrifau hysbys
-      domain_name: Parth
-      reset: Ailosod
-      search: Chwilio
       title: Achosion hysbys
     invites:
       deactivate_all: Diffodd pob un
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 5a9fb788180..e4286d156d1 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -257,11 +257,6 @@ da:
       reject_media: Afvis medie filer
       reject_media_hint: Fjerner lokalt lagrede multimedie filer og nægter at hente nogen i fremtiden. Irrelevant for udelukkelser
       reject_reports: Afvis anmeldelser
-      severities:
-        noop: Ingen
-        silence: Dæmp
-        suspend: Udeluk
-      severity: Alvorlighed
       show:
         affected_accounts:
           one: En konto i databasen påvirket
@@ -271,7 +266,6 @@ da:
           suspend: Fjern udelukkelsen af alle eksisterende konti fra dette domæne
         title: Annuller domæne blokeringen for domænet %{domain}
         undo: Fortryd
-      title: Domæne blokeringer
       undo: Fortryd
     email_domain_blocks:
       add_new: Tilføj ny
@@ -284,10 +278,6 @@ da:
         title: Ny email blokade opslag
       title: Email sortliste
     instances:
-      account_count: Kendte konti
-      domain_name: Domæne
-      reset: Nulstil
-      search: Søg
       title: Kendte instanser
     invites:
       deactivate_all: Deaktiver alle
diff --git a/config/locales/de.yml b/config/locales/de.yml
index c505bd8bb71..081895c9c18 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -265,11 +265,6 @@ de:
       reject_media_hint: Entfernt lokal gespeicherte Mediendateien und verhindert deren künftiges Herunterladen. Für Sperren irrelevant
       reject_reports: Meldungen ablehnen
       reject_reports_hint: Ignoriere alle Meldungen von dieser Domain. Irrelevant für Sperrungen
-      severities:
-        noop: Kein
-        silence: Stummschaltung
-        suspend: Sperren
-      severity: Schweregrad
       show:
         affected_accounts:
           one: Ein Konto in der Datenbank betroffen
@@ -279,7 +274,6 @@ de:
           suspend: Alle existierenden Konten dieser Domain entsperren
         title: Domain-Blockade für %{domain} zurücknehmen
         undo: Zurücknehmen
-      title: Domain-Blockaden
       undo: Zurücknehmen
     email_domain_blocks:
       add_new: Neue hinzufügen
@@ -292,10 +286,6 @@ de:
         title: Neue E-Mail-Domain-Blockade
       title: E-Mail-Domain-Blockade
     instances:
-      account_count: Bekannte Konten
-      domain_name: Domain
-      reset: Zurücksetzen
-      search: Suchen
       title: Bekannte Instanzen
     invites:
       deactivate_all: Alle deaktivieren
diff --git a/config/locales/el.yml b/config/locales/el.yml
index e453b581f61..dd998ce5cf6 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -265,11 +265,6 @@ el:
       reject_media_hint: Αφαιρεί τα τοπικά αποθηκευμένα αρχεία πολυμέσων και αποτρέπει τη λήψη άλλων στο μέλλον. Δεν έχει σημασία για τις αναστολές
       reject_reports: Απόρριψη καταγγελιών
       reject_reports_hint: Αγνόηση όσων καταγγελιών προέρχονται από αυτό τον τομέα. Δεν σχετίζεται με τις παύσεις
-      severities:
-        noop: Κανένα
-        silence: Αποσιώπηση
-        suspend: Αναστολή
-      severity: Βαρύτητα
       show:
         affected_accounts:
           one: Επηρεάζεται ένας λογαριασμός στη βάση δεδομένων
@@ -279,7 +274,6 @@ el:
           suspend: Αναίρεση αναστολής όλων των λογαριασμών του τομέα
         title: Αναίρεση αποκλεισμού για τον τομέα %{domain}
         undo: Αναίρεση
-      title: Αποκλεισμένοι τομείς
       undo: Αναίρεση
     email_domain_blocks:
       add_new: Πρόσθεση νέου
@@ -292,10 +286,6 @@ el:
         title: Νέα εγγραφή email στη μαύρη λίστα
       title: Μαύρη λίστα email
     instances:
-      account_count: Γνωστοί λογαριασμοί
-      domain_name: Τομέας
-      reset: Επαναφορά
-      search: Αναζήτηση
       title: Γνωστοί κόμβοι
     invites:
       deactivate_all: Απενεργοποίηση όλων
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0d01ad46663..8ad5ecb0604 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -256,7 +256,7 @@ en:
       week_users_active: active this week
       week_users_new: users this week
     domain_blocks:
-      add_new: Add new
+      add_new: Add new domain block
       created_msg: Domain block is now being processed
       destroyed_msg: Domain block has been undone
       domain: Domain
@@ -273,11 +273,11 @@ en:
       reject_media_hint: Removes locally stored media files and refuses to download any in the future. Irrelevant for suspensions
       reject_reports: Reject reports
       reject_reports_hint: Ignore all reports coming from this domain. Irrelevant for suspensions
-      severities:
-        noop: None
-        silence: Silence
-        suspend: Suspend
-      severity: Severity
+      rejecting_media: rejecting media files
+      rejecting_reports: rejecting reports
+      severity:
+        silence: silenced
+        suspend: suspended
       show:
         affected_accounts:
           one: One account in the database affected
@@ -287,8 +287,7 @@ en:
           suspend: Unsuspend all existing accounts from this domain
         title: Undo domain block for %{domain}
         undo: Undo
-      title: Domain blocks
-      undo: Undo
+      undo: Undo domain block
     email_domain_blocks:
       add_new: Add new
       created_msg: Successfully added e-mail domain to blacklist
@@ -303,11 +302,20 @@ en:
       back_to_account: Back To Account
       title: "%{acct}'s Followers"
     instances:
-      account_count: Known accounts
-      domain_name: Domain
-      reset: Reset
-      search: Search
-      title: Known instances
+      delivery_available: Delivery is available
+      known_accounts:
+        one: "%{count} known account"
+        other: "%{count} known accounts"
+      moderation:
+        all: All
+        limited: Limited
+        title: Moderation
+      title: Federation
+      total_blocked_by_us: Blocked by us
+      total_followed_by_them: Followed by them
+      total_followed_by_us: Followed by us
+      total_reported: Reports about them
+      total_storage: Media attachments
     invites:
       deactivate_all: Deactivate all
       filter:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index c05b21108e4..b7dd7ca8bb8 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -261,11 +261,6 @@ eo:
         title: Nova domajna blokado
       reject_media: Malakcepti aŭdovidajn dosierojn
       reject_media_hint: Forigas aŭdovidaĵojn loke konservitajn kaj rifuzas alŝuti ajnan estonte. Senzorge pri haltigoj
-      severities:
-        noop: Nenio
-        silence: Kaŝi
-        suspend: Haltigi
-      severity: Severeco
       show:
         affected_accounts:
           one: Unu konto en la datumbazo esta influita
@@ -275,7 +270,6 @@ eo:
           suspend: Malhaltigi ĉiujn kontojn, kiuj ekzistas en ĉi tiu domajno
         title: Malfari domajnan blokadon por %{domain}
         undo: Malfari
-      title: Domajnaj blokadoj
       undo: Malfari
     email_domain_blocks:
       add_new: Aldoni novan
@@ -288,10 +282,6 @@ eo:
         title: Nova blokado de retadresa domajno
       title: Nigra listo de retadresaj domajnoj
     instances:
-      account_count: Konataj kontoj
-      domain_name: Domajno
-      reset: Restarigi
-      search: Serĉi
       title: Konataj nodoj
     invites:
       deactivate_all: Malaktivigi ĉion
diff --git a/config/locales/es.yml b/config/locales/es.yml
index bf4cc29fe32..b221989e837 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -260,11 +260,6 @@ es:
       reject_media_hint: Remueve localmente archivos multimedia almacenados para descargar cualquiera en el futuro. Irrelevante para suspensiones
       reject_reports: Rechazar informes
       reject_reports_hint: Ignore todos los reportes de este dominio. Irrelevante para suspensiones
-      severities:
-        noop: Ninguno
-        silence: Silenciar
-        suspend: Suspender
-      severity: Severidad
       show:
         affected_accounts:
           one: Una cuenta en la base de datos afectada
@@ -274,7 +269,6 @@ es:
           suspend: Des-suspender todas las cuentas existentes de este dominio
         title: Deshacer bloque de dominio para %{domain}
         undo: Deshacer
-      title: Bloques de Dominio
       undo: Deshacer
     email_domain_blocks:
       add_new: Añadir nuevo
@@ -287,10 +281,6 @@ es:
         title: Nueva entrada en la lista negra de correo
       title: Lista negra de correo
     instances:
-      account_count: Cuentas conocidas
-      domain_name: Dominio
-      reset: Reiniciar
-      search: Buscar
       title: Instancias conocidas
     invites:
       deactivate_all: Desactivar todos
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 78fd4895880..6399fac83e0 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -262,11 +262,6 @@ eu:
       reject_media_hint: Lokalki gordetako multimedia fitxategiak ezabatzen ditu eta etorkizunean fitxategi berriak deskargatzeari uko egingo dio. Ez du garrantzirik kanporaketetan
       reject_reports: Errefusatu salaketak
       reject_reports_hint: Ezikusi domeinu honetatik jasotako salaketak. Kanporatzeentzako garrantzirik gabekoa
-      severities:
-        noop: Bat ere ez
-        silence: Isilarazi
-        suspend: Kanporatu
-      severity: Larritasuna
       show:
         affected_accounts:
           one: Datu-baseko kontu bati eragiten dio
@@ -276,7 +271,6 @@ eu:
           suspend: Kendu kanporatzeko agindua domeinu honetako kontu guztiei
         title: Desegin %{domain} domeinuko blokeoa
         undo: Desegin
-      title: Domeinuen blokeoak
       undo: Desegin
     email_domain_blocks:
       add_new: Gehitu berria
@@ -289,10 +283,6 @@ eu:
         title: Sarrera berria e-mail zerrenda beltzean
       title: E-mail zerrenda beltza
     instances:
-      account_count: Kontu ezagunak
-      domain_name: Domeinua
-      reset: Berrezarri
-      search: Bilatu
       title: Instantzia ezagunak
     invites:
       deactivate_all: Desgaitu guztiak
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 5fccefc6d08..e7dd86025f2 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -260,11 +260,6 @@ fa:
       reject_media_hint: تصویرهای ذخیره‌شده در این‌جا را پاک می‌کند و جلوی دریافت تصویرها را در آینده می‌گیرد. بی‌تأثیر برای معلق‌شده‌ها
       reject_reports: نپذیرفتن گزارش‌ها
       reject_reports_hint: گزارش‌هایی را که از این دامین می‌آید نادیده می‌گیرد. بی‌تأثیر برای معلق‌شده‌ها
-      severities:
-        noop: هیچ
-        silence: بی‌صداکردن
-        suspend: معلق‌کردن
-      severity: شدت
       show:
         affected_accounts:
           one: روی یک حساب در پایگاه داده تأثیر گذاشت
@@ -274,7 +269,6 @@ fa:
           suspend: معلق‌شدن همهٔ حساب‌های این دامین را لغو کن
         title: واگردانی مسدودسازی دامنه برای %{domain}
         undo: واگردانی
-      title: دامین‌های مسدودشده
       undo: واگردانی
     email_domain_blocks:
       add_new: افزودن تازه
@@ -287,10 +281,6 @@ fa:
         title: مسدودسازی دامین ایمیل تازه
       title: مسدودسازی دامین‌های ایمیل
     instances:
-      account_count: حساب‌های شناخته‌شده
-      domain_name: دامین
-      reset: بازنشانی
-      search: جستجو
       title: سرورهای شناخته‌شده
     invites:
       deactivate_all: غیرفعال‌کردن همه
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index b48635e21bb..e7b8b18ae65 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -211,11 +211,6 @@ fi:
         title: Uusi verkkotunnuksen esto
       reject_media: Hylkää mediatiedostot
       reject_media_hint: Poistaa paikallisesti tallennetut mediatiedostot eikä lataa niitä enää jatkossa. Ei merkitystä jäähyn kohdalla
-      severities:
-        noop: Ei mitään
-        silence: Hiljennys
-        suspend: Jäähy
-      severity: Vakavuus
       show:
         affected_accounts:
           one: Vaikuttaa yhteen tiliin tietokannassa
@@ -225,7 +220,6 @@ fi:
           suspend: Peru kaikkien tässä verkkotunnuksessa jo olemassa olevien tilien jäähy
         title: Peru verkkotunnuksen %{domain} esto
         undo: Peru
-      title: Verkkotunnusten estot
       undo: Peru
     email_domain_blocks:
       add_new: Lisää uusi
@@ -238,10 +232,6 @@ fi:
         title: Uusi sähköpostiestolistan merkintä
       title: Sähköpostiestolista
     instances:
-      account_count: Tiedossa olevat tilit
-      domain_name: Verkkotunnus
-      reset: Palauta
-      search: Hae
       title: Tiedossa olevat instanssit
     invites:
       filter:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 85728811030..2faed982ecb 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -265,11 +265,6 @@ fr:
       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
-      severities:
-        noop: Aucune
-        silence: Masquer
-        suspend: Suspendre
-      severity: Séverité
       show:
         affected_accounts:
           one: Un compte affecté dans la base de données
@@ -279,7 +274,6 @@ fr:
           suspend: Annuler la suspension sur tous les comptes existants pour ce domaine
         title: Annuler le blocage de domaine pour %{domain}
         undo: Annuler
-      title: Blocage de domaines
       undo: Annuler
     email_domain_blocks:
       add_new: Ajouter
@@ -292,10 +286,6 @@ fr:
         title: Nouveau blocage de domaine de courriel
       title: Blocage de domaines de courriel
     instances:
-      account_count: Comptes connus
-      domain_name: Domaine
-      reset: Réinitialiser
-      search: Rechercher
       title: Instances connues
     invites:
       deactivate_all: Tout désactiver
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 5908e773b9d..eb626190957 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -265,11 +265,6 @@ gl:
       reject_media_hint: Eliminar ficheiros de medios almacenados localmente e rexeita descargalos no futuro. Irrelevante para as suspensións
       reject_reports: Rexeitar informes
       reject_reports_hint: Ignorar todos os informes procedentes de este dominio. Irrelevante para as suspensións
-      severities:
-        noop: Ningún
-        silence: Silenciar
-        suspend: Suspender
-      severity: Severidade
       show:
         affected_accounts:
           one: Afectoulle a unha conta na base de datos
@@ -279,7 +274,6 @@ gl:
           suspend: Non suspender todas as contas existentes de este dominio
         title: Desfacer o bloqueo de dominio para %{domain}
         undo: Desfacer
-      title: Bloqueos de domino
       undo: Desfacer
     email_domain_blocks:
       add_new: Engadir novo
@@ -292,10 +286,6 @@ gl:
         title: Nova entrada la lista negra de e-mail
       title: Lista negra de E-mail
     instances:
-      account_count: Contas coñecidas
-      domain_name: Dominio
-      reset: Restablecer
-      search: Buscar
       title: Instancias coñecidas
     invites:
       deactivate_all: Desactivar todo
diff --git a/config/locales/he.yml b/config/locales/he.yml
index f45afe3a192..bc92ed90828 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -156,10 +156,6 @@ he:
         title: חסימת שרת חדשה
       reject_media: חסימת קבצי מדיה
       reject_media_hint: מסירה קבצי מדיה השמורים מקומית ומונעת מהורדת קבצים נוספים בעתיד. לא רלוונטי להשעיות
-      severities:
-        silence: השתקה
-        suspend: השעייה
-      severity: חוּמרה
       show:
         affected_accounts:
           one: חשבון אחד במסד הנתונים מושפע
@@ -169,11 +165,8 @@ he:
           suspend: הסרת השעייה מכל החשבונות על שרת זה
         title: ביטול חסימת שרת עבור %{domain}
         undo: ביטול
-      title: חסימת שרתים
       undo: ביטול
     instances:
-      account_count: חשבונות מוכרים
-      domain_name: שם מתחם
       title: שרתים מוכרים
     reports:
       are_you_sure: 100% על בטוח?
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 4fa74228d77..79363b9ee2d 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -195,11 +195,6 @@ hu:
         title: Új domain-tiltás
       reject_media: Médiafájlok elutasítása
       reject_media_hint: Eltávolítja a helyben tárolt médiafájlokat és a továbbiakban letiltja az új médiafájlok letöltését. Felfüggesztett fiókok esetében irreleváns opció
-      severities:
-        noop: Egyik sem
-        silence: Némítás
-        suspend: Felfüggesztés
-      severity: Súlyosság
       show:
         affected_accounts:
           one: Összesen egy fiók érintett az adatbázisban
@@ -209,7 +204,6 @@ hu:
           suspend: Minden felhasználó felfüggesztésének feloldása ezen a domainen
         title: "%{domain} domain tiltásának feloldása"
         undo: Visszavonás
-      title: Tiltott domainek
       undo: Visszavonás
     email_domain_blocks:
       add_new: Új hozzáadása
@@ -222,10 +216,6 @@ hu:
         title: Új e-mail feketelista bejegyzés
       title: E-mail feketelista
     instances:
-      account_count: Nyilvántartott fiókok
-      domain_name: Domain
-      reset: Visszaállítás
-      search: Keresés
       title: Nyilvántartott instanciák
     invites:
       filter:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 5cc928823fc..ae38b3f7d2a 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -85,10 +85,6 @@ id:
         title: Pemblokiran domain baru
       reject_media: Tolak berkas media
       reject_media_hint: Hapus file media yang tersimpan dan menolak semua unduhan nantinya. Tidak terpengaruh dengan suspen
-      severities:
-        silence: Diamkan
-        suspend: Suspen
-      severity: Keparahan
       show:
         affected_accounts:
           one: Satu akun di dalam database terpengaruh
@@ -98,10 +94,7 @@ id:
           suspend: Hapus suspen terhadap akun pada domain ini
         title: Hapus pemblokiran domain %{domain}
         undo: Undo
-      title: Pemblokiran Domain
     instances:
-      account_count: Akun yang diketahui
-      domain_name: Domain
       title: Server yang diketahui
     reports:
       comment:
diff --git a/config/locales/io.yml b/config/locales/io.yml
index 358ce4ca97f..73c981a985a 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -75,10 +75,6 @@ io:
         title: New domain block
       reject_media: Reject media files
       reject_media_hint: Removes locally stored media files and refuses to download any in the future. Irrelevant for suspensions
-      severities:
-        silence: Silence
-        suspend: Suspend
-      severity: Severity
       show:
         affected_accounts:
           one: One account in the database affected
@@ -88,11 +84,8 @@ io:
           suspend: Unsuspend all existing accounts from this domain
         title: Undo domain block for %{domain}
         undo: Undo
-      title: Domain Blocks
       undo: Undo
     instances:
-      account_count: Known accounts
-      domain_name: Domain
       title: Known Instances
     reports:
       comment:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 0b96ef46a29..339dadaf4b3 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -260,11 +260,6 @@ it:
       reject_media_hint: Rimuovi i file media salvati in locale e blocca i download futuri. Irrilevante per le sospensioni
       reject_reports: Respingi rapporti
       reject_reports_hint: Ignora tutti i rapporti provenienti da questo dominio. Irrilevante per sospensioni
-      severities:
-        noop: Nessuno
-        silence: Silenzia
-        suspend: Sospendi
-      severity: Severità
       show:
         affected_accounts:
           one: Interessato un solo account nel database
@@ -274,7 +269,6 @@ it:
           suspend: Annulla la sospensione di tutti gli account esistenti da questo dominio
         title: Annulla il blocco del dominio per %{domain}
         undo: Annulla
-      title: Blocchi dominio
       undo: Annulla
     email_domain_blocks:
       add_new: Aggiungi nuovo
@@ -287,10 +281,6 @@ it:
         title: Nuova voce della lista nera delle email
       title: Lista nera email
     instances:
-      account_count: Accounts conosciuti
-      domain_name: Dominio
-      reset: Reimposta
-      search: Cerca
       title: Istanze conosciute
     invites:
       deactivate_all: Disattiva tutto
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 22965a5952f..60c8fff87a6 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -265,11 +265,6 @@ ja:
       reject_media_hint: ローカルに保存されたメディアファイルを削除し、今後のダウンロードを拒否します。停止とは無関係です
       reject_reports: レポートを拒否
       reject_reports_hint: このドメインからのレポートをすべて無視します。停止とは無関係です
-      severities:
-        noop: なし
-        silence: サイレンス
-        suspend: 停止
-      severity: 深刻度
       show:
         affected_accounts:
           one: データベース中の一つのアカウントに影響します
@@ -279,7 +274,6 @@ ja:
           suspend: このドメインからの存在するすべてのアカウントの停止を戻す
         title: "%{domain}のドメインブロックを戻す"
         undo: 元に戻す
-      title: ドメインブロック
       undo: 元に戻す
     email_domain_blocks:
       add_new: 新規追加
@@ -292,10 +286,6 @@ ja:
         title: メールアドレス用ブラックリスト新規追加
       title: メールブラックリスト
     instances:
-      account_count: 既知のアカウント数
-      domain_name: ドメイン名
-      reset: リセット
-      search: 検索
       title: 既知のインスタンス
     invites:
       deactivate_all: すべて無効化
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 7dd586aee8f..056942ecd55 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -244,11 +244,6 @@ ka:
         title: ახალი დომენის ბლოკი
       reject_media: მედია ფაილების უარყოფა
       reject_media_hint: შლის ლოკალურად შენახულ მედია ფაილებს და უარყოფს სამომავლო გადმოტვირთებს. შეუსაბამო შეჩერებებისთვის
-      severities:
-        noop: არც ერთი
-        silence: გაჩუმება
-        suspend: შეჩერება
-      severity: სიმძიმე
       show:
         affected_accounts:
           one: გავლენა იქონია მონაცემთა ბაზაში ერთ ანგარიშზე
@@ -258,7 +253,6 @@ ka:
           suspend: ამ დომენში ყველა არსებულ ანგარიშზე შეჩერების მოშორება
         title: უკუაქციეთ დომენის ბლოკი %{domain} დომენზე
         undo: უკუქცევა
-      title: დომენის ბლოკები
       undo: უკუქცევა
     email_domain_blocks:
       add_new: ახლის დამატება
@@ -271,10 +265,6 @@ ka:
         title: ელ-ფოსტის ახალი შენატანი შავ სიაში
       title: ელ-ფოსტის შავი სია
     instances:
-      account_count: ცნობილი ანგარიშები
-      domain_name: დომენი
-      reset: გადატვირთვა
-      search: ძებნა
       title: ცნობილი ინსტანციები
     invites:
       deactivate_all: ყველას დეაქტივაცია
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index acfc811f3dc..e0b4bbd0f65 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -267,11 +267,6 @@ ko:
       reject_media_hint: 로컬에 저장된 미디어 파일을 삭제하고, 이후로도 다운로드를 거부합니다. 정지와는 관계 없습니다
       reject_reports: 신고 거부
       reject_reports_hint: 이 도메인으로부터의 모든 신고를 무시합니다. 정지와는 무관합니다
-      severities:
-        noop: 없음
-        silence: 침묵
-        suspend: 정지
-      severity: 심각도
       show:
         affected_accounts:
           one: 데이터베이스 중 1개의 계정에 영향을 끼칩니다
@@ -281,7 +276,6 @@ ko:
           suspend: 이 도메인에 존재하는 모든 계정의 계정 정지를 해제
         title: "%{domain}의 도메인 차단을 해제"
         undo: 실행 취소
-      title: 도메인 차단
       undo: 실행 취소
     email_domain_blocks:
       add_new: 새로 추가
@@ -294,10 +288,6 @@ ko:
         title: 새 이메일 도메인 차단
       title: Email 도메인 차단
     instances:
-      account_count: 알려진 계정의 수
-      domain_name: 도메인 이름
-      reset: 리셋
-      search: 검색
       title: 알려진 인스턴스들
     invites:
       deactivate_all: 전부 비활성화
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 7c6148e3be4..e3c901eff84 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -260,11 +260,6 @@ ms:
       reject_media_hint: Buang fail media yang disimpan di sini dan menolak sebarang muat turun pada masa depan. Tidak berkaitan dengan penggantungan
       reject_reports: Tolak laporan
       reject_reports_hint: Abaikan semua laporan daripada domain ini. Tidak dikira untuk penggantungan
-      severities:
-        noop: Tiada
-        silence: Senyapkan
-        suspend: Gantungkan
-      severity: Tahap teruk
       show:
         affected_accounts:
           one: Satu akaun dalam pangkalan data menerima kesan
@@ -274,7 +269,6 @@ ms:
           suspend: Buang penggantungan semua akaun sedia ada daripada domain ini
         title: Buang sekatan domain %{domain}
         undo: Buang
-      title: Sekatan domain
       undo: Buang
     email_domain_blocks:
       add_new: Tambah
@@ -287,10 +281,6 @@ ms:
         title: Entri senarai hitam emel baru
       title: Senarai hitam emel
     instances:
-      account_count: Akaun diketahui
-      domain_name: Domain
-      reset: Set semula
-      search: Cari
       title: Tika diketahui
     invites:
       deactivate_all: Nyahaktifkan semua
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 92acb71d158..50fda80af12 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -265,11 +265,6 @@ nl:
       reject_media_hint: Verwijderd lokaal opgeslagen mediabestanden en weigert deze in de toekomst te downloaden. Irrelevant voor opgeschorte domeinen
       reject_reports: Rapportages weigeren
       reject_reports_hint: Alle rapportages die vanaf dit domein komen negeren. Irrelevant voor opgeschorte domeinen
-      severities:
-        noop: Geen
-        silence: Negeren
-        suspend: Opschorten
-      severity: Zwaarte
       show:
         affected_accounts:
           one: Eén account in de database aangepast
@@ -279,7 +274,6 @@ nl:
           suspend: Alle opgeschorte accounts van dit domein niet langer opschorten
         title: Domeinblokkade voor %{domain} ongedaan maken
         undo: Ongedaan maken
-      title: Domeinblokkades
       undo: Ongedaan maken
     email_domain_blocks:
       add_new: Nieuwe toevoegen
@@ -292,10 +286,6 @@ nl:
         title: Nieuw e-maildomein blokkeren
       title: E-maildomeinen blokkeren
     instances:
-      account_count: Bekende accounts
-      domain_name: Domein
-      reset: Opnieuw
-      search: Zoeken
       title: Bekende servers
     invites:
       deactivate_all: Alles deactiveren
diff --git a/config/locales/no.yml b/config/locales/no.yml
index a446fa1f669..cf8f77b4ccd 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -195,11 +195,6 @@
         title: Ny domeneblokkering
       reject_media: Avvis mediefiler
       reject_media_hint: Fjerner lokalt lagrede mediefiler og nekter å laste dem ned i fremtiden. Irrelevant for utvisninger
-      severities:
-        noop: Ingen
-        silence: Målbind
-        suspend: Utvis
-      severity: Alvorlighet
       show:
         affected_accounts:
           one: En konto i databasen påvirket
@@ -209,7 +204,6 @@
           suspend: Avutvis alle eksisterende kontoer fra dette domenet
         title: Angre domeneblokkering for %{domain}
         undo: Angre
-      title: Domeneblokkeringer
       undo: Angre
     email_domain_blocks:
       add_new: Lag ny
@@ -222,10 +216,6 @@
         title: Ny blokkeringsoppføring av e-postdomene
       title: Blokkering av e-postdomene
     instances:
-      account_count: Kjente kontoer
-      domain_name: Domene
-      reset: Tilbakestill
-      search: Søk
       title: Kjente instanser
     invites:
       filter:
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index e81b10dac0e..6d4a6833b68 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -265,11 +265,6 @@ oc:
       reject_media_hint: Lèva los fichièrs gardats localament e regèta las demandas de telecargament dins lo futur. Servís pas a res per las suspensions
       reject_reports: Regetar los senhalaments
       reject_reports_hint: Ignorar totes los senhalaments que venon d’aqueste domeni. Pas pertiment per las suspensions
-      severities:
-        noop: Cap
-        silence: Silenci
-        suspend: Suspendre
-      severity: Severitat
       show:
         affected_accounts:
           one: Un compte de la basa de donadas tocat
@@ -279,7 +274,6 @@ oc:
           suspend: Levar la suspension de totes los comptes d’aqueste domeni
         title: Restablir lo blocatge de domeni de %{domain}
         undo: Restablir
-      title: Blòc de domeni
       undo: Restablir
     email_domain_blocks:
       add_new: Ajustar
@@ -292,10 +286,6 @@ oc:
         title: Nòu blocatge de domeni de corrièl
       title: Blocatge de domeni de corrièl
     instances:
-      account_count: Comptes coneguts
-      domain_name: Domeni
-      reset: Reïnicializar
-      search: Cercar
       title: Instàncias conegudas
     invites:
       deactivate_all: O desactivar tot
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 80259d013ae..7d9a0591930 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -271,11 +271,6 @@ pl:
       reject_media_hint: Usuwa przechowywane lokalnie pliki multimedialne i nie pozwala na ich pobieranie. Nieprzydatne przy zawieszeniu
       reject_reports: Odrzucaj zgłoszenia
       reject_reports_hint: Zgłoszenia z tej instancji będą ignorowane. Nieprzydatne przy zawieszeniu
-      severities:
-        noop: Nic nie rób
-        silence: Wycisz
-        suspend: Zawieś
-      severity: Priorytet
       show:
         affected_accounts: Dotyczy %{count} kont w bazie danych
         retroactive:
@@ -283,7 +278,6 @@ pl:
           suspend: Odwołaj zawieszenie wszystkich kont w tej domenie
         title: Odwołaj blokadę dla domeny %{domain}
         undo: Cofnij
-      title: Zablokowane domeny
       undo: Cofnij
     email_domain_blocks:
       add_new: Dodaj nową
@@ -296,10 +290,6 @@ pl:
         title: Nowa blokada domeny e-mail
       title: Blokowanie domen e-mail
     instances:
-      account_count: Znane konta
-      domain_name: Domena
-      reset: Przywróć
-      search: Szukaj
       title: Znane instancje
     invites:
       deactivate_all: Unieważnij wszystkie
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index efb8b1bf882..a475209eed3 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -263,11 +263,6 @@ pt-BR:
       reject_media_hint: Remove arquivos de mídia armazenados localmente e recusa quaisquer outros no futuro. Irrelevante para suspensões
       reject_reports: Rejeitar denúncias
       reject_reports_hint: Ignorar todas as denúncias vindas deste domíno. Irrelevante para suspensões
-      severities:
-        noop: Nenhum
-        silence: Silêncio
-        suspend: Suspensão
-      severity: Rigidez
       show:
         affected_accounts:
           one: Uma conta no banco de dados foi afetada
@@ -277,7 +272,6 @@ pt-BR:
           suspend: Retirar suspensão de todas as contas neste domínio
         title: Retirar bloqueio de domínio de %{domain}
         undo: Retirar
-      title: Bloqueios de domínio
       undo: Retirar
     email_domain_blocks:
       add_new: Adicionar novo
@@ -290,10 +284,6 @@ pt-BR:
         title: Novo bloqueio de domínio de e-mail
       title: Bloqueio de Domínio de E-mail
     instances:
-      account_count: Contas conhecidas
-      domain_name: Domínio
-      reset: Resetar
-      search: Buscar
       title: Instâncias conhecidas
     invites:
       deactivate_all: Desativar todos
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index a67223069da..037582f3432 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -195,11 +195,6 @@ pt:
         title: Novo bloqueio de domínio
       reject_media: Rejeitar ficheiros de media
       reject_media_hint: Remove localmente arquivos armazenados e rejeita fazer guardar novos no futuro. Irrelevante na suspensão
-      severities:
-        noop: Nenhum
-        silence: Silenciar
-        suspend: Suspender
-      severity: Severidade
       show:
         affected_accounts:
           one: Uma conta na base de dados afectada
@@ -209,7 +204,6 @@ pt:
           suspend: Não suspender todas as contas existentes nesse domínio
         title: Remover o bloqueio de domínio de %{domain}
         undo: Anular
-      title: Bloqueio de domínio
       undo: Anular
     email_domain_blocks:
       add_new: Adicionar novo
@@ -222,10 +216,6 @@ pt:
         title: Novo bloqueio de domínio de email
       title: Bloqueio de Domínio de Email
     instances:
-      account_count: Contas conhecidas
-      domain_name: Domínio
-      reset: Restaurar
-      search: Pesquisar
       title: Instâncias conhecidas
     invites:
       filter:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 40e66ceac9b..3e37391a891 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -260,11 +260,6 @@ ru:
         title: Новая доменная блокировка
       reject_media: Запретить медиаконтент
       reject_media_hint: Удаляет локально хранимый медиаконтент и запрещает его загрузку в будущем. Не имеет значения в случае блокировки
-      severities:
-        noop: Ничего
-        silence: Глушение
-        suspend: Блокировка
-      severity: Строгость
       show:
         affected_accounts:
           few: Влияет на %{count} аккаунта в базе данных
@@ -276,7 +271,6 @@ ru:
           suspend: Снять блокировку со всех существующих аккаунтов этого домена
         title: Снять блокировку с домена %{domain}
         undo: Отменить
-      title: Доменные блокировки
       undo: Отменить
     email_domain_blocks:
       add_new: Добавить новую
@@ -289,10 +283,6 @@ ru:
         title: Новая доменная блокировка еmail
       title: Доменная блокировка email
     instances:
-      account_count: Известных аккаунтов
-      domain_name: Домен
-      reset: Сбросить
-      search: Поиск
       title: Известные узлы
     invites:
       deactivate_all: Отключить все
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 36399d7523c..4b386e352ab 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -269,11 +269,6 @@ sk:
       reject_media_hint: Zmaže lokálne uložené súbory médií a odmietne ich sťahovanie v budúcnosti. Irelevantné pre suspendáciu
       reject_reports: Zamietni hlásenia
       reject_reports_hint: Ignoruj všetky hlásenia prichádzajúce z tejto domény. Nevplýva na blokovania
-      severities:
-        noop: Žiadne
-        silence: Stíšiť
-        suspend: Suspendovať
-      severity: Závažnosť
       show:
         affected_accounts:
           few: "%{count} účty v databáze ovplyvnených"
@@ -284,7 +279,6 @@ sk:
           suspend: Zrušiť suspendáciu všetkých existujúcich účtov z tejto domény
         title: Zrušiť blokovanie domény pre %{domain}
         undo: Vrátiť späť
-      title: Blokovanie domén
       undo: Späť
     email_domain_blocks:
       add_new: Pridať nový
@@ -297,10 +291,6 @@ sk:
         title: Nový email na zablokovanie
       title: Blokované emailové adresy
     instances:
-      account_count: Známe účty
-      domain_name: Doména
-      reset: Resetovať
-      search: Hľadať
       title: Známe instancie
     invites:
       deactivate_all: Pozastaviť všetky
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 62ad744f3bc..82739c9bb77 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -195,11 +195,6 @@ sr-Latn:
         title: Novo blokiranje domena
       reject_media: Odbaci multimediju
       reject_media_hint: Uklanja lokalno uskladištene multimedijske fajlove i odbija da ih skida na dalje. Nebitno je za suspenziju
-      severities:
-        noop: Ništa
-        silence: Ućutkavanje
-        suspend: Suspenzija
-      severity: Oštrina
       show:
         affected_accounts:
           few: Utiče na %{count} naloga u bazi
@@ -211,7 +206,6 @@ sr-Latn:
           suspend: Ugasi suspenzije za sve postojeće naloge sa ovog domena
         title: Poništi blokadu domena za domen %{domain}
         undo: Poništi
-      title: Blokade domena
       undo: Poništi
     email_domain_blocks:
       add_new: Dodaj novuAdd new
@@ -224,10 +218,6 @@ sr-Latn:
         title: Nova stavka u crnoj listi e-pošti
       title: Crna lista adresa e-pošte
     instances:
-      account_count: Poznati nalozi
-      domain_name: Domen
-      reset: Resetuj
-      search: Pretraga
       title: Poznate instance
     invites:
       filter:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 009281339d5..e78a9b81790 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -268,11 +268,6 @@ sr:
       reject_media_hint: Уклања локално ускладиштене мултимедијске фајлове и одбија да их скида убудуће. Небитно је за суспензију
       reject_reports: Одбаци извештај
       reject_reports_hint: Игнориши све извештаје који долазе са овог домена. Небитно је за суспензије
-      severities:
-        noop: Ништа
-        silence: Ућуткавање
-        suspend: Суспензија
-      severity: Оштрина
       show:
         affected_accounts:
           few: Утиче на %{count} налога у бази
@@ -284,7 +279,6 @@ sr:
           suspend: Уклони суспензије за све постојеће налоге са овог домена
         title: Поништи блокаду домена за %{domain}
         undo: Поништи
-      title: Блокаде домена
       undo: Поништи
     email_domain_blocks:
       add_new: Додај нови
@@ -297,10 +291,6 @@ sr:
         title: Нова ставка е-поштe у црној листи
       title: Црна листа E-поште
     instances:
-      account_count: Познати налози
-      domain_name: Домен
-      reset: Ресетуј
-      search: Претрага
       title: Познате инстанце
     invites:
       deactivate_all: Деактивирај све
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 79040b46c34..aa5b3420daf 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -213,11 +213,6 @@ sv:
         title: Nytt domänblock
       reject_media: Avvisa mediafiler
       reject_media_hint: Raderar lokalt lagrade mediefiler och förhindrar möjligheten att ladda ner något i framtiden. Irrelevant för suspensioner
-      severities:
-        noop: Ingen
-        silence: Tysta ner
-        suspend: Suspendera
-      severity: Svårighet
       show:
         affected_accounts:
           one: Ett konto i databasen drabbades
@@ -227,7 +222,6 @@ sv:
           suspend: Ta bort suspendering från alla befintliga konton på den här domänen
         title: Ångra domänblockering för %{domain}
         undo: Ångra
-      title: Domänblockering
       undo: Ångra
     email_domain_blocks:
       add_new: Lägg till ny
@@ -240,10 +234,6 @@ sv:
         title: Ny E-postdomänblocklistningsinmatning
       title: E-postdomänblock
     instances:
-      account_count: Kända konton
-      domain_name: Domän
-      reset: Återställa
-      search: Sök
       title: Kända instanser
     invites:
       filter:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 1a1ffae3b67..5be8e02c0f0 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -84,10 +84,6 @@ th:
         title: การบล๊อกโดเมนใหม่
       reject_media: ไม่อนุมัติไฟล์สื่อ
       reject_media_hint: ลบไฟล์สื่อที่เก็บไว้ในเครื่อง และ ป้องกันการดาวน์โหลดในอนาคต. Irrelevant for suspensions
-      severities:
-        silence: ปิดเสียง
-        suspend: หยุดไว้
-      severity: Severity
       show:
         affected_accounts:
           one: มีผลต่อหนึ่งแอคเค๊าท์ในฐานข้อมูล
@@ -97,11 +93,8 @@ th:
           suspend: ยกเลิกการหยุดทุกแอคเค๊าท์จากโดเมน
         title: ยกเลิกการบล๊อกโดเมน %{domain}
         undo: ยกเลิก
-      title: บล๊อกโดเมน
       undo: ยกเลิก
     instances:
-      account_count: Known accounts
-      domain_name: ชื่อโดเมน
       title: Known Instances
     reports:
       comment:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index aae1549f770..c38b73f2e25 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -83,10 +83,6 @@ tr:
         title: Yeni domain bloğu
       reject_media: Ortam dosyalarını reddetme
       reject_media_hint: Yerel olarak depolanmış ortam dosyalarını ve gelecekte indirilecek olanları reddeder. Uzaklaştırma için uygun değildir
-      severities:
-        silence: Sustur
-        suspend: Uzaklaştır
-      severity: İşlem
       show:
         affected_accounts:
           one: Veritabanındaki bir hesap etkilendi
@@ -96,11 +92,8 @@ tr:
           suspend: Bu domaindeki tüm hesapların üzerindeki uzaklaştırma işlemini kaldır
         title: "%{domain} domain'i için yapılan işlemi geri al"
         undo: Geri al
-      title: Domain Blokları
       undo: Geri al
     instances:
-      account_count: Bilinen hesaplar
-      domain_name: Domain
       title: Bilinen Sunucular
     reports:
       comment:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index b3fc4cd3648..9a63854b582 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -237,11 +237,6 @@ uk:
         title: Нове блокування домену
       reject_media: Заборонити медіаконтент
       reject_media_hint: Видаляє медіаконтент, збережений локально, і забороняє його завантаження у майбутньому. Не має значення у випадку блокування
-      severities:
-        noop: Нічого
-        silence: Глушення
-        suspend: Блокування
-      severity: Суворість
       show:
         affected_accounts:
           few: Впливає на %{count} акаунти у базі даних
@@ -253,7 +248,6 @@ uk:
           suspend: Зняти блокування з усіх існуючих акаунтів цього домену
         title: Зняти блокування з домена %{domain}
         undo: Відмінити
-      title: Доменні блокування
       undo: Відмінити
     email_domain_blocks:
       add_new: Додати
@@ -266,10 +260,6 @@ uk:
         title: Нове доменне блокування домену email
       title: Чорний список поштових доменів
     instances:
-      account_count: Відомі аккаунти
-      domain_name: Домен
-      reset: Скинути
-      search: Пошук
       title: Відомі інстанції
     invites:
       filter:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index d03bf121784..e482e9c417a 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -246,11 +246,6 @@ zh-CN:
         title: 添加域名屏蔽
       reject_media: 拒绝接收媒体文件
       reject_media_hint: 删除本地已缓存的媒体文件，并且不再接收来自该域名的任何媒体文件。此选项不影响封禁
-      severities:
-        noop: 无
-        silence: 自动隐藏
-        suspend: 自动封禁
-      severity: 屏蔽级别
       show:
         affected_accounts:
           one: 将会影响到数据库中的 1 个帐户
@@ -260,7 +255,6 @@ zh-CN:
           suspend: 对此域名的所有帐户解除封禁
         title: 撤销对 %{domain} 的域名屏蔽
         undo: 撤销
-      title: 域名屏蔽
       undo: 撤销
     email_domain_blocks:
       add_new: 添加新条目
@@ -273,10 +267,6 @@ zh-CN:
         title: 添加电子邮件域名屏蔽
       title: 电子邮件域名屏蔽
     instances:
-      account_count: 已知帐户
-      domain_name: 域名
-      reset: 重置
-      search: 搜索
       title: 已知实例
     invites:
       deactivate_all: 撤销所有邀请链接
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 35b7741200c..737ca000cfb 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -213,11 +213,6 @@ zh-HK:
         title: 新增域名阻隔
       reject_media: 拒絕媒體檔案
       reject_media_hint: 刪除本地緩存的媒體檔案，再也不在未來下載這個站點的檔案。和自動刪除無關
-      severities:
-        noop: 無
-        silence: 自動靜音
-        suspend: 自動刪除
-      severity: 阻隔分級
       show:
         affected_accounts: 資料庫中有%{count}個用戶受影響
         retroactive:
@@ -225,7 +220,6 @@ zh-HK:
           suspend: 對此域名的所有用戶取消除名
         title: 撤銷 %{domain} 的域名阻隔
         undo: 撤銷
-      title: 域名阻隔
       undo: 撤銷
     email_domain_blocks:
       add_new: 加入新項目
@@ -238,10 +232,6 @@ zh-HK:
         title: 新增電郵網域阻隔
       title: 電郵網域阻隔
     instances:
-      account_count: 已知帳號
-      domain_name: 域名
-      reset: 重設
-      search: 搜索
       title: 已知服務站
     invites:
       filter:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 5e209d2ffa4..f4bda0f348f 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -218,11 +218,6 @@ zh-TW:
         title: 新增封鎖網域
       reject_media: 拒絕媒體檔案
       reject_media_hint: 刪除本地緩存的媒體檔案，並且不再接收來自該網域的任何媒體檔案。與自動封鎖無關
-      severities:
-        noop: 無
-        silence: 自動靜音
-        suspend: 自動封鎖
-      severity: 嚴重度
       show:
         affected_accounts: 資料庫中有%{count}個使用者受影響
         retroactive:
@@ -230,7 +225,6 @@ zh-TW:
           suspend: 對此網域的所有使用者取消封鎖
         title: 撤銷 %{domain} 的網域封鎖
         undo: 撤銷
-      title: 網域封鎖
       undo: 撤銷
     email_domain_blocks:
       add_new: 加入新項目
@@ -243,10 +237,6 @@ zh-TW:
         title: 新增E-mail封鎖
       title: E-mail封鎖
     instances:
-      account_count: 已知帳戶
-      domain_name: 網域
-      reset: 重設
-      search: 搜尋
       title: 已知站點
     invites:
       filter:
diff --git a/config/navigation.rb b/config/navigation.rb
index 1b3c05ef7a8..2365191dc20 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -29,8 +29,7 @@ SimpleNavigation::Configuration.run do |navigation|
       admin.item :accounts, safe_join([fa_icon('users fw'), t('admin.accounts.title')]), admin_accounts_url, highlights_on: %r{/admin/accounts}
       admin.item :invites, safe_join([fa_icon('user-plus fw'), t('admin.invites.title')]), admin_invites_path
       admin.item :tags, safe_join([fa_icon('tag fw'), t('admin.tags.title')]), admin_tags_path
-      admin.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_url, highlights_on: %r{/admin/instances}, if: -> { current_user.admin? }
-      admin.item :domain_blocks, safe_join([fa_icon('lock fw'), t('admin.domain_blocks.title')]), admin_domain_blocks_url, highlights_on: %r{/admin/domain_blocks}, if: -> { current_user.admin? }
+      admin.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_url, highlights_on: %r{/admin/instances|/admin/domain_blocks}, if: -> { current_user.admin? }
       admin.item :email_domain_blocks, safe_join([fa_icon('envelope fw'), t('admin.email_domain_blocks.title')]), admin_email_domain_blocks_url, highlights_on: %r{/admin/email_domain_blocks}, if: -> { current_user.admin? }
     end
 
diff --git a/config/routes.rb b/config/routes.rb
index 3ae2735d1c4..af49845ccbe 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -138,7 +138,7 @@ Rails.application.routes.draw do
     get '/dashboard', to: 'dashboard#index'
 
     resources :subscriptions, only: [:index]
-    resources :domain_blocks, only: [:index, :new, :create, :show, :destroy]
+    resources :domain_blocks, only: [:new, :create, :show, :destroy]
     resources :email_domain_blocks, only: [:index, :new, :create, :destroy]
     resources :action_logs, only: [:index]
     resources :warning_presets, except: [:new]
@@ -157,11 +157,7 @@ Rails.application.routes.draw do
       end
     end
 
-    resources :instances, only: [:index] do
-      collection do
-        post :resubscribe
-      end
-    end
+    resources :instances, only: [:index, :show], constraints: { id: /[^\/]+/ }
 
     resources :reports, only: [:index, :show] do
       member do
diff --git a/spec/controllers/admin/domain_blocks_controller_spec.rb b/spec/controllers/admin/domain_blocks_controller_spec.rb
index 79e7fea4236..129bf888370 100644
--- a/spec/controllers/admin/domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/domain_blocks_controller_spec.rb
@@ -7,26 +7,6 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
     sign_in Fabricate(:user, admin: true), scope: :user
   end
 
-  describe 'GET #index' do
-    around do |example|
-      default_per_page = DomainBlock.default_per_page
-      DomainBlock.paginates_per 1
-      example.run
-      DomainBlock.paginates_per default_per_page
-    end
-
-    it 'renders domain blocks' do
-      2.times { Fabricate(:domain_block) }
-
-      get :index, params: { page: 2 }
-
-      assigned = assigns(:domain_blocks)
-      expect(assigned.count).to eq 1
-      expect(assigned.klass).to be DomainBlock
-      expect(response).to have_http_status(200)
-    end
-  end
-
   describe 'GET #new' do
     it 'assigns a new domain block' do
       get :new
@@ -53,7 +33,7 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
 
       expect(DomainBlockWorker).to have_received(:perform_async)
       expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.created_msg')
-      expect(response).to redirect_to(admin_domain_blocks_path)
+      expect(response).to redirect_to(admin_instances_path(limited: '1'))
     end
 
     it 'renders new when failed to save' do
@@ -76,7 +56,7 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
 
       expect(service).to have_received(:call).with(domain_block, true)
       expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.destroyed_msg')
-      expect(response).to redirect_to(admin_domain_blocks_path)
+      expect(response).to redirect_to(admin_instances_path(limited: '1'))
     end
   end
 end
diff --git a/spec/policies/instance_policy_spec.rb b/spec/policies/instance_policy_spec.rb
index fbfddd72f5c..77a3bde3fb5 100644
--- a/spec/policies/instance_policy_spec.rb
+++ b/spec/policies/instance_policy_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe InstancePolicy do
   let(:admin)   { Fabricate(:user, admin: true).account }
   let(:john)    { Fabricate(:user).account }
 
-  permissions :index?, :resubscribe? do
+  permissions :index? do
     context 'admin' do
       it 'permits' do
         expect(subject).to permit(admin, Instance)