Merge 5910d5096d into 94bceb8683

Co-authored-by: GitHub Actions <noreply@github.com>

app/controllers/admin/instances_controller.rb

@@ -21,6 +21,15 @@ module Admin
       @action_logs = Admin::ActionLogFilter.new(target_domain: @instance.domain).results.limit(LOGS_LIMIT)
     end
 
+    def availability
+      authorize :instance, :show?
+    end
+
+    def statistics
+      authorize :instance, :show?
+      @time_period = (6.days.ago.to_date...Time.now.utc.to_date)
+    end
+
     def destroy
       authorize :instance, :destroy?
       Admin::DomainPurgeWorker.perform_async(@instance.domain)
@@ -31,7 +40,7 @@ module Admin
     def clear_delivery_errors
       authorize :delivery, :clear_delivery_errors?
       @instance.delivery_failure_tracker.clear_failures!
-      redirect_to admin_instance_path(@instance.domain)
+      redirect_to availability_admin_instance_path(@instance.domain)
     end
 
     def restart_delivery
@@ -42,14 +51,14 @@ module Admin
         log_action :destroy, @instance.unavailable_domain
       end
 
-      redirect_to admin_instance_path(@instance.domain)
+      redirect_to availability_admin_instance_path(@instance.domain)
     end
 
     def stop_delivery
       authorize :delivery, :stop_delivery?
       unavailable_domain = UnavailableDomain.create!(domain: @instance.domain)
       log_action :create, unavailable_domain
-      redirect_to admin_instance_path(@instance.domain)
+      redirect_to availability_admin_instance_path(@instance.domain)
     end
 
     private

app/javascript/mastodon/components/admin/Dimension.jsx

@@ -60,7 +60,7 @@ export default class Dimension extends PureComponent {
           </tbody>
         </table>
       );
-    } else {
+    } else if (data[0].data.length > 0) {
       const sum = data[0].data.reduce((sum, cur) => sum + (cur.value * 1), 0);
 
       content = (
@@ -81,6 +81,16 @@ export default class Dimension extends PureComponent {
           </tbody>
         </table>
       );
+    } else {
+      content = (
+        <table>
+          <tbody>
+            <tr className='dimension__item'>
+              <td>No data available</td>
+            </tr>
+          </tbody>
+        </table>
+      );
     }
 
     return (

app/javascript/mastodon/initial_state.js

@@ -1,6 +1,5 @@
 // @ts-check
 
-
 /**
  * @typedef {[code: string, name: string, localName: string]} InitialStateLanguage
  */
@@ -64,6 +63,7 @@
  * @property {boolean=} critical_updates_pending
  * @property {InitialStateMeta} meta
  * @property {Role?} role
+ * @property {string[]} features
  */
 
 const element = document.getElementById('initial-state');
@@ -140,4 +140,12 @@ export function getAccessToken() {
   return getMeta('access_token');
 }
 
+/**
+ * @param {string} feature
+ * @returns {boolean}
+ */
+export function isFeatureEnabled(feature) {
+  return initialState?.features?.includes(feature) || false;
+}
+
 export default initialState;

app/javascript/mastodon/locales/ca.json

@@ -219,6 +219,9 @@
   "confirmations.delete_list.confirm": "Elimina",
   "confirmations.delete_list.message": "Segur que vols suprimir permanentment aquesta llista?",
   "confirmations.delete_list.title": "Eliminar la llista?",
+  "confirmations.discard_draft.confirm": "Descarta i continua",
+  "confirmations.discard_draft.edit.cancel": "Continua l'edició",
+  "confirmations.discard_draft.post.cancel": "Reprendre l'esborrany",
   "confirmations.discard_edit_media.confirm": "Descarta",
   "confirmations.discard_edit_media.message": "Tens canvis no desats en la descripció del contingut o en la previsualització, els vols descartar?",
   "confirmations.follow_to_list.confirm": "Seguir i afegir a una llista",
@@ -792,6 +795,7 @@
   "report_notification.categories.violation": "Violació de norma",
   "report_notification.categories.violation_sentence": "violació de normes",
   "report_notification.open": "Obre l'informe",
+  "search.clear": "Esborra la cerca",
   "search.no_recent_searches": "No hi ha cerques recents",
   "search.placeholder": "Cerca",
   "search.quick_action.account_search": "Perfils coincidint amb {x}",

app/javascript/mastodon/locales/da.json

@@ -572,7 +572,7 @@
   "navigation_bar.mutes": "Skjulte brugere",
   "navigation_bar.opened_in_classic_interface": "Indlæg, konti og visse andre sider åbnes som standard i den klassiske webgrænseflade.",
   "navigation_bar.preferences": "Præferencer",
-  "navigation_bar.privacy_and_reach": "Fortrolighed og udbredelse",
+  "navigation_bar.privacy_and_reach": "Fortrolighed og rækkevidde",
   "navigation_bar.search": "Søg",
   "navigation_bar.search_trends": "Søg/Trender",
   "navigation_panel.collapse_followed_tags": "Sammenfold menuen Fulgte hashtags",

app/javascript/styles/mastodon/admin.scss

@@ -309,6 +309,27 @@ $content-width: 840px;
       font-weight: 500;
     }
 
+    em {
+      font-style: italic;
+    }
+
+    .lead {
+      font-size: 17px;
+      line-height: 22px;
+      color: $secondary-text-color;
+      margin-bottom: 30px;
+
+      a {
+        color: $highlight-text-color;
+      }
+    }
+
+    p.with-icon {
+      display: flex;
+      align-items: center;
+      gap: 5px;
+    }
+
     .fields-group h6 {
       color: $primary-text-color;
       font-weight: 500;
@@ -609,6 +630,25 @@ body,
   max-width: 100%;
 }
 
+.simple_form {
+  .actions {
+    margin-top: 15px;
+  }
+
+  .button {
+    font-size: 15px;
+  }
+}
+
+.button-group {
+  display: flex;
+  gap: 10px;
+
+  &__button--end {
+    margin-left: auto;
+  }
+}
+
 .batch-form-box {
   display: flex;
   flex-wrap: wrap;
@@ -1835,7 +1875,7 @@ a.sparkline {
 .availability-indicator {
   display: flex;
   align-items: center;
-  margin-bottom: 30px;
+  margin-bottom: 20px;
   font-size: 14px;
   line-height: 21px;
 

app/javascript/styles/mastodon/dashboard.scss

@@ -62,11 +62,20 @@
   display: grid;
   grid-template-columns: minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr);
   grid-gap: 10px;
+  align-content: start;
 
   @media screen and (width <= 1350px) {
     grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
   }
 
+  &__hint {
+    display: flex;
+    gap: 4px;
+    grid-column: span 3;
+    align-items: center;
+    color: $darker-text-color;
+  }
+
   &__item {
     &--span-double-column {
       grid-column: span 2;
@@ -118,4 +127,8 @@
       font-weight: 700;
     }
   }
+
+  &--instance-overview {
+    min-height: 400px;
+  }
 }

app/lib/delivery_failure_tracker.rb

@@ -4,6 +4,7 @@ class DeliveryFailureTracker
   include Redisable
 
   FAILURE_DAYS_THRESHOLD = 7
+  MEASURED_DAYS = 14
 
   def initialize(url_or_host)
     @host = url_or_host.start_with?('https://', 'http://') ? Addressable::URI.parse(url_or_host).normalized_host : url_or_host

app/models/concerns/database_view_record.rb

@@ -10,12 +10,6 @@ module DatabaseViewRecord
         concurrently: true,
         cascade: false
       )
-    rescue ActiveRecord::StatementInvalid
-      Scenic.database.refresh_materialized_view(
-        table_name,
-        concurrently: false,
-        cascade: false
-      )
     end
   end
 

app/serializers/initial_state_serializer.rb

@@ -5,7 +5,7 @@ class InitialStateSerializer < ActiveModel::Serializer
 
   attributes :meta, :compose, :accounts,
              :media_attachments, :settings,
-             :languages
+             :languages, :features
 
   attribute :critical_updates_pending, if: -> { object&.role&.can?(:view_devops) && SoftwareUpdate.check_enabled? }
 
@@ -85,6 +85,10 @@ class InitialStateSerializer < ActiveModel::Serializer
     LanguagesHelper::SUPPORTED_LOCALES.map { |(key, value)| [key, value[0], value[1]] }
   end
 
+  def features
+    Mastodon::Feature.enabled_features
+  end
+
   private
 
   def default_meta_store

app/views/admin/export_domain_blocks/_domain_block.html.haml

@@ -17,7 +17,7 @@
 
       %br/
 
-      = f.object.policies.map { |policy| t(policy, scope: 'admin.instances.content_policies.policies') }.join(' · ')
+      = f.object.policies.map { |policy| t(policy, scope: 'admin.instances.federation_policies.policies') }.join(' · ')
       - if f.object.public_comment.present?
         ·
         = f.object.public_comment

app/views/admin/instances/_dashboard.html.haml

@@ -1,9 +1,6 @@
 -# locals: (instance_domain:, period_end_at:, period_start_at:)
-%p
-  = material_symbol 'info'
-  = t('admin.instances.totals_time_period_hint_html')
 
-.dashboard
+.dashboard.dashboard--instance-overview
   .dashboard__item
     = react_admin_component :counter,
                             end_at: period_end_at,
@@ -48,19 +45,6 @@
                             measure: 'instance_reports',
                             params: { domain: instance_domain },
                             start_at: period_start_at
-  .dashboard__item
-    = react_admin_component :dimension,
-                            dimension: 'instance_accounts',
-                            end_at: period_end_at,
-                            label: t('admin.instances.dashboard.instance_accounts_dimension'),
-                            limit: 8,
-                            params: { domain: instance_domain },
-                            start_at: period_start_at
-  .dashboard__item
-    = react_admin_component :dimension,
-                            dimension: 'instance_languages',
-                            end_at: period_end_at,
-                            label: t('admin.instances.dashboard.instance_languages_dimension'),
-                            limit: 8,
-                            params: { domain: instance_domain },
-                            start_at: period_start_at
+  %p.dashboard__hint
+    = material_symbol 'info'
+    = t('admin.instances.totals_time_period_hint_html')

app/views/admin/instances/_instance.html.haml

@@ -6,7 +6,7 @@
 
       %small
         - if instance.domain_block
-          = instance.domain_block.policies.map { |policy| t(policy, scope: 'admin.instances.content_policies.policies') }.join(' · ')
+          = instance.domain_block.policies.map { |policy| t(policy, scope: 'admin.instances.federation_policies.policies') }.join(' · ')
           - if instance.domain_block.public_comment.present?
             %span.comment.public-comment #{t('admin.domain_blocks.public_comment')}: #{instance.domain_block.public_comment}
           - if instance.domain_block.private_comment.present?

app/views/admin/instances/availability.html.haml

@@ -0,0 +1,47 @@
+- content_for :page_title do
+  = @instance.domain
+
+- content_for :heading do
+  %h2= t('admin.instances.instance.title', domain: @instance.domain)
+  = render partial: 'admin/instances/shared/links', locals: { instance: @instance }
+
+%p.lead= t('admin.instances.availability.subtitle')
+
+- if @instance.persisted?
+  %p
+    = t('admin.instances.availability.description_html', count: DeliveryFailureTracker::FAILURE_DAYS_THRESHOLD)
+    = t('admin.instances.availability.period_description', count: DeliveryFailureTracker::MEASURED_DAYS)
+
+  .availability-indicator
+    %ul.availability-indicator__graphic
+      - @instance.availability_over_days(DeliveryFailureTracker::MEASURED_DAYS).each do |(date, failing)|
+        %li.availability-indicator__graphic__item{ class: failing ? 'negative' : 'neutral', title: l(date) }
+    .availability-indicator__hint
+      - if @instance.unavailable?
+        %span.negative-hint
+          = t('admin.instances.availability.failure_threshold_reached', date: l(@instance.unavailable_domain.created_at.to_date))
+      - elsif @instance.exhausted_deliveries_days.empty?
+        %span.positive-hint
+          = t('admin.instances.availability.no_failures_recorded')
+      - else
+        %span.negative-hint
+          = t('admin.instances.availability.failures_recorded', count: @instance.delivery_failure_tracker.days)
+
+  .button-group
+    - if @instance.unavailable?
+      = link_to t('admin.instances.delivery.restart'), restart_delivery_admin_instance_path(@instance), data: { confirm: t('admin.accounts.are_you_sure'), method: :post }, class: 'button'
+    - elsif @instance.exhausted_deliveries_days.empty?
+      = link_to t('admin.instances.delivery.stop'), stop_delivery_admin_instance_path(@instance), data: { confirm: t('admin.accounts.are_you_sure'), method: :post }, class: 'button button--destructive'
+    - else
+      = link_to t('admin.instances.delivery.clear'), clear_delivery_errors_admin_instance_path(@instance), data: { confirm: t('admin.accounts.are_you_sure'), method: :post }, class: 'button button-secondary' unless @instance.exhausted_deliveries_days.empty?
+      = link_to t('admin.instances.delivery.stop'), stop_delivery_admin_instance_path(@instance), data: { confirm: t('admin.accounts.are_you_sure'), method: :post }, class: 'button button--destructive'
+
+  %hr.spacer
+
+  - if @instance.purgeable?
+    %h3= t('admin.instances.purge_title')
+    %p= t('admin.instances.purge_description_html')
+
+    = link_to t('admin.instances.purge'), admin_instance_path(@instance), data: { confirm: t('admin.instances.confirm_purge'), method: :delete }, class: 'button button--destructive'
+- else
+  %p= t('admin.instances.availability.unknown_instance')

app/views/admin/instances/shared/_links.html.haml

@@ -0,0 +1,6 @@
+.content__heading__tabs
+  = render_navigation renderer: :links do |primary|
+    :ruby
+      primary.item :overview, safe_join([material_symbol('cloud'), t('admin.instances.title')]), admin_instance_path(instance)
+      primary.item :statistics, safe_join([material_symbol('trending_up'), t('admin.instances.statistics.title')]), statistics_admin_instance_path(instance)
+      primary.item :availability, safe_join([material_symbol('warning'), t('admin.instances.availability.title')]), availability_admin_instance_path(instance)

app/views/admin/instances/show.html.haml

@@ -1,6 +1,10 @@
 - content_for :page_title do
   = @instance.domain
 
+- content_for :heading do
+  %h2= t('admin.instances.instance.title', domain: @instance.domain)
+  = render partial: 'admin/instances/shared/links', locals: { instance: @instance }
+
 - if current_user.can?(:view_dashboard)
   - content_for :heading_actions do
     = date_range(@time_period)
@@ -13,34 +17,49 @@
 
 %hr.spacer/
 
-%h3= t('admin.instances.content_policies.title')
+%h3= t('admin.instances.federation_policies.title')
 
 - if limited_federation_mode?
-  %p= t('admin.instances.content_policies.limited_federation_mode_description_html')
+  %p= t('admin.instances.federation_policies.limited_federation_mode_description_html')
 
   - if @instance.domain_allow
     = link_to t('admin.domain_allows.undo'), admin_domain_allow_path(@instance.domain_allow), class: 'button button--destructive', data: { confirm: t('admin.accounts.are_you_sure'), method: :delete }
   - else
     = link_to t('admin.domain_allows.add_new'), admin_domain_allows_path(domain_allow: { domain: @instance.domain }), class: 'button', method: :post
 - else
-  %p= t('admin.instances.content_policies.description_html')
+  %p= t('admin.instances.federation_policies.description_html')
 
   - if @instance.domain_block
     .table-wrapper
       %table.table.horizontal-table
+        %thead
+          %tr
+            %th{ width: '28%' }
+            %th
         %tbody
           %tr
-            %th= t('admin.instances.content_policies.comment')
-            %td= @instance.domain_block.private_comment
+            %th= t('admin.instances.federation_policies.comment')
+            %td
+              - if @instance.domain_block.private_comment.present?
+                = @instance.domain_block.private_comment
+              - else
+                %em= t('admin.instances.federation_policies.no_comment')
           %tr
-            %th= t('admin.instances.content_policies.reason')
-            %td= @instance.domain_block.public_comment
+            %th= t('admin.instances.federation_policies.reason')
+            %td
+              - if @instance.domain_block.public_comment.present?
+                = @instance.domain_block.public_comment
+              - else
+                %em= t('admin.instances.federation_policies.no_comment')
           %tr
-            %th= t('admin.instances.content_policies.policy')
-            %td= @instance.domain_block.policies.map { |policy| t(policy, scope: 'admin.instances.content_policies.policies') }.join(' · ')
+            %th= t('admin.instances.federation_policies.policy')
+            %td= @instance.domain_block.policies.map { |policy| t(policy, scope: 'admin.instances.federation_policies.policies') }.join(' · ')
 
-    = link_to t('admin.domain_blocks.edit'), edit_admin_domain_block_path(@instance.domain_block), class: 'button'
-    = link_to t('admin.domain_blocks.undo'), admin_domain_block_path(@instance.domain_block), class: 'button', data: { confirm: t('admin.accounts.are_you_sure'), method: :delete }
+    .button-group
+      = link_to t('admin.domain_blocks.edit'), edit_admin_domain_block_path(@instance.domain_block), class: 'button'
+      = link_to t('admin.domain_blocks.undo'), admin_domain_block_path(@instance.domain_block), class: 'button button-secondary', data: { confirm: t('admin.accounts.are_you_sure'), method: :delete }
+      - if @instance.purgeable?
+        = link_to t('admin.instances.federation_policies.purge_data'), admin_instance_path(@instance), data: { confirm: t('admin.instances.confirm_purge'), method: :delete }, class: 'button button-tertiary button--destructive button-group__button--end'
   - else
     = link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: @instance.domain), class: 'button'
 
@@ -48,12 +67,13 @@
   %hr.spacer/
 
   %h3= t('admin.instances.audit_log.title')
+  %p= t('admin.instances.audit_log.description')
   - if @action_logs.empty?
     %p= t('accounts.nothing_here')
   - else
     .report-notes
       = render partial: 'admin/action_logs/action_log', collection: @action_logs
-    = link_to t('admin.instances.audit_log.view_all'), admin_action_logs_path(target_domain: @instance.domain), class: 'button'
+    = link_to t('admin.instances.audit_log.view_all'), admin_action_logs_path(target_domain: @instance.domain), class: 'button button-secondary'
 
 %hr.spacer/
 
@@ -71,35 +91,3 @@
 
     .actions
       = form.button :button, t('admin.instances.moderation_notes.create'), type: :submit
-
-- if @instance.persisted?
-  %hr.spacer/
-
-  %h3= t('admin.instances.availability.title')
-
-  %p
-    = t('admin.instances.availability.description_html', count: DeliveryFailureTracker::FAILURE_DAYS_THRESHOLD)
-
-  .availability-indicator
-    %ul.availability-indicator__graphic
-      - @instance.availability_over_days(14).each do |(date, failing)|
-        %li.availability-indicator__graphic__item{ class: failing ? 'negative' : 'neutral', title: l(date) }
-    .availability-indicator__hint
-      - if @instance.unavailable?
-        %span.negative-hint
-          = t('admin.instances.availability.failure_threshold_reached', date: l(@instance.unavailable_domain.created_at.to_date))
-          = link_to t('admin.instances.delivery.restart'), restart_delivery_admin_instance_path(@instance), data: { confirm: t('admin.accounts.are_you_sure'), method: :post }
-      - elsif @instance.exhausted_deliveries_days.empty?
-        %span.positive-hint
-          = t('admin.instances.availability.no_failures_recorded')
-          = link_to t('admin.instances.delivery.stop'), stop_delivery_admin_instance_path(@instance), data: { confirm: t('admin.accounts.are_you_sure'), method: :post }
-      - else
-        %span.negative-hint
-          = t('admin.instances.availability.failures_recorded', count: @instance.delivery_failure_tracker.days)
-          %span= link_to t('admin.instances.delivery.clear'), clear_delivery_errors_admin_instance_path(@instance), data: { confirm: t('admin.accounts.are_you_sure'), method: :post } unless @instance.exhausted_deliveries_days.empty?
-          %span= link_to t('admin.instances.delivery.stop'), stop_delivery_admin_instance_path(@instance), data: { confirm: t('admin.accounts.are_you_sure'), method: :post }
-
-  - if @instance.purgeable?
-    %p= t('admin.instances.purge_description_html')
-
-    = link_to t('admin.instances.purge'), admin_instance_path(@instance), data: { confirm: t('admin.instances.confirm_purge'), method: :delete }, class: 'button button--destructive'

app/views/admin/instances/statistics.html.haml

@@ -0,0 +1,28 @@
+- content_for :page_title do
+  = @instance.domain
+
+- content_for :heading do
+  %h2= t('admin.instances.instance.title', domain: @instance.domain)
+  = render partial: 'admin/instances/shared/links', locals: { instance: @instance }
+
+- if @instance.persisted?
+  %p.lead= t('admin.instances.statistics.subtitle', domain: @instance.domain)
+  .dashboard
+    .dashboard__item
+      = react_admin_component :dimension,
+                              dimension: 'instance_accounts',
+                              label: t('admin.instances.dashboard.instance_accounts_dimension'),
+                              params: { domain: @instance.domain },
+                              start_at: @time_period.first,
+                              end_at: @time_period.last,
+                              limit: 8
+    .dashboard__item
+      = react_admin_component :dimension,
+                              dimension: 'instance_languages',
+                              label: t('admin.instances.dashboard.instance_languages_dimension'),
+                              params: { domain: @instance.domain },
+                              start_at: @time_period.first,
+                              end_at: @time_period.last,
+                              limit: 8
+- else
+  %p.lead= t('admin.instances.availability.unknown_instance')

config/locales/ca.yml

@@ -578,6 +578,11 @@ ca:
         all: Totes
         limited: Limitades
         title: Moderació
+      moderation_notes:
+        create: Afegeix una nota de moderació
+        created_msg: S'ha creat la nota de moderació d'instància.
+        destroyed_msg: S'ha esborrat la nota de moderació d'instància.
+        title: Notes de moderació
       private_comment: Comentari privat
       public_comment: Comentari públic
       purge: Purga
@@ -1339,6 +1344,10 @@ ca:
     basic_information: Informació bàsica
     hint_html: "<strong>Personalitza el que la gent veu en el teu perfil públic i a prop dels teus tuts..</strong> És més probable que altres persones et segueixin i interaccionin amb tu quan tens emplenat el teu perfil i amb la teva imatge."
     other: Altres
+  emoji_styles:
+    auto: Automàtic
+    native: Nadiu
+    twemoji: Twemoji
   errors:
     '400': La sol·licitud que vas emetre no era vàlida o no era correcta.
     '403': No tens permís per a veure aquesta pàgina.

config/locales/da.yml

@@ -653,7 +653,7 @@ da:
         mark_as_sensitive_description_html: Medierne i det anmeldte indlæg markeres som sensitive, og en advarsel (strike) registreres mhp. eskalering ved evt. fremtidige overtrædelser fra samme konto.
         other_description_html: Se flere muligheder for at kontrollere kontoens adfærd og tilpasse kommunikationen til den anmeldte konto.
         resolve_description_html: Ingen foranstaltninger træffes mod den anmeldte konto, ingen advarsel (strike) registreres og anmeldelsen lukkes.
-        silence_description_html: Kontoen vil kun være synlig for følgerene eller dem, som manuelt slå den op, hvilket markant begrænser dens udbredelse. Kan altid omgøres. Lukker alle indrapporteringer af kontoen.
+        silence_description_html: Kontoen vil kun være synlig for dem, der allerede følger den eller manuelt slår den op, hvilket alvorligt begrænser dens rækkevidde. Kan altid omgøres. Lukker alle indrapporteringer af denne konto.
         suspend_description_html: Kontoen inkl. alt indhold utilgængeliggøres og interaktion umuliggøres, og den slettes på et tidspunkt. Kan omgøres inden for 30 dage. Lukker alle indrapporteringer af kontoen.
       actions_description_html: Afgør, hvilke foranstaltning, der skal træffes for at løse denne anmeldelse. Ved en straffende foranstaltning mod den anmeldte konto, fremsendes en e-mailnotifikation, undtagen når kategorien <strong>Spam</strong> er valgt.
       actions_description_remote_html: Fastslå en nødvendig handling mhp. at løse denne anmeldelse. Dette vil kun påvirke <strong>din</strong> servers kommunikation med, og indholdshåndtering for, fjernkontoen.
@@ -1266,8 +1266,8 @@ da:
     user_privacy_agreement_html: Jeg accepterer <a href="%{privacy_policy_path}" target="_blank">fortrolighedspolitikken</a>
   author_attribution:
     example_title: Eksempeltekst
-    hint_html: Skriver du nyheder eller blogartikler uden for Mastodon? Styr, hvordan man bliver krediteret, når disse deles på Mastodon.
-    instructions: 'Sørg for, at denne kode er i artikelens HTML:'
+    hint_html: Skriver du nyheder eller blogartikler uden for Mastodon? Styr, hvordan du bliver krediteret, når de bliver delt på Mastodon.
+    instructions: 'Sørg for, at denne kode er i din artikels HTML:'
     more_from_html: Flere fra %{name}
     s_blog: "%{name}s blog"
     then_instructions: Tilføj dernæst publikationsdomænenavnet i feltet nedenfor.
@@ -1718,11 +1718,11 @@ da:
     hint_html: "<strong>Tilpas hvordan din profil og dine indlæg kan findes.</strong> En række funktioner i Mastodon kan hjælpe dig med at nå ud til et bredere publikum, hvis du aktiverer dem. Tjek indstillingerne herunder for at sikre, at de passer til dit brugsscenarie."
     privacy: Privatliv
     privacy_hint_html: Styr, hvor meget der ønskes synliggjort til gavn for andre. Folk finder interessante profiler og apps ved at tjekke andres følgere ud, samt se hvilke apps de sender fra, men dine præferencer ønskes muligvis ikke synliggjort.
-    reach: Udbredelse
+    reach: Rækkevidde
     reach_hint_html: Indstil om du vil blive opdaget og fulgt af nye mennesker. Ønsker du, at dine indlæg skal vises på Udforsk-siden? Ønsker du, at andre skal se dig i deres følg-anbefalinger? Ønsker du at acceptere alle nye følgere automatisk, eller vil du have detaljeret kontrol over hver og en?
-    search: Søg
+    search: Søgning
     search_hint_html: Indstil hvordan du vil findes. Ønsker du, at folk skal finde dig gennem hvad du har skrevet offentligt? Vil du have folk udenfor Mastodon til at finde din profil, når de søger på nettet? Vær opmærksom på, at det ikke kan garanteres at dine offentlige indlæg er udelukket fra alle søgemaskiner.
-    title: Fortrolighed og udbredelse
+    title: Fortrolighed og rækkevidde
   privacy_policy:
     title: Privatlivspolitik
   reactions:
@@ -1923,7 +1923,7 @@ da:
       '7889238': 3 måneder
     min_age_label: Alderstærskel
     min_favs: Behold indlæg favoritmarkeret mindst
-    min_favs_hint: Sletter ingen dine egne indlæg, som har modtaget minimum dette antal favoritmarkeringer. Lad stå tomt for at slette indlæg uanset antal favoritmarkeringer
+    min_favs_hint: Sletter ingen af dine egne indlæg, som har modtaget minimum dette antal favoritmarkeringer. Lad stå tom for at slette indlæg uanset antal favoritmarkeringer
     min_reblogs: Behold indlæg fremhævet mindst
     min_reblogs_hint: Sletter ingen af dine egne indlæg, som er fremhævet flere end dette antal gange. Lad stå tom for at slette indlæg uanset antallet af fremhævelser
   stream_entries:
@@ -2095,7 +2095,7 @@ da:
   verification:
     extra_instructions_html: <strong>Tip:</strong> Linket på din hjemmeside kan være usynligt. Den vigtige del er <code>rel="me"</code> , som forhindrer impersonation på websteder med brugergenereret indhold. Du kan endda bruge et <code>link</code> tag i overskriften på siden i stedet for <code>a</code>, men HTML skal være tilgængelig uden at udføre JavaScript.
     here_is_how: Sådan gør du
-    hint_html: "<strong>Bekræftelse af din identitet på Mastodon er for alle.</strong> Baseret på åbne webstandarder, nu og for evigt gratis. Alt du behøver er en personlig hjemmeside, som folk genkende dig ved. Når du linker til denne hjemmeside fra din profil, vi vil kontrollere, at hjemmesiden linker tilbage til din profil og vise en visuel indikator på det."
+    hint_html: "<strong>Verificering af din identitet på Mastodon er for alle.</strong> Baseret på åbne webstandarder, nu og for altid gratis. Alt, hvad du behøver, er en personlig hjemmeside, som folk kender dig fra. Når du linker til denne hjemmeside fra din profil, kontrollerer vi, at hjemmesiden linker tilbage til din profil, og viser en visuel indikator på den."
     instructions_html: Kopier og indsæt koden nedenfor i HTML på din hjemmeside. Tilføj derefter adressen på din hjemmeside i et af de ekstra felter på din profil på fanen "Redigér profil" og gem ændringer.
     verification: Bekræftelse
     verified_links: Dine bekræftede links

config/locales/en.yml

@@ -520,8 +520,9 @@ en:
       unsuppress: Restore follow recommendation
     instances:
       audit_log:
-        title: Recent Audit Logs
-        view_all: View full audit logs
+        description: These are the 5 most recent audit log entries relating to this instance.
+        title: Audit Logs
+        view_all: View all audit logs
       availability:
         description_html:
           one: If delivering to the domain fails <strong>%{count} day</strong> without succeeding, no further delivery attempts will be made unless a delivery <em>from</em> the domain is received.
@@ -531,25 +532,16 @@ en:
           one: Failed attempt on %{count} day.
           other: Failed attempts on %{count} different days.
         no_failures_recorded: No failures on record.
+        period_description: The bars shown are for delivery status over the last %{count} days.
+        subtitle: Instance availability measures how successfully we've been able to federate
         title: Availability
+        unknown_instance: There is no data available for this instance as this server doesn't currently federate with it.
         warning: The last attempt to connect to this server has been unsuccessful
       back_to_all: All
       back_to_limited: Limited
       back_to_warning: Warning
       by_domain: Domain
       confirm_purge: Are you sure you want to permanently delete data from this domain?
-      content_policies:
-        comment: Internal note
-        description_html: You can define content policies that will be applied to all accounts from this domain and any of its subdomains.
-        limited_federation_mode_description_html: You can chose whether to allow federation with this domain.
-        policies:
-          reject_media: Reject media
-          reject_reports: Reject reports
-          silence: Limit
-          suspend: Suspend
-        policy: Policy
-        reason: Public reason
-        title: Content policies
       dashboard:
         instance_accounts_dimension: Most followed accounts
         instance_accounts_measure: stored accounts
@@ -571,6 +563,22 @@ en:
       delivery_error_hint: If delivery is not possible for %{count} days, it will be automatically marked as undeliverable.
       destroyed_msg: Data from %{domain} is now queued for imminent deletion.
       empty: No domains found.
+      federation_policies:
+        comment: Private note
+        description_html: You can set a federation policy that will be applied to all accounts from this domain and any of its subdomains.
+        limited_federation_mode_description_html: You can chose whether to allow federation with this domain.
+        no_comment: None
+        policies:
+          reject_media: Reject media
+          reject_reports: Reject reports
+          silence: Limit
+          suspend: Suspend
+        policy: Policy
+        purge_data: Purge Data
+        reason: Public reason
+        title: Federation policy
+      instance:
+        title: Federation with %{domain}
       known_accounts:
         one: "%{count} known account"
         other: "%{count} known accounts"
@@ -587,15 +595,19 @@ en:
         title: Moderation Notes
       private_comment: Private comment
       public_comment: Public comment
-      purge: Purge
+      purge: Purge Data
       purge_description_html: If you believe this domain is offline for good, you can delete all account records and associated data from this domain from your storage. This may take a while.
+      purge_title: Purge Data
+      statistics:
+        subtitle: Below are a few statistics about %{domain}, that you may find interesting.
+        title: Statistics
       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
-      totals_time_period_hint_html: The totals displayed below include data for all time.
+      totals_time_period_hint_html: The totals displayed above include data for all time.
       unknown_instance: There is currently no record of this domain on this server.
     invites:
       deactivate_all: Deactivate all

config/locales/hu.yml

@@ -1349,6 +1349,10 @@ hu:
     basic_information: Általános információk
     hint_html: "<strong>Tedd egyedivé, mi látnak mások a profilodon és a bejegyzéseid mellett.</strong> Mások nagyobb eséllyel követnek vissza és lépnek veled kapcsolatba, ha van kitöltött profilod és profilképed."
     other: Egyéb
+  emoji_styles:
+    auto: Automatikus
+    native: Natív
+    twemoji: Twemoji
   errors:
     '400': A küldött kérés érvénytelen vagy hibás volt.
     '403': Nincs jogosultságod az oldal megtekintéséhez.

config/locales/simple_form.ca.yml

@@ -61,6 +61,7 @@ ca:
         setting_display_media_default: Amaga el contingut gràfic marcat com a sensible
         setting_display_media_hide_all: Oculta sempre tot el contingut multimèdia
         setting_display_media_show_all: Mostra sempre el contingut gràfic
+        setting_emoji_style: Com mostrar els emojis. "Automàtic" provarà de fer servir els emojis nadius, però revertirà a twemojis en els navegadors antics.
         setting_system_scrollbars_ui: S'aplica només als navegadors d'escriptori basats en Safari i Chrome
         setting_use_blurhash: Els degradats es basen en els colors de les imatges ocultes, però n'enfosqueixen els detalls
         setting_use_pending_items: Amaga les actualitzacions de la línia de temps després de fer un clic, en lloc de desplaçar-les automàticament
@@ -240,6 +241,7 @@ ca:
         setting_display_media_default: Per defecte
         setting_display_media_hide_all: Amaga-ho tot
         setting_display_media_show_all: Mostra-ho tot
+        setting_emoji_style: Estil d'emojis
         setting_expand_spoilers: Desplega sempre els tuts marcats amb advertències de contingut
         setting_hide_network: Amaga la teva xarxa
         setting_missing_alt_text_modal: Mostra un diàleg de confirmació abans de publicar contingut sense text alternatiu

config/locales/simple_form.hu.yml

@@ -61,6 +61,7 @@ hu:
         setting_display_media_default: Kényes tartalomnak jelölt média elrejtése
         setting_display_media_hide_all: Média elrejtése mindig
         setting_display_media_show_all: Média megjelenítése mindig
+        setting_emoji_style: Az emodzsik megjelenítési módja. Az „Automatikus” megpróbálja a natív emodzsikat használni, de az örökölt böngészők esetén a Twemojira vált vissza.
         setting_system_scrollbars_ui: Csak Chrome és Safari alapú asztali böngészőkre vonatkozik
         setting_use_blurhash: A kihomályosítás az eredeti képből történik, de minden részletet elrejt
         setting_use_pending_items: Idővonal frissítése csak kattintásra automatikus görgetés helyett
@@ -241,6 +242,7 @@ hu:
         setting_display_media_default: Alapértelmezés
         setting_display_media_hide_all: Mindent elrejt
         setting_display_media_show_all: Mindent mutat
+        setting_emoji_style: Emodzsistílus
         setting_expand_spoilers: Tartalmi figyelmeztetéssel ellátott bejegyzések automatikus kinyitása
         setting_hide_network: Hálózatod elrejtése
         setting_missing_alt_text_modal: Megerősítési párbeszédablak megjelenítése a helyettesítő szöveg nélküli média közzététele előtt

config/routes/admin.rb

@@ -87,6 +87,8 @@ namespace :admin do
 
   resources :instances, only: [:index, :show, :destroy], constraints: { id: %r{[^/]+} }, format: 'html' do
     member do
+      get :availability
+      get :statistics
       post :clear_delivery_errors
       post :restart_delivery
       post :stop_delivery